coding-tool-x 3.5.7 → 3.5.9

package/src/server/services/agents-service.js

@@ -7,32 +7,42 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const toml = require('toml');
 const tomlStringify = require('@iarna/toml').stringify;
 const { RepoScannerBase } = require('./repo-scanner-base');
-const { NATIVE_PATHS } = require('../../config/paths');
-const { resolvePreferredHomeDir } = require('../../utils/home-dir');
+const {
+  NATIVE_PATHS,
+  PATHS,
+  HOME_DIR,
+  isWindowsAbsolutePath,
+  isNativeAbsolutePath,
+  joinNativeBasePath,
+  resolveNativeBasePath,
+  getNativePathDir
+} = require('../../config/paths');
 
 // 默认仓库源
 const DEFAULT_REPOS = [];
 const SUPPORTED_PLATFORMS = ['claude', 'codex', 'opencode'];
-const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
+const OPENCODE_AGENTS_DIR = NATIVE_PATHS.opencode.agents;
+const OPENCODE_LEGACY_AGENTS_DIR = NATIVE_PATHS.opencode.agentsLegacy;
+const CODEX_DIR = NATIVE_PATHS.codex.dir;
 const CODEX_CONFIG_PATH = NATIVE_PATHS.codex.config;
-const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
-const CODEX_AGENTS_DIR = path.join(path.dirname(CODEX_CONFIG_PATH), 'agents');
-const CLAUDE_AGENTS_DIR = path.join(path.dirname(NATIVE_PATHS.claude.settings), 'agents');
+const CODEX_AGENTS_DIR = NATIVE_PATHS.codex.agents;
+const CLAUDE_AGENTS_DIR = NATIVE_PATHS.claude.agents;
 const CODEX_CONFIG_MODES = new Set(['none', 'managed', 'custom']);
 
 const PLATFORM_CONFIG = {
   claude: {
     userAgentsDir: CLAUDE_AGENTS_DIR,
+    storageDir: PATHS.localAgents.claude,
     projectAgentsDir: (projectPath) => path.join(projectPath, '.claude', 'agents'),
     repoType: 'agents'
   },
   opencode: {
-    userAgentsDir: path.join(OPENCODE_CONFIG_DIR, 'agents'),
-    legacyUserAgentsDir: path.join(OPENCODE_CONFIG_DIR, 'agent'),
+    userAgentsDir: OPENCODE_AGENTS_DIR,
+    storageDir: PATHS.localAgents.opencode,
+    legacyUserAgentsDir: OPENCODE_LEGACY_AGENTS_DIR,
     projectAgentsDir: (projectPath) => {
       const modern = path.join(projectPath, '.opencode', 'agents');
       const legacy = path.join(projectPath, '.opencode', 'agent');
@@ -45,6 +55,7 @@ const PLATFORM_CONFIG = {
   },
   codex: {
     userAgentsDir: CODEX_AGENTS_DIR,
+    storageDir: PATHS.localAgents.codex,
     projectAgentsDir: () => null,
     repoType: 'agents'
   }
@@ -149,7 +160,7 @@ function readCodexTomlConfig() {
 }
 
 function writeCodexTomlConfig(config) {
-  ensureDir(path.dirname(CODEX_CONFIG_PATH));
+  ensureDir(getNativePathDir(CODEX_CONFIG_PATH));
   writeFileAtomic(CODEX_CONFIG_PATH, tomlStringify(config));
 }
 
@@ -158,7 +169,7 @@ function isPlainObject(value) {
 }
 
 function getCodexManagedAgentConfigPath(fileName) {
-  return path.join(CODEX_AGENTS_DIR, `${fileName}.toml`);
+  return joinNativeBasePath(CODEX_AGENTS_DIR, `${fileName}.toml`);
 }
 
 function normalizeCodexConfigPath(configPath) {
@@ -187,7 +198,7 @@ function assertSafeCodexConfigPath(configPath) {
     return `~/${relative}`;
   }
 
-  if (path.isAbsolute(normalized)) {
+  if (isNativeAbsolutePath(normalized)) {
     return normalized;
   }
 
@@ -209,21 +220,35 @@ function resolveCodexConfigPath(configPath) {
   if (!normalized) return '';
 
   if (normalized.startsWith('~/')) {
-    return path.join(HOME_DIR, normalized.slice(2));
+    return joinNativeBasePath(HOME_DIR, normalized.slice(2));
   }
 
-  if (path.isAbsolute(normalized)) {
+  if (isNativeAbsolutePath(normalized)) {
     return normalized;
   }
 
-  return path.resolve(path.dirname(CODEX_CONFIG_PATH), normalized);
+  return resolveNativeBasePath(CODEX_DIR, normalized);
+}
+
+function isPathInsideNativeDir(targetPath, baseDir) {
+  const shouldFoldCase = isWindowsAbsolutePath(baseDir);
+  const normalize = (value) => {
+    const normalized = String(value || '')
+      .replace(/[\\/]+/g, '/')
+      .replace(/\/+$/, '');
+    return shouldFoldCase ? normalized.toLowerCase() : normalized;
+  };
+
+  const normalizedTarget = normalize(targetPath);
+  const normalizedBase = normalize(baseDir);
+  return normalizedTarget === normalizedBase || normalizedTarget.startsWith(`${normalizedBase}/`);
 }
 
 function isManagedCodexConfigPath(configPath) {
   const resolved = resolveCodexConfigPath(configPath);
   if (!resolved) return false;
-  const managedRoot = path.resolve(CODEX_AGENTS_DIR) + path.sep;
-  return resolved.startsWith(managedRoot) || resolved === path.resolve(CODEX_AGENTS_DIR);
+  const managedRoot = resolveNativeBasePath(CODEX_AGENTS_DIR);
+  return isPathInsideNativeDir(resolved, managedRoot);
 }
 
 function getManagedCodexConfigResolvedPath(configPath) {
@@ -387,7 +412,7 @@ function generateFrontmatter(data, platform = 'claude') {
 /**
  * 扫描目录获取代理文件（agents 约定为扁平目录）
  */
-function scanAgentsDir(dir, basePath, scope) {
+function scanAgentsDir(dir, basePath, scope, options = {}) {
   const agents = [];
 
   if (!fs.existsSync(dir)) {
@@ -410,7 +435,7 @@ function scanAgentsDir(dir, basePath, scope) {
           const relativePath = path.relative(basePath, fullPath);
           const fileName = entry.name.replace(/\.md$/, '');
 
-          agents.push({
+          const agent = {
             name: frontmatter.name || fileName,
             fileName,
             scope,
@@ -424,7 +449,15 @@ function scanAgentsDir(dir, basePath, scope) {
             systemPrompt: body,
             fullContent: content,
             updatedAt: fs.statSync(fullPath).mtime.getTime()
-          });
+          };
+          const decoratedAgent = typeof options.decorate === 'function'
+            ? {
+                ...agent,
+                ...options.decorate(agent)
+              }
+            : agent;
+
+          agents.push(decoratedAgent);
         } catch (err) {
           console.warn(`[AgentsService] Failed to parse ${fullPath}:`, err.message);
         }
@@ -533,6 +566,7 @@ class AgentsService {
     const config = PLATFORM_CONFIG[this.platform];
 
     this.userAgentsDir = config.userAgentsDir;
+    this.storageDir = config.storageDir;
     if (this.platform === 'opencode') {
       const legacyUserDir = config.legacyUserAgentsDir;
       if (legacyUserDir && fs.existsSync(legacyUserDir) && !fs.existsSync(this.userAgentsDir)) {
@@ -543,6 +577,9 @@ class AgentsService {
     this.projectAgentsDir = config.projectAgentsDir;
     this.repoScanner = new AgentsRepoScanner(this.platform, this.userAgentsDir);
     ensureDir(this.userAgentsDir);
+    if (this.platform !== 'codex') {
+      ensureDir(this.storageDir);
+    }
   }
 
   getProjectAgentsDir(projectPath) {
@@ -551,36 +588,146 @@ class AgentsService {
     return this.projectAgentsDir(safeProjectPath);
   }
 
+  getManagedAgentPath(fileName) {
+    assertSafeAgentFileName(fileName);
+    return path.join(this.storageDir, `${fileName}.md`);
+  }
+
+  isInstalledAgent(fileName) {
+    assertSafeAgentFileName(fileName);
+    return fs.existsSync(path.join(this.userAgentsDir, `${fileName}.md`));
+  }
+
+  buildAgentContent({ fileName, name, description, tools, model, permissionMode, skills, systemPrompt }) {
+    const frontmatterData = {
+      name: name || fileName,
+      description: description || ''
+    };
+    if (tools) frontmatterData.tools = tools;
+    if (model) frontmatterData.model = model;
+    if (permissionMode) frontmatterData.permissionMode = permissionMode;
+    if (skills) frontmatterData.skills = skills;
+
+    return generateFrontmatter(frontmatterData, this.platform) + '\n\n' + (systemPrompt || '');
+  }
+
+  ensureManagedAgentCopy(fileName, sourcePath, options = {}) {
+    const overwrite = options.overwrite === true;
+    assertSafeAgentFileName(fileName);
+    if (!sourcePath || !fs.existsSync(sourcePath)) {
+      return false;
+    }
+
+    const managedPath = this.getManagedAgentPath(fileName);
+    if (fs.existsSync(managedPath) && !overwrite) {
+      return false;
+    }
+
+    ensureDir(path.dirname(managedPath));
+    fs.copyFileSync(sourcePath, managedPath);
+    return true;
+  }
+
+  mergeInstalledUserAgents(agents, options = {}) {
+    const syncManagedLocalAgents = options.syncManagedLocalAgents === true;
+    const installedAgents = scanAgentsDir(this.userAgentsDir, this.userAgentsDir, 'user', {
+      decorate: () => ({
+        installed: true,
+        isManagedLocal: false,
+        source: 'native-installed'
+      })
+    });
+
+    for (const installedAgent of installedAgents) {
+      const existing = agents.find(agent =>
+        agent.scope === 'user' &&
+        agent.fileName.toLowerCase() === installedAgent.fileName.toLowerCase()
+      );
+      const managedPath = this.getManagedAgentPath(installedAgent.fileName);
+
+      if (existing) {
+        if (syncManagedLocalAgents && fs.existsSync(managedPath)) {
+          this.ensureManagedAgentCopy(installedAgent.fileName, installedAgent.fullPath, { overwrite: true });
+        }
+        existing.installed = true;
+        if (!existing.description && installedAgent.description) existing.description = installedAgent.description;
+        if (!existing.systemPrompt && installedAgent.systemPrompt) existing.systemPrompt = installedAgent.systemPrompt;
+        if (!existing.fullContent && installedAgent.fullContent) existing.fullContent = installedAgent.fullContent;
+        continue;
+      }
+
+      this.ensureManagedAgentCopy(installedAgent.fileName, installedAgent.fullPath, {
+        overwrite: syncManagedLocalAgents
+      });
+      agents.push(installedAgent);
+    }
+  }
+
+  mergeLocalUserAgents(agents) {
+    if (!fs.existsSync(this.storageDir)) return;
+
+    const localAgents = scanAgentsDir(this.storageDir, this.storageDir, 'user', {
+      decorate: (agent) => ({
+        installed: this.isInstalledAgent(agent.fileName),
+        isManagedLocal: true,
+        source: 'local'
+      })
+    });
+
+    for (const localAgent of localAgents) {
+      const existing = agents.find(agent =>
+        agent.scope === 'user' &&
+        agent.fileName.toLowerCase() === localAgent.fileName.toLowerCase()
+      );
+
+      if (existing) {
+        existing.isManagedLocal = true;
+        existing.installed = this.isInstalledAgent(existing.fileName);
+        continue;
+      }
+
+      agents.push(localAgent);
+    }
+  }
+
   /**
    * 获取所有代理列表
    * @param {string} projectPath - 项目路径（可选，用于获取项目级代理）
    */
-  listAgents(projectPath = null) {
+  listAgents(projectPath = null, options = {}) {
     if (this.platform === 'codex') {
       return this.listCodexAgents();
     }
 
     const agents = [];
+    const syncManagedLocalAgents = options.syncManagedLocalAgents === true;
 
-    // 获取用户级代理
-    const userAgents = scanAgentsDir(this.userAgentsDir, this.userAgentsDir, 'user');
-    agents.push(...userAgents);
+    this.mergeInstalledUserAgents(agents, { syncManagedLocalAgents });
+    this.mergeLocalUserAgents(agents);
 
     // 获取项目级代理（如果提供了项目路径）
     if (projectPath) {
       const projectAgentsDir = this.getProjectAgentsDir(projectPath);
-      const projectAgents = scanAgentsDir(projectAgentsDir, projectAgentsDir, 'project');
+      const projectAgents = scanAgentsDir(projectAgentsDir, projectAgentsDir, 'project', {
+        decorate: () => ({
+          installed: true,
+          isManagedLocal: false,
+          source: 'native-installed'
+        })
+      });
       agents.push(...projectAgents);
     }
 
     // 按名称排序
     agents.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()));
+    const userCount = agents.filter(agent => agent.scope === 'user').length;
+    const projectCount = agents.length - userCount;
 
     return {
       agents,
       total: agents.length,
-      userCount: userAgents.length,
-      projectCount: agents.length - userAgents.length
+      userCount,
+      projectCount
     };
   }
 
@@ -600,7 +747,9 @@ class AgentsService {
     }
 
     // 获取本地代理
-    const { agents: localAgents, userCount, projectCount } = this.listAgents(projectPath);
+    const { agents: localAgents, userCount, projectCount } = this.listAgents(projectPath, {
+      syncManagedLocalAgents: forceRefresh
+    });
 
     // 获取远程代理
     let remoteAgents = [];
@@ -652,20 +801,26 @@ class AgentsService {
       : this.getProjectAgentsDir(projectPath);
 
     const filePath = path.join(baseDir, `${fileName}.md`);
+    const managedPath = scope === 'user' ? this.getManagedAgentPath(fileName) : '';
+    const activePath = fs.existsSync(filePath)
+      ? filePath
+      : (managedPath && fs.existsSync(managedPath) ? managedPath : '');
 
-    if (!fs.existsSync(filePath)) {
+    if (!activePath) {
       return null;
     }
 
-    const content = fs.readFileSync(filePath, 'utf-8');
+    const content = fs.readFileSync(activePath, 'utf-8');
     const { frontmatter, body } = parseFrontmatter(content);
+    const installed = fs.existsSync(filePath);
+    const isManagedLocal = scope === 'user' && !!managedPath && fs.existsSync(managedPath);
 
     return {
       name: frontmatter.name || fileName,
       fileName,
       scope,
       path: `${fileName}.md`,
-      fullPath: filePath,
+      fullPath: activePath,
       description: frontmatter.description || '',
       tools: frontmatter.tools || '',
       model: frontmatter.model || '',
@@ -673,7 +828,10 @@ class AgentsService {
       skills: frontmatter.skills || '',
       systemPrompt: body,
       fullContent: content,
-      updatedAt: fs.statSync(filePath).mtime.getTime()
+      installed,
+      isManagedLocal,
+      source: installed ? 'native-installed' : 'local',
+      updatedAt: fs.statSync(activePath).mtime.getTime()
     };
   }
 
@@ -702,22 +860,29 @@ class AgentsService {
     ensureDir(baseDir);
 
     const filePath = path.join(baseDir, `${fileName}.md`);
+    const managedPath = scope === 'user' ? this.getManagedAgentPath(fileName) : '';
 
     // 检查是否已存在
-    if (fs.existsSync(filePath)) {
+    if (fs.existsSync(filePath) || (managedPath && fs.existsSync(managedPath))) {
       throw new Error(`代理 "${fileName}" 已存在`);
     }
 
-    // 生成文件内容
-    const frontmatterData = { name: (name || fileName), description };
-    if (tools) frontmatterData.tools = tools;
-    if (model) frontmatterData.model = model;
-    if (permissionMode) frontmatterData.permissionMode = permissionMode;
-    if (skills) frontmatterData.skills = skills;
-
-    const content = generateFrontmatter(frontmatterData, this.platform) + '\n\n' + (systemPrompt || '');
+    const content = this.buildAgentContent({
+      fileName,
+      name,
+      description,
+      tools,
+      model,
+      permissionMode,
+      skills,
+      systemPrompt
+    });
 
     fs.writeFileSync(filePath, content, 'utf-8');
+    if (managedPath) {
+      ensureDir(path.dirname(managedPath));
+      fs.writeFileSync(managedPath, content, 'utf-8');
+    }
 
     return this.getAgent(fileName, scope, projectPath);
   }
@@ -737,24 +902,31 @@ class AgentsService {
       : this.getProjectAgentsDir(projectPath);
 
     const filePath = path.join(baseDir, `${fileName}.md`);
+    const managedPath = scope === 'user' ? this.getManagedAgentPath(fileName) : '';
+    const hasManagedCopy = managedPath && fs.existsSync(managedPath);
 
-    if (!fs.existsSync(filePath)) {
+    if (!fs.existsSync(filePath) && !hasManagedCopy) {
       throw new Error(`代理 "${fileName}" 不存在`);
     }
 
-    // 生成文件内容
-    const frontmatterData = {
-      name: name || fileName,
-      description: description || ''
-    };
-    if (tools) frontmatterData.tools = tools;
-    if (model) frontmatterData.model = model;
-    if (permissionMode) frontmatterData.permissionMode = permissionMode;
-    if (skills) frontmatterData.skills = skills;
-
-    const content = generateFrontmatter(frontmatterData, this.platform) + '\n\n' + (systemPrompt || '');
+    const content = this.buildAgentContent({
+      fileName,
+      name,
+      description,
+      tools,
+      model,
+      permissionMode,
+      skills,
+      systemPrompt
+    });
 
-    fs.writeFileSync(filePath, content, 'utf-8');
+    if (fs.existsSync(filePath)) {
+      fs.writeFileSync(filePath, content, 'utf-8');
+    }
+    if (managedPath) {
+      ensureDir(path.dirname(managedPath));
+      fs.writeFileSync(managedPath, content, 'utf-8');
+    }
 
     return this.getAgent(fileName, scope, projectPath);
   }
@@ -774,12 +946,22 @@ class AgentsService {
       : this.getProjectAgentsDir(projectPath);
 
     const filePath = path.join(baseDir, `${fileName}.md`);
+    const managedPath = scope === 'user' ? this.getManagedAgentPath(fileName) : '';
+    let removed = false;
 
-    if (!fs.existsSync(filePath)) {
-      return { success: false, message: '代理不存在' };
+    if (fs.existsSync(filePath)) {
+      fs.unlinkSync(filePath);
+      removed = true;
+    }
+
+    if (managedPath && fs.existsSync(managedPath)) {
+      fs.unlinkSync(managedPath);
+      removed = true;
     }
 
-    fs.unlinkSync(filePath);
+    if (!removed) {
+      return { success: false, message: '代理不存在' };
+    }
 
     return { success: true, message: '代理已删除' };
   }
@@ -860,12 +1042,37 @@ class AgentsService {
     return this.repoScanner.installAgent(agent);
   }
 
+  installLocalAgent(fileName) {
+    assertSafeAgentFileName(fileName);
+    const managedPath = this.getManagedAgentPath(fileName);
+    const targetPath = path.join(this.userAgentsDir, `${fileName}.md`);
+
+    if (!fs.existsSync(managedPath)) {
+      throw new Error(`本地代理 "${fileName}" 不存在`);
+    }
+
+    if (fs.existsSync(targetPath)) {
+      return { success: true, message: 'Already installed' };
+    }
+
+    ensureDir(path.dirname(targetPath));
+    fs.copyFileSync(managedPath, targetPath);
+    return { success: true, message: 'Installed successfully' };
+  }
+
   /**
    * 卸载代理
    */
   uninstallAgent(fileName) {
     assertSafeAgentFileName(fileName);
-    return this.repoScanner.uninstall(`${fileName}.md`);
+    const targetPath = path.join(this.userAgentsDir, `${fileName}.md`);
+
+    if (fs.existsSync(targetPath)) {
+      fs.unlinkSync(targetPath);
+      return { success: true, message: 'Uninstalled successfully' };
+    }
+
+    return { success: true, message: 'Not installed' };
   }
 
   listCodexAgents() {
@@ -986,7 +1193,7 @@ class AgentsService {
     } else if (normalizedMode === 'custom') {
       const safeConfigFile = assertSafeCodexConfigPath(configFile);
       const resolvedPath = resolveCodexConfigPath(safeConfigFile);
-      ensureDir(path.dirname(resolvedPath));
+      ensureDir(getNativePathDir(resolvedPath));
       const content = resolveCodexConfigContent({ configContent, model });
       writeFileAtomic(resolvedPath, content);
       agentConfig.config_file = safeConfigFile;
@@ -1032,7 +1239,7 @@ class AgentsService {
         const parsedConfigFile = readCodexAgentConfigFile(resolvedConfigFilePath);
         const configFileData = isPlainObject(parsedConfigFile?.data) ? parsedConfigFile.data : {};
         configFileData.model = trimmedModel;
-        ensureDir(path.dirname(resolvedConfigFilePath));
+        ensureDir(getNativePathDir(resolvedConfigFilePath));
         writeFileAtomic(resolvedConfigFilePath, tomlStringify(configFileData));
         agentConfig.config_file = configFilePath;
       } else if (isExistingManagedConfig) {
@@ -1058,7 +1265,7 @@ class AgentsService {
         model,
         fallbackContent: existingManagedContent
       });
-      ensureDir(path.dirname(resolvedConfigFilePath));
+      ensureDir(getNativePathDir(resolvedConfigFilePath));
       writeFileAtomic(resolvedConfigFilePath, content);
       agentConfig.config_file = configFilePath;
       if (resolvedExistingConfigFile &&
@@ -1087,7 +1294,7 @@ class AgentsService {
         model,
         fallbackContent: existingContent
       });
-      ensureDir(path.dirname(resolvedTargetConfigPath));
+      ensureDir(getNativePathDir(resolvedTargetConfigPath));
       writeFileAtomic(resolvedTargetConfigPath, content);
       agentConfig.config_file = targetConfigPath;
       if (resolvedExistingConfigFile &&