Tianyi Cui
c2d5a5be80
Merge origin/master into PR #219 review branch
...
Bring PR #219 onto current master before re-evaluating review findings so fixes are tested against the code that would actually land.
Resolve generated catalogs by regeneration, preserve the new ACP tool-schema sidecar format while refreshing affected snapshots keylessly, and update the newly paired Chinese adding-a-tool document to match the background-task guidance. This keeps generated and bilingual artifacts authoritative instead of choosing one conflict side blindly.
2026-07-15 11:40:26 +08:00
Tianyi Cui
ac820b68a6
Merge branch 'master' into feat/mcp-client
2026-07-15 11:35:45 +08:00
imccyu
33474159e9
docs: add node-addon-internal-loader README
2026-07-15 11:33:23 +08:00
imccyu
52264d87ee
fix: test
2026-07-15 11:31:55 +08:00
imccyu
31f4441fd4
pkg: update vendor dep
2026-07-15 11:28:45 +08:00
imccyu
8e892095a1
fix: readme and dep
2026-07-15 11:20:48 +08:00
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
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
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
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
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
34344bc4ee
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 23:36:15 +08:00
Tianyi Cui
29fc58c93d
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 23:36:15 +08:00
Tianyi Cui
9745a0d43a
fix: reject empty configured session ids
2026-07-14 23:36:04 +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
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
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
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
3b26fb8e1e
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-14 23:16:41 +08:00