coding-tool-x 3.7.5 → 3.7.6

package/dist/web/index.html

@@ -5,14 +5,14 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>coding-tool-x · AI 编程工作台</title>
-    <script type="module" crossorigin src="/assets/index-DnDBHGCC.js"></script>
+    <script type="module" crossorigin src="/assets/index-ClMNA9Hf.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/markdown-BNJfEgCA.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-vendor-B5RqjEjQ.js">
     <link rel="modulepreload" crossorigin href="/assets/naive-ui-CVyvdmg1.js">
     <link rel="modulepreload" crossorigin href="/assets/icons-nGdSKQn2.js">
     <link rel="modulepreload" crossorigin href="/assets/vendors-DQA4Hw9v.js">
     <link rel="stylesheet" crossorigin href="/assets/markdown-BfC0goYb.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-U3TOywtB.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-B_nFqixU.css">
   </head>
   <body>
     <div id="app"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.7.5",
+  "version": "3.7.6",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {

package/src/server/api/omp-channels.js

@@ -23,9 +23,13 @@ const {
 } = require('../services/model-detector');
 const {
   findAuthProviderForKey,
-  getOmpAuthProviderSnapshot
+  getCachedOmpAuthProviderSnapshot,
+  getOmpAuthProviderCacheMeta,
+  warmOmpAuthProviderSnapshot
 } = require('../services/omp-auth-providers');
 
+const CHANNEL_LIST_AUTH_OPTIONS = { accountCheck: false, includeStatus: false };
+
 function uniqueModels(models = []) {
   const seen = new Set();
   const result = [];
@@ -136,19 +140,53 @@ function attachAuthProvider(channel, snapshot) {
   };
 }
 
+function getAuthSnapshotForChannelList() {
+  const snapshot = getCachedOmpAuthProviderSnapshot(CHANNEL_LIST_AUTH_OPTIONS);
+  const shouldWarm = !snapshot || snapshot.stale;
+  if (shouldWarm) {
+    warmOmpAuthProviderSnapshot(CHANNEL_LIST_AUTH_OPTIONS);
+  }
+  const meta = getOmpAuthProviderCacheMeta(CHANNEL_LIST_AUTH_OPTIONS);
+  return {
+    snapshot,
+    meta: {
+      ...meta,
+      stale: !snapshot || Boolean(snapshot.stale),
+      refreshing: shouldWarm || meta.refreshing,
+      fallback: !snapshot
+    }
+  };
+}
+
+function buildUnavailableAuthProviderMeta(error) {
+  return {
+    cached: false,
+    stale: false,
+    refreshing: false,
+    fallback: true,
+    checkedAt: new Date().toISOString(),
+    error: error || 'omp-not-available'
+  };
+}
+
 module.exports = () => {
   router.get('/', (req, res) => {
     try {
       if (!isOmpInstalled()) {
-        return res.json({ channels: [], installed: false, error: 'OMP CLI not installed' });
+        return res.json({
+          channels: [],
+          installed: false,
+          error: 'OMP CLI not installed',
+          authProviderMeta: buildUnavailableAuthProviderMeta('OMP CLI not installed')
+        });
       }
       const data = getChannels();
-      const authSnapshot = getOmpAuthProviderSnapshot({ accountCheck: false, includeStatus: false });
+      const { snapshot: authSnapshot, meta: authProviderMeta } = getAuthSnapshotForChannelList();
       const channels = (data.channels || []).map(ch => ({
         ...attachAuthProvider(ch, authSnapshot),
         health: getChannelHealthStatus(ch.id, 'omp')
       }));
-      res.json({ channels, installed: true });
+      res.json({ channels, installed: true, authProviderMeta });
     } catch (err) {
       console.error('[OMP Channels API] Failed to get channels:', err);
       res.status(500).json({ error: err.message });
@@ -158,14 +196,19 @@ module.exports = () => {
   router.get('/enabled', (req, res) => {
     try {
       if (!isOmpInstalled()) {
-        return res.json({ channels: [], installed: false, error: 'OMP CLI not installed' });
+        return res.json({
+          channels: [],
+          installed: false,
+          error: 'OMP CLI not installed',
+          authProviderMeta: buildUnavailableAuthProviderMeta('OMP CLI not installed')
+        });
       }
       const data = getChannels();
-      const authSnapshot = getOmpAuthProviderSnapshot({ accountCheck: false, includeStatus: false });
+      const { snapshot: authSnapshot, meta: authProviderMeta } = getAuthSnapshotForChannelList();
       const channels = (data.channels || [])
         .filter(ch => ch.enabled !== false)
         .map(ch => ({ ...attachAuthProvider(ch, authSnapshot), health: getChannelHealthStatus(ch.id, 'omp') }));
-      res.json({ channels, installed: true });
+      res.json({ channels, installed: true, authProviderMeta });
     } catch (err) {
       console.error('[OMP Channels API] Failed to get enabled channels:', err);
       res.status(500).json({ error: err.message });

package/src/server/services/dashboard-snapshot-worker.js

@@ -2,7 +2,7 @@
 
 const { fork } = require('child_process');
 
-const DASHBOARD_SNAPSHOT_WORKER_TIMEOUT_MS = 120 * 1000;
+const DASHBOARD_SNAPSHOT_WORKER_TIMEOUT_MS = 180 * 1000;
 
 function sortClaudeProjects(projects, order = []) {
   if (!Array.isArray(order) || order.length === 0) {

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

@@ -1029,7 +1029,8 @@ function runOmpCommand(args = [], options = {}) {
       ...process.env,
       ...(options.env || {})
     },
-    timeout: options.timeout || 10000
+    timeout: options.timeout || 10000,
+    windowsHide: true
   });
   const status = result?.status === undefined || result?.status === null ? 0 : result.status;
   return {

package/src/server/services/omp-auth-provider-worker.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const { getOmpAuthProviderSnapshot } = require('./omp-auth-providers');
+
+function attachWorkerHandler() {
+  process.on('message', (options = {}) => {
+    try {
+      const value = getOmpAuthProviderSnapshot(options);
+      if (process.send) {
+        process.send({ ok: true, value }, () => process.exit(0));
+        return;
+      }
+    } catch (error) {
+      if (process.send) {
+        process.send({ ok: false, error: error?.message || String(error) }, () => process.exit(1));
+        return;
+      }
+    }
+    process.exit(1);
+  });
+}
+
+if (process.env.CC_TOOL_OMP_AUTH_PROVIDER_WORKER === '1' || require.main === module) {
+  attachWorkerHandler();
+}
+
+module.exports = {
+  attachWorkerHandler
+};

package/src/server/services/omp-auth-providers.js

@@ -1,9 +1,11 @@
-const { spawnSync } = require('child_process');
+const path = require('path');
+const { fork, spawnSync } = require('child_process');
 const ompConfig = require('./omp-config');
 
 const COMMAND_TIMEOUT_MS = 5000;
 const TOKEN_LIST_TIMEOUT_MS = 3000;
 const CACHE_TTL_MS = 15000;
+const WARMUP_WORKER_TIMEOUT_MS = COMMAND_TIMEOUT_MS + 1000;
 
 const LOGIN_PROVIDER_IDS = new Set([
   'openai-codex',
@@ -50,6 +52,20 @@ const PROVIDER_ALIASES = {
 };
 
 let snapshotCache = {};
+const warmupTimers = new Map();
+const warmupErrors = new Map();
+
+function getSnapshotCacheKey(options = {}) {
+  return options.accountCheck === false
+    ? (options.includeStatus === false ? 'metadata' : 'metadata-status')
+    : 'full';
+}
+
+function writeSnapshotCache(cacheKey, loadedAt, value) {
+  snapshotCache[cacheKey] = { loadedAt, value };
+  warmupErrors.delete(cacheKey);
+  return value;
+}
 
 function normalizeProviderId(value = '') {
   return String(value || '')
@@ -95,7 +111,8 @@ function runCommand(command, args = [], options = {}) {
       ...process.env,
       ...(options.env || {})
     },
-    timeout: options.timeout || COMMAND_TIMEOUT_MS
+    timeout: options.timeout || COMMAND_TIMEOUT_MS,
+    windowsHide: true
   });
   if (typeof result === 'string' || Buffer.isBuffer(result)) {
     return { status: 0, stdout: normalizeCommandOutput(result), stderr: '' };
@@ -205,9 +222,7 @@ function buildEmptySnapshot(runtime, reason) {
 
 function getOmpAuthProviderSnapshot(options = {}) {
   const now = Date.now();
-  const cacheKey = options.accountCheck === false
-    ? (options.includeStatus === false ? 'metadata' : 'metadata-status')
-    : 'full';
+  const cacheKey = getSnapshotCacheKey(options);
   const cached = snapshotCache[cacheKey];
   if (!options.forceRefresh && cached && now - cached.loadedAt < CACHE_TTL_MS) {
     return cached.value;
@@ -217,16 +232,14 @@ function getOmpAuthProviderSnapshot(options = {}) {
   const runtime = options.runtime || ompConfig.resolveOmpRuntime(env, options.runtimeOptions || {});
   if (!runtime || runtime.runtime !== 'omp' || !runtime.installed) {
     const value = buildEmptySnapshot(runtime || null, 'omp-not-available');
-    snapshotCache[cacheKey] = { loadedAt: now, value };
-    return value;
+    return writeSnapshotCache(cacheKey, now, value);
   }
 
   const command = runtime.command;
   const listResult = parseJsonCommand(command, ['auth-broker', 'list', '--json'], options);
   if (!listResult.ok || !Array.isArray(listResult.value)) {
     const value = buildEmptySnapshot(runtime, listResult.error || listResult.stderr || 'auth-provider-list-failed');
-    snapshotCache[cacheKey] = { loadedAt: now, value };
-    return value;
+    return writeSnapshotCache(cacheKey, now, value);
   }
 
   const supportedProviders = listResult.value
@@ -268,8 +281,112 @@ function getOmpAuthProviderSnapshot(options = {}) {
     aliases: { ...PROVIDER_ALIASES },
     checkedAt: new Date().toISOString()
   };
-  snapshotCache[cacheKey] = { loadedAt: now, value };
-  return value;
+  return writeSnapshotCache(cacheKey, now, value);
+}
+
+function getCachedOmpAuthProviderSnapshot(options = {}) {
+  const cacheKey = getSnapshotCacheKey(options);
+  const cached = snapshotCache[cacheKey];
+  if (!cached) return null;
+  return {
+    ...cached.value,
+    stale: Date.now() - cached.loadedAt >= CACHE_TTL_MS
+  };
+}
+
+function getOmpAuthProviderCacheMeta(options = {}) {
+  const cacheKey = getSnapshotCacheKey(options);
+  const cached = snapshotCache[cacheKey];
+  const stale = !cached || Date.now() - cached.loadedAt >= CACHE_TTL_MS;
+  const cachedReason = cached?.value?.available === false ? cached.value.reason || null : null;
+  return {
+    cached: Boolean(cached),
+    stale,
+    refreshing: warmupTimers.has(cacheKey),
+    fallback: !cached,
+    checkedAt: cached?.value?.checkedAt || null,
+    error: warmupErrors.get(cacheKey) || cachedReason || null
+  };
+}
+
+function warmOmpAuthProviderSnapshot(options = {}) {
+  const cacheKey = getSnapshotCacheKey(options);
+  if (warmupTimers.has(cacheKey)) return;
+
+  const finishWarmup = (task, error = null, value = null) => {
+    if (!warmupTimers.has(cacheKey)) return;
+    if (task.timeout) clearTimeout(task.timeout);
+    if (task.child) {
+      task.child.removeAllListeners();
+      if (!task.child.killed) task.child.kill();
+    }
+    warmupTimers.delete(cacheKey);
+    if (error) {
+      warmupErrors.set(cacheKey, sanitizeIdentity(error?.message || String(error || 'auth-provider-warmup-failed')));
+      return;
+    }
+    if (value) {
+      writeSnapshotCache(cacheKey, Date.now(), value);
+    }
+  };
+
+  // Tests and callers that supply a function-based command runner cannot cross
+  // the process boundary. Production channel-list warmups use the worker path.
+  if (process.env.NODE_ENV === 'test' || options.commandRunner) {
+    const task = { timeout: null, child: null };
+    const timer = setTimeout(() => {
+      try {
+        finishWarmup(task, null, getOmpAuthProviderSnapshot(options));
+      } catch (error) {
+        finishWarmup(task, error);
+      }
+    }, 0);
+    task.timeout = timer;
+    warmupTimers.set(cacheKey, task);
+    return;
+  }
+
+  const workerPath = path.join(__dirname, 'omp-auth-provider-worker.js');
+  const task = { timeout: null, child: null };
+  try {
+    const child = fork(workerPath, [], {
+      stdio: ['ignore', 'ignore', 'ignore', 'ipc'],
+      env: {
+        ...process.env,
+        CC_TOOL_OMP_AUTH_PROVIDER_WORKER: '1'
+      }
+    });
+    task.child = child;
+    task.timeout = setTimeout(() => {
+      finishWarmup(task, new Error('auth-provider-warmup-timed-out'));
+    }, WARMUP_WORKER_TIMEOUT_MS);
+    warmupTimers.set(cacheKey, task);
+
+    child.on('message', (message) => {
+      if (message?.ok) {
+        finishWarmup(task, null, message.value);
+      } else {
+        finishWarmup(task, new Error(message?.error || 'auth-provider-warmup-failed'));
+      }
+    });
+    child.on('error', (error) => finishWarmup(task, error));
+    child.on('exit', (code, signal) => {
+      if (warmupTimers.get(cacheKey) === task) {
+        finishWarmup(task, new Error(`auth-provider-warmup-worker-exited-${code || signal || 'unknown'}`));
+      }
+    });
+    child.send({
+      accountCheck: options.accountCheck,
+      includeStatus: options.includeStatus,
+      forceRefresh: options.forceRefresh === true,
+      runtime: options.runtime,
+      runtimeOptions: options.runtimeOptions
+    });
+  } catch (error) {
+    // `fork` itself can fail before the task is registered. Preserve the
+    // failure for the non-blocking status endpoint instead of dropping it.
+    warmupErrors.set(cacheKey, sanitizeIdentity(error?.message || String(error || 'auth-provider-warmup-failed')));
+  }
 }
 
 function findAuthProviderForKey(providerKey, snapshot) {
@@ -280,6 +397,12 @@ function findAuthProviderForKey(providerKey, snapshot) {
 
 function clearOmpAuthProviderCache() {
   snapshotCache = {};
+  for (const task of warmupTimers.values()) {
+    if (task.timeout) clearTimeout(task.timeout);
+    if (task.child && !task.child.killed) task.child.kill();
+  }
+  warmupTimers.clear();
+  warmupErrors.clear();
 }
 
 module.exports = {
@@ -287,7 +410,10 @@ module.exports = {
   ACCOUNT_CHECK_PROVIDER_IDS,
   clearOmpAuthProviderCache,
   findAuthProviderForKey,
+  getCachedOmpAuthProviderSnapshot,
+  getOmpAuthProviderCacheMeta,
   getOmpAuthProviderSnapshot,
+  warmOmpAuthProviderSnapshot,
   normalizeProviderId,
   resolveProviderAlias,
   sanitizeIdentity

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}`;
@@ -113,6 +115,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 +133,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/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/dist/web/assets/ProjectList-C6BA3V49.js

@@ -1 +0,0 @@
-import{r as e,f as a,c as t,o as s,a as l,X as n,s as o,Y as r,N as c,_ as i,G as u,Z as d,p,a0 as v,W as m,a8 as f,a5 as h,w as y,h as g,K as _,F as k,$ as j,a6 as w,R as x,v as C}from"./vue-vendor-B5RqjEjQ.js";import{d as b}from"./vendors-DQA4Hw9v.js";import{_ as $,k as z,l as L,m as N,o as P,p as M,q as D}from"./index-DnDBHGCC.js";import{a9 as I,T,d as E,ad as K,h as U}from"./icons-nGdSKQn2.js";import{N as R,B as q,c as V,a as H,_ as O,q as S,m as A,g as B,x as F,h as G,p as W}from"./naive-ui-CVyvdmg1.js";import"./markdown-BNJfEgCA.js";const X={class:"card-content"},Y={class:"header-row"},Z={class:"project-name"},J={class:"stats-row"},Q=$({__name:"ProjectCard",props:{project:{type:Object,required:!0}},emits:["click","delete"],setup(f,{emit:h}){const y=f,g=h,_=e(!1);function k(){g("click")}function j(){g("delete",y.project)}const w=a(()=>{var e,a;return(null==(e=y.project)?void 0:e.displayName)||(null==(a=y.project)?void 0:a.name)||""}),x=a(()=>{var e,a,t;return(null==(e=y.project)?void 0:e.path)||(null==(a=y.project)?void 0:a.fullPath)||(null==(t=y.project)?void 0:t.name)||""}),C=a(()=>{var e;return(null==(e=y.project)?void 0:e.sessionCount)||0}),b=a(()=>{var e;return null==(e=y.project)?void 0:e.lastUsed}),$=a(()=>{var e;const a=["#18a058","#2080f0","#f0a020","#d03050","#9333ea","#06b6d4"];return a[((null==(e=y.project)?void 0:e.name)||"").split("").reduce((e,a)=>e+a.charCodeAt(0),0)%a.length]});function z(e){if(!e)return"";const a=new Date(e),t=new Date-a;return t<6e4?"刚刚":t<36e5?`${Math.floor(t/6e4)}分钟前`:t<864e5?`${Math.floor(t/36e5)}小时前`:t<6048e5?`${Math.floor(t/864e5)}天前`:a.toLocaleDateString("zh-CN")}return(e,a)=>(s(),t("div",{class:"project-card",onClick:k,onMouseenter:a[0]||(a[0]=e=>_.value=!0),onMouseleave:a[1]||(a[1]=e=>_.value=!1)},[l("div",X,[l("div",Y,[n(c(R),{size:"18",color:$.value},{default:r(()=>[n(c(I))]),_:1},8,["color"]),l("span",Z,i(w.value),1),o(n(c(q),{text:"",type:"error",size:"tiny",class:"delete-btn",onClick:d(j,["stop"])},{icon:r(()=>[n(c(R),{size:"14"},{default:r(()=>[n(c(T))]),_:1})]),_:1},512),[[u,_.value]])]),n(c(V),{depth:"3",class:"project-path"},{default:r(()=>[p(i(x.value),1)]),_:1}),l("div",J,[n(c(H),{size:"tiny",bordered:!1,type:"success"},{default:r(()=>[p(i(C.value)+" 会话 ",1)]),_:1}),b.value?(s(),v(c(V),{key:0,depth:"3",class:"last-used"},{default:r(()=>[p(i(z(b.value)),1)]),_:1})):m("",!0)])])],32))}},[["__scopeId","data-v-3a18e66d"]]),ee={class:"project-list-container"},ae={class:"header"},te={class:"header-text"},se={key:0,class:"loading-container"},le={key:3,class:"projects-grid"},ne={class:"search-hint"},oe={style:{"margin-bottom":"16px"}},re={key:0,style:{"max-height":"60vh","overflow-y":"auto"}},ce={class:"search-result-header"},ie={class:"search-result-title"},ue=$({__name:"ProjectList",setup(o){const u=f(),d=h(),$=z(),T=a(()=>d.meta.channel||"claude"),X=e(""),Y=e([]),Z=e(null),J=e(!1),ue=e(""),de=e(null),pe=e(!1),ve=e(null),me=a(()=>{const e=X.value.toLowerCase();return Y.value.filter(a=>{const t=(a.displayName||"").toLowerCase(),s=(a.fullPath||"").toLowerCase();return t.includes(e)||s.includes(e)})});function fe(e){const a=d.meta.channel||"claude";u.push({name:`${a}-sessions`,params:{projectName:e}})}async function he(){const e=Y.value.map(e=>e.name);await $.saveProjectOrder(e)}function ye(e){const a=e.fullPath||e.name,t=e.sessionCount||0;P.warning({title:"删除项目",content:`确定要删除项目 "${a}" 吗？\n\n当前项目包含 ${t} 个会话，删除后所有会话数据将无法恢复！`,positiveText:"确定删除",negativeText:"取消",onPositiveClick:async()=>{try{await $.deleteProject(e.name),N.success("项目已删除")}catch(a){N.error("删除失败: "+a.message)}}})}async function ge(){try{const a="codex"===(e=T.value||"claude")?"codex":"gemini"===e?"gemini":"opencode"===e?"opencode":"omp"===e?"omp":"claude",t=await L(a);if("manual"===(null==t?void 0:t.method))return void N.warning("自动复制失败，已弹出手动复制框");N.success("基础启动命令已复制到剪贴板")}catch(a){N.error("复制失败: "+a.message)}var e}async function _e(){if(ue.value){pe.value=!0;try{const e=await M(ue.value,35,T.value);de.value=e}catch(e){N.error("搜索失败: "+e.message)}finally{pe.value=!1}}}function ke(e,a){if(!a||!e)return e;const t=new RegExp(`(${a})`,"gi");return e.replace(t,'<mark style="background-color: #ffd700; padding: 2px 4px; border-radius: 2px; font-weight: 600;">$1</mark>')}function je(e){(e.metaKey||e.ctrlKey)&&"k"===e.key&&(e.preventDefault(),J.value=!0,C(()=>{var e;null==(e=ve.value)||e.focus()}))}return y(()=>$.projects,e=>{Y.value=[...e]},{immediate:!0}),y(J,e=>{e||(ue.value="",de.value=null)}),y(T,e=>{$.setChannel(e),$.fetchProjects()},{immediate:!0}),g(()=>{document.addEventListener("keydown",je)}),_(()=>{document.removeEventListener("keydown",je)}),(e,a)=>(s(),t("div",ee,[l("div",ae,[l("div",te,[n(c(O),{style:{margin:"0"}},{default:r(()=>[...a[4]||(a[4]=[p("我的项目",-1)])]),_:1}),n(c(V),{depth:"3"},{default:r(()=>[...a[5]||(a[5]=[p("选择一个项目查看会话，拖拽可调整顺序",-1)])]),_:1})]),n(c(A),null,{default:r(()=>[n(c(q),{type:"primary",size:"medium",onClick:ge},{icon:r(()=>[n(c(R),null,{default:r(()=>[n(c(E))]),_:1})]),default:r(()=>[a[6]||(a[6]=p(" 新建项目 ",-1))]),_:1}),n(c(S),{value:X.value,"onUpdate:value":a[0]||(a[0]=e=>X.value=e),placeholder:"搜索项目...",clearable:"",class:"search-input"},{prefix:r(()=>[n(c(R),null,{default:r(()=>[n(c(K))]),_:1})]),_:1},8,["value"])]),_:1})]),l("div",{class:"content",ref_key:"contentEl",ref:Z},[c($).loading?(s(),t("div",se,[n(c(B),{size:"large"},{description:r(()=>[...a[7]||(a[7]=[p(" 加载项目列表... ",-1)])]),_:1})])):c($).error?(s(),v(c(F),{key:1,type:"error",title:"加载失败",style:{"margin-top":"20px"}},{default:r(()=>[p(i(c($).error),1)]),_:1})):X.value?(s(),t("div",le,[(s(!0),t(k,null,j(me.value,e=>(s(),v(Q,{key:e.name,project:e,onClick:a=>fe(e.name),onDelete:ye},null,8,["project","onClick"]))),128))])):(s(),v(c(b),{key:2,modelValue:Y.value,"onUpdate:modelValue":a[1]||(a[1]=e=>Y.value=e),"item-key":"name",class:"projects-grid","ghost-class":"ghost","chosen-class":"chosen","drag-class":"drag",animation:"200",onEnd:he},{item:r(({element:e})=>[n(Q,{project:e,onClick:a=>fe(e.name),onDelete:ye},null,8,["project","onClick"])]),_:1},8,["modelValue"])),c($).loading||c($).error||0!==c($).projects.length?m("",!0):(s(),v(c(G),{key:4,description:"没有找到项目",style:{"margin-top":"60px"}},{icon:r(()=>[n(c(R),null,{default:r(()=>[n(c(I))]),_:1})]),_:1}))],512),l("div",ne,[n(c(V),{depth:"3",style:{"font-size":"12px"}},{default:r(()=>[...a[8]||(a[8]=[l("kbd",null,"Cmd",-1),p(" / ",-1),l("kbd",null,"Ctrl",-1),p(" + ",-1),l("kbd",null,"K",-1),p(" 全局搜索 ",-1)])]),_:1})]),n(c(W),{show:J.value,"onUpdate:show":a[3]||(a[3]=e=>J.value=e),preset:"card",title:"全局搜索",style:x([{width:"800px","max-width":"90vw"},{marginTop:"80px"}])},{default:r(()=>[l("div",oe,[n(c(S),{ref_key:"globalSearchInputRef",ref:ve,value:ue.value,"onUpdate:value":a[2]||(a[2]=e=>ue.value=e),placeholder:"搜索所有项目的对话内容...",clearable:"",onKeyup:w(_e,["enter"]),disabled:pe.value},{prefix:r(()=>[n(c(R),null,{default:r(()=>[n(c(K))]),_:1})]),suffix:r(()=>[n(c(q),{text:"",onClick:_e,disabled:!ue.value||pe.value,loading:pe.value},{default:r(()=>[...a[9]||(a[9]=[p(" 搜索 ",-1)])]),_:1},8,["disabled","loading"])]),_:1},8,["value","disabled"])]),de.value?(s(),t("div",re,[n(c(F),{type:"info",style:{"margin-bottom":"16px"}},{default:r(()=>[p(' 关键词 "'+i(de.value.keyword)+'" 共找到 '+i(de.value.totalMatches)+" 处匹配 ",1)]),_:1}),(s(!0),t(k,null,j(de.value.sessions,e=>(s(),t("div",{key:`${e.projectName}-${e.sessionId}`,class:"search-result-item"},[l("div",ce,[l("div",ie,[n(c(V),{strong:"",style:{"font-size":"15px","font-weight":"700"}},{default:r(()=>[p(i(e.projectDisplayName),1)]),_:2},1024),n(c(V),{depth:"2",style:{margin:"0 8px"}},{default:r(()=>[...a[10]||(a[10]=[p("·",-1)])]),_:1}),n(c(V),{strong:""},{default:r(()=>[p(i(e.alias?`${e.alias} (${e.sessionId.substring(0,8)})`:e.sessionId.substring(0,8)),1)]),_:2},1024),n(c(H),{size:"small",bordered:!1},{default:r(()=>[p(i(e.matchCount)+" 个匹配",1)]),_:2},1024)]),n(c(q),{size:"small",type:"primary",onClick:a=>async function(e,a){try{const{copyResult:t}=await D(e,a,T.value);"manual"===(null==t?void 0:t.method)?N.warning("自动复制失败，已弹出手动复制框"):N.success("启动命令已复制到剪贴板"),J.value=!1}catch(t){N.error("复制失败: "+t.message)}}(e.projectName,e.sessionId)},{icon:r(()=>[n(c(R),null,{default:r(()=>[n(c(U))]),_:1})]),default:r(()=>[a[11]||(a[11]=p(" 使用对话 ",-1))]),_:1},8,["onClick"])]),(s(!0),t(k,null,j(e.matches,(e,a)=>(s(),t("div",{key:a,class:"search-match"},[n(c(H),{size:"tiny",type:"user"===e.role?"info":"success",bordered:!1},{default:r(()=>[p(i("user"===e.role?"用户":"助手"),1)]),_:2},1032,["type"]),n(c(V),{depth:"3",class:"search-match-text",innerHTML:ke(e.context,de.value.keyword)},null,8,["innerHTML"])]))),128))]))),128)),0===de.value.sessions.length?(s(),v(c(G),{key:0,description:"没有找到匹配的内容"})):m("",!0)])):m("",!0)]),_:1},8,["show"])]))}},[["__scopeId","data-v-f9fdf45c"]]);export{ue as default};

package/dist/web/assets/ProjectList-DQ5ZCJO2.css

@@ -1 +0,0 @@
-.project-card[data-v-3a18e66d]{padding:12px 14px;cursor:pointer;transition:all .25s cubic-bezier(.4,0,.2,1);border-radius:8px;border:1px solid var(--border-primary);box-shadow:0 1px 3px #0000000a;background:var(--bg-primary);position:relative;overflow:hidden}.project-card[data-v-3a18e66d]:before{content:"";position:absolute;top:0;left:0;width:3px;height:100%;background:linear-gradient(180deg,#18a058,#18a05866);opacity:0;transition:opacity .25s ease}.project-card[data-v-3a18e66d]:hover{transform:translateY(-3px);box-shadow:0 8px 20px #18a0581f,0 2px 6px #0000000f;border-color:#18a05866}.project-card[data-v-3a18e66d]:hover:before{opacity:1}.card-content[data-v-3a18e66d]{display:flex;flex-direction:column;gap:6px}.header-row[data-v-3a18e66d]{display:flex;align-items:center;gap:8px}.project-name[data-v-3a18e66d]{font-size:14px;font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex:1;color:var(--text-primary);letter-spacing:-.2px}.delete-btn[data-v-3a18e66d]{opacity:.7;transition:opacity .2s;padding:2px!important}.delete-btn[data-v-3a18e66d]:hover{opacity:1}.project-path[data-v-3a18e66d]{font-size:11px;display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;line-height:1.3}.stats-row[data-v-3a18e66d]{display:flex;align-items:center;justify-content:space-between;margin-top:4px;padding-top:8px;border-top:1px dashed var(--border-primary)}.stats-row[data-v-3a18e66d] .n-tag{font-size:11px;font-weight:600;padding:0 6px;height:18px;border-radius:4px}.last-used[data-v-3a18e66d]{font-size:11px;font-weight:500}.project-list-container[data-v-f9fdf45c]{width:100%;height:100%;display:flex;flex-direction:column;box-sizing:border-box}.header[data-v-f9fdf45c]{flex-shrink:0;padding:24px 24px 20px;background:var(--gradient-bg);border-bottom:1px solid var(--border-primary);display:flex;justify-content:space-between;align-items:flex-start;gap:24px;position:relative}.header[data-v-f9fdf45c]:after{content:"";position:absolute;bottom:0;left:0;right:0;height:1px;background:linear-gradient(90deg,transparent,rgba(24,160,88,.1),transparent)}.header-text[data-v-f9fdf45c]{flex:1}.header-text[data-v-f9fdf45c] .n-h2{font-size:26px;font-weight:700;background:linear-gradient(135deg,#1f2937,#374151);-webkit-background-clip:text;-webkit-text-fill-color:transparent;background-clip:text;letter-spacing:-.5px}[data-theme=dark] .header-text[data-v-f9fdf45c] .n-h2{background:linear-gradient(135deg,#f9fafb,#d1d5db);-webkit-background-clip:text;-webkit-text-fill-color:transparent;background-clip:text}.search-input[data-v-f9fdf45c]{width:320px;flex-shrink:0}.search-input[data-v-f9fdf45c] .n-input{border-radius:10px;background:var(--bg-primary);border:1px solid var(--border-primary);transition:all .2s ease}.search-input[data-v-f9fdf45c] .n-input:hover{border-color:var(--border-secondary);box-shadow:var(--shadow-sm)}.search-input[data-v-f9fdf45c] .n-input:focus-within{border-color:#18a058;box-shadow:0 0 0 3px #18a0581a}.content[data-v-f9fdf45c]{flex:1;overflow-y:auto;padding:20px 24px 24px;background:var(--gradient-bg)}.loading-container[data-v-f9fdf45c]{display:flex;justify-content:center;align-items:center;min-height:400px}.projects-grid[data-v-f9fdf45c]{display:grid;grid-template-columns:repeat(auto-fill,minmax(220px,1fr));gap:12px}.ghost[data-v-f9fdf45c]{opacity:.4}.chosen[data-v-f9fdf45c]{transform:scale(1.05);box-shadow:0 8px 24px #0003!important;cursor:move!important}.drag[data-v-f9fdf45c]{opacity:.8;transform:rotate(2deg);box-shadow:0 12px 32px #00000040!important}.search-hint[data-v-f9fdf45c]{position:fixed;bottom:24px;left:24px;padding:10px 14px;background:#ffffffe6;border:1px solid var(--border-primary);border-radius:8px;box-shadow:0 4px 12px #00000014;z-index:10;-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);opacity:.8;transition:all .2s ease}[data-theme=dark] .search-hint[data-v-f9fdf45c]{background:#1e293bf2;border:1px solid rgba(71,85,105,.6);box-shadow:0 4px 16px #0006}.search-hint[data-v-f9fdf45c]:hover{opacity:1;transform:translateY(-2px);box-shadow:0 6px 16px #0000001f}[data-theme=dark] .search-hint[data-v-f9fdf45c]:hover{box-shadow:0 6px 20px #00000080}.search-hint kbd[data-v-f9fdf45c]{display:inline-block;padding:4px 8px;font-family:SF Mono,Monaco,monospace;font-size:12px;line-height:1.4;font-weight:600;color:var(--text-secondary);background:var(--bg-primary);border:1px solid var(--border-secondary);border-radius:4px;box-shadow:0 2px 0 var(--border-primary),0 1px 3px #0000001a}[data-theme=dark] .search-hint kbd[data-v-f9fdf45c]{background:#33415599;border:1px solid rgba(71,85,105,.8);box-shadow:0 2px #1e293bcc,0 1px 4px #0006;color:#e2e8f0}.search-result-item[data-v-f9fdf45c]{margin-bottom:16px;padding:12px;border:1px solid var(--border-primary);border-radius:6px;background:var(--bg-elevated)}.search-result-header[data-v-f9fdf45c]{display:flex;align-items:center;justify-content:space-between;margin-bottom:8px}.search-result-title[data-v-f9fdf45c]{display:flex;align-items:center;gap:8px}.search-match[data-v-f9fdf45c]{display:flex;align-items:flex-start;gap:8px;margin-top:6px;padding:6px;background:var(--bg-secondary);border-radius:4px}.search-match-text[data-v-f9fdf45c]{flex:1;line-height:1.6}