coding-tool-x 3.6.12 → 3.7.0

package/src/server/pi-proxy-server.js

@@ -0,0 +1,66 @@
+const { loadConfig } = require('../config/loader');
+const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
+const { syncManagedOmpProviders, disableManagedOmpProviders, getEnabledChannels } = require('./services/pi-channels');
+
+let running = false;
+let currentPort = null;
+let lastSyncResult = null;
+
+async function startPiProxyServer(options = {}) {
+  const preserveStartTime = options.preserveStartTime || false;
+  const config = loadConfig();
+  currentPort = config.ports?.piProxy || 20092;
+  lastSyncResult = syncManagedOmpProviders();
+  running = true;
+  saveProxyStartTime('pi', preserveStartTime);
+  return {
+    success: true,
+    port: currentPort,
+    sync: lastSyncResult,
+    warnings: lastSyncResult?.warnings || []
+  };
+}
+
+async function stopPiProxyServer(options = {}) {
+  const clearStartTime = options.clearStartTime !== false;
+  const stoppedPort = currentPort;
+  lastSyncResult = disableManagedOmpProviders();
+  running = false;
+  currentPort = null;
+  if (clearStartTime) {
+    clearProxyStartTime('pi');
+  }
+  return {
+    success: true,
+    port: stoppedPort,
+    sync: lastSyncResult,
+    warnings: lastSyncResult?.warnings || []
+  };
+}
+
+function getPiProxyStatus() {
+  const config = loadConfig();
+  const startTime = getProxyStartTime('pi', { allowRecovery: running });
+  const runtime = getProxyRuntime('pi', { allowRecovery: running });
+  const enabledCount = getEnabledChannels().length;
+  const validation = lastSyncResult?.validation || null;
+  return {
+    running,
+    port: currentPort,
+    defaultPort: config.ports?.piProxy || 20092,
+    startTime,
+    runtime,
+    mode: 'models-yml-provider-config',
+    enabledChannelsCount: enabledCount,
+    modelsPath: lastSyncResult?.modelsPath || lastSyncResult?.path || null,
+    backupPath: lastSyncResult?.backupPath || null,
+    modelsValidation: validation,
+    warnings: lastSyncResult?.warnings || []
+  };
+}
+
+module.exports = {
+  startPiProxyServer,
+  stopPiProxyServer,
+  getPiProxyStatus
+};

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

@@ -26,7 +26,8 @@ const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
 const CODEX_CONFIG_PATH = NATIVE_PATHS.codex.config;
 const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
 const CODEX_AGENTS_DIR = path.join(path.dirname(CODEX_CONFIG_PATH), 'agents');
-const CLAUDE_AGENTS_DIR = path.join(path.dirname(NATIVE_PATHS.claude.settings), 'agents');
+const CLAUDE_AGENTS_DIR = NATIVE_PATHS.claude.agents
+  || path.join(NATIVE_PATHS.claude.dir || path.dirname(NATIVE_PATHS.claude.settings), 'agents');
 const GEMINI_AGENTS_DIR = path.join(NATIVE_PATHS.gemini.dir, 'agents');
 const CODEX_CONFIG_MODES = new Set(['none', 'managed', 'custom']);
 

package/src/server/services/base/proxy-utils.js

@@ -101,6 +101,7 @@ function normalizeGatewaySourceType(value, fallback = 'claude') {
   if (normalized === 'claude') return 'claude';
   if (normalized === 'codex') return 'codex';
   if (normalized === 'gemini') return 'gemini';
+  if (normalized === 'opencode') return 'opencode';
   if (normalized === 'openai_compatible') return 'openai_compatible';
   return fallback;
 }

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

@@ -12,7 +12,8 @@ const REQUEST_TIMEOUT_MS = 8000;
 const MAX_RESPONSE_BYTES = 1024 * 1024;
 const QUOTA_UNIT = 500000;
 const VELOERA_QUOTA_UNIT = 1000000;
-const VALID_SOURCES = new Set(['claude', 'codex', 'gemini', 'opencode']);
+const NEWCLI_QUOTA_UNIT = 1000000;
+const VALID_SOURCES = new Set(['claude', 'codex', 'gemini', 'opencode', 'pi']);
 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']);
