@brimveyn/aimux 1.7.3 → 1.8.0

package/src/auto-commit/output-parser.ts

@@ -0,0 +1,21 @@
+export interface ParsedSuggestion {
+  title: string
+  body: string
+}
+
+const TITLE_RE = /^[ \t]*TITLE:[ \t]*(.*?)[ \t]*$/m
+const BODY_MARKER_RE = /^[ \t]*BODY:[ \t]*$/m
+
+export function parseSuggestion(raw: string): ParsedSuggestion | null {
+  const titleMatch = TITLE_RE.exec(raw)
+  if (!titleMatch) return null
+  const title = (titleMatch[1] ?? '').trim()
+  if (!title) return null
+
+  const bodyMarker = BODY_MARKER_RE.exec(raw)
+  if (!bodyMarker) return { body: '', title }
+  const bodyStart = bodyMarker.index + bodyMarker[0].length
+  const body = raw.slice(bodyStart).trim()
+
+  return { body, title }
+}

package/src/auto-commit/prompt-loader.ts

@@ -0,0 +1,33 @@
+import { existsSync } from 'node:fs'
+import { readFile } from 'node:fs/promises'
+import { join } from 'node:path'
+
+const OVERRIDE_FILENAME = 'auto-commit-prompt.md'
+const DEFAULT_PATH = new URL('./default-auto-commit-prompt.md', import.meta.url)
+
+export interface LoadOptions {
+  profileConfigRoot: string
+}
+
+export async function loadBriefingTemplate(opts: LoadOptions): Promise<string> {
+  const override = join(opts.profileConfigRoot, OVERRIDE_FILENAME)
+  if (existsSync(override)) {
+    return await readFile(override, 'utf8')
+  }
+  return await readFile(DEFAULT_PATH, 'utf8')
+}
+
+export interface PromptSlots {
+  recentCommits: string
+  diff: string
+  branch: string
+  sessionTail: string
+}
+
+export function composePromptFromTemplate(template: string, slots: PromptSlots): string {
+  return template
+    .replaceAll('{recentCommits}', slots.recentCommits)
+    .replaceAll('{diff}', slots.diff)
+    .replaceAll('{branch}', slots.branch)
+    .replaceAll('{sessionTail}', slots.sessionTail)
+}

package/src/auto-commit/staging-mode.ts

@@ -0,0 +1,5 @@
+import type { GitRefreshPayload } from '../state/types'
+
+export function hasStagedFiles(git: GitRefreshPayload): boolean {
+  return git.files.some((f) => f.section === 'staged')
+}

package/src/auto-commit/strip-ansi.ts

@@ -0,0 +1,13 @@
+// Matches the common subset of terminal escape sequences we care about:
+// - CSI sequences (ESC [ ... letter)       — SGR colors, cursor moves
+// - OSC sequences (ESC ] ... BEL | ESC \\)  — title/hyperlink setters
+// - Single-char ESC + letter/digit          — simple mode toggles
+// - Other C0/C1 controls outside tab/newline — stripped
+// Reference: https://en.wikipedia.org/wiki/ANSI_escape_code
+const ANSI_RE =
+  // eslint-disable-next-line no-control-regex
+  /\x1B(?:\]([\s\S]*?)(?:\x07|\x1B\\)|\[[0-?]*[ -/]*[@-~]|[@-_])|[\x00-\x08\x0B-\x1F\x7F]/g
+
+export function stripAnsi(input: string): string {
+  return input.replace(ANSI_RE, '')
+}

package/src/auto-commit/suggestion-runner.ts

