@deepseek-harness-tui/dsh-tui 0.6.1 → 0.7.1

package/cordis.yml

@@ -9,8 +9,29 @@
 - id: user-questions
   name: '@deepseek-ai/dsh-user-questions'
 
+# The approval service (issue #49): the harness's sandbox escalation seam
+# (`sandbox_permissions: danger-full-access`) asks ApprovalService.request(),
+# which dispatches an `approval/request` waterfall; dsh-tui registers itself
+# as the interactive answerer (ApprovalStore + approval panel). Without this
+# row the waterfall has no service and fail-closes to 'unavailable'. Policy
+# expression mirrors the profile cordis.patch.yml row exactly (verified by
+# scripts/verify-cordis-approval.mjs): ask everywhere except
+# danger-full-access (nothing needs asking) and Windows (no sandbox — the
+# user's terminal trust model, matching every other terminal coding agent).
+- id: approval
+  name: '@deepseek-ai/dsh-user-approval'
+  config:
+    policy: !!js "process.platform === 'win32' ? 'never' : ((process.env.DSH_PERMISSION_MODE ?? 'workspace-write') === 'danger-full-access' ? 'never' : 'ask')"
+
+- id: dsh-tui-workspaces
+  name: '@deepseek-harness-tui/dsh-tui/workspaces'
+
+- id: dsh-tui-command-trees
+  name: '@deepseek-harness-tui/dsh-tui/command-trees'
+
 - id: dsh-tui
   name: '@deepseek-harness-tui/dsh-tui'
+  inject: [agents, tuiWorkspaces]
   config:
     provider: deepseek-official
     # Alt-screen fullscreen (CC 同款): 应用内鼠标选区（选择即复制, OSC 52 +
@@ -20,11 +41,30 @@
     # Reasoning effort applied to every request, validated against the live
     # route's adapter levels (deepseek: off/high/max) — an unlisted level is
     # ignored and the adapter default applies. Wins over the persisted
-    # Shift+Tab choice (~/.dsh-cc/effort.json); also seeds the startup
+    # Shift+Tab choice (~/.dsh-tui/effort.json); also seeds the startup
     # header/statusline until the first request header reports the live value.
     effort: max
-    #  feeds the chosen session id through this env var.
-    sessionId: !!js process.env.DSH_CC_RESUME_SESSION ?? undefined
+    # Shift+Tab 会话模式循环（数组顺序即循环顺序；缺省为下面三档）。
+    # 每档可声明 plan（计划模式开/关）、sandbox（read-only/
+    # workspace-write/danger-full-access）、approval（ask/never）三个
+    # 原子的任意子集；未声明的原子不动。首档（index 0）为无标记基态。
+    # modes:
+    #   - id: default
+    #     plan: false
+    #     sandbox: workspace-write
+    #     approval: ask
+    #   - id: plan
+    #     plan: true
+    #     sandbox: read-only
+    #     approval: ask
+    #   - id: full
+    #     plan: false
+    #     sandbox: danger-full-access
+    #     approval: never
+    #  feeds the chosen session id through this env var (DSH_TUI_ name; the
+    #  pre-rename DSH_CC_ spelling is still honored, issue #120).
+    sessionId: !!js process.env.DSH_TUI_RESUME_SESSION ?? process.env.DSH_CC_RESUME_SESSION ?? undefined
+    workspace: !!js process.env.DSH_TUI_WORKSPACE_TARGET ?? undefined
 
 # The DeepSeek adapter. Shipped default: full thinking at max effort.
 # rc.6 schema key is `apiKeyEnv` (a credential-ref env var NAME, default
@@ -106,7 +146,7 @@
 - id: agent-spine
   name: '@deepseek-ai/dsh-agent-spine-demo'
   config:
-    persona: !!js process.env.CC_TUI_PERSONA ?? 'You are a coding agent.'
+    persona: !!js process.env.DSH_TUI_PERSONA ?? 'You are a coding agent.'
     # Workspace context (AGENTS.md injection) at the standard 64KB cap;
     # task tools stay at their DSH defaults (on).
     workspaceContext:
@@ -141,18 +181,16 @@
 - id: command-goal
   name: '@deepseek-ai/dsh-command-goal'
 
