Tianyi Cui
99d2d5a092
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-14 11:53:55 +08:00
Tianyi Cui
795371a209
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
...
# Conflicts:
# examples/acp-agent/tests/acp.e2e.ts
# examples/acp-agent/tests/escalation.e2e.ts
# examples/acp-agent/tests/hooks.e2e.ts
# packages/support/acp-snapshot/src/harness.ts
2026-07-14 11:53:45 +08:00
Ziya
53556f9712
Merge remote-tracking branch 'upstream/master' into docs/i18n-capability
2026-07-13 20:51:12 -07:00
Tianyi Cui
fd5ee06a97
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-14 11:49:56 +08: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
Tianyi Cui
34fe20962f
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
...
# Conflicts:
# packages/core/session/src/surface.ts
2026-07-14 11:39:11 +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
6ec1c6ee5d
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 11:35:59 +08:00
Tianyi Cui
545c7d57d3
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-14 11:35:51 +08: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
b2031dd6b2
docs: keep package index within budget
2026-07-14 11:32:17 +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
1b41675036
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 11:27:42 +08:00
Tianyi Cui
54bd21cf58
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
2026-07-14 11:27:35 +08:00
Tianyi Cui
0d24cb14cb
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-14 11:27:12 +08:00
Tianyi Cui
c1fb97c63a
fix: surface config startup failures
2026-07-14 11:23:38 +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
Tianyi Cui
8ee8c7e5ee
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 11:04:32 +08:00
Tianyi Cui
cce3df55a9
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-14 11:04:12 +08:00
Tianyi Cui
63936dd884
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 11:03:48 +08:00
Dudu-0223
b69129601e
test: satisfy post-merge push gates
2026-07-14 11:02:49 +08:00
Tianyi Cui
e8f1bd41f5
fix: buffer stdio until exact session starts
2026-07-14 11:02:18 +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
c3137b5474
Merge pull request #250 from deepseek-harness/session-query
...
Session query exact-read service (phase 1)
2026-07-14 10:55:27 +08:00
Tianyi Cui
8d9d6e0eca
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 10:54:35 +08:00
Tianyi Cui
7d30906ee4
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
2026-07-14 10:54:25 +08:00
Tianyi Cui
8780a73750
Merge branch 'master' into session-query
2026-07-14 10:53:25 +08:00
Tianyi Cui
93b26de52f
Merge pull request #261 from deepseek-harness/unify-acp-example
...
feat(permission): one ACP example, one user-facing Permissions select
2026-07-14 10:52:07 +08:00
Tianyi Cui
288023dac1
docs: define local subagent lineage
2026-07-14 10:51:36 +08:00
Tianyi Cui
783074aa4c
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 10:51:00 +08:00
Tianyi Cui
46b8bce03a
fix: join exact session startup on teardown
2026-07-14 10:49:15 +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
Dudu-0223
6c57e6036d
docs(spill): clarify forked spill namespace
2026-07-14 10:40:53 +08:00
Tianyi Cui
547892b9d9
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 10:40:33 +08:00
Tianyi Cui
03d3e006b3
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 10:40:33 +08:00
Tianyi Cui
3659c8a11f
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 10:40:33 +08:00
Tianyi Cui
949ee03377
test: cover exact session restore failure
2026-07-14 10:38:53 +08:00
Tianyi Cui
a52d85b3d7
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 10:35:30 +08:00
Tianyi Cui
0c19d69507
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# packages/core/agent-loop/README.md
2026-07-14 10:35:15 +08:00
Ziya
7756ed0869
docs(i18n): re-record README pair after master merge
2026-07-13 19:34:30 -07:00
Tianyi Cui
cf21e252fa
fix: recognize provider-owned local subagents
2026-07-14 10:32:02 +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
Tianyi Cui
e150806171
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 10:30:04 +08:00
Hypatia May
70ca37c859
Merge remote-tracking branch 'origin/session-query' into session-query-trace-filter
...
# Conflicts:
# packages/README.md
2026-07-14 10:29:18 +08:00
Tianyi Cui
656ae95263
test: await exact stdio startup condition
2026-07-14 10:28:04 +08:00
Tianyi Cui
816b6e4c68
fix: restore exact config sessions on loop reload
2026-07-14 10:25:49 +08:00
Tianyi Cui
be34b9c545
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-14 10:15:54 +08:00
Tianyi Cui
Ziya
Hypatia May
Dudu-0223
kingwl