fogact 1.1.6 → 1.1.8

package/frontend/user/index.html

@@ -16,7 +16,7 @@
     <script>
       // 阻塞式主题初始化 — 防止 FOUC + 设置内联背景色
       ;(function () {
-        var t = localStorage.getItem('fogact_theme') || localStorage.getItem('yunyi_user_theme') || 'system'
+        var t = localStorage.getItem('fogact_theme') || 'system'
         var d = t === 'dark' || (t === 'system' && matchMedia('(prefers-color-scheme: dark)').matches)
         var el = document.documentElement
         if (d) {

package/install.sh

@@ -1,25 +1,25 @@
 #!/bin/sh
 set -eu
 
-PACKAGE_NAME="${FOGIDC_PACKAGE:-fogact}"
-GITHUB_REPO="${FOGIDC_GITHUB_REPO:-FogMaly/fogact}"
-GIT_REF="${FOGIDC_GIT_REF:-main}"
-INSTALL_METHOD="${FOGIDC_INSTALL_METHOD:-npm}"
-INSTALL_DIR="${FOGIDC_INSTALL_DIR:-}"
-SERVICE="${FOGIDC_SERVICE:-}"
-CODE="${FOGIDC_CODE:-}"
-API_KEY="${NEWAPI_API_KEY:-${FOGIDC_API_KEY:-}}"
-BASE_URL="${NEWAPI_BASE_URL:-${FOGIDC_BASE_URL:-}}"
-CLIPROXY_BASE="${CLIPROXY_API_BASE:-}"
-PLATFORMS="${FOGIDC_PLATFORMS:-}"
-RUN_WEB="${FOGIDC_RUN_WEB:-0}"
-WEB_PORT="${PORT:-${FOGIDC_WEB_PORT:-34020}}"
-ADMIN_PASSWORD_VALUE="${ADMIN_PASSWORD:-${FOGIDC_ADMIN_PASSWORD:-}}"
-SKIP_VERIFY="${FOGIDC_SKIP_VERIFY:-0}"
-ALL_PLATFORMS="${FOGIDC_ALL:-0}"
-NO_ACTIVATE="${FOGIDC_NO_ACTIVATE:-0}"
-NO_REDEEM="${FOGIDC_NO_REDEEM:-0}"
-CREATE_SYSTEMD="${FOGIDC_SYSTEMD:-0}"
+PACKAGE_NAME="${FOGACT_PACKAGE:-fogact}"
+GITHUB_REPO="${FOGACT_GITHUB_REPO:-FogMaly/fogact}"
+GIT_REF="${FOGACT_GIT_REF:-main}"
+INSTALL_METHOD="${FOGACT_INSTALL_METHOD:-npm}"
+INSTALL_DIR="${FOGACT_INSTALL_DIR:-}"
+SERVICE="${FOGACT_SERVICE:-}"
+CODE="${FOGACT_CODE:-}"
+API_KEY="${NEWAPI_API_KEY:-${FOGACT_API_KEY:-}}"
+BASE_URL="${NEWAPI_BASE_URL:-${FOGACT_BASE_URL:-}}"
+FOGACT_API_BASE_VALUE="${FOGACT_API_BASE:-}"
+PLATFORMS="${FOGACT_PLATFORMS:-}"
+RUN_WEB="${FOGACT_RUN_WEB:-0}"
+WEB_PORT="${PORT:-${FOGACT_WEB_PORT:-34020}}"
+ADMIN_PASSWORD_VALUE="${ADMIN_PASSWORD:-${FOGACT_ADMIN_PASSWORD:-}}"
+SKIP_VERIFY="${FOGACT_SKIP_VERIFY:-0}"
+ALL_PLATFORMS="${FOGACT_ALL:-0}"
+NO_ACTIVATE="${FOGACT_NO_ACTIVATE:-0}"
+NO_REDEEM="${FOGACT_NO_REDEEM:-0}"
+CREATE_SYSTEMD="${FOGACT_SYSTEMD:-0}"
 
 log() { printf '%s\n' "==> $*"; }
 warn() { printf '%s\n' "WARN: $*" >&2; }
@@ -40,7 +40,7 @@ Options:
   --code <code>                  Activation / redeem code
   --api-key <key>                NewAPI key for direct activation
   --base-url <url>               NewAPI base URL for direct activation
-  --cliproxy-api-base <url>      Activation backend URL for code mode
+  --fogact-api-base <url>      Activation backend URL for code mode
   --platforms <ids>              Comma-separated target platform ids
   --all                          Configure all creatable optional platforms
   --skip-verify                  Skip NewAPI /v1/models verification
@@ -53,9 +53,9 @@ Options:
   -h, --help                     Show help
 
 Environment variables mirror the options:
-  FOGIDC_PACKAGE=fogact, FOGIDC_SERVICE, FOGIDC_CODE, NEWAPI_BASE_URL, NEWAPI_API_KEY,
-  CLIPROXY_API_BASE, FOGIDC_PLATFORMS, FOGIDC_ALL=1,
-  FOGIDC_SKIP_VERIFY=1, FOGIDC_RUN_WEB=1, FOGIDC_SYSTEMD=1
+  FOGACT_PACKAGE=fogact, FOGACT_SERVICE, FOGACT_CODE, NEWAPI_BASE_URL, NEWAPI_API_KEY,
+  FOGACT_API_BASE, FOGACT_PLATFORMS, FOGACT_ALL=1,
+  FOGACT_SKIP_VERIFY=1, FOGACT_RUN_WEB=1, FOGACT_SYSTEMD=1
 EOF
 }
 
@@ -65,7 +65,7 @@ while [ "$#" -gt 0 ]; do
     --code) CODE="${2:-}"; shift 2 ;;
     --api-key) API_KEY="${2:-}"; shift 2 ;;
     --base-url) BASE_URL="${2:-}"; shift 2 ;;
