fix(cli): close shared config review gaps

apps/cli/composition.md

@@ -32,6 +32,8 @@ flowchart LR
   cfg --> plugin_tui_llm_pi_ai
   plugin_tui_session_persistence_jsonl["session-persistence-jsonl<br/>@deepseek-ai/dsh-session-persistence-jsonl"]
   cfg --> plugin_tui_session_persistence_jsonl
+  plugin_tui_session_query_sqlite["session-query-sqlite<br/>@deepseek-ai/dsh-session-query-sqlite"]
+  cfg --> plugin_tui_session_query_sqlite
   plugin_tui_subprocess["subprocess<br/>@deepseek-ai/dsh-subprocess-local"]
   cfg --> plugin_tui_subprocess
   plugin_tui_bash_local["bash-local<br/>@deepseek-ai/dsh-bash-local"]
@@ -114,6 +116,7 @@ flowchart LR
 | `llm-retry` | `@deepseek-ai/dsh-llm-retry` |
 | `llm-pi-ai` | `@deepseek-ai/dsh-llm-pi-ai` |
 | `session-persistence-jsonl` | `@deepseek-ai/dsh-session-persistence-jsonl` |
+| `session-query-sqlite` | `@deepseek-ai/dsh-session-query-sqlite` |
 | `subprocess` | `@deepseek-ai/dsh-subprocess-local` |
 | `bash-local` | `@deepseek-ai/dsh-bash-local` |
 | `tool-bash` | `@deepseek-ai/dsh-tool-bash` |

apps/cli/config/base.cordis.yml

@@ -70,7 +70,15 @@
 - id: session-persistence-jsonl
   name: '@deepseek-ai/dsh-session-persistence-jsonl'
   config:
-    root: !!js process.getBuiltinModule('node:path').join(process.env.DSH_HOME || process.getBuiltinModule('node:path').join(process.getBuiltinModule('node:os').homedir(), '.dsh'), 'sessions')
+    root: !!js >-
+      (() => { const path = process.getBuiltinModule('node:path'); const home = process.getBuiltinModule('node:os').homedir(); const configured = process.env.DSH_HOME; const selected = configured !== undefined && configured.trim().length > 0 ? configured : path.join(home, '.dsh'); const expanded = selected === '~' ? home : selected.startsWith('~/') || selected.startsWith('~\\') ? path.join(home, selected.slice(2)) : selected; return path.join(path.resolve(expanded), 'sessions') })()
+
+# TUI consumes this shared session capability. Its launcher supplies a unique
+# process-local path; non-TUI surfaces disable the row in their overlay.
+- id: session-query-sqlite
+  name: '@deepseek-ai/dsh-session-query-sqlite'
+  config:
+    path: !!js launcherSessionQueryPath ?? './.sessions/session-query.db'
 
 - id: subprocess
   name: '@deepseek-ai/dsh-subprocess-local'

apps/cli/config/tui.cordis.yml

@@ -50,8 +50,7 @@
   config:
     cwd: !!js process.cwd()
 
-# The shipped TUI presents the native tool registry. `examples/code-mode` is the
-# overlay that switches this row to the `run_code` transport.
+# The shipped TUI presents the native tool registry.
 - id: tools
   config:
     mode: native
@@ -78,11 +77,6 @@
     # 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-query-sqlite
-      name: '@deepseek-ai/dsh-session-query-sqlite'
-      config:
-        path: !!js launcherSessionQueryPath ?? './.sessions/session-query.db'
-
     - id: session-reference
       name: '@deepseek-ai/dsh-session-reference'
 

apps/cli/config/web.cordis.yml

@@ -14,9 +14,9 @@
 - id: hmr
   disabled: true
 
-- id: system-prompt
-  config:
-    persona: ''
+# Session query is a TUI capability; Web owns its own session presentation.
+- id: session-query-sqlite
+  disabled: true
 
 - id: tools
   config:
@@ -26,10 +26,6 @@
     # once the web UI owns the choice per session.
     mode: !!js process.env.DSH_TOOLS_MODE
 
-- id: agent-loop
-  config:
-    agents: []
-
 - id: llm-deepseek
   config:
     apiKey: !!js process.env.DEEPSEEK_API_KEY

apps/cli/package.json

@@ -71,6 +71,7 @@
     "@deepseek-ai/dsh-sandbox-local": "workspace:^",
     "@deepseek-ai/dsh-sandbox-policy": "workspace:^",
     "@deepseek-ai/dsh-scope": "workspace:^",
+    "@deepseek-ai/dsh-tool-cordis": "workspace:^",
     "@deepseek-ai/dsh-session": "workspace:^",
     "@deepseek-ai/dsh-session-checkpoint-policy": "workspace:^",
     "@deepseek-ai/dsh-session-persistence-jsonl": "workspace:^",

