coding-tool-x 3.2.2 → 3.3.1

package/src/server/services/request-logger.js

@@ -122,9 +122,199 @@ function createApiRequestLogger() {
   };
 }
 
+const CLAUDE_TEMPLATE_PATH = path.join(CC_TOOL_DIR, 'claude-request-template.json');
+const CLAUDE_TEMPLATE_MIN_SYSTEM_CHARS = 100;
+
+const FALLBACK_CLAUDE_SYSTEM = Object.freeze([
+  {
+    type: 'text',
+    text: 'x-anthropic-billing-header: cc_version=2.1.59; cc_entrypoint=cli; cch=00000;'
+  },
+  {
+    type: 'text',
+    text: "You are Claude Code, Anthropic's official CLI for Claude."
+  }
+]);
+
+const FALLBACK_CLAUDE_TOOLS = Object.freeze([
+  {
+    name: 'Task',
+    description: 'Launch a new agent to handle complex, multi-step tasks autonomously.',
+    input_schema: {
+      type: 'object',
+      properties: {
+        description: { type: 'string' },
+        prompt: { type: 'string' },
+        subagent_type: { type: 'string' },
+        model: { type: 'string' },
+        resume: { type: 'string' },
+        run_in_background: { type: 'boolean' },
+        max_turns: { type: 'integer' },
+        isolation: { type: 'string' }
+      },
+      required: ['description', 'prompt', 'subagent_type']
+    }
+  },
+  {
+    name: 'Bash',
+    description: 'Executes a given bash command and returns its output.',
+    input_schema: {
+      type: 'object',
+      properties: {
+        command: { type: 'string' },
+        timeout: { type: 'number' },
+        description: { type: 'string' },
+        run_in_background: { type: 'boolean' },
+        dangerouslyDisableSandbox: { type: 'boolean' }
+      },
+      required: ['command']
+    }
+  },
+  {
+    name: 'Glob',
+    description: 'Fast file pattern matching tool that works with any codebase size.',
+    input_schema: {
+      type: 'object',
+      properties: {
+        pattern: { type: 'string' },
+        path: { type: 'string' }
+      },
+      required: ['pattern']
+    }
+  },
+  {
+    name: 'Grep',
+    description: 'A powerful search tool built on ripgrep.',
+    input_schema: {
+      type: 'object',
+      properties: {
+        pattern: { type: 'string' },
+        path: { type: 'string' },
+        glob: { type: 'string' },
+        output_mode: { type: 'string' },
+        '-B': { type: 'number' },
+        '-A': { type: 'number' },
+        '-C': { type: 'number' },
+        context: { type: 'number' },
+        '-n': { type: 'boolean' },
+        '-i': { type: 'boolean' },
+        type: { type: 'string' },
+        head_limit: { type: 'number' },
+        offset: { type: 'number' },
+        multiline: { type: 'boolean' }
+      },
+      required: ['pattern']
+    }
+  },
+  {
+    name: 'Read',
+    description: 'Reads a file from the local filesystem.',
+    input_schema: {
+      type: 'object',
+      properties: {
+        file_path: { type: 'string' },
+        offset: { type: 'number' },
+        limit: { type: 'number' },
+        pages: { type: 'string' }
+      },
+      required: ['file_path']
+    }
+  },
+  {
+    name: 'Edit',
+    description: 'Performs exact string replacements in files.',
+    input_schema: {
+      type: 'object',
+      properties: {
+        file_path: { type: 'string' },
+        old_string: { type: 'string' },
+        new_string: { type: 'string' },
+        replace_all: { type: 'boolean' }
+      },
+      required: ['file_path', 'old_string', 'new_string']
+    }
+  },
+  {
+    name: 'Write',
+    description: 'Writes a file to the local filesystem.',
+    input_schema: {
+      type: 'object',
+      properties: {
+        file_path: { type: 'string' },
+        content: { type: 'string' }
+      },
+      required: ['file_path', 'content']
+    }
+  },
+  {
+    name: 'ToolSearch',
+    description: 'Search for or select deferred tools to make them available for use.',
+    input_schema: {
+      type: 'object',
+      properties: {
+        query: { type: 'string' },
+        max_results: { type: 'number' }
+      },
+      required: ['query', 'max_results']
+    }
+  }
+]);
+
+/**
+ * 从 Claude 请求 body 提取模板（system/tools/userId），覆盖写入单一文件。
+ * 无需环境变量开关，默认始终执行（文件极小，仅保留最新一次有效模板）。
+ * @param {object} body - 请求 body 对象
+ */
+function persistClaudeRequestTemplate(body) {
+  if (!body || typeof body !== 'object') return;
+
+  const system = Array.isArray(body.system) ? body.system : [];
+  const tools = Array.isArray(body.tools) ? body.tools : [];
+  const userId = (body.metadata && typeof body.metadata.user_id === 'string')
+    ? body.metadata.user_id
+    : '';
+
+  // 必须有 tools 且 system 有一定内容才算有效模板
+  if (tools.length === 0) return;
+  const systemCharCount = system.reduce((s, b) => s + (typeof b?.text === 'string' ? b.text.length : 0), 0);
+  if (systemCharCount < CLAUDE_TEMPLATE_MIN_SYSTEM_CHARS) return;
+
+  try {
+    ensureDir(CC_TOOL_DIR);
+    const template = { updatedAt: Date.now(), userId, system, tools };
+    fs.writeFile(CLAUDE_TEMPLATE_PATH, JSON.stringify(template), (err) => {
+      if (err) console.error('[request-logger] Failed to write claude-request-template.json:', err);
+    });
+  } catch (err) {
+    console.error('[request-logger] Failed to write claude-request-template.json:', err);
+  }
+}
+
+/**
+ * 读取 Claude 请求模板（同步）。
+ * 若文件不存在或无效，返回内置 fallback（含 billing header 占位符和完整工具 schema）。
+ * @returns {{ userId: string, system: Array, tools: Array }}
+ */
+function loadClaudeRequestTemplate() {
+  try {
+    if (fs.existsSync(CLAUDE_TEMPLATE_PATH)) {
+      const raw = fs.readFileSync(CLAUDE_TEMPLATE_PATH, 'utf8');
+      const parsed = JSON.parse(raw);
+      if (Array.isArray(parsed.tools) && parsed.tools.length > 0 && Array.isArray(parsed.system)) {
+        return { userId: parsed.userId || '', system: parsed.system, tools: parsed.tools };
+      }
+    }
+  } catch {
+    // fall through to fallback
+  }
+  return { userId: '', system: [...FALLBACK_CLAUDE_SYSTEM], tools: [...FALLBACK_CLAUDE_TOOLS] };
+}
+
 module.exports = {
   isProxyRequestLoggingEnabled,
   isApiRequestLoggingEnabled,
   persistProxyRequestSnapshot,
+  persistClaudeRequestTemplate,
+  loadClaudeRequestTemplate,
   createApiRequestLogger
 };

