coding-tool-x 3.5.7 → 3.5.9

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 } = require('../../config/paths');
+const { NATIVE_PATHS, PATHS, joinNativeBasePath } = require('../../config/paths');
 
 /**
  * OpenCode 会话服务
@@ -11,7 +11,7 @@ const { NATIVE_PATHS, PATHS } = require('../../config/paths');
 
 const PROJECT_ORDER_FILE = PATHS.opencodeProjectOrder;
 const SESSION_ORDER_FILE = PATHS.opencodeSessionOrder;
-const OPENCODE_DB_PATH = path.join(NATIVE_PATHS.opencode.data, 'opencode.db');
+const OPENCODE_DB_PATH = joinNativeBasePath(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 path.join(getOpenCodeDataDir(), 'storage', 'session');
+  return NATIVE_PATHS?.opencode?.sessions || joinNativeBasePath(getOpenCodeDataDir(), 'storage', 'session');
 }
 
 // 兼容导出：保留旧路径函数
 function getProjectsDir() {
-  return path.join(getOpenCodeDataDir(), 'storage', 'project');
+  return NATIVE_PATHS?.opencode?.projects || joinNativeBasePath(getOpenCodeDataDir(), 'storage', 'project');
 }
 
 function getProjectOrder() {
@@ -513,7 +513,13 @@ function getProjects() {
 
 // 根据项目ID获取会话列表
 function getSessionsByProjectId(projectId) {
-  const sessions = getSessionRowsByProjectId(projectId).map(session => normalizeSession(session, 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 order = getSessionOrder(projectId);
 
   const fallbackSorted = sessions.sort(
@@ -558,7 +564,11 @@ function getSessionById(sessionId) {
     return null;
   }
 
-  return normalizeSession(location.sessionData, location.projectId);
+  const { getForkRelations } = require('./sessions');
+  const forkRelations = getForkRelations();
+  const normalized = normalizeSession(location.sessionData, location.projectId);
+  normalized.forkedFrom = forkRelations[normalized.sessionId] || null;
+  return normalized;
 }
 
 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: path.join(CONFIG_DIR, 'config.json'),
-  opencode: path.join(CONFIG_DIR, 'opencode.json'),
-  opencodec: path.join(CONFIG_DIR, 'opencode.jsonc')
+  config: NATIVE_PATHS.opencode.configLegacy,
+  opencode: NATIVE_PATHS.opencode.configJson,
+  opencodec: NATIVE_PATHS.opencode.configJsonc
 };
 const BACKUP_SUFFIX = '.cc-tool-backup';
 const EMPTY_SENTINEL = '__CC_TOOL_NO_FILE__';