@@ -0,0 +1,55 @@
+import type { HeadlessInvocation } from './headless-commands'
+
+import { type ParsedSuggestion, parseSuggestion } from './output-parser'
+
+export type SpawnFn = (
+  invocation: HeadlessInvocation,
+  signal: AbortSignal
+) => Promise<{ stdout: string; exitCode: number } | null>
+
+export interface RunOptions {
+  invocation: HeadlessInvocation
+  signal: AbortSignal
+  timeoutMs: number
+  spawn?: SpawnFn
+}
+
+export async function runSuggestion(opts: RunOptions): Promise<ParsedSuggestion | null> {
+  const spawnFn = opts.spawn ?? defaultSpawn
+  const composite = AbortSignal.any([opts.signal, AbortSignal.timeout(opts.timeoutMs)])
+  try {
+    const result = await spawnFn(opts.invocation, composite)
+    if (!result) return null
+    if (result.exitCode !== 0) return null
+    return parseSuggestion(result.stdout)
+  } catch {
+    return null
+  }
+}
+
+async function defaultSpawn(
+  invocation: HeadlessInvocation,
+  signal: AbortSignal
+): Promise<{ stdout: string; exitCode: number } | null> {
+  try {
+    const proc = Bun.spawn([invocation.executable, ...invocation.args], {
+      stderr: 'ignore',
+      stdin: 'ignore',
+      stdout: 'pipe',
+    })
+    const onAbort = () => {
+      try {
+        proc.kill()
+      } catch {
+        // ignore
+      }
+    }
+    signal.addEventListener('abort', onAbort, { once: true })
+    const [stdout, exitCode] = await Promise.all([new Response(proc.stdout).text(), proc.exited])
+    signal.removeEventListener('abort', onAbort)
+    if (signal.aborted) return null
+    return { exitCode: exitCode ?? 1, stdout }
+  } catch {
+    return null
+  }
+}

package/src/auto-commit/working-tree-hash.ts

@@ -0,0 +1,24 @@
+import type { GitFileEntry, GitRefreshPayload } from '../state/types'
+
+import { diffHash } from '../git/diff-hash'
+
+function fileKey(f: GitFileEntry): string {
+  return [f.path, f.status, f.section, f.added ?? '∅', f.removed ?? '∅'].join('|')
+}
+
+export function workingTreeHash(payload: GitRefreshPayload): string {
+  const sortedFiles = [...payload.files].sort((x, y) => {
+    const kx = fileKey(x)
+    const ky = fileKey(y)
+    if (kx < ky) return -1
+    if (kx > ky) return 1
+    return 0
+  })
+  const body = [
+    payload.branch ?? '∅',
+    String(payload.ahead),
+    String(payload.behind),
+    sortedFiles.map(fileKey).join('\n'),
+  ].join('\n---\n')
+  return diffHash(body)
+}

package/src/config.ts

