@askdkc/dsh-cli 0.12.2 → 0.13.0

package/lib/types/dsh-adapter/plugin.js

@@ -3,7 +3,6 @@ import React from 'react';
 import { SessionId } from '@deepseek-ai/dsh-session';
 import UserQuestionService from '@deepseek-ai/dsh-user-questions';
 import * as toolAskUser from '@deepseek-ai/dsh-tool-ask-user';
-import Schema from '@deepseek-ai/schemastery';
 import { Config } from './index.js';
 import { configValues, createSettingsScope, resolveSettingsNamespace } from './compat/settings.js';
 import { createChannel } from './channel.js';
@@ -16,26 +15,24 @@ import { removeClipboardImageDir } from '../utils/clipboard.js';
 import { logForDebugging } from '../utils/debug.js';
 import { isEnvTruthy } from '../utils/envUtils.js';
 import { QuestionStore, bindQuestionStore } from './questions.js';
-import { prepareQuestionAnswerer } from './questions-answerer.js';
+import { registerQuestionAnswerer } from './questions-answerer.js';
 import { adapterRuntimeFor } from '../adapter/kernel/runtime-context.js';
 import { ApprovalStore, bindApprovalStore } from './approvals.js';
 import { registerPromptDebug } from './promptDebug.js';
 import { readActivityFrames } from '../activityPrefs.js';
-import { commitFullscreenFactoryMigration, planFullscreenFactoryMigration, readAppliedMigrations } from '../migrationPrefs.js';
 import { readModelPref } from '../modelPrefs.js';
 import { explicitModelRoute, recordedModelRoute, resolveModelRoute, validateModelRoute } from '../modelRoute.js';
 import { migratePresetPref, readPresetPref } from '../presetPrefs.js';
 import { readEffortPref } from '../effortPrefs.js';
 import { composePreset, filterMinimalPresetTools, resolvePersistedPreset, resolvePersistedRoute, runningPresetOf } from './presets.js';
-import { ensurePackagedPresets } from './packaged-presets.js';
 import { registerBundledPresets } from './bundled-presets.js';
-import { ensureLegacySessionEventTypes, snapshotLiveSessionEvents } from './compat/index.js';
+import { registerTuiSessionEventTypes, snapshotLiveSessionEvents } from './compat/index.js';
 import { clearResumeTarget, resumeTargetFromArgv, writeResumeTarget } from '../sessionHistory.js';
 import { readHomePrefs } from '../homePrefs.js';
 import { resolveSessionCwd } from '../utils/workspaceRoot.js';
 import { beginRestartAttempt, checkForTuiUpdate, installedTuiVersion, isBootDeadlockTarget, isStandaloneRuntime, isVersionNewer, logRestartEvent, resolveDshProfileName, resolveTuiUpdateTarget, restartTui, updateTuiAndRestart, writeHandoffNotice } from '../update.js';
 import { getLang, isLang, resolveStartupLang, setLang, t, writeLangPref } from '../i18n.js';
-import { DEFAULT_PAGE_MARGIN, DEFAULT_STATUS_BAR, applyMermaidDiagrams, applyPageMargin, isPageMarginMode, normalizePageMargin, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground, parsePageMarginSpec } from '../tuiDisplayPrefs.js';
+import { DEFAULT_PAGE_MARGIN, applyMermaidDiagrams, applyPageMargin, isPageMarginMode, normalizePageMargin, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground, parsePageMarginSpec } from '../tuiDisplayPrefs.js';
 import { draftComboConflicts, effectiveComboString, parseComboDraft, setKeymapOverrides, SHORTCUT_ACTIONS, } from '../utils/keymap.js';
 import { attachHerdrIntegration } from '../herdr.js';
 import { logMouseDebug } from '../utils/debug.js';
@@ -73,7 +70,7 @@ import { CLEAR_ITERM2_PROGRESS, CLEAR_TAB_STATUS, supportsTabStatus, wrapForMult
  * Fullscreen decision latched across host recomposes. The launcher disposes
  * and re-mounts the plugin tree (teardown → apply() runs again) — a fresh
  * apply() re-resolves `bootedFullscreen` from cordis config, and the
- * settings user layer (settings.yaml) can arrive after the 300ms
+ * profile configuration can arrive after the 300ms
  * `settingsReady` bound when the recompose is also re-mounting the settings
  * service. The tree would then mount INLINE and `rendererSettingsFrozen` would
  * swallow the late application — the app lands on the main screen
@@ -189,23 +186,9 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     }
     // Validate settings before creating an agent or taking over the terminal.
     const tuiSettingsNs = resolveSettingsNamespace(configOwner, Config);
