@toddzheng024/dscode-bundle 0.7.21 → 0.7.23

package/vendor/tui/lib/index.mjs

@@ -20,6 +20,8 @@ import { createUserMessage, MessageId } from '@deepseek-ai/dsh-llm';
 import { SessionId, SessionLogOffset } from '@deepseek-ai/dsh-session';
 import { deriveTurnTokenUsage } from '@deepseek-ai/dsh-token-meter/client';
 import { App } from './app.mjs';
+import { evaluateBudget, parseBudget } from '../../../plugins/session-metrics/turns.mjs';
+import { sessionSpend, turnCostsFor } from '../../../plugins/session-metrics/view.mjs';
 import { mountApprovalAnswerer } from './approval.mjs';
 import { isSlashLine, submissionPayload, watchCommands } from './commands.mjs';
 import { internals } from './internals.mjs';
@@ -35,6 +37,7 @@ import { createMentions } from './mentions.mjs';
 import { mountQuestionProvider } from './questions.mjs';
 import { createTranscriptStore } from './store.mjs';
 import { createSubagentFeed } from './subagents.mjs';
+import { createCommunicationFeed, foldCommunication } from './communication.mjs';
 import { btwBrief, btwSeed, createBtwFeed } from './btw.mjs';
 import { parseStatuslineItems } from './render/status.mjs';
 import { historyLine, HISTORY_MAX_ENTRIES, needsCompaction, parseHistoryFile, serializeHistoryList } from './history.mjs';
@@ -55,7 +58,7 @@ import { applyLauncherUpdate, probeLauncherUpdate } from './update.mjs';
 import { parseAnimationsPref } from './render/animations.mjs';
 import { parseThemeName, setTheme } from './theme.mjs';
 import { parseLanguageName, setLanguage, t } from './i18n.mjs';
-import { isSubagentSession, matchSessionId, mergeSessionTitles, newestRootForCwd, isSessionArtifactName, jsonlSessionRoot, planSessionDeletion, projectSessionRows, sessionArtifactDirectory, sessionDirectoryFor, } from './session-directory.mjs';
+import { isSubagentSession, matchSessionId, mergeSessionTitles, newestRootForCwd, sessionFolderMatches, isSessionArtifactName, jsonlSessionRoot, planSessionDeletion, projectSessionRows, sessionArtifactDirectory, sessionDirectoryFor, } from './session-directory.mjs';
 import { createUserSettingsPersistence, writeFileAtomically } from './settings-file.mjs';
 import { turnUsages } from './render/usage.mjs';
 /** Stable Cordis plugin name. */
@@ -375,6 +378,20 @@ export class StartupInputGate {
         }
     }
 }
