dsh-code 1.0.6 → 1.2.0

package/src/render/status.ts

@@ -12,21 +12,13 @@
 
 import { visibleColumns } from './markdown.ts'
 import type { TranscriptStats } from './projection.ts'
-import { singleLineText, truncateColumns } from './text.ts'
+import { billedInputTokens } from './usage.ts'
+import { singleLineText, truncateColumns, formatTokens } from './text.ts'
+
+// Re-exported for the callers that have always read the formatter here.
+export { formatTokens }
+import { t } from '../i18n.ts'
 
-/**
- * Compact token count: 517 / 12.2K / 517K / 1.2M (one decimal under three
- * digits), mirroring the web composer's StatsLine format.
- * @param n - token count.
- * @returns display string.
- */
-export function formatTokens(n: number): string {
-  const scaled = (v: number): string =>
-    v >= 100 ? String(Math.round(v)) : String(Math.round(v * 10) / 10)
-  if (n < 1_000) return String(n)
-  if (n < 1_000_000) return scaled(n / 1_000) + 'K'
-  return scaled(n / 1_000_000) + 'M'
-}
 
 /**
  * Compact duration: 45.2s under a minute, 2m42s from there on.
@@ -53,14 +45,17 @@ function formatRate(n: number): string {
 }
 
 /**
- * Cache-hit share of billed prompt-side input.
+ * Cache-hit share of billed prompt-side input. The denominator is the same
+ * billed total the /usage panel shows (uncached input plus both cache
+ * buckets), so the two readouts can never disagree.
  * @param usage - cumulative token totals.
  * @returns percent rounded to one decimal place, or null when no input was billed.
  */
 export function cacheHitPercent(usage: TranscriptStats['usage']): number | null {
-  return usage.inputTokens === 0
+  const billed = billedInputTokens(usage)
+  return billed === 0
     ? null
-    : Math.round(usage.cacheReadTokens / usage.inputTokens * 1_000) / 10
+    : Math.round(usage.cacheReadTokens / billed * 1_000) / 10
 }
 
 /**
@@ -77,6 +72,7 @@ export type StatusTone =
   | 'meta'
   | 'accent'
   | 'success'
+  | 'plan'
   | 'warn'
   | 'error'
   // Context-bar fill: one DeepSeek blue for the whole occupied run (the free
@@ -123,8 +119,14 @@ export const STATUS_GROUP_SEPARATOR = ' | '
 /** Separator between trailing state spans. */
 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)'
 
