@aiwayds/dsh-tui-pi 2.30.0 → 2.32.0

package/README.md

@@ -17,6 +17,7 @@ https://github.com/user-attachments/assets/67a7c6ca-ff42-4005-b543-437ba61771bb
 - [**Footer — live session overview**](docs/features/footer.md) — provider/model, context pressure and the session cache-hit rate at a glance, always in view.
 - [**Think & tool panels**](docs/features/think-tool-panels.md) — reasoning and tool activity stay out of the transcript, so the conversation reads clean.
 - [**Subagents**](docs/features/subagents.md) — every running subagent gets a status line; watch its live transcript and decode speed (tok/s), steer it in place.
+- [**Tool approvals**](docs/features/approval.md) — review the operation and allow it once or deny it; no automatic approval.
 - [**Ask User Question**](docs/features/ask-user-question.md) — the model can pause and ask you structured questions, answered without leaving the TUI.
 - [**Feishu integration**](docs/features/feishu-demo.md) — dsh-tui-pi on the desktop and Feishu/Lark on the phone driving (and answering for) the same dsh session.
 - [**Dynamic context pruning (DCP)**](docs/features/dcp.md) — context stays within limits automatically, with zero LLM calls.
@@ -37,13 +38,24 @@ https://github.com/user-attachments/assets/67a7c6ca-ff42-4005-b543-437ba61771bb
 ## Install and launch
 
 ```sh
+npm i -g @aiwayds/dsh-tui-pi
+dsh-tui-pi          # or the short form: dst
+```
+
+The global install sets the machine up by itself, printing one progress line per step: it installs the `@deepseek-ai/dsh` host when missing (via npm; if npm itself is not on PATH, it prints what to install and stops), installs pnpm, and creates the `tui` profile with this plugin and its bundled companions. Whatever the install cannot finish (e.g. an offline machine) completes automatically on the first launch. After a later `npm i -g` upgrade of this package, the profile's mounted copy is moved to the new version on the next launch — a profile that is newer than the global install (dev-upgraded ahead) is left untouched.
+
+The manual steps do exactly what the onboarding runs, if you prefer them:
+
+```sh
+npm i -g @deepseek-ai/dsh
+npm i -g pnpm
 dsh plugin --profile tui add @aiwayds/dsh-tui-pi
-dsh --profile tui          # launch (or: dsh-tui-pi)
+dsh --profile tui          # launch
 ```
 
 Legacy `session_projcache` records (written before dsh 0.1.2-alpha.4) are migrated automatically at profile load — idempotent, with per-file backups, never blocking startup; the `dsh-tui-pi` launcher runs the same preflight.
 
