coding-tool-x 3.5.9 → 3.5.11

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

@@ -14,7 +14,6 @@ const {
 } = require('../services/opencode-sessions');
 const { loadAliases } = require('../services/alias');
 const { broadcastLog } = require('../websocket-server');
-const { buildLaunchCommand } = require('../services/session-launch-command');
 const { HOME_DIR } = require('../../config/paths');
 
 function isNotFoundError(error) {
@@ -152,6 +151,73 @@ module.exports = (config) => {
     }
   });
 
+  /**
+   * GET /api/opencode/sessions/:projectName/:sessionId/status
+   * 获取会话轻量状态（用于实时刷新）
+   */
+  router.get('/:projectName/:sessionId/status', (req, res) => {
+    try {
+      if (!isOpenCodeInstalled()) {
+        return res.status(404).json({ error: 'OpenCode CLI not installed' });
+      }
+
+      const { sessionId } = req.params;
+      const session = getSessionById(sessionId);
+      if (!session) {
+        return res.status(404).json({ error: 'Session not found' });
+      }
+
+      res.json({
+        sessionId,
+        lastModified: session.mtime || null,
+        size: session.size || 0
+      });
+    } catch (err) {
+      console.error('[OpenCode API] Failed to get session status:', err);
+      res.status(500).json({ error: err.message });
+    }
+  });
+
+  /**
+   * GET /api/opencode/sessions/:projectName/:sessionId/outline
+   * 获取用户消息目录
+   */
+  router.get('/:projectName/:sessionId/outline', (req, res) => {
+    try {
+      if (!isOpenCodeInstalled()) {
+        return res.status(404).json({ error: 'OpenCode CLI not installed' });
+      }
+
+      const { sessionId } = req.params;
+      const session = getSessionById(sessionId);
+      if (!session) {
+        return res.status(404).json({ error: 'Session not found' });
+      }
+
+      let userMessageNumber = 0;
+      const items = [];
+      for (const msg of getSessionMessages(sessionId)) {
+        if (msg.type !== 'user') continue;
+        const preview = typeof msg.content === 'string' ? msg.content.trim() : '';
+        if (!preview) continue;
+        userMessageNumber += 1;
+        items.push({
+          userMessageNumber,
+          preview: preview.length > 42 ? `${preview.slice(0, 42)}...` : preview,
+          timestamp: msg.timestamp || null
+        });
+      }
+
+      res.json({
+        sessionId,
+        items
+      });
+    } catch (err) {
+      console.error('[OpenCode API] Failed to get session outline:', err);
+      res.status(500).json({ error: err.message });
+    }
+  });
+
   /**
    * GET /api/opencode/sessions/:projectName/:sessionId/messages
    * 获取会话的消息列表
@@ -168,7 +234,18 @@ module.exports = (config) => {
       if (!session) {
         return res.status(404).json({ error: 'Session not found' });
       }
-      const convertedMessages = getSessionMessages(sessionId);
+      const baseMessages = getSessionMessages(sessionId);
+      let userMessageNumber = 0;
+      const convertedMessages = baseMessages.map((message) => {
+        if (message.type !== 'user') {
+          return message;
+        }
+        userMessageNumber += 1;
+        return {
+          ...message,
+          userMessageNumber
+        };
+      });
 
       // 分页处理
       const pageNum = parseInt(page);
@@ -342,7 +419,6 @@ module.exports = (config) => {
       }
 
       const { projectName, sessionId } = req.params;
-      const fork = Boolean(req.body?.fork);
 
       const session = getSessionById(sessionId);
       if (!session) {
@@ -352,16 +428,14 @@ module.exports = (config) => {
       const projects = getProjects();
       const project = projects.find(p => p.name === projectName);
       const cwd = session.directory || project?.fullPath || HOME_DIR;
-      const { command, copyCommand } = buildLaunchCommand({
-        cwd,
-        executable: 'opencode',
-        args: fork ? ['--session', sessionId, '--fork'] : ['--session', sessionId]
-      });
+      const command = `opencode -r ${sessionId}`;
+      const quotedCwd = `"${String(cwd).replace(/"/g, '\\"')}"`;
+      const copyCommand = `cd ${quotedCwd} && ${command}`;
 
       broadcastLog({
         type: 'action',
         action: 'launch_opencode_session',
-        message: `${fork ? '复制 OpenCode 会话 Fork 命令' : '复制 OpenCode 会话启动命令'} ${sessionId.substring(0, 8)}`,
+        message: `复制 OpenCode 会话启动命令 ${sessionId.substring(0, 8)}`,
         sessionId,
         tool: 'opencode',
         timestamp: Date.now()
@@ -372,7 +446,6 @@ module.exports = (config) => {
         cwd,
         sessionId,
         tool: 'opencode',
-        fork,
         command,
         copyCommand
       });

package/src/server/api/plugins.js

@@ -45,24 +45,6 @@ function extractRepoPayload(source = {}) {
   };
 }
 
-function extractPluginQueryInfo(name, query = {}) {
-  return {
-    name,
-    repoId: query.repoId || '',
-    repoProvider: query.repoProvider || '',
-    repoHost: query.repoHost || '',
-    repoOwner: query.repoOwner || '',
-    repoName: query.repoName || '',
-    repoBranch: query.repoBranch || '',
-    directory: query.directory || '',
-    source: query.source || '',
-    repoUrl: query.repoUrl || '',
-    repoProjectPath: query.repoProjectPath || '',
-    repoLocalPath: query.repoLocalPath || '',
-    installPath: query.installPath || ''
-  };
-}
-
 function sanitizeRepo(repo = {}) {
   const token = String(repo.token || '').trim();
   const sanitized = {
@@ -88,10 +70,7 @@ function sanitizeRepos(service, repos = []) {
 router.get('/', (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
-    const forceRefresh = req.query.refresh === '1';
-    const result = service.listPlugins({
-      syncManagedLocalPlugins: forceRefresh
-    });
+    const result = service.listPlugins();
 
     res.json({
       success: true,
@@ -192,46 +171,6 @@ router.post('/install', async (req, res) => {
   }
 });
 
-/**
- * 安装本地托管插件
- * POST /api/plugins/install-local
- * Body: { name }
- */
-router.post('/install-local', (req, res) => {
-  try {
-    const { platform, service } = getPluginsService(req);
-    const { name } = req.body;
-
-    if (!name) {
-      return res.status(400).json({
-        success: false,
-        message: 'name is required'
-      });
-    }
-
-    const result = service.installLocalPlugin(name);
-    if (!result.success) {
-      return res.status(400).json({
-        success: false,
-        message: result.error || result.message || 'Install failed'
-      });
-    }
-
-    res.json({
-      success: true,
-      platform,
-      plugin: result.plugin,
-      message: result.message || `Plugin "${result.plugin?.name || name}" installed successfully`
-    });
-  } catch (err) {
-    console.error('[Plugins API] Install local plugin error:', err);
-    res.status(500).json({
-      success: false,
-      message: err.message
-    });
-  }
-});
-
 // ==================== 仓库管理 API ====================
 
 /**
@@ -483,66 +422,6 @@ router.post('/sync', async (req, res) => {
   }
 });
 
-/**
- * 获取插件文件列表
- * GET /api/plugins/:name/files
- */
-router.get('/:name/files', async (req, res) => {
-  try {
-    const { platform, service } = getPluginsService(req);
-    const { name } = req.params;
-    const pluginInfo = extractPluginQueryInfo(name, req.query);
-    const result = await service.getPluginFiles(pluginInfo);
-
-    res.json({
-      success: true,
-      platform,
-      ...result
-    });
-  } catch (err) {
-    console.error('[Plugins API] Get plugin files error:', err);
-    res.status(500).json({
-      success: false,
-      message: err.message,
-      files: []
-    });
-  }
-});
-
-/**
- * 获取插件单个文件内容
- * GET /api/plugins/:name/file/*
- */
-router.get('/:name/file/*', async (req, res) => {
-  try {
-    const { platform, service } = getPluginsService(req);
-    const { name } = req.params;
-    const filePath = req.params[0];
-
-    if (!filePath) {
-      return res.status(400).json({
-        success: false,
-        message: '请指定文件路径'
-      });
-    }
-
-    const pluginInfo = extractPluginQueryInfo(name, req.query);
-    const result = await service.getPluginFileContent(pluginInfo, filePath);
-
-    res.json({
-      success: true,
-      platform,
-      ...result
-    });
-  } catch (err) {
-    console.error('[Plugins API] Get plugin file content error:', err);
-    res.status(500).json({
-      success: false,
-      message: err.message
-    });
-  }
-});
-
 /**
  * 获取插件 README
  * GET /api/plugins/:name/readme
@@ -552,7 +431,36 @@ router.get('/:name/readme', async (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
     const { name } = req.params;
-    const pluginInfo = extractPluginQueryInfo(name, req.query);
+    const {
+      repoId,
+      repoProvider,
+      repoHost,
+      repoOwner,
+      repoName,
+      repoBranch,
+      directory,
+      source,
+      repoUrl,
+      repoProjectPath,
+      repoLocalPath,
+      installPath
+    } = req.query;
+
+    const pluginInfo = {
+      name,
+      repoId,
+      repoProvider,
+      repoHost,
+      repoOwner,
+      repoName,
+      repoBranch,
+      directory,
+      source,
+      repoUrl,
+      repoProjectPath,
+      repoLocalPath,
+      installPath
+    };
 
     const readme = await service.getPluginReadme(pluginInfo);
 
@@ -575,14 +483,12 @@ router.get('/:name/readme', async (req, res) => {
  * 获取单个插件详情
  * GET /api/plugins/:name
  */
