dsh-ssh-tui 0.6.2 → 0.6.3

package/lib/preset-rows.js

@@ -0,0 +1,96 @@
+/**
+ * The profile patch that mounts the agent-preset roster `/mode` needs.
+ *
+ * A terminal profile built on `dsh-base` composes no preset roster (only the
+ * Web bundle does), and this plugin's own bundle patch may not mount one: DSH
+ * STORE accepts additive rows with plugin-owned ids and no `@deepseek-ai/*`
+ * module names. The profile's user layer is the supported home for the row, so
+ * both the install script and the running TUI write the same block here — the
+ * TUI needs it because `dsh plugin add dsh-ssh-tui@latest` (the in-app update
+ * path) never runs `scripts/`, which npm installs do not ship.
+ *
+ * The roster is not cosmetic: without it `/mode` cannot switch, and the tools
+ * the shipped presets own (`ask_user_question`, `present`, PTC's presentation)
+ * are absent from the agent's catalog.
+ * @module dsh-ssh-tui/preset-rows
+ */
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { dirname, join } from 'node:path';
+/**
+ * The exact profile patch block that mounts the roster and the two host
+ * services the shipped presets need. `scripts/ensure-profile-rows.sh` carries
+ * the same text; a test compares the two so they cannot drift.
+ */
+export const ROSTER_PATCH_BLOCK = `# dsh-ssh-tui /mode: the agent-preset roster (standard / minimal / PTC /
+# cordis, plus every preset under $DSH_HOME/.agent-presets) and the two host
+# services the shipped presets need. dsh-base composes no roster in a terminal
+# profile, and a third-party bundle patch may not mount an @deepseek-ai row, so
+# the profile's user layer owns them.
+- insert:
+    - id: agent-presets
+      name: '@deepseek-ai/dsh-agent-presets'
+      config:
+        default: standard
+
+    - id: code-runtime
+      name: '@deepseek-ai/dsh-code-runtime-worker-thread'
+
+    - id: subagent-model-selection-settings
+      name: '@deepseek-ai/dsh-tool-subagent/model-selection-settings'
+`;
+/** The profile patch file the roster block belongs in. */
+export function rosterPatchPath(home, profile) {
+    return join(home, 'profiles', profile, 'cordis.patch.yml');
+}
+/**
+ * The patch text with the roster block appended, or `undefined` when the file
+ * already names the roster row.
+ *
+ * A file that is exactly `[]` (the profile template) is replaced, so the result
+ * stays a valid top-level patch list; anything else keeps its content and the
+ * block is appended after a blank line.
+ * @param existing - the patch file's current text.
+ * @returns the new text, or `undefined` when nothing has to change.
+ */
+export function rosterPatchText(existing) {
+    if (/name:\s*'@deepseek-ai\/dsh-agent-presets'/.test(existing))
+        return undefined;
+    if (/^\s*\[\s*\]\s*$/m.test(existing))
+        return existing.replace(/^\s*\[\s*\]\s*$/m, ROSTER_PATCH_BLOCK.trimEnd() + '\n');
+    return `${existing.endsWith('\n') ? existing : `${existing}\n`}\n${ROSTER_PATCH_BLOCK}`;
+}
+/** The template a missing profile patch starts from. */
+const PATCH_TEMPLATE = `# Your patch layer for this dsh profile, applied after every bundle layer:
+# a top-level YAML array of loader patch entries (id-targeted config
+# overrides, disables, and insert lists; \`!!js\` expressions allowed).
+[]
+
+`;
+/**
+ * Mount the roster in one profile, unless it is already composed.
+ *
+ * Idempotent: a profile whose patch already names the roster row (one bundling
+ * `@deepseek-ai/dsh-web-app`, for example) is left untouched. The write is a
+ * plain whole-file replace because the file is small and read once at boot; a
+ * half-written patch would only be seen by the next launch.
+ * @param home - the harness home carrying `profiles/`.
+ * @param profile - the profile to patch.
+ * @returns `present` when the row already exists, else `written`.
+ */
+export async function ensureRosterRows(home, profile) {
+    const path = rosterPatchPath(home, profile);
+    let existing = PATCH_TEMPLATE;
+    try {
+        existing = await readFile(path, 'utf8');
+    }
+    catch {
+        // Missing file: start from the template the launcher would have written.
+    }
+    const next = rosterPatchText(existing);
+    if (next === undefined)
+        return 'present';
+    await mkdir(dirname(path), { recursive: true });
+    await writeFile(path, next, 'utf8');
+    return 'written';
+}
+//# sourceMappingURL=preset-rows.js.map

