@adversity/coding-tool-x 3.1.0 → 3.1.2

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
 };

package/src/server/services/config-sync-manager.js

@@ -4,24 +4,28 @@
  * Manages file synchronization between cc-tool central storage and CLI directories:
  * - Claude Code: ~/.claude/{skills,commands,agents,rules}/
  * - Codex CLI: ~/.codex/skills/, ~/.codex/prompts/
+ * - OpenCode CLI: ~/.config/opencode/{skills,commands,agents,plugins}/
  *
  * Config types:
  * - skills: directory-based (each skill is a dir with SKILL.md)
  * - commands: file-based (.md), may be nested in subdirectories
  * - agents: file-based (.md), flat directory
  * - rules: file-based (.md), may be nested in subdirectories
+ * - plugins: directory-based
  */
 
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { convertSkillToCodex, convertCommandToCodex } = require('./format-converter');
+const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 
 // Paths
 const HOME = os.homedir();
-const CC_TOOL_CONFIGS = path.join(HOME, '.claude', 'cc-tool', 'configs');
+const CC_TOOL_CONFIGS = path.join(PATHS.base, 'configs');
 const CLAUDE_CODE_DIR = path.join(HOME, '.claude');
 const CODEX_DIR = path.join(HOME, '.codex');
+const OPENCODE_DIR = NATIVE_PATHS.opencode.config;
 
 // Config type definitions
 const CONFIG_TYPES = {
@@ -31,7 +35,10 @@ const CONFIG_TYPES = {
     claudeTarget: 'skills',
     codexTarget: 'skills',
     codexSupported: true,
-    convertForCodex: true
+    convertForCodex: true,
+    opencodeTarget: 'skills',
+    opencodeLegacyTarget: 'skill',
+    opencodeSupported: true
   },
   commands: {
     isDirectory: false,
@@ -39,27 +46,44 @@ const CONFIG_TYPES = {
     claudeTarget: 'commands',
     codexTarget: 'prompts',
     codexSupported: true,
-    convertForCodex: true
+    convertForCodex: true,
+    opencodeTarget: 'commands',
+    opencodeLegacyTarget: 'command',
+    opencodeSupported: true
   },
   agents: {
     isDirectory: false,
     extension: '.md',
     claudeTarget: 'agents',
-    codexSupported: false
+    codexSupported: false,
+    opencodeTarget: 'agents',
+    opencodeLegacyTarget: 'agent',
+    opencodeSupported: true
   },
   rules: {
     isDirectory: false,
     extension: '.md',
     claudeTarget: 'rules',
-    codexSupported: false
+    codexSupported: false,
+    opencodeSupported: false
+  },
+  plugins: {
+    isDirectory: true,
+    claudeTarget: 'plugins',
+    codexSupported: false,
+    opencodeTarget: 'plugins',
+    opencodeLegacyTarget: 'plugin',
+    opencodeSupported: true
   }
 };
 
 class ConfigSyncManager {
   constructor() {
+    ensureStorageDirMigrated();
     this.ccToolConfigs = CC_TOOL_CONFIGS;
     this.claudeDir = CLAUDE_CODE_DIR;
     this.codexDir = CODEX_DIR;
+    this.opencodeDir = OPENCODE_DIR;
     this.configTypes = CONFIG_TYPES;
   }
 
@@ -262,10 +286,96 @@ class ConfigSyncManager {
     }
   }
 
+  /**
+   * Sync a config item to OpenCode CLI
+   * Supports skills, commands, agents, plugins
+   * @param {string} type - Config type
+   * @param {string} name - Item name
+   * @returns {Object} Result with success status
+   */
+  syncToOpenCode(type, name) {
+    const config = this.configTypes[type];
+    if (!config) {
+      return { success: false, error: `Unknown config type: ${type}` };
+    }
+
+    if (!config.opencodeSupported) {
+      console.log(`[ConfigSyncManager] ${type} not supported by OpenCode, skipping`);
+      return { success: true, skipped: true, reason: 'Not supported by OpenCode' };
+    }
+
+    const sourcePath = path.join(this.ccToolConfigs, type, name);
+    if (!fs.existsSync(sourcePath)) {
+      console.log(`[ConfigSyncManager] Source not found: ${sourcePath}`);
+      return { success: false, error: 'Source not found' };
+    }
+
+    try {
+      const targetBaseDir = this._getOpenCodeTypeBaseDir(config);
+      const targetPath = path.join(targetBaseDir, name);
+
+      if (config.isDirectory) {
+        this._ensureDir(path.dirname(targetPath));
+        this._copyDirRecursive(sourcePath, targetPath);
+        console.log(`[ConfigSyncManager] Synced ${type}/${name} to OpenCode (directory)`);
+      } else {
+        this._ensureDir(path.dirname(targetPath));
+        this._copyFile(sourcePath, targetPath);
+        console.log(`[ConfigSyncManager] Synced ${type}/${name} to OpenCode (file)`);
+      }
+
+      return { success: true, target: targetPath };
+    } catch (err) {
+      console.error(`[ConfigSyncManager] Sync to OpenCode failed:`, err.message);
+      return { success: false, error: err.message };
+    }
+  }
+
+  /**
+   * Remove a config item from OpenCode CLI
+   * @param {string} type - Config type
+   * @param {string} name - Item name
+   * @returns {Object} Result with success status
+   */
+  removeFromOpenCode(type, name) {
+    const config = this.configTypes[type];
+    if (!config) {
+      return { success: false, error: `Unknown config type: ${type}` };
+    }
+
+    if (!config.opencodeSupported) {
+      return { success: true, skipped: true, reason: 'Not supported by OpenCode' };
+    }
+
+    const targetBaseDir = this._getOpenCodeTypeBaseDir(config);
+    const targetPath = path.join(targetBaseDir, name);
+
+    if (!fs.existsSync(targetPath)) {
+      console.log(`[ConfigSyncManager] Target not found (already removed): ${targetPath}`);
+      return { success: true, message: 'Already removed' };
+    }
+
+    try {
+      if (config.isDirectory) {
+        this._removeRecursive(targetPath);
+        console.log(`[ConfigSyncManager] Removed ${type}/${name} from OpenCode (directory)`);
+      } else {
+        fs.unlinkSync(targetPath);
+        console.log(`[ConfigSyncManager] Removed ${type}/${name} from OpenCode (file)`);
+        this._cleanupEmptyParents(path.dirname(targetPath), targetBaseDir);
+      }
+
+      return { success: true };
+    } catch (err) {
+      console.error(`[ConfigSyncManager] Remove from OpenCode failed:`, err.message);
+      return { success: false, error: err.message };
+    }
+  }
+
   /**
    * Batch sync based on registry data
    * @param {string} type - Config type
-   * @param {Object} registryItems - Registry items { name: { enabled, platforms: { claude, codex } } }
+   * @param {Object} registryItems - Registry items { name: { enabled, platforms: { claude, codex, opencode } } }
    * @returns {Object} Results summary
    */
   syncAll(type, registryItems) {
@@ -319,6 +429,20 @@ class ConfigSyncManager {
             results.removed.push({ type, name, platform: 'codex' });
           }
         }
+
+        if (platforms.opencode) {
+          const result = this.syncToOpenCode(type, name);
+          if (result.success && !result.skipped) {
+            results.synced.push({ type, name, platform: 'opencode' });
+          } else if (!result.success) {
+            results.errors.push({ type, name, platform: 'opencode', error: result.error });
+          }
+        } else {
+          const result = this.removeFromOpenCode(type, name);
+          if (result.success && !result.message && !result.skipped) {
+            results.removed.push({ type, name, platform: 'opencode' });
+          }
+        }
       } else {
         // Item disabled, remove from all platforms
         const claudeResult = this.removeFromClaude(type, name);
@@ -330,6 +454,11 @@ class ConfigSyncManager {
         if (codexResult.success && !codexResult.message && !codexResult.skipped) {
           results.removed.push({ type, name, platform: 'codex' });
         }
+
+        const opencodeResult = this.removeFromOpenCode(type, name);
+        if (opencodeResult.success && !opencodeResult.message && !opencodeResult.skipped) {
+          results.removed.push({ type, name, platform: 'opencode' });
+        }
       }
     }
 
@@ -409,6 +538,29 @@ class ConfigSyncManager {
     fs.copyFileSync(src, dest);
   }
 
+  /**
+   * Resolve OpenCode base target directory for a config type.
+   * OpenCode supports both plural (new) and singular (legacy) folder names.
+   */
+  _getOpenCodeTypeBaseDir(config) {
+    const modernDir = path.join(this.opencodeDir, config.opencodeTarget);
+    // 技能目录强制使用 modern/plural 形式，避免 legacy 目录带来的跨平台历史污染
+    if (config === this.configTypes.skills) {
+      return modernDir;
+    }
+
+    if (!config.opencodeLegacyTarget) {
+      return modernDir;
+    }
+
+    const legacyDir = path.join(this.opencodeDir, config.opencodeLegacyTarget);
+    if (fs.existsSync(legacyDir) && !fs.existsSync(modernDir)) {
+      return legacyDir;
+    }
+
+    return modernDir;
+  }
+
   /**
    * Recursively remove a file or directory
    */
@@ -452,5 +604,6 @@ module.exports = {
   CONFIG_TYPES,
   CC_TOOL_CONFIGS,
   CLAUDE_CODE_DIR,
-  CODEX_DIR
+  CODEX_DIR,
+  OPENCODE_DIR
 };