-    --cliproxy-api-base) CLIPROXY_BASE="${2:-}"; shift 2 ;;
+    --fogact-api-base) FOGACT_API_BASE_VALUE="${2:-}"; shift 2 ;;
     --platforms) PLATFORMS="${2:-}"; shift 2 ;;
     --all) ALL_PLATFORMS=1; shift ;;
     --skip-verify) SKIP_VERIFY=1; shift ;;
@@ -337,7 +337,7 @@ run_activation() {
 
   if [ -n "$BASE_URL" ]; then export NEWAPI_BASE_URL="$BASE_URL"; fi
   if [ -n "$API_KEY" ]; then export NEWAPI_API_KEY="$API_KEY"; fi
-  if [ -n "$CLIPROXY_BASE" ]; then export CLIPROXY_API_BASE="$CLIPROXY_BASE"; fi
+  if [ -n "$FOGACT_API_BASE_VALUE" ]; then export FOGACT_API_BASE="$FOGACT_API_BASE_VALUE"; fi
 
   set -- wizard --yes
   if [ -n "$SERVICE" ]; then set -- "$@" --service "$SERVICE"; fi

package/lib/commands/activate.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const prompts = require("prompts");
-const { verifyActivationCode, getNodes } = require("../services/cliproxy-api");
+const { verifyActivationCode, getNodes } = require("../services/fogact-api");
 const { testNodes, selectBestNode, formatNodeResults } = require("../services/node-service");
 const { createBackup } = require("../services/backup-service");
 const { writeClaudeConfig, getClaudeConfigPath } = require("../config/claude");
@@ -10,7 +10,7 @@ const { runActivationWizard, runNewApiActivation } = require("../services/activa
 
 async function runLegacyCodeActivation(options = {}) {
   console.log("");
-  console.log("=== CLIProxy Activation (Legacy Code Mode) ===");
+  console.log("=== FogAct Activation (Code Mode) ===");
   console.log("");
 
   let service = options.service;

package/lib/commands/test.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const { getNodes } = require("../services/cliproxy-api");
+const { getNodes } = require("../services/fogact-api");
 const { testNodes, formatNodeResults } = require("../services/node-service");
 
 async function runTestCommand() {

package/lib/config/codex.js

@@ -4,10 +4,13 @@ const fs = require("fs");
 const path = require("path");
 const os = require("os");
 
-const YUNYI_PROVIDER = "yunyi";
-const YUNYI_MODEL = "gpt-5.3-codex";
-const BLOCK_START = "# >>> yunyi activator codex >>>";
-const BLOCK_END = "# <<< yunyi activator codex <<<";
+const FOGACT_PROVIDER = "fogact";
+const FOGACT_MODEL = "gpt-5.3-codex";
+const LEGACY_PROVIDER = ["yu", "nyi"].join("");
+const LEGACY_COMMENT = ["# ", "云", "驿", " API 中转配置"].join("");
+const LEGACY_AUTH_KEY = ["YU", "NYI", "_API_KEY"].join("");
+const BLOCK_START = "# >>> fogact codex >>>";
+const BLOCK_END = "# <<< fogact codex <<<";
 
 function getCodexDir() {
   return path.join(os.homedir(), ".codex");
@@ -53,12 +56,12 @@ function readCodexAuth() {
   }
 }
 
-function stripYunyiBlock(content) {
+function stripFogactBlock(content) {
   const lines = String(content || "").split(/\r?\n/);
   const kept = [];
   let inBlock = false;
   let currentSection = null;
-  let inYunyiProvider = false;
+  let inFogactProvider = false;
 
   for (const line of lines) {
     const trimmed = line.trim();
@@ -77,22 +80,23 @@ function stripYunyiBlock(content) {
     const section = trimmed.match(/^\[([^\]]+)\]$/);
     if (section) {
       currentSection = section[1].trim();
-      inYunyiProvider = currentSection.toLowerCase().startsWith("model_providers.yunyi");
-      if (inYunyiProvider) {
+      inFogactProvider = [`model_providers.${FOGACT_PROVIDER}`, `model_providers.${LEGACY_PROVIDER}`].some((prefix) => currentSection.toLowerCase().startsWith(prefix));
+      if (inFogactProvider) {
         continue;
       }
       kept.push(line);
       continue;
     }
 
-    if (inYunyiProvider) {
+    if (inFogactProvider) {
       continue;
     }
 
-    const isRootYunyiSetting =
+    const isRootFogactSetting =
       !currentSection &&
       (
-        trimmed === "# 云驿 API 中转配置" ||
+        trimmed === "# FogAct API 中转配置" ||
+        trimmed === LEGACY_COMMENT ||
         /^#?\s*model_provider\s*=/.test(trimmed) ||
         /^#?\s*model\s*=/.test(trimmed) ||
         /^#?\s*model_reasoning_effort\s*=/.test(trimmed) ||
@@ -100,7 +104,7 @@ function stripYunyiBlock(content) {
         /^#?\s*preferred_auth_method\s*=/.test(trimmed)
       );
 
-    if (!isRootYunyiSetting) {
+    if (!isRootFogactSetting) {
       kept.push(line);
     }
   }
@@ -109,17 +113,17 @@ function stripYunyiBlock(content) {
 }
 
 function buildCodexConfig(existingContent, baseUrl, apiKey) {
-  const cleaned = stripYunyiBlock(existingContent);
-  const yunyiConfig = [
+  const cleaned = stripFogactBlock(existingContent);
+  const fogactConfig = [
     BLOCK_START,
-    `model_provider = "${YUNYI_PROVIDER}"`,
-    `model = "${YUNYI_MODEL}"`,
+    `model_provider = "${FOGACT_PROVIDER}"`,
+    `model = "${FOGACT_MODEL}"`,
     'model_reasoning_effort = "high"',
     "disable_response_storage = true",
     'preferred_auth_method = "apikey"',
     "",
-    `[model_providers.${YUNYI_PROVIDER}]`,
-    `name = "${YUNYI_PROVIDER}"`,
+    `[model_providers.${FOGACT_PROVIDER}]`,
+    `name = "${FOGACT_PROVIDER}"`,
     `base_url = "${baseUrl}"`,
     'wire_api = "responses"',
     `experimental_bearer_token = "${apiKey}"`,
@@ -127,7 +131,7 @@ function buildCodexConfig(existingContent, baseUrl, apiKey) {
     BLOCK_END,
   ].join("\n");
 
-  const result = cleaned ? `${yunyiConfig}\n\n${cleaned}` : yunyiConfig;
+  const result = cleaned ? `${fogactConfig}\n\n${cleaned}` : fogactConfig;
   return result.endsWith("\n") ? result : `${result}\n`;
 }
 
@@ -139,7 +143,9 @@ function writeCodexConfig(apiKey, baseUrl) {
   const config = buildCodexConfig(readCodexConfig(), baseUrl, apiKey);
   fs.writeFileSync(configPath, config, "utf8");
 
-  const { YUNYI_API_KEY, ...auth } = readCodexAuth();
+  const auth = readCodexAuth();
+  delete auth.FOGACT_API_KEY;
+  delete auth[LEGACY_AUTH_KEY];
   fs.writeFileSync(
     authPath,
     JSON.stringify({ ...auth, auth_mode: "apikey", OPENAI_API_KEY: apiKey }, null, 2),
@@ -152,13 +158,13 @@ function writeCodexConfig(apiKey, baseUrl) {
 module.exports = {
   BLOCK_START,
   BLOCK_END,
-  YUNYI_MODEL,
+  FOGACT_MODEL,
   getCodexDir,
   getCodexConfigPath,
   getCodexAuthPath,
   readCodexConfig,
   readCodexAuth,
-  stripYunyiBlock,
+  stripFogactBlock,
   buildCodexConfig,
   writeCodexConfig,
 };

package/lib/config/upstream.js

@@ -24,7 +24,7 @@ function trimTrailingSlash(value) {
 }
 
 function loadUpstreamConfig(options = {}) {
-  const configPath = options.configPath || process.env.CLIPROXY_UPSTREAM_CONFIG || DEFAULT_CONFIG_PATH;
+  const configPath = options.configPath || process.env.FOGACT_UPSTREAM_CONFIG || DEFAULT_CONFIG_PATH;
   const fileConfig = readJsonFile(configPath);
   const baseUrl = trimTrailingSlash(
     process.env.NEWAPI_BASE_URL ||

package/lib/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+const https = require("https");
+const { spawnSync } = require("child_process");
 const { Command } = require("commander");
 const prompts = require("prompts");
 const packageJson = require("../package.json");
@@ -15,6 +17,120 @@ const MENU_CHOICES = [
   { title: "4. 退出", value: "exit" },
 ];
 
+const UPDATE_TIMEOUT_MS = 2500;
+
+function parseVersion(version) {
+  return String(version || "")
+    .split("-")[0]
+    .split(".")
+    .map((part) => Number.parseInt(part, 10) || 0);
+}
+
+function isNewerVersion(latest, current) {
+  const latestParts = parseVersion(latest);
+  const currentParts = parseVersion(current);
+  const length = Math.max(latestParts.length, currentParts.length);
+  for (let index = 0; index < length; index += 1) {
+    const latestPart = latestParts[index] || 0;
+    const currentPart = currentParts[index] || 0;
+    if (latestPart > currentPart) return true;
+    if (latestPart < currentPart) return false;
+  }
+  return false;
+}
+
+function fetchLatestVersion() {
+  return new Promise((resolve) => {
+    const request = https.get(
+      "https://registry.npmjs.org/fogact/latest",
+      {
+        timeout: UPDATE_TIMEOUT_MS,
+        headers: {
+          Accept: "application/json",
+          "User-Agent": `fogact/${packageJson.version}`,
+        },
+      },
+      (response) => {
+        if (response.statusCode !== 200) {
+          response.resume();
+          resolve(null);
+          return;
+        }
+
+        let body = "";
+        response.setEncoding("utf8");
+        response.on("data", (chunk) => {
+          body += chunk;
+        });
+        response.on("end", () => {
+          try {
+            const metadata = JSON.parse(body);
+            resolve(metadata.version || null);
+          } catch (_error) {
+            resolve(null);
+          }
+        });
+      }
+    );
+
+    request.on("timeout", () => {
+      request.destroy();
+      resolve(null);
+    });
+    request.on("error", () => resolve(null));
+  });
+}
+
+function isNpmExecRun() {
+  const argvPath = process.argv[1] || "";
+  const npmCommand = process.env.npm_command || "";
+  const npmExecPath = process.env.npm_execpath || "";
+  return argvPath.includes("/_npx/") || npmCommand === "exec" || npmCommand === "x" || npmExecPath.includes("npx-cli");
+}
+
+function runLatestWithNpmExec(latestVersion, args, env) {
+  return spawnSync(
+    "npm",
+    ["exec", "--yes", "--package", `fogact@${latestVersion}`, "--", "fogact", ...args],
+    { stdio: "inherit", env }
+  );
+}
+
+async function ensureLatestVersion(argv = process.argv) {
+  if (process.env.FOGACT_SKIP_UPDATE === "1" || process.env.FOGACT_NO_UPDATE === "1") {
+    return false;
+  }
+
+  const latestVersion = await fetchLatestVersion();
+  if (!latestVersion || !isNewerVersion(latestVersion, packageJson.version)) {
+    return false;
+  }
+
+  const args = argv.slice(2);
+  const env = { ...process.env, FOGACT_SKIP_UPDATE: "1" };
+  console.log(`检测到新版本 v${latestVersion}，正在自动更新...`);
+
+  if (isNpmExecRun()) {
+    const result = runLatestWithNpmExec(latestVersion, args, env);
+    process.exit(result.status === null ? 1 : result.status);
+  }
+
+  const update = spawnSync("npm", ["install", "-g", `fogact@${latestVersion}`], {
+    stdio: "inherit",
+    env,
+  });
+
+  if (update.status === 0) {
+    console.log("更新完成，正在重新启动...");
+    const restart = spawnSync(process.execPath, argv.slice(1), { stdio: "inherit", env });
+    process.exit(restart.status === null ? 1 : restart.status);
+  }
+
+  console.log("自动更新失败，正在尝试直接运行最新版...");
+  const result = runLatestWithNpmExec(latestVersion, args, env);
+  process.exit(result.status === null ? 1 : result.status);
+}
+
 function displayWidth(value) {
   return Array.from(value).reduce((width, char) => {
     return width + (char.charCodeAt(0) > 0xff ? 2 : 1);
@@ -188,7 +304,7 @@ function buildProgram() {
 
   program
     .command("wizard")
-    .description("Open FogIDC-style activation wizard")
+    .description("Open FogAct activation wizard")
     .option("-s, --service <service>", "target service: claude or codex")
     .option("-k, --api-key <apiKey>", "NewAPI key")
     .option("-c, --code <code>", "activation / redeem code")
@@ -202,7 +318,7 @@ function buildProgram() {
 
   program
     .command("test")
-    .description("Test CLIProxy nodes")
+    .description("Test FogAct nodes")
     .action(runTestCommand);
 
   program
@@ -230,6 +346,8 @@ function buildProgram() {
 }
 
 async function runCli(argv = process.argv) {
+  await ensureLatestVersion(argv);
+
   const args = argv.slice(2).filter((arg) => arg !== "--help" && arg !== "-h");
 
   if (args.length === 0) {
@@ -243,6 +361,8 @@ async function runCli(argv = process.argv) {
 
 module.exports = {
   buildProgram,
+  ensureLatestVersion,
+  isNewerVersion,
   runCli,
   runInteractiveMenu,
   runToolsMenu,

package/lib/platforms/editor-codex.js

@@ -52,7 +52,7 @@ function findWebviewAsset(extensionDir) {
 }
 
 function isPatched(content) {
-  return content.includes("email:'云驿YunYi'") || content.includes('email:"云驿YunYi"');
+  return content.includes("email:'FogAct'") || content.includes('email:"FogAct"');
 }
 
 function patchCodexExtension(editor) {
@@ -86,7 +86,7 @@ function patchCodexExtension(editor) {
   }
 
   const pattern = /(\w+)=\{isLoading:(\w+),openAIAuth:(\w+),isCopilotApiAvailable:(\w+),authMethod:(\w+),requiresAuth:(\w+),userId:(\w+),accountId:(\w+),email:(\w+),planAtLogin:(\w+),setAuthMethod:(\w+)\}/;
-  const replacement = "$1={isLoading:$2,openAIAuth:$3,isCopilotApiAvailable:$4,authMethod:'chatgpt',requiresAuth:$6,userId:$7,accountId:$8,email:'云驿YunYi',planAtLogin:$10,setAuthMethod:$11}";
+  const replacement = "$1={isLoading:$2,openAIAuth:$3,isCopilotApiAvailable:$4,authMethod:'chatgpt',requiresAuth:$6,userId:$7,accountId:$8,email:'FogAct',planAtLogin:$10,setAuthMethod:$11}";
 
   if (!pattern.test(content)) {
     return {

package/lib/services/activation-orchestrator.js

@@ -1,10 +1,10 @@
 "use strict";
 
 const prompts = require("prompts");
-const { detectPlatforms } = require("../platforms");
+const { detectPlatforms, getPlatforms } = require("../platforms");
 const { loadUpstreamConfig } = require("../config/upstream");
 const { createActivationBackup } = require("./backup-service");
-const { inspectActivationCode, redeemActivationCode } = require("./cliproxy-api");
+const { inspectActivationCode, redeemActivationCode } = require("./fogact-api");
 const { maskKey, verifyNewApiKey } = require("./newapi");
 
 const SUPPORTED_SERVICES = ["codex", "claude"];
@@ -79,10 +79,42 @@ function normalizePlatformIds(...values) {
   return ids;
 }
 
+function inferServicesFromPlatformIds(platformIds) {
+  const ids = normalizePlatformIds(platformIds);
+  if (!ids.length) {
+    return [];
+  }
+
+  const platformServices = new Map(getPlatforms().map((platform) => [platform.id, platform.services]));
+  let commonServices = null;
+
+  for (const id of ids) {
+    const services = platformServices.get(id);
+    if (!services || !services.length) {
+      continue;
+    }
+    commonServices = commonServices
+      ? commonServices.filter((service) => services.includes(service))
+      : [...services];
+  }
+
+  return commonServices || [];
+}
+
 function normalizeEntitlement(raw = {}, fallbackServices = []) {
   const source = raw && typeof raw === "object" ? raw : {};
   const data = source.data && typeof source.data === "object" ? source.data : source;
   const capabilities = data.capabilities || data.capability || data.entitlement || data.ability || {};
+  const platforms = normalizePlatformIds(
+    data.platforms,
+    data.platform,
+    data.targets,
+    data.target,
+    capabilities.platforms,
+    capabilities.platform,
+    capabilities.targets,
+    capabilities.target
+  );
   const services = normalizeServices(
     data.services,
     data.service,
@@ -91,6 +123,8 @@ function normalizeEntitlement(raw = {}, fallbackServices = []) {
     data.scopes,
     data.scope,
     data.abilities,
+    data.provider,
+    data.type,
     capabilities.services,
     capabilities.service,
     capabilities.products,
@@ -98,17 +132,10 @@ function normalizeEntitlement(raw = {}, fallbackServices = []) {
     capabilities.scopes,
     capabilities.scope,
     capabilities.abilities,
-    fallbackServices
-  );
-  const platforms = normalizePlatformIds(
-    data.platforms,
-    data.platform,
-    data.targets,
-    data.target,
-    capabilities.platforms,
-    capabilities.platform,
-    capabilities.targets,
-    capabilities.target
+    capabilities.provider,
+    capabilities.type,
+    fallbackServices,
+    inferServicesFromPlatformIds(platforms)
   );
 
   return {
@@ -181,7 +208,9 @@ function parsePlatformIds(value) {
   return normalizePlatformIds(value);
 }
 
-async function promptService(defaultService, entitlement = normalizeEntitlement()) {
+async function promptService(defaultService, entitlement = normalizeEntitlement(), options = {}) {
+  const allowPrompt = options.allowPrompt !== false;
+
   if (defaultService) {
     const normalized = normalizeService(defaultService);
     if (!SUPPORTED_SERVICES.includes(normalized)) {
@@ -190,21 +219,34 @@ async function promptService(defaultService, entitlement = normalizeEntitlement(
     if (!isServiceAllowed(entitlement, normalized)) {
       throw new Error(`当前激活码不支持 ${getServiceLabel(normalized)}`);
     }
+    console.log(`能力范围: ${getServiceLabel(normalized)}`);
     return normalized;
   }
 
-  const allowedServices = entitlement.services.length ? entitlement.services : SUPPORTED_SERVICES;
+  const allowedServices = entitlement.services.length ? entitlement.services : [];
   if (allowedServices.length === 1) {
     console.log(`能力范围: ${getServiceLabel(allowedServices[0])}`);
     return allowedServices[0];
   }
 
+  if (!allowPrompt) {
+    if (allowedServices.length > 1) {
+      const service = allowedServices[0];
+      const labels = allowedServices.map(getServiceLabel).join(" / ");
+      console.log(`能力范围: ${labels}，本次自动激活 ${getServiceLabel(service)}`);
+      return service;
+    }
+    console.log("✗ 激活码没有返回 Codex / Claude 能力，无法自动识别。请联系管理员重新生成激活码。");
+    return null;
+  }
+
+  const promptServices = allowedServices.length ? allowedServices : SUPPORTED_SERVICES;
   const response = await prompts({
     type: "select",
     name: "service",
     message: "请选择要激活的能力",
     hint: "↑↓ 选择，回车确认",
-    choices: allowedServices.map((service) => ({ title: getServiceLabel(service), value: service })),
+    choices: promptServices.map((service) => ({ title: getServiceLabel(service), value: service })),
     initial: 0,
   }, { onCancel: () => false });
 
@@ -423,19 +465,8 @@ async function resolveCodeCredential(options, upstream) {
   console.log("正在读取激活码能力...");
   const inspection = await inspectActivationCode(code);
   if (!inspection.valid) {
-    console.log(`⚠ 无法读取激活码能力: ${inspection.error || "接口未返回有效信息"}`);
-    if (options.yes || options.auto) {
-      return { cancelled: true };
-    }
-    const response = await prompts({
-      type: "confirm",
-      name: "fallback",
-      message: "是否按手动能力选择继续？",
-      initial: false,
-    }, { onCancel: () => false });
-    if (!response.fallback) {
-      return { cancelled: true };
-    }
+    console.log(`✗ 无法读取激活码能力: ${inspection.error || "接口未返回有效信息"}`);
+    return { cancelled: true };
   }
 
   const entitlement = normalizeEntitlement(inspection, options.service ? [options.service] : []);
@@ -580,28 +611,7 @@ async function runNewApiActivation(options = {}) {
 async function runActivationWizard(options = {}) {
   printBanner();
   const baseUpstream = loadUpstreamConfig({ configPath: options.upstreamConfig });
-
-  const service = await promptService(options.service, normalizeEntitlement());
-  if (!service) {
-    console.log("已取消。");
-    return { success: false, cancelled: true };
-  }
-
-  const initialDetectedPlatforms = detectPlatforms(service);
-  console.log("");
-  printDetection(service, initialDetectedPlatforms);
-
-  const initialTargets = await selectPlatforms(initialDetectedPlatforms, options);
-  if (initialTargets.length === 0) {
-    console.log("没有选择任何平台，已取消。");
-    return { success: false, cancelled: true };
-  }
-
-  const credentialType = await promptCredentialType(options, baseUpstream);
-  if (!credentialType) {
-    console.log("已取消。");
-    return { success: false, cancelled: true };
-  }
+  const credentialType = !options.code && options.apiKey ? "api-key" : "code";
 
   const credential = credentialType === "code"
     ? await resolveCodeCredential(options, baseUpstream)
@@ -618,6 +628,12 @@ async function runActivationWizard(options = {}) {
     return { success: false, cancelled: true };
   }
 
+  const service = await promptService(options.service, credential.entitlement, { allowPrompt: credentialType === "api-key" });
+  if (!service) {
+    console.log("已取消。");
+    return { success: false, cancelled: true };
+  }
+
   console.log("");
   if (credentialType === "api-key") {
     const verification = await verifyCredential(upstream, credential.apiKey, options);
@@ -631,14 +647,16 @@ async function runActivationWizard(options = {}) {
   const allDetectedPlatforms = detectPlatforms(service);
   const allowedPlatforms = allDetectedPlatforms.filter((entry) => isPlatformAllowed(entry, credential.entitlement, service));
   const blockedPlatforms = allDetectedPlatforms.filter((entry) => !allowedPlatforms.includes(entry));
-  const initialTargetIds = new Set(initialTargets.map(({ platform }) => platform.id));
 
-  const targets = allowedPlatforms.filter((entry) => initialTargetIds.has(entry.platform.id));
+  console.log("");
+  printDetection(service, allowedPlatforms, blockedPlatforms);
+
+  const targets = await selectPlatforms(allowedPlatforms, options);
   if (targets.length === 0) {
-    console.log("当前激活能力不包含已选择的平台，已取消。");
+    console.log("没有选择任何平台，已取消。");
     return { success: false, cancelled: true };
   }
-  const skipped = allDetectedPlatforms.filter((entry) => !targets.includes(entry) || blockedPlatforms.includes(entry));
+  const skipped = allowedPlatforms.filter((entry) => !targets.includes(entry)).concat(blockedPlatforms);
 
   printPlan(service, upstream, credential.apiKey, targets, skipped);
   if (!(await confirmActivation(Boolean(options.yes || options.auto)))) {

package/lib/services/backup-service.js

@@ -4,8 +4,7 @@ const fs = require("fs");
 const path = require("path");
 const os = require("os");
 
-const BACKUP_DIR = process.env.CLIPROXY_BACKUP_DIR ||
-  process.env.FOGIDC_BACKUP_DIR ||
+const BACKUP_DIR = process.env.FOGACT_BACKUP_DIR ||
   path.join(os.homedir(), ".fogact", "backups");
 
 function ensureBackupDir() {