codemini-cli 0.3.1 → 0.3.2

package/src/tui/chat-app.js

@@ -102,7 +102,7 @@ const TUI_COPY = {
       startupHint: '使用 /help、/commands、/compact、/exit、!<shell>。Tab 可自动补全 slash 命令。',
       toolSummaryExpanded: '工具摘要：已展开',
       toolSummaryCollapsed: '工具摘要：已收起',
-      toolChainCollapsed: (count) => `已折叠更早的 ${count} 个工具调用，按 Ctrl+T 展开全部`,
+      toolChainCollapsed: (count) => `已折叠更早的 ${count} 个工具调用`,
       toggleToolSummary: 'Ctrl+T 切换',
       scrollHint: '使用终端自己的滚动条或 scrollback',
       keyboardDebugEnabled: '键盘调试已开启',
@@ -247,7 +247,7 @@ const TUI_COPY = {
       startupHint: 'Use /help, /commands, /compact, /exit, !<shell>. Tab for slash autocomplete.',
       toolSummaryExpanded: 'Tool summary: expanded',
       toolSummaryCollapsed: 'Tool summary: collapsed',
-      toolChainCollapsed: (count) => `${count} earlier tool calls hidden, press Ctrl+T to expand`,
+      toolChainCollapsed: (count) => `${count} earlier tool calls hidden`,
       toggleToolSummary: 'Ctrl+T to toggle',
       scrollHint: 'Scroll with your terminal scrollbar or scrollback',
       keyboardDebugEnabled: 'Keyboard debug enabled',
@@ -697,6 +697,61 @@ function parseRichTextSegments(line, baseColor) {
   });
 }
 
