dsh-ssh-tui 0.3.6 → 0.3.7

package/README.en.md

@@ -9,6 +9,10 @@ If you mostly work over SSH — a jump host, a test box, a keyboard-only
 session — start here. A local desktop terminal with themes and layout
 you already like can stay as it is.
 
+Listed on the [dshfind plugin directory](https://dshfind.com/en/plugins/cyjyyd/dsh-ssh-tui):
+
+[![dshfind](https://dshfind.com/api/card/cyjyyd/dsh-ssh-tui?lang=en)](https://dshfind.com/en/plugins/cyjyyd/dsh-ssh-tui?ref=badge)
+
 Install with the official CLI (no clone):
 
 ```sh
@@ -356,7 +360,7 @@ collapsed card instead of being prefixed onto parent transcript lines;
 `/subagents` lists active runs.
 
 `/mode` opens the agent-mode picker backed by dsh's official preset roster:
-标准模式 (standard), PTC 模式 (code), 极简模式 (minimal), 创造模式 (cordis),
+标准模式 (standard), PTC 模式 (ptc; `code` on dsh 0.1.1), 极简模式 (minimal), 创造模式 (cordis),
 智能路由模式 (routing-suite, from `dsh-routing-suite`),
 plus any locally authored presets (e.g. `whoami-standard`). On a session that
 has not produced work the switch applies immediately; otherwise it is remembered

package/README.md

@@ -10,6 +10,10 @@ English: [README.en.md](README.en.md)
 
 SuperGrok / X Premium 订阅走配套插件 [dsh-llm-xai-oauth](https://github.com/cyjyyd/dsh-llm-xai-oauth)，复用本机 grok-bridge token，不需要 xAI API Key。
 
+本插件已被 [dshfind 插件目录](https://dshfind.com/zh/plugins/cyjyyd/dsh-ssh-tui) 收录：
+
+[![dshfind](https://dshfind.com/api/card/cyjyyd/dsh-ssh-tui?lang=zh)](https://dshfind.com/zh/plugins/cyjyyd/dsh-ssh-tui?ref=badge)
+
 安装（官方 CLI，无需 clone）：
 
 ```bash
@@ -194,6 +198,8 @@ dsh --profile tui --no-color
 | `Ctrl+D` | 退出 |
 | `Ctrl+L` | 重绘整个画面 |
 
+`/mode` 切换官方 preset：标准 (`standard`)、PTC (`ptc`；dsh 0.1.1 上仍是 `code`)、极简 (`minimal`)、创造 (`cordis`)，以及本地安装的其它模式。
+
 斜杠命令：`/help`、`/find`、`/model`、`/provider`、`/submodel`、`/subeffort`、`/mode`、`/resume`、
 `/status`、`/subagents`、`/usage`（`/balance` 同义）、`/setup`、`/clear`，
 以及 harness 自带命令（`/goal`、`/plan`、`/compact` 等）。`/compact` 进行中会显示

package/cordis.patch.yml

@@ -13,14 +13,19 @@
       directory is {{cwd}}. Verify your work by running the code or tests.
       Keep answers brief and factual.
 
-# The shared module-reload HMR row stays off; the launcher's watch-only
-# fallback keeps user patch layers live until the TUI exits.
+# A patch replaces the targeted row's whole `config`, so restating `root`
+# keeps the official HMR row complete while the TUI keeps module reload off.
+# The launcher's watch-only fallback still keeps user patch layers live.
 - id: hmr
   disabled: true
+  config:
+    root: ['.']
 
 - id: tools
   config:
-    mode: !!js process.env.DSH_TOOLS_MODE
+    # 0.1.2 renamed the tools-mode value `code` → `ptc` with no alias.
+    # Map either env value onto the schema this dsh install actually accepts.
+    mode: !!js (function () { var mode = process.env.DSH_TOOLS_MODE; if (mode !== 'code' && mode !== 'ptc') return mode; try { var req = process.getBuiltinModule('module').createRequire(ctx.baseUrl || process.cwd() + '/'); var ver = req('@deepseek-ai/dsh-tools/package.json').version || ''; if (!/^0\.(0|1)\.(0|1)/.test(ver)) return 'ptc'; return 'code' } catch (err) { if (mode === 'code') return 'ptc'; return mode } })()
 
 # The `main` agent is created by the TUI plugin itself after the loader
 # settles, so it can read the saved default provider/model from
@@ -63,6 +68,15 @@
       config:
         default: standard
 
+    # Host-plane PTC runtime used by the shipped `ptc` preset. Absent on
+    # dsh-base; web/headless insert it themselves. Keep it optional so an
+    # older dsh install without the package still boots standard mode.
+    # Disabled when the package is not installed (older dsh 0.1.1 runtimes
+    # still boot; 0.1.2's ptc preset can mount once the worker is on disk).
+    - id: code-runtime
+      name: '@deepseek-ai/dsh-code-runtime-worker-thread'
+      disabled: !!js (function () { try { process.getBuiltinModule('module').createRequire(ctx.baseUrl || process.cwd() + '/').resolve('@deepseek-ai/dsh-code-runtime-worker-thread'); return false } catch (err) { return true } })()
+
     - id: ssh-tui-startup
       name: 'dsh-ssh-tui/startup'
 

package/lib/tui.js

@@ -26,8 +26,27 @@ import { defaultReasoningEffort } from './reasoning.js';
 import { checkForPluginUpdate } from './update-check.js';
 import { ROUTE_MEMORY_NAMESPACE, parseRouteMemory, rememberedRouteFor, upsertRememberedRoute, } from './route-memory.js';
 import { DEFAULT_SUBAGENT_MODEL, SUBAGENT_SETTINGS_NAMESPACE, defaultSubagentModelForProvider, subagentModelMatchesProvider, subagentSettingsValue, } from './subagent-model.js';
-const ROUTE_MEMORY_NS = ROUTE_MEMORY_NAMESPACE;
 import { UserQuestionError, } from '@deepseek-ai/dsh-user-questions';
+function discoverProviderModels(llm, request, signal) {
+    return llm.discoverModels(settingsNamespace('llm-pi-ai'), { ...request, signal }, signal);
+}
+function installUserQuestionAnswerer(ctx, questions, ask) {
+    const provider = questions;
+    if (typeof provider.registerProvider === 'function') {
+        return provider.registerProvider({ ask });
+    }
+    return ctx.on('user-questions/request', async (request, next) => {
+        try {
+            return await ask(request);
+        }
+        catch (error) {
+            if (error instanceof UserQuestionError && error.code === 'ASK_ABORTED')
+                throw error;
+            return await next();
+        }
+    });
+}
+const ROUTE_MEMORY_NS = ROUTE_MEMORY_NAMESPACE;
 const PROVIDER_TEMPLATES = {
     official: {
         label: 'DeepSeek 官方',
@@ -492,7 +511,7 @@ const LOCAL_COMMANDS = [
     { name: 'provider', description: 'switch provider, then model and reasoning effort' },
     { name: 'submodel', description: `select subagent model (default ${DEFAULT_SUBAGENT_MODEL}, same provider as parent)` },
     { name: 'subeffort', description: 'select subagent reasoning effort (default follows provider)' },
-    { name: 'mode', description: 'switch agent mode / preset (standard, minimal, code, cordis, routing-suite, ...)' },
+    { name: 'mode', description: 'switch agent mode / preset (standard, minimal, ptc, cordis, routing-suite, ...)' },
     { name: 'quit', description: 'exit the TUI' },
     { name: 'exit', description: 'exit the TUI' },
     { name: 'clear', description: 'clear the transcript view' },
@@ -1197,9 +1216,14 @@ export function remainingPercentFromUsed(usedPercent) {
         return 100;
     return Math.max(0, Math.min(100, Math.round((100 - usedPercent) * 10) / 10));
 }
-/** Cross a remaining-percent threshold from above (50 / 25 / 10 / 5). */
+/** Cross a remaining-percent threshold from above (50 / 25 / 10 / 5).
+ *  Only the tightest (lowest) crossed threshold is returned, so one drop
+ *  never paints 50/25/10 as three identical warnings. */
 export function crossedQuotaThresholds(previousRemaining, remaining) {
-    return QUOTA_ALERT_THRESHOLDS.filter(threshold => remaining <= threshold && (previousRemaining === undefined || previousRemaining > threshold));
+    const crossed = QUOTA_ALERT_THRESHOLDS.filter(threshold => remaining <= threshold && (previousRemaining === undefined || previousRemaining > threshold));
+    if (crossed.length === 0)
+        return [];
+    return [crossed[crossed.length - 1]];
 }
 export function quotaAlertText(snapshot, window) {
     const reset = window.resetsAt === undefined ? '' : `（${formatQuotaReset(window.resetsAt)}）`;
@@ -1207,11 +1231,13 @@ export function quotaAlertText(snapshot, window) {
 }
 /**
  * How often to re-fetch quota, based on the tightest window.
- * Hourly/5h: every 10 turns, every 4 when near a threshold.
- * Weekly: every 50 turns, every 10 when near.
- * Monthly: every 80 turns, every 20 when near.
+ * Counted in model steps (not conversation turns): a turn with several
+ * tool/LLM steps should refresh more often because it spends more quota.
+ * Hourly/5h: every 10 steps, every 4 when near a threshold.
+ * Weekly: every 50 steps, every 10 when near.
+ * Monthly: every 80 steps, every 20 when near.
  */
-export function quotaRefreshEveryTurns(window) {
+export function quotaRefreshEverySteps(window) {
     if (window === undefined)
         return 10;
     const near = window.remainingPercent <= QUOTA_NEAR_THRESHOLD_PERCENT;
@@ -1223,6 +1249,8 @@ export function quotaRefreshEveryTurns(window) {
         return near ? 20 : 80;
     return near ? 10 : 50;
 }
+/** @deprecated Same cadence as {@link quotaRefreshEverySteps}; the name predates step accounting. */
+export const quotaRefreshEveryTurns = quotaRefreshEverySteps;
 function quotaPeriodLabel(period) {
     if (period === 'hourly')
         return '5 小时';
@@ -2353,6 +2381,7 @@ export class SshTui {
     lastPaintWidth = 0;
     lastPaintHeight = 0;
     lastChromeStart = 0;
+    lastTranscriptStart = -1;
     paintIntervalMs;
     paintLink = 'local';
     paintProbed = false;
@@ -2361,7 +2390,7 @@ export class SshTui {
     llmRetry;
     quotaSnapshot;
     quotaAlerted = new Set();
-    quotaTurnsSinceRefresh = 0;
+    quotaStepsSinceRefresh = 0;
     quotaRefreshInFlight = false;
     searchHits = [];
     searchIndex = -1;
@@ -2405,7 +2434,7 @@ export class SshTui {
         this.disposers.push(this.ctx.on('session/event', this.handleSessionEvent), this.ctx.on('agent/status', this.handleStatus), this.ctx.on('agent/error', this.handleError), this.ctx.on('agent/disposed', this.handleDisposed), this.ctx.on('agent/inbox/claimed', this.handleInboxClaimed), this.ctx.on('agent/inbox/discarded', this.handleInboxDiscarded), this.ctx.on('agent/request', this.handleAgentRequest), this.ctx.on('subagent/start', this.handleSubagentStart), this.ctx.on('subagent/end', this.handleSubagentEnd), this.ctx.on('approval/request', this.handleApproval));
         const questions = this.ctx.get('userQuestions');
         if (questions !== undefined) {
-            this.userQuestionDisposer = questions.registerProvider({ ask: this.handleUserQuestions });
+            this.userQuestionDisposer = installUserQuestionAnswerer(this.ctx, questions, this.handleUserQuestions);
         }
         this.write(`${this.useAlternateScreen ? '\x1b[?1049h' : ''}\x1b[?1000h\x1b[?1006h\x1b[?2004h\x1b[?25l`);
         this.render();
@@ -3598,7 +3627,8 @@ export class SshTui {
             String(chromeStart),
         ].join('\x1f');
         const chromeChanged = chromeKey !== this.lastChromeKey || chromeStart !== this.lastChromeStart;
-        const sizeChanged = width !== this.lastPaintWidth || height !== this.lastPaintHeight;
+        const transcriptScrolled = start !== this.lastTranscriptStart;
+        const sizeChanged = width !== this.lastPaintWidth || height !== this.lastPaintHeight || transcriptScrolled;
         // One stdout write per frame: dirty rows only, so jump-host SSH sees a
         // single packet instead of one write per line. Clip/pad so leftover
         // wide glyphs cannot wrap into the input box.
@@ -3621,6 +3651,7 @@ export class SshTui {
         this.lastPaintWidth = width;
         this.lastPaintHeight = height;
         this.lastChromeStart = chromeStart;
+        this.lastTranscriptStart = start;
     };
     buildSuggestions() {
         const input = this.input;
@@ -3769,8 +3800,9 @@ export class SshTui {
                 kind === 'reasoning' ? '2;3' :
                     kind === 'brand' ? '1;38;2;77;107;253' :
                         kind === 'tool' || kind === 'tool-result' ? '33' :
-                            kind === 'diff-add' ? '38;5;22;48;5;194' :
-                                kind === 'diff-del' ? '38;5;124;48;5;224' :
+                            // Codex-like: muted add/del that blend into the terminal background.
+                            kind === 'diff-add' ? '38;2;122;168;116;48;2;18;42;24' :
+                                kind === 'diff-del' ? '38;2;196;122;122;48;2;48;20;20' :
                                     kind === 'diff-path' ? '1;36' :
                                         kind === 'todo-done' ? '2;32' :
                                             kind === 'todo-active' ? '1;36' :
@@ -4006,6 +4038,16 @@ export class SshTui {
                 // Usage accounting is complete for this step; the map only exists to
                 // deduplicate repeated usage reports during the step.
                 this.usageByStep.delete(`${event.data.turn}:${event.data.step}`);
+                if (!this.replaying) {
+                    this.quotaStepsSinceRefresh += 1;
+                    const every = quotaRefreshEverySteps(this.quotaSnapshot === undefined
+                        ? undefined
+                        : tightestQuotaWindow(this.quotaSnapshot));
+                    if (this.quotaStepsSinceRefresh >= every) {
+                        this.quotaStepsSinceRefresh = 0;
+                        void this.refreshQuota({ reason: 'step', announce: false }).catch(() => { });
+                    }
+                }
                 this.markDirty();
                 break;
             }
@@ -4016,14 +4058,6 @@ export class SshTui {
                 this.markDirty();
                 break;
             case 'turn/end': {
-                this.quotaTurnsSinceRefresh += 1;
-                const every = quotaRefreshEveryTurns(this.quotaSnapshot === undefined
-                    ? undefined
-                    : tightestQuotaWindow(this.quotaSnapshot));
-                if (this.quotaTurnsSinceRefresh >= every) {
-                    this.quotaTurnsSinceRefresh = 0;
-                    void this.refreshQuota({ reason: 'turn', announce: false }).catch(() => { });
-                }
                 const reason = event.data.reason;
                 this.openToolCalls.clear();
                 this.pendingToolTimes.clear();
@@ -4062,11 +4096,6 @@ export class SshTui {
                 this.markDirty();
                 break;
             }
-            case 'todo/write': {
-                this.upsertPlanRow({ todos: parsePlanTodos(event.data.todos) });
-                this.markDirty();
-                break;
-            }
             default:
                 this.handleExtensionEvent(event);
                 break;
@@ -4132,6 +4161,11 @@ export class SshTui {
             this.markDirty();
             return;
         }
+        if (type === 'todo/write') {
+            this.upsertPlanRow({ todos: parsePlanTodos(data?.todos) });
+            this.markDirty();
+            return;
+        }
         if (type === 'command/run') {
             this.handleCommandRun(data);
             return;
@@ -4707,12 +4741,11 @@ export class SshTui {
         const llm = this.ctx.get('llm');
         if (llm === undefined)
             return [];
-        const discovered = await llm.discoverModels(settingsNamespace('llm-pi-ai'), {
+        const discovered = await discoverProviderModels(llm, {
             baseURL,
             ...(api === undefined ? {} : { api }),
             ...(apiKey === undefined ? {} : { apiKey }),
-            signal: AbortSignal.timeout(15_000),
-        });
+        }, AbortSignal.timeout(15_000));
         return discovered.map(model => ({ id: model.id, label: model.name || model.id }));
     }
     /** Add one endpoint-listed model to the stored provider profile when needed. */
@@ -5112,7 +5145,7 @@ export class SshTui {
             return;
         this.quotaSnapshot = undefined;
         this.quotaAlerted.clear();
-        this.quotaTurnsSinceRefresh = 0;
+        this.quotaStepsSinceRefresh = 0;
         this.markDirty();
     }
     /** Persist one subagent selection and publish it to the live request waterfall. */
@@ -5254,7 +5287,7 @@ export class SshTui {
         });
         this.markDirty();
     }
-    /** /mode: pick an agent preset (standard / minimal / code / cordis / routing-suite / ...). */
+    /** /mode: pick an agent preset (standard / minimal / ptc / cordis / routing-suite / ...). */
     async runModeCommand() {
         const agentPresets = this.ctx.get('agentPresets');
         if (agentPresets === undefined) {
@@ -6149,12 +6182,11 @@ export class SshTui {
             const llm = this.ctx.get('llm');
             if (llm === undefined)
                 throw new Error('llm 服务不可用');
-            const discovered = await llm.discoverModels(settingsNamespace('llm-pi-ai'), {
+            const discovered = await discoverProviderModels(llm, {
                 baseURL,
                 ...(template.api === undefined ? {} : { api: template.api }),
                 ...(key === '' ? {} : { apiKey: key }),
-                signal: AbortSignal.timeout(15_000),
-            });
+            }, AbortSignal.timeout(15_000));
             // Apply only if the wizard is still on the same draft the fetch started
             // from, so a stale reply cannot overwrite a newer edit or a reset.
             const stillCurrent = this.onboarding === state