Commit Graph
1713 Commits
Author SHA1 Message Date
Tianyi Cui d8cced2602 Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface 2026-07-14 23:44:39 +08:00
Tianyi Cui 2e43cdcfa1 Merge branch 'codex/simp-prune-web-seam-fields' into codex/simp-hide-web-provider-helpers 2026-07-14 23:44:38 +08:00
Tianyi Cui 177144917d Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields 2026-07-14 23:44:38 +08:00
Tianyi Cui abc76d8ac7 Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers 2026-07-14 23:44:06 +08:00
Tianyi Cui 0bc114c07d Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract 2026-07-14 23:42:47 +08:00
Tianyi Cui a673ee4888 Merge remote-tracking branch 'origin/master' into codex/pr202-merge-review 2026-07-14 23:42:36 +08:00
Tianyi Cui bbead98c1d docs: align sandbox extraction with prose standard 2026-07-14 23:42:22 +08:00
Tianyi Cui 7993f41da3 Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface 2026-07-14 23:39:05 +08:00
Tianyi Cui d6d8c6ae0e Merge branch 'codex/simp-prune-bash-surface' into codex/simp-prune-sandbox-surface 2026-07-14 23:39:05 +08:00
Tianyi Cui ed3654da00 docs: reconcile hidden internals with prose standard 2026-07-14 23:38:53 +08:00
imccyu c67c3d9413 refactor: derive event graphs and scope invariants from TypeScript 2026-07-14 23:37:56 +08:00
Tianyi Cui 7b50c573ca Merge branch 'master' into codex/fix-acp-snapshot-fs-registration 2026-07-14 23:32:41 +08:00
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 7cbed547c7 Merge remote-tracking branch 'origin/master' into codex/pr202-merge-review 2026-07-14 23:21:47 +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 98c12676af Merge remote-tracking branch 'origin/master' into feat/mcp-client 2026-07-14 23:16:43 +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 466bc01ed3 Merge remote-tracking branch 'origin/master' into codex/fix-acp-snapshot-fs-registration 2026-07-14 23:11:28 +08:00
Tianyi Cui 8ffcef7db9 test(snapshot): split pinned schemas into sidecars 2026-07-14 23:11:21 +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 2e631a4ba2 Merge remote-tracking branch 'origin/master' into codex/fix-pr172-review-findings 2026-07-14 23:09:13 +08:00
Tianyi Cui 3caaa43797 fix(i18n): make translation contracts executable 2026-07-14 23:09:01 +08:00
Tianyi Cui 1fbb1cb229 docs: address cookbook translation review 2026-07-14 22:50:20 +08:00
Tianyi Cui 883948d1d5 Merge commit 'refs/review/pr-312-head' into codex/fix-pr172-review-findings
# Conflicts:
#	docs/i18n/translation-prompt.md
2026-07-14 22:46:36 +08:00
Tianyi Cui 19504f7e34 fix(i18n): resolve pairing workflow review findings 2026-07-14 22:38:17 +08:00
Tianyi Cui 28cad74b7c Merge remote-tracking branch 'origin/master' into codex/fix-acp-snapshot-fs-registration 2026-07-14 22:26:02 +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
Yichen Jiang dfd3638d67 Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters 2026-07-14 22:18:35 +08:00
Yichen Jiang 815365dbbe Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/core-data-structures/core.md
#	docs/event-producer-consumer.md
#	docs/persistence-catalog.md
#	examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
#	examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
#	examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
#	examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
#	examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
#	examples/acp-agent/tests/snapshots/skill-load/session.jsonl
#	examples/acp-agent/tests/snapshots/text-turn/session.jsonl
#	examples/sandbox-acp-agent/cordis.yml
#	examples/sandbox-acp-agent/tests/snapshots/escalation-approved/session.jsonl
#	examples/sandbox-acp-agent/tests/snapshots/escalation-rejected/session.jsonl
#	examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
#	packages/compact/compact-basic/README.md
#	packages/compact/compact-basic/src/index.ts
#	packages/compact/compact-basic/tests/compact-basic.spec.ts
#	packages/core/agent-loop/README.md
#	packages/core/agent-loop/src/loop.ts
#	packages/core/agent-loop/tests/properties.spec.ts
#	packages/core/session/README.md
#	packages/core/session/src/types.ts
#	packages/core/session/tests/derived-cache.spec.ts
#	packages/llm/llm-deepseek/src/index.ts
#	packages/llm/llm-pi-ai/README.md
#	packages/llm/llm-pi-ai/src/adapter.ts
#	packages/llm/llm-pi-ai/src/convert.ts
#	packages/llm/llm-pi-ai/tests/adapter.spec.ts
#	packages/llm/llm/README.md
#	packages/llm/llm/src/call-config.ts
#	packages/llm/llm/src/index.ts
#	packages/ui/acp-agent/src/index.ts
#	packages/ui/acp/tests/harness.ts
#	packages/ui/jsonrpc/README.md
#	packages/ui/jsonrpc/src/server.ts
#	packages/ui/stdio-agent/README.md
#	packages/ui/stdio-agent/src/index.ts
#	python/sdk/README.i18n.yaml
2026-07-14 22:17:50 +08:00
Yichen Jiang e547980d77 feat(llm): route adapters by provider 2026-07-14 21:57:52 +08:00
Tianyi Cui 528f9cba62 fix: default time context to system zone 2026-07-14 21:45:54 +08:00
Dudu-0223 4afc701e98 fix(snapshot): register filesystem tools through explicit overlay 2026-07-14 21:25:58 +08:00
Dudu-0223 77be4b891b Merge remote-tracking branch 'origin/master' into pr-265
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
#	docs/rfc/INDEX.md
#	examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
#	examples/acp-agent/tests/snapshots/skill-load/session.jsonl
#	examples/acp-agent/tests/snapshots/text-turn/session.jsonl
#	examples/sandbox-acp-agent/tests/snapshots/escalation-approved/session.jsonl
#	examples/sandbox-acp-agent/tests/snapshots/escalation-rejected/session.jsonl
#	packages/core/agent-loop/README.md
#	packages/core/agent-loop/src/loop.ts
#	packages/core/tools/README.md
#	packages/core/tools/src/index.ts
#	packages/core/tools/src/schema.ts
#	packages/ui/acp/src/index.ts
#	packages/ui/stdio-agent/README.md
2026-07-14 20:49:54 +08:00
Yichen Jiang ee111fd978 Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
# Conflicts:
#	AGENTS.md
#	docs/config-catalog.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/core-data-structures/core.md
#	docs/event-producer-consumer.md
#	docs/persistence-catalog.md
#	docs/rfc/implemented/architecture/2026-07-05-reconstructable-requests.md
#	docs/rfc/implemented/feature/2026-06-15-code-mode.md
#	docs/rfc/implemented/feature/2026-06-30-hook-bridges.md
#	docs/rfc/implemented/feature/2026-06-30-interception-seams.md
#	docs/rfc/implemented/feature/2026-07-08-repeat-tool-guard.md
#	docs/rfc/proposed/simplification/2026-07-04-prune-dead-core-spine-surface.md
#	examples/AGENTS.md
#	examples/acp-agent/cordis.yml
#	examples/acp-agent/tests/acp.snapshot.ts
#	examples/echo-agent/cordis.yml
#	examples/sandbox-acp-agent/cordis.yml
#	packages/cordis/tool-cordis/src/api-catalog.ts
#	packages/core/agent-core/README.md
#	packages/core/agent-core/src/index.ts
#	packages/core/agent-loop/README.md
#	packages/core/agent-loop/src/loop.ts
#	packages/core/agent-loop/tests/interception.spec.ts
#	packages/core/agent/src/types.ts
#	packages/core/tools/README.md
#	packages/core/tools/src/code-mode.ts
#	packages/core/tools/src/index.ts
#	packages/fs/fs-local/src/index.ts
#	packages/fs/fs/README.md
#	packages/fs/fs/src/index.ts
#	packages/guard/repeat-tool-guard/README.md
#	packages/guard/repeat-tool-guard/src/index.ts
#	packages/hooks/hooks-claude/src/index.ts
#	packages/hooks/hooks-codex/src/index.ts
#	packages/ui/acp-agent/src/index.ts
2026-07-14 19:50:25 +08:00
Tianyi Cui c08b5a24ec Merge branch 'codex/simp-prune-web-seam-fields' into codex/simp-hide-web-provider-helpers
# Conflicts:
#	docs/config-catalog.md
2026-07-14 19:12:06 +08:00
Tianyi Cui 9361402c68 Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers
# Conflicts:
#	docs/config-catalog.md
2026-07-14 19:10:48 +08:00
Tianyi Cui e8092dd65a Merge branch 'codex/simp-prune-bash-surface' into codex/simp-prune-sandbox-surface
# Conflicts:
#	docs/config-catalog.md
#	packages/bash/bash-sandbox/src/index.ts
#	packages/sandbox/sandbox-local/README.md
#	packages/sandbox/sandbox-local/src/index.ts
2026-07-14 19:09:35 +08:00
Tianyi Cui bd0a1855b9 Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
2026-07-14 19:06:25 +08:00
Tianyi Cui 59c5010283 Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
#	docs/rfc/implemented/feature/2026-06-15-code-mode.md
2026-07-14 19:05:23 +08:00
Tianyi Cui 64a3933270 docs: refresh config catalog after parent merge 2026-07-14 19:03:07 +08:00