Commit Graph

2307 Commits

Author SHA1 Message Date
Yichen Jiang
df8fe3bde4 Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
#	docs/architecture.md
#	docs/config-catalog.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
#	docs/module-graph.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/permission-switching/session.jsonl
#	examples/acp-agent/tests/snapshots/skill-load/session.jsonl
#	examples/acp-agent/tests/snapshots/text-turn/session.jsonl
#	packages/README.md
2026-07-15 11:17:55 +08:00
Yichen Jiang
904397a7ef Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.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/permission-switching/session.jsonl
#	examples/acp-agent/tests/snapshots/skill-load/session.jsonl
#	examples/acp-agent/tests/snapshots/text-turn/session.jsonl
#	packages/session-persistence/session-persistence/src/index.ts
2026-07-15 11:12:39 +08:00
Hypatia May
4ce32807e1 Fix async injection tool-result ordering 2026-07-15 11:12:05 +08:00
imccyu
c685582d54 vendor: update cordis / loader 2026-07-15 10:39:18 +08:00
Yichen Jiang
35cae1d389 Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.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/code-mode-turn/session.jsonl
#	examples/acp-agent/tests/snapshots/permission-switching/session.jsonl
#	examples/acp-agent/tests/snapshots/skill-load/session.jsonl
#	examples/acp-agent/tests/snapshots/text-turn/session.jsonl
2026-07-15 10:15:06 +08:00
Yichen Jiang
310aa9992f fix: address provider routing review feedback 2026-07-15 10:07:21 +08:00
imccyu
80fbeefbd6 refactor(ui): extract stdio plugin package
Move the readline front door from stdio-agent into @deepseek-ai/dsh-stdio, keeping the loader shape and the stdio coverage with the new package.
2026-07-15 10:04:40 +08:00
Hypatia May
356236d08a Merge remote-tracking branch 'origin/master' into session-query-trace
# Conflicts:
#	docs/cordis-catalog/services.md
#	docs/rfc/INDEX.md
#	packages/core/session/src/surface.ts
#	packages/support/invariants/src/index.ts
2026-07-15 09:11:19 +08:00
Tianyi Cui
77de6497b4 Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-15 01:49:41 +08:00
Tianyi Cui
3ff4d2a051 Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness 2026-07-15 01:49:01 +08:00
Tianyi Cui
eb2b3964eb Merge branch 'codex/simp-prune-web-seam-fields' into codex/simp-hide-web-provider-helpers 2026-07-15 01:49:00 +08:00
Tianyi Cui
9b8b17b6fa Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields 2026-07-15 01:49:00 +08:00
Tianyi Cui
704a9b670c Merge branch 'codex/simp-prune-bash-surface' into codex/simp-prune-sandbox-surface 2026-07-15 01:49:00 +08:00
Tianyi Cui
358bc91a9e Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface 2026-07-15 01:49:00 +08:00
Tianyi Cui
ce364cdff0 Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface 2026-07-15 01:49:00 +08:00
Tianyi Cui
b69b084c7a Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals 2026-07-15 01:49:00 +08:00
Tianyi Cui
81d3f85605 Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order 2026-07-15 01:48:59 +08:00
Tianyi Cui
5d3c995b4c Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface 2026-07-15 01:48:59 +08:00
Tianyi Cui
da75ed9056 Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface 2026-07-15 01:48:59 +08:00
Tianyi Cui
34bb75b2d2 Merge pull request #318 from deepseek-harness/worktree-ts-gen
refactor: derive event graphs and scope invariants from TypeScript
2026-07-15 01:10:25 +08:00
imccyu
8a390025ef fix: scan one-shot event listeners 2026-07-15 00:49:56 +08:00
imccyu
13255ceb15 docs: add rfc 2026-07-15 00:42:08 +08:00
Tianyi Cui
89bb0c47c3 Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order 2026-07-14 23:45:40 +08:00
Tianyi Cui
aba1b18eac Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface 2026-07-14 23:45:39 +08:00
Tianyi Cui
73b34e5c4d Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
# Conflicts:
#	docs/rfc/implemented/architecture/2026-06-18-session-surface.md
#	packages/core/session/src/surface.ts
#	packages/core/session/tests/surface.spec.ts
2026-07-14 23:45:25 +08:00
imccyu
b734567cc0 fix: lint 2026-07-14 23:44:48 +08:00
Tianyi Cui
0bbb2a5426 Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness 2026-07-14 23:44:40 +08:00
Tianyi Cui
ebf2fb763a Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals 2026-07-14 23:44:40 +08:00
Tianyi Cui
606337f2f7 Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events 2026-07-14 23:44:39 +08:00
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
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
imccyu
c67c3d9413 refactor: derive event graphs and scope invariants from TypeScript 2026-07-14 23:37:56 +08:00
Tianyi Cui
174619929d Merge pull request #310 from deepseek-harness/codex/fix-acp-snapshot-fs-registration
fix(snapshot): restore filesystem tool registration after permission consolidation
2026-07-14 23:34:57 +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
7cbed547c7 Merge remote-tracking branch 'origin/master' into codex/pr202-merge-review 2026-07-14 23:21:47 +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
98c12676af Merge remote-tracking branch 'origin/master' into feat/mcp-client 2026-07-14 23:16:43 +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