+/** Localized mode-cycle hint used by the live layout. */
+export function statusCycleHint(): string {
+  return ` ${t('status.cycleHint')}`
+}
+
 /**
  * Interior columns of the context bar. The layout starts every bar at this
  * width so the drop ladder can pre-measure the group, then degrades the
@@ -184,7 +186,7 @@ export function contextGroupSpans(
   barWidth: number,
   readout: ContextReadoutMode,
 ): readonly StatusSpan[] {
-  const spans: StatusSpan[] = [{ text: 'context ', tone: 'label' }]
+  const spans: StatusSpan[] = [{ text: t('status.label.context') + ' ', tone: 'label' }]
   spans.push(...contextBar(usedTokens, contextWindow, barWidth))
   if (readout === 'none' || barWidth <= 0 || contextWindow <= 0) return spans
   const used = Math.max(0, usedTokens)
@@ -407,7 +409,7 @@ function buildCandidates(
   if (cwd !== '' && enabled.has('cwd')) push({ text: cwd, tone: 'path' })
   const mode = safe(facts.mode ?? '')
   if (mode !== '' && enabled.has('mode')) {
-    push({ text: '/mode ', tone: 'label' })
+    push({ text: t('status.label.mode') + ' ', tone: 'label' })
     identity.push({ text: mode, tone: 'accent' })
   }
   const branch = safe(facts.branch)
@@ -419,9 +421,7 @@ function buildCandidates(
   const right: { span: StatusSpan; rank: number; id: string }[] = []
   const row2: { group: StatusGroup; rank: number; id: string }[] = []
 
-  if (facts.plan && enabled.has('plan')) {
-    row2.push({ group: { spans: [{ text: '⧉ plan', tone: 'accent' }] }, rank: RANK2_PLAN, id: 'plan' })
-  }
+
 
   if (stats.turns > 0 || stats.steps > 0) {
     if (enabled.has('turns')) {
@@ -431,8 +431,8 @@ function buildCandidates(
         if (counts.length > 0) counts.push(sep())
         counts.push({ text: label + ' ', tone: 'label' }, { text: value, tone: 'value' })
       }
-      pair('turns', String(stats.turns))
-      pair('steps', String(stats.steps))
+      pair(t('status.label.turns'), String(stats.turns))
+      pair(t('status.label.steps'), String(stats.steps))
       row2.push({ group: { spans: counts }, rank: RANK_COUNTS, id: 'turns' })
     }
     if (enabled.has('durations')) {
@@ -444,29 +444,34 @@ function buildCandidates(
         if (durations.length > 0) durations.push(sep())
         durations.push({ text: label + ' ', tone: 'label' }, { text: value, tone: 'value' })
       }
-      if (stats.llmMs > 0) pair('model', formatDuration(stats.llmMs))
-      if (stats.ttftSteps > 0) pair('latency', formatDuration(stats.ttftMs / stats.ttftSteps))
+      if (stats.llmMs > 0) pair(t('status.label.modelTime'), formatDuration(stats.llmMs))
+      if (stats.ttftSteps > 0) pair(t('status.label.latency'), formatDuration(stats.ttftMs / stats.ttftSteps))
       if (stats.decodeMs > 0 && stats.decodeTokens > 0) {
         if (durations.length > 0) durations.push(sep())
         durations.push(
           { text: formatRate(stats.decodeTokens / (stats.decodeMs / 1_000)), tone: 'value' },
-          { text: ' tokens/s', tone: 'label' },
+          { text: t('status.label.tokensPerSec'), tone: 'label' },
         )
       }
-      if (stats.toolMs > 0) pair('tool', formatDuration(stats.toolMs))
+      if (stats.toolMs > 0) pair(t('status.label.tool'), formatDuration(stats.toolMs))
       if (durations.length > 0) {
         row2.push({ group: { spans: durations }, rank: RANK2_DURATIONS, id: 'durations' })
       }
     }
   }
 
+  // The cache group carries both facts about cached prompt tokens: how many
+  // were read and what share of the billed prompt that was. The read count
+  // lives here rather than in the tokens group so the tokens group keeps
+  // meaning "what the provider billed outside the cache".
   const cacheHit = cacheHitPercent(stats.usage)
   if (cacheHit !== null && enabled.has('cache')) {
-    row2.push({
-      group: { spans: [{ text: 'cache ', tone: 'label' }, { text: cacheHit + '%', tone: 'value' }] },
-      rank: RANK2_CACHE,
-      id: 'cache',
-    })
+    const spans: StatusSpan[] = [{ text: t('status.label.cache') + ' ', tone: 'label' }]
+    if (stats.usage.cacheReadTokens > 0) {
+      spans.push({ text: formatTokens(stats.usage.cacheReadTokens), tone: 'value' }, sep())
+    }
+    spans.push({ text: cacheHit + '%', tone: 'value' })
+    row2.push({ group: { spans }, rank: RANK2_CACHE, id: 'cache' })
   }
   // Context occupancy as a purely proportional bar with the usage readout
   // riding outside it: the used total is the most recent reported prompt
@@ -480,14 +485,14 @@ function buildCandidates(
       id: 'context',
     })
   }
-  if ((stats.usage.inputTokens > 0 || stats.usage.outputTokens > 0) && enabled.has('tokens')) {
+  if ((stats.usage.uncachedInputTokens > 0 || stats.usage.outputTokens > 0) && enabled.has('tokens')) {
     const tokens: StatusSpan[] = []
     const pair = (label: string, value: string): void => {
       if (tokens.length > 0) tokens.push(sep())
       tokens.push({ text: label + ' ', tone: 'label' }, { text: value, tone: 'value' })
     }
-    pair('in', formatTokens(stats.usage.inputTokens))
-    pair('out', formatTokens(stats.usage.outputTokens))
+    pair(t('status.label.in'), formatTokens(stats.usage.uncachedInputTokens))
+    pair(t('status.label.out'), formatTokens(stats.usage.outputTokens))
     row2.push({ group: { spans: tokens }, rank: RANK_TOKENS, id: 'tokens' })
   }
 
@@ -522,10 +527,25 @@ function buildCandidates(
   }
   const permission = safe(facts.permission)
   let badge = -1
+  // The plan STATION names itself in the permission badge: with the most
+  // restrictive preset active, plan mode reads as the green fourth cycle
+  // station 'plan' (that preset IS the station's permission layer). Plan on
+  // any other preset (a typed /plan mid-session) stays orthogonal: the badge
+  // keeps naming the preset and row 2 carries the green plan marker.
+  const planStation = facts.plan && permissionTone(permission) === 'success'
   if (permission !== '' && enabled.has('permission')) {
-    right.push({ span: { text: permission, tone: permissionTone(permission) }, rank: RANK_BADGE, id: 'permission' })
+    right.push({
+      span: planStation
+        ? { text: 'plan on', tone: 'plan' }
+        : { text: permission, tone: permissionTone(permission) },
+      rank: RANK_BADGE,
+      id: 'permission',
+    })
     badge = right.length - 1
   }
+  if (facts.plan && enabled.has('plan')) {
+    row2.push({ group: { spans: [{ text: '⧉ plan', tone: 'accent' }] }, rank: RANK2_PLAN, id: 'plan' })
+  }
   return { left, right, badge, row2 }
 }
 
@@ -598,7 +618,7 @@ export function layoutStatusBar(
       groupSeparator,
     )
     const rightWidth = joinWidth(rightKept.map(entry => visibleColumns(entry.span.text)), itemSeparator)
-      + (hint ? visibleColumns(STATUS_CYCLE_HINT) : 0)
+      + (hint ? visibleColumns(statusCycleHint()) : 0)
     return rightWidth > 0 ? leftWidth + LEFT_RIGHT_GAP + rightWidth : leftWidth
   }
 
@@ -627,7 +647,7 @@ export function layoutStatusBar(
       const identity = leftKept[0]
       const identityText = identity.group.spans.map(span => span.text).join('')
       const rightWidth = joinWidth(rightKept.map(entry => visibleColumns(entry.span.text)), itemSeparator)
-      const identityBudget = budget - rightWidth - LEFT_RIGHT_GAP - visibleColumns(STATUS_CYCLE_HINT)
+      const identityBudget = budget - rightWidth - LEFT_RIGHT_GAP - visibleColumns(statusCycleHint())
       if (identityBudget > 0 && visibleColumns(identityText) > identityBudget) {
         leftKept[0] = {
           ...identity,

package/src/render/text.ts

@@ -14,6 +14,20 @@
 
 import { graphemeWidth, splitGraphemes, stringWidth } from './width.ts'
 
+/**
+ * Compact token count: exact below 1K, then one-decimal-ish K/M.
+ * @param n - token count.
+ * @returns display string.
+ */
+export function formatTokens(n: number): string {
+  const scaled = (v: number): string =>
+    v >= 100 ? String(Math.round(v)) : String(Math.round(v * 10) / 10)
+  if (n < 1_000) return String(n)
+  if (n < 1_000_000) return scaled(n / 1_000) + 'K'
+  return scaled(n / 1_000_000) + 'M'
+}
+
+
 /** C0 controls except tab (0x09) and newline (0x0a), plus DEL and C1. */
 const CONTROL_ESCAPE = /[\u0000-\u0008\u000b-\u001f\u007f-\u009f]/gu
 