-# Live working line for the status bar: thinking copy / running tool / turn
-# summary. dsh-tui consumes its log-only activity/status events; the
-# plugin's own TUI prompt slot is skipped without an official dsh-tui.
+# Live working line narration support. dsh-tui computes the visible status
+# in-process from base session events; activity/status is never persisted.
 # Mounted through @deepseek-harness-tui/dsh-tui's `./working-activity`
 # re-export (not the bare `dsh-working-activity` name) so the row resolves
 # from install layouts that never link transitive dependencies into the
 # boot anchor's node_modules — pnpm's isolated profile layout, issue #60.
-# publishIntervalMs 500: live-phase snapshots republish every 500ms so the
-# dsh-tui status-line elapsed timers tick smoothly (default 2000ms).
 - id: working-activity
   name: '@deepseek-harness-tui/dsh-tui/working-activity'
   config:
+    publish: false
     publishIntervalMs: 500
 
 # Durable session log (DSH's own persistence seam): /resume and rewind both
@@ -161,7 +199,7 @@
 - id: sessions
   name: '@deepseek-ai/dsh-session-persistence-jsonl'
   config:
-    root: !!js process.env.DSH_CC_SESSION_ROOT ?? (process.env.USERPROFILE ?? process.env.HOME) + '/.dsh-cc/sessions'
+    root: !!js process.env.DSH_TUI_SESSION_ROOT ?? (process.env.USERPROFILE ?? process.env.HOME) + '/.dsh-tui/sessions'
 
 # Read-only session lineage — the subagent service's /agents listing reads it.
 - id: session-query
@@ -181,5 +219,5 @@
     # would never make manual /compact useful. Default 20% (200k tokens)
     # with a 5% retained tail; both are overridable for tests and must keep
     # retainRatio < thresholdRatio (BasicCompactConfig validates this).
-    thresholdRatio: !!js parseFloat(process.env.CC_TUI_COMPACT_RATIO ?? '0.2')
-    retainRatio: !!js parseFloat(process.env.CC_TUI_COMPACT_RETAIN ?? '0.05')
+    thresholdRatio: !!js parseFloat(process.env.DSH_TUI_COMPACT_RATIO ?? '0.2')
+    retainRatio: !!js parseFloat(process.env.DSH_TUI_COMPACT_RETAIN ?? '0.05')

package/lib/types/activityPrefs.d.ts

@@ -2,7 +2,7 @@
  * Persisted working-activity indicator preference, mirroring the pi
  * working-activity extension's `~/.pi/agent/working-activity.json`
  * (`frames` key). dsh-tui keeps its own copy at
- * `~/.dsh-cc/working-activity.json` so the `/activity` choice survives
+ * `~/.dsh-tui/working-activity.json` so the `/activity` choice survives
  * restarts. The file is best-effort: a missing or corrupt file (or an
  * unknown preset left behind by an older version) just falls back to the
  * default preset.

package/lib/types/activityPrefs.js

@@ -2,16 +2,16 @@
  * Persisted working-activity indicator preference, mirroring the pi
  * working-activity extension's `~/.pi/agent/working-activity.json`
  * (`frames` key). dsh-tui keeps its own copy at
- * `~/.dsh-cc/working-activity.json` so the `/activity` choice survives
+ * `~/.dsh-tui/working-activity.json` so the `/activity` choice survives
  * restarts. The file is best-effort: a missing or corrupt file (or an
  * unknown preset left behind by an older version) just falls back to the
  * default preset.
  */
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { isPresetName } from './components/activityFrames.js';
-const PREFS_DIR = join(homedir(), '.dsh-cc');
+import { DATA_DIR } from './utils/paths.js';
+const PREFS_DIR = DATA_DIR;
 /**
  * Parse a persisted `{ frames }` value; anything else yields undefined.
  * @param text - Raw file contents.

package/lib/types/cc/figures.d.ts

@@ -1,41 +1,48 @@
 /**
- * UI glyph constants, ported from the leaked Claude Code source
- * (`src/constants/figures.ts`). The macOS/Windows variants from the original
- * are kept; the plugin renders on whatever platform the user runs.
+ * UI glyph constants used across the TUI: prompt markers, status badges,
+ * direction arrows, media controls, reasoning-effort indicators, and
+ * bridge-state symbols.
+ *
+ * Every constant is a fixed Unicode character, so rendering is identical on
+ * all platforms except the activity bullet: macOS gets a heavier ring glyph
+ * that matches its default terminal font, everything else gets a solid dot.
+ * Escapes are used instead of raw characters so the file stays robust to
+ * encoding round-trips; the rendered glyph is shown in each comment.
  */