-    // Modern hosts own a declarative registry; old hosts discover directories.
-    // A modern bundle failure must not silently fall back to obsolete files.
-    if (!await registerBundledPresets(ctx))
-        try {
-            for (const result of ensurePackagedPresets()) {
-                if (result.status === 'conflict') {
-                    ctx.logger.warn(`dsh-tui: packaged preset "${result.id}" was not installed because an unmanaged preset already uses that id`);
-                }
-            }
-        }
-        catch (error) {
-            // A read-only home must not make the whole terminal unusable; the other
-            // official and user presets remain available.
-            ctx.logger.warn(`dsh-tui: unable to install packaged presets (${error instanceof Error ? error.message : String(error)})`);
-        }
+    await registerBundledPresets(ctx);
     // UI language resolution: DSH_TUI_LANG env var wins, then the
-    // settings.yaml `dsh-tui.lang` user layer (applied once the settings
+    // active profile `dsh-tui.lang` configuration (applied once the settings
     // namespace registers below), then cordis.yml `lang`, then the
     // persisted `/lang` choice, then `zh`. Must settle before the first
     // render so every module resolves strings in the same language.
@@ -269,10 +252,8 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     // service when the composition doesn't (the official dsh-base
     // user-interaction config row does; a bare plugin mount creates it on
     // this context), then expose the model-facing tool before resolving the
-    // agent so per-step assembly includes ask_user_question. rc.2's provider
-    // seat is registered below; the 0.1.2 line's agent-aware waterfall needs the
-    // channel owner and is therefore registered immediately after the channel
-    // is created. Optional-service access goes through `ctx.get`, not the
+    // agent so per-step assembly includes ask_user_question. The answerer needs
+    // the channel owner and registers immediately after channel creation. Optional-service access goes through `ctx.get`, not the
     // inject proxy.
     const userQuestions = ctx.get('userQuestions') ?? new UserQuestionService(ctx);
     ctx.plugin(toolAskUser);
@@ -288,31 +269,11 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     });
     const questionStore = new QuestionStore(adapterRuntimeFor(ctx));
     bindQuestionStore(ctx, questionStore);
-    // One store, one teardown effect on both API lines. The compatibility
-    // adapter binds either registration to this Cordis fiber; this separate
-    // effect rejects asks still parked in the UI during teardown.
+    // Reject questions still parked in the UI when its fiber is disposed.
     ctx.effect(() => () => questionStore.rejectAll());
     // `/debug-prompt` snapshots the final provider-neutral request at the
     // llm/stream boundary, after every prompt and tool contributor has run.
     registerPromptDebug(ctx);
-    // API selection and registration live behind one adapter boundary. The UI
-    // bootstrap only translates a legacy seat conflict into its visible notice.
-    const questionAnswererRegistration = prepareQuestionAnswerer(ctx, userQuestions, questionStore);
-    const questionSeatDecision = questionAnswererRegistration.kind === 'legacy'
-        ? questionAnswererRegistration.yieldDecision
-        : undefined;
-    let questionSeatNotice;
-    if (questionSeatDecision?.action === 'alert-unverified') {
-        ctx.logger.error(`dsh-tui: user-questions provider seat is held by a component self-reporting as ${questionSeatDecision.incumbentId} ` +
-            '(identity not host-verified); this TUI will not register its questionnaire and model questions may be answered by it');
-        questionSeatNotice = t('question-provider-occupied-unverified', { id: questionSeatDecision.incumbentId ?? '' });
-    }
-    else if (questionSeatDecision?.action === 'alert') {
-        const displayId = questionSeatDecision.incumbentId ?? t('question-provider-occupied-unknown');
-        ctx.logger.error(`dsh-tui: user-questions provider seat is held by a non-host component (${displayId}); ` +
-            'this TUI will not register its questionnaire and model questions may be answered by it');
-        questionSeatNotice = t('question-provider-occupied', { id: displayId });
-    }
     // Child-process stderr guard (issue #17): MCP servers spawned with an
     // inherited stderr (the MCP SDK's stdio default) write straight to the
     // terminal device from the child process, bypassing the renderer's own
@@ -550,11 +511,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     toastStore?.setSink(delivery => {
         notifyChannel(delivery.text, { color: delivery.color, timeoutMs: delivery.timeoutMs });
     });
-    if (questionAnswererRegistration.kind === 'waterfall') {
-        // Ownership follows the mutable channel; registration cleanup belongs to
-        // this Cordis fiber.
-        questionAnswererRegistration.register(channel);
-    }
+    registerQuestionAnswerer(ctx, channel, questionStore);
     // Fullscreen layout decision: the settings user layer (edited through the
     // /settings screen) overrides cordis.yml when set. The settings injection
     // below resolves it synchronously when the host settings service is up —
@@ -578,81 +535,10 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         resolveSettingsReady = () => resolve();
         setTimeout(resolve, 300);
     });
