Commit Graph

1903 Commits

Author SHA1 Message Date
Tianyi Cui
d3d5b66d08 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 23:22:44 +08:00
Tianyi Cui
7db59c27c4 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 23:22:43 +08:00
Tianyi Cui
4c461f86a3 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 23:22:43 +08:00
Tianyi Cui
10fd0b4504 docs: align unified identity translation 2026-07-14 23:22:37 +08:00
Tianyi Cui
22289065f8 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 23:19:59 +08:00
Tianyi Cui
18a643f543 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 23:19:58 +08:00
Tianyi Cui
9ed59df02b Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 23:19:52 +08:00
Tianyi Cui
b656bef59a Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/module-graph.md
2026-07-14 23:19:41 +08:00
Tianyi Cui
20f2f24d72 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 23:19:05 +08:00
Tianyi Cui
474e721028 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 23:19:05 +08:00
Tianyi Cui
d3a29b36a8 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 23:19:05 +08:00
Tianyi Cui
3d89e42d47 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-14 23:19:05 +08:00
Tianyi Cui
380544d5a5 Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 23:19:05 +08:00
Tianyi Cui
0998db87d8 test: align time context with full headers 2026-07-14 23:18:46 +08:00
Tianyi Cui
c2fc9dcd05 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 23:16:41 +08:00
Tianyi Cui
380a4d6dbc Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 23:16:41 +08:00
Tianyi Cui
332edfeee7 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 23:16:41 +08:00
Tianyi Cui
3b26fb8e1e Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-14 23:16:41 +08:00
Tianyi Cui
7fd7064c27 Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 23:16:40 +08:00
Tianyi Cui
f06d623030 Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation 2026-07-14 23:16:23 +08:00
Tianyi Cui
513a8d2177 Merge pull request #276 from deepseek-harness/codex/simp-session-dead-surface
refactor: prune dead session surfaces
2026-07-14 23:15:44 +08:00
Tianyi Cui
101e8cbeb6 Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface 2026-07-14 23:09:21 +08:00
Tianyi Cui
29b6527198 Merge pull request #312 from deepseek-harness/docs/i18n-cookbook-batch
docs(i18n): cookbook batch — six bilingual pairs via the committed pipeline
2026-07-14 23:00:52 +08:00
Tianyi Cui
1fbb1cb229 docs: address cookbook translation review 2026-07-14 22:50:20 +08:00
Ziya
3d0ad3db3e docs(i18n): cookbook batch — six bilingual pairs via the committed pipeline
六篇 cookbook 全部配对(adding-a-package / adding-a-tool /
adding-a-vendored-package / adding-an-llm-adapter /
extension-cookbook / responding-to-pr-review-on-a-stack):译文由
进仓流水线产出(translation-prompt.md 全占位符渲染 + 5 组金标
few-shot),双侧语言切换行齐备,六篇加入 manifest required(15)。
另补 prompt 的 When translating into English 一节(此前为占位):
标点/术语双向绑定/主语显化/惯用语概念还原/语域,与
translation-rules 的中文先行条款一致。
2026-07-14 07:23:53 -07:00
Tianyi Cui
0a423b43e2 Merge pull request #308 from deepseek-harness/codex/time-context-plugin
feat: add optional time context plugin
2026-07-14 22:04:17 +08:00
Tianyi Cui
528f9cba62 fix: default time context to system zone 2026-07-14 21:45:54 +08:00
Tianyi Cui
a63be3f624 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 20:18:56 +08:00
Tianyi Cui
53c612300b Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 20:18:56 +08:00
Tianyi Cui
5a1194bf30 test: refresh snapshots after bash guidance merge 2026-07-14 20:18:24 +08:00
Tianyi Cui
4b11b53017 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 20:09:22 +08:00
Tianyi Cui
c4d3e53ed9 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 20:09:22 +08:00
Tianyi Cui
f0e23fab13 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 20:09:22 +08:00
Tianyi Cui
8be096c540 fix: preserve master bash guidance wording 2026-07-14 20:08:37 +08:00
Tianyi Cui
d653687f17 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 20:03:57 +08:00
Tianyi Cui
dd18ede8a7 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 20:03:57 +08:00
Tianyi Cui
d409bb23ba Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 20:03:57 +08:00
Tianyi Cui
b09efae186 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-14 20:03:57 +08:00
Tianyi Cui
9524122c0c Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id 2026-07-14 20:03:57 +08:00
Tianyi Cui
cdb87fbefb Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 20:03:56 +08:00
Tianyi Cui
b12b5f8a95 test: refresh permission-switching header snapshot 2026-07-14 20:03:28 +08:00
Tianyi Cui
38876d9d7c Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 19:30:54 +08:00
Tianyi Cui
087ea9f866 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 19:30:53 +08:00
Tianyi Cui
5409452cc7 test: refresh snapshots after master merge 2026-07-14 19:30:29 +08:00
Tianyi Cui
64a3933270 docs: refresh config catalog after parent merge 2026-07-14 19:03:07 +08:00
Tianyi Cui
18abf87107 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
# Conflicts:
#	docs/rfc/implemented/architecture/2026-07-05-prompt-variables-and-tool-guidance-ownership.md
#	packages/subagent/subagent-subprocess/src/index.ts
#	packages/subagent/tool-subagent/src/index.ts
2026-07-14 19:02:27 +08:00
Tianyi Cui
93dc0f30a9 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
#	packages/core/agent-loop/tests/agent.spec.ts
#	packages/core/agent-loop/tests/contract-regressions.spec.ts
2026-07-14 18:58:29 +08:00
Tianyi Cui
8a5ebb1cde Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/config-catalog.md
#	docs/event-producer-consumer.md
#	docs/rfc/implemented/feature/2026-07-06-approval-seam.md
#	packages/ui/acp/README.md
#	packages/ui/acp/src/index.ts
#	packages/ui/jsonrpc/README.md
#	packages/ui/jsonrpc/src/server.ts
2026-07-14 18:55:51 +08:00
Tianyi Cui
83271191d1 Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
#	docs/rfc/implemented/architecture/2026-06-18-agent-lifecycle-and-ownership-seams.md
#	docs/rfc/implemented/architecture/2026-06-20-branded-ids.md
#	docs/rfc/implemented/simplification/2026-06-20-remove-agent-boundary-mirror-events.md
#	docs/rfc/proposed/feature/2026-07-07-claude-code-and-codex-subagent-backends.md
#	docs/rfc/proposed/simplification/2026-06-20-unify-agent-and-session-id.md
#	packages/bash/tool-bash/README.md
#	packages/bash/tool-bash/src/index.ts
#	packages/bash/tool-bash/tests/tools.spec.ts
#	packages/core/agent-loop/README.md
#	packages/core/agent-loop/tests/properties.spec.ts
#	packages/core/agent/README.md
#	packages/core/agent/src/index.ts
#	packages/guard/repeat-tool-guard/src/index.ts
#	packages/hooks/hooks-claude/tests/bridge.spec.ts
#	packages/subagent/subagent-acp/tests/mock-acp-server.ts
#	packages/ui/acp/tests/dispose.spec.ts
#	packages/ui/stdio-agent/src/index.ts
#	packages/ui/stdio-agent/src/stdio-chat.ts
#	packages/ui/stdio-agent/tests/stdio-chat.spec.ts
#	packages/util/brand/src/index.ts
2026-07-14 18:51:24 +08:00
Tianyi Cui
897bbe89f5 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
# Conflicts:
#	packages/core/agent/src/index.ts
2026-07-14 18:48:24 +08:00