fogact 1.2.0 → 1.2.3

package/frontend/user/assets/link-2-DT5R5nGO-fogact-live.js

@@ -0,0 +1,6 @@
+import{c as e}from"./index-fogact-live.js";/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const n=e("Link2Icon",[["path",{d:"M9 17H7A5 5 0 0 1 7 7h2",key:"8i5ue5"}],["path",{d:"M15 7h2a5 5 0 1 1 0 10h-2",key:"1b9ql8"}],["line",{x1:"8",x2:"16",y1:"12",y2:"12",key:"1jonct"}]]);export{n as L};

package/frontend/user/assets/package-rUbExUEn-fogact-live.js

@@ -0,0 +1,6 @@
+import{c as a}from"./index-fogact-live.js";/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const c=a("PackageIcon",[["path",{d:"M11 21.73a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73z",key:"1a0edw"}],["path",{d:"M12 22V12",key:"d0xqtd"}],["path",{d:"m3.3 7 7.703 4.734a2 2 0 0 0 1.994 0L20.7 7",key:"yx3hmr"}],["path",{d:"m7.5 4.27 9 5.15",key:"1c824w"}]]);export{c as P};

package/frontend/user/assets/plus-CQc6C8wG-fogact-live.js

@@ -0,0 +1,11 @@
+import{c as a}from"./index-fogact-live.js";/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const s=a("LayersIcon",[["path",{d:"M12.83 2.18a2 2 0 0 0-1.66 0L2.6 6.08a1 1 0 0 0 0 1.83l8.58 3.91a2 2 0 0 0 1.66 0l8.58-3.9a1 1 0 0 0 0-1.83z",key:"zw3jo"}],["path",{d:"M2 12a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 12",key:"1wduqc"}],["path",{d:"M2 17a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 17",key:"kqbvx6"}]]);/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const t=a("PlusIcon",[["path",{d:"M5 12h14",key:"1ays0h"}],["path",{d:"M12 5v14",key:"s699le"}]]);export{s as L,t as P};

package/frontend/user/assets/refresh-cw-Y9hCloPL-fogact-live.js

@@ -0,0 +1,6 @@
+import{c as e}from"./index-fogact-live.js";/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const t=e("RefreshCwIcon",[["path",{d:"M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8",key:"v9h5vc"}],["path",{d:"M21 3v5h-5",key:"1q7to0"}],["path",{d:"M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16",key:"3uifl3"}],["path",{d:"M8 16H3v5",key:"1cv678"}]]);export{t as R};

package/frontend/user/assets/useUserPageRefresh-BYZvpNR9-fogact-live.js

@@ -0,0 +1 @@
+import{u as c}from"./index-fogact-live.js";import{w as i,L as d,f as h}from"./chart-vendor-CULJE59K.js";const o=Symbol("user-page-refresh");function v(l,e={}){const n=c(),f=h(o,null);let t=0;async function a(r="custom"){var u;const s=++t;(u=e.resetBeforeLoad)==null||u.call(e,r),await l({reason:r,runId:s,isLatest:()=>s===t})}return e.reloadOnKeyChange!==!1&&i(()=>n.activeKeyId,(r,s)=>{r!==s&&a("active-key-change")}),e.reloadOnManualRefresh!==!1&&f&&i(()=>f.refreshTick.value,()=>{a("manual-refresh")}),e.immediate!==!1&&d(()=>{a("initial")}),{reload:a}}export{v as a,o as u};

package/frontend/user/assets/zap-l5zbZqrM-fogact-live.js

@@ -0,0 +1,11 @@
+import{c as a}from"./index-fogact-live.js";/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const e=a("ShieldIcon",[["path",{d:"M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z",key:"oel41y"}]]);/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const o=a("ZapIcon",[["path",{d:"M4 14a1 1 0 0 1-.78-1.63l9.9-10.2a.5.5 0 0 1 .86.46l-1.92 6.02A1 1 0 0 0 13 10h7a1 1 0 0 1 .78 1.63l-9.9 10.2a.5.5 0 0 1-.86-.46l1.92-6.02A1 1 0 0 0 11 14z",key:"1xq2db"}]]);export{e as S,o as Z};

