@deepseek-harness-tui/dsh-tui 0.6.0 → 0.7.0

package/lib/types/{plugin.js → dsh-adapter/plugin.js}

@@ -5,20 +5,28 @@ import UserQuestionService from '@deepseek-ai/dsh-user-questions';
 import * as toolAskUser from '@deepseek-ai/dsh-tool-ask-user';
 import { createChannel } from './channel.js';
 import { createChildStderrReporter, installChildStderrGuard } from './childStderr.js';
-import { logForDebugging } from './utils/debug.js';
+import { logForDebugging } from '../utils/debug.js';
 import { QuestionStore } from './questions.js';
 import { ApprovalStore } from './approvals.js';
 import { registerPackagedSkills } from './packaged-skills.js';
-import { readActivityFrames } from './activityPrefs.js';
-import { readModelPref } from './modelPrefs.js';
-import { explicitModelRoute, recordedModelRoute, resolveModelRoute, validateModelRoute } from './modelRoute.js';
-import { readPresetPref } from './presetPrefs.js';
+import { readActivityFrames } from '../activityPrefs.js';
+import { readModelPref } from '../modelPrefs.js';
+import { explicitModelRoute, recordedModelRoute, resolveModelRoute, validateModelRoute } from '../modelRoute.js';
+import { readPresetPref } from '../presetPrefs.js';
 import { composePreset, resolvePersistedPreset, runningPresetOf } from './presets.js';
