@miphamai/cli 0.33.0 → 0.33.2

package/src/ui/app.tsx

@@ -1,6 +1,7 @@
 import React, { useState, useCallback, useEffect, useRef, useMemo } from 'react'
 import { Box, Text, useInput } from 'ink'
 import TextInput from 'ink-text-input'
+import { ErrorBoundary } from './error-boundary'
 import type { QueryEngine } from '../core/engine'
 import type { RemoteEngine } from '../daemon/remote-engine'
 import type { MiphamConfig } from '../shared/index.ts'
@@ -410,7 +411,17 @@ export function App({
               role: msg.role,
               content: typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content),
             }))
-            setMessages((prev) => [...prev, ...restored])
+            if (result.resumeWarning) {
+              // Fix 7: Session isolation — add a visual separator between current session
+              // and restored history to prevent accidental leakage/confusion
+              const separator: ChatMessage = {
+                role: 'assistant' as const,
+                content: '── Restored session history below ──',
+              }
+              setMessages((prev) => [...prev, separator, ...restored])
+            } else {
+              setMessages((prev) => [...prev, ...restored])
+            }
           }
           if (result.copyContent) {
             // Copy to clipboard via pbcopy (macOS) or clip (Windows)
@@ -743,140 +754,142 @@ export function App({
   }
 
   return (
-    <Box flexDirection="column" padding={1} height="100%">
-      {/* Workflow progress — auto-detects active workflows, renders nothing when idle */}
-      <WorkflowProgress />
-
-      {/* Agent View Dashboard — Ctrl+G overlay (replaces chat + input) */}
-      {agentViewOpen && agentViewManager ? (
-        <AgentViewDashboard
-          manager={agentViewManager}
-          onAttach={() => {}}
-          onExit={() => setAgentViewOpen(false)}
-        />
-      ) : (
-        <>
-          {/* Chat panel */}
-          <ChatPanel messages={messages} focusMode={focusMode} />
-
-          {/* Input with separator lines */}
-          {pickerOpen ? (
-            <ModelPicker
-              config={config}
-              currentProvider={providerId}
-              currentModel={modelId}
-              onSelect={(newProvider, newModel) => {
-                engine.switchProvider(newProvider, newModel)
-                setProviderId(newProvider)
-                setModelId(newModel)
-                setPickerOpen(false)
-                setMessages((prev) => [
-                  ...prev,
-                  { role: 'system', content: `✓ Switched to ${newProvider}/${newModel}` },
-                ])
-              }}
-              onNeedsApiKey={(providerId, modelId, providerName) => {
-                setApiKeyPrompt({ providerId, modelId, providerName })
-                setApiKeyInput('')
-                setPickerOpen(false)
-                setMessages((prev) => [
-                  ...prev,
-                  {
-                    role: 'system',
-                    content: t('ui.picker.needs_api_key', { provider: providerName }),
-                  },
-                ])
-              }}
-              onClose={() => setPickerOpen(false)}
-            />
-          ) : (
-            /* Input bar (hidden when picker is open) */
-            <Box flexDirection="column">
-              <Text dimColor>──────────────────────────────</Text>
-              <InputBar
-                onSubmit={handleSubmit}
-                isLoading={isLoading}
-                onTogglePicker={() => setPickerOpen((prev) => !prev)}
-                onToggleFocus={() => setFocusMode((prev) => !prev)}
-                onToggleExpand={() => {
-                  setMessages((prev) => {
-                    const msgs = [...prev]
-                    for (let i = msgs.length - 1; i >= 0; i--) {
-                      if (msgs[i]?.toolMeta) {
-                        const meta = msgs[i]!.toolMeta!
-                        if (meta.collapsed) {
-                          msgs[i] = {
-                            ...msgs[i]!,
-                            content: `🔧 ${meta.name}: ${meta.input}\n📋 Result: ${meta.output || '(pending)'}`,
-                            toolMeta: { ...meta, collapsed: false },
-                          }
-                        } else {
-                          const short =
-                            meta.input.length > 50 ? meta.input.slice(0, 50) + '...' : meta.input
-                          msgs[i] = {
-                            ...msgs[i]!,
-                            content: `⏺ ${meta.name} · ${short} (Ctrl+O to expand)`,
-                            toolMeta: { ...meta, collapsed: true },
+    <ErrorBoundary>
+      <Box flexDirection="column" padding={1} height="100%">
+        {/* Workflow progress — auto-detects active workflows, renders nothing when idle */}
+        <WorkflowProgress />
+
+        {/* Agent View Dashboard — Ctrl+G overlay (replaces chat + input) */}
+        {agentViewOpen && agentViewManager ? (
+          <AgentViewDashboard
+            manager={agentViewManager}
+            onAttach={() => {}}
+            onExit={() => setAgentViewOpen(false)}
+          />
+        ) : (
+          <>
+            {/* Chat panel */}
+            <ChatPanel messages={messages} focusMode={focusMode} />
+
+            {/* Input with separator lines */}
+            {pickerOpen ? (
+              <ModelPicker
+                config={config}
+                currentProvider={providerId}
+                currentModel={modelId}
+                onSelect={(newProvider, newModel) => {
+                  engine.switchProvider(newProvider, newModel)
+                  setProviderId(newProvider)
+                  setModelId(newModel)
+                  setPickerOpen(false)
+                  setMessages((prev) => [
+                    ...prev,
+                    { role: 'system', content: `✓ Switched to ${newProvider}/${newModel}` },
+                  ])
+                }}
+                onNeedsApiKey={(providerId, modelId, providerName) => {
+                  setApiKeyPrompt({ providerId, modelId, providerName })
+                  setApiKeyInput('')
+                  setPickerOpen(false)
+                  setMessages((prev) => [
+                    ...prev,
+                    {
+                      role: 'system',
+                      content: t('ui.picker.needs_api_key', { provider: providerName }),
+                    },
+                  ])
+                }}
+                onClose={() => setPickerOpen(false)}
+              />
+            ) : (
+              /* Input bar (hidden when picker is open) */
+              <Box flexDirection="column">
+                <Text dimColor>──────────────────────────────</Text>
+                <InputBar
+                  onSubmit={handleSubmit}
+                  isLoading={isLoading}
+                  onTogglePicker={() => setPickerOpen((prev) => !prev)}
+                  onToggleFocus={() => setFocusMode((prev) => !prev)}
+                  onToggleExpand={() => {
+                    setMessages((prev) => {
+                      const msgs = [...prev]
+                      for (let i = msgs.length - 1; i >= 0; i--) {
+                        if (msgs[i]?.toolMeta) {
+                          const meta = msgs[i]!.toolMeta!
+                          if (meta.collapsed) {
+                            msgs[i] = {
+                              ...msgs[i]!,
+                              content: `🔧 ${meta.name}: ${meta.input}\n📋 Result: ${meta.output || '(pending)'}`,
+                              toolMeta: { ...meta, collapsed: false },
+                            }
+                          } else {
+                            const short =
+                              meta.input.length > 50 ? meta.input.slice(0, 50) + '...' : meta.input
+                            msgs[i] = {
+                              ...msgs[i]!,
+                              content: `⏺ ${meta.name} · ${short} (Ctrl+O to expand)`,
+                              toolMeta: { ...meta, collapsed: true },
+                            }
                           }
+                          break
                         }
-                        break
                       }
+                      return msgs
+                    })
+                  }}
+                  onCyclePermission={() => {
+                    setPermissionMode((prev) => {
+                      const idx = PERMISSION_MODES.indexOf(prev)
+                      const next = PERMISSION_MODES[(idx + 1) % PERMISSION_MODES.length]!
+                      engine.getPermission().setMode(next)
+                      return next
+                    })
+                  }}
+                  onCancel={() => {
+                    if (abortRef.current) {
+                      abortRef.current.abort()
                     }
-                    return msgs
-                  })
-                }}
-                onCyclePermission={() => {
-                  setPermissionMode((prev) => {
-                    const idx = PERMISSION_MODES.indexOf(prev)
-                    const next = PERMISSION_MODES[(idx + 1) % PERMISSION_MODES.length]!
-                    engine.getPermission().setMode(next)
-                    return next
-                  })
-                }}
-                onCancel={() => {
-                  if (abortRef.current) {
-                    abortRef.current.abort()
-                  }
-                }}
-                onToggleAgentView={() => setAgentViewOpen((prev) => !prev)}
-              />
-              <Text dimColor>──────────────────────────────</Text>
-            </Box>
-          )}
-
-          {/* Agent status footer — shows active tool indicator + inline agent progress + running background agents */}
-          <AgentFooter
-            agents={Object.values(runningAgents)}
-            tick={agentTick}
-            activeTool={activeTool}
-            agentProgress={agentProgress}
-          />
-
-          {/* Status line — Claude Code style */}
-          <Box marginTop={1} flexDirection="column">
-            {goalText && (
-              <Box>
-                <Text color="green">🎯 Goal: {goalText}</Text>
+                  }}
+                  onToggleAgentView={() => setAgentViewOpen((prev) => !prev)}
+                />
+                <Text dimColor>──────────────────────────────</Text>
               </Box>
             )}
-            <Box flexDirection="row">
-              <Text color={PERMISSION_COLORS[permissionMode]}>
-                ⏵⏵ {PERMISSION_LABELS[permissionMode]}
-              </Text>
-              <Text dimColor>
-                {' '}
-                ({t('ui.status.shift_tab_cycle')}: {PERMISSION_LABELS.default} ·{' '}
-                {PERMISSION_LABELS.acceptEdits} · {PERMISSION_LABELS.bypassPermissions} ·{' '}
-                {PERMISSION_LABELS.plan} · {PERMISSION_LABELS.auto} · {PERMISSION_LABELS.dontAsk})
-                {' · '}
-                {t('ui.status.esc_to_interrupt')}
-                {' · '}
-                {t('ui.status.left_for_agents')}
-              </Text>
+
+            {/* Agent status footer — shows active tool indicator + inline agent progress + running background agents */}
+            <AgentFooter
+              agents={Object.values(runningAgents)}
+              tick={agentTick}
+              activeTool={activeTool}
+              agentProgress={agentProgress}
+            />
+
+            {/* Status line — Claude Code style */}
+            <Box marginTop={1} flexDirection="column">
+              {goalText && (
+                <Box>
+                  <Text color="green">🎯 Goal: {goalText}</Text>
+                </Box>
+              )}
+              <Box flexDirection="row">
+                <Text color={PERMISSION_COLORS[permissionMode]}>
+                  ⏵⏵ {PERMISSION_LABELS[permissionMode]}
+                </Text>
+                <Text dimColor>
+                  {' '}
+                  ({t('ui.status.shift_tab_cycle')}: {PERMISSION_LABELS.default} ·{' '}
+                  {PERMISSION_LABELS.acceptEdits} · {PERMISSION_LABELS.bypassPermissions} ·{' '}
+                  {PERMISSION_LABELS.plan} · {PERMISSION_LABELS.auto} · {PERMISSION_LABELS.dontAsk})
+                  {' · '}
+                  {t('ui.status.esc_to_interrupt')}
+                  {' · '}
+                  {t('ui.status.left_for_agents')}
+                </Text>
+              </Box>
             </Box>
-          </Box>
-        </>
-      )}
-    </Box>
+          </>
+        )}
+      </Box>
+    </ErrorBoundary>
   )
 }

package/src/ui/commands.ts

@@ -83,6 +83,8 @@ export interface CommandResult {
   forwardToAI?: string
   /** If set, restored messages to load into the session (used by /resume last). */
   forwardedMessages?: Message[]
+  /** If true, resume into current non-empty session — app should warn before loading */
+  resumeWarning?: boolean
   /** API Key 补录请求：切换前需用户输入 Key */
   needsApiKey?: {
     providerId: string
@@ -269,11 +271,31 @@ const exitCmd: CommandHandler = () => ({ content: '', exit: true })
 const compactCmd: CommandHandler = async (ctx) => {
   const t = resolveT(ctx)
   const context = ctx.engine.getContext()
-  const before = context.getEstimatedTokens()
-  await context.compact('user requested compaction')
-  const after = context.getEstimatedTokens()
+  const msgsBefore = context.getMessageCount()
+  const tokensBefore = context.getEstimatedTokens()
+
+  // Show start progress
+  process.stderr.write(
+    `🔄 Compacting: ${msgsBefore} messages, ${tokensBefore.toLocaleString()} tokens...\n`,
+  )
+
+  const startTime = Date.now()
+  const result = await context.compact('user requested compaction')
+  const elapsed = ((Date.now() - startTime) / 1000).toFixed(1)
+  const msgsAfter = context.getMessageCount()
+  const saved = result.before > 0 ? ((1 - result.after / result.before) * 100).toFixed(0) : '0'
+
   return {
-    content: `${t('commands.compact.confirmed')}\n${t('commands.compact.tokens', { before: before.toLocaleString(), after: after.toLocaleString(), saved: ((1 - after / before) * 100).toFixed(0) })}`,
+    content: [
+      t('commands.compact.confirmed'),
+      `Messages: ${msgsBefore} → ${msgsAfter} | Tokens: ${result.before.toLocaleString()} → ${result.after.toLocaleString()} (${saved}% saved)`,
+      `Duration: ${elapsed}s`,
+      msgsBefore > msgsAfter
+        ? `💡 Tip: Use /compact early to prevent automatic compaction delays.`
+        : '',
+    ]
+      .filter(Boolean)
+      .join('\n'),
   }
 }
 
@@ -2256,6 +2278,46 @@ const hooksCmd: CommandHandler = async (ctx) => {
   }
 }
 
+const hooksHealthCmd: CommandHandler = (ctx) => {
+  const hookEngine = ctx.engine.getHookEngine?.()
+  if (!hookEngine) {
+    return { content: 'Hook engine not available.' }
+  }
+
+  const health = hookEngine.getHookHealth()
+  if (health.length === 0) {
+    return { content: '✅ All hooks are healthy — no failures recorded.' }
+  }
+
+  const lines: string[] = ['## 🪝 Hook Health Status', '']
+  for (const { key, health: h } of health) {
+    const status = h.disabled ? '🔴 DISABLED' : h.failures > 0 ? '🟡 DEGRADED' : '🟢 HEALTHY'
+    lines.push(`### ${status} \`${key}\``)
+    lines.push(`| 连续失败 | ${h.failures} (threshold: 5) |`)
+    lines.push(`| 总失败次数 | ${h.totalFailures} |`)
+    if (h.disabled) {
+      const remaining = Math.max(0, 5 - (Date.now() - h.disabledAt) / 60_000)
+      lines.push(`| 自动恢复 | ${remaining.toFixed(0)} min remaining |`)
+      lines.push('')
+      lines.push(`Use \`/hooks enable "${key}"\` to re-enable manually.`)
+    }
+    lines.push('')
+  }
+  return { content: lines.join('\n') }
+}
+
+const hooksEnableCmd: CommandHandler = (ctx, args) => {
+  const hookEngine = ctx.engine.getHookEngine?.()
+  if (!hookEngine) return { content: 'Hook engine not available.' }
+  const keyArg = args[0]?.trim().replace(/"/g, '')
+  if (!keyArg) {
+    return { content: 'Usage: /hooks enable "<hook-key>"\n\nUse /hooks health to see hook keys.' }
+  }
+  return hookEngine.reEnableHook(keyArg)
+    ? { content: `✅ Hook "${keyArg}" re-enabled.` }
+    : { content: `Hook "${keyArg}" not found or not disabled. Use /hooks health to check status.` }
+}
+
 const batchCmd: CommandHandler = async (ctx) => {
   const t = resolveT(ctx)
   return { content: t('commands.batch.title') }
@@ -2426,6 +2488,7 @@ const resumeLastCmd: CommandHandler = async (ctx) => {
         : t('commands.resume.restored_full_footer', { loaded: String(messages.length) }),
     ].join('\n'),
     forwardedMessages: messages,
+    resumeWarning: true,
   }
 }
 
@@ -3776,6 +3839,8 @@ registry.set('/stats', statsCmd)
 registry.set('/summary', summaryCmd)
 registry.set('/cd', cdCmd)
 registry.set('/hooks', hooksCmd)
+registry.set('/hooks health', hooksHealthCmd)
+registry.set('/hooks enable', hooksEnableCmd)
 registry.set('/batch', batchCmd)
 
 // ═══════════════════════════════════════════════════════════════
@@ -3909,6 +3974,8 @@ const COMMAND_DESCRIPTIONS: Record<string, string> = {
   '/summary': 'Generate session summary',
   '/cd': 'Change session working directory',
   '/hooks': 'Manage lifecycle hook scripts',
+  '/hooks health': 'Check hook health — see failures, disabled hooks, recovery status',
+  '/hooks enable': 'Manually re-enable a hook that was auto-disabled after repeated failures',
   '/batch': 'Apply changes across multiple files',
 }
 

package/src/ui/error-boundary.tsx

@@ -0,0 +1,85 @@
+/**
+ * Fix 8: Error Boundary for UI Rendering Protection
+ *
+ * Catches rendering errors in the React/Ink component tree,
+ * preventing the "layout freeze" bug where the interactive session
+ * stops redrawing while the process stays alive.
+ *
+ * Recovery path: renders a fallback message with a hint that the
+ * user can press Enter to attempt recovery (re-render).
+ */
+
+import React, { Component } from 'react'
+import { Text, Box } from 'ink'
+
+interface Props {
+  children: React.ReactNode
+  /** Called when a render error is caught */
+  onError?: (error: Error, errorInfo: React.ErrorInfo) => void
+}
+
+interface State {
+  hasError: boolean
+  error: Error | null
+  errorCount: number
+}
+
+export class ErrorBoundary extends Component<Props, State> {
+  private resetTimer: ReturnType<typeof setTimeout> | null = null
+
+  constructor(props: Props) {
+    super(props)
+    this.state = { hasError: false, error: null, errorCount: 0 }
+  }
+
+  static getDerivedStateFromError(error: Error): Partial<State> {
+    return { hasError: true, error }
+  }
+
+  override componentDidCatch(error: Error, errorInfo: React.ErrorInfo): void {
+    // Log to stderr for diagnostics
+    process.stderr.write(
+      `\n⚠️  UI Error Boundary caught: ${error.message}\n` +
+        `   Component: ${errorInfo.componentStack?.slice(0, 200) || 'unknown'}\n`,
+    )
+
+    this.props.onError?.(error, errorInfo)
+
+    // Auto-recovery: reset after 5 seconds to attempt re-render
+    this.resetTimer = setTimeout(() => {
+      this.setState((prev) => ({
+        hasError: false,
+        error: null,
+        errorCount: prev.errorCount,
+      }))
+    }, 5_000)
+  }
+
+  override componentWillUnmount(): void {
+    if (this.resetTimer) {
+      clearTimeout(this.resetTimer)
+    }
+  }
+
+  override render(): React.ReactNode {
+    if (this.state.hasError) {
+      return (
+        <Box flexDirection="column" padding={1}>
+          <Text color="red" bold>
+            ⚠️ UI Render Error
+          </Text>
+          <Text dimColor>{this.state.error?.message || 'Unknown rendering error'}</Text>
+          <Text> </Text>
+          <Text dimColor>
+            The terminal interface encountered a rendering issue. Auto-recovery in 5 seconds...
+            Press Enter to attempt immediate recovery.
+          </Text>
+          <Text> </Text>
+          <Text color="yellow">Your session data and conversation history are preserved.</Text>
+        </Box>
+      )
+    }
+
+    return this.props.children
+  }
+}