Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output

Browse Source

# Conflicts:
#	docs/config-catalog.md
#	docs/persistence-catalog.md
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
#	packages/cordis/tool-cordis/src/api-catalog.ts
#	packages/core/agent-loop/tests/contract-regressions.spec.ts
#	packages/ui/acp/src/index.ts
#	packages/ui/tui/src/index.ts

...

This commit is contained in:

Tianyi Cui

2026-07-22 23:50:41 +08:00

parent b8aa1507cd 065d20c249

commit 8d42d3c979

159 changed files with 3918 additions and 362 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl

+1 -1

File diff suppressed because one or more lines are too long

examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl

+2 -2

File diff suppressed because one or more lines are too long