@toddzheng024/dscode-bundle 0.7.21 → 0.7.23

package/plugins/session-metrics/view.mjs

@@ -4,7 +4,7 @@ import { estimateCost, peakEmoji } from './pricing.mjs';
 import { balanceNow, trustedNow } from './balance.mjs';
 import { grokSubscriptionNow } from '../grok/billing.mjs';
 import { sessionAverageTps } from './rate.mjs';
-import { providerOfHeader } from '../providers/catalog.mjs';
+import { attributeCostByTurn, evaluateBudget, parseBudget } from './turns.mjs';
 let source;
 export function setMetricSource(next) { source = next; return () => { if (source === next) source = undefined; }; }
 export function summarize(rows, events = [], corrupt = false) {
@@ -43,7 +43,29 @@ export function summarize(rows, events = [], corrupt = false) {
     // OpenRouter reports cache reads only when there are some: a missing count is zero, not unknown.
     input += total; hit += u.cacheReadTokens ?? 0;
   }
-  return { cost, unknown, calls, pending, cache: input > 0 && !cacheUnknown ? Math.min(100, hit / input * 100) : null };
+  // Per-turn attribution needs the ledger's own rows (the backfilled history has
+  // no turn boundary), so it reads them directly instead of the merged map.
+  const attribution = attributeCostByTurn(rows, events);
+  return {
+    cost, unknown, calls, pending,
+    cache: input > 0 && !cacheUnknown ? Math.min(100, hit / input * 100) : null,
+    turns: attribution.turns,
+    lastTurn: attribution.lastTurn,
+    unattributed: attribution.unattributed,
+  };
+}
+
+/**
+ * Per-turn cost for one live session, straight from its ledger, keyed by the
+ * durable turn number. The /usage panel prices its turns with this: the token
+ * meter says what each turn billed, this says what it cost.
+ * @param id - the session id.
+ * @param events - the session's durable events, for the turn windows.
+ * @returns `{ turn, cost, calls, unknown }` per completed or running turn.
+ */
+export function turnCostsFor(id, events = []) {
+  const entries = id && process.env.DSH_HOME ? readMetrics(process.env.DSH_HOME, id).rows : [];
+  return attributeCostByTurn(entries, events).turns;
 }
 /**
  * Terminal columns of a string: East Asian wide characters (such as the cache label's
@@ -113,50 +135,77 @@ function figure(text, width) {
   return padding > 0 ? ' '.repeat(padding) + text : text;
 }
 
-export function formatFooter(metrics, context, columns = 80, rates, locale = 'en', header = '', provider = providerOfHeader(header) ?? 'deepseek-official') {
+export function formatFooter(metrics, context, columns = 80, rates, locale = 'en', provider = 'deepseek-official') {
   const label = key => t(locale, key);
   const ctx = figure(Number.isFinite(context) ? `${Math.round(context)}%` : '--', FIGURE.percent);
   const cache = figure(metrics.cache === null ? '--' : `${metrics.cache.toFixed(1)}%`, FIGURE.share);
-  // The balance belongs to the provider the header names; only DeepSeek's official route bills by a peak window.
+  // The balance belongs to the provider serving the route; only DeepSeek's official one bills by a peak window.
   const balance = balanceNow(provider);
   const spend = metrics.unknown && metrics.cost === 0 ? '--' : `$${metrics.cost.toFixed(2)}${metrics.unknown ? '+' : ''}${metrics.pending ? '…' : ''}`;
-  // The money pair is the one live figure left unpadded: its digits cross a
-  // column a handful of times per session, and reserving those columns would
-  // evict a per-second figure at the widths the footer actually runs at.
+  // The money is the one live figure whose digits are not reserved: they cross a
+  // column a handful of times per session, and reserving them would evict a
+  // per-second figure at the widths the footer actually runs at. A balance the
+  // provider cannot report is left out instead of parked as `$--`.
   const dollars = provider === 'grok' ? grokFooterFact(grokSubscriptionNow(), locale)
-    : `${spend} / ${balance === null ? '$--' : '$' + balance.toFixed(2)}${provider === 'deepseek-official' ? ' ' + peakEmoji(trustedNow()) : ''}`;
+    : spend + (balance === null ? '' : ' / $' + balance.toFixed(2)) + (provider === 'deepseek-official' ? ' ' + peakEmoji(trustedNow()) : '');
+  // The budget slot rides the money figure: it answers "how much of the session's
+  // limit is spent", which is a fact about the cost, not a second cost. A session
+  // with no limit renders exactly as before, so the footer only grows by choice.
+  const budget = metrics.budget;
+  const budgeted = budget === undefined || budget.limit === null ? ''
+    : `/${budget.limit.toFixed(2)}${budget.state === 'over' ? '⚠!' : budget.state === 'warn' ? '⚠' : ''}`;
+  const money = dollars + budgeted;
+  // The last completed turn is the one figure the whole-session total cannot
+  // give: `$1.23 / $9.86 · #12 $0.04` reads "the session so far, of which the
+  // last turn cost this". `+` marks a turn whose settled calls were not all
+  // priceable, the same mark the total uses.
+  const turn = metrics.lastTurn === undefined || !Number.isFinite(metrics.lastTurn.cost) ? ''
+    : `#${metrics.lastTurn.turn} $${metrics.lastTurn.cost.toFixed(2)}${metrics.lastTurn.unknown ? '+' : ''}`;
+  // Every figure reads value first and carries its own short qualifier, so the
+  // cluster stays scannable without a `label:` prefix in front of each number.
   const base = rates ? [
-    `${label('footer.current')}: ${figure(Number.isFinite(rates.current) ? '~' + rates.current.toFixed(1) : '--', FIGURE.rate)} tps`,
-    `${label('footer.average')}: ${figure(Number.isFinite(rates.average) ? rates.average.toFixed(1) : '--', FIGURE.rate)} tps`,
-    `${label('footer.context')}: ${ctx}`, dollars, `${label('footer.cache')}: ${cache}`,
-  ] : [`${label('footer.context')}: ${ctx}`, dollars, `${label('footer.cache')}: ${cache}`];
-  // Narrow terminals shed the quietest figures first: average, current, context. The
-  // model header then falls back to its bare `model @ effort` form, then context goes,
-  // and only then the header itself — the running cost is the last thing standing.
-  const drops = rates ? [1, 0, 2, 4] : [0, 2];
-  const offset = header === '' ? 0 : 1;
-  const parts = header === '' ? base : [header, ...base];
-  const short = header.replace(/^[^:]+: /, '');
-  const heads = header === '' ? [''] : short === header ? [header] : [header, short];
-  const render = ({ omit, head }) => parts
-    .map((part, index) => (index === 0 && header !== '' ? head : part))
-    .filter((part, index) => part !== '' && !omit.has(index))
-    .join(' | ');
+    `${figure(Number.isFinite(rates.current) ? '~' + rates.current.toFixed(1) : '--', FIGURE.rate)} tps`,
+    `${figure(Number.isFinite(rates.average) ? rates.average.toFixed(1) : '--', FIGURE.rate)} tps ${label('footer.average')}`,
+    `${ctx} ${label('footer.context')}`, money, `${cache} ${label('footer.cache')}`,
+  ] : [`${ctx} ${label('footer.context')}`, money, `${cache} ${label('footer.cache')}`];
+  // The slot is reserved even when no turn has cost anything yet: the drop
+  // ladder's indices are fixed against this array, and an unfilled slot renders
+  // as '' (skipped by `render`) exactly like the absent figure would.
+  base.splice(rates ? 3 : 1, 0, turn);
+  // Narrow terminals shed the quietest figures first: the last turn, then
+  // average, current and context, and only then the cache. The running cost is
+  // the last thing standing, and its slot is index 4 (or 2 without rates) now
+  // that the turn slot holds index 3 (or 1) open.
+  const drops = rates ? [3, 1, 0, 2, 5, 4] : [1, 0, 3, 2];
+  const render = omit => base.filter((part, index) => part !== '' && !omit.has(index)).join(' · ');
   for (let dropped = 0; dropped <= drops.length; dropped++) {
-    const omit = new Set(drops.slice(0, dropped).map(index => index + offset));
-    for (const head of heads) {
-      const value = render({ omit, head });
-      if (displayWidth(value) <= columns) return value;
-    }
+    const value = render(new Set(drops.slice(0, dropped)));
+    if (displayWidth(value) <= columns) return value;
   }
-  const floor = render({ omit: new Set(drops.map(index => index + offset)), head: '' });
+  const floor = render(new Set(drops));
   let clipped = '';
   for (const char of floor) { if (displayWidth(clipped + char) > columns) break; clipped += char; }
   return clipped;
 }
+/**
+ * The session's recorded spend and whether any of it is unpriceable, for a host
+ * that must decide something (the budget gate) rather than only render it. Same
+ * ledger and same rules as {@link footerFor}, so the figure the gate compares
+ * and the figure the footer shows can never disagree.
+ */
+export function sessionSpend(id) {
+  try {
+    const ledger = id && process.env.DSH_HOME ? readMetrics(process.env.DSH_HOME, id) : { rows: [], corrupt: false };
+    const data = id ? source?.(id) : undefined;
+    const summary = summarize(ledger.rows, data?.events ?? [], ledger.corrupt);
+    return { cost: summary.cost, unknown: summary.unknown, pending: summary.pending };
+  } catch { return { cost: 0, unknown: true, pending: 0 }; }
+}
+
 /** Per-events memo: the status line renders up to once a second, and summarize/average are O(events). */
 const footerCache = new WeakMap();
