Merge remote-tracking branch 'origin/master' into worktree/pr1018-todo-retarget-20260731

# Conflicts: # apps/cli/README.i18n.yaml # packages/ui/tui/README.i18n.yaml
2026-07-31 19:23:34 +08:00
parent 3aa98ba609 2abf643326
commit 7d04e4654a
53 changed files with 1113 additions and 150 deletions
--- a/apps/cli/README.i18n.yaml
+++ b/apps/cli/README.i18n.yaml
@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write apps/cli/README.md
-README.md: c3d6a359c81cb2dce13d43715b1d816cc010efff
-README.zh.md: 9843738e015af1259a228e6023c6096ef624f4dd
+README.md: e2567bebea80b154c01d1cad8094008818e5fd13
+README.zh.md: a3b7f433040ce0ff02848e3741f407dffe8f8cb8
--- a/apps/cli/README.md
+++ b/apps/cli/README.md
@@ -25,9 +25,9 @@ The Web and headless surfaces boot `base.cordis.yml` plus `web.cordis.yml`, then

 The shipped TUI and Web compositions register the native DeepSeek adapter plus pi-ai OpenAI and Anthropic profiles. Credentials and endpoint overrides come from the provider-standard `DEEPSEEK_API_KEY` / `DEEPSEEK_BASE_URL`, `OPENAI_API_KEY` / `OPENAI_BASE_URL`, and `ANTHROPIC_API_KEY` / `ANTHROPIC_BASE_URL` pairs in the boot's layered environment.

-The Web/headless composition also registers only `web_search`. Search uses DeepSeek's Anthropic-compatible Messages endpoint, resolves the same `DEEPSEEK_API_KEY` reference for every call, and accepts the separate `DEEPSEEK_SEARCH_BASE_URL` endpoint override; each search is an auxiliary model request with its own latency and token cost. `web_fetch` remains disabled and the composition mounts no default fetch provider, so deployments that need arbitrary page retrieval must opt in through an overlay. The TUI composition does not mount Web tools by default. The deployment decision and its security boundary live in the [default Web search Agent Note](../../.agents/notes/implemented/feature/2026-07-31-web-default-search.md).
+Every surface also registers `web_search` and only `web_search`. Search uses DeepSeek's Anthropic-compatible Messages endpoint, resolves the same `DEEPSEEK_API_KEY` reference for every call, and accepts the separate `DEEPSEEK_SEARCH_BASE_URL` endpoint override; each search is an auxiliary model request with its own latency and token cost. `web_fetch` remains disabled and the composition mounts no default fetch provider, so deployments that need arbitrary page retrieval must opt in through an overlay. The deployment decision and its security boundary live in the [default Web search Agent Note](../../.agents/notes/implemented/feature/2026-07-31-web-default-search.md).

-`DSH_TOOLS_MODE` selects the tool presentation mode for the whole Web/headless process: `native` (the schema default when unset), `code` (the `run_code`-only Code Mode wire), or `both`; any other value fails loud at boot through the `dsh-tools` config schema. It is a TEMPORARY seam — process-wide because Loader composition is static — and is removed once the web UI owns per-session tool-mode selection; the TUI surface ignores it (its config tree pins its own mode).
+`DSH_TOOLS_MODE` selects the tool presentation mode for the whole Web/headless process: `native` (the schema default when unset), `code` (the `run_code`-only Code Mode wire), or `both`; any other value fails loud at boot through the `dsh-tools` config schema. It is a TEMPORARY seam — process-wide because Loader composition is static — and is removed once the web UI owns per-session tool-mode selection; the TUI surface ignores it and pins `native`.

 [`core-web.cordis.yml`](config/core-web.cordis.yml) is an opt-in `dsh web --config` overlay that keeps the shipped Web host, browser, Workspace, persistence, and permission composition while reducing the default native model surface to owner-scoped persistent `bash` and `str_replace_editor`. The PTY backend and editor consume the existing Web sandbox and filesystem providers. An open persistent shell prevents changing that session's permission mode until the shell closes, so a shell created under wider access cannot survive a downgrade. `DSH_TOOLS_MODE` still controls native/Code Mode presentation for the resulting two-tool registry.

@@ -39,6 +39,23 @@ pnpm run dsh web --config apps/cli/config/core-web.cordis.yml

 Every `dsh` surface — TUI, Web, and headless — reports session telemetry by default (the row lives in the shared `base.cordis.yml`): every session-log event streams as OTLP/HTTP log records to `https://harness-telemetry.deepseeksvc.com/v1/logs` on a 10-second batch cadence. `DSH_TELEMETRY_OTLP_URL` points the exporter at a different collector; setting `DSH_TELEMETRY_DISABLED` to ANY non-empty value — including `0` or `false` — disables the row before it loads (a privacy switch prefers off-by-mistake over on-by-mistake). No redaction rule is mounted in this composition yet: exported records are the raw captured copy, including message text, tool arguments and results, and the session's working-directory path. The deployment rulings live in the [web-telemetry-default-mount Agent Note](../../.agents/notes/implemented/feature/2026-07-31-web-telemetry-default-mount.md).