-Everything that used to need manual patching — the canvas background, the `@deepseek-ai` module closure, the compaction backend — now happens automatically. Upgrade an existing profile after a release:
+Everything that used to need manual patching — the canvas background, the `@deepseek-ai` module closure, the compaction backend — now happens automatically. For a normal install, upgrading the global package upgrades the profile on the next launch (see above). `dev-upgrade` remains for dev machines that install the profile from a checked-out repo:
 
 ```sh
 node scripts/dev-upgrade.mjs                  # latest

package/bin/boot.mjs

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+/**
+ * Launcher entry behind the `dsh-tui-pi` and `dst` bin shims: boot the dsh
+ * `tui` profile, running the one-time onboarding first when this machine is
+ * missing any of the three pieces (dsh host, pnpm, mounted tui profile).
+ *
+ * Fast path — host present and profile current: no output, straight to the
+ * TUI, exactly like the plain `dsh --profile tui` this replaces.
+ *
+ * Version follow: after `npm i -g` upgrades this package, the profile still
+ * holds the old copy; the next launch (or the package's postinstall) re-runs
+ * the add to move the profile to the new version. A profile that is NEWER
+ * than the global install (dev-upgraded ahead) is left untouched.
+ *
+ * See bin/onboard-core.mjs for the setup logic and its failure contract.
+ */
+
+import { spawnSync } from 'node:child_process'
+import {
+  dshBinPath,
+  profileBehind,
+  profileMounted,
+  runOnboard,
+} from './onboard-core.mjs'
+
+const args = process.argv.slice(2)
+
+function boot(dsh) {
+  const result = spawnSync(dsh, ['--profile', 'tui', ...args], { stdio: 'inherit' })
+  process.exit(result.status ?? 1)
+}
+
+const dsh = dshBinPath()
+
+if (dsh && profileMounted() && !profileBehind()) {
+  boot(dsh)
+}
+
+console.log('dsh-tui-pi setup (first run / upgrade only):')
+const setup = runOnboard({ log: (line) => console.log(line) })
+if (!setup.ok) {
+  console.error(`\ndsh-tui-pi: setup stopped at "${setup.step}".`)
+  console.error(`dsh-tui-pi: ${setup.hint}`)
+  process.exit(1)
+}
+console.log('')
+boot(setup.dsh)

package/bin/dsh-tui-pi

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
-# Convenience launcher: boots the dsh `tui` profile that mounts @aiwayds/dsh-tui-pi.
-# Requires the dsh CLI on PATH and @aiwayds/dsh-tui-pi installed into that profile
-# (dsh plugin --profile tui add @aiwayds/dsh-tui-pi).
+# Launcher for the dsh `tui` profile that mounts @aiwayds/dsh-tui-pi.
+# First run performs a one-time setup (dsh host, pnpm, profile plugins) with
+# progress output; every later run boots straight into the TUI. Aliased as `dst`.
 SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$(readlink -f -- "$0" 2>/dev/null || echo "$0")")" && pwd)
 node "$SCRIPT_DIR/preflight-projcache.mjs" >/dev/null 2>&1 || true
-exec dsh --profile tui "$@"
+exec node "$SCRIPT_DIR/boot.mjs" "$@"

package/bin/onboard-core.mjs

@@ -0,0 +1,275 @@
+/**
+ * One-time onboarding for the `dsh-tui-pi` / `dst` launcher, shared by two
+ * entry points:
+ *   - scripts/postinstall.mjs — runs at `npm i -g @aiwayds/dsh-tui-pi` time,
+ *     so the package is usable the moment the install prints "added 1 package";
+ *   - bin/boot.mjs — runs on the first `dsh-tui-pi` invocation, catching up
+ *     anything the postinstall could not finish (offline install, pnpm that
+ *     does not run postinstall scripts, non-global context, …).
+ *
+ * Contract:
+ *   - idempotent: every step checks before it acts, so a re-run only prints
+ *     "found" lines and the launcher fast-paths to a silent boot;
+ *   - the dsh host is installed globally WITH NPM when missing (largest
+ *     step); npm itself is a prerequisite — when it is not on PATH we print
+ *     what to install and stop instead of guessing;
+ *   - all functions are synchronous and never throw past the boundary:
+ *     failures come back as { ok: false, step, hint }.
+ */
+
+import { execFileSync, spawnSync } from 'node:child_process'
+import { accessSync, constants, existsSync, readFileSync, statSync, writeFileSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { delimiter, dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const PKG = '@aiwayds/dsh-tui-pi'
+const HOST = '@deepseek-ai/dsh'
+const PROFILE = 'tui'
+const INSTALL_TIMEOUT_MS = 10 * 60_000
+
+const packageRoot = join(dirname(fileURLToPath(import.meta.url)), '..')
+
+function readSelfPackage() {
+  return JSON.parse(readFileSync(join(packageRoot, 'package.json'), 'utf8'))
+}
+
+export function selfVersion() {
+  try {
+    return readSelfPackage().version ?? null
+  } catch {
+    return null
+  }
+}
+
+export function dshHome() {
+  return process.env.DSH_HOME || join(homedir(), '.dsh')
+}
+
+// The profile counts as set up once this package is resolvable inside it.
+export function profileMounted() {
+  return existsSync(join(dshHome(), 'profiles', PROFILE, 'node_modules', PKG, 'package.json'))
+}
+
+export function profileVersion() {
+  try {
+    return JSON.parse(
+      readFileSync(join(dshHome(), 'profiles', PROFILE, 'node_modules', PKG, 'package.json'), 'utf8'),
+    ).version ?? null
+  } catch {
+    return null
+  }
+}
+
+// Companion plugins ship as npm dependencies of this package and land in the
+// profile's node_modules together with it when `dsh plugin add` runs.
+export function companions() {
+  try {
+    const deps = readSelfPackage().dependencies ?? {}
+    return Object.keys(deps).filter((name) => name.startsWith('@aiwayds/') && name !== PKG)
+  } catch {
+    return []
+  }
+}
+
+export function which(cmd) {
+  const dirs = (process.env.PATH || '').split(delimiter).filter(Boolean)
+  const suffixes = process.platform === 'win32' ? ['.cmd', '.exe', '.bat', ''] : ['']
+  for (const dir of dirs) {
+    for (const suffix of suffixes) {
+      const candidate = join(dir, cmd + suffix)
+      try {
+        if (!statSync(candidate).isFile()) continue
+        accessSync(candidate, constants.X_OK)
+        return candidate
+      } catch {
+        /* keep scanning */
+      }
+    }
+  }
+  return null
+}
+
+function queryVersion(cmd, args) {
+  try {
+    return execFileSync(cmd, args, {
+      encoding: 'utf8',
+      timeout: 20_000,
+      stdio: ['ignore', 'pipe', 'pipe'],
+    }).trim() || null
+  } catch {
+    return null
+  }
+}
+
+export function dshBinPath() {
+  const onPath = which('dsh')
+  if (onPath) return onPath
+  // A host installed moments ago can be missing from this shell's PATH cache;
+  // fall back to the npm global prefix the installer just wrote to.
+  try {
+    const prefix = execFileSync('npm', ['prefix', '-g'], {
+      encoding: 'utf8',
+      timeout: 20_000,
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim()
+    const candidate = join(prefix, 'bin', 'dsh')
+    if (existsSync(candidate)) return candidate
+  } catch {
+    /* no npm, no fallback */
+  }
+  return null
+}
+
+// Global installs always go through npm — one predictable path, regardless
+// of which package manager pulled this package in.
+function installGlobal(name) {
+  const result = spawnSync('npm', ['install', '-g', name], {
+    stdio: 'inherit',
+    timeout: INSTALL_TIMEOUT_MS,
+    shell: process.platform === 'win32',
+  })
+  return result.status === 0
+}
+
+// True when the mounted profile copy is OLDER than this package. Prerelease
+// tags compare numerically per dot segment (rc.10 > rc.4); a profile that is
+// NEWER (dev-upgraded ahead of the global install) is left alone.
+export function profileBehind() {
+  const mounted = profileVersion()
+  const self = selfVersion()
+  if (!mounted || !self) return false
+  if (mounted === self) return false
+  return compareVersions(mounted, self) < 0
+}
+
+export function compareVersions(a, b) {
+  const parse = (version) => {
+    const [core, pre = ''] = String(version).replace(/^v/, '').split(/[-+]/, 2)
+    return { core: core.split('.').map((n) => Number.parseInt(n, 10) || 0), pre: pre ? pre.split('.') : [] }
+  }
+  const pa = parse(a)
+  const pb = parse(b)
+  for (let i = 0; i < 3; i += 1) {
+    if (pa.core[i] !== pb.core[i]) return pa.core[i] - pb.core[i]
+  }
+  if (pa.pre.length === 0 && pb.pre.length === 0) return 0
+  if (pa.pre.length === 0) return 1
+  if (pb.pre.length === 0) return -1
+  for (let i = 0; i < Math.max(pa.pre.length, pb.pre.length); i += 1) {
+    const x = pa.pre[i]
+    const y = pb.pre[i]
+    if (x === undefined) return -1
+    if (y === undefined) return 1
+    const xn = Number.parseInt(x, 10)
+    const yn = Number.parseInt(y, 10)
+    if (!Number.isNaN(xn) && !Number.isNaN(yn) && xn !== yn) return xn - yn
+    if (x !== y) return x < y ? -1 : 1
+  }
+  return 0
+}
+
+// pnpm ≥10 fails a fresh `add` with ERR_PNPM_IGNORED_BUILDS when the added
+// packages carry lifecycle scripts. The only scripts our packages ship are
+// the closure-linker postinstalls, which no-op on published tarballs (they
+// guard on the repo's src/), so approving them is safe and is what `pnpm
+// approve-builds` would do interactively. pnpm sometimes records an
+// allowBuilds skeleton in the profile's pnpm-workspace.yaml with a
+// "set this to true or false" placeholder — fill those placeholders; when
+// it does not (behavior varies by pnpm build and environment), write the
+// allowBuilds block ourselves for exactly the packages this suite ships.
+// A user-written true/false decision is never overwritten. Returns whether
+// the workspace file was updated.
+function approvePrintedBuilds() {
+  const workspace = join(dshHome(), 'profiles', PROFILE, 'pnpm-workspace.yaml')
+  try {
+    const text = readFileSync(workspace, 'utf8')
+    if (text.includes('set this to true or false')) {
+      writeFileSync(workspace, text.replaceAll('set this to true or false', 'true'))
+      return true
+    }
+    if (text.includes('allowBuilds:')) return false
+    const names = [PKG, ...companions()]
+    const block = ['allowBuilds:', ...names.map((name) => `  '${name}': true`)].join('\n')
+    writeFileSync(workspace, `${text.replace(/\n*$/, '\n')}${block}\n`)
+    return true
+  } catch {
+    return false
+  }
+}
+
+/**
+ * Bring the machine to a bootable state, printing one progress line per step.
+ * Steps:
+ *   1/3 dsh host    — installed globally with npm when missing; when npm
+ *                     itself is not on PATH, print what to install and stop
+ *   2/3 pnpm        — the host's plugin manager shells out to it; installed
+ *                     globally when missing
+ *   3/3 tui profile — `dsh plugin --profile tui add` this package (+ companions)
+ * Returns { ok: true, dsh } or { ok: false, step, hint }.
+ */
+export function runOnboard({ log = () => {} } = {}) {
+  let dsh = dshBinPath()
+  if (dsh) {
+    log(`  [1/3] dsh host              found ${queryVersion(dsh, ['-V']) ?? '(version unknown)'}`)
+  } else if (!which('npm')) {
+    log(`  [1/3] dsh host              not found, and npm is not on PATH either`)
+    return {
+      ok: false,
+      step: 'npm',
+      hint: 'install Node.js (ships with npm) first: https://nodejs.org — then re-run dsh-tui-pi',
+    }
+  } else {
+    log(`  [1/3] dsh host              not found — installing ${HOST} globally with npm (largest step, a few minutes)…`)
+    if (!installGlobal(HOST)) {
+      return { ok: false, step: 'dsh host install', hint: `install it with: npm install -g ${HOST} — then re-run dsh-tui-pi` }
+    }
+    dsh = dshBinPath()
+    if (!dsh) {
+      return { ok: false, step: 'dsh host lookup', hint: `installed, but still not found — run: npm install -g ${HOST}` }
+    }
+    log(`  [1/3] dsh host              installed ${queryVersion(dsh, ['-V']) ?? ''}`)
+  }
+
+  const pnpm = which('pnpm')
+  if (pnpm) {
+    log(`  [2/3] pnpm                  found ${queryVersion(pnpm, ['-v']) ?? ''}`)
+  } else {
+    log('  [2/3] pnpm                  not found — installing globally…')
+    if (!installGlobal('pnpm')) {
+      return { ok: false, step: 'pnpm install', hint: 'install it with: npm install -g pnpm — then re-run dsh-tui-pi' }
+    }
+    log(`  [2/3] pnpm                  installed ${queryVersion('pnpm', ['-v']) ?? ''}`)
+  }
+
+  if (profileMounted() && !profileBehind()) {
+    log('  [3/3] tui profile           already set up')
+  } else {
+    const verb = profileMounted() ? 'updating' : 'creating'
+    const list = companions()
+    log(`  [3/3] tui profile           ${verb}: installing ${PKG}${list.length ? ` + ${list.length} bundled companions` : ''}…`)
+    if (list.length) log(`        ${list.join(', ')}`)
+    const result = spawnSync(dsh, ['plugin', '--profile', PROFILE, 'add', PKG], {
+      stdio: 'inherit',
+      timeout: INSTALL_TIMEOUT_MS,
+    })
+    if (result.status !== 0) {
+      if (!approvePrintedBuilds()) {
+        return { ok: false, step: 'tui profile setup', hint: `run it manually with: dsh plugin --profile ${PROFILE} add ${PKG} — then re-run dsh-tui-pi` }
+      }
+      // pnpm's skeleton is filled; the same idempotent add now succeeds
+      // (everything is already downloaded).
+      log('  [3/3] tui profile           approved the printed build scripts (our closure-linker no-ops) — retrying…')
+      const retry = spawnSync(dsh, ['plugin', '--profile', PROFILE, 'add', PKG], {
+        stdio: 'inherit',
+        timeout: INSTALL_TIMEOUT_MS,
+      })
+      if (retry.status !== 0) {
+        return { ok: false, step: 'tui profile setup', hint: `run it manually with: dsh plugin --profile ${PROFILE} add ${PKG} — then re-run dsh-tui-pi` }
+      }
+    }
+    log(`  [3/3] tui profile           ${verb === 'updating' ? 'updated' : 'done'}`)
+  }
+
+  return { ok: true, dsh }
+}