-export function footerFor(id, stats, columns, header = '', locale = 'en') {
+export function footerFor(id, stats, columns, provider = 'deepseek-official', locale = 'en') {
+  const limit = parseBudget(process.env.DSCODE_SESSION_BUDGET_USD);
   try {
     const data = id ? source?.(id) : undefined;
     const ledger = id && process.env.DSH_HOME ? readMetrics(process.env.DSH_HOME, id) : { rows: [], corrupt: false };
@@ -170,6 +219,9 @@ export function footerFor(id, stats, columns, header = '', locale = 'en') {
     const capacity = data?.capacity ?? stats.contextWindow;
     const average = fresh ? hit.average : sessionAverageTps(events);
     if (events.length > 0 && !fresh) footerCache.set(events, { key: ledger.rows, length: events.length, tail, summary, average });
-    return formatFooter(summary, Number.isFinite(used) && capacity > 0 ? used / capacity * 100 : undefined, columns, { current: data?.currentTps, average }, locale, header);
-  } catch { return formatFooter({ cost: 0, unknown: true, cache: null }, undefined, columns, { current: null, average: null }, locale, header); }
+    // The budget comes from the environment for this process only: it is a
+    // per-machine spending guard, not a session property worth persisting.
+    const budget = limit === null ? undefined : evaluateBudget(summary.cost, limit);
+    return formatFooter({ ...summary, ...(budget === undefined ? {} : { budget }) }, Number.isFinite(used) && capacity > 0 ? used / capacity * 100 : undefined, columns, { current: data?.currentTps, average }, locale, provider);
+  } catch { return formatFooter({ cost: 0, unknown: true, cache: null }, undefined, columns, { current: null, average: null }, locale, provider); }
 }

package/plugins/tui-tools/workspace-discovery.mjs

@@ -10,11 +10,15 @@ export const instructionFileCandidates = Object.freeze(['AGENTS.md', 'CLAUDE.md'
 export const projectRootMarkers = Object.freeze(['.git']);
 
 export const ENABLED_VALUES = Object.freeze(['1', 'true', 'on', 'yes']);
-// Fail closed: only the documented enable spellings arm a switch, so an operator
-// writing "no", "none" or "disable" cannot accidentally turn on a feature that
-// reads untrusted project content.
+// Fail closed: only the documented enable spellings read as on, so an operator
+// writing "no", "none" or "disable" cannot accidentally arm a feature that reads
+// untrusted project content.
 export const enabledFlag = (value) => ENABLED_VALUES.includes(String(value ?? '').trim().toLowerCase());
-export const skillAncestorsEnabled = (env = process.env) => enabledFlag(env.DSCODE_SKILL_ANCESTORS);
+// Ancestor skill discovery defaults to on, so its switch is the inverse: only an
+// explicit off spelling disables it and an unrecognised value keeps the default.
+export const DISABLED_VALUES = Object.freeze(['0', 'false', 'off', 'no', 'none', 'disable']);
+export const disabledFlag = (value) => DISABLED_VALUES.includes(String(value ?? '').trim().toLowerCase());
+export const skillAncestorsEnabled = (env = process.env) => !disabledFlag(env.DSCODE_SKILL_ANCESTORS);
 
 // A symlinked $HOME (or a /Volumes mount) must not break the boundary test: the
 // launcher passes an already-resolved session directory while os.homedir() returns
@@ -52,6 +56,9 @@ export function projectRootOf({ cwd, markers = projectRootMarkers }) {
   }
 }
 
+// Nearest first, which is also precedence: the provider scans `customSkillDirs` in
+// order and the first definition of a duplicate name wins. The provider's own rank
+// 100/200 roots at the project root still outrank everything registered here.
 export function ancestorSkillDirs({ cwd, home, env = process.env }) {
   if (!skillAncestorsEnabled(env)) return [];
   const projectRoot = projectRootOf({ cwd });

package/presets/dscode/agent.cordis.yml

@@ -135,8 +135,9 @@
 - id: skill-filesystem
   name: '@deepseek-ai/dsh-skill-filesystem'
   config:
-    # DSCODE_SKILL_ANCESTORS=1 adds the skill roots of directories between the
-    # project root and home at rank 300: headers enter the catalog, bodies stay lazy.
+    # Ancestor skill discovery is on by default: the skill roots of directories
+    # between the working directory and home register at rank 300, nearest first,
+    # so headers enter the catalog and bodies stay lazy. =0 turns it off.
     customSkillDirs: !!js 'JSON.parse(process.env.DSCODE_SKILL_ANCESTOR_DIRS ?? "[]")'
 
 - id: tool-skill

package/vendor/tui/lib/app.mjs

@@ -28,13 +28,12 @@ import { DEFAULT_TERMINAL_TITLE, sanitizeTerminalTitle, terminalTitleSequence, u
 import { settledEntryCount } from './render/projection.mjs';
 import { imeCursorRowsUp, useImeCursorAnchor } from './render/ime-cursor.mjs';
 import { readClipboardImage } from './dscode/clipboard-image/index.mjs';
-import { dscodeChatLines } from './dscode/chat.mjs';
+import { createChatLinesCache, dscodeChatLines } from './dscode/chat.mjs';
 import { readFileSync } from 'node:fs';
 import { FOOTER_FIGURE_RESERVE, footerFor as dscodeFooterFor } from '../../../plugins/session-metrics/view.mjs';
 import { newerVersion as dscodeNewerVersion } from '../../../plugins/tui-tools/update.mjs';
 import { languageName as dscodeLanguageName, normalizeLanguage as dscodeNormalizeLanguage, t as dscodeMessage } from '../../../plugins/i18n/messages.mjs';
 import { dscodeTelemetryNodes } from './dscode/telemetry.mjs';
-import { dscodeFooterHeader } from './render/status.mjs';
 import { dscodePadEnd, welcomeArtRows, welcomePath, WELCOME_ART, WELCOME_ART_SMALL } from './dscode/welcome.mjs';
 import { TETRIS_TICK_MS as DSCODE_TETRIS_TICK_MS, TETRIS_WIDTH as DSCODE_TETRIS_WIDTH, tetrisFrame as dscodeTetrisFrame } from '../../../plugins/compaction/tetris.mjs';
 import { PROVIDERS as DSCODE_PROVIDERS, providerSpec as dscodeProviderSpec, providerArgument as dscodeProviderArgument, providerOfLabel as dscodeProviderOfLabel, pickModel as dscodePickModel, credentialState as dscodeCredentialState, waitForModels as dscodeWaitForModels, } from '../../../plugins/providers/catalog.mjs';
@@ -128,8 +127,8 @@ const RESIZE_REFLOW_CLEAR = '\x1b[r\x1b[0m\x1b[H\x1b[2J\x1b[3J\x1b[H';
 const SYNCHRONIZED_UPDATE_BEGIN = '\x1b[?2026h';
 /** Release the held frame after Ink has replayed the source-backed Static rows. */
 const SYNCHRONIZED_UPDATE_END = '\x1b[?2026l';
-import { layoutStatusBar, padValue, parseStatuslineItems, statusCycleHint, STATUS_GROUP_SEPARATOR, STATUS_ITEM_SEPARATOR, STATUS_ROW2_INDENT, } from './render/status.mjs';
-import { displayTail, displayText, singleLineText, truncateColumns } from './render/text.mjs';
+import { layoutStatusBar, parseStatuslineItems, statusCycleHint, STATUS_GROUP_SEPARATOR, STATUS_ITEM_SEPARATOR, STATUS_ROW2_INDENT, } from './render/status.mjs';
+import { displayTail, displayText, formatTokens, singleLineText, truncateColumns, wrapText } from './render/text.mjs';
 import { isVsCodeTerminalEnv, normalizeKeyboardChunk, PASTE_BRACKET_TIMEOUT_MS, PASTE_END_MARKER, PASTE_START_MARKER, stripPasteMarkers, stripTerminalFocusEvents, tokenizeRawEditorChunk, } from './keyboard.mjs';
 import { clampScroll, followInspectorCursor, inspectorViewport, layoutGutterRows, liveRegionBudget, moveScroll, panelViewport, revealRow, selectionWindow, } from './render/inspector.mjs';
 import { clampLiveAllocation, diffLineStyle, fillDiffLineBars, lineSegment, markdownLines, styledLines, textLines, transcriptEntryLines, } from './render/lines.mjs';
@@ -214,9 +213,10 @@ function useFrames(intervalMs, active = true) {
  * Ink re-subscribes its input effect whenever the handler identity changes.
  * Keep terminal input ownership stable while a local surface updates cursor,
  * scroll, or draft state; otherwise every key toggles raw mode and can make
- * Ink repeatedly repaint the live region.
+ * Ink repeatedly repaint the live region. `active` defaults to true: a panel
+ * that only mounts while it owns the keyboard omits the argument.
  */
-function useStableInput(handler, active) {
+function useStableInput(handler, active = true) {
     const handlerRef = useRef(handler);
     handlerRef.current = handler;
     const stableHandler = useCallback((input, key) => {
@@ -349,6 +349,25 @@ function dscodeActivity(entries, streaming) {
     return dscodeT('activity.running') + ' · ' + singleLineText(tool.name) + (running.length > 1 ? ' +' + (running.length - 1) : '')
         + (description ? ' · ' + truncateColumns(singleLineText(description), 56) : '');
 }
+/**
+ * dscode: what cross-session communication is doing, or undefined when none is.
+ * A send in flight and a request still awaiting its answer outrank the ordinary
+ * tool activity, because the turn is blocked on another session either way.
+ */
+function dscodeCommunicationActivity(view) {
+    const waiting = view.waiting.at(-1);
+    if (waiting !== undefined)
+        return '⇄ ' + dscodeT('communication.waiting', { peer: shortPeer(waiting.peer) });
+    const sending = [...view.rows].reverse().find(row => row.direction === 'sent' && row.pending);
+    if (sending !== undefined)
+        return '⇄ ' + dscodeT('communication.sending', { peer: shortPeer(sending.peer) });
+    return undefined;
+}
+/** Bounded peer label: a full session id is too long for one activity row. */
+function shortPeer(peer) {
+    const label = peer.startsWith('session:') ? `session ${peer.slice('session:'.length, 'session:'.length + 8)}` : peer;
+    return label.length > 32 ? `${label.slice(0, 31)}…` : label;
+}
 // dscode: the compaction indicator — a small scripted Tetris bot that lines each
 // piece up, drops it and clears full rows, the way compaction clears older history.
 function dscodeTetrisCells(row, palette, key) {
@@ -374,7 +393,7 @@ export function DscodeCompactionLine({ since, rows, animated = true }) {
     }
     return createElement(Box, { flexDirection: 'column', paddingX: 2 }, ...board.map((row, y) => createElement(Box, { key: y }, wall('left'), ...dscodeTetrisCells(row, palette, 'cell'), wall('right'), y === 1 ? label(dscodeT('compaction.running'), palette.brandBright) : y === 2 ? label(clock, palette.dim) : undefined)), createElement(Text, { color: inkColor(palette.dim) }, '+' + '-'.repeat(DSCODE_TETRIS_WIDTH * 2) + '+'));
 }
-export function DscodeActivityLine({ entries, streaming, since, animated = true }) {
+export function DscodeActivityLine({ entries, streaming, since, animated = true, communication }) {
     const columns = useStdout().stdout?.columns ?? 80;
     const tick = useFrames(animated ? 100 : 1000);
     const elapsed = since > 0 ? Math.max(0, Date.now() - since) : 0;
@@ -385,8 +404,9 @@ export function DscodeActivityLine({ entries, streaming, since, animated = true
     const spinner = animated
         ? dscodeSpinnerCells(tick, palette)
         : { left: { text: ' ', color: palette.brandMid }, flake: palette.brandBright, right: { text: ' ', color: palette.brandMid } };
-    const label = truncateColumns(dscodeActivity(entries, streaming), Math.max(1, columns - 9 - visibleColumns(suffix)));
-    return createElement(Box, { paddingX: 2 }, createElement(Text, { wrap: 'truncate-end' }, createElement(Text, { color: inkColor(spinner.left.color) }, spinner.left.text), createElement(Text, { color: inkColor(spinner.flake) }, '❄'), createElement(Text, { color: inkColor(spinner.right.color) }, spinner.right.text), createElement(Text, { color: inkColor(getPalette().brandBright) }, ' ' + label), createElement(Text, { color: inkColor(getPalette().dim) }, suffix)));
+    const crossSession = communication === undefined ? undefined : dscodeCommunicationActivity(communication);
+    const label = truncateColumns(crossSession ?? dscodeActivity(entries, streaming), Math.max(1, columns - 9 - visibleColumns(suffix)));
+    return createElement(Box, { paddingX: 2 }, createElement(Text, { wrap: 'truncate-end' }, createElement(Text, { color: inkColor(spinner.left.color) }, spinner.left.text), createElement(Text, { color: inkColor(spinner.flake) }, '❄'), createElement(Text, { color: inkColor(spinner.right.color) }, spinner.right.text), createElement(Text, { color: inkColor(crossSession === undefined ? getPalette().brandBright : getPalette().steered) }, ' ' + label), createElement(Text, { color: inkColor(getPalette().dim) }, suffix)));
 }
 function DeepDivingLine({ since, animated = true }) {
     const elapsed = since === 0 ? 0 : Date.now() - since;
@@ -1018,15 +1038,18 @@ export function StatusLine({ facts, stats, busy, columns, items, onRows, animate
         const timer = setInterval(() => dscodeRefreshMetrics(n => n + 1), 1000);
         return () => clearInterval(timer);
     }, []);
-    // dscode: the telemetry segment carries the header and only appears once the
-    // terminal can seat it; below that the identity row keeps the model. Its
-    // slot is padded to the width it was laid out for, so the live figures
-    // decide the text the row shows without ever changing the row's geometry.
+    // dscode: the live figures close row 2 as one left-hand cluster and only appear
+    // once the terminal can seat them; row 1 names the model itself. The cluster is
+    // laid out against the same width budget as before, and its own ladder decides
+    // which figures fit.
     const telemetryWidth = Math.max(1, Math.min(columns - 8, Math.max(40, Math.floor(columns * 0.8) - 4) + FOOTER_FIGURE_RESERVE));
+    // The figures belong to the provider serving the route (`provider/model`).
+    const slash = facts.model.indexOf('/');
+    const provider = slash > 0 ? facts.model.slice(0, slash) : 'deepseek-official';
     const telemetry = columns >= 48
-        ? dscodeFooterFor(facts.fullSessionId, stats, telemetryWidth, dscodeFooterHeader(facts, stats), getLanguage())
+        ? dscodeFooterFor(facts.fullSessionId, stats, telemetryWidth, provider, getLanguage())
         : '';
-    facts = { ...facts, telemetry: telemetry === '' ? '' : padValue(telemetry, telemetryWidth) };
+    facts = { ...facts, telemetry };
     // Flowing-theme busy flow: the identity cluster's live dot cycles the
     // anchor walk while a turn runs; static themes never start the timer.
     const flow = themeFlow();
@@ -1055,6 +1078,7 @@ export function StatusLine({ facts, stats, busy, columns, items, onRows, animate
         facts.goal?.phase,
         facts.goal?.rounds,
         facts.goal?.max,
+        facts.skills,
         stats,
         busy,
         columns,
@@ -1075,16 +1099,13 @@ export function StatusLine({ facts, stats, busy, columns, items, onRows, animate
             if (groupIndex > 0) {
                 leftParts.push(createElement(Text, { key: key + 'gs' + groupIndex, color: inkColor(getPalette().dim) }, STATUS_GROUP_SEPARATOR));
             }
+            const telemetryGroup = group.id === 'telemetry';
             group.spans.forEach((span, spanIndex) => {
-                leftParts.push(createElement(Text, { key: key + 'g' + groupIndex + 's' + spanIndex, wrap: 'truncate-end', ...statusToneProps(span.tone, flowMs) }, span.text));
+                const spanKey = key + 'g' + groupIndex + 's' + spanIndex;
+                leftParts.push(createElement(Text, { key: spanKey, wrap: 'truncate-end', ...statusToneProps(span.tone, flowMs) }, telemetryGroup ? dscodeTelemetryNodes(span.text, spanKey) : span.text));
             });
         });
         const rightParts = [];
-        // dscode: row 2 joins its left figures to the right-pinned telemetry with a
-        // quieter rule than the cluster separator.
-        if (key === 's2' && row.left.length > 0 && row.right.length > 0) {
-            rightParts.push(createElement(Text, { key: key + 'divider', color: inkColor(getPalette().dim) }, '｜ '));
-        }
         // dscode: the cycle hint rides LEFT of the right cluster, so the
         // right-anchored badge holds its columns whether or not the hint is
         // painted; layoutStatusBar reserves the hint's width in both states.
@@ -1098,7 +1119,7 @@ export function StatusLine({ facts, stats, busy, columns, items, onRows, animate
             if (index > 0) {
                 rightParts.push(createElement(Text, { key: key + 'rs' + index, color: inkColor(getPalette().dim) }, STATUS_ITEM_SEPARATOR));
             }
-            rightParts.push(createElement(Text, { key: key + 'r' + index, wrap: 'truncate-end', ...statusToneProps(span.tone, flowMs) }, key === 's2' && index === 0 ? dscodeTelemetryNodes(span.text, key + 'r' + index) : span.text));
+            rightParts.push(createElement(Text, { key: key + 'r' + index, wrap: 'truncate-end', ...statusToneProps(span.tone, flowMs) }, span.text));
         });
         // Each row already fits the column budget; truncate-end stays as the
         // terminal-measurement backstop so a drifting cell count clips instead
@@ -1119,12 +1140,17 @@ export function StatusLine({ facts, stats, busy, columns, items, onRows, animate
  * above the composer.
  */
 function NoticeLine({ text, tone, columns }) {
+    // dscode: `relay` is cross-session traffic. It takes the violet the interface
+    // reserves for steered/queued interactive input plus its own glyph, so it is
+    // never mistaken for the session's own tool or shell output.
     const color = tone === 'error'
         ? getPalette().error
         : tone === 'warning'
             ? getPalette().warn
-            : getPalette().brandBright;
-    const mark = tone === 'error' ? '⨯' : tone === 'warning' ? '!' : '•';
+            : tone === 'relay'
+                ? getPalette().steered
+                : getPalette().brandBright;
+    const mark = tone === 'error' ? '⨯' : tone === 'warning' ? '!' : tone === 'relay' ? '⇄' : '•';
     return createElement(Box, { paddingLeft: 2 }, createElement(Text, { color: inkColor(color), wrap: 'truncate-end' }, truncateColumns(`${mark} ${singleLineText(text)}`, Math.max(1, columns - 2))));
 }
 /** The fixed decision list; answers stay in the binary answerer vocabulary. */
@@ -1987,7 +2013,7 @@ export function DscodeEmailPanel({ columns, rows, pick, close, gmail, imap }) {
     const listWidth = wide ? Math.max(26, Math.floor(columns * 0.4)) : columns;
     const previewWidth = wide ? Math.max(1, columns - listWidth - 1) : columns;
     const clean = value => dscodeEmailText(value).replace(/\n/g, ' ');
-    const bodyLines = mail ? wrapText(dscodeEmailText(mail.body), Math.max(1, previewWidth - 2), 'wrap').split('\n') : [];
+    const bodyLines = mail ? wrapText(dscodeEmailText(mail.body), Math.max(1, previewWidth - 2)) : [];
     useStableInput((input, key) => {
         if (setup)
             return;
@@ -2878,6 +2904,40 @@ function ProviderDiscoveryPanel({ target, baseURL, apiKey, configured, discover,
         return createElement(Text, { key: model.id, color: added ? inkColor(getPalette().dim) : active ? inkColor(getPalette().brandBright) : inkColor(getPalette().text), wrap: 'truncate-end' }, truncateColumns(label, viewport.contentColumns));
     }), createElement(PanelGap, { visible: viewport.gapRows > 0 }), createElement(Text, { color: inkColor(getPalette().dim), wrap: 'truncate-end' }, truncateColumns(t('panel.discovery.footer'), viewport.contentColumns)));
 }
+/**
+ * dscode: the budget gate. The runner checks the session's recorded spend
+ * against `DSCODE_SESSION_BUDGET_USD` before it delivers a prompt and hands the
+ * submission here instead of sending it; the user decides whether the turn
+ * still runs. It deliberately mirrors the compaction confirmation (`y`/`n`/Esc)
+ * so the two stops share one reflex, and it never sends the prompt itself — the
+ * runner owns delivery, this panel only answers.
+ */
+export function DscodeBudgetConfirmPanel({ decision, confirm, back }) {
+    const stdout = useStdout().stdout;
+    const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
+    useStableInput((input, key) => {
+        if (key.escape || input === 'n') {
+            back();
+            return;
+        }
+        if (input === 'y')
+            confirm();
+    }, true);
+    const palette = getPalette();
+    const values = {
+        spent: '$' + decision.spent.toFixed(2),
+        limit: '$' + decision.limit.toFixed(2),
+        percent: String(Math.round(decision.percent)) + '%',
+    };
+    const title = dscodeT('budget.confirm.title', values);
+    const hint = dscodeT('budget.confirm.hint');
+    if (viewport.maxHeight === 0 || viewport.compact)
+        return createElement(Text, { wrap: 'truncate-end' }, truncateColumns(title + ' · ' + hint, viewport.contentColumns));
+    const body = [dscodeT('budget.confirm.spent', values), dscodeT('budget.confirm.next', values)]
+        .map((text, index) => createElement(Text, { key: 'body' + index, color: index === 0 ? void 0 : inkColor(palette.dim), wrap: 'truncate-end' }, truncateColumns('  ' + text, viewport.contentColumns)))
+        .slice(0, viewport.bodyRows);
+    return createElement(Box, { flexDirection: 'column', width: viewport.outerColumns, paddingX: 1, borderStyle: 'round', borderColor: inkColor(palette.warn) }, createElement(Text, { color: inkColor(palette.warn), bold: true, wrap: 'truncate-end' }, truncateColumns(title, viewport.contentColumns)), createElement(PanelGap, { visible: viewport.gapRows > 0 }), ...body, createElement(PanelGap, { visible: viewport.gapRows > 0 }), createElement(Text, { color: inkColor(palette.dim), wrap: 'truncate-end' }, truncateColumns(hint, viewport.contentColumns)));
+}
 /** Bounded destructive-action confirmation for credential or provider removal. */
 export function DscodeCompactionConfirmPanel({ preview, confirm, back }) {
     const stdout = useStdout().stdout;
@@ -3993,8 +4053,8 @@ function Input({ effortSurface, ultraPulse, active, frozen, frozenHint, busy, de
     // path-like query keeps the upstream order entirely.
     let rankedMentionRows = visibleMentionRows;
     if (mentionToken !== undefined && !isPathLikeMentionQuery(mentionToken.query) && mentionToken.query !== '') {
-        const hits = rankByName(visibleMentionRows.map(row => ({ name: row.label.replace(/^@/u, ''), row })), mentionToken.query)
-            .map(entry => entry.row);
+        const mentionMatches = visibleMentionRows.map(row => ({ name: row.label.replace(/^@/u, ''), row }));
+        const hits = rankByName(mentionMatches, mentionToken.query).map(entry => entry.row);
         const hitSet = new Set(hits);
         rankedMentionRows = [...hits, ...visibleMentionRows.filter(row => !hitSet.has(row))];
     }
@@ -4329,7 +4389,7 @@ function Input({ effortSurface, ultraPulse, active, frozen, frozenHint, busy, de
             }
             if (liveValue.startsWith('!')) {
                 // Dropping the bang shifts every character left: keep the caret on the same letter.
-                applyEdit({ value: liveValue.slice(1), cursor: Math.max(0, liveCursor - 1) });
+                applyEdit({ value: liveValue.slice(1), cursor: Math.max(0, liveCursor - 1), killed: undefined });
                 return;
             }
             if (hasNotice) {
@@ -5195,7 +5255,7 @@ export function computeSettledRows(previous, entries, settled, showReasoning, re
             if (record.before !== undefined)
                 window.unshift(record.before);
         }
-        const header = createElement(Header, { key: 'header', ...headerFacts, resumed });
+        const header = createElement(Header, { key: 'header', ...headerFacts });
         const flat = droppedEntries > 0
             ? [header, settledTrimHint(droppedEntries, columns), ...window]
             : [header, ...window];
@@ -5270,6 +5330,12 @@ export function App(props) {
     // dscode: the email inbox owns the surface while it is open; a picked message
     // steers into the running turn (or starts one) and closes the panel.
     const [emailOpen, setEmailOpen] = useState(false);
+    /**
+     * dscode: a submission the budget gate stopped. The runner parks it here
+     * instead of delivering it; the panel's `y` hands the exact line back, and
+     * `n`/Esc clears it without sending. Only one prompt waits at a time.
+     */
+    const [budgetPending, setBudgetPending] = useState(undefined);
     const gmail = useMemo(() => dscodeCreateGmailConnector(), []);
     const imap = useMemo(() => dscodeCreateImapConnector(), []);
     useEffect(() => {
@@ -5291,6 +5357,9 @@ export function App(props) {
         setEmailOpen(false);
         setBtwOpen(false);
         setBtwSelected(undefined);
+        // A parked prompt belongs to the session that was over budget; carrying it
+        // across a switch would deliver the old session's text into the new one.
+        setBudgetPending(undefined);
     }, [props.sessionKey]);
     // The stores are closure-backed singletons whose methods never touch `this`,
     // but a bare method reference still detaches it from its receiver. One stable
@@ -5320,10 +5389,12 @@ export function App(props) {
     // process-stable, so one callback per view identity is enough.
     const readDescriptors = useCallback(() => props.commands.descriptors, [props.commands]);
     const readSkills = useCallback(() => props.skills.rows, [props.skills]);
+    const readSkillCount = useCallback(() => props.skills.count, [props.skills]);
     const subscribeCommands = useCallback((listener) => props.commands.subscribe(listener), [props.commands]);
     const subscribeSkills = useCallback((listener) => props.skills.subscribe(listener), [props.skills]);
     const descriptors = useSyncExternalStore(subscribeCommands, readDescriptors);
     const skills = useSyncExternalStore(subscribeSkills, readSkills);
+    const skillCount = useSyncExternalStore(subscribeSkills, readSkillCount);
     const [modelLabel, setModelLabel] = useState(props.model);
     const [modelOpen, setModelOpen] = useState(false);
     /** Nested /model stages; only one owns terminal input at a time. */
@@ -5419,8 +5490,8 @@ export function App(props) {
         // `/latest` dist-tag endpoint, which silently suppressed this notice.
         fetch(DSCODE_REGISTRY_URL, { headers: { accept: 'application/json' }, signal: controller.signal })
             .then(response => (response.ok ? response.json() : undefined))
-            .then(data => {
-            const latest = data?.version;
+            .then((data) => {
+            const latest = data !== null && typeof data === 'object' ? data.version : undefined;
             if (typeof latest === 'string' && dscodeNewerVersion(latest, DSCODE_VERSION))
                 notify(t('update.available', { version: latest }), 'warning');
         })
@@ -5432,7 +5503,7 @@ export function App(props) {
         };
     }, []);
     useEffect(() => {
-        props.onBridgeReady({ notify });
+        props.onBridgeReady({ notify, confirmBudget: setBudgetPending });
     }, []);
     useEffect(() => {
         if (!modelOpen)
@@ -5616,8 +5687,8 @@ export function App(props) {
     // panel keypress.
     const inputActive = deleteConfirmId !== undefined
         ? !approvalPending && !questionPending
-        : !emailOpen && !modelOpen && !helpOpen && !modeOpen && !permissionOpen && !resumeOpen && !pluginOpen && !updateOpen && !scheduleOpen && !jobsOpen && !statuslineOpen && !themeOpen && !languageOpen && !historyOpen && !queueOpen && !agentsOpen && !subagentOpen && !todosOpen && !usageOpen && !verboseOpen && diffView === undefined && !reviewPickerOpen && !approvalPending && !questionPending;
-    const transcriptVisible = !btwOpen && !emailOpen && !modelOpen && !helpOpen && !modeOpen && !permissionOpen && !resumeOpen && !pluginOpen && !updateOpen && !scheduleOpen && !jobsOpen && !statuslineOpen && !themeOpen && !languageOpen && !historyOpen && !queueOpen && !agentsOpen && !subagentOpen && !todosOpen && !usageOpen && !verboseOpen && diffView === undefined && !reviewPickerOpen && !approvalPending && !questionPending;
+        : !emailOpen && !modelOpen && !helpOpen && !modeOpen && !permissionOpen && !resumeOpen && !pluginOpen && !updateOpen && !scheduleOpen && !jobsOpen && !statuslineOpen && !themeOpen && !languageOpen && !historyOpen && !queueOpen && !agentsOpen && !subagentOpen && !todosOpen && !usageOpen && !verboseOpen && budgetPending === undefined && diffView === undefined && !reviewPickerOpen && !approvalPending && !questionPending;
+    const transcriptVisible = !btwOpen && !emailOpen && !modelOpen && !helpOpen && !modeOpen && !permissionOpen && !resumeOpen && !pluginOpen && !updateOpen && !scheduleOpen && !jobsOpen && !statuslineOpen && !themeOpen && !languageOpen && !historyOpen && !queueOpen && !agentsOpen && !subagentOpen && !todosOpen && !usageOpen && !verboseOpen && budgetPending === undefined && diffView === undefined && !reviewPickerOpen && !approvalPending && !questionPending;
     // Human questions outrank local inspectors. Close the lower modal instead
     // of leaving an approval/question visible but keyboard-locked behind it.
     useEffect(() => {
@@ -5774,10 +5845,15 @@ export function App(props) {
     // session title; cleared on unmount so the host shell regains its default.
     const tabTitle = view.title === '' ? DEFAULT_TERMINAL_TITLE : view.title;
     useTerminalTitle(tabTitle);
+    // dscode: the live region is re-rendered for every event, but an entry that
+    // did not change keeps its object identity, so its wrapped lines are reused
+    // instead of re-flowed per frame. Only the streaming text (view.streaming)
+    // changes between those frames, and it is rendered outside this list.
+    const chatLines = useMemo(() => createChatLinesCache(), []);
     const allLiveLines = useMemo(() => view.entries.slice(settled).flatMap(
     // Width shrinks with the real terminal (no 10-column floor: on a
     // narrower terminal the floor silently overflowed every row).
-    entry => dscodeChatLines(entry, Math.max(1, terminalColumns - 2), showReasoning)), [view.entries, settled, terminalColumns, showReasoning]);
+    entry => chatLines(entry, Math.max(1, terminalColumns - 2), showReasoning)), [view.entries, settled, terminalColumns, showReasoning, chatLines]);
     // Reserve the same stream slice from the moment a turn becomes busy. This
     // keeps the first thinking frame from changing the dynamic-tree geometry
     // underneath Ink's cursor ledger and avoids a start-of-thinking flash.
@@ -5820,7 +5896,7 @@ export function App(props) {
     const auditedReasoningRows = liveAudit.allocation.reasoning;
     const auditedAnswerRows = liveAudit.allocation.answer;
     const inspectorVisible = verboseOpen && !approvalPending && !questionPending;
-    const modalVisible = emailOpen || modelOpen || helpOpen && modeOpen || permissionOpen || resumeOpen || pluginOpen || updateOpen || scheduleOpen || jobsOpen || statuslineOpen || themeOpen || languageOpen || historyOpen || queueOpen || agentsOpen || subagentOpen || todosOpen || usageOpen || inspectorVisible || diffView !== undefined || reviewPickerOpen || approvalPending || questionPending;
+    const modalVisible = budgetPending !== undefined || emailOpen || modelOpen || helpOpen && modeOpen || permissionOpen || resumeOpen || pluginOpen || updateOpen || scheduleOpen || jobsOpen || statuslineOpen || themeOpen || languageOpen || historyOpen || queueOpen || agentsOpen || subagentOpen || todosOpen || usageOpen || inspectorVisible || diffView !== undefined || reviewPickerOpen || approvalPending || questionPending;
     // The surface that currently owns the keyboard, named in the frozen band:
     // an empty composer under a panel must not advertise typing it cannot
     // accept — every key actually feeds the panel (which may or may not
@@ -6385,6 +6461,17 @@ export function App(props) {
             update: props.updateQueued,
             onClose: () => setQueueOpen(false),
         })
+        : undefined, budgetPending !== undefined
+        ? createElement(DscodeBudgetConfirmPanel, {
+            decision: budgetPending.decision,
+            confirm: () => {
+                const parked = budgetPending;
+                setBudgetPending(undefined);
+                props.dscodeAcknowledgeBudget?.(props.sessionKey);
+                props.dispatch(parked.text, parked.images, props.sessionKey);
+            },
+            back: () => setBudgetPending(undefined),
+        })
         : undefined, createElement(QuestionBar, { store: props.questions, snapshot: questionSnapshot, locked: false }), createElement(ApprovalBar, { snapshot: approvalSnapshot, locked: questionPending, notify, interrupt: props.interrupt, summarize: questionPending }), effortFor !== undefined ? undefined : modelSurface, helpOpen && !approvalPending && !questionPending
         ? createElement(HelpPanel, {
             descriptors,
@@ -6801,6 +6888,7 @@ export function App(props) {
             permission: view.permission !== '' ? view.permission : props.permission,
             sandbox: view.sandbox,
             goal: view.goal === undefined ? undefined : { phase: view.goal.phase, rounds: view.goal.rounds, max: view.goal.max },
+            skills: skillCount,
         },
         stats: view.stats,
         busy,