Yichen Jiang 904397a7ef Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location ...

# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
#	examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
#	examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
#	examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
#	examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
#	examples/acp-agent/tests/snapshots/permission-switching/session.jsonl
#	examples/acp-agent/tests/snapshots/skill-load/session.jsonl
#	examples/acp-agent/tests/snapshots/text-turn/session.jsonl
#	packages/session-persistence/session-persistence/src/index.ts

2026-07-15 11:12:39 +08:00

..

advanced-toolchain

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

2026-07-15 11:12:39 +08:00

both-mode-turn

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

2026-07-15 11:12:39 +08:00

cancel

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

code-mode-turn

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

2026-07-15 11:12:39 +08:00

config-options

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

error-finish

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

escalation-approved

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

escalation-rejected

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

fs-edit

fix(snapshot): register filesystem tools through explicit overlay

2026-07-14 21:25:58 +08:00

fs-policy-reject

fix(snapshot): register filesystem tools through explicit overlay

2026-07-14 21:25:58 +08:00

fs-read

fix(snapshot): register filesystem tools through explicit overlay

2026-07-14 21:25:58 +08:00

fs-read-window

fix(snapshot): register filesystem tools through explicit overlay

2026-07-14 21:25:58 +08:00

fs-terminal-card

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

fs-write

fix(snapshot): register filesystem tools through explicit overlay

2026-07-14 21:25:58 +08:00

fs-write-overwrite

fix(snapshot): register filesystem tools through explicit overlay

2026-07-14 21:25:58 +08:00

handshake

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-cc-posttool-block

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-cc-posttool-context

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-cc-pretool-ask

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-cc-pretool-deny

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-cc-promptsubmit-block

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-cc-promptsubmit-context

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-cc-stop-continue

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-codex-posttool-block

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-codex-posttool-context

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-codex-pretool-block

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-codex-promptsubmit-block

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-codex-promptsubmit-context

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

hook-codex-stop-continue

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

multi-turn

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

permission-switching

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

2026-07-15 11:12:39 +08:00

reject-extra-dirs

fix review findings: bump session format version + restore late turn-end warn

2026-06-21 11:08:10 +08:00

repeat-tool-guard

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

skill-load

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

2026-07-15 11:12:39 +08:00

subagent-fork

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

subagent-mixed

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

subagent-multi

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

subagent-spawn

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

text-turn

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

2026-07-15 11:12:39 +08:00

todo-plan

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

tool-call-turn

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

workflow-run

docs: align prose with runtime contracts

2026-07-14 16:21:41 +08:00

workspace-edit

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

2026-07-15 11:12:39 +08:00