apps/cli/src/app-cli-entry.ts

@@ -12,7 +12,6 @@ import { createRequire } from 'node:module'
 import { networkInterfaces } from 'node:os'
 import { join, resolve } from 'node:path'
 import { Context } from 'cordis'
-import type { FiberState } from 'cordis'
 import type { PatchOptions } from '@cordisjs/plugin-include'
 import yaml from 'js-yaml'
 import { boot, installFailLoud, loadEnv, loadOverlayPatches, loadPersonalPatches } from '@deepseek-ai/dsh-app-boot'
@@ -88,14 +87,6 @@ const jsExprType = new yaml.Type('tag:yaml.org,2002:js', {
 })
 const includeYamlSchema = yaml.JSON_SCHEMA.extend(jsExprType)
 
-/**
- * Value mirror of cordis's `FiberState` const enum members the sweep needs
- * (a const enum has no runtime object to import; same rationale as the
- * client-side mirror in dsh-client-web).
- */
-const FIBER_ACTIVE = 2 as FiberState.ACTIVE
-const FIBER_PENDING = 0 as FiberState.PENDING
-
 /** Constructor facts for one dsh invocation over the shared composition (argv already parsed by the surface bin). */
 export interface AppCLIEntryOptions {
   /** Absolute path of the shared base config the Loader includes. */
@@ -174,10 +165,8 @@ export class AppCLIEntry {
   }
 
   /**
-   * Compose the patch set from the non-yml config sources: computed
-   * engineering defaults (the global session root), profile json (user
-   * config, overriding those defaults), CLI flags, and the resolved frontend
-   * dist. Patches replace a row's config wholesale, so each patched row's yml
+   * Compose the patch set from profile json, CLI flags, and the resolved
+   * frontend dist. Patches replace a row's config wholesale, so each patched row's yml
    * static values are re-read here (bypass parse) and merged under the overrides.
    */
   private composePatches(): void {
@@ -189,7 +178,6 @@ export class AppCLIEntry {
       overrides.set(entryId, bag)
     }
 
-
     // Source 1: profile json (missing file = empty; unmapped key = loud).
     for (const [key, value] of Object.entries(this.readProfile())) {
       const mapping = PROFILE_MAPPINGS.find(m => m.jsonPath === key)
@@ -215,7 +203,6 @@ export class AppCLIEntry {
     // user config. Workspace knowledge stays here.
     put('webserver', 'distIndex', this.resolveDistIndex())
 
-
     this.patches = [...overrides.entries()].map(([id, bag]) => {
       const yml = rows.get(id)
       if (yml === undefined) throw new Error(`dsh: patch target row "${id}" not found in ${this.options.configPath}`)
@@ -241,28 +228,9 @@ export class AppCLIEntry {
     })
   }
 
-  /**
-   * Shared boot catches import failures, installFailLoud catches late apply
-   * rejections, and the all-ACTIVE sweep
-   * below catches PENDING fibers (cordis inject waiting has no timeout).
-   */
+  /** Install the diagnostic for plugin rejections that happen after settled boot. */
   private assertBoot(): void {
     installFailLoud('dsh')
-    const failures: string[] = []
-    for (const entry of this.ctx.loader.entries()) {
-      if (entry.fiber === undefined || entry.disabled) continue
-      const state = entry.fiber.state
-      if (state === FIBER_ACTIVE) continue
-      if (state === FIBER_PENDING) {
-        const missing = Object.keys(entry.fiber.inject).filter(service => this.ctx.get(service) === undefined)
-        failures.push(`${entry.options.name}: pending (waiting for service${missing.length === 1 ? '' : 's'}: ${missing.join(', ') || 'unknown'})`)
-      } else {
-        failures.push(`${entry.options.name}: fiber state ${String(state)}`)
-      }
-    }
-    if (failures.length > 0) {
-      throw new Error(`dsh: ${String(failures.length)} entr${failures.length === 1 ? 'y' : 'ies'} did not activate\n${failures.join('\n')}`)
-    }
   }
 
   /**

apps/cli/src/args.ts

@@ -126,6 +126,9 @@ Examples:
   dsh --resume <id>       continue a past session
 `)
     .exitOverride()
+    // Stop parent options at a subcommand boundary so `web --config` belongs to
+    // Web while `--config ... web` remains a leaked default-surface option.
+    .enablePositionalOptions()
     // Default surface: option-only (no positional), so `web` can be a real
     // subcommand without a positional collision.
     .option('-p, --prompt <task>', 'answer this task without the interactive UI, then exit')

apps/cli/src/tui.ts

@@ -10,8 +10,8 @@
  * workspace, and an in-place resume enters the selected session's own directory.
  * `dsh meta`
  * ({@link runMeta}) is the one exception — it makes this harness checkout the
- * workspace. `dsh upgrade` ({@link runSkillSession}) are fresh
- * sessions whose first turn auto-invokes a bundled skill. After boot, the
+ * workspace. `dsh upgrade` ({@link runSkillSession}) is a fresh
+ * session whose first turn auto-invokes a bundled skill. After boot, the
  * agent's system prompt is told the path to this harness checkout so it can
  * find its own source.
  * @module @deepseek-ai/dsh/tui
@@ -146,7 +146,7 @@ export async function runTui(
   const app: { current?: Context } = {}
   // Resume always enters the default surface because meta rejects parent
   // options, including `--resume`. The resumed session already persists its cwd.
-  const resumeArgs = (sessionId: string, _targetCwd?: string): string[] => [
+  const resumeArgs = (sessionId: string): string[] => [
     `--resume=${sessionId}`,
     // Both config flags must survive the handoff: resuming into a different
     // tree than the session was created in would silently change the agent.
@@ -167,7 +167,7 @@ export async function runTui(
         process.execPath,
         ...process.execArgv,
         entry,
-        ...resumeArgs(sessionId, cwd),
+        ...resumeArgs(sessionId),
       ]
       // `execve` inherits the cwd, and the target session may belong to another
       // workspace. Enter it BEFORE teardown commits: an unreachable directory
@@ -199,14 +199,14 @@ export async function runTui(
   const replaceTree = configReplace !== undefined
   const patches = replaceTree ? [] : [
     ...loadOverlayPatches(NAME, TUI_OVERLAY),
-    ...config === undefined
+    ...resolvedConfig === undefined
       ? loadPersonalPatches(NAME) ?? []
-      : loadOverlayPatches(NAME, resolveConfigPath(resolve(config), undefined)),
+      : loadOverlayPatches(NAME, resolveConfigPath(resolvedConfig, undefined)),
   ]
   const queryIndexPath = join(tmpdir(), SESSION_QUERY_DB)
   const ctx = await boot(
     NAME,
-    replaceTree ? resolveConfigPath(resolve(configReplace), undefined) : BASE_CONFIG,
+    resolvedConfigReplace === undefined ? BASE_CONFIG : resolveConfigPath(resolvedConfigReplace, undefined),
     patches,
     (hostCtx) => {
       // The launcher owns session identity and the exit line: a config-mounted
@@ -230,7 +230,7 @@ export async function runTui(
           rm(`${queryIndexPath}-wal`, { force: true }),
           rm(`${queryIndexPath}-shm`, { force: true }),
         ])
-      }, 'launcherSessionQueryPath.cleanup')
+      }, `${SESSION_QUERY_SQLITE_PATH_KEY}.cleanup`)
       if (resumeHost !== undefined) hostCtx.provide('tuiResumeHost', resumeHost)
       // Seed the first turn only for a fresh session, so resuming never
       // re-invokes the skill.

apps/cli/tests/args.spec.ts

@@ -31,10 +31,9 @@ describe('parseDshArgs', () => {
     expect(parse(['--resume', 'sess', '--config', 'app.yml'])).toEqual({ mode: 'tui', config: 'app.yml', resume: 'sess' })
     expect(parse(['-p', 'do the thing'])).toEqual({ mode: 'headless', prompt: 'do the thing' })
     expect(parse(['meta'])).toEqual({ mode: 'meta' })
-    // Credential setup is option-free: it writes the Harness-home .env, so
-    // there is nothing for a flag to select.
     // Bare `web` carries no host/port: the shipped Web overlay owns the default.
     expect(parse(['web'])).toEqual({ mode: 'web', dev: false })
+    expect(parse(['web', '--config', 'web.yml'])).toEqual({ mode: 'web', dev: false, config: 'web.yml' })
     // Host/port are unvalidated pass-throughs (the webserver schema gates them
     // at boot); the adapter only coerces the port string to a number.
     expect(parse(['web', '--host', '0.0.0.0', '--port', '8080', '--dev', '--workspace-root', '/w']))
@@ -72,7 +71,7 @@ describe('parseDshArgs', () => {
     expect(exitCode(['meta', '--config', 'c.yml'])).toBe(1)
     expect(exitCode(['meta', '--config-replace', 'tree.yml'])).toBe(1)
     expect(exitCode(['meta', '-p', 'task'])).toBe(1)
-    // `upgrade` take no options: any leaked default-surface flag is a
+    // `upgrade` takes no options: any leaked default-surface flag is a
     // mistyped invocation, not a silently-dropped input.
     expect(exitCode(['upgrade', '--resume', 's'])).toBe(1)
     expect(exitCode(['upgrade', '--config', 'c.yml'])).toBe(1)