package/lib/approval.d.ts

@@ -0,0 +1,23 @@
+import type { Context } from '@deepseek-ai/cordis';
+import type { AskUserPanelDeps } from './ask-user.ts';
+import type { DialogQueue } from './dialog-queue.ts';
+export type ApprovalOutcome = 'allowed-once' | 'rejected' | 'cancelled' | 'unavailable';
+export interface ApprovalRequest {
+    agent: {
+        session: {
+            id: unknown;
+            seq?: number;
+            eventAt?: (seq: number) => unknown;
+        };
+    };
+    toolName: string;
+    callId?: string;
+    reason?: string;
+    signal?: AbortSignal;
+}
+/** Keep the exact tool arguments visible; the reason alone is not the operation. */
+export declare function approvalDetails(request: ApprovalRequest): string;
+/** A one-shot decision. Enter defaults to deny; paste never implies consent. */
+export declare function openApprovalPanel(deps: AskUserPanelDeps, request: ApprovalRequest, signal: AbortSignal): Promise<ApprovalOutcome>;
+/** Claim only the active session; other answerers can serve other sessions. */
+export declare function registerApprovalProvider(ctx: Context, deps: AskUserPanelDeps, queue: DialogQueue): () => void;

package/lib/approval.js

@@ -0,0 +1,124 @@
+import { matchesKey, Text } from '@earendil-works/pi-tui';
+import { ansiFg, RESET } from "./theme/index.js";
+import { clipToWidth, visibleWidth } from "./text.js";
+/** Keep the exact tool arguments visible; the reason alone is not the operation. */
+export function approvalDetails(request) {
+    const lines = ['Tool: ' + request.toolName];
+    if (request.reason)
+        lines.push('Reason: ' + request.reason);
+    if (request.callId) {
+        lines.push('Call: ' + request.callId);
+        const session = request.agent.session;
+        for (let seq = (session.seq ?? 0) - 1; seq >= 0; seq--) {
+            const event = session.eventAt?.(seq);
+            if (event?.type === 'tool/call' && event.data?.callId === request.callId) {
+                if (event.data.arguments)
+                    lines.push('Arguments: ' + event.data.arguments);
+                break;
+            }
+        }
+    }
+    return lines.join('\n').replace(/[\u0000-\u0008\u000b-\u001f\u007f-\u009f]/g, char => '\\u' + char.charCodeAt(0).toString(16).padStart(4, '0'));
+}
+/** A one-shot decision. Enter defaults to deny; paste never implies consent. */
+export function openApprovalPanel(deps, request, signal) {
+    if (signal.aborted)
+        return Promise.resolve('cancelled');
+    return new Promise(resolve => {
+        let selected = 0;
+        let offset = 0;
+        let settled = false;
+        let unmount;
+        const details = approvalDetails(request);
+        const detailText = new Text(details, 0, 0);
+        let detailsWidth = -1;
+        let content = [];
+        const finish = (outcome) => {
+            if (settled)
+                return;
+            settled = true;
+            signal.removeEventListener('abort', abort);
+            unmount?.();
+            deps.setModalActive(false);
+            deps.restoreFocus();
+            resolve(outcome);
+        };
+        const abort = () => finish('cancelled');
+        const panel = {
+            invalidate() { },
+            render(width) {
+                const inner = Math.max(1, width - 4);
+                const theme = deps.theme();
+                const border = ansiFg(theme.palette.borderDefault);
+                const row = (text) => {
+                    const clipped = clipToWidth(text, inner);
+                    return border + '│ ' + RESET + clipped + ' '.repeat(Math.max(0, inner - visibleWidth(clipped))) + border + ' │' + RESET;
+                };
+                if (inner !== detailsWidth) {
+                    content = detailText.render(inner);
+                    detailsWidth = inner;
+                }
+                const budget = Math.max(1, Math.min(10, (deps.tui.terminal.rows || 24) - 16));
+                offset = Math.max(0, Math.min(offset, content.length - budget));
+                return [
+                    border + '┌' + '─'.repeat(Math.max(0, width - 2)) + '┐' + RESET,
+                    row('Approval required'),
+                    ...content.slice(offset, offset + budget).map(row),
+                    row('Details ' + (offset + 1) + '–' + Math.min(offset + budget, content.length) + '/' + content.length + ' · PgUp/PgDn scroll'),
+                    row((selected === 0 ? '▸ ' : '  ') + '1. Deny'),
+                    row((selected === 1 ? '▸ ' : '  ') + '2. Allow once'),
+                    row('↑↓ choose · Enter confirm · Esc/Ctrl+C deny'),
+                    border + '└' + '─'.repeat(Math.max(0, width - 2)) + '┘' + RESET,
+                ];
+            },
+            handleInput(data) {
+                if (data.startsWith('\x1b[200~'))
+                    return;
+                if (matchesKey(data, 'escape') || matchesKey(data, 'ctrl+c')) {
+                    finish('rejected');
+                    return;
+                }
+                if (data === '1') {
+                    finish('rejected');
+                    return;
+                }
+                if (data === '2') {
+                    selected = 1;
+                }
+                else if (matchesKey(data, 'up') || matchesKey(data, 'down'))
+                    selected = selected === 0 ? 1 : 0;
+                else if (matchesKey(data, 'pageUp'))
+                    offset = Math.max(0, offset - 5);
+                else if (matchesKey(data, 'pageDown'))
+                    offset += 5;
+                else if (matchesKey(data, 'enter')) {
+                    finish(selected === 1 ? 'allowed-once' : 'rejected');
+                    return;
+                }
+                deps.tui.requestRender();
+            },
+        };
+        try {
+            unmount = deps.mount(panel);
+            deps.tui.hideOverlay();
+            deps.tui.setFocus(panel);
+            deps.setModalActive(true);
+            signal.addEventListener('abort', abort, { once: true });
+        }
+        catch {
+            finish('unavailable');
+        }
+    });
+}
+/** Claim only the active session; other answerers can serve other sessions. */
+export function registerApprovalProvider(ctx, deps, queue) {
+    const register = ctx.on.bind(ctx);
+    return register('approval/request', (request, next) => {
+        const mine = deps.getSessionId?.();
+        if (mine === undefined || String(request.agent.session.id) !== mine)
+            return next();
+        return queue.run(signal => openApprovalPanel(deps, request, signal), request.signal)
+            .catch(error => error instanceof Error && error.name === 'AbortError' ? 'cancelled' : 'unavailable');
+    });
+}
+//# sourceMappingURL=approval.js.map

