cfpilot 0.8.1 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli.js CHANGED
@@ -87,7 +87,7 @@ var VERSION, NAME;
87
87
  var init_version = __esm({
88
88
  "src/shared/version.ts"() {
89
89
  "use strict";
90
- VERSION = "0.8.1";
90
+ VERSION = "0.9.1";
91
91
  NAME = "cfpilot";
92
92
  }
93
93
  });
@@ -453,13 +453,21 @@ var init_prompt = __esm({
453
453
  import { homedir } from "node:os";
454
454
  import { join } from "node:path";
455
455
  import { mkdirSync, readFileSync, writeFileSync, existsSync } from "node:fs";
456
+ function configDir() {
457
+ const override = process.env.CFPILOT_CONFIG_DIR?.trim();
458
+ return override ? override : join(homedir(), ".cfpilot");
459
+ }
460
+ function configFile() {
461
+ return join(configDir(), "config.json");
462
+ }
456
463
  function configPath() {
457
- return CONFIG_FILE;
464
+ return configFile();
458
465
  }
459
466
  function loadConfig() {
460
- if (!existsSync(CONFIG_FILE)) return {};
467
+ const file = configFile();
468
+ if (!existsSync(file)) return {};
461
469
  try {
462
- return JSON.parse(readFileSync(CONFIG_FILE, "utf8"));
470
+ return JSON.parse(readFileSync(file, "utf8"));
463
471
  } catch {
464
472
  return {};
465
473
  }
@@ -470,11 +478,29 @@ function saveConfig(patch) {
470
478
  for (const k of Object.keys(next)) {
471
479
  if (next[k] === "" || next[k] === void 0) delete next[k];
472
480
  }
473
- mkdirSync(CONFIG_DIR, { recursive: true });
474
- writeFileSync(CONFIG_FILE, JSON.stringify(next, null, 2) + "\n", "utf8");
481
+ mkdirSync(configDir(), { recursive: true });
482
+ writeFileSync(configFile(), JSON.stringify(next, null, 2) + "\n", "utf8");
483
+ }
484
+ function saveToken(token, keep = {}) {
485
+ const trimmed = token.trim();
486
+ const current = loadConfig();
487
+ const changed = (current.token ?? "") !== trimmed;
488
+ const explicit = {};
489
+ for (const key of Object.keys(keep)) {
490
+ const value = keep[key];
491
+ if (value !== void 0) explicit[key] = value;
492
+ }
493
+ if (!changed) {
494
+ saveConfig({ token: trimmed, ...explicit });
495
+ return;
496
+ }
497
+ const clearing = {};
498
+ for (const key of ACCOUNT_SCOPED_FIELDS) clearing[key] = "";
499
+ saveConfig({ ...clearing, ...explicit, token: trimmed });
475
500
  }
476
501
  function clearConfig() {
477
- if (existsSync(CONFIG_FILE)) writeFileSync(CONFIG_FILE, "{}\n", "utf8");
502
+ const file = configFile();
503
+ if (existsSync(file)) writeFileSync(file, "{}\n", "utf8");
478
504
  }
479
505
  function resolveToken(fromArgs) {
480
506
  return (fromArgs || "").trim() || (process.env.CLOUDFLARE_API_TOKEN || "").trim() || loadConfig().token || "";
@@ -482,12 +508,19 @@ function resolveToken(fromArgs) {
482
508
  function isConfigured(cfg = loadConfig()) {
483
509
  return Boolean(cfg.token);
484
510
  }
485
- var CONFIG_DIR, CONFIG_FILE;
511
+ var ACCOUNT_SCOPED_FIELDS;
486
512
  var init_store = __esm({
487
513
  "src/menu/store.ts"() {
488
514
  "use strict";
489
- CONFIG_DIR = join(homedir(), ".cfpilot");
490
- CONFIG_FILE = join(CONFIG_DIR, "config.json");
515
+ ACCOUNT_SCOPED_FIELDS = [
516
+ "accountId",
517
+ "accountName",
518
+ "kvNamespaceId",
519
+ "panelHost",
520
+ "dataHost",
521
+ "wsPath",
522
+ "panelPassword"
523
+ ];
491
524
  }
492
525
  });
493
526
 
@@ -628,22 +661,43 @@ var init_cf_api = __esm({
628
661
  * 读取 KV 里的一个键值(不存在时返回 null)。
629
662
  *
630
663
  * 用于部署前检测「KV 已有配置会覆盖环境变量」的情况。
664
+ *
665
+ * ## ⚠️ 「读不到」与「不存在」必须区分
666
+ *
667
+ * 之前这里对 **403 / 500 / 网络异常**统统返回 `null`,
668
+ * 与「键不存在」混为一谈。
669
+ *
670
+ * 后果:KV 归属判定(`inspectKvOwnership`)里
671
+ * 「清单存在」「小写 config 存在」两个判据在
672
+ * 「KV 属于别的账号」「Token 没权限」「网络断了」时**全为 false**
673
+ * → verdict 落到 `empty`(**不阻断**)
674
+ * → 于是会去建项目、写 KV,产出一堆孤儿项目与半成品实例。
675
+ *
676
+ * 现在只有 **404(键不存在)** 才返回 null,
677
+ * 其它错误一律抛出,由调用方按「无法确认 → 不可放行」处理。
631
678
  */
632
679
  async getKvValue(accountId, namespaceId, key) {
680
+ let response;
633
681
  try {
634
- const response = await fetch(
682
+ response = await fetch(
635
683
  `${this.apiBase}/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${encodeURIComponent(key)}`,
636
684
  {
637
685
  headers: { Authorization: `Bearer ${this.token}` },
638
686
  signal: AbortSignal.timeout(this.timeoutMs)
639
687
  }
640
688
  );
641
- if (response.status === 404) return null;
642
- if (!response.ok) return null;
643
- return await response.text();
644
- } catch {
645
- return null;
689
+ } catch (err) {
690
+ throw new Error(
691
+ `\u8BFB\u53D6 KV \u5931\u8D25\uFF08\u65E0\u6CD5\u786E\u8BA4\u5F52\u5C5E\uFF09\uFF1A${err instanceof Error ? err.message : String(err)}`
692
+ );
646
693
  }
694
+ if (response.status === 404) return null;
695
+ if (!response.ok) {
696
+ const text = await response.text().catch(() => "");
697
+ const detail = parseApiError(response.status, text).message;
698
+ throw new Error(`\u8BFB\u53D6 KV \u5931\u8D25\uFF08\u65E0\u6CD5\u786E\u8BA4\u5F52\u5C5E\uFF09\uFF1A${detail}`);
699
+ }
700
+ return await response.text();
647
701
  }
648
702
  /**
649
703
  * 写入 KV 键值。
@@ -972,6 +1026,38 @@ var init_cf_api = __esm({
972
1026
  }
973
1027
  });
974
1028
 
1029
+ // src/deploy/account-resolve.ts
1030
+ async function findAccountByKv(client, accounts, kvId) {
1031
+ let unreadable = 0;
1032
+ for (const account of accounts) {
1033
+ let namespaces;
1034
+ try {
1035
+ namespaces = await client.listKvNamespaces(account.id);
1036
+ } catch {
1037
+ unreadable++;
1038
+ continue;
1039
+ }
1040
+ if (namespaces.some((ns) => ns.id === kvId)) {
1041
+ return { owner: account, unreadable };
1042
+ }
1043
+ }
1044
+ return { owner: null, unreadable };
1045
+ }
1046
+ async function checkKvInAccount(client, accountId, kvId) {
1047
+ let namespaces;
1048
+ try {
1049
+ namespaces = await client.listKvNamespaces(accountId);
1050
+ } catch {
1051
+ return "unknown";
1052
+ }
1053
+ return namespaces.some((ns) => ns.id === kvId) ? "yes" : "no";
1054
+ }
1055
+ var init_account_resolve = __esm({
1056
+ "src/deploy/account-resolve.ts"() {
1057
+ "use strict";
1058
+ }
1059
+ });
1060
+
975
1061
  // src/deploy/utils.ts
976
1062
  import { randomBytes } from "node:crypto";
977
1063
  function randomAlnum(length) {
@@ -1088,7 +1174,7 @@ function renderTokenCheck(result) {
1088
1174
  }
1089
1175
  lines.push("");
1090
1176
  lines.push("\u8BF4\u660E\uFF1A\u5217\u8868\u7C7B\u63A5\u53E3\u901A\u8FC7\u53EA\u4EE3\u8868\u5177\u5907\u8BFB\u53D6\u6743\u9650\uFF1B\u521B\u5EFA / \u4FEE\u6539\u7C7B\u64CD\u4F5C\u4ECD\u7136\u9700\u8981 Edit \u6743\u9650\u3002");
1091
- lines.push("\u63D0\u793A\uFF1A\u90E8\u7F72\u65F6\u52A0 --workers-dev \u53EF\u8DF3\u8FC7\u81EA\u5B9A\u4E49\u57DF\u540D\uFF0C\u6B64\u65F6 Zone / DNS / Routes \u6743\u9650\u90FD\u4E0D\u662F\u5FC5\u9700\u7684\u3002");
1177
+ lines.push("\u63D0\u793A\uFF1AZone / DNS / Routes \u6743\u9650\u53EA\u5F71\u54CD**\u8DE8\u8D26\u53F7**\u81EA\u5B9A\u4E49\u57DF\u540D\uFF1B\u540C\u8D26\u53F7\u57DF\u540D\u7531 Cloudflare \u81EA\u52A8\u5EFA DNS \u8BB0\u5F55\u3002");
1092
1178
  return `${lines.join("\n")}
1093
1179
  `;
1094
1180
  }
@@ -1184,7 +1270,7 @@ async function checkTokenPermissions(options) {
1184
1270
  let zoneRow = makeRow(
1185
1271
  "\u57DF\u540D\u5217\u8868\uFF08Zone\uFF09",
1186
1272
  expectCustomDomain,
1187
- expectCustomDomain ? "\u65E0\u6CD5\u9009\u62E9\u57DF\u540D\u3001\u65E0\u6CD5\u7ED1\u5B9A\u81EA\u5B9A\u4E49\u57DF\u540D\uFF0C\u53EA\u80FD\u4F7F\u7528 workers.dev \u5730\u5740" : "\u81EA\u5B9A\u4E49\u57DF\u540D\u80FD\u529B\u4E0D\u53EF\u7528\uFF0C\u53EA\u80FD\u4F7F\u7528 workers.dev \u5730\u5740",
1273
+ expectCustomDomain ? "\u65E0\u6CD5\u9009\u62E9\u57DF\u540D\u3001\u65E0\u6CD5\u7ED1\u5B9A\u81EA\u5B9A\u4E49\u57DF\u540D\uFF0C\u53EA\u80FD\u4F7F\u7528 workers.dev \u5730\u5740" : "\u65E0\u6CD5\u6258\u7BA1\u81EA\u5B9A\u4E49\u57DF\u540D\uFF08Pages \u9ED8\u8BA4\u7684 *.pages.dev \u57DF\u540D\u4E0D\u53D7\u5F71\u54CD\uFF09",
1188
1274
  "Token \u4E2D\u6DFB\u52A0 Zone / Zone / Read",
1189
1275
  zoneProbe
1190
1276
  );
@@ -1205,7 +1291,7 @@ async function checkTokenPermissions(options) {
1205
1291
  "Workers KV Storage",
1206
1292
  true,
1207
1293
  "\u65E0\u6CD5\u521B\u5EFA / \u7ED1\u5B9A KV \u547D\u540D\u7A7A\u95F4\uFF0C\u90E8\u7F72\u4F1A\u4E2D\u65AD",
1208
- "Token \u4E2D\u6DFB\u52A0 Developer Platform / Workers KV Storage / Edit",
1294
+ "Token \u4E2D\u6DFB\u52A0 Account / Workers KV Storage / Write",
1209
1295
  kvProbe
1210
1296
  )
1211
1297
  );
@@ -1216,9 +1302,9 @@ async function checkTokenPermissions(options) {
1216
1302
  rows.push(
1217
1303
  makeRow(
1218
1304
  "Workers \u811A\u672C",
1219
- true,
1220
- "\u65E0\u6CD5\u4E0A\u4F20\u6216\u66F4\u65B0\u5185\u6838\uFF0C\u90E8\u7F72\u4F1A\u4E2D\u65AD",
1221
- "Token \u4E2D\u6DFB\u52A0 Developer Platform / Workers Scripts / Edit",
1305
+ false,
1306
+ "\u4E0D\u5F71\u54CD Pages \u90E8\u7F72\uFF08\u5185\u6838\u8D70 Pages \u90E8\u7F72\u63A5\u53E3\u4E0A\u4F20\uFF0C\u4E0D\u7ECF\u8FC7 Workers \u811A\u672C API\uFF09",
1307
+ "\u4EC5\u5F53\u4F60\u8981\u7528\u5F52\u6863\u7684\u5355\u9879\u76EE Workers \u5F62\u6001\u65F6\u624D\u9700\u8981",
1222
1308
  scriptsProbe
1223
1309
  )
1224
1310
  );
@@ -1229,9 +1315,9 @@ async function checkTokenPermissions(options) {
1229
1315
  rows.push(
1230
1316
  makeRow(
1231
1317
  "workers.dev \u5B50\u57DF\u8BFB\u53D6",
1232
- true,
1233
- "\u65E0\u6CD5\u62FC\u51FA https://<name>.<sub>.workers.dev \u5730\u5740",
1234
- "Token \u4E2D\u6DFB\u52A0 Developer Platform / Workers Scripts / Read",
1318
+ false,
1319
+ "\u4E0D\u5F71\u54CD Pages \u90E8\u7F72\uFF08Pages \u9879\u76EE\u7528\u81EA\u5DF1\u7684 *.pages.dev \u57DF\u540D\uFF09",
1320
+ "\u4EC5\u5F53\u4F60\u8981\u7528\u5F52\u6863\u7684\u5355\u9879\u76EE Workers \u5F62\u6001\u65F6\u624D\u9700\u8981",
1235
1321
  subdomainProbe
1236
1322
  )
1237
1323
  );
@@ -1256,9 +1342,9 @@ async function checkTokenPermissions(options) {
1256
1342
  rows.push(
1257
1343
  makeRow(
1258
1344
  "workers.dev \u8DEF\u7531\u5F00\u5173",
1259
- true,
1260
- "\u90E8\u7F72\u540E workers.dev \u4F1A\u4E00\u76F4\u663E\u793A\u300CThere is nothing here yet\u300D",
1261
- "Token \u4E2D\u6DFB\u52A0 Developer Platform / Workers Scripts / Edit",
1345
+ false,
1346
+ "\u4E0D\u5F71\u54CD Pages \u90E8\u7F72\uFF08Pages \u9879\u76EE\u7528\u81EA\u5DF1\u7684 *.pages.dev \u57DF\u540D\uFF09",
1347
+ "\u4EC5\u5F53\u4F60\u8981\u7528\u5F52\u6863\u7684\u5355\u9879\u76EE Workers \u5F62\u6001\u65F6\u624D\u9700\u8981",
1262
1348
  subdomainRouteProbe
1263
1349
  )
1264
1350
  );
@@ -1271,7 +1357,7 @@ async function checkTokenPermissions(options) {
1271
1357
  "Pages \u9879\u76EE",
1272
1358
  true,
1273
1359
  "pages-split \u65E0\u6CD5\u521B\u5EFA\u9879\u76EE\u3001\u914D\u7F6E\u53D8\u91CF\u4E0E\u89E6\u53D1\u90E8\u7F72",
1274
- "Token \u4E2D\u6DFB\u52A0 Developer Platform / Pages / Edit",
1360
+ "Token \u4E2D\u6DFB\u52A0 Account / Pages / Write",
1275
1361
  pagesProbe
1276
1362
  )
1277
1363
  );
@@ -1282,7 +1368,7 @@ async function checkTokenPermissions(options) {
1282
1368
  makeRow(
1283
1369
  "DNS \u8BB0\u5F55",
1284
1370
  expectCustomDomain,
1285
- "\u65E0\u6CD5\u68C0\u6D4B\u51B2\u7A81 DNS\u3001\u65E0\u6CD5\u521B\u5EFA CNAME\uFF1B\u81EA\u5B9A\u4E49\u57DF\u540D\u5931\u8D25\u65F6\u65E0\u6CD5\u964D\u7EA7 Route + CNAME",
1371
+ "\u65E0\u6CD5\u81EA\u884C\u521B\u5EFA CNAME \u8BB0\u5F55\uFF08\u8DE8\u8D26\u53F7\u81EA\u5B9A\u4E49\u57DF\u540D\u9700\u624B\u52A8\u52A0\uFF1B\u540C\u8D26\u53F7\u7531 Cloudflare \u81EA\u52A8\u5EFA\uFF09",
1286
1372
  "Token \u4E2D\u6DFB\u52A0 Zone / DNS / Edit",
1287
1373
  { status: "unknown", detail }
1288
1374
  )
@@ -1291,7 +1377,7 @@ async function checkTokenPermissions(options) {
1291
1377
  makeRow(
1292
1378
  "Worker Routes",
1293
1379
  expectCustomDomain,
1294
- "\u81EA\u5B9A\u4E49\u57DF\u540D\u51FA\u73B0 522 \u65F6\u65E0\u6CD5\u964D\u7EA7 Route + CNAME\uFF0C\u53EA\u80FD\u56DE\u9000 workers.dev",
1380
+ "Pages \u81EA\u5B9A\u4E49\u57DF\u540D\u65E0\u6CD5\u964D\u7EA7\u5230 Route + CNAME \u65B9\u6848",
1295
1381
  "Token \u4E2D\u6DFB\u52A0 Zone / Workers Routes / Edit",
1296
1382
  { status: "unknown", detail }
1297
1383
  )
@@ -1305,7 +1391,7 @@ async function checkTokenPermissions(options) {
1305
1391
  makeRow(
1306
1392
  "DNS \u8BB0\u5F55",
1307
1393
  expectCustomDomain,
1308
- "\u65E0\u6CD5\u68C0\u6D4B\u51B2\u7A81 DNS\u3001\u65E0\u6CD5\u521B\u5EFA CNAME\uFF1B\u81EA\u5B9A\u4E49\u57DF\u540D\u5931\u8D25\u65F6\u65E0\u6CD5\u964D\u7EA7 Route + CNAME",
1394
+ "\u65E0\u6CD5\u81EA\u884C\u521B\u5EFA CNAME \u8BB0\u5F55\uFF08\u8DE8\u8D26\u53F7\u81EA\u5B9A\u4E49\u57DF\u540D\u9700\u624B\u52A8\u52A0\uFF1B\u540C\u8D26\u53F7\u7531 Cloudflare \u81EA\u52A8\u5EFA\uFF09",
1309
1395
  "Token \u4E2D\u6DFB\u52A0 Zone / DNS / Edit",
1310
1396
  dnsProbe
1311
1397
  )
@@ -1318,7 +1404,7 @@ async function checkTokenPermissions(options) {
1318
1404
  makeRow(
1319
1405
  "Worker Routes",
1320
1406
  expectCustomDomain,
1321
- "\u81EA\u5B9A\u4E49\u57DF\u540D\u51FA\u73B0 522 \u65F6\u65E0\u6CD5\u964D\u7EA7 Route + CNAME\uFF0C\u53EA\u80FD\u56DE\u9000 workers.dev",
1407
+ "Pages \u81EA\u5B9A\u4E49\u57DF\u540D\u65E0\u6CD5\u964D\u7EA7\u5230 Route + CNAME \u65B9\u6848",
1322
1408
  "Token \u4E2D\u6DFB\u52A0 Zone / Workers Routes / Edit",
1323
1409
  routesProbe
1324
1410
  )
@@ -1427,6 +1513,59 @@ var init_version_util = __esm({
1427
1513
  }
1428
1514
  });
1429
1515
 
1516
+ // src/shared/github-mirrors.ts
1517
+ function downloadSources(url) {
1518
+ const sources = [{ name: "GitHub", url }];
1519
+ for (const m of MIRRORS) {
1520
+ sources.push({ name: m.name, url: m.prefix + url });
1521
+ }
1522
+ return sources;
1523
+ }
1524
+ function apiSources(apiUrl) {
1525
+ const sources = [{ name: "GitHub API", url: apiUrl }];
1526
+ for (const m of MIRRORS) {
1527
+ sources.push({ name: `${m.name} API`, url: m.prefix + apiUrl });
1528
+ }
1529
+ return sources;
1530
+ }
1531
+ async function fetchLatestVersionWithoutApi(timeoutMs) {
1532
+ const url = `${RELEASES_WEB}/latest`;
1533
+ for (const source of downloadSources(url)) {
1534
+ try {
1535
+ const response = await fetch(source.url, {
1536
+ headers: { "User-Agent": "CFPilot-CLI" },
1537
+ redirect: "manual",
1538
+ signal: AbortSignal.timeout(timeoutMs)
1539
+ });
1540
+ const location = response.headers.get("location") ?? "";
1541
+ const version = versionFromReleaseUrl(location);
1542
+ if (version) return version;
1543
+ } catch {
1544
+ }
1545
+ }
1546
+ return "";
1547
+ }
1548
+ function versionFromReleaseUrl(url) {
1549
+ if (!url) return "";
1550
+ const m = url.match(/\/releases\/(?:tag|download)\/v?([0-9]+(?:\.[0-9]+)*)/i);
1551
+ return m ? m[1] : "";
1552
+ }
1553
+ var MIRRORS, GITHUB_OWNER, GITHUB_REPO, RELEASES_API, RELEASES_WEB;
1554
+ var init_github_mirrors = __esm({
1555
+ "src/shared/github-mirrors.ts"() {
1556
+ "use strict";
1557
+ MIRRORS = [
1558
+ { name: "ghfast.top", prefix: "https://ghfast.top/" },
1559
+ { name: "ghproxy.net", prefix: "https://ghproxy.net/" },
1560
+ { name: "gh-proxy.com", prefix: "https://gh-proxy.com/" }
1561
+ ];
1562
+ GITHUB_OWNER = "xmwengxing";
1563
+ GITHUB_REPO = "CFPilot";
1564
+ RELEASES_API = `https://api.github.com/repos/${GITHUB_OWNER}/${GITHUB_REPO}/releases`;
1565
+ RELEASES_WEB = `https://github.com/${GITHUB_OWNER}/${GITHUB_REPO}/releases`;
1566
+ }
1567
+ });
1568
+
1430
1569
  // src/deploy/kernel-remote.ts
1431
1570
  import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
1432
1571
  import { homedir as homedir2 } from "node:os";
@@ -1444,20 +1583,8 @@ function versionFromTag(tag) {
1444
1583
  }
1445
1584
  async function fetchRemoteKernelInfo(options = {}) {
1446
1585
  if (isRemoteDisabled()) return null;
1447
- let releases;
1448
- try {
1449
- const response = await fetch(`${RELEASES_API}?per_page=20`, {
1450
- headers: {
1451
- Accept: "application/vnd.github+json",
1452
- "User-Agent": "CFPilot-CLI"
1453
- },
1454
- signal: AbortSignal.timeout(options.timeoutMs ?? DEFAULT_TIMEOUT_MS)
1455
- });
1456
- if (!response.ok) return null;
1457
- const payload = await response.json();
1458
- if (!Array.isArray(payload)) return null;
1459
- releases = payload.filter(isGitHubRelease);
1460
- } catch {
1586
+ const releases = await fetchReleasesWithFallback(options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
1587
+ if (releases.length === 0) {
1461
1588
  return null;
1462
1589
  }
1463
1590
  const sorted = releases.filter((release) => !release.draft && !release.prerelease).map((release) => ({ release, version: versionFromTag(release.tag_name) })).filter((item) => item.version !== "").sort((a, b) => compareSemver(b.version, a.version));
@@ -1471,6 +1598,40 @@ async function fetchRemoteKernelInfo(options = {}) {
1471
1598
  }
1472
1599
  return null;
1473
1600
  }
1601
+ async function fetchReleasesWithFallback(timeoutMs) {
1602
+ const apiUrl = `${RELEASES_API2}?per_page=20`;
1603
+ for (const source of apiSources(apiUrl)) {
1604
+ try {
1605
+ const response = await fetch(source.url, {
1606
+ headers: {
1607
+ Accept: "application/vnd.github+json",
1608
+ "User-Agent": "CFPilot-CLI"
1609
+ },
1610
+ signal: AbortSignal.timeout(timeoutMs)
1611
+ });
1612
+ if (!response.ok) continue;
1613
+ const payload = await response.json();
1614
+ if (!Array.isArray(payload)) continue;
1615
+ const releases = payload.filter(isGitHubRelease);
1616
+ if (releases.length > 0) return releases;
1617
+ } catch {
1618
+ }
1619
+ }
1620
+ const version = await fetchLatestVersionWithoutApi(timeoutMs);
1621
+ if (!version) return [];
1622
+ const controlUrl = `${RELEASES_WEB}/latest/download/${CONTROL_ASSET_NAME}`;
1623
+ const dataUrl = `${RELEASES_WEB}/latest/download/${DATA_ASSET_NAME}`;
1624
+ const pseudo = {
1625
+ tag_name: `v${version}`,
1626
+ draft: false,
1627
+ prerelease: false,
1628
+ assets: [
1629
+ { name: CONTROL_ASSET_NAME, browser_download_url: controlUrl },
1630
+ { name: DATA_ASSET_NAME, browser_download_url: dataUrl }
1631
+ ]
1632
+ };
1633
+ return [pseudo];
1634
+ }
1474
1635
  function findAssetUrl(assets, name) {
1475
1636
  for (const asset of assets) {
1476
1637
  if (asset.name.trim().toLowerCase() === name) return asset.browser_download_url;
@@ -1491,21 +1652,31 @@ function isGitHubRelease(value) {
1491
1652
  }
1492
1653
  async function downloadAsset(url, timeoutMs) {
1493
1654
  if (!url.trim()) throw new Error("\u4E0B\u8F7D\u5730\u5740\u4E3A\u7A7A");
1494
- const response = await fetch(url, {
1495
- headers: { "User-Agent": "CFPilot-CLI" },
1496
- signal: AbortSignal.timeout(timeoutMs)
1497
- });
1498
- if (!response.ok) {
1499
- throw new Error(`\u4E0B\u8F7D\u5931\u8D25\uFF1AHTTP ${response.status}`);
1500
- }
1501
- const declared = response.headers.get("content-length");
1502
- if (declared) {
1503
- const size = Number(declared);
1504
- if (Number.isFinite(size) && size > MAX_ASSET_BYTES) {
1505
- throw new Error(`\u5185\u6838\u4EA7\u7269\u8D85\u8FC7 ${MAX_ASSET_BYTES} \u5B57\u8282\u4E0A\u9650\uFF0C\u7591\u4F3C\u5F02\u5E38\u5185\u5BB9`);
1655
+ const errors = [];
1656
+ for (const source of downloadSources(url)) {
1657
+ try {
1658
+ const response = await fetch(source.url, {
1659
+ headers: { "User-Agent": "CFPilot-CLI" },
1660
+ signal: AbortSignal.timeout(timeoutMs)
1661
+ });
1662
+ if (!response.ok) {
1663
+ errors.push(`${source.name}: HTTP ${response.status}`);
1664
+ continue;
1665
+ }
1666
+ const declared = response.headers.get("content-length");
1667
+ if (declared) {
1668
+ const size = Number(declared);
1669
+ if (Number.isFinite(size) && size > MAX_ASSET_BYTES) {
1670
+ errors.push(`${source.name}: \u8D85\u8FC7 ${MAX_ASSET_BYTES} \u5B57\u8282\u4E0A\u9650`);
1671
+ continue;
1672
+ }
1673
+ }
1674
+ return await readBodyWithLimit(response);
1675
+ } catch (err) {
1676
+ errors.push(`${source.name}: ${err instanceof Error ? err.message : String(err)}`);
1506
1677
  }
1507
1678
  }
1508
- return await readBodyWithLimit(response);
1679
+ throw new Error(`\u6240\u6709\u4E0B\u8F7D\u6E90\u5747\u5931\u8D25 \u2014\u2014 ${errors.join("\uFF1B")}`);
1509
1680
  }
1510
1681
  async function readBodyWithLimit(response) {
1511
1682
  const body = response.body;
@@ -1646,15 +1817,16 @@ async function fetchRemoteKernel(info, timeoutMs) {
1646
1817
  await writeCached(dataPath, data).catch(() => void 0);
1647
1818
  return { control, data };
1648
1819
  }
1649
- var CONTROL_ASSET_NAME, DATA_ASSET_NAME, REPO, RELEASES_API, DEFAULT_TIMEOUT_MS, MAX_ASSET_BYTES, CACHE_DIR_ENV, LOCAL_DIR_ENV, REMOTE_OFF_ENV, BUILD_RE, BUILD_NUMERIC_RE;
1820
+ var CONTROL_ASSET_NAME, DATA_ASSET_NAME, REPO, RELEASES_API2, DEFAULT_TIMEOUT_MS, MAX_ASSET_BYTES, CACHE_DIR_ENV, LOCAL_DIR_ENV, REMOTE_OFF_ENV, BUILD_RE, BUILD_NUMERIC_RE;
1650
1821
  var init_kernel_remote = __esm({
1651
1822
  "src/deploy/kernel-remote.ts"() {
1652
1823
  "use strict";
1653
1824
  init_version_util();
1825
+ init_github_mirrors();
1654
1826
  CONTROL_ASSET_NAME = "cfpilot-kernel-control.js";
1655
1827
  DATA_ASSET_NAME = "cfpilot-kernel-dataplane.js";
1656
1828
  REPO = "xmwengxing/CFPilot";
1657
- RELEASES_API = process.env.CFPILOT_KERNEL_API_BASE ?? `https://api.github.com/repos/${REPO}/releases`;
1829
+ RELEASES_API2 = process.env.CFPILOT_KERNEL_API_BASE ?? `https://api.github.com/repos/${REPO}/releases`;
1658
1830
  DEFAULT_TIMEOUT_MS = 2e4;
1659
1831
  MAX_ASSET_BYTES = 10 * 1024 * 1024;
1660
1832
  CACHE_DIR_ENV = "CFPILOT_KERNEL_CACHE_DIR";
@@ -1677,20 +1849,29 @@ __export(pages_deploy_exports, {
1677
1849
  });
1678
1850
  import { randomBytes as randomBytes2, randomUUID } from "node:crypto";
1679
1851
  async function readManifest(client, accountId, namespaceId) {
1852
+ const raw = await client.getKvValue(accountId, namespaceId, MANIFEST_KEY);
1853
+ if (raw === null) return null;
1854
+ let parsed;
1680
1855
  try {
1681
- const raw = await client.getKvValue(accountId, namespaceId, MANIFEST_KEY);
1682
- if (!raw) return null;
1683
- const parsed = JSON.parse(raw);
1684
- return parsed && parsed.v === 1 ? parsed : null;
1685
- } catch {
1686
- return null;
1856
+ parsed = JSON.parse(raw);
1857
+ } catch (err) {
1858
+ throw new Error(
1859
+ `\u8BFB\u53D6 KV \u5931\u8D25\uFF08\u65E0\u6CD5\u786E\u8BA4\u5F52\u5C5E\uFF09\uFF1A\u90E8\u7F72\u6E05\u5355 ${MANIFEST_KEY} \u4E0D\u662F\u5408\u6CD5 JSON\uFF08${err instanceof Error ? err.message : String(err)}\uFF09`
1860
+ );
1687
1861
  }
1862
+ const manifest = parsed;
1863
+ return manifest && manifest.v === 1 ? manifest : null;
1688
1864
  }
1689
1865
  async function listCfPilotNamespaces(client, accountId) {
1690
1866
  const namespaces = await client.listKvNamespaces(accountId);
1691
1867
  const out = [];
1692
1868
  for (const ns of namespaces) {
1693
- const manifest = await readManifest(client, accountId, ns.id);
1869
+ let manifest = null;
1870
+ try {
1871
+ manifest = await readManifest(client, accountId, ns.id);
1872
+ } catch {
1873
+ continue;
1874
+ }
1694
1875
  if (manifest) out.push({ id: ns.id, title: ns.title, manifest });
1695
1876
  }
1696
1877
  return out;
@@ -1701,8 +1882,22 @@ async function writeManifest(client, accountId, namespaceId, manifest) {
1701
1882
  } catch {
1702
1883
  }
1703
1884
  }
1885
+ function unableToConfirm(err) {
1886
+ const reason = err instanceof Error ? err.message : String(err);
1887
+ return {
1888
+ verdict: "occupied",
1889
+ manifest: null,
1890
+ detail: `\u65E0\u6CD5\u786E\u8BA4 KV \u5F52\u5C5E\uFF08${reason}\uFF09\u2014\u2014 \u8BF7\u68C0\u67E5 Token \u6743\u9650\u4E0E\u7F51\u7EDC\u540E\u91CD\u8BD5`,
1891
+ blocking: true
1892
+ };
1893
+ }
1704
1894
  async function inspectKvOwnership(client, accountId, namespaceId, controlProject) {
1705
- const manifest = await readManifest(client, accountId, namespaceId);
1895
+ let manifest;
1896
+ try {
1897
+ manifest = await readManifest(client, accountId, namespaceId);
1898
+ } catch (err) {
1899
+ return unableToConfirm(err);
1900
+ }
1706
1901
  if (manifest) {
1707
1902
  if (manifest.controlProject === controlProject) {
1708
1903
  return {
@@ -1719,7 +1914,12 @@ async function inspectKvOwnership(client, accountId, namespaceId, controlProject
1719
1914
  blocking: true
1720
1915
  };
1721
1916
  }
1722
- const legacyConfig = await client.getKvValue(accountId, namespaceId, "config");
1917
+ let legacyConfig;
1918
+ try {
1919
+ legacyConfig = await client.getKvValue(accountId, namespaceId, "config");
1920
+ } catch (err) {
1921
+ return unableToConfirm(err);
1922
+ }
1723
1923
  if (legacyConfig !== null) {
1724
1924
  return {
1725
1925
  verdict: "foreign",
@@ -1731,7 +1931,12 @@ async function inspectKvOwnership(client, accountId, namespaceId, controlProject
1731
1931
  blocking: true
1732
1932
  };
1733
1933
  }
1734
- const cfpilotConfig = await client.getKvValue(accountId, namespaceId, "CONFIG");
1934
+ let cfpilotConfig;
1935
+ try {
1936
+ cfpilotConfig = await client.getKvValue(accountId, namespaceId, "CONFIG");
1937
+ } catch (err) {
1938
+ return unableToConfirm(err);
1939
+ }
1735
1940
  if (cfpilotConfig !== null) {
1736
1941
  return {
1737
1942
  verdict: "stale",
@@ -1776,15 +1981,27 @@ async function assertKvOwnership(client, accountId, namespaceId, options) {
1776
1981
  }
1777
1982
  async function writeEffectiveConfig(client, accountId, namespaceId, effective, options, warnings, log) {
1778
1983
  let existing = {};
1984
+ let raw;
1779
1985
  try {
1780
- const raw = await client.getKvValue(accountId, namespaceId, "CONFIG");
1781
- if (raw) {
1986
+ raw = await client.getKvValue(accountId, namespaceId, "CONFIG");
1987
+ } catch (err) {
1988
+ warnings.push(
1989
+ `\u8BFB\u53D6\u65E2\u6709 KV \u914D\u7F6E\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
1990
+ \u5DF2\u8DF3\u8FC7\u5199\u5165 CONFIG\uFF08\u907F\u514D\u8986\u76D6\u4F60\u5728\u9762\u677F\u91CC\u6539\u8FC7\u7684\u4F18\u9009\u6C60 / \u4EE3\u7406\u6C60 / \u8BA2\u9605\u57DF\u540D\uFF09\u3002
1991
+ \u5185\u6838\u4F1A\u56DE\u9000\u5230\u73AF\u5883\u53D8\u91CF\uFF08UUID / WS \u8DEF\u5F84 / Trojan \u5BC6\u7801\u6765\u81EA\u90E8\u7F72\u65F6\u6CE8\u5165\u7684 env\uFF09\u3002
1992
+ \u2192 \u8BF7\u68C0\u67E5 Token \u7684 KV \u8BFB\u53D6\u6743\u9650\u4E0E\u7F51\u7EDC\u8FDE\u901A\u6027\u540E\u91CD\u8BD5\u3002`
1993
+ );
1994
+ return;
1995
+ }
1996
+ if (raw) {
1997
+ try {
1782
1998
  const parsed = JSON.parse(raw);
1783
1999
  if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
1784
2000
  existing = parsed;
1785
2001
  }
2002
+ } catch {
2003
+ warnings.push("\u65E2\u6709 KV \u914D\u7F6E\u4E0D\u662F\u5408\u6CD5 JSON\uFF0C\u5DF2\u6309\u7A7A\u914D\u7F6E\u91CD\u5199");
1786
2004
  }
1787
- } catch {
1788
2005
  }
1789
2006
  const merged = {
1790
2007
  ...existing,
@@ -1930,7 +2147,16 @@ async function deployPagesSplit(options) {
1930
2147
  const kv = { KV: { namespace_id: options.kvNamespaceId } };
1931
2148
  const kernel = await resolveKernel(options, log, warnings);
1932
2149
  const effectiveBuild = kernel.build || (options.localBuild ?? "").trim();
1933
- const manifest = await readManifest(client, options.accountId, options.kvNamespaceId);
2150
+ let manifest;
2151
+ try {
2152
+ manifest = await readManifest(client, options.accountId, options.kvNamespaceId);
2153
+ } catch (err) {
2154
+ throw new Error(
2155
+ `\u8BFB\u53D6 KV \u90E8\u7F72\u6E05\u5355\u5931\u8D25\uFF0C\u5DF2\u4E2D\u6B62\u90E8\u7F72\uFF1A${err instanceof Error ? err.message : String(err)}
2156
+ \u2192 \u65E0\u6CD5\u786E\u8BA4\u8BE5 KV \u91CC\u662F\u5426\u5DF2\u6709\u90E8\u7F72\uFF0C\u7EE7\u7EED\u90E8\u7F72\u53EF\u80FD\u6539\u574F\u65E2\u6709\u5B9E\u4F8B\u7684\u51ED\u636E\u3002
2157
+ \u2192 \u8BF7\u68C0\u67E5 Token \u7684 KV \u8BFB\u53D6\u6743\u9650\u4E0E\u7F51\u7EDC\u8FDE\u901A\u6027\u540E\u91CD\u8BD5\u3002`
2158
+ );
2159
+ }
1934
2160
  let effective = {
1935
2161
  panelPath: options.panelPath,
1936
2162
  panelPassword: options.panelPassword,
@@ -2380,6 +2606,7 @@ Token \u6240\u9700\u6743\u9650:
2380
2606
  var command_exports = {};
2381
2607
  __export(command_exports, {
2382
2608
  listKvInstances: () => listKvInstances,
2609
+ resolveDeployAccount: () => resolveDeployAccount,
2383
2610
  runDeployCommand: () => runDeployCommand
2384
2611
  });
2385
2612
  async function listKvInstances(client, accountId) {
@@ -2419,6 +2646,87 @@ ${hint}
2419
2646
  ` + (instanceIds.size > 0 ? "\u66F4\u65B0\u67D0\u4E2A\u5B9E\u4F8B\uFF1Acfpilot deploy --kv <id>\n" : "") + "\u90E8\u7F72\u65B0\u5B9E\u4F8B\uFF1Acfpilot deploy --new-kv\n"
2420
2647
  );
2421
2648
  }
2649
+ async function resolveDeployAccount(client, options) {
2650
+ const { accountFlag } = options;
2651
+ const kvId = options.ignoreKv ? "" : options.kvId;
2652
+ if (accountFlag) {
2653
+ if (kvId) {
2654
+ const check = await checkKvInAccount(client, accountFlag, kvId);
2655
+ if (check === "no") {
2656
+ return {
2657
+ ok: false,
2658
+ accountId: "",
2659
+ accountName: "",
2660
+ source: "flag",
2661
+ message: `\u2717 KV ${kvId} \u4E0D\u5C5E\u4E8E\u8D26\u53F7 ${accountFlag}
2662
+ \u2192 \u8D26\u53F7\u4E0E KV \u5FC5\u987B\u5C5E\u4E8E\u540C\u4E00\u4E2A Cloudflare \u8D26\u53F7\uFF0C\u5426\u5219\u4F1A\u5EFA\u51FA\u65E0\u6CD5\u4F7F\u7528\u7684\u5B64\u513F\u9879\u76EE
2663
+ `
2664
+ };
2665
+ }
2666
+ if (check === "unknown") {
2667
+ return {
2668
+ ok: true,
2669
+ accountId: accountFlag,
2670
+ accountName: accountFlag,
2671
+ source: "flag",
2672
+ message: `\xB7 \u672A\u80FD\u786E\u8BA4 KV ${kvId} \u662F\u5426\u5C5E\u4E8E\u8BE5\u8D26\u53F7\uFF08\u8BFB\u53D6 KV \u5217\u8868\u5931\u8D25\uFF09\uFF0C\u7EE7\u7EED
2673
+ `
2674
+ };
2675
+ }
2676
+ }
2677
+ return {
2678
+ ok: true,
2679
+ accountId: accountFlag,
2680
+ accountName: accountFlag,
2681
+ source: "flag",
2682
+ message: `\u4F7F\u7528\u8D26\u53F7\uFF1A${accountFlag}
2683
+ `
2684
+ };
2685
+ }
2686
+ const accounts = await client.listAccounts();
2687
+ if (accounts.length === 0) {
2688
+ return {
2689
+ ok: false,
2690
+ accountId: "",
2691
+ accountName: "",
2692
+ source: "first",
2693
+ message: "\u2717 \u8BE5 Token \u6CA1\u6709\u53EF\u8BBF\u95EE\u7684\u8D26\u53F7\n"
2694
+ };
2695
+ }
2696
+ if (kvId) {
2697
+ const { owner, unreadable } = await findAccountByKv(client, accounts, kvId);
2698
+ if (!owner) {
2699
+ const names = accounts.map((a) => a.name).join("\u3001");
2700
+ return {
2701
+ ok: false,
2702
+ accountId: "",
2703
+ accountName: "",
2704
+ source: "kv-lookup",
2705
+ message: unreadable > 0 ? `\u2717 \u65E0\u6CD5\u786E\u5B9A KV ${kvId} \u5C5E\u4E8E\u54EA\u4E2A\u8D26\u53F7\uFF08${names}\uFF1B\u5176\u4E2D ${unreadable} \u4E2A\u8D26\u53F7\u7684 KV \u5217\u8868\u8BFB\u53D6\u5931\u8D25\uFF09
2706
+ \u2192 \u8BF7\u7528 --account <\u8D26\u53F7ID> \u4E0E --kv <KV ID> \u4E00\u8D77\u6307\u5B9A
2707
+ ` : `\u2717 KV ${kvId} \u4E0D\u5C5E\u4E8E\u8BE5 Token \u7684\u4EFB\u4F55\u8D26\u53F7\uFF08${names}\uFF09
2708
+ \u2192 \u8BF7\u7528 --account <\u8D26\u53F7ID> \u4E0E --kv <KV ID> \u4E00\u8D77\u6307\u5B9A
2709
+ `
2710
+ };
2711
+ }
2712
+ return {
2713
+ ok: true,
2714
+ accountId: owner.id,
2715
+ accountName: owner.name,
2716
+ source: "kv-lookup",
2717
+ message: `\u4F7F\u7528\u8D26\u53F7\uFF1A${owner.name}\uFF08${owner.id}\uFF0C\u7531 --kv \u53CD\u67E5\uFF09
2718
+ `
2719
+ };
2720
+ }
2721
+ return {
2722
+ ok: true,
2723
+ accountId: accounts[0].id,
2724
+ accountName: accounts[0].name,
2725
+ source: "first",
2726
+ message: `\u4F7F\u7528\u8D26\u53F7\uFF1A${accounts[0].name}\uFF08${accounts[0].id}\uFF09
2727
+ `
2728
+ };
2729
+ }
2422
2730
  async function runDeployCommand(args) {
2423
2731
  if (flagBool(args, "h") || flagBool(args, "help")) {
2424
2732
  process.stdout.write(DEPLOY_HELP);
@@ -2431,21 +2739,21 @@ async function runDeployCommand(args) {
2431
2739
  return;
2432
2740
  }
2433
2741
  const client = new CloudflareClient({ token });
2434
- const accountId = flagString(args, "account") || "";
2435
2742
  let kvId = flagString(args, "kv") || "";
2436
- let resolvedAccount = accountId;
2437
- if (!resolvedAccount) {
2438
- const accounts = await client.listAccounts();
2439
- if (accounts.length === 0) {
2440
- process.stderr.write("\u2717 \u8BE5 Token \u6CA1\u6709\u53EF\u8BBF\u95EE\u7684\u8D26\u53F7\n");
2441
- process.exitCode = 1;
2442
- return;
2443
- }
2444
- resolvedAccount = accounts[0].id;
2445
- process.stdout.write(`\u4F7F\u7528\u8D26\u53F7\uFF1A${accounts[0].name}\uFF08${accounts[0].id}\uFF09
2446
- `);
2743
+ const listKv = flagBool(args, "list-kv");
2744
+ const resolution = await resolveDeployAccount(client, {
2745
+ accountFlag: flagString(args, "account") || "",
2746
+ kvId,
2747
+ ignoreKv: listKv
2748
+ });
2749
+ if (!resolution.ok) {
2750
+ process.stderr.write(resolution.message);
2751
+ process.exitCode = 1;
2752
+ return;
2447
2753
  }
2448
- if (flagBool(args, "list-kv")) {
2754
+ const resolvedAccount = resolution.accountId;
2755
+ process.stdout.write(resolution.message);
2756
+ if (listKv) {
2449
2757
  await listKvInstances(client, resolvedAccount);
2450
2758
  return;
2451
2759
  }
@@ -2570,6 +2878,7 @@ var init_command = __esm({
2570
2878
  "use strict";
2571
2879
  init_args();
2572
2880
  init_cf_api();
2881
+ init_account_resolve();
2573
2882
  init_pages_deploy();
2574
2883
  init_kernel_remote();
2575
2884
  init_utils();
@@ -2589,16 +2898,59 @@ __export(deploy_exports, {
2589
2898
  function makeArgs(flags) {
2590
2899
  return { command: "", flags, positionals: [] };
2591
2900
  }
2901
+ async function resolveAccountId(token, cfg) {
2902
+ if (cfg.accountId) return cfg.accountId;
2903
+ const client = new CloudflareClient({ token });
2904
+ let accounts;
2905
+ try {
2906
+ accounts = await client.listAccounts();
2907
+ } catch (err) {
2908
+ status("fail", `\u8BFB\u53D6\u8D26\u53F7\u5217\u8868\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}`);
2909
+ return "";
2910
+ }
2911
+ if (accounts.length === 0) {
2912
+ status("fail", "\u8BE5 Token \u6CA1\u6709\u53EF\u8BBF\u95EE\u7684\u8D26\u53F7");
2913
+ return "";
2914
+ }
2915
+ if (cfg.kvNamespaceId) {
2916
+ const { owner } = await findAccountByKv(client, accounts, cfg.kvNamespaceId);
2917
+ if (owner) {
2918
+ saveConfig({ accountId: owner.id, accountName: owner.name });
2919
+ return owner.id;
2920
+ }
2921
+ status("warn", `\u914D\u7F6E\u7684 KV ${cfg.kvNamespaceId} \u4E0D\u5728\u53EF\u89C1\u7684\u8D26\u53F7\u4E0B\uFF0C\u5C06\u91CD\u65B0\u9009\u62E9`);
2922
+ }
2923
+ if (accounts.length === 1) {
2924
+ const only = accounts[0];
2925
+ saveConfig({ accountId: only.id, accountName: only.name });
2926
+ return only.id;
2927
+ }
2928
+ const picked = await select(
2929
+ "\u68C0\u6D4B\u5230\u591A\u4E2A\u8D26\u53F7\uFF0C\u8BF7\u9009\u62E9\u672C\u6B21\u90E8\u7F72\u4F7F\u7528\u54EA\u4E2A",
2930
+ accounts.map((a) => ({ label: a.name, value: a.id, hint: a.id.slice(0, 12) + "\u2026" }))
2931
+ );
2932
+ if (!picked) {
2933
+ status("info", "\u5DF2\u53D6\u6D88");
2934
+ return "";
2935
+ }
2936
+ const chosen = accounts.find((a) => a.id === picked);
2937
+ if (!chosen) return "";
2938
+ saveConfig({ accountId: chosen.id, accountName: chosen.name });
2939
+ return chosen.id;
2940
+ }
2592
2941
  async function menuDeploy(mode) {
2593
- const cfg = loadConfig();
2942
+ let cfg = loadConfig();
2594
2943
  const token = resolveToken();
2595
2944
  if (!token) {
2596
2945
  status("warn", "\u5C1A\u672A\u914D\u7F6E API Token");
2597
2946
  status("info", "\u8BF7\u5148\u5230\u300C\u914D\u7F6E\u300D\u83DC\u5355\u8BBE\u7F6E\uFF0C\u6216\u8FD0\u884C cfpilot config --token xxx");
2598
2947
  return;
2599
2948
  }
2949
+ const accountId = await resolveAccountId(token, cfg);
2950
+ if (!accountId) return;
2951
+ cfg = loadConfig();
2600
2952
  box(mode === "fresh" ? "\u90E8\u7F72\u65B0\u5B9E\u4F8B" : "\u66F4\u65B0\u73B0\u6709\u5B9E\u4F8B", [
2601
- `${c.gray("\u8D26\u53F7")} ${cfg.accountName || c.yellow("\u5F85\u68C0\u6D4B")}`,
2953
+ `${c.gray("\u8D26\u53F7")} ${cfg.accountName || accountId}`,
2602
2954
  `${c.gray("KV")} ${cfg.kvNamespaceId || c.gray("\uFF08\u81EA\u52A8\uFF09")}`,
2603
2955
  `${c.gray("\u6A21\u5F0F")} ${mode === "fresh" ? "\u5168\u65B0\u90E8\u7F72" : "\u66F4\u65B0\u73B0\u6709"}`
2604
2956
  ]);
@@ -2620,7 +2972,9 @@ async function menuDeploy(mode) {
2620
2972
  const flags = {
2621
2973
  token,
2622
2974
  yes: true,
2623
- mode: mode === "fresh" ? "fresh" : "update"
2975
+ mode: mode === "fresh" ? "fresh" : "update",
2976
+ // ⚠️ 账号与 KV 来自同一份配置 → 不会错配。
2977
+ account: accountId
2624
2978
  };
2625
2979
  if (mode === "fresh") flags["new-kv"] = true;
2626
2980
  if (panelPassword) flags["panel-password"] = panelPassword;
@@ -2642,7 +2996,13 @@ async function menuChangePassword() {
2642
2996
  status("info", "\u6B63\u5728\u8BFB\u53D6\u5B9E\u4F8B\u4FE1\u606F\u2026");
2643
2997
  try {
2644
2998
  const client = new CloudflareClient({ token });
2645
- const raw = await client.getKvValue(cfg.accountId, cfg.kvNamespaceId, "CFP_DEPLOY_MANIFEST");
2999
+ let raw;
3000
+ try {
3001
+ raw = await client.getKvValue(cfg.accountId, cfg.kvNamespaceId, "CFP_DEPLOY_MANIFEST");
3002
+ } catch (err) {
3003
+ status("fail", `\u8BFB\u53D6\u90E8\u7F72\u8BB0\u5F55\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}`);
3004
+ return;
3005
+ }
2646
3006
  if (!raw) {
2647
3007
  status("fail", "\u8BE5 KV \u91CC\u6CA1\u6709\u90E8\u7F72\u8BB0\u5F55");
2648
3008
  return;
@@ -2727,6 +3087,7 @@ var init_deploy = __esm({
2727
3087
  init_prompt();
2728
3088
  init_store();
2729
3089
  init_cf_api();
3090
+ init_account_resolve();
2730
3091
  init_token_check();
2731
3092
  }
2732
3093
  });
@@ -2753,9 +3114,25 @@ async function menuStatus() {
2753
3114
  status("fail", "\u8BE5 Token \u6CA1\u6709\u53EF\u8BBF\u95EE\u7684\u8D26\u53F7");
2754
3115
  return;
2755
3116
  }
2756
- const accountId = cfg.accountId || accounts[0].id;
2757
- const accountName = accounts.find((a) => a.id === accountId)?.name ?? accounts[0].name;
2758
- if (!cfg.accountId) saveConfig({ accountId, accountName });
3117
+ let account = accounts.find((a) => a.id === cfg.accountId);
3118
+ if (!account) {
3119
+ if (accounts.length === 1) {
3120
+ account = accounts[0];
3121
+ } else {
3122
+ const picked = await select(
3123
+ "\u68C0\u6D4B\u5230\u591A\u4E2A\u8D26\u53F7\uFF0C\u8BF7\u9009\u62E9\u8981\u67E5\u770B\u54EA\u4E2A",
3124
+ accounts.map((a) => ({ label: a.name, value: a.id, hint: a.id.slice(0, 12) + "\u2026" }))
3125
+ );
3126
+ if (!picked) {
3127
+ status("info", "\u5DF2\u53D6\u6D88");
3128
+ return;
3129
+ }
3130
+ account = accounts.find((a) => a.id === picked) ?? accounts[0];
3131
+ }
3132
+ }
3133
+ const accountId = account.id;
3134
+ const accountName = account.name;
3135
+ if (cfg.accountId !== accountId) saveConfig({ accountId, accountName });
2759
3136
  process.stdout.write("\n");
2760
3137
  box("\u5F53\u524D\u5B9E\u4F8B", [`${c.gray("\u8D26\u53F7")} ${accountName}`, `${c.gray("ID")} ${accountId}`]);
2761
3138
  process.stdout.write("\n");
@@ -2771,6 +3148,7 @@ var init_status = __esm({
2771
3148
  "src/menu/status.ts"() {
2772
3149
  "use strict";
2773
3150
  init_ui();
3151
+ init_prompt();
2774
3152
  init_store();
2775
3153
  init_cf_api();
2776
3154
  init_command();
@@ -4956,7 +5334,7 @@ function normalizeWsPath(raw, fallback) {
4956
5334
  \u8FD9\u662F Git-Bash \u7684\u81EA\u52A8\u8DEF\u5F84\u8F6C\u6362\u884C\u4E3A\uFF0C\u4E0D\u662F\u672C\u5DE5\u5177\u7684\u95EE\u9898\u3002
4957
5335
  \u4E09\u79CD\u7ED5\u5F00\u65B9\u5F0F\uFF0C\u4EFB\u9009\u5176\u4E00\uFF1A
4958
5336
  1. \u7528\u7B49\u53F7\u5199\u6CD5\uFF1A --path=/vless
4959
- 2. \u52A0\u73AF\u5883\u53D8\u91CF\uFF1A MSYS_NO_PATHCONV=1 cfpilot-scanner scan ...
5337
+ 2. \u52A0\u73AF\u5883\u53D8\u91CF\uFF1A MSYS_NO_PATHCONV=1 cfpilot scan ...
4960
5338
  3. \u6362\u7528 PowerShell / CMD \u6267\u884C
4961
5339
  `
4962
5340
  );
@@ -5352,7 +5730,15 @@ async function fetchInstances(token) {
5352
5730
  const client = new CloudflareClient({ token });
5353
5731
  const cfg = loadConfig();
5354
5732
  const accounts = await client.listAccounts();
5355
- const accountId = cfg.accountId || accounts[0]?.id;
5733
+ if (accounts.length === 0) return [];
5734
+ let accountId = cfg.accountId || "";
5735
+ if (!accountId && cfg.kvNamespaceId) {
5736
+ const { owner } = await findAccountByKv(client, accounts, cfg.kvNamespaceId);
5737
+ if (owner) accountId = owner.id;
5738
+ }
5739
+ if (!accountId && accounts.length === 1) {
5740
+ accountId = accounts[0].id;
5741
+ }
5356
5742
  if (!accountId) return [];
5357
5743
  const list = await listCfPilotNamespaces(client, accountId);
5358
5744
  return list.map((i) => ({
@@ -5499,6 +5885,7 @@ var init_scan2 = __esm({
5499
5885
  init_store();
5500
5886
  init_countries();
5501
5887
  init_cf_api();
5888
+ init_account_resolve();
5502
5889
  init_pages_deploy();
5503
5890
  }
5504
5891
  });
@@ -5511,6 +5898,26 @@ __export(config_exports, {
5511
5898
  syncAccount: () => syncAccount
5512
5899
  });
5513
5900
  async function syncFromCloud(token) {
5901
+ if ((loadConfig().token ?? "").trim() !== token.trim()) {
5902
+ saveConfig({
5903
+ accountId: "",
5904
+ accountName: "",
5905
+ kvNamespaceId: "",
5906
+ panelHost: "",
5907
+ dataHost: "",
5908
+ wsPath: "",
5909
+ panelPassword: ""
5910
+ });
5911
+ }
5912
+ saveConfig({
5913
+ accountId: "",
5914
+ accountName: "",
5915
+ kvNamespaceId: "",
5916
+ panelHost: "",
5917
+ dataHost: "",
5918
+ wsPath: "",
5919
+ panelPassword: ""
5920
+ });
5514
5921
  try {
5515
5922
  const client = new CloudflareClient({ token });
5516
5923
  const accounts = await client.listAccounts();
@@ -5526,10 +5933,18 @@ async function syncFromCloud(token) {
5526
5933
  );
5527
5934
  account = accounts.find((a) => a.id === picked) ?? accounts[0];
5528
5935
  }
5529
- saveConfig({ accountId: account.id, accountName: account.name });
5530
5936
  status("ok", `\u8D26\u53F7\uFF1A${account.name}`);
5531
5937
  const namespaces = await client.listKvNamespaces(account.id);
5532
5938
  if (namespaces.length === 0) {
5939
+ saveConfig({
5940
+ accountId: account.id,
5941
+ accountName: account.name,
5942
+ kvNamespaceId: "",
5943
+ panelHost: "",
5944
+ dataHost: "",
5945
+ wsPath: "",
5946
+ panelPassword: ""
5947
+ });
5533
5948
  status("info", "\u8BE5\u8D26\u53F7\u4E0B\u8FD8\u6CA1\u6709 KV\uFF08\u9996\u6B21\u90E8\u7F72\u65F6\u4F1A\u81EA\u52A8\u521B\u5EFA\uFF09");
5534
5949
  return true;
5535
5950
  }
@@ -5548,9 +5963,12 @@ async function syncFromCloud(token) {
5548
5963
  chosen = instances.find((i) => i.id === picked) ?? instances[0];
5549
5964
  }
5550
5965
  saveConfig({
5966
+ accountId: account.id,
5967
+ accountName: account.name,
5551
5968
  kvNamespaceId: chosen.id,
5552
5969
  panelHost: chosen.manifest.controlSubdomain,
5553
- dataHost: chosen.manifest.dataSubdomain
5970
+ dataHost: chosen.manifest.dataSubdomain,
5971
+ wsPath: chosen.manifest.credentials?.wsPath ?? ""
5554
5972
  });
5555
5973
  status("ok", `\u5B9E\u4F8B\uFF1A${chosen.manifest.controlProject} / ${chosen.manifest.dataProject}`);
5556
5974
  status("info", `\u63A7\u5236\u9762\uFF1A${chosen.manifest.controlSubdomain}`);
@@ -5558,7 +5976,15 @@ async function syncFromCloud(token) {
5558
5976
  return true;
5559
5977
  }
5560
5978
  if (namespaces.length === 1) {
5561
- saveConfig({ kvNamespaceId: namespaces[0].id });
5979
+ saveConfig({
5980
+ accountId: account.id,
5981
+ accountName: account.name,
5982
+ kvNamespaceId: namespaces[0].id,
5983
+ panelHost: "",
5984
+ dataHost: "",
5985
+ wsPath: "",
5986
+ panelPassword: ""
5987
+ });
5562
5988
  status("info", `KV\uFF1A${namespaces[0].title}\uFF08\u5C1A\u65E0\u90E8\u7F72\uFF09`);
5563
5989
  } else {
5564
5990
  const picked = await select(
@@ -5572,8 +5998,16 @@ async function syncFromCloud(token) {
5572
5998
  { label: "\u4E0D\u6307\u5B9A\uFF08\u90E8\u7F72\u65F6\u81EA\u52A8\u521B\u5EFA\uFF09", value: "" }
5573
5999
  ]
5574
6000
  );
6001
+ saveConfig({
6002
+ accountId: account.id,
6003
+ accountName: account.name,
6004
+ kvNamespaceId: picked ?? "",
6005
+ panelHost: "",
6006
+ dataHost: "",
6007
+ wsPath: "",
6008
+ panelPassword: ""
6009
+ });
5575
6010
  if (picked) {
5576
- saveConfig({ kvNamespaceId: picked });
5577
6011
  status("ok", "KV \u5DF2\u4FDD\u5B58");
5578
6012
  }
5579
6013
  }
@@ -5630,7 +6064,7 @@ async function menuConfig() {
5630
6064
  status("warn", "\u672A\u8F93\u5165\uFF0C\u5DF2\u53D6\u6D88");
5631
6065
  break;
5632
6066
  }
5633
- saveConfig({ token });
6067
+ saveToken(token);
5634
6068
  status("ok", "Token \u5DF2\u4FDD\u5B58");
5635
6069
  status("info", "\u6B63\u5728\u8BC6\u522B\u8D26\u53F7\u4E0E\u5B9E\u4F8B\u2026");
5636
6070
  process.stdout.write("\n");
@@ -5694,12 +6128,31 @@ async function runConfig(args) {
5694
6128
  return;
5695
6129
  }
5696
6130
  const patch = {};
6131
+ const explicit = {};
5697
6132
  if (typeof flags["token"] === "string") patch.token = flags["token"];
5698
- if (typeof flags["kv"] === "string") patch.kvNamespaceId = flags["kv"];
5699
- if (typeof flags["panel"] === "string") patch.panelHost = flags["panel"];
5700
- if (typeof flags["account"] === "string") patch.accountId = flags["account"];
5701
- saveConfig(patch);
6133
+ if (typeof flags["kv"] === "string") {
6134
+ patch.kvNamespaceId = flags["kv"];
6135
+ explicit.kvNamespaceId = flags["kv"];
6136
+ }
6137
+ if (typeof flags["panel"] === "string") {
6138
+ patch.panelHost = flags["panel"];
6139
+ explicit.panelHost = flags["panel"];
6140
+ }
6141
+ if (typeof flags["account"] === "string") {
6142
+ patch.accountId = flags["account"];
6143
+ explicit.accountId = flags["account"];
6144
+ }
6145
+ if (typeof patch.token === "string") {
6146
+ saveToken(patch.token, explicit);
6147
+ } else {
6148
+ saveConfig(patch);
6149
+ }
5702
6150
  process.stdout.write("\u5DF2\u4FDD\u5B58\uFF1A" + Object.keys(patch).join(", ") + "\n");
6151
+ if (typeof patch.token === "string") {
6152
+ process.stdout.write("\n");
6153
+ status("info", "\u6B63\u5728\u8BC6\u522B\u8D26\u53F7\u4E0E\u5B9E\u4F8B\u2026");
6154
+ await syncFromCloud(patch.token);
6155
+ }
5703
6156
  }
5704
6157
  async function syncAccount(token) {
5705
6158
  const t = token || resolveToken();