@mingozhou/dsh-replay 0.4.1 → 0.4.2

package/src/core/audit.ts

@@ -3,16 +3,35 @@
  * with a severity, grouped for the audit view. Rules are data, not code —
  * extend `DEFAULT_RULES` or pass your own list.
  *
+ * Design goals, in order:
+ *  1. Signal, not activity. A clean session should produce zero findings;
+ *     routine file writes and ordinary network reads are not "risks".
+ *  2. Windows is a first-class platform. `pwsh`, PowerShell aliases and
+ *     Windows paths are scanned just like bash on Unix.
+ *  3. Baseline is not a finding. Every session starts with a permission
+ *     preset and sandbox mode; only a later *change* is interesting.
+ *
  * Severity vocabulary mirrors a standard status palette:
  * 'critical' | 'serious' | 'warning' | 'info'.
  */
 import type { ParsedSession, SessionEvent } from './types.js'
+import { containsSecret, redactText } from './redact.js'
 
 export type Severity = 'critical' | 'serious' | 'warning' | 'info'
 
+export type AuditCategory =
+  | 'shell'
+  | 'file'
+  | 'network'
+  | 'approval'
+  | 'config'
+  | 'error'
+  | 'secret'
+
 export interface AuditFinding {
   ruleId: string
   severity: Severity
+  category?: AuditCategory
   seq: number
   time: number
   /** English title (stable fallback). */
@@ -25,6 +44,7 @@ export interface AuditFinding {
 
 export interface AuditRule {
   id: string
+  category?: AuditCategory
   severity: Severity | ((event: SessionEvent) => Severity)
   /** Return a finding title when the event matches, undefined otherwise. */
   match: (event: SessionEvent) => {
@@ -32,12 +52,19 @@ export interface AuditRule {
     detail?: string
     messageKey?: string
     params?: Record<string, string>
+    category?: AuditCategory
   } | undefined
 }
 
 export interface AuditReport {
   findings: AuditFinding[]
   counts: Record<Severity, number>
+  /** Number of raw events scanned. */
+  scanned: number
+  /** Number of rules evaluated. */
+  rules: number
+  /** Baseline/duplicate config events deliberately ignored. */
+  suppressed: number
 }
 
 function get(obj: unknown, key: string): unknown {
@@ -45,138 +72,280 @@ function get(obj: unknown, key: string): unknown {
 }
 
 function str(value: unknown): string {
-  return typeof value === 'string' ? value : JSON.stringify(value) ?? ''
+  if (typeof value === 'string') return value
+  try {
+    return JSON.stringify(value) ?? ''
+  } catch {
+    return ''
+  }
+}
+
+function clipped(value: string, max = 500): string {
+  return redactText(value).text.slice(0, max)
+}
+
+function toolName(event: SessionEvent): string {
+  return str(get(event.data, 'name'))
+}
+
+function argsOf(event: SessionEvent): string {
+  return str(get(event.data, 'arguments'))
+}
+
+function parseArgs(raw: string): Record<string, unknown> | undefined {
+  try {
+    const value = JSON.parse(raw) as unknown
+    return typeof value === 'object' && value !== null ? (value as Record<string, unknown>) : undefined
+  } catch {
+    return undefined
+  }
+}
+
+const PATH_KEYS = [
+  'path',
+  'file_path',
+  'filePath',
+  'target',
+  'destination',
+  'dest',
+  'filename',
+  'file',
+  'name',
+] as const
+
+function pathOf(raw: string): string | undefined {
+  const args = parseArgs(raw)
+  if (args === undefined) return undefined
+  for (const key of PATH_KEYS) {
+    const value = args[key]
+    if (typeof value === 'string' && value !== '' && /[\\/.]/u.test(value)) return value
+  }
+  return undefined
 }
 
-const SHELL_TOOLS = /^(bash|shell|exec|run_command|terminal|subprocess)/iu
-const WRITE_TOOLS = /^(write|edit|create_file|str_replace|apply_patch|notebook_edit|fs_write|mv|rm|delete)/iu
-const NETWORK_TOOLS = /^(fetch|web_fetch|http|curl|download|web_search|browser)/iu
-
-const DANGEROUS_SHELL = [
-  { re: /\brm\s+(-[a-z]*[rf][a-z]*\s+)+/iu, why: 'recursive/forced delete', key: 'rm-rf' },
-  { re: /\bsudo\b/u, why: 'privilege escalation', key: 'sudo' },
-  { re: /\bchmod\s+([0-7]{3,4}|\+x)/u, why: 'permission change', key: 'chmod' },
-  { re: /\b(curl|wget)\b[^|;&]*\|\s*(ba)?sh\b/iu, why: 'pipe remote script to shell', key: 'curl-pipe' },
-  { re: /\bgit\s+push\s+.*--force/iu, why: 'force push', key: 'force-push' },
-  { re: /\b(dd|mkfs|fdisk)\b/u, why: 'raw disk operation', key: 'disk' },
-  { re: /(\bssh\b|\bscp\b|\brsync\b.*@)/u, why: 'remote host access', key: 'remote' },
-  { re: /\b(export|echo)\b.*\b(API_?KEY|TOKEN|SECRET|PASSWORD)\b/iu, why: 'credential material in command', key: 'creds' },
+const SHELL_TOOLS = /^(bash|shell|exec|run_command|terminal|subprocess|pwsh|powershell|cmd|run_code|code_execution)/iu
+const WRITE_TOOLS = /^(write|write_file|edit|edit_file|create_file|str_replace|multi_edit|apply_patch|notebook_edit|fs_write|mv|move|rename|copy|rm|remove|delete|del|remove_item|rmdir|rd)/iu
+const DESTRUCTIVE_TOOLS = /^(rm|remove|delete|del|remove_item|rmdir|rd|mv|move|rename)/iu
+const READ_TOOLS = /^(read|read_file|view|open|cat|type|get-content|grep|search|glob|list|find|head|tail|less|more|strings|xxd)/iu
+const NETWORK_TOOLS = /^(fetch|web_fetch|http|curl|download|web_search|browser|invoke-webrequest|iwr|invoke-restmethod|start-bitstransfer)/iu
+
+interface ShellPattern {
+  re: RegExp
+  why: string
+  key: string
+  severity: Severity
+}
+
+/**
+ * Shell patterns are deliberately small and readable. Each one maps to a
+ * stable `why` key so the UI can localize the reason.
+ */
+const DANGEROUS_SHELL: ShellPattern[] = [
+  // --- destructive deletes -------------------------------------------------
+  { re: /\brm\s+(-[a-z]*[rf][a-z]*\s+)+/iu, why: 'recursive/forced delete', key: 'rm-rf', severity: 'critical' },
+  { re: /\bremove-item\b[^\n]*(?:-recurse|-force)/iu, why: 'recursive/forced delete', key: 'rm-rf', severity: 'critical' },
+  { re: /\b(?:del|erase)\b[^\n]*\/[sq]/iu, why: 'forced delete', key: 'rm-rf', severity: 'critical' },
+  { re: /\b(?:rd|rmdir)\b[^\n]*\/s/iu, why: 'recursive directory delete', key: 'rm-rf', severity: 'critical' },
+  // --- privilege / system --------------------------------------------------
+  { re: /\bsudo\b/iu, why: 'privilege escalation', key: 'sudo', severity: 'critical' },
+  { re: /\b(?:takeown|icacls)\b[^\n]*(?:grant|\/grant|\/f|\/reset)/iu, why: 'ownership/permission change', key: 'chmod', severity: 'serious' },
+  { re: /\bchmod\s+([0-7]{3,4}|\+x)/u, why: 'permission change', key: 'chmod', severity: 'serious' },
+  { re: /\bset-executionpolicy\b/iu, why: 'script execution policy change', key: 'exec-policy', severity: 'serious' },
+  { re: /\b(?:bcdedit|vssadmin\s+delete|wevtutil\s+cl)\b/iu, why: 'boot/shadow/log tampering', key: 'system-tamper', severity: 'critical' },
+  { re: /\b(?:reg\s+delete|schtasks\b[^\n]*\/create|sc\s+create|net\s+user|net\s+localgroup)\b/iu, why: 'persistence or account change', key: 'persistence', severity: 'serious' },
+  // --- disk / remote code --------------------------------------------------
+  { re: /\b(?:dd|mkfs|fdisk|diskpart|format)\b/iu, why: 'raw disk operation', key: 'disk', severity: 'critical' },
+  { re: /\b(?:iwr|invoke-webrequest|curl|wget|start-bitstransfer)\b[^\n|;]*(?:\||;)\s*(?:iex|invoke-expression)\b/iu, why: 'pipe remote script to shell', key: 'curl-pipe', severity: 'critical' },
+  { re: /\b(?:downloadstring|downloadfile)\b/iu, why: 'download and execute', key: 'curl-pipe', severity: 'critical' },
+  { re: /\b(?:powershell|pwsh)\b[^\n]*-e(?:nc|ncodedcommand)?\s+[A-Za-z0-9+/=]{40,}/iu, why: 'encoded PowerShell command', key: 'encoded-shell', severity: 'critical' },
+  // --- credentials / exfiltration -----------------------------------------
+  { re: /\b(?:export|\$env:|\bset\b|\becho\b)[^\n]*(?:api[_-]?key|token|secret|password|passwd)/iu, why: 'credential material in command', key: 'creds', severity: 'serious' },
+  { re: /\b(?:get-content|type|cat)\b[^\n]*(?:\.env\b|id_rsa|\.ssh[\\/]|credentials)/iu, why: 'credential file read', key: 'creds', severity: 'serious' },
+  { re: /\b(?:curl|wget|iwr|invoke-webrequest|invoke-restmethod)\b[^\n]*(?:-d\b|--data|--upload-file|-f\b|\.env\b|secret|token|password)/iu, why: 'possible credential exfiltration', key: 'exfil', severity: 'critical' },
+  { re: /\b(?:ssh|scp|rsync)\b[^\n]*(?:@|\bremote\b)/iu, why: 'remote host access', key: 'remote', severity: 'warning' },
+  { re: /\b(?:invoke-command|enter-pssession|winrs)\b/iu, why: 'remote execution', key: 'remote', severity: 'serious' },
+  // --- supply chain / repo ------------------------------------------------
+  { re: /\bgit\s+push\s+[^\n]*--force/iu, why: 'force push', key: 'force-push', severity: 'serious' },
+  { re: /\b(?:npm|pnpm|yarn)\s+publish\b/iu, why: 'package publish', key: 'publish', severity: 'warning' },
+  { re: /\bgh\s+release\s+create\b/iu, why: 'release publish', key: 'publish', severity: 'warning' },
 ]
 
-const SENSITIVE_PATH = /(\.env\b|\.ssh\/|id_rsa|\.aws\/|credentials|\.npmrc|\.netrc|secrets?\.|\.pem\b)/iu
+/** File paths that deserve a second look when read or written. */
+const SENSITIVE_PATH = /(?:^|[\\/])(?:\.env(?:\.[\w-]+)?(?:[\\/]|$)|\.ssh(?:[\\/]|$)|id_rsa|id_ed25519|\.aws(?:[\\/]|$)|\.kube(?:[\\/]|$)|\.docker(?:[\\/]config\.json|$)|credentials|\.npmrc|\.netrc|secrets?\.|\.pem|\.pfx|\.p12|ntuser\.dat|\.git[\\/]config|\.config[\\/]gh[\\/]hosts\.yml)/iu
+
+const NETWORK_RISK = /(?:--data|-d\s|--upload-file|-f\s|body\s*[:=]|\.env\b|secret|token|password|passwd|private[_-]?key|authorization|api[_-]?key)/iu
+
+function messageText(message: unknown): string {
+  const content = get(message, 'content')
+  if (!Array.isArray(content)) return ''
+  return content
+    .map(block => (typeof get(block, 'text') === 'string' ? (get(block, 'text') as string) : ''))
+    .join('')
+}
+
+function findDanger(event: SessionEvent): ShellPattern | undefined {
+  if (event.type !== 'tool/call') return undefined
+  const name = toolName(event)
+  if (!SHELL_TOOLS.test(name)) return undefined
+  const args = argsOf(event)
+  return DANGEROUS_SHELL.find(pattern => pattern.re.test(args))
+}
 
 export const DEFAULT_RULES: AuditRule[] = [
   {
     id: 'shell-exec',
-    severity: event => {
-      const args = str(get(event.data, 'arguments'))
-      return DANGEROUS_SHELL.some(p => p.re.test(args)) ? 'critical' : 'warning'
-    },
+    category: 'shell',
+    severity: event => findDanger(event)?.severity ?? 'warning',
     match: event => {
       if (event.type !== 'tool/call') return undefined
-      const name = str(get(event.data, 'name'))
+      const name = toolName(event)
       if (!SHELL_TOOLS.test(name)) return undefined
-      const args = str(get(event.data, 'arguments'))
-      const hit = DANGEROUS_SHELL.find(p => p.re.test(args))
+      const args = argsOf(event)
+      const hit = DANGEROUS_SHELL.find(pattern => pattern.re.test(args))
+      if (hit === undefined) return undefined // ordinary shell is activity, not a finding
       return {
-        title: hit ? `shell: ${hit.why}` : `shell command via ${name}`,
-        detail: args.slice(0, 400),
-        messageKey: hit ? 'f.shell.dangerous' : 'f.shell.plain',
-        params: (hit ? { whyKey: hit.key, why: hit.why } : { name }) as Record<string, string>,
+        title: `shell: ${hit.why}`,
+        detail: clipped(args),
+        messageKey: 'f.shell.dangerous',
+        params: { whyKey: hit.key, why: hit.why, name },
       }
     },
   },
   {
     id: 'file-write',
-    severity: event =>
-      SENSITIVE_PATH.test(str(get(event.data, 'arguments'))) ? 'critical' : 'info',
+    category: 'file',
+    severity: event => {
+      const args = argsOf(event)
+      const path = pathOf(args) ?? args
+      return SENSITIVE_PATH.test(path) || containsSecret(args) ? 'critical' : 'warning'
+    },
     match: event => {
       if (event.type !== 'tool/call') return undefined
-      const name = str(get(event.data, 'name'))
+      const name = toolName(event)
       if (!WRITE_TOOLS.test(name)) return undefined
-      const args = str(get(event.data, 'arguments'))
-      const sensitive = SENSITIVE_PATH.test(args)
+      const args = argsOf(event)
+      const path = pathOf(args) ?? args
+      const sensitive = SENSITIVE_PATH.test(path)
+      const secret = containsSecret(args)
+      if (!sensitive && !secret && !DESTRUCTIVE_TOOLS.test(name)) return undefined
+      const reason = sensitive
+        ? 'file write touches a sensitive path'
+        : secret
+          ? 'credential material written to a file'
+          : `destructive file operation via ${name}`
       return {
-        title: sensitive ? `file write touches sensitive path` : `file mutation via ${name}`,
-        detail: args.slice(0, 400),
-        messageKey: sensitive ? 'f.file.sensitive' : 'f.file.write',
-        params: { name },
+        title: reason,
+        detail: clipped(args),
+        messageKey: sensitive ? 'f.file.sensitive' : secret ? 'f.file.secret' : 'f.file.destructive',
+        params: { name, ...(path !== args ? { path } : {}) },
       }
     },
   },
   {
     id: 'sensitive-read',
+    category: 'file',
     severity: 'serious',
     match: event => {
       if (event.type !== 'tool/call') return undefined
-      const args = str(get(event.data, 'arguments'))
-      const name = str(get(event.data, 'name'))
-      if (WRITE_TOOLS.test(name) || SHELL_TOOLS.test(name)) return undefined
-      if (!SENSITIVE_PATH.test(args)) return undefined
+      const name = toolName(event)
+      if (WRITE_TOOLS.test(name) || SHELL_TOOLS.test(name) || NETWORK_TOOLS.test(name)) return undefined
+      if (!READ_TOOLS.test(name)) return undefined
+      const args = argsOf(event)
+      const path = pathOf(args) ?? args
+      if (!SENSITIVE_PATH.test(path)) return undefined
       return {
         title: `access to sensitive path via ${name}`,
-        detail: args.slice(0, 400),
+        detail: clipped(args),
         messageKey: 'f.read.sensitive',
-        params: { name },
+        params: { name, ...(path !== args ? { path } : {}) },
       }
     },
   },
   {
     id: 'network',
-    severity: 'info',
+    category: 'network',
+    severity: event => {
+      const args = argsOf(event)
+      return containsSecret(args) || SENSITIVE_PATH.test(args) ? 'critical' : 'warning'
+    },
     match: event => {
       if (event.type !== 'tool/call') return undefined
-      const name = str(get(event.data, 'name'))
+      const name = toolName(event)
       if (!NETWORK_TOOLS.test(name)) return undefined
+      const args = argsOf(event)
+      if (!NETWORK_RISK.test(args)) return undefined // ordinary fetches are activity
       return {
-        title: `network access via ${name}`,
-        detail: str(get(event.data, 'arguments')).slice(0, 400),
+        title: `network request may carry sensitive data via ${name}`,
+        detail: clipped(args),
         messageKey: 'f.network',
         params: { name },
       }
     },
   },
+  {
+    id: 'secret-output',
+    category: 'secret',
+    severity: 'critical',
+    match: event => {
+      if (event.type !== 'tool/result') return undefined
+      const message = get(event.data, 'message')
+      const text = messageText(message) || str(message) || str(get(event.data, 'error'))
+      if (text === '' || !containsSecret(text)) return undefined
+      return {
+        title: 'tool output contains credential material',
+        detail: clipped(text, 300),
+        messageKey: 'f.output.secret',
+      }
+    },
+  },
   {
     id: 'approval-denied',
+    category: 'approval',
     severity: 'warning',
     match: event => {
       if (event.type !== 'approval/decided') return undefined
       const outcome = str(get(event.data, 'outcome') ?? get(event.data, 'decision'))
-      if (!/den|reject|refus/iu.test(outcome)) return undefined
-      return { title: 'user denied an approval', detail: outcome, messageKey: 'f.approval.denied' }
+      if (!/deny|denied|reject|refus/iu.test(outcome)) return undefined
+      return { title: 'user denied an approval', detail: clipped(outcome), messageKey: 'f.approval.denied' }
     },
   },
   {
     id: 'sandbox-change',
-    severity: 'serious',
+    category: 'config',
+    severity: event => {
+      const mode = str(get(event.data, 'mode'))
+      return /danger|full/iu.test(mode) ? 'critical' : 'serious'
+    },
     match: event =>
       event.type === 'sandbox/mode'
-        ? { title: 'sandbox mode changed', detail: JSON.stringify(event.data), messageKey: 'f.sandbox.change' }
+        ? {
+            title: `sandbox mode changed to ${str(get(event.data, 'mode')) || 'unknown'}`,
+            detail: clipped(JSON.stringify(event.data)),
+            messageKey: 'f.sandbox.change',
+            params: { mode: str(get(event.data, 'mode')) },
+          }
         : undefined,
   },
   {
     id: 'permission-change',
-    severity: 'serious',
+    category: 'config',
+    severity: event => {
+      const preset = str(get(event.data, 'preset'))
+      return /danger|full/iu.test(preset) ? 'critical' : 'serious'
+    },
     match: event =>
       event.type === 'permission/preset'
-        ? { title: 'permission preset changed', detail: JSON.stringify(event.data), messageKey: 'f.permission.change' }
-        : undefined,
-  },
-  {
-    id: 'subagent',
-    severity: 'info',
-    match: event =>
-      event.type === 'subagent/descriptor'
         ? {
-            title: `subagent spawned (${str(get(event.data, 'mode'))})`,
-            detail: str(get(event.data, 'persona') ?? get(event.data, 'label') ?? ''),
-            messageKey: 'f.subagent',
-            params: { mode: str(get(event.data, 'mode')) },
+            title: `permission preset changed to ${str(get(event.data, 'preset')) || 'unknown'}`,
+            detail: clipped(JSON.stringify(event.data)),
+            messageKey: 'f.permission.change',
+            params: { preset: str(get(event.data, 'preset')) },
           }
         : undefined,
   },
   {
     id: 'tool-error',
+    category: 'error',
     severity: 'warning',
     match: event => {
       if (event.type !== 'tool/result') return undefined
@@ -184,19 +353,20 @@ export const DEFAULT_RULES: AuditRule[] = [
       if (error === undefined) return undefined
       return {
         title: `tool failed: ${str(get(error, 'name'))}`,
-        detail: str(get(error, 'code')),
+        detail: clipped(str(get(error, 'code'))),
         messageKey: 'f.tool.error',
-        params: { name: str(get(error, 'name')) },
+        params: { name: str(get(error, 'name')), code: str(get(error, 'code')) },
       }
     },
   },
   {
     id: 'turn-error',
+    category: 'error',
     severity: 'warning',
     match: event => {
       if (event.type !== 'turn/end') return undefined
       const kind = str(get(get(event.data, 'reason'), 'kind'))
-      if (kind === 'completed' || kind === '') return undefined
+      if (kind === '' || kind === 'completed' || kind === 'aborted') return undefined
       return { title: `turn ended abnormally: ${kind}`, messageKey: 'f.turn.error', params: { kind } }
     },
   },
@@ -204,17 +374,54 @@ export const DEFAULT_RULES: AuditRule[] = [
 
 const SEVERITY_ORDER: Severity[] = ['critical', 'serious', 'warning', 'info']
 
+const CONFIG_RULES = new Set(['sandbox-change', 'permission-change'])
+
 export function auditSession(
   session: ParsedSession,
   rules: AuditRule[] = DEFAULT_RULES,
 ): AuditReport {
+  // The first permission/sandbox event is the session baseline, not a change.
+  // A later event only matters when its value differs from the previous one.
+  const lastConfig = new Map<string, string>()
+  const changedConfig = new Set<number>()
+  let suppressed = 0
+  for (const event of session.events) {
+    if (
+      event.type !== 'permission/preset' &&
+      event.type !== 'sandbox/mode' &&
+      event.type !== 'approval/policy'
+    ) {
+      continue
+    }
+    const value = JSON.stringify(event.data)
+    if (!lastConfig.has(event.type)) {
+      lastConfig.set(event.type, value)
+      suppressed++
+      continue
+    }
+    if (lastConfig.get(event.type) === value) {
+      suppressed++
+      continue
+    }
+    lastConfig.set(event.type, value)
+    changedConfig.add(event.seq)
+  }
+
   const findings: AuditFinding[] = []
   for (const event of session.events) {
     for (const rule of rules) {
+      if (CONFIG_RULES.has(rule.id) && !changedConfig.has(event.seq)) continue
       const hit = rule.match(event)
       if (hit === undefined) continue
       const severity = typeof rule.severity === 'function' ? rule.severity(event) : rule.severity
-      findings.push({ ruleId: rule.id, severity, seq: event.seq, time: event.time, ...hit })
+      findings.push({
+        ruleId: rule.id,
+        severity,
+        category: hit.category ?? rule.category,
+        seq: event.seq,
+        time: event.time,
+        ...hit,
+      })
     }
   }
   findings.sort(
@@ -223,5 +430,5 @@ export function auditSession(
   )
   const counts: Record<Severity, number> = { critical: 0, serious: 0, warning: 0, info: 0 }
   for (const finding of findings) counts[finding.severity]++
-  return { findings, counts }
+  return { findings, counts, scanned: session.events.length, rules: rules.length, suppressed }
 }

package/src/core/cost.ts

@@ -1,8 +1,8 @@
 /**
  * Cost estimation from token totals. Prices are USD per 1M tokens and are
- * ESTIMATES — provider list prices change; override the table if you need
- * exact numbers. Cache-write falls back to the input rate when a provider
- * doesn't price it separately.
+ * ESTIMATES — provider list prices change; the UI lets you override them.
+ * Cache-write falls back to the input rate when a provider doesn't price it
+ * separately.
  */
 import type { TokenTotals } from './timeline.js'
 
@@ -21,15 +21,48 @@ export interface PricingEntry {
   match: RegExp
   rate: PricingRate
   label: string
+  /** ISO date the default rates were last checked. */
+  updatedAt?: string
+  source?: string
 }
 
 /** Editable defaults — first match wins, most specific first. */
 export const DEFAULT_PRICING: PricingEntry[] = [
-  { match: /deepseek.*pro/iu, rate: { input: 1.1, cacheRead: 0.27, output: 4.4 }, label: 'DeepSeek Pro' },
-  { match: /deepseek/iu, rate: { input: 0.27, cacheRead: 0.07, output: 1.1 }, label: 'DeepSeek' },
-  { match: /claude|anthropic/iu, rate: { input: 3, cacheRead: 0.3, cacheWrite: 3.75, output: 15 }, label: 'Claude' },
-  { match: /gpt|^o\d|openai|codex/iu, rate: { input: 2.5, cacheRead: 1.25, output: 10 }, label: 'OpenAI' },
-  { match: /gemini/iu, rate: { input: 1.25, cacheRead: 0.31, output: 10 }, label: 'Gemini' },
+  {
+    match: /deepseek.*pro/iu,
+    rate: { input: 1.1, cacheRead: 0.27, output: 4.4 },
+    label: 'DeepSeek Pro',
+    updatedAt: '2026-08-18',
+    source: 'provider list price (estimate)',
+  },
+  {
+    match: /deepseek/iu,
+    rate: { input: 0.27, cacheRead: 0.07, output: 1.1 },
+    label: 'DeepSeek',
+    updatedAt: '2026-08-18',
+    source: 'provider list price (estimate)',
+  },
+  {
+    match: /claude|anthropic/iu,
+    rate: { input: 3, cacheRead: 0.3, cacheWrite: 3.75, output: 15 },
+    label: 'Claude',
+    updatedAt: '2026-08-18',
+    source: 'provider list price (estimate)',
+  },
+  {
+    match: /gpt|^o\d|openai|codex/iu,
+    rate: { input: 2.5, cacheRead: 1.25, output: 10 },
+    label: 'OpenAI',
+    updatedAt: '2026-08-18',
+    source: 'provider list price (estimate)',
+  },
+  {
+    match: /gemini/iu,
+    rate: { input: 1.25, cacheRead: 0.31, output: 10 },
+    label: 'Gemini',
+    updatedAt: '2026-08-18',
+    source: 'provider list price (estimate)',
+  },
 ]
 
 export interface CostEstimate {
@@ -37,6 +70,25 @@ export interface CostEstimate {
   label: string
 }
 
+export interface CostPart extends CostEstimate {
+  model: string
+  totals: TokenTotals
+}
+
+export interface CostEstimateDetailed extends CostEstimate {
+  parts: CostPart[]
+}
+
+function costOf(totals: TokenTotals, rate: PricingRate): number {
+  return (
+    (totals.input * rate.input +
+      totals.cacheRead * rate.cacheRead +
+      totals.cacheWrite * (rate.cacheWrite ?? rate.input) +
+      totals.output * rate.output) /
+    1_000_000
+  )
+}
+
 export function estimateCost(
   totals: TokenTotals,
   models: string[],
@@ -44,14 +96,28 @@ export function estimateCost(
 ): CostEstimate | undefined {
   const entry = pricing.find(p => models.some(m => p.match.test(m)))
   if (entry === undefined) return undefined
-  const { rate } = entry
-  const usd =
-    (totals.input * rate.input +
-      totals.cacheRead * rate.cacheRead +
-      totals.cacheWrite * (rate.cacheWrite ?? rate.input) +
-      totals.output * rate.output) /
-    1_000_000
-  return { usd, label: entry.label }
+  return { usd: costOf(totals, entry.rate), label: entry.label }
+}
+
+/**
+ * Per-model cost. A session can switch models mid-run; charging every token at
+ * the first matching rate over- or under-estimates the bill.
+ */
+export function estimateCostDetailed(
+  modelTotals: Record<string, TokenTotals>,
+  pricing: PricingEntry[] = DEFAULT_PRICING,
+): CostEstimateDetailed | undefined {
+  if (modelTotals === undefined || modelTotals === null) return undefined
+  const parts: CostPart[] = []
+  for (const [model, totals] of Object.entries(modelTotals)) {
+    const entry = pricing.find(p => p.match.test(model))
+    if (entry === undefined) continue
+    parts.push({ model, label: entry.label, usd: costOf(totals, entry.rate), totals })
+  }
+  if (parts.length === 0) return undefined
+  const usd = parts.reduce((sum, part) => sum + part.usd, 0)
+  const labels = [...new Set(parts.map(part => part.label))]
+  return { usd, label: labels.length === 1 ? labels[0] : `Mixed (${labels.length} models)`, parts }
 }
 
 export function formatUsd(usd: number): string {
@@ -59,3 +125,15 @@ export function formatUsd(usd: number): string {
   if (usd >= 0.01) return `$${usd.toFixed(3)}`
   return `$${usd.toFixed(4)}`
 }
+
+/** Approximate CNY amount at a caller-supplied exchange rate. */
+export function formatCny(usd: number, rate = 7.2): string {
+  const cny = usd * rate
+  if (cny >= 1) return `¥${cny.toFixed(2)}`
+  if (cny >= 0.01) return `¥${cny.toFixed(3)}`
+  return `¥${cny.toFixed(4)}`
+}
+
+export function formatMoney(usd: number, currency: 'USD' | 'CNY', rate = 7.2): string {
+  return currency === 'CNY' ? formatCny(usd, rate) : formatUsd(usd)
+}

package/src/core/index.ts

@@ -5,3 +5,4 @@ export * from './audit.js'
 export * from './forktree.js'
 export * from './compare.js'
 export * from './cost.js'
+export * from './redact.js'