@miphamai/cli 0.65.0 → 0.66.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miphamai/cli",
-  "version": "0.65.0",
+  "version": "0.66.0",
   "description": "Mipham Code — Multi-model open-core intelligent coding terminal by MiphamAI",
   "keywords": [
     "ai",

package/src/agent/background-registry.ts

@@ -20,6 +20,8 @@ export interface BackgroundTask {
   status: BackgroundTaskStatus
   kind: BackgroundTaskKind
   startedAt: Date
+  /** Cumulative token usage (input + output) reported by the running task. */
+  tokensUsed: number
   completedAt?: Date
   result?: string
   error?: string
@@ -99,6 +101,7 @@ export class BackgroundAgentRegistry {
       status: 'running',
       kind,
       startedAt: now,
+      tokensUsed: 0,
       abortController: new AbortController(),
     }
 
@@ -177,6 +180,15 @@ export class BackgroundAgentRegistry {
     return this.list().filter((t) => t.status === 'running')
   }
 
+  /**
+   * Update the cumulative token usage reported by a running task.
+   * No-op if the task no longer exists.
+   */
+  updateTokenUsage(id: string, tokensUsed: number): void {
+    const task = this.tasks.get(id)
+    if (task) task.tokensUsed = tokensUsed
+  }
+
   /**
    * Stop a running task by aborting its controller.
    * Returns true if the task was running and was stopped.

package/src/agent/sub-agent.ts

@@ -73,8 +73,13 @@ export class SubAgent {
       const bgRegistry = getBackgroundAgentRegistry()
 
       const taskId = bgRegistry.spawn(description, agentType, async (signal) => {
-        // Run the synchronous execution inside the background executor
-        return this.runExecution(prompt, options, signal)
+        // Run the synchronous execution inside the background executor, reporting
+        // cumulative token usage back to the registry for live footer display.
+        const opts: SubAgentOptions = {
+          ...options,
+          onTokenUsage: (total) => bgRegistry.updateTokenUsage(taskId, total),
+        }
+        return this.runExecution(prompt, opts, signal)
       })
 
       // Register completion callback for hook firing
@@ -323,6 +328,7 @@ export class SubAgent {
 
     let currentMessages = messages
     let currentSystemPrompt = systemPrompt
+    let totalTokens = 0
 
     try {
       for (let turn = 0; turn < MAX_TOOL_TURNS; turn++) {
@@ -366,6 +372,10 @@ export class SubAgent {
           if (chunk.type === 'stop') {
             break
           }
+          if (chunk.type === 'usage') {
+            totalTokens += (chunk.inputTokens ?? 0) + (chunk.outputTokens ?? 0)
+            if (options.onTokenUsage) options.onTokenUsage(totalTokens)
+          }
         }
 
         chunks.push(turnText)

package/src/agent/types.ts

@@ -46,6 +46,8 @@ export interface SubAgentOptions {
   runInBackground?: boolean
   /** Optional callback for streaming progress chunks during background execution. */
   onProgress?: (chunk: string) => void
+  /** Optional callback reporting cumulative token usage (input + output) from the API stream. */
+  onTokenUsage?: (totalTokens: number) => void
   /** When set, tool executions use this path as cwd (git worktree isolation). */
   worktreePath?: string
   /** Seed the sub-agent with a parent conversation prefix (e.g., fork inheritance). */

package/src/shared/package-info.ts

@@ -9,7 +9,7 @@
 export const PACKAGE_NAME = '@miphamai/cli' as const
 
 /** 当前发布版本 */
-export const PACKAGE_VERSION = '0.65.0' as const
+export const PACKAGE_VERSION = '0.66.0' as const
 
 /** npm install 全局安装命令 */
 export const NPM_INSTALL_COMMAND = `npm install -g ${PACKAGE_NAME}` as const

package/src/tools/exec/git.ts

@@ -75,6 +75,60 @@ function isOutsideWorktree(command: string, cwd: string): string | null {
   return null
 }
 
+/**
+ * Split a git command string into argv tokens, honoring shell-style quoting
+ * (single quotes, double quotes, and backslash escapes). Unlike a naive
+ * `split(/\s+/)`, this keeps `-m "multi word message"` as a single argument
+ * instead of splitting it into separate tokens.
+ */
+export function splitCommand(command: string): string[] {
+  const tokens: string[] = []
+  let current = ''
+  let inSingle = false
+  let inDouble = false
+
+  for (let i = 0; i < command.length; i++) {
+    const ch = command[i]!
+
+    if (inSingle) {
+      if (ch === "'") inSingle = false
+      else current += ch
+      continue
+    }
+
+    if (inDouble) {
+      if (ch === '"') inDouble = false
+      else if (ch === '\\' && i + 1 < command.length && '$`"\\'.includes(command[i + 1]!)) {
+        current += command[++i]!
+      } else {
+        current += ch
+      }
+      continue
+    }
+
+    if (ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r') {
+      if (current !== '') {
+        tokens.push(current)
+        current = ''
+      }
+      continue
+    }
+
+    if (ch === "'") {
+      inSingle = true
+    } else if (ch === '"') {
+      inDouble = true
+    } else if (ch === '\\' && i + 1 < command.length) {
+      current += command[++i]!
+    } else {
+      current += ch
+    }
+  }
+
+  if (current !== '') tokens.push(current)
+  return tokens
+}
+
 export const gitTool: ToolDefinition = {
   name: 'Git',
   description: 'Execute git commands. Dangerous operations (force push, hard reset) are blocked.',
@@ -115,7 +169,7 @@ export const gitTool: ToolDefinition = {
     }
 
     try {
-      const proc = Bun.spawn(['git', ...command.split(/\s+/)], {
+      const proc = Bun.spawn(['git', ...splitCommand(command)], {
         cwd: ctx.cwd,
         stdout: 'pipe',
         stderr: 'pipe',

package/src/ui/agent-footer.tsx

@@ -101,6 +101,9 @@ function rotatingGerund(tick: number): string {
   return GERUNDS[Math.floor(tick / 2) % GERUNDS.length]!
 }
 
+/** Max agent lines to render before collapsing the rest into "↓ N more". */
+const MAX_AGENT_LINES = 5
+
 export function AgentFooter({ agents, tick, activeTool, agentProgress }: AgentFooterProps) {
   const { t } = useI18n()
   const hasAgents = agents.length > 0
@@ -118,6 +121,7 @@ export function AgentFooter({ agents, tick, activeTool, agentProgress }: AgentFo
             {'  '}[{activeTool!.name} {activeTool!.detail.slice(0, 60)}
             {animatedDots(tick)}]
           </Text>
+          <Box flexGrow={1} />
           <Text dimColor>
             {' '}
             {formatElapsed(Math.floor((Date.now() - activeTool!.startTime) / 1000))}
@@ -131,6 +135,7 @@ export function AgentFooter({ agents, tick, activeTool, agentProgress }: AgentFo
           <Text color="#FFA500">
             {'  '}✻ {rotatingGerund(tick)}…
           </Text>
+          <Box flexGrow={1} />
           <Text dimColor>
             {' ('}
             {formatElapsed(Math.floor((Date.now() - agentProgress!.startTime) / 1000))}
@@ -142,8 +147,8 @@ export function AgentFooter({ agents, tick, activeTool, agentProgress }: AgentFo
         </Box>
       )}
 
-      {/* Agent status lines */}
-      {agents.map((agent) => {
+      {/* Agent status lines — collapse to MAX_AGENT_LINES + "↓ N more" */}
+      {agents.slice(0, MAX_AGENT_LINES).map((agent) => {
         const elapsed = Math.floor((Date.now() - agent.startTime) / 1000)
         const isRunning = agent.status === 'running'
         const symbol = isRunning ? '◯' : '◼'
@@ -163,7 +168,8 @@ export function AgentFooter({ agents, tick, activeTool, agentProgress }: AgentFo
               {agent.name}
             </Text>
             <Text dimColor> {desc}</Text>
-            {/* Spacer pushes stats to the right — Ink handles this naturally */}
+            {/* Spacer pushes elapsed + tokens to the right edge */}
+            <Box flexGrow={1} />
             <Text dimColor>
               {'  '}
               {isRunning ? formatElapsed(elapsed) : t('ui.agent.finished')}
@@ -177,6 +183,11 @@ export function AgentFooter({ agents, tick, activeTool, agentProgress }: AgentFo
           </Box>
         )
       })}
+      {agents.length > MAX_AGENT_LINES && (
+        <Text dimColor>
+          {'  '}↓ {agents.length - MAX_AGENT_LINES} more
+        </Text>
+      )}
     </Box>
   )
 }

package/src/ui/app.tsx

@@ -270,7 +270,23 @@ export function App({
       agentProgressRef.current !== null ||
       activeToolRef.current !== null
     if (!hasRunning) return
-    const i = setInterval(() => setAgentTick((t) => t + 1), 1000)
+    const i = setInterval(() => {
+      setAgentTick((t) => t + 1)
+      // Refresh live token counts for running background agents.
+      setRunningAgents((prev) => {
+        const bg = getBackgroundAgentRegistry()
+        let changed = false
+        const next = { ...prev }
+        for (const task of bg.list()) {
+          const cur = next[task.id]
+          if (cur && cur.status === 'running' && cur.tokensUsed !== task.tokensUsed) {
+            next[task.id] = { ...cur, tokensUsed: task.tokensUsed }
+            changed = true
+          }
+        }
+        return changed ? next : prev
+      })
+    }, 1000)
     return () => clearInterval(i)
   }, [runningAgents, agentProgress, activeTool])
 
@@ -282,14 +298,14 @@ export function App({
     setRunningAgents((prev) => {
       const next: Record<string, AgentEntry> = {}
       for (const task of all) {
-        // Preserve existing entry if it has more data (e.g. tokens accumulated during streaming)
+        // Preserve existing entry for metadata; tokens come from the registry task.
         const existing = prev[task.id]
         next[task.id] = {
           id: task.id,
           name: existing?.name || task.agentType.charAt(0).toUpperCase() + task.agentType.slice(1),
           description: existing?.description || task.description,
           startTime: existing?.startTime || task.startedAt.getTime(),
-          tokensUsed: existing?.tokensUsed || 0,
+          tokensUsed: task.tokensUsed ?? 0,
           status: task.status === 'running' ? 'running' : 'completed',
         }
       }