coding-tool-x 3.5.9 → 3.5.11

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

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

package/src/server/services/network-access.js

@@ -16,21 +16,6 @@ function isLoopbackAddress(address) {
   return false;
 }
 
-function hasTrustedProxySocket(req) {
-  if (!req) return false;
-  return isLoopbackAddress(req.socket && req.socket.remoteAddress);
-}
-
-function getForwardedHeaderValue(req, headerName) {
-  if (!hasTrustedProxySocket(req) || !req.headers) {
-    return '';
-  }
-
-  const rawValue = req.headers[headerName];
-  const value = Array.isArray(rawValue) ? rawValue[0] : rawValue;
-  return String(value || '').split(',')[0].trim();
-}
-
 function isLoopbackRequest(req) {
   if (!req) return false;
   const socketAddress = req.socket && req.socket.remoteAddress;
@@ -45,34 +30,6 @@ function isLoopbackRequest(req) {
   return true;
 }
 
-function getRequestProtocol(req) {
-  const forwardedProto = getForwardedHeaderValue(req, 'x-forwarded-proto').toLowerCase();
-  if (forwardedProto === 'https' || forwardedProto === 'https:') {
-    return 'https:';
-  }
-  if (forwardedProto === 'http' || forwardedProto === 'http:') {
-    return 'http:';
-  }
-  return req && req.socket && req.socket.encrypted ? 'https:' : 'http:';
-}
-
-function getRequestHost(req) {
-  const forwardedHost = getForwardedHeaderValue(req, 'x-forwarded-host');
-  if (forwardedHost) {
-    return forwardedHost;
-  }
-
-  if (!req || !req.headers) {
-    return '';
-  }
-
-  const host = req.headers.host;
-  if (Array.isArray(host)) {
-    return String(host[0] || '').trim();
-  }
-  return String(host || '').trim();
-}
-
 function isSameOriginRequest(req) {
   if (!req) return false;
   const origin = req.headers && req.headers.origin;
@@ -80,32 +37,19 @@ function isSameOriginRequest(req) {
     return true;
   }
 
-  const host = getRequestHost(req);
+  const host = req.headers && req.headers.host;
   if (!host) {
     return false;
   }
 
   try {
     const originUrl = new URL(origin);
-    return originUrl.host.toLowerCase() === host.toLowerCase();
+    return originUrl.host === host;
   } catch (error) {
     return false;
   }
 }
 
-function isRemoteMutationAllowed(envValue) {
-  if (envValue === undefined || envValue === null) {
-    return true;
-  }
-
-  const normalized = String(envValue).trim().toLowerCase();
-  if (!normalized) {
-    return true;
-  }
-
-  return !['0', 'false', 'no', 'off'].includes(normalized);
-}
-
 function createRemoteMutationGuard(options = {}) {
   const enabled = options.enabled === true;
   const allowRemoteMutation = options.allowRemoteMutation === true;
@@ -167,10 +111,7 @@ module.exports = {
   normalizeAddress,
   isLoopbackAddress,
   isLoopbackRequest,
-  getRequestProtocol,
-  getRequestHost,
   isSameOriginRequest,
-  isRemoteMutationAllowed,
   createRemoteMutationGuard,
   createRemoteRouteGuard,
   createSameOriginGuard

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

@@ -4,12 +4,10 @@ const os = require('os');
 const http = require('http');
 const https = require('https');
 const { execSync, execFileSync } = require('child_process');
-const { PATHS, NATIVE_PATHS, getNativePathDir, joinNativeBasePath } = require('../../config/paths');
-const { loadConfig } = require('../../config/loader');
+const { PATHS, NATIVE_PATHS } = require('../../config/paths');
 const { loadUIConfig, saveUIConfig } = require('./ui-config');
 const codexSettingsManager = require('./codex-settings-manager');
 const geminiSettingsManager = require('./gemini-settings-manager');
-const { getWebUiProtocol } = require('./web-ui-runtime');
 
 const MANAGED_HOOK_NAME = 'coding-tool-notify';
 const MANAGED_OPENCODE_PLUGIN_FILE = 'coding-tool-notify.js';
@@ -19,7 +17,7 @@ function normalizeType(type) {
 }
 
 function ensureParentDir(filePath) {
-  const dir = getNativePathDir(filePath);
+  const dir = path.dirname(filePath);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
@@ -59,13 +57,6 @@ function getFeishuConfig() {
   };
 }
 
-function getBrowserNotificationConfig() {
-  const uiConfig = loadUIConfig();
-  return {
-    enabled: uiConfig.browserNotification?.enabled === true
-  };
-}
-
 function applyClaudeDisablePreference(uiConfig = {}, claudeEnabled) {
   const nextConfig = (uiConfig && typeof uiConfig === 'object') ? { ...uiConfig } : {};
   if (claudeEnabled) {
@@ -76,7 +67,7 @@ function applyClaudeDisablePreference(uiConfig = {}, claudeEnabled) {
   return nextConfig;
 }
 
-function saveNotificationUiConfig(feishu = {}, browser = {}, claudeEnabled) {
+function saveNotificationUiConfig(feishu = {}, claudeEnabled) {
   let uiConfig = loadUIConfig();
   if (typeof claudeEnabled === 'boolean') {
     uiConfig = applyClaudeDisablePreference(uiConfig, claudeEnabled);
@@ -85,9 +76,6 @@ function saveNotificationUiConfig(feishu = {}, browser = {}, claudeEnabled) {
     enabled: feishu.enabled === true,
     webhookUrl: feishu.webhookUrl || ''
   };
-  uiConfig.browserNotification = {
-    enabled: browser.enabled === true
-  };
   saveUIConfig(uiConfig);
 }
 
@@ -127,85 +115,6 @@ function removeNotifyScript() {
   }
 }
 
-function getNotificationSourceLabel(source = 'claude') {
-  switch (String(source || '').trim().toLowerCase()) {
-    case 'codex':
-      return 'Codex CLI';
-    case 'gemini':
-      return 'Gemini CLI';
-    case 'opencode':
-      return 'OpenCode';
-    default:
-      return 'Claude Code';
-  }
-}
-
-function resolveFallbackNotificationMessage(source = 'claude', eventType = '') {
-  const normalizedSource = String(source || '').trim().toLowerCase();
-  const normalizedEventType = String(eventType || '').trim();
-
-  if (normalizedSource === 'codex') {
-    if (normalizedEventType === 'agent-turn-complete') {
-      return 'Codex CLI 回合已完成 | 等待交互';
-    }
-    return 'Codex CLI 已返回结果 | 等待交互';
-  }
-
-  if (normalizedSource === 'gemini') {
-    return 'Gemini CLI 回合已完成 | 等待交互';
-  }
-
-  if (normalizedSource === 'opencode') {
-    if (normalizedEventType === 'session.error') {
-      return 'OpenCode 会话异常，请检查日志';
-    }
-    return 'OpenCode 响应已完成 | 等待交互';
-  }
-
-  return 'Claude Code 任务已完成 | 等待交互';
-}
-
-function buildBrowserNotificationEndpoint() {
-  try {
-    const config = loadConfig();
-    const port = Number(config?.ports?.webUI);
-    const resolvedPort = Number.isFinite(port) && port > 0 ? port : 19999;
-    const protocol = getWebUiProtocol();
-    return `${protocol}://127.0.0.1:${resolvedPort}/api/hooks/browser-event`;
-  } catch (error) {
-    return `${getWebUiProtocol()}://127.0.0.1:19999/api/hooks/browser-event`;
-  }
-}
-
-function buildBrowserNotificationPayload(input = {}) {
-  const rawSource = String(input?.source || '').trim().toLowerCase();
-  const source = ['claude', 'codex', 'gemini', 'opencode'].includes(rawSource) ? rawSource : 'claude';
-  const eventType = String(input?.eventType || input?.event_type || '').trim();
-  const rawMessage = String(input?.message || '').trim();
-  const timestamp = Number(input?.timestamp);
-
-  return {
-    title: String(input?.title || '').trim() || 'Coding Tool',
-    source,
-    sourceLabel: getNotificationSourceLabel(source),
-    mode: normalizeType(input?.mode),
-    eventType,
-    message: rawMessage || resolveFallbackNotificationMessage(source, eventType),
-    timestamp: Number.isFinite(timestamp) ? timestamp : Date.now()
-  };
-}
-
-function emitBrowserNotificationEvent(input = {}) {
-  const browser = getBrowserNotificationConfig();
-  if (!browser.enabled) {
-    return false;
-  }
-
-  const { broadcastBrowserNotification } = require('../websocket-server');
-  broadcastBrowserNotification(buildBrowserNotificationPayload(input));
-  return true;
-}
-
 function parseManagedType(input) {
   const value = String(input || '');
   const matches = [
@@ -269,7 +178,7 @@ function buildGeminiCommand(type) {
 }
 
 function getOpenCodeManagedPluginPath() {
-  return joinNativeBasePath(NATIVE_PATHS.opencode.plugins, MANAGED_OPENCODE_PLUGIN_FILE);
+  return path.join(NATIVE_PATHS.opencode.config, 'plugins', MANAGED_OPENCODE_PLUGIN_FILE);
 }
 
 function buildOpenCodePluginContent(type) {
@@ -524,10 +433,8 @@ function runWindowsPowerShellCommand(command) {
   });
 }
 
-function generateNotifyScript(feishu = {}, browser = {}) {
+function generateNotifyScript(feishu = {}) {
   const feishuEnabled = feishu.enabled === true && !!feishu.webhookUrl;
-  const browserEnabled = browser.enabled === true;
-  const browserEndpoint = browserEnabled ? buildBrowserNotificationEndpoint() : '';
 
   return `#!/usr/bin/env node
 // Coding Tool 通知脚本 - 自动生成，请勿手动修改
@@ -539,8 +446,6 @@ const { execSync, execFileSync } = require('child_process')
 
 const FEISHU_ENABLED = ${feishuEnabled ? 'true' : 'false'}
 const FEISHU_WEBHOOK_URL = ${JSON.stringify(feishuEnabled ? feishu.webhookUrl : '')}
-const BROWSER_ENABLED = ${browserEnabled ? 'true' : 'false'}
-const BROWSER_ENDPOINT = ${JSON.stringify(browserEndpoint)}
 
 function readArg(name) {
   const prefix = \`\${name}=\`
@@ -578,25 +483,21 @@ function readOptionalPayload() {
   return null
 }
 
-function resolveEventType(eventType, payload) {
-  return eventType || payload?.type || payload?.hook_event?.event_type || ''
-}
-
-function resolveMessage(source, effectiveEventType) {
-  const normalizedSource = String(source || '').trim().toLowerCase()
+function resolveMessage(source, eventType, payload) {
+  const effectiveEventType = eventType || payload?.type || payload?.hook_event?.event_type || ''
 
-  if (normalizedSource === 'codex') {
+  if (source === 'codex') {
     if (effectiveEventType === 'agent-turn-complete') {
       return 'Codex CLI 回合已完成 | 等待交互'
     }
     return 'Codex CLI 已返回结果 | 等待交互'
   }
 
-  if (normalizedSource === 'gemini') {
+  if (source === 'gemini') {
     return 'Gemini CLI 回合已完成 | 等待交互'
   }
 
-  if (normalizedSource === 'opencode') {
+  if (source === 'opencode') {
     if (effectiveEventType === 'session.error') {
       return 'OpenCode 会话异常，请检查日志'
     }
@@ -727,67 +628,15 @@ function sendFeishu(message, source) {
   })
 }
 
-function sendBrowserNotification(payload) {
-  if (!BROWSER_ENABLED || !BROWSER_ENDPOINT) {
-    return Promise.resolve()
-  }
-
-  return new Promise((resolve) => {
-    try {
-      const urlObj = new URL(BROWSER_ENDPOINT)
-      const data = JSON.stringify(payload)
-      const options = {
-        hostname: urlObj.hostname,
-        port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
-        path: urlObj.pathname + urlObj.search,
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          'Content-Length': Buffer.byteLength(data)
-        },
-        timeout: 5000
-      }
-
-      if (urlObj.protocol === 'https:' && ['127.0.0.1', 'localhost', '::1'].includes(urlObj.hostname)) {
-        options.rejectUnauthorized = false
-      }
-
-      const requestModule = urlObj.protocol === 'https:' ? https : http
-      const request = requestModule.request(options, () => resolve())
-      request.on('error', () => resolve())
-      request.on('timeout', () => {
-        request.destroy()
-        resolve()
-      })
-      request.write(data)
-      request.end()
-    } catch (error) {
-      resolve()
-    }
-  })
-}
-
 (async () => {
   const source = readArg('--source') || 'claude'
   const mode = readArg('--mode') || readArg('--cc-notify-type') || 'notification'
   const eventType = readArg('--event-type') || ''
   const payload = readOptionalPayload()
-  const effectiveEventType = resolveEventType(eventType, payload)
-  const normalizedMode = mode === 'dialog' ? 'dialog' : 'notification'
-  const message = resolveMessage(source, effectiveEventType)
-  const timestamp = Date.now()
-
-  notify(normalizedMode, message)
-  await Promise.all([
-    sendFeishu(message, source),
-    sendBrowserNotification({
-      source,
-      mode: normalizedMode,
-      eventType: effectiveEventType,
-      message,
-      timestamp
-    })
-  ])
+  const message = resolveMessage(source, eventType, payload)
+
+  notify(mode === 'dialog' ? 'dialog' : 'notification', message)
+  await sendFeishu(message, source)
 })().catch(() => {
   process.exit(0)
 })
@@ -1007,9 +856,9 @@ function runWindowsPowerShellCommand(command) {
 `;
 }
 
-function writeNotifyScript(feishu = {}, browser = getBrowserNotificationConfig()) {
+function writeNotifyScript(feishu = {}) {
   ensureParentDir(PATHS.notifyHook);
-  fs.writeFileSync(PATHS.notifyHook, generateNotifyScript(feishu, browser), { mode: 0o755 });
+  fs.writeFileSync(PATHS.notifyHook, generateNotifyScript(feishu), { mode: 0o755 });
 }
 
 function getClaudeHookStatus() {
@@ -1318,7 +1167,6 @@ function getNotificationSettings() {
     success: true,
     platform: os.platform(),
     feishu: getFeishuConfig(),
-    browser: getBrowserNotificationConfig(),
     platforms: {
       claude: getClaudeHookStatus(),
       codex: getCodexHookStatus(),
@@ -1337,7 +1185,6 @@ function normalizePlatformInput(platform = {}) {
 
 function saveNotificationSettings(input = {}) {
   const existingFeishu = getFeishuConfig();
-  const existingBrowser = getBrowserNotificationConfig();
   const requestedWebhookUrl = String(input?.feishu?.webhookUrl || '').trim();
   const feishu = {
     enabled: input?.feishu?.enabled === true,
@@ -1346,11 +1193,6 @@ function saveNotificationSettings(input = {}) {
   if (feishu.enabled && feishu.webhookUrl) {
     validateFeishuWebhookUrl(feishu.webhookUrl);
   }
-  const browser = {
-    enabled: input?.browser !== undefined
-      ? input?.browser?.enabled === true
-      : existingBrowser.enabled === true
-  };
   const platforms = {
     claude: normalizePlatformInput(input?.platforms?.claude),
     codex: normalizePlatformInput(input?.platforms?.codex),
@@ -1358,11 +1200,11 @@ function saveNotificationSettings(input = {}) {
     opencode: normalizePlatformInput(input?.platforms?.opencode)
   };
 
-  saveNotificationUiConfig(feishu, browser, platforms.claude.enabled);
+  saveNotificationUiConfig(feishu, platforms.claude.enabled);
 
   const hasManagedPlatform = Object.values(platforms).some((platform) => platform.enabled);
   if (hasManagedPlatform) {
-    writeNotifyScript(feishu, browser);
+    writeNotifyScript(feishu);
   }
 
   saveClaudeHook(platforms.claude.enabled, platforms.claude.type);
@@ -1505,9 +1347,6 @@ function buildLegacyClaudeSaveInput(input = {}, currentSettings = getNotificatio
       : {
           enabled: currentSettings?.feishu?.enabled === true,
           webhookUrl: currentSettings?.feishu?.webhookUrl || ''
-        },
-    browser: {
-      enabled: currentSettings?.browser?.enabled === true
         }
   };
 }
@@ -1517,7 +1356,6 @@ function getLegacyClaudeHookSettings() {
     success: true,
     stopHook: parseStopHookStatus(readClaudeSettings()),
     feishu: getFeishuConfig(),
-    browser: getBrowserNotificationConfig(),
     platform: os.platform()
   };
 }
@@ -1715,7 +1553,7 @@ function syncManagedNotificationAssets() {
   const hasManagedPlatform = Object.values(settings?.platforms || {}).some((platform) => platform?.enabled === true);
 
   if (hasManagedPlatform) {
-    writeNotifyScript(settings.feishu || {}, settings.browser || {});
+    writeNotifyScript(settings.feishu || {});
   } else {
     removeNotifyScript();
   }
@@ -1737,7 +1575,6 @@ module.exports = {
   getLegacyClaudeHookSettings,
   saveNotificationSettings,
   saveLegacyClaudeHookSettings,
-  emitBrowserNotificationEvent,
   testNotification,
   initDefaultHooks,
   syncManagedNotificationAssets,
@@ -1763,8 +1600,6 @@ module.exports = {
     buildGeminiCommand,
     buildStopHookCommand,
     buildClaudeCommand,
-    buildBrowserNotificationEndpoint,
-    buildBrowserNotificationPayload,
     buildOpenCodePluginContent,
     getOpenCodeManagedPluginPath,
     generateNotifyScript,

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

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const { PATHS } = require('../../config/paths');
+const { resolveChannelWebsiteUrl } = require('../../config/channel-preset-websites');
 const {
   setChannelConfig,
   clearManagedChannelConfig
@@ -83,6 +84,7 @@ function loadChannels() {
           allowedModels: ch.allowedModels || []
         };
         normalized.providerKey = deriveProviderKey(normalized);
+        normalized.websiteUrl = resolveChannelWebsiteUrl('opencode', normalized);
         return normalized;
       });
     }
@@ -165,6 +167,7 @@ function createChannel(name, baseUrl, apiKey, extraConfig = {}) {
     updatedAt: Date.now()
   };
   newChannel.providerKey = extraConfig.providerKey || deriveProviderKey(newChannel);
+  newChannel.websiteUrl = resolveChannelWebsiteUrl('opencode', newChannel);
 
   data.channels.push(newChannel);
 
@@ -213,6 +216,7 @@ function updateChannel(channelId, updates) {
     updatedAt: Date.now()
   };
   merged.providerKey = updates.providerKey || deriveProviderKey(merged);
+  merged.websiteUrl = resolveChannelWebsiteUrl('opencode', merged);
   data.channels[index] = merged;
 
   const isProxyRunning = getOpenCodeProxyRunning();
@@ -268,6 +272,10 @@ function getEnabledChannels() {
   return data.channels.filter(c => c.enabled !== false);
 }
 
+function markChannelAsRecentlyUsed(channelId) {
+  return updateChannel(channelId, {});
+}
+
 // 保存渠道顺序
 function saveChannelOrder(order) {
   const data = loadChannels();
@@ -438,6 +446,7 @@ module.exports = {
   getChannels,
   createChannel,
   updateChannel,
+  markChannelAsRecentlyUsed,
   deleteChannel,
   getEnabledChannels,
   saveChannelOrder,

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

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const { execFileSync } = require('child_process');
-const { NATIVE_PATHS, PATHS, joinNativeBasePath } = require('../../config/paths');
+const { NATIVE_PATHS, PATHS } = require('../../config/paths');
 
 /**
  * OpenCode 会话服务
@@ -11,7 +11,7 @@ const { NATIVE_PATHS, PATHS, joinNativeBasePath } = require('../../config/paths'
 
 const PROJECT_ORDER_FILE = PATHS.opencodeProjectOrder;
 const SESSION_ORDER_FILE = PATHS.opencodeSessionOrder;
-const OPENCODE_DB_PATH = joinNativeBasePath(NATIVE_PATHS.opencode.data, 'opencode.db');
+const OPENCODE_DB_PATH = path.join(NATIVE_PATHS.opencode.data, 'opencode.db');
 const COUNTS_CACHE_TTL_MS = 30 * 1000;
 const EMPTY_COUNTS = Object.freeze({ projectCount: 0, sessionCount: 0 });
 
@@ -234,12 +234,12 @@ function getOpenCodeDataDir() {
 
 // 兼容导出：保留旧路径函数
 function getSessionsDir() {
-  return NATIVE_PATHS?.opencode?.sessions || joinNativeBasePath(getOpenCodeDataDir(), 'storage', 'session');
+  return path.join(getOpenCodeDataDir(), 'storage', 'session');
 }
 
 // 兼容导出：保留旧路径函数
 function getProjectsDir() {
-  return NATIVE_PATHS?.opencode?.projects || joinNativeBasePath(getOpenCodeDataDir(), 'storage', 'project');
+  return path.join(getOpenCodeDataDir(), 'storage', 'project');
 }
 
 function getProjectOrder() {
@@ -513,13 +513,7 @@ function getProjects() {
 
 // 根据项目ID获取会话列表
 function getSessionsByProjectId(projectId) {
-  const { getForkRelations } = require('./sessions');
-  const forkRelations = getForkRelations();
-  const sessions = getSessionRowsByProjectId(projectId).map((session) => {
-    const normalized = normalizeSession(session, projectId);
-    normalized.forkedFrom = forkRelations[normalized.sessionId] || null;
-    return normalized;
-  });
+  const sessions = getSessionRowsByProjectId(projectId).map(session => normalizeSession(session, projectId));
   const order = getSessionOrder(projectId);
 
   const fallbackSorted = sessions.sort(
@@ -564,11 +558,7 @@ function getSessionById(sessionId) {
     return null;
   }
 
-  const { getForkRelations } = require('./sessions');
-  const forkRelations = getForkRelations();
-  const normalized = normalizeSession(location.sessionData, location.projectId);
-  normalized.forkedFrom = forkRelations[normalized.sessionId] || null;
-  return normalized;
+  return normalizeSession(location.sessionData, location.projectId);
 }
 
 function buildSessionMessages(sessionId) {

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

@@ -23,9 +23,9 @@ function resolveModelCost(modelId) {
 
 const CONFIG_DIR = NATIVE_PATHS.opencode.config;
 const CONFIG_PATHS = {
-  config: NATIVE_PATHS.opencode.configLegacy,
-  opencode: NATIVE_PATHS.opencode.configJson,
-  opencodec: NATIVE_PATHS.opencode.configJsonc
+  config: path.join(CONFIG_DIR, 'config.json'),
+  opencode: path.join(CONFIG_DIR, 'opencode.json'),
+  opencodec: path.join(CONFIG_DIR, 'opencode.jsonc')
 };
 const BACKUP_SUFFIX = '.cc-tool-backup';
 const EMPTY_SENTINEL = '__CC_TOOL_NO_FILE__';