Tianyi Cui
4f37c91beb
Merge remote-tracking branch 'origin/master' into codex/simp-hide-web-provider-helpers
2026-07-15 20:51:05 +08:00
Tianyi Cui
abd1d7d89f
Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface
2026-07-15 20:51:04 +08:00
Huanqi Cao
30a209aab5
fix(e2e): reach child quiescence before temp-dir cleanup in built-bin smokes
...
The acp built-bin smoke killed its child and immediately rm'd the temp
consumer dir; POSIX tolerates unlinking a live process's cwd, Windows fails
EBUSY while the child still holds its cwd and session-log handles (the CI
windows job's only red step). Await the child's exit after SIGKILL and give
both smokes' rm a brief retry for the OS handle-release lag.
2026-07-15 19:13:05 +08:00
Tianyi Cui
9f96b74e21
Merge remote-tracking branch 'origin/master' into codex/simp-hide-web-provider-helpers
2026-07-15 17:07:46 +08:00
Tianyi Cui
7f53340f41
Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface
2026-07-15 17:07:35 +08:00
Yichen Jiang
ff3d893f74
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
...
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# docs/module-graph.md
# examples/echo-agent/composition.md
# packages/README.md
# packages/core/README.md
# packages/examples/acp-demo/package.json
# packages/examples/acp-demo/src/index.ts
# packages/examples/acp-demo/tests/acp-agent.spec.ts
# packages/examples/acp-demo/tests/built-bin.e2e.ts
# packages/examples/acp-demo/tsconfig.json
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# packages/examples/stdio-demo/package.json
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/built-bin.e2e.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# packages/examples/stdio-demo/tsconfig.json
# pnpm-lock.yaml
# python/sdk-runtime/README.i18n.yaml
# python/sdk-runtime/src/deepseek_harness_runtime/runtime/cordis.yml
# python/sdk/tests/test_bundled_runtime.py
2026-07-15 17:04:16 +08:00
Yichen Jiang
306b79fa2c
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
...
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/coding-agent/README.md
# examples/coding-agent/cordis.yml
# packages/README.md
# packages/examples/acp-demo/README.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/src/index.ts
# packages/examples/stdio-demo/README.md
# pnpm-lock.yaml
# scripts/doc-budgets.manifest.json
# scripts/verify-package-readme-model-experience.ts
2026-07-15 16:57:03 +08:00
Yichen Jiang
20572f8468
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
...
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# packages/README.md
# packages/examples/acp-demo/README.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/README.md
# pnpm-lock.yaml
2026-07-15 16:53:56 +08:00
Hypatia May
94346513ec
Merge origin/master into compact-tool-pairing
2026-07-15 16:52:50 +08:00
imccyu
6dde9f70f0
fix: satisfy doc gates after the examples/ relocation
...
Repair cross-group README links whose targets changed groups
(ui/jsonrpc, ui/app-boot -> examples; examples/* -> ui seams),
re-record the bilingual-pair consistency hashes for the docs the
rename touched on both language sides, and condense the AGENTS.md and
packages/README.md group entries. The packages/README ceiling rises
710 -> 760 for the mandated new examples/ hierarchy row (5% headroom).
2026-07-15 16:46:05 +08:00
imccyu
e4691a2f79
fix: register the examples/ group in the tsconfig paths map
...
The @deepseek-ai/dsh-* wildcard maps each package name to its group's
src; the new packages/examples/ group needs its own glob, or the four
moved packages fall back to unbuilt lib/ and vitest cannot resolve them.
Also update the moved specs' plugin export-name assertions (acp-agent ->
acp-demo, stdio-agent -> stdio-demo, agent-core -> agent-spine-demo).
2026-07-15 16:46:05 +08:00
imccyu
2a48b31306
docs: rewrite group maps for the examples/ relocation
...
Add the packages/examples/ group README, drop the moved packages from the
core/ and ui/ group READMEs, and add the examples/ row to the packages
hierarchy table and the repo-layout in AGENTS.md.
2026-07-15 16:46:05 +08:00
imccyu
6f77da4c8c
refactor: relocate demo app bundles to packages/examples/*-demo
...
Move the agent-spine bundle and the stdio/ACP/JSON-RPC app packages out of
core/ and ui/ into a new packages/examples/ group, renamed with a -demo
suffix so the npm name marks them as non-product surface:
core/agent-core -> examples/agent-spine-demo (dsh-agent-spine-demo)
ui/stdio-agent -> examples/stdio-demo (dsh-stdio-demo)
ui/acp-agent -> examples/acp-demo (dsh-acp-demo)
ui/jsonrpc-agent -> examples/jsonrpc-demo (dsh-jsonrpc-demo)
Update every code/config/test reference and reference-only doc mentions, and
regenerate module-graph, config-catalog, and doc-graphs. The jsonrpc bin
(dsh-jsonrpc-agent) and single-file exe (dsh-jsonrpc-agent-pkg) keep their
names; the SDK runtime-startup surface is reconciled separately.
2026-07-15 16:46:05 +08:00
Tianyi Cui
8765c27bd9
Merge remote-tracking branch 'origin/master' into codex/simp-hide-web-provider-helpers
2026-07-15 16:39:24 +08:00
Tianyi Cui
1fe2d90d6f
Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface
2026-07-15 16:37:21 +08:00
Tianyi Cui
e7bae3aa3b
Merge branch 'master' into feat/mcp-client
2026-07-15 15:50:59 +08:00
Yichen Jiang
4f92ede4a0
Merge branch 'master' into codex/rfc-subagent-background-tasks
2026-07-15 15:41:56 +08:00
lintianle
b9eeb2162c
Fix lockfile broken by hand-resolved merge conflict
...
The web-editor conflict resolution renamed the cordis snapshot keys to
rc.7 but left the mcp-client importer pointing at the deleted
cordis@4.0.0-rc.6(...rc.4) key, so every CI lane failed at
'pnpm install --frozen-lockfile' with ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY.
Align the mcp-client cordis range with the repo-wide ^4.0.0-rc.7 sweep
from master and re-resolve the lockfile with pnpm.
2026-07-15 15:40:02 +08:00
Yichen Jiang
17511ea0d8
Merge branch 'master' into codex/rfc-subagent-background-tasks
2026-07-15 15:33:53 +08:00
Tianyi Cui
dbae83d573
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
2026-07-15 15:31:29 +08:00
Hypatia May
63330ac638
Merge origin/master into compact-tool-pairing
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 15:24:59 +08:00
TianleLin
905b8ead9f
Merge branch 'master' into feat/mcp-client
2026-07-15 15:22:32 +08:00
Tianyi Cui
0239ac3752
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
2026-07-15 14:05:54 +08:00
Tianyi Cui
d711dad726
Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface
2026-07-15 14:01:14 +08:00
Tianyi Cui
627738c4ed
Merge remote-tracking branch 'origin/master' into codex/simp-prune-code-runtime-surface
2026-07-15 13:58:44 +08:00
Yichen Jiang
2f268cb47d
Merge remote-tracking branch 'origin/codex/project-instruction-files' into codex/project-instruction-files
2026-07-15 13:45:59 +08:00
Yichen Jiang
54514f48c5
Fix time-context workspace config fixture
2026-07-15 13:44:26 +08:00
Yichen Jiang
40336f945a
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
2026-07-15 13:38:22 +08:00
Yichen Jiang
09d9fec6f9
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
...
# Conflicts:
# docs/config-catalog.md
# docs/core-data-structures/bash.md
# packages/bash/bash-local/src/index.ts
# packages/bash/bash/src/types.ts
# packages/bash/bash/tests/service.spec.ts
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
2026-07-15 13:38:17 +08:00
Yichen Jiang
aa284e0802
Merge branch 'master' into codex/project-instruction-files
2026-07-15 13:36:53 +08:00
Yichen Jiang
28344ac124
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
2026-07-15 13:35:54 +08:00
Yichen Jiang
2ed2fa3896
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
...
# Conflicts:
# packages/bash/bash-local/tests/run.spec.ts
# packages/bash/tool-bash/src/index.ts
2026-07-15 13:34:09 +08:00
Tianyi Cui
713b50cc2c
Merge remote-tracking branch 'origin/master' into codex/simp-hide-web-provider-helpers
2026-07-15 13:32:45 +08:00
Yichen Jiang
3285b77d3c
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 13:30:39 +08:00
Tianyi Cui
96851da571
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
...
# Conflicts:
# docs/rfc/INDEX.md
2026-07-15 13:28:40 +08:00
Yichen Jiang
8a50ddc6f4
Merge remote-tracking branch 'origin/codex/agent-session-jsonl-location' into codex/agent-session-jsonl-location
2026-07-15 13:28:00 +08:00
Yichen Jiang
72105ad89c
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
2026-07-15 13:27:28 +08:00
Tianyi Cui
40065dd4fc
Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface
2026-07-15 13:27:16 +08:00
Hypatia May
c9efdf68f9
Merge remote-tracking branch 'origin/master' into codex/compact-tool-pairing
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 13:26:57 +08:00
Yichen Jiang
9e6a2827c6
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/README.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/README.md
# packages/core/tools/src/index.ts
# packages/ui/stdio-agent/tests/built-bin.e2e.ts
2026-07-15 13:25:44 +08:00
Yichen Jiang
6edd4a205b
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
...
# Conflicts:
# packages/README.md
2026-07-15 13:25:29 +08:00
Tianyi Cui
fe2d61198f
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
2026-07-15 13:23:16 +08:00
Hypatia May
cc546c4580
feat(compact): move pairing helpers (PR1 round 1)
2026-07-15 13:22:44 +08:00
Tianyi Cui
e6edee1d54
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
2026-07-15 13:21:06 +08:00
Tianyi Cui
38ea10eee0
Merge remote-tracking branch 'origin/master' into codex/simp-prune-code-runtime-surface
2026-07-15 13:20:08 +08:00
Tianyi Cui
3eb8c15b36
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
2026-07-15 13:14:56 +08:00
Tianyi Cui
eccaf2e2f7
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
2026-07-15 13:10:16 +08:00
imccyu
8aa4c8f660
Merge branch 'master' into refactor/agent-leaf-dependencies
2026-07-15 13:10:14 +08:00
imccyu
517964fe84
Merge branch 'master' into refactor/agent-leaf-dependencies
2026-07-15 13:09:33 +08:00
Yichen Jiang
ca14bcc34b
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
...
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/fs/fs-local/src/index.ts
# pnpm-lock.yaml
2026-07-15 13:07:11 +08:00
Tianyi Cui
Huanqi Cao
Yichen Jiang
Hypatia May
imccyu
lintianle
TianleLin