coding-tool-x 3.5.7 → 3.5.9

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

@@ -16,21 +16,43 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const toml = require('toml');
 const tomlStringify = require('@iarna/toml').stringify;
 const { convertSkillToCodex, convertCommandToCodex } = require('./format-converter');
-const { PATHS, NATIVE_PATHS, HOME_DIR, ensureStorageDirMigrated } = require('../../config/paths');
+const {
+  PATHS,
+  NATIVE_PATHS,
+  HOME_DIR,
+  ensureStorageDirMigrated,
+  getNativePlatformDir,
+  isWindowsAbsolutePath,
+  isNativeAbsolutePath,
+  joinNativeBasePath,
+  resolveNativeBasePath,
+  getNativePathDir
+} = require('../../config/paths');
 
-// Paths
-const HOME = HOME_DIR || os.homedir();
 const CC_TOOL_CONFIGS = PATHS.configs;
-const CLAUDE_CODE_DIR = path.join(HOME, '.claude');
-const CODEX_DIR = path.join(HOME, '.codex');
-const GEMINI_DIR = path.join(HOME, '.gemini');
+const CLAUDE_CODE_DIR = getNativePlatformDir('claude');
+const CODEX_DIR = getNativePlatformDir('codex');
+const GEMINI_DIR = getNativePlatformDir('gemini');
 const OPENCODE_DIR = NATIVE_PATHS.opencode.config;
 const CODEX_CONFIG_PATH = NATIVE_PATHS.codex.config;
 
