coding-tool-x 3.8.4 → 3.8.6

package/src/server/platform-context.js

@@ -0,0 +1,81 @@
+'use strict';
+
+const { createPlatformRegistry } = require('../platforms/registry');
+const { getDriverRegistry } = require('../platforms/driver-registry');
+const { createSessionHistoryIndex } = require('./services/session-history-index');
+
+let defaultContext;
+
+function getPlatformRuntimeModule() {
+  return require('../platforms/runtime');
+}
+
+function createLazyDependency(getValue) {
+  return new Proxy({}, {
+    get(_target, property) {
+      const value = getValue();
+      return typeof value?.[property] === 'function' ? value[property].bind(value) : value?.[property];
+    }
+  });
+}
+
+function getDefaultPlatformBindings() {
+  const runtimeModule = getPlatformRuntimeModule();
+  const registry = typeof runtimeModule.getPlatformRegistry === 'function'
+    ? runtimeModule.getPlatformRegistry()
+    : createPlatformRegistry();
+  const runtime = typeof runtimeModule.getPlatformRuntime === 'function'
+    ? runtimeModule.getPlatformRuntime()
+    : null;
+  return { registry, runtime };
+}
+
+function createPlatformContext({ registry, runtime, dependencies = {}, driverRegistry } = {}) {
+  const runtimeModule = getPlatformRuntimeModule();
+  const resolvedRegistry = registry || createPlatformRegistry();
+  let sessionHistoryIndex = dependencies.sessionHistoryIndex || null;
+  const indexDependency = sessionHistoryIndex || createLazyDependency(() => sessionHistoryIndex);
+  const resolvedDependencies = {
+    ...(typeof runtimeModule.getDefaultDependencies === 'function'
+      ? runtimeModule.getDefaultDependencies()
+      : {}),
+    ...dependencies,
+    sessionHistoryIndex: indexDependency
+  };
+  if (typeof runtimeModule.configureDefaultDependencies === 'function') {
+    runtimeModule.configureDefaultDependencies(resolvedDependencies);
+  }
+  const resolvedRuntime = runtime || (typeof runtimeModule.createPlatformRuntime === 'function'
+    ? runtimeModule.createPlatformRuntime({
+      registry: resolvedRegistry,
+      driverRegistry: driverRegistry || getDriverRegistry(),
+      dependencies: resolvedDependencies
+    })
+    : { getDriver: () => null });
+  if (!sessionHistoryIndex) {
+    sessionHistoryIndex = createSessionHistoryIndex({ runtime: resolvedRuntime });
+  }
+  return Object.freeze({
+    registry: resolvedRegistry,
+    runtime: resolvedRuntime,
+    dependencies: Object.freeze({ ...resolvedDependencies, sessionHistoryIndex })
+  });
+}
+
+function getPlatformContext(options = {}) {
+  const hasOptions = Object.keys(options).length > 0;
+  const bindings = hasOptions ? null : getDefaultPlatformBindings();
+  if (!defaultContext
+    || hasOptions
+    || (bindings.runtime && defaultContext.runtime !== bindings.runtime)
+    || (bindings.registry && defaultContext.registry !== bindings.registry)) {
+    defaultContext = createPlatformContext(hasOptions ? options : bindings);
+  }
+  return defaultContext;
+}
+
+function resetPlatformContext() {
+  defaultContext = undefined;
+}
+
+module.exports = { createPlatformContext, getPlatformContext, resetPlatformContext };

package/src/server/services/channel-balance.js

@@ -6,6 +6,7 @@ const path = require('path');
 const { URL } = require('url');
 const { PATHS } = require('../../config/paths');
 const { loadUIConfig } = require('./ui-config');