-    // Old hosts register a settings.yaml scope. 0.1.7 projects the plugin's
-    // volatile Config fields instead; both paths apply edits without remounting.
+    // Apply volatile Config edits without remounting the agent.
     ctx.inject(['settings'], (settingsCtx) => {
         // Loader targets the Config owner's fiber, not the injected child fiber.
-        const scope = createSettingsScope(configOwner, settingsCtx.settings, tuiSettingsNs, Schema.object({
-            diffLayout: Schema.union(['auto', 'split', 'unified']).default('auto'),
-            thinkingFold: Schema.union(['preview', 'full']).default('preview'),
-            toolBackground: Schema.union(['none', 'subtle', 'strong']).default('none'),
-            scrollGutter: Schema.union(['timeline', 'scrollbar', 'hidden']).default('timeline'),
-            // Preset names AND custom `NxM` specs (the settings field's parse
-            // gate keeps junk out of the user layer; the transform normalizes
-            // whatever survives — cordis.yml junk included).
-            pageMargin: Schema.transform(Schema.string().default('normal'), value => normalizePageMargin(value)),
-            // No default on purpose (same rule as `fullscreen` below): a schema
-            // default here would come back from scope.get()/watch() and shadow
-            // an explicit cordis.yml `foldTerminalCommand: true` while the
-            // settings user layer is unset — applyDisplay's
-            // `?? config.foldTerminalCommand ?? false` already supplies the
-            // default and keeps cordis.yml decisive.
-            foldTerminalCommand: Schema.boolean(),
-            promptSessionLabel: Schema.boolean().default(false),
-            // No schema default (same rule as foldTerminalCommand): applyDisplay
-            // resolves `?? config.expandEditor ?? true` so cordis.yml stays
-            // decisive while the user layer is unset.
-            expandEditor: Schema.boolean(),
-            // Same no-default rule: applyDisplay resolves `?? config.smoothStreaming ?? true`.
-            smoothStreaming: Schema.boolean(),
-            // Same no-default rule: applyDisplay resolves `?? config.mermaidDiagrams ?? true`.
-            mermaidDiagrams: Schema.boolean(),
-            // No default on purpose: unset keeps the boot chain decisive
-            // (applyEffortDefault hands `undefined` to channel.setDefaultEffort,
-            // which resolves cordis.yml `effort` → effort.json → adapter default).
-            effortDefault: Schema.string(),
-            statusBar: Schema.object({
-                compact: Schema.boolean().default(DEFAULT_STATUS_BAR.compact),
-                model: Schema.boolean().default(DEFAULT_STATUS_BAR.model),
-                thinking: Schema.boolean().default(DEFAULT_STATUS_BAR.thinking),
-                cwd: Schema.boolean().default(DEFAULT_STATUS_BAR.cwd),
-                contextUsage: Schema.boolean().default(DEFAULT_STATUS_BAR.contextUsage),
-                cache: Schema.boolean().default(DEFAULT_STATUS_BAR.cache),
-                tokens: Schema.boolean().default(DEFAULT_STATUS_BAR.tokens),
-                tps: Schema.boolean().default(DEFAULT_STATUS_BAR.tps),
-                gitBranch: Schema.boolean().default(DEFAULT_STATUS_BAR.gitBranch),
-                sessionTitle: Schema.boolean().default(DEFAULT_STATUS_BAR.sessionTitle),
-                sessionId: Schema.boolean().default(DEFAULT_STATUS_BAR.sessionId),
-                goal: Schema.boolean().default(DEFAULT_STATUS_BAR.goal),
-                mode: Schema.boolean().default(DEFAULT_STATUS_BAR.mode),
-                contextBar: Schema.boolean().default(DEFAULT_STATUS_BAR.contextBar),
-                activity: Schema.boolean().default(DEFAULT_STATUS_BAR.activity),
-                trajectory: Schema.boolean().default(DEFAULT_STATUS_BAR.trajectory),
-                shortcutHint: Schema.boolean().default(DEFAULT_STATUS_BAR.shortcutHint),
-            }).default({ ...DEFAULT_STATUS_BAR }),
-            // Header pixel whale art; on unless settings.yaml says otherwise.
-            whale: Schema.boolean().default(true),
-            // Idle whale behaviors after the intro settles; on by default —
-            // the idle-wakeup gate stays: an explicit `false` keeps the settled
-            // header timer-free.
-            whaleIdle: Schema.boolean().default(true),
-            // Minimal mode: strips the header splash, emoji glyphs, and
-            // decorative colors; code highlight and tool colors stay.
-            minimal: Schema.boolean().default(false),
-            // No default on purpose: an unset `lang` keeps the field showing
-            // the effective language (see the section's format below) and lets
-            // cordis.yml / lang.json keep their precedence.
-            lang: Schema.union(['zh', 'en']),
-            // Same no-default rule: unset keeps cordis.yml's `fullscreen`
-            // decisive; set overrides it from the next boot on.
-            fullscreen: Schema.boolean(),
-            // Unset inherits cordis.yml; a saved choice takes effect after restart.
-            terminalImages: Schema.boolean(),
-            // Built-in action-shortcut overrides, one optional combo string per
-            // action (see the keymap utility). Unset keeps the default binding
-            // and the section's format() shows the effective combos.
-            shortcuts: Schema.object(Object.fromEntries(SHORTCUT_ACTIONS.map(action => [action.id, Schema.string().required(false)]))).required(false),
-        }), () => {
+        const scope = createSettingsScope(configOwner, () => {
             const current = configValues(runtimeConfig);
             return { ...current, lang: isLang(current.lang) ? current.lang : undefined };
         });
@@ -715,19 +601,16 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
             applyMermaidDiagrams(value.mermaidDiagrams ?? config.mermaidDiagrams);
             channel.setStatusBar(normalizeStatusBar(value.statusBar ?? config.statusBar));
         };
-        // Legacy user scopes layer over cordis.yml. Modern Config is already
-        // resolved: an unset action must not revive its startup override.
+        // Config is already resolved: an unset action must not revive its startup override.
         // Applied live so the very next keypress matches the new combos.
         const applyShortcuts = (value) => {
             const userLayer = value.shortcuts ?? {};
-            const configLayer = scope.legacy ? config.shortcuts ?? {} : {};
             const merged = {};
             for (const action of SHORTCUT_ACTIONS) {
                 const user = userLayer[action.id];
-                const pinned = configLayer[action.id];
                 const chosen = typeof user === 'string' && user.trim() !== ''
                     ? user
-                    : (typeof pinned === 'string' && pinned.trim() !== '' ? pinned : undefined);
+                    : undefined;
                 if (chosen !== undefined)
                     merged[action.id] = chosen;
             }
@@ -758,30 +641,8 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
             applyShortcuts(next);
             applyRendererSettings(next);
         };
-        // One-time fullscreen factory-default migration (companion to the
-        // schema + cordis.patch.yml flip false→true): a `fullscreen: false`
-        // pinned in the settings user layer BEFORE the flip keeps overriding
-        // the new default on every boot. The first boot past this code clears
-        // that stale explicit choice; the migrations.json marker makes it
-        // strictly once, so a `false` re-pinned afterwards always stands. The
-        // boot decision cannot wait for the async doc write — the stale value
-        // is shadowed out of the first apply below (destructuring omission,
-        // not an explicit undefined), and the later watch commit (fullscreen
-        // back to undefined) leaves the fullscreen decision unchanged.
         const bootSettings = scope.get();
-        // The old migration applies only to the separate user layer. A modern
-        // profile's explicit inline Config must never be mistaken for that layer.
-        const fullscreenMigration = scope.legacy
-            ? planFullscreenFactoryMigration(bootSettings.fullscreen, readAppliedMigrations())
-            : 'done';
-        void commitFullscreenFactoryMigration(fullscreenMigration, {
-            unset: () => settingsCtx.settings.mutate(tuiSettingsNs, [{ op: 'unset', path: ['fullscreen'] }]),
-        });
-        if (fullscreenMigration === 'unset') {
-            notifyChannel(t('settings-fullscreen-migrated'), { color: 'warning' });
-        }
-        const { fullscreen: staleFullscreen, ...migratedSettings } = bootSettings;
-        apply(fullscreenMigration === 'unset' ? migratedSettings : bootSettings);
+        apply(bootSettings);
         let lastTerminalImages = bootSettings.terminalImages ?? config.terminalImages ?? true;
         settingsCtx.effect(() => scope.watch(next => {
             apply(next);
@@ -934,7 +795,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
                         { value: 'en', label: 'English', descriptions: { zh: '英文' } },
                     ],
                     format(value) {
-                        // Unset in settings.yaml: show the effective UI language
+                        // Unset in profile configuration: show the effective UI language
                         // (env / cordis.yml / lang.json resolution) instead of a
                         // blank "unset" that hides the current choice.
                         return value === undefined || value === null ? getLang() : String(value);
@@ -951,7 +812,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
                     hintDescriptions: { zh: '开启：接管整个终端（同 vim/less），应用内鼠标；关闭：终端原生滚动选择；整屏页两种模式都有鼠标。重启生效。' },
                     kind: 'boolean',
                     format(value) {
-                        // Unset in settings.yaml: show what THIS session booted with
+                        // Unset in profile configuration: show what THIS session booted with
                         // (the cordis.yml resolution) instead of a misleading false.
                         return value === undefined || value === null ? String(bootedFullscreen) : String(value);
                     },
@@ -1060,7 +921,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
                     hintDescriptions: { zh: '终端卡（Bash/PowerShell）：多行命令头部折叠为首行 + 计数；Ctrl+O 或点击卡片展开。' },
                     kind: 'boolean',
                     format(value) {
-                        // Unset in settings.yaml: show the effective resolution (cordis.yml
+                        // Unset in profile configuration: show the effective resolution (cordis.yml
                         // → off) instead of a blank — same rule as `fullscreen`'s field.
                         return String(typeof value === 'boolean' ? value : config.foldTerminalCommand === true);
                     },
@@ -1081,7 +942,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
                     hintDescriptions: { zh: '开启：输入行尾 ⛶ 按钮与全屏编辑快捷键（默认 Ctrl+Shift+E）把草稿展开成整屏编辑器（Enter 换行、Ctrl+Enter 发送）。关闭：两个入口都不显示。默认开启。' },
                     kind: 'boolean',
                     format(value) {
-                        // Unset in settings.yaml: the effective default is on.
+                        // Unset in profile configuration: the effective default is on.
                         return String(typeof value === 'boolean' ? value : config.expandEditor !== false);
                     },
                 },
@@ -1093,7 +954,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
                     hintDescriptions: { zh: '把实时回复、展开的思考与工具卡正文按 ~30fps 匀速揭示，不再随供应商突发一跳一跳；一次性到达的非流式回复也会平滑打出。回放/历史内容始终完整直出。默认开启。' },
                     kind: 'boolean',
                     format(value) {
-                        // Unset in settings.yaml: the effective default is on.
+                        // Unset in profile configuration: the effective default is on.
                         return String(typeof value === 'boolean' ? value : config.smoothStreaming !== false);
                     },
                 },
@@ -1105,7 +966,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
                     hintDescriptions: { zh: '把回复中的 ```mermaid 代码块画成字符图（flowchart、sequence、state、class、ER、pie、mindmap、timeline、gitGraph）。比终端宽或类型不支持的图保留源码。立即生效。默认开启。' },
                     kind: 'boolean',
                     format(value) {
-                        // Unset in settings.yaml: the effective default is on.
+                        // Unset in profile configuration: the effective default is on.
                         return String(typeof value === 'boolean' ? value : config.mermaidDiagrams !== false);
                     },
                 },
@@ -1117,7 +978,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
                     hintDescriptions: { zh: '开启：打开/恢复会话时自动把最近活动总结成一行灰字显示在会话底部（可悬停/点击查看或应用建议标题）；关闭：手动使用 /recap。' },
                     kind: 'boolean',
                     format(value) {
-                        // Unset in settings.yaml: the default is on.
+                        // Unset in profile configuration: the default is on.
                         return value === undefined || value === null ? 'true' : String(value);
                     },
                 },
@@ -1136,7 +997,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
                         { value: 'max', label: 'Max', descriptions: { zh: '最高' } },
                     ],
                     format(value) {
-                        // Unset in settings.yaml: show what a boot would actually start
+                        // Unset in profile configuration: show what a boot would actually start
                         // on (the cordis effort pin → the persisted /effort choice)
                         // instead of a misleading blank.
                         if (value === undefined || value === null || value === 'auto') {
@@ -1386,10 +1247,6 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     notifyStderr = (text, options) => notifyChannel(text, options);
     // The question-seat alert was raised before the channel existed; flush it
     // now so it lands as an in-UI notice, not only in the log file.
-    if (questionSeatNotice !== undefined) {
-        notifyChannel(questionSeatNotice, { color: 'error' });
-        questionSeatNotice = undefined;
-    }
     for (const [text, options] of stderrBacklog.splice(0)) {
         notifyStderr(text, options);
     }
@@ -1762,10 +1619,10 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
         // between would otherwise drop the claim this boot just committed.
         const reservation = reserved.reservation;
         try {
-            // Compat boundary: register vouched-for legacy event types before the
+            // Register current TUI-owned event types before the
             // strict read path (issue #153) — same seam as the /resume picker,
             // here for the launch-time --resume flow. In-process only.
-            ensureLegacySessionEventTypes();
+            registerTuiSessionEventTypes();
             // The resumed session keeps the preset its log records (last
             // `agent-preset/selected` wins over the creation header), never the
             // caller's current preference.

package/lib/types/dsh-adapter/preset-resolution.d.ts

@@ -1,11 +1,4 @@
-/**
- * Agent-preset resolution across upstream prerelease lines.
- *
- * Legacy rc.2 exports `resolveSessionPreset` and ships `code`; the 0.1.2 line
- * replaces the helper with a projection definition and renames that preset to `ptc`.
- * Keeping both compatibility decisions here prevents composition and channel
- * code from acquiring prerelease-specific branches.
- */
+/** Current DSH agent-preset roster and durable selection. */
 import type { Context } from '@deepseek-ai/cordis';
 /** One roster entry, as returned by `agentPresets.list()`/`resolve()`. */
 export interface AgentPresetInfo {
@@ -40,18 +33,4 @@ export declare function resolveRecordedPreset(session: {
         data: unknown;
     }[];
 }): string | undefined;
-/**
- * Resolve an exact roster id first, then bridge the official rename in either
- * direction. A successful list is required before aliasing so roster I/O or
- * a broken exact preset can never be mistaken for an unknown id.
- */
-export declare function resolveCompatiblePreset(presets: AgentPresetsLike, requested?: string): Promise<AgentPresetInfo>;
-/**
- * The i18n dictionary id a roster preset's localized display text resolves
- * under. The 0.1.2 line renamed the official PTC preset `code` → `ptc`, but
- * the dictionary keys still use the legacy `code` id (`preset-name-code` /
- * `preset-desc-code`), so the `/preset` picker's display lookup must bridge
- * the roster id back. User-authored ids pass through untouched.
- */
-export declare function presetDisplayId(id: string): string;
 //# sourceMappingURL=preset-resolution.d.ts.map

package/lib/types/dsh-adapter/preset-resolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preset-resolution.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/preset-resolution.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,0EAA0E;AAC1E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAA;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,+DAA+D;AAC/D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,IAAI,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAAA;IAC3C,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAC9C,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAC/D,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAClE,yEAAyE;IACzE,UAAU,CAAC,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAC3D;AAED,2EAA2E;AAC3E,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAEnE;AAED,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,MAAM,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAChC,MAAM,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CACnD,GAAG,MAAM,GAAG,SAAS,CASrB;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,eAAe,CAAC,CAQ1B;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAElD"}
+{"version":3,"file":"preset-resolution.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/preset-resolution.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,0EAA0E;AAC1E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAA;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,+DAA+D;AAC/D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,IAAI,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAAA;IAC3C,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAC9C,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAC/D,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAClE,yEAAyE;IACzE,UAAU,CAAC,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAC3D;AAED,2EAA2E;AAC3E,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAEnE;AAED,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,MAAM,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAChC,MAAM,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CACnD,GAAG,MAAM,GAAG,SAAS,CASrB"}

package/lib/types/dsh-adapter/preset-resolution.js

@@ -1,11 +1,3 @@
-/**
- * Agent-preset resolution across upstream prerelease lines.
- *
- * Legacy rc.2 exports `resolveSessionPreset` and ships `code`; the 0.1.2 line
- * replaces the helper with a projection definition and renames that preset to `ptc`.
- * Keeping both compatibility decisions here prevents composition and channel
- * code from acquiring prerelease-specific branches.
- */
 /** The mounted preset roster, or undefined in a rosterless composition. */
 export function rosterOf(ctx) {
     return ctx.get('agentPresets');
@@ -24,29 +16,3 @@ export function resolveRecordedPreset(session) {
     }
     return session.header.agentPreset;
 }
-/**
- * Resolve an exact roster id first, then bridge the official rename in either
- * direction. A successful list is required before aliasing so roster I/O or
- * a broken exact preset can never be mistaken for an unknown id.
- */
-export async function resolveCompatiblePreset(presets, requested) {
-    const fallback = requested === 'code' ? 'ptc' : requested === 'ptc' ? 'code' : undefined;
-    if (fallback === undefined)
-        return presets.resolve(requested);
-    const roster = await presets.list();
-    if (roster.some(preset => preset.id === requested))
-        return presets.resolve(requested);
-    if (roster.some(preset => preset.id === fallback))
-        return presets.resolve(fallback);
-    return presets.resolve(requested);
-}
-/**
- * The i18n dictionary id a roster preset's localized display text resolves
- * under. The 0.1.2 line renamed the official PTC preset `code` → `ptc`, but
- * the dictionary keys still use the legacy `code` id (`preset-name-code` /
- * `preset-desc-code`), so the `/preset` picker's display lookup must bridge
- * the roster id back. User-authored ids pass through untouched.
- */
-export function presetDisplayId(id) {
-    return id === 'ptc' ? 'code' : id;
-}

package/lib/types/dsh-adapter/presets.d.ts

@@ -10,10 +10,7 @@
  * factory's `setup(agentCtx)` hook, where a composition failure rolls the
  * whole creation back instead of publishing a half-configured agent.
  *
- * A deployment without the roster (bare `dsh --config cordis.yml` boots,
- * older CLI without the shipped preset root) composes nothing: callers get
- * no `setup` and every session shares the host composition — the behavior
- * before presets existed.
+ * A composition without a preset registry supplies no preset setup.
  */
 import type { Context } from '@deepseek-ai/cordis';
 import type { AgentSetup } from '@deepseek-ai/dsh-agent';

package/lib/types/dsh-adapter/presets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"presets.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/presets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAWtE,kEAAkE;AAClE,MAAM,WAAW,iBAAiB;IAChC,kFAAkF;IAClF,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAA;CAC5B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmBhG;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAW5G;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAGpE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAW/G;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,cAAc,CAM/G;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAKpG"}
+{"version":3,"file":"presets.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/presets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAUtE,kEAAkE;AAClE,MAAM,WAAW,iBAAiB;IAChC,kFAAkF;IAClF,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAA;CAC5B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmBhG;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAW5G;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAGpE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAW/G;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,cAAc,CAM/G;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAKpG"}

package/lib/types/dsh-adapter/presets.js

@@ -10,15 +10,12 @@
  * factory's `setup(agentCtx)` hook, where a composition failure rolls the
  * whole creation back instead of publishing a half-configured agent.
  *
- * A deployment without the roster (bare `dsh --config cordis.yml` boots,
- * older CLI without the shipped preset root) composes nothing: callers get
- * no `setup` and every session shares the host composition — the behavior
- * before presets existed.
+ * A composition without a preset registry supplies no preset setup.
  */
 import { recordedModelRoute } from '../modelRoute.js';
 import { snapshotLiveSessionEvents } from './compat/liveSession.js';
 import { readPersistedSession } from './compat/persistence.js';
-import { resolveCompatiblePreset, resolveRecordedPreset, rosterOf, } from './preset-resolution.js';
+import { resolveRecordedPreset, rosterOf, } from './preset-resolution.js';
 const ASK_USER_TOOL = 'ask_user_question';
 /**
  * Resolve the preset one new/resumed session will run under and the setup
@@ -39,7 +36,7 @@ export async function composePreset(ctx, requested) {
         return {};
     let resolvedId;
     try {
-        resolvedId = (await resolveCompatiblePreset(presets, requested)).id;
+        resolvedId = (await presets.resolve(requested)).id;
     }
     catch (error) {
         ctx.logger.warn(`dsh-tui: agent preset ${requested === undefined ? '(default)' : `"${requested}"`} unavailable ` +

package/lib/types/dsh-adapter/questions-answerer.d.ts

@@ -1,51 +1,13 @@
-/**
- * User-question answerer compatibility.
- *
- * Legacy rc.2 exposes one global `registerProvider` seat. The 0.1.2 line removed that
- * API in favour of a scope-aware `user-questions/request` waterfall. Keep the
- * capability probe and both registration paths here so the TUI bootstrap only
- * consumes a small prepared-registration result.
- */
+/** Scope-aware question routing. Registration belongs to the TUI fiber. */
 import type { Context } from '@deepseek-ai/cordis';
 import type { AskUserQuestionAnswer, AskUserQuestionRequest } from '@deepseek-ai/dsh-user-questions';
-import { type QuestionProviderYieldDecision } from './providerGuard.js';
 export interface QuestionAnswerer {
     ask(request: AskUserQuestionRequest, options?: {
         redact?: boolean;
     }): Promise<AskUserQuestionAnswer>;
 }
-export type PreparedQuestionAnswerer = {
-    readonly kind: 'legacy';
-    /** Present only when another component already owns the provider seat. */
-    readonly yieldDecision?: QuestionProviderYieldDecision;
-} | {
-    readonly kind: 'waterfall';
-    /** Bind ownership after the mutable channel has been created. */
-    register(owner: {
-        readonly agentId: string;
-    }): () => void;
-};
-/**
- * Prepare the answerer against whichever upstream API the active package
- * exposes. The legacy path registers immediately and binds the returned
- * disposer to this TUI fiber. The waterfall path returns a late binder because
- * channel.agentId changes across `/new`, `/resume`, and rewind.
- *
- * Agentless waterfall requests are claimed deliberately: dsh-auth's `/auth`
- * wizard asks through the same service without an agent. Foreign-agent
- * requests continue to the next answerer.
- *
- * Security scope (#586): the provider-seat guard (DUPLICATE_PROVIDER probe +
- * private symbol check) exists ONLY on the legacy path. The waterfall has no
- * seat. Agent-bearing requests are scope-filtered; agentless requests such as
- * dsh-auth `/auth` are dispatched without a scope carrier. Under the answerer
- * contract, the first eligible listener that returns instead of delegating
- * with `next()` claims the request. Cordis waterfall is around middleware,
- * however: an outer listener can call `next()` and then observe, replace, or
- * reject the downstream result, while `{ prepend: true }` inserts a listener
- * at the front. Upstream exposes no supported way to discover or reserve an
- * exclusive claimant, so the legacy guard and its warning cannot be
- * reproduced here.
- */
-export declare function prepareQuestionAnswerer(ctx: Context, service: unknown, answerer: QuestionAnswerer): PreparedQuestionAnswerer;
+/** Read the mutable channel identity for every request, including after resume. */
+export declare function registerQuestionAnswerer(ctx: Context, owner: {
+    readonly agentId: string;
+}, answerer: QuestionAnswerer): () => void;
 //# sourceMappingURL=questions-answerer.d.ts.map

package/lib/types/dsh-adapter/questions-answerer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questions-answerer.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/questions-answerer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EACV,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAIL,KAAK,6BAA6B,EACnC,MAAM,oBAAoB,CAAA;AAE3B,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,OAAO,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;CACrG;AAoBD,MAAM,MAAM,wBAAwB,GAChC;IACE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;IACvB,0EAA0E;IAC1E,QAAQ,CAAC,aAAa,CAAC,EAAE,6BAA6B,CAAA;CACvD,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;IAC1B,iEAAiE;IACjE,QAAQ,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,IAAI,CAAA;CAC1D,CAAA;AAML;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,gBAAgB,GACzB,wBAAwB,CA2B1B"}
+{"version":3,"file":"questions-answerer.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/questions-answerer.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAA;AAEpG,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,OAAO,EAAE,sBAAsB,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;CACrG;AAED,mFAAmF;AACnF,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACnC,QAAQ,EAAE,gBAAgB,GACzB,MAAM,IAAI,CAKZ"}

package/lib/types/dsh-adapter/questions-answerer.js

@@ -1,64 +1,8 @@
-/**
- * User-question answerer compatibility.
- *
- * Legacy rc.2 exposes one global `registerProvider` seat. The 0.1.2 line removed that
- * API in favour of a scope-aware `user-questions/request` waterfall. Keep the
- * capability probe and both registration paths here so the TUI bootstrap only
- * consumes a small prepared-registration result.
- */
-import { decideQuestionProviderYield, incumbentQuestionProviderId, tagTuiQuestionProvider, } from './providerGuard.js';
-function secretRequest(request) {
-    return request.questions.some(question => question.id === 'dsh-auth-secret');
-}
-function hasLegacyProvider(service) {
-    return typeof service.registerProvider === 'function';
-}
-/**
- * Prepare the answerer against whichever upstream API the active package
- * exposes. The legacy path registers immediately and binds the returned
- * disposer to this TUI fiber. The waterfall path returns a late binder because
- * channel.agentId changes across `/new`, `/resume`, and rewind.
- *
- * Agentless waterfall requests are claimed deliberately: dsh-auth's `/auth`
- * wizard asks through the same service without an agent. Foreign-agent
- * requests continue to the next answerer.
- *
- * Security scope (#586): the provider-seat guard (DUPLICATE_PROVIDER probe +
- * private symbol check) exists ONLY on the legacy path. The waterfall has no
- * seat. Agent-bearing requests are scope-filtered; agentless requests such as
- * dsh-auth `/auth` are dispatched without a scope carrier. Under the answerer
- * contract, the first eligible listener that returns instead of delegating
- * with `next()` claims the request. Cordis waterfall is around middleware,
- * however: an outer listener can call `next()` and then observe, replace, or
- * reject the downstream result, while `{ prepend: true }` inserts a listener
- * at the front. Upstream exposes no supported way to discover or reserve an
- * exclusive claimant, so the legacy guard and its warning cannot be
- * reproduced here.
- */
-export function prepareQuestionAnswerer(ctx, service, answerer) {
-    if (!hasLegacyProvider(service)) {
-        const events = ctx;
-        return {
-            kind: 'waterfall',
-            register: owner => events.on('user-questions/request', (request, next) => {
-                if (request.agent !== undefined && String(request.agent.id) !== owner.agentId)
-                    return next();
-                return answerer.ask(request, { redact: secretRequest(request) });
-            }),
-        };
-    }
-    const provider = { ask: request => answerer.ask(request, { redact: secretRequest(request) }) };
-    tagTuiQuestionProvider(provider);
-    try {
-        ctx.effect(() => service.registerProvider(provider), 'dsh-tui.questions.legacy-provider');
-        return { kind: 'legacy' };
-    }
-    catch (error) {
-        if (error.code !== 'DUPLICATE_PROVIDER')
-            throw error;
-        return {
-            kind: 'legacy',
-            yieldDecision: decideQuestionProviderYield(incumbentQuestionProviderId(service)),
-        };
-    }
+/** Read the mutable channel identity for every request, including after resume. */
+export function registerQuestionAnswerer(ctx, owner, answerer) {
+    return ctx.on('user-questions/request', (request, next) => {
+        if (request.agent !== undefined && String(request.agent.id) !== owner.agentId)
+            return next();
+        return answerer.ask(request, { redact: request.questions.some(question => question.id === 'dsh-auth-secret') });
+    });
 }