Tianyi Cui
|
8c6ba1736f
|
Merge remote-tracking branch 'origin/master' into codex/pr239-parent-retarget-publish
# Conflicts:
# docs/cookbook/extension-cookbook.i18n.yaml
# examples/acp-agent/tests/acp.snapshot.ts
# examples/acp-agent/tests/snapshots/advanced-toolchain/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/bash-spill/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/config-options/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-policy-reject/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read-window/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-terminal-card/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write-overwrite/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/handshake/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-pretool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/model-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/multi-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/parallel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/repeat-tool-guard/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/skill-load/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/text-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/todo-plan/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/tool-call-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-edit/stdout.expected.jsonl
|
2026-07-21 00:54:51 +08:00 |
|
Tianyi Cui
|
962c43aa9e
|
Merge remote-tracking branch 'origin/master' into codex/pr239-parent-retarget-publish
# Conflicts:
# docs/capability-seams.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/bash-spill/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/config-options/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-policy-reject/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read-window/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-terminal-card/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write-overwrite/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/handshake/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-pretool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/model-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/multi-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/parallel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/repeat-tool-guard/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/skill-load/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/text-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/todo-plan/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/tool-call-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-edit/stdout.expected.jsonl
# packages/core/tools/tests/gen-tool-catalog.spec.ts
# packages/ui/acp/acp-feature-support.md
# packages/ui/acp/src/index.ts
# scripts/gen-doc-graphs.ts
|
2026-07-21 00:50:00 +08:00 |
|
Tianyi Cui
|
c3f4332b8d
|
refactor(examples): fold plan mode into ACP demo
|
2026-07-21 00:40:15 +08:00 |
|
Tianyi Cui
|
0022979e4c
|
Merge remote-tracking branch 'origin/master' into codex/pr239-parent-retarget-publish
# Conflicts:
# docs/architecture.md
|
2026-07-21 00:32:01 +08:00 |
|
Tianyi Cui
|
28a74d6d7e
|
fix(mode): finish master retarget integration
|
2026-07-20 23:32:37 +08:00 |
|
Tianyi Cui
|
0246806fec
|
Merge origin/master into feat/plan-mode
|
2026-07-20 23:28:07 +08:00 |
|
Tianyi Cui
|
a9a9d40cb1
|
Merge branch 'codex/commands' into codex/goal-commands
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# packages/examples/acp-demo/README.md
# packages/examples/acp-demo/src/index.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/src/index.ts
|
2026-07-20 23:10:33 +08:00 |
|
Tianyi Cui
|
22fa51845e
|
Merge branch 'codex/goal-session' into codex/commands
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# packages/ui/acp/README.md
# packages/ui/tui/README.md
|
2026-07-20 23:03:55 +08:00 |
|
Tianyi Cui
|
f98f0e9838
|
Merge branch 'codex/goal-tools' into codex/goal-session
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/README.md
# packages/core/agent/README.md
|
2026-07-20 22:57:14 +08:00 |
|
Tianyi Cui
|
ea530241d8
|
Merge branch 'codex/goal-domain' into codex/goal-tools
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
|
2026-07-20 22:50:36 +08:00 |
|
Tianyi Cui
|
076e46ebc0
|
Merge branch 'rfc/loop' into codex/goal-domain
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
|
2026-07-20 22:46:26 +08:00 |
|
Tianyi Cui
|
5c301febbf
|
Merge branch 'codex/commands' into codex/goal-commands
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/module-graph.md
# packages/examples/README.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
|
2026-07-20 22:18:20 +08:00 |
|
Tianyi Cui
|
78472196c8
|
Merge branch 'codex/goal-session' into codex/commands
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/module-graph.md
# knip.json
# packages/examples/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/tui-demo/package.json
# packages/ui/README.md
# packages/ui/tui/src/index.ts
|
2026-07-20 22:05:51 +08:00 |
|
Tianyi Cui
|
40f7195266
|
Merge latest master into codex/llm-error-recovery-rfc
|
2026-07-20 21:59:47 +08:00 |
|
Tianyi Cui
|
41196b7e4f
|
Merge branch 'codex/goal-tools' into codex/goal-session
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-20 21:55:13 +08:00 |
|
Tianyi Cui
|
9d0a75b154
|
Merge branch 'codex/goal-domain' into codex/goal-tools
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-20 21:44:06 +08:00 |
|
Tianyi Cui
|
11afddf61d
|
Merge branch 'rfc/loop' into codex/goal-domain
# Conflicts:
# docs/event-producer-consumer.md
# knip.json
|
2026-07-20 21:37:04 +08:00 |
|
Tianyi Cui
|
29729f83cf
|
Test the TUI through ConPTY on Windows
|
2026-07-20 20:59:22 +08:00 |
|
Tianyi Cui
|
8c12f8945e
|
Merge latest master into codex/llm-error-recovery-rfc
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/persistence-catalog.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent/src/types.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/llm/llm-deepseek/README.md
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-deepseek/tests/adapter.spec.ts
# packages/llm/llm/README.md
# packages/llm/llm/src/error.ts
# packages/llm/llm/tests/service.spec.ts
# packages/sandbox/sandbox-policy/tsconfig.json
# packages/ui/stdio/README.md
# packages/ui/stdio/src/index.ts
# packages/ui/stdio/tests/stdio.spec.ts
# packages/ui/tui/src/index.ts
# pnpm-lock.yaml
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/llm.md
|
2026-07-20 20:59:11 +08:00 |
|
Tianyi Cui
|
d121f87def
|
Merge branch 'codex/commands' into codex/goal-commands
# Conflicts:
# .agents/notes/implemented/feature/2026-06-30-interception-seams.md
# docs/core-data-structures/core.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/both-mode-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/model-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/permission-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/skill-load/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/text-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/workspace-edit/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/workspace-edit/tool-schemas.expected.json
|
2026-07-20 20:55:50 +08:00 |
|
Tianyi Cui
|
9ef673a5a3
|
test(commands): cover current ACP scenarios
|
2026-07-20 20:47:24 +08:00 |
|
Tianyi Cui
|
dfc401a66a
|
Merge branch 'codex/goal-session' into codex/commands
# Conflicts:
# docs/event-producer-consumer.md
# website/.vitepress/config/api-sidebar.json
# website/zh-CN/api/harness/events.md
|
2026-07-20 20:43:02 +08:00 |
|
Tianyi Cui
|
b5d112a251
|
Skip TUI PTY smoke on Windows
|
2026-07-20 20:40:44 +08:00 |
|
Tianyi Cui
|
eb5ae54a79
|
Merge branch 'codex/goal-tools' into codex/goal-session
# Conflicts:
# .agents/notes/implemented/feature/2026-07-19-persisted-same-session-goal-domain.i18n.yaml
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/package.json
# packages/core/agent/README.md
# packages/core/agent/src/types.ts
# website/zh-CN/api/harness/events.md
|
2026-07-20 20:35:15 +08:00 |
|
Tianyi Cui
|
3e3f9a911d
|
Merge branch 'codex/goal-domain' into codex/goal-tools
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/core/agent/README.md
# website/zh-CN/api/harness/events.md
|
2026-07-20 20:21:01 +08:00 |
|
Tianyi Cui
|
e5ac87454b
|
Merge remote-tracking branch 'origin/master' into codex/remove-stdio-agent
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# examples/echo-agent/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/built-bin.e2e.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# scripts/run-gates.ts
|
2026-07-20 20:20:21 +08:00 |
|
Tianyi Cui
|
44ad2ef073
|
Remove the Echo agent
|
2026-07-20 20:16:41 +08:00 |
|
Tianyi Cui
|
6cf681df4b
|
Merge branch 'rfc/loop' into codex/goal-domain
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/glossary.md
# docs/module-graph.md
# examples/package.json
# pnpm-lock.yaml
# website/.vitepress/config/api-sidebar.json
# website/zh-CN/api/harness/events.md
|
2026-07-20 20:06:23 +08:00 |
|
Tianyi Cui
|
153e4b47bd
|
Merge branch 'master' into codex/jsonl-zstd-persistence
|
2026-07-20 19:58:41 +08:00 |
|
Tianyi Cui
|
2191d45ece
|
Merge origin/master into codex/remove-stdio-agent
# Conflicts:
# examples/repl-agent/cordis.yml
|
2026-07-20 19:58:40 +08:00 |
|
Tianyi Cui
|
82ce9dfe0e
|
Merge branch 'master' into codex/jsonl-zstd-persistence
|
2026-07-20 19:52:47 +08:00 |
|
Tianyi Cui
|
4cadf096ce
|
Remove the stdio agent
|
2026-07-20 19:26:04 +08:00 |
|
Tianyi Cui
|
283c78eec8
|
test(goal): refresh shipped ACP goal snapshots
|
2026-07-20 18:06:34 +08:00 |
|
Tianyi Cui
|
08b37399d1
|
Merge command and goal feedback fixes into goal commands
# Conflicts:
# .agents/notes/implemented/feature/2026-07-19-model-facing-goal-tools.i18n.yaml
# docs/glossary.md
|
2026-07-20 18:04:03 +08:00 |
|
Tianyi Cui
|
75e98d6974
|
test(acp): drop obsolete transcript rerecordings
|
2026-07-20 18:02:38 +08:00 |
|
Tianyi Cui
|
d5638ee8e1
|
Merge remote-tracking branch 'origin/master' into fix/subagent-depth-budget
# Conflicts:
# website/zh-CN/api/harness/agents.md
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/sessions.md
# website/zh-CN/api/harness/subagents.md
|
2026-07-20 18:00:40 +08:00 |
|
Tianyi Cui
|
41d3e78d3a
|
test(snapshots): require explicit delegation depth
|
2026-07-20 17:59:13 +08:00 |
|
Tianyi Cui
|
46d60d6d90
|
fix(tool-subagent): enforce depth only at runtime
|
2026-07-20 17:58:57 +08:00 |
|
Tianyi Cui
|
78560dbc91
|
test(commands): refresh ACP goal lifecycle snapshot
|
2026-07-20 17:52:21 +08:00 |
|
Tianyi Cui
|
bbdd92ebc1
|
Merge goal-session snapshot fixes into commands
|
2026-07-20 17:46:05 +08:00 |
|
Tianyi Cui
|
4e74794236
|
test(goal): isolate the ACP lifecycle snapshot
|
2026-07-20 17:44:57 +08:00 |
|
Tianyi Cui
|
a87d3e7e55
|
Merge branch 'codex/goal-session' into codex/commands
|
2026-07-20 17:24:39 +08:00 |
|
Tianyi Cui
|
51f8bef112
|
Merge remote-tracking branch 'origin/master' into fix/subagent-depth-budget
|
2026-07-20 17:24:09 +08:00 |
|
Tianyi Cui
|
77ab5516a9
|
Merge goal tool fixes and align same-session blockers
|
2026-07-20 17:23:55 +08:00 |
|
Tianyi Cui
|
60ecdbc88b
|
Merge remote-tracking branch 'origin/master' into codex/pr353-retarget-master-20260719
|
2026-07-20 17:23:17 +08:00 |
|
Tianyi Cui
|
2d345b5882
|
Merge remote-tracking branch 'origin/master' into fix/subagent-depth-budget
# Conflicts:
# docs/cordis-catalog/services.md
# docs/persistence-catalog.md
# website/zh-CN/api/harness/sessions.md
|
2026-07-20 17:14:24 +08:00 |
|
Tianyi Cui
|
1a1ff56ab7
|
fix(tool-subagent): default maxDepth to 3
|
2026-07-20 17:12:14 +08:00 |
|
Tianyi Cui
|
44345feaf7
|
Merge origin/master into worktree/acp-default-fs-suite
|
2026-07-20 17:10:28 +08:00 |
|
Tianyi Cui
|
9f5b01d446
|
Merge origin/master into worktree/acp-default-fs-suite
|
2026-07-20 17:03:33 +08:00 |
|
Tianyi Cui
|
27f37942df
|
Merge remote-tracking branch 'origin/master' into fix/subagent-depth-budget
|
2026-07-20 17:02:25 +08:00 |
|