+/** Activity bullet: ring on macOS (`⏺`), solid dot elsewhere (`●`). */
 export declare const BLACK_CIRCLE: string;
-/** The prompt pointer glyph (`❯`), figures.pointer. */
+/** Prompt pointer, a bold right chevron (`❯`). */
 export declare const POINTER = "\u276F";
-/** Checkmark (`✓`), figures.tick. */
+/** Success checkmark (`✓`). */
 export declare const TICK = "\u2713";
-/** Bullet dot (`∙`), figures.bulletOperator. */
+/** Small dot for separating operators (`∙`). */
 export declare const BULLET_OPERATOR = "\u2219";
-/** Teardrop asterisk (`✻`), figures.teardropAsterisk. */
+/** Teardrop asterisk, decorative list marker (`✻`). */
 export declare const TEARDROP_ASTERISK = "\u273B";
+/** Lightning bolt, "fast / hot" marker (`↯`). */
+export declare const LIGHTNING_BOLT = "\u21AF";
 /** Up arrow (`↑`). */
 export declare const UP_ARROW = "\u2191";
 /** Down arrow (`↓`). */
 export declare const DOWN_ARROW = "\u2193";
-/** Lightning bolt (`↯`), figures.lightningBolt. */
-export declare const LIGHTNING_BOLT = "\u21AF";
-/** Low-effort indicator: open circle (`○`). */
+/** Left arrow (`←`), channel indicator. */
+export declare const CHANNEL_ARROW = "\u2190";
+/** Right arrow (`→`), injected-message indicator. */
+export declare const INJECTED_ARROW = "\u2192";
+/** Low effort: open circle (`○`). */
 export declare const EFFORT_LOW = "\u25CB";
-/** Medium-effort indicator: half circle (`◐`). */
+/** Medium effort: half-filled circle (`◐`). */
 export declare const EFFORT_MEDIUM = "\u25D0";
-/** High-effort indicator: filled circle (`●`). */
+/** High effort: filled circle (`●`). */
 export declare const EFFORT_HIGH = "\u25CF";
-/** Max-effort indicator: bullseye (`◉`). */
+/** Maximum effort: bullseye (`◉`). */
 export declare const EFFORT_MAX = "\u25C9";
-/** Play control icon (`▶`). */
+/** Play control (`▶`). */
 export declare const PLAY_ICON = "\u25B6";
-/** Pause control icon (`⏸`). */
+/** Pause control (`⏸`). */
 export declare const PAUSE_ICON = "\u23F8";
 /** Refresh arrow (`↻`), MCP subscription indicator. */
 export declare const REFRESH_ARROW = "\u21BB";
-/** Left arrow (`←`), channel indicator. */
-export declare const CHANNEL_ARROW = "\u2190";
-/** Right arrow (`→`), injected-message indicator. */
-export declare const INJECTED_ARROW = "\u2192";
 /** Fork glyph (`⑂`), fork indicator. */
 export declare const FORK_GLYPH = "\u2442";
 /** Open diamond (`◇`), review status indicator. */
@@ -50,7 +57,7 @@ export declare const FLAG_ICON = "\u2691";
 export declare const BLOCKQUOTE_BAR = "\u258E";
 /** Heavy horizontal rule (`━`). */
 export declare const HEAVY_HORIZONTAL = "\u2501";
-/** Bridge status spinner frames (`·|·`, `·/·`, `·—·`, `·\·`). */
+/** Bridge spinner frames: `·|·` → `·/·` → `·—·` → `·\·`. */
 export declare const BRIDGE_SPINNER_FRAMES: string[];
 /** Bridge ready indicator (`·✔︎·`). */
 export declare const BRIDGE_READY_INDICATOR = "\u00B7\u2714\uFE0E\u00B7";