+/**
+ * The warning for a resume that leaves the launch folder, or undefined when
+ * it stays. A session binds to one folder when it is created, and the
+ * workspace, the shell and the durable log all follow that header cwd — so a
+ * cross-folder resume works, but the user must be told the window moved.
+ * @param pinnedCwd - the header's project directory, when it has one.
+ * @param launchCwd - the directory DSCODE was launched in.
+ * @returns the warning text, or undefined when the folders already agree.
+ */
+export function resumeFolderWarning(pinnedCwd, launchCwd) {
+    if (sessionFolderMatches(pinnedCwd, launchCwd))
+        return undefined;
+    return t('notice.resumedOtherFolder', { folder: pinnedCwd, launch: launchCwd });
+}
 /**
  * Resolve the invocation's target session against the persisted headers.
  * @param startup - the parsed startup flags.
@@ -505,6 +522,16 @@ async function run(ctx, startup, io) {
         const seedOptions = pendingSelection === undefined
             ? { provider: currentDefaults().provider, model: currentDefaults().model }
             : { provider: pendingSelection.provider, model: pendingSelection.model };
+        let folderWarning;
+        if (next.resume) {
+            // The header is the only durable folder binding; the resumed session
+            // works in that folder whichever entry point got here — the CLI
+            // --resume flag, the /resume picker, /search or a queued switch. Only
+            // the notice differs, so it is prepared here and displayed once the
+            // session is actually on screen.
+            const pinned = (await persistence?.list())?.find(record => record.header.id === next.sessionId)?.header.cwd;
+            folderWarning = resumeFolderWarning(pinned, cwd);
+        }
         const handle = next.resume
             ? await agents.resume({
                 resumeSessionId: SessionId(next.sessionId),
@@ -554,6 +581,7 @@ async function run(ctx, startup, io) {
             mode: mode ?? 'standard',
             selection: selectionState,
             resumed: next.resume,
+            ...(folderWarning === undefined ? {} : { folderWarning }),
             catalogSeed: subagentCatalogSeed(seedEvents),
         };
     };
@@ -564,6 +592,60 @@ async function run(ctx, startup, io) {
     // Live subagent activity (child sessions of the current root): one bounded
     // row per child, folded from the same event bus the transcript feeds on.
     const subagents = createSubagentFeed();
+    // The bridge the React app registers on mount: local notices from the
+    // process side (unknown commands, switch confirmations, cancels).
+    const bridge = { notify: () => { }, confirmBudget: () => { } };
+    /**
+     * Notices emitted before the App mounted and registered its bridge; the
+     * first registration flushes them in order. Nothing else can drop a startup
+     * notice: the stub above is running before any React effect has committed.
+     */
+    const pendingNotices = [];
+    /** True from the FIRST bridge registration: a startup notice must land on it,
+     * never on the instance a later session switch is about to replace. */
+    let bridgeReady = false;
+    /**
+     * The session whose over-budget submission the user already approved. The
+     * gate asks once per session: a second prompt in the same session does not
+     * re-ask, and a new session starts with the question unanswered again.
+     */
+    let budgetAcknowledgedFor;
+    // dscode: live cross-session communication of the CURRENT root session. The
+    // feed is advisory display state rebuilt from the root log, so a resumed
+    // session re-derives its history instead of replaying stale notices.
+    let communication = createCommunicationFeed();
+    /** Row ids already reported through a notice, so a re-fold never repeats one. */
+    const communicationNoticed = new Set();
+    /**
+     * A peer's readable label: a bridge relay labels its source `session:<id>`,
+     * which is shortened to the tail the session directory shows.
+     */
+    const dscodePeerLabel = (peer) => peer.startsWith('session:') ? `session ${peer.slice('session:'.length).slice(-12)}` : peer;
+    /**
+     * Fold one root event into the cross-session feed and announce what is new.
+     * The activity line reads the view; a notice is the durable, scrollable
+     * record. Both use the relay tone and the ⇄ family, so this traffic never
+     * reads as the session's own shell or model output.
+     */
+    const observeCommunication = (event) => {
+        const previous = communication;
+        const next = foldCommunication(previous, event);
+        if (next === previous)
+            return;
+        communication = next;
+        for (const row of next.rows) {
+            if (row.pending || communicationNoticed.has(row.id))
+                continue;
+            communicationNoticed.add(row.id);
+            if (row.direction === 'received') {
+                bridge.notify(`← ${dscodePeerLabel(row.peer)}${row.preview === '' ? '' : ` · ${row.preview}`}`, 'relay');
+                continue;
+            }
+            const kind = row.kind === undefined ? '' : ` ${row.kind}`;
+            const status = row.failed ? ' — failed' : '';
+            bridge.notify(`→ ${dscodePeerLabel(row.peer)}${kind}${status}`, 'relay');
+        }
+    };
     // Side-question runs (/btw): a seeded read-only child whose answer renders in
     // its own panel and never in this transcript or its model context.
     const btw = createBtwFeed();
@@ -661,9 +743,12 @@ async function run(ctx, startup, io) {
         composing = turn.catch(() => { });
         return turn;
     };
