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
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
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
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
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
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
Tianyi Cui
816b6e4c68
fix: restore exact config sessions on loop reload
2026-07-14 10:25:49 +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
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
Tianyi Cui
6b782b0189
fix: bind stdio to its exact fresh identity
2026-07-14 09:54:34 +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
c4c6b1c92d
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 09:46:32 +08:00
Tianyi Cui
558bc36cd9
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 09:46:32 +08:00
Tianyi Cui
2333ab19e3
fix: verify JSON-RPC child ownership
2026-07-14 09:46:05 +08:00
Tianyi Cui
462746029b
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 08:57:54 +08:00
Tianyi Cui
0d724b455e
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 08:57:53 +08:00
Tianyi Cui
151d6387e0
docs: refresh module dependency graph
2026-07-14 08:57:46 +08:00
Tianyi Cui
17debd5049
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 08:56:35 +08:00
Tianyi Cui
da458d496f
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 08:56:35 +08:00
Tianyi Cui
c6cb9f4210
fix: share scope carrier across built JSON-RPC
2026-07-14 08:56:27 +08:00
Tianyi Cui
39c6c1120a
Revert "fix: share scope carrier across built JSON-RPC"
...
This reverts commit 835fd3ca4f46e0c6464098e3d0864dc56f31398d.
2026-07-14 08:56:21 +08:00
Tianyi Cui
d33a819d15
fix: share scope carrier across built JSON-RPC
2026-07-14 08:55:38 +08:00