dsh-code 1.0.4 → 1.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-code",
   "description": "DeepSeek Harness CLI core bundle: interactive coding terminal, durable sessions, and model management for dsh --profile cli",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "module",
   "bin": {
     "deepseek": "./bin/deepseek.mjs",
@@ -63,8 +63,9 @@
     "node": "^22.19 || >=24"
   },
   "dependencies": {
-    "@deepseek-ai/dsh-authorization": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-web-fetch-http": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-authorization": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-web-fetch-http": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-util-values": "0.1.2-rc.1",
     "@deepseek-ai/schemastery": "^3.18.1",
     "chalk": "^5.6.2",
     "commander": "^15.0.0",
@@ -74,32 +75,32 @@
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/cordis-plugin-loader": "^1.0.2",
-    "@deepseek-ai/dsh-attachment": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-agent": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-agent-default-model": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-agent-presets": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-cmdline": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-code-runtime-worker-thread": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-commands": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-compaction": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-cordis-host-runner": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-credentials": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-file-reference-local": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-goal": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-invariants": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-jobs": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm-retry": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-permission-presets": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-plan-mode": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session-persistence": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session-reference": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session-title": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-skill": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-user-approval": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-user-questions": "0.1.1-rc.2"
+    "@deepseek-ai/dsh-attachment": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent-default-model": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent-presets": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-cmdline": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-code-runtime-worker-thread": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-commands": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-cordis-host-runner": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-file-reference-local": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-goal": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-invariants": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-jobs": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm-retry": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-permission-presets": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-plan-mode": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session-persistence": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session-reference": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session-title": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-skill": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-user-approval": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-user-questions": "0.1.2-rc.1"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": { "optional": true },
@@ -132,23 +133,25 @@
     "@deepseek-ai/dsh-user-questions": { "optional": true }
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-agent-presets": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-attachment": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-compaction": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-commands": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-credentials": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-goal": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-jobs": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm-retry": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-permission-presets": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-plan-mode": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session-persistence": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session-reference": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session-title": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-skill": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-user-approval": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-user-questions": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-agent-presets": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-attachment": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-commands": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-tool-todo": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-goal": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-jobs": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm-retry": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-permission-presets": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-plan-mode": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session-persistence": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session-reference": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session-title": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-skill": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-user-approval": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-user-questions": "0.1.2-rc.1",
     "@types/node": "^24.0.0",
     "@types/react": "~18.3.1",
     "tsdown": "^0.22.2",

package/src/app.ts

@@ -21,7 +21,7 @@ import {
 import { Box, Static, Text, useInput, useStdin, useStdout, type Key } from 'ink'
 import type { CommandDescriptor } from '@deepseek-ai/dsh-commands'
 import type { ImageBlock } from '@deepseek-ai/dsh-llm'
-import type { TodoItem } from '@deepseek-ai/dsh-session'
+import type { TodoItem } from '@deepseek-ai/dsh-tool-todo'
 import type { AskUserQuestionAnswerItem, AskUserQuestionItem } from '@deepseek-ai/dsh-user-questions'
 import type { AuthorizationInteraction, AuthorizationStatus } from '@deepseek-ai/dsh-authorization'
 import {

package/src/git-workflow.ts

@@ -1,4 +1,9 @@
-/** Read-only Git inspection used by /diff and /review. */
+/**
+ * Read-only Git inspection used by /diff and /review. Every diff
+ * invocation carries --no-ext-diff and --no-textconv, so configured
+ * external diff drivers and text converters can never execute as a
+ * side effect of reading a diff.
+ */
 
 import { execFile } from 'node:child_process'
 
@@ -36,12 +41,12 @@ export function parseGitDiffFiles(text: string): readonly GitDiffFile[] {
 /** Parse the intentionally small, option-safe /diff argument vocabulary. */
 export function parseGitDiffSpec(argument: string): GitDiffSpec {
   const value = argument.trim()
-  if (value === '') return { label: 'working tree vs HEAD', args: ['diff', '--no-ext-diff', '--unified=3', 'HEAD', '--'] }
+  if (value === '') return { label: 'working tree vs HEAD', args: ['diff', '--no-ext-diff', '--no-textconv', '--unified=3', 'HEAD', '--'] }
   if (value === '--staged' || value === '--cached') {
-    return { label: 'staged changes', args: ['diff', '--no-ext-diff', '--unified=3', '--cached', '--'] }
+    return { label: 'staged changes', args: ['diff', '--no-ext-diff', '--no-textconv', '--unified=3', '--cached', '--'] }
   }
   if (value.startsWith('-') || /\s/u.test(value)) throw new Error('usage: /diff [--staged|git-ref]')
-  return { label: `changes since ${value}`, args: ['diff', '--no-ext-diff', '--unified=3', value, '--'] }
+  return { label: `changes since ${value}`, args: ['diff', '--no-ext-diff', '--no-textconv', '--unified=3', value, '--'] }
 }
 
 function executeGit(cwd: string, args: readonly string[], signal?: AbortSignal): Promise<string> {
@@ -56,8 +61,18 @@ function executeGit(cwd: string, args: readonly string[], signal?: AbortSignal):
   })
 }
 
+/** Arguments for the unstaged-only fallback below. */
+const UNSTAGED_DIFF_ARGS = ['diff', '--no-ext-diff', '--no-textconv', '--unified=3', '--'] as const
+
+/** Whether the repository has at least one commit (a HEAD revision). */
+function hasHeadRevision(cwd: string, signal?: AbortSignal): Promise<boolean> {
+  return executeGit(cwd, ['rev-parse', '--verify', '--quiet', 'HEAD'], signal)
+    .then(() => true)
+    .catch(() => false)
+}
+
 /**
- * Load one complete textual diff without invoking external diff drivers.
+ * Load one complete textual diff without invoking external programs.
  * @param signal - aborted by the caller on session switches/quit, killing the
  * git subprocess instead of letting a stale repository's diff land later.
  */
@@ -67,11 +82,15 @@ export async function loadGitDiff(cwd: string, argument: string, signal?: AbortS
     const text = await executeGit(cwd, spec.args, signal)
     return { title: `git diff - ${spec.label}`, files: parseGitDiffFiles(text) }
   } catch (error: unknown) {
-    // An unborn repository has no HEAD. Preserve useful unstaged output for
-    // the default form while still surfacing all other Git failures.
-    if (argument.trim() !== '') throw error
-    const text = await executeGit(cwd, ['diff', '--no-ext-diff', '--unified=3', '--'], signal)
-    return { title: 'git diff - working tree', files: parseGitDiffFiles(text) }
+    // Only a repository without commits (no HEAD to diff against) may
+    // narrow the default form to the unstaged fallback. Every other
+    // failure — output past the buffer limit, a corrupt index, a missing
+    // repository, or the caller aborting between the two calls — must
+    // surface, not silently shrink what /diff and /review end up seeing
+    // (an aborted probe would otherwise masquerade as an unborn repo).
+    if (argument.trim() !== '' || signal?.aborted === true || (await hasHeadRevision(cwd, signal))) throw error
+    const text = await executeGit(cwd, UNSTAGED_DIFF_ARGS, signal)
+    return { title: 'git diff - working tree (no commits yet)', files: parseGitDiffFiles(text) }
   }
 }
 

package/src/history.ts

@@ -42,16 +42,25 @@ export function parseHistoryFile(raw: string, max = HISTORY_MAX_ENTRIES): readon
 }
 
 /**
- * Append one entry to the persistent file content: JSON line, capped to the
- * newest `max` entries with a trailing newline.
- * @param current - existing file content.
- * @param text - submission to persist.
- * @param max - entry cap.
- * @returns the new file content.
+ * The append unit for the persistent file: one JSON line, so a multi-line
+ * draft still occupies exactly one physical line. Each submission appends
+ * this unit at the end of the file, so concurrent terminals add entries
+ * after each other. Node chunks one append at 512 KiB: a pasted entry
+ * beyond that size could interleave mid-line with another writer's
+ * chunks, and the damaged line then drops out at the next parse —
+ * recall tolerates the loss by design.
  */
