coding-tool-x 3.5.9 → 3.5.11

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

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

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

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const { PATHS, NATIVE_PATHS } = require('../../config/paths');
+const { resolveChannelWebsiteUrl } = require('../../config/channel-preset-websites');
 const { clearNativeOAuth } = require('./native-oauth-adapters');
 const { normalizeGatewaySourceType } = require('./base/proxy-utils');
 
@@ -22,7 +23,7 @@ const { normalizeGatewaySourceType } = require('./base/proxy-utils');
 
 // 获取 Gemini 配置目录
 function getGeminiDir() {
-  return NATIVE_PATHS.gemini.dir;
+  return path.dirname(NATIVE_PATHS.gemini.env);
 }
 
 // 获取渠道存储文件路径
@@ -35,7 +36,7 @@ function getChannelsFilePath() {
 }
 
 function readExistingGeminiEnv() {
-  const envPath = NATIVE_PATHS.gemini.env;
+  const envPath = path.join(getGeminiDir(), '.env');
   if (!fs.existsSync(envPath)) {
     return {};
   }
@@ -60,7 +61,7 @@ function readExistingGeminiEnv() {
 }
 
 function writeGeminiEnv(env = {}) {
-  const envPath = NATIVE_PATHS.gemini.env;
+  const envPath = path.join(getGeminiDir(), '.env');
   const content = Object.entries(env)
     .map(([key, value]) => `${key}=${value}`)
     .join('\n');
@@ -73,7 +74,7 @@ function writeGeminiEnv(env = {}) {
 
 // 检查是否在代理模式
 function isProxyConfig() {
-  const envPath = NATIVE_PATHS.gemini.env;
+  const envPath = path.join(getGeminiDir(), '.env');
   if (!fs.existsSync(envPath)) {
     return false;
   }
@@ -108,7 +109,7 @@ function loadChannels() {
     // 确保渠道有 enabled 字段（兼容旧数据）
     if (data.channels) {
       data.channels = data.channels.map(ch => {
-        return {
+        const normalized = {
           ...ch,
           enabled: ch.enabled !== false, // 默认启用
           weight: ch.weight || 1,
@@ -117,6 +118,8 @@ function loadChannels() {
           speedTestModel: ch.speedTestModel || null,
           gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType, 'gemini')
         };
+        normalized.websiteUrl = resolveChannelWebsiteUrl('gemini', normalized);
+        return normalized;
       });
     }
     return data;
@@ -128,7 +131,7 @@ function loadChannels() {
 
 // 从现有 .env 初始化渠道
 function initializeFromEnv() {
-  const envPath = NATIVE_PATHS.gemini.env;
+  const envPath = path.join(getGeminiDir(), '.env');
 
   const defaultData = { channels: [] };
 
@@ -166,6 +169,7 @@ function initializeFromEnv() {
         createdAt: Date.now(),
         updatedAt: Date.now()
       };
+      channel.websiteUrl = resolveChannelWebsiteUrl('gemini', channel);
 
       const data = {
         channels: [channel]
@@ -224,6 +228,7 @@ function createChannel(name, baseUrl, apiKey, model = 'gemini-2.5-pro', extraCon
     createdAt: Date.now(),
     updatedAt: Date.now()
   };
+  newChannel.websiteUrl = resolveChannelWebsiteUrl('gemini', newChannel);
 
   data.channels.push(newChannel);
   saveChannels(data);
@@ -267,6 +272,7 @@ function updateChannel(channelId, updates) {
     gatewaySourceType: normalizeGatewaySourceType(merged.gatewaySourceType, 'gemini'),
     updatedAt: Date.now()
   };
+  nextChannel.websiteUrl = resolveChannelWebsiteUrl('gemini', nextChannel);
   data.channels[index] = nextChannel;
 
   // Get proxy status
@@ -438,6 +444,10 @@ function getEnabledChannels() {
   return data.channels.filter(c => c.enabled !== false);
 }
 
+function markChannelAsRecentlyUsed(channelId) {
+  return updateChannel(channelId, {});
+}
+
 function getEffectiveApiKey(channel) {
   return channel.apiKey || null;
 }
@@ -476,6 +486,7 @@ module.exports = {
   getChannels,
   createChannel,
   updateChannel,
+  markChannelAsRecentlyUsed,
   deleteChannel,
   getEnabledChannels,
   getEffectiveApiKey,

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

@@ -1,18 +1,19 @@
 const fs = require('fs');
+const path = require('path');
 const { NATIVE_PATHS } = require('../../config/paths');
 
 /**
  * 获取 Gemini 配置目录
  */
 function getGeminiDir() {
-  return NATIVE_PATHS.gemini.dir;
+  return path.dirname(NATIVE_PATHS.gemini.env);
 }
 
 /**
  * 读取 .env 文件
  */
 function loadEnv() {
-  const envPath = NATIVE_PATHS.gemini.env;
+  const envPath = path.join(getGeminiDir(), '.env');
 
   if (!fs.existsSync(envPath)) {
     return {};
@@ -43,7 +44,7 @@ function loadEnv() {
  * 读取 settings.json
  */
 function loadSettings() {
-  const settingsPath = NATIVE_PATHS.gemini.settings;
+  const settingsPath = path.join(getGeminiDir(), 'settings.json');
 
   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, NATIVE_PATHS, joinNativeBasePath } = require('../../config/paths');
+const { HOME_DIR } = require('../../config/paths');
 const { getGeminiDir } = require('./gemini-config');
 
 // 路径映射缓存
@@ -13,7 +13,7 @@ const PATH_MAPPING_CACHE_TTL = 60000; // 1分钟缓存
  * 获取 Gemini tmp 目录（包含所有项目）
  */
 function getTmpDir() {
-  return NATIVE_PATHS?.gemini?.tmp || joinNativeBasePath(getGeminiDir(), 'tmp');
+  return path.join(getGeminiDir(), 'tmp');
 }
 
 /**
@@ -63,7 +63,7 @@ function scanDirForHashes(dir, targetHashes, maxDepth, results, currentDepth = 0
 
       if (item.isDirectory()) {
         scanDirForHashes(
-          joinNativeBasePath(dir, item.name),
+          path.join(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: 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 层子目录
+    { 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 层子目录
   ];
 
   for (const { dir, depth } of searchPaths) {
@@ -164,7 +164,7 @@ function scanProjects() {
  * @returns {Array} 会话文件路径数组
  */
 function scanProjectSessions(projectHash) {
-  const chatsDir = joinNativeBasePath(getTmpDir(), projectHash, 'chats');
+  const chatsDir = path.join(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 = joinNativeBasePath(chatsDir, entry.name);
+      const filePath = path.join(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 = joinNativeBasePath(getTmpDir(), projectHash);
+  const projectDir = path.join(getTmpDir(), projectHash);
 
   if (!fs.existsSync(projectDir)) {
     throw new Error('Project not found');
@@ -604,7 +604,7 @@ function saveSessionOrder(projectHash, order) {
  * @param {string} sessionId - 原会话 ID
  * @returns {Object} Fork 结果
  */
-function forkSession(sessionId) {
+function forkSession(sessionId, options = {}) {
   const allSessions = getAllSessions();
   const sourceSession = allSessions.find(s => s.sessionId === sessionId);
 
@@ -618,6 +618,35 @@ function forkSession(sessionId) {
     throw new Error('Failed to read source session');
   }
 
+  const sourceMessages = Array.isArray(fullSession.messages) ? fullSession.messages : [];
+  let truncatedMessages = sourceMessages;
+  if (Number.isInteger(options.afterUserMessageNumber) && options.afterUserMessageNumber > 0) {
+    let matchedUserMessages = 0;
+    let targetUserIndex = -1;
+    for (let index = 0; index < sourceMessages.length; index += 1) {
+      if (sourceMessages[index]?.type !== 'user') continue;
+      matchedUserMessages += 1;
+      if (matchedUserMessages >= options.afterUserMessageNumber) {
+        targetUserIndex = index;
+        break;
+      }
+    }
+
+    if (targetUserIndex < 0) {
+      throw new Error(`afterUserMessageNumber ${options.afterUserMessageNumber} exceeds available user messages (${matchedUserMessages})`);
+    }
+
+    let nextUserIndex = sourceMessages.length;
+    for (let index = targetUserIndex + 1; index < sourceMessages.length; index += 1) {
+      if (sourceMessages[index]?.type === 'user') {
+        nextUserIndex = index;
+        break;
+      }
+    }
+
+    truncatedMessages = sourceMessages.slice(0, nextUserIndex);
+  }
+
   // 生成新的会话 ID
   const newSessionId = crypto.randomUUID();
   const timestamp = new Date().toISOString().replace(/:/g, '-').replace(/\..+/, '');
@@ -630,21 +659,28 @@ function forkSession(sessionId) {
     sessionId: newSessionId,
     startTime: new Date().toISOString(),
     lastUpdated: new Date().toISOString(),
-    forkedFrom: sessionId
+    forkedFrom: sessionId,
+    messages: truncatedMessages
   };
 
   // 写入新文件
-  const chatsDir = joinNativeBasePath(getTmpDir(), sourceSession.projectHash, 'chats');
-  const newFilePath = joinNativeBasePath(chatsDir, newFileName);
+  const chatsDir = path.join(getTmpDir(), sourceSession.projectHash, 'chats');
+  const newFilePath = path.join(chatsDir, newFileName);
 
   try {
     fs.writeFileSync(newFilePath, JSON.stringify(newSession, null, 2), 'utf8');
+    if (options.alias) {
+      const { setAlias } = require('./alias');
+      setAlias(newSessionId, options.alias);
+    }
 
     return {
       success: true,
       sessionId: newSessionId,
       filePath: newFilePath,
-      forkedFrom: sessionId
+      forkedFrom: sessionId,
+      alias: options.alias || null,
+      afterUserMessageNumber: options.afterUserMessageNumber || null
     };
   } catch (err) {
     throw new Error('Failed to fork session: ' + err.message);
@@ -685,8 +721,5 @@ module.exports = {
   saveSessionOrder,
   forkSession,
   getProjectPath,
-  getProjectAndSessionCounts,
-  _test: {
-    getTmpDir
-  }
+  getProjectAndSessionCounts
 };

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

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