package/lib/types/cc/figures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"figures.d.ts","sourceRoot":"","sources":["../../../src/cc/figures.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,eAAO,MAAM,YAAY,QAA4C,CAAA;AACrE,uDAAuD;AACvD,eAAO,MAAM,OAAO,WAAM,CAAA;AAC1B,qCAAqC;AACrC,eAAO,MAAM,IAAI,WAAM,CAAA;AACvB,gDAAgD;AAChD,eAAO,MAAM,eAAe,WAAM,CAAA;AAClC,yDAAyD;AACzD,eAAO,MAAM,iBAAiB,WAAM,CAAA;AACpC,sBAAsB;AACtB,eAAO,MAAM,QAAQ,WAAW,CAAA;AAChC,wBAAwB;AACxB,eAAO,MAAM,UAAU,WAAW,CAAA;AAClC,mDAAmD;AACnD,eAAO,MAAM,cAAc,WAAM,CAAA;AACjC,+CAA+C;AAC/C,eAAO,MAAM,UAAU,WAAM,CAAA;AAC7B,kDAAkD;AAClD,eAAO,MAAM,aAAa,WAAM,CAAA;AAChC,kDAAkD;AAClD,eAAO,MAAM,WAAW,WAAM,CAAA;AAC9B,4CAA4C;AAC5C,eAAO,MAAM,UAAU,WAAM,CAAA;AAG7B,+BAA+B;AAC/B,eAAO,MAAM,SAAS,WAAW,CAAA;AACjC,gCAAgC;AAChC,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,uDAAuD;AACvD,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,2CAA2C;AAC3C,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,qDAAqD;AACrD,eAAO,MAAM,cAAc,WAAW,CAAA;AACtC,wCAAwC;AACxC,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,mDAAmD;AACnD,eAAO,MAAM,YAAY,WAAW,CAAA;AACpC,qDAAqD;AACrD,eAAO,MAAM,cAAc,WAAW,CAAA;AACtC,iDAAiD;AACjD,eAAO,MAAM,cAAc,WAAW,CAAA;AAGtC,wCAAwC;AACxC,eAAO,MAAM,SAAS,WAAW,CAAA;AAGjC,oDAAoD;AACpD,eAAO,MAAM,cAAc,WAAW,CAAA;AACtC,mCAAmC;AACnC,eAAO,MAAM,gBAAgB,WAAW,CAAA;AAGxC,iEAAiE;AACjE,eAAO,MAAM,qBAAqB,UAKjC,CAAA;AACD,uCAAuC;AACvC,eAAO,MAAM,sBAAsB,6BAA6B,CAAA;AAChE,qCAAqC;AACrC,eAAO,MAAM,uBAAuB,WAAW,CAAA"}
+{"version":3,"file":"figures.d.ts","sourceRoot":"","sources":["../../../src/cc/figures.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,uEAAuE;AACvE,eAAO,MAAM,YAAY,QAA4C,CAAA;AAGrE,kDAAkD;AAClD,eAAO,MAAM,OAAO,WAAW,CAAA;AAC/B,+BAA+B;AAC/B,eAAO,MAAM,IAAI,WAAW,CAAA;AAC5B,gDAAgD;AAChD,eAAO,MAAM,eAAe,WAAW,CAAA;AACvC,uDAAuD;AACvD,eAAO,MAAM,iBAAiB,WAAW,CAAA;AACzC,iDAAiD;AACjD,eAAO,MAAM,cAAc,WAAW,CAAA;AAGtC,sBAAsB;AACtB,eAAO,MAAM,QAAQ,WAAW,CAAA;AAChC,wBAAwB;AACxB,eAAO,MAAM,UAAU,WAAW,CAAA;AAClC,2CAA2C;AAC3C,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,qDAAqD;AACrD,eAAO,MAAM,cAAc,WAAW,CAAA;AAGtC,qCAAqC;AACrC,eAAO,MAAM,UAAU,WAAW,CAAA;AAClC,+CAA+C;AAC/C,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,wCAAwC;AACxC,eAAO,MAAM,WAAW,WAAW,CAAA;AACnC,sCAAsC;AACtC,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,0BAA0B;AAC1B,eAAO,MAAM,SAAS,WAAW,CAAA;AACjC,2BAA2B;AAC3B,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,uDAAuD;AACvD,eAAO,MAAM,aAAa,WAAW,CAAA;AACrC,wCAAwC;AACxC,eAAO,MAAM,UAAU,WAAW,CAAA;AAGlC,mDAAmD;AACnD,eAAO,MAAM,YAAY,WAAW,CAAA;AACpC,qDAAqD;AACrD,eAAO,MAAM,cAAc,WAAW,CAAA;AACtC,iDAAiD;AACjD,eAAO,MAAM,cAAc,WAAW,CAAA;AAGtC,wCAAwC;AACxC,eAAO,MAAM,SAAS,WAAW,CAAA;AACjC,oDAAoD;AACpD,eAAO,MAAM,cAAc,WAAW,CAAA;AACtC,mCAAmC;AACnC,eAAO,MAAM,gBAAgB,WAAW,CAAA;AAGxC,4DAA4D;AAC5D,eAAO,MAAM,qBAAqB,UAKjC,CAAA;AACD,uCAAuC;AACvC,eAAO,MAAM,sBAAsB,6BAA6B,CAAA;AAChE,qCAAqC;AACrC,eAAO,MAAM,uBAAuB,WAAW,CAAA"}

package/lib/types/cc/figures.js

@@ -1,62 +1,71 @@
 /**
- * UI glyph constants, ported from the leaked Claude Code source
- * (`src/constants/figures.ts`). The macOS/Windows variants from the original
- * are kept; the plugin renders on whatever platform the user runs.
+ * UI glyph constants used across the TUI: prompt markers, status badges,
+ * direction arrows, media controls, reasoning-effort indicators, and
+ * bridge-state symbols.
+ *
+ * Every constant is a fixed Unicode character, so rendering is identical on
+ * all platforms except the activity bullet: macOS gets a heavier ring glyph
+ * that matches its default terminal font, everything else gets a solid dot.
+ * Escapes are used instead of raw characters so the file stays robust to
+ * encoding round-trips; the rendered glyph is shown in each comment.
  */
+/** Activity bullet: ring on macOS (`⏺`), solid dot elsewhere (`●`). */
 export const BLACK_CIRCLE = process.platform === 'darwin' ? '⏺' : '●';
-/** The prompt pointer glyph (`❯`), figures.pointer. */
-export const POINTER = '❯';
-/** Checkmark (`✓`), figures.tick. */
-export const TICK = '✓';
-/** Bullet dot (`∙`), figures.bulletOperator. */
-export const BULLET_OPERATOR = '∙';
-/** Teardrop asterisk (`✻`), figures.teardropAsterisk. */
-export const TEARDROP_ASTERISK = '✻';
+// Prompt and list markers
+/** Prompt pointer, a bold right chevron (`❯`). */
+export const POINTER = '\u276f'; // ❯
+/** Success checkmark (`✓`). */
+export const TICK = '\u2713'; // ✓
+/** Small dot for separating operators (`∙`). */
+export const BULLET_OPERATOR = '\u2219'; // ∙
+/** Teardrop asterisk, decorative list marker (`✻`). */
+export const TEARDROP_ASTERISK = '\u273b'; // ✻
+/** Lightning bolt, "fast / hot" marker (`↯`). */
+export const LIGHTNING_BOLT = '\u21af'; // ↯
+// Direction arrows
 /** Up arrow (`↑`). */
 export const UP_ARROW = '\u2191'; // ↑
 /** Down arrow (`↓`). */
 export const DOWN_ARROW = '\u2193'; // ↓
-/** Lightning bolt (`↯`), figures.lightningBolt. */
-export const LIGHTNING_BOLT = '↯';
-/** Low-effort indicator: open circle (`○`). */
-export const EFFORT_LOW = '○';
-/** Medium-effort indicator: half circle (`◐`). */
-export const EFFORT_MEDIUM = '◐';
-/** High-effort indicator: filled circle (`●`). */
-export const EFFORT_HIGH = '●';
-/** Max-effort indicator: bullseye (`◉`). */
-export const EFFORT_MAX = '◉';
-// Media/trigger status indicators
-/** Play control icon (`▶`). */
-export const PLAY_ICON = '\u25b6'; // ▶
-/** Pause control icon (`⏸`). */
-export const PAUSE_ICON = '\u23f8'; // ⏸
-// MCP subscription indicators
-/** Refresh arrow (`↻`), MCP subscription indicator. */
-export const REFRESH_ARROW = '\u21bb'; // ↻
 /** Left arrow (`←`), channel indicator. */
 export const CHANNEL_ARROW = '\u2190'; // ←
 /** Right arrow (`→`), injected-message indicator. */
 export const INJECTED_ARROW = '\u2192'; // →
+// Reasoning-effort badges, from low to maximum
+/** Low effort: open circle (`○`). */
+export const EFFORT_LOW = '\u25cb'; // ○
+/** Medium effort: half-filled circle (`◐`). */
+export const EFFORT_MEDIUM = '\u25d0'; // ◐
+/** High effort: filled circle (`●`). */
+export const EFFORT_HIGH = '\u25cf'; // ●
+/** Maximum effort: bullseye (`◉`). */
+export const EFFORT_MAX = '\u25c9'; // ◉
+// Media transport controls
+/** Play control (`▶`). */
+export const PLAY_ICON = '\u25b6'; // ▶
+/** Pause control (`⏸`). */
+export const PAUSE_ICON = '\u23f8'; // ⏸
+// Subscription and routing
+/** Refresh arrow (`↻`), MCP subscription indicator. */
+export const REFRESH_ARROW = '\u21bb'; // ↻
 /** Fork glyph (`⑂`), fork indicator. */
 export const FORK_GLYPH = '\u2442'; // ⑂
-// Review status indicators
+// Review status
 /** Open diamond (`◇`), review status indicator. */
 export const DIAMOND_OPEN = '\u25c7'; // ◇
 /** Filled diamond (`◆`), review status indicator. */
 export const DIAMOND_FILLED = '\u25c6'; // ◆
 /** Reference mark (`※`), reference indicator. */
 export const REFERENCE_MARK = '\u203b'; // ※
-// Issue flag indicator
+// Flag, quote, and rule markers
 /** Flag icon (`⚑`), issue indicator. */
 export const FLAG_ICON = '\u2691'; // ⚑
-// Blockquote indicator
 /** Blockquote bar (`▎`), left one-quarter block. */
 export const BLOCKQUOTE_BAR = '\u258e'; // ▎
 /** Heavy horizontal rule (`━`). */
 export const HEAVY_HORIZONTAL = '\u2501'; // ━
-// Bridge status indicators
-/** Bridge status spinner frames (`·|·`, `·/·`, `·—·`, `·\·`). */
+// Bridge status
+/** Bridge spinner frames: `·|·` → `·/·` → `·—·` → `·\·`. */
 export const BRIDGE_SPINNER_FRAMES = [
     '\u00b7|\u00b7',
     '\u00b7/\u00b7',

package/lib/types/cc/format.d.ts

@@ -1,24 +1,33 @@
 /**
- * Token/byte display formatters, ported from the leaked Claude Code source
- * (src/utils/format.ts) minus the app-level formatter registry.
+ * Number, token-count, and duration formatters shared by the status line
+ * and message rows.
+ *
+ * All number output uses the `en` locale with at most one fraction digit.
+ * Values at or above 1000 switch to compact notation (e.g. `1.5K`), which
+ * callers receive lowercased as `1.5k` for a calmer status-line look.
  */
 /**
  * Format a number for display, switching to compact notation at 1000.
  * @param number - The value to format.
- * @returns The formatted number, lowercased (e.g. `1.2k`).
+ * @returns The formatted number, lowercased (e.g. `1.2k`, `1.5m`).
  */
 export declare function formatNumber(number: number): string;
 /**
- * Format a token count, dropping a trailing `.0` from compact values.
+ * Format a token count for display.
+ * Compact values that round to an even unit (e.g. `1.0k`) drop the
+ * trailing zero so the status line reads `1k` instead of `1.0k`.
  * @param count - The token count to format.
- * @returns The formatted count (e.g. `988`, `3.4k`).
+ * @returns The formatted count (e.g. `988`, `3.4k`, `1k`).
  */
 export declare function formatTokens(count: number): string;
 /**
- * Compact duration like `12s`, `3m 4s`, `1h 2m` (ported from the leak).
- * @param durationMs - Duration in milliseconds; negative values clamp to zero.
- * @param options - Formatting options; `mostSignificantOnly` stops after the first non-zero unit.
- * @returns The space-joined duration string with `h`/`m`/`s` units.
+ * Format a duration in milliseconds as a compact `h`/`m`/`s` string
+ * (e.g. `12s`, `3m 4s`, `1h 2m`).
+ * Negative durations are clamped to zero; a zero duration renders as `0s`.
+ * @param durationMs - Duration in milliseconds.
+ * @param options - `mostSignificantOnly` stops at the first non-zero unit
+ *                  (e.g. `1h`, `3m`) instead of emitting every unit.
+ * @returns The space-joined duration string.
  */
 export declare function formatDuration(durationMs: number, options?: {
     mostSignificantOnly?: boolean;

package/lib/types/cc/format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../src/cc/format.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGnD;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC9C,MAAM,CAoBR"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../src/cc/format.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAUH;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC9C,MAAM,CAwBR"}

package/lib/types/cc/format.js

@@ -1,8 +1,13 @@
 /**
- * Token/byte display formatters, ported from the leaked Claude Code source
- * (src/utils/format.ts) minus the app-level formatter registry.
+ * Number, token-count, and duration formatters shared by the status line
+ * and message rows.
+ *
+ * All number output uses the `en` locale with at most one fraction digit.
+ * Values at or above 1000 switch to compact notation (e.g. `1.5K`), which
+ * callers receive lowercased as `1.5k` for a calmer status-line look.
  */
-function numberFormatter(compact) {
+/** Build a formatter that emits either compact or standard notation. */
+function buildNumberFormat(compact) {
     return new Intl.NumberFormat('en', {
         notation: compact ? 'compact' : 'standard',
         maximumFractionDigits: 1,
@@ -11,25 +16,29 @@ function numberFormatter(compact) {
 /**
  * Format a number for display, switching to compact notation at 1000.
  * @param number - The value to format.
- * @returns The formatted number, lowercased (e.g. `1.2k`).
+ * @returns The formatted number, lowercased (e.g. `1.2k`, `1.5m`).
  */
 export function formatNumber(number) {
-    const compact = number >= 1000;
-    return numberFormatter(compact).format(number).toLowerCase();
+    return buildNumberFormat(number >= 1000).format(number).toLowerCase();
 }
 /**
- * Format a token count, dropping a trailing `.0` from compact values.
+ * Format a token count for display.
+ * Compact values that round to an even unit (e.g. `1.0k`) drop the
+ * trailing zero so the status line reads `1k` instead of `1.0k`.
  * @param count - The token count to format.
- * @returns The formatted count (e.g. `988`, `3.4k`).
+ * @returns The formatted count (e.g. `988`, `3.4k`, `1k`).
  */
 export function formatTokens(count) {
     return formatNumber(count).replace('.0', '');
 }
 /**
- * Compact duration like `12s`, `3m 4s`, `1h 2m` (ported from the leak).
- * @param durationMs - Duration in milliseconds; negative values clamp to zero.
- * @param options - Formatting options; `mostSignificantOnly` stops after the first non-zero unit.
- * @returns The space-joined duration string with `h`/`m`/`s` units.
+ * Format a duration in milliseconds as a compact `h`/`m`/`s` string
+ * (e.g. `12s`, `3m 4s`, `1h 2m`).
+ * Negative durations are clamped to zero; a zero duration renders as `0s`.
+ * @param durationMs - Duration in milliseconds.
+ * @param options - `mostSignificantOnly` stops at the first non-zero unit
+ *                  (e.g. `1h`, `3m`) instead of emitting every unit.
+ * @returns The space-joined duration string.
  */
 export function formatDuration(durationMs, options = {}) {
     const { mostSignificantOnly = false } = options;
@@ -38,17 +47,16 @@ export function formatDuration(durationMs, options = {}) {
     const minutes = Math.floor((totalSeconds % 3600) / 60);
     const seconds = totalSeconds % 60;
     const parts = [];
+    let stopAfterFirst = false;
     if (hours > 0) {
         parts.push(`${hours}h`);
-        if (mostSignificantOnly)
-            return parts.join(' ');
+        stopAfterFirst = mostSignificantOnly;
     }
-    if (minutes > 0) {
+    if (!stopAfterFirst && minutes > 0) {
         parts.push(`${minutes}m`);
-        if (mostSignificantOnly && hours === 0)
-            return parts.join(' ');
+        stopAfterFirst = mostSignificantOnly && hours === 0;
     }
-    if (seconds > 0 || parts.length === 0) {
+    if (!stopAfterFirst && (seconds > 0 || parts.length === 0)) {
         parts.push(`${seconds}s`);
     }
     return parts.join(' ');

package/lib/types/cc/markdown.d.ts

@@ -1,24 +1,32 @@
+/**
+ * Markdown-to-ANSI renderer over marked's token stream.
+ *
+ * Converts the shared marked lexer output into styled terminal text: quote
+ * gutters, syntax-highlighted fenced blocks, indented list bullets with
+ * depth-based numbering, and alignment-padded tables. The visual conventions
+ * (▎ bars for blockquotes, theme-colored inline code, OSC 8 hyperlinks) are
+ * standard terminal markdown idioms, but this is an independent
+ * implementation: a single dispatch switch fans tokens out to dedicated
+ * per-type render functions, and all recursive calls thread one immutable
+ * RenderState (parent token, list depth, list ordinal, highlighter) instead
+ * of passing positional arguments.
+ */
 import { type Token } from 'marked';
 import type { CliHighlight } from './cliHighlight.js';
 /**
- * Strip tool-analysis XML tags (`<commit_analysis>`, `<context>`, `<function_analysis>`,
- * `<pr_analysis>`) and their contents, then trim the result.
- * @param content - Markdown text that may contain the wrapped tool-analysis tag blocks.
- * @returns The content with those blocks removed and surrounding whitespace trimmed.
+ * Strip tool-analysis XML blocks (`<commit_analysis>`, `<context>`,
+ * `<function_analysis>`, `<pr_analysis>`) and their contents, then trim.
+ * @param content - Markdown that may wrap the tool-analysis tag blocks.
+ * @returns The content with those blocks removed and whitespace trimmed.
  */
 export declare function stripPromptXMLTags(content: string): string;
 /**
- * Configure the shared `marked` instance once: disable strikethrough parsing so
- * `~100` renders literally instead of as deleted text.
+ * Configure the shared `marked` instance once. Strikethrough parsing is
+ * disabled so that `~100` renders literally instead of as deleted text —
+ * models use `~` far more often for "approximate" than for real
+ * strikethrough.
  */
 export declare function configureMarked(): void;
-/**
- * Render markdown content to ANSI-styled text via the shared `marked` instance.
- * @param content - Markdown source to render.
- * @param highlight - Optional cli-highlight surface for code blocks; null disables syntax highlighting.
- * @returns The rendered ANSI string, trimmed.
- */
-export declare function applyMarkdown(content: string, highlight?: CliHighlight | null): string;
 /**
  * Render one marked token to ANSI text, recursing into child tokens.
  * @param token - The marked token to render.
@@ -30,9 +38,16 @@ export declare function applyMarkdown(content: string, highlight?: CliHighlight
  */
 export declare function formatToken(token: Token, listDepth?: number, orderedListNumber?: number | null, parent?: Token | null, highlight?: CliHighlight | null): string;
 /**
- * Pad `content` to `targetWidth` according to alignment. `displayWidth` is the
- * visible width of `content` (caller computes this, e.g. via stringWidth on
- * stripAnsi'd text, so ANSI codes in `content` don't affect padding).
+ * Render markdown content to ANSI-styled text via the shared `marked` instance.
+ * @param content - Markdown source to render.
+ * @param highlight - Optional cli-highlight surface for code blocks; null disables syntax highlighting.
+ * @returns The rendered ANSI string, trimmed.
+ */
+export declare function applyMarkdown(content: string, highlight?: CliHighlight | null): string;
+/**
+ * Pad `content` to `targetWidth` according to alignment. `displayWidth` is
+ * the visible width of `content` (callers compute it via stringWidth on the
+ * ANSI-stripped text, so embedded escape codes don't affect padding).
  * @param content - The text to pad, which may carry ANSI codes.
  * @param displayWidth - Visible width of `content` without ANSI codes.
  * @param targetWidth - Column width to pad `content` to.

package/lib/types/cc/markdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../../src/cc/markdown.ts"],"names":[],"mappings":"AAOA,OAAO,EAAU,KAAK,KAAK,EAAe,MAAM,QAAQ,CAAA;AAMxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAcrD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AASD;;;GAGG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAatC;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EAEf,SAAS,GAAE,YAAY,GAAG,IAAW,GACpC,MAAM,CAOR;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EAEZ,SAAS,SAAI,EACb,iBAAiB,GAAE,MAAM,GAAG,IAAW,EACvC,MAAM,GAAE,KAAK,GAAG,IAAW,EAC3B,SAAS,GAAE,YAAY,GAAG,IAAW,GACpC,MAAM,CA+NR;AAiFD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GACpD,MAAM,CAUR"}
+{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../../src/cc/markdown.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAA4B,KAAK,KAAK,EAAe,MAAM,QAAQ,CAAA;AAM1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AA4BrD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAID;;;;;GAKG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAWtC;AAuCD;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EACZ,SAAS,SAAI,EACb,iBAAiB,GAAE,MAAM,GAAG,IAAW,EACvC,MAAM,GAAE,KAAK,GAAG,IAAW,EAC3B,SAAS,GAAE,YAAY,GAAG,IAAW,GACpC,MAAM,CAER;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,YAAY,GAAG,IAAW,GACpC,MAAM,CAaR;AA2QD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GACpD,MAAM,CAUR"}