package/src/server/services/speed-test.js

@@ -6,9 +6,6 @@
 
 const https = require('https');
 const http = require('http');
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
 const crypto = require('crypto');
 const { URL } = require('url');
 const { probeModelAvailability } = require('./model-detector');
@@ -16,6 +13,7 @@ const { getEffectiveApiKey: getClaudeEffectiveApiKey } = require('./channels');
 const { getEffectiveApiKey: getCodexEffectiveApiKey } = require('./codex-channels');
 const { getEffectiveApiKey: getGeminiEffectiveApiKey } = require('./gemini-channels');
 const { getEffectiveApiKey: getOpenCodeEffectiveApiKey } = require('./opencode-channels');
+const { loadClaudeRequestTemplate } = require('./request-logger');
 
 // 测试结果缓存
 const testResultsCache = new Map();
@@ -35,16 +33,6 @@ const CLAUDE_ADVANCED_TOOL_USE_BETA = 'advanced-tool-use-2025-11-20';
 const ROUTE_OR_METHOD_MISMATCH_STATUS = new Set([404, 405, 501]);
 const CLAUDE_USER_ID_ACCOUNT_RE = /^user_([0-9a-f]{64})_account__session_[a-z0-9._-]+$/i;
 const CLAUDE_USER_ID_FULL_RE = /^user_[0-9a-f]{64}_account__session_[a-z0-9._-]+$/i;
-const DEFAULT_CLAUDE_CODE_TOOL_NAMES = Object.freeze([
-  'Task',
-  'Bash',
-  'Glob',
-  'Grep',
-  'Read',
-  'Edit',
-  'Write',
-  'ToolSearch'
-]);
 let cachedClaudeAccountId = '';
 let cachedClaudeUserId = '';
 
