coding-tool-x 3.3.3 → 3.3.5

package/src/config/paths.js

@@ -3,16 +3,19 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { resolvePreferredHomeDir } = require('../utils/home-dir');
+
+const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
 
 // 基础目录
-const CC_TOOL_BASE_DIR = path.join(os.homedir(), '.cc-tool');
+const CC_TOOL_BASE_DIR = path.join(HOME_DIR, '.cc-tool');
 // 兼容旧变量名，避免外部调用方断裂
 const CTX_BASE_DIR = CC_TOOL_BASE_DIR;
 
 // 旧目录（升级时自动合并到 ~/.cc-tool）
 const LEGACY_BASE_DIRS = [
-  path.join(os.homedir(), '.claude', 'ctx'),
-  path.join(os.homedir(), '.claude', 'cc-tool')
+  path.join(HOME_DIR, '.claude', 'ctx'),
+  path.join(HOME_DIR, '.claude', 'cc-tool')
 ];
 
 let migrationChecked = false;
@@ -127,7 +130,7 @@ const PATHS = {
   notifyHook: path.join(CC_TOOL_BASE_DIR, 'notify-hook.js'),
 
   // Skills 安装目录（注意：这个仍使用 Claude 原生路径）
-  skills: path.join(os.homedir(), '.claude', 'skills'),
+  skills: path.join(HOME_DIR, '.claude', 'skills'),
 
   // MCP 配置（注意：这个仍使用 Claude 原生路径）
   mcpConfig: path.join(CC_TOOL_BASE_DIR, 'mcp-config.json'),
@@ -148,41 +151,42 @@ const PATHS = {
 const NATIVE_PATHS = {
   // Claude Code 原生配置
   claude: {
-    settings: path.join(os.homedir(), '.claude', 'settings.json'),
-    settingsBackup: path.join(os.homedir(), '.claude', 'settings.json.cc-tool-backup'),
-    projects: path.join(os.homedir(), '.claude', 'projects')
+    settings: path.join(HOME_DIR, '.claude', 'settings.json'),
+    settingsBackup: path.join(HOME_DIR, '.claude', 'settings.json.cc-tool-backup'),
+    projects: path.join(HOME_DIR, '.claude', 'projects')
   },
 
   // Codex 原生配置
   codex: {
-    config: path.join(os.homedir(), '.codex', 'config.toml'),
-    configBackup: path.join(os.homedir(), '.codex', 'config.toml.cc-tool-backup'),
-    auth: path.join(os.homedir(), '.codex', 'auth.json'),
-    authBackup: path.join(os.homedir(), '.codex', 'auth.json.cc-tool-backup'),
-    sessions: path.join(os.homedir(), '.codex', 'sessions')
+    config: path.join(HOME_DIR, '.codex', 'config.toml'),
+    configBackup: path.join(HOME_DIR, '.codex', 'config.toml.cc-tool-backup'),
+    auth: path.join(HOME_DIR, '.codex', 'auth.json'),
+    authBackup: path.join(HOME_DIR, '.codex', 'auth.json.cc-tool-backup'),
+    sessions: path.join(HOME_DIR, '.codex', 'sessions')
   },
 
   // Gemini 原生配置
   gemini: {
-    env: path.join(os.homedir(), '.gemini', '.env'),
-    envBackup: path.join(os.homedir(), '.gemini', '.env.cc-tool-backup'),
-    tmp: path.join(os.homedir(), '.gemini', 'tmp')
+    env: path.join(HOME_DIR, '.gemini', '.env'),
+    envBackup: path.join(HOME_DIR, '.gemini', '.env.cc-tool-backup'),
+    tmp: path.join(HOME_DIR, '.gemini', 'tmp')
   },
 
   // OpenCode 原生配置
   opencode: {
-    data: path.join(os.homedir(), '.local', 'share', 'opencode'),
-    config: path.join(os.homedir(), '.config', 'opencode'),
-    sessions: path.join(os.homedir(), '.local', 'share', 'opencode', 'storage', 'session'),
-    projects: path.join(os.homedir(), '.local', 'share', 'opencode', 'storage', 'project'),
-    messages: path.join(os.homedir(), '.local', 'share', 'opencode', 'storage', 'message'),
-    log: path.join(os.homedir(), '.local', 'share', 'opencode', 'log')
+    data: path.join(HOME_DIR, '.local', 'share', 'opencode'),
+    config: path.join(HOME_DIR, '.config', 'opencode'),
+    sessions: path.join(HOME_DIR, '.local', 'share', 'opencode', 'storage', 'session'),
+    projects: path.join(HOME_DIR, '.local', 'share', 'opencode', 'storage', 'project'),
+    messages: path.join(HOME_DIR, '.local', 'share', 'opencode', 'storage', 'message'),
+    log: path.join(HOME_DIR, '.local', 'share', 'opencode', 'log')
   }
 };
 
 module.exports = {
   PATHS,
   NATIVE_PATHS,
+  HOME_DIR,
   CTX_BASE_DIR,
   CC_TOOL_BASE_DIR,
   LEGACY_BASE_DIRS,

package/src/reset-config.js

@@ -1,7 +1,5 @@
 const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const { PATHS, ensureStorageDirMigrated } = require('./config/paths');
+const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('./config/paths');
 
 // 恢复配置到默认状态
 async function resetConfig() {
@@ -25,8 +23,8 @@ async function resetConfig() {
     }
 
     // 2. 检查并恢复 settings.json
-    const settingsPath = path.join(os.homedir(), '.claude', 'settings.json');
-    const backupPath = path.join(os.homedir(), '.claude', 'settings.json.cc-tool-backup');
+    const settingsPath = NATIVE_PATHS.claude.settings;
+    const backupPath = NATIVE_PATHS.claude.settingsBackup;
 
     if (fs.existsSync(backupPath)) {
       console.log('发现备份文件，正在恢复...');

package/src/server/api/agents.js

@@ -6,15 +6,14 @@
 
 const express = require('express');
 const fs = require('fs');
-const os = require('os');
 const path = require('path');
 const { AgentsService } = require('../services/agents-service');
-const { PATHS } = require('../../config/paths');
+const { PATHS, HOME_DIR } = require('../../config/paths');
 
 const router = express.Router();
 const SUPPORTED_PLATFORMS = ['claude', 'codex', 'opencode'];
 const agentServices = new Map();
-const DEFAULT_PROJECT_ALLOWED_ROOTS = [os.homedir(), process.cwd()];
+const DEFAULT_PROJECT_ALLOWED_ROOTS = [HOME_DIR, process.cwd()];
 
 function isSupportedPlatform(platform) {
   return SUPPORTED_PLATFORMS.includes(platform);

package/src/server/api/claude-hooks.js

@@ -5,18 +5,21 @@ const path = require('path');
 const os = require('os');
 const https = require('https');
 const http = require('http');
+const { resolvePreferredHomeDir, normalizeWindowsHomePath } = require('../../utils/home-dir');
+
+// 检测操作系统
+const platform = os.platform(); // 'darwin' | 'win32' | 'linux'
+
+const HOME_DIR = resolvePreferredHomeDir(platform, process.env, os.homedir());
 
 // Claude settings.json 路径
-const CLAUDE_SETTINGS_PATH = path.join(os.homedir(), '.claude', 'settings.json');
+const CLAUDE_SETTINGS_PATH = path.join(HOME_DIR, '.claude', 'settings.json');
 
 // UI 配置路径（记录用户是否主动关闭过、飞书配置等）
-const UI_CONFIG_PATH = path.join(os.homedir(), '.cc-tool', 'ui-config.json');
+const UI_CONFIG_PATH = path.join(HOME_DIR, '.cc-tool', 'ui-config.json');
 
 // 通知脚本路径（用于飞书通知）
-const NOTIFY_SCRIPT_PATH = path.join(os.homedir(), '.cc-tool', 'notify-hook.js');
-
-// 检测操作系统
-const platform = os.platform(); // 'darwin' | 'win32' | 'linux'
+const NOTIFY_SCRIPT_PATH = path.join(HOME_DIR, '.cc-tool', 'notify-hook.js');
 
 // 读取 Claude settings.json
 function readClaudeSettings() {
@@ -91,7 +94,7 @@ function generateSystemNotificationCommand(type) {
     if (type === 'dialog') {
       return `powershell -Command "Add-Type -AssemblyName PresentationFramework; [System.Windows.MessageBox]::Show('Claude Code 任务已完成 | 等待交互', 'Coding Tool', 'OK', 'Information')"`;
     } else {
-      return `powershell -Command "$wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('任务已完成 | 等待交互', 5, 'Coding Tool', 0x40)"`;
+      return `powershell -NoProfile -Command "try { [Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null; [Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] > $null; $xml = New-Object Windows.Data.Xml.Dom.XmlDocument; $xml.LoadXml('<toast><visual><binding template=\\"ToastGeneric\\"><text>Coding Tool</text><text>任务已完成 | 等待交互</text></binding></visual><audio src=\\"ms-winsoundevent:Notification.Default\\"/></toast>'); $toast = [Windows.UI.Notifications.ToastNotification]::new($xml); [Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier('Coding Tool').Show($toast) } catch { $wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('任务已完成 | 等待交互', 5, 'Coding Tool', 0x40) }"`;
     }
   } else {
     // Linux
@@ -192,6 +195,52 @@ try {
   return script;
 }
 
+function parseNotifyTypeMarker(command) {
+  const marker = command.match(/--cc-notify-type=(['"])?(dialog|notification)\1/i);
+  return marker ? marker[2].toLowerCase() : null;
+}
+
+function getStopHookCommand(settings) {
+  const hooks = settings?.hooks?.Stop;
+  if (!Array.isArray(hooks) || hooks.length === 0) {
+    return '';
+  }
+  const firstHook = hooks[0]?.hooks;
+  if (!Array.isArray(firstHook) || firstHook.length === 0) {
+    return '';
+  }
+  return firstHook[0]?.command || '';
+}
+
+function normalizePathForCompare(rawPath) {
+  return String(rawPath || '').replace(/\\/g, '/');
+}
+
+function shouldRepairStopHook(settings, expectedScriptPath = NOTIFY_SCRIPT_PATH, fileExists = fs.existsSync) {
+  const command = getStopHookCommand(settings);
+  if (!command || !command.includes('notify-hook.js')) {
+    return false;
+  }
+
+  const markerType = parseNotifyTypeMarker(command);
+  if (!markerType) {
+    return false;
+  }
+
+  const normalizedCommand = normalizePathForCompare(command);
+  const normalizedExpected = normalizePathForCompare(expectedScriptPath);
+  if (!normalizedCommand.includes(normalizedExpected)) {
+    return true;
+  }
+
+  return !fileExists(expectedScriptPath);
+}
+
+function buildStopHookCommand(type) {
+  const notifyType = type === 'dialog' ? 'dialog' : 'notification';
+  return `node "${NOTIFY_SCRIPT_PATH}" --cc-notify-type=${notifyType}`;
+}
+
 // 写入通知脚本
 function writeNotifyScript(config) {
   try {
@@ -222,6 +271,11 @@ function parseStopHookStatus(settings) {
   }
 
   const command = stopHook.hooks[0].command || '';
+  const markerType = parseNotifyTypeMarker(command);
+
+  if (markerType) {
+    return { enabled: true, type: markerType };
+  }
 
   // 判断通知类型（跨平台检测）
   const isDialog = command.includes('display dialog') ||
@@ -229,7 +283,9 @@ function parseStopHookStatus(settings) {
                    command.includes('zenity --info');
   const isNotification = command.includes('display notification') ||
                          command.includes('Popup') ||
-                         command.includes('notify-send');
+                         command.includes('notify-send') ||
+                         command.includes('ToastNotificationManager') ||
+                         command.includes('CreateToastNotifier');
 
   // 检查是否是我们的通知脚本
   const isOurScript = command.includes('notify-hook.js');
@@ -285,7 +341,9 @@ function updateStopHook(systemNotification, feishu) {
     }
   } else {
     // 生成并写入通知脚本
-    writeNotifyScript({ systemNotification, feishu });
+    if (!writeNotifyScript({ systemNotification, feishu })) {
+      return false;
+    }
 
     // 更新 Stop hook 指向通知脚本
     settings.hooks = settings.hooks || {};
@@ -294,7 +352,7 @@ function updateStopHook(systemNotification, feishu) {
         hooks: [
           {
             type: 'command',
-            command: `node "${NOTIFY_SCRIPT_PATH}"`
+            command: buildStopHookCommand(systemNotification?.type)
           }
         ]
       }
@@ -318,9 +376,22 @@ function initDefaultHooks() {
     const settings = readClaudeSettings();
     const currentStatus = parseStopHookStatus(settings);
 
-    // 如果已经有 Stop hook 配置，不覆盖
+    // 如果已经有 Stop hook 配置，优先尝试自愈旧路径，再决定是否跳过
     if (currentStatus.enabled) {
-      console.log('[Claude Hooks] 已存在 Stop hook 配置，跳过初始化');
+      if (shouldRepairStopHook(settings)) {
+        const systemNotification = {
+          enabled: true,
+          type: currentStatus.type || 'notification'
+        };
+        const feishu = getFeishuConfig();
+        if (updateStopHook(systemNotification, feishu)) {
+          console.log('[Claude Hooks] 检测到旧版 Stop hook 路径，已自动修复');
+        } else {
+          console.warn('[Claude Hooks] Stop hook 路径修复失败，保留原配置');
+        }
+      } else {
+        console.log('[Claude Hooks] 已存在 Stop hook 配置，跳过初始化');
+      }
       return;
     }
 
@@ -478,3 +549,12 @@ router.post('/test', (req, res) => {
 // 导出初始化函数供服务启动时调用
 module.exports = router;
 module.exports.initDefaultHooks = initDefaultHooks;
+module.exports._test = {
+  generateSystemNotificationCommand,
+  parseStopHookStatus,
+  parseNotifyTypeMarker,
+  buildStopHookCommand,
+  normalizeWindowsHomePath,
+  resolvePreferredHomeDir,
+  shouldRepairStopHook
+};

package/src/server/api/codex-sessions.js

@@ -243,7 +243,7 @@ module.exports = (config) => {
             type: 'assistant',
             content: msg.content || '[空消息]',
             timestamp: msg.timestamp,
-            model: session.provider || 'codex'
+            model: msg.model || session.provider || 'codex'
           });
         }
         // 推理内容
@@ -252,7 +252,7 @@ module.exports = (config) => {
             type: 'assistant',
             content: `**[推理]**\n${msg.content || '[空推理]'}`,
             timestamp: msg.timestamp,
-            model: session.provider || 'codex'
+            model: msg.model || session.provider || 'codex'
           });
         }
         // 工具调用
@@ -264,7 +264,7 @@ module.exports = (config) => {
             type: 'assistant',
             content: `**[调用工具: ${msg.name}]**\n\`\`\`json\n${argsStr}\n\`\`\``,
             timestamp: msg.timestamp,
-            model: session.provider || 'codex'
+            model: msg.model || session.provider || 'codex'
           });
         }
         // 工具输出
@@ -284,10 +284,11 @@ module.exports = (config) => {
           }
 
           convertedMessages.push({
-            type: 'user',
+            type: 'assistant',
+            subtype: 'tool_result',
             content: `**[工具结果]**\n\`\`\`\n${outputStr}\n\`\`\``,
             timestamp: msg.timestamp,
-            model: null
+            model: msg.model || session.provider || 'codex'
           });
         }
       }

package/src/server/api/opencode-sessions.js

@@ -14,7 +14,7 @@ const {
 } = require('../services/opencode-sessions');
 const { loadAliases } = require('../services/alias');
 const { broadcastLog } = require('../websocket-server');
-const os = require('os');
+const { HOME_DIR } = require('../../config/paths');
 
 function isNotFoundError(error) {
   if (!error || !error.message) {
@@ -295,7 +295,7 @@ module.exports = (config) => {
 
       const projects = getProjects();
       const project = projects.find(p => p.name === projectName);
-      const cwd = session.directory || project?.fullPath || os.homedir();
+      const cwd = session.directory || project?.fullPath || HOME_DIR;
       const command = `opencode -r ${sessionId}`;
       const quotedCwd = `"${String(cwd).replace(/"/g, '\\"')}"`;
       const copyCommand = `cd ${quotedCwd} && ${command}`;

package/src/server/api/pm2-autostart.js

@@ -3,11 +3,18 @@ const { exec } = require('child_process');
 const { promisify } = require('util');
 const path = require('path');
 const fs = require('fs');
-const os = require('os');
 const pm2 = require('pm2');
+const { HOME_DIR } = require('../../config/paths');
 
 const execAsync = promisify(exec);
 
+function getExecOptions(timeout = 30000, runtimePlatform = process.platform) {
+  if (runtimePlatform === 'win32') {
+    return { timeout };
+  }
+  return { shell: '/bin/bash', timeout };
+}
+
 /**
  * Check if PM2 autostart is enabled
  * by looking for PM2 startup script in system
@@ -18,7 +25,7 @@ async function checkAutoStartStatus() {
 
     if (platform === 'darwin') {
       // macOS - check for LaunchDaemon
-      const launchDaemonsPath = path.join(os.homedir(), 'Library/LaunchDaemons');
+      const launchDaemonsPath = path.join(HOME_DIR, 'Library/LaunchDaemons');
       const pm2Files = fs.existsSync(launchDaemonsPath)
         ? fs.readdirSync(launchDaemonsPath).filter(f => f.includes('pm2'))
         : [];
@@ -27,11 +34,11 @@ async function checkAutoStartStatus() {
     } else if (platform === 'linux') {
       // Linux - check for systemd service
       const systemdPath = '/etc/systemd/system/pm2-root.service';
-      const userSystemdPath = path.join(os.homedir(), '.config/systemd/user/pm2-*.service');
+      const userSystemdPath = path.join(HOME_DIR, '.config/systemd/user/pm2-*.service');
 
       const rootExists = fs.existsSync(systemdPath);
-      const userExists = fs.existsSync(path.join(os.homedir(), '.config/systemd/user')) &&
-        fs.readdirSync(path.join(os.homedir(), '.config/systemd/user')).some(f => f.includes('pm2'));
+      const userExists = fs.existsSync(path.join(HOME_DIR, '.config/systemd/user')) &&
+        fs.readdirSync(path.join(HOME_DIR, '.config/systemd/user')).some(f => f.includes('pm2'));
 
       return { enabled: rootExists || userExists, platform: 'linux' };
     } else if (platform === 'win32') {
@@ -104,7 +111,7 @@ async function enableAutoStart() {
 
           console.log(`Running startup command: ${command}`);
 
-          exec(command, { shell: '/bin/bash', timeout: 30000 }, (execErr, stdout, stderr) => {
+          exec(command, getExecOptions(30000), (execErr, stdout, stderr) => {
             pm2.disconnect();
 
             if (execErr) {
@@ -163,7 +170,7 @@ async function disableAutoStart() {
 
       console.log(`Running unstartup command: ${command}`);
 
-      exec(command, { shell: '/bin/bash', timeout: 30000 }, (execErr, stdout, stderr) => {
+      exec(command, getExecOptions(30000), (execErr, stdout, stderr) => {
         pm2.disconnect();
 
         if (execErr) {
@@ -195,7 +202,7 @@ async function disableAutoStart() {
   });
 }
 
-module.exports = () => {
+function createPm2AutostartRouter() {
   const router = express.Router();
 
   /**
@@ -266,4 +273,9 @@ module.exports = () => {
   });
 
   return router;
+}
+
+module.exports = createPm2AutostartRouter;
+module.exports._test = {
+  getExecOptions
 };

package/src/server/api/proxy.js

@@ -12,10 +12,9 @@ const {
 } = require('../services/settings-manager');
 const { getAllChannels } = require('../services/channels');
 const { clearAllLogs } = require('../websocket-server');
-const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
+const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 
 function sanitizeChannelForResponse(channel) {
   if (!channel) return null;
@@ -285,7 +284,7 @@ router.post('/stop', async (req, res) => {
 
     // 3. 删除备份文件和active-channel.json
     if (hasBackup()) {
-      const backupPath = path.join(os.homedir(), '.claude', 'settings.json.cc-tool-backup');
+      const backupPath = NATIVE_PATHS.claude.settingsBackup;
       if (fs.existsSync(backupPath)) {
         fs.unlinkSync(backupPath);
         console.log('✅ Removed backup file');

package/src/server/api/sessions.js

@@ -2,11 +2,12 @@ const express = require('express');
 const router = express.Router();
 const path = require('path');
 const fs = require('fs');
-const os = require('os');
 const readline = require('readline');
 const { getSessionsForProject, deleteSession, forkSession, saveSessionOrder, parseRealProjectPath, searchSessions, getRecentSessions, searchSessionsAcrossProjects, hasActualMessages } = require('../services/sessions');
 const { loadAliases } = require('../services/alias');
 const { broadcastLog } = require('../websocket-server');
+const { NATIVE_PATHS } = require('../../config/paths');
+const CLAUDE_PROJECTS_DIR = NATIVE_PATHS.claude.projects;
 
 module.exports = (config) => {
   // GET /api/sessions/search/global - Search sessions across all projects
@@ -120,12 +121,12 @@ module.exports = (config) => {
         const year = now.getFullYear();
         const month = String(now.getMonth() + 1).padStart(2, '0');
         const day = String(now.getDate()).padStart(2, '0');
-        sessionDir = path.join(os.homedir(), '.codex', 'sessions', String(year), month, day);
+        sessionDir = path.join(NATIVE_PATHS.codex.sessions, String(year), month, day);
         sessionFile = path.join(sessionDir, `${newSessionId}.jsonl`);
       } else if (toolType === 'gemini') {
         // Gemini: ~/.gemini/tmp/{hash}/chats/{sessionId}.json
         const pathHash = crypto.createHash('sha256').update(fullPath).digest('hex');
-        sessionDir = path.join(os.homedir(), '.gemini', 'tmp', pathHash, 'chats');
+        sessionDir = path.join(NATIVE_PATHS.gemini.tmp, pathHash, 'chats');
         sessionFile = path.join(sessionDir, `${newSessionId}.json`);
       } else {
         return res.status(400).json({ error: 'Invalid toolType. Must be claude, codex, or gemini' });
@@ -243,7 +244,7 @@ module.exports = (config) => {
       let sessionFile = null;
       const possiblePaths = [
         path.join(fullPath, '.claude', 'sessions', sessionId + '.jsonl'),
-        path.join(os.homedir(), '.claude', 'projects', projectName, sessionId + '.jsonl')
+        path.join(CLAUDE_PROJECTS_DIR, projectName, sessionId + '.jsonl')
       ];
 
       console.log(`[Messages API] Trying paths:`, possiblePaths);
@@ -279,6 +280,7 @@ module.exports = (config) => {
 
       const stream = fs.createReadStream(sessionFile, { encoding: 'utf8' });
       const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+      let lastAssistantModel = null;
 
       try {
         for await (const line of rl) {
@@ -297,31 +299,45 @@ module.exports = (config) => {
             }
 
             if (json.type === 'user' || json.type === 'assistant') {
+              const resolvedModel = json.message?.model || json.model || lastAssistantModel || null;
+              const messageId = json.message?.id || json.uuid || null;
               const message = {
                 type: json.type,
                 content: null,
                 timestamp: json.timestamp || null,
-                model: json.model || null
+                model: resolvedModel,
+                messageId,
+                subtype: null
               };
+              let deferredToolResultContent = '';
 
               if (json.type === 'user') {
                 if (typeof json.message?.content === 'string') {
                   message.content = json.message.content;
                 } else if (Array.isArray(json.message?.content)) {
-                  const parts = [];
+                  const userParts = [];
+                  const toolResultParts = [];
                   for (const item of json.message.content) {
                     if (item.type === 'text' && item.text) {
-                      parts.push(item.text);
+                      userParts.push(item.text);
                     } else if (item.type === 'tool_result') {
                       const resultContent = typeof item.content === 'string'
                         ? item.content
                         : JSON.stringify(item.content, null, 2);
-                      parts.push(`**[工具结果]**\n\`\`\`\n${resultContent}\n\`\`\``);
+                      toolResultParts.push(`**[工具结果]**\n\`\`\`\n${resultContent}\n\`\`\``);
                     } else if (item.type === 'image') {
-                      parts.push('[图片]');
+                      userParts.push('[图片]');
                     }
                   }
-                  message.content = parts.join('\n\n') || '[工具交互]';
+
+                  if (userParts.length > 0) {
+                    message.content = userParts.join('\n\n');
+                  }
+
+                  // Claude tool_result is carried in a "user" envelope, but should be rendered as AI tool output.
+                  if (toolResultParts.length > 0) {
+                    deferredToolResultContent = toolResultParts.join('\n\n');
+                  }
                 }
               } else if (json.type === 'assistant') {
                 if (Array.isArray(json.message?.content)) {
@@ -340,11 +356,26 @@ module.exports = (config) => {
                 } else if (typeof json.message?.content === 'string') {
                   message.content = json.message.content;
                 }
+
+                if (message.model) {
+                  lastAssistantModel = message.model;
+                }
               }
 
               if (message.content && message.content !== 'Warmup') {
                 allMessages.push(message);
               }
+
+              if (deferredToolResultContent) {
+                allMessages.push({
+                  type: 'assistant',
+                  subtype: 'tool_result',
+                  content: deferredToolResultContent,
+                  timestamp: json.timestamp || null,
+                  model: resolvedModel,
+                  messageId: messageId ? `${messageId}-tool-result` : null
+                });
+              }
             }
           } catch (err) {
             // Skip invalid lines
@@ -393,7 +424,6 @@ module.exports = (config) => {
       const { projectName, sessionId } = req.params;
       const path = require('path');
       const fs = require('fs');
-      const os = require('os');
 
       // Parse real project path (important for cross-project sessions)
       const { fullPath } = parseRealProjectPath(projectName);
@@ -406,7 +436,7 @@ module.exports = (config) => {
       const possiblePaths = [
         projectSessionFile,
         // Location 2: User's .claude/projects directory (ClaudeCode default)
-        path.join(os.homedir(), '.claude', 'projects', projectName, sessionId + '.jsonl')
+        path.join(CLAUDE_PROJECTS_DIR, projectName, sessionId + '.jsonl')
       ];
 
       for (const testPath of possiblePaths) {

package/src/server/index.js

@@ -3,7 +3,7 @@ const path = require('path');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
 const { loadConfig } = require('../config/loader');
-const { ensureStorageDirMigrated } = require('../config/paths');
+const { PATHS, ensureStorageDirMigrated } = require('../config/paths');
 const { startWebSocketServer: attachWebSocketServer } = require('./websocket-server');
 const { isPortInUse, killProcessByPort, waitForPortRelease } = require('../utils/port-helper');
 const { isProxyConfig } = require('./services/settings-manager');
@@ -266,14 +266,10 @@ async function startServer(port, host = '127.0.0.1', options = {}) {
 // 自动恢复代理状态
 function autoRestoreProxies() {
   const config = loadConfig();
-  const os = require('os');
   const fs = require('fs');
-  const path = require('path');
-
-  const ccToolDir = path.join(os.homedir(), '.cc-tool');
 
   // 检查 Claude 代理状态文件
-  const claudeActiveFile = path.join(ccToolDir, 'active-channel.json');
+  const claudeActiveFile = PATHS.activeChannel.claude;
   if (fs.existsSync(claudeActiveFile)) {
     console.log(chalk.cyan('\n🔄 检测到 Claude 代理状态文件，正在自动启动...'));
     const proxyPort = config.ports?.proxy || 20088;
@@ -287,7 +283,7 @@ function autoRestoreProxies() {
   }
 
   // 检查 Codex 代理状态文件
-  const codexActiveFile = path.join(ccToolDir, 'codex-active-channel.json');
+  const codexActiveFile = PATHS.activeChannel.codex;
   if (fs.existsSync(codexActiveFile)) {
     console.log(chalk.cyan('\n🔄 检测到 Codex 代理状态文件，正在自动启动...'));
     const codexProxyPort = config.ports?.codexProxy || 20089;
@@ -312,7 +308,7 @@ function autoRestoreProxies() {
   }
 
   // 检查 Gemini 代理状态文件
-  const geminiActiveFile = path.join(ccToolDir, 'gemini-active-channel.json');
+  const geminiActiveFile = PATHS.activeChannel.gemini;
   if (fs.existsSync(geminiActiveFile)) {
     console.log(chalk.cyan('\n🔄 检测到 Gemini 代理状态文件，正在自动启动...'));
     const geminiProxyPort = config.ports?.geminiProxy || 20090;
@@ -332,7 +328,7 @@ function autoRestoreProxies() {
   }
 
   // 检查 OpenCode 代理状态文件
-  const opencodeActiveFile = path.join(ccToolDir, 'opencode-active-channel.json');
+  const opencodeActiveFile = PATHS.activeChannel.opencode;
   if (fs.existsSync(opencodeActiveFile)) {
     console.log(chalk.cyan('\n🔄 检测到 OpenCode 代理状态文件，正在自动启动...'));
     const opencodeProxyPort = config.ports?.opencodeProxy || 20091;