-export function appendHistoryContent(current: string, text: string, max = HISTORY_MAX_ENTRIES): string {
-  const entries = [...parseHistoryFile(current, max), text].slice(-max)
-  return entries.map(serializeHistoryEntry).join('\n') + '\n'
+export function historyLine(text: string): string {
+  return serializeHistoryEntry(text) + '\n'
+}
+
+/**
+ * Whether the file on disk differs from its canonical form (deduped and
+ * capped). True means stale lines have accumulated and the next boot
+ * should rewrite it once, atomically.
+ */
+export function needsCompaction(raw: string, max = HISTORY_MAX_ENTRIES): boolean {
+  return serializeHistoryList(parseHistoryFile(raw, max)) !== raw
 }
 
 /**
@@ -70,10 +79,10 @@ export function recordLocalEntry(local: readonly string[], text: string, max = H
 }
 
 /**
- * Serialize a capped entry list to the history file format (one JSON line per
- * entry, trailing newline). The runner writes the in-memory list as the whole
- * file, so rapid same-process submissions cannot lose entries to a
- * read-modify-write race (the file is never read back before writing).
+ * Serialize a capped entry list to the history file format (one JSON line
+ * per entry, trailing newline). The boot-time compaction writes this
+ * canonical form once when stale lines have accumulated; submissions
+ * themselves only ever append a single line.
  * @param entries - the entries to persist, oldest first.
  * @returns the file content, '' for an empty list.
  */

package/src/index.ts

@@ -12,7 +12,7 @@
 import { randomUUID } from 'node:crypto'
 import { readFileSync } from 'node:fs'
 import { homedir } from 'node:os'
-import { mkdir, rm, stat, writeFile as writeFileAsync } from 'node:fs/promises'
+import { appendFile as appendFileAsync, mkdir, rm, stat, writeFile as writeFileAsync } from 'node:fs/promises'
 import { basename, dirname, join } from 'node:path'
 import { createElement } from 'react'
 import type { Context } from '@deepseek-ai/cordis'
@@ -48,10 +48,13 @@ import {
 } from './provider-settings.ts'
 import { createMentions, type MentionsApi } from './mentions.ts'
 import { mountQuestionProvider, type QuestionStore } from './questions.ts'
+// Type-only import merges the settings Events declarations ('settings/updated',
+// 'settings/document-updated') into this program's Cordis bus typing.
+import type {} from '@deepseek-ai/dsh-settings'
 import { createTranscriptStore, type TranscriptStore } from './store.ts'
 import { createSubagentFeed, type SubagentFeedView } from './subagents.ts'
 import { parseStatuslineItems } from './render/status.ts'
-import { HISTORY_MAX_ENTRIES, parseHistoryFile, serializeHistoryList } from './history.ts'
+import { historyLine, HISTORY_MAX_ENTRIES, needsCompaction, parseHistoryFile, serializeHistoryList } from './history.ts'
 import { watchSkills, type SkillsView } from './skills.ts'
 import { toolArgumentsPreview } from './render/tool-preview.ts'
 import { buildExportMarkdown } from './render/export.ts'
@@ -70,7 +73,7 @@ import { selectForkSeed } from './fork.ts'
 import { buildReviewPrompt, loadGitDiff } from './git-workflow.ts'
 import type { TuiStartup } from './startup.ts'
 import { SessionSwitchQueue } from './session-switch.ts'
-import { agentPresetsFrom, resolvePreset, selectPreset } from './presets.ts'
+import { agentPresetsFrom, normalizePresetId, resolvePreset, selectPreset } from './presets.ts'
 import {
   applyPendingPermission,
   cyclePermission as cyclePermissionPreset,
@@ -94,7 +97,7 @@ import {
   type SessionQueryService,
   type SessionRow,
 } from './session-directory.ts'
-import { createUserSettingsPersistence } from './settings-file.ts'
+import { createUserSettingsPersistence, writeFileAtomically } from './settings-file.ts'
 
 /** Stable Cordis plugin name. */
 export const name = 'tui-runner'
@@ -406,7 +409,9 @@ async function run(ctx: Context, startup: TuiStartup, io: TuiIo): Promise<void>
       ? {}
       : { picked: pendingSelection }
     let mode = next.resume ? next.mode : next.mode ?? pendingMode
-    if (!next.resume) mode = (await presets.resolve(mode)).id
+    // An explicit `--mode` or the settings-layer service default may still name
+    // an id an upstream rename retired (code → ptc); normalize both.
+    if (!next.resume) mode = (await presets.resolve(normalizePresetId(mode ?? presets.defaultId))).id
     const setup = async (agentCtx: Context): Promise<void> => {
       const sessionPreset = next.resume
         ? resolvePreset(agentCtx.agent!.session)
@@ -457,7 +462,7 @@ async function run(ctx: Context, startup: TuiStartup, io: TuiIo): Promise<void>
       handle,
       agent: handle.agent,
       session,
-      store: createTranscriptStore(session.events),
+      store: createTranscriptStore(session.snapshotEvents()),
       mentions: createMentions(ctx, handle.agent, session.header.cwd ?? nextCwd),
       mode: mode ?? 'standard',
       selection: selectionState,
@@ -590,10 +595,13 @@ async function run(ctx: Context, startup: TuiStartup, io: TuiIo): Promise<void>
     return next().then(resolved => applyModelSelectionToConfig(resolved, picked))
   })
 
-  // ask_user_question provider: the single UI provider on the shared service,
-  // one request on screen at a time. Plan reviews (exit_plan_mode) arrive
-  // through this same pipe.
-  const questions: QuestionStore = mountQuestionProvider(ctx)
+  // ask_user_question answerer: one waterfall listener, one request on
+  // screen at a time. Plan reviews (exit_plan_mode) arrive through this same
+  // pipe; sibling answerers stay usable through the claim/defer split.
+  const questions: QuestionStore = mountQuestionProvider(
+    ctx,
+    candidate => agent !== undefined && candidate.id === agent.id,
+  )
 
   // The bridge the React app registers on mount: local notices from the
   // process side (unknown commands, switch confirmations, cancels).
@@ -696,22 +704,39 @@ async function run(ctx: Context, startup: TuiStartup, io: TuiIo): Promise<void>
   // recall is a convenience surface, never a gate.
   const historyPath = join(homedir(), '.dsh', 'dsh-code', 'history.jsonl')
   let inputHistory: readonly string[] = []
+  let historyWriteChain: Promise<void> = Promise.resolve()
   try {
-    inputHistory = parseHistoryFile(readFileSync(historyPath, 'utf8'))
+    const rawHistory = readFileSync(historyPath, 'utf8')
+    inputHistory = parseHistoryFile(rawHistory)
+    // Stale lines (adjacent duplicates, dropped garbage, an over-cap tail)
+    // accumulate in an append-only file; rewrite the canonical form once
+    // per boot. The rewrite rides the same chain, so it lands before any
+    // submission the user types next. An entry another terminal appends
+    // inside the read-to-rename window is dropped — a millisecond-scale
+    // gap at boot that recall tolerates by design.
+    if (needsCompaction(rawHistory)) {
+      historyWriteChain = historyWriteChain
+        .then(() => writeFileAtomically(historyPath, serializeHistoryList(inputHistory)))
+        .catch(() => {})
+    }
   } catch {
     inputHistory = []
   }
-  /** Serialized history writes: each submission rewrites the latest in-memory snapshot. */
-  let historyWriteChain: Promise<void> = Promise.resolve()
+  /**
+   * Serialized history writes: each submission appends one JSON line at the
+   * end of the file, so concurrent terminals add entries after each other
+   * instead of overwriting snapshots they read at their own boot. A
+   * multi-line draft still occupies one physical line (JSON escapes the
+   * newline), and a regular-length line reaches the disk as one positioned
+   * write; an oversized paste may interleave mid-line, which the next
+   * parse simply drops.
+   */
   const recordHistory = (text: string): void => {
     if (text === '') return
     inputHistory = [...inputHistory, text].slice(-HISTORY_MAX_ENTRIES)
-    // Write the whole current list, serialized per submission: the file is
-    // never read back on the submit path, so rapid same-process submissions
-    // cannot lose entries to a read-modify-write race.
     historyWriteChain = historyWriteChain
       .then(() => mkdir(dirname(historyPath), { recursive: true }))
-      .then(() => writeFileAsync(historyPath, serializeHistoryList(inputHistory), 'utf8'))
+      .then(() => appendFileAsync(historyPath, historyLine(text), 'utf8'))
       .catch((writeError: unknown) => {
         bridge.notify('history save failed: ' + (writeError instanceof Error ? writeError.message : String(writeError)), 'error')
       })
@@ -1483,11 +1508,13 @@ async function run(ctx: Context, startup: TuiStartup, io: TuiIo): Promise<void>
   }
 
   const reviewChanges = (argument: string): void => {
+    // Works from a bare launch too: with no session yet the read-only
+    // choice goes to pendingPermission (materialized when the first
+    // session composes) and the review prompt queues behind that
+    // creation exactly like a typed first submission. The identity guard
+    // below still aborts a load that outlives a mid-flight switch —
+    // including one landing on an undefined agent.
     const currentAgent = agent
-    if (currentAgent === undefined) {
-      bridge.notify('no session yet - submit a message to start', 'warning')
-      return
-    }
     // The diff loads from the CALLING session's cwd; capture that
     // workspace and this turn's identity so a switch mid-load can neither
     // flip the new session read-only nor send the old workspace's review
@@ -1529,7 +1556,7 @@ async function run(ctx: Context, startup: TuiStartup, io: TuiIo): Promise<void>
       if (text !== '' && (!Number.isSafeInteger(atSeq) || (atSeq ?? -1) < 0)) {
         throw new Error('usage: /fork [event-seq]')
       }
-      const seed = selectForkSeed(session.events, atSeq)
+      const seed = selectForkSeed(session.snapshotEvents(), atSeq)
       const id = `session-${randomUUID()}`
       requestSwitch({
         target: {
@@ -1595,7 +1622,7 @@ async function run(ctx: Context, startup: TuiStartup, io: TuiIo): Promise<void>
       branch: gitBranch(sessionCwd),
       sessionId: session === undefined ? '' : session.id.slice(-8),
       resumed: active?.resumed ?? false,
-      mode: active?.mode ?? pendingMode ?? presets.defaultId,
+      mode: active?.mode ?? pendingMode ?? normalizePresetId(presets.defaultId),
       permission,
       dispatch,
       steer,

package/src/permissions.ts

@@ -24,7 +24,7 @@ export function effectivePermission(
   session: Session | undefined,
   pending: string | undefined,
 ): string {
-  return session === undefined ? pending ?? service.defaultPreset : service.current(session.events)
+  return session === undefined ? pending ?? service.defaultPreset : service.current(session)
 }
 
 /** Validate a preset and write it only when a durable session already exists. */

package/src/presets.ts

@@ -21,15 +21,27 @@ export function isBlankSession(events: readonly SessionEvent[]): boolean {
   return !events.some(event => event.type === 'turn/start')
 }
 
+/** Upstream renamed the shipped `code` preset to `ptc` in 0.1.2-rc.1; sessions
+ * and CLI choices recorded before the rename keep resolving through this map. */
+const LEGACY_PRESET_IDS: Readonly<Record<string, string>> = { code: 'ptc' }
+
+/** Translate a preset id recorded before an upstream rename to its current id. */
+export function normalizePresetId(id: string): string
+export function normalizePresetId(id: string | undefined): string | undefined
+export function normalizePresetId(id: string | undefined): string | undefined {
+  return id === undefined ? undefined : LEGACY_PRESET_IDS[id] ?? id
+}
+
 /** Latest logged selection wins; legacy sessions deliberately fall back to standard. */
-export function resolvePreset(session: Pick<Session, 'header' | 'events'>): string {
-  for (let index = session.events.length - 1; index >= 0; index -= 1) {
-    const event = session.events[index] as unknown as { type: string; data?: { agentPreset?: string } }
+export function resolvePreset(session: Pick<Session, 'header' | 'snapshotEvents'>): string {
+  const events = session.snapshotEvents()
+  for (let index = events.length - 1; index >= 0; index -= 1) {
+    const event = events[index] as unknown as { type: string; data?: { agentPreset?: string } }
     if (event.type === 'agent-preset/selected' && event.data?.agentPreset !== undefined) {
-      return event.data.agentPreset
+      return normalizePresetId(event.data.agentPreset) as string
     }
   }
-  return session.header.agentPreset ?? 'standard'
+  return normalizePresetId(session.header.agentPreset) ?? 'standard'
 }
 
 /** Resolve a pre-session choice, or recompose an active blank Agent. */
@@ -38,6 +50,7 @@ export async function selectPreset(
   agent: Agent | undefined,
   presetId: string,
 ): Promise<PresetRow> {
+  presetId = normalizePresetId(presetId)
   if (agent !== undefined) return switchPreset(service, agent, presetId)
   const preset = await service.resolve(presetId)
   if (preset.broken !== undefined) throw new Error(preset.broken)
@@ -50,7 +63,7 @@ export async function switchPreset(
   agent: Agent,
   presetId: string,
 ): Promise<PresetRow> {
-  if (!isBlankSession(agent.session.events)) {
+  if (!isBlankSession(agent.session.snapshotEvents())) {
     throw new Error('mode is locked after the first turn; use /new <mode>')
   }
   const preset = await service.recompose(agent.ctx, presetId)

package/src/questions.ts

@@ -1,12 +1,12 @@
 /**
- * The terminal ask_user_question provider: registers the single UI provider
- * on `ctx.userQuestions` and drives it with a FIFO queue — one question
- * request on screen at a time, everything else waiting — then resolves the
- * collected answers back into the tool's promise. The community TUI proved
- * this exact pipeline shape; here the dialog is an Ink bar instead of a
- * pi-tui inline modal.
+ * The terminal ask_user_question answerer: one `user-questions/request`
+ * waterfall listener that drives a FIFO queue — one question request on
+ * screen at a time, everything else waiting — then resolves the collected
+ * answers back into the waterfall. Mirrors the approval answerer's claim/
+ * defer split: only agents this TUI owns are answered, every other request
+ * falls through to the next answerer.
  *
- * Plan reviews (`exit_plan_mode`) arrive through the same service with an
+ * Plan reviews (`exit_plan_mode`) arrive through the same waterfall with an
  * `intent: { kind: 'plan-review' }` — the renderer highlights the approve
  * option; the answer encoding is identical either way.
  *
@@ -14,6 +14,7 @@
  */
 
 import type { Context } from '@deepseek-ai/cordis'
+import type { Agent } from '@deepseek-ai/dsh-agent'
 import {
   UserQuestionError,
   type AskUserQuestionAnswer,
@@ -56,13 +57,15 @@ const ABORT_ERROR = new UserQuestionError(
 )
 
 /**
- * Mount the single `ctx.userQuestions` UI provider over a FIFO queue.
- * @param ctx - context carrying the `userQuestions` service (dsh-base).
- * @returns the store the renderer subscribes to; a context without the
- * service yields a permanently empty store.
+ * Mount the `user-questions/request` answerer over a FIFO queue.
+ * @param ctx - plugin context whose event bus carries the waterfall.
+ * @param owns - agents this terminal answers for; every other request is
+ * deferred back into the waterfall (`next()`), so sibling answerers stay
+ * usable. Agent-less asks are claimed: this TUI is the only human surface
+ * in the process.
+ * @returns the store the renderer subscribes to.
  */
-export function mountQuestionProvider(ctx: Context): QuestionStore {
-  const service = ctx.get('userQuestions')
+export function mountQuestionProvider(ctx: Context, owns: (agent: Agent) => boolean): QuestionStore {
   let snapshot: QuestionSnapshot = { pending: undefined }
   let active: PendingQuestion | undefined
   const queue: PendingQuestion[] = []
@@ -79,69 +82,49 @@ export function mountQuestionProvider(ctx: Context): QuestionStore {
     set({ pending: next })
   }
 
-  if (service !== undefined) {
-    // Capability guard against contract drift: the pinned release exposes
-    // registerProvider, but an upstream alignment may replace it with the
-    // 'user-questions/request' waterfall. Degrade to the permanently-empty
-    // store (the no-service path) instead of failing startup with a
-    // TypeError on a missing method.
-    if (typeof (service as unknown as { registerProvider?: unknown }).registerProvider !== 'function') {
-      return {
-        subscribe(listener: () => void): () => void {
-          listeners.add(listener)
-          return () => {
-            listeners.delete(listener)
-          }
-        },
-        getSnapshot(): QuestionSnapshot {
-          return snapshot
-        },
-        submit(): void {},
-        cancel(): void {},
+  ctx.on('user-questions/request', (
+    request: AskUserQuestionRequest,
+    next: () => Promise<AskUserQuestionAnswer>,
+  ): Promise<AskUserQuestionAnswer> => {
+    if (request.agent !== undefined && !owns(request.agent)) return next()
+    return new Promise((resolve, reject) => {
+      // Abort settles through the same channel as an Esc cancel: the
+      // owning tool/step died, so the answer must not linger.
+      const onAbort = (): void => {
+        if (active === pending) {
+          active = undefined
+          set({ pending: undefined })
+          advance()
+        } else {
+          const at = queue.indexOf(pending)
+          if (at >= 0) queue.splice(at, 1)
+        }
+        reject(ABORT_ERROR)
+      }
+      // Detach on every settle so an answered/cancelled question never
+      // retains a listener on the owning tool call's signal.
+      const detachAbort = (): void => {
+        if (request.signal !== undefined) request.signal.removeEventListener('abort', onAbort)
+      }
+      const pending: PendingQuestion = {
+        request,
+        resolve,
+        reject,
+        detachAbort,
+      }
+      if (request.signal?.aborted === true) {
+        reject(ABORT_ERROR)
+        return
+      }
+      request.signal?.addEventListener('abort', onAbort, { once: true })
+      if (active === undefined) {
+        active = pending
+        set({ pending })
+      } else {
+        queue.push(pending)
       }
-    }
-    service.registerProvider({
-      ask(request: AskUserQuestionRequest): Promise<AskUserQuestionAnswer> {
-        return new Promise((resolve, reject) => {
-          // Abort settles through the same channel as an Esc cancel: the
-          // owning tool/step died, so the answer must not linger.
-          const onAbort = (): void => {
-            if (active === pending) {
-              active = undefined
-              set({ pending: undefined })
-              advance()
-            } else {
-              const at = queue.indexOf(pending)
-              if (at >= 0) queue.splice(at, 1)
-            }
-            reject(ABORT_ERROR)
-          }
-          // Detach on every settle so an answered/cancelled question never
-          // retains a listener on the owning tool call's signal.
-          const detachAbort = (): void => {
-            if (request.signal !== undefined) request.signal.removeEventListener('abort', onAbort)
-          }
-          const pending: PendingQuestion = {
-            request,
-            resolve,
-            reject,
-            detachAbort,
-          }
-          if (request.signal?.aborted === true) {
-            reject(ABORT_ERROR)
-            return
-          }
-          request.signal?.addEventListener('abort', onAbort, { once: true })
-          if (active === undefined) {
-            active = pending
-            set({ pending })
-          } else {
-            queue.push(pending)
-          }
-        })
-      },
     })
-  }
+  })
 
   return {
     subscribe(listener: () => void): () => void {