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

..

approval.md

refactor: unify agent and session identity

2026-07-14 01:59:21 +08:00

bash.md

Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location

2026-07-17 18:39:05 +08:00

code-runtime.md

refactor: prune code runtime surface

2026-07-14 03:07:41 +08:00

compaction.md

Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface

2026-07-18 12:07:34 +08:00

core.md

Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id

2026-07-18 12:21:15 +08:00

filesystem.md

Merge remote-tracking branch 'origin/master' into codex/project-instruction-files

2026-07-14 19:50:25 +08:00

llm-streaming.md

feat(acp): advertise and switch llm models

2026-07-15 13:33:42 +08:00

persistence.md

Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location

2026-07-13 16:18:44 +08:00

sandbox.md

fix(review): reconcile sandbox and approval contracts

2026-07-11 21:37:38 +08:00

scope.md

docs(rfc): align scoped runtime contracts

2026-07-12 22:49:46 +08:00

session-query.md

Unify session surface validation

2026-07-14 13:49:36 +08:00

session.md

Merge newest origin/master into token-meter-service

2026-07-17 22:49:54 +08:00

skills.md

docs: tighten prose audit after master retarget

2026-07-13 16:24:32 +08:00

spill.md

docs(spill): clarify forked spill namespace

2026-07-14 10:40:53 +08:00

subagent.md

Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue

2026-07-14 18:55:51 +08:00

system-prompt.md

refactor(core): remove owner-final assembly machinery

2026-07-13 13:09:41 +08:00

tasks.md

fix(tasks): address task API review feedback

2026-07-15 21:45:30 +08:00

token-meter.md

fix(token-meter): keep pressure anchors conservative

2026-07-16 15:26:30 +08:00

tools.md

Merge current master into PR #106

2026-07-15 22:44:47 +08:00

user-interaction.md

refactor: relocate demo app bundles to packages/examples/*-demo

2026-07-15 16:46:05 +08:00

web.md

Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields

2026-07-14 17:57:50 +08:00

workflow.md

workflow: meta rides the seam as data — the engine never evaluates it

2026-07-09 20:09:10 +08:00