@toddzheng024/dscode-desktop 0.7.39 → 0.7.41

package/plugins/acp/models.mjs

@@ -0,0 +1,47 @@
+import { credentialKeyId, credentialKeyScope } from '@deepseek-ai/dsh-credentials';
+import { isCustomId, keyRef } from '../custom/config.mjs';
+import { providerSpec } from '../providers/catalog.mjs';
+
+function credentialReference(ctx, provider) {
+  const entry = ctx.llm.listConfigurableProviders?.().find(entry => entry.provider === provider);
+  if (!entry) return providerSpec(provider)?.credentialRef;
+  const descriptor = ctx.get('settings')?.describe({ redactSecrets: true }).find(item => item.ns === entry.settingsNs);
+  const profile = entry.settingsPath.reduce((value, key) => value?.[key], descriptor?.value);
+  return typeof profile?.apiKeyEnv === 'string' ? profile.apiKeyEnv : undefined;
+}
+
+/** Local configuration facts only: no secret values or inference requests. */
+export async function configuredProvider(ctx, provider) {
+  try {
+    const credentials = ctx.get('credentials');
+    if (isCustomId(provider)) {
+      const profile = ctx.get('dscodeCustom')?.providers.find(profile => profile.id === provider);
+      return !!profile && (profile.auth === 'none' || (await credentials?.describe(keyRef(provider)))?.configured === true);
+    }
+    // Harness 0.2 separates the account route from the API-key route.
+    if (provider === 'deepseek-account') {
+      return (await ctx.get('deepseekAccount')?.getState())?.status === 'credential-stored';
+    }
+    const ref = credentialReference(ctx, provider);
+    if (ref && (await credentials?.describe(ref))?.configured === true) return true;
+    const entries = ctx.get('authorization')?.list() ?? [];
+    for (const { key } of entries) {
+      if (credentialKeyScope(key) === 'llm-pi-ai' && credentialKeyId(key) === provider
+        && (await credentials?.describeRecord(key))?.configured === true) return true;
+    }
+  } catch {
+    // One unavailable configuration source must not break the ACP picker.
+  }
+  return false;
+}
+
+/** Scope discovery to ACP; native routing and the shared TUI catalog stay intact. */
+export function configuredModels(ctx) {
+  return new Proxy(ctx.llm, {
+    get(target, key) {
+      if (key === 'listModels') return async provider => await configuredProvider(ctx, provider) ? target.listModels(provider) : [];
+      const value = Reflect.get(target, key, target);
+      return typeof value === 'function' ? value.bind(target) : value;
+    },
+  });
+}

package/plugins/custom/config.mjs

