@deepseek-harness-tui/dsh-tui 0.9.0 → 0.9.2

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

@@ -1,5 +1,6 @@
 import Schema from '@deepseek-ai/schemastery';
 import { DEFAULT_STATUS_BAR } from '../tuiDisplayPrefs.js';
+import { SHORTCUT_ACTIONS } from '../utils/keymap.js';
 export const name = 'dsh-tui';
 // `tuiWorkspaces` must stay OUT of this code-level inject (issue #183): the
 // dsh CLI resolves the bundle's cordis.patch.yml from the FIRST copy of this
@@ -32,6 +33,7 @@ export const Config = Schema.object({
     thinkingFold: Schema.union(['preview', 'full']).default('preview'),
     toolBackground: Schema.union(['none', 'subtle', 'strong']).default('none'),
     scrollGutter: Schema.union(['timeline', 'scrollbar', 'hidden']).default('timeline'),
+    promptSessionLabel: Schema.boolean().default(false),
     statusBar: Schema.object({
         compact: Schema.boolean().default(DEFAULT_STATUS_BAR.compact),
         model: Schema.boolean().default(DEFAULT_STATUS_BAR.model),
@@ -51,6 +53,9 @@ export const Config = Schema.object({
         trajectory: Schema.boolean().default(DEFAULT_STATUS_BAR.trajectory),
         shortcutHint: Schema.boolean().default(DEFAULT_STATUS_BAR.shortcutHint),
     }).default({ ...DEFAULT_STATUS_BAR }),
+    // One optional combo string per customizable action (no defaults: unset
+    // keeps the built-in binding; see Config.shortcuts).
+    shortcuts: Schema.object(Object.fromEntries(SHORTCUT_ACTIONS.map(action => [action.id, Schema.string().required(false)]))).required(false),
     modes: Schema.array(Schema.object({
         id: Schema.string(),
         label: Schema.string().required(false),

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

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AA6DnC,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAm8BvE;AA6GD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAcA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAsEnC,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAitCvE;AAsHD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAcA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV"}

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

@@ -13,17 +13,19 @@ import { ApprovalStore } from './approvals.js';
 import { registerPackagedSkills } from './packaged-skills.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 { readPresetPref } from '../presetPrefs.js';
-import { composePreset, filterMinimalPresetTools, resolvePersistedPreset, runningPresetOf } from './presets.js';
+import { composePreset, filterMinimalPresetTools, resolvePersistedPreset, resolvePersistedRoute, runningPresetOf } from './presets.js';
 import { ensurePackagedPresets } from './packaged-presets.js';
 import { ensureLegacySessionEventTypes } from './compat/index.js';
 import { clearResumeTarget, writeResumeTarget } from '../sessionHistory.js';
 import { resolveSessionCwd } from '../utils/workspaceRoot.js';
-import { checkForTuiUpdate, installedTuiVersion, isBootDeadlockTarget, isVersionNewer, resolveDshProfileName, resolveTuiUpdateTarget, updateTuiAndRestart } from '../update.js';
+import { beginRestartAttempt, checkForTuiUpdate, installedTuiVersion, isBootDeadlockTarget, isVersionNewer, logRestartEvent, resolveDshProfileName, resolveTuiUpdateTarget, restartTui, updateTuiAndRestart, writeHandoffNotice } from '../update.js';
 import { getLang, isLang, resolveStartupLang, setLang, t, writeLangPref } from '../i18n.js';
 import { DEFAULT_STATUS_BAR, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground } from '../tuiDisplayPrefs.js';
+import { draftComboConflicts, effectiveComboString, parseComboDraft, setKeymapOverrides, SHORTCUT_ACTIONS, } from '../utils/keymap.js';
 import { detectLegacyEnv, migrateLegacyDataDir, RENAMED_ENV } from '../utils/paths.js';
 import { attachHerdrIntegration } from '../herdr.js';
 import { logMouseDebug } from '../utils/debug.js';
@@ -63,7 +65,65 @@ import { CLEAR_ITERM2_PROGRESS, CLEAR_TAB_STATUS, supportsTabStatus, wrapForMult
  */
 let lastBootedFullscreen;
 export async function apply(ctx, config) {
+    // /restart handoff diagnosis: the replacement process is marked by env and
+    // logs its boot progress to ~/.dsh-tui/restart.log (ordinary launches stay
+    // silent). First line lands before anything in this function can throw.
+    if (process.env.DSH_TUI_RESTART_CHILD === '1') {
+        logRestartEvent('boot: plugin apply', {
+            stdoutTty: process.stdout.isTTY === true,
+            stdinTty: process.stdin.isTTY === true,
+            stderrTty: process.stderr.isTTY === true,
+        });
+        // Field evidence (2026-08-24): the restarted TUI mounts but takes no
+        // input, and the terminal's DA reply surfaced on PS's prompt line in an
+        // earlier attempt — meaning NO process was reading console input. Probe
+        // whether THIS process's stdin pump ever sees bytes: wrap read()
+        // transparently (delegates; purely observational) and sample the pump
+        // state, so the log distinguishes "bytes never arrive" (console-level
+        // theft/mode) from "bytes arrive but the UI ignores them".
+        const probedStdin = process.stdin;
+        const originalRead = probedStdin.read.bind(probedStdin);
+        let loggedChunks = 0;
+        probedStdin.read = ((...args) => {
+            const chunk = originalRead(...args);
+            if (chunk !== null && chunk !== '' && loggedChunks < 12) {
+                loggedChunks += 1;
+                const text = String(chunk);
+                logRestartEvent('boot: stdin chunk arrived', {
+                    bytes: text.length,
+                    preview: text.slice(0, 24).replace(/[^\x20-\x7e]/g, '.'),
+                });
+            }
+            return chunk;
+        });
+        const sampleStdinState = (label) => {
+            logRestartEvent(`boot: ${label}`, {
+                isRaw: probedStdin.isRaw === true,
+                readableListeners: probedStdin.listenerCount('readable'),
+                dataListeners: probedStdin.listenerCount('data'),
+                paused: probedStdin.isPaused,
+                buffered: probedStdin.readableLength,
+                chunksSeen: loggedChunks,
+            });
+        };
+        sampleStdinState('stdin state at plugin apply');
+        let pendingSamples = 0;
+        const sampleAt = (delayMs, label) => {
+            pendingSamples += 1;
+            const timer = setTimeout(() => {
+                pendingSamples -= 1;
+                sampleStdinState(label);
+            }, delayMs);
+            timer.unref?.();
+        };
+        sampleAt(2000, 'stdin state +2s');
+        sampleAt(5000, 'stdin state +5s');
+        sampleAt(12000, 'stdin state +12s');
+    }
     if (!process.stdout.isTTY) {
+        if (process.env.DSH_TUI_RESTART_CHILD === '1') {
+            logRestartEvent('boot: TTY gate failed - stdout is not a TTY');
+        }
         throw new Error('dsh-tui requires an interactive terminal (stdout must be a TTY).');
     }
     // The official profile launcher owns the system preset root and replaces
@@ -324,6 +384,10 @@ export async function apply(ctx, config) {
         // only explicit values so the target session's own record wins.
         configuredModel: config.model,
         configuredProvider: config.provider,
+        // Raw cordis.yml `lang` / `activityFrames`: /reload must not override a
+        // static deployment choice with the persisted preference.
+        configuredLang: config.lang,
+        configuredActivityFrames: config.activityFrames,
         effort: config.effort,
         activity: config.activity,
         // Explicit cordis.yml value (static deployment choice) wins over the
@@ -344,6 +408,7 @@ export async function apply(ctx, config) {
         thinkingFold: config.thinkingFold,
         toolBackground: config.toolBackground,
         scrollGutter: config.scrollGutter,
+        promptSessionLabel: config.promptSessionLabel,
         statusBar: config.statusBar,
         handle,
     });
@@ -373,11 +438,13 @@ export async function apply(ctx, config) {
     // user layer in settings.yaml wins over cordis.yml's diffLayout, and
     // watch() lands commits on the live channel — no recompose needed.
     ctx.inject(['settings'], (settingsCtx) => {
-        const scope = settingsCtx.settings.register(settingsNamespace('dsh-tui'), Schema.object({
+        const tuiSettingsNs = settingsNamespace('dsh-tui');
+        const scope = settingsCtx.settings.register(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'),
+            promptSessionLabel: Schema.boolean().default(false),
             statusBar: Schema.object({
                 compact: Schema.boolean().default(DEFAULT_STATUS_BAR.compact),
                 model: Schema.boolean().default(DEFAULT_STATUS_BAR.model),
@@ -409,6 +476,10 @@ export async function apply(ctx, config) {
             // Same no-default rule: unset keeps cordis.yml's `fullscreen`
             // decisive; set overrides it from the next boot on.
             fullscreen: Schema.boolean(),
+            // Built-in action-shortcut overrides, one optional combo string per
+            // action (see src/utils/keymap.ts). 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 applyLayout = (value) => {
             channel.setDiffLayout(value.diffLayout ?? config.diffLayout ?? 'auto');
@@ -445,17 +516,57 @@ export async function apply(ctx, config) {
             channel.setThinkingFold(value.thinkingFold ?? config.thinkingFold ?? 'preview');
             channel.setToolBackground(normalizeToolBackground(value.toolBackground ?? config.toolBackground));
             channel.setScrollGutter(normalizeScrollGutter(value.scrollGutter ?? config.scrollGutter));
+            channel.setPromptSessionLabel(value.promptSessionLabel ?? config.promptSessionLabel ?? false);
             channel.setStatusBar(normalizeStatusBar(value.statusBar ?? config.statusBar));
         };
+        // Shortcut overrides resolve per action: settings user layer wins over
+        // cordis.yml's `shortcuts` (same precedence as every other field);
+        // unset everywhere keeps the registry default. Applied live into the
+        // keymap module — the very next keypress matches the new combos.
+        const applyShortcuts = (value) => {
+            const userLayer = value.shortcuts ?? {};
+            const configLayer = 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);
+                if (chosen !== undefined)
+                    merged[action.id] = chosen;
+            }
+            setKeymapOverrides(merged);
+        };
         const apply = (next) => {
             applyLayout(next);
             applyWhale(next);
             applyMinimal(next);
             applyLang(next);
             applyDisplay(next);
+            applyShortcuts(next);
             applyFullscreen(next);
         };
-        apply(scope.get());
+        // 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) is a no-op for applyFullscreen.
+        const bootSettings = scope.get();
+        const fullscreenMigration = planFullscreenFactoryMigration(bootSettings.fullscreen, readAppliedMigrations());
+        void commitFullscreenFactoryMigration(fullscreenMigration, {
+            unset: () => settingsCtx.settings.mutate(tuiSettingsNs, [{ op: 'unset', path: ['fullscreen'] }]),
+        });
+        if (fullscreenMigration === 'unset') {
+            channel.notify(t('settings-fullscreen-migrated'), { color: 'warning' });
+        }
+        const { fullscreen: staleFullscreen, ...migratedSettings } = bootSettings;
+        apply(fullscreenMigration === 'unset' ? migratedSettings : bootSettings);
         scope.watch(next => {
             apply(next);
             if (typeof next.fullscreen === 'boolean' && next.fullscreen !== bootedFullscreen) {
@@ -468,12 +579,109 @@ export async function apply(ctx, config) {
     // the settings registration above, and the declared selects write `lang`
     // and `diffLayout` back through the settings service's revision-fenced
     // mutate (the watch applies both live).
+    //
+    // Shortcut fields: one text field per customizable action. The draft is
+    // one or more ctrl+/alt+ combos (comma-separated); blank restores the
+    // default, and a combo another action or a fixed editor binding already
+    // owns is refused as invalid so remaps can never silently shadow.
+    const shortcutFieldMeta = {
+        paste: {
+            label: 'Paste shortcut',
+            zh: '粘贴快捷键',
+            hintEn: d => `Clipboard paste (text, file paths, images). Default: ${d}. Alt+V works where the terminal eats Ctrl+V.`,
+            hintZh: d => `剪贴板粘贴（文本、文件路径、图片）。默认 ${d}。终端吞掉 Ctrl+V 时可用 Alt+V。`,
+        },
+        history: {
+            label: 'History search shortcut',
+            zh: '历史搜索快捷键',
+            hintEn: d => `Open the prompt-history search. Default: ${d}.`,
+            hintZh: d => `打开输入历史搜索。默认 ${d}。`,
+        },
+        editor: {
+            label: 'External editor shortcut',
+            zh: '外部编辑器快捷键',
+            hintEn: d => `Edit the draft in $VISUAL/$EDITOR. Default: ${d}.`,
+            hintZh: d => `在 $VISUAL/$EDITOR 外部编辑器中编辑草稿。默认 ${d}。`,
+        },
+        transcript: {
+            label: 'Transcript mode shortcut',
+            zh: '转录模式快捷键',
+            hintEn: d => `Toggle expanded transcript mode. Default: ${d}.`,
+            hintZh: d => `切换展开转录模式。默认 ${d}。`,
+        },
+        trajectory: {
+            label: 'Trajectory scene shortcut',
+            zh: '轨迹场景快捷键',
+            hintEn: d => `Open the trajectory scene. Default: ${d}.`,
+            hintZh: d => `打开轨迹场景。默认 ${d}。`,
+        },
+        dashboard: {
+            label: 'Subagent dashboard shortcut',
+            zh: '子代理面板快捷键',
+            hintEn: d => `Open the subagent dashboard. Default: ${d}.`,
+            hintZh: d => `打开子代理面板。默认 ${d}。`,
+        },
+        contextPanel: {
+            label: 'Loaded-context panel shortcut',
+            zh: '加载上下文面板快捷键',
+            hintEn: d => `Toggle the startup loaded-context panel. Default: ${d}.`,
+            hintZh: d => `切换启动时的已加载上下文面板。默认 ${d}。`,
+        },
+        showAll: {
+            label: 'Show-all shortcut',
+            zh: '显示全部消息快捷键',
+            hintEn: d => `Toggle show-all-messages. Default: ${d}.`,
+            hintZh: d => `切换显示全部消息。默认 ${d}。`,
+        },
+        redraw: {
+            label: 'Redraw shortcut',
+            zh: '终端重绘快捷键',
+            hintEn: d => `Clear and repaint the terminal. Default: ${d}.`,
+            hintZh: d => `清空并重绘终端。默认 ${d}。`,
+        },
+        todoFold: {
+            label: 'Todo fold shortcut',
+            zh: '待办折叠快捷键',
+            hintEn: d => `Fold/unfold the goal/todo panel. Default: ${d}.`,
+            hintZh: d => `折叠/展开目标与待办面板。默认 ${d}。`,
+        },
+    };
+    const shortcutFields = SHORTCUT_ACTIONS.map(action => {
+        const meta = shortcutFieldMeta[action.id];
+        const defaults = action.defaults.join(', ');
+        return {
+            path: ['shortcuts', action.id],
+            label: meta.label,
+            descriptions: { zh: meta.zh },
+            hint: meta.hintEn(defaults),
+            hintDescriptions: { zh: meta.hintZh(defaults) },
+            group: 'shortcuts',
+            kind: 'text',
+            format(value) {
+                return typeof value === 'string' && value.trim() !== '' ? value : effectiveComboString(action.id);
+            },
+            parse(text) {
+                const draft = parseComboDraft(text);
+                if (draft === undefined)
+                    return undefined;
+                if (draft.combos.length === 0)
+                    return { kind: 'clear' };
+                if (draftComboConflicts(action.id, draft.combos))
+                    return undefined;
+                return { kind: 'set', value: draft.combos.join(', ') };
+            },
+        };
+    });
     const settingsSections = getHostSettingsSections(ctx.get('tuiSettingsSections'));
     if (settingsSections !== undefined) {
         const unregister = settingsSections.register({
             ns: 'dsh-tui',
             title: 'dsh-tui',
-            groups: [{ id: 'status-bar', title: 'Status bar', descriptions: { zh: '底栏设置' } }],
+            groups: [
+                { id: 'status-bar', title: 'Status bar', descriptions: { zh: '底栏设置' } },
+                { id: 'shortcuts', title: 'Shortcuts', descriptions: { zh: '快捷键' } },
+                { id: 'session', title: 'Session', descriptions: { zh: '会话' } },
+            ],
             fields: [
                 {
                     path: ['lang'],
@@ -560,6 +768,27 @@ export async function apply(ctx, config) {
                         { value: 'hidden', label: 'Hidden', descriptions: { zh: '隐藏' } },
                     ],
                 },
+                {
+                    path: ['promptSessionLabel'],
+                    label: 'Session name chip',
+                    descriptions: { zh: '会话名标签' },
+                    hint: 'Show the session name on the prompt top border, right corner. Off by default.',
+                    hintDescriptions: { zh: '在输入框顶边框右上角显示会话名。默认关闭。' },
+                    kind: 'boolean',
+                },
+                {
+                    path: ['recapOnOpen'],
+                    label: 'Auto recap on open',
+                    descriptions: { zh: '打开会话时自动总结' },
+                    hint: 'On: opening/resuming a session automatically summarizes its recent activity into a dim line at the bottom of the transcript (hover/click to view or apply the suggested title). Off: use /recap manually.',
+                    hintDescriptions: { zh: '开启：打开/恢复会话时自动把最近活动总结成一行灰字显示在会话底部（可悬停/点击查看或应用建议标题）；关闭：手动使用 /recap。' },
+                    kind: 'boolean',
+                    format(value) {
+                        // Unset in settings.yaml: the default is on.
+                        return value === undefined || value === null ? 'true' : String(value);
+                    },
+                },
+                ...shortcutFields,
                 {
                     path: ['statusBar', 'compact'],
                     label: 'Compact status bar',
@@ -782,6 +1011,10 @@ export async function apply(ctx, config) {
     let exited = false;
     let updateRequested = false;
     let updateTargetVersion;
+    // `/restart` flag: same exit funnel as `/update` minus the pnpm step —
+    // write the resume target, restore the terminal, respawn the process with
+    // the original argv, and let the fresh boot attach the same session.
+    let restartRequested = false;
     // The profile this process was booted with (`dsh --profile <name>`); dsh
     // exposes it nowhere else, and /update must update the installation the
     // user is actually running, not a hard-coded one.
@@ -812,6 +1045,25 @@ export async function apply(ctx, config) {
                 void finishExit(ctx, instance, bootedFullscreen, 'Updating @deepseek-harness-tui/dsh-tui and restarting…', undefined, () => runUpdate(ctx, profile, channel.agentId, updateTargetVersion));
                 return;
             }
+            // `/restart`: same handoff as the update path, no installation step.
+            // The resume target is written unconditionally — the user asked to
+            // restart THIS session, blank or not (mirrors the update contract).
+            if (restartRequested) {
+                beginRestartAttempt(channel.agentId);
+                logRestartEvent('funnel: /restart branch entered');
+                try {
+                    writeResumeTarget(channel.agentId);
+                    logRestartEvent('funnel: resume target written');
+                }
+                catch (error) {
+                    // Resume persistence is best effort and must never block a restart.
+                    logRestartEvent('funnel: resume target write failed', {
+                        message: error instanceof Error ? error.message : String(error),
+                    });
+                }
+                void finishExit(ctx, instance, bootedFullscreen, t('restart-starting'), undefined, () => runRestart(ctx, profile, channel.agentId));
+                return;
+            }
             // 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
@@ -861,6 +1113,15 @@ export async function apply(ctx, config) {
         // the tree is already wrapped below, so they must not nest.
         fullscreen: bootedFullscreen,
         onExit: () => handleExit(),
+        // `/restart`: respawn this process and resume the session, no update.
+        onRestart: () => {
+            if (exited || restartRequested)
+                return;
+            restartRequested = true;
+            logRestartEvent('command: /restart accepted');
+            channel.notify(t('restart-starting'));
+            handleExit();
+        },
         // Only a `dsh --profile <name>` launch has a profile installation for
         // `/update` to act on; source checkouts and `--config` overlays get the
         // unavailable notice instead.
@@ -926,6 +1187,12 @@ export async function apply(ctx, config) {
     const isRecompose = lastBootedFullscreen !== undefined;
     lastBootedFullscreen = bootedFullscreen;
     logMouseDebug('apply mount', { bootedFullscreen, isRecompose });
+    // /restart handoff diagnosis: the replacement got all the way to a mounted
+    // UI, so any later death is post-boot (and its stderr keeps flowing to the
+    // parent only within the survival window — this line is the durable mark).
+    if (process.env.DSH_TUI_RESTART_CHILD === '1') {
+        logRestartEvent('boot: UI mounted', { fullscreen: bootedFullscreen, isRecompose });
+    }
     // Check in the background so registry latency never delays the first frame.
     // A failed/offline check is intentionally silent; the manual `/update`
     // command remains available regardless of network access.
@@ -977,9 +1244,13 @@ export async function apply(ctx, config) {
 async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRoute, meta, configuredPreset) {
     // Resume override (issue #67): cordis.yml overrides the target session's
     // recorded route only when it pins BOTH halves; undefined halves let the
-    // session's own request/header records win (issue #30).
+    // session's own request/header records win (issue #30). The recorded route
+    // is ALSO fed back into agentOptions (not just the status line): a resume
+    // whose cordis.yml pins only `provider` would otherwise leave
+    // agentOptions.model undefined, which breaks the `{{model}}` persona
+    // variable for the resumed agent's own assembly and for every subagent it
+    // spawns (dsh-subagent inherits `parent.options.model`).
     const resumeRoute = explicitModelRoute(configuredRoute);
-    const resumeOptions = { provider: resumeRoute?.provider, model: resumeRoute?.model };
     if (requestedSessionId !== undefined) {
         const resumeId = SessionId(requestedSessionId);
         const existing = ctx.agents.get(resumeId);
@@ -996,6 +1267,11 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
             // caller's current preference.
             const persisted = await resolvePersistedPreset(ctx, resumeId);
             const composed = await composePreset(ctx, persisted);
+            const recorded = await resolvePersistedRoute(ctx, resumeId);
+            const resumeOptions = {
+                provider: resumeRoute?.provider ?? recorded?.provider,
+                model: resumeRoute?.model ?? recorded?.model,
+            };
             const resumed = await ctx.agents.resume({
                 resumeSessionId: resumeId,
                 agentOptions: resumeOptions,
@@ -1195,6 +1471,34 @@ function writeStream(stream, data) {
         }
     });
 }
+/**
+ * Restart the TUI in place and resume the same session — the `/restart`
+ * tail of `/reload`: the soft reload cannot re-read boot-time-only state
+ * (cordis.yml root config, frozen fullscreen layout, newly built code), so
+ * /restart respawns the process with the original argv through the same
+ * terminal handoff the /update path uses, minus the installation step.
+ * The resume contract is dual-written (env + resume.txt) before this runs.
+ */
+function runRestart(ctx, profile, sessionId) {
+    logRestartEvent('runRestart: entered, disposing cordis root');
+    disposeRootAndThen(ctx, () => {
+        logRestartEvent('runRestart: root disposed, starting restartTui');
+        void restartTui(sessionId).then(restartCode => {
+            logRestartEvent('runRestart: restartTui resolved', { restartCode });
+            if (restartCode !== 0) {
+                writeHandoffNotice(`\ndsh-tui restart failed to spawn (exit ${restartCode}). Your session is preserved — resume with:\n` +
+                    `${resumeCommand(profile, sessionId)}\n\n`);
+            }
+            process.exit(restartCode);
+        }, restartError => {
+            const message = restartError instanceof Error ? restartError.message : String(restartError);
+            logRestartEvent('runRestart: restartTui rejected', { message });
+            writeHandoffNotice(`\ndsh-tui restart failed: ${message}. Your session is preserved — resume with:\n` +
+                `${resumeCommand(profile, sessionId)}\n\n`);
+            process.exit(1);
+        });
+    });
+}
 function runUpdate(ctx, profile, sessionId, targetVersion) {
     disposeRootAndThen(ctx, () => {
         if (profile === undefined) {
@@ -1243,7 +1547,12 @@ function resumeCommand(profile, sessionId) {
  * reporting failure on a clean exit would mislead wrapper scripts.
  */
 function disposeRootAndThen(ctx, done, fallbackCode = 1) {
-    const timer = setTimeout(() => process.exit(fallbackCode), 5000);
+    const timer = setTimeout(() => {
+        // Diagnosis for a stalled disposal: without this line the fallback exit
+        // is indistinguishable from a successful handoff in the field.
+        logRestartEvent('dispose: timeout, taking fallback exit', { fallbackCode });
+        process.exit(fallbackCode);
+    }, 5000);
     timer.unref();
     void withHostRootCapability(() => ctx.root.fiber.dispose()).then(() => {
         clearTimeout(timer);

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

@@ -19,6 +19,7 @@ import type { Context } from '@deepseek-ai/cordis';
 import type { AgentSetup } from '@deepseek-ai/dsh-agent';
 import type { SessionId } from '@deepseek-ai/dsh-session';
 import type { PromptAssembly } from '@deepseek-ai/dsh-system-prompt';
+import { type ModelRoute } from '../modelRoute.js';
 /** One roster entry, as returned by `agentPresets.list()`/`resolve()`. */
 export interface AgentPresetInfo {
     readonly id: string;
@@ -94,6 +95,23 @@ export declare function runningPresetOf(session: {
         data: unknown;
     }[];
 }): string | undefined;
+/**
+ * The route a PERSISTED session actually ran, read from its log: the last
+ * `request/header` snapshot. undefined when the log records none (a session
+ * that never started a turn) or the artifact is unreadable.
+ *
+ * Resume feeds this back into `agents.resume({ agentOptions })` so the
+ * resumed agent's `options.model` is populated again — a cordis.yml that
+ * pins only `provider` (issue #67: a half-pin never merges) leaves
+ * agentOptions.model undefined, which breaks the `{{model}}` persona variable
+ * for the resumed agent's own assembly AND for every subagent it spawns
+ * (dsh-subagent's `resolveChildAgentOptions` inherits `parent.options.model`).
+ *
+ * @param ctx - The plugin context (persistence lookup).
+ * @param sessionId - The persisted session to inspect.
+ * @returns The recorded model route, or undefined when unrecorded/unreadable.
+ */
+export declare function resolvePersistedRoute(ctx: Context, sessionId: SessionId): Promise<ModelRoute | undefined>;
 /**
  * Keep the official Minimal preset's model-facing contract at exactly two
  * tools. The TUI mounts ask_user_question at the host layer so every other

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;AAKpE,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;;;;;;;;;;;;;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":"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"}

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

@@ -16,6 +16,7 @@
  * before presets existed.
  */
 import { resolveSessionPreset } from '@deepseek-ai/dsh-agent-presets';
+import { recordedModelRoute } from '../modelRoute.js';
 const ASK_USER_TOOL = 'ask_user_question';
 /**
  * The mounted preset roster, or undefined when the composition has no
@@ -95,6 +96,36 @@ export async function resolvePersistedPreset(ctx, sessionId) {
 export function runningPresetOf(session) {
     return resolveSessionPreset(session);
 }
+/**
+ * The route a PERSISTED session actually ran, read from its log: the last
+ * `request/header` snapshot. undefined when the log records none (a session
+ * that never started a turn) or the artifact is unreadable.
+ *
+ * Resume feeds this back into `agents.resume({ agentOptions })` so the
+ * resumed agent's `options.model` is populated again — a cordis.yml that
+ * pins only `provider` (issue #67: a half-pin never merges) leaves
+ * agentOptions.model undefined, which breaks the `{{model}}` persona variable
+ * for the resumed agent's own assembly AND for every subagent it spawns
+ * (dsh-subagent's `resolveChildAgentOptions` inherits `parent.options.model`).
+ *
+ * @param ctx - The plugin context (persistence lookup).
+ * @param sessionId - The persisted session to inspect.
+ * @returns The recorded model route, or undefined when unrecorded/unreadable.
+ */
+export async function resolvePersistedRoute(ctx, sessionId) {
+    const persistence = ctx.get('sessionPersistence');
+    if (persistence === undefined)
+        return undefined;
+    try {
+        const { events } = await persistence.load(sessionId);
+        return recordedModelRoute(events);
+    }
+    catch {
+        // A missing/corrupt artifact leaves resume itself to report the failure;
+        // the route lookup must not mask it with a second, misleading error.
+        return undefined;
+    }
+}
 /**
  * Keep the official Minimal preset's model-facing contract at exactly two
  * tools. The TUI mounts ask_user_question at the host layer so every other

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

@@ -31,6 +31,32 @@ export interface CatalogProviderCandidate {
     readonly provider: string;
     readonly displayName: string;
 }
+/** One OAuth-capable provider a dsh-auth-style plugin mounts (masked state only). */
+export interface OAuthProviderStatus {
+    readonly provider: string;
+    readonly label: string;
+    readonly oauthLabel: string;
+    readonly loginLabel: string | undefined;
+    readonly signedIn: boolean;
+    readonly expiresAt: number | undefined;
+    readonly expired: boolean;
+}
+/** One successful OAuth login. */
+export interface OAuthLoginResult {
+    readonly provider: string;
+    readonly oauthLabel: string;
+    readonly expiresAt: number;
+}
+/**
+ * The `ctx.dshAuth` api, structural so this tree never imports the plugin:
+ * mounting dsh-auth (or anything exporting this shape) lights up the wizard's
+ * OAuth branch; absent it, the wizard behaves exactly as before.
+ */
+export interface OAuthSetupHost {
+    providers(): Promise<readonly OAuthProviderStatus[]>;
+    login(provider?: string, signal?: AbortSignal): Promise<OAuthLoginResult>;
+    logout(provider: string): Promise<boolean>;
+}
 /**
  * Runtime capabilities the wizard needs, implemented by the channel over
  * `ctx.settings` / `ctx.credentials` / `ctx.llm`. `undefined` from
@@ -66,6 +92,8 @@ export interface ProviderSetupHost {
      * rejects when the adapter's validation deems it unserviceable.
      */
     writeProfile(route: string, profile: Record<string, unknown>): Promise<void>;
+    /** The OAuth sign-in surface; absent when no dsh-auth-style plugin is mounted. */
+    readonly oauth?: OAuthSetupHost;
 }
 export interface ProviderWizardDeps {
     readonly host: ProviderSetupHost;
@@ -81,7 +109,7 @@ export interface ProviderWizardDeps {
     readonly working: () => boolean;
     readonly switchModel: (provider: string, model: string) => Promise<boolean>;
 }
-export type ProviderWizardOutcome = 'added' | 'cancelled' | 'failed';
+export type ProviderWizardOutcome = 'added' | 'signed-out' | '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: