@miphamai/cli 0.33.1 → 0.34.0

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)
@@ -438,6 +449,24 @@ export function App({
         }
       }
 
+      // ── Emotion detection: adjust behavior based on user's emotional state ──
+      // Uses regex heuristics (zero-latency) to detect frustration/impatience/confusion.
+      // When frustrated, prepends a terseness instruction to the user input so the
+      // AI model skips explanations and gets straight to the fix.
+      let emotionPrefix = ''
+      try {
+        const { EmotionDetector } = await import('../core/emotion-detector.js')
+        const detector = new EmotionDetector()
+        const result = detector.detect(input)
+        if (result.emotion === 'frustrated' || result.emotion === 'impatient') {
+          emotionPrefix = `[SYSTEM NOTE: The user is ${result.emotion}. Be extremely concise. Skip all explanations, preambles, and summaries. Output only the fix/result. No "here's what I did" or "let me explain". One sentence maximum before code.]\n\n`
+        } else if (result.emotion === 'confused') {
+          emotionPrefix = `[SYSTEM NOTE: The user seems confused. Explain more thoroughly, break down complex steps, and offer clarifying questions rather than assuming understanding.]\n\n`
+        }
+      } catch {
+        // Emotion detection is non-critical — fail silently
+      }
+
       // ── Normal message processing (AI chat) ──
       setMessages((prev) => [...prev, { role: 'user', content: input }])
       setIsLoading(true)
@@ -482,7 +511,10 @@ export function App({
       }
 
       try {
-        for await (const chunk of engine.process(input, controller.signal)) {
+        for await (const chunk of engine.process(
+          emotionPrefix ? emotionPrefix + input : input,
+          controller.signal,
+        )) {
           // Reasoning content (DeepSeek V4 thinking mode) — silently consumed,
           // not shown to user to avoid noise.
           if (chunk.reasoning_content) {
@@ -743,140 +775,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>
   )
 }