@adversity/coding-tool-x 3.1.0 → 3.1.1

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

@@ -1,11 +1,7 @@
 /**
  * Commands 服务
  *
- * 管理 Claude Code 自定义命令的 CRUD 操作
- * 命令目录:
- * - 用户级: ~/.claude/commands/
- * - 项目级: .claude/commands/
- *
+ * 管理 Claude/OpenCode 自定义命令的 CRUD 操作
  * 支持从 GitHub 仓库扫描和安装命令
  */
 
@@ -13,6 +9,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { RepoScannerBase } = require('./repo-scanner-base');
+const { NATIVE_PATHS } = require('../../config/paths');
 const {
   parseCommandContent,
   detectCommandFormat,
@@ -21,11 +18,35 @@ const {
   parseFrontmatter
 } = require('./format-converter');
 
-// 命令目录路径
-const USER_COMMANDS_DIR = path.join(os.homedir(), '.claude', 'commands');
-
 // 默认仓库源
 const DEFAULT_REPOS = [];
+const SUPPORTED_PLATFORMS = ['claude', 'opencode'];
+const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
+
+const PLATFORM_CONFIG = {
+  claude: {
+    userCommandsDir: path.join(os.homedir(), '.claude', 'commands'),
+    projectCommandsDir: (projectPath) => path.join(projectPath, '.claude', 'commands'),
+    repoType: 'commands'
+  },
+  opencode: {
+    userCommandsDir: path.join(OPENCODE_CONFIG_DIR, 'commands'),
+    legacyUserCommandsDir: path.join(OPENCODE_CONFIG_DIR, 'command'),
+    projectCommandsDir: (projectPath) => {
+      const modern = path.join(projectPath, '.opencode', 'commands');
+      const legacy = path.join(projectPath, '.opencode', 'command');
+      if (fs.existsSync(legacy) && !fs.existsSync(modern)) {
+        return legacy;
+      }
+      return modern;
+    },
+    repoType: 'opencode-commands'
+  }
+};
+
+function normalizePlatform(platform) {
+  return SUPPORTED_PLATFORMS.includes(platform) ? platform : 'claude';
+}
 
 /**
  * 确保目录存在
@@ -60,6 +81,9 @@ function generateCommandFrontmatter(data) {
   if (data.agent) {
     lines.push(`agent: ${data.agent}`);
   }
+  if (typeof data.subtask === 'boolean') {
+    lines.push(`subtask: ${data.subtask}`);
+  }
 
   lines.push('---');
   return lines.join('\n');
@@ -105,6 +129,9 @@ function scanCommandsDir(dir, basePath, scope) {
             description: frontmatter.description || '',
             allowedTools: frontmatter['allowed-tools'] || '',
             argumentHint: frontmatter['argument-hint'] || '',
+            agent: frontmatter.agent || '',
+            model: frontmatter.model || '',
+            subtask: frontmatter.subtask || '',
             body,
             fullContent: content,
             updatedAt: fs.statSync(fullPath).mtime.getTime()
@@ -125,10 +152,10 @@ function scanCommandsDir(dir, basePath, scope) {
  * Commands 仓库扫描器
  */
 class CommandsRepoScanner extends RepoScannerBase {
-  constructor() {
+  constructor(platform, installDir) {
     super({
-      type: 'commands',
-      installDir: USER_COMMANDS_DIR,
+      type: PLATFORM_CONFIG[platform]?.repoType || 'commands',
+      installDir,
       markerFile: null, // 直接扫描 .md 文件
       fileExtension: '.md',
       defaultRepos: DEFAULT_REPOS
@@ -159,6 +186,9 @@ class CommandsRepoScanner extends RepoScannerBase {
         description: frontmatter.description || '',
         allowedTools: frontmatter['allowed-tools'] || '',
         argumentHint: frontmatter['argument-hint'] || '',
+        agent: frontmatter.agent || '',
+        model: frontmatter.model || '',
+        subtask: frontmatter.subtask || '',
         body,
         fullContent: content,
         installed: this.isInstalled(relativePath),
@@ -208,12 +238,28 @@ class CommandsRepoScanner extends RepoScannerBase {
  * Commands 服务类
  */
 class CommandsService {
-  constructor() {
-    this.userCommandsDir = USER_COMMANDS_DIR;
-    this.repoScanner = new CommandsRepoScanner();
+  constructor(platform = 'claude') {
+    this.platform = normalizePlatform(platform);
+    const config = PLATFORM_CONFIG[this.platform];
+
+    this.userCommandsDir = config.userCommandsDir;
+    if (this.platform === 'opencode') {
+      const legacyUserDir = config.legacyUserCommandsDir;
+      if (legacyUserDir && fs.existsSync(legacyUserDir) && !fs.existsSync(this.userCommandsDir)) {
+        this.userCommandsDir = legacyUserDir;
+      }
+    }
+
+    this.projectCommandsDir = config.projectCommandsDir;
+    this.repoScanner = new CommandsRepoScanner(this.platform, this.userCommandsDir);
     ensureDir(this.userCommandsDir);
   }
 
+  getProjectCommandsDir(projectPath) {
+    if (!projectPath) return null;
+    return this.projectCommandsDir(projectPath);
+  }
+
   /**
    * 获取所有命令列表
    * @param {string} projectPath - 项目路径（可选，用于获取项目级命令）
@@ -227,7 +273,7 @@ class CommandsService {
 
     // 获取项目级命令（如果提供了项目路径）
     if (projectPath) {
-      const projectCommandsDir = path.join(projectPath, '.claude', 'commands');
+      const projectCommandsDir = this.getProjectCommandsDir(projectPath);
       const projectCommands = scanCommandsDir(projectCommandsDir, projectCommandsDir, 'project');
       commands.push(...projectCommands);
     }
@@ -295,7 +341,7 @@ class CommandsService {
   getCommand(name, scope, projectPath = null, namespace = null) {
     const baseDir = scope === 'user'
       ? this.userCommandsDir
-      : path.join(projectPath, '.claude', 'commands');
+      : this.getProjectCommandsDir(projectPath);
 
     const relativePath = namespace
       ? path.join(namespace, `${name}.md`)
@@ -319,6 +365,9 @@ class CommandsService {
       description: frontmatter.description || '',
       allowedTools: frontmatter['allowed-tools'] || '',
       argumentHint: frontmatter['argument-hint'] || '',
+      agent: frontmatter.agent || '',
+      model: frontmatter.model || '',
+      subtask: frontmatter.subtask || '',
       body,
       fullContent: content,
       updatedAt: fs.statSync(fullPath).mtime.getTime()
@@ -328,7 +377,7 @@ class CommandsService {
   /**
    * 创建命令
    */
-  createCommand({ name, scope, projectPath, namespace, description, allowedTools, argumentHint, body }) {
+  createCommand({ name, scope, projectPath, namespace, description, allowedTools, argumentHint, agent, model, subtask, body }) {
     if (!name || !name.trim()) {
       throw new Error('命令名称不能为空');
     }
@@ -340,7 +389,7 @@ class CommandsService {
 
     const baseDir = scope === 'user'
       ? this.userCommandsDir
-      : path.join(projectPath, '.claude', 'commands');
+      : this.getProjectCommandsDir(projectPath);
 
     const targetDir = namespace ? path.join(baseDir, namespace) : baseDir;
     ensureDir(targetDir);
@@ -355,8 +404,13 @@ class CommandsService {
     // 生成文件内容
     const frontmatterData = {};
     if (description) frontmatterData.description = description;
-    if (allowedTools) frontmatterData['allowed-tools'] = allowedTools;
-    if (argumentHint) frontmatterData['argument-hint'] = argumentHint;
+    if (this.platform !== 'opencode') {
+      if (allowedTools) frontmatterData['allowed-tools'] = allowedTools;
+      if (argumentHint) frontmatterData['argument-hint'] = argumentHint;
+    }
+    if (agent) frontmatterData.agent = agent;
+    if (model) frontmatterData.model = model;
+    if (typeof subtask === 'boolean') frontmatterData.subtask = subtask;
 
     let content = '';
     if (Object.keys(frontmatterData).length > 0) {
@@ -372,10 +426,10 @@ class CommandsService {
   /**
    * 更新命令
    */
-  updateCommand({ name, scope, projectPath, namespace, description, allowedTools, argumentHint, body }) {
+  updateCommand({ name, scope, projectPath, namespace, description, allowedTools, argumentHint, agent, model, subtask, body }) {
     const baseDir = scope === 'user'
       ? this.userCommandsDir
-      : path.join(projectPath, '.claude', 'commands');
+      : this.getProjectCommandsDir(projectPath);
 
     const relativePath = namespace
       ? path.join(namespace, `${name}.md`)
@@ -390,8 +444,13 @@ class CommandsService {
     // 生成文件内容
     const frontmatterData = {};
     if (description) frontmatterData.description = description;
-    if (allowedTools) frontmatterData['allowed-tools'] = allowedTools;
-    if (argumentHint) frontmatterData['argument-hint'] = argumentHint;
+    if (this.platform !== 'opencode') {
+      if (allowedTools) frontmatterData['allowed-tools'] = allowedTools;
+      if (argumentHint) frontmatterData['argument-hint'] = argumentHint;
+    }
+    if (agent) frontmatterData.agent = agent;
+    if (model) frontmatterData.model = model;
+    if (typeof subtask === 'boolean') frontmatterData.subtask = subtask;
 
     let content = '';
     if (Object.keys(frontmatterData).length > 0) {
@@ -410,7 +469,7 @@ class CommandsService {
   deleteCommand(name, scope, projectPath = null, namespace = null) {
     const baseDir = scope === 'user'
       ? this.userCommandsDir
-      : path.join(projectPath, '.claude', 'commands');
+      : this.getProjectCommandsDir(projectPath);
 
     const relativePath = namespace
       ? path.join(namespace, `${name}.md`)

package/src/server/services/config-export-service.js

@@ -1,13 +1,12 @@
 /**
  * 配置导出/导入服务
- * 支持权限模板、配置模板、频道配置的导出与导入
+ * 支持配置模板、频道配置的导出与导入
  */
 
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const AdmZip = require('adm-zip');
-const permissionTemplatesService = require('./permission-templates-service');
 const configTemplatesService = require('./config-templates-service');
 const channelsService = require('./channels');
 const { AgentsService } = require('./agents-service');
@@ -19,7 +18,7 @@ const CONFIG_VERSION = '1.2.0';
 const SKILL_FILE_ENCODING = 'base64';
 const SKILL_IGNORE_DIRS = new Set(['.git']);
 const SKILL_IGNORE_FILES = new Set(['.DS_Store']);
-const CC_TOOL_DIR = path.join(os.homedir(), '.claude', 'cc-tool');
+const CC_TOOL_DIR = path.join(os.homedir(), '.cc-tool');
 const LEGACY_CC_TOOL_DIR = path.join(os.homedir(), '.cc-tool');
 const CLAUDE_SETTINGS_PATH = path.join(os.homedir(), '.claude', 'settings.json');
 const LEGACY_PLUGINS_DIR = path.join(LEGACY_CC_TOOL_DIR, 'plugins', 'installed');
@@ -106,8 +105,8 @@ function writeTextFileAbsolute(filePath, content, overwrite, options = {}) {
 
 function getConfigFilePath() {
   try {
-    const loaderPath = require.resolve('../../config/loader');
-    return path.resolve(path.dirname(loaderPath), '../../config.json');
+    const { getConfigFilePath: resolveConfigPath } = require('../../config/loader');
+    return typeof resolveConfigPath === 'function' ? resolveConfigPath() : null;
   } catch (err) {
     return null;
   }
@@ -121,7 +120,7 @@ function buildExportReadme(exportData) {
 版本: ${exportData.version || CONFIG_VERSION}
 
 ## 📦 包含内容
-- 权限模板、配置模板、频道配置、工作区、收藏
+- 配置模板、频道配置、工作区、收藏
 - Agents / Skills / Commands / Rules
 - 插件 (Plugins)
 - MCP 服务器配置
@@ -436,17 +435,12 @@ function writeTextFile(baseDir, relativePath, content, overwrite) {
  */
 function exportAllConfigs() {
   try {
-    // 获取所有权限模板(只导出自定义模板)
-    const allPermissionTemplates = permissionTemplatesService.getAllTemplates();
-    const customPermissionTemplates = allPermissionTemplates.filter(t => !t.isBuiltin);
-
     // 获取所有配置模板(只导出自定义模板)
     const allConfigTemplates = configTemplatesService.getAllTemplates();
     const customConfigTemplates = allConfigTemplates.filter(t => !t.isBuiltin);
 
     // 获取所有频道配置
-    const channelsData = channelsService.getAllChannels();
-    const channels = channelsData?.channels || [];
+    const channels = channelsService.getAllChannels() || [];
 
     // 获取工作区配置
     const workspaceService = require('./workspace-service');
@@ -549,7 +543,6 @@ function exportAllConfigs() {
       version: CONFIG_VERSION,
       exportedAt: new Date().toISOString(),
       data: {
-        permissionTemplates: customPermissionTemplates,
         configTemplates: customConfigTemplates,
         channels: channels || [],
         workspaces: workspaces || { workspaces: [] },
@@ -617,7 +610,6 @@ function exportAllConfigsZip() {
 function importConfigs(importData, options = {}) {
   const { overwrite = true } = options; // 默认覆盖模式
   const results = {
-    permissionTemplates: { success: 0, failed: 0, skipped: 0 },
     configTemplates: { success: 0, failed: 0, skipped: 0 },
     channels: { success: 0, failed: 0, skipped: 0 },
     workspaces: { success: 0, failed: 0, skipped: 0 },
@@ -645,7 +637,6 @@ function importConfigs(importData, options = {}) {
     }
 
     const {
-      permissionTemplates = [],
       configTemplates = [],
       channels = [],
       workspaces = null,
@@ -665,33 +656,6 @@ function importConfigs(importData, options = {}) {
       claudeHooks = null
     } = importData.data;
 
-    // 导入权限模板
-    for (const template of permissionTemplates) {
-      try {
-        const existing = permissionTemplatesService.getTemplateById(template.id);
-
-        if (existing && !overwrite) {
-          results.permissionTemplates.skipped++;
-          continue;
-        }
-
-        if (existing && overwrite) {
-          permissionTemplatesService.updateTemplate(template.id, template);
-        } else {
-          const newTemplate = {
-            ...template,
-            isBuiltin: false,
-            importedAt: new Date().toISOString()
-          };
-          permissionTemplatesService.createTemplate(newTemplate);
-        }
-        results.permissionTemplates.success++;
-      } catch (err) {
-        console.error(`[ConfigImport] 导入权限模板失败: ${template.name}`, err);
-        results.permissionTemplates.failed++;
-      }
-    }
-
     // 导入配置模板
     for (const template of configTemplates) {
       try {
@@ -722,8 +686,7 @@ function importConfigs(importData, options = {}) {
     // 导入频道配置
     for (const channel of channels) {
       try {
-        const channelsData = channelsService.getAllChannels();
-        const existingChannels = channelsData?.channels || [];
+        const existingChannels = channelsService.getAllChannels() || [];
         const existing = existingChannels.find(c => c.id === channel.id);
 
         if (existing && !overwrite) {
@@ -1264,7 +1227,6 @@ function generateImportSummary(results) {
   const parts = [];
 
   const types = [
-    { key: 'permissionTemplates', label: '权限模板' },
     { key: 'configTemplates', label: '配置模板' },
     { key: 'channels', label: '频道' },
     { key: 'workspaces', label: '工作区' },

package/src/server/services/config-registry-service.js

@@ -1,10 +1,10 @@
 /**
  * Config Registry Service
  *
- * Manages a unified config registry at ~/.claude/cc-tool/config-registry.json
+ * Manages a unified config registry at ~/.cc-tool/config-registry.json
  * that tracks skills, commands, agents, rules with enable/disable and per-platform support.
  *
- * Storage directories: ~/.claude/cc-tool/configs/{skills,commands,agents,rules}/
+ * Storage directories: ~/.cc-tool/configs/{skills,commands,agents,rules}/
  */
 
 const fs = require('fs');
@@ -12,7 +12,7 @@ const path = require('path');
 const os = require('os');
 
 // Configuration paths
-const CC_TOOL_DIR = path.join(os.homedir(), '.claude', 'cc-tool');
+const CC_TOOL_DIR = path.join(os.homedir(), '.cc-tool');
 const REGISTRY_FILE = path.join(CC_TOOL_DIR, 'config-registry.json');
 const CONFIGS_DIR = path.join(CC_TOOL_DIR, 'configs');
 
@@ -27,6 +27,37 @@ const CLAUDE_DIRS = {
 
 // Valid config types
 const CONFIG_TYPES = ['skills', 'commands', 'agents', 'rules', 'plugins'];
+const SUPPORTED_PLATFORMS = ['claude', 'codex', 'opencode'];
+
+const PLATFORM_SUPPORT = {
+  skills: { claude: true, codex: true, opencode: true },
+  commands: { claude: true, codex: true, opencode: true },
+  agents: { claude: true, codex: false, opencode: true },
+  rules: { claude: true, codex: false, opencode: false },
+  plugins: { claude: true, codex: false, opencode: true }
+};
+
+function normalizePlatforms(type, platforms = {}) {
+  const support = PLATFORM_SUPPORT[type] || {};
+  const normalized = {
+    claude: !!platforms.claude,
+    codex: !!platforms.codex,
+    opencode: !!platforms.opencode
+  };
+
+  for (const platform of SUPPORTED_PLATFORMS) {
+    if (support[platform] === false) {
+      normalized[platform] = false;
+    }
+  }
+
+  // Default to Claude enabled when no platform explicitly configured
+  if (!platforms || Object.keys(platforms).length === 0) {
+    normalized.claude = true;
+  }
+
+  return normalized;
+}
 
 // Default registry structure
 const DEFAULT_REGISTRY = {
@@ -87,6 +118,13 @@ class ConfigRegistryService {
           if (!data[type]) {
             data[type] = {};
           }
+
+          for (const [name, item] of Object.entries(data[type])) {
+            if (!item || typeof item !== 'object') {
+              continue;
+            }
+            data[type][name].platforms = normalizePlatforms(type, item.platforms);
+          }
         }
 
         return data;
@@ -147,12 +185,12 @@ class ConfigRegistryService {
 
     const existing = registry[type][name];
     const entry = {
+      ...data,
       enabled: data.enabled !== undefined ? data.enabled : true,
-      platforms: data.platforms || { claude: true, codex: false },
+      platforms: normalizePlatforms(type, data.platforms),
       createdAt: existing?.createdAt || now,
       updatedAt: now,
-      source: data.source || 'local',
-      ...data
+      source: data.source || 'local'
     };
 
     registry[type][name] = entry;
@@ -244,7 +282,7 @@ class ConfigRegistryService {
    * Toggle platform support for an item
    * @param {string} type - Config type
    * @param {string} name - Item name/key
-   * @param {string} platform - Platform name (claude, codex)
+   * @param {string} platform - Platform name (claude, codex, opencode)
    * @param {boolean} enabled - New platform status
    * @returns {Object} Updated entry
    */
@@ -253,10 +291,14 @@ class ConfigRegistryService {
       throw new Error(`Invalid config type: ${type}`);
     }
 
-    if (!['claude', 'codex'].includes(platform)) {
+    if (!SUPPORTED_PLATFORMS.includes(platform)) {
       throw new Error(`Invalid platform: ${platform}`);
     }
 
+    if (PLATFORM_SUPPORT[type] && PLATFORM_SUPPORT[type][platform] === false) {
+      throw new Error(`Platform "${platform}" is not supported for ${type}`);
+    }
+
     const registry = this._readRegistry();
     const entry = registry[type][name];
 
@@ -265,7 +307,7 @@ class ConfigRegistryService {
     }
 
     if (!entry.platforms) {
-      entry.platforms = { claude: true, codex: false };
+      entry.platforms = normalizePlatforms(type, {});
     }
 
     entry.platforms[platform] = enabled;
@@ -353,7 +395,7 @@ class ConfigRegistryService {
           // Add to registry
           registry.skills[name] = {
             enabled: true,
-            platforms: { claude: true, codex: false },
+            platforms: normalizePlatforms('skills', { claude: true }),
             createdAt: new Date().toISOString(),
             updatedAt: new Date().toISOString(),
             source: 'imported'
@@ -409,7 +451,7 @@ class ConfigRegistryService {
           // Add to registry
           registry.plugins[name] = {
             enabled: true,
-            platforms: { claude: true, codex: false },
+            platforms: normalizePlatforms('plugins', { claude: true }),
             createdAt: new Date().toISOString(),
             updatedAt: new Date().toISOString(),
             source: 'imported'
@@ -473,7 +515,7 @@ class ConfigRegistryService {
             // Add to registry
             registry[type][name] = {
               enabled: true,
-              platforms: { claude: true, codex: false },
+              platforms: normalizePlatforms(type, { claude: true }),
               createdAt: new Date().toISOString(),
               updatedAt: new Date().toISOString(),
               source: 'imported'
@@ -523,7 +565,8 @@ class ConfigRegistryService {
       byType: {},
       byPlatform: {
         claude: 0,
-        codex: 0
+        codex: 0,
+        opencode: 0
       }
     };
 
@@ -534,13 +577,15 @@ class ConfigRegistryService {
         enabled: items.filter(i => i.enabled).length,
         disabled: items.filter(i => !i.enabled).length,
         claude: items.filter(i => i.platforms?.claude).length,
-        codex: items.filter(i => i.platforms?.codex).length
+        codex: items.filter(i => i.platforms?.codex).length,
+        opencode: items.filter(i => i.platforms?.opencode).length
       };
 
       stats.byType[type] = typeStats;
       stats.total += typeStats.total;
       stats.byPlatform.claude += typeStats.claude;
       stats.byPlatform.codex += typeStats.codex;
+      stats.byPlatform.opencode += typeStats.opencode;
     }
 
     return stats;
@@ -660,7 +705,7 @@ class ConfigRegistryService {
         if (!registry.skills[name]) {
           registry.skills[name] = {
             enabled: true,
-            platforms: { claude: true, codex: false },
+            platforms: normalizePlatforms('skills', { claude: true }),
             createdAt: new Date().toISOString(),
             updatedAt: new Date().toISOString(),
             source: 'synced'
@@ -697,7 +742,7 @@ class ConfigRegistryService {
         if (!registry.plugins[name]) {
           registry.plugins[name] = {
             enabled: true,
-            platforms: { claude: true, codex: false },
+            platforms: normalizePlatforms('plugins', { claude: true }),
             createdAt: new Date().toISOString(),
             updatedAt: new Date().toISOString(),
             source: 'synced'
@@ -739,7 +784,7 @@ class ConfigRegistryService {
           if (!registry[type][name]) {
             registry[type][name] = {
               enabled: true,
-              platforms: { claude: true, codex: false },
+              platforms: normalizePlatforms(type, { claude: true }),
               createdAt: new Date().toISOString(),
               updatedAt: new Date().toISOString(),
               source: 'synced'
@@ -757,6 +802,7 @@ class ConfigRegistryService {
 module.exports = {
   ConfigRegistryService,
   CONFIG_TYPES,
+  SUPPORTED_PLATFORMS,
   CONFIGS_DIR,
   REGISTRY_FILE
 };