dave-code 1.0.4 → 1.1.0

package/bin/index.js

@@ -10,12 +10,14 @@
 
 import fs from 'fs';
 import path from 'path';
+import crypto from 'crypto';
 
 const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
 const packageVersion = pkg.version;
-import { exec } from 'child_process';
+import { spawn } from 'child_process';
 import { getLogoLines } from './logoRenderer.js';
-import { hasApiKey, getAIResponse, sessionTokenUsage, resetTokenUsage } from './aiClient.js';
+import { hasApiKey, getAIResponse, streamAIResponse, generateTitle, sessionTokenUsage, resetTokenUsage } from './aiClient.js';
+import { listSessions, saveSession, deleteSession } from './sessionManager.js';
 import { 
   CONFIG_FILE,
   getProfiles, 
@@ -27,7 +29,8 @@ import {
   setActiveEffort,
   EFFORT_PRESETS,
   isFirstLaunch,
-  setInitialized
+  setInitialized,
+  lastConfigError
 } from './configManager.js';
 import { runWelcomeAnimation } from './install.js';
 import { 
@@ -35,10 +38,25 @@ import {
   secureInputPrompt,
   chatInputPrompt,
   waitForEnter,
-  startSpinner,
   selectEffortMenu,
-  confirmPrompt
+  confirmPrompt,
+  textInputPrompt
 } from './cliMenu.js';
+import { prepareModelMessages, stripReasoningBlocks, getContextStats } from './contextManager.js';
+import { parseToolCall, executeToolCall, resolveExistingWorkspacePath, resolveWorkspacePath, SUPPORTED_TOOLS } from './toolRuntime.js';
+import { createRuntimeEvents } from './runtimeEvents.js';
+import { createTerminalRenderer, sanitizeUntrustedText } from './terminalRenderer.js';
+import { parseInputCommand } from './commandRouter.js';
+import {
+  deletePlan,
+  findPlan,
+  listPlans,
+  planStatusLines,
+  renamePlan,
+  updatePlan,
+  upsertPlan,
+  validatePlanContent
+} from './planManager.js';
 
 // Localization Dictionary
 const locales = {
@@ -71,13 +89,16 @@ const locales = {
     helpLines: [
       '  /help   - 显示此帮助信息',
       '  /clear  - 清屏并重置主面板',
-      '  /reset  - 重置对话历史',
-      '  /stats  - 显示当前会话的 Token 使用统计',
-      '  /lang   - 切换中英文界面',
+      '  /reset  - 重置对话历史并新建会话',
+      '  /history - 查看并载入历史聊天记录',
+      '  /stats  - 显示当前会话的 Token 使用统计 (别名: /tokens)',
+      '  /lang   - 切换中英文界面 (别名: /language)',
       '  /config - 编辑本地配置文件 (~/.dave-code-config.json)',
       '  /model  - 快捷切换当前激活的服务配置',
       '  /api    - 快捷修改当前配置的 API 密钥',
       '  /effort - 调整 AI 思考与阅读的努力程度 (low/medium/high/xhigh/max/ultracode)',
+      '  /plan 名称: 需求 - 创建只读实施计划；/plan 管理已有计划',
+      '  /code <需求或计划名> - 单次授权编程修改，仍逐项确认',
       '  /open   - 打开文件或文件夹并在其中工作',
       '  /exit   - 退出 Dave Code 代理'
     ],
@@ -97,7 +118,7 @@ const locales = {
 保存并关闭文件后，请在下方按 \x1b[1;32m[回车 (Enter)]\x1b[0m 键重载配置。`,
     reloadingConfigMsg: '\n\x1b[32m正在重载配置...\x1b[0m\n',
     openDirSuccess: '已切换工作目录至: ',
-    openFileSuccess: '已在编辑器中打开文件，并将其内容加载至 AI 上下文。',
+    openFileSuccess: '已在编辑器中打开现有文件。Dave 将按需读取最新内容。',
     openPathError: '路径不存在或无法访问：',
     openUsagePrompt: '使用方法：/open <文件或文件夹路径>'
   },
@@ -130,13 +151,16 @@ const locales = {
     helpLines: [
       '  /help   - Show this help message',
       '  /clear  - Clear screen and refresh home panel',
-      '  /reset  - Reset conversation history',
-      '  /stats  - Show session token usage statistics',
-      '  /lang   - Switch language between Chinese and English',
+      '  /reset  - Reset conversation history and start a new session',
+      '  /history - View and resume past chat sessions',
+      '  /stats  - Show session token usage statistics (alias: /tokens)',
+      '  /lang   - Switch language between Chinese and English (alias: /language)',
       '  /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)',
+      '  /plan name: request - Create a read-only implementation plan; /plan manages plans',
+      '  /code <request or plan> - Authorize one confirmed coding turn',
       '  /open   - Open a file or directory to work in',
       '  /exit   - Exit the Dave Code agent'
     ],
@@ -156,7 +180,7 @@ Please edit and save the file in your editor.
 Once done, press \x1b[1;32m[Enter]\x1b[0m below in this terminal to reload configuration.`,
     reloadingConfigMsg: '\n\x1b[32mReloading configuration...\x1b[0m\n',
     openDirSuccess: 'Switched working directory to: ',
-    openFileSuccess: 'Opened file in editor and loaded its content into AI context.',
+    openFileSuccess: 'Opened the existing file. Dave will read current content on demand.',
     openPathError: 'Path does not exist or is not accessible: ',
     openUsagePrompt: 'Usage: /open <file or folder path>'
   }
@@ -165,6 +189,56 @@ Once done, press \x1b[1;32m[Enter]\x1b[0m below in this terminal to reload confi
 let currentLang = 'cn';
 let messages = [];
 let activeOpenFile = null;
+let workspaceRoot = process.cwd();
+let workspaceReady = true;
+let currentSessionId = null;
+let currentSessionTitle = 'New Chat';
+
+function initSession() {
+  currentSessionId = crypto.randomUUID();
+  currentSessionTitle = currentLang === 'cn' ? '新会话' : 'New Chat';
+  messages = [];
+  saveCurrentSession();
+}
+
+function saveCurrentSession() {
+  if (!currentSessionId) return;
+  if (messages.length === 0) return; // Prevent saving empty sessions
+  const sessionData = {
+    id: currentSessionId,
+    title: currentSessionTitle,
+    timestamp: Date.now(),
+    messages: messages,
+    workspaceRoot: workspaceReady ? workspaceRoot : null,
+    activeOpenFile: workspaceReady && activeOpenFile ? activeOpenFile : null
+  };
+  saveSession(currentSessionId, sessionData);
+}
+
+function redrawScreen(messageText = '') {
+  clearConsole();
+  drawHeader();
+  if (messageText) {
+    console.log(messageText);
+  }
+  
+  const cleanHistory = messages.filter(m => m.role !== 'tool' && !m.toolCall && !m.content.includes('[System Context:') && !m.content.includes('[Tool Response for'));
+  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}`);
+        }
+      }
+    });
+    console.log('\x1b[90m─────────────────────────────────\x1b[0m\n');
+  }
+}
 
 function getStringWidth(str) {
   const cleanStr = str.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '');
@@ -199,6 +273,16 @@ function padLine(str, width) {
   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 maskKey(key) {
   if (!key) return '(None/Not Configured)';
   if (key.length <= 8) return '********';
@@ -226,7 +310,7 @@ async function runConcurrentLimit(items, limit, fn) {
   return Promise.all(results);
 }
 
-async function runFileDigestionWorkflow(filePath) {
+async function runFileDigestionWorkflow(filePath, runtime = {}) {
   const resolvedPath = path.resolve(filePath);
   const content = fs.readFileSync(resolvedPath, 'utf8');
   const lines = content.split('\n');
@@ -241,39 +325,24 @@ async function runFileDigestionWorkflow(filePath) {
   const totalChunks = chunks.length;
   let completedCount = 0;
   let failedCount = 0;
-  
-  const spinnerFrames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-  let spinnerIdx = 0;
-  
-  function drawProgressBar() {
-    const percentage = totalChunks > 0 ? Math.round((completedCount / totalChunks) * 100) : 100;
-    const barLength = 25;
-    const filledLength = totalChunks > 0 ? Math.round((completedCount / totalChunks) * barLength) : barLength;
-    const emptyLength = barLength - filledLength;
-    
-    const filledBar = '█'.repeat(filledLength);
-    const emptyBar = '░'.repeat(emptyLength);
-    
-    const barColor = completedCount === totalChunks ? '\x1b[32m' : '\x1b[38;2;140;90;240m';
-    const spinnerFrame = spinnerFrames[spinnerIdx];
-    
-    let suffix = '';
-    if (failedCount > 0) {
-      suffix = ` \x1b[31m(${failedCount} failed)\x1b[0m`;
-    }
-    
-    process.stdout.write(
-      `\r\x1b[K\x1b[35m[Ultracode Workflow]\x1b[0m Digesting ${path.basename(filePath)}: ` +
-      `${barColor}[${filledBar}${emptyBar}]\x1b[0m ${percentage}% ` +
-      `(${completedCount}/${totalChunks} chunks) ${completedCount === totalChunks ? '✔' : '\x1b[36m' + spinnerFrame + '\x1b[0m'}${suffix}`
-    );
-  }
-  
-  process.stdout.write('\x1b[?25l');
-  const spinnerInterval = setInterval(() => {
-    spinnerIdx = (spinnerIdx + 1) % spinnerFrames.length;
-    drawProgressBar();
-  }, 80);
+
+  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`
+    });
+  };
+
+  emitProgress();
   
   const tasks = chunks.map((chunkText, idx) => ({ chunkText, idx }));
   
@@ -291,20 +360,16 @@ async function runFileDigestionWorkflow(filePath) {
     try {
       const summary = await getAIResponse(promptMsg);
       completedCount++;
-      drawProgressBar();
+      emitProgress();
       return { idx: task.idx, start, end, summary };
     } catch (err) {
       completedCount++;
       failedCount++;
-      drawProgressBar();
+      emitProgress();
       return { idx: task.idx, start, end, summary: `[Error reading this segment: ${err.message}]` };
     }
   });
   
-  clearInterval(spinnerInterval);
-  drawProgressBar(); // final draw to show 100% complete
-  process.stdout.write('\n\x1b[?25h');
-  
   results.sort((a, b) => a.idx - b.idx);
   
   let report = `=== ULTRACODE DIGESTION REPORT FOR "${path.basename(filePath)}" ===\n`;
@@ -323,24 +388,60 @@ async function runFileDigestionWorkflow(filePath) {
 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 leftColWidth = 45;
+  const rightColWidth = 47;
+  const boxWidth = 95;
+  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' ? '模型' : 'Model'}: ${active ? active.model : '(not configured)'}`,
+      `Effort: ${effort}`,
+      `${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')}`
+    ];
+
+    console.log(`\x1b[38;2;250;100;30m${rule}\x1b[0m`);
+    console.log(centerLine(`\x1b[1mDave Code v${packageVersion}\x1b[0m`, contentWidth));
+    for (const logoLine of logoLines) console.log(centerLine(logoLine, contentWidth));
+    console.log(`\x1b[38;2;250;100;30m${rule}\x1b[0m`);
+    for (const line of compactStatus) console.log(truncateMiddle(line, contentWidth));
+    console.log(`\x1b[90m${rule}\x1b[0m\n`);
+    return;
+  }
   
   const rightLines = [
-    t.tipsTitle,
-    ...t.tipsLines,
-    t.newsTitle,
-    ...t.newsLines,
-    t.docTitle,
-    ...t.docLines,
+    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' ? '\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;30mCommands\x1b[0m',
+    '/plan  /code  /open',
+    '/help  /history /model',
+    currentLang === 'cn' ? 'Ctrl+C 或 /exit 退出' : 'Ctrl+C or /exit to quit',
     '',
-    ''
+    currentLang === 'cn' ? '文件内容会按需读取并压缩上下文。' : 'Files are read on demand and compacted.'
   ];
 
-  const leftColWidth = 45;
-  const rightColWidth = 47;
-  const boxWidth = 95;
-
   const boxColor = '\x1b[38;2;250;100;30m';
   const resetColor = '\x1b[0m';
   
@@ -371,7 +472,7 @@ function drawHeader() {
       leftContent = centerLine(`\x1b[90m${truncatedCwd}\x1b[0m`, leftColWidth);
     }
 
-    const rightContent = padLine(rightLines[i] || '', rightColWidth);
+    const rightContent = padLine(truncateMiddle(rightLines[i] || '', rightColWidth), rightColWidth);
 
     console.log(
       boxColor + '│ ' + resetColor + 
@@ -387,90 +488,33 @@ function drawHeader() {
 
 }
 
-class AgentActionTracker {
-  constructor() {
-    this.actionsCount = 0;
-    this.actionTypes = {};
-    this.lastActionText = '';
-    this.spinnerIdx = 0;
-    this.spinnerInterval = null;
-    this.statusColor = '\x1b[35m';
-  }
+let promptLoopRunning = false;
 
-  start(actionText) {
-    this.actionsCount++;
-    this.lastActionText = actionText;
-    
-    // Parse action type
-    let type = 'Action';
-    if (actionText.includes('Reading file')) type = 'Read';
-    else if (actionText.includes('Writing file')) type = 'Write';
-    else if (actionText.includes('Listing directory')) type = 'List';
-    else if (actionText.includes('Searching files')) type = 'Search';
-    this.actionTypes[type] = (this.actionTypes[type] || 0) + 1;
-
-    if (!this.spinnerInterval) {
-      process.stdout.write('\x1b[?25l'); // Hide cursor
-      const spinnerFrames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-      this.spinnerInterval = setInterval(() => {
-        this.spinnerIdx = (this.spinnerIdx + 1) % spinnerFrames.length;
-        this.draw();
-      }, 80);
-    }
-    this.draw();
-  }
-
-  draw() {
-    const spinnerFrames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-    const spinnerFrame = spinnerFrames[this.spinnerIdx];
-    
-    const cleanActionText = this.lastActionText.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, '');
-    
-    let displayAction = cleanActionText;
-    if (displayAction.length > 50) {
-      displayAction = displayAction.slice(0, 47) + '...';
-    }
-    
-    process.stdout.write(
-      `\r\x1b[K\x1b[35m⚙ [Agent Actions]\x1b[0m ${this.actionsCount} actions | Last: ${displayAction} \x1b[36m${spinnerFrame}\x1b[0m`
-    );
-  }
-
-  stop() {
-    if (this.spinnerInterval) {
-      clearInterval(this.spinnerInterval);
-      this.spinnerInterval = null;
-    }
-  }
-
-  finish() {
-    this.stop();
-    if (this.actionsCount > 0) {
-      const typesStr = Object.entries(this.actionTypes)
-        .map(([type, count]) => `${count} ${type.toLowerCase()}${count > 1 ? 's' : ''}`)
-        .join(', ');
-      const summaryText = `Completed ${this.actionsCount} actions (${typesStr})`;
-      process.stdout.write(`\r\x1b[K\x1b[32m✔ [Agent Actions]\x1b[0m ${summaryText}\n`);
+async function promptUser() {
+  if (promptLoopRunning) return;
+  promptLoopRunning = true;
+
+  while (true) {
+    const effort = getActiveEffort();
+    const effortText = `● ${effort} · /effort`;
+    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 activeFileBase = activeOpenFile ? path.basename(activeOpenFile) : '';
+    const placeholder = activeOpenFile
+      ? (currentLang === 'cn' ? `正在针对 [${activeFileBase}] 工作...` : `Working on [${activeFileBase}]...`)
+      : (currentLang === 'cn' ? '输入问题或命令，例如 /help ...' : 'Enter a prompt or command, e.g. /help ...');
+    const input = await chatInputPrompt(placeholder, currentLang);
+    try {
+      await handleInput(input);
+    } catch (error) {
+      process.stdout.write('\x1b[?25h');
+      console.log(`\n\x1b[31mUnexpected error:\x1b[0m ${error.message}\n`);
     }
-    process.stdout.write('\x1b[?25h'); // Show cursor
   }
 }
 
-async function promptUser() {
-  const effort = getActiveEffort();
-  const effortText = `● ${effort} · /effort`;
-  const N = effort.length;
-  const padding = ' '.repeat(Math.max(1, 80 - N));
-  const colorCode = effort === 'ultracode' ? '\x1b[1;38;2;140;90;240m' : '\x1b[90m';
-  console.log(padding + colorCode + effortText + '\x1b[0m');
-  const activeFileBase = activeOpenFile ? path.basename(activeOpenFile) : '';
-  const placeholder = activeOpenFile
-    ? (currentLang === 'cn' ? `正在针对 [${activeFileBase}] 工作...` : `Working on [${activeFileBase}]...`)
-    : (currentLang === 'cn' ? 'Try "how do I log an error?" / 输入提示词或命令...' : 'Try "how do I log an error?" / Enter prompt or command...');
-  const input = await chatInputPrompt(placeholder, currentLang);
-  handleInput(input);
-}
-
 // ── Interactive Config Handlers ──
 
 async function triggerProfileSwitch(t) {
@@ -491,9 +535,126 @@ async function triggerProfileSwitch(t) {
   const chosenProfile = profiles[selectedIdx];
   setActiveProfile(chosenProfile.model);
   
-  clearConsole();
-  drawHeader();
-  console.log(`\n\x1b[32mActive model set to: ${chosenProfile.model}\x1b[0m\n`);
+  redrawScreen(`\n\x1b[32mActive model set to: ${chosenProfile.model}\x1b[0m\n`);
+}
+
+function describeToolRequest(toolName, toolArg, lang) {
+  const cn = lang === 'cn';
+  const structuredValue = toolArg && typeof toolArg === 'object'
+    ? (toolArg.path || toolArg.filePath || toolArg.source || toolArg.query || toolArg.command || '')
+    : toolArg;
+  const firstLine = String(structuredValue || '').split('\n', 1)[0].trim();
+  const target = firstLine.length > 80 ? `${firstLine.slice(0, 77)}...` : firstLine;
+  const labels = {
+    LIST_DIR: cn ? `准备查看 ${target || '.'}` : `Preparing to list ${target || '.'}`,
+    READ_FILE: cn ? `准备读取 ${target}` : `Preparing to read ${target}`,
+    EDIT_FILE: cn ? `准备局部修改 ${target}` : `Preparing to edit ${target}`,
+    WRITE_FILE: cn ? `准备修改 ${target}` : `Preparing to change ${target}`,
+    SEARCH_GREP: cn ? `准备搜索 “${target}”` : `Preparing to search "${target}"`,
+    MAKE_DIR: cn ? `准备创建目录 ${target}` : `Preparing to create directory ${target}`,
+    MOVE_PATH: cn ? `准备移动 ${target}` : `Preparing to move ${target}`,
+    DELETE_PATH: cn ? `准备删除 ${target}` : `Preparing to delete ${target}`,
+    RUN_COMMAND: cn ? `准备运行命令 ${target}` : `Preparing to run ${target}`
+  };
+  return labels[toolName] || (cn ? `准备执行 ${toolName}` : `Preparing ${toolName}`);
+}
+
+function launchEditor(filePath) {
+  const command = process.platform === 'win32'
+    ? { file: 'explorer.exe', args: [filePath] }
+    : process.platform === 'darwin'
+      ? { file: 'open', args: [filePath] }
+      : { file: 'xdg-open', args: [filePath] };
+  const child = spawn(command.file, command.args, { detached: true, stdio: 'ignore', windowsHide: true });
+  child.on('error', () => {});
+  child.unref();
+}
+
+async function handlePlanMenu() {
+  while (true) {
+    const plans = listPlans(workspaceRoot);
+    if (plans.length === 0) {
+      console.log(currentLang === 'cn'
+        ? '\n\x1b[90m暂无计划。使用 /plan 名称: 需求 创建。\x1b[0m\n'
+        : '\n\x1b[90mNo plans. Use /plan name: request to create one.\x1b[0m\n');
+      return;
+    }
+    const selected = await selectMenu(
+      currentLang === 'cn' ? '工作区计划' : 'Workspace Plans',
+      currentLang === 'cn' ? '选择一个计划进行查看、重命名或删除。' : 'Select a plan to view, rename, or delete.',
+      plans.map(plan => ({ name: plan.name, desc: `${plan.status} · ${new Date(plan.updatedAt).toLocaleString()}` })),
+      0
+    );
+    if (selected === -1) return;
+    const plan = plans[selected];
+    const action = await selectMenu(
+      plan.name,
+      currentLang === 'cn' ? `状态: ${plan.status}` : `Status: ${plan.status}`,
+      currentLang === 'cn'
+        ? [
+            { name: '查看计划', desc: '显示完整的做什么与怎么做' },
+            { name: '重命名', desc: '修改计划名称' },
+            { name: '删除', desc: '永久删除计划' },
+            { name: '返回', desc: '返回计划列表' }
+          ]
+        : [
+            { name: 'View Plan', desc: 'Show the complete what-and-how plan' },
+            { name: 'Rename', desc: 'Change the plan name' },
+            { name: 'Delete', desc: 'Permanently delete the plan' },
+            { name: 'Back', desc: 'Return to the plan list' }
+          ],
+      0
+    );
+    if (action === -1 || action === 3) continue;
+    if (action === 0) {
+      console.log(`\n\x1b[1;36m${sanitizeUntrustedText(plan.name)}\x1b[0m`);
+      console.log(`${sanitizeUntrustedText(plan.content)}\n`);
+      await waitForEnter(currentLang === 'cn' ? '按 Enter 返回计划列表。' : 'Press Enter to return to plans.');
+    } else if (action === 1) {
+      const nextName = await textInputPrompt(currentLang === 'cn' ? '新计划名称: ' : 'New plan name: ');
+      if (nextName) {
+        try {
+          renamePlan(workspaceRoot, plan.id, nextName);
+        } catch (error) {
+          console.log(`\n\x1b[31m${sanitizeUntrustedText(error.message)}\x1b[0m\n`);
+        }
+      }
+    } else if (action === 2) {
+      const allowed = await confirmPrompt(currentLang === 'cn'
+        ? `删除计划 "${sanitizeUntrustedText(plan.name)}"？(y/n): `
+        : `Delete plan "${sanitizeUntrustedText(plan.name)}"? (y/n): `);
+      if (allowed) deletePlan(workspaceRoot, plan.id);
+    }
+  }
+}
+
+function sessionMatchesWorkspace(session, candidateRoot) {
+  const referencedFiles = new Set();
+  for (const message of session.messages || []) {
+    if (message.role !== 'assistant') continue;
+    const parsed = message.toolCall
+      ? { toolName: message.toolCall.name, toolArg: message.toolCall.arguments }
+      : parseToolCall(message.content || '');
+    if (!parsed || parsed.error || !['READ_FILE', 'EDIT_FILE', 'WRITE_FILE'].includes(parsed.toolName)) continue;
+    const rawPath = parsed.toolArg && typeof parsed.toolArg === 'object'
+      ? (parsed.toolArg.path || parsed.toolArg.filePath || '')
+      : parsed.toolArg;
+    let filePath = String(rawPath || '').split('\n', 1)[0].replace(/:(\d+)-(\d+)$/, '').trim();
+    if (filePath) referencedFiles.add(filePath);
+    if (referencedFiles.size >= 8) break;
+  }
+
+  let matches = 0;
+  for (const filePath of referencedFiles) {
+    try {
+      const resolved = resolveExistingWorkspacePath(filePath, candidateRoot);
+      if (fs.existsSync(resolved) && fs.statSync(resolved).isFile()) matches++;
+      if (matches >= 2) return true;
+    } catch (error) {
+      // A missing reference simply means this is probably not the old workspace.
+    }
+  }
+  return false;
 }
 
 // ── Main REPL Input Handler ──
@@ -525,13 +686,152 @@ async function handleInput(input) {
   }
 
   if (trimmed === '/reset') {
-    messages = [];
+    initSession();
     resetTokenUsage();
     console.log(`\x1b[32m${t.resetMsg}\x1b[0m\n`);
     promptUser();
     return;
   }
 
+  if (trimmed === '/history') {
+    while (true) {
+      const sessions = listSessions();
+      if (sessions.length === 0) {
+        console.log(currentLang === 'cn' ? '\n\x1b[31m暂无历史聊天记录！\x1b[0m\n' : '\n\x1b[31mNo chat history found!\x1b[0m\n');
+        promptUser();
+        return;
+      }
+
+      const menuOptions = sessions.map(s => {
+        const dateStr = new Date(s.timestamp || Date.now()).toLocaleString(currentLang === 'cn' ? 'zh-CN' : 'en-US', {
+          month: 'short',
+          day: 'numeric',
+          hour: '2-digit',
+          minute: '2-digit'
+        });
+        const cleanMsgs = (s.messages || []).filter(m => m.role !== 'tool' && !m.toolCall && !m.content.includes('[System Context:') && !m.content.includes('[Tool Response for'));
+        const msgCount = cleanMsgs.length;
+        return {
+          name: sanitizeUntrustedText(s.title || (currentLang === 'cn' ? '未命名会话' : 'Untitled Session')),
+          desc: `${dateStr} | ${msgCount} ${currentLang === 'cn' ? '条对话' : 'messages'}`
+        };
+      });
+
+      const titleText = currentLang === 'cn' ? '历史聊天记录 (Chat History)' : 'Chat History';
+      const descText = currentLang === 'cn' ? '选择一个历史聊天记录以继续或删除：' : 'Select a chat history to resume or delete:';
+      
+      const currentIdx = sessions.findIndex(s => s.id === currentSessionId);
+      const selectedIdx = await selectMenu(titleText, descText, menuOptions, currentIdx !== -1 ? currentIdx : 0);
+      
+      if (selectedIdx === -1) {
+        redrawScreen();
+        promptUser();
+        return;
+      }
+
+      const chosenSession = sessions[selectedIdx];
+      
+      const safeChosenTitle = sanitizeUntrustedText(chosenSession.title);
+      const actionTitle = currentLang === 'cn' ? `选择操作: "${safeChosenTitle}"` : `Actions for: "${safeChosenTitle}"`;
+      const actionDesc = currentLang === 'cn' ? '请选择您想要进行的操作：' : 'Please select an action:';
+      
+      const actionOptions = currentLang === 'cn' ? [
+        { name: '载入并继续对话 (Resume)', desc: '加载此会话的历史聊天内容并继续' },
+        { name: '删除此会话 (Delete)', desc: '从本地磁盘永久删除此聊天记录' },
+        { name: '取消并返回 (Cancel)', desc: '返回上级历史记录列表' }
+      ] : [
+        { name: 'Resume Conversation', desc: 'Load the messages and continue chatting' },
+        { name: 'Delete Session', desc: 'Permanently remove this chat file from disk' },
+        { name: 'Cancel & Back', desc: 'Go back to the sessions list' }
+      ];
+
+      const actionIdx = await selectMenu(actionTitle, actionDesc, actionOptions, 0);
+
+      if (actionIdx === 0) {
+        currentSessionId = chosenSession.id;
+        currentSessionTitle = chosenSession.title;
+        messages = chosenSession.messages || [];
+
+        const savedWorkspace = chosenSession.workspaceRoot ? path.resolve(chosenSession.workspaceRoot) : null;
+        const savedWorkspaceUsable = savedWorkspace && fs.existsSync(savedWorkspace) && fs.statSync(savedWorkspace).isDirectory()
+          ? savedWorkspace
+          : null;
+        const inferredWorkspace = !savedWorkspaceUsable && sessionMatchesWorkspace(chosenSession, workspaceRoot)
+          ? path.resolve(workspaceRoot)
+          : null;
+        const restorableWorkspace = savedWorkspaceUsable || inferredWorkspace;
+        let workspaceMessage;
+        if (restorableWorkspace && fs.existsSync(restorableWorkspace) && fs.statSync(restorableWorkspace).isDirectory()) {
+          process.chdir(restorableWorkspace);
+          workspaceRoot = restorableWorkspace;
+          workspaceReady = true;
+          activeOpenFile = null;
+          if (chosenSession.activeOpenFile) {
+            try {
+              const restoredFile = resolveWorkspacePath(chosenSession.activeOpenFile, workspaceRoot);
+              if (fs.existsSync(restoredFile) && fs.statSync(restoredFile).isFile()) activeOpenFile = restoredFile;
+            } catch (error) {
+              // The saved active file may have been moved or deleted.
+            }
+          }
+          workspaceMessage = currentLang === 'cn'
+            ? `\x1b[90m工作区: ${workspaceRoot}${inferredWorkspace ? '（已从历史验证）' : ''}\x1b[0m`
+            : `\x1b[90mWorkspace: ${workspaceRoot}${inferredWorkspace ? ' (verified from history)' : ''}\x1b[0m`;
+          saveCurrentSession();
+        } else {
+          workspaceReady = false;
+          activeOpenFile = null;
+          workspaceMessage = currentLang === 'cn'
+            ? `\x1b[33m此旧会话没有可恢复的工作区。请先使用 /open <项目目录>。\x1b[0m`
+            : `\x1b[33mThis older session has no restorable workspace. Use /open <project-directory> first.\x1b[0m`;
+        }
+
+        redrawScreen(currentLang === 'cn'
+          ? `\n\x1b[32m已成功载入会话: "${sanitizeUntrustedText(currentSessionTitle)}"\x1b[0m\n${workspaceMessage}\n`
+          : `\n\x1b[32mSuccessfully loaded session: "${sanitizeUntrustedText(currentSessionTitle)}"\x1b[0m\n${workspaceMessage}\n`
+        );
+
+        const cleanHistory = messages.filter(m => m.role !== 'tool' && !m.toolCall && !m.content.includes('[System Context:') && !m.content.includes('[Tool Response for'));
+        const lastMessages = cleanHistory.slice(-6);
+        
+        if (lastMessages.length > 0) {
+          console.log(currentLang === 'cn' ? '\x1b[90m--- 最近聊天内容预览 ---\x1b[0m' : '\x1b[90m--- Recent Chat Preview ---\x1b[0m');
+          lastMessages.forEach(m => {
+            let previewContent = sanitizeUntrustedText(stripReasoningBlocks(m.displayContent || m.content));
+            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('\x1b[90m────────────────────────\x1b[0m\n');
+        }
+        
+        promptUser();
+        return;
+      } else if (actionIdx === 1) {
+        const confirmMsg = currentLang === 'cn'
+          ? `\x1b[31m警告：您确定要删除此会话 "${safeChosenTitle}" 吗？此操作无法撤销！ (y/n): \x1b[0m`
+          : `\x1b[31mWarning: Are you sure you want to delete session "${safeChosenTitle}"? This cannot be undone! (y/n): \x1b[0m`;
+        
+        const confirmed = await confirmPrompt(confirmMsg);
+        if (confirmed) {
+          deleteSession(chosenSession.id);
+          
+          if (chosenSession.id === currentSessionId) {
+            initSession();
+          }
+          
+          console.log(currentLang === 'cn' ? '\n\x1b[32m✔ 会话已成功删除！\x1b[0m\n' : '\n\x1b[32m✔ Session deleted successfully!\x1b[0m\n');
+          await new Promise(resolve => setTimeout(resolve, 1000));
+        }
+      }
+    }
+  }
+
   if (trimmed === '/stats' || trimmed === '/tokens') {
     console.log(`\n\x1b[1;36mToken Usage Statistics / Token 使用统计:\x1b[0m`);
     console.log(`  \x1b[90mLast Request (单次请求):\x1b[0m`);
@@ -549,9 +849,7 @@ async function handleInput(input) {
   if (trimmed === '/lang' || trimmed === '/language') {
     currentLang = currentLang === 'cn' ? 'en' : 'cn';
     const nextT = locales[currentLang];
-    clearConsole();
-    drawHeader();
-    console.log(`\x1b[32m${nextT.switchMsg}\x1b[0m\n`);
+    redrawScreen(`\x1b[32m${nextT.switchMsg}\x1b[0m\n`);
     promptUser();
     return;
   }
@@ -577,12 +875,9 @@ async function handleInput(input) {
     const selected = await selectEffortMenu(currentEffort, currentLang);
     if (selected) {
       setActiveEffort(selected);
-      clearConsole();
-      drawHeader();
-      console.log(`\n\x1b[32mThinking effort set to: ${selected}\x1b[0m\n`);
+      redrawScreen(`\n\x1b[32mThinking effort set to: ${selected}\x1b[0m\n`);
     } else {
-      clearConsole();
-      drawHeader();
+      redrawScreen();
     }
     promptUser();
     return;
@@ -610,17 +905,22 @@ async function handleInput(input) {
     
     // Pause prompt and wait for Enter key
     await waitForEnter(t.openingConfigMsg);
-    
-    // Reload config and refresh
-    console.log(t.reloadingConfigMsg);
-    clearConsole();
-    drawHeader();
+
+    // Give the editor a brief moment to flush the saved file, then read it again from disk.
+    await new Promise(resolve => setTimeout(resolve, 150));
+    const reloadedProfile = getActiveProfile();
+    const reloadMessage = reloadedProfile
+      ? (currentLang === 'cn'
+          ? `\n\x1b[32m配置已重载\x1b[0m\n\x1b[90m当前模型: ${reloadedProfile.model}\n配置文件: ${CONFIG_FILE}\x1b[0m\n`
+          : `\n\x1b[32mConfiguration reloaded\x1b[0m\n\x1b[90mActive model: ${reloadedProfile.model}\nConfig file: ${CONFIG_FILE}\x1b[0m\n`)
+      : `\n\x1b[31m${t.noActiveError}\x1b[0m\n\x1b[90m${CONFIG_FILE}\x1b[0m\n`;
+    redrawScreen(reloadMessage);
     promptUser();
     return;
   }
 
   // Handle /open <path>
-  if (trimmed.startsWith('/open')) {
+  if (/^\/open(?:\s|$)/.test(trimmed)) {
     const args = trimmed.slice(5).trim();
     if (!args) {
       console.log(`\n\x1b[31m${t.openUsagePrompt}\x1b[0m\n`);
@@ -639,10 +939,11 @@ async function handleInput(input) {
     if (stats && stats.isDirectory()) {
       try {
         process.chdir(resolvedPath);
+        workspaceRoot = process.cwd();
+        workspaceReady = true;
         activeOpenFile = null; // Switch to directory mode clears active file focus
-        clearConsole();
-        drawHeader();
-        console.log(`\n\x1b[32m${t.openDirSuccess}${resolvedPath}\x1b[0m\n`);
+        saveCurrentSession();
+        redrawScreen(`\n\x1b[32m${t.openDirSuccess}${resolvedPath}\x1b[0m\n`);
       } catch (err) {
         console.log(`\n\x1b[31m${t.openPathError}${resolvedPath} (${err.message})\x1b[0m\n`);
       }
@@ -650,75 +951,36 @@ async function handleInput(input) {
       return;
     }
 
-    // It is a file or a path to be created as a file
-    try {
-      // Create empty file if it doesn't exist
-      if (!fs.existsSync(resolvedPath)) {
-        fs.mkdirSync(path.dirname(resolvedPath), { recursive: true });
-        fs.writeFileSync(resolvedPath, '', 'utf8');
-      }
-
-      activeOpenFile = resolvedPath; // Track currently open file
-
-      // Read content
-      const content = fs.readFileSync(resolvedPath, 'utf8');
-      const lines = content.split('\n');
-      const activeEffort = getActiveEffort();
-      const preset = EFFORT_PRESETS[activeEffort] || EFFORT_PRESETS.high;
-      
-      let contextContent = '';
-      if (activeEffort === 'ultracode') {
-        if (lines.length > 1000) {
-          const totalChunks = Math.ceil(lines.length / 2000);
-          const confirmMsg = `\n\x1b[35m[Ultracode]\x1b[0m File "${path.basename(resolvedPath)}" has ${lines.length} lines. Digesting it will take ${totalChunks} API calls. Proceed? (y/n): `;
-          const proceed = await confirmPrompt(confirmMsg);
-          
-          if (proceed) {
-            const report = await runFileDigestionWorkflow(resolvedPath);
-            const relPath = path.relative(process.cwd(), resolvedPath);
-            contextContent = `[System Context: User opened file "${resolvedPath}" (${lines.length} lines). The file has been processed using the chunked digestion workflow. Below is the full digestion report. If you need to view raw code or text of specific lines, use the <<READ_FILE: ${relPath}:start-end>> tool (e.g., <<READ_FILE: ${relPath}:1200-1350>>).]\n\n${report}`;
-          } else {
-            const relPath = path.relative(process.cwd(), resolvedPath);
-            contextContent = `[System Context: User opened file "${resolvedPath}" (${lines.length} lines). Since the file is large, digestion was skipped by user. Use the <<READ_FILE: filePath:start-end>> tool (e.g. <<READ_FILE: ${relPath}:1-500>>) to read other segments of the file if needed.]`;
-            console.log(`\n\x1b[33m[Warning] Skipped digestion. AI will read file sections on demand.\x1b[0m`);
-          }
-        } else if (lines.length > preset.maxReadLines) {
-          const truncatedContent = lines.slice(0, 100).join('\n');
-          const relPath = path.relative(process.cwd(), resolvedPath);
-          contextContent = `[System Context: User opened file "${resolvedPath}" (${lines.length} lines). Since the file is large, only the first 100 lines are shown below. Use the <<READ_FILE: filePath:start-end>> tool (e.g. <<READ_FILE: ${relPath}:101-300>>) to read other segments of the file if needed.]\n\n${truncatedContent}`;
-          console.log(`\n\x1b[33m[Warning] File is large (${lines.length} lines). Truncated first 100 lines for AI context.\x1b[0m`);
-        } else {
-          contextContent = `[System Context: User opened file "${resolvedPath}" for editing and working. Current file contents:\n\n${content}]`;
-        }
+    if (!workspaceReady) {
+      if (stats && stats.isFile()) {
+        workspaceRoot = path.dirname(resolvedPath);
+        process.chdir(workspaceRoot);
+        workspaceReady = true;
       } else {
-        // Non-ultracode modes: Smart Incremental Reading
-        if (lines.length > preset.maxReadLines) {
-          const truncatedContent = lines.slice(0, 100).join('\n');
-          const relPath = path.relative(process.cwd(), resolvedPath);
-          contextContent = `[System Context: User opened file "${resolvedPath}" (${lines.length} lines). Since the file is large, only the first 100 lines are shown below. Use the <<READ_FILE: filePath:start-end>> tool (e.g. <<READ_FILE: ${relPath}:101-300>>) to read other segments of the file if needed.]\n\n${truncatedContent}`;
-        } else {
-          contextContent = `[System Context: User opened file "${resolvedPath}" for editing and working. Current file contents:\n\n${content}]`;
-        }
+        console.log(currentLang === 'cn'
+          ? '\n\x1b[33m此会话尚未关联工作区，请先使用 /open <项目目录>。\x1b[0m\n'
+          : '\n\x1b[33mThis session is not linked to a workspace. Use /open <project-directory> first.\x1b[0m\n');
+        promptUser();
+        return;
       }
-      
-      // Load file into messages history as a System context message
-      messages.push({
-        role: 'user',
-        content: contextContent
-      });
+    }
+
+    if (!stats || !stats.isFile()) {
+      console.log(`\n\x1b[31m${t.openPathError}${sanitizeUntrustedText(resolvedPath)}\x1b[0m\n`);
+      promptUser();
+      return;
+    }
 
-      // Open in default editor
-      const command = process.platform === 'win32'
-        ? `start "" "${resolvedPath}"`
-        : (process.platform === 'darwin' ? `open "${resolvedPath}"` : `xdg-open "${resolvedPath}"`);
+    // Existing files can be focused, but /open never creates workspace content.
+    try {
+      const filePath = resolveWorkspacePath(args, workspaceRoot);
+      activeOpenFile = filePath; // Track currently open file
+      workspaceReady = true;
+      saveCurrentSession();
 
-      exec(command, (err) => {
-        if (err && process.platform === 'win32') {
-          exec(`notepad "${resolvedPath}"`);
-        }
-      });
+      launchEditor(filePath);
 
-      console.log(`\n\x1b[32m${t.openFileSuccess}\n\x1b[90mPath: ${resolvedPath}\x1b[0m\n`);
+      console.log(`\n\x1b[32m${t.openFileSuccess}\n\x1b[90mPath: ${filePath}\x1b[0m\n`);
     } catch (err) {
       console.log(`\n\x1b[31m${t.openPathError}${resolvedPath} (${err.message})\x1b[0m\n`);
     }
@@ -727,259 +989,347 @@ async function handleInput(input) {
     return;
   }
 
+  let agentMode = 'chat';
+  let agentPrompt = trimmed;
+  let historyDisplay = trimmed;
+  let executingPlan = null;
+  let pendingPlan = null;
+
+  if (/^\/(?:plan|code)(?:\s|$)/.test(trimmed)) {
+    if (!workspaceReady) {
+      console.log(currentLang === 'cn'
+        ? '\n\x1b[33m请先使用 /open <项目目录> 关联工作区。\x1b[0m\n'
+        : '\n\x1b[33mUse /open <project-directory> before planning or coding.\x1b[0m\n');
+      promptUser();
+      return;
+    }
+    const command = parseInputCommand(trimmed, { findPlan: name => findPlan(workspaceRoot, name) });
+    if (command.type === 'error') {
+      console.log(`\n\x1b[31m${sanitizeUntrustedText(command.error)}\x1b[0m\n`);
+      promptUser();
+      return;
+    }
+    if (command.type === 'code.usage') {
+      console.log(currentLang === 'cn'
+        ? '\n用法: /code <需求或计划名>，或 /code --prompt <需求>\n'
+        : '\nUsage: /code <request or plan name>, or /code --prompt <request>\n');
+      promptUser();
+      return;
+    }
+    if (command.type === 'plan.menu') {
+      await handlePlanMenu();
+      redrawScreen();
+      promptUser();
+      return;
+    }
+    if (command.type === 'plan.create') {
+      const existing = findPlan(workspaceRoot, command.name);
+      let replace = false;
+      if (existing) {
+        replace = await confirmPrompt(currentLang === 'cn'
+          ? `计划 "${sanitizeUntrustedText(existing.name)}" 已存在，替换它？(y/n): `
+          : `Plan "${sanitizeUntrustedText(existing.name)}" exists. Replace it? (y/n): `);
+        if (!replace) {
+          promptUser();
+          return;
+        }
+      }
+      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;
+      agentPrompt = executingPlan
+        ? `Execute the saved plan "${executingPlan.name}". Re-read current files before changing them.\n\n${executingPlan.content}`
+        : command.prompt;
+    }
+  }
+
+  if (!workspaceReady) {
+    console.log(currentLang === 'cn'
+      ? '\n\x1b[33m当前历史会话没有关联项目目录。请先输入 /open <项目目录>，再继续修改。\x1b[0m\n'
+      : '\n\x1b[33mThis history session is not linked to a project directory. Run /open <project-directory> before continuing.\x1b[0m\n');
+    promptUser();
+    return;
+  }
+
   // Check if active profile and API key are configured
   if (!hasApiKey()) {
     console.log(`\n${t.noKeyError}\n`);
+    if (lastConfigError) console.log(`\x1b[31m${sanitizeUntrustedText(lastConfigError)}\x1b[0m\n`);
     promptUser();
     return;
   }
 
   // Push user message to history
-  messages.push({ role: 'user', content: trimmed });
+  messages.push({ role: 'user', content: agentPrompt, displayContent: historyDisplay });
+  saveCurrentSession();
+
+  if (executingPlan) {
+    updatePlan(workspaceRoot, executingPlan.id, { status: 'running', lastRun: { startedAt: Date.now() } });
+    redrawScreen(currentLang === 'cn'
+      ? `\x1b[90m正在执行计划: ${sanitizeUntrustedText(executingPlan.name)}\x1b[0m\n`
+      : `\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 actionTracker = new AgentActionTracker();
+  const turnTokenStart = {
+    input: sessionTokenUsage.inputTokens,
+    output: sessionTokenUsage.outputTokens
+  };
+
+  const runtime = createRuntimeEvents();
+  const renderer = createTerminalRenderer({ stdout: process.stdout, lang: currentLang });
+  const unsubscribe = runtime.subscribe(event => renderer.handle(event));
+  const abortController = new AbortController();
+  let interrupted = false;
+  const onTurnInterrupt = () => {
+    interrupted = true;
+    abortController.abort();
+  };
+  process.once('SIGINT', onTurnInterrupt);
   let loopCount = 0;
-  let activeReply = '';
+  let turnCompleted = false;
+  let terminalEventSent = false;
+  let compactionShown = false;
+  let turnOutcome = 'stopped';
+  let planActionCancelled = false;
+
+  runtime.emit('turn.started', {
+    label: currentLang === 'cn' ? '思考中 · 正在理解问题' : 'Thinking · understanding the request'
+  });
 
-  while (loopCount < maxLoops) {
-    // Simulate thinking with animated spinner
-    const prefixText = currentLang === 'cn' ? '正在思考' : 'Thinking';
-    const stopSpinner = startSpinner(prefixText);
-    
-    try {
-      activeReply = await getAIResponse(messages, activeOpenFile, preset.maxReadLines);
-      stopSpinner();
-    } catch (error) {
-      stopSpinner();
-      console.log(`\n\x1b[31mAPI Error:\x1b[0m ${error.message}\n`);
-      if (loopCount === 0) messages.pop();
-      break;
-    }
+  try {
+    while (loopCount < maxLoops) {
+      const modelMessages = prepareModelMessages(messages, activeEffort);
+      const contextWasCompacted = modelMessages.some(message => String(message.content || '').startsWith('[Conversation context compacted:'));
+      if (!compactionShown && contextWasCompacted) {
+        runtime.emit('context.compacted', {
+          omittedMessages: Math.max(1, messages.length - modelMessages.length + 1),
+          keptMessages: modelMessages.length
+        });
+        compactionShown = true;
+      }
 
-    // Check if the reply contains any tool tags
-    const match = activeReply.match(/<<([A-Z_]+):\s*([\s\S]*?)>>/);
-    if (!match) {
-      // Final response from Dave
-      let finalReply = activeReply;
-      const thinkMatch = finalReply.match(/<think>([\s\S]*?)<\/think>/);
-      if (thinkMatch) {
-        const thinkContent = thinkMatch[1].trim();
-        if (thinkContent) {
-          console.log(`\n\x1b[90m💭 Dave (Thinking):\n${thinkContent}\x1b[0m`);
+      let activeReply = '';
+      const nativeToolCalls = [];
+      let modelWasTruncated = false;
+      for await (const modelEvent of streamAIResponse(modelMessages, {
+        activeOpenFile,
+        maxReadLines: preset.maxReadLines,
+        signal: abortController.signal,
+        mode: agentMode,
+        workspaceRoot
+      })) {
+        if (modelEvent.type === 'model.delta') {
+          activeReply += modelEvent.data.text || '';
+        } else if (modelEvent.type === 'model.tool_call') {
+          nativeToolCalls.push(modelEvent.data);
+        } else if (modelEvent.type === 'model.completed') {
+          modelWasTruncated = modelEvent.data.truncated === true;
+          runtime.emit(modelEvent.type, modelEvent.data);
+        } else if (modelEvent.type === 'model.started') {
+          runtime.emit('model.started', {
+            ...modelEvent.data,
+            label: loopCount === 0
+              ? (currentLang === 'cn' ? '思考中 · 正在理解问题' : 'Thinking · understanding the request')
+              : (currentLang === 'cn' ? '思考中 · 正在检查工具结果' : 'Thinking · checking tool results')
+          });
+        } else {
+          runtime.emit(modelEvent.type, modelEvent.data);
         }
-        finalReply = finalReply.replace(/<think>[\s\S]*?<\/think>/, '').trim();
       }
-      if (finalReply === '') {
-        finalReply = '(Finished reasoning / 已思考完毕但未返回额外文本)';
+
+      if (modelWasTruncated) {
+        runtime.emit('model.retry', {
+          reason: 'output-truncated',
+          label: currentLang === 'cn' ? '模型输出达到上限，正在要求其缩短并继续' : 'Model output was truncated; requesting a concise continuation'
+        });
+        messages.push({
+          role: 'user',
+          content: '[System notice: The previous model response reached its output limit and was not accepted. Continue concisely. If a tool is needed, request exactly one structured tool.]'
+        });
+        saveCurrentSession();
+        loopCount++;
+        continue;
       }
-      console.log(`\n\x1b[1;38;2;250;100;30mDave\x1b[0m: ${finalReply}\n`);
-      messages.push({ role: 'assistant', content: activeReply });
-      break;
-    }
 
-    // Extract thought text if present
-    let thoughtText = activeReply.slice(0, match.index).trim();
-    if (thoughtText) {
-      const thinkMatch = thoughtText.match(/<think>([\s\S]*?)<\/think>/);
-      if (thinkMatch) {
-        const thinkContent = thinkMatch[1].trim();
-        if (thinkContent) {
-          console.log(`\n\x1b[90m💭 Dave (Thinking):\n${thinkContent}\x1b[0m`);
+      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.' };
+      } else if (nativeToolCalls.length === 1) {
+        const call = nativeToolCalls[0];
+        parsedTool = SUPPORTED_TOOLS.has(call.name)
+          ? { toolName: call.name, toolArg: call.arguments || {}, native: true, id: call.id }
+          : { error: `Unsupported structured tool: ${call.name}` };
+      } else if ((activeProfile?.toolMode || 'native') === 'legacy') {
+        parsedTool = parseToolCall(activeReply);
+        if (parsedTool && !parsedTool.error && typeof parsedTool.toolArg === 'string' && parsedTool.toolArg.trim().startsWith('{')) {
+          try {
+            parsedTool.toolArg = JSON.parse(parsedTool.toolArg);
+          } catch {
+            parsedTool = { error: 'Legacy tool arguments must be valid JSON.' };
+          }
         }
-        thoughtText = thoughtText.replace(/<think>[\s\S]*?<\/think>/, '').trim();
       }
-      if (thoughtText) {
-        console.log(`\x1b[90m💭 Dave: ${thoughtText}\x1b[0m`);
-      }
-    }
-
-    // Save Dave's intermediate tool call message to history
-    messages.push({ role: 'assistant', content: activeReply });
-
-    const toolName = match[1];
-    const toolArg = match[2];
-
-    let toolResult = '';
-    const statusColor = '\x1b[35m'; // purple for agent action
-    const resetColor = '\x1b[0m';
-    
-    try {
-      if (toolName === 'LIST_DIR') {
-        const resolvedPath = path.resolve(toolArg.trim() || '.');
-        actionTracker.start(`Listing directory: ${path.basename(resolvedPath) || '.'}`);
-        
-        const files = fs.readdirSync(resolvedPath);
-        toolResult = files.map(f => {
-          const stat = fs.statSync(path.join(resolvedPath, f));
-          return `${f} (${stat.isDirectory() ? 'Dir' : 'File, ' + stat.size + 'B'})`;
-        }).join('\n') || '(Empty directory)';
-      } 
-      else if (toolName === 'READ_FILE') {
-        let filePath = toolArg.trim();
-        let startLine = 1;
-        let endLine = null;
-        
-        // Parse range like: path/to/file:20-80
-        const rangeMatch = filePath.match(/:(\d+)-(\d+)$/);
-        if (rangeMatch) {
-          filePath = filePath.slice(0, -rangeMatch[0].length);
-          startLine = parseInt(rangeMatch[1], 10);
-          endLine = parseInt(rangeMatch[2], 10);
+      if (!parsedTool) {
+        let finalReply = sanitizeUntrustedText(stripReasoningBlocks(activeReply));
+        if (!finalReply) {
+          finalReply = currentLang === 'cn' ? '模型未返回可显示内容。' : 'The model returned no displayable content.';
         }
-
-        const resolvedPath = path.resolve(filePath);
-        actionTracker.start(`Reading file: ${path.basename(filePath)}${rangeMatch ? ` (Lines ${startLine}-${endLine})` : ''}`);
-        
-        const content = fs.readFileSync(resolvedPath, 'utf8');
-        const lines = content.split('\n');
-        const activeEffort = getActiveEffort();
-        const preset = EFFORT_PRESETS[activeEffort] || EFFORT_PRESETS.high;
-        
-        if (rangeMatch) {
-          const sliced = lines.slice(startLine - 1, endLine);
-          toolResult = sliced.join('\n');
-        } else {
-          if (activeEffort === 'ultracode') {
-            if (lines.length > 1000) {
-              actionTracker.stop(); // Stop the dynamic status line before prompt
-              process.stdout.write('\n'); // Carriage return to next line for clean confirmation
-              const totalChunks = Math.ceil(lines.length / 2000);
-              const confirmMsg = `\x1b[35m[Ultracode]\x1b[0m AI requested to read "${path.basename(resolvedPath)}" (${lines.length} lines). Digesting it will take ${totalChunks} API calls. Proceed? (y/n): `;
-              const proceed = await confirmPrompt(confirmMsg);
-              
-              if (proceed) {
-                const report = await runFileDigestionWorkflow(resolvedPath);
-                toolResult = `[File is large (${lines.length} lines). Triggered Ultracode Digestion Workflow. Below is the report. Use READ_FILE with ranges for specific parts if needed.]\n\n${report}`;
-              } else {
-                const relPath = path.relative(process.cwd(), resolvedPath);
-                toolResult = `[Warning: File is large (${lines.length} lines) and digestion was skipped by user. You MUST read specific parts using range constraints like <<READ_FILE: ${relPath}:start-end>> (e.g. 1-500) to find the information.]`;
-                console.log(`\n\x1b[33m[Warning] Skipped digestion. AI will read file sections on demand.\x1b[0m`);
-              }
-            } else if (lines.length > preset.maxReadLines) {
-              const truncated = lines.slice(0, preset.maxReadLines).join('\n');
-              const relPath = path.relative(process.cwd(), resolvedPath);
-              toolResult = `[Warning: File is large (${lines.length} lines). Truncated first ${preset.maxReadLines} lines. Use range constraints like <<READ_FILE: ${relPath}:start-end>> to read other sections.]\n\n${truncated}`;
-              console.log(`\n\x1b[33m[Warning] File is large (${lines.length} lines). Truncated to first ${preset.maxReadLines} lines.\x1b[0m`);
-            } else {
-              toolResult = content;
-            }
-          } else {
-            // Non-ultracode modes: Smart Incremental Reading (精读模式)
-            if (lines.length > preset.maxReadLines) {
-              const truncated = lines.slice(0, preset.maxReadLines).join('\n');
-              const relPath = path.relative(process.cwd(), resolvedPath);
-              toolResult = `[System Context: File is large (${lines.length} lines). Truncated first ${preset.maxReadLines} lines for this read. To read other sections, you MUST use range constraints like <<READ_FILE: ${relPath}:start-end>> (e.g. 200-800) to find the information.]\n\n${truncated}`;
-            } else {
-              toolResult = content;
+        if (pendingPlan) {
+          const missingSections = validatePlanContent(finalReply);
+          if (missingSections.length > 0) {
+            if (loopCount + 1 >= maxLoops) {
+              throw new Error(`Plan validation failed: missing ${missingSections.join(', ')}.`);
             }
+            messages.push({ role: 'assistant', content: finalReply });
+            messages.push({ role: 'user', content: `[Plan validation failed. Rewrite the complete plan. Missing: ${missingSections.join(', ')}. Every implementation step must state WHAT changes, HOW it is implemented, affected files/interfaces, and validation.]` });
+            saveCurrentSession();
+            loopCount++;
+            continue;
           }
         }
-      } 
-      else if (toolName === 'WRITE_FILE') {
-        const firstNewline = toolArg.indexOf('\n');
-        const filePathPart = firstNewline === -1 ? toolArg : toolArg.slice(0, firstNewline);
-        const fileContentPart = firstNewline === -1 ? '' : toolArg.slice(firstNewline + 1);
-        
-        const resolvedPath = path.resolve(filePathPart.trim());
-        actionTracker.start(`Writing file: ${path.basename(resolvedPath)}`);
-        
-        fs.mkdirSync(path.dirname(resolvedPath), { recursive: true });
-        fs.writeFileSync(resolvedPath, fileContentPart, 'utf8');
-        toolResult = `Successfully wrote to file: ${resolvedPath}`;
-      } 
-      else if (toolName === 'SEARCH_GREP') {
-        const query = toolArg.trim();
-        actionTracker.start(`Searching files for: "${query}"`);
-        
-        const results = [];
-        let totalMatches = 0;
-        const maxTotalMatches = 50;
-
-        function searchGrep(dir, q, depth = 0) {
-          if (depth > 5 || totalMatches >= maxTotalMatches) return;
-          const files = fs.readdirSync(dir);
-          for (const f of files) {
-            if (totalMatches >= maxTotalMatches) break;
-            if (f === 'node_modules' || f === '.git' || f === '.gemini' || f === 'package-lock.json') continue;
-            const fullPath = path.join(dir, f);
-            try {
-              const stat = fs.statSync(fullPath);
-              if (stat.isDirectory()) {
-                searchGrep(fullPath, q, depth + 1);
-              } else if (stat.isFile()) {
-                const ext = path.extname(f).toLowerCase();
-                const textExts = ['.js', '.json', '.txt', '.md', '.html', '.css', '.yml', '.yaml', '.sh', '.bat', '.cmd', '.py', '.cpp', '.h', '.c', '.go', '.rs', '.java', '.ts'];
-                if (textExts.includes(ext) || stat.size < 100000) {
-                  const content = fs.readFileSync(fullPath, 'utf8');
-                  if (content.includes(q)) {
-                    const lines = content.split('\n');
-                    const fileMatches = [];
-                    for (let i = 0; i < lines.length; i++) {
-                      if (lines[i].includes(q)) {
-                        fileMatches.push({ lineNum: i + 1, text: lines[i].trim() });
-                        totalMatches++;
-                        if (totalMatches >= maxTotalMatches) break;
-                      }
-                    }
-                    if (fileMatches.length > 0) {
-                      results.push({
-                        file: path.relative(process.cwd(), fullPath),
-                        matches: fileMatches
-                      });
-                    }
-                  }
-                }
-              }
-            } catch (e) {
-              // Ignore unreadable files
+        runtime.emit('model.delta', { text: finalReply });
+        messages.push({ role: 'assistant', content: finalReply });
+        saveCurrentSession();
+        if (pendingPlan) {
+          upsertPlan(workspaceRoot, {
+            name: pendingPlan.name,
+            request: pendingPlan.request,
+            content: finalReply
+          }, { replace: pendingPlan.replace });
+        }
+        turnCompleted = true;
+
+        if (currentSessionTitle === 'New Chat' || currentSessionTitle === '新会话' || currentSessionTitle === 'New Session') {
+          const titleSessionId = currentSessionId;
+          const titleMessages = prepareModelMessages(messages.map(message => ({ ...message })), activeEffort);
+          generateTitle(titleMessages).then(newTitle => {
+            if (currentSessionId === titleSessionId && newTitle && newTitle !== 'New Session') {
+              currentSessionTitle = sanitizeUntrustedText(newTitle).slice(0, 80);
+              saveCurrentSession();
             }
-          }
+          }).catch(() => {});
         }
+        break;
+      }
 
-        searchGrep(process.cwd(), query);
-        
-        if (results.length > 0) {
-          let outputText = 'Found matches:\n';
-          results.forEach(res => {
-            outputText += `- ${res.file}:\n`;
-            res.matches.forEach(m => {
-              const displayInfo = m.text.length > 120 ? m.text.slice(0, 117) + '...' : m.text;
-              outputText += `    Line ${m.lineNum}: ${displayInfo}\n`;
-            });
-          });
-          toolResult = outputText;
-        } else {
-          toolResult = `No matches found for "${query}"`;
-        }
-      } 
-      else {
-        toolResult = `Unknown tool: ${toolName}`;
+      if (parsedTool.error) {
+        runtime.emit('tool.failed', {
+          tool: 'TOOL_PARSE',
+          displaySummary: currentLang === 'cn' ? '工具格式无法解析' : 'Could not parse tool call',
+          error: parsedTool.error
+        });
+        messages.push({ role: 'user', content: `[Tool Response for TOOL_PARSE:\n${parsedTool.error}]` });
+        saveCurrentSession();
+        loopCount++;
+        continue;
       }
-    } catch (err) {
-      toolResult = `Error executing tool ${toolName}: ${err.message}`;
-      console.log(`\n\x1b[31m[Agent Error] ${err.message}\x1b[0m\n`);
-    }
 
-    // Append tool response to history as a user message
-    messages.push({
-      role: 'user',
-      content: `[Tool Response for ${toolName}:\n${toolResult}]`
-    });
+      const toolName = parsedTool.toolName;
+      const toolArg = parsedTool.toolArg;
+      const toolCallId = parsedTool.id || `${runtime.turnId}-tool-${loopCount + 1}`;
+      runtime.emit('tool.requested', {
+        tool: toolName,
+        toolCallId,
+        displaySummary: describeToolRequest(toolName, toolArg, currentLang)
+      });
 
-    actionTracker.stop(); // Stop the action tracker spinner before we loop back to thinking
+      messages.push({
+        role: 'assistant',
+        content: '',
+        toolCall: { id: toolCallId, name: toolName, arguments: toolArg }
+      });
+      saveCurrentSession();
+
+      const toolResponse = await executeToolCall({
+        toolName,
+        toolArg,
+        toolCallId,
+        workspaceRoot,
+        emit: runtime.emit,
+        requestPermission: async ({ prompt }) => {
+          renderer.pause();
+          try {
+            return await confirmPrompt(`\x1b[33m${sanitizeUntrustedText(prompt)}\x1b[0m`);
+          } finally {
+            renderer.resume();
+          }
+        },
+        lang: currentLang,
+        mode: agentMode,
+        signal: abortController.signal,
+        getActiveEffort,
+        effortPresets: EFFORT_PRESETS,
+        runFileDigestionWorkflow
+      });
+      const toolResult = toolResponse.modelResult || toolResponse.result;
+      if (toolResponse.cancelled) planActionCancelled = true;
+      messages.push({ role: 'tool', content: String(toolResult || ''), toolCallId, toolName });
+      saveCurrentSession();
+      if (interrupted) throw new Error('Request cancelled.');
+      loopCount++;
+    }
 
-    loopCount++;
+    if (turnCompleted) {
+      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) {
+      runtime.emit('turn.cancelled', {
+        reason: currentLang === 'cn' ? '已取消当前操作' : 'Current operation cancelled'
+      });
+      terminalEventSent = true;
+      turnOutcome = 'cancelled';
+    } else {
+      if (loopCount === 0) {
+        messages.pop();
+        saveCurrentSession();
+      }
+      runtime.emit('turn.failed', {
+        error: currentLang === 'cn' ? `请求失败：${error.message}` : `Request failed: ${error.message}`
+      });
+      terminalEventSent = true;
+      turnOutcome = 'blocked';
+    }
+  } finally {
+    process.removeListener('SIGINT', onTurnInterrupt);
+    if (!terminalEventSent) runtime.emit('turn.cancelled', { reason: currentLang === 'cn' ? '本轮已停止' : 'Turn stopped' });
+    renderer.dispose();
+    unsubscribe();
+    runtime.close();
   }
 
-  actionTracker.finish();
-  if (loopCount >= maxLoops) {
-    console.log(`\n\x1b[33m[Warning] Loop limit reached (${maxLoops} steps). Dave stopped to prevent high API token usage. Try raising the effort level using /effort or narrowing down the task.\x1b[0m\n`);
+  if (executingPlan) {
+    updatePlan(workspaceRoot, executingPlan.id, {
+      status: turnOutcome === 'completed' ? 'completed' : turnOutcome === 'cancelled' ? 'ready' : 'blocked',
+      lastRun: {
+        ...(executingPlan.lastRun || {}),
+        finishedAt: Date.now(),
+        outcome: turnOutcome
+      }
+    });
   }
 
+  sessionTokenUsage.lastInputTokens = Math.max(0, sessionTokenUsage.inputTokens - turnTokenStart.input);
+  sessionTokenUsage.lastOutputTokens = Math.max(0, sessionTokenUsage.outputTokens - turnTokenStart.output);
+  sessionTokenUsage.lastTotalTokens = sessionTokenUsage.lastInputTokens + sessionTokenUsage.lastOutputTokens;
+
   if (sessionTokenUsage.lastTotalTokens > 0) {
     console.log(
       `\x1b[90mTokens: ${sessionTokenUsage.lastInputTokens.toLocaleString()} input, ` +
@@ -991,6 +1341,12 @@ async function handleInput(input) {
     );
   }
 
+  if (pendingPlan || executingPlan) {
+    redrawScreen(currentLang === 'cn'
+      ? '\x1b[90m计划状态已更新。\x1b[0m\n'
+      : '\x1b[90mPlan status updated.\x1b[0m\n');
+  }
+
   promptUser();
 }
 
@@ -1000,12 +1356,16 @@ async function startApp() {
     clearConsole();
     await runWelcomeAnimation();
     setInitialized();
-    // Wait briefly so the user can see the final successful initialization status
-    await new Promise(resolve => setTimeout(resolve, 1500));
+    await new Promise(resolve => setTimeout(resolve, 500));
   }
+  initSession();
   clearConsole();
+  // The octopus workspace header remains part of every normal startup.
   drawHeader();
   promptUser();
 }
 
-startApp().catch(console.error);
+startApp().catch(error => {
+  process.stdout.write('\x1b[?25h');
+  console.error(error);
+});