3 Commits

Author	SHA1	Message	Date
Tianyi Cui	35473c2701	Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue ... # Conflicts: # AGENTS.md # docs/config-catalog.md # docs/event-producer-consumer.md # examples/acp-agent/tests/snapshots/advanced-toolchain/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/both-mode-turn/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/cancel/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/code-mode-turn/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/config-options/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/error-finish/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl # examples/acp-agent/tests/snapshots/escalation-approved/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl # examples/acp-agent/tests/snapshots/escalation-rejected/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/fs-edit/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/fs-policy-reject/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/fs-read-window/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/fs-read/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/fs-terminal-card/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/fs-write-overwrite/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/fs-write/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/handshake/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-cc-posttool-block/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-cc-posttool-context/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl # examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-block/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-cc-stop-continue/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-codex-posttool-block/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-codex-posttool-context/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-codex-pretool-block/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-block/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/hook-codex-stop-continue/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/multi-turn/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/permission-switching/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/repeat-tool-guard/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/skill-load/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/subagent-fork/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/subagent-mixed/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/subagent-multi/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/subagent-spawn/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/text-turn/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/todo-plan/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/tool-call-turn/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/workflow-run/stdout.golden.jsonl # examples/acp-agent/tests/snapshots/workspace-edit/stdout.golden.jsonl # packages/ui/acp/README.md # packages/ui/acp/src/index.ts # packages/ui/jsonrpc/README.md # packages/ui/jsonrpc/src/server.ts	2026-07-18 12:25:33 +08:00
Yichen Jiang	ee111fd978	Merge remote-tracking branch 'origin/master' into codex/project-instruction-files ... # Conflicts: # AGENTS.md # docs/config-catalog.md # docs/cordis-catalog/events.md # docs/cordis-catalog/services.md # docs/core-data-structures/core.md # docs/event-producer-consumer.md # docs/persistence-catalog.md # docs/rfc/implemented/architecture/2026-07-05-reconstructable-requests.md # docs/rfc/implemented/feature/2026-06-15-code-mode.md # docs/rfc/implemented/feature/2026-06-30-hook-bridges.md # docs/rfc/implemented/feature/2026-06-30-interception-seams.md # docs/rfc/implemented/feature/2026-07-08-repeat-tool-guard.md # docs/rfc/proposed/simplification/2026-07-04-prune-dead-core-spine-surface.md # examples/AGENTS.md # examples/acp-agent/cordis.yml # examples/acp-agent/tests/acp.snapshot.ts # examples/echo-agent/cordis.yml # examples/sandbox-acp-agent/cordis.yml # packages/cordis/tool-cordis/src/api-catalog.ts # packages/core/agent-core/README.md # packages/core/agent-core/src/index.ts # packages/core/agent-loop/README.md # packages/core/agent-loop/src/loop.ts # packages/core/agent-loop/tests/interception.spec.ts # packages/core/agent/src/types.ts # packages/core/tools/README.md # packages/core/tools/src/code-mode.ts # packages/core/tools/src/index.ts # packages/fs/fs-local/src/index.ts # packages/fs/fs/README.md # packages/fs/fs/src/index.ts # packages/guard/repeat-tool-guard/README.md # packages/guard/repeat-tool-guard/src/index.ts # packages/hooks/hooks-claude/src/index.ts # packages/hooks/hooks-codex/src/index.ts # packages/ui/acp-agent/src/index.ts	2026-07-14 19:50:25 +08:00
Yichen Jiang	768c79fd45	Fix Code Mode workspace context propagation	2026-07-13 13:56:45 +08:00