+MCP servers are not a shipped default, because a default would have to name one: `@deepseek-ai/dsh-mcp-client` mounts exactly one server per row and spawns it as a child process, outside `ctx.bash` and so outside the sandbox policy. The package is a runtime dependency of this CLI, so an installed `dsh` can mount your own servers from `$DSH_HOME/config.yaml` or a `--config` overlay without a source checkout:
+
+```yaml
+- insert:
+    - id: mcp-github
+      name: '@deepseek-ai/dsh-mcp-client'
+      config:
+        serverName: github
+        transport: stdio
+        command: npx
+        args: ['-y', '@modelcontextprotocol/server-github']
+        env:
+          GITHUB_TOKEN: !!js process.env.GITHUB_TOKEN
+```
+
+The model then sees `mcp__github__*`. See the [mcp-client README](../../packages/mcp/mcp-client/README.md) for the Streamable HTTP transport and the full field table.
+
 ## Install (developer machine)

 Symlink the source-running launcher onto your PATH; it resolves the checkout through its own real path, so code changes apply on the next launch with no build step:
--- a/apps/cli/README.zh.md
+++ b/apps/cli/README.zh.md
@@ -25,9 +25,9 @@ Web 和无头界面启动 `base.cordis.yml` 与 `web.cordis.yml`，随后应用

 已交付的 TUI 和 Web 组合会注册原生 DeepSeek 适配器，以及 pi-ai 的 OpenAI 和 Anthropic 提供方配置。凭据和端点覆盖来自启动分层环境中的提供方标准变量对：`DEEPSEEK_API_KEY` / `DEEPSEEK_BASE_URL`、`OPENAI_API_KEY` / `OPENAI_BASE_URL` 和 `ANTHROPIC_API_KEY` / `ANTHROPIC_BASE_URL`。

-Web／无头组合还只会注册 `web_search`。搜索使用 DeepSeek 的 Anthropic 兼容 Messages 端点，每次调用都会解析同一个 `DEEPSEEK_API_KEY` 凭据引用，并接受独立的 `DEEPSEEK_SEARCH_BASE_URL` 端点覆盖；每次搜索都是一次辅助模型请求，会产生独立的延迟与 token 成本。`web_fetch` 仍处于禁用状态，组合也未挂载默认抓取提供方；需要任意页面抓取能力的部署必须通过覆盖层选择启用。TUI 组合默认不挂载 Web 工具。部署决策及其安全边界见[默认 Web 搜索 Agent Note](../../.agents/notes/implemented/feature/2026-07-31-web-default-search.md)。
+每个界面也都只注册 `web_search` 这一个 Web 工具。搜索使用 DeepSeek 的 Anthropic 兼容 Messages 端点，每次调用都会解析同一个 `DEEPSEEK_API_KEY` 凭据引用，并接受独立的 `DEEPSEEK_SEARCH_BASE_URL` 端点覆盖；每次搜索都是一次辅助模型请求，会产生独立的延迟与 token 成本。`web_fetch` 仍处于禁用状态，组合也未挂载默认抓取提供方；需要任意页面抓取能力的部署必须通过覆盖层选择启用。部署决策及其安全边界见[默认 Web 搜索 Agent Note](../../.agents/notes/implemented/feature/2026-07-31-web-default-search.md)。

-`DSH_TOOLS_MODE` 为整个 Web／无头进程选择工具呈现模式：可选值为 `native`（未设置时的 schema 默认值）、`code`（仅含 `run_code` 的 Code Mode 协议接口）或 `both`；任何其他值都会经由 `dsh-tools` 配置 schema 在启动时明确报错。它是一个临时 seam：Loader 组合是静态的，因此该设置作用于整个进程；待 Web UI 负责逐会话工具模式选择后便会移除。TUI 界面会忽略该变量（其配置树固定了自身模式）。
+`DSH_TOOLS_MODE` 为整个 Web／无头进程选择工具呈现模式：`native`（未设置时的 schema 默认值）、`code`（仅含 `run_code` 的 Code Mode 线路）或 `both`；任何其他值都会经由 `dsh-tools` 配置 schema 在启动时明确报错。它是一个临时 seam——Loader 组合是静态的，因此该设置作用于整个进程——待 Web UI 负责逐会话工具模式选择后便会移除；TUI 界面会忽略该变量并固定为 `native`。

 [`core-web.cordis.yml`](config/core-web.cordis.yml) 是一个可选启用的 `dsh web --config` 覆盖层：它保留已交付的 Web 宿主、浏览器、Workspace、持久化与权限组合，同时将默认的原生模型界面精简为以所有者为作用域的持久 `bash` 以及 `str_replace_editor`。PTY 后端和编辑器分别消费现有的 Web 沙箱与文件系统提供方。持久 shell 处于打开状态时，会阻止所属会话更改权限模式；因此，在较宽权限下创建的 shell 无法在降权后继续存活。`DSH_TOOLS_MODE` 仍控制由此得到的双工具注册表采用原生／Code Mode 呈现。