package/lib/approval.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval.js","sourceRoot":"","sources":["../src/approval.ts"],"names":[],"mappings":"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"}

package/lib/ask-user.d.ts

@@ -521,6 +521,8 @@ export interface AskUserPanelDeps {
      * human exactly as before (direct callers, tests, embedders).
      */
     resolveTimeouts?: () => Promise<AskUserTimeouts>;
+    /** Serialize this panel with other capturing dialogs. */
+    openPanel?: (questions: AskUserQuestionItem[], signal: AbortSignal | undefined, timeouts: AskUserTimeouts) => Promise<AskUserQuestionAnswer>;
 }
 /** Result promise from `openAskUserPanel`. Declined carries the canonical decline envelope. */
 export type AskUserResult = AskUserQuestionAnswer;

package/lib/ask-user.js

@@ -1664,6 +1664,7 @@ export function openAskUserPanel(deps, questions, signal, timeouts = ASK_USER_TI
  *   mounted tool with no UI and no trace.
  */
 export function registerAskUserProvider(ctx, deps) {
+    const openPanel = deps.openPanel ?? ((questions, signal, timeouts) => openAskUserPanel(deps, questions, signal, timeouts));
     // dsh-ask-router present: register as ONE surface among several (claim by
     // session, first answer wins across surfaces) instead of taking an ask
     // slot. Absent router keeps the standalone waterfall path below.
@@ -1685,7 +1686,7 @@ export function registerAskUserProvider(ctx, deps) {
                 const controller = new AbortController();
                 controllers.set(request, controller);
                 request.signal?.addEventListener('abort', () => controller.abort(), { once: true });
-                const open = (timeouts) => openAskUserPanel(deps, request.questions, controller.signal, timeouts);
+                const open = (timeouts) => openPanel(request.questions, controller.signal, timeouts);
                 if (deps.resolveTimeouts === undefined)
                     return open(ASK_USER_TIMEOUTS_DISABLED);
                 // Resolved fresh per ask so a committed settings change applies to
@@ -1723,7 +1724,7 @@ export function registerAskUserProvider(ctx, deps) {
             if (asking !== undefined && String(asking) !== mine)
                 return next();
         }
-        const open = (timeouts) => openAskUserPanel(deps, request.questions, request.signal, timeouts);
+        const open = (timeouts) => openPanel(request.questions, request.signal, timeouts);
         if (deps.resolveTimeouts === undefined)
             return open(ASK_USER_TIMEOUTS_DISABLED);
         return deps.resolveTimeouts().then(open, () => open(ASK_USER_TIMEOUTS_DISABLED));