coding-tool-x 3.7.5 → 3.7.7

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

@@ -61,7 +61,10 @@ function runOmpCommand(command, args = [], env = process.env, options = {}, stdi
     encoding: 'utf8',
     env: buildCommandEnv(env),
     stdio,
-    timeout: options.timeout || 3000
+    timeout: options.timeout || 3000,
+    // On Windows, an npm/PowerShell command shim can otherwise create a visible
+    // console every time we probe OMP or resolve its configuration directory.
+    windowsHide: true
   });
 }
 
@@ -76,8 +79,8 @@ function readOmpAgentDirFromCommand(command, env = process.env, options = {}) {
 }
 
 function getOmpAgentDir(env = process.env, options = {}) {
-  const runtime = options.runtime || resolveOmpRuntime(env, options);
-  if (runtime.runtime === 'omp' && runtime.installed) {
+  const runtime = options.runtime || (options.resolveRuntime === false ? null : resolveOmpRuntime(env, options));
+  if (runtime?.runtime === 'omp' && runtime.installed) {
     const commandAgentDir = readOmpAgentDirFromCommand(runtime.command, env, options);
     if (commandAgentDir) {
       return commandAgentDir;
@@ -87,7 +90,7 @@ function getOmpAgentDir(env = process.env, options = {}) {
 }
 
 function getOmpPaths(env = process.env, options = {}) {
-  const runtime = options.runtime || resolveOmpRuntime(env, options);
+  const runtime = options.runtime || (options.resolveRuntime === false ? null : resolveOmpRuntime(env, options));
   const agentDir = getOmpAgentDir(env, { ...options, runtime });
   return {
     agentDir,

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

@@ -1,8 +1,7 @@
 const fs = require('fs');
 const path = require('path');
-const { execFileSync } = require('child_process');
 const { PATHS, HOME_DIR } = require('../../config/paths');
-const { getOmpCommand, getOmpPaths, isOmpInstalled, resolveOmpRuntime } = require('./omp-config');
+const { getOmpCommand, getOmpPaths, resolveOmpRuntime } = require('./omp-config');
 
 const PROJECT_ORDER_FILE = PATHS.ompProjectOrder;
 const SESSION_ORDER_FILE = PATHS.ompSessionOrder;
@@ -213,7 +212,20 @@ function parseSessionFile(filePath) {
   };
 }
 
-function scanSessionFiles(rootDir = getOmpPaths().sessions) {
+function getOmpSessionPaths() {
+  // Reading historical sessions normally only needs OMP's native directory
+  // convention. Avoid starting the CLI here: project/count snapshot workers
+  // invoke this path independently, which made Windows repeatedly open
+  // PowerShell shims. Keep the CLI lookup as a fallback for non-standard OMP
+  // locations that cannot be derived from the environment.
+  const nativePaths = getOmpPaths(process.env, { resolveRuntime: false });
+  if (fs.existsSync(nativePaths.agentDir) || fs.existsSync(nativePaths.sessions)) {
+    return nativePaths;
+  }
+  return getOmpPaths();
+}
+
+function scanSessionFiles(rootDir = getOmpSessionPaths().sessions) {
   if (!fs.existsSync(rootDir)) {
     return [];
   }
@@ -462,20 +474,12 @@ function isOmpCliInstalled() {
   }
 
   let installed = false;
-  if (isOmpInstalled()) {
+  const nativePaths = getOmpSessionPaths();
+  if (fs.existsSync(nativePaths.agentDir)) {
     installed = true;
   } else {
     const runtime = resolveOmpRuntime();
-    if (runtime.installed) {
-      installed = true;
-    } else {
-      try {
-        execFileSync(getOmpCommand(), ['--version'], { stdio: 'ignore', timeout: 3000 });
-        installed = true;
-      } catch {
-        installed = false;
-      }
-    }
+    installed = Boolean(runtime && runtime.installed);
   }
 
   ompInstallCache = {

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

@@ -833,7 +833,8 @@ class PluginsService {
       cwd: process.cwd(),
       encoding: 'utf8',
       stdio: 'pipe',
-      timeout: 120000
+      timeout: 120000,
+      windowsHide: true
     });
   }
 

package/src/server/services/project-snapshots.js

@@ -6,6 +6,8 @@ const {
 } = require('./snapshot-cache');
 
 const PROJECT_SNAPSHOT_TTL_MS = 60 * 1000;
+const PROJECT_SNAPSHOT_WAIT_ON_MISS_MS = process.env.NODE_ENV === 'test' ? 0 : 1500;
+const PROJECT_SNAPSHOT_WAIT_ON_FORCE_MS = process.env.NODE_ENV === 'test' ? 0 : 1500;
 
 function projectListKey(source) {
   return `projects:list:${source}`;
@@ -33,7 +35,10 @@ async function getProjectListSnapshot(source, {
     fallbackValue,
     refresh,
     force,
-    backgroundOnMiss: !force
+    backgroundOnMiss: !force,
+    staleWhileForce: true,
+    waitOnMissMs: PROJECT_SNAPSHOT_WAIT_ON_MISS_MS,
+    waitOnForceMs: PROJECT_SNAPSHOT_WAIT_ON_FORCE_MS
   });
 }
 
@@ -44,6 +49,8 @@ function invalidateProjectSnapshots(source) {
 
 module.exports = {
   PROJECT_SNAPSHOT_TTL_MS,
+  PROJECT_SNAPSHOT_WAIT_ON_MISS_MS,
+  PROJECT_SNAPSHOT_WAIT_ON_FORCE_MS,
   projectListKey,
   projectCountKey,
   emptyProjectList,

package/src/server/services/session-snapshots.js

@@ -9,7 +9,9 @@ const {
 
 const SESSION_SNAPSHOT_TTL_MS = 60 * 1000;
 const SESSION_SNAPSHOT_DEFER_MS = process.env.NODE_ENV === 'test' ? 0 : 750;
-const SESSION_SNAPSHOT_WORKER_TIMEOUT_MS = 120 * 1000;
+const SESSION_SNAPSHOT_WORKER_TIMEOUT_MS = 180 * 1000;
+const SESSION_SNAPSHOT_WAIT_ON_MISS_MS = process.env.NODE_ENV === 'test' ? 0 : 2500;
+const SESSION_SNAPSHOT_WAIT_ON_FORCE_MS = process.env.NODE_ENV === 'test' ? 0 : 2500;
 
 function sessionListKey(source, projectName) {
   return `sessions:list:${source}:${projectName}`;
@@ -44,6 +46,7 @@ function runSessionSnapshotWorker(source, projectName, config = {}, options = {}
     const workerPath = path.join(__dirname, 'session-snapshot-worker.js');
     const child = fork(workerPath, [], {
       stdio: ['ignore', 'ignore', 'pipe', 'ipc'],
+      windowsHide: true,
       env: {
         ...process.env,
         CC_TOOL_SESSION_SNAPSHOT_WORKER: '1'
@@ -113,6 +116,9 @@ async function getSessionListSnapshot(source, projectName, {
     refresh,
     force: process.env.NODE_ENV === 'test' ? true : force,
     backgroundOnMiss: process.env.NODE_ENV === 'test' ? false : !force,
+    staleWhileForce: true,
+    waitOnMissMs: SESSION_SNAPSHOT_WAIT_ON_MISS_MS,
+    waitOnForceMs: SESSION_SNAPSHOT_WAIT_ON_FORCE_MS,
     deferMs: SESSION_SNAPSHOT_DEFER_MS
   });
 }
@@ -128,6 +134,9 @@ function invalidateSessionSnapshots(source, projectName = null) {
 
 module.exports = {
   SESSION_SNAPSHOT_TTL_MS,
+  SESSION_SNAPSHOT_WAIT_ON_MISS_MS,
+  SESSION_SNAPSHOT_WAIT_ON_FORCE_MS,
+  SESSION_SNAPSHOT_WORKER_TIMEOUT_MS,
   defaultProjectInfo,
   emptySessionList,
   getSessionListSnapshot,

package/src/server/services/sessions.js

@@ -17,6 +17,17 @@ const CLAUDE_PROJECTS_DIR = NATIVE_PATHS.claude.projects;
 const CODEX_PROJECTS_DIR = path.join(path.dirname(NATIVE_PATHS.codex.config), 'projects');
 const GEMINI_PROJECTS_DIR = path.join(path.dirname(NATIVE_PATHS.gemini.env), 'projects');
 
+function resolveProjectsDir(config = {}) {
+  return config.projectsDir || CLAUDE_PROJECTS_DIR;
+}
+
+function withResolvedProjectsDir(config = {}) {
+  return {
+    ...config,
+    projectsDir: resolveProjectsDir(config)
+  };
+}
+
 // Base directory for cc-tool data
 function getCcToolDir() {
   return PATHS.base;
@@ -182,7 +193,7 @@ function sliceClaudeSessionContentByUserMessage(content, afterUserMessageNumber)
 
 // Get all projects with stats (async version)
 async function getProjects(config) {
-  const projectsDir = config.projectsDir;
+  const projectsDir = resolveProjectsDir(config);
 
   if (!fs.existsSync(projectsDir)) {
     return [];
@@ -383,16 +394,17 @@ function extractCwdFromSessionHeader(sessionFile) {
 
 // Get projects with detailed stats (with caching) - async version
 async function getProjectsWithStats(config, options = {}) {
+  const resolvedConfig = withResolvedProjectsDir(config);
   if (!options.force) {
     // Check enhanced cache first
-    const cacheKey = `${CacheKeys.PROJECTS}${config.projectsDir}`;
+    const cacheKey = `${CacheKeys.PROJECTS}${resolvedConfig.projectsDir}`;
     const enhancedCached = globalCache.get(cacheKey);
     if (enhancedCached) {
       return enhancedCached;
     }
 
     // Check old cache
-    const cached = getCachedProjects(config);
+    const cached = getCachedProjects(resolvedConfig);
     if (cached) {
       globalCache.set(cacheKey, cached, 300000); // 5分钟
       return cached;
@@ -400,22 +412,22 @@ async function getProjectsWithStats(config, options = {}) {
   }
 
   try {
-    const data = await buildProjectsWithStats(config);
+    const data = await buildProjectsWithStats(resolvedConfig);
     if (!Array.isArray(data)) {
-      console.warn(`[getProjectsWithStats] Unexpected non-array result for ${config.projectsDir}, returning empty array.`);
+      console.warn(`[getProjectsWithStats] Unexpected non-array result for ${resolvedConfig.projectsDir}, returning empty array.`);
       return [];
     }
-    setCachedProjects(config, data);
-    globalCache.set(`${CacheKeys.PROJECTS}${config.projectsDir}`, data, 300000);
+    setCachedProjects(resolvedConfig, data);
+    globalCache.set(`${CacheKeys.PROJECTS}${resolvedConfig.projectsDir}`, data, 300000);
     return data;
   } catch (err) {
-    console.error(`[getProjectsWithStats] Failed to build projects for ${config.projectsDir}:`, err);
+    console.error(`[getProjectsWithStats] Failed to build projects for ${resolvedConfig.projectsDir}:`, err);
     return [];
   }
 }
 
 async function buildProjectsWithStats(config) {
-  const projectsDir = config.projectsDir;
+  const projectsDir = resolveProjectsDir(config);
 
   if (!fs.existsSync(projectsDir)) {
     return [];
@@ -482,7 +494,7 @@ async function buildProjectsWithStats(config) {
 
 // 获取 Claude 项目/会话数量（轻量统计）
 function getProjectAndSessionCounts(config) {
-  const projectsDir = config.projectsDir;
+  const projectsDir = resolveProjectsDir(config);
   if (!fs.existsSync(projectsDir)) {
     return { projectCount: 0, sessionCount: 0 };
   }
@@ -672,7 +684,8 @@ async function getSessionsForProject(config, projectName, options = {}) {
 
 // Delete a session
 function deleteSession(config, projectName, sessionId) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
   const sessionFile = path.join(projectDir, sessionId + '.jsonl');
 
   if (!fs.existsSync(sessionFile)) {
@@ -680,14 +693,15 @@ function deleteSession(config, projectName, sessionId) {
   }
 
   fs.unlinkSync(sessionFile);
-  invalidateProjectsCache(config);
+  invalidateProjectsCache(resolvedConfig);
   invalidateSessionResultCache(projectName);
   return { success: true };
 }
 
 // Fork a session
 function forkSession(config, projectName, sessionId, options = {}) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
   const sessionFile = path.join(projectDir, sessionId + '.jsonl');
 
   if (!fs.existsSync(sessionFile)) {
@@ -716,7 +730,7 @@ function forkSession(config, projectName, sessionId, options = {}) {
     const { setAlias } = require('./alias');
     setAlias(newSessionId, options.alias);
   }
-  invalidateProjectsCache(config);
+  invalidateProjectsCache(resolvedConfig);
   invalidateSessionResultCache(projectName);
 
   return {
@@ -768,7 +782,8 @@ function saveSessionOrder(projectName, order) {
 
 // Delete a project (remove the entire project directory)
 function deleteProject(config, projectName) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
 
   if (!fs.existsSync(projectDir)) {
     throw new Error('Project not found');
@@ -778,19 +793,20 @@ function deleteProject(config, projectName) {
   fs.rmSync(projectDir, { recursive: true, force: true });
 
   // Remove from order file if exists
-  const order = getProjectOrder(config);
+  const order = getProjectOrder(resolvedConfig);
   const newOrder = order.filter(name => name !== projectName);
   if (newOrder.length !== order.length) {
-    saveProjectOrder(config, newOrder);
+    saveProjectOrder(resolvedConfig, newOrder);
   }
 
-  invalidateProjectsCache(config);
+  invalidateProjectsCache(resolvedConfig);
   return { success: true };
 }
 
 // Search sessions for keyword
 function searchSessions(config, projectName, keyword, contextLength = 15) {
-  const projectDir = path.join(config.projectsDir, projectName);
+  const resolvedConfig = withResolvedProjectsDir(config);
+  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
 
   if (!fs.existsSync(projectDir)) {
     return [];

package/src/server/services/snapshot-cache.js

@@ -9,6 +9,7 @@ const DEFAULT_TTL_MS = 60 * 1000;
 const SNAPSHOT_VERSION = 1;
 const DEFAULT_BACKGROUND_DELAY_MS = process.env.NODE_ENV === 'test' ? 0 : 750;
 const DEFAULT_BACKGROUND_GAP_MS = process.env.NODE_ENV === 'test' ? 0 : 100;
+const WAIT_TIMEOUT = Symbol('snapshot-wait-timeout');
 
 const snapshots = new Map();
 const inflight = new Map();
@@ -196,6 +197,28 @@ function isExpired(entry, ttlMs, nowMs) {
   return nowMs - Number(entry.updatedAtMs || 0) >= ttlMs;
 }
 
+async function waitForRefresh(promise, waitMs) {
+  const timeoutMs = Number(waitMs) || 0;
+  if (timeoutMs <= 0) return { skipped: true };
+
+  let timer = null;
+  const result = await Promise.race([
+    promise
+      .then(entry => ({ entry }))
+      .catch(error => ({ error })),
+    new Promise(resolve => {
+      timer = setTimeout(() => resolve(WAIT_TIMEOUT), timeoutMs);
+    })
+  ]);
+  if (timer) {
+    clearTimeout(timer);
+  }
+  if (result === WAIT_TIMEOUT) {
+    return { timedOut: true };
+  }
+  return result;
+}
+
 function makeMeta(entry, {
   key,
   stale,
@@ -220,7 +243,9 @@ async function getSnapshot(key, {
   force = false,
   staleWhileForce = false,
   nowMs = Date.now(),
-  deferMs = DEFAULT_BACKGROUND_DELAY_MS
+  deferMs = DEFAULT_BACKGROUND_DELAY_MS,
+  waitOnMissMs = 0,
+  waitOnForceMs = 0
 } = {}) {
   if (typeof refresh !== 'function') {
     const entry = getEntry(key);
@@ -241,7 +266,26 @@ async function getSnapshot(key, {
   let refreshError = null;
 
   if (expired) {
-    if (!entry && backgroundOnMiss === false) {
+    const coldWaitMs = !entry
+      ? (force ? (waitOnForceMs || waitOnMissMs) : waitOnMissMs)
+      : 0;
+
+    if (!entry && Number(coldWaitMs) > 0) {
+      refreshPromise = refreshSnapshot(key, refresh, { bypassInflight: force });
+      const waitResult = await waitForRefresh(refreshPromise, coldWaitMs);
+      if (waitResult.entry) {
+        entry = waitResult.entry;
+        expired = false;
+        refreshPromise = null;
+      } else if (waitResult.error) {
+        refreshError = waitResult.error?.message || String(waitResult.error);
+        entry = getEntry(key);
+        if (entry) {
+          expired = isExpired(entry, ttlMs, nowMs);
+        }
+        refreshPromise = null;
+      }
+    } else if (!entry && backgroundOnMiss === false) {
       try {
         entry = await refreshSnapshot(key, refresh, { bypassInflight: force });
         expired = false;
@@ -251,7 +295,7 @@ async function getSnapshot(key, {
         if (!entry) throw error;
       }
     } else {
-      refreshPromise = refreshSnapshot(key, refresh, { defer: true, deferMs, bypassInflight: force });
+      refreshPromise = refreshSnapshot(key, refresh, { defer: !force, deferMs, bypassInflight: force });
     }
   }
 

package/src/server/services/web-build.js

@@ -101,7 +101,8 @@ function runWebBuild(options = {}) {
     const child = spawn(npmCommand, ['run', 'build'], {
       cwd: sourceRoot,
       env,
-      stdio
+      stdio,
+      windowsHide: true
     });
 
     child.once('error', (error) => {