@@ -39,6 +39,23 @@ pnpm run dsh web --config apps/cli/config/core-web.cordis.yml

 每个 `dsh` 界面——TUI、Web 与无头——都默认上报会话遥测（该行位于共享的 `base.cordis.yml`）：每条会话日志事件以 OTLP/HTTP 日志记录的形式、按 10 秒批处理节奏流向 `https://harness-telemetry.deepseeksvc.com/v1/logs`。`DSH_TELEMETRY_OTLP_URL` 可将 exporter 指向其他 collector；将 `DSH_TELEMETRY_DISABLED` 设为**任意非空值**——包括 `0` 或 `false`——都会在该行加载前将其关停（隐私开关取「宁可误关、不可误开」）。该组合当前未挂载任何脱敏规则：导出记录即原始捕获副本，包含消息正文、工具参数与结果、以及会话工作目录路径。部署口径见 [web-telemetry-default-mount Agent Note](../../.agents/notes/implemented/feature/2026-07-31-web-telemetry-default-mount.md)。

+MCP 服务器不是交付默认值,因为默认值必须点名一台:`@deepseek-ai/dsh-mcp-client` 每一行只挂载一台服务器,并把它作为子进程 spawn,该进程不经 `ctx.bash`,因此也不受沙箱策略约束。该包是本 CLI 的运行时依赖,所以已安装的 `dsh` 无需源码检出即可从 `$DSH_HOME/config.yaml` 或 `--config` 覆盖层挂载你自己的服务器:
+
+```yaml
+- insert:
+    - id: mcp-github
+      name: '@deepseek-ai/dsh-mcp-client'
+      config:
+        serverName: github
+        transport: stdio
+        command: npx
+        args: ['-y', '@modelcontextprotocol/server-github']
+        env:
+          GITHUB_TOKEN: !!js process.env.GITHUB_TOKEN
+```
+
+模型随后会看到 `mcp__github__*`。Streamable HTTP 传输与完整字段表见 [mcp-client README](../../packages/mcp/mcp-client/README.md)。
+
 ## 安装（开发机）

 将从源码运行的启动器符号链接到 PATH 上；它通过自身真实路径解析 checkout，因此代码更改会在下次启动时生效，无需构建：
--- a/apps/cli/composition.md
+++ b/apps/cli/composition.md
@@ -98,6 +98,28 @@ flowchart LR
  cfg --> plugin_tui_spill_local
  plugin_tui_spill_policy["spill-policy<br/>@deepseek-ai/dsh-spill-policy"]
  cfg --> plugin_tui_spill_policy
+  plugin_tui_session_checkpoint_policy["session-checkpoint-policy<br/>@deepseek-ai/dsh-session-checkpoint-policy"]
+  cfg --> plugin_tui_session_checkpoint_policy
+  plugin_tui_tool_result_prune["tool-result-prune<br/>@deepseek-ai/dsh-compact-tool-result-prune"]
+  cfg --> plugin_tui_tool_result_prune
+  plugin_tui_tool_todo["tool-todo<br/>@deepseek-ai/dsh-tool-todo"]
+  cfg --> plugin_tui_tool_todo
+  plugin_tui_tool_goal["tool-goal<br/>@deepseek-ai/dsh-tool-goal"]
+  cfg --> plugin_tui_tool_goal
+  plugin_tui_tool_ralph["tool-ralph<br/>@deepseek-ai/dsh-tool-ralph"]
+  cfg --> plugin_tui_tool_ralph
+  plugin_tui_tool_session_query["tool-session-query<br/>@deepseek-ai/dsh-tool-session-query"]
+  cfg --> plugin_tui_tool_session_query
+  plugin_tui_tool_str_replace_editor["tool-str-replace-editor<br/>@deepseek-ai/dsh-tool-str-replace-editor"]
+  cfg --> plugin_tui_tool_str_replace_editor
+  plugin_tui_repeat_tool_guard["repeat-tool-guard<br/>@deepseek-ai/dsh-repeat-tool-guard"]
+  cfg --> plugin_tui_repeat_tool_guard
+  plugin_tui_web["web<br/>@deepseek-ai/dsh-web"]
+  cfg --> plugin_tui_web
+  plugin_tui_web_search_deepseek["web-search-deepseek<br/>@deepseek-ai/dsh-web-search-deepseek"]
+  cfg --> plugin_tui_web_search_deepseek
+  plugin_tui_tool_web["tool-web<br/>@deepseek-ai/dsh-tool-web"]
+  cfg --> plugin_tui_tool_web
  plugin_tui_tools["tools<br/>@deepseek-ai/dsh-tools"]
  cfg --> plugin_tui_tools
  plugin_tui_system_prompt["system-prompt<br/>@deepseek-ai/dsh-system-prompt"]
