Tianyi Cui
3ba92e70ad
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
2026-07-14 12:12:48 +08:00
Tianyi Cui
e218e36e88
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 12:12:40 +08:00
Tianyi Cui
bbeeaed43c
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-14 12:12:40 +08:00
Tianyi Cui
fa9f8a794c
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
2026-07-14 12:12:39 +08:00
Tianyi Cui
75caa2490f
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
2026-07-14 12:12:28 +08:00
Tianyi Cui
414f696a74
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
2026-07-14 11:58:31 +08:00
Tianyi Cui
7e58e9a35b
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
2026-07-14 11:57:51 +08:00
Tianyi Cui
4cdbe564d8
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
...
# Conflicts:
# docs/config-catalog.md
2026-07-14 11:56:35 +08:00
Tianyi Cui
9272d2871b
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
2026-07-14 11:56:09 +08:00
Ziya
53556f9712
Merge remote-tracking branch 'upstream/master' into docs/i18n-capability
2026-07-13 20:51:12 -07:00
Tianyi Cui
4d5fb2cb1d
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
...
# Conflicts:
# docs/core-data-structures/session.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
# examples/sandbox-acp-agent/tests/acp.snapshot.ts
# examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
# packages/core/session/README.md
# packages/core/session/src/index.ts
# packages/core/session/src/surface.ts
# packages/core/session/tests/surface.spec.ts
# scripts/type-equiv.manifest.json
2026-07-14 11:49:46 +08:00
Ziya
1d288f1bca
docs(i18n): address ds-review-bot round-2 — switcher placeholders, regex anchor, contract completeness
...
新增 {{source_filename}}/{{source_filename_zh}} 占位符：切换行指令
可执行化，新配对（源文件尚无切换行）也必须生成（critical）。加粗
后空格规则限定于拉丁字母/数字，不再与全角标点规则冲突。日期匹配
锚定 basename 开头，release-notes-2026-* 类文件不再误判。金标
development.zh 补回 RFC 指引句与 agent 首现括注、pre-push 描述改
为 check:pre-push 调度器实况。术语表补回单文件可执行 RFC 配对在用
的 5 行（VFS/deploy root/peer dependency/serving surface/wheel）。
双语 README 的门禁清单补第 4 条（日期分界强制配对）。
2026-07-13 20:37:21 -07:00
Tianyi Cui
3746c37882
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-14 11:35:29 +08:00
Tianyi Cui
7d6ef0a472
fix: contain config failure observers
2026-07-14 11:33:36 +08:00
Tianyi Cui
a50e8bc1f3
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
...
# Conflicts:
# packages/bash/bash-sandbox/README.md
# packages/sandbox/sandbox-local/README.md
2026-07-14 11:28:08 +08:00
Tianyi Cui
c74f17a143
docs: audit hook compatibility limits
2026-07-14 11:22:53 +08:00
Hypatia May
d9714fb30b
Merge remote-tracking branch 'origin/master' into session-query-trace
2026-07-14 11:16:15 +08:00
Dudu-0223
8ab39267f3
Merge remote-tracking branch 'origin/master' into codex/truncated-design
...
# Conflicts:
# docs/rfc/INDEX.md
2026-07-14 11:06:41 +08:00
Dudu-0223
30ba5bd23c
Merge remote-tracking branch 'origin/master' into codex/truncated-design
...
# Conflicts:
# docs/config-catalog.md
# docs/rfc/INDEX.md
# examples/acp-agent/README.md
# packages/bash/tool-bash/tests/tools.spec.ts
2026-07-14 10:57:29 +08:00
Tianyi Cui
8780a73750
Merge branch 'master' into session-query
2026-07-14 10:53:25 +08:00
kingwl
85a2140781
Merge origin/master (single-exe pipeline #253 , duplication lint #281 , side-sessions RFC)
...
Beyond line merges: python/sdk-runtime's deploy manifest gains
@deepseek-ai/dsh-mode — the single-exe closure gate
(verify-runtime-closure) requires every workspace peer of dsh-acp, and
the bridge's type-only peer edge on dsh-mode counts; the AGENTS.md
efficiency section is condensed to fit the 1820-word ceiling after
master's single-exe additions. Catalogs and graphs regenerated.
2026-07-14 10:46:09 +08:00
Ziya
472fbb992b
Merge remote-tracking branch 'upstream/master' into docs/i18n-capability
...
# Conflicts:
# docs/i18n/README.i18n.yaml
# docs/i18n/terminology.md
# scripts/translation-pairing.manifest.json
2026-07-13 19:31:51 -07:00
Hypatia May
3b48adeabf
Merge remote-tracking branch 'origin/master' into session-query-trace-filter
...
# Conflicts:
# docs/rfc/INDEX.md
# packages/README.md
2026-07-14 10:14:57 +08:00
Ziya
bbb3955565
docs(i18n): classifier rule in the prompt; absorb PR #275 terminology rows
...
prompt 增补量词规则（数词修饰名词必须带量词：three-package seam→
由三个 package 构成的 seam），来自 jingtingxiang 对 v4-pro/GPT-5.4/
Opus-4.6 对照测试的质量评审。按 #275 收录三行术语：Cookbook→实操
手册（文档标题用语）、task id 保留英文（禁「任务 id」）、companion
tool→配套工具。#275 内容自此全部涵盖。
2026-07-13 19:14:10 -07:00
Yichen Jiang
cb78634bf2
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
...
# Conflicts:
# docs/event-producer-consumer.md
# packages/bash/tool-bash/tests/tools.spec.ts
2026-07-14 09:59:21 +08:00
Yichen Jiang
f570d2201e
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
...
# Conflicts:
# docs/config-catalog.md
# packages/hooks/hooks-codex/src/index.ts
# packages/ui/acp-agent/src/index.ts
# packages/ui/stdio-agent/src/index.ts
2026-07-14 09:51:50 +08:00
Yichen Jiang
03eab08797
Merge remote-tracking branch 'origin/master' into worktree/docs-website
...
# Conflicts:
# package.json
# pnpm-lock.yaml
# pnpm-workspace.yaml
# scripts/verify-md-wrap.ts
2026-07-14 09:50:42 +08:00
Tianyi Cui
c6cb9f4210
fix: share scope carrier across built JSON-RPC
2026-07-14 08:56:27 +08:00
Hypatia May
e9f0c37745
Merge remote-tracking branch 'origin/master' into session-query
...
# Conflicts:
# docs/rfc/INDEX.md
# packages/README.md
2026-07-14 08:36:06 +08:00
Tianyi Cui
3ab35de64f
refactor: prune unused web seam fields
2026-07-14 04:17:38 +08:00
Tianyi Cui
4f40197e16
fix: complete code runtime surface pruning
2026-07-14 03:18:16 +08:00
Tianyi Cui
01da49a3ab
refactor: prune code runtime surface
2026-07-14 03:07:41 +08:00
Tianyi Cui
c378dbf36a
Merge remote-tracking branch 'origin/master' into unify-acp-example
2026-07-14 01:11:37 +08:00
Tianyi Cui
e3d7bb62d8
fix(permission): address human review feedback
2026-07-14 01:09:44 +08:00
Tianyi Cui
b35d66b86d
fix: reject legacy session events on every path
2026-07-14 00:59:25 +08:00
Tianyi Cui
cdc3522e48
Merge remote-tracking branch 'origin/master' into unify-acp-example
...
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# pnpm-lock.yaml
2026-07-14 00:56:28 +08:00
Tianyi Cui
461c0c598c
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
2026-07-14 00:54:55 +08:00
Tianyi Cui
d11b713e0a
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# docs/config-catalog.md
# scripts/gen-persistence-catalog.ts
# scripts/jsdoc.ts
# scripts/verify-md-wrap.ts
# scripts/verify-package-paths.ts
2026-07-14 00:47:30 +08:00
Tianyi Cui
972e7cc77d
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/feature/2026-07-05-dynamic-workflows.md
# examples/acp-agent/tests/acp.snapshot.ts
# packages/code-runtime/code-runtime-worker/tests/built-lib.e2e.ts
# packages/code-runtime/code-runtime-worker/tsdown.config.ts
2026-07-14 00:40:36 +08:00
Tianyi Cui
95065330d7
chore: share README gate Markdown scanning
2026-07-14 00:39:48 +08:00
Tianyi Cui
3a1332e3f0
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
2026-07-14 00:36:28 +08:00
Tianyi Cui
788fb48d4c
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-14 00:34:46 +08:00
Tianyi Cui
4d9f771f94
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
...
# Conflicts:
# package.json
# packages/code-runtime/code-runtime-worker/README.md
# packages/workflow/tool-workflow/README.md
2026-07-14 00:34:25 +08:00
Tianyi Cui
53d9634043
chore: tighten TypeScript duplication lint
2026-07-14 00:24:04 +08:00
Tianyi Cui
eed43abe66
docs: address final model experience review
2026-07-14 00:22:52 +08:00
Tianyi Cui
274db4966a
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# packages/ui/acp/tests/stream-update.spec.ts
2026-07-14 00:08:53 +08:00
Tianyi Cui
8d5422606d
Merge branch 'master' into worktree-singleexe
2026-07-14 00:07:22 +08:00
Tianyi Cui
1123e946c0
refactor: simplify session log representation
2026-07-13 23:56:10 +08:00
lintianle
2850b42654
Merge remote-tracking branch 'origin/master' into feat/mcp-client
2026-07-13 23:48:11 +08:00
Tianyi Cui
661504b3ec
chore: gate TypeScript duplication in CI
2026-07-13 23:42:54 +08:00
Tianyi Cui
Ziya
Hypatia May
Dudu-0223
kingwl
Yichen Jiang
lintianle