package/src/render/tool-preview.ts

@@ -1,77 +1,77 @@
-/**
- * Bounded preview line for a tool invocation's raw JSON arguments: the first
- * human-meaningful string among the well-known keys (command, path, query, …)
- * with a fallback to the bounded raw JSON. Shared by the tool card in the
- * transcript and the approval bar's command preview. Arguments longer than
- * {@link MAX_PARSE_CHARS} are never parsed: the preview is a display concern,
- * and a synchronous `JSON.parse` plus string copies of an unbounded model
- * payload must not run on the approval or projection paths.
- *
- * @module @deepseek-ai/dsh-code/render/tool-preview
- */
-
-/** Keys searched in declaration order when building a preview. */
-const PREVIEW_KEYS = ['command', 'cmd', 'description', 'path', 'pattern', 'query'] as const
-
-/**
- * Raw arguments longer than this are skipped without parsing and fall back
- * to the bounded raw preview. Well above any realistic command/path/query
- * string while keeping the synchronous parse cost negligible.
- */
-const MAX_PARSE_CHARS = 4096
-
-/** Bounded raw-arguments fallback shared by the skip-parse and parse-failure paths. */
-function boundedRawPreview(args: string): string {
-  return args.length > 80 ? `${args.slice(0, 77)}...` : args
-}
-
-/**
- * Resolve one bounded preview for raw tool arguments.
- * @param args - raw JSON arguments string as the model produced it.
- * @param toolName - the tool the arguments belong to (fallback label).
- * @returns the preview line; empty when nothing useful resolves.
- */
-export function toolArgumentsPreview(args: string, toolName: string): string {
-  if (args === '') return toolName
-  if (args.length > MAX_PARSE_CHARS) return boundedRawPreview(args)
-  try {
-    const parsed: unknown = JSON.parse(args)
-    if (parsed !== null && typeof parsed === 'object') {
-      const record = parsed as Record<string, unknown>
-      for (const key of PREVIEW_KEYS) {
-        const value = record[key]
-        if (typeof value === 'string' && value !== '') return value
-      }
-    }
-  } catch {
-    // Raw JSON parse failed: fall through to the bounded raw arguments.
-  }
-  return boundedRawPreview(args)
-}
-
-/** Visible budget for one delegation prompt row on the tool card. */
-const MAX_PROMPT_CHARS = 160
-
-/**
- * Bounded prompt preview for delegation-style tools (`subagent`): the
- * `prompt` argument rendered as the card's second row, so the transcript
- * shows what the child agent was asked — not just its description label —
- * while it runs (Codex's SpawnAgent card preview). Anything else returns ''.
- * @param toolName - the tool the arguments belong to.
- * @param args - raw JSON arguments string as the model produced it.
- * @returns the one-line prompt preview, or '' when none applies.
- */
-export function toolPromptPreview(toolName: string, args: string): string {
-  if (toolName !== 'subagent' || args === '' || args.length > MAX_PARSE_CHARS) return ''
-  try {
-    const parsed: unknown = JSON.parse(args)
-    if (parsed === null || typeof parsed !== 'object') return ''
-    const prompt = (parsed as Record<string, unknown>)['prompt']
-    if (typeof prompt !== 'string' || prompt === '') return ''
-    const flat = prompt.replace(/\s+/gu, ' ').trim()
-    return flat.length > MAX_PROMPT_CHARS ? `${flat.slice(0, MAX_PROMPT_CHARS - 1)}…` : flat
-  } catch {
-    // Malformed arguments degrade to no prompt row, never a thrown parse.
-    return ''
-  }
-}
+/**
+ * Bounded preview line for a tool invocation's raw JSON arguments: the first
+ * human-meaningful string among the well-known keys (command, path, query, …)
+ * with a fallback to the bounded raw JSON. Shared by the tool card in the
+ * transcript and the approval bar's command preview. Arguments longer than
+ * {@link MAX_PARSE_CHARS} are never parsed: the preview is a display concern,
+ * and a synchronous `JSON.parse` plus string copies of an unbounded model
+ * payload must not run on the approval or projection paths.
+ *
+ * @module @deepseek-ai/dsh-code/render/tool-preview
+ */
+
+/** Keys searched in declaration order when building a preview. */
+const PREVIEW_KEYS = ['command', 'cmd', 'description', 'path', 'pattern', 'query'] as const
+
+/**
+ * Raw arguments longer than this are skipped without parsing and fall back
+ * to the bounded raw preview. Well above any realistic command/path/query
+ * string while keeping the synchronous parse cost negligible.
+ */
+const MAX_PARSE_CHARS = 4096
+
+/** Bounded raw-arguments fallback shared by the skip-parse and parse-failure paths. */
+function boundedRawPreview(args: string): string {
+  return args.length > 80 ? `${args.slice(0, 77)}...` : args
+}
+
+/**
+ * Resolve one bounded preview for raw tool arguments.
+ * @param args - raw JSON arguments string as the model produced it.
+ * @param toolName - the tool the arguments belong to (fallback label).
+ * @returns the preview line; empty when nothing useful resolves.
+ */
+export function toolArgumentsPreview(args: string, toolName: string): string {
+  if (args === '') return toolName
+  if (args.length > MAX_PARSE_CHARS) return boundedRawPreview(args)
+  try {
+    const parsed: unknown = JSON.parse(args)
+    if (parsed !== null && typeof parsed === 'object') {
+      const record = parsed as Record<string, unknown>
+      for (const key of PREVIEW_KEYS) {
+        const value = record[key]
+        if (typeof value === 'string' && value !== '') return value
+      }
+    }
+  } catch {
+    // Raw JSON parse failed: fall through to the bounded raw arguments.
+  }
+  return boundedRawPreview(args)
+}
+
+/** Visible budget for one delegation prompt row on the tool card. */
+const MAX_PROMPT_CHARS = 160
+
+/**
+ * Bounded prompt preview for delegation-style tools (`subagent`): the
+ * `prompt` argument rendered as the card's second row, so the transcript
+ * shows what the child agent was asked — not just its description label —
+ * while it runs (Codex's SpawnAgent card preview). Anything else returns ''.
+ * @param toolName - the tool the arguments belong to.
+ * @param args - raw JSON arguments string as the model produced it.
+ * @returns the one-line prompt preview, or '' when none applies.
+ */
+export function toolPromptPreview(toolName: string, args: string): string {
+  if (toolName !== 'subagent' || args === '' || args.length > MAX_PARSE_CHARS) return ''
+  try {
+    const parsed: unknown = JSON.parse(args)
+    if (parsed === null || typeof parsed !== 'object') return ''
+    const prompt = (parsed as Record<string, unknown>)['prompt']
+    if (typeof prompt !== 'string' || prompt === '') return ''
+    const flat = prompt.replace(/\s+/gu, ' ').trim()
+    return flat.length > MAX_PROMPT_CHARS ? `${flat.slice(0, MAX_PROMPT_CHARS - 1)}…` : flat
+  } catch {
+    // Malformed arguments degrade to no prompt row, never a thrown parse.
+    return ''
+  }
+}