@@ -415,6 +416,7 @@ async function tryRequestJson(url, options) {
 function detectPlatformByUrlHint(...values) {
   const value = values.map(item => String(item || '')).join(' ').toLowerCase();
   if (value.includes('88code') || value.includes('88-code') || value.includes('rainapp.top')) return '88code';
+  if (value.includes('code.newcli.com') || value.includes('newcli') || value.includes('new-cli')) return 'newcli';
   if (value.includes('openrouter.ai') || value.includes('openrouter')) return 'openrouter';
   if (value.includes('aihubmix')) return 'aihubmix';
   if (value.includes('dashscope') || value.includes('dashscope.aliyuncs.com') || value.includes('compatible-mode')) return 'dashscope';
@@ -600,6 +602,77 @@ function buildSiliconFlowUserInfoSnapshot(payload) {
   });
 }
 
+function normalizeNewCliQuotaUnit(value) {
+  return normalizeQuotaUnit(value, NEWCLI_QUOTA_UNIT);
+}
+
+function extractNewCliSubscriptionItems(payload) {
+  if (!payload || typeof payload !== 'object') return [];
+  const data = payload.data && typeof payload.data === 'object' ? payload.data : payload;
+  const subscription = data.subscription && typeof data.subscription === 'object' ? data.subscription : data;
+  const candidates = [
+    subscription.active,
+    subscription.subscriptions,
+    subscription.items,
+    data.subscriptions,
+    data.items,
+    Array.isArray(subscription) ? subscription : null,
+    Array.isArray(data) ? data : null
+  ];
+  for (const candidate of candidates) {
+    if (Array.isArray(candidate)) return candidate;
+  }
+  return [];
+}
+
+function shouldUseNewCliSubscription(item = {}) {
+  if (!item || typeof item !== 'object') return false;
+  if (item.isActive === false) return false;
+  const status = String(item.status || item.subscriptionStatus || '').trim().toUpperCase();
+  return !status || status === 'ACTIVE' || status === '活跃中';
+}
+
+function buildNewCliDashboardSnapshot(payload) {
+  const items = extractNewCliSubscriptionItems(payload).filter(shouldUseNewCliSubscription);
+  if (!items.length) return makeHiddenSnapshot('newcli');
+
+  const data = payload?.data && typeof payload.data === 'object' ? payload.data : payload;
+  const unit = normalizeNewCliQuotaUnit(data?.quotaUnit || data?.quota_unit || data?.quota_per_unit || data?.quotaPerUnit);
+  let remainingRaw = 0;
+  let usedRaw = 0;
+  let totalRaw = 0;
+  let hasRemaining = false;
+  let hasTotal = false;
+
+  for (const item of items) {
+    const plan = item.plan && typeof item.plan === 'object' ? item.plan : {};
+    const remaining = readMoneyField(item, 'quotaRemaining', 'quota_remaining', 'remainingQuota', 'remaining_quota');
+    const used = readMoneyField(item, 'quotaUsed', 'quota_used', 'usedQuota', 'used_quota') || 0;
+    const limit = readMoneyField(item, 'quotaLimit', 'quota_limit')
+      ?? readMoneyField(plan, 'quotaLimit', 'quota_limit');
+
+    if (remaining != null) {
+      hasRemaining = true;
+      remainingRaw += Math.max(0, remaining);
+      usedRaw += Math.max(0, used);
+      if (limit != null) {
+        hasTotal = true;
+        totalRaw += Math.max(0, limit);
+      } else {
+        totalRaw += Math.max(0, remaining + used);
+      }
+    }
+  }
+
+  if (!hasRemaining) return makeHiddenSnapshot('newcli');
+
+  return makeVisibleSnapshot('newcli', {
+    remaining: remainingRaw / unit,
+    used: usedRaw / unit,
+    total: (hasTotal || usedRaw > 0) ? totalRaw / unit : undefined
+  });
+}
+
 function extractQuotaUnitFromStatus(payload) {
   if (!payload || typeof payload !== 'object') return null;
   const data = payload.data && typeof payload.data === 'object' ? payload.data : payload;
@@ -791,6 +864,41 @@ function buildSiliconFlowApiBaseCandidates(baseUrl, channel = {}) {
   return candidates;
 }
 
+function buildNewCliWebBaseCandidates(baseUrl, channel = {}) {
+  const candidates = [];
+  const inputs = [
+    channel.balanceBaseUrl,
+    channel.websiteUrl,
+    channel.baseUrl,
+    baseUrl
+  ].filter(Boolean);
+
+  for (const input of inputs) {
+    try {
+      const parsed = new URL(input);
+      addUnique(candidates, parsed.origin);
+    } catch {}
+  }
+  return candidates;
+}
+
+function buildNewCliAuthHeaderCandidates(token) {
+  const raw = stripBearer(token).replace(/^cookie:\s*/i, '').trim();
+  if (!raw) return [];
+  if (raw.includes('=')) {
+    return [{
+      Accept: 'application/json',
+      Cookie: raw
+    }];
+  }
+  return [
+    buildAuthHeaders(raw),
+    { Accept: 'application/json', Cookie: `auth_token=${raw}` },
+    { Accept: 'application/json', Cookie: `session=${raw}` },
+    { Accept: 'application/json', Cookie: `__Secure-authjs.session-token=${raw}` }
+  ];
+}
+
 function hasGatewayPathSegment(value) {
   try {
     const parsed = new URL(normalizeBaseUrl(value));
@@ -1047,12 +1155,27 @@ function buildBalanceProbeStrategies(baseUrl, channel = {}, token = '') {
       add({ type: 'siliconflow-user-info', baseUrl, apiBase });
     }
   };
+  const addNewCliStrategies = () => {
+    for (const webBase of buildNewCliWebBaseCandidates(baseUrl, channel)) {
+      add({
+        type: 'newcli-dashboard',
+        baseUrl,
+        webBase,
+        requiresDedicatedToken: !hasDedicatedBalanceToken(channel)
+      });
+    }
+  };
 
   if (UNSUPPORTED_BALANCE_PLATFORMS.has(hintedPlatform)) {
     add({ type: 'unsupported-balance', platform: hintedPlatform, baseUrl });
     return strategies;
   }
 
+  if (hintedPlatform === 'newcli') {
+    addNewCliStrategies();
+    return strategies;
+  }
+
   if (hintedPlatform === 'siliconflow') {
     addSiliconFlowStrategies();
     return strategies;
@@ -1224,6 +1347,21 @@ async function runSiliconFlowUserInfoStrategy(strategy, token) {
   return buildSiliconFlowUserInfoSnapshot(payload);
 }
 
+async function runNewCliDashboardStrategy(strategy, token, channel = {}) {
+  if (strategy.requiresDedicatedToken || !hasDedicatedBalanceToken(channel)) {
+    return makeHiddenSnapshot('newcli');
+  }
+
+  for (const headers of buildNewCliAuthHeaderCandidates(token)) {
+    const payload = await tryRequestJson(joinUrl(strategy.webBase || strategy.baseUrl, '/api/user/dashboard'), {
+      headers
+    });
+    const snapshot = buildNewCliDashboardSnapshot(payload);
+    if (snapshot.visible) return snapshot;
+  }
+  return makeHiddenSnapshot('newcli');
+}
+
 async function runBalanceStrategy(strategy, token, channel = {}) {
   if (!strategy || !strategy.type) {
     return { snapshot: makeHiddenSnapshot(), strategy };
@@ -1295,6 +1433,12 @@ async function runBalanceStrategy(strategy, token, channel = {}) {
       strategy
     };
   }
+  if (strategy.type === 'newcli-dashboard') {
+    return {
+      snapshot: await runNewCliDashboardStrategy(strategy, token, channel),
+      strategy
+    };
+  }
 
   return { snapshot: makeHiddenSnapshot(), strategy };
 }
@@ -1320,6 +1464,7 @@ async function probeBalanceFromBase(baseUrl, channel, token) {
         strategy.type?.startsWith('88code') ? '88code'
           : strategy.type?.startsWith('openrouter') ? 'openrouter'
           : strategy.type?.startsWith('siliconflow') ? 'siliconflow'
+          : strategy.type?.startsWith('newcli') ? 'newcli'
           : strategy.type?.startsWith('sub2api') ? 'sub2api'
             : strategy.platform || null
       );
@@ -1477,6 +1622,9 @@ function getChannelsForSource(source) {
   if (source === 'opencode') {
     return require('./opencode-channels').getChannels().channels || [];
   }
+  if (source === 'pi') {
+    return require('./pi-channels').getChannels().channels || [];
+  }
   return [];
 }
 
@@ -1586,8 +1734,10 @@ module.exports = {
     build88CodeApiBaseCandidates,
     buildOpenRouterApiBaseCandidates,
     buildSiliconFlowApiBaseCandidates,
+    buildNewCliWebBaseCandidates,
     build88CodeUsageSnapshot,
     build88CodeSubscriptionSnapshot,
+    buildNewCliDashboardSnapshot,
     buildBalanceProbeStrategies,
     getEnabledBalanceChannels,
     runBalanceStrategy,

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

@@ -2,6 +2,7 @@ const { getAllChannels } = require('./channels');
 const { getChannels: getCodexChannels } = require('./codex-channels');
 const { getChannels: getGeminiChannels } = require('./gemini-channels');
 const { getChannels: getOpenCodeChannels } = require('./opencode-channels');
+const { getChannels: getPiChannels } = require('./pi-channels');
 const { isChannelAvailable, getChannelHealthStatus, setOnChannelFrozen, setChannelListProvider } = require('./channel-health');
 
 const channelProviders = {
@@ -17,6 +18,10 @@ const channelProviders = {
   opencode: () => {
     const data = getOpenCodeChannels();
     return Array.isArray(data?.channels) ? data.channels : [];
+  },
+  pi: () => {
+    const data = getPiChannels();
+    return Array.isArray(data?.channels) ? data.channels : [];
   }
 };
 
@@ -33,7 +38,8 @@ const schedulerStates = {
   claude: createState(),
   codex: createState(),
   gemini: createState(),
-  opencode: createState()
+  opencode: createState(),
+  pi: createState()
 };
 
 function getState(source = 'claude') {

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

@@ -22,9 +22,10 @@ const {
 
 // 默认仓库源
 const DEFAULT_REPOS = [];
-const SUPPORTED_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode'];
+const SUPPORTED_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode', 'pi'];
 const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
-const CLAUDE_COMMANDS_DIR = path.join(path.dirname(NATIVE_PATHS.claude.settings), 'commands');
+const CLAUDE_COMMANDS_DIR = NATIVE_PATHS.claude.commands
+  || path.join(NATIVE_PATHS.claude.dir || path.dirname(NATIVE_PATHS.claude.settings), 'commands');
 const CODEX_COMMANDS_DIR = path.join(path.dirname(NATIVE_PATHS.codex.config), 'commands');
 const GEMINI_COMMANDS_DIR = path.join(NATIVE_PATHS.gemini.dir, 'commands');
 
@@ -57,6 +58,11 @@ const PLATFORM_CONFIG = {
     projectCommandsDir: (projectPath) => path.join(projectPath, '.gemini', 'commands'),
     repoType: 'gemini-commands',
     fileExtension: '.toml'
+  },
+  pi: {
+    userCommandsDir: NATIVE_PATHS.pi.commands || path.join(NATIVE_PATHS.pi.dir, 'commands'),
+    projectCommandsDir: (projectPath) => path.join(projectPath, '.omp', 'commands'),
+    repoType: 'pi-commands'
   }
 };
 
@@ -373,6 +379,9 @@ class CommandsService {
     if (this.platform === 'gemini') {
       return generateGeminiCommandToml({ description, body });
     }
+    if (this.platform === 'pi') {
+      return body || '';
+    }
 
     const frontmatterData = {};
     if (description) frontmatterData.description = description;