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/core-data-structures/core.md
#	docs/event-producer-consumer.md
#	packages/core/agent-loop/README.md
#	packages/core/agent-loop/src/agent.ts
#	packages/core/agent/README.md
#	packages/core/agent/src/types.ts
#	packages/ui/acp/src/index.ts
#	packages/ui/tui/src/index.ts
#	packages/ui/tui/tests/harness.ts

...

This commit is contained in:

Tianyi Cui

2026-07-21 12:48:46 +08:00

parent c6e1d35a99 43d50a38b1

commit d6bebc18f8

267 changed files with 13024 additions and 278 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/stdout.expected.jsonl

+1

File diff suppressed because one or more lines are too long