-router.get('/:name', async (req, res) => {
+router.get('/:name', (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
     const { name } = req.params;
-    const pluginInfo = extractPluginQueryInfo(name, req.query);
-    const plugin = typeof service.getPluginDetail === 'function'
-      ? await service.getPluginDetail(pluginInfo)
-      : service.getPlugin(name);
+
+    const plugin = service.getPlugin(name);
 
     if (!plugin) {
       return res.status(404).json({

package/src/server/api/proxy.js

@@ -11,7 +11,7 @@ const {
   hasBackup,
   readSettings
 } = require('../services/settings-manager');
-const { getAllChannels, extractApiKeyFromHelper } = require('../services/channels');
+const { getAllChannels, markChannelAsRecentlyUsed, extractApiKeyFromHelper } = require('../services/channels');
 const { clearNativeOAuth } = require('../services/native-oauth-adapters');
 const { clearAllLogs } = require('../websocket-server');
 const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('../../config/paths');
@@ -194,13 +194,15 @@ router.post('/start', async (req, res) => {
     }
 
     // 2. 从 settings.json 找到当前使用的渠道
-    const currentChannel = findActiveChannelFromSettings();
+    let currentChannel = findActiveChannelFromSettings();
     if (!currentChannel) {
       return res.status(400).json({
         error: '无法从 settings.json 识别当前渠道。请先激活一个渠道。'
       });
     }
 
+    currentChannel = markChannelAsRecentlyUsed(currentChannel.id);
+
     // 3. 保存当前激活渠道ID（用于代理模式）
     saveActiveChannelId(currentChannel.id);
     console.log(`[OK] Saved active channel: ${currentChannel.name} (${currentChannel.id})`);
@@ -218,7 +220,7 @@ router.post('/start', async (req, res) => {
 
     const updatedStatus = getProxyStatus();
     const channels = getAllChannels();
-    const activeChannel = channels.find(ch => ch.enabled !== false);
+    const activeChannel = channels.find(ch => ch.id === currentChannel.id) || currentChannel;
 
     // 6. 通过 WebSocket 推送代理状态更新
     const { broadcastProxyState } = require('../websocket-server');

package/src/server/api/sessions.js

@@ -6,10 +6,118 @@ 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 { buildLaunchCommand } = require('../services/session-launch-command');
-const { NATIVE_PATHS, joinNativeBasePath } = require('../../config/paths');
+const { NATIVE_PATHS } = require('../../config/paths');
 const CLAUDE_PROJECTS_DIR = NATIVE_PATHS.claude.projects;
 
+function resolveClaudeSessionFile(projectName, sessionId, fullPath) {
+  const possiblePaths = [
+    path.join(fullPath, '.claude', 'sessions', sessionId + '.jsonl'),
+    path.join(CLAUDE_PROJECTS_DIR, projectName, sessionId + '.jsonl')
+  ];
+
+  for (const testPath of possiblePaths) {
+    if (fs.existsSync(testPath)) {
+      return {
+        sessionFile: testPath,
+        triedPaths: possiblePaths
+      };
+    }
+  }
+
+  return {
+    sessionFile: null,
+    triedPaths: possiblePaths
+  };
+}
+
+function getClaudeUserText(content) {
+  if (typeof content === 'string') {
+    return content === 'Warmup' ? '' : content;
+  }
+
+  if (!Array.isArray(content)) {
+    return '';
+  }
+
+  const parts = [];
+  for (const item of content) {
+    if (item?.type === 'text' && item.text) {
+      parts.push(item.text);
+    } else if (item?.type === 'image') {
+      parts.push('[图片]');
+    }
+  }
+
+  return parts.join('\n\n').trim();
+}
+
+function buildOutlinePreview(text = '') {
+  const firstLine = String(text)
+    .split('\n')
+    .map(line => line.trim())
+    .find(Boolean) || '（空消息）';
+  return firstLine.length > 42 ? `${firstLine.slice(0, 42)}...` : firstLine;
+}
+
+async function readClaudeSessionOutline(sessionFile) {
+  const outline = [];
+  const stream = fs.createReadStream(sessionFile, { encoding: 'utf8' });
+  const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+  let userMessageNumber = 0;
+
+  try {
+    for await (const line of rl) {
+      if (!line.trim()) continue;
+
+      let json;
+      try {
+        json = JSON.parse(line);
+      } catch (err) {
+        continue;
+      }
+
+      if (json.type !== 'user') {
+        continue;
+      }
+
+      const userText = getClaudeUserText(json.message?.content);
+      if (!userText) {
+        continue;
+      }
+
+      userMessageNumber += 1;
+      outline.push({
+        userMessageNumber,
+        preview: buildOutlinePreview(userText),
+        timestamp: json.timestamp || null
+      });
+    }
+  } finally {
+    rl.close();
+    stream.destroy();
+  }
+
+  return outline;
+}
+
+function normalizeForkOptions(body = {}) {
+  const alias = typeof body.alias === 'string' ? body.alias.trim() : '';
+  const rawNumber = body.afterUserMessageNumber;
+  const hasExplicitNumber = rawNumber !== undefined && rawNumber !== null && rawNumber !== '';
+  const parsedNumber = hasExplicitNumber ? parseInt(rawNumber, 10) : null;
+
+  if (hasExplicitNumber && (!Number.isInteger(parsedNumber) || parsedNumber <= 0)) {
+    const error = new Error('afterUserMessageNumber must be a positive integer');
+    error.statusCode = 400;
+    throw error;
+  }
+
+  return {
+    afterUserMessageNumber: parsedNumber,
+    alias: alias || null
+  };
+}
+
 module.exports = (config) => {
   // GET /api/sessions/search/global - Search sessions across all projects
   router.get('/search/global', async (req, res) => {
@@ -137,11 +245,11 @@ module.exports = (config) => {
   router.post('/:projectName/:sessionId/fork', (req, res) => {
     try {
       const { projectName, sessionId } = req.params;
-      const result = forkSession(config, projectName, sessionId);
+      const result = forkSession(config, projectName, sessionId, normalizeForkOptions(req.body));
       res.json(result);
     } catch (error) {
       console.error('Error forking session:', error);
-      res.status(500).json({ error: error.message });
+      res.status(error.statusCode || 500).json({ error: error.message });
     }
   });
 
@@ -171,13 +279,13 @@ 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 = joinNativeBasePath(NATIVE_PATHS.codex.sessions, String(year), month, day);
-        sessionFile = joinNativeBasePath(sessionDir, `${newSessionId}.jsonl`);
+        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 = joinNativeBasePath(NATIVE_PATHS.gemini.tmp, pathHash, 'chats');
-        sessionFile = joinNativeBasePath(sessionDir, `${newSessionId}.json`);
+        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' });
       }
@@ -275,6 +383,57 @@ module.exports = (config) => {
     }
   });
 
+  // GET /api/sessions/:projectName/:sessionId/status - Lightweight status for live sync
+  router.get('/:projectName/:sessionId/status', async (req, res) => {
+    try {
+      const { projectName, sessionId } = req.params;
+      const { fullPath } = parseRealProjectPath(projectName);
+      const { sessionFile, triedPaths } = resolveClaudeSessionFile(projectName, sessionId, fullPath);
+
+      if (!sessionFile) {
+        return res.status(404).json({
+          error: `Session file not found: ${sessionId}`,
+          triedPaths
+        });
+      }
+
+      const stats = await fs.promises.stat(sessionFile);
+      res.json({
+        sessionId,
+        lastModified: stats.mtime.toISOString(),
+        size: stats.size
+      });
+    } catch (error) {
+      console.error('Error fetching session status:', error);
+      res.status(500).json({ error: error.message });
+    }
+  });
+
+  // GET /api/sessions/:projectName/:sessionId/outline - Lightweight user outline for TOC and forking
+  router.get('/:projectName/:sessionId/outline', async (req, res) => {
+    try {
+      const { projectName, sessionId } = req.params;
+      const { fullPath } = parseRealProjectPath(projectName);
+      const { sessionFile, triedPaths } = resolveClaudeSessionFile(projectName, sessionId, fullPath);
+
+      if (!sessionFile) {
+        return res.status(404).json({
+          error: `Session file not found: ${sessionId}`,
+          triedPaths
+        });
+      }
+
+      const outline = await readClaudeSessionOutline(sessionFile);
+      res.json({
+        sessionId,
+        items: outline
+      });
+    } catch (error) {
+      console.error('Error fetching session outline:', error);
+      res.status(500).json({ error: error.message });
+    }
+  });
+
   // GET /api/sessions/:projectName/:sessionId/messages - Get session messages with pagination
   router.get('/:projectName/:sessionId/messages', async (req, res) => {
     try {
@@ -291,20 +450,12 @@ module.exports = (config) => {
       console.log(`[Messages API] Parsed project path: ${fullPath}`);
 
       // Try to find session file
-      let sessionFile = null;
-      const possiblePaths = [
-        path.join(fullPath, '.claude', 'sessions', sessionId + '.jsonl'),
-        path.join(CLAUDE_PROJECTS_DIR, projectName, sessionId + '.jsonl')
-      ];
+      const { sessionFile, triedPaths: possiblePaths } = resolveClaudeSessionFile(projectName, sessionId, fullPath);
 
       console.log(`[Messages API] Trying paths:`, possiblePaths);
 
-      for (const testPath of possiblePaths) {
-        if (fs.existsSync(testPath)) {
-          sessionFile = testPath;
-          console.log(`[Messages API] Found session file: ${sessionFile}`);
-          break;
-        }
+      if (sessionFile) {
+        console.log(`[Messages API] Found session file: ${sessionFile}`);
       }
 
       if (!sessionFile) {
@@ -331,6 +482,7 @@ module.exports = (config) => {
       const stream = fs.createReadStream(sessionFile, { encoding: 'utf8' });
       const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
       let lastAssistantModel = null;
+      let userMessageNumber = 0;
 
       try {
         for await (const line of rl) {
@@ -362,6 +514,7 @@ module.exports = (config) => {
               let deferredToolResultContent = '';
 
               if (json.type === 'user') {
+                const normalizedUserText = getClaudeUserText(json.message?.content);
                 if (typeof json.message?.content === 'string') {
                   message.content = json.message.content;
                 } else if (Array.isArray(json.message?.content)) {
@@ -389,6 +542,11 @@ module.exports = (config) => {
                     deferredToolResultContent = toolResultParts.join('\n\n');
                   }
                 }
+
+                if (normalizedUserText) {
+                  userMessageNumber += 1;
+                  message.userMessageNumber = userMessageNumber;
+                }
               } else if (json.type === 'assistant') {
                 if (Array.isArray(json.message?.content)) {
                   const parts = [];
@@ -472,7 +630,6 @@ module.exports = (config) => {
   router.post('/:projectName/:sessionId/launch', async (req, res) => {
     try {
       const { projectName, sessionId } = req.params;
-      const fork = Boolean(req.body?.fork);
       const path = require('path');
       const fs = require('fs');
 
@@ -565,18 +722,16 @@ module.exports = (config) => {
       broadcastLog({
         type: 'action',
         action: 'launch_session',
-        message: `${fork ? '复制会话 Fork 命令' : '复制会话启动命令'} ${alias || sessionId.substring(0, 8)} (claude)`,
+        message: `复制会话启动命令 ${alias || sessionId.substring(0, 8)} (claude)`,
         sessionId,
         alias: alias || null,
         tool: 'claude',
         timestamp: Date.now()
       });
 
-      const { command, copyCommand } = buildLaunchCommand({
-        cwd,
-        executable: 'claude',
-        args: fork ? ['-r', sessionId, '--fork-session'] : ['-r', sessionId]
-      });
+      const command = `claude -r ${sessionId}`;
+      const quotedCwd = `"${String(cwd).replace(/"/g, '\\"')}"`;
+      const copyCommand = `cd ${quotedCwd} && ${command}`;
 
       res.json({
         success: true,
@@ -584,7 +739,6 @@ module.exports = (config) => {
         sessionFile,
         sessionId,
         tool: 'claude',
-        fork,
         command,
         copyCommand
       });