coding-tool-x 3.3.6 → 3.3.8

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

@@ -16,7 +16,7 @@ const { CommandsService } = require('./commands-service');
 const { SkillService } = require('./skill-service');
 const { PATHS, NATIVE_PATHS } = require('../../config/paths');
 
-const CONFIG_VERSION = '1.2.0';
+const CONFIG_VERSION = '1.4.0';
 const SKILL_FILE_ENCODING = 'base64';
 const SKILL_IGNORE_DIRS = new Set(['.git']);
 const SKILL_IGNORE_FILES = new Set(['.DS_Store']);
@@ -44,6 +44,41 @@ const CC_PROMPTS_PATH = path.join(CC_TOOL_DIR, 'prompts.json');
 const CC_SECURITY_PATH = path.join(CC_TOOL_DIR, 'security.json');
 const LEGACY_UI_CONFIG_PATH = path.join(LEGACY_CC_TOOL_DIR, 'ui-config.json');
 const LEGACY_NOTIFY_HOOK_PATH = path.join(LEGACY_CC_TOOL_DIR, 'notify-hook.js');
+const GEMINI_SETTINGS_PATH = path.join(path.dirname(NATIVE_PATHS.gemini.env), 'settings.json');
+const AGENT_PLATFORMS = ['claude', 'codex', 'opencode'];
+const COMMAND_PLATFORMS = ['claude', 'opencode'];
+const SKILL_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode'];
+
+function getOpenCodeConfigPaths() {
+  try {
+    const { CONFIG_PATHS } = require('./opencode-settings-manager');
+    return CONFIG_PATHS || {};
+  } catch (err) {
+    return {};
+  }
+}
+
+function getNativeConfigSpecs() {
+  const openCodeConfigPaths = getOpenCodeConfigPaths();
+  return {
+    claude: {
+      settings: { path: NATIVE_PATHS.claude.settings, format: 'json' }
+    },
+    codex: {
+      config: { path: NATIVE_PATHS.codex.config, format: 'text' },
+      auth: { path: NATIVE_PATHS.codex.auth, format: 'json', mode: 0o600 }
+    },
+    gemini: {
+      env: { path: NATIVE_PATHS.gemini.env, format: 'text', mode: 0o600 },
+      settings: { path: GEMINI_SETTINGS_PATH, format: 'json' }
+    },
+    opencode: {
+      opencodeJsonc: { path: openCodeConfigPaths.opencodec, format: 'text' },
+      opencodeJson: { path: openCodeConfigPaths.opencode, format: 'text' },
+      configJson: { path: openCodeConfigPaths.config, format: 'text' }
+    }
+  };
+}
 
 function ensureDir(dirPath) {
   if (!fs.existsSync(dirPath)) {
@@ -70,6 +105,39 @@ function readTextFileSafe(filePath) {
   }
 }
 
+function readNativeConfigSnapshot(spec) {
+  if (!spec?.path || !fs.existsSync(spec.path)) {
+    return null;
+  }
+
+  try {
+    const rawContent = fs.readFileSync(spec.path, 'utf8');
+    if (spec.format === 'json') {
+      try {
+        return {
+          format: 'json',
+          fileName: path.basename(spec.path),
+          content: JSON.parse(rawContent)
+        };
+      } catch (err) {
+        return {
+          format: 'text',
+          fileName: path.basename(spec.path),
+          content: rawContent
+        };
+      }
+    }
+
+    return {
+      format: spec.format || 'text',
+      fileName: path.basename(spec.path),
+      content: rawContent
+    };
+  } catch (err) {
+    return null;
+  }
+}
+
 function writeJsonFileAbsolute(filePath, data, overwrite, options = {}) {
   if (data === undefined) {
     return 'failed';
@@ -104,6 +172,19 @@ function writeTextFileAbsolute(filePath, content, overwrite, options = {}) {
   return 'success';
 }
 
+function writeNativeConfigAbsolute(spec, entry, overwrite) {
+  if (!spec?.path || !entry || entry.content === undefined) {
+    return 'failed';
+  }
+
+  const format = entry.format || spec.format || 'text';
+  if (format === 'json' && entry.content && typeof entry.content === 'object') {
+    return writeJsonFileAbsolute(spec.path, entry.content, overwrite, { mode: spec.mode });
+  }
+
+  return writeTextFileAbsolute(spec.path, String(entry.content), overwrite, { mode: spec.mode });
+}
+
 function getConfigFilePath() {
   try {
     const { getConfigFilePath: resolveConfigPath } = require('../../config/loader');
@@ -125,6 +206,8 @@ function buildExportReadme(exportData) {
 - Agents / Skills / Commands
 - 插件 (Plugins)
 - MCP 服务器配置
+- OAuth 凭证管理池
+- 各平台原生配置（Claude / Codex / Gemini / OpenCode）
 - UI 配置（主题、面板显示、排序等）
 - Prompts 预设
 - 安全配置
@@ -184,6 +267,288 @@ function buildCommandContent(command) {
   return `${lines.join('\n')}${body}`;
 }
 
+function buildAgentExportItem(agent, platform) {
+  return {
+    platform,
+    fileName: agent.fileName,
+    name: agent.name,
+    description: agent.description,
+    tools: agent.tools,
+    model: agent.model,
+    permissionMode: agent.permissionMode,
+    skills: agent.skills,
+    path: agent.path,
+    systemPrompt: agent.systemPrompt,
+    fullContent: agent.fullContent
+  };
+}
+
+function buildCommandExportItem(command, platform) {
+  return {
+    platform,
+    name: command.name,
+    namespace: command.namespace,
+    description: command.description,
+    allowedTools: command.allowedTools,
+    argumentHint: command.argumentHint,
+    path: command.path,
+    body: command.body,
+    fullContent: command.fullContent
+  };
+}
+
+function exportAgentsSnapshotByPlatform() {
+  return AGENT_PLATFORMS.reduce((result, platform) => {
+    try {
+      const agentsService = new AgentsService(platform);
+      const { agents: rawAgents = [] } = agentsService.listAgents();
+      result[platform] = rawAgents.map(agent => buildAgentExportItem(agent, platform));
+    } catch (err) {
+      console.warn(`[ConfigExport] Failed to export agents for ${platform}:`, err.message);
+      result[platform] = [];
+    }
+    return result;
+  }, {});
+}
+
+function exportCommandsSnapshotByPlatform() {
+  return COMMAND_PLATFORMS.reduce((result, platform) => {
+    try {
+      const commandsService = new CommandsService(platform);
+      const { commands: rawCommands = [] } = commandsService.listCommands();
+      result[platform] = rawCommands.map(command => buildCommandExportItem(command, platform));
+    } catch (err) {
+      console.warn(`[ConfigExport] Failed to export commands for ${platform}:`, err.message);
+      result[platform] = [];
+    }
+    return result;
+  }, {});
+}
+
+function normalizePlatformItems(legacyItems = [], byPlatform = {}, supportedPlatforms = [], defaultPlatform = 'claude') {
+  const result = Object.fromEntries(supportedPlatforms.map(platform => [platform, []]));
+  const structuredPlatforms = new Set();
+
+  for (const platform of supportedPlatforms) {
+    if (Array.isArray(byPlatform?.[platform])) {
+      result[platform] = byPlatform[platform].map(item => ({
+        ...item,
+        platform: supportedPlatforms.includes(item?.platform) ? item.platform : platform
+      }));
+      structuredPlatforms.add(platform);
+    }
+  }
+
+  if (!Array.isArray(legacyItems)) {
+    return result;
+  }
+
+  for (const item of legacyItems) {
+    const platform = supportedPlatforms.includes(item?.platform) ? item.platform : defaultPlatform;
+    if (structuredPlatforms.has(platform)) {
+      continue;
+    }
+    result[platform].push({ ...item, platform });
+  }
+
+  return result;
+}
+
+function resolveAgentRelativePath(agent, platform) {
+  const pathCandidates = [agent?.path, agent?.fileName]
+    .filter(value => typeof value === 'string' && value.trim())
+    .map(value => value.trim());
+
+  for (const candidate of pathCandidates) {
+    if (path.extname(candidate)) {
+      return candidate;
+    }
+  }
+
+  const baseName = agent?.fileName || agent?.name;
+  if (!baseName) {
+    return null;
+  }
+
+  return platform === 'codex' ? `${baseName}.toml` : `${baseName}.md`;
+}
+
+function resolveCommandRelativePath(command) {
+  if (typeof command?.path === 'string' && command.path.trim()) {
+    return command.path.trim();
+  }
+  if (command?.namespace) {
+    return path.join(command.namespace, `${command.name}.md`);
+  }
+  return command?.name ? `${command.name}.md` : null;
+}
+
+function pickPrimaryChannel(channels = []) {
+  if (!Array.isArray(channels) || channels.length === 0) {
+    return null;
+  }
+  return channels.find(channel => channel.enabled !== false) || channels[0] || null;
+}
+
+function findMatchingPersistedChannel(existingChannels = [], importedChannel = {}, extraMatchers = []) {
+  if (!Array.isArray(existingChannels) || existingChannels.length === 0 || !importedChannel) {
+    return null;
+  }
+
+  if (importedChannel.id) {
+    const exactMatch = existingChannels.find(channel => channel.id === importedChannel.id);
+    if (exactMatch) {
+      return exactMatch;
+    }
+  }
+
+  for (const matcher of extraMatchers) {
+    const matchedChannel = existingChannels.find(channel => matcher(channel, importedChannel));
+    if (matchedChannel) {
+      return matchedChannel;
+    }
+  }
+
+  return null;
+}
+
+function sanitizeOpenCodeProviderId(value) {
+  return String(value || '')
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9-]/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '') || 'channel';
+}
+
+function buildOpenCodeNativeConfig(channels = []) {
+  const config = { provider: {} };
+  const usedProviderIds = new Set();
+  let defaultModelRef = '';
+
+  channels.forEach((channel) => {
+    const baseProviderId = sanitizeOpenCodeProviderId(channel.providerKey || channel.name);
+    let providerId = baseProviderId;
+    let suffix = 2;
+    while (usedProviderIds.has(providerId)) {
+      providerId = `${baseProviderId}-${suffix}`;
+      suffix += 1;
+    }
+    usedProviderIds.add(providerId);
+
+    const provider = {
+      npm: '@ai-sdk/openai-compatible',
+      name: channel.name || providerId,
+      options: {
+        baseURL: channel.baseUrl || '',
+        apiKey: channel.apiKey || ''
+      }
+    };
+
+    const models = {};
+    const allowedModels = Array.isArray(channel.allowedModels) ? channel.allowedModels : [];
+    const allModels = allowedModels.length > 0
+      ? allowedModels
+      : [channel.model].filter(Boolean);
+
+    allModels.forEach((modelId) => {
+      const normalizedModel = String(modelId || '').trim();
+      if (!normalizedModel) return;
+      models[normalizedModel] = { name: normalizedModel };
+      if (!defaultModelRef && (channel.enabled !== false || !pickPrimaryChannel(channels))) {
+        defaultModelRef = `${providerId}/${normalizedModel}`;
+      }
+    });
+
+    if (Object.keys(models).length > 0) {
+      provider.models = models;
+    }
+
+    config.provider[providerId] = provider;
+  });
+
+  const preferredChannel = pickPrimaryChannel(channels);
+  if (!defaultModelRef && preferredChannel?.model) {
+    const providerId = sanitizeOpenCodeProviderId(preferredChannel.providerKey || preferredChannel.name);
+    defaultModelRef = `${providerId}/${preferredChannel.model}`;
+  }
+
+  if (defaultModelRef) {
+    config.model = defaultModelRef;
+  }
+
+  return config;
+}
+
+function syncImportedChannelsToNativeConfigs(importChannelsByType, nativeConfigs, overwrite) {
+  const hasNativeConfigFor = (platform) => !!nativeConfigs?.[platform] && Object.keys(nativeConfigs[platform]).length > 0;
+
+  try {
+    if (!hasNativeConfigFor('claude')) {
+      const primaryClaudeChannel = pickPrimaryChannel(importChannelsByType.claude);
+      const persistedClaudeChannel = findMatchingPersistedChannel(
+        channelsService.getAllChannels?.() || [],
+        primaryClaudeChannel,
+        [
+          (channel, imported) => channel.name === imported.name && channel.baseUrl === imported.baseUrl
+        ]
+      );
+      if (persistedClaudeChannel?.id) {
+        ensureDir(path.dirname(NATIVE_PATHS.claude.settings));
+        channelsService.applyChannelToSettings(persistedClaudeChannel.id);
+      }
+    }
+  } catch (err) {
+    console.warn('[ConfigImport] Claude native sync fallback failed:', err.message);
+  }
+
+  try {
+    if (!hasNativeConfigFor('codex')) {
+      codexChannelsService.writeCodexConfigForMultiChannel(importChannelsByType.codex || []);
+    }
+  } catch (err) {
+    console.warn('[ConfigImport] Codex native sync fallback failed:', err.message);
+  }
+
+  try {
+    if (!hasNativeConfigFor('gemini')) {
+      const primaryGeminiChannel = pickPrimaryChannel(importChannelsByType.gemini);
+      const persistedGeminiChannel = findMatchingPersistedChannel(
+        geminiChannelsService.getChannels?.().channels || [],
+        primaryGeminiChannel,
+        [
+          (channel, imported) => channel.name === imported.name && channel.baseUrl === imported.baseUrl
+        ]
+      );
+      if (persistedGeminiChannel?.id) {
+        geminiChannelsService.applyChannelToSettings(persistedGeminiChannel.id);
+      }
+    }
+  } catch (err) {
+    console.warn('[ConfigImport] Gemini native sync fallback failed:', err.message);
+  }
+
+  try {
+    if (!hasNativeConfigFor('opencode')) {
+      const openCodeSpecs = getNativeConfigSpecs().opencode || {};
+      const preferredSpec = [
+        openCodeSpecs.opencodeJsonc,
+        openCodeSpecs.opencodeJson,
+        openCodeSpecs.configJson
+      ].find(spec => spec?.path && fs.existsSync(spec.path))
+        || openCodeSpecs.opencodeJson
+        || openCodeSpecs.configJson;
+
+      if (preferredSpec?.path) {
+        const payload = buildOpenCodeNativeConfig(importChannelsByType.opencode || []);
+        writeTextFileAbsolute(preferredSpec.path, JSON.stringify(payload, null, 2), overwrite);
+      }
+    }
+  } catch (err) {
+    console.warn('[ConfigImport] OpenCode native sync fallback failed:', err.message);
+  }
+}
+
 function collectSkillFiles(baseDir) {
   const files = [];
   const stack = [baseDir];
@@ -277,8 +642,8 @@ function collectPluginFiles(pluginDir, basePath = '') {
   return files;
 }
 
-function exportSkillsSnapshot() {
-  const skillService = new SkillService();
+function exportSkillsSnapshot(platform = 'claude') {
+  const skillService = new SkillService(platform);
   const installedSkills = skillService.getInstalledSkills();
   const baseDir = skillService.installDir;
 
@@ -289,6 +654,7 @@ function exportSkillsSnapshot() {
       return null;
     }
     return {
+      platform,
       directory,
       name: skill.name || directory,
       description: skill.description || '',
@@ -297,6 +663,36 @@ function exportSkillsSnapshot() {
   }).filter(Boolean);
 }
 
+function exportSkillsSnapshotByPlatform() {
+  return SKILL_PLATFORMS.reduce((result, platform) => {
+    try {
+      result[platform] = exportSkillsSnapshot(platform);
+    } catch (err) {
+      console.warn(`[ConfigExport] Failed to export skills for ${platform}:`, err.message);
+      result[platform] = [];
+    }
+    return result;
+  }, {});
+}
+
+function exportNativeConfigs() {
+  const specs = getNativeConfigSpecs();
+  return Object.entries(specs).reduce((result, [platform, platformSpecs]) => {
+    const exportedEntries = Object.entries(platformSpecs).reduce((entries, [key, spec]) => {
+      const snapshot = readNativeConfigSnapshot(spec);
+      if (snapshot) {
+        entries[key] = snapshot;
+      }
+      return entries;
+    }, {});
+
+    if (Object.keys(exportedEntries).length > 0) {
+      result[platform] = exportedEntries;
+    }
+    return result;
+  }, {});
+}
+
 function exportLegacyPlugins() {
   const plugins = [];
 
@@ -447,38 +843,13 @@ function exportAllConfigs() {
     const favoritesService = require('./favorites');
     const favorites = favoritesService.loadFavorites();
 
-    // 获取 Agents 配置
-    const agentsService = new AgentsService();
-    const { agents: rawAgents } = agentsService.listAgents();
-    const agents = rawAgents.map(agent => ({
-      fileName: agent.fileName,
-      name: agent.name,
-      description: agent.description,
-      tools: agent.tools,
-      model: agent.model,
-      permissionMode: agent.permissionMode,
-      skills: agent.skills,
-      path: agent.path,
-      systemPrompt: agent.systemPrompt,
-      fullContent: agent.fullContent
-    }));
-
-    // 获取 Skills 配置
-    const skills = exportSkillsSnapshot();
-
-    // 获取 Commands 配置
-    const commandsService = new CommandsService();
-    const { commands: rawCommands } = commandsService.listCommands();
-    const commands = rawCommands.map(command => ({
-      name: command.name,
-      namespace: command.namespace,
-      description: command.description,
-      allowedTools: command.allowedTools,
-      argumentHint: command.argumentHint,
-      path: command.path,
-      body: command.body,
-      fullContent: command.fullContent
-    }));
+    // 获取 Agents / Skills / Commands 配置（多平台）
+    const agentsByPlatform = exportAgentsSnapshotByPlatform();
+    const skillsByPlatform = exportSkillsSnapshotByPlatform();
+    const commandsByPlatform = exportCommandsSnapshotByPlatform();
+    const agents = agentsByPlatform.claude || [];
+    const skills = skillsByPlatform.claude || [];
+    const commands = commandsByPlatform.claude || [];
 
     // 获取 MCP 配置
     const mcpService = require('./mcp-service');
@@ -486,9 +857,10 @@ function exportAllConfigs() {
 
     // 获取 Plugins 配置
     const plugins = exportPluginsSnapshot();
+    const nativeConfigs = exportNativeConfigs();
+    const oauthCredentials = readJsonFileSafe(PATHS.oauthCredentials);
 
     // 读取 Markdown 配置文件
-    const { PATHS } = require('../../config/paths');
     const markdownFiles = {};
     const mdFileNames = ['CLAUDE.md', 'AGENTS.md', 'GEMINI.md'];
 
@@ -530,8 +902,11 @@ function exportAllConfigs() {
         workspaces: workspaces || { workspaces: [] },
         favorites: favorites || { favorites: [] },
         agents: agents || [],
+        agentsByPlatform,
         skills: skills || [],
+        skillsByPlatform,
         commands: commands || [],
+        commandsByPlatform,
         mcpServers: mcpServers || [],
         plugins: plugins || [],
         markdownFiles: markdownFiles,
@@ -539,6 +914,8 @@ function exportAllConfigs() {
         prompts: prompts,
         security: security,
         appConfig: appConfig,
+        nativeConfigs,
+        oauthCredentials,
         claudeHooks: claudeHooks
       }
     };
@@ -603,6 +980,8 @@ async function importConfigs(importData, options = {}) {
     prompts: { success: 0, failed: 0, skipped: 0 },
     security: { success: 0, failed: 0, skipped: 0 },
     appConfig: { success: 0, failed: 0, skipped: 0 },
+    nativeConfigs: { success: 0, failed: 0, skipped: 0 },
+    oauthCredentials: { success: 0, failed: 0, skipped: 0 },
     claudeHooks: { success: 0, failed: 0, skipped: 0 }
   };
 
@@ -619,17 +998,26 @@ async function importConfigs(importData, options = {}) {
       workspaces = null,
       favorites = null,
       agents = [],
+      agentsByPlatform = {},
       skills = [],
+      skillsByPlatform = {},
       commands = [],
+      commandsByPlatform = {},
       mcpServers = [],
       markdownFiles = {},
       uiConfig = null,
       prompts = null,
       security = null,
       appConfig = null,
+      nativeConfigs = {},
+      oauthCredentials = null,
       claudeHooks = null
     } = importData.data;
 
+    const importAgentsByPlatform = normalizePlatformItems(agents, agentsByPlatform, AGENT_PLATFORMS);
+    const importSkillsByPlatform = normalizePlatformItems(skills, skillsByPlatform, SKILL_PLATFORMS);
+    const importCommandsByPlatform = normalizePlatformItems(commands, commandsByPlatform, COMMAND_PLATFORMS);
+
     const hasTypedChannels = channelsByType && typeof channelsByType === 'object';
     const importChannelsByType = {
       claude: hasTypedChannels && Array.isArray(channelsByType.claude)
@@ -759,26 +1147,28 @@ async function importConfigs(importData, options = {}) {
       }
     }
 
-    // 导入 Agents
-    if (agents && agents.length > 0) {
+    // 导入 Agents（多平台）
+    if (AGENT_PLATFORMS.some(platform => importAgentsByPlatform[platform]?.length > 0)) {
       try {
-        const agentsService = new AgentsService();
-        const baseDir = agentsService.userAgentsDir;
-
-        for (const agent of agents) {
-          const relativePath = agent.path || agent.fileName || agent.name;
-          const filePath = relativePath && relativePath.endsWith('.md')
-            ? relativePath
-            : (relativePath ? `${relativePath}.md` : null);
-          const content = agent.fullContent || agent.content || buildAgentContent(agent);
-
-          const status = filePath ? writeTextFile(baseDir, filePath, content, overwrite) : 'failed';
-          if (status === 'success') {
-            results.agents.success++;
-          } else if (status === 'skipped') {
-            results.agents.skipped++;
-          } else {
-            results.agents.failed++;
+        for (const platform of AGENT_PLATFORMS) {
+          const platformAgents = importAgentsByPlatform[platform] || [];
+          if (platformAgents.length === 0) continue;
+
+          const agentsService = new AgentsService(platform);
+          const baseDir = agentsService.userAgentsDir;
+
+          for (const agent of platformAgents) {
+            const filePath = resolveAgentRelativePath(agent, platform);
+            const content = agent.fullContent || agent.content || buildAgentContent(agent);
+            const status = filePath ? writeTextFile(baseDir, filePath, content, overwrite) : 'failed';
+
+            if (status === 'success') {
+              results.agents.success++;
+            } else if (status === 'skipped') {
+              results.agents.skipped++;
+            } else {
+              results.agents.failed++;
+            }
           }
         }
       } catch (err) {
@@ -786,56 +1176,61 @@ async function importConfigs(importData, options = {}) {
       }
     }
 
-    // 导入 Skills
-    if (skills && skills.length > 0) {
+    // 导入 Skills（多平台）
+    if (SKILL_PLATFORMS.some(platform => importSkillsByPlatform[platform]?.length > 0)) {
       try {
-        const skillService = new SkillService();
-        const baseDir = skillService.installDir;
-        ensureDir(baseDir);
-
-        for (const skill of skills) {
-          const directory = skill.directory;
-          const skillDir = resolveSafePath(baseDir, directory);
-          if (!skillDir) {
-            results.skills.failed++;
-            continue;
-          }
-
-          if (fs.existsSync(skillDir)) {
-            if (!overwrite) {
-              results.skills.skipped++;
+        for (const platform of SKILL_PLATFORMS) {
+          const platformSkills = importSkillsByPlatform[platform] || [];
+          if (platformSkills.length === 0) continue;
+
+          const skillService = new SkillService(platform);
+          const baseDir = skillService.installDir;
+          ensureDir(baseDir);
+
+          for (const skill of platformSkills) {
+            const directory = skill.directory;
+            const skillDir = resolveSafePath(baseDir, directory);
+            if (!skillDir) {
+              results.skills.failed++;
               continue;
             }
-            fs.rmSync(skillDir, { recursive: true, force: true });
-          }
 
-          ensureDir(skillDir);
-          const files = Array.isArray(skill.files) ? skill.files : [];
-          let failed = false;
-
-          for (const file of files) {
-            const filePath = resolveSafePath(skillDir, file.path);
-            if (!filePath) {
-              failed = true;
-              break;
+            if (fs.existsSync(skillDir)) {
+              if (!overwrite) {
+                results.skills.skipped++;
+                continue;
+              }
+              fs.rmSync(skillDir, { recursive: true, force: true });
             }
-            ensureDir(path.dirname(filePath));
-            try {
-              if (file.encoding === SKILL_FILE_ENCODING) {
-                fs.writeFileSync(filePath, Buffer.from(file.content || '', SKILL_FILE_ENCODING));
-              } else {
-                fs.writeFileSync(filePath, file.content || '', file.encoding || 'utf8');
+
+            ensureDir(skillDir);
+            const files = Array.isArray(skill.files) ? skill.files : [];
+            let failed = false;
+
+            for (const file of files) {
+              const filePath = resolveSafePath(skillDir, file.path);
+              if (!filePath) {
+                failed = true;
+                break;
+              }
+              ensureDir(path.dirname(filePath));
+              try {
+                if (file.encoding === SKILL_FILE_ENCODING) {
+                  fs.writeFileSync(filePath, Buffer.from(file.content || '', SKILL_FILE_ENCODING));
+                } else {
+                  fs.writeFileSync(filePath, file.content || '', file.encoding || 'utf8');
+                }
+              } catch (err) {
+                failed = true;
+                break;
               }
-            } catch (err) {
-              failed = true;
-              break;
             }
-          }
 
-          if (failed || files.length === 0) {
-            results.skills.failed++;
-          } else {
-            results.skills.success++;
+            if (failed || files.length === 0) {
+              results.skills.failed++;
+            } else {
+              results.skills.success++;
+            }
           }
         }
       } catch (err) {
@@ -980,27 +1375,28 @@ async function importConfigs(importData, options = {}) {
       }
     }
 
-    // 导入 Commands
-    if (commands && commands.length > 0) {
+    // 导入 Commands（多平台）
+    if (COMMAND_PLATFORMS.some(platform => importCommandsByPlatform[platform]?.length > 0)) {
       try {
-        const commandsService = new CommandsService();
-        const baseDir = commandsService.userCommandsDir;
-
-        for (const command of commands) {
-          const relativePath = command.path || (
-            command.namespace
-              ? path.join(command.namespace, `${command.name}.md`)
-              : `${command.name}.md`
-          );
-          const content = command.fullContent || command.content || buildCommandContent(command);
-
-          const status = relativePath ? writeTextFile(baseDir, relativePath, content, overwrite) : 'failed';
-          if (status === 'success') {
-            results.commands.success++;
-          } else if (status === 'skipped') {
-            results.commands.skipped++;
-          } else {
-            results.commands.failed++;
+        for (const platform of COMMAND_PLATFORMS) {
+          const platformCommands = importCommandsByPlatform[platform] || [];
+          if (platformCommands.length === 0) continue;
+
+          const commandsService = new CommandsService(platform);
+          const baseDir = commandsService.userCommandsDir;
+
+          for (const command of platformCommands) {
+            const relativePath = resolveCommandRelativePath(command);
+            const content = command.fullContent || command.content || buildCommandContent(command);
+
+            const status = relativePath ? writeTextFile(baseDir, relativePath, content, overwrite) : 'failed';
+            if (status === 'success') {
+              results.commands.success++;
+            } else if (status === 'skipped') {
+              results.commands.skipped++;
+            } else {
+              results.commands.failed++;
+            }
           }
         }
       } catch (err) {
@@ -1073,6 +1469,12 @@ async function importConfigs(importData, options = {}) {
       try {
         const status = writeJsonFileAbsolute(CC_PROMPTS_PATH, prompts, overwrite);
         if (status === 'success') {
+          const promptsService = require('./prompts-service');
+          if (prompts.activePresetId && prompts.presets?.[prompts.activePresetId]) {
+            await promptsService.activatePreset(prompts.activePresetId);
+          } else if (overwrite) {
+            await promptsService.deactivatePrompt();
+          }
           results.prompts.success++;
         } else if (status === 'skipped') {
           results.prompts.skipped++;
@@ -1119,6 +1521,55 @@ async function importConfigs(importData, options = {}) {
       }
     }
 
+    // 导入各平台原生配置
+    if (nativeConfigs && typeof nativeConfigs === 'object' && Object.keys(nativeConfigs).length > 0) {
+      const nativeConfigSpecs = getNativeConfigSpecs();
+
+      for (const [platform, platformEntries] of Object.entries(nativeConfigs)) {
+        const platformSpecs = nativeConfigSpecs[platform];
+        if (!platformSpecs || !platformEntries || typeof platformEntries !== 'object') {
+          continue;
+        }
+
+        for (const [key, entry] of Object.entries(platformEntries)) {
+          const spec = platformSpecs[key];
+          if (!spec) {
+            continue;
+          }
+
+          try {
+            const status = writeNativeConfigAbsolute(spec, entry, overwrite);
+            if (status === 'success') {
+              results.nativeConfigs.success++;
+            } else if (status === 'skipped') {
+              results.nativeConfigs.skipped++;
+            } else {
+              results.nativeConfigs.failed++;
+            }
+          } catch (err) {
+            console.error(`[ConfigImport] 导入 ${platform}.${key} 原生配置失败:`, err);
+            results.nativeConfigs.failed++;
+          }
+        }
+      }
+    }
+
+    if (oauthCredentials && typeof oauthCredentials === 'object') {
+      try {
+        const status = writeJsonFileAbsolute(PATHS.oauthCredentials, oauthCredentials, overwrite, { mode: 0o600 });
+        if (status === 'success') {
+          results.oauthCredentials.success++;
+        } else if (status === 'skipped') {
+          results.oauthCredentials.skipped++;
+        } else {
+          results.oauthCredentials.failed++;
+        }
+      } catch (err) {
+        console.error('[ConfigImport] 导入 OAuth 凭证失败:', err);
+        results.oauthCredentials.failed++;
+      }
+    }
+
     // 导入 Claude Hooks 配置
     if (claudeHooks && typeof claudeHooks === 'object') {
       let didWrite = false;
@@ -1172,6 +1623,8 @@ async function importConfigs(importData, options = {}) {
       }
     }
 
+    syncImportedChannelsToNativeConfigs(importChannelsByType, nativeConfigs, overwrite);
+
     return {
       success: true,
       results,
@@ -1208,6 +1661,8 @@ function generateImportSummary(results) {
     { key: 'prompts', label: 'Prompts' },
     { key: 'security', label: '安全配置' },
     { key: 'appConfig', label: '高级配置' },
+    { key: 'nativeConfigs', label: '原生配置' },
+    { key: 'oauthCredentials', label: 'OAuth凭证' },
     { key: 'claudeHooks', label: 'Claude Hooks' }
   ];