@@ -195,96 +183,31 @@ function resolveClaudeAccountIdFromUserId(userId = '') {
 }
 
 function resolveClaudeAccountIdFromLogs() {
-  const logsPath = path.join(os.homedir(), '.cc-tool', 'claude-requests.jsonl');
-  if (!fs.existsSync(logsPath)) return '';
-
   try {
-    const content = fs.readFileSync(logsPath, 'utf8');
-    const lines = content.trim().split('\n');
-    const accountIdCount = new Map();
-
-    for (let index = lines.length - 1; index >= 0; index -= 1) {
-      const line = lines[index].trim();
-      if (!line) continue;
-      try {
-        const parsed = JSON.parse(line);
-        const userId = parsed?.request?.body?.metadata?.user_id;
-        const accountId = resolveClaudeAccountIdFromUserId(userId);
-        if (accountId) {
-          accountIdCount.set(accountId, (accountIdCount.get(accountId) || 0) + 1);
-        }
-      } catch {
-        // ignore malformed line
-      }
-    }
-
-    const ranked = Array.from(accountIdCount.entries())
-      .filter(([accountId]) => accountId !== '0'.repeat(64))
-      .sort((left, right) => right[1] - left[1]);
-
-    if (ranked.length > 0) {
-      return ranked[0][0];
-    }
+    const template = loadClaudeRequestTemplate();
+    const userId = template?.userId || '';
+    const accountId = resolveClaudeAccountIdFromUserId(userId);
+    return (accountId && accountId !== '0'.repeat(64)) ? accountId : '';
   } catch {
-    // ignore read error
+    return '';
   }
-
-  return '';
 }
 
 function resolveClaudeUserIdFromLogs() {
-  const logsPath = path.join(os.homedir(), '.cc-tool', 'claude-requests.jsonl');
-  if (!fs.existsSync(logsPath)) return '';
-
   try {
-    const content = fs.readFileSync(logsPath, 'utf8');
-    const lines = content.trim().split('\n');
-    const userIdCount = new Map();
-
-    for (let index = lines.length - 1; index >= 0; index -= 1) {
-      const line = lines[index].trim();
-      if (!line) continue;
-      try {
-        const parsed = JSON.parse(line);
-        const userId = normalizeNonEmptyString(parsed?.request?.body?.metadata?.user_id);
-        if (!userId || !CLAUDE_USER_ID_FULL_RE.test(userId)) continue;
-        const accountId = resolveClaudeAccountIdFromUserId(userId);
-        if (!accountId || accountId === '0'.repeat(64)) continue;
-        userIdCount.set(userId, (userIdCount.get(userId) || 0) + 1);
-      } catch {
-        // ignore malformed line
-      }
-    }
-
-    const ranked = Array.from(userIdCount.entries()).sort((left, right) => right[1] - left[1]);
-    return ranked.length > 0 ? ranked[0][0] : '';
+    const template = loadClaudeRequestTemplate();
+    const userId = normalizeNonEmptyString(template?.userId || '');
+    if (!userId || !CLAUDE_USER_ID_FULL_RE.test(userId)) return '';
+    const accountId = resolveClaudeAccountIdFromUserId(userId);
+    if (!accountId || accountId === '0'.repeat(64)) return '';
+    return userId;
   } catch {
     return '';
   }
 }
 
 function resolveClaudeRequestTemplate() {
-  const logsPath = path.join(os.homedir(), '.cc-tool', 'claude-requests.jsonl');
-  if (!fs.existsSync(logsPath)) return null;
-  try {
-    const content = fs.readFileSync(logsPath, 'utf8');
-    const lines = content.trim().split('\n');
-    for (let i = lines.length - 1; i >= 0; i--) {
-      const line = lines[i].trim();
-      if (!line) continue;
-      try {
-        const parsed = JSON.parse(line);
-        const body = parsed?.request?.body;
-        if (!body || typeof body !== 'object') continue;
-        const system = Array.isArray(body.system) ? body.system : [];
-        const tools = Array.isArray(body.tools) ? body.tools : [];
-        const hasBilling = system.some(b => typeof b?.text === 'string' && b.text.startsWith('x-anthropic-billing-header:'));
-        if (!hasBilling || tools.length === 0) continue;
-        return { system, tools };
-      } catch { }
-    }
-  } catch { }
-  return null;
+  return loadClaudeRequestTemplate();
 }
 
 function resolveClaudePreferredUserId() {
@@ -347,17 +270,6 @@ function buildClaudeCodeUserId() {
   return `user_${accountId}_account__session_${sessionId}`;
 }
 
-function buildDefaultClaudeCodeTools() {
-  return DEFAULT_CLAUDE_CODE_TOOL_NAMES.map(name => ({
-    name,
-    description: `${name} tool`,
-    input_schema: {
-      type: 'object',
-      properties: {},
-      additionalProperties: true
-    }
-  }));
-}
 
 function buildGeminiNativeGeneratePath(parsedUrl, model) {
   let pathname = parsedUrl.pathname.replace(/\/+$/, '');
@@ -755,12 +667,8 @@ async function testAPIFunctionality(baseUrl, apiKey, timeout, channelType = 'cla
       : `${Date.now().toString(36)}${Math.random().toString(36).slice(2, 10)}`;
     const userId = buildClaudeCodeUserId() || `user_${'0'.repeat(64)}_account__session_${sessionId}`;
     const template = resolveClaudeRequestTemplate();
-    const systemBlocks = template?.system?.length > 0
-      ? template.system
-      : [{ type: 'text', text: "You are Claude Code, Anthropic's official CLI for Claude." }];
-    const toolsToUse = template?.tools?.length > 0
-      ? template.tools
-      : buildDefaultClaudeCodeTools();
+    const systemBlocks = template.system;
+    const toolsToUse = template.tools;
     const requestPayload = {
       model: testModel,
       max_tokens: 10,
@@ -868,6 +776,7 @@ async function testAPIFunctionality(baseUrl, apiKey, timeout, channelType = 'cla
     primaryRequestConfig = useCliFormat ? cliRequestConfig : nativeRequestConfig;
     fallbackRequestConfig = useCliFormat ? nativeRequestConfig : cliRequestConfig;
   } else {
+    testModel = modelProbe?.preferredTestModel || normalizeNonEmptyString(model) || 'gpt-4o-mini';
     let apiPath = parsedUrl.pathname.replace(/\/$/, '');
     if (!apiPath.endsWith('/chat/completions')) {
       apiPath = apiPath + (apiPath.endsWith('/v1') ? '/chat/completions' : '/v1/chat/completions');
@@ -875,7 +784,7 @@ async function testAPIFunctionality(baseUrl, apiKey, timeout, channelType = 'cla
     primaryRequestConfig = {
       apiPath,
       requestBody: JSON.stringify({
-        model: 'gpt-4o-mini',
+        model: testModel,
         max_tokens: 1,
         messages: [{ role: 'user', content: 'Hi' }]
       }),

package/src/utils/port-helper.js

@@ -40,17 +40,33 @@ function isPortInUse(port, host = '127.0.0.1') {
 }
 
 /**
- * 查找占用端口的进程PID
+ * 查找占用端口的进程PID（跨平台）
  */
 function findProcessByPort(port) {
+  const isWindows = process.platform === 'win32';
+  if (isWindows) {
+    try {
+      // Windows: netstat -ano 列出所有连接，findstr 过滤端口
+      const result = execSync(`netstat -ano | findstr ":${port} "`, { encoding: 'utf-8' });
+      const pids = new Set();
+      result.split('\n').forEach(line => {
+        // 格式: "  TCP  0.0.0.0:9999  0.0.0.0:0  LISTENING  1234"
+        const match = line.trim().match(/\s+(\d+)\s*$/);
+        if (match) pids.add(match[1]);
+      });
+      return Array.from(pids).filter(pid => pid && pid !== '0');
+    } catch (e) {
+      return [];
+    }
+  }
+
   try {
     // macOS/Linux 使用 lsof
     const result = execSync(`lsof -ti :${port}`, { encoding: 'utf-8' }).trim();
     return result.split('\n').filter(pid => pid);
   } catch (err) {
-    // 如果 lsof 失败，尝试使用其他命令
+    // 如果 lsof 失败，尝试使用 fuser（某些 Linux 系统）
     try {
-      // 适用于某些 Linux 系统
       const result = execSync(`fuser ${port}/tcp 2>/dev/null`, { encoding: 'utf-8' }).trim();
       return result.split(/\s+/).filter(pid => pid);
     } catch (e) {
@@ -60,7 +76,7 @@ function findProcessByPort(port) {
 }
 
 /**
- * 杀掉占用端口的进程
+ * 杀掉占用端口的进程（跨平台）
  */
 function killProcessByPort(port) {
   try {
@@ -69,9 +85,14 @@ function killProcessByPort(port) {
       return false;
     }
 
+    const isWindows = process.platform === 'win32';
     pids.forEach(pid => {
       try {
-        execSync(`kill -9 ${pid}`, { stdio: 'ignore' });
+        if (isWindows) {
+          execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore' });
+        } else {
+          execSync(`kill -9 ${pid}`, { stdio: 'ignore' });
+        }
       } catch (err) {
         // 忽略单个进程杀掉失败的错误
       }