Commit Graph

2340 Commits

Author SHA1 Message Date
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 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
Dudu-0223 6c57e6036d docs(spill): clarify forked spill namespace 2026-07-14 10:40:53 +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
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 be34b9c545 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 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
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 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 a8c0e8a03c test: cover successful ACP cleanup failure 2026-07-14 09:55:15 +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
Tianyi Cui 4b1b9cce3a Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 09:46:31 +08:00
Tianyi Cui 1c8668c406 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 09:46:31 +08:00
Tianyi Cui b7f768598c Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 09:46:31 +08:00
Tianyi Cui 6b59b6050e fix: preserve ACP scenario cleanup failures 2026-07-14 09:43:12 +08:00
Tianyi Cui d706a7035d Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 09:19:55 +08:00
Tianyi Cui bc21f8d2f8 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 09:19:55 +08:00
Tianyi Cui e80582d449 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 09:19:55 +08:00
Tianyi Cui d4c96deac3 refactor: share ACP callback cleanup 2026-07-14 09:19:02 +08:00
Tianyi Cui 9d35517809 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 09:13:57 +08:00
Tianyi Cui 2a787ae84d Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 09:13:57 +08:00
Tianyi Cui 7dfef9df03 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 09:13:57 +08:00
Tianyi Cui e784e4dce5 fix: await ACP client callbacks during shutdown 2026-07-14 09:12:32 +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 088056b182 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 07:58:02 +08:00
Tianyi Cui 7e73d9d841 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 07:58:02 +08:00
Tianyi Cui 47812b45db test: re-record Codex hook snapshot 2026-07-14 07:57:45 +08:00
Tianyi Cui f9c597ece0 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 07:30:01 +08:00
Tianyi Cui 26489351ba Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 07:30:01 +08:00
Tianyi Cui 4e44e9ab6a Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 07:30:00 +08:00
Tianyi Cui 0b492e6e62 fix: drain ACP test launcher streams 2026-07-14 07:22:22 +08:00
Tianyi Cui bee4b5414e Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 07:01:30 +08:00
Tianyi Cui 033d4ec266 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 07:01:30 +08:00
Tianyi Cui 6c8210724b Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 07:01:30 +08:00
Tianyi Cui e2a5a160d3 fix: settle ACP update waiters on shutdown 2026-07-14 07:00:10 +08:00
Tianyi Cui e3865bce25 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 06:41:36 +08:00
Tianyi Cui def127a1b2 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 06:41:36 +08:00
Tianyi Cui a5fc15bdd2 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 06:41:36 +08:00
Tianyi Cui 140d32681e fix: make ACP test teardown failure-safe 2026-07-14 06:33:22 +08:00