package/frontend/user/index.html

@@ -8,15 +8,15 @@
       href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%239ca3af' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9Z'%3E%3C/path%3E%3C/svg%3E"
     />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>CLIProxy - API 使用监控</title>
-    <meta name="description" content="CLIProxy API 使用量监控平台" />
+    <title>FogAct - API 使用监控</title>
+    <meta name="description" content="FogAct API 使用量监控平台" />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@600;700;800&family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet" />
     <script>
       // 阻塞式主题初始化 — 防止 FOUC + 设置内联背景色
       ;(function () {
-        var t = localStorage.getItem('yunyi_user_theme') || 'system'
+        var t = localStorage.getItem('fogact_user_theme') || 'system'
         var d = t === 'dark' || (t === 'system' && matchMedia('(prefers-color-scheme: dark)').matches)
         var el = document.documentElement
         if (d) {
@@ -28,10 +28,10 @@
         }
       })()
     </script>
-    <script type="module" crossorigin src="assets/index-Da98HOxL.js"></script>
+    <script type="module" crossorigin src="assets/index-fogact-live.js"></script>
     <link rel="modulepreload" crossorigin href="assets/chart-vendor-CULJE59K.js">
     <link rel="stylesheet" crossorigin href="assets/index-B8QSyYhS.css">
-    <link rel="stylesheet" href="/assets/market-ui.css?v=20260619-user-restore" />
+    <link rel="stylesheet" href="/assets/market-ui.css?v=20260619-fogact-copy2" />
   </head>
   <body class="market-user min-h-screen">
     <span class="market-mouse-light" aria-hidden="true"></span>

package/lib/commands/activate.js

@@ -6,7 +6,7 @@ const { testNodes, selectBestNode, formatNodeResults } = require("../services/no
 const { createBackup } = require("../services/backup-service");
 const { writeClaudeConfig, getClaudeConfigPath } = require("../config/claude");
 const { writeCodexConfig, getCodexConfigPath } = require("../config/codex");
-const { runActivationWizard, runNewApiActivation } = require("../services/activation-orchestrator");
+const { runActivationWizard } = require("../services/activation-orchestrator");
 
 async function runLegacyCodeActivation(options = {}) {
   console.log("");
@@ -131,13 +131,6 @@ async function runActivateCommand(options = {}) {
     return;
   }
 
-  if (options.service && options.apiKey && (options.yes || options.auto)) {
-    console.log("");
-    console.log("=== NewAPI Multi-Platform Activation ===");
-    await runNewApiActivation(options);
-    return;
-  }
-
   await runActivationWizard(options);
 }
 

package/lib/config/claude.js

@@ -59,6 +59,7 @@ function writeClaudeConfig(apiKey, baseUrl) {
       ...existingEnv,
       ANTHROPIC_BASE_URL: baseUrl,
       ANTHROPIC_AUTH_TOKEN: apiKey,
+      FOGACT_ACTIVATION_CODE: apiKey,
     },
   });
 

package/lib/config/codex.js

