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
b1f1d611e1
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 10:15:54 +08:00
Tianyi Cui
50d96689ac
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 10:15:54 +08:00
Tianyi Cui
9bf4ea6b7d
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 10:15:54 +08:00
Tianyi Cui
e87204314e
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-14 10:15:54 +08:00
Tianyi Cui
e1bfa47962
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-14 10:15:53 +08:00
Tianyi Cui
eeb86a2fca
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-14 10:15:53 +08: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
Tianyi Cui
3e2ba3f557
fix: stop ACP teardown when fallback kill fails
2026-07-14 10:13:05 +08:00
Tianyi Cui
7515e8eec0
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 10:06:29 +08:00
Tianyi Cui
df955c4cc5
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 10:06:29 +08:00
Tianyi Cui
db3e97fc17
test: create built probe child in parent scope
2026-07-14 10:05:19 +08:00
Tianyi Cui
5c5aedf869
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 10:01:45 +08:00
Tianyi Cui
0e97d4e13b
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 10:01:45 +08:00
Tianyi Cui
00462f80a6
docs: expose agent ownership in Cordis catalog
2026-07-14 10:01:36 +08: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
Tianyi Cui
bd8b31e4e7
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 09:59:05 +08:00
Tianyi Cui
b0533e7ecd
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/cordis-catalog/services.md
2026-07-14 09:58:59 +08:00
Tianyi Cui
ffe64f582c
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 09:58:46 +08:00
Tianyi Cui
2dca8e2151
docs: refresh agent loop catalog location
2026-07-14 09:58:35 +08:00
Tianyi Cui
452c7aa5ff
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 09:56:18 +08:00
Tianyi Cui
1c2e2680db
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# packages/core/agent-loop/README.md
2026-07-14 09:55:54 +08:00
Tianyi Cui
772d7c74e0
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 09:55:32 +08:00
Yichen Jiang
1951eb5463
fix(runtime): include dsh-home in bundled closure
2026-07-14 09:55:31 +08:00
Tianyi Cui
f2664e91de
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-14 09:55:31 +08:00
Tianyi Cui
a98a0696f2
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-14 09:55:31 +08:00
Tianyi Cui
0a2667b7ca
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-14 09:55:31 +08:00
Tianyi Cui
17e7649b49
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-14 09:55:31 +08:00
Tianyi Cui
a8c0e8a03c
test: cover successful ACP cleanup failure
2026-07-14 09:55:15 +08:00
Tianyi Cui
6b782b0189
fix: bind stdio to its exact fresh identity
2026-07-14 09:54:34 +08:00
Yichen Jiang
415907a162
test(acp): sync advanced snapshot with bash environment hint
2026-07-14 09:54:00 +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