dave-code 1.1.0 → 1.2.0

package/bin/index.js

@@ -16,7 +16,7 @@ const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.ur
 const packageVersion = pkg.version;
 import { spawn } from 'child_process';
 import { getLogoLines } from './logoRenderer.js';
-import { hasApiKey, getAIResponse, streamAIResponse, generateTitle, sessionTokenUsage, resetTokenUsage } from './aiClient.js';
+import { hasApiKey, getAIResponse, streamAIResponse, generateTitle, extractMemoryCandidates, summarizeForCompaction, sessionTokenUsage, resetTokenUsage } from './aiClient.js';
 import { listSessions, saveSession, deleteSession } from './sessionManager.js';
 import { 
   CONFIG_FILE,
@@ -25,9 +25,7 @@ import {
   setActiveProfile, 
   updateProfile, 
   openConfigFileInEditor,
-  getActiveEffort,
-  setActiveEffort,
-  EFFORT_PRESETS,
+  inferContextWindowTokens,
   isFirstLaunch,
   setInitialized,
   lastConfigError
@@ -38,20 +36,68 @@ import {
   secureInputPrompt,
   chatInputPrompt,
   waitForEnter,
-  selectEffortMenu,
+  selectWorkModeMenu,
+  runThunderActivationAnimation,
   confirmPrompt,
+  permissionPrompt,
   textInputPrompt
 } from './cliMenu.js';
-import { prepareModelMessages, stripReasoningBlocks, getContextStats } from './contextManager.js';
-import { parseToolCall, executeToolCall, resolveExistingWorkspacePath, resolveWorkspacePath, SUPPORTED_TOOLS } from './toolRuntime.js';
+import { estimateTokens, prepareModelMessages, shouldCompact, stripReasoningBlocks, getContextStats } from './contextManager.js';
+import { buildScanSnapshot, planHighwayNotebookBuild, runAdaptiveScan } from './scanManager.js';
+import {
+  clearProjectNotebook,
+  ensureHighwayProjectNotebook,
+  getProjectNotebookStatus,
+  loadProjectNotebook,
+  markProjectNotebookStale,
+  readProjectNotebook
+} from './projectNotebookManager.js';
+import {
+  parseToolCall,
+  executeToolCall,
+  createToolCallSignature,
+  resolveBudgetFinishResponse,
+  resolveRepeatedToolRequest,
+  resolveExistingWorkspacePath,
+  resolveWorkspacePath,
+  undoLastMutation,
+  closeWorkspaceShell,
+  SUPPORTED_TOOLS,
+  MUTATING_TOOLS
+} from './toolRuntime.js';
 import { createRuntimeEvents } from './runtimeEvents.js';
-import { createTerminalRenderer, sanitizeUntrustedText } from './terminalRenderer.js';
+import { createTerminalRenderer, formatConversationMessage, sanitizeUntrustedText } from './terminalRenderer.js';
+import { displayWidth, displayWidth as getStringWidth, padCenter as centerLine, padEnd as padLine, truncateMiddle } from './textWidth.js';
+import { createThunderRenderer } from './thunderRenderer.js';
 import { parseInputCommand } from './commandRouter.js';
+import {
+  formatThunderResourceProposal,
+  runThunderPlanning,
+  runThunderPostReview,
+  suggestThunderPlanName
+} from './thunderOrchestrator.js';
+import {
+  addThunderMessage,
+  findThunderTeamForPlan,
+  getThunderTeam,
+  thunderSummary,
+  updateThunderTeam
+} from './thunderManager.js';
+import { buildThunderSystemPrompt } from './thunderPrompts.js';
+import {
+  clearMemories,
+  deleteMemory,
+  formatMemoriesForPrompt,
+  memorySummary,
+  mergeMemoryCandidates,
+  retrieveMemories,
+  setMemoryEnabled
+} from './memoryManager.js';
 import {
   deletePlan,
   findPlan,
   listPlans,
-  planStatusLines,
+  planStatusPanel,
   renamePlan,
   updatePlan,
   upsertPlan,
@@ -96,9 +142,14 @@ const locales = {
       '  /config - 编辑本地配置文件 (~/.dave-code-config.json)',
       '  /model  - 快捷切换当前激活的服务配置',
       '  /api    - 快捷修改当前配置的 API 密钥',
-      '  /effort - 调整 AI 思考与阅读的努力程度 (low/medium/high/xhigh/max/ultracode)',
+      '  /mode highway|thunder - 切换单 Agent 或办公室团队工作流',
+      '  /thunder <需求> - 切换到 Thunder 并开始团队规划',
+      '  /agents - 查看当前工作区的 Thunder 团队',
+      '  /memory - 查看、开关或删除当前工作区的跨聊天记忆',
+      '  /note status|refresh|rebuild|clear - 管理 Highway 后台项目笔记',
       '  /plan 名称: 需求 - 创建只读实施计划；/plan 管理已有计划',
       '  /code <需求或计划名> - 单次授权编程修改，仍逐项确认',
+      '  /undo   - 回滚本进程内最近一次文件变更',
       '  /open   - 打开文件或文件夹并在其中工作',
       '  /exit   - 退出 Dave Code 代理'
     ],
@@ -158,9 +209,14 @@ const locales = {
       '  /config - Open and edit config file (~/.dave-code-config.json)',
       '  /model  - Interactively switch active service profile',
       '  /api    - Interactively set API key for active profile',
-      '  /effort - Adjust AI thinking/reading effort level (low/medium/high/xhigh/max/ultracode)',
+      '  /mode highway|thunder - Switch between single-agent and office-team workflow',
+      '  /thunder <request> - Switch to Thunder and start team planning',
+      '  /agents - View Thunder teams for this workspace',
+      '  /memory - View, toggle, or delete cross-chat workspace memories',
+      '  /note status|refresh|rebuild|clear - Manage the private Highway project notebook',
       '  /plan name: request - Create a read-only implementation plan; /plan manages plans',
       '  /code <request or plan> - Authorize one confirmed coding turn',
+      '  /undo   - Undo the most recent file mutation in this process',
       '  /open   - Open a file or directory to work in',
       '  /exit   - Exit the Dave Code agent'
     ],
@@ -193,24 +249,34 @@ let workspaceRoot = process.cwd();
 let workspaceReady = true;
 let currentSessionId = null;
 let currentSessionTitle = 'New Chat';
+let workMode = 'highway';
+let currentContextPlan = null;
+let currentScanSummary = '';
+let currentReadBrief = '';
 
 function initSession() {
   currentSessionId = crypto.randomUUID();
   currentSessionTitle = currentLang === 'cn' ? '新会话' : 'New Chat';
   messages = [];
+  workMode = 'highway';
+  currentContextPlan = null;
+  currentScanSummary = '';
+  currentReadBrief = '';
   saveCurrentSession();
 }
 
-function saveCurrentSession() {
+function saveCurrentSession(allowEmpty = false) {
   if (!currentSessionId) return;
-  if (messages.length === 0) return; // Prevent saving empty sessions
+  if (!allowEmpty && messages.length === 0) return;
   const sessionData = {
     id: currentSessionId,
     title: currentSessionTitle,
     timestamp: Date.now(),
     messages: messages,
     workspaceRoot: workspaceReady ? workspaceRoot : null,
-    activeOpenFile: workspaceReady && activeOpenFile ? activeOpenFile : null
+    activeOpenFile: workspaceReady && activeOpenFile ? activeOpenFile : null,
+    workMode,
+    contextPlan: currentContextPlan
   };
   saveSession(currentSessionId, sessionData);
 }
@@ -226,61 +292,22 @@ function redrawScreen(messageText = '') {
   if (cleanHistory.length > 0) {
     console.log(currentLang === 'cn' ? '\x1b[90m--- 当前对话内容 (Current Chat) ---\x1b[0m' : '\x1b[90m--- Current Chat Context ---\x1b[0m');
     cleanHistory.forEach(m => {
-      let displayContent = sanitizeUntrustedText(stripReasoningBlocks(m.displayContent || m.content));
-      
-      if (displayContent) {
-        if (m.role === 'user') {
-          console.log(`\x1b[36mUser\x1b[0m: ${displayContent}`);
-        } else {
-          console.log(`\x1b[1;38;2;250;100;30mDave\x1b[0m: ${displayContent}`);
-        }
-      }
+      const displayContent = stripReasoningBlocks(m.displayContent || m.content);
+      const rendered = formatConversationMessage({ ...m, displayContent }, {
+        color: Boolean(process.stdout.isTTY && !process.env.NO_COLOR),
+        width: Math.max(24, Math.min(process.stdout.columns || 96, 120))
+      });
+      if (rendered) console.log(`\n${rendered}`);
     });
     console.log('\x1b[90m─────────────────────────────────\x1b[0m\n');
   }
 }
 
-function getStringWidth(str) {
-  const cleanStr = str.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '');
-  let width = 0;
-  for (let i = 0; i < cleanStr.length; i++) {
-    const code = cleanStr.charCodeAt(i);
-    if (
-      (code >= 0x4e00 && code <= 0x9fff) ||
-      (code >= 0x3400 && code <= 0x4dbf) ||
-      (code >= 0x3000 && code <= 0x303f) ||
-      (code >= 0xff00 && code <= 0xffef)
-    ) {
-      width += 2;
-    } else {
-      width += 1;
-    }
-  }
-  return width;
-}
-
-function centerLine(str, width) {
-  const strWidth = getStringWidth(str);
-  if (strWidth >= width) return str;
-  const leftPad = Math.floor((width - strWidth) / 2);
-  const rightPad = width - strWidth - leftPad;
-  return ' '.repeat(leftPad) + str + ' '.repeat(rightPad);
-}
-
-function padLine(str, width) {
-  const strWidth = getStringWidth(str);
-  if (strWidth >= width) return str;
-  return str + ' '.repeat(width - strWidth);
-}
-
-function truncateMiddle(str, width) {
-  const text = String(str || '');
-  if (getStringWidth(text) <= width) return text;
-  if (width <= 6) return text.slice(0, width);
-  const keep = width - 3;
-  const left = Math.ceil(keep / 2);
-  const right = Math.floor(keep / 2);
-  return text.slice(0, left) + '...' + text.slice(-right);
+function detectInputLanguage(text, fallback = currentLang) {
+  const value = String(text || '');
+  if (/[\u3400-\u9fff]/.test(value)) return 'cn';
+  if (/[A-Za-z]{2,}/.test(value)) return 'en';
+  return fallback;
 }
 
 function maskKey(key) {
@@ -293,125 +320,299 @@ function clearConsole() {
   process.stdout.write('\x1b[2J\x1b[0f');
 }
 
-async function runConcurrentLimit(items, limit, fn) {
-  const results = [];
-  const executing = [];
-  for (const item of items) {
-    const p = Promise.resolve().then(() => fn(item));
-    results.push(p);
-    if (limit <= items.length) {
-      const e = p.then(() => executing.splice(executing.indexOf(e), 1));
-      executing.push(e);
-      if (executing.length >= limit) {
-        await Promise.race(executing);
-      }
+function formatPlanPanelItem(plan, width, compact = false) {
+  const meta = {
+    ready: { icon: '○', color: '\x1b[36m', cn: '待执行', en: 'READY' },
+    running: { icon: '▶', color: '\x1b[33m', cn: '执行中', en: 'RUNNING' },
+    completed: { icon: '✓', color: '\x1b[32m', cn: '已完成', en: 'DONE' },
+    blocked: { icon: '!', color: '\x1b[31m', cn: '受阻', en: 'BLOCKED' }
+  }[plan.status] || { icon: '○', color: '\x1b[36m', cn: '待执行', en: 'READY' };
+  const name = sanitizeUntrustedText(plan.name);
+  if (compact) return `${meta.icon} ${name}`;
+  const label = currentLang === 'cn' ? meta.cn : meta.en;
+  const available = Math.max(6, width - getStringWidth(meta.icon) - getStringWidth(label) - 3);
+  const shownName = truncateMiddle(name, available);
+  const padding = ' '.repeat(Math.max(1, width - getStringWidth(meta.icon) - getStringWidth(shownName) - getStringWidth(label) - 2));
+  return `${meta.color}${meta.icon}\x1b[0m ${shownName}${padding}\x1b[90m${label}\x1b[0m`;
+}
+
+function notebookStatusLabel(status, lang = currentLang) {
+  const cn = lang === 'cn';
+  const labels = {
+    missing: cn ? '未建立' : 'missing', building: cn ? '建库中' : 'building',
+    partial: cn ? '待续建' : 'partial', ready: cn ? '就绪' : 'ready',
+    drift: cn ? '有漂移' : 'drift', stale: cn ? '待修复' : 'stale', failed: cn ? '失败' : 'failed'
+  };
+  return labels[status] || status;
+}
+
+function currentNotebookStatus() {
+  if (!workspaceReady || workMode !== 'highway') return null;
+  return getProjectNotebookStatus(workspaceRoot);
+}
+
+function formatNotebookAge(updatedAt) {
+  if (!updatedAt) return currentLang === 'cn' ? '从未' : 'never';
+  const seconds = Math.max(0, Math.floor((Date.now() - updatedAt) / 1000));
+  if (seconds < 60) return currentLang === 'cn' ? '刚刚' : 'just now';
+  const minutes = Math.floor(seconds / 60);
+  if (minutes < 60) return currentLang === 'cn' ? `${minutes} 分钟前` : `${minutes}m ago`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 48) return currentLang === 'cn' ? `${hours} 小时前` : `${hours}h ago`;
+  const days = Math.floor(hours / 24);
+  return currentLang === 'cn' ? `${days} 天前` : `${days}d ago`;
+}
+
+async function confirmLargeNotebookBuild(info, renderer = null) {
+  renderer?.pause();
+  try {
+    const sizeMb = (info.bytes / 1024 / 1024).toFixed(1);
+    const prompt = currentLang === 'cn'
+      ? `首次项目读取将处理 ${info.files} 个有效文本文件（${sizeMb} MB，约 ${info.estimatedBatches} 个读取批次），并在后台缓存项目认知。是否继续？`
+      : `The first project read will process ${info.files} effective text files (${sizeMb} MB, about ${info.estimatedBatches} read batches) and cache project knowledge in the background. Continue?`;
+    return await confirmPrompt(`\x1b[33m${prompt}\x1b[0m`);
+  } finally { renderer?.resume(); }
+}
+
+function cloneReadPlan(plan) {
+  return JSON.parse(JSON.stringify(plan));
+}
+
+function planTokenTotal(plan) {
+  return (plan.files || []).reduce((sum, file) => sum + (Number(file.estimatedTokens) || 0), 0)
+    + (Number(plan.notebook?.notebookBudgetTokens) || 0);
+}
+
+function printReadPlan(plan, scanUsage = {}) {
+  const cn = currentLang === 'cn';
+  console.log(cn ? '\n\x1b[1;36mHighway 阅读计划\x1b[0m' : '\n\x1b[1;36mHighway read plan\x1b[0m');
+  console.log(cn
+    ? `  Scan：${Number(scanUsage.inputTokens || 0).toLocaleString()} 输入 / ${Number(scanUsage.outputTokens || 0).toLocaleString()} 输出`
+    : `  Scan: ${Number(scanUsage.inputTokens || 0).toLocaleString()} in / ${Number(scanUsage.outputTokens || 0).toLocaleString()} out`);
+  console.log(cn
+    ? `  整轮软预算：${Number(plan.turnBudgetTokens || 0).toLocaleString()} Token · 单次上下文：${Number(plan.contextBudgetTokens || plan.budgetTokens || 0).toLocaleString()}`
+    : `  Post-Scan soft budget: ${Number(plan.turnBudgetTokens || 0).toLocaleString()} tokens · per-call context: ${Number(plan.contextBudgetTokens || plan.budgetTokens || 0).toLocaleString()}`);
+  console.log(cn
+    ? `  笔记：${plan.notebook?.action || 'reuse'} · ${Number(plan.notebook?.notebookBudgetTokens || 0).toLocaleString()} Token`
+    : `  Notebook: ${plan.notebook?.action || 'reuse'} · ${Number(plan.notebook?.notebookBudgetTokens || 0).toLocaleString()} tokens`);
+  const files = plan.files || [];
+  if (!files.length) console.log(cn ? '  文件：仅按需读取笔记' : '  Files: notebook only unless evidence is needed');
+  for (const [index, file] of files.slice(0, 20).entries()) {
+    console.log(`  ${index + 1}. [${file.strategy}] ${sanitizeUntrustedText(file.path)}${file.required ? ' *' : ''} · ${Number(file.estimatedTokens || 0).toLocaleString()} · ${sanitizeUntrustedText(file.reason || '')}`);
+  }
+  if (files.length > 20) console.log(cn ? `  …另有 ${files.length - 20} 个文件` : `  ...and ${files.length - 20} more files`);
+  console.log(cn
+    ? `  计划证据估算：约 ${planTokenTotal(plan).toLocaleString()} Token\n`
+    : `  Planned evidence estimate: about ${planTokenTotal(plan).toLocaleString()} tokens\n`);
+}
+
+function readPlanMenuDescription(plan, scanUsage = {}) {
+  const lines = [
+    currentLang === 'cn'
+      ? `Scan ${Number(scanUsage.inputTokens || 0).toLocaleString()} 输入 / ${Number(scanUsage.outputTokens || 0).toLocaleString()} 输出`
+      : `Scan ${Number(scanUsage.inputTokens || 0).toLocaleString()} in / ${Number(scanUsage.outputTokens || 0).toLocaleString()} out`,
+    currentLang === 'cn'
+      ? `整轮 ${Number(plan.turnBudgetTokens || 0).toLocaleString()} · 单次 ${Number(plan.contextBudgetTokens || plan.budgetTokens || 0).toLocaleString()} · 笔记 ${plan.notebook?.action || 'reuse'} ${Number(plan.notebook?.notebookBudgetTokens || 0).toLocaleString()}`
+      : `Turn ${Number(plan.turnBudgetTokens || 0).toLocaleString()} · per-call ${Number(plan.contextBudgetTokens || plan.budgetTokens || 0).toLocaleString()} · notebook ${plan.notebook?.action || 'reuse'} ${Number(plan.notebook?.notebookBudgetTokens || 0).toLocaleString()}`,
+    ...(plan.files || []).slice(0, 12).map((file, index) =>
+      `${index + 1}. [${file.strategy}] ${file.path}${file.required ? ' *' : ''} · ${Number(file.estimatedTokens || 0).toLocaleString()} · ${file.reason || ''}`),
+    ...((plan.files || []).length > 12
+      ? [currentLang === 'cn' ? `…另有 ${plan.files.length - 12} 个文件` : `...and ${plan.files.length - 12} more files`]
+      : [])
+  ];
+  return lines.join('\n');
+}
+
+function loadProjectInstructions(root) {
+  const sections = [];
+  for (const name of ['CLAUDE.md', 'AGENTS.md', '.cursorrules']) {
+    const target = path.join(root, name);
+    try {
+      if (!fs.statSync(target).isFile()) continue;
+      sections.push(`## ${name}\n${fs.readFileSync(target, 'utf8').slice(0, 8192)}`);
+    } catch {
+      // Missing or unreadable convention files are ignored.
     }
   }
-  return Promise.all(results);
+  return sections.join('\n\n');
 }
 
-async function runFileDigestionWorkflow(filePath, runtime = {}) {
-  const resolvedPath = path.resolve(filePath);
-  const content = fs.readFileSync(resolvedPath, 'utf8');
-  const lines = content.split('\n');
-  const totalLines = lines.length;
-  
-  const chunkSize = 2000;
-  const chunks = [];
-  for (let i = 0; i < totalLines; i += chunkSize) {
-    chunks.push(lines.slice(i, i + chunkSize).join('\n'));
+async function reviewHighwayReadPlan(plan, snapshot, scanUsage, renderer) {
+  if (process.env.DAVE_CODE_REVIEW_PLAN !== '1') return { approved: true, plan: cloneReadPlan(plan) };
+  const original = cloneReadPlan(plan);
+  let current = cloneReadPlan(plan);
+  const recommended = Number(original.turnBudgetTokens) || Number(original.budgetTokens) * 3 || 24000;
+  const known = new Map((snapshot.files || []).map(file => [file.path.toLowerCase(), file]));
+  renderer?.pause();
+  try {
+    while (true) {
+      const selected = await selectMenu(
+        currentLang === 'cn' ? '确认 Highway 阅读计划' : 'Confirm Highway read plan',
+        readPlanMenuDescription(current, scanUsage),
+        [
+          { name: currentLang === 'cn' ? '按当前计划开始' : 'Start with this plan', desc: currentLang === 'cn' ? '进入正式 READ' : 'Enter formal READ' },
+          { name: currentLang === 'cn' ? '经济预算（70%）' : 'Economy budget (70%)', desc: Math.round(recommended * 0.7).toLocaleString() },
+          { name: currentLang === 'cn' ? '推荐预算（100%）' : 'Recommended budget (100%)', desc: recommended.toLocaleString() },
+          { name: currentLang === 'cn' ? '充分预算（150%）' : 'Thorough budget (150%)', desc: Math.round(recommended * 1.5).toLocaleString() },
+          { name: currentLang === 'cn' ? '自定义预算' : 'Custom budget', desc: currentLang === 'cn' ? '输入累计 Token' : 'Enter cumulative tokens' },
+          { name: currentLang === 'cn' ? '修改文件策略' : 'Edit file strategy', desc: 'outline / targeted / full' },
+          { name: currentLang === 'cn' ? '增加文件' : 'Add file', desc: currentLang === 'cn' ? '添加快照中的路径' : 'Add a path from the snapshot' },
+          { name: currentLang === 'cn' ? '排除文件' : 'Exclude file', desc: currentLang === 'cn' ? '从本轮计划移除' : 'Remove from this turn' },
+          { name: currentLang === 'cn' ? '恢复 Scan 推荐' : 'Restore Scan plan', desc: currentLang === 'cn' ? '撤销所有调整' : 'Undo all adjustments' },
+          { name: currentLang === 'cn' ? '取消本轮' : 'Cancel turn', desc: currentLang === 'cn' ? '不进入 READ' : 'Do not enter READ' }
+        ]
+      );
+      if (selected === 0) return { approved: true, plan: current };
+      if (selected === 1) current.turnBudgetTokens = Math.max(current.contextBudgetTokens || current.budgetTokens, Math.round(recommended * 0.7));
+      else if (selected === 2) current.turnBudgetTokens = Math.max(current.contextBudgetTokens || current.budgetTokens, Math.round(recommended));
+      else if (selected === 3) current.turnBudgetTokens = Math.max(current.contextBudgetTokens || current.budgetTokens, Math.round(recommended * 1.5));
+      else if (selected === 4) {
+        const value = Number(await textInputPrompt(currentLang === 'cn' ? '整轮累计预算 Token：' : 'Post-Scan cumulative token budget: '));
+        if (Number.isFinite(value) && value >= (current.contextBudgetTokens || current.budgetTokens)) current.turnBudgetTokens = Math.round(value);
+      } else if (selected === 5 && current.files.length) {
+        const index = await selectMenu(
+          currentLang === 'cn' ? '选择文件' : 'Select file',
+          currentLang === 'cn' ? '选择后切换读取策略' : 'Choose a new read strategy',
+          current.files.map(file => ({ name: file.path, desc: `${file.strategy}${file.required ? ' · required' : ''}` }))
+        );
+        if (index >= 0) {
+          const strategy = await selectMenu('Read strategy', current.files[index].path, [
+            { name: 'outline', desc: currentLang === 'cn' ? '仅结构大纲' : 'Structure only' },
+            { name: 'targeted', desc: currentLang === 'cn' ? '按需局部读取' : 'Targeted ranges' },
+            { name: 'full', desc: currentLang === 'cn' ? '完整读取' : 'Full file' }
+          ]);
+          if (strategy >= 0) current.files[index].strategy = ['outline', 'targeted', 'full'][strategy];
+        }
+      } else if (selected === 6) {
+        const candidate = (await textInputPrompt(currentLang === 'cn' ? '工作区相对路径：' : 'Workspace-relative path: ')).replace(/\\/g, '/');
+        const file = known.get(candidate.toLowerCase());
+        if (file && !current.files.some(item => item.path.toLowerCase() === candidate.toLowerCase())) {
+          current.files.push({
+            path: file.path,
+            reason: currentLang === 'cn' ? '用户添加' : 'Added by user',
+            strategy: 'targeted',
+            required: true,
+            estimatedTokens: Math.max(100, Math.ceil(Math.min(file.size, 24000) / 4))
+          });
+        }
+      } else if (selected === 7 && current.files.length) {
+        const index = await selectMenu(
+          currentLang === 'cn' ? '排除文件' : 'Exclude file',
+          currentLang === 'cn' ? '选择要从计划中移除的文件' : 'Choose a file to remove from this plan',
+          current.files.map(file => ({ name: file.path, desc: file.required ? 'required' : file.strategy }))
+        );
+        if (index >= 0) {
+          const target = current.files[index];
+          const allowed = !target.required || await confirmPrompt(currentLang === 'cn'
+            ? `这是 Scan 标记的必需文件，仍要排除 ${target.path}？(y/n): `
+            : `Scan marked this file required. Exclude ${target.path} anyway? (y/n): `);
+          if (allowed) current.files.splice(index, 1);
+        }
+      } else if (selected === 8) current = cloneReadPlan(original);
+      else if (selected === 9 || selected < 0) return { approved: false, plan: current };
+    }
+  } finally {
+    renderer?.resume();
   }
-  
-  const totalChunks = chunks.length;
-  let completedCount = 0;
-  let failedCount = 0;
-
-  const emitProgress = () => {
-    const percent = totalChunks > 0 ? Math.round((completedCount / totalChunks) * 100) : 100;
-    runtime.emit?.('tool.progress', {
-      tool: runtime.toolName || 'READ_FILE',
-      toolCallId: runtime.toolCallId || '',
-      target: path.basename(filePath),
-      current: completedCount,
-      total: totalChunks,
-      percent,
-      failedCount,
-      label: runtime.lang === 'cn'
-        ? `正在消化 ${path.basename(filePath)} · ${completedCount}/${totalChunks} 分片`
-        : `Digesting ${path.basename(filePath)} · ${completedCount}/${totalChunks} chunks`
-    });
+}
+
+function buildReadBrief(plan, notebook) {
+  const brief = {
+    budget: {
+      perCall: plan.contextBudgetTokens || plan.budgetTokens,
+      postScan: plan.turnBudgetTokens
+    },
+    notebook: {
+      action: plan.notebook?.action,
+      status: notebook?.status || plan.notebook?.status || 'missing',
+      maturity: notebook?.maturity || plan.notebook?.maturity || 'baseline',
+      sections: Object.keys(notebook?.sections || {}).slice(0, 12)
+    },
+    files: (plan.files || []).slice(0, 40).map(file => ({
+      path: file.path, strategy: file.strategy, required: file.required, reason: file.reason
+    }))
   };
+  const text = JSON.stringify(brief);
+  if (estimateTokens(text) <= 1200) return text;
+  let low = 0;
+  let high = text.length;
+  while (low < high) {
+    const middle = Math.ceil((low + high) / 2);
+    if (estimateTokens(text.slice(0, middle)) <= 1200) low = middle;
+    else high = middle - 1;
+  }
+  return `${text.slice(0, low)}\n[Read brief capped at 1200 estimated tokens]`;
+}
 
-  emitProgress();
-  
-  const tasks = chunks.map((chunkText, idx) => ({ chunkText, idx }));
-  
-  const results = await runConcurrentLimit(tasks, 5, async (task) => {
-    const start = task.idx * chunkSize + 1;
-    const end = Math.min((task.idx + 1) * chunkSize, totalLines);
-    
-    const promptMsg = [
-      {
-        role: 'user',
-        content: `Analyze the following segment (Lines ${start}-${end}) of the file "${path.basename(filePath)}" and write a detailed, dense summary of its contents (key functions/classes/logic if code, or major events/plot/characters if text). Keep the summary highly informative and structured:\n\n${task.chunkText}`
-      }
-    ];
-    
-    try {
-      const summary = await getAIResponse(promptMsg);
-      completedCount++;
-      emitProgress();
-      return { idx: task.idx, start, end, summary };
-    } catch (err) {
-      completedCount++;
-      failedCount++;
-      emitProgress();
-      return { idx: task.idx, start, end, summary: `[Error reading this segment: ${err.message}]` };
+async function resolveTurnBudgetPressure(plan, usedTokens, renderer) {
+  renderer?.pause();
+  try {
+    const choice = await selectMenu(
+      currentLang === 'cn' ? 'Highway Token 预算接近上限' : 'Highway token budget is nearly exhausted',
+      currentLang === 'cn'
+        ? `已使用 ${usedTokens.toLocaleString()} / ${plan.turnBudgetTokens.toLocaleString()} Token`
+        : `Used ${usedTokens.toLocaleString()} / ${plan.turnBudgetTokens.toLocaleString()} tokens`,
+      [
+        { name: currentLang === 'cn' ? '增加 25%' : 'Add 25%', desc: currentLang === 'cn' ? '继续当前工作流' : 'Continue the workflow' },
+        { name: currentLang === 'cn' ? '增加 50%' : 'Add 50%', desc: currentLang === 'cn' ? '为复杂任务增加余量' : 'Add room for complex work' },
+        { name: currentLang === 'cn' ? '自定义追加' : 'Custom extension', desc: currentLang === 'cn' ? '输入新增 Token' : 'Enter additional tokens' },
+        { name: currentLang === 'cn' ? '基于现有证据收尾' : 'Finish with current evidence', desc: currentLang === 'cn' ? '停止调用工具并简洁回答' : 'Stop tools and answer concisely' },
+        { name: currentLang === 'cn' ? '取消本轮' : 'Cancel turn', desc: currentLang === 'cn' ? '保留已经落盘的修改' : 'Keep any already-applied changes' }
+      ]
+    );
+    if (choice === 0) return { action: 'extend', tokens: Math.max(1000, Math.round(plan.turnBudgetTokens * 0.25)) };
+    if (choice === 1) return { action: 'extend', tokens: Math.max(1000, Math.round(plan.turnBudgetTokens * 0.5)) };
+    if (choice === 2) {
+      const tokens = Number(await textInputPrompt(currentLang === 'cn' ? '追加 Token：' : 'Additional tokens: '));
+      return Number.isFinite(tokens) && tokens > 0
+        ? { action: 'extend', tokens: Math.round(tokens) }
+        : { action: 'finish' };
     }
-  });
-  
-  results.sort((a, b) => a.idx - b.idx);
-  
-  let report = `=== ULTRACODE DIGESTION REPORT FOR "${path.basename(filePath)}" ===\n`;
-  report += `Total Lines: ${totalLines}\n`;
-  report += `Resolved Path: ${resolvedPath}\n\n`;
-  
-  results.forEach(res => {
-    report += `--- Segment ${res.idx + 1} (Lines ${res.start}-${res.end}) ---\n`;
-    report += `${res.summary}\n\n`;
-  });
-  
-  report += `=========================================================\n`;
-  return report;
+    if (choice === 3) return { action: 'finish' };
+    return { action: 'cancel' };
+  } finally {
+    renderer?.resume();
+  }
 }
 
 function drawHeader() {
   const logoLines = getLogoLines();
   const t = locales[currentLang];
   const active = getActiveProfile();
-  const effort = getActiveEffort();
-  const contextStats = getContextStats(messages, effort);
-  const plans = workspaceReady ? planStatusLines(workspaceRoot, process.stdout.columns && process.stdout.columns < 100 ? 2 : 4) : [];
+  const contextStats = getContextStats(messages, currentContextPlan);
+  const memory = workspaceReady ? memorySummary(workspaceRoot) : { enabled: true, total: 0 };
+  const note = currentNotebookStatus();
+  const planLimit = process.stdout.columns && process.stdout.columns < 100 ? 2 : 4;
+  const planPanel = workspaceReady
+    ? planStatusPanel(workspaceRoot, planLimit)
+    : { items: [], total: 0, hidden: 0, counts: { active: 0, completed: 0 } };
+  const terminalWidth = Math.max(36, process.stdout.columns || 100);
+  // The two-column header scales with the terminal instead of assuming 95
+  // columns, so 101-119 column windows no longer leave a ragged right edge.
+  const boxWidth = Math.min(terminalWidth - 2, 118);
   const leftColWidth = 45;
-  const rightColWidth = 47;
-  const boxWidth = 95;
+  const rightColWidth = Math.max(38, boxWidth - leftColWidth - 3);
   const activeFileLabel = workspaceReady && activeOpenFile ? truncateMiddle(sanitizeUntrustedText(path.relative(workspaceRoot, activeOpenFile)), rightColWidth - 13) : (currentLang === 'cn' ? '未选择' : 'None');
   const workspaceLabel = workspaceReady
     ? truncateMiddle(sanitizeUntrustedText(workspaceRoot), rightColWidth - 11)
     : (currentLang === 'cn' ? '未关联，请使用 /open' : 'Not linked; use /open');
   const contextLabel = `${contextStats.modelMessages}/${contextStats.savedMessages} msgs · ~${contextStats.estimatedTokens}/${contextStats.budgetTokens} tokens${contextStats.compacted ? ' · compacted' : ''}`;
-  const terminalWidth = Math.max(36, process.stdout.columns || 100);
 
   if (terminalWidth < 100) {
     const contentWidth = Math.max(32, terminalWidth - 2);
     const rule = '─'.repeat(contentWidth);
     const compactStatus = [
+      `${currentLang === 'cn' ? '模式' : 'Mode'}: ${workMode === 'thunder' ? '⚡ Thunder' : '➜ Highway'}`,
       `${currentLang === 'cn' ? '模型' : 'Model'}: ${active ? active.model : '(not configured)'}`,
-      `Effort: ${effort}`,
+      `${currentLang === 'cn' ? '上下文窗口' : 'Context window'}: ${inferContextWindowTokens(active).toLocaleString()} tokens`,
       `${currentLang === 'cn' ? '目录' : 'Workspace'}: ${workspaceReady ? truncateMiddle(sanitizeUntrustedText(workspaceRoot), contentWidth - 5) : (currentLang === 'cn' ? '未关联，请使用 /open' : 'Not linked; use /open')}`,
       `${currentLang === 'cn' ? '文件' : 'File'}: ${workspaceReady && activeOpenFile ? truncateMiddle(sanitizeUntrustedText(path.relative(workspaceRoot, activeOpenFile)), contentWidth - 5) : (currentLang === 'cn' ? '未选择' : 'None')}`,
       `${currentLang === 'cn' ? '上下文' : 'Context'}: ${contextStats.modelMessages}/${contextStats.savedMessages} · ~${contextStats.estimatedTokens}/${contextStats.budgetTokens}${contextStats.compacted ? (currentLang === 'cn' ? ' · 已压缩' : ' · compacted') : ''}`,
-      `${currentLang === 'cn' ? '计划' : 'Plans'}: ${plans.length ? plans.join(' | ') : (currentLang === 'cn' ? '无' : 'None')}`
+      `${currentLang === 'cn' ? '记忆' : 'Memory'}: ${memory.total} ${currentLang === 'cn' ? '条' : 'saved'} · ${memory.enabled ? (currentLang === 'cn' ? '已开启' : 'on') : (currentLang === 'cn' ? '已关闭' : 'off')}`,
+      ...(note ? [`${currentLang === 'cn' ? '项目笔记' : 'Note'}: ${notebookStatusLabel(note.status)} · ${note.completed}/${note.files}${note.drift ? ` · ${note.drift} ${currentLang === 'cn' ? '处漂移' : 'drift'}` : ''}`] : []),
+      `${currentLang === 'cn' ? '计划' : 'Plans'}: ${planPanel.items.length
+        ? `${planPanel.items.map(plan => formatPlanPanelItem(plan, contentWidth, true)).join(' | ')}${planPanel.hidden ? ` | +${planPanel.hidden}` : ''}`
+        : (currentLang === 'cn' ? '无' : 'None')}`
     ];
 
     console.log(`\x1b[38;2;250;100;30m${rule}\x1b[0m`);
@@ -425,17 +626,29 @@ function drawHeader() {
   
   const rightLines = [
     currentLang === 'cn' ? '\x1b[1;38;2;250;100;30m状态\x1b[0m' : '\x1b[1;38;2;250;100;30mStatus\x1b[0m',
-    `Model: ${active ? active.model : '(not configured)'}`,
-    `Effort: ${effort}`,
-    `Workspace: ${workspaceLabel}`,
-    `Active file: ${activeFileLabel}`,
-    `Context: ${contextLabel}`,
+    `${currentLang === 'cn' ? '模式' : 'Mode'}: ${workMode === 'thunder' ? '\x1b[1;33m⚡ Thunder\x1b[0m' : '\x1b[36m➜ Highway\x1b[0m'}`,
+    `${currentLang === 'cn' ? '模型' : 'Model'}: ${active ? active.model : (currentLang === 'cn' ? '未配置' : 'not configured')}`,
+    `${currentLang === 'cn' ? '阶段' : 'Stage'}: ${currentContextPlan ? 'SCAN ✓ · READ' : (currentLang === 'cn' ? '等待任务' : 'Idle')}`,
+    `${currentLang === 'cn' ? '工作区' : 'Workspace'}: ${workspaceLabel}`,
+    `${currentLang === 'cn' ? '当前文件' : 'Active file'}: ${activeFileLabel}`,
+    `${currentLang === 'cn' ? '上下文' : 'Context'}: ${contextLabel}`,
+    currentLang === 'cn'
+      ? `记忆: ${memory.total} 条 · ${memory.enabled ? '已开启' : '已关闭'} · /memory`
+      : `Memory: ${memory.total} saved · ${memory.enabled ? 'on' : 'off'} · /memory`,
+    ...(note ? [currentLang === 'cn'
+      ? `笔记: ${notebookStatusLabel(note.status)} · ${note.completed}/${note.files} 文件 · /note`
+      : `Note: ${notebookStatusLabel(note.status)} · ${note.completed}/${note.files} files · /note`] : []),
     '',
-    currentLang === 'cn' ? '\x1b[1;38;2;250;100;30m计划\x1b[0m' : '\x1b[1;38;2;250;100;30mPlans\x1b[0m',
-    ...(plans.length ? plans : [currentLang === 'cn' ? '暂无计划' : 'No plans']),
+    `${currentLang === 'cn' ? '\x1b[1;38;2;250;100;30m计划\x1b[0m' : '\x1b[1;38;2;250;100;30mPlans\x1b[0m'} ` +
+      `\x1b[90m${planPanel.counts.active} ${currentLang === 'cn' ? '未完成' : 'active'} · ${planPanel.counts.completed} ${currentLang === 'cn' ? '已完成' : 'done'}\x1b[0m`,
+    ...(planPanel.items.length
+      ? planPanel.items.map(plan => formatPlanPanelItem(plan, rightColWidth))
+      : [currentLang === 'cn' ? '\x1b[90m暂无计划 · 使用 /plan 创建\x1b[0m' : '\x1b[90mNo plans · create one with /plan\x1b[0m']),
+    ...(planPanel.hidden > 0 ? [`\x1b[90m↳ +${planPanel.hidden} more · /plan\x1b[0m`] : []),
     '',
     currentLang === 'cn' ? '\x1b[1;38;2;250;100;30m常用命令\x1b[0m' : '\x1b[1;38;2;250;100;30mCommands\x1b[0m',
-    '/plan  /code  /open',
+    '/mode  /plan  /code',
+    '/agents /open',
     '/help  /history /model',
     currentLang === 'cn' ? 'Ctrl+C 或 /exit 退出' : 'Ctrl+C or /exit to quit',
     '',
@@ -444,9 +657,14 @@ function drawHeader() {
 
   const boxColor = '\x1b[38;2;250;100;30m';
   const resetColor = '\x1b[0m';
-  
-  const topBorder = boxColor + '┌── ' + resetColor + `\x1b[1mDave Code v${packageVersion}\x1b[0m` + boxColor + ' ' + '─'.repeat(boxWidth - 16 - packageVersion.length) + '┐' + resetColor;
-  const bottomBorder = boxColor + '└' + '─'.repeat(boxWidth) + '┘' + resetColor;
+
+  // Every row is "│ " + left + " │ " + right + " │", so the border must match
+  // that exact inner width or the box corners drift as the terminal resizes.
+  const innerWidth = leftColWidth + rightColWidth + 3;
+  const titleText = `Dave Code v${packageVersion}`;
+  const topFill = Math.max(1, innerWidth - displayWidth(titleText) - 4);
+  const topBorder = `${boxColor}┌── ${resetColor}\x1b[1m${titleText}\x1b[0m${boxColor} ${'─'.repeat(topFill)}┐${resetColor}`;
+  const bottomBorder = `${boxColor}└${'─'.repeat(innerWidth + 2)}┘${resetColor}`;
 
   console.log(topBorder);
 
@@ -467,18 +685,16 @@ function drawHeader() {
         leftContent = centerLine(`\x1b[90m(No Models / 未配置)\x1b[0m`, leftColWidth);
       }
     } else if (i === 19) {
-      const cwd = process.cwd();
-      const truncatedCwd = cwd.length > leftColWidth - 2 ? '...' + cwd.slice(-(leftColWidth - 5)) : cwd;
-      leftContent = centerLine(`\x1b[90m${truncatedCwd}\x1b[0m`, leftColWidth);
+      leftContent = centerLine(`\x1b[90m${truncateMiddle(process.cwd(), leftColWidth - 2)}\x1b[0m`, leftColWidth);
     }
 
     const rightContent = padLine(truncateMiddle(rightLines[i] || '', rightColWidth), rightColWidth);
 
     console.log(
-      boxColor + '│ ' + resetColor + 
-      leftContent + 
-      boxColor + ' │ ' + resetColor + 
-      rightContent + 
+      boxColor + '│ ' + resetColor +
+      leftContent +
+      boxColor + ' │ ' + resetColor +
+      rightContent +
       boxColor + ' │' + resetColor
     );
   }
@@ -495,12 +711,18 @@ async function promptUser() {
   promptLoopRunning = true;
 
   while (true) {
-    const effort = getActiveEffort();
-    const effortText = `● ${effort} · /effort`;
+    const note = currentNotebookStatus();
+    const noteText = note
+      ? ` · ${currentLang === 'cn' ? '笔记' : 'Note'} ${notebookStatusLabel(note.status)}`
+      : '';
+    const statusText = currentContextPlan
+      ? `${workMode === 'thunder' ? '⚡ Thunder' : '➜ Highway'} · ${currentLang === 'cn' ? '上下文' : 'Context'} ~${getContextStats(messages, currentContextPlan).estimatedTokens}/${currentContextPlan.budgetTokens}`
+          + noteText
+      : `${workMode === 'thunder' ? '⚡ Thunder' : '➜ Highway'} · ${currentLang === 'cn' ? '扫描就绪' : 'Scan ready'}${noteText}`;
     const promptWidth = Math.max(32, process.stdout.columns || 80);
-    const padding = ' '.repeat(Math.max(1, promptWidth - getStringWidth(effortText) - 1));
-    const colorCode = effort === 'ultracode' ? '\x1b[33m' : '\x1b[90m';
-    console.log(padding + colorCode + effortText + '\x1b[0m');
+    const padding = ' '.repeat(Math.max(1, promptWidth - getStringWidth(statusText) - 1));
+    const colorCode = '\x1b[90m';
+    console.log(padding + colorCode + statusText + '\x1b[0m');
     const activeFileBase = activeOpenFile ? path.basename(activeOpenFile) : '';
     const placeholder = activeOpenFile
       ? (currentLang === 'cn' ? `正在针对 [${activeFileBase}] 工作...` : `Working on [${activeFileBase}]...`)
@@ -547,7 +769,9 @@ function describeToolRequest(toolName, toolArg, lang) {
   const target = firstLine.length > 80 ? `${firstLine.slice(0, 77)}...` : firstLine;
   const labels = {
     LIST_DIR: cn ? `准备查看 ${target || '.'}` : `Preparing to list ${target || '.'}`,
+    INSPECT_FILE: cn ? `准备分析 ${target} 的结构` : `Preparing to inspect ${target}`,
     READ_FILE: cn ? `准备读取 ${target}` : `Preparing to read ${target}`,
+    READ_NOTEBOOK: cn ? '准备按需读取项目笔记' : 'Preparing to read the project notebook',
     EDIT_FILE: cn ? `准备局部修改 ${target}` : `Preparing to edit ${target}`,
     WRITE_FILE: cn ? `准备修改 ${target}` : `Preparing to change ${target}`,
     SEARCH_GREP: cn ? `准备搜索 “${target}”` : `Preparing to search "${target}"`,
@@ -570,6 +794,59 @@ function launchEditor(filePath) {
   child.unref();
 }
 
+async function handleMemoryMenu() {
+  while (true) {
+    const summary = memorySummary(workspaceRoot);
+    const options = [
+      {
+        name: currentLang === 'cn'
+          ? `自动记忆：${summary.enabled ? '开启' : '关闭'}`
+          : `Auto memory: ${summary.enabled ? 'on' : 'off'}`,
+        desc: currentLang === 'cn' ? '切换跨聊天记忆提取' : 'Toggle cross-chat memory extraction'
+      },
+      ...summary.memories.map(memory => ({
+        name: `[${memory.category}] ${memory.text}`,
+        desc: new Date(memory.updatedAt).toLocaleString(currentLang === 'cn' ? 'zh-CN' : 'en-US')
+      })),
+      ...(summary.memories.length ? [{
+        name: currentLang === 'cn' ? '清空全部记忆' : 'Clear all memories',
+        desc: currentLang === 'cn' ? '永久删除当前工作区的自动记忆' : 'Permanently delete workspace memories'
+      }] : [])
+    ];
+    const selected = await selectMenu(
+      currentLang === 'cn' ? '工作区记忆' : 'Workspace Memory',
+      currentLang === 'cn'
+        ? `${summary.total} 条记忆 · 仅保存可跨聊天复用的偏好、约定和项目事实`
+        : `${summary.total} memories · durable preferences, conventions, and project facts only`,
+      options,
+      0
+    );
+    if (selected === -1) return;
+    if (selected === 0) {
+      setMemoryEnabled(workspaceRoot, !summary.enabled);
+      continue;
+    }
+    const memoryIndex = selected - 1;
+    if (memoryIndex < summary.memories.length) {
+      const memory = summary.memories[memoryIndex];
+      const action = await selectMenu(
+        currentLang === 'cn' ? '记忆详情' : 'Memory detail',
+        memory.text,
+        currentLang === 'cn'
+          ? [{ name: '删除', desc: '永久删除这条记忆' }, { name: '返回', desc: '保留记忆' }]
+          : [{ name: 'Delete', desc: 'Permanently delete this memory' }, { name: 'Back', desc: 'Keep this memory' }],
+        1
+      );
+      if (action === 0) deleteMemory(workspaceRoot, memory.id);
+      continue;
+    }
+    const confirmed = await confirmPrompt(currentLang === 'cn'
+      ? '确认清空当前工作区的全部记忆？(y/n): '
+      : 'Clear every memory for this workspace? (y/n): ');
+    if (confirmed) clearMemories(workspaceRoot);
+  }
+}
+
 async function handlePlanMenu() {
   while (true) {
     const plans = listPlans(workspaceRoot);
@@ -657,8 +934,219 @@ function sessionMatchesWorkspace(session, candidateRoot) {
   return false;
 }
 
+function recentConversationForScan(history, maxMessages = 8) {
+  return history
+    .filter(message => ['user', 'assistant'].includes(message.role) && !message.toolCall)
+    .slice(-maxMessages)
+    .map(message => `[${message.role}] ${sanitizeUntrustedText(stripReasoningBlocks(message.displayContent || message.content || '')).slice(0, 1200)}`)
+    .join('\n');
+}
+
 // ── Main REPL Input Handler ──
 
+async function chooseWorkMode() {
+  return selectWorkModeMenu(workMode, currentLang);
+}
+
+async function showThunderTeams() {
+  if (!workspaceReady) {
+    console.log(currentLang === 'cn' ? '\n请先使用 /open 关联工作区。\n' : '\nUse /open to attach a workspace first.\n');
+    return;
+  }
+  const summary = thunderSummary(workspaceRoot);
+  if (!summary.latest) {
+    console.log(currentLang === 'cn' ? '\n暂无活跃 Thunder 团队。\n' : '\nNo active Thunder team.\n');
+    return;
+  }
+  const team = summary.latest;
+  console.log(`\n\x1b[1;33m⚡ Thunder · ${sanitizeUntrustedText(team.planName)}\x1b[0m`);
+  console.log(currentLang === 'cn'
+    ? `阶段 ${team.phase} · ${team.members.length} 人 · ${team.resourceProposal.tier} · 并发 ${team.resourceProposal.concurrency}`
+    : `Phase ${team.phase} · ${team.members.length} members · ${team.resourceProposal.tier} · concurrency ${team.resourceProposal.concurrency}`);
+  for (const member of team.members) {
+    const used = (member.contextUsage?.usedTokens || 0).toLocaleString();
+    const budget = (member.contextUsage?.budgetTokens || currentContextPlan?.budgetTokens || 0).toLocaleString();
+    console.log(`  ${member.status === 'done' ? '✓' : member.status === 'blocked' ? '!' : '○'} ${member.name} · ${member.phase || 'reading'} · ${used}/${budget} · ${sanitizeUntrustedText(member.latestReport || member.currentTask || '')}`);
+  }
+  console.log('');
+}
+
+async function runThunderPlanningFlow({ request, requestedName = null, replace = false }) {
+  const planName = requestedName || suggestThunderPlanName(request, currentLang);
+  const finalName = !requestedName && findPlan(workspaceRoot, planName) ? `${planName} ${new Date().toLocaleTimeString(currentLang === 'cn' ? 'zh-CN' : 'en-US', { hour: '2-digit', minute: '2-digit' })}` : planName;
+  const recalled = retrieveMemories(workspaceRoot, request, 8);
+  const memoryText = formatMemoriesForPrompt(recalled);
+  const runtime = createRuntimeEvents();
+  let renderer = createTerminalRenderer({ stdout: process.stdout, lang: currentLang });
+  const unsubscribe = runtime.subscribe(event => renderer?.handle(event));
+  const abortController = new AbortController();
+  const onInterrupt = () => abortController.abort();
+  process.once('SIGINT', onInterrupt);
+  messages.push({ role: 'user', content: request, displayContent: request });
+  saveCurrentSession();
+  try {
+    runtime.emit('turn.started', { label: currentLang === 'cn' ? '准备 Thunder 工作流' : 'Preparing Thunder workflow' });
+    runtime.emit('phase.changed', { phase: 'scan', label: currentLang === 'cn' ? 'SCAN · 扫描项目' : 'SCAN · scanning project' });
+    const scan = await runAdaptiveScan({
+      workspaceRoot, request, memories: memoryText, conversationContext: recentConversationForScan(messages),
+      profile: getActiveProfile(), emit: runtime.emit, signal: abortController.signal, lang: currentLang
+    });
+    currentContextPlan = scan.contextPlan;
+    currentScanSummary = scan.summary;
+    saveCurrentSession();
+    renderer.dispose();
+    renderer = null;
+    const result = await runThunderPlanning({
+      workspaceRoot, request, planName: finalName, lang: currentLang, memories: memoryText,
+      contextPlan: scan.contextPlan, scanSummary: scan.summary, scanSnapshot: scan.snapshot,
+      emit: runtime.emit,
+      requestPermission: async request => {
+        renderer?.pause();
+        try {
+          if (request.preview) {
+            const lines = sanitizeUntrustedText(request.preview).split('\n');
+            console.log(lines.slice(0, 30).join('\n'));
+            if (lines.length > 30) console.log(currentLang === 'cn' ? `… 已折叠 ${lines.length - 30} 行预览` : `… ${lines.length - 30} preview lines collapsed`);
+          }
+          return await (request.allowSession ? permissionPrompt : confirmPrompt)(`\x1b[33m${sanitizeUntrustedText(request.prompt)}\x1b[0m`);
+        }
+        finally { renderer?.resume(); }
+      },
+      approveResources: async (proposal, team) => {
+        renderer?.dispose();
+        renderer = createThunderRenderer({
+          stdout: process.stdout, lang: currentLang, team,
+          onMessageRequested: async member => {
+            renderer?.pause();
+            try {
+              const message = await textInputPrompt(currentLang === 'cn'
+                ? `给 ${member.name} 的消息（由 PM 记录和路由）: `
+                : `Message for ${member.name} (recorded and routed by PM): `);
+              if (message?.trim()) {
+                addThunderMessage(workspaceRoot, team.id, {
+                  from: 'user', to: member.id, type: 'question', summary: message.trim(), refs: [], requiresResponse: true
+                });
+                runtime.emit('message.sent', { teamId: team.id, message: { from: 'user', to: member.id, type: 'question', summary: message.trim() } });
+              }
+            } finally {
+              renderer?.resume();
+            }
+          }
+        });
+        renderer.pause();
+        console.log(`\n\x1b[1;33m${sanitizeUntrustedText(formatThunderResourceProposal(proposal, currentLang))}\x1b[0m\n`);
+        const approved = await confirmPrompt(currentLang === 'cn'
+          ? '批准此资源方案并开始只读团队规划？(y/n): '
+          : 'Approve this resource proposal and start read-only team planning? (y/n): ');
+        if (approved) renderer.resume();
+        return approved;
+      },
+      approvePerformance: async () => confirmPrompt(currentLang === 'cn'
+        ? 'PM 判断这是高难度任务。是否批准高性能档（最多 9 个 Agent、6 个并发请求）？(y/n): '
+        : 'The PM classified this as high difficulty. Approve performance tier (up to 9 agents and 6 concurrent requests)? (y/n): '),
+      signal: abortController.signal
+    });
+    if (result.cancelled) {
+      messages.push({ role: 'assistant', content: currentLang === 'cn' ? 'Thunder 资源方案未获批准，未启动规划。' : 'The Thunder resource proposal was not approved; planning did not start.' });
+      saveCurrentSession();
+      return null;
+    }
+    const plan = upsertPlan(workspaceRoot, {
+      name: finalName, request, content: result.planContent, workflowMode: 'thunder', teamId: result.team.id,
+      resourceProposal: result.team.resourceProposal, teamSnapshot: result.team,
+      taskGraph: result.team.tasks, decisions: result.team.decisions
+    }, { replace });
+    updateThunderTeam(workspaceRoot, result.team.id, { planId: plan.id, planName: plan.name, phase: 'awaiting_code' });
+    messages.push({ role: 'assistant', content: result.planContent });
+    saveCurrentSession();
+    renderer?.dispose();
+    renderer = null;
+    redrawScreen(currentLang === 'cn'
+      ? `\n\x1b[32mThunder 团队计划“${sanitizeUntrustedText(plan.name)}”已保存。输入 /code ${sanitizeUntrustedText(plan.name)} 开始执行。\x1b[0m\n`
+      : `\n\x1b[32mThunder team plan “${sanitizeUntrustedText(plan.name)}” was saved. Run /code ${sanitizeUntrustedText(plan.name)} to execute.\x1b[0m\n`);
+    return plan;
+  } catch (error) {
+    renderer?.dispose();
+    renderer = null;
+    if (abortController.signal.aborted) console.log(currentLang === 'cn' ? '\nThunder 规划已取消。\n' : '\nThunder planning cancelled.\n');
+    else console.log(currentLang === 'cn' ? `\nThunder 规划失败：${sanitizeUntrustedText(error.message)}\n` : `\nThunder planning failed: ${sanitizeUntrustedText(error.message)}\n`);
+    return null;
+  } finally {
+    process.removeListener('SIGINT', onInterrupt);
+    renderer?.dispose();
+    unsubscribe();
+    runtime.close();
+  }
+}
+
+async function handleNoteCommand(action) {
+  if (workMode !== 'highway') {
+    console.log(currentLang === 'cn'
+      ? '\n\x1b[33m项目笔记暂仅支持 Highway；Thunder 工作流保持不变。\x1b[0m\n'
+      : '\n\x1b[33mProject notebooks currently support Highway only; Thunder is unchanged.\x1b[0m\n');
+    return;
+  }
+  if (!workspaceReady) {
+    console.log(currentLang === 'cn' ? '\n请先使用 /open 关联工作区。\n' : '\nUse /open to attach a workspace first.\n');
+    return;
+  }
+  if (action === 'status') {
+    const note = getProjectNotebookStatus(workspaceRoot);
+    if (!note.exists) {
+      console.log(currentLang === 'cn'
+        ? '\n\x1b[90m项目笔记尚未建立；下一次 Highway 项目任务会自动建库。\x1b[0m\n'
+        : '\n\x1b[90mNo project notebook exists; the next Highway project task will build it.\x1b[0m\n');
+      return;
+    }
+    const coverage = note.files ? Math.round(note.completed / note.files * 100) : 0;
+    console.log(currentLang === 'cn'
+      ? `\n\x1b[1;36m项目笔记\x1b[0m\n  状态：${notebookStatusLabel(note.status)}\n  覆盖：${note.completed}/${note.files} 文件（${coverage}%）\n  漂移：${note.drift} 个路径\n  更新：${formatNotebookAge(note.updatedAt)}\n`
+      : `\n\x1b[1;36mProject notebook\x1b[0m\n  Status: ${notebookStatusLabel(note.status)}\n  Coverage: ${note.completed}/${note.files} files (${coverage}%)\n  Drift: ${note.drift} paths\n  Updated: ${formatNotebookAge(note.updatedAt)}\n`);
+    return;
+  }
+  if (action === 'clear') {
+    const confirmed = await confirmPrompt(currentLang === 'cn'
+      ? '\x1b[31m确认删除此工作区的后台项目笔记？下一次 Highway Scan 将重新建库。\x1b[0m'
+      : '\x1b[31mDelete this workspace notebook? The next Highway Scan will rebuild it.\x1b[0m');
+    if (confirmed) clearProjectNotebook(workspaceRoot);
+    console.log(confirmed
+      ? (currentLang === 'cn' ? '\n\x1b[32m项目笔记已删除。\x1b[0m\n' : '\n\x1b[32mProject notebook deleted.\x1b[0m\n')
+      : (currentLang === 'cn' ? '\n已取消。\n' : '\nCancelled.\n'));
+    return;
+  }
+  if (!hasApiKey()) {
+    console.log(`\n${locales[currentLang].noKeyError}\n`);
+    return;
+  }
+  const runtime = createRuntimeEvents();
+  const renderer = createTerminalRenderer({ stdout: process.stdout, lang: currentLang });
+  const unsubscribe = runtime.subscribe(event => renderer.handle(event));
+  const abortController = new AbortController();
+  const onInterrupt = () => abortController.abort();
+  process.once('SIGINT', onInterrupt);
+  try {
+    runtime.emit('turn.started', { label: currentLang === 'cn' ? '维护后台项目笔记' : 'Maintaining private project notebook' });
+    const snapshot = await buildScanSnapshot(workspaceRoot, '', { emit: runtime.emit, includeOutlines: false, signal: abortController.signal });
+    const existingNote = getProjectNotebookStatus(workspaceRoot);
+    const buildPlan = action === 'rebuild' || !existingNote.exists
+      ? await planHighwayNotebookBuild({
+          snapshot, request: '', emit: runtime.emit, signal: abortController.signal
+        })
+      : null;
+    await ensureHighwayProjectNotebook({
+      workspaceRoot, snapshot, request: '', lang: currentLang, profile: getActiveProfile(), emit: runtime.emit, signal: abortController.signal,
+      mode: action, reason: `manual-${action}`, modelRunner: streamAIResponse,
+      confirmLarge: info => confirmLargeNotebookBuild(info, renderer), buildPlan
+    });
+    runtime.emit('turn.completed', { steps: 1 });
+  } catch (error) {
+    runtime.emit('turn.failed', { error: sanitizeUntrustedText(error.message) });
+  } finally {
+    process.removeListener('SIGINT', onInterrupt);
+    renderer.dispose(); unsubscribe(); runtime.close();
+  }
+}
+
 async function handleInput(input) {
   const trimmed = input.trim();
   const t = locales[currentLang];
@@ -693,6 +1181,82 @@ async function handleInput(input) {
     return;
   }
 
+  if (trimmed === '/undo') {
+    if (!workspaceReady) console.log(currentLang === 'cn' ? '\n请先使用 /open 关联工作区。\n' : '\nUse /open to attach a workspace first.\n');
+    else {
+      try {
+        const undone = await undoLastMutation(workspaceRoot);
+        console.log(`\n${undone.ok ? '\x1b[32m' : '\x1b[33m'}${sanitizeUntrustedText(undone.message)}\x1b[0m\n`);
+      } catch (error) {
+        console.log(`\n\x1b[31m${sanitizeUntrustedText(error.message)}\x1b[0m\n`);
+      }
+    }
+    promptUser();
+    return;
+  }
+
+  if (/^\/mode(?:\s|$)/.test(trimmed)) {
+    const command = parseInputCommand(trimmed);
+    if (command.type === 'error') {
+      console.log(`\n\x1b[31m${sanitizeUntrustedText(command.error)}\x1b[0m\n`);
+    } else {
+      const selected = command.type === 'mode.menu' ? await chooseWorkMode() : command.mode;
+      if (selected) {
+        const enteringThunder = selected === 'thunder' && workMode !== 'thunder';
+        workMode = selected;
+        saveCurrentSession(true);
+        if (enteringThunder) await runThunderActivationAnimation({ currentLang });
+        redrawScreen(currentLang === 'cn'
+          ? `\n\x1b[32m工作模式已切换为 ${selected === 'thunder' ? '⚡ Thunder' : '➜ Highway'}。\x1b[0m\n`
+          : `\n\x1b[32mWork mode switched to ${selected === 'thunder' ? '⚡ Thunder' : '➜ Highway'}.\x1b[0m\n`);
+      }
+    }
+    promptUser();
+    return;
+  }
+
+  if (/^\/thunder(?:\s|$)/.test(trimmed)) {
+    const command = parseInputCommand(trimmed);
+    if (command.type === 'thunder.usage') {
+      console.log(currentLang === 'cn' ? '\n用法：/thunder <需求>\n' : '\nUsage: /thunder <request>\n');
+      promptUser();
+      return;
+    }
+    const enteringThunder = workMode !== 'thunder';
+    workMode = 'thunder';
+    saveCurrentSession(true);
+    if (enteringThunder) await runThunderActivationAnimation({ currentLang });
+    await handleInput(command.prompt);
+    return;
+  }
+
+  if (trimmed === '/agents') {
+    await showThunderTeams();
+    promptUser();
+    return;
+  }
+
+  if (/^\/note(?:\s|$)/.test(trimmed)) {
+    const command = parseInputCommand(trimmed);
+    if (command.type === 'error') console.log(currentLang === 'cn'
+      ? '\n用法：/note status|refresh|rebuild|clear\n'
+      : '\nUsage: /note status|refresh|rebuild|clear\n');
+    else await handleNoteCommand(command.action);
+    promptUser();
+    return;
+  }
+
+  if (trimmed === '/memory') {
+    if (!workspaceReady) {
+      console.log(currentLang === 'cn' ? '\n请先使用 /open 关联工作区。\n' : '\nUse /open to attach a workspace first.\n');
+    } else {
+      await handleMemoryMenu();
+      redrawScreen();
+    }
+    promptUser();
+    return;
+  }
+
   if (trimmed === '/history') {
     while (true) {
       const sessions = listSessions();
@@ -751,6 +1315,9 @@ async function handleInput(input) {
         currentSessionId = chosenSession.id;
         currentSessionTitle = chosenSession.title;
         messages = chosenSession.messages || [];
+        workMode = chosenSession.workMode === 'thunder' ? 'thunder' : 'highway';
+        currentContextPlan = chosenSession.contextPlan || null;
+        currentScanSummary = '';
 
         const savedWorkspace = chosenSession.workspaceRoot ? path.resolve(chosenSession.workspaceRoot) : null;
         const savedWorkspaceUsable = savedWorkspace && fs.existsSync(savedWorkspace) && fs.statSync(savedWorkspace).isDirectory()
@@ -801,11 +1368,10 @@ async function handleInput(input) {
             if (previewContent.length > 150) {
               previewContent = previewContent.slice(0, 147) + '...';
             }
-            if (m.role === 'user') {
-              console.log(`\x1b[36mUser\x1b[0m: ${previewContent}`);
-            } else {
-              console.log(`\x1b[1;38;2;250;100;30mDave\x1b[0m: ${previewContent}`);
-            }
+            console.log(formatConversationMessage({ ...m, displayContent: previewContent }, {
+              color: Boolean(process.stdout.isTTY && !process.env.NO_COLOR),
+              width: Math.max(24, Math.min(process.stdout.columns || 96, 100))
+            }));
           });
           console.log('\x1b[90m────────────────────────\x1b[0m\n');
         }
@@ -833,15 +1399,46 @@ async function handleInput(input) {
   }
 
   if (trimmed === '/stats' || trimmed === '/tokens') {
-    console.log(`\n\x1b[1;36mToken Usage Statistics / Token 使用统计:\x1b[0m`);
-    console.log(`  \x1b[90mLast Request (单次请求):\x1b[0m`);
-    console.log(`    Input (输入):  ${sessionTokenUsage.lastInputTokens.toLocaleString()}`);
-    console.log(`    Output (输出): ${sessionTokenUsage.lastOutputTokens.toLocaleString()}`);
-    console.log(`    Total (总计):  ${sessionTokenUsage.lastTotalTokens.toLocaleString()}`);
-    console.log(`  \x1b[90mSession Cumulative (累计会话):\x1b[0m`);
-    console.log(`    Input (输入):  ${sessionTokenUsage.inputTokens.toLocaleString()}`);
-    console.log(`    Output (输出): ${sessionTokenUsage.outputTokens.toLocaleString()}`);
-    console.log(`    Total (总计):  ${sessionTokenUsage.totalTokens.toLocaleString()}\n`);
+    if (currentLang === 'cn') {
+      console.log(`\n\x1b[1;36mToken 使用统计\x1b[0m`);
+      console.log(`  \x1b[90m本次请求\x1b[0m`);
+      console.log(`    输入：${sessionTokenUsage.lastInputTokens.toLocaleString()}`);
+      console.log(`    输出：${sessionTokenUsage.lastOutputTokens.toLocaleString()}`);
+      console.log(`    总计：${sessionTokenUsage.lastTotalTokens.toLocaleString()}`);
+      console.log(`  \x1b[90m当前会话累计\x1b[0m`);
+      console.log(`    输入：${sessionTokenUsage.inputTokens.toLocaleString()}`);
+      console.log(`    输出：${sessionTokenUsage.outputTokens.toLocaleString()}`);
+      console.log(`    总计：${sessionTokenUsage.totalTokens.toLocaleString()}\n`);
+      console.log(`  \x1b[90m后台记忆提取：${sessionTokenUsage.memoryTotalTokens.toLocaleString()} Token\x1b[0m\n`);
+      console.log(`  \x1b[90m上下文压缩：${sessionTokenUsage.compactionTotalTokens.toLocaleString()} Token · 缓存读取：${sessionTokenUsage.cacheReadInputTokens.toLocaleString()} · 缓存创建：${sessionTokenUsage.cacheCreationInputTokens.toLocaleString()}\x1b[0m\n`);
+    } else {
+      console.log(`\n\x1b[1;36mToken usage\x1b[0m`);
+      console.log(`  \x1b[90mLast request\x1b[0m`);
+      console.log(`    Input:  ${sessionTokenUsage.lastInputTokens.toLocaleString()}`);
+      console.log(`    Output: ${sessionTokenUsage.lastOutputTokens.toLocaleString()}`);
+      console.log(`    Total:  ${sessionTokenUsage.lastTotalTokens.toLocaleString()}`);
+      console.log(`  \x1b[90mCurrent session\x1b[0m`);
+      console.log(`    Input:  ${sessionTokenUsage.inputTokens.toLocaleString()}`);
+      console.log(`    Output: ${sessionTokenUsage.outputTokens.toLocaleString()}`);
+      console.log(`    Total:  ${sessionTokenUsage.totalTokens.toLocaleString()}\n`);
+      console.log(`  \x1b[90mBackground memory extraction: ${sessionTokenUsage.memoryTotalTokens.toLocaleString()} tokens\x1b[0m\n`);
+      console.log(`  \x1b[90mContext compaction: ${sessionTokenUsage.compactionTotalTokens.toLocaleString()} tokens · cache read: ${sessionTokenUsage.cacheReadInputTokens.toLocaleString()} · cache creation: ${sessionTokenUsage.cacheCreationInputTokens.toLocaleString()}\x1b[0m\n`);
+    }
+    const phases = sessionTokenUsage.lastPhaseUsage;
+    if (phases) {
+      const label = currentLang === 'cn' ? '阶段明细' : 'Phase breakdown';
+      console.log(`  \x1b[90m${label}\x1b[0m`);
+      for (const [name, usage] of [
+        ['Scan', phases.scan],
+        ['Notebook', phases.notebook],
+        ['Post-Scan', phases.postScan]
+      ]) {
+        console.log(`    ${name}: ${Number(usage?.inputTokens || 0).toLocaleString()} in / ${Number(usage?.outputTokens || 0).toLocaleString()} out / ${Number(usage?.totalTokens || 0).toLocaleString()} total`);
+      }
+      if (phases.approvedPostScanBudget) {
+        console.log(`    ${currentLang === 'cn' ? '批准的整轮预算' : 'Approved post-Scan budget'}: ${Number(phases.approvedPostScanBudget).toLocaleString()}\n`);
+      }
+    }
     promptUser();
     return;
   }
@@ -869,16 +1466,11 @@ async function handleInput(input) {
     return;
   }
 
-  // Handle /effort (adjust effort level slider)
-  if (trimmed === '/effort') {
-    const currentEffort = getActiveEffort();
-    const selected = await selectEffortMenu(currentEffort, currentLang);
-    if (selected) {
-      setActiveEffort(selected);
-      redrawScreen(`\n\x1b[32mThinking effort set to: ${selected}\x1b[0m\n`);
-    } else {
-      redrawScreen();
-    }
+  // Compatibility notice for the removed effort workflow.
+  if (trimmed === '/effort' || trimmed.startsWith('/effort ')) {
+    console.log(currentLang === 'cn'
+      ? '\n\x1b[36m/effort 已移除：上下文预算现在由每轮自适应 Scan 根据项目和需求决定。\x1b[0m\n'
+      : '\n\x1b[36m/effort was removed. Adaptive Scan now chooses the context budget for each project task.\x1b[0m\n');
     promptUser();
     return;
   }
@@ -994,6 +1586,7 @@ async function handleInput(input) {
   let historyDisplay = trimmed;
   let executingPlan = null;
   let pendingPlan = null;
+  let thunderPlanningRequest = null;
 
   if (/^\/(?:plan|code)(?:\s|$)/.test(trimmed)) {
     if (!workspaceReady) {
@@ -1034,18 +1627,37 @@ async function handleInput(input) {
           return;
         }
       }
+      if (workMode === 'thunder') {
+        thunderPlanningRequest = { request: command.request, name: command.name, replace };
+      }
       agentMode = 'plan';
       pendingPlan = { name: command.name, request: command.request, replace };
       agentPrompt = `Create the named implementation plan "${command.name}" for this request:\n${command.request}`;
     } else if (command.type === 'agent' && command.mode === 'code') {
       agentMode = 'code';
       executingPlan = command.plan;
+      if (executingPlan?.workflowMode === 'thunder') workMode = 'thunder';
       agentPrompt = executingPlan
         ? `Execute the saved plan "${executingPlan.name}". Re-read current files before changing them.\n\n${executingPlan.content}`
         : command.prompt;
     }
   }
 
+  if (agentMode === 'chat' && /^(?:你好|您好|嗨|哈喽|hello|hi|hey)[!！。,.\s]*$/i.test(agentPrompt)) {
+    currentLang = detectInputLanguage(agentPrompt, currentLang);
+    const reply = currentLang === 'cn'
+      ? '你好，我在。你可以直接告诉我想了解、规划或修改项目中的什么。'
+      : 'Hello, I’m here. Tell me what you want to understand, plan, or change in the project.';
+    messages.push({ role: 'user', content: agentPrompt, displayContent: historyDisplay });
+    messages.push({ role: 'assistant', content: reply });
+    saveCurrentSession();
+    console.log(formatConversationMessage({ role: 'assistant', content: reply }, {
+      color: Boolean(process.stdout.isTTY && !process.env.NO_COLOR), width: Math.max(24, process.stdout.columns || 80)
+    }));
+    promptUser();
+    return;
+  }
+
   if (!workspaceReady) {
     console.log(currentLang === 'cn'
       ? '\n\x1b[33m当前历史会话没有关联项目目录。请先输入 /open <项目目录>，再继续修改。\x1b[0m\n'
@@ -1062,7 +1674,16 @@ async function handleInput(input) {
     return;
   }
 
+  if (workMode === 'thunder' && (thunderPlanningRequest || agentMode === 'chat')) {
+    const target = thunderPlanningRequest || { request: agentPrompt, name: null, replace: false };
+    currentLang = detectInputLanguage(target.request, currentLang);
+    await runThunderPlanningFlow({ request: target.request, requestedName: target.name, replace: target.replace });
+    promptUser();
+    return;
+  }
+
   // Push user message to history
+  currentLang = detectInputLanguage(historyDisplay || agentPrompt, currentLang);
   messages.push({ role: 'user', content: agentPrompt, displayContent: historyDisplay });
   saveCurrentSession();
 
@@ -1073,16 +1694,39 @@ async function handleInput(input) {
       : `\x1b[90mExecuting plan: ${sanitizeUntrustedText(executingPlan.name)}\x1b[0m\n`);
   }
 
-  const activeEffort = getActiveEffort();
-  const preset = EFFORT_PRESETS[activeEffort] || EFFORT_PRESETS.high;
-  const maxLoops = preset.maxLoops;
+  const recalledMemories = workspaceReady ? retrieveMemories(workspaceRoot, agentPrompt, 8) : [];
+  const recalledMemoryText = formatMemoriesForPrompt(recalledMemories);
   const turnTokenStart = {
     input: sessionTokenUsage.inputTokens,
     output: sessionTokenUsage.outputTokens
   };
 
   const runtime = createRuntimeEvents();
-  const renderer = createTerminalRenderer({ stdout: process.stdout, lang: currentLang });
+  const thunderTeam = executingPlan?.workflowMode === 'thunder'
+    ? (findThunderTeamForPlan(workspaceRoot, executingPlan.id) || (executingPlan.teamId ? getThunderTeam(workspaceRoot, executingPlan.teamId) : null))
+    : null;
+  if (thunderTeam) updateThunderTeam(workspaceRoot, thunderTeam.id, { phase: 'executing' });
+  const pendingThunderDirectives = [];
+  let renderer;
+  renderer = thunderTeam
+    ? createThunderRenderer({
+        stdout: process.stdout, lang: currentLang, team: { ...thunderTeam, phase: 'executing' },
+        onMessageRequested: async member => {
+          renderer?.pause();
+          try {
+            const message = await textInputPrompt(currentLang === 'cn'
+              ? `给 ${member.name} 的消息（由 PM 记录，将在下一协调边界生效）: `
+              : `Message for ${member.name} (recorded by PM and applied at the next coordination boundary): `);
+            if (message?.trim()) {
+              addThunderMessage(workspaceRoot, thunderTeam.id, {
+                from: 'user', to: member.id, type: 'question', summary: message.trim(), refs: [], requiresResponse: true
+              });
+              pendingThunderDirectives.push(`[PM-routed user message for ${member.name}] ${message.trim()}`);
+            }
+          } finally { renderer?.resume(); }
+        }
+      })
+    : createTerminalRenderer({ stdout: process.stdout, lang: currentLang });
   const unsubscribe = runtime.subscribe(event => renderer.handle(event));
   const abortController = new AbortController();
   let interrupted = false;
@@ -1095,17 +1739,190 @@ async function handleInput(input) {
   let turnCompleted = false;
   let terminalEventSent = false;
   let compactionShown = false;
+  let compactionSummary = '';
+  let summarizedMessageCount = 0;
   let turnOutcome = 'stopped';
   let planActionCancelled = false;
+  const readTracker = { files: new Map() };
+  const configuredPermission = getActiveProfile()?.permissionPolicy || {};
+  const permissionPolicy = {
+    mode: ['ask', 'acceptEdits', 'allowlist'].includes(configuredPermission.mode) ? configuredPermission.mode : 'ask',
+    rules: Array.isArray(configuredPermission.rules) ? configuredPermission.rules : [],
+    allowedTools: new Set()
+  };
+  let repeatedToolSignature = '';
+  let repeatedToolResultHash = '';
+  let repeatedToolCount = 0;
+  let blockedRepeatedToolSignature = '';
+  const batchToolHistory = new Map();
+  const blockedBatchSignatures = new Set();
+  let planValidationAttempts = 0;
+  let workspaceMayHaveChanged = false;
+  const mutationJournal = [];
+  const phaseUsage = {
+    scan: { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
+    notebook: { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
+    postScan: { inputTokens: 0, outputTokens: 0, totalTokens: 0 }
+  };
+  let readPlanCancelled = false;
+  let budgetCancelled = false;
+  let forceBudgetFinish = false;
+  let forceNoProgressFinish = false;
+  let toolFreeFinishRepairAttempts = 0;
+  let lastBudgetPromptAt = -1;
+
+  function addPhaseUsage(bucket, data = {}) {
+    const target = phaseUsage[bucket];
+    if (!target) return;
+    target.inputTokens += Number(data.inputTokens) || 0;
+    target.outputTokens += Number(data.outputTokens) || 0;
+    target.totalTokens = target.inputTokens + target.outputTokens;
+  }
+
+  async function* trackedModelRunner(modelMessages, options = {}) {
+    for await (const event of streamAIResponse(modelMessages, options)) {
+      if (event.type === 'model.completed') {
+        const bucket = options.usagePhase === 'notebook' ? 'notebook' : 'postScan';
+        addPhaseUsage(bucket, event.data);
+        runtime.emit('usage.phase', { phase: bucket, ...event.data, cumulative: phaseUsage[bucket] });
+      }
+      yield event;
+    }
+  }
 
   runtime.emit('turn.started', {
-    label: currentLang === 'cn' ? '思考中 · 正在理解问题' : 'Thinking · understanding the request'
+    label: currentLang === 'cn' ? '准备项目工作流' : 'Preparing project workflow'
   });
+  if (thunderTeam) {
+    runtime.emit('team.started', { team: { ...thunderTeam, phase: 'executing' } });
+    runtime.emit('team.phase', { teamId: thunderTeam.id, phase: 'executing' });
+    const lead = thunderTeam.members.find(member => member.role === 'techLead');
+    if (lead) runtime.emit('member.updated', { teamId: thunderTeam.id, member: { ...lead, status: 'working', currentTask: currentLang === 'cn' ? '执行已批准计划并管理单写入队列' : 'Execute approved plan through the single write queue' } });
+  }
+  if (recalledMemories.length > 0) {
+    runtime.emit('memory.recalled', { count: recalledMemories.length });
+  }
 
   try {
-    while (loopCount < maxLoops) {
-      const modelMessages = prepareModelMessages(messages, activeEffort);
-      const contextWasCompacted = modelMessages.some(message => String(message.content || '').startsWith('[Conversation context compacted:'));
+    runtime.emit('phase.changed', { phase: 'scan', label: currentLang === 'cn' ? 'SCAN · 扫描项目' : 'SCAN · scanning project' });
+    const scan = await runAdaptiveScan({
+      workspaceRoot,
+      request: agentPrompt,
+      memories: recalledMemoryText,
+      conversationContext: recentConversationForScan(messages),
+      profile: getActiveProfile(),
+      lang: currentLang,
+      emit: runtime.emit,
+      signal: abortController.signal,
+      notebookPolicy: workMode === 'highway' ? 'highway' : 'metadata',
+      confirmLargeNotebook: info => confirmLargeNotebookBuild(info, renderer)
+    });
+    currentContextPlan = scan.contextPlan;
+    phaseUsage.scan = { ...phaseUsage.scan, ...(scan.scanUsage || {}) };
+    currentScanSummary = workMode === 'thunder' ? scan.summary : '';
+    if (workMode === 'highway') {
+      runtime.emit('read.plan.presented', {
+        contextPlan: currentContextPlan,
+        scanUsage: scan.scanUsage || {}
+      });
+      const reviewed = await reviewHighwayReadPlan(currentContextPlan, scan.snapshot, scan.scanUsage, renderer);
+      runtime.emit('read.plan.resolved', {
+        approved: reviewed.approved,
+        contextPlan: reviewed.plan
+      });
+      if (!reviewed.approved) {
+        readPlanCancelled = true;
+        throw new Error('READ_PLAN_CANCELLED');
+      }
+      currentContextPlan = reviewed.plan;
+      currentContextPlan.budgetTokens = currentContextPlan.contextBudgetTokens || currentContextPlan.budgetTokens;
+      runtime.emit('phase.changed', {
+        phase: 'read',
+        label: currentLang === 'cn' ? 'READ · 制作并读取项目笔记' : 'READ · preparing project notebook'
+      });
+      const groups = ['full', 'targeted', 'outline'].map((strategy, index) => ({
+        id: `approved-${strategy}`,
+        strategy: strategy === 'targeted' ? 'read' : strategy,
+        paths: (currentContextPlan.files || []).filter(file => file.strategy === strategy).map(file => file.path),
+        reason: 'User-approved Highway read plan.',
+        priority: 100 - index * 20
+      })).filter(group => group.paths.length);
+      const notebookResult = await ensureHighwayProjectNotebook({
+        workspaceRoot,
+        snapshot: scan.snapshot,
+        request: agentPrompt,
+        lang: currentLang,
+        profile: getActiveProfile(),
+        emit: runtime.emit,
+        signal: abortController.signal,
+        confirmLarge: info => confirmLargeNotebookBuild(info, renderer),
+        mode: currentContextPlan.notebook?.action === 'build' && scan.notebook ? 'rebuild'
+          : currentContextPlan.notebook?.action === 'update' ? 'refresh' : 'auto',
+        reason: 'read',
+        notebookBudgetTokens: currentContextPlan.notebook?.notebookBudgetTokens || 2000,
+        notebookSections: currentContextPlan.notebook?.sections || [],
+        buildPlan: {
+          rationale: currentContextPlan.rationale,
+          defaultStrategy: 'outline',
+          groups,
+          validation: {
+            requiredCoveragePercent: 100,
+            requireEntries: true,
+            requireConfigs: true,
+            requireDependencies: true
+          }
+        },
+        modelRunner: trackedModelRunner
+      });
+      currentReadBrief = buildReadBrief(currentContextPlan, notebookResult?.notebook || scan.notebook);
+    } else {
+      currentReadBrief = buildReadBrief(currentContextPlan, null);
+    }
+    if (thunderTeam) updateThunderTeam(workspaceRoot, thunderTeam.id, { scanSnapshot: scan.snapshot, contextPlan: scan.contextPlan });
+    saveCurrentSession();
+    runtime.emit('phase.changed', { phase: 'read', label: currentLang === 'cn' ? 'READ · 正式读取' : 'READ · formal reading' });
+
+    while (!abortController.signal.aborted) {
+      if (loopCount >= 100) {
+        forceNoProgressFinish = true;
+        messages.push({ role: 'user', content: '[Safety limit: 100 agent steps reached. Tools are now disabled. Finish with the best verified result and list any remaining work.]' });
+      }
+      while (pendingThunderDirectives.length) {
+        messages.push({ role: 'user', content: pendingThunderDirectives.shift() });
+      }
+      const activeContextProfile = getActiveProfile();
+      const compacting = shouldCompact(messages, activeContextProfile || currentContextPlan);
+      const archivedCount = Math.max(0, messages.length - 20);
+      if (compacting && (!compactionSummary || archivedCount >= summarizedMessageCount + 10)) {
+        try {
+          compactionSummary = await summarizeForCompaction(messages.slice(0, archivedCount), activeContextProfile, { signal: abortController.signal });
+          summarizedMessageCount = archivedCount;
+        } catch {
+          // prepareModelMessages supplies a deterministic structured fallback.
+        }
+      }
+      const contextOptions = { profile: activeContextProfile, summary: compactionSummary };
+      const modelMessages = prepareModelMessages(messages, currentContextPlan, contextOptions);
+      const contextStats = getContextStats(messages, currentContextPlan, contextOptions);
+      runtime.emit('context.usage', {
+        usedTokens: contextStats.estimatedTokens,
+        rawTokens: contextStats.rawEstimatedTokens,
+        budgetTokens: contextStats.budgetTokens,
+        compacted: contextStats.compacted
+      });
+      const postScanUsed = phaseUsage.notebook.totalTokens + phaseUsage.postScan.totalTokens;
+      const turnBudget = Number(currentContextPlan.turnBudgetTokens) || Number(currentContextPlan.budgetTokens) || 24000;
+      const predictedNextTokens = Math.max(500, Math.min(
+        contextStats.estimatedTokens + (Number(getActiveProfile()?.maxOutputTokens) || 4096),
+        Number(currentContextPlan.contextBudgetTokens || currentContextPlan.budgetTokens) || 24000
+      ));
+      if (!forceBudgetFinish && !forceNoProgressFinish
+          && (postScanUsed >= Math.floor(turnBudget * 0.9) || postScanUsed + predictedNextTokens > turnBudget)
+          && lastBudgetPromptAt < 0) {
+        runtime.emit('budget.warning', { usedTokens: postScanUsed, budgetTokens: turnBudget });
+        lastBudgetPromptAt = postScanUsed;
+      }
+      const contextWasCompacted = modelMessages.some(message => String(message.content || '').startsWith('[Context summary]'));
       if (!compactionShown && contextWasCompacted) {
         runtime.emit('context.compacted', {
           omittedMessages: Math.max(1, messages.length - modelMessages.length + 1),
@@ -1117,12 +1934,36 @@ async function handleInput(input) {
       let activeReply = '';
       const nativeToolCalls = [];
       let modelWasTruncated = false;
-      for await (const modelEvent of streamAIResponse(modelMessages, {
+      const finishWithoutTools = forceBudgetFinish || forceNoProgressFinish;
+      for await (const modelEvent of trackedModelRunner(modelMessages, {
         activeOpenFile,
-        maxReadLines: preset.maxReadLines,
         signal: abortController.signal,
         mode: agentMode,
-        workspaceRoot
+        usagePhase: 'postScan',
+        disableTools: finishWithoutTools,
+        disableToolsReason: forceNoProgressFinish ? 'no-progress' : 'budget',
+        maxOutputTokens: finishWithoutTools
+          ? Math.min(1200, Number(getActiveProfile()?.maxOutputTokens) || 1200)
+          : undefined,
+        notebookEnabled: workMode === 'highway',
+        workspaceRoot,
+        lang: currentLang,
+        projectInstructions: loadProjectInstructions(workspaceRoot),
+        workspaceMemories: recalledMemoryText,
+        contextPlan: currentContextPlan,
+        ...(workMode === 'highway'
+          ? { readBrief: currentReadBrief }
+          : { scanSummary: currentScanSummary }),
+        thunderPrompt: thunderTeam ? buildThunderSystemPrompt('techLead', {
+          language: currentLang,
+          capability: 'code',
+          userRequest: executingPlan.request,
+          approvedPlan: executingPlan.content,
+          assignedTask: currentLang === 'cn' ? '按批准计划执行；统一管理所有文件写入并在完成前验证。' : 'Execute the approved plan, own every workspace write, and validate before completion.',
+          decisions: executingPlan.decisions || [],
+          relevantMemory: recalledMemoryText,
+          resourceLimits: `Tier ${thunderTeam.resourceProposal.tier}; concurrency ${thunderTeam.resourceProposal.concurrency}; single workspace write queue.`
+        }) : ''
       })) {
         if (modelEvent.type === 'model.delta') {
           activeReply += modelEvent.data.text || '';
@@ -1143,6 +1984,41 @@ async function handleInput(input) {
         }
       }
 
+      if (finishWithoutTools) {
+        const finishResolution = resolveBudgetFinishResponse({
+          reply: activeReply,
+          nativeToolCalls,
+          repairAttempts: toolFreeFinishRepairAttempts,
+          lang: currentLang,
+          reason: forceNoProgressFinish ? 'no-progress' : 'budget'
+        });
+        if (finishResolution.action === 'retry') {
+          toolFreeFinishRepairAttempts++;
+          runtime.emit('model.retry', {
+            reason: 'tool-free-finish-protocol',
+            label: currentLang === 'cn'
+              ? '收尾响应错误地请求了工具，正在重新生成纯文本结论'
+              : 'The finish response requested a tool; regenerating a plain-text conclusion'
+          });
+          messages.push({
+            role: 'user',
+            content: '[System notice: The previous finish response was rejected because it attempted a tool call. Tools are unavailable. Do not continue reading and do not output any protocol or markup. Answer now in plain language using only evidence already present in the conversation. Clearly state any limits caused by missing evidence.]'
+          });
+          saveCurrentSession();
+          loopCount++;
+          continue;
+        }
+        if (finishResolution.action === 'fallback') {
+          activeReply = finishResolution.reply;
+          nativeToolCalls.length = 0;
+          modelWasTruncated = false;
+          runtime.emit('model.protocol_blocked', {
+            reason: 'tool-free-finish-protocol',
+            attempts: toolFreeFinishRepairAttempts + 1
+          });
+        }
+      }
+
       if (modelWasTruncated) {
         runtime.emit('model.retry', {
           reason: 'output-truncated',
@@ -1159,8 +2035,18 @@ async function handleInput(input) {
 
       const activeProfile = getActiveProfile();
       let parsedTool = null;
-      if (nativeToolCalls.length > 1) {
-        parsedTool = { error: 'The model requested multiple tools at once. Request exactly one tool per step.' };
+      if (finishWithoutTools) {
+        parsedTool = null;
+      } else if (nativeToolCalls.length > 1) {
+        const unsupported = nativeToolCalls.find(call => !SUPPORTED_TOOLS.has(call.name));
+        parsedTool = unsupported
+          ? { error: `Unsupported structured tool: ${unsupported.name}` }
+          : { batch: nativeToolCalls.map((call, index) => ({
+              toolName: call.name,
+              toolArg: call.arguments || {},
+              native: true,
+              id: call.id || `${runtime.turnId}-tool-${loopCount + 1}-${index + 1}`
+            })) };
       } else if (nativeToolCalls.length === 1) {
         const call = nativeToolCalls[0];
         parsedTool = SUPPORTED_TOOLS.has(call.name)
@@ -1177,6 +2063,14 @@ async function handleInput(input) {
         }
       }
       if (!parsedTool) {
+        if (pendingThunderDirectives.length > 0) {
+          const interruptedReply = sanitizeUntrustedText(stripReasoningBlocks(activeReply));
+          if (interruptedReply) messages.push({ role: 'assistant', content: interruptedReply });
+          while (pendingThunderDirectives.length) messages.push({ role: 'user', content: pendingThunderDirectives.shift() });
+          saveCurrentSession();
+          loopCount++;
+          continue;
+        }
         let finalReply = sanitizeUntrustedText(stripReasoningBlocks(activeReply));
         if (!finalReply) {
           finalReply = currentLang === 'cn' ? '模型未返回可显示内容。' : 'The model returned no displayable content.';
@@ -1184,7 +2078,8 @@ async function handleInput(input) {
         if (pendingPlan) {
           const missingSections = validatePlanContent(finalReply);
           if (missingSections.length > 0) {
-            if (loopCount + 1 >= maxLoops) {
+            planValidationAttempts++;
+            if (planValidationAttempts >= 3) {
               throw new Error(`Plan validation failed: missing ${missingSections.join(', ')}.`);
             }
             messages.push({ role: 'assistant', content: finalReply });
@@ -1194,6 +2089,7 @@ async function handleInput(input) {
             continue;
           }
         }
+        runtime.emit('phase.changed', { phase: 'act', label: currentLang === 'cn' ? 'ACT · 整理结果' : 'ACT · organizing result' });
         runtime.emit('model.delta', { text: finalReply });
         messages.push({ role: 'assistant', content: finalReply });
         saveCurrentSession();
@@ -1208,7 +2104,7 @@ async function handleInput(input) {
 
         if (currentSessionTitle === 'New Chat' || currentSessionTitle === '新会话' || currentSessionTitle === 'New Session') {
           const titleSessionId = currentSessionId;
-          const titleMessages = prepareModelMessages(messages.map(message => ({ ...message })), activeEffort);
+          const titleMessages = prepareModelMessages(messages.map(message => ({ ...message })), currentContextPlan);
           generateTitle(titleMessages).then(newTitle => {
             if (currentSessionId === titleSessionId && newTitle && newTitle !== 'New Session') {
               currentSessionTitle = sanitizeUntrustedText(newTitle).slice(0, 80);
@@ -1220,20 +2116,165 @@ async function handleInput(input) {
       }
 
       if (parsedTool.error) {
+        const requestedSeveralTools = /multiple tools at once|exactly one .*invocation/i.test(parsedTool.error);
         runtime.emit('tool.failed', {
           tool: 'TOOL_PARSE',
-          displaySummary: currentLang === 'cn' ? '工具格式无法解析' : 'Could not parse tool call',
+          displaySummary: requestedSeveralTools
+            ? (currentLang === 'cn' ? '模型一次请求了多个工具，已要求逐个调用' : 'The model requested several tools; retrying one at a time')
+            : (currentLang === 'cn' ? '工具格式无法解析' : 'Could not parse tool call'),
           error: parsedTool.error
         });
-        messages.push({ role: 'user', content: `[Tool Response for TOOL_PARSE:\n${parsedTool.error}]` });
+        messages.push({
+          role: 'user',
+          content: requestedSeveralTools
+            ? '[Tool protocol correction: You requested multiple tools in one response. Request exactly one tool next. Choose the single call most likely to add new evidence; do not repeat a call that already succeeded.]'
+            : `[Tool Response for TOOL_PARSE:\n${parsedTool.error}]`
+        });
         saveCurrentSession();
         loopCount++;
         continue;
       }
 
+      if (parsedTool.batch) {
+        const calls = parsedTool.batch;
+        const executable = [];
+        const completed = [];
+        for (const call of calls) {
+          const signature = createToolCallSignature(call.toolName, call.toolArg);
+          const history = batchToolHistory.get(signature);
+          if (history?.count >= 2) {
+            if (blockedBatchSignatures.has(signature)) forceNoProgressFinish = true;
+            blockedBatchSignatures.add(signature);
+            completed.push({ call, response: { ok: false }, result: `No-progress guard: duplicate ${call.toolName} was not executed; use the cached earlier result or request different evidence.` });
+          } else executable.push(call);
+        }
+        const readOnly = executable.filter(call => !MUTATING_TOOLS.has(call.toolName));
+        const mutations = executable.filter(call => MUTATING_TOOLS.has(call.toolName));
+        for (const call of calls) {
+          runtime.emit('tool.requested', {
+            tool: call.toolName,
+            toolCallId: call.id,
+            displaySummary: describeToolRequest(call.toolName, call.toolArg, currentLang)
+          });
+        }
+        messages.push({
+          role: 'assistant',
+          content: '',
+          toolCalls: calls.map(call => ({ id: call.id, name: call.toolName, arguments: call.toolArg }))
+        });
+        saveCurrentSession();
+
+        const runBatchCall = async call => {
+          const response = await executeToolCall({
+            toolName: call.toolName,
+            toolArg: call.toolArg,
+            toolCallId: call.id,
+            workspaceRoot,
+            emit: runtime.emit,
+            requestPermission: async request => {
+              renderer.pause();
+              try {
+                if (thunderTeam && request.preview) {
+                  const lines = sanitizeUntrustedText(request.preview).split('\n');
+                  console.log(lines.slice(0, 30).join('\n'));
+                  if (lines.length > 30) console.log(currentLang === 'cn' ? `… 已折叠 ${lines.length - 30} 行预览` : `… ${lines.length - 30} preview lines collapsed`);
+                }
+                return await (request.allowSession ? permissionPrompt : confirmPrompt)(`\x1b[33m${sanitizeUntrustedText(request.prompt)}\x1b[0m`);
+              } finally {
+                renderer.resume();
+              }
+            },
+            lang: currentLang,
+            mode: agentMode,
+            signal: abortController.signal,
+            readTracker,
+            permissionPolicy,
+            contextPlan: currentContextPlan,
+            remainingBudgetTokens: Math.max(100, (Number(currentContextPlan.turnBudgetTokens) || 24000) - phaseUsage.notebook.totalTokens - phaseUsage.postScan.totalTokens),
+            readNotebook: workMode === 'highway' ? options => readProjectNotebook(workspaceRoot, options) : async () => null
+          });
+          return { call, response, result: response.modelResult || response.result };
+        };
+
+        completed.push(...await Promise.all(readOnly.map(runBatchCall)));
+        for (const call of mutations) completed.push(await runBatchCall(call));
+        const byId = new Map(completed.map(item => [item.call.id, item]));
+        for (const call of calls) {
+          const item = byId.get(call.id);
+          const toolResult = String(item?.result || 'Tool returned no result.');
+          const signature = createToolCallSignature(call.toolName, call.toolArg);
+          if (!toolResult.startsWith('No-progress guard:')) {
+            const resultHash = crypto.createHash('sha256').update(toolResult).digest('hex');
+            const previous = batchToolHistory.get(signature);
+            batchToolHistory.set(signature, { hash: resultHash, count: previous?.hash === resultHash ? previous.count + 1 : 1 });
+          }
+          if (item?.response?.cancelled) planActionCancelled = true;
+          if (agentMode === 'code' && MUTATING_TOOLS.has(call.toolName) && !item?.response?.cancelled && (item?.response?.ok || call.toolName === 'RUN_COMMAND')) {
+            workspaceMayHaveChanged = true;
+            mutationJournal.push({
+              tool: call.toolName,
+              path: call.toolArg?.path || call.toolArg?.filePath || call.toolArg?.source || '',
+              destination: call.toolArg?.destination || call.toolArg?.to || '',
+              at: Date.now()
+            });
+          }
+          messages.push({ role: 'tool', content: toolResult, toolCallId: call.id, toolName: call.toolName });
+        }
+        saveCurrentSession();
+        if (interrupted) throw new Error('Request cancelled.');
+        loopCount += calls.length;
+        continue;
+      }
+
       const toolName = parsedTool.toolName;
       const toolArg = parsedTool.toolArg;
       const toolCallId = parsedTool.id || `${runtime.turnId}-tool-${loopCount + 1}`;
+      const requestedToolSignature = createToolCallSignature(toolName, toolArg);
+      const repeatedRequest = resolveRepeatedToolRequest({
+        signature: requestedToolSignature,
+        previousSignature: repeatedToolSignature,
+        identicalResultCount: repeatedToolCount,
+        blockedSignature: blockedRepeatedToolSignature
+      });
+      if (repeatedRequest.action !== 'allow') {
+        blockedRepeatedToolSignature = repeatedRequest.blockedSignature;
+        if (repeatedRequest.action === 'redirect') {
+          runtime.emit('model.retry', {
+            reason: 'repeated-tool-call',
+            label: currentLang === 'cn'
+              ? `已阻止重复调用 ${toolName}，正在要求改用新的证据路径`
+              : `Blocked repeated ${toolName}; requesting a new evidence path`
+          });
+          messages.push({
+            role: 'user',
+            content: `[No-progress guard: The exact ${toolName} call was not executed because it already returned identical evidence twice. Do not request it again. ${toolName === 'INSPECT_FILE'
+              ? 'Use READ_FILE with a task-relevant line range from the existing outline, inspect a different file, or answer from current evidence.'
+              : 'Change the arguments, choose a different tool, or answer from current evidence.'}]`
+          });
+        } else {
+          forceNoProgressFinish = true;
+          runtime.emit('model.retry', {
+            reason: 'repeated-tool-call-finish',
+            label: currentLang === 'cn'
+              ? '模型仍在重复同一调用，将基于现有证据收尾'
+              : 'The model repeated the same call again; finishing from current evidence'
+          });
+          messages.push({
+            role: 'user',
+            content: '[No-progress guard: You repeated the blocked tool call again. Tools are now disabled for this turn. Give the best concise final answer using only evidence already returned, and identify anything not verified.]'
+          });
+        }
+        saveCurrentSession();
+        loopCount++;
+        continue;
+      }
+      if (toolName === 'RUN_COMMAND') {
+        runtime.emit('phase.changed', { phase: 'verify', label: currentLang === 'cn' ? 'VERIFY · 运行验证' : 'VERIFY · running validation' });
+      } else if (MUTATING_TOOLS.has(toolName)) {
+        runtime.emit('phase.changed', { phase: 'act', label: currentLang === 'cn' ? 'ACT · 准备更改' : 'ACT · preparing change' });
+      } else {
+        runtime.emit('phase.changed', { phase: 'read', label: currentLang === 'cn' ? 'READ · 正式读取' : 'READ · formal reading' });
+      }
       runtime.emit('tool.requested', {
         tool: toolName,
         toolCallId,
@@ -1253,10 +2294,15 @@ async function handleInput(input) {
         toolCallId,
         workspaceRoot,
         emit: runtime.emit,
-        requestPermission: async ({ prompt }) => {
+        requestPermission: async request => {
           renderer.pause();
           try {
-            return await confirmPrompt(`\x1b[33m${sanitizeUntrustedText(prompt)}\x1b[0m`);
+            if (thunderTeam && request.preview) {
+              const lines = sanitizeUntrustedText(request.preview).split('\n');
+              console.log(lines.slice(0, 30).join('\n'));
+              if (lines.length > 30) console.log(currentLang === 'cn' ? `… 已折叠 ${lines.length - 30} 行预览` : `… ${lines.length - 30} preview lines collapsed`);
+            }
+            return await (request.allowSession ? permissionPrompt : confirmPrompt)(`\x1b[33m${sanitizeUntrustedText(request.prompt)}\x1b[0m`);
           } finally {
             renderer.resume();
           }
@@ -1264,11 +2310,39 @@ async function handleInput(input) {
         lang: currentLang,
         mode: agentMode,
         signal: abortController.signal,
-        getActiveEffort,
-        effortPresets: EFFORT_PRESETS,
-        runFileDigestionWorkflow
+        readTracker,
+        permissionPolicy,
+        contextPlan: currentContextPlan,
+        remainingBudgetTokens: Math.max(
+          100,
+          (Number(currentContextPlan.turnBudgetTokens) || 24000)
+            - phaseUsage.notebook.totalTokens
+            - phaseUsage.postScan.totalTokens
+        ),
+        readNotebook: workMode === 'highway'
+          ? options => readProjectNotebook(workspaceRoot, options)
+          : async () => null
       });
       const toolResult = toolResponse.modelResult || toolResponse.result;
+      if (agentMode === 'code' && MUTATING_TOOLS.has(toolName) && !toolResponse.cancelled
+          && (toolResponse.ok || toolName === 'RUN_COMMAND')) {
+        workspaceMayHaveChanged = true;
+        mutationJournal.push({
+          tool: toolName,
+          path: toolArg?.path || toolArg?.filePath || toolArg?.source || '',
+          destination: toolArg?.destination || toolArg?.to || '',
+          at: Date.now()
+        });
+      }
+      const signature = requestedToolSignature;
+      const resultHash = crypto.createHash('sha256').update(String(toolResult || '')).digest('hex');
+      if (signature === repeatedToolSignature && resultHash === repeatedToolResultHash) repeatedToolCount++;
+      else {
+        repeatedToolCount = 1;
+        blockedRepeatedToolSignature = '';
+      }
+      repeatedToolSignature = signature;
+      repeatedToolResultHash = resultHash;
       if (toolResponse.cancelled) planActionCancelled = true;
       messages.push({ role: 'tool', content: String(toolResult || ''), toolCallId, toolName });
       saveCurrentSession();
@@ -1277,25 +2351,29 @@ async function handleInput(input) {
     }
 
     if (turnCompleted) {
+      runtime.emit('phase.changed', { phase: 'verify', label: currentLang === 'cn' ? 'VERIFY · 完成检查' : 'VERIFY · final checks' });
       runtime.emit('turn.completed', { steps: loopCount });
       terminalEventSent = true;
       turnOutcome = planActionCancelled ? 'cancelled' : 'completed';
-    } else if (loopCount >= maxLoops) {
-      runtime.emit('turn.failed', {
-        error: currentLang === 'cn'
-          ? `已达到 ${maxLoops} 步上限，请提高 effort 或缩小任务范围。`
-          : `Reached the ${maxLoops}-step limit. Raise effort or narrow the task.`
-      });
-      terminalEventSent = true;
-      turnOutcome = 'blocked';
     }
   } catch (error) {
-    if (interrupted || abortController.signal.aborted) {
+    if (readPlanCancelled || budgetCancelled || interrupted || abortController.signal.aborted) {
       runtime.emit('turn.cancelled', {
-        reason: currentLang === 'cn' ? '已取消当前操作' : 'Current operation cancelled'
+        reason: readPlanCancelled
+          ? (currentLang === 'cn' ? '阅读计划已取消，未进入正式读取' : 'Read plan cancelled before formal reading')
+          : budgetCancelled
+            ? (currentLang === 'cn' ? '已按 Token 预算选择取消本轮' : 'Turn cancelled at the token budget boundary')
+            : (currentLang === 'cn' ? '已取消当前操作' : 'Current operation cancelled')
       });
       terminalEventSent = true;
       turnOutcome = 'cancelled';
+      if (readPlanCancelled) {
+        messages.push({
+          role: 'assistant',
+          content: currentLang === 'cn' ? '阅读计划已取消，未进入正式读取。' : 'The read plan was cancelled before formal reading.'
+        });
+        saveCurrentSession();
+      }
     } else {
       if (loopCount === 0) {
         messages.pop();
@@ -1315,30 +2393,121 @@ async function handleInput(input) {
     runtime.close();
   }
 
+  // Code changes are already authorized and durable at this point. Notebook
+  // maintenance is best-effort and must run even after a later failure/cancel.
+  if (workMode === 'highway' && agentMode === 'code' && workspaceMayHaveChanged
+      && getProjectNotebookStatus(workspaceRoot).exists) {
+    const noteRuntime = createRuntimeEvents();
+    const noteRenderer = createTerminalRenderer({ stdout: process.stdout, lang: currentLang });
+    const stopNoteRender = noteRuntime.subscribe(event => noteRenderer.handle(event));
+    const noteAbortController = new AbortController();
+    const onNoteInterrupt = () => noteAbortController.abort();
+    process.once('SIGINT', onNoteInterrupt);
+    try {
+      noteRuntime.emit('turn.started', { label: currentLang === 'cn' ? '同步后台项目笔记' : 'Synchronizing project notebook' });
+      const snapshot = await buildScanSnapshot(workspaceRoot, '', { emit: () => {}, includeOutlines: false, signal: noteAbortController.signal });
+      await ensureHighwayProjectNotebook({
+        workspaceRoot, snapshot, request: agentPrompt, lang: currentLang, profile: getActiveProfile(),
+        emit: noteRuntime.emit, mode: 'refresh', reason: 'dave-code', modelRunner: trackedModelRunner,
+        notebookBudgetTokens: Math.max(400, Math.min(
+          2000,
+          (Number(currentContextPlan?.turnBudgetTokens) || 24000)
+            - phaseUsage.notebook.totalTokens
+            - phaseUsage.postScan.totalTokens
+        )),
+        mutationJournal, signal: noteAbortController.signal
+      });
+      noteRuntime.emit('turn.completed', { steps: 1 });
+    } catch (error) {
+      markProjectNotebookStale(workspaceRoot, `Dave code update failed: ${error.message}`);
+      noteRuntime.emit('note.failed', { error: sanitizeUntrustedText(error.message), status: 'stale' });
+      noteRuntime.emit('turn.failed', { error: currentLang === 'cn' ? '代码已保存，但项目笔记更新失败；下次 Scan 会优先修复。' : 'Code was saved, but notebook update failed; the next Scan will repair it.' });
+    } finally {
+      process.removeListener('SIGINT', onNoteInterrupt);
+      noteRenderer.dispose(); stopNoteRender(); noteRuntime.close();
+    }
+  }
+
+  let thunderReviews = [];
+  if (thunderTeam) {
+    if (turnOutcome === 'completed') {
+      const reviewRuntime = createRuntimeEvents();
+      const reviewRenderer = createThunderRenderer({ stdout: process.stdout, lang: currentLang, team: { ...thunderTeam, phase: 'reviewing' } });
+      const stopReviewRender = reviewRuntime.subscribe(event => reviewRenderer.handle(event));
+      try {
+        const executionSummary = messages.slice(-12).map(message => {
+          if (message.role === 'tool') return `[${message.toolName || 'tool'}] ${String(message.content || '').slice(0, 1200)}`;
+          return `[${message.role}] ${String(message.content || '').slice(0, 1600)}`;
+        }).join('\n\n');
+        const reviewResult = await runThunderPostReview({
+          workspaceRoot, team: getThunderTeam(workspaceRoot, thunderTeam.id) || thunderTeam,
+          planContent: executingPlan.content, executionSummary, lang: currentLang,
+          memories: recalledMemoryText, emit: reviewRuntime.emit,
+          contextPlan: currentContextPlan, scanSummary: currentScanSummary,
+          requestPermission: async request => {
+            reviewRenderer.pause();
+            try {
+              if (request.preview) console.log(sanitizeUntrustedText(request.preview).split('\n').slice(0, 30).join('\n'));
+              return await (request.allowSession ? permissionPrompt : confirmPrompt)(`\x1b[33m${sanitizeUntrustedText(request.prompt)}\x1b[0m`);
+            }
+            finally { reviewRenderer.resume(); }
+          }
+        });
+        thunderReviews = reviewResult.reports;
+        if (reviewResult.blocked) turnOutcome = 'blocked';
+      } catch (error) {
+        thunderReviews = [{ role: 'review', report: error.message }];
+        updateThunderTeam(workspaceRoot, thunderTeam.id, { phase: 'blocked' });
+        turnOutcome = 'blocked';
+      } finally {
+        reviewRenderer.dispose();
+        stopReviewRender();
+        reviewRuntime.close();
+      }
+      if (thunderReviews.length) {
+        console.log(currentLang === 'cn' ? '\n\x1b[1;33mThunder 最终复核\x1b[0m' : '\n\x1b[1;33mThunder final review\x1b[0m');
+        for (const review of thunderReviews) console.log(`  ${review.role}: ${sanitizeUntrustedText(review.report).replace(/\s+/g, ' ').slice(0, 300)}`);
+        console.log('');
+      }
+    } else {
+      updateThunderTeam(workspaceRoot, thunderTeam.id, { phase: turnOutcome === 'cancelled' ? 'cancelled' : 'blocked' });
+    }
+  }
+
   if (executingPlan) {
     updatePlan(workspaceRoot, executingPlan.id, {
       status: turnOutcome === 'completed' ? 'completed' : turnOutcome === 'cancelled' ? 'ready' : 'blocked',
       lastRun: {
         ...(executingPlan.lastRun || {}),
         finishedAt: Date.now(),
-        outcome: turnOutcome
-      }
+        outcome: turnOutcome,
+        reviews: thunderReviews
+      },
+      ...(thunderTeam ? { teamSnapshot: getThunderTeam(workspaceRoot, thunderTeam.id) || thunderTeam } : {})
     });
   }
 
+  if (turnOutcome === 'completed' && workspaceReady && memorySummary(workspaceRoot).enabled) {
+    const memoryWorkspace = workspaceRoot;
+    const memorySessionId = currentSessionId;
+    const memoryMessages = messages.map(message => ({ ...message }));
+    extractMemoryCandidates(memoryMessages)
+      .then(candidates => mergeMemoryCandidates(memoryWorkspace, candidates, memorySessionId))
+      .catch(() => {});
+  }
+
   sessionTokenUsage.lastInputTokens = Math.max(0, sessionTokenUsage.inputTokens - turnTokenStart.input);
   sessionTokenUsage.lastOutputTokens = Math.max(0, sessionTokenUsage.outputTokens - turnTokenStart.output);
   sessionTokenUsage.lastTotalTokens = sessionTokenUsage.lastInputTokens + sessionTokenUsage.lastOutputTokens;
+  sessionTokenUsage.lastPhaseUsage = {
+    ...phaseUsage,
+    approvedPostScanBudget: Number(currentContextPlan?.turnBudgetTokens) || 0
+  };
 
   if (sessionTokenUsage.lastTotalTokens > 0) {
-    console.log(
-      `\x1b[90mTokens: ${sessionTokenUsage.lastInputTokens.toLocaleString()} input, ` +
-      `${sessionTokenUsage.lastOutputTokens.toLocaleString()} output ` +
-      `(${sessionTokenUsage.lastTotalTokens.toLocaleString()} total) | ` +
-      `Session Total: ${sessionTokenUsage.inputTokens.toLocaleString()} input, ` +
-      `${sessionTokenUsage.outputTokens.toLocaleString()} output ` +
-      `(${sessionTokenUsage.totalTokens.toLocaleString()} total)\x1b[0m\n`
-    );
+    console.log(currentLang === 'cn'
+      ? `\x1b[90m本次：${sessionTokenUsage.lastInputTokens.toLocaleString()} 输入 · ${sessionTokenUsage.lastOutputTokens.toLocaleString()} 输出 · ${sessionTokenUsage.lastTotalTokens.toLocaleString()} 总计 │ 会话：${sessionTokenUsage.totalTokens.toLocaleString()} 总计\x1b[0m\n`
+      : `\x1b[90mTurn: ${sessionTokenUsage.lastInputTokens.toLocaleString()} in · ${sessionTokenUsage.lastOutputTokens.toLocaleString()} out · ${sessionTokenUsage.lastTotalTokens.toLocaleString()} total │ Session: ${sessionTokenUsage.totalTokens.toLocaleString()} total\x1b[0m\n`);
   }
 
   if (pendingPlan || executingPlan) {
@@ -1347,6 +2516,7 @@ async function handleInput(input) {
       : '\x1b[90mPlan status updated.\x1b[0m\n');
   }
 
+  await closeWorkspaceShell(workspaceRoot);
   promptUser();
 }