Merge branch 'master' into worktree/dsh-arg-parser

Integrate the Commander argument adapter and dsh-front-door work with master's
config-tree `dsh web` (#601: AppCLIEntry + apps/cli/cordis.yml) and the
packages/ui/acp → packages/acp/acp relocation.

- web.ts: keep master's AppCLIEntry-based boot, but take the adapter's parsed
  (host, port, dev) instead of an internal parseArgs. The adapter's host/port
  defaults (127.0.0.1/3080) match cordis.yml, so always passing them is
  behavior-equivalent to master's "undefined keeps the yml default".
- apps/cli/package.json: master's expanded config-tree dep set + commander.
- retire-readline Agent Note: point the TUI refusal proof at
  apps/cli/tests/built-bin.e2e.ts (both languages), re-record the pair.
- READMEs reconciled (demo-bin removal + master's ACP/channel rewording).

scripts/doc-budgets.manifest.json

@@ -7,5 +7,5 @@
   "docs/testing.md": 1020,
   "examples/AGENTS.md": 310,
   "packages/AGENTS.md": 660,
-  "packages/README.md": 760
+  "packages/README.md": 790
 }

scripts/gen-cordis-catalog.ts

@@ -207,8 +207,15 @@ const TYPE_LINK_EXEMPTIONS: Readonly<Record<string, string>> = {
   BashEnvVariableInfo: 'service-local metadata type is owned by packages/bash/tool-bash/src/index.ts',
   CompactAgentContext: 'compaction service input is owned by packages/compact/compact/src/index.ts',
   CreateAgentOptions: 'agent creation contract is owned by packages/core/agent/README.md',
+  DomainChanged: 'event-local snapshot is owned by packages/storage/storage-domain/src/events.ts',
+  DomainFacility: 'domain form facility is owned by packages/storage/storage-domain/README.md',
+  DomainSpec: 'domain declaration contract is owned by packages/storage/storage-domain/README.md',
+  StorageBackend: 'backend contract is owned by packages/storage/storage/src/backend.ts',
+  StorageForms: 'merge-extensible form map is owned by packages/storage/storage/src/index.ts',
   InvariantInstaller: 'service-local contribution contract is owned by packages/support/invariants/README.md',
   LocaleDict: 'service-local dictionary shape is owned by packages/client/i18n/src/index.ts',
+  WebBootGraph: 'web boot graph wire shape is owned by packages/client/modules/src/client/index.ts',
+  WebRoute: 'route registration contract is owned by packages/host/webserver/src/index.ts',
   ThemeTokens: 'service-local token dictionary is owned by packages/client/ui-theme/src/index.ts',
   Translate: 'service-local bound translator is owned by packages/client/i18n/src/index.ts',
   TuiOverlayRequest: 'service-local extension contract is owned by packages/ui/tui/README.md',
@@ -224,6 +231,8 @@ const TYPE_LINK_EXEMPTIONS: Readonly<Record<string, string>> = {
   WorkflowAgentEndInfo: 'event-local snapshot is owned by packages/workflow/workflow/src/index.ts',
   WorkflowAgentInfo: 'event-local snapshot is owned by packages/workflow/workflow/src/index.ts',
   WorkflowResultInfo: 'event-local snapshot is owned by packages/workflow/workflow/src/index.ts',
+  Workspace: 'workspace entity contract is owned by packages/workspace/workspace/README.md',
+  WorkspaceId: 'branded id is owned by packages/workspace/workspace/README.md',
 }
 
 /** Collect named references from parameter, generic-constraint/default, and return types. */

scripts/gen-doc-graphs.ts

@@ -77,7 +77,10 @@ const GROUP_ORDER = [
   'session-persistence',
   'session-query',
   'session-title',
+  'storage',
+  'workspace',
   'support',
+  'acp',
   'ui',
 ]
 
@@ -129,9 +132,26 @@ const SERVICE_ROLES: ServiceRole[] = [
     title: 'Durable session persistence seam',
     mode: 'seam',
     implementations: ['session-persistence-jsonl', 'session-persistence-sqlite'],
-    consumers: ['agent-loop', 'tool-bash', 'hooks-claude', 'hooks-codex', 'acp', 'session-query', 'session-query-sqlite'],
+    consumers: ['agent-loop', 'tool-bash', 'hooks-claude', 'hooks-codex', 'session-query', 'session-query-sqlite'],
     note: 'Backends persist the same SessionEvent vocabulary; apps choose a backend at composition time.',
   },
+  {
+    key: 'storage',
+    pkg: 'storage',
+    title: 'Non-session storage hub',
+    mode: 'seam',
+    implementations: ['storage-json', 'storage-sqlite'],
+    consumers: ['storage-domain', 'workspace'],
+    note: 'Backends register side by side under names; data forms (domain first) mount on the hub and translate typed operations into opaque KV-unit primitives.',
+  },
+  {
+    key: 'workspace',
+    pkg: 'workspace',
+    title: 'Workspace entity registry',
+    mode: 'core',
+    consumers: [],
+    note: 'Owns WorkspaceId-branded records over the domain form; sessionIds is the single source of ownership truth. RPC and GUI consumers arrive next phase.',
+  },
   {
     key: 'sessionQuery',
     pkg: 'session-query',
@@ -146,7 +166,7 @@ const SERVICE_ROLES: ServiceRole[] = [
     pkg: 'session-reference',
     title: 'Cross-session snapshot preparation',
     mode: 'core',
-    consumers: ['tui', 'acp'],
+    consumers: ['tui'],
     note: 'Projects bounded current-surface conversation snapshots into durable untrusted message context; host adapters own mention syntax.',
   },
   {
@@ -170,7 +190,7 @@ const SERVICE_ROLES: ServiceRole[] = [
     pkg: 'tools',
     title: 'Tool registry and guarded execution pipeline',
     mode: 'core',
-    consumers: ['agent-loop', 'tool-ask-user', 'tool-bash', 'tool-cordis', 'tool-fs', 'tool-pty', 'tool-skill', 'tool-subagent', 'tool-todo', 'tool-web', 'acp'],
+    consumers: ['agent-loop', 'tool-ask-user', 'tool-bash', 'tool-cordis', 'tool-fs', 'tool-pty', 'tool-skill', 'tool-subagent', 'tool-todo', 'tool-web'],
     note: 'Registers capabilities, owns Code Mode transport, and routes calls through pre-policy, monotonic guards, around dispatch, post-policy, and final-result observation.',
   },
   {
@@ -178,8 +198,8 @@ const SERVICE_ROLES: ServiceRole[] = [
     pkg: 'user-interaction',
     title: 'Human question/answer seam',
     mode: 'seam',
-    implementations: ['tui', 'acp'],
-    consumers: ['tool-ask-user', 'tui', 'acp'],
+    implementations: ['tui'],
+    consumers: ['tool-ask-user', 'tui'],
     note: 'UI front doors provide the active human-answer provider; tool-ask-user pauses a tool call on the provider-neutral ask() promise.',
   },
   {
@@ -187,7 +207,6 @@ const SERVICE_ROLES: ServiceRole[] = [
     pkg: 'plan-mode',
     title: 'Plan collaboration state',
     mode: 'core',
-    consumers: ['acp'],
     note: 'Folds logged plan/mode state, flushes user selections at turn boundaries, renders deployment-owned guidance, registers /plan, and keeps the plan-exit schema stable across transitions.',
   },
   {
@@ -195,8 +214,8 @@ const SERVICE_ROLES: ServiceRole[] = [
     pkg: 'commands',
     title: 'Human command registry',
     mode: 'core',
-    consumers: ['tui', 'acp'],
-    note: 'Plugins register direct human commands; TUI and ACP consume the same effective per-agent catalog without sending invocations to the model.',
+    consumers: ['tui'],
+    note: 'Plugins register direct human commands; TUI consumes the effective per-agent catalog without sending invocations to the model.',
   },
   {
     key: 'tui',
@@ -295,7 +314,6 @@ const SERVICE_ROLES: ServiceRole[] = [
     title: 'Permission presets',
     mode: 'core',
     implementations: [],
-    consumers: ['acp'],
     note: 'User-facing preset table (`workspace-write`/`danger-full-access`) bundling the sandbox-mode and approval-policy knobs; a switch writes one `permission/preset` event through to both knob events.',
   },
   {
@@ -361,6 +379,22 @@ const SERVICE_ROLES: ServiceRole[] = [
     consumers: ['spill-policy'],
     note: 'The backend saves oversized tool text and returns a model-facing locator plus retrieval hint; spill-policy is the tools/post-execute consumer that decides when to spill.',
   },
+  {
+    key: 'httpServer',
+    pkg: 'webserver',
+    title: 'HTTP route registration',
+    mode: 'core',
+    consumers: ['connection', 'modules', 'hmr'],
+    note: 'Plain node:http carrier: named-route registry, index transform taps, and the static dist fallback; web-transport plugins register their own routes.',
+  },
+  {
+    key: 'clientModuleHost',
+    pkg: 'modules',
+    title: 'Client plugin graph host',
+    mode: 'core',
+    consumers: ['hmr'],
+    note: 'Composes the __DSH_BOOT__ entry graph from an incremental dshClient scan, serves plugin bundles, and notifies rebuilt/graph-changed subscribers.',
+  },
   {
     key: 'workflows',
     pkg: 'workflow',
@@ -531,10 +565,10 @@ const APP_EXAMPLES = [
   {
     id: 'acp',
     rel: 'examples/acp-agent/composition.md',
-    title: 'ACP Agent App Composition',
+    title: 'ACP Automation App Composition',
     label: 'examples/acp-agent',
     config: 'examples/acp-agent/cordis.yml',
-    summary: 'The ACP demo exposes the same agent spine over JSON-RPC stdio, with no stdout logger and no pre-created agent; clients create sessions through the ACP bridge.',
+    summary: 'The ACP demo exposes fresh baseline-prompt agent sessions to programmatic clients over JSON-RPC stdio, with no stdout logger, human UI, or pre-created agent.',
   },
 ]
 
@@ -550,7 +584,7 @@ function renderAppExpansion(lines: string[], appNode: string, pluginName: string
   } else if (pluginName === '@deepseek-ai/dsh-cli-demo') {
     lines.push(`  ${appNode} --> ${nodeId('frontdoor', 'cli')}["one-shot driver<br/>format-pure stdout<br/>fresh top-level agent"]`)
   } else if (pluginName === '@deepseek-ai/dsh-acp-demo') {
-    lines.push(`  ${appNode} --> ${nodeId('frontdoor', 'acp')}["@deepseek-ai/dsh-acp<br/>JSON-RPC stdio bridge<br/>sessions created by client"]`)
+    lines.push(`  ${appNode} --> ${nodeId('frontdoor', 'acp')}["@deepseek-ai/dsh-acp<br/>automation-only JSON-RPC stdio<br/>fresh sessions created by client"]`)
   }
   lines.push(
     `  ${agentCore} --> ${nodeId('spine', 'llm')}["ctx.llm"]`,
@@ -1039,35 +1073,6 @@ function renderToolPipeline(): string {
   ].join('\n')
 }
 
-function renderSnapshotReplay(): string {
-  const maintenance = 'curated Mermaid sequence based on the snapshot test harness'
-  return [
-    ...generatedHeader('ACP Snapshot Replay'),
-    'This graph explains what a snapshot scenario proves: recorded real-model session logs are replayed keylessly, ACP stdout is normalized and diffed, and scenario workspaces preserve tool side effects that the UI stream alone cannot prove.',
-    '',
-    '```mermaid',
-    'sequenceDiagram',
-    '  participant Recorder as Real API recording',
-    '  participant Fixture as snapshot fixture',
-    '  participant Workspace',
-    '  participant Replay as llm-replay adapter',
-    '  participant ACP as acp-agent subprocess',
-    '  participant Expected as stdout expected output',
-    '  Recorder->>Fixture: session.jsonl + workspace inputs',
-    '  Fixture->>Workspace: seed files and hook configs',
-    '  Fixture->>Replay: recorded StreamChunk script',
-    `  Replay->>ACP: deterministic ${mermaidCode('llm/stream')} chunks`,
-    '  ACP->>Workspace: bash, fs, and hook side effects',
-    '  ACP->>Expected: normalized sessionUpdate stream',
-    '  Expected-->>ACP: diff must be empty',
-    '```',
-    '',
-    'The fs and hook snapshot matrix is valuable because it proves world state, hook decisions, and failed tool-card rendering, not just that replay returns text.',
-    '',
-    ...maintenanceFooter(maintenance),
-  ].join('\n')
-}
-
 function renderDocs(): GraphDoc[] {
   const pkgs = collectPackageGraph(root, GROUP_ORDER, 'gen-doc-graphs')
   const docs: GraphDoc[] = [
@@ -1076,7 +1081,6 @@ function renderDocs(): GraphDoc[] {
     { rel: 'docs/event-producer-consumer.md', content: renderEventRelations(pkgs) },
     { rel: 'docs/agent-lifecycle.md', content: renderLifecycle() },
     { rel: 'docs/tool-execution-pipeline.md', content: renderToolPipeline() },
-    { rel: 'packages/ui/acp/snapshot-replay.md', content: renderSnapshotReplay() },
   ]
   docs.unshift({ rel: 'docs/graph-atlas.md', content: renderIndex(docs) })
   return docs
@@ -1092,7 +1096,6 @@ function renderIndex(docs: GraphDoc[]): string {
     'docs/event-producer-consumer.md': 'event producer/consumer matrix',
     'docs/agent-lifecycle.md': 'agent turn and step lifecycle',
     'docs/tool-execution-pipeline.md': 'tool execution pipeline',
-    'packages/ui/acp/snapshot-replay.md': 'ACP snapshot replay',
   }
   const modes: Record<string, string> = {
     'docs/capability-seams.md': 'hybrid generated',
@@ -1103,7 +1106,6 @@ function renderIndex(docs: GraphDoc[]): string {
     'docs/event-producer-consumer.md': 'hybrid generated',
     'docs/agent-lifecycle.md': 'curated',
     'docs/tool-execution-pipeline.md': 'curated',
-    'packages/ui/acp/snapshot-replay.md': 'curated',
   }
   const rows = [
     '| [module dependency graph](module-graph.md) | `generated` |',

scripts/gen-module-graph.ts

@@ -38,6 +38,7 @@ const GROUP_ORDER = [
   'session-query',
   'session-title',
   'support',
+  'acp',
   'ui',
 ]
 

scripts/gen-tool-catalog.ts

@@ -354,7 +354,7 @@ const TOOL_PACKAGES: ToolPackage[] = [
       await ctx.plugin(ToolTodo)
     },
     note:
-      'todo_write is session-owned state; UIs render the latest todo/write event as a checklist or ACP plan.',
+      'todo_write is session-owned state; UIs render the latest todo/write event as a checklist.',
   },
   {
     pkg: '@deepseek-ai/dsh-tool-workflow',

scripts/translation-pairing.manifest.json

@@ -134,7 +134,7 @@
     ".agents/notes/proposed/feature/2026-07-07-claude-code-and-codex-subagent-backends.md",
     ".agents/notes/proposed/feature/2026-07-08-interactive-side-sessions.md",
     ".agents/notes/implemented/feature/2026-07-10-sqlite-session-query-provider.md",
-    ".agents/notes/proposed/feature/2026-07-13-stream-workflow-progress-through-tool-calls.md",
+    ".agents/notes/rejected/feature/2026-07-13-stream-workflow-progress-through-tool-calls.md",
     ".agents/notes/proposed/process/2026-06-11-api-extractor-reports.md",
     ".agents/notes/proposed/process/2026-06-11-architectural-conformance.md",
     ".agents/notes/proposed/process/2026-06-11-supply-chain-and-vendor-drift.md",