+export function sanitizeRenderableText(value) {
+  const input = String(value ?? '');
+  if (!input) return '';
+
+  return input
+    .replace(/\r\n/g, '\n')
+    .replace(/\r/g, '\n')
+    .replace(/\u001b\][^\u0007\u001b]*(?:\u0007|\u001b\\)/g, '')
+    .replace(/[\u001b\u009b][[\]()#;?]*(?:(?:(?:[a-zA-Z\d]*(?:;[a-zA-Z\d]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g, '')
+    .replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/g, '');
+}
+
+function textFromSessionContent(content) {
+  if (typeof content === 'string') return sanitizeRenderableText(content);
+  if (Array.isArray(content)) {
+    return sanitizeRenderableText(
+      content
+        .map((part) => {
+          if (typeof part === 'string') return part;
+          if (part?.type === 'text') return part.text || '';
+          return '';
+        })
+        .join('')
+    );
+  }
+  return sanitizeRenderableText(String(content || ''));
+}
+
+function buildUiMessagesFromSessionHistory(sessionMessages, nextId) {
+  const source = Array.isArray(sessionMessages) ? sessionMessages : [];
+  const out = [];
+
+  for (const message of source) {
+    if (!message || typeof message !== 'object') continue;
+    if (message.role === 'tool') continue;
+
+    const text = textFromSessionContent(message.content);
+    if (!text.trim() && message.role !== 'assistant') continue;
+
+    if (message.role === 'user') {
+      out.push({ id: nextId(), label: 'you', text, color: 'blueBright' });
+      continue;
+    }
+    if (message.role === 'assistant') {
+      out.push({ id: nextId(), label: 'coder', text, color: 'greenBright' });
+      continue;
+    }
+    if (message.role === 'system') {
+      out.push({ id: nextId(), label: 'system', text, color: 'yellowBright' });
+    }
+  }
+
+  return out;
+}
+
 function safeJsonParse(raw) {
   try {
     return JSON.parse(String(raw || '{}'));
@@ -1018,6 +1073,21 @@ function ContextProgressMeter({ runtimeState, runtimeStatus, compact = false })
 function PlanStrip({ planState, copy }) {
   if (!planState || !planState.total) return null;
   const progress = `${planState.current}/${planState.total}`;
+  const stripComplete = Boolean(planState.completed) && !planState.failed;
+  const statusLabel = planState.failed ? copy.generic.attention : stripComplete ? copy.generic.taskCompleted : copy.generic.active;
+  const statusColor = planState.failed ? 'redBright' : stripComplete ? 'cyanBright' : 'greenBright';
+  const roleLabel =
+    planState.resultStatus || stripComplete || planState.failed
+      ? copy?.roleLabels?.system === 'SYSTEM'
+        ? 'RESULT'
+        : '结果'
+      : String(planState.role || 'agent').toUpperCase();
+  const titleLabel =
+    planState.resultStatus || stripComplete || planState.failed
+      ? copy?.roleLabels?.system === 'SYSTEM'
+        ? 'Plan execution result'
+        : '计划执行结果'
+      : planState.title || 'running plan step';
   return h(
     Box,
     {
@@ -1036,11 +1106,18 @@ function PlanStrip({ planState, copy }) {
         null,
         h(Text, { color: 'black', backgroundColor: planState.failed ? 'red' : 'cyanBright' }, ` ${copy.generic.plan} ${progress} `),
         h(Text, { color: 'gray' }, '  '),
-        h(Text, { color: 'magentaBright' }, String(planState.role || 'agent').toUpperCase())
+        h(Text, { color: 'magentaBright' }, roleLabel)
       ),
-      h(Text, { color: planState.failed ? 'redBright' : 'greenBright' }, planState.failed ? copy.generic.attention : copy.generic.active)
+      h(Text, { color: statusColor }, statusLabel)
     ),
-    h(Text, { color: 'white' }, planState.title || 'running plan step'),
+    h(Text, { color: 'white' }, titleLabel),
+    planState.resultVerified
+      ? h(
+          Box,
+          { marginTop: 1 },
+          h(Text, { color: 'gray' }, trimText(planState.resultVerified, 120))
+        )
+      : null,
     planState.steps.length > 0
       ? h(
           Box,
@@ -1058,15 +1135,24 @@ function PlanStrip({ planState, copy }) {
             )
           )
         )
+      : null,
+    planState.resultNext
+      ? h(
+          Box,
+          { marginTop: 1 },
+          h(Text, { color: 'black', backgroundColor: 'yellowBright' }, ' NEXT '),
+          h(Text, { color: 'gray' }, ` ${trimText(planState.resultNext, 108)}`)
+        )
       : null
   );
 }
 
-function Header({ sessionId, model, shellName, safeMode = true }) {
+function Header({ sessionId, model, sdkProvider, shellName, safeMode = true }) {
   const shortSession = String(sessionId || '').slice(-12) || '-';
   const modeValue = safeMode ? 'SAFE' : 'OPEN';
   const modeColor = safeMode ? 'greenBright' : 'redBright';
   const modeTextColor = safeMode ? 'black' : 'white';
+  const sdkValue = String(sdkProvider || 'openai-compatible');
   return h(
     Box,
     { width: '100%', justifyContent: 'center', marginTop: 1, marginBottom: 2 },
@@ -1094,6 +1180,7 @@ function Header({ sessionId, model, shellName, safeMode = true }) {
       h(
         Box,
         { flexDirection: 'row', justifyContent: 'center' },
+        h(StatusPill, { label: 'SDK', value: sdkValue, color: 'blueBright', textColor: 'white' }),
         h(StatusPill, { label: 'MODEL', value: model, color: 'cyanBright', textColor: 'black' }),
         h(StatusPill, { label: 'SHELL', value: shellName || 'powershell', color: 'yellowBright', textColor: 'black' }),
         h(StatusPill, { label: 'SESSION', value: shortSession, color: 'magentaBright', textColor: 'black' }),
@@ -1149,6 +1236,7 @@ export function parseAutoPlanSummaryMessage(text) {
     filePath: '',
     planSummary: '',
     finalSummary: '',
+    approval: '',
     stepsTotal: '',
     completed: '',
     warnings: '',
@@ -1159,8 +1247,10 @@ export function parseAutoPlanSummaryMessage(text) {
 
   for (const line of lines.slice(1)) {
     if (line.startsWith('File: ')) parsed.filePath = line.slice('File: '.length).trim();
+    else if (line.startsWith('Plan File: ')) parsed.filePath = line.slice('Plan File: '.length).trim();
     else if (line.startsWith('Plan Summary: ')) parsed.planSummary = line.slice('Plan Summary: '.length).trim();
     else if (line.startsWith('Final Summary: ')) parsed.finalSummary = line.slice('Final Summary: '.length).trim();
+    else if (line.startsWith('Approval: ')) parsed.approval = line.slice('Approval: '.length).trim();
     else if (line.startsWith('Steps: ')) parsed.stepsTotal = line.slice('Steps: '.length).trim();
     else if (line.startsWith('Completed: ')) parsed.completed = line.slice('Completed: '.length).trim();
     else if (line.startsWith('Warnings: ')) parsed.warnings = line.slice('Warnings: '.length).trim();
@@ -1184,6 +1274,31 @@ export function parsePlanProgressLine(text) {
   };
 }
 
+export function parsePlanExecutionResult(text) {
+  const raw = String(text || '').trim();
+  if (!raw) return null;
+  const statusMatch = raw.match(/(?:^|\n)\s*Status:\s*(done|partial|blocked)\s*$/im);
+  const verifiedMatch = raw.match(/(?:^|\n)\s*Verified:\s*(.+)\s*$/im);
+  const nextMatch = raw.match(/(?:^|\n)\s*Next:\s*(.+)\s*$/im);
+  if (!statusMatch && !verifiedMatch && !nextMatch) return null;
+  return {
+    status: String(statusMatch?.[1] || '').trim().toLowerCase(),
+    verified: String(verifiedMatch?.[1] || '').trim(),
+    next: String(nextMatch?.[1] || '').trim()
+  };
+}
+
+export function stripPlanExecutionResult(text) {
+  const raw = String(text || '');
+  if (!parsePlanExecutionResult(raw)) return raw;
+  return raw
+    .replace(/(?:^|\n)\s*Status:\s*(done|partial|blocked)\s*$/im, '')
+    .replace(/(?:^|\n)\s*Verified:\s*.+\s*$/im, '')
+    .replace(/(?:^|\n)\s*Next:\s*.+\s*$/im, '')
+    .replace(/\n{3,}/g, '\n\n')
+    .trim();
+}
+
 function getTailPreviewWindow(text, maxLines = 3) {
   const source = String(text || '');
   if (!source.trim()) return { lines: [], startLine: 1 };
@@ -1410,7 +1525,7 @@ function finishCodeGeneration(msg, now = Date.now()) {
 
 export function injectPlanStateMessage(messages, planState, activeUserMessageId, activeAssistantId) {
   const source = Array.isArray(messages) ? messages : [];
-  if (!planState || !planState.total) return source;
+  if (!planState || !planState.total || planState.pendingApproval) return source;
   const synthetic = {
     id: `plan-state-${planState.current}-${planState.total}-${planState.role || 'agent'}`,
     label: 'system',
@@ -1456,6 +1571,7 @@ function PlanSummaryBubble({ msg, copy }) {
     ? {
         conclusion: 'Conclusion',
         plan: 'Plan',
+        approval: 'Approval',
         warnings: 'Warnings',
         failed: 'Failed',
         file: 'File',
@@ -1467,6 +1583,7 @@ function PlanSummaryBubble({ msg, copy }) {
     : {
         conclusion: '结论',
         plan: '计划',
+        approval: '审批',
         warnings: '警告',
         failed: '失败',
         file: '文件',
@@ -1520,11 +1637,19 @@ function PlanSummaryBubble({ msg, copy }) {
       summary.planSummary
         ? h(
             Box,
-            { marginBottom: metaItems.length > 0 || summary.warningSteps || summary.failedSteps || shortFile ? 1 : 0, flexDirection: 'column' },
+            { marginBottom: summary.approval || metaItems.length > 0 || summary.warningSteps || summary.failedSteps || shortFile ? 1 : 0, flexDirection: 'column' },
             h(Text, { color: 'cyanBright' }, labels.plan),
             h(Text, { color: 'gray' }, summary.planSummary)
           )
         : null,
+      summary.approval
+        ? h(
+            Box,
+            { marginBottom: metaItems.length > 0 || summary.warningSteps || summary.failedSteps || shortFile ? 1 : 0, flexDirection: 'column' },
+            h(Text, { color: 'yellowBright' }, labels.approval),
+            h(Text, { color: 'gray' }, summary.approval)
+          )
+        : null,
       metaItems.length > 0
         ? h(
             Box,
@@ -2497,7 +2622,7 @@ function makeIdleStatus(copy, snapshot, variant = 'ready') {
   );
 }
 
-export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName = 'powershell', version = '', safeMode = true }) {
+export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compatible', language = 'zh', shellName = 'powershell', version = '', safeMode = true }) {
   const copy = getCopy(language);
   const stdoutCols = Number(process.stdout?.columns || 120);
   const [inputValue, setInputValue] = useState('');
@@ -2513,6 +2638,7 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
   const [cursorVisible, setCursorVisible] = useState(true);
   const [displaySessionId, setDisplaySessionId] = useState(sessionId);
   const [displayModel, setDisplayModel] = useState(model);
+  const [displaySdkProvider, setDisplaySdkProvider] = useState(sdkProvider);
   const [pendingQueue, setPendingQueue] = useState([]);
   const [loaderTick, setLoaderTick] = useState(0);
   const [runtimeStatus, setRuntimeStatus] = useState(
@@ -2526,7 +2652,12 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
     role: '',
     title: '',
     failed: false,
-    steps: []
+    steps: [],
+    pendingApproval: false,
+    completed: false,
+    resultStatus: '',
+    resultVerified: '',
+    resultNext: ''
   });
   const [debugKeys, setDebugKeys] = useState(false);
   const [lastKeyDebug, setLastKeyDebug] = useState('');
@@ -2605,6 +2736,7 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
     if (!snapshot) return;
     setDisplaySessionId(snapshot.sessionId || sessionId);
     setDisplayModel(snapshot.model || model);
+    setDisplaySdkProvider(snapshot.sdkProvider || sdkProvider);
     setRuntimeState(snapshot);
     setRuntimeStatus(makeIdleStatus(copy, snapshot, variant));
   };
@@ -2641,6 +2773,11 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
         role,
         title,
         failed: false,
+        pendingApproval: false,
+        completed: false,
+        resultStatus: '',
+        resultVerified: '',
+        resultNext: '',
         steps: [...withoutCurrent, { index: current, total, role, title, status: 'active' }].sort((a, b) => a.index - b.index)
       };
     });
@@ -2763,6 +2900,10 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
 
   const appendResultMessage = (result) => {
     if (result.type === 'noop') return;
+    if (Array.isArray(result.restoredMessages)) {
+      setMessages(buildUiMessagesFromSessionHistory(result.restoredMessages, nextId));
+      syncRuntimeVisualState('after');
+    }
     if (
       result.type === 'system' &&
       typeof result.text === 'string' &&
@@ -2790,7 +2931,7 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
           {
             id: nextId(),
             label: 'system',
-            text: copy.generic.keyboardDebugStatus(debugKeys),
+            text: sanitizeRenderableText(copy.generic.keyboardDebugStatus(debugKeys)),
             color: 'yellowBright'
           }
         ]);
@@ -2798,13 +2939,14 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
       }
     }
     if (result.type === 'assistant') {
-      if (!activeAssistantIdRef.current && result.text) {
+      const { displayText } = applyPlanExecutionResult(result.text);
+      if (!activeAssistantIdRef.current && displayText) {
         setMessages((prev) => [
           ...prev,
           {
             id: nextId(),
             label: 'coder',
-            text: result.text,
+            text: sanitizeRenderableText(displayText),
             color: 'greenBright',
             autoSkillNames: activeAssistantAutoSkillNamesRef.current
           }
@@ -2813,12 +2955,27 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
       return;
     }
     const parsedPlanSummary = result.type === 'system' ? parseAutoPlanSummaryMessage(result.text || '') : null;
+    if (parsedPlanSummary?.approval === 'pending') {
+      setPlanState({
+        current: 0,
+        total: 0,
+        role: '',
+        title: '',
+        failed: false,
+        steps: [],
+        pendingApproval: true,
+        completed: false,
+        resultStatus: '',
+        resultVerified: '',
+        resultNext: ''
+      });
+    }
     setMessages((prev) => [
       ...prev,
       {
         id: nextId(),
         label: 'system',
-        text: result.text || '',
+        text: sanitizeRenderableText(result.text || ''),
         color: 'yellowBright',
         ...(parsedPlanSummary ? { planSummary: parsedPlanSummary } : {})
       }
@@ -2865,6 +3022,31 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
     });
   };
 
+  const applyPlanExecutionResult = (rawText) => {
+    const parsedExecution = parsePlanExecutionResult(rawText);
+    if (!parsedExecution || !planTextBufferRef.current) return { parsedExecution: null, displayText: rawText };
+    setPlanState((prev) => {
+      if (!prev.total) return prev;
+      return {
+        ...prev,
+        completed: parsedExecution.status === 'done',
+        failed: parsedExecution.status === 'blocked',
+        resultStatus: parsedExecution.status || prev.resultStatus,
+        resultVerified: parsedExecution.verified || prev.resultVerified,
+        resultNext: parsedExecution.next || prev.resultNext,
+        steps: (prev.steps || []).map((step) =>
+          step.index === prev.current && step.status === 'active'
+            ? { ...step, status: parsedExecution.status === 'blocked' ? 'failed' : 'done' }
+            : step
+        )
+      };
+    });
+    return {
+      parsedExecution,
+      displayText: stripPlanExecutionResult(rawText)
+    };
+  };
+
   const ensureActiveAssistant = () => {
     if (activeAssistantIdRef.current) return activeAssistantIdRef.current;
     const aid = nextId();
@@ -2913,7 +3095,19 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
     setBusy(true);
     setInputStage('sending');
     setRuntimeStatus(makeStatus(copy.runtime.sendingToGateway, copy.runtime.preparingRequest, 'yellowBright'));
-    setPlanState({ current: 0, total: 0, role: '', title: '', failed: false, steps: [] });
+    setPlanState({
+      current: 0,
+      total: 0,
+      role: '',
+      title: '',
+      failed: false,
+      steps: [],
+      pendingApproval: false,
+      completed: false,
+      resultStatus: '',
+      resultVerified: '',
+      resultNext: ''
+    });
     planTextBufferRef.current = '';
     activeAssistantIdRef.current = null;
     activeAssistantAutoSkillNamesRef.current = [];
@@ -2996,16 +3190,19 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
           if (hadActiveAssistant) {
             streamedAssistantHandledRef.current = true;
           }
+          const { displayText } = applyPlanExecutionResult(event.text);
           if (targetId && !hasPlannedTools) {
             setMessages((prev) =>
               prev.map((m) => {
                 if (m.id !== targetId) return m;
-                const responseText = typeof event.text === 'string' ? event.text.trim() : '';
-                const shouldSynthesizeCompletion = !responseText && m.syntheticPrelude;
+                const responseText = typeof displayText === 'string' ? displayText.trim() : '';
+                const cleanedExistingText = stripPlanExecutionResult(String(m.text || '')).trim();
+                const finalText = responseText || cleanedExistingText;
+                const shouldSynthesizeCompletion = !finalText && m.syntheticPrelude;
                 return {
                   ...m,
-                  ...(responseText
-                    ? { text: event.text, syntheticPrelude: false }
+                  ...(finalText
+                    ? { text: finalText, syntheticPrelude: false }
                     : shouldSynthesizeCompletion
                       ? { text: buildSyntheticCompletionText(m, copy), syntheticPrelude: false }
                       : {}),
@@ -3024,9 +3221,10 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
             activeAssistantIdRef.current = null;
           }
           if (!hadActiveAssistant && !hasPlannedTools && event.text) {
+            const cleanedStandaloneText = stripPlanExecutionResult(String(displayText || event.text)).trim();
             setMessages((prev) => [
               ...prev,
-              { id: nextId(), label: 'coder', text: event.text, color: 'greenBright' }
+              { id: nextId(), label: 'coder', text: cleanedStandaloneText, color: 'greenBright' }
             ]);
           }
         }
@@ -3265,7 +3463,8 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
         appendResultMessage(result);
       })
       .catch((err) => {
-        setRuntimeStatus(makeStatus(copy.runtime.requestFailed, err.message, 'redBright'));
+        const message = sanitizeRenderableText(err?.message || String(err));
+        setRuntimeStatus(makeStatus(copy.runtime.requestFailed, message, 'redBright'));
         setInputStage('idle');
         updateMessageMeta(activeUserMessageIdRef.current, {
           loading: false,
@@ -3281,7 +3480,7 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
         }));
         setMessages((prev) => [
           ...prev,
-          { id: nextId(), label: 'error', text: err.message, color: 'redBright' }
+          { id: nextId(), label: 'error', text: message, color: 'redBright' }
         ]);
       })
       .finally(() => {
@@ -3343,6 +3542,7 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
         appendResultMessage(result);
       })
       .catch((err) => {
+        const message = sanitizeRenderableText(err?.message || String(err));
         updateMessageMeta(userMessageId, {
           loading: false,
           phase: undefined,
@@ -3350,7 +3550,7 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
         });
         setMessages((prev) => [
           ...prev,
-          { id: nextId(), label: 'error', text: err.message, color: 'redBright' }
+          { id: nextId(), label: 'error', text: message, color: 'redBright' }
         ]);
       });
   };
@@ -3677,7 +3877,7 @@ export function ChatApp({ runtime, sessionId, model, language = 'zh', shellName
   return h(
     Box,
     { flexDirection: 'column' },
-    h(Header, { sessionId: displaySessionId, model: displayModel, shellName, safeMode }),
+    h(Header, { sessionId: displaySessionId, model: displayModel, sdkProvider: displaySdkProvider, shellName, safeMode }),
     h(MessageList, {
       messages: visibleMessages,
       loaderTick,