@@ -157,6 +179,17 @@ flowchart LR
 | `timeout-policy` | `@deepseek-ai/dsh-timeout-policy` |
 | `spill-local` | `@deepseek-ai/dsh-spill-local` |
 | `spill-policy` | `@deepseek-ai/dsh-spill-policy` |
+| `session-checkpoint-policy` | `@deepseek-ai/dsh-session-checkpoint-policy` |
+| `tool-result-prune` | `@deepseek-ai/dsh-compact-tool-result-prune` |
+| `tool-todo` | `@deepseek-ai/dsh-tool-todo` |
+| `tool-goal` | `@deepseek-ai/dsh-tool-goal` |
+| `tool-ralph` | `@deepseek-ai/dsh-tool-ralph` |
+| `tool-session-query` | `@deepseek-ai/dsh-tool-session-query` |
+| `tool-str-replace-editor` | `@deepseek-ai/dsh-tool-str-replace-editor` |
+| `repeat-tool-guard` | `@deepseek-ai/dsh-repeat-tool-guard` |
+| `web` | `@deepseek-ai/dsh-web` |
+| `web-search-deepseek` | `@deepseek-ai/dsh-web-search-deepseek` |
+| `tool-web` | `@deepseek-ai/dsh-tool-web` |
 | `tools` | `@deepseek-ai/dsh-tools` |
 | `system-prompt` | `@deepseek-ai/dsh-system-prompt` |
 | `agent-loop` | `@deepseek-ai/dsh-agent-loop` |
--- a/apps/cli/config/base.cordis.yml
+++ b/apps/cli/config/base.cordis.yml
@@ -250,6 +250,74 @@
  config:
    maxInlineBytes: 50000

+# Durability checkpoints before each model request and top-level dispatch.
+- id: session-checkpoint-policy
+  name: '@deepseek-ai/dsh-session-checkpoint-policy'
+
+# Compacts oversized tool results before the broader conversation compactor
+# runs, preserving the model-visible result within the configured budget.
+- id: tool-result-prune
+  name: '@deepseek-ai/dsh-compact-tool-result-prune'
+  config:
+    thresholdChars: 8192
+    headChars: 4096
+    tailChars: 1024
+
+- id: tool-todo
+  name: '@deepseek-ai/dsh-tool-todo'
+
+# Persisted same-session goals reach the model and the slash menu here; the
+# domain, driver, and `/goal` command are above.
+- id: tool-goal
+  name: '@deepseek-ai/dsh-tool-goal'
+
+# Fresh-agent Ralph iteration over a build-time-fixed script.
+- id: tool-ralph
+  name: '@deepseek-ai/dsh-tool-ralph'
+  config:
+    subagentProvider: spawn
+    maxRounds: 64
+
+- id: tool-session-query
+  name: '@deepseek-ai/dsh-tool-session-query'
+  config:
+    maxSearchResults: 100
+    searchTimeoutMs: 30000
+
+- id: tool-str-replace-editor
+  name: '@deepseek-ai/dsh-tool-str-replace-editor'
+  config:
+    maxOutputChars: 16000
+
+# Consecutive-repeat reminders on the tool chain.
+- id: repeat-tool-guard
+  name: '@deepseek-ai/dsh-repeat-tool-guard'
+  config:
+    thresholds: [3, 5, 8]
+    argumentsPreviewChars: 500
+
+# Every surface enables the stable web_search model surface. DeepSeek search
+# resolves the same DEEPSEEK_API_KEY credential the Models page manages for
+# chat, at each search; its Messages endpoint is separate from the
+# chat-completions endpoint, so it takes its own base-URL override. Fetch stays
+# disabled and no fetch provider is mounted: that provider defers SSRF
+# protection and the model would choose the request target.
+- id: web
+  name: '@deepseek-ai/dsh-web'
+  config:
+    searchProvider: deepseek-official
+
+- id: web-search-deepseek
+  name: '@deepseek-ai/dsh-web-search-deepseek'
+  config:
+    apiKeyEnv: DEEPSEEK_API_KEY
+    baseURL: !!js process.env.DEEPSEEK_SEARCH_BASE_URL
+
+- id: tool-web
+  name: '@deepseek-ai/dsh-tool-web'
+  config:
+    fetch: false
+
 # ── rows every surface mounts, whose values each overlay states ──────────────

 # The tool registry. Presentation mode is a surface choice, so each overlay
--- a/apps/cli/config/core-web.cordis.yml
+++ b/apps/cli/config/core-web.cordis.yml
@@ -37,6 +37,20 @@
 - id: tool-todo
  disabled: true

