codemini-cli 0.3.5 → 0.3.7

package/src/tui/chat-app.js

@@ -44,6 +44,38 @@ const ROLE_STYLES = {
     badgeText: 'black',
     chrome: 'gray'
   },
+  planner: {
+    accent: 'magentaBright',
+    border: 'magenta',
+    text: 'magentaBright',
+    badgeBg: 'magenta',
+    badgeText: 'white',
+    chrome: 'gray'
+  },
+  reviewer: {
+    accent: 'yellowBright',
+    border: 'yellow',
+    text: 'yellowBright',
+    badgeBg: 'yellow',
+    badgeText: 'black',
+    chrome: 'gray'
+  },
+  tester: {
+    accent: 'blueBright',
+    border: 'blue',
+    text: 'blueBright',
+    badgeBg: 'blue',
+    badgeText: 'white',
+    chrome: 'gray'
+  },
+  summarizer: {
+    accent: 'cyanBright',
+    border: 'cyan',
+    text: 'cyanBright',
+    badgeBg: 'cyan',
+    badgeText: 'black',
+    chrome: 'gray'
+  },
   system: {
     accent: 'yellowBright',
     border: 'yellow',
@@ -72,7 +104,7 @@ const ROLE_STYLES = {
 
 const TUI_COPY = {
   zh: {
-    roleLabels: { you: '你', coder: 'CODER', system: '系统', error: '错误', pending: '等待中' },
+    roleLabels: { you: '👤 你', coder: '💻 CODER', planner: '📋 PLANNER', reviewer: '🔍 REVIEWER', tester: '🧪 TESTER', summarizer: '📝 SUMMARIZER', system: '⚙️ 系统', error: '❌ 错误', pending: '⏳ 等待中' },
     generic: {
       waitingForInput: '等待输入',
       ready: '就绪',
@@ -99,7 +131,7 @@ const TUI_COPY = {
       pendingQueue: '等待队列',
       commandPaletteGroupedSelect: '命令面板 | 分组选择模式',
       commandPaletteGroupedSuggestions: '命令面板 | 分组候选',
-      startupHint: '使用 /help、/commands、/compact、/exit、!<shell>。Tab 可自动补全 slash 命令。',
+      startupHint: '使用 /help、/commands、/compact、/exit、/stop、!<shell>。Tab 可自动补全 slash 命令。',
       toolSummaryExpanded: '工具摘要：已展开',
       toolSummaryCollapsed: '工具摘要：已收起',
       toolChainCollapsed: (count) => `已折叠更早的 ${count} 个工具调用`,
@@ -126,6 +158,8 @@ const TUI_COPY = {
       doingEdit: '正在编辑文件',
       doneWrite: '已写入文件',
       doingWrite: '正在写入文件',
+      doneDelete: '已删除目标',
+      doingDelete: '正在等待删除确认',
       donePatch: '已应用补丁',
       doingPatch: '正在应用补丁',
       doneList: '已列出目录',
@@ -204,16 +238,30 @@ const TUI_COPY = {
       compactingContext: '正在压缩上下文',
       autoCompactTriggered: (mode, threshold) => `自动压缩已触发（${mode}，阈值 ${threshold}%）`,
       requestFailed: '请求失败',
+      responseStopped: '回答已中止',
       localCommandRunning: '正在执行本地命令',
       queuedWaiting: '排队中，等待上一轮完成',
       idleReady: '等待输入',
       idleReadyDetail: '就绪',
       idleAfterTurn: '空闲',
       idleAfterTurnDetail: '等待下一轮输入'
+    },
+    deleteApproval: {
+      title: '确认删除？',
+      pathLabel: '路径',
+      nameLabel: '名称',
+      typeLabel: '类型',
+      fileType: '文件',
+      directoryType: '目录',
+      prompt: '输入 yes 确认删除，输入 no 取消。',
+      invalidAnswer: '请输入 yes 或 no。',
+      inputLocked: '删除确认进行中，请输入 yes 或 no',
+      answerLabel: '确认输入（yes/no）',
+      answerPlaceholder: 'yes 或 no'
     }
   },
   en: {
-    roleLabels: { you: 'YOU', coder: 'CODER', system: 'SYSTEM', error: 'ERROR', pending: 'PENDING' },
+    roleLabels: { you: 'YOU', coder: 'CODER', planner: 'PLANNER', reviewer: 'REVIEWER', tester: 'TESTER', summarizer: 'SUMMARIZER', system: 'SYSTEM', error: 'ERROR', pending: 'PENDING' },
     generic: {
       waitingForInput: 'waiting for input',
       ready: 'ready',
@@ -240,7 +288,7 @@ const TUI_COPY = {
       pendingQueue: 'pending queue',
       commandPaletteGroupedSelect: 'command palette | grouped select mode',
       commandPaletteGroupedSuggestions: 'command palette | grouped suggestions',
-      startupHint: 'Use /help, /commands, /compact, /exit, !<shell>. Tab for slash autocomplete.',
+      startupHint: 'Use /help, /commands, /compact, /stop, /exit, !<shell>. Tab for slash autocomplete.',
       toolSummaryExpanded: 'Tool summary: expanded',
       toolSummaryCollapsed: 'Tool summary: collapsed',
       toolChainCollapsed: (count) => `${count} earlier tool calls hidden`,
@@ -267,6 +315,8 @@ const TUI_COPY = {
       doingEdit: 'Editing file',
       doneWrite: 'Wrote file',
       doingWrite: 'Writing file',
+      doneDelete: 'Deleted target',
+      doingDelete: 'Waiting for delete approval',
       donePatch: 'Applied patch',
       doingPatch: 'Applying patch',
       doneList: 'Listed directory',
@@ -345,12 +395,26 @@ const TUI_COPY = {
       compactingContext: 'compacting context',
       autoCompactTriggered: (mode, threshold) => `auto-compact triggered (${mode}, threshold ${threshold}%)`,
       requestFailed: 'request failed',
+      responseStopped: 'Response stopped',
       localCommandRunning: 'running local command',
       queuedWaiting: 'queued, waiting for current turn',
       idleReady: 'waiting for input',
       idleReadyDetail: 'ready',
       idleAfterTurn: 'idle',
       idleAfterTurnDetail: 'ready for next input'
+    },
+    deleteApproval: {
+      title: 'Confirm deletion?',
+      pathLabel: 'Path',
+      nameLabel: 'Name',
+      typeLabel: 'Type',
+      fileType: 'file',
+      directoryType: 'directory',
+      prompt: 'Type yes to delete, or no to cancel.',
+      invalidAnswer: 'Please enter yes or no.',
+      inputLocked: 'Delete approval is active; type yes or no',
+      answerLabel: 'Approval input (yes/no)',
+      answerPlaceholder: 'yes or no'
     }
   }
 };
@@ -747,8 +811,8 @@ function buildUiMessagesFromSessionHistory(sessionMessages, nextId) {
 function safeJsonParse(raw) {
   try {
     return JSON.parse(String(raw || '{}'));
-  } catch {
-    return null;
+  } catch (parseError) {
+    return { _raw: String(raw || ''), _invalid_json: true, _parseError: parseError.message };
   }
 }
 
@@ -867,6 +931,49 @@ export function getPendingUserMessageMeta(copy, { immediateLocal = false, inFlig
   };
 }
 
+export function normalizeDeleteApprovalRequest(request) {
+  if (!request || String(request?.name || '').trim() !== 'delete') return null;
+  const details =
+    request?.approvalDetails && typeof request.approvalDetails === 'object' && !Array.isArray(request.approvalDetails)
+      ? request.approvalDetails
+      : request?.arguments?.approval && typeof request.arguments.approval === 'object' && !Array.isArray(request.arguments.approval)
+        ? request.arguments.approval
+        : {};
+  const fallbackPath = String(details.path || request?.arguments?.path || '').trim();
+  const pathValue = fallbackPath;
+  const nameValue = String(details.name || (pathValue ? pathValue.split(/[\\/]/).pop() : '') || '').trim();
+  const typeValue = String(details.type || '').trim() === 'directory' ? 'directory' : 'file';
+  if (!pathValue) return null;
+  return {
+    id: String(request?.id || '').trim(),
+    toolName: 'delete',
+    path: pathValue,
+    name: nameValue || pathValue,
+    type: typeValue
+  };
+}
+
+export function parseDeleteApprovalAnswer(value) {
+  const normalized = String(value || '').trim().toLowerCase();
+  if (normalized === 'yes') return 'approve';
+  if (normalized === 'no') return 'deny';
+  return normalized ? 'invalid' : 'empty';
+}
+
+export function formatDeleteApprovalLines(copy, request) {
+  const details = normalizeDeleteApprovalRequest(request);
+  if (!details) return [];
+  const typeLabel = details.type === 'directory' ? copy.deleteApproval.directoryType : copy.deleteApproval.fileType;
+  const pathDisplay = details.path.includes('/') || details.path.includes('\\') ? details.path : `./${details.path}`;
+  return [
+    copy.deleteApproval.title,
+    `${copy.deleteApproval.pathLabel}: ${pathDisplay}`,
+    `${copy.deleteApproval.nameLabel}: ${details.name}`,
+    `${copy.deleteApproval.typeLabel}: ${typeLabel}`,
+    copy.deleteApproval.prompt
+  ];
+}
+
 function getActivityDisplayParts(activity) {
   if (isCodeGenerationActivityName(activity?.name)) {
     return {
@@ -904,6 +1011,7 @@ function getActivityDisplayParts(activity) {
     read: 'Read',
     edit: 'Edit',
     write: 'Write',
+    delete: 'Delete',
     patch: 'Patch',
     run: 'Run',
     grep: 'Search',
@@ -1036,7 +1144,6 @@ function ContextProgressMeter({ runtimeState, runtimeStatus, compact = false })
   const pct = Math.min(100, Math.max(0, pctRaw));
   const filled = Math.min(12, Math.max(0, Math.round((pct / 100) * 12)));
   const activeColor = pct < 40 ? 'greenBright' : pct < 75 ? 'yellowBright' : 'redBright';
-  const statusColor = runtimeStatus?.color || activeColor;
   const chunks = Array.from({ length: 12 }, (_, idx) => {
     const zoneColor = idx < 5 ? 'greenBright' : idx < 9 ? 'yellowBright' : 'redBright';
     const color = idx < filled ? zoneColor : 'gray';
@@ -1048,7 +1155,7 @@ function ContextProgressMeter({ runtimeState, runtimeStatus, compact = false })
       Box,
       { justifyContent: 'flex-end', alignItems: 'center' },
       h(Text, { color: 'gray' }, '上下文 '),
-      h(Text, { color: statusColor }, `${Math.round(pct)}% `),
+      h(Text, { color: activeColor }, `${Math.round(pct)}% `),
       h(
         Box,
         { flexDirection: 'row' },
@@ -1072,78 +1179,58 @@ 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';
+  const isDone = planState.completed;
+  const borderColor = isDone ? 'green' : planState.failed ? 'red' : 'cyan';
+  const isEnglish = copy?.roleLabels?.system === 'SYSTEM';
+  const completedLabel = isEnglish ? 'DONE' : '已完成';
   return h(
     Box,
-    {
-      marginBottom: 1,
-      borderStyle: 'round',
-      borderColor: planState.failed ? 'red' : 'cyan',
-      paddingX: 1,
-      paddingY: 0,
-      flexDirection: 'column'
-    },
+    { marginBottom: 1, flexDirection: 'row' },
+    h(Box, { width: 2 }, h(Text, { color: borderColor }, '│')),
     h(
       Box,
-      { justifyContent: 'space-between' },
+      {
+        flexDirection: 'column',
+        borderStyle: 'round',
+        borderColor,
+        paddingX: 1,
+        paddingY: 0,
+        width: '100%'
+      },
       h(
         Box,
-        null,
-        h(Text, { color: 'black', backgroundColor: planState.failed ? 'red' : 'cyanBright' }, ` ${copy.generic.plan} ${progress} `),
-        h(Text, { color: 'gray' }, '  '),
-        h(Text, { color: 'magentaBright' }, roleLabel)
+        { justifyContent: 'space-between', marginBottom: planState.steps.length > 0 ? 1 : 0 },
+        h(Text, { color: 'black', backgroundColor: isDone ? 'greenBright' : 'cyanBright' }, ' Plan Summary '),
+        isDone
+          ? h(Text, { color: 'black', backgroundColor: 'greenBright' }, ` ${completedLabel} `)
+          : null
       ),
-      h(Text, { color: statusColor }, statusLabel)
-    ),
-    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,
-          { marginTop: 1, flexDirection: 'column' },
-          ...planState.steps.slice(-4).map((step, idx) =>
-            h(
-              Box,
-              { key: `plan-step-${idx}`, marginTop: idx === 0 ? 0 : 1 },
-              h(Text, { color: step.status === 'active' ? 'cyanBright' : step.status === 'failed' ? 'redBright' : 'gray' }, `${step.status === 'active' ? '>' : step.status === 'failed' ? 'x' : '·'} `),
-              h(Text, { color: step.status === 'active' ? 'yellowBright' : step.status === 'failed' ? 'redBright' : 'gray' }, `${step.index}/${step.total}`),
-              h(Text, { color: 'gray' }, '  '),
-              h(Text, { color: step.status === 'active' ? 'magentaBright' : step.status === 'failed' ? 'redBright' : 'gray' }, String(step.role || 'agent').toUpperCase()),
-              h(Text, { color: 'gray' }, '  '),
-              h(Text, { color: step.status === 'active' ? 'white' : step.status === 'failed' ? 'redBright' : 'gray' }, step.title)
+      planState.steps.length > 0
+        ? h(
+            Box,
+            { flexDirection: 'column' },
+            ...planState.steps.map((step, idx) => {
+                const roleKey = step.role ? step.role.toLowerCase() : '';
+                const normalizedRole = ['planner', 'coder', 'reviewer', 'tester', 'summarizer'].includes(roleKey) ? roleKey : 'coder';
+                const stepTheme = roleStyle(normalizedRole);
+                const roleTag = step.role ? step.role.toUpperCase() : '';
+                const stepDone = step.status === 'done' || isDone;
+                const stepFailed = step.status === 'failed';
+                const marker = stepFailed ? '✗' : stepDone ? '✓' : '·';
+                const markerColor = stepFailed ? 'redBright' : stepDone ? 'greenBright' : 'gray';
+                return h(
+                  Box,
+                  { key: `plan-step-${idx}` },
+                  h(Text, { color: markerColor }, `${marker} `),
+                  roleTag ? h(Text, { color: stepTheme.badgeText, backgroundColor: stepTheme.badgeBg }, ` ${roleTag} `) : null,
+                  roleTag ? h(Text, { color: 'gray' }, ' ') : null,
+                  h(Text, { color: stepDone && !stepFailed ? 'gray' : 'white' }, `${step.index}. ${step.title}`)
+                );
+              }
             )
           )
-        )
-      : null,
-    planState.resultNext
-      ? h(
-          Box,
-          { marginTop: 1 },
-          h(Text, { color: 'black', backgroundColor: 'yellowBright' }, ' NEXT '),
-          h(Text, { color: 'gray' }, ` ${trimText(planState.resultNext, 108)}`)
-        )
-      : null
+        : null
+    )
   );
 }
 
@@ -1242,21 +1329,43 @@ export function parseAutoPlanSummaryMessage(text) {
     warnings: '',
     failed: '',
     warningSteps: '',
-    failedSteps: ''
+    failedSteps: '',
+    planSteps: []
   };
 
+  let inPlanSteps = false;
   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();
-    else if (line.startsWith('Failed: ')) parsed.failed = line.slice('Failed: '.length).trim();
-    else if (line.startsWith('Warning steps: ')) parsed.warningSteps = line.slice('Warning steps: '.length).trim();
-    else if (line.startsWith('Failed steps: ')) parsed.failedSteps = line.slice('Failed steps: '.length).trim();
+    if (line === 'Plan Steps:') {
+      inPlanSteps = true;
+      continue;
+    }
+    if (inPlanSteps) {
+      // Parse "  1. [role] title"
+      const stepMatch = line.match(/^(\d+)\.\s*\[([^\]]+)\]\s+(.+)$/);
+      if (stepMatch) {
+        parsed.planSteps.push({
+          index: Number(stepMatch[1]),
+          role: String(stepMatch[2] || '').trim().toLowerCase(),
+          title: String(stepMatch[3] || '').trim(),
+          status: 'pending'
+        });
+      } else {
+        inPlanSteps = false;
+      }
+    }
+    if (!inPlanSteps) {
+      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();
+      else if (line.startsWith('Failed: ')) parsed.failed = line.slice('Failed: '.length).trim();
+      else if (line.startsWith('Warning steps: ')) parsed.warningSteps = line.slice('Warning steps: '.length).trim();
+      else if (line.startsWith('Failed steps: ')) parsed.failedSteps = line.slice('Failed steps: '.length).trim();
+    }
   }
 
   return parsed;
@@ -1405,7 +1514,7 @@ function extractPreviewLinesFromTool(tool, maxLines = 3) {
     typeof tool?.arguments === 'string'
       ? (() => {
           const parsedArguments = safeJsonParse(tool.arguments);
-          if (parsedArguments) {
+          if (parsedArguments && !parsedArguments._invalid_json) {
             const parsedPreview = collectPreviewStrings(parsedArguments);
             if (parsedPreview.length > 0) return parsedPreview;
           }
@@ -1424,7 +1533,7 @@ function extractPreviewLinesFromTool(tool, maxLines = 3) {
 }
 
 function getLatestToolPreviewLines(msg, maxLines = 3) {
-  const codeTools = new Set(['edit', 'write', 'patch', 'generate_diff']);
+  const codeTools = new Set(['edit', 'write']);
   const extractFromCalls = (calls) => {
     for (let index = calls.length - 1; index >= 0; index -= 1) {
       const tool = calls[index];
@@ -1462,7 +1571,7 @@ export function getGeneratingCodePlaceholderRows(msg, copy, contentWidth = 72) {
   const previewWindow = getLatestToolPreviewLines(msg, 3);
   if (previewWindow.lines.length === 0) return [];
   const hasRunningCodeTool = (Array.isArray(msg?.toolCalls) ? msg.toolCalls : []).some(
-    (tool) => tool?.status === 'running' && new Set(['edit', 'write', 'patch', 'generate_diff']).has(parseToolDisplayName(tool?.name).base)
+    (tool) => tool?.status === 'running' && new Set(['edit', 'write']).has(parseToolDisplayName(tool?.name).base)
   );
   const isCodeGenerationStatus = liveStatus === String(copy?.runtime?.generatingCode || '').trim();
   if (!isCodeGenerationStatus && !(msg?.phase === 'tooling' && hasRunningCodeTool)) return [];
@@ -1760,13 +1869,11 @@ function isCodeActivityName(name) {
     'edit',
     'write',
     'write_file',
-    'patch',
     'replace_text',
     'replace_block',
     'insert_before',
     'insert_after',
-    'validate_edit',
-    'generate_diff'
+    'validate_edit'
   ]).has(parsed.base);
 }
 
@@ -1979,13 +2086,7 @@ export function buildMessageRows(msg, showToolDetails, contentWidth = 72, copy)
       const trimmed = line.trim();
       const planProgress = parsePlanProgressLine(trimmed);
       if (planProgress) {
-        rows.push({
-          kind: 'plan-progress',
-          current: planProgress.current,
-          total: planProgress.total,
-          role: planProgress.role,
-          title: trimText(planProgress.title, Math.max(12, contentWidth - 18))
-        });
+        // Skip rendering plan progress lines inline — shown in header badge instead
         continue;
       }
       if (trimmed.startsWith('```')) {
@@ -2208,16 +2309,8 @@ export function renderMessageRow(msg, row, idx, loaderTick) {
     );
   }
   if (row.kind === 'plan-progress') {
-    return h(
-      Box,
-      { key: `row-plan-progress-${msg.id}-${idx}`, marginTop: 1, marginBottom: 1 },
-      h(Text, { color: 'cyanBright' }, '[plan] '),
-      h(Text, { color: 'yellowBright' }, `Step ${row.current}/${row.total}`),
-      h(Text, { color: 'gray' }, '  ->  '),
-      h(Text, { color: 'magentaBright' }, String(row.role || 'agent').toUpperCase()),
-      h(Text, { color: 'gray' }, ': '),
-      h(Text, { color: 'white' }, row.title)
-    );
+    // Already shown in header badge — skip inline rendering
+    return null;
   }
   if (row.kind === 'status') {
     const dots = '.'.repeat((loaderTick % 3) + 1);
@@ -2366,11 +2459,7 @@ export function moveSuggestionSelection(currentIndex, itemCount, direction, page
 
 function MessageBubble({ msg, loaderTick, showToolDetails, rowWindow = null, contentWidth = 72, copy }) {
   if (msg?.planStrip) {
-    return h(
-      Box,
-      { marginBottom: 1 },
-      h(PlanStrip, { planState: msg.planState, copy })
-    );
+    return h(PlanStrip, { planState: msg.planState, copy });
   }
   if (msg?.planSummary || parseAutoPlanSummaryMessage(msg?.text)) {
     return h(PlanSummaryBubble, { msg, copy });
@@ -2403,7 +2492,8 @@ function MessageBubble({ msg, loaderTick, showToolDetails, rowWindow = null, con
         h(
           Box,
           null,
-          h(Text, { color: theme.badgeText, backgroundColor: theme.badgeBg }, ` ${messageLabel(msg.label, copy)} `)
+          h(Text, { color: theme.badgeText, backgroundColor: theme.badgeBg }, ` ${messageLabel(msg.label, copy)} `),
+          msg.planStep ? h(Text, { color: 'gray', dimColor: true }, ` ${msg.planStep} `) : null
         ),
         autoSkillBadge
           ? h(Text, { color: 'blueBright' }, autoSkillBadge)
@@ -2554,6 +2644,8 @@ function InputBar({
   afterCursor,
   cursorVisible,
   busy,
+  disabled = false,
+  disabledText = '',
   inputStage,
   pendingQueueLength,
   showToolDetails,
@@ -2595,20 +2687,60 @@ function InputBar({
       Box,
       null,
       h(Text, { color: 'cyan' }, 'codemini> '),
-      h(Text, { color: 'white' }, beforeCursor),
-      h(
-        Text,
-        {
-          color: cursorVisible ? 'black' : 'white',
-          backgroundColor: cursorVisible ? 'cyanBright' : undefined
-        },
-        underCursor || ' '
-      ),
-      h(Text, { color: 'white' }, afterCursor)
+      disabled
+        ? h(Text, { color: 'gray' }, disabledText || '')
+        : [
+            h(Text, { key: 'before', color: 'white' }, beforeCursor),
+            h(
+              Text,
+              {
+                key: 'cursor',
+                color: cursorVisible ? 'black' : 'white',
+                backgroundColor: cursorVisible ? 'cyanBright' : undefined
+              },
+              underCursor || ' '
+            ),
+            h(Text, { key: 'after', color: 'white' }, afterCursor)
+          ]
     )
   );
 }
 
+function DeleteApprovalPanel({ request, inputValue, errorText, copy }) {
+  if (!request) return null;
+  const details =
+    request?.toolName === 'delete'
+      ? request
+      : normalizeDeleteApprovalRequest(request);
+  if (!details) return null;
+  const typeLabel = details.type === 'directory' ? copy.deleteApproval.directoryType : copy.deleteApproval.fileType;
+  const pathDisplay = details.path.includes('/') || details.path.includes('\\') ? details.path : `./${details.path}`;
+  const placeholder = String(copy.deleteApproval.answerPlaceholder || '').trim();
+  return h(
+    Box,
+    {
+      marginTop: 1,
+      flexDirection: 'column',
+      borderStyle: 'round',
+      borderColor: 'redBright',
+      paddingX: 1,
+      paddingY: 0
+    },
+    h(Text, { color: 'redBright' }, copy.deleteApproval.title),
+    h(Text, { color: 'white' }, `${copy.deleteApproval.nameLabel}: ${details.name}`),
+    h(Text, { color: 'white' }, `${copy.deleteApproval.pathLabel}: ${pathDisplay}`),
+    h(Text, { color: 'white' }, `${copy.deleteApproval.typeLabel}: ${typeLabel}`),
+    h(Text, { color: 'gray' }, copy.deleteApproval.prompt),
+    h(
+      Box,
+      { marginTop: 1 },
+      h(Text, { color: 'redBright' }, `${copy.deleteApproval.answerLabel}: `),
+      h(Text, { color: inputValue ? 'white' : 'gray' }, inputValue || placeholder || ' ')
+    ),
+    errorText ? h(Text, { color: 'yellowBright' }, errorText) : null
+  );
+}
+
 function SignatureBar({ version = '' }) {
   return h(
     Box,
@@ -2690,6 +2822,9 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
   const [debugKeys, setDebugKeys] = useState(false);
   const [lastKeyDebug, setLastKeyDebug] = useState('');
   const [showToolDetails, setShowToolDetails] = useState(false);
+  const [pendingDeleteApproval, setPendingDeleteApproval] = useState(null);
+  const [deleteApprovalInput, setDeleteApprovalInput] = useState('');
+  const [deleteApprovalError, setDeleteApprovalError] = useState('');
   const activeAssistantIdRef = useRef(null);
   const activeAssistantAutoSkillNamesRef = useRef([]);
   const streamedAssistantHandledRef = useRef(false);
@@ -2699,6 +2834,11 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
   const messagesRef = useRef([]);
   const pendingQueueRef = useRef([]);
   const deltaBufferRef = useRef('');
+  const activePlanStepNumberRef = useRef(0);
+  const activePlanStepRoleRef = useRef(null);
+  const activePlanStepInfoRef = useRef(null);
+  const activePlanStepTitleRef = useRef('');
+  const deleteApprovalResolverRef = useRef(null);
 
   useEffect(() => {
     const rawStartupActivities = runtime.consumeStartupEvents?.();
@@ -2721,6 +2861,26 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
   const planTextBufferRef = useRef('');
   const { exit } = useApp();
 
+  useEffect(() => {
+    if (typeof runtime.setRequestToolApproval !== 'function') return () => {};
+    runtime.setRequestToolApproval((request) => {
+      const normalized = normalizeDeleteApprovalRequest(request);
+      if (!normalized) {
+        return Promise.resolve({ approved: false });
+      }
+      setDeleteApprovalInput('');
+      setDeleteApprovalError('');
+      setPendingDeleteApproval(normalized);
+      return new Promise((resolve) => {
+        deleteApprovalResolverRef.current = resolve;
+      });
+    });
+    return () => {
+      runtime.setRequestToolApproval(null);
+      deleteApprovalResolverRef.current = null;
+    };
+  }, [runtime]);
+
   useEffect(() => {
     messagesRef.current = messages;
   }, [messages]);
@@ -2757,7 +2917,7 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
       : [];
   const hasTransientPanels =
     commandSuggestions.length > 0 || pendingQueue.length > 0 || debugKeys || Boolean(planState?.total);
-  const messageContentWidth = Math.max(24, stdoutCols - 18);
+  const messageContentWidth = Math.max(24, stdoutCols - 8);
 
   const syncRuntimeVisualState = (variant = 'ready') => {
     const snapshot = runtime.getRuntimeState?.();
@@ -2765,7 +2925,15 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     setDisplaySessionId(snapshot.sessionId || sessionId);
     setDisplayModel(snapshot.model || model);
     setDisplaySdkProvider(snapshot.sdkProvider || sdkProvider);
-    setRuntimeState(snapshot);
+    setRuntimeState((prev) => {
+      if (!prev || !planTextBufferRef.current) return snapshot;
+      const prevTokens = Number(prev.currentContextTokens || 0);
+      const newTokens = Number(snapshot.currentContextTokens || 0);
+      if (newTokens < prevTokens) {
+        return { ...snapshot, currentContextTokens: prevTokens, contextUsagePct: prev.contextUsagePct };
+      }
+      return snapshot;
+    });
     setRuntimeStatus(makeIdleStatus(copy, snapshot, variant));
   };
 
@@ -2775,7 +2943,15 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     setDisplaySessionId(snapshot.sessionId || sessionId);
     setDisplayModel(snapshot.model || model);
     setDisplaySdkProvider(snapshot.sdkProvider || sdkProvider);
-    setRuntimeState(snapshot);
+    setRuntimeState((prev) => {
+      if (!prev || !planTextBufferRef.current) return snapshot;
+      const prevTokens = Number(prev.currentContextTokens || 0);
+      const newTokens = Number(snapshot.currentContextTokens || 0);
+      if (newTokens < prevTokens) {
+        return { ...snapshot, currentContextTokens: prevTokens, contextUsagePct: prev.contextUsagePct };
+      }
+      return snapshot;
+    });
   };
 
   useEffect(() => {
@@ -2794,15 +2970,34 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     if (!last) return;
     const current = Number(last[1]);
     const total = Number(last[2]);
-    const role = String(last[3] || '').trim();
+    const role = String(last[3] || '').trim().toLowerCase();
+    const normalizedRole = ['planner', 'coder', 'reviewer', 'tester', 'summarizer'].includes(role) ? role : 'coder';
     const title = String(last[4] || '').trim();
+
+    // Detect step transition — finalize old assistant and create a new one
+    if (activePlanStepNumberRef.current > 0 && current !== activePlanStepNumberRef.current) {
+      flushAssistantDelta();
+      const oldId = activeAssistantIdRef.current;
+      if (oldId) {
+        finalizeActiveAssistant();
+        activeAssistantIdRef.current = null;
+      }
+    }
+    activePlanStepNumberRef.current = current;
+
+    activePlanStepRoleRef.current = normalizedRole;
+    activePlanStepInfoRef.current = { current, total };
+    activePlanStepTitleRef.current = title;
     setActiveAssistantMeta({
-      planStep: `${current}/${total} · ${role}: ${title}`
+      label: normalizedRole,
+      planStepInfo: { current, total },
+      planStep: `${current}/${total} · ${title}`
     });
     setPlanState((prev) => {
-      const steps = (prev.steps || [])
-        .map((step) => (step.index === current ? { ...step, status: 'done' } : step))
+      let steps = (prev.steps || [])
+        .map((step) => (step.status === 'active' ? { ...step, status: 'done' } : step))
         .filter((step, idx, arr) => arr.findIndex((x) => x.index === step.index) === idx);
+
       const withoutCurrent = steps.filter((step) => step.index !== current);
       return {
         current,
@@ -2993,13 +3188,16 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     }
     const parsedPlanSummary = result.type === 'system' ? parseAutoPlanSummaryMessage(result.text || '') : null;
     if (parsedPlanSummary?.approval === 'pending') {
+      const preSteps = Array.isArray(parsedPlanSummary.planSteps) && parsedPlanSummary.planSteps.length > 0
+        ? parsedPlanSummary.planSteps
+        : [];
       setPlanState({
         current: 0,
-        total: 0,
+        total: preSteps.length,
         role: '',
         title: '',
         failed: false,
-        steps: [],
+        steps: preSteps,
         pendingApproval: true,
         completed: false,
         resultStatus: '',
@@ -3035,7 +3233,9 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
         const nextCall = {
           id: toolCall.id || '',
           name: toolCall.name || '',
-          arguments: typeof toolCall.arguments === 'string' ? safeJsonParse(toolCall.arguments) ?? toolCall.arguments : toolCall.arguments,
+          arguments: typeof toolCall.arguments === 'string'
+            ? (() => { const p = safeJsonParse(toolCall.arguments); return p._invalid_json ? toolCall.arguments : p; })()
+            : toolCall.arguments,
           status: 'pending',
           type: 'tool'
         };
@@ -3048,11 +3248,13 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
   };
 
   const finalizeActiveAssistant = () => {
+    activePlanStepRoleRef.current = null;
+    activePlanStepInfoRef.current = null;
+    activePlanStepTitleRef.current = '';
     setActiveAssistantMeta({
       loading: false,
       phase: undefined,
       liveStatus: undefined,
-      planStep: undefined,
       pendingToolCalls: [],
       codeGenerationEndedAt: undefined,
       autoSkillNames: activeAssistantAutoSkillNamesRef.current
@@ -3088,19 +3290,27 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     if (activeAssistantIdRef.current) return activeAssistantIdRef.current;
     const aid = nextId();
     activeAssistantIdRef.current = aid;
+    const planRole = activePlanStepRoleRef.current;
+    const label = planRole || 'coder';
+    const style = ROLE_STYLES[label] || ROLE_STYLES.coder;
+    const planStepInfo = activePlanStepInfoRef.current;
+    const planStepTitle = activePlanStepTitleRef.current;
+    const planStepDisplay = planStepInfo ? `${planStepInfo.current}/${planStepInfo.total} · ${planStepTitle}` : undefined;
     setMessages((prev) => [
       ...prev,
       {
         id: aid,
-        label: 'coder',
+        label,
         text: '',
-        color: 'greenBright',
+        color: style.text,
         toolCalls: [],
         segments: [],
         loading: true,
         phase: 'thinking',
         liveStatus: copy.runtime.modelThinking,
-        autoSkillNames: activeAssistantAutoSkillNamesRef.current
+        autoSkillNames: activeAssistantAutoSkillNamesRef.current,
+        ...(planStepInfo ? { planStepInfo } : {}),
+        ...(planStepDisplay ? { planStep: planStepDisplay } : {})
       }
     ]);
     return aid;
@@ -3146,6 +3356,7 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
       resultNext: ''
     });
     planTextBufferRef.current = '';
+    activePlanStepNumberRef.current = 0;
     activeAssistantIdRef.current = null;
     activeAssistantAutoSkillNamesRef.current = [];
     streamedAssistantHandledRef.current = false;
@@ -3190,7 +3401,7 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
         if (event?.type === 'assistant:tool_call_delta') {
           ensureActiveAssistant();
           const parsed = parseToolDisplayName(event.toolCall?.name);
-          const isCodeTool = new Set(['write', 'edit', 'patch', 'generate_diff']).has(parsed.base);
+          const isCodeTool = new Set(['write', 'edit']).has(parsed.base);
           if (isCodeTool) {
             setRuntimeStatus(makeStatus(copy.runtime.generatingCode, copy.runtime.streamingReply, 'greenBright'));
             setInputStage('streaming');
@@ -3249,7 +3460,6 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
                   loading: false,
                   phase: undefined,
                   liveStatus: undefined,
-                  planStep: undefined,
                   pendingToolCalls: [],
                   autoSkillNames: activeAssistantAutoSkillNamesRef.current,
                   ...(m.codeGenerationStartedAt && !m.codeGenerationEndedAt ? { codeGenerationEndedAt: Date.now() } : {})
@@ -3257,7 +3467,7 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
               })
             );
           }
-          if (!hasPlannedTools) {
+          if (!hasPlannedTools && !activePlanStepInfoRef.current) {
             activeAssistantIdRef.current = null;
           }
           if (!hadActiveAssistant && !hasPlannedTools && event.text) {
@@ -3410,6 +3620,22 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
             liveStatus: copy.toolActivity.waitingModelAdjust(detail)
           });
         }
+        if (event?.type === 'plan:steps') {
+          const planSteps = Array.isArray(event.steps) ? event.steps : [];
+          if (planSteps.length > 0) {
+            setPlanState((prev) => ({
+              ...prev,
+              total: planSteps.length,
+              steps: planSteps.map((s) => ({
+                index: s.index,
+                total: planSteps.length,
+                role: s.role || '',
+                title: s.title || '',
+                status: 'pending'
+              }))
+            }));
+          }
+        }
         if (event?.type === 'skill:start') {
           ensureActiveAssistant();
           const detail = describeSkillActivity(event.name, copy);
@@ -3489,16 +3715,28 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
           return;
         }
         if (result.type !== 'noop') setInputStage('idle');
-        if (planTextBufferRef.current && planState.total > 0) {
-          setPlanState((prev) => ({
-            ...prev,
-            steps: (prev.steps || []).map((step) =>
-              step.index === prev.current && step.status === 'active' ? { ...step, status: prev.failed ? 'failed' : 'done' } : step
-            )
-          }));
+        if (planTextBufferRef.current) {
+          setPlanState((prev) => {
+            if (!prev.total) return prev;
+            return {
+              ...prev,
+              completed: !prev.failed,
+              steps: (prev.steps || []).map((step) =>
+                step.status === 'active' ? { ...step, status: prev.failed ? 'failed' : 'done' } : step
+              )
+            };
+          });
         }
         syncRuntimeVisualState(result.type === 'noop' ? 'ready' : 'after');
         if (result.type === 'noop') return;
+        // 被用户中止时显示提示消息
+        if (result.aborted) {
+          setMessages((prev) => [
+            ...prev,
+            { id: nextId(), label: 'system', text: copy.runtime.responseStopped, color: 'yellowBright' }
+          ]);
+          return;
+        }
         if (!shouldAppendAssistantResult(result, activeAssistantIdRef.current, streamedAssistantHandledRef.current)) return;
         appendResultMessage(result);
       })
@@ -3515,7 +3753,7 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
           ...prev,
           failed: prev.total > 0,
           steps: (prev.steps || []).map((step) =>
-            step.index === prev.current ? { ...step, status: 'failed' } : step
+            step.status === 'active' ? { ...step, status: 'failed' } : step
           )
         }));
         setMessages((prev) => [
@@ -3527,6 +3765,7 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
         flushAssistantDelta();
         finalizeActiveAssistant();
         activeAssistantIdRef.current = null;
+        activePlanStepNumberRef.current = 0;
         streamedAssistantHandledRef.current = false;
         activeUserMessageIdRef.current = null;
         if (deltaFlushTimerRef.current) {
@@ -3582,6 +3821,19 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
         appendResultMessage(result);
       })
       .catch((err) => {
+        // 用户主动中止，不显示为错误
+        if (err?.name === 'AbortError') {
+          updateMessageMeta(userMessageId, {
+            loading: false,
+            phase: undefined,
+            liveStatus: undefined
+          });
+          setMessages((prev) => [
+            ...prev,
+            { id: nextId(), label: 'system', text: copy.runtime.responseStopped, color: 'yellowBright' }
+          ]);
+          return;
+        }
         const message = sanitizeRenderableText(err?.message || String(err));
         updateMessageMeta(userMessageId, {
           loading: false,
@@ -3629,6 +3881,46 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
       escSeqRef.current = '';
     }
 
+    if (pendingDeleteApproval) {
+      if (key.return) {
+        const answer = parseDeleteApprovalAnswer(deleteApprovalInput);
+        if (answer === 'approve' || answer === 'deny') {
+          const resolver = deleteApprovalResolverRef.current;
+          deleteApprovalResolverRef.current = null;
+          setPendingDeleteApproval(null);
+          setDeleteApprovalInput('');
+          setDeleteApprovalError('');
+          if (resolver) resolver({ approved: answer === 'approve' });
+        } else {
+          setDeleteApprovalError(copy.deleteApproval.invalidAnswer);
+        }
+        return;
+      }
+
+      if (isBackspaceKey(value, key) || isDeleteKey(value, key)) {
+        setDeleteApprovalInput((prev) => prev.slice(0, -1));
+        setDeleteApprovalError('');
+        return;
+      }
+
+      if (isPrintableInput(value, key)) {
+        setDeleteApprovalInput((prev) => `${prev}${value}`);
+        setDeleteApprovalError('');
+        return;
+      }
+
+      if (key.ctrl && value === 'c') {
+        if (busy && typeof runtime.abort === 'function') {
+          runtime.abort();
+          return;
+        }
+        exit();
+        return;
+      }
+
+      return;
+    }
+
     if (key.upArrow) {
       if (suggestionNav && commandSuggestions.length > 0) {
         setMenuIndex((prev) => moveSuggestionSelection(prev, commandSuggestions.length, 'up'));
@@ -3733,6 +4025,16 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
       setCursorIndex(0);
       if (!line) return;
 
+      // /stop 命令：中止当前正在进行的回答
+      if (line === '/stop' && busy && typeof runtime.abort === 'function') {
+        runtime.abort();
+        setHistory((prev) => [...prev, line]);
+        setHistoryIndex(null);
+        setDraftBeforeHistory('');
+        setHistoryMatches([]);
+        return;
+      }
+
       setHistory((prev) => [...prev, line]);
       setHistoryIndex(null);
       setDraftBeforeHistory('');
@@ -3802,6 +4104,10 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     }
 
     if (key.ctrl && value === 'c') {
+      if (busy && typeof runtime.abort === 'function') {
+        runtime.abort();
+        return;
+      }
       exit();
       return;
     }
@@ -3941,6 +4247,12 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     ),
     h(SuggestionPanel, { commandSuggestions, suggestionNav, menuIndex, copy }),
     h(PendingPanel, { pendingQueue, copy }),
+    h(DeleteApprovalPanel, {
+      request: pendingDeleteApproval,
+      inputValue: deleteApprovalInput,
+      errorText: deleteApprovalError,
+      copy
+    }),
     debugKeys
       ? h(
           Box,
@@ -3954,6 +4266,8 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
       afterCursor,
       cursorVisible,
       busy,
+      disabled: Boolean(pendingDeleteApproval),
+      disabledText: pendingDeleteApproval ? copy.deleteApproval.inputLocked : '',
       inputStage,
       pendingQueueLength: pendingQueue.length,
       showToolDetails,