+const { getPlatformContext } = require('../platform-context');
 const {
   getSnapshot,
   refreshSnapshot,
@@ -18,7 +19,6 @@ const MAX_RESPONSE_BYTES = 1024 * 1024;
 const QUOTA_UNIT = 500000;
 const VELOERA_QUOTA_UNIT = 1000000;
 const NEWCLI_QUOTA_UNIT = 1000000;
-const VALID_SOURCES = new Set(['claude', 'codex', 'gemini', 'opencode', 'omp']);
 const GATEWAY_PATH_SEGMENTS = new Set(['openai', 'anthropic', 'claude', 'gemini', 'codex']);
 const HUB_PLATFORMS = new Set(['new-api', 'one-api', 'one-hub', 'done-hub', 'veloera', 'anyrouter', 'aihubmix']);
 const UNSUPPORTED_BALANCE_PLATFORMS = new Set(['dashscope', 'modelscope']);
@@ -120,6 +120,22 @@ function resolveBalanceToken(channel = {}) {
   );
 }
 
+function isOAuthChannel(channel = {}) {
+  return channel?.authMode === 'oauth';
+}
+
+function resolveOAuthCacheIdentity(channel = {}) {
+  const ref = channel.authRef && typeof channel.authRef === 'object' ? channel.authRef : {};
+  return [
+    channel.oauthProviderId,
+    ref.credentialId,
+    ref.providerId,
+    ref.accountId,
+    ref.identityKey,
+    ref.accountEmail
+  ].map(value => String(value || '').trim()).filter(Boolean).join('|');
+}
+
 function resolveBalanceUserId(channel = {}) {
   const raw = channel.balanceUserId
     ?? channel.platformUserId
@@ -250,6 +266,64 @@ function makeVisibleSnapshot(platform, input, { stale = false, updatedAt = nowIs
   return snapshot;
 }
 
+function formatPercent(value) {
+  const number = parseFiniteNumber(value);
+  if (number == null) return '';
+  return Number.isInteger(number) ? String(number) : number.toFixed(1).replace(/\.0$/, '');
+}
+
+function normalizeOAuthWindows(quota = {}) {
+  const source = quota && typeof quota === 'object' ? quota : {};
+  const candidates = [];
+  if (source.primary) candidates.push({ id: 'primary', ...source.primary });
+  if (source.secondary) candidates.push({ id: 'secondary', ...source.secondary });
+  if (Array.isArray(source.windows)) candidates.push(...source.windows);
+  if (Array.isArray(source.additional)) candidates.push(...source.additional);
+
+  const seen = new Set();
+  return candidates.map((window, index) => {
+    const remainingPercent = parseFiniteNumber(window?.remainingPercent);
+    const usedPercent = parseFiniteNumber(window?.usedPercent);
+    if (remainingPercent == null && usedPercent == null) return null;
+    const id = String(window?.id || `window-${index}`);
+    if (seen.has(id)) return null;
+    seen.add(id);
+    return {
+      id,
+      label: String(window?.label || id),
+      remainingPercent: remainingPercent != null
+        ? Math.max(0, Math.min(100, remainingPercent))
+        : Math.max(0, Math.min(100, 100 - usedPercent)),
+      usedPercent: usedPercent != null
+        ? Math.max(0, Math.min(100, usedPercent))
+        : Math.max(0, Math.min(100, 100 - remainingPercent)),
+      resetsAt: window?.resetsAt || null,
+      scope: window?.scope || null
+    };
+  }).filter(Boolean);
+}
+
+function buildOAuthBalanceSnapshot(platform, quota, { stale = false, updatedAt = nowIso() } = {}) {
+  const windows = normalizeOAuthWindows(quota);
+  if (!windows.length) return makeHiddenSnapshot(platform, { stale, updatedAt });
+
+  const primaryWindows = windows.filter(window => window.id === 'primary' || window.id === 'secondary');
+  const displayWindows = primaryWindows.length ? primaryWindows : windows;
+  const label = displayWindows
+    .map(window => `${window.label} 剩余 ${formatPercent(window.remainingPercent)}%`)
+    .join(' · ');
+
+  return {
+    visible: true,
+    kind: 'oauth-quota',
+    platform,
+    label,
+    windows,
+    updatedAt,
+    stale
+  };
+}
+
 function normalizeBaseUrl(value) {
   const raw = String(value || '').trim();
   if (!raw) return '';
@@ -1483,14 +1557,16 @@ async function probeBalanceFromBase(baseUrl, channel, token) {
 
 function buildCacheKey(source, channel) {
   const token = resolveBalanceToken(channel);
-  const tokenHash = token
-    ? crypto.createHash('sha256').update(token).digest('hex').slice(0, 16)
-    : 'no-token';
+  const identity = isOAuthChannel(channel)
+    ? `oauth:${resolveOAuthCacheIdentity(channel) || channel.id || channel.name || 'unknown'}`
+    : token
+      ? crypto.createHash('sha256').update(token).digest('hex').slice(0, 16)
+      : 'no-token';
   return [
     source,
     channel.id || channel.name || 'unknown',
     normalizeBaseUrl(channel.baseUrl || ''),
-    tokenHash
+    identity
   ].join(':');
 }
 
@@ -1512,6 +1588,44 @@ async function refreshChannelBalanceSnapshot(source, channel, options = {}) {
     return cached.snapshot;
   }
 
+  if (isOAuthChannel(channel)) {
+    try {
+      const { fetchChannelAuthQuota } = require('../../platforms/channel-auth-service');
+      const result = await fetchChannelAuthQuota(source, channel.id, { refresh: force });
+      const snapshot = buildOAuthBalanceSnapshot(source, result?.quota, {
+        updatedAt: result?.checkedAt || nowIso(currentTime)
+      });
+      if (snapshot.visible) {
+        balanceCache.set(key, {
+          snapshot,
+          expiresAt: currentTime + CACHE_TTL_MS
+        });
+        return snapshot;
+      }
+    } catch {
+      // OAuth providers are best-effort; preserve a previous successful quota below.
+    }
+
+    if (cached?.snapshot?.visible) {
+      const staleSnapshot = {
+        ...cached.snapshot,
+        stale: true
+      };
+      balanceCache.set(key, {
+        snapshot: staleSnapshot,
+        expiresAt: currentTime + CACHE_TTL_MS
+      });
+      return staleSnapshot;
+    }
+
+    const hiddenSnapshot = makeHiddenSnapshot(source, { updatedAt: nowIso(currentTime) });
+    balanceCache.set(key, {
+      snapshot: hiddenSnapshot,
+      expiresAt: currentTime + CACHE_TTL_MS
+    });
+    return hiddenSnapshot;
+  }
+
   const bases = buildBaseCandidates(channel.baseUrl);
   if (!bases.length || !resolveBalanceToken(channel)) {
     return makeHiddenSnapshot(null, { updatedAt: nowIso(currentTime) });
@@ -1622,24 +1736,16 @@ function clearChannelBalanceCache(source, channel) {
     writePersistedStrategyCache();
   }
 }
-
 function getChannelsForSource(source) {
-  if (source === 'claude') {
-    return require('./channels').getAllChannels() || [];
-  }
-  if (source === 'codex') {
-    return require('./codex-channels').getChannels().channels || [];
-  }
-  if (source === 'gemini') {
-    return require('./gemini-channels').getChannels().channels || [];
-  }
-  if (source === 'opencode') {
-    return require('./opencode-channels').getChannels().channels || [];
-  }
-  if (source === 'omp') {
-    return require('./omp-channels').getChannels().channels || [];
+  try {
+    const driver = getPlatformContext().runtime.getDriver(source, 'channels');
+    if (!driver) return [];
+    const value = typeof driver.list === 'function' ? driver.list() : driver.getChannels?.();
+    if (value?.status === 'ok') return value.data?.channels || value.data || [];
+    return Array.isArray(value) ? value : value?.channels || [];
+  } catch (_) {
+    return [];
   }
-  return [];
 }
 
 function getEnabledBalanceChannels(source) {
@@ -1656,7 +1762,7 @@ function isBalanceDisplayEnabled() {
 
 function validateSource(source) {
   const normalized = String(source || '').trim().toLowerCase();
-  if (!VALID_SOURCES.has(normalized)) {
+  if (!getPlatformContext().registry.resolve(normalized)) {
     throw new Error('Invalid channel balance source');
   }
   return normalized;
@@ -1737,8 +1843,7 @@ async function refreshChannelBalance(source, channelId) {
 
   const entry = await refreshSnapshot(
     buildBalanceSnapshotKey(normalizedSource, channel),
-    () => refreshChannelBalanceSnapshot(normalizedSource, channel, { force: true }),
-    { bypassInflight: true }
+    () => refreshChannelBalanceSnapshot(normalizedSource, channel, { force: true })
   );
   const balance = entry.value;
   return {
@@ -1775,6 +1880,10 @@ module.exports = {
     buildSub2ApiUsageSnapshot,
     resolveStatusPlatform,
     resolveBalanceToken,
+    isOAuthChannel,
+    resolveOAuthCacheIdentity,
+    normalizeOAuthWindows,
+    buildOAuthBalanceSnapshot,
     resolveBalanceUserId,
     buildCookieCandidates,
     build88CodeApiBaseCandidates,

package/src/server/services/channel-health.js

@@ -16,9 +16,9 @@ const healthConfig = {
 // 渠道健康状态
 const channelHealth = new Map(); // `${source}:${channelId}` → health info
 
-// 冻结回调（用于通知调度器解绑会话）
 let onChannelFrozenCallback = null;
 let channelListProvider = null;
+let channelHealthPolicyProvider = null;
 
 /**
  * 设置渠道冻结时的回调
@@ -31,6 +31,22 @@ function setChannelListProvider(provider) {
   channelListProvider = typeof provider === 'function' ? provider : null;
 }
 
+
+function setChannelHealthPolicyProvider(provider) {
+  channelHealthPolicyProvider = typeof provider === 'function' ? provider : null;
+}
+
+function getHealthPolicy(source = 'claude') {
+  try {
+    const policy = channelHealthPolicyProvider?.(source);
+    if (policy && typeof policy === 'object') {
+      return { freezeOnFailure: policy.freezeOnFailure !== false };
+    }
+  } catch (_error) {
+    // Fall through to the safe default freeze policy.
+  }
+  return { freezeOnFailure: true };
+}
 /**
  * 初始化渠道健康信息
  */
@@ -128,9 +144,8 @@ function recordSuccess(channelId, source = 'claude') {
       health.nextFreezeTime = healthConfig.initialFreezeTime; // 重置冻结时间
       console.log(`[ChannelHealth] Channel ${channelId} recovered and marked as healthy`);
     }
-  }
 }
-
+}
 /**
  * 记录失败请求
  */
@@ -142,12 +157,11 @@ function recordFailure(channelId, source = 'claude', error) {
   health.consecutiveFailures++;
   health.consecutiveSuccesses = 0;
   health.lastCheckTime = now;
-
-  // omp 动态切换按请求即时回退其他渠道，失败渠道无需冻结（冻结会将其排除在后续分配之外）
-  if (source === 'omp') {
+  if (!getHealthPolicy(source).freezeOnFailure) {
     return;
   }
 
+
   // 如果当前是健康状态或检测中状态，检查是否需要冻结
   if (health.status === 'healthy' || health.status === 'checking') {
     if (health.consecutiveFailures >= healthConfig.failureThreshold) {
@@ -291,5 +305,6 @@ module.exports = {
   resetChannelHealth,
   setOnChannelFrozen,
   setChannelListProvider,
+  setChannelHealthPolicyProvider,
   healthConfig,
 };

package/src/server/services/channel-scheduler.js

@@ -1,29 +1,25 @@
-const { getAllChannels } = require('./channels');
-const { getChannels: getCodexChannels } = require('./codex-channels');
-const { getChannels: getGeminiChannels } = require('./gemini-channels');
-const { getChannels: getOpenCodeChannels } = require('./opencode-channels');
-const { getChannels: getOmpChannels } = require('./omp-channels');
-const { isChannelAvailable, getChannelHealthStatus, setOnChannelFrozen, setChannelListProvider } = require('./channel-health');
+const { getPlatformContext } = require('../platform-context');
+const { isChannelAvailable, getChannelHealthStatus, setOnChannelFrozen, setChannelListProvider, setChannelHealthPolicyProvider } = require('./channel-health');
 
-const channelProviders = {
-  claude: () => getAllChannels(),
-  codex: () => {
-    const data = getCodexChannels();
-    return Array.isArray(data?.channels) ? data.channels : [];
-  },
-  gemini: () => {
-    const data = getGeminiChannels();
-    return Array.isArray(data?.channels) ? data.channels : [];
-  },
-  opencode: () => {
-    const data = getOpenCodeChannels();
-    return Array.isArray(data?.channels) ? data.channels : [];
-  },
-  omp: () => {
-    const data = getOmpChannels();
-    return Array.isArray(data?.channels) ? data.channels : [];
+function readChannels(source = 'claude') {
+  try {
+    const driver = getPlatformContext().runtime.getDriver(source, 'channels');
+    if (!driver || (typeof driver.status === 'string' && driver.status !== 'ok')) {
+      return [];
+    }
+    const list = typeof driver.list === 'function'
+      ? driver.list.bind(driver)
+      : typeof driver.getChannels === 'function'
+        ? driver.getChannels.bind(driver)
+        : null;
+    if (!list) return [];
+    const result = list();
+    const payload = result?.status === 'ok' ? result.data : result;
+    return Array.isArray(payload) ? payload : (Array.isArray(payload?.channels) ? payload.channels : []);
+  } catch (_) {
+    return [];
   }
-};
+}
 
 function createState() {
   return {
@@ -33,14 +29,7 @@ function createState() {
     queue: []
   };
 }
-
-const schedulerStates = {
-  claude: createState(),
-  codex: createState(),
-  gemini: createState(),
-  opencode: createState(),
-  omp: createState()
-};
+const schedulerStates = Object.create(null);
 
 function getState(source = 'claude') {
   if (!schedulerStates[source]) {
@@ -70,19 +59,20 @@ function unbindChannelSessions(source, channelId) {
 
 // 注册冻结回调，当渠道被冻结时解绑其会话
 setOnChannelFrozen(unbindChannelSessions);
-setChannelListProvider((source = 'claude') => {
-  const provider = channelProviders[source || 'claude'];
-  if (!provider) return [];
-  return provider();
+setChannelListProvider((source = 'claude') => readChannels(source));
+setChannelHealthPolicyProvider((source = 'claude') => {
+  try {
+    return getPlatformContext().runtime.getDriver(source, 'channels')?.getHealthPolicy?.() || { freezeOnFailure: true };
+  } catch (_error) {
+    return { freezeOnFailure: true };
+  }
 });
 
 function refreshChannels(source = 'claude') {
   const state = getState(source);
-  const provider = channelProviders[source];
-  if (!provider) return;
+  const raw = readChannels(source);
 
   // 每次直接读取最新配置，不做缓存
-  const raw = provider();
   state.channels = raw
     .filter(ch => ch.enabled !== false)
     .map(ch => ({

package/src/server/services/channel-sync-utils.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
-const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
+const { PATHS, ensureStorageDirMigrated, getPlatformStatePath } = require('../../config/paths');
 
 function normalizeString(value) {
   return String(value || '').trim();
@@ -74,7 +74,7 @@ function resolveApiKeyValue(value, env = process.env) {
 function readActiveChannelId(platform) {
   try {
     ensureStorageDirMigrated?.();
-    const filePath = PATHS.activeChannel?.[platform];
+    const filePath = getPlatformStatePath('activeChannel', platform);
     if (!filePath || !fs.existsSync(filePath)) return null;
     const data = JSON.parse(fs.readFileSync(filePath, 'utf8'));
     return data?.activeChannelId || null;
@@ -231,12 +231,25 @@ function sanitizeChannel(channel) {
   const sanitized = {
     id: channel.id,
     name: channel.name,
-    baseUrl: channel.baseUrl,
-    enabled: channel.enabled !== false
+    baseUrl: channel.authMode === 'oauth' ? '' : channel.baseUrl,
+    apiKey: channel.apiKey || '',
+    enabled: channel.enabled !== false,
+    authMode: channel.authMode || 'api_key'
   };
   if (channel.providerKey) sanitized.providerKey = channel.providerKey;
   if (channel.model) sanitized.model = channel.model;
   if (channel.credentialSource) sanitized.credentialSource = channel.credentialSource;
+  if (channel.authMode === 'oauth') {
+    sanitized.authRef = {
+      credentialId: String(channel.authRef?.credentialId || ''),
+      providerId: String(channel.authRef?.providerId || ''),
+      accountId: String(channel.authRef?.accountId || ''),
+      identityKey: String(channel.authRef?.identityKey || ''),
+      accountEmail: String(channel.authRef?.accountEmail || '')
+    };
+    sanitized.authSource = channel.authSource || 'synced-local';
+    sanitized.authStatus = channel.authStatus || 'available';
+  }
   return sanitized;
 }
 
@@ -272,26 +285,23 @@ function upsertSyncedChannels({
     channels: [],
     warnings: []
   };
-
   let changed = false;
   for (const rawCandidate of candidates || []) {
     const candidate = rawCandidate || {};
-    if (candidate.warning) {
-      result.warnings.push(candidate.warning);
-    }
+    if (candidate.warning) result.warnings.push(candidate.warning);
     if (candidate.skip) {
       result.skipped += 1;
       if (candidate.channel) result.channels.push(sanitizeChannel(candidate.channel));
       continue;
     }
-    if (!normalizeString(candidate.baseUrl)) {
+    if (candidate.authMode !== 'oauth' && !normalizeString(candidate.baseUrl)) {
       result.skipped += 1;
       result.warnings.push(`${toolType}: missing baseUrl, skipped current channel sync`);
       continue;
     }
-    if (!normalizeString(candidate.apiKey) && candidate.authMode !== 'none') {
+    if (!normalizeString(candidate.apiKey) && candidate.authMode !== 'oauth' && candidate.authMode !== 'none') {
       result.skipped += 1;
-      result.warnings.push(`${toolType}: missing API key or OAuth-only config, skipped current channel sync`);
+      result.warnings.push(`${toolType}: missing API key, skipped current channel sync`);
       continue;
     }
 
@@ -317,7 +327,7 @@ function upsertSyncedChannels({
     const now = Date.now();
     const created = applyDefaults ? applyDefaults({
       id: candidate.id || crypto.randomUUID(),
-      enabled: candidate.enabled !== false,
+      enabled: candidate.authMode === 'oauth' ? false : candidate.enabled !== false,
       weight: candidate.weight || 1,
       maxConcurrency: candidate.maxConcurrency || null,
       ...normalizedCandidate,
@@ -325,7 +335,7 @@ function upsertSyncedChannels({
       updatedAt: now
     }) : {
       id: candidate.id || crypto.randomUUID(),
-      enabled: candidate.enabled !== false,
+      enabled: candidate.authMode === 'oauth' ? false : candidate.enabled !== false,
       weight: candidate.weight || 1,
       maxConcurrency: candidate.maxConcurrency || null,
       ...normalizedCandidate,