Tianyi Cui
a5a0cad46a
Merge branch 'worktree/pr343-retarget-latest-master' into worktree/pr344-retarget-stack
...
# Conflicts:
# scripts/type-equiv.manifest.json
2026-07-23 00:19:53 +08:00
Tianyi Cui
3090708f85
Merge remote-tracking branch 'origin/master' into worktree/pr343-retarget-latest-master
2026-07-23 00:11:23 +08:00
Tianyi Cui
d5d6960184
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/module-graph.md
2026-07-22 23:17:02 +08:00
Tianyi Cui
c701fad75d
docs(i18n): sync session durability translation
2026-07-22 23:02:10 +08:00
Tianyi Cui
b65afd320a
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
...
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
2026-07-22 23:00:05 +08:00
Tianyi Cui
f24664e1d4
Merge latest docs/i18n-batch-core into docs/i18n-batch-cds-postmortem
2026-07-22 22:59:43 +08:00
Tianyi Cui
1085dc7794
Merge latest master into docs/i18n-batch-core
2026-07-22 22:58:34 +08:00
Tianyi Cui
01622abde7
docs(i18n): refresh core data translations after merge
2026-07-22 22:58:05 +08:00
Tianyi Cui
cf5dfe46e7
Merge remote-tracking branch 'origin/rfc/pty' into worktree/pr467-retarget-latest-master
2026-07-22 22:50:55 +08:00
Tianyi Cui
d99094b1ac
Merge updated rfc/pty into feature/persistent-pty-sessions
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.md
# pnpm-lock.yaml
# scripts/gen-cordis-catalog.ts
2026-07-22 22:43:20 +08:00
Tianyi Cui
e962642926
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/examples/acp-demo/README.md
# packages/examples/acp-demo/src/index.ts
# packages/examples/acp-demo/tests/built-bin.e2e.ts
# packages/examples/tui-demo/package.json
# packages/examples/tui-demo/src/index.ts
# packages/examples/tui-demo/tests/tui-agent.spec.ts
2026-07-22 22:38:17 +08:00
Tianyi Cui
b0f5d9e313
Merge commit 'refs/codex-unblock/20260722-pr338-master' into HEAD
...
# Conflicts:
# docs/event-producer-consumer.md
# examples/acp-agent/tests/acp.snapshot.ts
# packages/core/session/src/index.ts
# packages/examples/acp-demo/src/index.ts
# packages/session-persistence/session-persistence-jsonl/src/format.ts
# vitest.config.ts
2026-07-22 22:37:16 +08:00
Tianyi Cui
58a531ebf5
Merge refreshed docs/i18n-batch-core into docs/i18n-batch-cds-postmortem
...
# Conflicts:
# .agents/notes/README.i18n.yaml
# .agents/notes/README.zh.md
# docs/core-data-structures/bash.md
# docs/core-data-structures/code-runtime.md
# docs/core-data-structures/compaction.md
# docs/core-data-structures/scope.md
# docs/core-data-structures/session-query.md
# docs/core-data-structures/user-interaction.md
# docs/core-data-structures/web.md
# docs/rfc/README.md
# scripts/translation-pairing.manifest.json
# scripts/type-equiv.manifest.json
2026-07-22 22:26:24 +08:00
Tianyi Cui
f72db5ac7b
docs(i18n): address core data review
2026-07-22 22:19:12 +08:00
Tianyi Cui
3fd5d5dc2b
docs(i18n): address core translation review
2026-07-22 22:11:02 +08:00
Tianyi Cui
fbb87d5bb9
Merge master into docs/i18n-batch-core
2026-07-22 22:07:05 +08:00
Tianyi Cui
277b65aa8c
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
...
# Conflicts:
# pnpm-lock.yaml
2026-07-22 22:00:00 +08:00
Tianyi Cui
3679b4d829
Merge master into worktree/semantic-session-checkpoints
2026-07-22 21:49:24 +08:00
Tianyi Cui
db21dcfeae
Merge remote-tracking branch 'origin/master' into codex/session-scoped-sandbox-roots
2026-07-22 21:41:53 +08:00
Tianyi Cui
10a55d7a27
Merge remote-tracking branch 'origin/master' into codex/session-scoped-sandbox-roots
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.i18n.yaml
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.md
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.zh.md
# examples/acp-agent/README.md
# packages/examples/agent-spine-demo/package.json
# packages/fs/fs-sandbox/src/index.ts
# packages/fs/tool-fs-search/tests/tools.spec.ts
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/suite.ts
# pnpm-lock.yaml
# scripts/type-equiv.manifest.json
2026-07-22 21:37:30 +08:00
Tianyi Cui
7b803be4ae
Merge branch 'master' into worktree/session-reference
2026-07-22 21:33:21 +08:00
Tianyi Cui
3787bef665
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
...
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/examples/tui-demo/src/index.ts
# packages/examples/tui-demo/tests/tui-agent.spec.ts
# packages/ui/tui/README.md
# packages/ui/tui/package.json
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/tui.spec.ts
# packages/ui/tui/tsconfig.json
# pnpm-lock.yaml
# vitest.config.ts
2026-07-22 21:27:18 +08:00
Tianyi Cui
1167ea71b7
Merge latest master through rfc/pty into feature/persistent-pty-sessions
...
# Conflicts:
# docs/module-graph.md
2026-07-22 21:21:58 +08:00
Tianyi Cui
c848c7b15e
Merge refreshed rfc/pty into feature/persistent-pty-sessions
...
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/module-graph.md
# docs/tool-catalog.md
# examples/acp-agent/tests/acp.snapshot.ts
# examples/headless-agent/tests/headless.snapshot.ts
# examples/package.json
# packages/README.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/tests/gen-tool-catalog.spec.ts
# pnpm-lock.yaml
# pnpm-workspace.yaml
# scripts/gen-tool-catalog.ts
# scripts/type-equiv.manifest.json
# website/.vitepress/config/api-sidebar.json
2026-07-22 21:12:16 +08:00
Tianyi Cui
9c6099fbbd
Merge branch 'master' into worktree/run-all-gates
2026-07-22 21:10:45 +08:00
Tianyi Cui
6613f43178
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/capability-seams.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/goal-snapshots/goal-session/stdout.expected.jsonl
# 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/goal-command-status/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/lsp-definition/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/ui/acp/acp-feature-support.md
# packages/ui/acp/src/index.ts
# packages/ui/acp/tests/harness.ts
# packages/ui/tui/README.md
# scripts/type-equiv.manifest.json
2026-07-22 21:06:50 +08:00
Tianyi Cui
78c2741d3e
Merge remote-tracking branch 'origin/master' into worktree/pr504-retarget-latest-master
...
# Conflicts:
# docs/event-producer-consumer.md
# examples/tui-agent/README.md
# examples/tui-agent/composition.md
# examples/tui-agent/cordis.yml
# examples/tui-agent/tests/snapshots/multi-turn-conversation/terminal.expected.txt
# examples/tui-agent/tests/tui-keyless-smoke.e2e.ts
# packages/ui/tui/README.md
# vitest.config.ts
2026-07-22 20:55:12 +08:00
Tianyi Cui
2478ef7d6d
Merge master into worktree/semantic-session-checkpoints
2026-07-22 20:50:46 +08:00
Tianyi Cui
b44f8539e6
Merge latest master into tui-staging-merge-1
2026-07-22 20:45:24 +08:00
Tianyi Cui
b2b63b5b2e
Merge latest master into check-all recovery
2026-07-22 20:42:28 +08:00
Tianyi Cui
db21840a43
Merge latest master into check-all recovery
2026-07-22 20:34:54 +08:00
kingwl
fd5a76160d
Merge remote-tracking branch 'origin/master' into feat/plan-mode
...
17 master merges (GUI host/web stack, compact header, dshweb, fast local
hooks, windows coverage skips, worktree runtime). Conflicts:
- packages/ui/user-interaction/src/index.ts: master extracted the question
types to types.ts; took the re-export and grafted our detail field (the
plan-review payload) into the extracted AskUserQuestionItem.
- generated catalogs regenerated over both sides.
The module graph crossed mermaid's default 500-edge render guard with the
GUI packages plus our plan-mode edges; raised maxEdges in verify-mermaid
(a secure config settable only at initialize).
Note: the remote branch also renamed packages/mode -> packages/plan
(PR #512 plan-mode-simplification, fast-forwarded before this merge).
2026-07-22 19:42:14 +08:00
kingwl
5eb4297758
Merge remote-tracking branch 'origin/master' into jsonl-packed-chunk-rows
...
Conflict: the generated event-producer-consumer doc — regenerated over merged
sources. Also strips the trailing whitespace / extra EOF blank line that
master's vitest.config.ts and client api.ts arrived with (the pre-commit
whitespace hook rejects any commit touching them otherwise).
2026-07-22 19:38:42 +08:00
Yichen Jiang
5234a40f9c
refactor(llm): classify auxiliary request purpose
2026-07-22 18:59:49 +08:00
Yichen Jiang
f432f25203
fix(llm): sync compact option catalogs
2026-07-22 18:55:21 +08:00
ZiyaZhang
6599acdee8
docs(i18n): add the core.md pair (long-doc lane, v4 pipeline)
2026-07-22 03:40:46 -07:00
Tianyi Cui
fe273bd9dd
refactor: name the all-gates mode check-all
2026-07-22 18:27:31 +08:00
ZiyaZhang
e38955b2fa
docs(i18n): re-translate cds/postmortem batch with the prompt-v4 pipeline
...
22 篇（core-data-structures 18、postmortem 3、rfc/README）译文按
v4 基线重出；机械核对零异常；rfc/README.zh 页内锚点按门禁规则改回
英文侧锚名。
2026-07-22 03:06:01 -07:00
Tianyi Cui
c5d1f5c4ae
Merge branch 'master' into feat/plan-mode
2026-07-22 18:05:28 +08:00
ZiyaZhang
03e25be831
Merge branch 'docs/i18n-batch-core' into docs/i18n-batch-cds-postmortem
2026-07-22 03:04:57 -07:00
ZiyaZhang
1295493878
docs(i18n): re-translate core batch with the prompt-v4 pipeline
...
五篇核心文档译文按 v4 基线（#348）重出：v4 模板+术语表渲染、金标
few-shot 裸文本注入、三段协议取 <final>、切换行流水线后处理；全量
机械核对（结构/切换行/术语禁项/重复括注）零异常，architecture 一处
被模型合并的列表项已按源结构拆回。
2026-07-22 03:04:38 -07:00
Tianyi Cui
197cae8bdd
fix: expose the manual gate set without changing hooks
2026-07-22 18:01:54 +08:00
Tianyi Cui
6d054fd31b
Merge PR #500 head into all-gates recovery
...
# Conflicts:
# package.json
# scripts/run-gates.ts
2026-07-22 17:56:29 +08:00
Tianyi Cui
d38b27ef65
docs(core): remove stale mode option contract
2026-07-22 17:45:58 +08:00
Tianyi Cui
2405570ac8
chore: restore opt-in all-gates command
2026-07-22 17:42:23 +08:00
imccyu
ae44063a51
Merge remote-tracking branch 'origin/master' into worktree-dshweb
2026-07-22 17:35:49 +08:00
Yichen Jiang
da8c0ab092
fix(session-reference): bind snapshots to prompts
2026-07-22 17:34:31 +08:00
Tianyi Cui
ec533d0a77
Merge latest master into tui-staging-merge-1
2026-07-22 17:25:35 +08:00
Tianyi Cui
f4185122dc
refactor(plan): remove generic mode abstraction
2026-07-22 16:57:23 +08:00
Tianyi Cui
31c0589439
chore: keep local git hooks fast
2026-07-22 16:37:20 +08:00
Tianyi Cui
kingwl
Yichen Jiang
ZiyaZhang
imccyu