+    /** The initial session's folder warning, held until the App can show it. */
+    let startupFolderWarning;
     if (!lazy) {
         const target = await resolveTarget(startup, persistence, cwd);
         const prepared = await prepare(target);
+        startupFolderWarning = prepared.folderWarning;
         active = prepared;
         agent = prepared.agent;
         session = prepared.session;
@@ -674,6 +759,13 @@ async function run(ctx, startup, io) {
         for (const event of prepared.catalogSeed)
             subagents.apply(event.data.childId, event);
     }
+    // The resumed root's own cross-session history is folded here, but its rows
+    // are marked seen: a restart reports new traffic, never the whole past.
+    if (session !== undefined) {
+        communication = session.snapshotEvents().reduce((view, event) => foldCommunication(view, event), createCommunicationFeed());
+        for (const row of communication.rows)
+            communicationNoticed.add(row.id);
+    }
     // Seed the transcript from the full session log: constructor seeds never
     // fire on `session/event`, so a resumed session paints its history once
     // before the first render. The handler reads the current session/store, so
@@ -692,6 +784,7 @@ async function run(ctx, startup, io) {
             // fact describes one child, so it feeds that child's live row.
             if (event.type === 'subagent/catalog' && event.data.childId !== '')
                 subagents.apply(event.data.childId, event);
+            observeCommunication(event);
             return;
         }
         // Child sessions (subagent conversations this root spawned) fold into
@@ -762,9 +855,6 @@ async function run(ctx, startup, io) {
     // screen at a time. Plan reviews (exit_plan_mode) arrive through this same
     // pipe; sibling answerers stay usable through the claim/defer split.
     const questions = mountQuestionProvider(ctx, candidate => agent !== undefined && candidate.id === agent.id);
-    // The bridge the React app registers on mount: local notices from the
-    // process side (unknown commands, switch confirmations, cancels).
-    const bridge = { notify: () => { } };
     // Same-id capability inheritance. Catalog capabilities flow by route key,
     // not model id, so a hand-declared relay model without an explicit
     // reasoningEfforts declaration serves no reasoning levels and offers no
@@ -1300,6 +1390,21 @@ async function run(ctx, startup, io) {
             ensureSession();
             return;
         }
+        // dscode: the budget gate stops exactly one submission per session when the
+        // recorded spend has reached `DSCODE_SESSION_BUDGET_USD`. The user decides;
+        // an approval is remembered for the rest of the session, and a session with
+        // no limit (or an unparseable one) never reaches this branch.
+        const limit = parseBudget(process.env.DSCODE_SESSION_BUDGET_USD);
+        if (limit !== null && budgetAcknowledgedFor !== session.id) {
+            const decision = evaluateBudget(sessionSpend(session.id).cost, limit);
+            if (decision.state === 'over') {
+                bridge.confirmBudget({
+                    decision: { spent: decision.spent, limit: decision.limit, percent: decision.percent },
+                    text: line, images, mode,
+                });
+                return;
+            }
+        }
         deliverLine(line, images, mode);
     };
     // Startup serialization: input submitted while the startup prompt/images
@@ -1688,9 +1793,12 @@ async function run(ctx, startup, io) {
         if (current === undefined)
             return Promise.resolve({ turns: [] });
         const values = ctx.get('sessionProjections')?.snapshot(current, ['tokenUsage']).values;
+        const events = current.snapshotEvents();
+        // The token meter says what each turn billed; the cost ledger says what it
+        // cost. Both read the same durable log, so the panel's rows line up.
         return Promise.resolve({
             totals: values?.tokenUsage,
-            turns: turnUsages(current.snapshotEvents(), deriveTurnTokenUsage),
+            turns: turnUsages(events, deriveTurnTokenUsage, turnCostsFor(current.id, events)),
         });
     };
     const switchModeAction = async (id) => {
@@ -1756,6 +1864,14 @@ async function run(ctx, startup, io) {
             session = next.session;
             store = next.store;
             mentions = next.mentions;
+            // Cross-session rows belong to the previous root. The incoming session's
+            // own history is re-derived from its log and marked seen, so the activity
+            // line keeps an unanswered request visible while only NEW traffic is
+            // announced.
+            communication = next.session.snapshotEvents().reduce((view, event) => foldCommunication(view, event), createCommunicationFeed());
+            communicationNoticed.clear();
+            for (const row of communication.rows)
+                communicationNoticed.add(row.id);
             commands.setAgent(agent);
             skills.setAgent(agent);
             try {
@@ -1816,6 +1932,8 @@ async function run(ctx, startup, io) {
                 // instance and React drops it silently. Defer past the commit.
                 setTimeout(() => {
                     bridge.notify(`${next.resumed ? 'resumed' : 'created'} ${next.session.id.slice(-12)} · mode ${next.mode}`);
+                    if (next.folderWarning !== undefined)
+                        bridge.notify(next.folderWarning, 'warning');
                 }, 0);
                 return;
             }
@@ -1836,6 +1954,8 @@ async function run(ctx, startup, io) {
             bridge.notify(cleanupWarning === undefined
                 ? `${next.resumed ? 'resumed' : 'created'} ${next.session.id.slice(-12)} · mode ${next.mode}`
                 : `switched to ${next.session.id.slice(-12)}, but ${cleanupWarning}`, cleanupWarning === undefined ? 'info' : 'warning');
+            if (next.folderWarning !== undefined)
+                bridge.notify(next.folderWarning, 'warning');
         });
     };
     const switchQueue = new SessionSwitchQueue(async (request) => { if (!quitting)
@@ -2095,6 +2215,7 @@ async function run(ctx, startup, io) {
             approval,
             questions,
             subagents,
+            communication,
             btw,
             startBtw,
             commands,
@@ -2111,6 +2232,8 @@ async function run(ctx, startup, io) {
             /** Pre-session plan choice for the status badge until a session composes. */
             pendingPlan: session === undefined && pendingPlan,
             dispatch,
+            /** dscode: the budget gate's approval covers the rest of the session. */
+            dscodeAcknowledgeBudget: (sessionKey) => { budgetAcknowledgedFor = sessionKey; },
             steer,
             interrupt,
             quit,
@@ -2190,12 +2313,23 @@ async function run(ctx, startup, io) {
             history: inputHistory,
             recordHistory,
             updateQueued,
-            onBridgeReady: (instance) => { bridge.notify = instance.notify; },
+            onBridgeReady: (instance) => {
+                bridge.notify = instance.notify;
+                if (bridgeReady)
+                    return;
+                bridgeReady = true;
+                for (const notice of pendingNotices.splice(0))
+                    bridge.notify(notice.text, notice.tone);
+            },
         });
     };
     const renderCurrent = () => {
         mountRef.current?.rerender(appElement());
     };
+    // Hold the cross-folder notice until a bridge exists: a resume that left the
+    // launch folder says so once, on the first window that can show it.
+    if (startupFolderWarning !== undefined)
+        pendingNotices.push({ text: startupFolderWarning, tone: 'warning' });
     mountRef.current = io.mount(appElement());
     // Startup prompt/images use the same durable delivery path as composer
     // submissions. Image bytes are committed before the user/message event, and

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

@@ -175,6 +175,7 @@ export const en = {
     'panel.usage.colTurns': 'turns',
     'panel.usage.unknownModel': 'unattributed',
     'panel.usage.colTurn': 'turn',
+    'panel.usage.colCost': 'cost',
     'panel.usage.colTotal': 'total',
     'panel.usage.colUncached': 'uncached',
     'panel.usage.colCacheRead': 'cache R',
@@ -250,6 +251,7 @@ export const en = {
     'status.label.out': 'out',
     'status.label.mode': '/mode',
     'status.label.context': 'context',
+    'status.label.skills': 'skills',
     // Frozen band
     'frozen.keysGoTo': 'keys go to {owner} · esc {action}',
     'frozen.action.rejects': 'rejects',
@@ -268,6 +270,7 @@ export const en = {
     'notice.themeSaveFailed': 'theme save failed: {message}',
     'notice.languageSaveFailed': 'language save failed: {message}',
     'notice.alreadyActive': 'that session is already active',
+    'notice.resumedOtherFolder': 'this session belongs to {folder}; its workspace and shell follow that folder (launched in {launch})',
     'notice.queueCancelled': 'queued message cancelled',
     'notice.queueActionFailed': 'queue action failed: {message}',
     'notice.queueUnavailable': 'queued message is no longer pending',

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

@@ -175,6 +175,7 @@ export const zh = {
     'panel.usage.colTurns': '回合数',
     'panel.usage.unknownModel': '未标注模型',
     'panel.usage.colTurn': '回合',
+    'panel.usage.colCost': '费用',
     'panel.usage.colTotal': '合计',
     'panel.usage.colUncached': '未命中',
     'panel.usage.colCacheRead': '缓存读',
@@ -250,6 +251,7 @@ export const zh = {
     'status.label.out': '出',
     'status.label.mode': '/mode',
     'status.label.context': '上下文',
+    'status.label.skills': '技能',
     // Frozen band
     'frozen.keysGoTo': '按键交给{owner} · esc {action}',
     'frozen.action.rejects': '拒绝',
@@ -268,6 +270,7 @@ export const zh = {
     'notice.themeSaveFailed': '主题保存失败：{message}',
     'notice.languageSaveFailed': '语言保存失败：{message}',
     'notice.alreadyActive': '该会话已是当前会话',
+    'notice.resumedOtherFolder': '该会话属于 {folder}；工作区与 shell 均跟随该目录（启动目录为 {launch}）',
     'notice.queueCancelled': '已取消排队消息',
     'notice.queueActionFailed': '队列操作失败：{message}',
     'notice.queueUnavailable': '该消息已不在队列中',

package/vendor/tui/lib/mentions.mjs

@@ -114,7 +114,7 @@ export function createMentions(ctx, agent, cwd) {
                     ? { path: isAbsolute(candidate.path) ? candidate.path : resolve(cwd, candidate.path) }
                     : {},
             }));
-            const sessionRows = sessions.map(candidate => ({
+            const sessionRows = sessions.map((candidate) => ({
                 label: formatSessionReferenceMention(candidate),
                 description: `Session · ${candidate.cwd ?? '(no cwd)'}`,
                 kind: 'session',

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

@@ -86,9 +86,9 @@ export function cacheHitPercent(usage) {
         : Math.round(usage.cacheReadTokens / billed * 1_000) / 10;
 }
 /** Separator between leading clusters. */
-export const STATUS_GROUP_SEPARATOR = ' ｜ ';
+export const STATUS_GROUP_SEPARATOR = ' · ';
 /** Separator between trailing state spans. */
-export const STATUS_ITEM_SEPARATOR = ' ｜ ';
+export const STATUS_ITEM_SEPARATOR = ' · ';
 /** The Codex-style mode cycle hint appended to the permission badge. */
 /** English compatibility value for callers that only measure the default layout. */
 export const STATUS_CYCLE_HINT = ' (shift+tab to cycle)';
@@ -172,6 +172,7 @@ export const STATUS_ITEMS = [
     { id: 'mode', label: 'mode', description: 'agent preset composing the session', side: 'left' },
     { id: 'branch', label: 'branch', description: 'git branch inside a repository', side: 'left' },
     { id: 'context', label: 'context', description: 'context-window occupancy meter', side: 'left' },
+    { id: 'skills', label: 'skills', description: 'skills loaded in the session catalog', side: 'left' },
     { id: 'permission', label: 'permission', description: 'permission preset badge with cycle hint', side: 'right' },
     { id: 'plan', label: 'plan', description: 'plan-mode state mark', side: 'left' },
     { id: 'turns', label: 'turns', description: 'turn and step counters', side: 'left' },
@@ -186,7 +187,7 @@ export const STATUS_ITEMS = [
  * Default order: the whole catalog (matches the pre-customization bar).
  * The busy dot is not an item — it always leads the identity cluster.
  */
-export const DEFAULT_STATUSLINE_ITEMS = ['model', 'permission', 'title', 'plan', 'goal', 'sandbox'];
+export const DEFAULT_STATUSLINE_ITEMS = ['model', 'permission', 'title', 'plan', 'goal', 'sandbox', 'skills'];
 /**
  * Parse a persisted statusline item list. The stored value is the ordered
  * set of ENABLED items (the Codex /statusline contract): unknown ids and
@@ -236,7 +237,10 @@ const RANK_IDENTITY = Number.POSITIVE_INFINITY;
 /** Row 2 drop ranks: title and durations go first; state and counts survive longest. */
 const RANK2_DURATIONS = 40;
 const RANK2_CACHE = 50;
+const RANK2_SKILLS = 60;
 const RANK2_PLAN = 70;
+/** The live telemetry cluster is the last row-2 group to go: it carries the running cost. */
+const RANK2_TELEMETRY = 95;
 /**
  * Traffic-light tone for a permission preset: read-only stays success green,
  * full access reads error red, and every workspace-scoped middle ground
@@ -258,7 +262,7 @@ function safe(text) {
 }
 /** Dim junction separator span inside a cluster. */
 function sep() {
-    return { text: ' ｜ ', tone: 'label' };
+    return { text: ' · ', tone: 'label' };
 }
 /** Total visible columns of a span list (separators ride inside the spans). */
 function spansWidth(spans) {
@@ -276,26 +280,12 @@ function joinWidth(parts, separator) {
         width += part;
     return width + separator * (parts.length - 1);
 }
-/** Build every candidate group/span with its drop rank and item id. */
-/** dscode: the footer telemetry header — `provider: model @ effort`. */
-export function dscodeFooterHeader(facts, stats) {
-    const raw = typeof facts.model === 'string' ? facts.model : '';
-    if (raw === '')
-        return '';
-    const cut = raw.indexOf('/');
-    const provider = cut > 0 ? raw.slice(0, cut) : '';
-    const model = cut > 0 ? raw.slice(cut + 1) : raw;
-    const effort = typeof facts.effort === 'string' && facts.effort !== '' ? facts.effort : (typeof stats.reasoningEffort === 'string' ? stats.reasoningEffort : '');
-    return (provider === '' ? model : provider + ': ' + model) + (effort === '' ? '' : ' @ ' + effort);
-}
-/** dscode: row 1's identity lead — the session title, else the model and its effort. */
-function dscodeStatusLead(facts, model, effort) {
+/** dscode: row 1's identity lead — the session title, else the session id. */
+function dscodeStatusLead(facts) {
     const source = facts.title !== undefined && facts.title !== '' ? facts.title : facts.sessionId;
-    const title = source === undefined || source === '' ? '' : truncateColumns(safe(source), TITLE_BUDGET);
-    if (title !== '')
-        return title;
-    return effort === '' ? model : model + ' ｜ ' + effort;
+    return source === undefined || source === '' ? '' : truncateColumns(safe(source), TITLE_BUDGET);
 }
+/** Build every candidate group/span with its drop rank and item id. */
 function buildCandidates(facts, stats, busy, enabled, contextWidth) {
     const identity = [
         { text: busy ? '● ' : '○ ', tone: busy ? 'live' : 'meta' },
@@ -308,11 +298,16 @@ function buildCandidates(facts, stats, busy, enabled, contextWidth) {
         identity.push(span);
     };
     const model = safe(facts.model).split('/').at(-1) ?? '';
-    // dscode: row 1 leads with the session title (falling back to the model), and the
-    // full `provider: model @ effort` header rides the telemetry segment instead.
+    // dscode: row 1 names the session (title, else its id) and then the model with
+    // its effort, so row 2 stays free for the live figures.
     if ((model !== '' && enabled.has('model')) || enabled.has('title')) {
+        const lead = dscodeStatusLead(facts);
+        if (lead !== '')
+            push({ text: lead, tone: 'model' });
+    }
+    if (model !== '' && enabled.has('model')) {
         const effort = safe(facts.effort ?? stats.reasoningEffort);
-        push({ text: dscodeStatusLead(facts, model, effort), tone: 'model' });
+        push({ text: effort === '' ? model : model + ' @ ' + effort, tone: 'accent' });
     }
     const cwd = safe(facts.cwd);
     if (cwd !== '' && enabled.has('cwd'))
@@ -414,6 +409,27 @@ function buildCandidates(facts, stats, busy, enabled, contextWidth) {
         pair(t('status.label.out'), padValue(formatTokens(stats.usage.outputTokens), VALUE_WIDTH.tokens));
         row2.push({ group: { spans: tokens }, rank: RANK_TOKENS, id: 'tokens' });
     }
+    // dscode: the catalog size the session actually sees, read from the live
+    // skills view, so the footer answers "how many skills are loaded" without
+    // opening /skills. Before the first read settles the figure keeps its
+    // columns as the `--` placeholder, like every other live figure.
+    if (enabled.has('skills')) {
+        row2.push({
+            group: {
+                spans: [
+                    { text: t('status.label.skills') + ' ', tone: 'label' },
+                    {
+                        text: facts.skills === undefined
+                            ? pendingValue(VALUE_WIDTH.count)
+                            : padValue(String(facts.skills), VALUE_WIDTH.count),
+                        tone: 'value',
+                    },
+                ],
+            },
+            rank: RANK2_SKILLS,
+            id: 'skills',
+        });
+    }
     // dscode: the session title moved to row 1's identity lead (dscodeStatusLead),
     // so row 2 no longer carries it.
     // Secondary state rides row 2; permission alone remains right-pinned on row 1.
@@ -460,13 +476,20 @@ 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 !== '') {
+        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 model,
- * 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 and state within its own budget.
+ * Compose the two-row 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
+ * cluster and state within its own budget.
  * @param facts - identity facts resolved by the runner.
  * @param stats - session figures folded from the durable log.
  * @param columns - usable columns for each row (before their left padding).
@@ -619,9 +642,7 @@ export function layoutStatusBar(facts, stats, columns, options = {}) {
     // group drops first until the row fits or nothing is left. An empty row2 is
     // a valid state — the footer degrades back to a single status row.
     const row2Kept = [...orderedRow2];
-    // dscode: the telemetry segment owns row 2's right edge, so its width comes out
-    // of the left groups' budget first.
-    const row2Budget = Math.max(0, budget - 1 - (facts.telemetry ? visibleColumns(facts.telemetry) + 3 : 0));
+    const row2Budget = Math.max(0, budget - 1);
     const row2Width = () => joinWidth(row2Kept.map(entry => spansWidth(entry.group.spans)), groupSeparator);
     while (row2Width() > row2Budget && row2Kept.length > 0) {
         let dropIndex = 0;
@@ -636,13 +657,13 @@ export function layoutStatusBar(facts, stats, columns, options = {}) {
     }
     return {
         row1: {
-            left: leftKept.map(entry => entry.group),
+            left: leftKept.map(entry => ({ ...entry.group, id: entry.id })),
             right: rightKept.map(entry => entry.span),
             hint,
         },
         row2: {
-            left: row2Kept.map(entry => entry.group),
-            right: facts.telemetry ? [{ text: facts.telemetry, tone: 'meta' }] : [],
+            left: row2Kept.map(entry => ({ ...entry.group, id: entry.id })),
+            right: [],
             hint: false,
         },
     };

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

@@ -77,6 +77,39 @@ export function truncateColumns(text, columns) {
     }
     return `${result}…`;
 }
+/**
+ * Hard-wrap display-safe text into physical rows of at most `columns` cells, except
+ * for a cluster wider than that budget, which gets a row to itself.
+ * Wrapping runs forward so a row already produced never re-flows, and the cut
+ * walks grapheme clusters so emoji and combining sequences stay whole; a single
+ * cluster wider than the budget keeps a row of its own rather than looping.
+ * Newlines in the input start a new row, so the result is the row list a panel
+ * pages through. Rows still get truncated at render time: this bounds the row
+ * count, it does not promise the terminal paints every cell.
+ * @param text - display-safe text (see {@link displayText}).
+ * @param columns - available terminal columns.
+ * @returns one string per physical row, in order.
+ */
+export function wrapText(text, columns) {
+    const limit = Math.max(1, Math.floor(columns));
+    const rows = [];
+    for (const line of text.split('\n')) {
+        let row = '';
+        let used = 0;
+        for (const cluster of splitGraphemes(line)) {
+            const width = graphemeWidth(cluster);
+            if (used > 0 && used + width > limit) {
+                rows.push(row);
+                row = '';
+                used = 0;
+            }
+            row += cluster;
+            used += width;
+        }
+        rows.push(row);
+    }
+    return rows;
+}
 /** Punctuation that must never START a physical row (CJK kinsoku tail set). */
 const ROW_START_FORBIDDEN = '，。、；：！？）】」』〉》…‥';
 /** Punctuation that must never END a physical row (CJK kinsoku head set). */

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

@@ -64,13 +64,15 @@ export function completedTurns(events) {
  *   not all report usage are omitted rather than estimated, and so is a turn
  *   that billed nothing at all — an empty row is noise in a usage table.
  */
-export function turnUsages(events, derive) {
+export function turnUsages(events, derive, costs) {
+    const byTurn = new Map((costs ?? []).map(entry => [entry.turn, { cost: entry.cost, unknown: entry.unknown }]));
     const rows = [];
     for (const slice of completedTurns(events)) {
         const usage = derive(slice.events);
         if (usage === undefined || usage.totalTokens === 0)
             continue;
-        rows.push({ turn: slice.turn, usage, model: turnModel(slice, usage) });
+        const cost = byTurn.get(slice.turn);
+        rows.push({ turn: slice.turn, usage, model: turnModel(slice, usage), ...(cost === undefined ? {} : { cost }) });
     }
     return rows;
 }
@@ -329,6 +331,13 @@ export function usageLines(view, columns) {
         const withTurn = [
             { label: () => t('panel.usage.colTurn'), value: (row) => `#${row.turn}`, width: 7 },
             ...BUCKET_COLUMNS.map(column => ({ ...column, value: (row) => column.value(row.usage) })),
+            // The cost column answers what the token columns cannot: which turn spent
+            // the money. `+` marks a turn whose settled calls were not all priced.
+            {
+                label: () => t('panel.usage.colCost'),
+                value: (row) => row.cost === undefined ? '--' : `$${row.cost.cost.toFixed(4)}${row.cost.unknown ? '+' : ''}`,
+                width: 10,
+            },
         ];
         lines.push(...table(withTurn, [...view.turns].reverse(), row => modelLabel(row.model), width, false));
     }

package/vendor/tui/lib/session-directory.mjs

@@ -29,6 +29,31 @@ function samePath(left, right) {
         return false;
     return comparablePath(left) === comparablePath(right);
 }
+/**
+ * The comparison form of a project directory: canonical `realpath` when the
+ * path exists, then Unicode-normalized so two filesystems that spell the same
+ * folder differently still agree.
+ */
+function comparisonPath(value) {
+    return comparablePath(value.normalize('NFC'));
+}
+/**
+ * Whether a resume may proceed from the directory DSCODE was launched in. A
+ * session chooses its project directory once, at creation, and the header
+ * keeps it durable; resuming from anywhere else would append to the log from
+ * a directory the session never bound to. A header without a cwd (a pre-cwd
+ * log) stays resumable anywhere. macOS and Windows keep both case and
+ * distinct Unicode normalization forms apart, so both paths take the
+ * comparison form (canonical `realpath`, then NFC) before they are compared.
+ * @param pinnedCwd - the header's project directory, when it has one.
+ * @param launchCwd - the directory DSCODE was launched in.
+ * @returns true when the folder matches, or the session has no pinned folder.
+ */
+export function sessionFolderMatches(pinnedCwd, launchCwd) {
+    if (pinnedCwd === undefined || pinnedCwd === '')
+        return true;
+    return comparisonPath(pinnedCwd) === comparisonPath(launchCwd);
+}
 /**
  * Unique header match by exact id or unique id prefix (root and subagent
  * headers alike); the caller applies any lineage gate.