codemini-cli 0.3.7 → 0.3.8

package/src/core/tools.js

@@ -19,6 +19,7 @@ import { checkReadDedup } from './agent-loop.js';
 import { TOOL_SKIP_DIRS as SKIP_DIRS, TEXT_EXTENSIONS, CODE_WRITE_GUARD_EXTENSIONS, LANGUAGE_FILE_TYPES } from './constants.js';
 import { sha256Prefixed as sha256, sha256 as sha256Hash } from './crypto-utils.js';
 import { forgetMemory, listMemories, rememberMemory, searchMemories } from './memory-store.js';
+import { normalizePlanState } from './plan-state.js';
 import { normalizeTodos } from './todo-state.js';
 const BACKGROUND_TASK_RECENT_OUTPUT_LIMIT = 80;
 const BACKGROUND_TASK_POLL_MS = 150;
@@ -1534,7 +1535,7 @@ async function editTarget(root, args) {
   throw new Error(`edit does not support kind: ${kind}`);
 }
 
-export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSystemEvent, getTodos, onTodosUpdate }) {
+export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSystemEvent, getTodos, onTodosUpdate, getPlanState, onPlanStateUpdate }) {
   const emitSystemTool = (event) => {
     if (typeof onSystemEvent === 'function' && event) onSystemEvent(event);
   };
@@ -1791,6 +1792,76 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
         }
       }
     },
+    {
+      type: 'function',
+      function: {
+        name: 'read_plan',
+        description:
+          'Read the structured plan state for the current session. Use this to recover plan progress after transient model/tool errors before continuing implementation.',
+        parameters: {
+          type: 'object',
+          properties: {
+            include_steps: { type: 'boolean', description: 'Include normalized plan steps in the output (default: true)' }
+          },
+          required: []
+        }
+      }
+    },
+    {
+      type: 'function',
+      function: {
+        name: 'update_plan',
+        description:
+          'Create, replace, or clear the structured plan state for the current session. Use clear=true to remove plan state.',
+        parameters: {
+          type: 'object',
+          properties: {
+            clear: { type: 'boolean', description: 'Set true to clear current plan state' },
+            plan: {
+              type: 'object',
+              properties: {
+                status: { type: 'string', description: 'Plan lifecycle status (for example pending_approval, approved, completed, failed)' },
+                source: { type: 'string', description: 'Plan source such as auto/manual/tool' },
+                goal: { type: 'string', description: 'Original user goal for this plan' },
+                filePath: { type: 'string', description: 'Plan markdown file path' },
+                summary: { type: 'string', description: 'Short plan summary' },
+                finalSummary: { type: 'string', description: 'Final planning summary shown for approval' },
+                steps: {
+                  type: 'array',
+                  items: {
+                    type: 'object',
+                    properties: {
+                      title: { type: 'string' },
+                      role: { type: 'string' },
+                      task: { type: 'string' }
+                    }
+                  }
+                }
+              }
+            },
+            status: { type: 'string', description: 'Top-level alias for plan.status when plan is omitted' },
+            source: { type: 'string', description: 'Top-level alias for plan.source when plan is omitted' },
+            goal: { type: 'string', description: 'Top-level alias for plan.goal when plan is omitted' },
+            filePath: { type: 'string', description: 'Top-level alias for plan.filePath when plan is omitted' },
+            summary: { type: 'string', description: 'Top-level alias for plan.summary when plan is omitted' },
+            finalSummary: { type: 'string', description: 'Top-level alias for plan.finalSummary when plan is omitted' },
+            steps: {
+              type: 'array',
+              description: 'Top-level alias for plan.steps when plan is omitted',
+              items: {
+                type: 'object',
+                properties: {
+                  title: { type: 'string' },
+                  role: { type: 'string' },
+                  task: { type: 'string' }
+                }
+              }
+            }
+          },
+          required: []
+        }
+      }
+    },
     {
       type: 'function',
       function: {
@@ -2164,6 +2235,42 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
         newTodos: nextTodos
       };
     },
