@toddzheng024/dscode-bundle 0.7.24 → 0.7.26

package/vendor/tui/lib/kernel-panels.mjs

@@ -1,6 +1,7 @@
 /** Bounded, composer-safe panels for preset, session, and plugin kernel views. */
 import { createElement, useEffect, useMemo, useRef, useState } from 'react';
 import { Box, Text, useInput, useStdout } from 'ink';
+import { resolveModelEffort } from './models.mjs';
 import { formatRelativeTime } from './session-directory.mjs';
 import { panelViewport, revealRow } from './render/inspector.mjs';
 import { markdownLines, textLines } from './render/lines.mjs';
@@ -893,8 +894,8 @@ export function EffortPanel({ row, current, select, back, onExit }) {
         : hasDefaultRow
             ? [{ id: '', name: 'Default' }, ...advertised]
             : advertised;
-    // An absent or cleared effort is the Default row's current state.
-    const effective = current === undefined || current === '' ? '' : current;
+    // A different model's effort must not override this model's default.
+    const effective = resolveModelEffort(row, current) ?? '';
     // The list opens ON the effective level (or the model's default row), so a
     // quick re-pick never restarts the cursor from the top.
     const wanted = effective === '' ? row.reasoning?.defaultEffort ?? '' : effective;

package/vendor/tui/lib/locales/en.mjs

@@ -100,9 +100,10 @@ export const en = {
     'cmd.help': 'show this overlay',
     'cmd.model': 'switch the model and manage providers',
     'cmd.effort': 'adjust reasoning effort for the current model',
+    'notice.modeLocked': 'DSCODE mode is fixed to dscode.',
     'cmd.mode': 'inspect or select the agent preset (/mode [preset])',
     'cmd.permission': 'inspect or select the permission preset (/permission [preset])',
-    'cmd.new': 'create and switch to a fresh session (/new [preset])',
+    'cmd.new': 'create and switch to a fresh DSCODE session (/new)',
     'cmd.fork': 'fork at the latest completed turn (/fork [event-seq])',
     'cmd.resume': 'browse or switch root sessions (/resume [id|prefix])',
     'cmd.search': 'full-text search across persisted sessions (/search [query])',
@@ -249,7 +250,7 @@ export const en = {
     'status.label.cache': 'cache',
     'status.label.in': 'in',
     'status.label.out': 'out',
-    'status.label.mode': '/mode',
+    'status.label.mode': 'Mode',
     'status.label.context': 'context',
     'status.label.skills': 'skills',
     // Frozen band

package/vendor/tui/lib/locales/zh.mjs

@@ -100,9 +100,10 @@ export const zh = {
     'cmd.help': '显示本帮助',
     'cmd.model': '切换模型并管理供应商',
     'cmd.effort': '调整当前模型的推理档位',
+    'notice.modeLocked': 'DSCODE 已固定使用 dscode 模式。',
     'cmd.mode': '查看或选择 Agent 预设（/mode [preset]）',
     'cmd.permission': '查看或选择权限预设（/permission [preset]）',
-    'cmd.new': '新建并切换到新会话（/new [preset]）',
+    'cmd.new': '新建并切换到 DSCODE 会话（/new）',
     'cmd.fork': '从最近的完成回合分叉（/fork [event-seq]）',
     'cmd.resume': '浏览或恢复历史会话（/resume [id|前缀]）',
     'cmd.search': '跨历史会话全文检索（/search [关键词]）',
@@ -249,7 +250,7 @@ export const zh = {
     'status.label.cache': '缓存',
     'status.label.in': '入',
     'status.label.out': '出',
-    'status.label.mode': '/mode',
+    'status.label.mode': '模式',
     'status.label.context': '上下文',
     'status.label.skills': '技能',
     // Frozen band

package/vendor/tui/lib/models.mjs

@@ -8,6 +8,14 @@
  * @module @deepseek-ai/dsh-tui/models
  */
 import { ReasoningEffortId, } from '@deepseek-ai/dsh-llm';
+/** Preserve an advertised effort, otherwise use the target model's own default. */
+export function resolveModelEffort(row, current) {
+    const reasoning = row.reasoning;
+    const offered = reasoning?.efforts ?? [];
+    if (current && offered.some(effort => effort.id === current))
+        return current;
+    return offered.find(effort => effort.id === reasoning?.defaultEffort)?.id;
+}
 /** Map an adapter's reasoning capability onto the panel's plain-id shape. */
 export function mapReasoning(reasoning) {
     return {

package/vendor/tui/lib/render/inspector.mjs

@@ -15,7 +15,7 @@ export function liveRegionBudget(chrome) {
     const terminal = Math.max(1, Math.floor(chrome.terminalRows));
     const editor = Math.max(1, Math.floor(chrome.composerRows));
     const band = editor + 2;
-    const status = chrome.statusBarRows === 2 ? 2 : 1;
+    const status = chrome.statusBarRows;
     const menu = Math.max(0, Math.floor(chrome.menuRows));
     const gutter = chrome.gutterRows;
     const notice = chrome.notice ? 1 : 0;

package/vendor/tui/lib/render/projection.mjs

@@ -247,6 +247,15 @@ function estimateTokens(text) {
     }
     return wide + Math.ceil(narrow / 4);
 }
+/** Recovery text shared by live events and replayed history. */
+function failureRecovery(code) {
+    if (code === 'MISSING_CREDENTIAL')
+        return ' · open /model to add an API key';
+    if (code === 'CONTENT_POLICY' || code === 'CONTENT_FILTER') {
+        return ' · turn stopped by provider content filtering; review the request and context before continuing';
+    }
+    return '';
+}
 /** A fresh, empty transcript view. */
 export function createTranscriptView() {
     return {
@@ -695,9 +704,7 @@ export function projectEvent(view, event) {
             const reason = event.data.reason;
             const appended = [];
             if (reason.kind === 'error') {
-                const recovery = reason.error.code === 'MISSING_CREDENTIAL'
-                    ? ' · open /model to add an API key'
-                    : '';
+                const recovery = failureRecovery(reason.error.code);
                 appended.push({ kind: 'error', text: `${reason.error.code}: ${reason.error.message}${recovery}` });
             }
             else {
@@ -1441,9 +1448,7 @@ export function replayProjectEvent(acc, event) {
             acc.streamingReasoning = '';
             acc.streaming = '';
             if (reason.kind === 'error') {
-                const recovery = reason.error.code === 'MISSING_CREDENTIAL'
-                    ? ' · open /model to add an API key'
-                    : '';
+                const recovery = failureRecovery(reason.error.code);
                 appended.push({ kind: 'error', text: `${reason.error.code}: ${reason.error.message}${recovery}` });
             }
             else {

package/vendor/tui/lib/render/status.mjs

@@ -306,7 +306,7 @@ function buildCandidates(facts, stats, busy, enabled, contextWidth) {
             push({ text: lead, tone: 'model' });
     }
     if (model !== '' && enabled.has('model')) {
-        const effort = safe(facts.effort ?? stats.reasoningEffort);
+        const effort = safe(facts.effort ?? '');
         push({ text: effort === '' ? model : model + ' @ ' + effort, tone: 'accent' });
     }
     const cwd = safe(facts.cwd);
@@ -426,7 +426,7 @@ function buildCandidates(facts, stats, busy, enabled, contextWidth) {
                     },
                 ],
             },
-            rank: RANK2_SKILLS,
+            rank: facts.telemetryFigures === undefined ? RANK2_SKILLS : 100,
             id: 'skills',
         });
     }
@@ -476,16 +476,26 @@ function buildCandidates(facts, stats, busy, enabled, contextWidth) {
     if (facts.plan && enabled.has('plan')) {
         row2.push({ group: { spans: [{ text: '⧉ plan', tone: 'accent' }] }, rank: RANK2_PLAN, id: 'plan' });
     }
-    // dscode: the live figures close row 2 as one ordinary left-hand group, so the
-    // row reads as a single cluster instead of a pinned right edge with a gap. It
-    // drops last: the running cost is the last thing the width may take away.
-    if (facts.telemetry !== undefined && facts.telemetry !== '') {
+    // Structured runtime figures sit on the left; finances are placed separately
+    // after fitting that row. Keep the flat form for older text-only callers.
+    if (facts.telemetryFigures !== undefined) {
+        const figures = facts.telemetryFigures;
+        for (const [id, text, rank] of [
+            ['telemetry-current', figures.current, 95],
+            ['telemetry-average', figures.average, 30],
+            ['telemetry-context', figures.context, 94],
+        ]) {
+            if (text !== '')
+                row2.push({ group: { spans: [{ text, tone: 'meta' }] }, rank, id });
+        }
+    }
+    else if (facts.telemetry !== undefined && facts.telemetry !== '') {
         row2.push({ group: { spans: [{ text: facts.telemetry, tone: 'meta' }] }, rank: RANK2_TELEMETRY, id: 'telemetry' });
     }
     return { left, right, badge, row2 };
 }
 /**
- * Compose the two-row footer layout under a column budget. Row 1 keeps the
+ * Compose the responsive footer layout under a column budget. Row 1 keeps the
  * session identity, cwd, mode, branch, context, then the right-pinned permission
  * badge and cycle hint. It drops hint, context, and permission before
  * ellipsizing identity. Row 2 fits all secondary figures, the live telemetry
@@ -497,7 +507,7 @@ function buildCandidates(facts, stats, busy, enabled, contextWidth) {
  * keeps mode hints idle-only); 'items' is the ordered enabled-item config
  * from /statusline (defaults to the full catalog). Display order follows the
  * config per side while the drop ladder keeps its fixed ranks.
- * @returns the two rows to render; row1.left is never empty.
+ * @returns the rows to render; row1.left is never empty.
  */
 export function layoutStatusBar(facts, stats, columns, options = {}) {
     const busy = options.busy === true;
@@ -517,7 +527,10 @@ export function layoutStatusBar(facts, stats, columns, options = {}) {
     const byPosition = (a, b) => (position.get(a.id) ?? Number.MAX_SAFE_INTEGER) - (position.get(b.id) ?? Number.MAX_SAFE_INTEGER);
     const orderedLeft = [left[0], ...left.slice(1).sort(byPosition)];
     const orderedRight = right.slice().sort(byPosition);
-    const orderedRow2 = row2.slice().sort(byPosition);
+    const orderedRow2 = facts.telemetryFigures === undefined ? row2.slice().sort(byPosition) : [
+        ...row2.filter(entry => entry.id.startsWith('telemetry-')),
+        ...row2.filter(entry => !entry.id.startsWith('telemetry-')).sort(byPosition),
+    ];
     // The cycle hint keeps its columns reserved whether or not it is painted:
     // the badge anchors the right edge, so a turn opening or closing must not
     // change what the left clusters may occupy.
@@ -655,6 +668,21 @@ export function layoutStatusBar(facts, stats, columns, options = {}) {
         }
         row2Kept.splice(dropIndex, 1);
     }
+    // Keep fees, balance, peak/off-peak and cache together. Move the group down
+    // before sacrificing left-side figures just to seat it on the same row.
+    const figures = facts.telemetryFigures;
+    let financial = [];
+    if (figures !== undefined) {
+        const parts = [figures.money, figures.turn, figures.cache].filter(Boolean);
+        let text = parts.join(STATUS_ITEM_SEPARATOR);
+        // The optional per-turn cost goes first on extremely narrow terminals.
+        if (visibleColumns(text) > row2Budget)
+            text = [figures.money, figures.cache].filter(Boolean).join(STATUS_ITEM_SEPARATOR);
+        financial = [{ text: truncateColumns(text, row2Budget), tone: 'meta', telemetry: true }];
+    }
+    const financialWidth = spansWidth(financial);
+    const financialWrap = financial.length > 0 && row2Kept.length > 0
+        && row2Width() + LEFT_RIGHT_GAP + financialWidth > row2Budget;
     return {
         row1: {
             left: leftKept.map(entry => ({ ...entry.group, id: entry.id })),
@@ -663,8 +691,9 @@ export function layoutStatusBar(facts, stats, columns, options = {}) {
         },
         row2: {
             left: row2Kept.map(entry => ({ ...entry.group, id: entry.id })),
-            right: [],
+            right: financialWrap ? [] : financial,
             hint: false,
         },
+        ...(financialWrap ? { row3: { left: [], right: financial, hint: false } } : {}),
     };
 }

package/vendor/tui/lib/startup.mjs

@@ -20,7 +20,8 @@
  *
  * @module @deepseek-ai/dsh-tui/startup
  */
-import { Command } from 'commander';
+import { Command, Option } from 'commander';
+import { requireDscodePreset } from './dscode/preset.mjs';
 import { parseCmdline } from '@deepseek-ai/dsh-cmdline';
 import { THEME_NAMES } from './theme.mjs';
 /** Stable Cordis plugin name. */
@@ -38,8 +39,7 @@ export function resolveTuiStartup(options) {
         throw new Error('--session needs an id');
     if (options.resume === '')
         throw new Error('--resume needs a session id or id prefix');
-    if (options.mode === '')
-        throw new Error('--mode needs a preset id');
+    requireDscodePreset(options.mode);
     if (options.mode !== undefined && (options.resume !== undefined || options.continue === true)) {
         throw new Error('--mode applies only to a new session; it cannot be combined with --resume or --continue');
     }
@@ -72,7 +72,7 @@ function tuiCommand() {
         .option('-r, --resume <session>', 'resume the persisted session with this id (or unique id prefix)')
         .option('-c, --continue', 'resume the most recent persisted session for this working directory')
         .option('--session <id>', 'create a new session under this explicit id')
-        .option('--mode <preset>', 'agent preset for a newly created session')
+        .addOption(new Option('--mode <preset>', 'compatibility flag; only dscode is accepted').hideHelp())
         .option('--theme <name>', 'color theme: dark (default), light, prismatic, rainbow, or auto')
         .option('-i, --image <path>', 'attach an image to the initial prompt (repeatable)', (path, paths) => [...paths, path], [])
         .argument('[prompt...]', 'initial prompt; sends immediately after startup')
@@ -81,7 +81,6 @@ Examples:
   dsh --profile cli                       fresh session, minted id
   dsh --profile cli --resume abc123       resume session by id prefix
   dsh --profile cli --continue            resume the latest local session
-  dsh --profile cli --mode minimal        fresh session using the minimal preset
   dsh --profile cli --theme light         light palette for bright terminals
   dsh --profile cli "explain this repo"   start and send an initial prompt
   dsh --profile cli -i diagram.png "review this diagram"