+# These consumers are shared defaults on the ordinary shipped surfaces, but
+# this opt-in profile keeps exactly its two named tools.
+- id: tool-goal
+  disabled: true
+
+- id: tool-ralph
+  disabled: true
+
+- id: tool-session-query
+  disabled: true
+
+- id: tool-str-replace-editor
+  disabled: true
+
 # The matching browser controls must not offer host tools that this profile
 # omits. ui-question's host half owns the ask_user_question registration.
 - id: ui-plan
--- a/apps/cli/config/tui.cordis.yml
+++ b/apps/cli/config/tui.cordis.yml
@@ -71,29 +71,17 @@
    - id: agent-loop-invariant
      name: '@deepseek-ai/dsh-agent-loop/invariant'

-    - id: session-checkpoint-policy
-      name: '@deepseek-ai/dsh-session-checkpoint-policy'
-
    # The derived query index behind `/resume`. The launcher provides a unique
    # process-local path because this SQLite backend has one writer owner; the
    # project-local fallback applies when no launcher sets the typed slot.
    - id: session-reference
      name: '@deepseek-ai/dsh-session-reference'

-    # Compacts oversized tool results before the broader conversation compactor
-    # runs, preserving the model-visible result within the configured budget.
-    - id: tool-result-prune
-      name: '@deepseek-ai/dsh-compact-tool-result-prune'
-
-    # Persisted same-session goals reach the model and the slash menu here; the
-    # domain, driver, and `/goal` command are in the base.
-    - id: tool-goal
-      name: '@deepseek-ai/dsh-tool-goal'
-
-    # A separate fixed consumer demonstrates fresh-agent Ralph iteration without
-    # changing the workflow tool or same-session goal behavior.
-    - id: tool-ralph
-      name: '@deepseek-ai/dsh-tool-ralph'
+    # Terminal-multiplexer context, mounted only where a terminal exists.
+    - id: tmux-context
+      name: '@deepseek-ai/dsh-tmux-context'
+      config:
+        refreshIntervalMs: 900000

    # The keyboard-backed provider behind ask_user_question and the plan-mode
    # review, and the front door it renders inside.
--- a/apps/cli/config/web.cordis.yml
+++ b/apps/cli/config/web.cordis.yml
@@ -80,28 +80,6 @@
 - id: fs-local
  disabled: true

-# The Web/headless product enables only the stable web_search model surface.
-# DeepSeek search resolves the same DEEPSEEK_API_KEY credential the Models page
-# manages for chat, at each search; its Messages endpoint is separate from the
-# chat-completions endpoint. Fetch remains disabled and no default fetch
-# provider is mounted.
- insert:
-    - id: web
-      name: '@deepseek-ai/dsh-web'
-      config:
-        searchProvider: deepseek-official
-
-    - id: web-search-deepseek
-      name: '@deepseek-ai/dsh-web-search-deepseek'
-      config:
-        apiKeyEnv: DEEPSEEK_API_KEY
-        baseURL: !!js process.env.DEEPSEEK_SEARCH_BASE_URL
-
-    - id: tool-web
-      name: '@deepseek-ai/dsh-tool-web'
-      config:
-        fetch: false
-
 # ── web-only host rows, the transport layer, and the browser roster ─────────

 # `dshClient` rows are the browser roster the modules node half scans into
@@ -135,9 +113,6 @@
        writeEveryEvents: 200
        writeIntervalMs: 5000

-    - id: tool-todo
-      name: '@deepseek-ai/dsh-tool-todo'
-
    # Resolve bind host, SSH launch, and display once at boot, then mount the
    # matching dual-face directory picker. Mount -native or -browse directly in
    # an overlay to pin the interaction.
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -74,6 +74,7 @@
    "@deepseek-ai/dsh-paths": "workspace:^",
    "@deepseek-ai/dsh-permission": "workspace:^",
    "@deepseek-ai/dsh-plan-mode": "workspace:^",
+    "@deepseek-ai/dsh-repeat-tool-guard": "workspace:^",
    "@deepseek-ai/dsh-pty": "workspace:^",
    "@deepseek-ai/dsh-pty-local": "workspace:^",
    "@deepseek-ai/dsh-sandbox-local": "workspace:^",
@@ -105,6 +106,7 @@
    "@deepseek-ai/dsh-system-prompt": "workspace:^",
    "@deepseek-ai/dsh-tasks-local": "workspace:^",
    "@deepseek-ai/dsh-timeout-policy": "workspace:^",
+    "@deepseek-ai/dsh-tmux-context": "workspace:^",
    "@deepseek-ai/dsh-token-meter": "workspace:^",
    "@deepseek-ai/dsh-tool-ask-user": "workspace:^",
    "@deepseek-ai/dsh-tool-bash": "workspace:^",