package/lib/preset-rows.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preset-rows.js","sourceRoot":"","sources":["../src/preset-rows.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEzC;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG;;;;;;;;;;;;;;;;CAgBjC,CAAA;AAED,0DAA0D;AAC1D,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,OAAe;IAC3D,OAAO,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAA;AAC5D,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,2CAA2C,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAA;IAChF,IAAI,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;IACvH,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,KAAK,kBAAkB,EAAE,CAAA;AACzF,CAAC;AAED,wDAAwD;AACxD,MAAM,cAAc,GAAG;;;;;CAKtB,CAAA;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAY,EAAE,OAAe;IAClE,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAC3C,IAAI,QAAQ,GAAG,cAAc,CAAA;IAC7B,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,yEAAyE;IAC3E,CAAC;IACD,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAA;IACtC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAA;IACxC,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC/C,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACnC,OAAO,SAAS,CAAA;AAClB,CAAC"}

package/lib/reasoning.js

@@ -2,11 +2,16 @@
  * Shared reasoning-effort defaults for the SSH TUI.
  *
  * OpenCode / third-party (llm-pi-ai) routes carry no adapter-level reasoning
- * default (unlike `llm-deepseek`, whose row declares `reasoningEffort: max`).
- * Without an explicit effort the model streams its thinking as plain `text`
- * chunks instead of `reasoning` blocks, so the TUI never receives the data
- * needed to render the collapsible `思考中` block. This helper picks a
+ * default. Without an explicit effort the model streams its thinking as plain
+ * `text` chunks instead of `reasoning` blocks, so the TUI never receives the
+ * data needed to render the collapsible `思考中` block. This helper picks a
  * supported default so the fold has data to show.