+    read_plan: async (args = {}) => {
+      const includeSteps = args?.include_steps !== false;
+      const currentPlan = normalizePlanState(typeof getPlanState === 'function' ? getPlanState() : null);
+      if (!includeSteps && currentPlan && Array.isArray(currentPlan.steps)) {
+        const { steps, ...rest } = currentPlan;
+        return {
+          ok: true,
+          plan: rest,
+          hasPendingApproval: rest.status === 'pending_approval'
+        };
+      }
+      return {
+        ok: true,
+        plan: currentPlan,
+        hasPendingApproval: currentPlan?.status === 'pending_approval'
+      };
+    },
+    update_plan: async (args = {}) => {
+      const oldPlan = normalizePlanState(typeof getPlanState === 'function' ? getPlanState() : null);
+      const shouldClear = args?.clear === true || args?.plan === null;
+      const nextRaw = shouldClear
+        ? null
+        : args?.plan && typeof args.plan === 'object'
+          ? args.plan
+          : args;
+      const nextPlan = normalizePlanState(nextRaw);
+      if (typeof onPlanStateUpdate === 'function') {
+        onPlanStateUpdate(nextPlan);
+      }
+      return {
+        ok: true,
+        oldPlan,
+        newPlan: nextPlan,
+        hasPendingApproval: nextPlan?.status === 'pending_approval'
+      };
+    },
     run: (args) => runCommand(workspaceRoot, config, args),
     remember_user: async (args = {}) => {
       const saved = await rememberMemory({
@@ -2312,6 +2419,56 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
       return ['Updated todo list:', ...lines].join('\n');
     },
 
+    read_plan(result) {
+      if (!result || typeof result !== 'object') return String(result);
+      const plan = normalizePlanState(result.plan);
+      if (!plan) return 'No active plan state.';
+      const lines = [
+        'Current plan state:',
+        `- status: ${plan.status || '-'}`,
+        `- source: ${plan.source || '-'}`,
+        `- goal: ${plan.goal || '-'}`,
+        `- filePath: ${plan.filePath || '-'}`,
+        `- summary: ${plan.summary || '-'}`,
+        `- finalSummary: ${plan.finalSummary || '-'}`
+      ];
+      const steps = Array.isArray(plan.steps) ? plan.steps : [];
+      if (steps.length > 0) {
+        lines.push('- steps:');
+        for (let i = 0; i < Math.min(steps.length, 8); i += 1) {
+          const step = steps[i];
+          lines.push(`  ${i + 1}. [${step.role || '-'}] ${step.title || '-'} :: ${step.task || '-'}`);
+        }
+        if (steps.length > 8) lines.push(`  ... and ${steps.length - 8} more step(s)`);
+      }
+      return lines.join('\n');
+    },
+
+    update_plan(result) {
+      if (!result || typeof result !== 'object') return String(result);
+      const nextPlan = normalizePlanState(result.newPlan);
+      if (!nextPlan) return 'Plan state cleared.';
+      const lines = [
+        'Current plan state:',
+        `- status: ${nextPlan.status || '-'}`,
+        `- source: ${nextPlan.source || '-'}`,
+        `- goal: ${nextPlan.goal || '-'}`,
+        `- filePath: ${nextPlan.filePath || '-'}`,
+        `- summary: ${nextPlan.summary || '-'}`,
+        `- finalSummary: ${nextPlan.finalSummary || '-'}`
+      ];
+      const steps = Array.isArray(nextPlan.steps) ? nextPlan.steps : [];
+      if (steps.length > 0) {
+        lines.push('- steps:');
+        for (let i = 0; i < Math.min(steps.length, 8); i += 1) {
+          const step = steps[i];
+          lines.push(`  ${i + 1}. [${step.role || '-'}] ${step.title || '-'} :: ${step.task || '-'}`);
+        }
+        if (steps.length > 8) lines.push(`  ... and ${steps.length - 8} more step(s)`);
+      }
+      return lines.join('\n');
+    },
+
     query_project_index(result) {
       if (!result || typeof result !== 'object') return String(result);
       const lines = [];

package/src/tui/chat-app.js

@@ -27,6 +27,7 @@ const BANNER = [
   ' ██████  ██████  ██████  ███████ ██      ██ ██ ██   ████ ██ '
 ];
 const BANNER_COLORS = ['magentaBright', 'redBright', 'yellowBright', 'cyanBright', 'magentaBright'];
+const SPINNER_FRAMES = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏'];
 const ROLE_STYLES = {
   you: {
     accent: 'blueBright',
@@ -258,6 +259,18 @@ const TUI_COPY = {
       inputLocked: '删除确认进行中，请输入 yes 或 no',
       answerLabel: '确认输入（yes/no）',
       answerPlaceholder: 'yes 或 no'
+    },
+    planApproval: {
+      title: '确认执行计划？',
+      goalLabel: '目标',
+      summaryLabel: '摘要',
+      fileLabel: '文件',
+      prompt: '输入 /yes 执行，输入 /edit <反馈> 修改，输入 /reject 拒绝。',
+      invalidAnswer: '请输入 /yes、/edit <反馈> 或 /reject。',
+      missingFeedback: '请在 /edit 后提供反馈内容。',
+      inputLocked: '计划审批进行中，请在审批框输入 /yes、/edit 或 /reject',
+      answerLabel: '审批输入',
+      answerPlaceholder: '/yes | /edit <反馈> | /reject'
     }
   },
   en: {
@@ -415,6 +428,18 @@ const TUI_COPY = {
       inputLocked: 'Delete approval is active; type yes or no',
       answerLabel: 'Approval input (yes/no)',
       answerPlaceholder: 'yes or no'
+    },
+    planApproval: {
+      title: 'Approve this plan?',
+      goalLabel: 'Goal',
+      summaryLabel: 'Summary',
+      fileLabel: 'File',
+      prompt: 'Type /yes to execute, /edit <feedback> to revise, or /reject to discard.',
+      invalidAnswer: 'Please enter /yes, /edit <feedback>, or /reject.',
+      missingFeedback: 'Please provide feedback after /edit.',
+      inputLocked: 'Plan approval is active; type /yes, /edit <feedback>, or /reject',
+      answerLabel: 'Approval input',
+      answerPlaceholder: '/yes | /edit <feedback> | /reject'
     }
   }
 };
@@ -960,6 +985,38 @@ export function parseDeleteApprovalAnswer(value) {
   return normalized ? 'invalid' : 'empty';
 }
 
+export function parsePlanApprovalAnswer(value) {
+  const raw = String(value || '').trim();
+  if (!raw) return { action: 'empty', command: '' };
+  const normalized = raw.toLowerCase();
+  if (normalized === '/yes' || normalized === 'yes') {
+    return { action: 'approve', command: '/yes' };
+  }
+  if (normalized === '/reject' || normalized === 'reject' || normalized === 'no') {
+    return { action: 'reject', command: '/reject' };
+  }
+  const editMatch = raw.match(/^\/?edit(?:\s+(.+))?$/i);
+  if (editMatch) {
+    const feedback = String(editMatch[1] || '').trim();
+    if (!feedback) return { action: 'missing_feedback', command: '' };
+    return { action: 'edit', feedback, command: `/edit ${feedback}` };
+  }
+  return { action: 'invalid', command: '' };
+}
+
+export function parsePendingPlanApprovalMessage(text = '') {
+  const raw = String(text || '');
+  if (!/^Plan approval is still pending\./i.test(raw.trim())) return null;
+  const lines = raw.split(/\r?\n/);
+  const out = { goal: '', summary: '', filePath: '' };
+  for (const line of lines) {
+    if (line.startsWith('Goal: ')) out.goal = line.slice('Goal: '.length).trim();
+    else if (line.startsWith('Summary: ')) out.summary = line.slice('Summary: '.length).trim();
+    else if (line.startsWith('Plan File: ')) out.filePath = line.slice('Plan File: '.length).trim();
+  }
+  return out;
+}
+
 export function formatDeleteApprovalLines(copy, request) {
   const details = normalizeDeleteApprovalRequest(request);
   if (!details) return [];
@@ -1021,7 +1078,9 @@ function getActivityDisplayParts(activity) {
     get_background_task: 'Task',
     stop_background_task: 'Stop',
     list_files: 'Glob',
-    update_todos: 'Update Todos'
+    update_todos: 'Update Todos',
+    read_plan: 'Read Plan',
+    update_plan: 'Update Plan'
   };
   return {
     primary: labels[parsed.base] || parsed.base || 'Tool',
@@ -1114,7 +1173,7 @@ function stageDescriptor(inputStage, busy, runtimeStatus, copy) {
 
 function RuntimeStrip({ busy, runtimeStatus, loaderTick, copy }) {
   const status = normalizeRuntimeStatus(runtimeStatus, copy);
-  const dots = '●○○'.slice(loaderTick % 3, (loaderTick % 3) + 1) || '●';
+  const spinnerChar = SPINNER_FRAMES[loaderTick % SPINNER_FRAMES.length];
   return h(
     Box,
     {
@@ -1126,7 +1185,7 @@ function RuntimeStrip({ busy, runtimeStatus, loaderTick, copy }) {
     },
     h(Text, { color: busy ? 'greenBright' : 'gray' }, busy ? copy.generic.live : copy.generic.idle),
     h(Text, { color: 'gray' }, '  '),
-    h(Text, { color: busy ? 'cyanBright' : 'gray' }, dots),
+    h(Text, { color: busy ? 'cyanBright' : 'gray' }, spinnerChar),
     h(Text, { color: 'gray' }, '  '),
     h(Text, { color: busy ? 'white' : 'gray' }, status.title || copy.generic.waitingForInput)
   );
@@ -1168,7 +1227,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,
       null,
@@ -1347,8 +1406,13 @@ export function parseAutoPlanSummaryMessage(text) {
           index: Number(stepMatch[1]),
           role: String(stepMatch[2] || '').trim().toLowerCase(),
           title: String(stepMatch[3] || '').trim(),
+          task: '',
           status: 'pending'
         });
+      } else if (/^-\s*task\s*:\s*/i.test(line) && parsed.planSteps.length > 0) {
+        parsed.planSteps[parsed.planSteps.length - 1].task = line.replace(/^-\s*task\s*:\s*/i, '').trim();
+      } else if (/^Next:\s*/i.test(line)) {
+        inPlanSteps = false;
       } else {
         inPlanSteps = false;
       }
@@ -1708,6 +1772,7 @@ function PlanSummaryBubble({ msg, copy }) {
     summary.failed ? `${labels.fail} ${summary.failed}` : ''
   ].filter(Boolean);
   const shortFile = summary.filePath ? trimText(summary.filePath, 96) : '';
+  const planSteps = Array.isArray(summary.planSteps) ? summary.planSteps : [];
 
   return h(
     Box,
@@ -1746,11 +1811,27 @@ function PlanSummaryBubble({ msg, copy }) {
       summary.planSummary
         ? h(
             Box,
-            { marginBottom: summary.approval || metaItems.length > 0 || summary.warningSteps || summary.failedSteps || shortFile ? 1 : 0, flexDirection: 'column' },
+            { marginBottom: planSteps.length > 0 || 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,
+      planSteps.length > 0
+        ? h(
+            Box,
+            { marginBottom: summary.approval || metaItems.length > 0 || summary.warningSteps || summary.failedSteps || shortFile ? 1 : 0, flexDirection: 'column' },
+            h(Text, { color: 'cyanBright' }, labels.steps),
+            ...planSteps.flatMap((step, idx) => {
+              const roleTag = String(step?.role || '').trim().toUpperCase() || 'CODER';
+              const titleText = String(step?.title || '-').trim() || '-';
+              const taskText = String(step?.task || '').trim();
+              const titleRow = h(Text, { key: `plan-step-title-${idx}`, color: 'gray' }, `${idx + 1}. [${roleTag}] ${titleText}`);
+              if (!taskText) return [titleRow];
+              const taskRow = h(Text, { key: `plan-step-task-${idx}`, color: 'gray' }, `   - task: ${taskText}`);
+              return [titleRow, taskRow];
+            })
+          )
+        : null,
       summary.approval
         ? h(
             Box,
@@ -2233,7 +2314,7 @@ export function renderMessageRow(msg, row, idx, loaderTick) {
       Box,
       { key: `row-tool-${msg.id}-${idx}` },
       h(Text, { color: 'gray' }, ' '),
-      h(Text, { color: dotColor }, '●'),
+      h(Text, { color: dotColor }, row.status === 'running' ? SPINNER_FRAMES[loaderTick % SPINNER_FRAMES.length] : '●'),
       h(Text, { color: 'gray' }, ' '),
       h(Text, { color: textColor }, display.primary),
       h(Text, { color: 'gray' }, display.secondary),
@@ -2313,12 +2394,12 @@ export function renderMessageRow(msg, row, idx, loaderTick) {
     return null;
   }
   if (row.kind === 'status') {
-    const dots = '.'.repeat((loaderTick % 3) + 1);
+    const spinnerChar = SPINNER_FRAMES[loaderTick % SPINNER_FRAMES.length];
     return h(
       Box,
       { key: `row-status-${msg.id}-${idx}`, marginTop: 1 },
       h(Text, { color: 'gray' }, '  '),
-      h(Text, { color: 'gray', dimColor: true }, `${row.text}${dots}`)
+      h(Text, { color: 'gray', dimColor: true }, `${row.text} ${spinnerChar}`)
     );
   }
   if (row.kind === 'quote') {
@@ -2457,7 +2538,7 @@ export function moveSuggestionSelection(currentIndex, itemCount, direction, page
   return safeIndex;
 }
 
-function MessageBubble({ msg, loaderTick, showToolDetails, rowWindow = null, contentWidth = 72, copy }) {
+const MessageBubble = React.memo(function MessageBubble({ msg, loaderTick, showToolDetails, rowWindow = null, contentWidth = 72, copy }) {
   if (msg?.planStrip) {
     return h(PlanStrip, { planState: msg.planState, copy });
   }
@@ -2509,7 +2590,13 @@ function MessageBubble({ msg, loaderTick, showToolDetails, rowWindow = null, con
         : null
     )
   );
-}
+}, (prev, next) => {
+  if (prev.msg === next.msg &&
+      prev.showToolDetails === next.showToolDetails &&
+      prev.contentWidth === next.contentWidth &&
+      prev.copy === next.copy) return true;
+  return false;
+});
 
 function MessageList({ messages, loaderTick, showToolDetails, contentWidth = 72, copy }) {
   return h(
@@ -2524,7 +2611,7 @@ function MessageList({ messages, loaderTick, showToolDetails, contentWidth = 72,
       h(MessageBubble, {
         key: message.id,
         msg: message,
-        loaderTick,
+        loaderTick: message.loading ? loaderTick : 0,
         showToolDetails,
         contentWidth,
         copy
@@ -2706,7 +2793,32 @@ function InputBar({
   );
 }
 
-function DeleteApprovalPanel({ request, inputValue, errorText, copy }) {
+function ApprovalCursorLine({ inputValue, placeholder, cursorVisible, accent }) {
+  if (inputValue) {
+    return h(
+      Box,
+      null,
+      h(Text, { color: 'white' }, inputValue),
+      h(
+        Text,
+        { color: cursorVisible ? 'black' : accent, backgroundColor: cursorVisible ? accent : undefined },
+        ' '
+      )
+    );
+  }
+  return h(
+    Box,
+    null,
+    h(
+      Text,
+      { color: cursorVisible ? 'black' : accent, backgroundColor: cursorVisible ? accent : undefined },
+      ' '
+    ),
+    placeholder ? h(Text, { color: 'gray' }, placeholder) : null
+  );
+}
+
+function DeleteApprovalPanel({ request, inputValue, errorText, copy, cursorVisible }) {
   if (!request) return null;
   const details =
     request?.toolName === 'delete'
@@ -2735,7 +2847,48 @@ function DeleteApprovalPanel({ request, inputValue, errorText, copy }) {
       Box,
       { marginTop: 1 },
       h(Text, { color: 'redBright' }, `${copy.deleteApproval.answerLabel}: `),
-      h(Text, { color: inputValue ? 'white' : 'gray' }, inputValue || placeholder || ' ')
+      h(ApprovalCursorLine, {
+        inputValue,
+        placeholder: placeholder || ' ',
+        cursorVisible,
+        accent: 'redBright'
+      })
+    ),
+    errorText ? h(Text, { color: 'yellowBright' }, errorText) : null
+  );
+}
+
+function PlanApprovalPanel({ request, inputValue, errorText, copy, cursorVisible }) {
+  if (!request) return null;
+  const goal = String(request.goal || '').trim();
+  const summary = String(request.summary || '').trim();
+  const filePath = String(request.filePath || '').trim();
+  const placeholder = String(copy.planApproval.answerPlaceholder || '').trim();
+  return h(
+    Box,
+    {
+      marginTop: 1,
+      flexDirection: 'column',
+      borderStyle: 'round',
+      borderColor: 'yellowBright',
+      paddingX: 1,
+      paddingY: 0
+    },
+    h(Text, { color: 'yellowBright' }, copy.planApproval.title),
+    goal ? h(Text, { color: 'white' }, `${copy.planApproval.goalLabel}: ${goal}`) : null,
+    summary ? h(Text, { color: 'white' }, `${copy.planApproval.summaryLabel}: ${summary}`) : null,
+    filePath ? h(Text, { color: 'gray' }, `${copy.planApproval.fileLabel}: ${filePath}`) : null,
+    h(Text, { color: 'gray' }, copy.planApproval.prompt),
+    h(
+      Box,
+      { marginTop: 1 },
+      h(Text, { color: 'yellowBright' }, `${copy.planApproval.answerLabel}: `),
+      h(ApprovalCursorLine, {
+        inputValue,
+        placeholder: placeholder || ' ',
+        cursorVisible,
+        accent: 'yellowBright'
+      })
     ),
     errorText ? h(Text, { color: 'yellowBright' }, errorText) : null
   );
@@ -2825,6 +2978,10 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
   const [pendingDeleteApproval, setPendingDeleteApproval] = useState(null);
   const [deleteApprovalInput, setDeleteApprovalInput] = useState('');
   const [deleteApprovalError, setDeleteApprovalError] = useState('');
+  const [pendingPlanApproval, setPendingPlanApproval] = useState(null);
+  const [planApprovalInput, setPlanApprovalInput] = useState('');
+  const [planApprovalError, setPlanApprovalError] = useState('');
+  const approvalLockActive = Boolean(pendingDeleteApproval || pendingPlanApproval);
   const activeAssistantIdRef = useRef(null);
   const activeAssistantAutoSkillNamesRef = useRef([]);
   const streamedAssistantHandledRef = useRef(false);
@@ -3204,6 +3361,25 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
         resultVerified: '',
         resultNext: ''
       });
+      setPendingPlanApproval({
+        goal: parsedPlanSummary.planSummary || '',
+        summary: parsedPlanSummary.finalSummary || parsedPlanSummary.planSummary || '',
+        filePath: parsedPlanSummary.filePath || ''
+      });
+      setPlanApprovalInput('');
+      setPlanApprovalError('');
+    } else if (result.type === 'system') {
+      const pendingMeta = parsePendingPlanApprovalMessage(result.text || '');
+      if (pendingMeta) {
+        setPendingPlanApproval({
+          goal: pendingMeta.goal || '',
+          summary: pendingMeta.summary || '',
+          filePath: pendingMeta.filePath || ''
+        });
+        setPlanState((prev) => ({ ...prev, pendingApproval: true }));
+        setPlanApprovalInput('');
+        setPlanApprovalError('');
+      }
     }
     setMessages((prev) => [
       ...prev,
@@ -3342,6 +3518,9 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     setBusy(true);
     setInputStage('sending');
     setRuntimeStatus(makeStatus(copy.runtime.sendingToGateway, copy.runtime.preparingRequest, 'yellowBright'));
+    setPendingPlanApproval(null);
+    setPlanApprovalInput('');
+    setPlanApprovalError('');
     setPlanState({
       current: 0,
       total: 0,
@@ -3623,6 +3802,9 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
         if (event?.type === 'plan:steps') {
           const planSteps = Array.isArray(event.steps) ? event.steps : [];
           if (planSteps.length > 0) {
+            setPendingPlanApproval(null);
+            setPlanApprovalInput('');
+            setPlanApprovalError('');
             setPlanState((prev) => ({
               ...prev,
               total: planSteps.length,
@@ -3921,6 +4103,46 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
       return;
     }
 
+    if (pendingPlanApproval) {
+      if (key.return) {
+        const parsed = parsePlanApprovalAnswer(planApprovalInput);
+        if (parsed.action === 'approve' || parsed.action === 'reject' || parsed.action === 'edit') {
+          setPendingPlanApproval(null);
+          setPlanApprovalInput('');
+          setPlanApprovalError('');
+          runSubmission(parsed.command);
+        } else if (parsed.action === 'missing_feedback') {
+          setPlanApprovalError(copy.planApproval.missingFeedback);
+        } else {
+          setPlanApprovalError(copy.planApproval.invalidAnswer);
+        }
+        return;
+      }
+
+      if (isBackspaceKey(value, key) || isDeleteKey(value, key)) {
+        setPlanApprovalInput((prev) => prev.slice(0, -1));
+        setPlanApprovalError('');
+        return;
+      }
+
+      if (isPrintableInput(value, key)) {
+        setPlanApprovalInput((prev) => `${prev}${value}`);
+        setPlanApprovalError('');
+        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'));
@@ -4171,13 +4393,24 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
   }, []);
 
   useEffect(() => {
-    const hasLoadingMessage = messages.some((m) => m.loading);
-    if (!busy && !hasLoadingMessage) return () => {};
+    if (!busy) return () => {};
     const timer = setInterval(() => {
       setLoaderTick((prev) => prev + 1);
     }, 500);
     return () => clearInterval(timer);
-  }, [busy, messages]);
+  }, [busy]);
+
+  useEffect(() => {
+    const pending = Boolean(runtimeState?.pendingPlanApproval);
+    if (!pending) {
+      setPendingPlanApproval(null);
+      return;
+    }
+    // Startup/recovery fallback only while idle; do not resurrect the panel mid-execution.
+    if (!busy) {
+      setPendingPlanApproval((prev) => prev || { goal: '', summary: '', filePath: '' });
+    }
+  }, [runtimeState?.pendingPlanApproval, busy]);
 
   useEffect(() => {
     if (commandSuggestions.length === 0) {
@@ -4219,6 +4452,11 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     activeUserMessageIdRef.current,
     activeAssistantIdRef.current
   );
+  const activeApprovalLock = pendingDeleteApproval
+    ? { text: copy.deleteApproval.inputLocked }
+    : pendingPlanApproval
+      ? { text: copy.planApproval.inputLocked }
+      : null;
 
   return h(
     Box,
@@ -4251,7 +4489,15 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
       request: pendingDeleteApproval,
       inputValue: deleteApprovalInput,
       errorText: deleteApprovalError,
-      copy
+      copy,
+      cursorVisible
+    }),
+    h(PlanApprovalPanel, {
+      request: pendingPlanApproval,
+      inputValue: planApprovalInput,
+      errorText: planApprovalError,
+      copy,
+      cursorVisible
     }),
     debugKeys
       ? h(
@@ -4266,8 +4512,8 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
       afterCursor,
       cursorVisible,
       busy,
-      disabled: Boolean(pendingDeleteApproval),
-      disabledText: pendingDeleteApproval ? copy.deleteApproval.inputLocked : '',
+      disabled: Boolean(activeApprovalLock),
+      disabledText: activeApprovalLock ? activeApprovalLock.text : '',
       inputStage,
       pendingQueueLength: pendingQueue.length,
       showToolDetails,