@@ -22,7 +22,14 @@ export interface PersistedGitPane {
   visible: boolean
   mode: 'embedded' | 'pane'
   position: 'top' | 'bottom' | 'left' | 'right'
-  ratio: number
+  paneRatio?: number
+  embeddedRatio?: number
+  ratio?: number
+}
+
+export interface PersistedSidebar {
+  visible: boolean
+  width: number
 }
 
 export interface AimuxConfig {
@@ -31,6 +38,7 @@ export interface AimuxConfig {
   themeId?: ThemeId
   themeTransparent?: boolean
   gitPane?: PersistedGitPane
+  sidebar?: PersistedSidebar
   sessionBarVisible?: boolean
   sessionBarPosition?: SessionBarPosition
   workspaceSnapshot?: WorkspaceSnapshotV1
@@ -47,7 +55,20 @@ function isPersistedGitPane(value: unknown): value is PersistedGitPane {
     v.position === 'left' ||
     v.position === 'right'
   const ratioOk =
-    typeof v.ratio === 'number' && Number.isFinite(v.ratio) && v.ratio > 0 && v.ratio < 1
+    v.ratio === undefined ||
+    (typeof v.ratio === 'number' && Number.isFinite(v.ratio) && v.ratio > 0 && v.ratio < 1)
+  const paneRatioOk =
+    v.paneRatio === undefined ||
+    (typeof v.paneRatio === 'number' &&
+      Number.isFinite(v.paneRatio) &&
+      v.paneRatio > 0 &&
+      v.paneRatio < 1)
+  const embeddedRatioOk =
+    v.embeddedRatio === undefined ||
+    (typeof v.embeddedRatio === 'number' &&
+      Number.isFinite(v.embeddedRatio) &&
+      v.embeddedRatio > 0 &&
+      v.embeddedRatio < 1)
   const diffModeRatioOk =
     v.diffModeRatio === undefined ||
     (typeof v.diffModeRatio === 'number' &&
@@ -68,6 +89,8 @@ function isPersistedGitPane(value: unknown): value is PersistedGitPane {
     !modeOk ||
     !positionOk ||
     !ratioOk ||
+    !paneRatioOk ||
+    !embeddedRatioOk ||
     !diffModeRatioOk ||
     !visibleOk ||
     !fileListModeOk ||
@@ -82,6 +105,17 @@ function isPersistedGitPane(value: unknown): value is PersistedGitPane {
   return true
 }
 
+function isPersistedSidebar(value: unknown): value is PersistedSidebar {
+  if (typeof value !== 'object' || value === null) return false
+  const v = value as Record<string, unknown>
+  return (
+    typeof v.visible === 'boolean' &&
+    typeof v.width === 'number' &&
+    Number.isFinite(v.width) &&
+    v.width > 0
+  )
+}
+
 const DEFAULT_CONFIG: AimuxConfig = {
   customCommands: {},
   version: 2,
@@ -121,6 +155,7 @@ export function loadConfigResult(): ConfigLoadResult {
       themeId?: unknown
       themeTransparent?: unknown
       gitPane?: unknown
+      sidebar?: unknown
       gitPanelVisible?: unknown
       gitPanelRatio?: unknown
       sessionBarVisible?: unknown
@@ -154,6 +189,11 @@ export function loadConfigResult(): ConfigLoadResult {
       issues.push('ignored invalid gitPane')
     }
 
+    const validSidebar = isPersistedSidebar(parsed.sidebar) ? parsed.sidebar : undefined
+    if (parsed.sidebar !== undefined && validSidebar === undefined) {
+      issues.push('ignored invalid sidebar')
+    }
+
     // Legacy migration: previous schema stored gitPanelVisible/gitPanelRatio at
     // top level. If the new `gitPane` field is absent, synthesize it from legacy
     // keys so users don't lose their toggle/ratio on upgrade.
@@ -169,7 +209,9 @@ export function loadConfigResult(): ConfigLoadResult {
           : undefined
       if (legacyVisible !== undefined || legacyRatio !== undefined) {
         validGitPane = {
+          embeddedRatio: legacyRatio ?? 0.5,
           mode: 'embedded',
+          paneRatio: legacyRatio ?? 0.5,
           position: 'bottom',
           ratio: legacyRatio ?? 0.5,
           visible: legacyVisible ?? true,
@@ -216,6 +258,7 @@ export function loadConfigResult(): ConfigLoadResult {
         gitPane: validGitPane,
         sessionBarPosition: validSessionBarPosition,
         sessionBarVisible: validSessionBarVisible,
+        sidebar: validSidebar,
         skippedUpdateVersion: validSkippedUpdateVersion,
         themeId: migrateThemeId(parsed.themeId),
         themeTransparent: validThemeTransparent,

package/src/daemon/session-registry.ts

@@ -89,6 +89,7 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
         const existing = this.tabs.get(persisted.id)
         if (existing) {
           existing.title = persisted.title
+          existing.scrollIntent = persisted.scrollIntent ?? DEFAULT_SCROLL_INTENT
         }
       }
       if (snapshot.activeTabId && this.tabs.has(snapshot.activeTabId)) {

package/src/index.tsx

@@ -52,7 +52,7 @@ if (command === 'terminal-manager') {
 
 if (command === '--help' || command === '-h') {
   process.stdout.write(
-    'aimux -- terminal multiplexer for AI CLIs\n\nUsage:\n  aimux                           Start aimux\n  aimux update                    Update to latest version\n  aimux doctor                    Diagnose setup issues\n  aimux restart-daemon            Restart IPC daemon\n  aimux restart-terminal-manager  Restart terminal-manager (kills live sessions)\n\n'
+    'aimux -- terminal multiplexer for AI CLIs\n\nUsage:\n  aimux                           Start aimux\n  aimux update                    Update to latest version\n  aimux doctor                    Diagnose setup issues\n  aimux restart-daemon            Restart IPC daemon\n  aimux restart-terminal-manager  Restart terminal-manager (kills live workspaces)\n\n'
   )
   process.exit(0)
 }

package/src/input/keymap/help-entries.ts

@@ -14,10 +14,10 @@ export const HELP_MODE_LABELS: { modeId: ModeId; label: string }[] = [
   { label: 'Git commit', modeId: 'modal.git-commit' },
   { label: 'New tab', modeId: 'modal.new-tab.command-edit' },
   { label: 'New tab — command', modeId: 'modal.new-tab.command-edit' },
-  { label: 'Session picker', modeId: 'modal.session-picker.filtering' },
-  { label: 'Session picker — filter', modeId: 'modal.session-picker.filtering' },
-  { label: 'Session name', modeId: 'modal.session-name' },
-  { label: 'Create session', modeId: 'modal.create-session' },
+  { label: 'Workspace picker', modeId: 'modal.session-picker.filtering' },
+  { label: 'Workspace picker — filter', modeId: 'modal.session-picker.filtering' },
+  { label: 'Workspace name', modeId: 'modal.session-name' },
+  { label: 'Create workspace', modeId: 'modal.create-session' },
   { label: 'Rename tab', modeId: 'modal.rename-tab' },
   { label: 'Snippet picker', modeId: 'modal.snippet-picker.filtering' },
   { label: 'Snippet picker — filter', modeId: 'modal.snippet-picker.filtering' },

package/src/input/modes/bridge.ts

@@ -43,6 +43,9 @@ export function deriveModeId(state: AppState): ModeId {
     if (state.modal.type === 'new-tab' && state.modal.editingCommand !== null) {
       return 'modal.new-tab.editing-command'
     }
+    if (state.modal.type === 'git-commit' && state.modal.stage === 'confirm') {
+      return 'modal.git-commit.confirm'
+    }
     const modalType = state.modal.type
     const commandEditMode = modalType ? COMMAND_EDIT_MODE_IDS[modalType] : undefined
     if (commandEditMode) {
@@ -53,6 +56,9 @@ export function deriveModeId(state: AppState): ModeId {
   }
 
   if (state.focusMode === 'modal') {
+    if (state.modal.type === 'git-commit' && state.modal.stage === 'generating') {
+      return 'modal.git-commit.generating'
+    }
     const modalType = state.modal.type
     const modalMode = modalType ? MODAL_MODE_IDS[modalType] : undefined
     if (modalMode) {

package/src/input/modes/transitions.ts

@@ -3,7 +3,9 @@ import type { ModeId } from './types'
 const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
   'git-mode': ['navigation', 'modal.git-commit'],
   'modal.create-session': ['navigation', 'modal.session-picker.filtering'],
-  'modal.git-commit': ['git-mode'],
+  'modal.git-commit': ['git-mode', 'modal.git-commit.confirm', 'modal.git-commit.generating'],
+  'modal.git-commit.confirm': ['modal.git-commit', 'git-mode'],
+  'modal.git-commit.generating': ['modal.git-commit', 'modal.git-commit.confirm', 'git-mode'],
   'modal.help.filtering': ['navigation'],
   'modal.new-tab.command-edit': ['navigation', 'modal.new-tab.editing-command'],
   'modal.new-tab.editing-command': ['navigation', 'modal.new-tab.command-edit'],

package/src/input/modes/types.ts

@@ -18,6 +18,8 @@ export type ModeId =
   | 'modal.help.filtering'
   | 'modal.split-picker'
   | 'modal.git-commit'
+  | 'modal.git-commit.confirm'
+  | 'modal.git-commit.generating'
   | 'modal.update-available'
 
 export type SideEffect =
@@ -55,6 +57,8 @@ export type SideEffect =
   | { type: 'git-restore'; path: string }
   | { type: 'git-rm'; path: string }
   | { type: 'git-commit'; title: string; body: string }
+  | { type: 'git-commit-auto'; title: string; body: string }
+  | { type: 'generate-auto-commit-now'; sessionId: string }
   | { type: 'git-push' }
   | { type: 'confirm-update-selection' }
   | { type: 'switch-session-by-index'; index: number }

package/src/ipc/manager-protocol.ts

@@ -14,8 +14,8 @@ import {
   negotiateProtocolVersion,
 } from './protocol'
 
-export const MANAGER_PROTOCOL_MIN_VERSION = 2
-export const MANAGER_PROTOCOL_VERSION = 2
+export const MANAGER_PROTOCOL_MIN_VERSION = 3
+export const MANAGER_PROTOCOL_VERSION = 3
 
 export interface ManagerHelloRequest {
   minVersion: number

package/src/ipc/protocol.ts

@@ -10,14 +10,8 @@ import type {
 
 import { isWorkspaceSnapshotV1 } from '../state/validation'
 
-// v4 widens sessionStatus from a single status enum to independent
-// {working, waiting} flags so a chip can show both at once.
-// v5 folds initial tab activities and session statuses into attachResult so
-// the client applies them atomically with tab creation — previously they
-// arrived as separate events and could lose to the unknown-tab no-op in
-// the reducer.
-export const IPC_PROTOCOL_MIN_VERSION = 6
-export const IPC_PROTOCOL_VERSION = 6
+export const IPC_PROTOCOL_MIN_VERSION = 7
+export const IPC_PROTOCOL_VERSION = 7
 
 export interface ProtocolHelloRequest {
   minVersion: number

package/src/pty/assistant-status-detector.ts

@@ -85,10 +85,10 @@ export class AssistantStatusDetector {
 }
 
 function extractTailText(viewport: TerminalSnapshot, lineCount: number): string {
+  const lines = viewport.tailLines ?? viewport.lines
   // Full-screen TUIs (claude, opencode) paint in the alternate buffer and
   // often leave the last rows blank, putting their status bar higher up.
   // Skip trailing blank rows before taking the last `lineCount`.
-  const lines = viewport.lines
   let end = lines.length
   while (end > 0) {
     const line = lines[end - 1]

package/src/pty/terminal-snapshot.ts

@@ -4,6 +4,8 @@ import type { TerminalLine, TerminalSnapshot, TerminalSpan } from '../state/type
 
 import { getCurrentTheme } from '../ui/theme'
 
+const SNAPSHOT_TAIL_LINE_COUNT = 10
+
 const ANSI_PALETTE = [
   '#000000',
   '#cd0000',
@@ -142,9 +144,11 @@ function buildLine(
 export function snapshotTerminal(terminal: Terminal, cursorVisible = true): TerminalSnapshot {
   const buffer = terminal.buffer.active
   const startLine = buffer.viewportY
+  const tailStartLine = Math.max(0, buffer.baseY + terminal.rows - SNAPSHOT_TAIL_LINE_COUNT)
   const cursorRow = buffer.cursorY
   const cursorColumn = Math.min(buffer.cursorX, Math.max(terminal.cols - 1, 0))
   const lines: TerminalLine[] = []
+  const tailLines: TerminalLine[] = []
 
   for (let row = 0; row < terminal.rows; row += 1) {
     lines.push(
@@ -152,10 +156,27 @@ export function snapshotTerminal(terminal: Terminal, cursorVisible = true): Term
     )
   }
 
+  for (
+    let lineIndex = tailStartLine;
+    lineIndex <= buffer.baseY + terminal.rows - 1;
+    lineIndex += 1
+  ) {
+    const relativeCursorRow = lineIndex - buffer.baseY
+    tailLines.push(
+      buildLine(
+        terminal,
+        lineIndex,
+        relativeCursorRow === cursorRow ? cursorColumn : null,
+        cursorVisible
+      )
+    )
+  }
+
   return {
     baseY: buffer.baseY,
     cursorVisible,
     lines,
+    tailLines,
     viewportY: buffer.viewportY,
   }
 }
@@ -195,6 +216,13 @@ export function areTerminalSnapshotsEqual(
     return false
   }
 
+  const leftTailLines = left.tailLines ?? []
+  const rightTailLines = right.tailLines ?? []
+
+  if (leftTailLines.length !== rightTailLines.length) {
+    return false
+  }
+
   if (
     left.viewportY !== right.viewportY ||
     left.baseY !== right.baseY ||
@@ -203,8 +231,14 @@ export function areTerminalSnapshotsEqual(
     return false
   }
 
-  return left.lines.every((line, index) => {
-    const other = right.lines[index]
-    return other ? areLinesEqual(line, other) : false
-  })
+  return (
+    left.lines.every((line, index) => {
+      const other = right.lines[index]
+      return other ? areLinesEqual(line, other) : false
+    }) &&
+    leftTailLines.every((line, index) => {
+      const other = rightTailLines[index]
+      return other ? areLinesEqual(line, other) : false
+    })
+  )
 }

package/src/services/ai-usage/adapters/claude.ts

@@ -0,0 +1,139 @@
+import type { AIUsageToolConfig } from '@brimveyn/aimux-config'
+
+import type { UsageSnapshot } from '../types'
+
+import { runCli } from '../spawn'
+
+interface ClaudeOAuthCreds {
+  accessToken: string
+  expiresAt?: number
+}
+
+interface ClaudeKeychainPayload {
+  claudeAiOauth?: {
+    accessToken?: string
+    expiresAt?: number
+    refreshToken?: string
+  }
+}
+
+interface UsageWindow {
+  utilization?: number
+  resets_at?: string
+}
+
+interface ClaudeUsageResponse {
+  five_hour?: UsageWindow
+  seven_day?: UsageWindow
+  seven_day_sonnet?: UsageWindow
+  seven_day_opus?: UsageWindow
+  extra_usage?: UsageWindow & { spent_usd?: number; limit_usd?: number }
+}
+
+const USAGE_URL = 'https://api.anthropic.com/api/oauth/usage'
+const OAUTH_BETA_HEADER = 'oauth-2025-04-20'
+const FETCH_TIMEOUT_MS = 15_000
+
+let cachedCreds: ClaudeOAuthCreds | null = null
+const CREDS_EXPIRY_BUFFER_MS = 60_000
+
+async function readClaudeCreds(): Promise<ClaudeOAuthCreds> {
+  const now = Date.now()
+  if (
+    cachedCreds &&
+    typeof cachedCreds.expiresAt === 'number' &&
+    cachedCreds.expiresAt - CREDS_EXPIRY_BUFFER_MS > now
+  ) {
+    return cachedCreds
+  }
+
+  if (process.platform !== 'darwin') {
+    throw new Error('claude usage requires macOS keychain (darwin only)')
+  }
+  const result = await runCli('security', [
+    'find-generic-password',
+    '-s',
+    'Claude Code-credentials',
+    '-w',
+  ])
+  if (!result.ok) {
+    throw new Error(`keychain read failed — run \`claude\` to sign in`)
+  }
+  const parsed = JSON.parse(result.stdout.trim()) as ClaudeKeychainPayload
+  const access = parsed.claudeAiOauth?.accessToken
+  if (!access) {
+    throw new Error('no accessToken in Claude Code keychain')
+  }
+  cachedCreds = { accessToken: access, expiresAt: parsed.claudeAiOauth?.expiresAt }
+  return cachedCreds
+}
+
+function formatRemainingFromIso(iso: string | undefined): string | null {
+  if (!iso) return null
+  const ms = new Date(iso).getTime() - Date.now()
+  if (ms <= 0) return null
+  const totalMin = Math.round(ms / 60_000)
+  const h = Math.floor(totalMin / 60)
+  const m = totalMin % 60
+  return `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}h`
+}
+
+export async function fetchClaudeUsage(_config: AIUsageToolConfig): Promise<UsageSnapshot> {
+  const now = new Date().toISOString()
+  const base: UsageSnapshot = {
+    burnRatePerHour: null,
+    costUSD: null,
+    lastUpdated: now,
+    percent: null,
+    resetAt: null,
+    timeRemaining: null,
+    tokens: { cache: 0, input: 0, output: 0, total: 0 },
+    tool: 'claude',
+  }
+
+  try {
+    const creds = await readClaudeCreds()
+
+    const controller = new AbortController()
+    const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS)
+    let response: Response
+    try {
+      response = await fetch(USAGE_URL, {
+        headers: {
+          'anthropic-beta': OAUTH_BETA_HEADER,
+          'Authorization': `Bearer ${creds.accessToken}`,
+          'Content-Type': 'application/json',
+        },
+        signal: controller.signal,
+      })
+    } finally {
+      clearTimeout(timer)
+    }
+
+    if (response.status === 401 || response.status === 403) {
+      cachedCreds = null
+      return { ...base, error: 'claude oauth expired — run `claude` to re-auth' }
+    }
+    if (!response.ok) {
+      return { ...base, error: `claude api ${response.status}` }
+    }
+
+    const parsed = (await response.json()) as ClaudeUsageResponse
+    const fiveHour = parsed.five_hour
+    const utilization = typeof fiveHour?.utilization === 'number' ? fiveHour.utilization : null
+    const percent = utilization === null ? null : Math.max(0, Math.min(100, utilization))
+
+    return {
+      ...base,
+      percent,
+      resetAt: fiveHour?.resets_at ?? null,
+      timeRemaining: formatRemainingFromIso(fiveHour?.resets_at),
+      tool: 'claude',
+    }
+  } catch (error) {
+    return {
+      ...base,
+      error: error instanceof Error ? error.message : String(error),
+    }
+  }
+}