-import { writeResumeTarget } from './sessionHistory.js';
-import { checkForTuiUpdate, installedTuiVersion, isVersionNewer, resolveDshProfileName, resolveTuiUpdateTarget, updateTuiAndRestart } from './update.js';
-import { isLang, resolveStartupLang, setLang, t } from './i18n.js';
-import { Chat } from './screens/Chat.js';
-import { render, ThemeProvider, AlternateScreen } from './ui.js';
+import { ensureLegacySessionEventTypes } from './compat/index.js';
+import { clearResumeTarget, writeResumeTarget } from '../sessionHistory.js';
+import { resolveSessionCwd } from '../utils/workspaceRoot.js';
+import { checkForTuiUpdate, installedTuiVersion, isVersionNewer, resolveDshProfileName, resolveTuiUpdateTarget, updateTuiAndRestart } from '../update.js';
+import { isLang, resolveStartupLang, setLang, t } from '../i18n.js';
+import { detectLegacyEnv, migrateLegacyDataDir, RENAMED_ENV } from '../utils/paths.js';
+import { Chat } from '../screens/Chat.js';
+import { attachSessionToWorkspace } from './workspace.js';
+import { render, ThemeProvider, AlternateScreen } from '../ui.js';
+import instances from '../ink/instances.js';
+import { cursorMove, DISABLE_KITTY_KEYBOARD, DISABLE_MODIFY_OTHER_KEYS, DISABLE_WIN32_INPUT_MODE } from '../ink/termio/csi.js';
+import { DBP, DFE, DISABLE_MOUSE_TRACKING, EXIT_ALT_SCREEN, SHOW_CURSOR } from '../ink/termio/dec.js';
+import { CLEAR_ITERM2_PROGRESS, CLEAR_TAB_STATUS, supportsTabStatus, wrapForMultiplexer } from '../ink/termio/osc.js';
 /**
  * Claude Code style interactive TUI front door for DeepSeek Harness agents.
  *
@@ -32,23 +40,43 @@ export async function apply(ctx, config) {
     if (!process.stdout.isTTY) {
         throw new Error('dsh-tui requires an interactive terminal (stdout must be a TTY).');
     }
-    // UI language resolution: CC_TUI_LANG env var wins, then cordis.yml
+    // Data-directory rename (~/.dsh-cc → ~/.dsh-tui, issue #120): copy the
+    // legacy directory before ANY preference read below (resolveStartupLang
+    // already touches lang.json). Copy, not move — old launchers keep working
+    // and the user deletes the legacy directory themselves.
+    const migrated = migrateLegacyDataDir();
+    // UI language resolution: DSH_TUI_LANG env var wins, 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.
-    const envLang = process.env.CC_TUI_LANG;
+    const envLang = process.env.DSH_TUI_LANG;
     setLang(isLang(envLang) ? envLang : isLang(config.lang) ? config.lang : resolveStartupLang());
+    // Rename notices must land before the first render — stderr writes break
+    // the fullscreen UI once it is up. The bin launcher prints the same
+    // warnings; this covers direct `dsh --profile dsh-tui` boots.
+    if (migrated) {
+        ctx.logger.warn('dsh-tui: data directory copied from ~/.dsh-cc to ~/.dsh-tui (legacy kept)');
+        if (process.stderr.isTTY) {
+            process.stderr.write(`\n[dsh-tui] ${t('legacy-dir-migrated')}\n`);
+        }
+    }
+    for (const oldName of detectLegacyEnv()) {
+        ctx.logger.warn(`dsh-tui: env ${oldName} renamed to ${RENAMED_ENV[oldName]}; the old name no longer takes effect`);
+        if (process.stderr.isTTY) {
+            process.stderr.write(`\n[dsh-tui] ${t('legacy-env-renamed', { old: oldName, new: RENAMED_ENV[oldName] })}\n`);
+        }
+    }
     // /update restart verification: the pre-update process stamps the version
     // it was leaving behind; if the freshly loaded one is not newer, the
     // package manager "succeeded" without actually moving the version (mirror
     // lag, cached manifest, wrong profile). Say so instead of silently
     // pretending the update landed.
     {
-        const updatedFrom = process.env.DSH_CC_UPDATED_FROM;
+        const updatedFrom = process.env.DSH_TUI_UPDATED_FROM;
         if (updatedFrom !== undefined) {
             // Assigning undefined would stringify to "undefined" and leak the
             // marker into every child process; remove it for real.
-            delete process.env.DSH_CC_UPDATED_FROM;
+            delete process.env.DSH_TUI_UPDATED_FROM;
             const now = installedTuiVersion();
             if (now === undefined || !isVersionNewer(now, updatedFrom)) {
                 ctx.logger.warn(`dsh-tui: /update restarted but the version did not advance (still ${now ?? 'unknown'}, was ${updatedFrom})`);
@@ -74,10 +102,22 @@ export async function apply(ctx, config) {
     // Packaged skills (/audit, /bug, …): contribute them through the host's
     // skill registry so they resolve with zero manual copying.
     registerPackagedSkills(ctx);
-    userQuestions.registerProvider({
-        ask: request => questionStore.ask(request),
-    });
-    ctx.effect(() => () => questionStore.rejectAll());
+    // Yield to an incumbent provider instead of crashing the whole plugin tree
+    // (issue #98): the harness allows exactly ONE user-questions provider per
+    // context, and stacking this TUI onto a profile that already carries
+    // @deepseek-ai/dsh-web-app (its api-gateway registers first) used to fail
+    // the boot with DUPLICATE_PROVIDER. The incumbent UI then owns questionnaire
+    // rendering; this TUI's ask_user_question requests are answered there.
+    try {
+        userQuestions.registerProvider({
+            ask: request => questionStore.ask(request),
+        });
+        ctx.effect(() => () => questionStore.rejectAll());
+    }
+    catch (error) {
+        if (error.code !== 'DUPLICATE_PROVIDER')
+            throw error;
+    }
     // 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
@@ -111,20 +151,61 @@ export async function apply(ctx, config) {
         model: config.model,
     };
     // Atomic route resolution (issue #67): a complete cordis.yml route wins
-    // whole, else the persisted `/model` choice wins whole, else the harness
-    // defaults — a provider-only config pin never merges with the persisted
-    // model half. resolveAgent validates this route on create and reports the
-    // one actually used, so the status line shows the real request route.
-    const startupRoute = resolveModelRoute(configuredRoute, readModelPref());
-    const meta = { cwd: config.cwd ?? process.cwd() };
+    // whole, else the persisted `/model` choice wins whole, else Harness's
+    // provider-neutral agent-default-model selection. The local DeepSeek pair
+    // remains the final fallback for bare embedders without that service. This
+    // lets optional provider bundles supply the same default to Web and TUI
+    // without patching this front door by name.
+    const configuredDefault = ctx.get('agentDefaultModel')?.currentSelection?.();
+    const harnessDefault = typeof configuredDefault?.provider === 'string'
+        && configuredDefault.provider.length > 0
+        && typeof configuredDefault.model === 'string'
+        && configuredDefault.model.length > 0
+        ? { provider: configuredDefault.provider, model: configuredDefault.model }
+        : undefined;
+    const startupRoute = resolveModelRoute(configuredRoute, readModelPref(), harnessDefault);
+    // Session cwd (issue #96): explicit cordis.yml `cwd` wins; otherwise the
+    // git worktree root containing the launch directory (the launch directory
+    // itself outside any worktree), so `@` completion and mention expansion
+    // see the repository, not an arbitrary launch subdirectory. Resolved ONCE
+    // here — the agent meta and the channel must agree.
+    const requestedWorkspace = config.workspace ?? process.env.DSH_TUI_WORKSPACE_TARGET;
+    const initialWorkspace = requestedWorkspace === undefined
+        ? undefined
+        : await ctx.tuiWorkspaces.resolve(requestedWorkspace);
+    if (requestedWorkspace !== undefined && initialWorkspace === undefined) {
+        throw new Error(`dsh-tui: unsupported or unavailable workspace target: ${requestedWorkspace}`);
+    }
+    const sessionCwd = initialWorkspace?.cwd ?? resolveSessionCwd(config.cwd);
+    const meta = { cwd: sessionCwd };
     const { agent, handle, agentPreset, route: createdRoute } = await resolveAgent(ctx, config.sessionId, configuredRoute, startupRoute, meta, config.preset);
+    try {
+        // Opening a persisted TUI session is an explicit ownership action too.
+        // Older TUI versions only wrote the Session log, so attaching on every
+        // startup repairs those durable-but-ungrouped sessions idempotently.
+        const attached = await attachSessionToWorkspace(ctx, meta.cwd, agent.session.id);
+        if (!attached) {
+            ctx.logger.warn(`dsh-tui: session "${agent.session.id}" has no workspace ownership because workspaceRegistry is not mounted`);
+        }
+    }
+    catch (error) {
+        // The Session is already published and durable, matching Web's partial
+        // failure contract. Keep the TUI usable but make the missing ownership
+        // loud instead of silently leaving the conversation Ungrouped.
+        ctx.logger.warn(`dsh-tui: session "${agent.session.id}" workspace attachment failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
     // Status-line route: the exact route the agent runs with — on create the
     // validated startup resolution, on resume the route the target session's
     // own records carry (a complete cordis.yml pin wins over them).
     const displayRoute = createdRoute ?? startupRoute;
     const channel = createChannel(ctx, agent, {
         model: displayRoute.model,
-        cwd: config.cwd ?? process.cwd(),
+        // A RESUMED session keeps its persisted header cwd (issue #96 review):
+        // pre-upgrade sessions recorded the launch directory, and re-resolving
+        // from the current launch directory would split @ expansion / file
+        // completion (state.cwd) from the agent's own workspace record. Fresh
+        // sessions record sessionCwd at creation, so both agree there.
+        cwd: agent.session.header.cwd ?? sessionCwd,
         provider: displayRoute.provider,
         // Raw cordis.yml route (undefined when unset): the channel's
         // new-session path re-resolves prefs against these, and resume passes
@@ -142,6 +223,9 @@ export async function apply(ctx, config) {
         // persisted `/preset` choice; undefined adopts the roster default.
         configuredPreset: config.preset,
         agentPreset,
+        // Shift+Tab session-mode cycle (undefined → the built-in default/
+        // plan/full cycle in sessionModes.ts).
+        modes: config.modes,
         handle,
     });
     // DSH approval seam: the permission layer asks ApprovalService.request(),
@@ -189,66 +273,44 @@ export async function apply(ctx, config) {
             // Mirror the funnel's internal exited flag for the /update and
             // background-check guards that still read the outer one.
             exited = true;
-            try {
-                writeResumeTarget(channel.agentId);
-            }
-            catch {
-                // Best effort — the resume marker is a launcher nicety; a stale
-                // marker must never block a clean exit.
-            }
-            try {
-                instance?.unmount();
-            }
-            catch {
-                // The terminal state may already be gone (broken pipe, alt session);
-                // the exit path must never throw.
-            }
             if (error !== undefined) {
-                // Error-driven unmount (render crash): stay loud and exit non-zero.
-                // A success code + resume hint here would tell wrappers/CI the
-                // session ended cleanly while the TUI actually crashed.
                 const message = error instanceof Error ? error.message : String(error);
                 ctx.logger.error(`dsh-tui: exit after error: ${message}`);
-                if (process.stderr.isTTY) {
-                    process.stderr.write(`\ndsh-tui crashed: ${message}\n`);
-                }
-                disposeRootAndExit(ctx, 1);
+                void finishExit(ctx, instance, config.fullscreen === true, undefined, `dsh-tui crashed: ${message}`, () => disposeRootAndExit(ctx, 1));
                 return;
             }
             if (updateRequested) {
-                if (process.stdout.isTTY) {
-                    process.stdout.write('\nUpdating @deepseek-harness-tui/dsh-tui and restarting…\n');
+                try {
+                    writeResumeTarget(channel.agentId);
+                }
+                catch {
+                    // Resume persistence is best effort and must never block an update.
                 }
-                disposeRootAndThen(ctx, () => {
-                    // updateRequested only flips when onUpdate exists, which itself
-                    // requires a resolved profile — narrow for the call below.
-                    const updateProfile = profile;
-                    if (updateProfile === undefined) {
-                        process.stderr.write('\ndsh-tui update aborted: no dsh profile resolved.\n');
-                        process.exit(1);
-                    }
-                    void updateTuiAndRestart(channel.agentId, updateProfile).then(({ updateCode, restartCode }) => {
-                        if (updateCode !== 0) {
-                            // The session survives: its log lives in DSH persistence and
-                            // resume.txt was already written. A bare non-zero exit would
-                            // drop the user into a shell with no way back in.
-                            process.stderr.write(`\ndsh-tui update failed (exit ${updateCode}). Your session is preserved — resume with:\n` +
-                                `${resumeCommand(profile, channel.agentId)}\n\n`);
-                        }
-                        process.exit(restartCode);
-                    }, updateError => {
-                        const message = updateError instanceof Error ? updateError.message : String(updateError);
-                        process.stderr.write(`\ndsh-tui update failed: ${message}. Your session is preserved — resume with:\n` +
-                            `${resumeCommand(profile, channel.agentId)}\n\n`);
-                        process.exit(1);
-                    });
-                });
+                void finishExit(ctx, instance, config.fullscreen === true, 'Updating @deepseek-harness-tui/dsh-tui and restarting…', undefined, () => runUpdate(ctx, profile, channel.agentId));
                 return;
             }
-            if (process.stdout.isTTY) {
-                process.stdout.write(`\nResume with (set the env var, then boot the profile):\n${resumeCommand(profile, channel.agentId)}\n\n`);
+            // Judge against the live session behind the channel (channel.agentId),
+            // not the boot-time agent captured above: /resume, /new and /model swap
+            // the active agent, so the captured reference can go stale (see
+            // isExitResumable).
+            const resumable = isExitResumable({
+                pendingCount: channel.pending.length,
+                liveAgent: ctx.agents.get(SessionId(channel.agentId)),
+                startupAgent: agent,
+            });
+            try {
+                if (resumable)
+                    writeResumeTarget(channel.agentId);
+                else
+                    clearResumeTarget();
             }
-            disposeRootAndExit(ctx, 0);
+            catch {
+                // Resume persistence is best effort and must never block shutdown.
+            }
+            const hint = resumable
+                ? `Resume with the command below:\n${resumeCommand(profile, channel.agentId)}`
+                : undefined;
+            void finishExit(ctx, instance, config.fullscreen === true, hint, undefined, () => disposeRootAndExit(ctx, 0));
         },
     });
     const handleExit = funnel.handleExit;
@@ -256,6 +318,9 @@ export async function apply(ctx, config) {
         channel,
         questionStore,
         approvalStore,
+        // The trajectory scene enters the alt screen itself in inline mode; in
+        // fullscreen the tree is already wrapped below, so it must not nest.
+        fullscreen: config.fullscreen === true,
         onExit: () => handleExit(),
         // Only a `dsh --profile <name>` launch has a profile installation for
         // `/update` to act on; source checkouts and `--config` overlays get the
@@ -278,7 +343,7 @@ export async function apply(ctx, config) {
                 }
                 channel.notify(t('update-starting'));
                 updateRequested = true;
-                instance?.unmount();
+                handleExit();
             });
         },
     });
@@ -343,6 +408,10 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
             return { agent: existing, agentPreset: runningPresetOf(existing.session) };
         }
         try {
+            // Compat boundary: register vouched-for legacy 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();
             // The resumed session keeps the preset its log records (last
             // `agent-preset/selected` wins over the creation header), never the
             // caller's current preference.
@@ -430,6 +499,136 @@ export function createExitFunnel(deps) {
         },
     };
 }
+/**
+ * Whether a user exit should leave the resume marker (and print the resume
+ * hint). Must be judged against the LIVE session behind the channel, not the
+ * boot-time agent apply() captured: /resume, /new and /model swap the active
+ * agent (channel.agentId follows, the old handle is disposed), so the
+ * captured reference can point at a stale session — wiping a marker the
+ * resume path just wrote (boot empty → /resume into history) or rewriting it
+ * to a fresh empty session (boot with history → /new). `liveAgent` is the
+ * registry lookup of channel.agentId; it falls back to the captured agent
+ * when the lookup misses. Exported for scripts/verify-exit-resume-marker.
+ */
+export function isExitResumable(deps) {
+    const agent = deps.liveAgent ?? deps.startupAgent;
+    return (deps.pendingCount > 0 ||
+        agent.session.events.some(event => event.type === 'user/message' && event.data.source.kind === 'user'));
+}
+/** Finish terminal I/O before handing control to a process-level exit action. */
+async function finishExit(ctx, instance, fullscreen, notice, stderrNotice, done) {
+    try {
+        const runtime = readInkShutdownState(instances.get(process.stdout));
+        if (runtime === undefined && instance !== undefined) {
+            ctx.logger.debug('dsh-tui: Ink runtime unavailable during shutdown; using generic terminal cleanup');
+        }
+        const cursor = fullscreen ? '' : cursorMoveToFrameEnd(runtime);
+        try {
+            runtime?.detachForShutdown?.();
+        }
+        catch {
+            ctx.logger.debug('dsh-tui: Ink shutdown detach failed; continuing with generic terminal cleanup');
+        }
+        const cleanup = [
+            fullscreen ? EXIT_ALT_SCREEN : '',
+            cursor,
+            DISABLE_MOUSE_TRACKING,
+            DISABLE_MODIFY_OTHER_KEYS,
+            DISABLE_KITTY_KEYBOARD,
+            DISABLE_WIN32_INPUT_MODE,
+            DFE,
+            DBP,
+            SHOW_CURSOR,
+            CLEAR_ITERM2_PROGRESS,
+            supportsTabStatus() ? wrapForMultiplexer(CLEAR_TAB_STATUS) : '',
+        ].join('');
+        const suffix = notice === undefined ? '' : `${notice}\n`;
+        await writeStream(process.stdout, `${cleanup}\r\n${suffix}`);
+        if (stderrNotice !== undefined) {
+            await writeStream(process.stderr, `\n${stderrNotice}\n`);
+        }
+    }
+    catch {
+        ctx.logger.debug('dsh-tui: terminal cleanup failed; continuing with process shutdown');
+    }
+    done();
+}
+function readInkShutdownState(value) {
+    if (value === null || typeof value !== 'object')
+        return undefined;
+    const candidate = value;
+    if (candidate.detachForShutdown !== undefined && typeof candidate.detachForShutdown !== 'function')
+        return undefined;
+    if (candidate.frontFrame !== undefined && !isFrameState(candidate.frontFrame))
+        return undefined;
+    if (candidate.displayCursor !== undefined && candidate.displayCursor !== null && !isCursorState(candidate.displayCursor))
+        return undefined;
+    return value;
+}
+function isFrameState(value) {
+    if (value === null || typeof value !== 'object')
+        return false;
+    const cursor = value.cursor;
+    return cursor === undefined || isCursorState(cursor);
+}
+function isCursorState(value) {
+    if (value === null || typeof value !== 'object')
+        return false;
+    const cursor = value;
+    return typeof cursor.x === 'number' && typeof cursor.y === 'number';
+}
+function cursorMoveToFrameEnd(runtime) {
+    const frame = runtime?.frontFrame?.cursor;
+    if (frame === undefined)
+        return '';
+    const parked = runtime?.displayCursor ?? frame;
+    return cursorMove(frame.x - parked.x, frame.y - parked.y);
+}
+function writeStream(stream, data) {
+    if (data.length === 0)
+        return Promise.resolve();
+    return new Promise(resolve => {
+        let settled = false;
+        const finish = () => {
+            if (settled)
+                return;
+            settled = true;
+            resolve();
+        };
+        const timer = setTimeout(finish, 1000);
+        timer.unref();
+        try {
+            stream.write(data, () => {
+                clearTimeout(timer);
+                finish();
+            });
+        }
+        catch {
+            clearTimeout(timer);
+            finish();
+        }
+    });
+}
+function runUpdate(ctx, profile, sessionId) {
+    disposeRootAndThen(ctx, () => {
+        if (profile === undefined) {
+            process.stderr.write(`\n${t('update-aborted-no-profile')}\n`);
+            process.exit(1);
+        }
+        void updateTuiAndRestart(sessionId, profile).then(({ updateCode, restartCode }) => {
+            if (updateCode !== 0) {
+                process.stderr.write(`\ndsh-tui update failed (exit ${updateCode}). Your session is preserved — resume with:\n` +
+                    `${resumeCommand(profile, sessionId)}\n\n`);
+            }
+            process.exit(restartCode);
+        }, updateError => {
+            const message = updateError instanceof Error ? updateError.message : String(updateError);
+            process.stderr.write(`\ndsh-tui update failed: ${message}. Your session is preserved — resume with:\n` +
+                `${resumeCommand(profile, sessionId)}\n\n`);
+            process.exit(1);
+        });
+    });
+}
 /**
  * Dispose the whole application before process exit, with a bounded fallback.
  * Mirrors the deleted dsh-tui front-door exit semantics.
@@ -440,15 +639,16 @@ function disposeRootAndExit(ctx, code) {
 /**
  * The real way back into a session after the TUI process is gone. The
  * package ships no `dsh-tui` bin — resuming means feeding the session id
- * through `DSH_CC_RESUME_SESSION` (what cordis.patch.yml's `sessionId` reads)
- * and booting the same profile; on Windows the repo's dsh-tui.cmd wrapper
- * does this via --resume + ~/.dsh-cc/resume.txt.
+ * through `DSH_TUI_RESUME_SESSION` (what cordis.patch.yml's `sessionId`
+ * reads; the pre-rename DSH_CC_ spelling still works, issue #120) and
+ * booting the same profile; on Windows the repo's dsh-tui.cmd wrapper
+ * does this via --resume + ~/.dsh-tui/resume.txt.
  */
 function resumeCommand(profile, sessionId) {
     const boot = profile === undefined ? 'dsh --config cordis.yml' : `dsh --profile ${profile}`;
     return process.platform === 'win32'
         ? `dsh-tui --resume ${sessionId}`
-        : `DSH_CC_RESUME_SESSION=${sessionId} ${boot}`;
+        : `DSH_TUI_RESUME_SESSION=${sessionId} ${boot}`;
 }
 /**
  * Dispose the Cordis tree, then run a process-level handoff action. The

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

@@ -0,0 +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;AAGzD,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;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAEnE;AAED,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,CAqB5G;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,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,CAErB;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/providerWizard.d.ts

@@ -0,0 +1,91 @@
+/**
+ * `/provider` wizard — interactively adds an LLM provider route at runtime.
+ *
+ * The wizard is a sequence of `QuestionStore` asks (the same panel the
+ * model-facing `ask_user_question` tool uses), so it needs no UI state of
+ * its own. All side effects go through {@link ProviderSetupHost}, which the
+ * channel implements over the dsh settings/credentials/llm seams:
+ *
+ *   profile → settings `llm-pi-ai.providers.<route>` (dsh-llm-pi-ai watches
+ *             the section and registers the route without a restart)
+ *   key     → credentials store (`~/.dsh/.credentials.yaml`, 0600), named by
+ *             the derived `<ROUTE>_API_KEY` env-style ref the profile's
+ *             `apiKeyEnv` points at
+ *
+ * The module is React-free so `scripts/verify-provider-wizard.mjs` can drive
+ * it headless with a stubbed host and scripted answers.
+ */
+import { type AskUserQuestionAnswer, type AskUserQuestionRequest } from '@deepseek-ai/dsh-user-questions';
+import type { LlmDiscoveredModel } from '@deepseek-ai/dsh-llm';
+/** Route id rule shared with the dsh configuration surface (web Models page). */
+export declare const PROVIDER_ROUTE_ID: RegExp;
+/** Wire protocols dsh-llm-pi-ai can serve on a manually declared route. */
+export declare const PROVIDER_PROTOCOLS: readonly ["openai-completions", "openai-responses", "anthropic-messages"];
+/**
+ * Derive the credential ref for a route, matching the official web UI
+ * convention so TUI- and web-added providers resolve the same key.
+ */
+export declare function deriveKeyRef(route: string): string;
+/** One catalog route the mounted adapters offer for activation. */
+export interface CatalogProviderCandidate {
+    readonly provider: string;
+    readonly displayName: string;
+}
+/**
+ * Runtime capabilities the wizard needs, implemented by the channel over
+ * `ctx.settings` / `ctx.credentials` / `ctx.llm`. `undefined` from
+ * `channel.providerSetup()` means the bare cordis.yml start (no dsh-base
+ * services) and the command refuses to run.
+ */
+export interface ProviderSetupHost {
+    /** Catalog routes activatable via the `llm-pi-ai` settings section. */
+    listCatalogProviders(): readonly CatalogProviderCandidate[];
+    /** Whether a profile (any layer) already exists for the route. */
+    routeExists(route: string): boolean;
+    /** Interrogate a draft endpoint; the draft key is never persisted. */
+    discoverModels(request: {
+        provider?: string;
+        baseURL?: string;
+        api?: string;
+        apiKey?: string;
+    }): Promise<readonly LlmDiscoveredModel[]>;
+    /** Whether the process environment already provides this ref (shadow). */
+    envShadows(ref: string): boolean;
+    /**
+     * Read the currently stored value for rollback purposes; undefined when no
+     * credential exists under the ref. Only called when {@link envShadows} is
+     * false, so the value comes from a writable/seeded store, never the env.
+     */
+    readCredential(ref: string): Promise<string | undefined>;
+    /** Persist the key under the ref; rejects when env-shadowed or invalid. */
+    writeCredential(ref: string, value: string): void | Promise<void>;
+    /** Best-effort rollback of a just-written credential. */
+    removeCredential(ref: string): void | Promise<void>;
+    /**
+     * Persist the provider profile under `llm-pi-ai.providers.<route>`;
+     * rejects when the adapter's validation deems it unserviceable.
+     */
+    writeProfile(route: string, profile: Record<string, unknown>): Promise<void>;
+}
+export interface ProviderWizardDeps {
+    readonly host: ProviderSetupHost;
+    readonly ask: (request: AskUserQuestionRequest, options?: {
+        redact?: boolean;
+    }) => Promise<AskUserQuestionAnswer>;
+    readonly notify: (text: string, options?: {
+        color?: 'error' | 'warning' | 'success';
+        timeoutMs?: number;
+    }) => void;
+    readonly pushLocal: (title: string, lines: readonly string[]) => void;
+    /** Live turn state; the model-switch question is skipped while working. */
+    readonly working: () => boolean;
+    readonly switchModel: (provider: string, model: string) => Promise<boolean>;
+}
+export type ProviderWizardOutcome = 'added' | 'cancelled' | 'failed';
+/**
+ * Run the add-provider wizard. Resolves 'cancelled' when the user dismisses
+ * any question (Esc) — nothing has been written at that point by design:
+ * all asks complete before the first side effect.
+ */
+export declare function runProviderWizard(deps: ProviderWizardDeps): Promise<ProviderWizardOutcome>;
+//# sourceMappingURL=providerWizard.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"providerWizard.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/providerWizard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,EAEL,KAAK,qBAAqB,EAE1B,KAAK,sBAAsB,EAC5B,MAAM,iCAAiC,CAAA;AACxC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,iFAAiF;AACjF,eAAO,MAAM,iBAAiB,QAAoC,CAAA;AAElE,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,2EAIrB,CAAA;AAEV;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,mEAAmE;AACnE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,uEAAuE;IACvE,oBAAoB,IAAI,SAAS,wBAAwB,EAAE,CAAA;IAC3D,kEAAkE;IAClE,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;IACnC,sEAAsE;IACtE,cAAc,CAAC,OAAO,EAAE;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,OAAO,CAAC,SAAS,kBAAkB,EAAE,CAAC,CAAA;IAC1C,0EAA0E;IAC1E,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;IAChC;;;;OAIG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IACxD,2EAA2E;IAC3E,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjE,yDAAyD;IACzD,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnD;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC7E;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;IAChC,QAAQ,CAAC,GAAG,EAAE,CACZ,OAAO,EAAE,sBAAsB,EAC/B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAC3B,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,CACf,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KACtE,IAAI,CAAA;IACT,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAA;IACrE,2EAA2E;IAC3E,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAA;IAC/B,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5E;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,WAAW,GAAG,QAAQ,CAAA;AAgDpE;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,qBAAqB,CAAC,CA4MhC"}