+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}/`);
+}
+
 // Config type definitions
 const CONFIG_TYPES = {
   skills: {
@@ -108,7 +130,7 @@ class ConfigSyncManager {
       return { success: false, error: 'Invalid config item name' };
     }
     const sourcePath = path.join(this.ccToolConfigs, type, safeName);
-    const targetPath = path.join(this.claudeDir, config.claudeTarget, safeName);
+    const targetPath = joinNativeBasePath(this.claudeDir, config.claudeTarget, safeName);
 
     // Check if source exists
     if (!fs.existsSync(sourcePath)) {
@@ -119,12 +141,12 @@ class ConfigSyncManager {
     try {
       if (config.isDirectory) {
         // Copy entire directory recursively
-        this._ensureDir(path.dirname(targetPath));
+        this._ensureDir(getNativePathDir(targetPath));
         this._copyDirRecursive(sourcePath, targetPath);
         console.log(`[ConfigSyncManager] Synced ${type}/${name} to Claude Code (directory)`);
       } else {
         // Copy single file, preserving subdirectory structure
-        this._ensureDir(path.dirname(targetPath));
+        this._ensureDir(getNativePathDir(targetPath));
         this._copyFile(sourcePath, targetPath);
         console.log(`[ConfigSyncManager] Synced ${type}/${name} to Claude Code (file)`);
       }
@@ -152,7 +174,7 @@ class ConfigSyncManager {
     if (!safeName) {
       return { success: false, error: 'Invalid config item name' };
     }
-    const targetPath = path.join(this.claudeDir, config.claudeTarget, safeName);
+    const targetPath = joinNativeBasePath(this.claudeDir, config.claudeTarget, safeName);
 
     if (!fs.existsSync(targetPath)) {
       console.log(`[ConfigSyncManager] Target not found (already removed): ${targetPath}`);
@@ -170,7 +192,7 @@ class ConfigSyncManager {
         console.log(`[ConfigSyncManager] Removed ${type}/${name} from Claude Code (file)`);
 
         // Clean up empty parent directories for file-based configs
-        this._cleanupEmptyParents(path.dirname(targetPath), path.join(this.claudeDir, config.claudeTarget));
+        this._cleanupEmptyParents(getNativePathDir(targetPath), joinNativeBasePath(this.claudeDir, config.claudeTarget));
       }
 
       return { success: true };
@@ -260,7 +282,7 @@ class ConfigSyncManager {
 
       if (type === 'skills') {
         // Skills: copy directory, convert SKILL.md content
-        const targetPath = path.join(this.codexDir, config.codexTarget, safeName);
+        const targetPath = joinNativeBasePath(this.codexDir, config.codexTarget, safeName);
         this._ensureDir(targetPath);
 
         // Copy all files, converting SKILL.md
@@ -288,8 +310,8 @@ class ConfigSyncManager {
         }
 
         // Target path in codex prompts (same relative path structure)
-        const targetPath = path.join(this.codexDir, config.codexTarget, safeName);
-        this._ensureDir(path.dirname(targetPath));
+        const targetPath = joinNativeBasePath(this.codexDir, config.codexTarget, safeName);
+        this._ensureDir(getNativePathDir(targetPath));
         fs.writeFileSync(targetPath, result.content, 'utf-8');
 
         console.log(`[ConfigSyncManager] Synced ${type}/${name} to Codex (prompt)`);
@@ -354,7 +376,7 @@ class ConfigSyncManager {
       }
     }
 
-    const targetPath = path.join(this.codexDir, config.codexTarget, safeName);
+    const targetPath = joinNativeBasePath(this.codexDir, config.codexTarget, safeName);
 
     if (!fs.existsSync(targetPath)) {
       console.log(`[ConfigSyncManager] Target not found (already removed): ${targetPath}`);
@@ -372,7 +394,7 @@ class ConfigSyncManager {
         console.log(`[ConfigSyncManager] Removed ${type}/${name} from Codex (prompt)`);
 
         // Clean up empty parent directories
-        this._cleanupEmptyParents(path.dirname(targetPath), path.join(this.codexDir, config.codexTarget));
+        this._cleanupEmptyParents(getNativePathDir(targetPath), joinNativeBasePath(this.codexDir, config.codexTarget));
       }
 
       return { success: true };
@@ -411,8 +433,8 @@ class ConfigSyncManager {
     }
 
     try {
-      const targetPath = path.join(this.geminiDir, config.geminiTarget, safeName);
-      this._ensureDir(path.dirname(targetPath));
+      const targetPath = joinNativeBasePath(this.geminiDir, config.geminiTarget, safeName);
+      this._ensureDir(getNativePathDir(targetPath));
       this._copyDirRecursive(sourcePath, targetPath);
       console.log(`[ConfigSyncManager] Synced ${type}/${name} to Gemini (directory)`);
       return { success: true, target: targetPath };
@@ -443,7 +465,7 @@ class ConfigSyncManager {
       return { success: true, skipped: true, reason: 'Not supported by Gemini' };
     }
 
-    const targetPath = path.join(this.geminiDir, config.geminiTarget, safeName);
+    const targetPath = joinNativeBasePath(this.geminiDir, config.geminiTarget, safeName);
     if (!fs.existsSync(targetPath)) {
       console.log(`[ConfigSyncManager] Target not found (already removed): ${targetPath}`);
       return { success: true, message: 'Already removed' };
@@ -489,14 +511,14 @@ class ConfigSyncManager {
 
     try {
       const targetBaseDir = this._getOpenCodeTypeBaseDir(config);
-      const targetPath = path.join(targetBaseDir, safeName);
+      const targetPath = joinNativeBasePath(targetBaseDir, safeName);
 
       if (config.isDirectory) {
-        this._ensureDir(path.dirname(targetPath));
+        this._ensureDir(getNativePathDir(targetPath));
         this._copyDirRecursive(sourcePath, targetPath);
         console.log(`[ConfigSyncManager] Synced ${type}/${name} to OpenCode (directory)`);
       } else {
-        this._ensureDir(path.dirname(targetPath));
+        this._ensureDir(getNativePathDir(targetPath));
         this._copyFile(sourcePath, targetPath);
         console.log(`[ConfigSyncManager] Synced ${type}/${name} to OpenCode (file)`);
       }
@@ -544,7 +566,7 @@ class ConfigSyncManager {
       } else {
         fs.unlinkSync(targetPath);
         console.log(`[ConfigSyncManager] Removed ${type}/${name} from OpenCode (file)`);
-        this._cleanupEmptyParents(path.dirname(targetPath), targetBaseDir);
+        this._cleanupEmptyParents(getNativePathDir(targetPath), targetBaseDir);
       }
 
       return { success: true };
@@ -744,7 +766,7 @@ class ConfigSyncManager {
    * OpenCode supports both plural (new) and singular (legacy) folder names.
    */
   _getOpenCodeTypeBaseDir(config) {
-    const modernDir = path.join(this.opencodeDir, config.opencodeTarget);
+    const modernDir = joinNativeBasePath(this.opencodeDir, config.opencodeTarget);
     // 技能目录强制使用 modern/plural 形式，避免 legacy 目录带来的跨平台历史污染
     if (config === this.configTypes.skills) {
       return modernDir;
@@ -754,7 +776,7 @@ class ConfigSyncManager {
       return modernDir;
     }
 
-    const legacyDir = path.join(this.opencodeDir, config.opencodeLegacyTarget);
+    const legacyDir = joinNativeBasePath(this.opencodeDir, config.opencodeLegacyTarget);
     if (fs.existsSync(legacyDir) && !fs.existsSync(modernDir)) {
       return legacyDir;
     }
@@ -777,12 +799,11 @@ class ConfigSyncManager {
    * Clean up empty parent directories up to the base directory
    */
   _cleanupEmptyParents(dir, baseDir) {
-    // Normalize paths for comparison
-    const normalizedDir = path.resolve(dir);
-    const normalizedBase = path.resolve(baseDir);
+    const normalizedDir = resolveNativeBasePath(dir);
+    const normalizedBase = resolveNativeBasePath(baseDir);
 
     // Don't go above base directory
-    if (!normalizedDir.startsWith(normalizedBase) || normalizedDir === normalizedBase) {
+    if (!isPathInsideNativeDir(normalizedDir, normalizedBase) || normalizedDir === normalizedBase) {
       return;
     }
 
@@ -792,7 +813,7 @@ class ConfigSyncManager {
         fs.rmdirSync(dir);
         console.log(`[ConfigSyncManager] Removed empty directory: ${dir}`);
         // Recurse to parent
-        this._cleanupEmptyParents(path.dirname(dir), baseDir);
+        this._cleanupEmptyParents(getNativePathDir(dir), baseDir);
       }
     } catch (err) {
       // Ignore errors (directory might not exist or permission issues)
@@ -810,7 +831,7 @@ class ConfigSyncManager {
       return null;
     }
 
-    if (path.isAbsolute(raw) || raw.startsWith('/')) {
+    if (isNativeAbsolutePath(raw) || raw.startsWith('/')) {
       return null;
     }
 
@@ -860,35 +881,34 @@ class ConfigSyncManager {
     if (!normalized) return '';
 
     if (normalized.startsWith('~/')) {
-      return path.join(HOME, 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);
   }
 
   _isManagedCodexAgentConfigPath(configPath) {
     const resolved = this._resolveCodexPath(configPath);
     if (!resolved) return false;
 
-    const managedRoot = path.resolve(this._getCodexManagedAgentConfigDir()) + path.sep;
-    return resolved.startsWith(managedRoot) || resolved === path.resolve(this._getCodexManagedAgentConfigDir());
+    return isPathInsideNativeDir(resolved, this._getCodexManagedAgentConfigDir());
   }
 
   _getCodexManagedAgentConfigDir() {
-    return path.join(this.codexDir, 'agents');
+    return NATIVE_PATHS.codex.agents;
   }
 
   _getCodexManagedAgentConfigPath(fileName) {
-    return path.join(this._getCodexManagedAgentConfigDir(), `${fileName}.toml`);
+    return joinNativeBasePath(this._getCodexManagedAgentConfigDir(), `${fileName}.toml`);
   }
 
   _writeCodexAgentConfigFile(configPath, data) {
     const resolved = this._resolveCodexPath(configPath);
-    this._ensureDir(path.dirname(resolved));
+    this._ensureDir(getNativePathDir(resolved));
     const tempPath = `${resolved}.tmp-${process.pid}-${Date.now()}`;
     fs.writeFileSync(tempPath, tomlStringify(data), 'utf-8');
     fs.renameSync(tempPath, resolved);
@@ -923,7 +943,7 @@ class ConfigSyncManager {
   }
 
   _writeCodexConfigToml(config) {
-    this._ensureDir(path.dirname(CODEX_CONFIG_PATH));
+    this._ensureDir(getNativePathDir(CODEX_CONFIG_PATH));
     const tempPath = `${CODEX_CONFIG_PATH}.tmp-${process.pid}-${Date.now()}`;
     fs.writeFileSync(tempPath, tomlStringify(config), 'utf-8');
     fs.renameSync(tempPath, CODEX_CONFIG_PATH);

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

@@ -15,10 +15,10 @@
 
 const fs = require('fs');
 const path = require('path');
-const { HOME_DIR } = require('../../config/paths');
+const { NATIVE_PATHS, joinNativeBasePath } = require('../../config/paths');
 
 // 全局配置目录
-const GLOBAL_CONFIG_DIR = path.join(HOME_DIR, '.claude');
+const GLOBAL_CONFIG_DIR = NATIVE_PATHS.claude.dir;
 
 // 配置类型定义
 const CONFIG_TYPES = {
@@ -96,7 +96,7 @@ class ConfigSyncService {
             let dir;
 
             if (source === 'global') {
-                dir = path.join(this.globalConfigDir, config.globalDir);
+                dir = joinNativeBasePath(this.globalConfigDir, config.globalDir);
             } else if (source === 'workspace' && projectPath) {
                 if (!config.projectDir) {
                     // skills 不支持项目级

package/src/server/services/gemini-channels.js

@@ -22,7 +22,7 @@ const { normalizeGatewaySourceType } = require('./base/proxy-utils');
 
 // 获取 Gemini 配置目录
 function getGeminiDir() {
-  return path.dirname(NATIVE_PATHS.gemini.env);
+  return NATIVE_PATHS.gemini.dir;
 }
 
 // 获取渠道存储文件路径
@@ -35,7 +35,7 @@ function getChannelsFilePath() {
 }
 
 function readExistingGeminiEnv() {
-  const envPath = path.join(getGeminiDir(), '.env');
+  const envPath = NATIVE_PATHS.gemini.env;
   if (!fs.existsSync(envPath)) {
     return {};
   }
@@ -60,7 +60,7 @@ function readExistingGeminiEnv() {
 }
 
 function writeGeminiEnv(env = {}) {
-  const envPath = path.join(getGeminiDir(), '.env');
+  const envPath = NATIVE_PATHS.gemini.env;
   const content = Object.entries(env)
     .map(([key, value]) => `${key}=${value}`)
     .join('\n');
@@ -73,7 +73,7 @@ function writeGeminiEnv(env = {}) {
 
 // 检查是否在代理模式
 function isProxyConfig() {
-  const envPath = path.join(getGeminiDir(), '.env');
+  const envPath = NATIVE_PATHS.gemini.env;
   if (!fs.existsSync(envPath)) {
     return false;
   }
@@ -128,7 +128,7 @@ function loadChannels() {
 
 // 从现有 .env 初始化渠道
 function initializeFromEnv() {
-  const envPath = path.join(getGeminiDir(), '.env');
+  const envPath = NATIVE_PATHS.gemini.env;
 
   const defaultData = { channels: [] };
 

package/src/server/services/gemini-config.js

@@ -1,19 +1,18 @@
 const fs = require('fs');
-const path = require('path');
 const { NATIVE_PATHS } = require('../../config/paths');
 
 /**
  * 获取 Gemini 配置目录
  */
 function getGeminiDir() {
-  return path.dirname(NATIVE_PATHS.gemini.env);
+  return NATIVE_PATHS.gemini.dir;
 }
 
 /**
  * 读取 .env 文件
  */
 function loadEnv() {
-  const envPath = path.join(getGeminiDir(), '.env');
+  const envPath = NATIVE_PATHS.gemini.env;
 
   if (!fs.existsSync(envPath)) {
     return {};
@@ -44,7 +43,7 @@ function loadEnv() {
  * 读取 settings.json
  */
 function loadSettings() {
-  const settingsPath = path.join(getGeminiDir(), 'settings.json');
+  const settingsPath = NATIVE_PATHS.gemini.settings;
 
   if (!fs.existsSync(settingsPath)) {
     return {};

package/src/server/services/gemini-sessions.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
-const { HOME_DIR } = require('../../config/paths');
+const { HOME_DIR, NATIVE_PATHS, joinNativeBasePath } = require('../../config/paths');
 const { getGeminiDir } = require('./gemini-config');
 
 // 路径映射缓存
@@ -13,7 +13,7 @@ const PATH_MAPPING_CACHE_TTL = 60000; // 1分钟缓存
  * 获取 Gemini tmp 目录（包含所有项目）
  */
 function getTmpDir() {
-  return path.join(getGeminiDir(), 'tmp');
+  return NATIVE_PATHS?.gemini?.tmp || joinNativeBasePath(getGeminiDir(), 'tmp');
 }
 
 /**
@@ -63,7 +63,7 @@ function scanDirForHashes(dir, targetHashes, maxDepth, results, currentDepth = 0
 
       if (item.isDirectory()) {
         scanDirForHashes(
-          path.join(dir, item.name),
+          joinNativeBasePath(dir, item.name),
           targetHashes,
           maxDepth,
           results,
@@ -108,17 +108,17 @@ function buildPathMapping() {
   // 深度说明：depth=3 表示可以扫描到 Desktop/a/b/c 这样的 4 层目录
   const searchPaths = [
     { dir: homeDir, depth: 0 },                           // 只检查 home 目录本身
-    { dir: path.join(homeDir, 'Desktop'), depth: 4 },     // Desktop 及 4 层子目录
-    { dir: path.join(homeDir, 'Documents'), depth: 4 },   // Documents 及 4 层子目录
-    { dir: path.join(homeDir, 'Downloads'), depth: 3 },   // Downloads 及 3 层子目录
-    { dir: path.join(homeDir, 'Projects'), depth: 4 },    // Projects 及 4 层子目录
-    { dir: path.join(homeDir, 'Code'), depth: 4 },        // Code 及 4 层子目录
-    { dir: path.join(homeDir, 'workspace'), depth: 4 },   // workspace 及 4 层子目录
-    { dir: path.join(homeDir, 'dev'), depth: 4 },         // dev 及 4 层子目录
-    { dir: path.join(homeDir, 'src'), depth: 4 },         // src 及 4 层子目录
-    { dir: path.join(homeDir, 'work'), depth: 4 },        // work 及 4 层子目录
-    { dir: path.join(homeDir, 'repos'), depth: 4 },       // repos 及 4 层子目录
-    { dir: path.join(homeDir, 'github'), depth: 4 },      // github 及 4 层子目录
+    { dir: joinNativeBasePath(homeDir, 'Desktop'), depth: 4 },     // Desktop 及 4 层子目录
+    { dir: joinNativeBasePath(homeDir, 'Documents'), depth: 4 },   // Documents 及 4 层子目录
+    { dir: joinNativeBasePath(homeDir, 'Downloads'), depth: 3 },   // Downloads 及 3 层子目录
+    { dir: joinNativeBasePath(homeDir, 'Projects'), depth: 4 },    // Projects 及 4 层子目录
+    { dir: joinNativeBasePath(homeDir, 'Code'), depth: 4 },        // Code 及 4 层子目录
+    { dir: joinNativeBasePath(homeDir, 'workspace'), depth: 4 },   // workspace 及 4 层子目录
+    { dir: joinNativeBasePath(homeDir, 'dev'), depth: 4 },         // dev 及 4 层子目录
+    { dir: joinNativeBasePath(homeDir, 'src'), depth: 4 },         // src 及 4 层子目录
+    { dir: joinNativeBasePath(homeDir, 'work'), depth: 4 },        // work 及 4 层子目录
+    { dir: joinNativeBasePath(homeDir, 'repos'), depth: 4 },       // repos 及 4 层子目录
+    { dir: joinNativeBasePath(homeDir, 'github'), depth: 4 },      // github 及 4 层子目录
   ];
 
   for (const { dir, depth } of searchPaths) {
@@ -164,7 +164,7 @@ function scanProjects() {
  * @returns {Array} 会话文件路径数组
  */
 function scanProjectSessions(projectHash) {
-  const chatsDir = path.join(getTmpDir(), projectHash, 'chats');
+  const chatsDir = joinNativeBasePath(getTmpDir(), projectHash, 'chats');
 
   if (!fs.existsSync(chatsDir)) {
     return [];
@@ -175,7 +175,7 @@ function scanProjectSessions(projectHash) {
   return entries
     .filter(entry => entry.isFile() && entry.name.match(/^session-.*\.json$/))
     .map(entry => {
-      const filePath = path.join(chatsDir, entry.name);
+      const filePath = joinNativeBasePath(chatsDir, entry.name);
       // 文件名格式：session-2025-11-23T02-09-87570eb4.json
       // session-{timestamp}-{shortId}.json
       const match = entry.name.match(/^session-(.*)-([a-f0-9]+)\.json$/);
@@ -451,7 +451,7 @@ function deleteSession(sessionId) {
  * @returns {Object} 删除结果
  */
 function deleteProject(projectHash) {
-  const projectDir = path.join(getTmpDir(), projectHash);
+  const projectDir = joinNativeBasePath(getTmpDir(), projectHash);
 
   if (!fs.existsSync(projectDir)) {
     throw new Error('Project not found');
@@ -634,8 +634,8 @@ function forkSession(sessionId) {
   };
 
   // 写入新文件
-  const chatsDir = path.join(getTmpDir(), sourceSession.projectHash, 'chats');
-  const newFilePath = path.join(chatsDir, newFileName);
+  const chatsDir = joinNativeBasePath(getTmpDir(), sourceSession.projectHash, 'chats');
+  const newFilePath = joinNativeBasePath(chatsDir, newFileName);
 
   try {
     fs.writeFileSync(newFilePath, JSON.stringify(newSession, null, 2), 'utf8');
@@ -685,5 +685,8 @@ module.exports = {
   saveSessionOrder,
   forkSession,
   getProjectPath,
-  getProjectAndSessionCounts
+  getProjectAndSessionCounts,
+  _test: {
+    getTmpDir
+  }
 };

package/src/server/services/gemini-settings-manager.js

@@ -1,5 +1,4 @@
 const fs = require('fs');
-const path = require('path');
 const { NATIVE_PATHS } = require('../../config/paths');
 
 // Gemini 配置文件路径
@@ -8,7 +7,7 @@ function getEnvPath() {
 }
 
 function getSettingsPath() {
-  return path.join(path.dirname(NATIVE_PATHS.gemini.env), 'settings.json');
+  return NATIVE_PATHS.gemini.settings;
 }
 
 // 备份文件路径
@@ -17,7 +16,7 @@ function getEnvBackupPath() {
 }
 
 function getSettingsBackupPath() {
-  return path.join(path.dirname(NATIVE_PATHS.gemini.env), 'settings.json.cc-tool-backup');
+  return NATIVE_PATHS.gemini.settingsBackup;
 }
 
 // 检查配置文件是否存在

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

@@ -6,29 +6,24 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const toml = require('@iarna/toml');
 const { spawn } = require('child_process');
 const http = require('http');
 const https = require('https');
 const { McpClient, buildMissingCommandMessage, createMissingCommandHint } = require('./mcp-client');
-const { NATIVE_PATHS, PATHS } = require('../../config/paths');
-const { resolvePreferredHomeDir } = require('../../utils/home-dir');
-
-const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
+const { NATIVE_PATHS, PATHS, HOME_DIR, getNativePathDir, joinNativeBasePath } = require('../../config/paths');
 
 // MCP 配置文件路径
 const MCP_SERVERS_FILE = PATHS.mcpServers;
 
 // 各平台配置文件路径
-const CLAUDE_CONFIG_PATH = path.join(HOME_DIR, '.claude.json');
+const CLAUDE_CONFIG_PATH = joinNativeBasePath(HOME_DIR, '.claude.json');
 const CODEX_CONFIG_PATH = NATIVE_PATHS.codex.config;
-const GEMINI_CONFIG_PATH = path.join(path.dirname(NATIVE_PATHS.gemini.env), 'settings.json');
-const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
+const GEMINI_CONFIG_PATH = NATIVE_PATHS.gemini.settings;
 const OPENCODE_CONFIG_PATHS = {
-  jsonc: path.join(OPENCODE_CONFIG_DIR, 'opencode.jsonc'),
-  json: path.join(OPENCODE_CONFIG_DIR, 'opencode.json'),
-  legacy: path.join(OPENCODE_CONFIG_DIR, 'config.json')
+  jsonc: NATIVE_PATHS.opencode.configJsonc,
+  json: NATIVE_PATHS.opencode.configJson,
+  legacy: NATIVE_PATHS.opencode.configLegacy
 };
 
 // MCP 客户端连接池
@@ -279,7 +274,7 @@ function readJsonFile(filePath, defaultValue = {}) {
  * 安全写入 JSON 文件（原子写入）
  */
 function writeJsonFile(filePath, data) {
-  ensureDir(path.dirname(filePath));
+  ensureDir(getNativePathDir(filePath));
   const tempPath = filePath + '.tmp';
   fs.writeFileSync(tempPath, JSON.stringify(data, null, 2), 'utf-8');
   fs.renameSync(tempPath, filePath);
@@ -305,7 +300,7 @@ function readTomlFile(filePath, defaultValue = {}) {
  * 安全写入 TOML 文件（原子写入）
  */
 function writeTomlFile(filePath, data) {
-  ensureDir(path.dirname(filePath));
+  ensureDir(getNativePathDir(filePath));
   const tempPath = filePath + '.tmp';
   fs.writeFileSync(tempPath, toml.stringify(data), 'utf-8');
   fs.renameSync(tempPath, filePath);
@@ -412,7 +407,7 @@ function readOpenCodeConfig() {
  * 写入 OpenCode 配置（保持 JSON 格式）
  */
 function writeOpenCodeConfig(filePath, data) {
-  ensureDir(path.dirname(filePath));
+  ensureDir(getNativePathDir(filePath));
   const tempPath = filePath + '.tmp';
   fs.writeFileSync(tempPath, JSON.stringify(data, null, 2), 'utf-8');
   fs.renameSync(tempPath, filePath);

package/src/server/services/native-oauth-adapters.js

@@ -4,7 +4,7 @@ const os = require('os');
 const crypto = require('crypto');
 const toml = require('toml');
 const tomlStringify = require('@iarna/toml').stringify;
-const { NATIVE_PATHS, PATHS } = require('../../config/paths');
+const { NATIVE_PATHS, PATHS, getNativePathDir } = require('../../config/paths');
 const claudeSettingsManager = require('./settings-manager');
 const codexSettingsManager = require('./codex-settings-manager');
 const geminiSettingsManager = require('./gemini-settings-manager');
@@ -35,7 +35,7 @@ function ensureFileMode(filePath, mode = 0o600) {
 }
 
 function writeJsonFile(filePath, value) {
-  ensureDir(path.dirname(filePath));
+  ensureDir(getNativePathDir(filePath));
   fs.writeFileSync(filePath, JSON.stringify(value, null, 2), 'utf8');
   ensureFileMode(filePath);
 }
@@ -562,7 +562,7 @@ function applyGeminiOAuth(credential) {
     }
   };
 
-  ensureDir(path.dirname(NATIVE_PATHS.gemini.oauthCredentialsEncrypted));
+  ensureDir(getNativePathDir(NATIVE_PATHS.gemini.oauthCredentialsEncrypted));
   fs.writeFileSync(
     NATIVE_PATHS.gemini.oauthCredentialsEncrypted,
     encryptGeminiPayload(JSON.stringify(payload, null, 2)),

package/src/server/services/notification-hooks.js

@@ -4,7 +4,7 @@ const os = require('os');
 const http = require('http');
 const https = require('https');
 const { execSync, execFileSync } = require('child_process');
-const { PATHS, NATIVE_PATHS } = require('../../config/paths');
+const { PATHS, NATIVE_PATHS, getNativePathDir, joinNativeBasePath } = require('../../config/paths');
 const { loadConfig } = require('../../config/loader');
 const { loadUIConfig, saveUIConfig } = require('./ui-config');
 const codexSettingsManager = require('./codex-settings-manager');
@@ -19,7 +19,7 @@ function normalizeType(type) {
 }
 
 function ensureParentDir(filePath) {
-  const dir = path.dirname(filePath);
+  const dir = getNativePathDir(filePath);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
@@ -269,7 +269,7 @@ function buildGeminiCommand(type) {
 }
 
 function getOpenCodeManagedPluginPath() {
-  return path.join(NATIVE_PATHS.opencode.config, 'plugins', MANAGED_OPENCODE_PLUGIN_FILE);
+  return joinNativeBasePath(NATIVE_PATHS.opencode.plugins, MANAGED_OPENCODE_PLUGIN_FILE);
 }
 
 function buildOpenCodePluginContent(type) {