@@ -148,7 +148,7 @@ function writeCodexConfig(apiKey, baseUrl) {
   delete auth[LEGACY_AUTH_KEY];
   fs.writeFileSync(
     authPath,
-    JSON.stringify({ ...auth, auth_mode: "apikey", OPENAI_API_KEY: apiKey }, null, 2),
+    JSON.stringify({ ...auth, auth_mode: "apikey", OPENAI_API_KEY: apiKey, FOGACT_ACTIVATION_CODE: apiKey }, null, 2),
     "utf8"
   );
 

package/lib/config/upstream.js

@@ -56,6 +56,9 @@ function loadUpstreamConfig(options = {}) {
 }
 
 function getServiceBaseUrl(config, service) {
+  if (config && config.proxy === true && config.baseUrl) {
+    return trimTrailingSlash(config.baseUrl);
+  }
   const serviceConfig = (config.services && config.services[service]) || {};
   return trimTrailingSlash(serviceConfig.baseUrl || config.baseUrl);
 }

package/lib/index.js

@@ -170,6 +170,75 @@ function printBanner() {
   console.log(renderMenu(0));
 }
 
+function shouldUseFixedMenuScreen(env = process.env, stdout = process.stdout) {
+  if (!stdout.isTTY) return false;
+  if (env.FOGACT_NO_FIXED_MENU === "1" || env.FOGACT_PLAIN_MENU === "1") return false;
+  return String(env.TERM || "").toLowerCase() !== "dumb";
+}
+
+function enterFixedMenuScreen(stdout = process.stdout) {
+  stdout.write("\x1b[?1049h\x1b[?25l\x1b[?7l");
+}
+
+function leaveFixedMenuScreen(stdout = process.stdout) {
+  stdout.write("\x1b[?7h\x1b[?25h\x1b[?1049l");
+}
+
+function saveMenuCursor(stdout = process.stdout) {
+  stdout.write("\x1b7\x1b[s\x1b[?25l");
+}
+
+function restoreMenuCursor(stdout = process.stdout) {
+  stdout.write("\x1b8\x1b[u\x1b[J");
+}
+
+function moveMenuCursor(cursor, direction, total) {
+  return (cursor + direction + total) % total;
+}
+
+function applyMenuInput(input, cursor, total = MENU_CHOICES.length) {
+  const text = String(input || "");
+  const result = { cursor, action: null };
+  const tokenPattern = /\u001b(?:\[[0-9;]*[AB]|O[AB])|\r|\n|\u0003|\u001b|[1-9jksw]/gi;
+  let match;
+
+  while ((match = tokenPattern.exec(text)) !== null) {
+    const token = match[0];
+    const lower = token.toLowerCase();
+
+    if (token === "\u0003" || token === "\u001b") {
+      result.action = "exit";
+      break;
+    }
+
+    if (token === "\r" || token === "\n") {
+      result.action = "submit";
+      break;
+    }
+
+    if (/^\u001b(?:\[[0-9;]*A|OA)$/i.test(token) || lower === "k" || lower === "w") {
+      result.cursor = moveMenuCursor(result.cursor, -1, total);
+      continue;
+    }
+
+    if (/^\u001b(?:\[[0-9;]*B|OB)$/i.test(token) || lower === "j" || lower === "s") {
+      result.cursor = moveMenuCursor(result.cursor, 1, total);
+      continue;
+    }
+
+    if (/^[1-9]$/.test(token)) {
+      const selected = Number(token) - 1;
+      if (selected >= 0 && selected < total) {
+        result.cursor = selected;
+        result.action = "submit";
+        break;
+      }
+    }
+  }
+
+  return result;
+}
+
 async function runInteractiveMenu() {
   await runToolsMenu();
 }
@@ -182,24 +251,33 @@ function selectMenuAction() {
 
   return new Promise((resolve) => {
     let cursor = 0;
-    let renderedLines = 0;
+    let closed = false;
     const stdin = process.stdin;
+    const stdout = process.stdout;
+    const useFixedScreen = shouldUseFixedMenuScreen(process.env, stdout);
+    const wasRaw = Boolean(stdin.isRaw);
 
     const render = () => {
-      if (renderedLines > 0) {
-        process.stdout.write(`\x1b[${renderedLines}A`);
-        process.stdout.write("\x1b[J");
+      if (useFixedScreen) {
+        stdout.write("\x1b[H\x1b[2J");
+      } else {
+        restoreMenuCursor(stdout);
       }
-      const output = renderMenu(cursor);
-      renderedLines = output.split("\n").length;
-      process.stdout.write(output);
+      stdout.write(renderMenu(cursor));
     };
 
     const cleanup = () => {
+      if (closed) return;
+      closed = true;
       stdin.off("data", onData);
-      if (stdin.isRaw) stdin.setRawMode(false);
+      if (stdin.isTTY && stdin.isRaw !== wasRaw) stdin.setRawMode(wasRaw);
       stdin.pause();
-      process.stdout.write("\x1b[?25h\n");
+      if (useFixedScreen) {
+        leaveFixedMenuScreen(stdout);
+      } else {
+        restoreMenuCursor(stdout);
+        stdout.write("\x1b[?25h");
+      }
     };
 
     const submit = () => {
@@ -214,31 +292,35 @@ function selectMenuAction() {
     };
 
     const onData = (data) => {
-      const key = data.toString("utf8");
-      if (key === "\u0003" || key === "\u001b") {
+      const next = applyMenuInput(String(data), cursor, MENU_CHOICES.length);
+      const cursorChanged = next.cursor !== cursor;
+      cursor = next.cursor;
+
+      if (next.action === "exit") {
         cancel();
         return;
       }
-      if (key === "\r" || key === "\n") {
+
+      if (next.action === "submit") {
         submit();
         return;
       }
-      if (key === "\u001b[A") {
-        cursor = cursor === 0 ? MENU_CHOICES.length - 1 : cursor - 1;
-        render();
-        return;
-      }
-      if (key === "\u001b[B") {
-        cursor = cursor === MENU_CHOICES.length - 1 ? 0 : cursor + 1;
+
+      if (cursorChanged) {
         render();
       }
     };
 
-    process.stdout.write("\x1b[?25l");
-    render();
-    stdin.resume();
     stdin.setEncoding("utf8");
     stdin.setRawMode(true);
+    stdin.resume();
+
+    if (useFixedScreen) {
+      enterFixedMenuScreen(stdout);
+    } else {
+      saveMenuCursor(stdout);
+    }
+    render();
     stdin.on("data", onData);
   });
 }
@@ -292,15 +374,11 @@ function buildProgram() {
     .command("activate")
     .description("Open the multi-platform activation flow")
     .option("-s, --service <service>", "target service: claude or codex")
-    .option("-k, --api-key <apiKey>", "NewAPI key; defaults to config/upstream.json or NEWAPI_API_KEY")
     .option("-y, --yes", "auto-confirm activation plan")
     .option("--auto", "alias for --yes")
     .option("--all", "configure optional platforms even when their config files do not exist")
     .option("--platforms <ids>", "comma-separated platform ids to activate")
-    .option("--skip-verify", "skip upstream /v1/models key verification")
-    .option("--upstream-config <path>", "path to upstream config JSON")
     .option("-c, --code <code>", "activation / redeem code")
-    .option("--legacy", "use legacy activation-code node switching flow")
     .option("--no-redeem", "do not mark activation code as redeemed after writing config")
     .action(runActivateCommand);
 
@@ -308,13 +386,10 @@ function buildProgram() {
     .command("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")
     .option("--platforms <ids>", "comma-separated platform ids to activate")
     .option("--all", "select all configurable platforms")
     .option("--yes", "auto-confirm activation plan")
-    .option("--skip-verify", "skip upstream /v1/models key verification")
-    .option("--upstream-config <path>", "path to upstream config JSON")
     .option("--no-redeem", "do not mark activation code as redeemed after writing config")
     .action(runActivationWizard);
 
@@ -362,7 +437,12 @@ async function runCli(argv = process.argv) {
 }
 
 module.exports = {
+  applyMenuInput,
   buildProgram,
+  enterFixedMenuScreen,
+  leaveFixedMenuScreen,
+  renderMenu,
+  shouldUseFixedMenuScreen,
   ensureLatestVersion,
   isNewerVersion,
   runCli,

package/lib/platforms/opencode.js

@@ -21,7 +21,7 @@ function buildClaudeConfig(existingConfig, baseUrl, apiKey) {
     name: "fogact-claude",
     npm: "@ai-sdk/anthropic",
     options: {
-      baseURL: `${baseUrl.replace(/\/+$/, "")}/v1`,
+      baseURL: baseUrl.replace(/\/+$/, ""),
       apiKey,
     },
   };

package/lib/services/activation-orchestrator.js

@@ -2,10 +2,9 @@
 
 const prompts = require("prompts");
 const { detectPlatforms, getPlatforms } = require("../platforms");
-const { loadUpstreamConfig } = require("../config/upstream");
 const { createActivationBackup } = require("./backup-service");
-const { getNodes, inspectActivationCode, redeemActivationCode, testNode } = require("./fogact-api");
-const { maskKey, verifyNewApiKey } = require("./newapi");
+const { getNodes, inspectActivationCode, testNode, verifyActivationCode } = require("./fogact-api");
+const { maskKey } = require("./newapi");
 
 const SUPPORTED_SERVICES = ["codex", "claude"];
 const SERVICE_LABELS = {
@@ -149,6 +148,9 @@ function normalizeEntitlement(raw = {}, fallbackServices = []) {
 function extractApiKeyFromEntitlement(entitlement, fallback) {
   const raw = entitlement && entitlement.raw ? entitlement.raw : {};
   const credential = raw.credential || raw.credentials || {};
+  if (raw.proxy === true) {
+    return String(raw.apiKey || raw.key || raw.token || fallback || "").trim();
+  }
   return String(
     raw.apiKey ||
     raw.key ||
@@ -176,6 +178,16 @@ function extractBaseUrlFromEntitlement(entitlement) {
   ).trim().replace(/\/+$/, "");
 }
 
+function extractProxyBaseUrlFromEntitlement(entitlement) {
+  const raw = entitlement && entitlement.raw ? entitlement.raw : {};
+  const service = raw.serviceKey || (entitlement.services && entitlement.services[0]);
+  return String(
+    raw.baseUrl ||
+    (raw.publicBaseUrl && service === "codex" ? `${String(raw.publicBaseUrl).replace(/\/+$/, "")}/v1` : raw.publicBaseUrl) ||
+    ""
+  ).trim().replace(/\/+$/, "");
+}
+
 function isServiceAllowed(entitlement, service) {
   return !entitlement.services.length || entitlement.services.includes(service);
 }
@@ -249,36 +261,6 @@ async function promptService(defaultService, entitlement = normalizeEntitlement(
   return response.service || null;
 }
 
-async function promptApiKey(defaultApiKey) {
-  if (defaultApiKey) {
-    return defaultApiKey;
-  }
-
-  const response = await prompts({
-    type: "password",
-    name: "apiKey",
-    message: "请输入 NewAPI API Key",
-    validate: (value) => value && value.trim() ? true : "API Key 不能为空",
-  }, { onCancel: () => false });
-
-  return response.apiKey ? response.apiKey.trim() : null;
-}
-
-async function promptBaseUrl(defaultBaseUrl) {
-  if (defaultBaseUrl) {
-    return defaultBaseUrl;
-  }
-
-  const response = await prompts({
-    type: "text",
-    name: "baseUrl",
-    message: "请输入 NewAPI Base URL",
-    validate: (value) => value && value.trim() ? true : "Base URL 不能为空",
-  }, { onCancel: () => false });
-
-  return response.baseUrl ? response.baseUrl.trim().replace(/\/+$/, "") : null;
-}
-
 async function promptActivationCode(defaultCode) {
   if (defaultCode) {
     return defaultCode;
@@ -287,36 +269,13 @@ async function promptActivationCode(defaultCode) {
   const response = await prompts({
     type: "password",
     name: "code",
-    message: "请输入 API Key / 激活码:",
-    validate: (value) => value && value.trim() ? true : "API Key / 激活码不能为空",
+    message: "请输入激活码:",
+    validate: (value) => value && value.trim() ? true : "激活码不能为空",
   }, { onCancel: () => false });
 
   return response.code ? response.code.trim() : null;
 }
 
-async function promptCredentialType(options, upstream) {
-  if (options.code) {
-    return "code";
-  }
-  if (options.apiKey || upstream.apiKey) {
-    return "api-key";
-  }
-
-  const response = await prompts({
-    type: "select",
-    name: "credentialType",
-    message: "请选择激活方式",
-    hint: "↑↓ 选择，回车确认",
-    choices: [
-      { title: "输入激活码 / 兑换码", value: "code" },
-      { title: "输入 NewAPI API Key", value: "api-key" },
-    ],
-    initial: 0,
-  }, { onCancel: () => false });
-
-  return response.credentialType || null;
-}
-
 async function confirmActivation(yes, service) {
   if (yes) {
     return true;
@@ -368,7 +327,7 @@ function printCredentialProfile(service, upstream, apiKey, entitlement) {
   console.log(divider());
   console.log(`  服务类型:   ${getServiceLabel(service)}`);
   console.log(`  接入地址:   ${upstream.baseUrl}`);
-  console.log(`  API Key:    ${maskKey(apiKey)}`);
+  console.log(`  激活码:     ${maskKey(apiKey)}`);
   if (entitlement.planName) {
     console.log(`  套餐名称:   ${entitlement.planName}`);
   }
@@ -454,9 +413,6 @@ function printResultSummary(service, backupPath, results, redeemResult) {
   if (failed.length) {
     console.log(`  激活完成：${succeeded.length} 成功，${failed.length} 失败，${skipped.length} 跳过`);
   }
-  if (redeemResult) {
-    console.log(`  兑换记录: ${redeemResult.valid ? "已完成" : `未完成（${redeemResult.error || "接口不可用"}）`}`);
-  }
   if (service === "claude") {
     const tools = ["Claude Code"];
     if (byId.get("opencode")?.result.success) tools.push("OpenCode");
@@ -516,28 +472,20 @@ async function resolveCodeCredential(options, upstream) {
 
   const entitlement = normalizeEntitlement(inspection, options.service ? [options.service] : []);
   const apiKey = extractApiKeyFromEntitlement(entitlement, code);
-  const entitlementBaseUrl = extractBaseUrlFromEntitlement(entitlement);
+  const entitlementBaseUrl = extractProxyBaseUrlFromEntitlement(entitlement);
+  if (!apiKey || !entitlementBaseUrl || entitlement.raw.proxy !== true) {
+    console.log("✗ 激活接口没有返回 FogAct 中转配置，请联系管理员检查服务端代理设置。");
+    return { cancelled: true };
+  }
   return {
     activationCode: code,
     apiKey,
     entitlement,
-    upstream: entitlementBaseUrl ? { ...upstream, baseUrl: entitlementBaseUrl } : upstream,
+    upstream: { services: {}, baseUrl: entitlementBaseUrl, proxy: true },
     inspection,
   };
 }
 
-async function resolveApiKeyCredential(options, upstream) {
-  const apiKey = await promptApiKey(options.apiKey || upstream.apiKey);
-  if (!apiKey) {
-    return { cancelled: true };
-  }
-  return {
-    apiKey,
-    entitlement: normalizeEntitlement({}, options.service ? [options.service] : []),
-    upstream,
-  };
-}
-
 async function activateTargets({ service, upstream, apiKey, targets, activationCode, options = {} }) {
   const backupPath = createActivationBackup(service, getBackupPaths(targets), {
     upstream: upstream.baseUrl,
@@ -558,85 +506,15 @@ async function activateTargets({ service, upstream, apiKey, targets, activationC
     }
   }
 
-  let redeemResult = null;
+  let activationRecord = null;
   const failures = results.filter(({ result }) => !result.success && !result.skipped);
-  if (activationCode && failures.length === 0 && !options.noRedeem) {
-    redeemResult = await redeemActivationCode(activationCode, service);
+  if (activationCode && failures.length === 0) {
+    activationRecord = await verifyActivationCode(activationCode, service);
   }
 
-  return { backupPath, results, redeemResult };
+  return { backupPath, results, redeemResult: null, activationRecord };
 }
 
-async function verifyCredential(upstream, apiKey, options = {}) {
-  if (options.skipVerify) {
-    console.log("跳过 NewAPI 连通性验证。");
-    return { valid: true, skipped: true };
-  }
-
-  console.log("正在验证 NewAPI Key...");
-  const verification = await verifyNewApiKey(upstream, apiKey);
-  if (!verification.valid) {
-    console.log(`✗ NewAPI 验证失败: ${verification.error}`);
-    return verification;
-  }
-  console.log(`✓ NewAPI 验证通过（可见 ${verification.models.length} 个模型）`);
-  return verification;
-}
-
-async function runNewApiActivation(options = {}) {
-  const baseUpstream = loadUpstreamConfig({ configPath: options.upstreamConfig });
-  const upstream = { ...baseUpstream };
-  upstream.baseUrl = await promptBaseUrl(upstream.baseUrl);
-  if (!upstream.baseUrl) {
-    console.log("Activation cancelled.");
-    return { success: false, cancelled: true };
-  }
-
-  const apiKey = await promptApiKey(options.apiKey || upstream.apiKey);
-  if (!apiKey) {
-    console.log("Activation cancelled.");
-    return { success: false, cancelled: true };
-  }
-
-  const entitlement = normalizeEntitlement({}, options.service ? [options.service] : []);
-  const service = await promptService(options.service, entitlement);
-  if (!service) {
-    console.log("Activation cancelled.");
-    return { success: false, cancelled: true };
-  }
-
-  console.log("");
-  const verification = await verifyCredential(upstream, apiKey, options);
-  if (!verification.valid) {
-    return { success: false, verification };
-  }
-
-  const detectedPlatforms = detectPlatforms(service);
-  const selectedPlatformIds = options.platforms ? parsePlatformIds(options.platforms) : null;
-  const targets = getActivationTargets(detectedPlatforms, Boolean(options.all), selectedPlatformIds);
-
-  printCredentialProfile(service, upstream, apiKey, entitlement);
-
-  if (!(await confirmActivation(Boolean(options.yes || options.auto), service))) {
-    console.log("");
-    console.log("  已取消");
-    console.log("");
-    return { success: false, cancelled: true };
-  }
-
-  console.log("");
-  console.log("  正在写入配置...");
-  const activation = await activateTargets({ service, upstream, apiKey, targets, options });
-  const failures = activation.results.filter(({ result }) => !result.success && !result.skipped);
-  console.log("  配置完成");
-  printResultSummary(service, activation.backupPath, activation.results, activation.redeemResult);
-
-  return {
-    success: failures.length === 0,
-    backupPath: activation.backupPath,
-    results: activation.results,
-  };
-}
 
 async function runActivationWizard(options = {}) {
   if (!options.noNodeCheck) {
@@ -646,37 +524,24 @@ async function runActivationWizard(options = {}) {
     }
   }
 
-  const baseUpstream = loadUpstreamConfig({ configPath: options.upstreamConfig });
-  const credentialType = !options.code && options.apiKey ? "api-key" : "code";
-
-  const credential = credentialType === "code"
-    ? await resolveCodeCredential(options, baseUpstream)
-    : await resolveApiKeyCredential(options, baseUpstream);
+  const credential = await resolveCodeCredential(options, {});
   if (credential.cancelled) {
     console.log("已取消。");
     return { success: false, cancelled: true };
   }
 
   const upstream = { ...credential.upstream };
-  upstream.baseUrl = await promptBaseUrl(upstream.baseUrl);
   if (!upstream.baseUrl) {
     console.log("已取消。");
     return { success: false, cancelled: true };
   }
 
-  const service = await promptService(options.service, credential.entitlement, { allowPrompt: credentialType === "api-key" });
+  const service = await promptService(options.service, credential.entitlement, { allowPrompt: false });
   if (!service) {
     console.log("已取消。");
     return { success: false, cancelled: true };
   }
 
-  console.log("");
-  if (credentialType === "api-key") {
-    const verification = await verifyCredential(upstream, credential.apiKey, options);
-    if (!verification.valid) {
-      return { success: false, verification };
-    }
-  }
 
   const allDetectedPlatforms = detectPlatforms(service);
   const allowedPlatforms = allDetectedPlatforms.filter((entry) => isPlatformAllowed(entry, credential.entitlement, service));
@@ -727,5 +592,4 @@ module.exports = {
   normalizeServices,
   parsePlatformIds,
   runActivationWizard,
-  runNewApiActivation,
 };