+ *
+ * `llm-deepseek` is not covered here: its adapter always reports a
+ * `defaultEffort`, which the LLM runtime materializes into the request on its
+ * own. Since the 0.5.1 STORE compliance trim dropped the bundle patch's
+ * `reasoningEffort: max` row override, that adapter default is `high` unless a
+ * deployment sets it (or `/effort` picks one, remembered per route).
  */
 /**
  * Pick a default reasoning effort for a provider/model when none is selected.

package/lib/reasoning.js.map

@@ -1 +1 @@
-{"version":3,"file":"reasoning.js","sourceRoot":"","sources":["../src/reasoning.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,GAAe,EACf,QAAgB,EAChB,KAAa;IAEb,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACxD,MAAM,OAAO,GAAG,IAAI,EAAE,SAAS,EAAE,OAAO,IAAI,EAAE,CAAA;QAC9C,IAAI,IAAI,EAAE,SAAS,EAAE,aAAa,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAA;QACrF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,CAAA;QAC5D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAA;QACzC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC;eACvD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC;eAC5C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC;eAC3C,MAAM,CAAC,CAAC,CAAC,CAAA;QACd,OAAO,SAAS,EAAE,EAAE,CAAA;IACtB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC"}
+{"version":3,"file":"reasoning.js","sourceRoot":"","sources":["../src/reasoning.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,GAAe,EACf,QAAgB,EAChB,KAAa;IAEb,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACxD,MAAM,OAAO,GAAG,IAAI,EAAE,SAAS,EAAE,OAAO,IAAI,EAAE,CAAA;QAC9C,IAAI,IAAI,EAAE,SAAS,EAAE,aAAa,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAA;QACrF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,CAAA;QAC5D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAA;QACzC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC;eACvD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC;eAC5C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC;eAC3C,MAAM,CAAC,CAAC,CAAC,CAAA;QACd,OAAO,SAAS,EAAE,EAAE,CAAA;IACtB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC"}

package/lib/tui.js

@@ -31,6 +31,8 @@ import { buildReviewUserMessage, parseReviewOutput, reviewSystemPrompt } from '.
 import { loadProviderCatalog, mergeProviderEntries } from './provider-catalog.js';
 import { formatFooterCwd } from './session-list.js';
 import { collectDiag, formatDiag } from './diag.js';
+import { presetLabel, profileFromArgv } from './preset-label.js';
+import { ensureRosterRows, rosterPatchPath } from './preset-rows.js';
 import { SessionStatsTracker, statsRowOf } from './stats.js';
 import { QUESTION_OPTION_KEYS, confirmAnswer, inspectClosesOn, moveQuestionCursor, optionsLength, questionSubmit, selectQuestionOptionByKey, } from './dialogs.js';
 import { commandSuggestions, localizedCommands } from './commands.js';
@@ -417,7 +419,7 @@ export class SshTui {
     disposers = [];
     userQuestionDisposer;
     presetId = 'standard';
-    presetName = t('mode.standard');
+    presetName = t('mode.preset.standard');
     useAlternateScreen;
     agentGone = false;
     onboarding;
@@ -531,7 +533,7 @@ export class SshTui {
         this.headlessDisplay = config.headlessDisplay === true;
         this.disconnectPolicy = config.disconnectPolicy ?? this.readDisconnectPolicy();
         this.presetId = config.presetId ?? 'standard';
-        this.presetName = config.presetName ?? this.presetId;
+        this.presetName = presetLabel(this.presetId, config.presetName, config.presetTrust);
         this.useAlternateScreen = process.env.DSH_TUI_NO_ALT_SCREEN !== '1' && process.env.DSH_TUI_NO_ALT_SCREEN !== 'true';
         this.paintLink = detectSshSession() ? 'ssh' : 'local';
         this.paintIntervalMs = resolvePaintIntervalMs(config.paintIntervalMs, process.env, {
@@ -540,6 +542,13 @@ export class SshTui {
         this.pushRow({ kind: 'brand-logo' });
         this.pushRow({ kind: 'system', text: t('boot.banner') });
         this.pushRow({ kind: 'system', text: t('boot.help') });
+        // The roster is a profile-layer row, so an install that predates it (or an
+        // in-app update, which only runs `dsh plugin add`) boots without one. Say
+        // so at boot: the banner's localized default hides the missing service, and
+        // the loss is not only `/mode` — the preset-owned tools are absent too.
+        if (this.ctx.get('agentPresets') === undefined) {
+            this.pushRow({ kind: 'system', text: t('mode.bootMissing') });
+        }
         if (config.cwdNotice !== undefined && config.cwdNotice !== '') {
             this.pushRow({ kind: /进入|Entered/u.test(config.cwdNotice) ? 'system' : 'error', text: config.cwdNotice });
         }
@@ -5176,8 +5185,28 @@ export class SshTui {
     /** /mode: pick an agent preset (standard / minimal / ptc / cordis / routing-suite / ...). */
     async runModeCommand(arg = '') {
         const agentPresets = this.ctx.get('agentPresets');
+        const direct = arg.trim().toLowerCase();
+        if (direct === 'fix' || direct === 'repair') {
+            await this.repairRoster();
+            return;
+        }
         if (agentPresets === undefined) {
-            this.pushRow({ kind: 'error', text: t('mode.missingService') });
+            // A terminal profile built on dsh-base composes no roster, and the
+            // plugin's bundle patch may not mount one; only the profile's user layer
+            // can. Report the exact row and offer the in-app repair: the install
+            // scripts are the checkout path, while an npm install and the in-app
+            // `dsh plugin add` update never run them.
+            const profile = profileFromArgv();
+            this.pushRow({
+                kind: 'error',
+                text: [
+                    t('mode.missingService'),
+                    t('mode.missingServiceHint', {
+                        profile,
+                        patch: rosterPatchPath(resolveDshHome(), profile),
+                    }),
+                ].join('\n'),
+            });
             this.markDirty();
             return;
         }
@@ -5187,12 +5216,16 @@ export class SshTui {
             this.markDirty();
             return;
         }
-        const direct = arg.trim().toLowerCase();
-        let selected = direct === ''
-            ? undefined
-            : presets.find(preset => preset.id.toLowerCase() === direct
-                || (preset.name ?? '').toLowerCase() === direct);
-        if (selected === undefined && direct !== '') {
+        // Shipped presets resolve through the TUI dictionary; a user-authored one
+        // keeps the name its own preset.yml published.
+        const labels = presets.map(preset => presetLabel(preset.id, preset.name, preset.trust));
+        const matchesDirect = (preset, label) => preset.id.toLowerCase() === direct
+            || (preset.name ?? '').trim().toLowerCase() === direct
+            || label.toLowerCase() === direct;
+        let index = direct === ''
+            ? -1
+            : presets.findIndex((preset, at) => matchesDirect(preset, labels[at] ?? preset.id));
+        if (index < 0 && direct !== '') {
             this.pushRow({
                 kind: 'error',
                 text: t('mode.unknown', { id: arg.trim(), available: presets.map(preset => preset.id).join(', ') }),
@@ -5200,20 +5233,31 @@ export class SshTui {
             this.markDirty();
             return;
         }
-        if (selected === undefined) {
+        if (index < 0 && direct === '') {
             const answer = await this.askQuestion({
                 id: 'mode-pick',
                 question: t('mode.pick'),
-                options: presets.map(preset => ({
-                    label: preset.name ?? preset.id,
-                    description: `${preset.id === this.presetId ? t('mode.currentPrefix') : ''}${preset.description ?? ''}`.trim(),
+                options: presets.map((preset, at) => ({
+                    label: labels[at] ?? preset.id,
+                    description: `${preset.id === this.presetId ? t('mode.currentPrefix') : ''}${preset.broken === undefined ? preset.description ?? '' : t('mode.brokenSuffix', { reason: preset.broken })}`.trim(),
                 })),
             });
-            selected = presets.find(preset => (preset.name ?? preset.id) === answer.selected[0]);
+            index = labels.indexOf(answer.selected[0] ?? '');
         }
+        if (index < 0)
+            return;
+        const selected = presets[index];
         if (selected === undefined)
             return;
-        const selectedName = selected.name ?? selected.id;
+        if (selected.broken !== undefined) {
+            this.pushRow({
+                kind: 'error',
+                text: t('mode.broken', { name: labels[index] ?? selected.id, reason: selected.broken }),
+            });
+            this.markDirty();
+            return;
+        }
+        const selectedName = labels[index] ?? selected.id;
         const hasWork = sessionEvents(this.agent.session).some(event => event.type === 'turn/start');
         if (!hasWork) {
             await agentPresets.recompose(this.agent.ctx, selected.id);
@@ -5230,6 +5274,28 @@ export class SshTui {
         await this.ctx.get('settings')?.update(settingsNamespace('agent-presets'), { default: selected.id });
         this.markDirty();
     }
+    /**
+     * `/mode fix`: write the roster row into this profile's user patch layer.
+     *
+     * The write only takes effect on the next launch — the loader composes the
+     * patch tree once at boot — so the report says so instead of pretending the
+     * running session gained a roster.
+     */
+    async repairRoster() {
+        const profile = profileFromArgv();
+        const patch = rosterPatchPath(resolveDshHome(), profile);
+        try {
+            const result = await ensureRosterRows(resolveDshHome(), profile);
+            this.pushRow({
+                kind: 'system',
+                text: result === 'present' ? t('mode.fixPresent', { patch }) : t('mode.fixWritten', { patch }),
+            });
+        }
+        catch (error) {
+            this.pushRow({ kind: 'error', text: t('mode.fixFailed', { patch, error: errorChain(error) }) });
+        }
+        this.markDirty();
+    }
     /** Current provider route selected for the running agent. */
     currentProvider() {
         // `agent.options` is authoritative for the launched agent; the selection