Merge remote-tracking branch 'origin/codex/enforce-tool-cancellation' into worktree/explicit-turn-signal

Browse Source

# Conflicts:
#	docs/architecture.md
#	docs/cordis-catalog/events.md
#	docs/event-producer-consumer.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/README.md
#	packages/core/agent-loop/src/loop.ts
#	packages/core/agent/README.md
#	packages/examples/cli-demo/src/cli.ts
#	packages/ui/tui/tests/tui.spec.ts

...

This commit is contained in:

Tianyi Cui

2026-07-21 00:02:17 +08:00

parent 3690c55660 bd1805c637

commit 72f0019c4e

191 changed files with 5505 additions and 728 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

+2 -2

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