@@ -114,6 +116,7 @@
    "@deepseek-ai/dsh-tool-fs-search": "workspace:^",
    "@deepseek-ai/dsh-tool-goal": "workspace:^",
    "@deepseek-ai/dsh-tool-ralph": "workspace:^",
+    "@deepseek-ai/dsh-tool-session-query": "workspace:^",
    "@deepseek-ai/dsh-tool-skill": "workspace:^",
    "@deepseek-ai/dsh-tool-str-replace-editor": "workspace:^",
    "@deepseek-ai/dsh-tool-subagent": "workspace:^",
--- a/apps/cli/tests/fixtures/composition-echo-llm.ts
+++ b/apps/cli/tests/fixtures/composition-echo-llm.ts
@@ -0,0 +1,51 @@
+import type { Context } from 'cordis'
+import type {
+  GenerateOptions,
+  LlmModelInfo,
+  LlmResolvedModelInfo,
+  StreamChunk,
+} from '@deepseek-ai/dsh-llm'
+import { LlmAdapter } from '@deepseek-ai/dsh-llm'
+
+/** Terminal marker the preset smoke waits for before it asks the TUI to exit. */
+export const COMPOSITION_REPLY_TEXT = 'Shipped composition acknowledged.'
+
+// Provider id and model the keyless tail routes `main` to; that overlay is the
+// only caller, so the pair lives here as plain constants.
+const COMPOSITION_PROVIDER = 'composition-keyless'
+const COMPOSITION_MODEL = 'composition-keyless-model'
+
+/**
+ * Network-free adapter for the shipped-composition smoke. It answers every
+ * request — tool-ful agent turns and the tool-less auxiliary calls alike — with
+ * one fixed text and never calls a tool, because the assertion under test is the
+ * assembled tool catalog the loop logs, not any tool's behavior.
+ */
+class CompositionEchoAdapter extends LlmAdapter {
+  override listModels(provider: string): Promise<readonly LlmModelInfo[]> {
+    return Promise.resolve([{ provider, id: COMPOSITION_MODEL, name: 'Preset Keyless' }])
+  }
+
+  override resolveModel(provider: string, model: string): Promise<LlmResolvedModelInfo> {
+    return Promise.resolve({ provider, id: model, name: 'Preset Keyless', context: { contextWindow: 128_000 } })
+  }
+
+  override async * stream(_options: GenerateOptions): AsyncIterable<StreamChunk> {
+    yield { type: 'block-start', index: 0, blockType: 'text' }
+    for (const char of COMPOSITION_REPLY_TEXT) yield { type: 'text-delta', index: 0, text: char }
+    yield { type: 'block-end', index: 0, block: { type: 'text', text: COMPOSITION_REPLY_TEXT } }
+    yield { type: 'usage', usage: { inputTokens: 20, outputTokens: COMPOSITION_REPLY_TEXT.length } }
+    yield { type: 'finish', reason: { kind: 'stop' } }
+  }
+}
+
+export const name = 'composition-echo-llm'
+export const inject = ['llm']
+
+/**
+ * Register the network-free adapter the shipped-composition smoke routes through.
+ * @param ctx - the loader-mounted plugin context.
+ */
+export function apply(ctx: Context): void {
+  ctx.llm.registerAdapter([COMPOSITION_PROVIDER], new CompositionEchoAdapter())
+}
--- a/apps/cli/tests/fixtures/composition-keyless-tail.cordis.yml
+++ b/apps/cli/tests/fixtures/composition-keyless-tail.cordis.yml
@@ -0,0 +1,52 @@
+# Keyless tail for the shipped-composition smoke, applied as `--config` so the
+# launcher boots `base.cordis.yml` + `tui.cordis.yml` and then this file.
+#
+# Everything below is test isolation, never composition under test: the model is
+# replaced so no request leaves the process, the settle marker gates the smoke's
+# first prompt, and the session artifacts move into the smoke's temporary
+# workspace so the log inspection can read them.
+
+# A patch's `name` is an assertion rather than a replacement, so the base
+# adapter row is disabled and the scripted one inserted. Relative specifiers
+# resolve against the INCLUDED file's directory (apps/cli/config), not this
+# file's, because the include moves baseUrl there.
+- id: llm-deepseek
+  disabled: true
+
+- insert:
+    - id: composition-echo-llm
+      name: '../tests/fixtures/composition-echo-llm.ts'
+    - id: composition-settled
+      name: '../tests/fixtures/composition-settled.ts'
+
+- id: agent-loop
+  config:
+    agents:
+      - id: main
+        provider: composition-keyless
+        model: composition-keyless-model
+        cwd: !!js process.cwd()
+
+- id: session-persistence-jsonl
+  config:
+    root: './.sessions'
+    compression: none
+
+- id: session-query-sqlite
+  config:
+    path: './.sessions/session-query.db'
+
+# The title call is a second, tool-less request that would race the log
+# inspection for no coverage: the catalog under test rides the agent turn.
+- id: session-title-llm
+  disabled: true
+
+- id: tui
+  config:
+    sessionId: !!js configuredAgentIdentities?.main?.id ?? 'main'
+    welcome: 'composition smoke ready.'
+    showReasoning: true
+
+# HMR watches the repository; a PTY subprocess test must not start a watcher.
+- id: hmr
+  disabled: true
--- a/apps/cli/tests/fixtures/composition-settled.ts
+++ b/apps/cli/tests/fixtures/composition-settled.ts
@@ -0,0 +1,24 @@
+import type { Context } from 'cordis'
+
+/**
+ * Marker the shipped-composition smoke gates its first prompt on. The TUI renders as soon as
+ * its own fiber starts, so a prompt typed at the banner can reach the loop while
+ * later rows — tool plugins, persistence — are still activating, and would
+ * assemble a partial catalog. Waiting for this line makes the turn observe the
+ * settled tree.
+ */
+export const COMPOSITION_SETTLED_MARKER = 'COMPOSITION_TREE_SETTLED'
+
+export const name = 'composition-settled'
+
+/**
+ * Announce settled Loader activation on the terminal byte stream, after every
+ * entry in the booted tree has started. The write is detached: awaiting the
+ * Loader from inside an entry would wait on this entry's own activation.
+ * @param ctx - the loader-mounted plugin context.
+ */
+export function apply(ctx: Context): void {
+  void ctx.loader.await().then(() => {
+    process.stdout.write(`\n${COMPOSITION_SETTLED_MARKER}\n`)
+  })
+}
--- a/apps/cli/tests/shipped-composition.e2e.ts
+++ b/apps/cli/tests/shipped-composition.e2e.ts
@@ -0,0 +1,124 @@
+import { readdir, readFile } from 'node:fs/promises'
+import { fileURLToPath } from 'node:url'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { LOADER_SMOKE_TEST_TIMEOUT_MS } from '@deepseek-ai/dsh-loader-smoke'
+import type { SessionEvent } from '@deepseek-ai/dsh-session'
+import { COMPOSITION_REPLY_TEXT } from './fixtures/composition-echo-llm.ts'
+import { COMPOSITION_SETTLED_MARKER } from './fixtures/composition-settled.ts'
+import { runTuiPtySmoke } from './pty-harness.ts'
+
+const dshBinScript = fileURLToPath(new URL('../src/bin.ts', import.meta.url))
+const tsconfigPath = fileURLToPath(new URL('../../../tsconfig.json', import.meta.url))
+// An overlay over the shipped tree, so the catalog under test is the one
+// `base.cordis.yml` + `tui.cordis.yml` assemble; the tail only swaps the model
+// and redirects session artifacts.
+const keylessTail = fileURLToPath(new URL('./fixtures/composition-keyless-tail.cordis.yml', import.meta.url))
+
+/**
+ * The catalog the shipped `dsh` TUI puts in front of the model, as the loop
+ * logged it, minus the ripgrep-dependent pair below.
+ * The absences are the composition's security decisions, not incidental gaps:
+ * the `cordis_*` toolset executes model-written JavaScript that no sandbox row
+ * confines, `web_fetch` chooses its own request target, and `mcp_*` servers
+ * spawn outside `ctx.bash`. The composition Agent Note owns the rationale and
+ * its sources.
+ */
+const EXPECTED_TUI_TOOLS = [
+  'ask_user_question',
+  'bash',
+  'create_goal',
+  'edit',
+  'exit_plan_mode',
+  'get_goal',
+  'ralph',
+  'read',
+  'session_event_read',
+  'session_event_search',
+  'session_event_trace',
+  'session_search',
+  'session_trace',
+  'skill',
+  'str_replace_editor',
+  'subagent',
+  'subagent_fork',
+  'task_kill',
+  'task_list',
+  'task_output',
+  'todo_write',
+  'update_goal',
+  'web_search',
+  'workflow',
+  'write',
+]
+
+/**
+ * `glob` and `grep` come from `dsh-tool-fs-search`, which probes `command -v rg`
+ * through the mounted bash executor at load and registers neither tool when
+ * ripgrep is absent. That is a host dependency, not a composition decision, so the
+ * pair is asserted separately — present together or absent together.
+ */
+const RIPGREP_TOOLS = ['glob', 'grep']
+
+/** The assembled request header the smoke asserts on. */
+interface LoggedHeader {
+  /** Assembled tool names, sorted. */
+  names: string[]
+  /** `bash`'s assembled parameter properties; the escalation pair is present only under a confining executor. */
+  bashArguments: Record<string, unknown>
+}
+
+/**
+ * Read the request header the loop assembled for its first request from the
+ * session log the smoke's workspace persisted — the model-visible composition
+ * itself, not a registry projection taken beside it.
+ * @param cwd - the smoke's temporary workspace.
+ * @returns the assembled catalog, system prompt, and `bash` argument shape.
+ */
+async function loggedHeader(cwd: string): Promise<LoggedHeader> {
+  const sessionsDir = join(cwd, '.sessions')
+  const entries = await readdir(sessionsDir, { recursive: true })
+  // A single keyless run writes one session log.
+  const logRelPath = entries.find(name => name.endsWith('.jsonl'))
+  if (logRelPath === undefined) throw new Error(`no session log written under ${sessionsDir}`)
+  const lines = (await readFile(join(sessionsDir, logRelPath), 'utf8')).split('\n').filter(Boolean)
+  for (const line of lines) {
+    const event = JSON.parse(line) as SessionEvent
+    if (event.type !== 'request/header') continue
+    const tools = event.data.header.tools ?? []
+    const bash = tools.find(schema => schema.name === 'bash')
+    return {
+      names: tools.map(schema => schema.name).sort(),
+      bashArguments: (bash?.parameters as { properties?: Record<string, unknown> } | undefined)?.properties ?? {},
+    }
+  }
+  throw new Error(`session log ${logRelPath} has no request/header event`)
+}
+
+describe('shipped dsh composition (real Loader tree in a PTY)', () => {
+  it('assembles exactly the shipped TUI catalog', async () => {
+    let observed: LoggedHeader | undefined
+    const output = await runTuiPtySmoke({
+      label: 'dsh shipped composition',
+      tempDirPrefix: 'dsh-shipped-tui-',
+      binScript: dshBinScript,
+      tsconfigPath,
+      configPath: keylessTail,
+      env: { DEEPSEEK_API_KEY: 'keyless-composition-no-call', DSH_TELEMETRY_DISABLED: '1' },
+      // Artifact CI builds and smokes concurrently on a contended runner.
+      ...(process.env.DSH_EXAMPLE_MODE === 'lib' ? { timeoutMs: 60_000 } : {}),
+      actions: [
+        { waitFor: COMPOSITION_SETTLED_MARKER, send: 'Describe the shipped composition.\r' },
+        { waitFor: COMPOSITION_REPLY_TEXT, send: '/exit\r' },
+      ],
+      inspect: async (cwd) => { observed = await loggedHeader(cwd) },
+    })
+    expect(output).toContain(COMPOSITION_REPLY_TEXT)
+    expect(observed?.names.filter(name => !RIPGREP_TOOLS.includes(name))).toEqual(EXPECTED_TUI_TOOLS)
+    expect([[], RIPGREP_TOOLS]).toContainEqual(observed?.names.filter(name => RIPGREP_TOOLS.includes(name)))
+    // The TUI mounts the unrestricted local executors, so `tool-bash` emits no
+    // escalation pair. Pinning its absence keeps a later sandbox change from
+    // arriving here unannounced.
+    expect(Object.keys(observed?.bashArguments ?? {})).not.toContain('sandbox_permissions')
+  }, LOADER_SMOKE_TEST_TIMEOUT_MS)
+})
--- a/apps/cli/tests/tui.snapshot.ts
+++ b/apps/cli/tests/tui.snapshot.ts
@@ -362,7 +362,8 @@ interface ScenarioResult {
 }

 async function runScenario(scenario: Scenario): Promise<ScenarioResult> {
-  const clock = vi.spyOn(Date, 'now').mockReturnValue(new Date(2026, 6, 21, 12, 0, 0).getTime())
+  const snapshotTime = new Date(2026, 6, 21, 12, 0, 0).getTime()
+  const clock = vi.spyOn(Date, 'now').mockReturnValue(snapshotTime)
  const fixtureFile = join(fixtureDir(scenario), 'session.jsonl')
  const childFiles = childFixturePaths(scenario)
  const prompts = userPrompts(await readFile(fixtureFile, 'utf8'))
@@ -543,6 +544,13 @@ async function runScenario(scenario: Scenario): Promise<ScenarioResult> {
        `manual summary did not start; status=${agent.status}; tail=${
          agent.session.events.slice(-8).map(event => event.type).join(',')
        }`)
+      clock.mockReturnValue(snapshotTime + 1_000)
+      await settleTerminal(terminal)
+      await expect.poll(() => terminal.snapshot()).toContain('dsh ⊙')
+      await expect.poll(() => terminal.snapshot()).toContain('Context being compacted 1.0s')
+      const liveCompaction = await terminal.snapshot()
+      expect(liveCompaction.indexOf('Context being compacted 1.0s')).toBeLessThan(liveCompaction.indexOf('dsh ⊙'))
+      clock.mockReturnValue(snapshotTime)

      // Real keystrokes: the prompt keeps its ordinary queue identity while
      // admission is reserved, and an injection appends immediately.