@@ -52,7 +52,7 @@ export function validateProfile(input) {
 
 /** Whole-file revision + cross-process lock: stale editors never overwrite another Host. */
 export class CustomStore {
-  constructor(path = join(homedir(), '.dscode', 'providers.yaml')) { this.path = path; }
+  constructor(path = join(process.env.DSCODE_STANDALONE_ROOT && process.env.DSCODE_HOME ? process.env.DSCODE_HOME : join(homedir(), '.dscode'), 'providers.yaml')) { this.path = path; }
   async read() {
     let raw;
     try { raw = await readFile(this.path, 'utf8'); } catch (error) { if (error.code !== 'ENOENT') throw error; raw = ''; }

package/plugins/custom/index.mjs

@@ -138,7 +138,7 @@ export async function apply(ctx, config = {}) {
     else if (ids.length) registration = ctx.llm.registerAdapter(ids, service.adapter);
   } });
   ctx.provide('dscodeCustom', service);
-  try { await service.refresh(); } catch { ctx.logger.warn('Could not read custom providers; repair ~/.dscode/providers.yaml'); }
+  try { await service.refresh(); } catch { ctx.logger.warn('Could not read custom providers; repair %s', service.store.path); }
   const refresh = () => { void service.refresh().catch(() => ctx.logger.warn('Invalid custom provider edit; retaining the last valid configuration')); };
   watchFile(service.store.path, { persistent: false, interval: 1000 }, refresh);
   ctx.effect(() => () => unwatchFile(service.store.path, refresh));

package/plugins/desktop/client.mjs

@@ -827,7 +827,7 @@ components.push({
   id: '@toddzheng024/dscode-desktop',
   factory: require => {
     const { createElement: h, useState, useEffect, useRef } = require('react');
-    const money = (cost, partial = false) => cost === null || partial && cost === 0 ? 'Unknown' : `$${cost.toFixed(4)}${partial ? '+' : ''}`;
+    const money = (cost, partial = false, currency = 'USD') => cost === null || partial && cost === 0 ? 'Unknown' : (currency === 'USD' ? `$${cost.toFixed(4)}` : `${cost.toFixed(4)} ${currency}`) + (partial ? '+' : '');
     const percent = value => value === null ? 'Unknown' : `${value.toFixed(1)}%`;
     const speed = value => value === null ? 'Unknown' : `${value.toFixed(1)} tokens/s`;
     const control = { padding: '7px 10px', border: '.5px solid var(--dsw-alias-border-l3, #8886)', borderRadius: 'var(--dsw-radius-md, 6px)', background: 'transparent', color: 'inherit', font: 'inherit' };
@@ -858,7 +858,7 @@ components.push({
             fact('Pending calls', state.pending ?? 'Unknown'), fact('Context estimate', percent(state.contextPercent)),
             fact('Input cache share', percent(state.cachePercent)), fact('Smoothed request speed', speed(state.currentTps)),
             fact('Session average speed', speed(state.averageTps)),
-            state.balance !== null && fact('Cached provider balance', money(state.balance)),
+            state.balance !== null && state.balanceCurrency && fact(state.balanceSource === 'key-limit' ? 'Cached key spending limit' : 'Cached account balance', money(state.balance, false, state.balanceCurrency)),
             state.subscription && fact('Cached subscription usage', state.subscription),
             state.budget && fact('Configured cost budget', `${money(state.budget.spent)} / ${money(state.budget.limit)} · ${state.budget.state}`)),
           h('p', { style: { fontSize: 12 } }, 'Unknown means a reading or price is unavailable. + marks a partial cost. Pending calls have not settled. Cached account figures may lag the provider.'),

package/plugins/dscode/index.mjs

@@ -9,8 +9,9 @@ import { boardSummary, DelegateBoard, setBoardSource } from './board.mjs';
 import { createUserMessage } from '@deepseek-ai/dsh-llm';
 import { worktreeBase } from '../worktree-subagent/worktree.mjs';
 import { withChildTarget } from './child-target.mjs';
+import { registerStatus } from '../status/index.mjs';
 export const name = 'dscode-execution-policy';
-export const inject = ['systemPrompt', 'tools', 'agents', 'commands', 'terminals', 'subagents'];
+export const inject = ['systemPrompt', 'tools', 'agents', 'commands', 'terminals', 'subagents', 'llm'];
 export const SHELL_POLICY = `Use bash as the persistent shell for reading, searching and modifying files. Prefer rg/rg --files, sed and standard CLI tools. Use apply_patch with a standard unified diff on stdin (git apply format, a/ and b/ paths); apply_patch --check validates before writing. It is not the *** Begin Patch format. Quote heredoc delimiters to avoid shell interpolation.
 Each agent has its own persistent shell, initially in the session workspace. cd, exported variables, functions and background jobs persist only while this shell lives. Timeout, cancellation, exit, /shell reset and process restart discard shell state; resume restores conversation, not an OS process. Never assume an environment from a past session still exists. Inspect pwd when paths matter. Keep long-running processes controlled and clean them up when done.
 Normal bash remains confined by the active sandbox. After a genuine sandbox denial, shell_retry provides a fresh, one-shot shell with the existing approval/escalation mechanism. Set an explicit absolute workdir and reconstruct needed non-secret setup; it does not inherit the persistent shell's cd, exports, functions or jobs. Use existing credential-aware CLIs; never paste secrets into arguments. Approval rejection is final for that action; do not work around it.
@@ -21,6 +22,7 @@ Delegation to child agents (subagent, subagent_fork) is available at every effor
 // unrequested commits, invented test suites). Kept separate from the persona so
 // it stays one reviewable unit and does not lengthen the deployment block.
 export const CODE_DISCIPLINE = `Code discipline. Fix the problem at its root cause rather than with a surface patch, and keep the change inside the requested scope: do not fix unrelated bugs or failing tests, do not reformat or rename what the task did not ask for, and mention adjacent problems instead of taking them on. Match the surrounding code's style, naming and comment density; do not add inline comments, license or copyright headers unless the task or the neighbouring code requires it. Do not commit, create branches or rewrite history unless the user asks. Do not introduce a test suite to a repository that has none; where tests exist, extend the nearest relevant pattern. When the repository's own history would settle a question, read it with git log or git blame before guessing.`;
+export const MARKDOWN_POLICY = 'Markdown output. Inside a code span, backslashes are literal and cannot escape a backtick. Wrap code containing backticks in a longer backtick delimiter (for example, two backticks around a template literal containing single backticks); add one padding space at both ends when the content starts or ends with a backtick. Use a fenced code block for multiline code, with a fence longer than any matching run inside it. Preserve literal backslashes and code text. Keep prose and punctuation outside code spans. For long file paths in explanations, prefer a short filename label with the full path as the link target instead of repeating the full path inline.';
 
 // Claude-Code-derived working discipline: instruction precedence, acting instead
 // of re-deriving, and correction economy. The memory and session sections already
@@ -61,10 +63,12 @@ const DOCS_REPO = 'https://github.com/qiz029/dscode/blob/main/docs/';
 export const DOCS_SECTION = `To answer questions about DSCODE itself - what it supports, how a feature is configured, what a command does - treat the bundled user guides as the source of truth instead of guessing: ${existsSync(DOCS_DIR) ? `${DOCS_DIR} plus the repository root README.md (session-bridge.md, session-communication.md, session-cards.md, memory.md, exec.md, acp.md, email.md, browser-use.md, plugin-hub.md, computer-use.md, skills.md, tui-commands.md, session-metrics.md, dscode-ultra.md, auto-review.md, account-login.md, opencode-go.md, custom-providers.md, demo.md, triggers.md)` : `the repository documentation at ${DOCS_REPO} plus the root README.md (session-bridge.md, session-communication.md, session-cards.md, memory.md, exec.md, acp.md, email.md, browser-use.md, plugin-hub.md, computer-use.md, skills.md, tui-commands.md, session-metrics.md, dscode-ultra.md, auto-review.md, account-login.md, opencode-go.md, custom-providers.md, demo.md, triggers.md)`}. Read the relevant guide before answering rather than relying on memory of an earlier session. docs/CONTEXT-HANDOFF.md, docs/session-messaging-design.md, docs/cloud-webapp-host.md, docs/triggers-design.md, docs/verification.md, docs/maintainability.md and docs/vendored-tui-upgrade.md are internal development records, not user documentation: never quote them to a user or treat them as a specification. When the guides do not cover something, describe only what the running installation actually does and say plainly that it is not documented.`;
 
 export function apply(ctx, config = {}) {
+  registerStatus(ctx);
   const viewer = config.desktop ? 'Delegation board in the right sidebar' : '/delegate-dashboard';
   ctx.systemPrompt.section({ name: 'dscode:shell-policy', order: 1050, text: SHELL_POLICY });
   ctx.systemPrompt.section({ name: 'dscode:docs', order: 1052, text: DOCS_SECTION });
   ctx.systemPrompt.section({ name: 'dscode:code-discipline', order: 1053, text: CODE_DISCIPLINE });
+  ctx.systemPrompt.section({ name: 'dscode:markdown', order: 1054, text: MARKDOWN_POLICY });
   ctx.systemPrompt.section({ name: 'dscode:working-discipline', order: 1054, text: WORKING_DISCIPLINE });
   ctx.systemPrompt.section({ name: 'dscode:child-policy', order: 1051, text: ({ scope }) => scope?.session?.header?.origin === 'subagent' && scope.session.header.agentPreset === 'dscode'
     ? 'You are a delegated worker. Complete your assigned task yourself and return a concise result to the parent. You cannot start or wake another agent; ask the parent to make any new delegation decision. Your parent is addressed as / in send_message.' : '' });

package/plugins/email/inbox.mjs

@@ -39,7 +39,7 @@ export function emailPrompt(mail) {
   }, null, 2);
 }
 
-export function createEmailInbox({ directory = process.env.DSCODE_EMAIL_DIR || join(homedir(), '.dscode', 'email') } = {}) {
+export function createEmailInbox({ directory = process.env.DSCODE_EMAIL_DIR || join(process.env.DSCODE_STANDALONE_ROOT && process.env.DSCODE_HOME ? process.env.DSCODE_HOME : join(homedir(), '.dscode'), 'email') } = {}) {
   return {
     directory,
     receive(value) {

package/plugins/i18n/messages.d.mts

@@ -19,3 +19,5 @@ export function normalizeLanguage(value: unknown): string | null;
 export function languageName(code: string): string;
 /** One message in one locale, with `{name}` parameters interpolated. */
 export function t(locale: string, key: string, params?: Readonly<Record<string, unknown>>): string;
+/** Package-local user preferences; legacy installs retain their existing location. */
+export function terminalStateDirectory(home?: string, env?: NodeJS.ProcessEnv): string;

package/plugins/i18n/messages.mjs

@@ -41,7 +41,7 @@ export const MESSAGES = {
     'language.set': 'language → {name}', 'language.title': '/language — interface language', 'language.currentMark': 'current', 'language.unknown': 'Unknown language "{value}". Choose en, zh-CN, zh-TW, ja, ko or es.',
     'language.saveFailed': 'language save failed: {error}',
     'doctor.logs.new': 'Only warnings/errors since this TUI version started are recorded.',
-    'footer.average': 'avg', 'footer.context': 'ctx', 'footer.cache': 'cache', 'footer.grokUsed': 'used', 'footer.grokResets': 'resets', 'footer.goLimited': 'limited until', 'composer.placeholder': 'type a message', 'composer.shellMode': '! shell mode · esc exits',
+    'footer.average': 'avg', 'footer.context': 'ctx', 'footer.cache': 'cache', 'footer.grokUsed': 'used', 'footer.grokResets': 'resets', 'footer.goLimited': 'limited until', 'footer.keyLimit': 'key', 'composer.placeholder': 'type a message', 'composer.shellMode': '! shell mode · esc exits',
     'compaction.running': 'Compacting context, please wait', 'compaction.confirm.title': 'Switching to {model} will compact the conversation',
     'compaction.confirm.usage': 'context {used} ≥ compaction threshold {threshold} ({window} × {ratio})', 'compaction.confirm.next': 'the next step compacts older history first',
     'compaction.confirm.overflow': 'it already exceeds the {window} window: the next request compacts and retries', 'compaction.confirm.hint': 'y switch · n/esc back',
@@ -119,7 +119,7 @@ export const MESSAGES = {
     'language.set': '语言 → {name}', 'language.title': '/language — 界面语言', 'language.currentMark': '当前', 'language.unknown': '未知语言 "{value}"。可选 en、zh-CN、zh-TW、ja、ko、es。',
     'language.saveFailed': '语言设置保存失败：{error}',
     'doctor.logs.new': '仅记录新版 TUI 启动后的 warning/error。',
-    'footer.average': '平均', 'footer.context': 'ctx', 'footer.cache': '缓存', 'footer.grokUsed': '已用', 'footer.grokResets': '重置', 'footer.goLimited': '受限至', 'composer.placeholder': '输入消息', 'composer.shellMode': '! shell 模式 · esc 退出',
+    'footer.average': '平均', 'footer.context': 'ctx', 'footer.cache': '缓存', 'footer.grokUsed': '已用', 'footer.grokResets': '重置', 'footer.goLimited': '受限至', 'footer.keyLimit': '额度', 'composer.placeholder': '输入消息', 'composer.shellMode': '! shell 模式 · esc 退出',
     'compaction.running': '正在压缩上下文，请稍后', 'compaction.confirm.title': '切换到 {model} 会触发自动压缩',
     'compaction.confirm.usage': '当前上下文 {used} ≥ 压缩阈值 {threshold}（{window} × {ratio}）', 'compaction.confirm.next': '下一步开始前会先压缩较早的对话',
     'compaction.confirm.overflow': '已超出新模型的 {window} 上下文窗口：下一次请求会先压缩再重试', 'compaction.confirm.hint': 'y 确认切换 · n/esc 返回',
@@ -197,7 +197,7 @@ export const MESSAGES = {
     'language.set': '語言 → {name}', 'language.title': '/language — 介面語言', 'language.currentMark': '目前', 'language.unknown': '未知語言 "{value}"。可選 en、zh-CN、zh-TW、ja、ko、es。',
     'language.saveFailed': '語言設定儲存失敗：{error}',
     'doctor.logs.new': '僅記錄新版 TUI 啟動後的 warning/error。',
-    'footer.average': '平均', 'footer.context': 'ctx', 'footer.cache': '快取', 'footer.grokUsed': '已用', 'footer.grokResets': '重置', 'footer.goLimited': '受限至', 'composer.placeholder': '輸入訊息', 'composer.shellMode': '! shell 模式 · esc 離開',
+    'footer.average': '平均', 'footer.context': 'ctx', 'footer.cache': '快取', 'footer.grokUsed': '已用', 'footer.grokResets': '重置', 'footer.goLimited': '受限至', 'footer.keyLimit': '額度', 'composer.placeholder': '輸入訊息', 'composer.shellMode': '! shell 模式 · esc 離開',
     'compaction.running': '正在壓縮上下文，請稍候', 'compaction.confirm.title': '切換到 {model} 會觸發自動壓縮',
     'compaction.confirm.usage': '目前上下文 {used} ≥ 壓縮閾值 {threshold}（{window} × {ratio}）', 'compaction.confirm.next': '下一步開始前會先壓縮較早的對話',
     'compaction.confirm.overflow': '已超出新模型的 {window} 上下文視窗：下一次請求會先壓縮再重試', 'compaction.confirm.hint': 'y 確認切換 · n/esc 返回',
@@ -275,7 +275,7 @@ export const MESSAGES = {
     'language.set': '言語 → {name}', 'language.title': '/language — 表示言語', 'language.currentMark': '現在', 'language.unknown': '不明な言語 "{value}"。en、zh-CN、zh-TW、ja、ko、es から選んでください。',
     'language.saveFailed': '言語設定の保存に失敗しました：{error}',
     'doctor.logs.new': 'この TUI バージョンの起動以降の warning/error のみ記録されています。',
-    'footer.average': '平均', 'footer.context': 'ctx', 'footer.cache': 'キャッシュ', 'footer.grokUsed': '使用', 'footer.grokResets': 'リセット', 'footer.goLimited': '制限解除', 'composer.placeholder': 'メッセージを入力', 'composer.shellMode': '! shell モード · esc で終了',
+    'footer.average': '平均', 'footer.context': 'ctx', 'footer.cache': 'キャッシュ', 'footer.grokUsed': '使用', 'footer.grokResets': 'リセット', 'footer.goLimited': '制限解除', 'footer.keyLimit': 'キー上限', 'composer.placeholder': 'メッセージを入力', 'composer.shellMode': '! shell モード · esc で終了',
     'compaction.running': 'コンテキストを圧縮しています。しばらくお待ちください', 'compaction.confirm.title': '{model} に切り替えると自動圧縮が実行されます',
     'compaction.confirm.usage': '現在のコンテキスト {used} ≥ 圧縮しきい値 {threshold}（{window} × {ratio}）', 'compaction.confirm.next': '次のステップの前に古い履歴を圧縮します',
     'compaction.confirm.overflow': '新しいモデルの {window} ウィンドウを超えています。次のリクエストで圧縮して再試行します', 'compaction.confirm.hint': 'y 切り替え · n/esc 戻る',
@@ -353,7 +353,7 @@ export const MESSAGES = {
     'language.set': '언어 → {name}', 'language.title': '/language — 인터페이스 언어', 'language.currentMark': '현재', 'language.unknown': '알 수 없는 언어 "{value}". en, zh-CN, zh-TW, ja, ko, es 중에서 선택하세요.',
     'language.saveFailed': '언어 설정 저장 실패: {error}',
     'doctor.logs.new': '이 TUI 버전 시작 이후의 warning/error만 기록됩니다.',
-    'footer.average': '평균', 'footer.context': 'ctx', 'footer.cache': '캐시', 'footer.grokUsed': '사용', 'footer.grokResets': '재설정', 'footer.goLimited': '제한 해제', 'composer.placeholder': '메시지를 입력하세요', 'composer.shellMode': '! shell 모드 · esc 종료',
+    'footer.average': '평균', 'footer.context': 'ctx', 'footer.cache': '캐시', 'footer.grokUsed': '사용', 'footer.grokResets': '재설정', 'footer.goLimited': '제한 해제', 'footer.keyLimit': '키 한도', 'composer.placeholder': '메시지를 입력하세요', 'composer.shellMode': '! shell 모드 · esc 종료',
     'compaction.running': '컨텍스트를 압축하는 중입니다. 잠시만 기다려 주세요', 'compaction.confirm.title': '{model}(으)로 전환하면 자동 압축이 실행됩니다',
     'compaction.confirm.usage': '현재 컨텍스트 {used} ≥ 압축 임계값 {threshold} ({window} × {ratio})', 'compaction.confirm.next': '다음 단계 전에 이전 대화를 먼저 압축합니다',
     'compaction.confirm.overflow': '새 모델의 {window} 창을 이미 넘었습니다. 다음 요청에서 압축한 뒤 재시도합니다', 'compaction.confirm.hint': 'y 전환 · n/esc 뒤로',
@@ -431,7 +431,7 @@ export const MESSAGES = {
     'language.set': 'idioma → {name}', 'language.title': '/language — idioma de la interfaz', 'language.currentMark': 'actual', 'language.unknown': 'Idioma desconocido "{value}". Elige en, zh-CN, zh-TW, ja, ko o es.',
     'language.saveFailed': 'no se pudo guardar el idioma: {error}',
     'doctor.logs.new': 'Solo se registran los warnings/errores desde que arrancó esta versión del TUI.',
-    'footer.average': 'prom', 'footer.context': 'ctx', 'footer.cache': 'caché', 'footer.grokUsed': 'usado', 'footer.grokResets': 'reinicia', 'footer.goLimited': 'limitado hasta', 'composer.placeholder': 'escribe un mensaje', 'composer.shellMode': '! modo shell · esc sale',
+    'footer.average': 'prom', 'footer.context': 'ctx', 'footer.cache': 'caché', 'footer.grokUsed': 'usado', 'footer.grokResets': 'reinicia', 'footer.goLimited': 'limitado hasta', 'footer.keyLimit': 'límite key', 'composer.placeholder': 'escribe un mensaje', 'composer.shellMode': '! modo shell · esc sale',
     'compaction.running': 'Compactando el contexto, espera un momento', 'compaction.confirm.title': 'Cambiar a {model} compactará la conversación',
     'compaction.confirm.usage': 'contexto {used} ≥ umbral de compactación {threshold} ({window} × {ratio})', 'compaction.confirm.next': 'el siguiente paso compacta antes el historial antiguo',
     'compaction.confirm.overflow': 'ya supera la ventana de {window}: la siguiente petición compacta y reintenta', 'compaction.confirm.hint': 'y cambiar · n/esc volver',
@@ -512,8 +512,12 @@ export function t(locale, key, params) {
   return text;
 }
 
-export function languageFile(home = homedir()) {
-  return join(home, '.dsh', 'dsh-code', 'language.json');
+export function terminalStateDirectory(home = homedir(), env = process.env) {
+  return env.DSCODE_STANDALONE_ROOT && env.DSCODE_HOME ? join(env.DSCODE_HOME, 'tui') : join(home, '.dsh', 'dsh-code');
+}
+
+export function languageFile(home = homedir(), env = process.env) {
+  return join(terminalStateDirectory(home, env), 'language.json');
 }
 
 /** The stored language, or English; DSCODE_LANGUAGE overrides the file for one process. */
@@ -521,17 +525,17 @@ export function readLanguage({ home = homedir(), env = process.env } = {}) {
   const override = normalizeLanguage(env.DSCODE_LANGUAGE);
   if (override) return override;
   try {
-    const file = languageFile(home);
+    const file = languageFile(home, env);
     if (!existsSync(file)) return 'en';
     return normalizeLanguage(JSON.parse(readFileSync(file, 'utf8')).language) ?? 'en';
   } catch { return 'en'; }
 }
 
-export function saveLanguage(code, { home = homedir() } = {}) {
+export function saveLanguage(code, { home = homedir(), env = process.env } = {}) {
   const normalized = normalizeLanguage(code);
   if (!normalized) throw new Error(`Unknown language: ${code}`);
-  const file = languageFile(home);
-  mkdirSync(join(home, '.dsh', 'dsh-code'), { recursive: true });
+  const file = languageFile(home, env);
+  mkdirSync(terminalStateDirectory(home, env), { recursive: true });
   writeFileSync(file, JSON.stringify({ language: normalized }, null, 2) + '\n');
   return normalized;
 }

package/plugins/providers/openrouter-account.mjs

@@ -6,8 +6,9 @@ export const OPENROUTER_API = 'https://openrouter.ai/api/v1';
 export const MANAGEMENT_REF = 'OPENROUTER_MANAGEMENT_KEY';
 
 const finite = value => {
+  if (!(typeof value === 'number' || typeof value === 'string' && value.trim())) return undefined;
   const number = Number(value);
-  return value !== null && value !== undefined && value !== '' && Number.isFinite(number) ? number : undefined;
+  return Number.isFinite(number) ? number : undefined;
 };
 
 export class OpenRouterAccountError extends Error {
@@ -45,10 +46,8 @@ export function parseOpenRouterCredits(body) {
 
 /** Remaining USD credit limit from a `/key` body; null when the key has no limit. */
 export function parseOpenRouterKeyRemaining(body) {
-  const remaining = body?.data?.limit_remaining;
-  if (remaining == null) return null;
-  const value = Number(remaining);
-  return Number.isFinite(value) ? Math.max(0, value) : null;
+  const value = finite(body?.data?.limit_remaining);
+  return value === undefined ? null : Math.max(0, value);
 }
 
 function keyOf(raw) {

package/plugins/session-metrics/balance.mjs

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto';
 import { OPENROUTER_API, parseOpenRouterCredits, parseOpenRouterKeyRemaining } from '../providers/openrouter-account.mjs';
 
 export { parseOpenRouterCredits, parseOpenRouterKeyRemaining };
@@ -8,10 +9,10 @@ export { parseOpenRouterCredits, parseOpenRouterKeyRemaining };
 // credits (`/credits`) are documented as management-only but are served to
 // inference keys too; a key refused them falls back to its own remaining limit (`/key`).
 const SOURCES = {
-  'deepseek-official': { env: 'DEEPSEEK_API_KEY', clock: true, requests: ({ key }) => [{ url: 'https://api.deepseek.com/user/balance', key, parse: body => parseBalance(body) }] },
+  'deepseek-official': { env: 'DEEPSEEK_API_KEY', clock: true, requests: ({ key }) => [{ url: 'https://api.deepseek.com/user/balance', key, source: 'account', parse: parseBalanceInfo }] },
   openrouter: { env: 'OPENROUTER_API_KEY', managementEnv: 'OPENROUTER_MANAGEMENT_KEY', clock: false, requests: ({ key, managementKey }) => [
-    { url: `${OPENROUTER_API}/credits`, key: managementKey ?? key, parse: parseOpenRouterCredits },
-    { url: `${OPENROUTER_API}/key`, key, parse: parseOpenRouterKeyRemaining },
+    { url: `${OPENROUTER_API}/credits`, key: managementKey || key, source: 'account', parse: body => usdBalance(parseOpenRouterCredits(body), 'account') },
+    { url: `${OPENROUTER_API}/key`, key, source: 'key-limit', parse: body => usdBalance(parseOpenRouterKeyRemaining(body), 'key-limit') },
   ] },
 };
 export const BALANCE_PROVIDERS = Object.freeze(Object.keys(SOURCES));
@@ -21,16 +22,29 @@ const snapshots = new Map();
 let clock = { anchor: null, skewMs: 0 };
 const snapshotOf = provider => snapshots.get(provider) ?? { balance: null, fetchedAt: 0, pending: false };
 
-/** Best-effort positive USD balance from a `/user/balance` body. */
-export function parseBalance(body) {
+const usdBalance = (amount, source) => amount === null ? null : Object.freeze({ amount, currency: 'USD', source });
+
+function parseBalanceInfo(body) {
+  if (body?.is_available === false) return null;
   const infos = Array.isArray(body?.balance_infos) ? body.balance_infos : [];
-  const usd = infos.find(info => String(info?.currency ?? '').toUpperCase() === 'USD') ?? infos[0];
-  const total = Number(usd?.total_balance);
-  if (!Number.isFinite(total) || total < 0) return null;
-  return body?.is_available === false ? null : total;
+  const balances = infos.flatMap(info => {
+    const value = info?.total_balance, currency = String(info?.currency ?? '').toUpperCase();
+    if (!(typeof value === 'number' || typeof value === 'string' && value.trim()) || !/^[A-Z]{3}$/.test(currency)) return [];
+    const amount = Number(value);
+    return Number.isFinite(amount) && amount >= 0 ? [Object.freeze({ amount, currency, source: 'account' })] : [];
+  });
+  return balances.find(info => info.currency === 'USD') ?? balances[0] ?? null;
 }
 
-export function balanceNow(provider = 'deepseek-official') { return snapshotOf(provider).balance; }
+/** Numeric projection retained for callers that do not render currency or source. */
+export function parseBalance(body) { return parseBalanceInfo(body)?.amount ?? null; }
+export function balanceNow(provider = 'deepseek-official') { return balanceInfoNow(provider)?.amount ?? null; }
+export function balanceInfoNow(provider = 'deepseek-official') { return snapshotOf(provider).balance; }
+export function invalidateBalance(provider) { snapshots.delete(provider); }
+export function formatBalance(balance, digits = 2) {
+  if (!balance) return '';
+  return balance.currency === 'USD' ? `$${balance.amount.toFixed(digits)}` : `${balance.amount.toFixed(digits)} ${balance.currency}`;
+}
 /** Clock anchored to the last DeepSeek balance response's `Date` header, else the local one. */
 export function trustedNow() {
   const local = Date.now();
@@ -42,40 +56,43 @@ export async function refreshBalance(options = {}) {
   const provider = options.provider ?? 'deepseek-official';
   const source = SOURCES[provider];
   if (!source) return null;
-  const snapshot = snapshotOf(provider);
-  const key = options.key ?? process.env[source.env];
-  const managementKey = options.managementKey ?? (source.managementEnv ? process.env[source.managementEnv] : undefined);
+  const key = Object.hasOwn(options, 'key') ? options.key : process.env[source.env];
+  const managementKey = Object.hasOwn(options, 'managementKey') ? options.managementKey : source.managementEnv ? process.env[source.managementEnv] : undefined;
   const requests = source.requests({ key, managementKey }).filter(request => request.key);
-  const mode = managementKey ? 'management' : 'key';
+  const identity = createHash('sha256').update(JSON.stringify(requests.map(({ url, key }) => [url, key]))).digest('hex');
+  let snapshot = snapshots.get(provider);
+  if (!snapshot || snapshot.identity !== identity) {
+    snapshot = { balance: null, fetchedAt: 0, pending: false, identity };
+    snapshots.set(provider, snapshot);
+  }
   const now = Date.now();
-  // A newly added (or removed) management key changes the source; it is read at once.
-  if (snapshot.pending || snapshot.mode === mode && now - snapshot.fetchedAt < CACHE_MS) return snapshot.balance;
+  if (requests.length === 0) return null;
+  if (snapshot.pending || snapshot.fetchedAt && now - snapshot.fetchedAt < CACHE_MS) return balanceNow(provider);
   const retrySoon = () => Date.now() - (CACHE_MS - RETRY_MS);
-  if (requests.length === 0) { snapshots.set(provider, { ...snapshot, mode, fetchedAt: retrySoon(), pending: false }); return snapshot.balance; }
   const fetchImpl = options.fetch ?? globalThis.fetch;
-  if (typeof fetchImpl !== 'function') return snapshot.balance;
-  snapshots.set(provider, { ...snapshot, pending: true });
+  if (typeof fetchImpl !== 'function') return balanceNow(provider);
+  snapshot.pending = true;
   try {
     let response, body, request;
     for (request of requests) {
       response = await fetchImpl(request.url, { headers: { Authorization: `Bearer ${request.key}`, Accept: 'application/json' } });
-      body = await response.json();
+      try { body = await response.json(); } catch { body = undefined; }
+      if (snapshots.get(provider) !== snapshot) return balanceNow(provider);
       // A key refused this reading falls through to the next source.
       if (response.ok || (response.status !== 401 && response.status !== 403)) break;
+      if (snapshot.balance?.source === request.source) snapshot.balance = null;
     }
     const header = source.clock ? response.headers?.get?.('date') : null;
     const anchor = header ? Date.parse(header) : NaN;
     const parsed = response.ok ? request.parse(body) : null;
     if (Number.isFinite(anchor)) clock = { anchor, skewMs: anchor - Date.now() };
-    snapshots.set(provider, {
-      mode,
-      balance: parsed === null && response.ok ? null : parsed ?? snapshot.balance,
-      fetchedAt: parsed === null ? retrySoon() : Date.now(),
-      pending: false,
-    });
+    snapshot.balance = response.ok ? parsed : snapshot.balance?.source === request.source ? snapshot.balance : null;
+    snapshot.fetchedAt = parsed === null ? retrySoon() : Date.now();
   } catch {
     // A transient failure keeps the last known balance and retries sooner.
-    snapshots.set(provider, { ...snapshot, mode, fetchedAt: retrySoon(), pending: false });
+    if (snapshots.get(provider) === snapshot) snapshot.fetchedAt = retrySoon();
+  } finally {
+    snapshot.pending = false;
   }
-  return snapshotOf(provider).balance;
+  return balanceNow(provider);
 }

package/plugins/session-metrics/desktop-client.mjs

@@ -2,7 +2,7 @@ globalThis.__ModuleLoader__.load({
   id: '@toddzheng024/dscode-desktop',
   factory: require => {
     const { createElement: h, useState, useEffect, useRef } = require('react');
-    const money = (cost, partial = false) => cost === null || partial && cost === 0 ? 'Unknown' : `$${cost.toFixed(4)}${partial ? '+' : ''}`;
+    const money = (cost, partial = false, currency = 'USD') => cost === null || partial && cost === 0 ? 'Unknown' : (currency === 'USD' ? `$${cost.toFixed(4)}` : `${cost.toFixed(4)} ${currency}`) + (partial ? '+' : '');
     const percent = value => value === null ? 'Unknown' : `${value.toFixed(1)}%`;
     const speed = value => value === null ? 'Unknown' : `${value.toFixed(1)} tokens/s`;
     const control = { padding: '7px 10px', border: '.5px solid var(--dsw-alias-border-l3, #8886)', borderRadius: 'var(--dsw-radius-md, 6px)', background: 'transparent', color: 'inherit', font: 'inherit' };
@@ -33,7 +33,7 @@ globalThis.__ModuleLoader__.load({
             fact('Pending calls', state.pending ?? 'Unknown'), fact('Context estimate', percent(state.contextPercent)),
             fact('Input cache share', percent(state.cachePercent)), fact('Smoothed request speed', speed(state.currentTps)),
             fact('Session average speed', speed(state.averageTps)),
-            state.balance !== null && fact('Cached provider balance', money(state.balance)),
+            state.balance !== null && state.balanceCurrency && fact(state.balanceSource === 'key-limit' ? 'Cached key spending limit' : 'Cached account balance', money(state.balance, false, state.balanceCurrency)),
             state.subscription && fact('Cached subscription usage', state.subscription),
             state.budget && fact('Configured cost budget', `${money(state.budget.spent)} / ${money(state.budget.limit)} · ${state.budget.state}`)),
           h('p', { style: { fontSize: 12 } }, 'Unknown means a reading or price is unavailable. + marks a partial cost. Pending calls have not settled. Cached account figures may lag the provider.'),

package/plugins/session-metrics/desktop-host.mjs

@@ -1,6 +1,6 @@
 import { clientRequestSchema } from '@deepseek-ai/dsh-client-connection';
 import { footerFor, goFooterFact, grokFooterFact } from './view.mjs';
-import { balanceNow } from './balance.mjs';
+import { balanceInfoNow } from './balance.mjs';
 import { canonicalProvider } from '../providers/catalog.mjs';
 import { grokSubscriptionNow } from '../grok/billing.mjs';
 import { goUsageNow } from '../opencode-go/usage.mjs';
@@ -13,12 +13,13 @@ export function desktopMetricsRequest(ctx, payload) {
   if (!agent || ctx.agentPresets.composedPreset(agent.ctx) !== 'dscode') throw Error('Usage is available for an open DSCODE session.');
   const route = agent.session.requestHeader()?.config ?? agent.options;
   const provider = canonicalProvider(route.provider);
+  const balance = balanceInfoNow(provider);
   return footerFor(agent.id, {}, 0, provider, 'en', (summary, context, _columns, rates) => ({
     sessionId: agent.id, provider: route.provider, model: route.model,
     cost: finite(summary.cost), partial: summary.unknown === true, calls: finite(summary.calls), pending: finite(summary.pending),
     contextPercent: finite(context), cachePercent: finite(summary.cache),
     currentTps: finite(rates.current), averageTps: finite(rates.average), requestActive: rates.active === true,
-    balance: finite(balanceNow(provider)),
+    balance: finite(balance?.amount), balanceCurrency: balance?.currency ?? null, balanceSource: balance?.source ?? null,
     subscription: provider === 'grok' ? grokFooterFact(grokSubscriptionNow()) : provider === 'opencode-go' ? goFooterFact(goUsageNow()) : null,
     turns: (summary.turns ?? []).slice(-50).reverse().map(turn => ({ turn: turn.turn, cost: finite(turn.cost), calls: turn.calls, partial: turn.unknown })),
     totalTurns: summary.turns?.length ?? 0, unattributed: finite(summary.unattributed),

package/plugins/session-metrics/index.mjs

@@ -3,7 +3,7 @@ import { randomUUID } from 'node:crypto';
 import { appendMetric } from './store.mjs';
 import { estimateCost, priceVersionFor } from './pricing.mjs';
 import { setMetricSource } from './view.mjs';
-import { BALANCE_PROVIDERS, refreshBalance } from './balance.mjs';
+import { BALANCE_PROVIDERS, invalidateBalance, refreshBalance } from './balance.mjs';
 import { refreshOpenRouterModels } from '../openrouter/models.mjs';
 import { REPLAY_KIND } from '../openrouter/wire.mjs';
 import { providerSpec } from '../providers/catalog.mjs';
@@ -35,17 +35,22 @@ export function apply(ctx) {
   // Remaining balance is best-effort decoration: resolve the key lazily (never
   // inject the credentials service, so a missing one cannot fail startup), keep
   // the request on a five-minute cache, and never let it reach the render path.
-  const credentials = ctx.get?.('credentials');
-  const refresh = () => Promise.all(BALANCE_PROVIDERS.map(async provider => {
+  const generations = new Map();
+  let closed = false;
+  const refresh = (providers = BALANCE_PROVIDERS) => Promise.all(providers.map(async provider => {
+    const generation = (generations.get(provider) ?? 0) + 1;
+    generations.set(provider, generation);
     try {
       const spec = providerSpec(provider);
       const secret = async ref => {
         if (!ref) return undefined;
+        const credentials = ctx.get?.('credentials');
         const resolved = await credentials?.resolve?.(ref);
         return (typeof resolved === 'string' ? resolved : resolved?.value) || process.env[ref] || undefined;
       };
       // An OpenRouter management key, when stored, turns the balance into the account's credits.
       const [key, managementKey] = await Promise.all([secret(spec.credentialRef), secret(spec.managementRef)]);
+      if (closed || generations.get(provider) !== generation) return;
       await refreshBalance({ provider, key, managementKey });
       // The listing needs no key, but only a user with an OpenRouter key uses it; the adapter waits for it before its first call.
       if (provider === 'openrouter' && key) await refreshOpenRouterModels({ home });
@@ -53,10 +58,18 @@ export function apply(ctx) {
       /* balance stays unknown */
     }
   }));
+  ctx.on('credentials/reference-updated', ref => {
+    const providers = BALANCE_PROVIDERS.filter(provider => {
+      const spec = providerSpec(provider);
+      return ref === spec.credentialRef || ref === spec.managementRef;
+    });
+    for (const provider of providers) invalidateBalance(provider);
+    return refresh(providers);
+  });
   refresh();
   const balanceTimer = setInterval(refresh, 5 * 60 * 1000);
   if (typeof balanceTimer.unref === 'function') balanceTimer.unref();
-  ctx.effect(() => () => clearInterval(balanceTimer));
+  ctx.effect(() => () => { closed = true; clearInterval(balanceTimer); for (const provider of BALANCE_PROVIDERS) invalidateBalance(provider); });
   const record = (id, entry) => { try { appendMetric(home, id, entry); } catch { ctx.logger.warn('Session cost telemetry could not be saved.'); } };
   ctx.on('llm/stream', async function* (options, next) {
     // Plugin calls made for a session carry no sessionId on the wire; they are charged through the async context.

package/plugins/session-metrics/view.mjs

@@ -2,7 +2,7 @@ import { resolveDshHome } from '@deepseek-ai/dsh-home-paths';
 import { readMetrics } from './store.mjs';
 import { t } from '../i18n/messages.mjs';
 import { estimateCost, peakEmoji } from './pricing.mjs';
-import { balanceNow, trustedNow } from './balance.mjs';
+import { balanceInfoNow, formatBalance, trustedNow } from './balance.mjs';
 import { grokSubscriptionNow } from '../grok/billing.mjs';
 import { goUsageNow } from '../opencode-go/usage.mjs';
 import { canonicalProvider } from '../providers/catalog.mjs';
@@ -166,7 +166,7 @@ function footerFigures(metrics, context, rates, locale = 'en', provider = 'deeps
   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 serving the route; only DeepSeek's official one bills by a peak window.
-  const balance = balanceNow(provider);
+  const balance = balanceInfoNow(provider);
   const spend = metrics.unknown && metrics.cost === 0 ? '--' : `$${metrics.cost.toFixed(2)}${metrics.unknown ? '+' : ''}${metrics.pending ? '…' : ''}`;
   // 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
@@ -174,7 +174,7 @@ function footerFigures(metrics, context, rates, locale = 'en', provider = 'deeps
   // provider cannot report is left out instead of parked as `$--`.
   const dollars = provider === 'grok' ? grokFooterFact(grokSubscriptionNow(), locale)
     : provider === 'opencode-go' ? goFooterFact(goUsageNow(), locale)
-    : spend + (balance === null ? '' : ' / $' + balance.toFixed(2)) + (provider === 'deepseek-official' ? ' ' + peakEmoji(trustedNow()) : '');
+    : spend + (balance === null ? '' : ' / ' + (balance.source === 'key-limit' ? label('footer.keyLimit') + ' ' : '') + formatBalance(balance)) + (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.