@tokenbuddy/tb-admin 1.0.33 → 1.0.34

package/src/seller.ts

@@ -35,6 +35,16 @@ export interface SellerAppJson {
   raw: Record<string, unknown>;
 }
 
+export interface SellerMachineSpecs {
+  machines: number;
+  runningMachines?: number;
+  cpuKind?: string;
+  cpuCores?: number;
+  memoryMb?: number;
+  volumeGb?: number;
+  regions?: string[];
+}
+
 /** ls --json 输出 */
 export interface SellerListResult {
   ok: true;
@@ -68,12 +78,39 @@ export interface SellerActionResult<T extends "create" | "deploy" | "remove"> {
   machines?: string[];
 }
 
+/** roll --json 输出: 按顺序对一组 seller 跑 image-only redeploy */
+export interface SellerRollResult {
+  ok: true;
+  provider: "fly";
+  action: "roll";
+  image: string;
+  dryRun: boolean;
+  /** 实际进入 roll 的 seller app 名 (去 exclude 之后) */
+  candidates: string[];
+  /** 被 --exclude 排除的 seller */
+  excluded: string[];
+  /** 每一台 deploy 的结果, 按执行顺序. 失败那一台后续不再执行 */
+  attempts: SellerRollAttempt[];
+  /** true = 全部 success; false = 至少一台失败且后续没跑 */
+  completed: boolean;
+}
+
+export interface SellerRollAttempt {
+  app: string;
+  ok: boolean;
+  /** 失败时填 stderr / 异常 message */
+  error?: string;
+  /** 实际 deploy 后 flyctl 摘录 */
+  summary?: string;
+}
+
 export type SellerCommandResult =
   | SellerListResult
   | SellerStatusResult
   | SellerActionResult<"create">
   | SellerActionResult<"deploy">
-  | SellerActionResult<"remove">;
+  | SellerActionResult<"remove">
+  | SellerRollResult;
 
 export class FlyCliMissingError extends Error {
   constructor(public readonly flyctl: string) {
@@ -162,9 +199,10 @@ function parseFlyStatusJson(jsonText: string): Record<string, unknown> {
 function runFlyctlJson(
   flyctl: string,
   args: string[],
-  env: NodeJS.ProcessEnv
+  env: NodeJS.ProcessEnv,
+  timeoutMs?: number
 ): unknown {
-  const result = spawnSync(flyctl, args, { encoding: "utf8", env });
+  const result = spawnSync(flyctl, args, { encoding: "utf8", env, timeout: timeoutMs });
   if (result.error) {
     throw result.error;
   }
@@ -178,6 +216,36 @@ function runFlyctlJson(
   return result.stdout;
 }
 
+function parseFlyMachinesJson(jsonText: string): SellerMachineSpecs {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(jsonText || "[]");
+  } catch (err) {
+    throw new Error(`flyctl machines list --json returned invalid JSON: ${(err as Error).message}`);
+  }
+  if (!Array.isArray(parsed)) {
+    throw new Error("flyctl machines list --json did not return an array");
+  }
+  const machines = parsed.filter((item) => item && typeof item === "object") as Array<Record<string, unknown>>;
+  const first = machines[0];
+  const guest = first && typeof first.config === "object" && first.config
+    ? (first.config as Record<string, unknown>).guest as Record<string, unknown> | undefined
+    : undefined;
+  const mount = first && typeof first.config === "object" && first.config && Array.isArray((first.config as Record<string, unknown>).mounts)
+    ? ((first.config as Record<string, unknown>).mounts as unknown[]).find((item) => item && typeof item === "object") as Record<string, unknown> | undefined
+    : undefined;
+  const regions = Array.from(new Set(machines.map((machine) => typeof machine.region === "string" ? machine.region : undefined).filter((region): region is string => Boolean(region)))).sort();
+  return {
+    machines: machines.length,
+    runningMachines: machines.filter((machine) => machine.state === "started").length,
+    cpuKind: typeof guest?.cpu_kind === "string" ? guest.cpu_kind : undefined,
+    cpuCores: typeof guest?.cpus === "number" ? guest.cpus : undefined,
+    memoryMb: typeof guest?.memory_mb === "number" ? guest.memory_mb : undefined,
+    volumeGb: typeof mount?.size_gb === "number" ? mount.size_gb : undefined,
+    regions
+  };
+}
+
 /**
  * 顶层 seller 命令入口. 5 个 op 都走这里.
  * - `json=false` (默认): 走 FlyProvider 现有方法, 返回人类可读 string, 调用方 console.log
@@ -233,6 +301,16 @@ export class SellerCommandRunner {
     return { ok: true, provider: "fly", action: "status", app: resolvedName, status };
   }
 
+  public machineSpecs(appName: string): SellerMachineSpecs | undefined {
+    const flyctl = this.getFlyctl();
+    if (!providerCheck(flyctl)) {
+      throw new FlyCliMissingError(flyctl);
+    }
+    const env = flyEnv(this.getProviderConfig());
+    const stdout = runFlyctlJson(flyctl, ["machines", "list", "--app", appName, "--json"], env, 10000) as string;
+    return parseFlyMachinesJson(stdout);
+  }
+
   // -- create --
 
   public create(options: SellerCreateOptions, json: boolean): SellerActionResult<"create"> | string {
@@ -321,6 +399,104 @@ export class SellerCommandRunner {
       summary: String(summary)
     };
   }
+
+  // -- roll --
+  //
+  // Step 13 之后 (v1.1 增量): 不写死 5 台 fixed-fleet, 从 `fly apps list` 拉全部
+  // `tbs-*` 候选, 按顺序 image-only redeploy 到指定镜像. 失败停、报告.
+  //
+  // 设计约束 (跟 1.0.31 deploy 子命令保持一致):
+  //   - 复用 FlyProvider.deploySeller (image-only, 不动 volume / config / secrets)
+  //   - 走 --json 路径 (runFlyctlJson), 失败可解析, 不靠 stdio inherit
+  //   - 候选列表 = fly apps list --json 中 name 以 `tbs-` 开头的, 排除 --exclude
+  //   - 真跑: 失败那台后续不再执行, 报告 attempts 全部 + completed=false
+  //   - dry-run: 跑 fly apps list 拿候选, 不真 deploy, attempts 全部 ok=true, summary=计划
+
+  public roll(
+    args: { image: string; exclude?: string[]; dryRun?: boolean },
+    json: boolean
+  ): SellerRollResult | string {
+    const provider = this.getProvider();
+    const flyctl = this.getFlyctl();
+    const targetImage = args.image;
+    const excludeSet = new Set<string>((args.exclude || []).filter((s) => s.trim().length > 0));
+
+    if (!targetImage) {
+      throw new Error("seller roll requires --image registry.fly.io/tb-seller:<v>");
+    }
+
+    // 拿候选: 必须走 --json 路径 (需要结构化 Name 字段做 filter)
+    if (!providerCheck(flyctl)) {
+      throw new FlyCliMissingError(flyctl);
+    }
+    const env = flyEnv(this.getProviderConfig());
+    const stdout = runFlyctlJson(flyctl, ["apps", "list", "--json"], env) as string;
+    const allApps = parseFlyListJson(stdout);
+    const tbsOnly = allApps.filter((a) => a.name.startsWith("tbs-"));
+    const excluded = tbsOnly.filter((a) => excludeSet.has(a.name)).map((a) => a.name);
+    const candidates = tbsOnly.filter((a) => !excludeSet.has(a.name)).map((a) => a.name);
+
+    if (!json) {
+      // 文本路径: 先列计划, 然后按顺序跑
+      const lines: string[] = [];
+      lines.push(`[Fly.io] roll candidates (tbs-*, excludes applied): ${candidates.length}`);
+      for (const app of candidates) lines.push(`  - ${app}`);
+      if (excluded.length > 0) {
+        lines.push(`[Fly.io] excluded by --exclude: ${excluded.join(", ")}`);
+      }
+      lines.push(`[Fly.io] image: ${targetImage}`);
+      lines.push(`[Fly.io] mode: ${args.dryRun ? "dry-run (no actual deploy)" : "live sequential, fail-fast"}`);
+      lines.push("");
+
+      let completed = true;
+      for (const app of candidates) {
+        if (args.dryRun) {
+          lines.push(`[Fly.io] [DRY-RUN] would update ${app} image to ${targetImage}`);
+          continue;
+        }
+        try {
+          const summary = provider.deploySeller({ app, image: targetImage });
+          lines.push(`[Fly.io] ${app}: ${summary}`);
+        } catch (err: any) {
+          lines.push(`[Fly.io] ${app}: FAILED — ${err.message || String(err)}`);
+          completed = false;
+          break;
+        }
+      }
+      lines.push("");
+      lines.push(completed ? "[Fly.io] roll completed." : "[Fly.io] roll stopped at failure.");
+      return lines.join("\n");
+    }
+
+    // --json 路径: 同样顺序执行, 但输出结构化
+    const attempts: SellerRollAttempt[] = [];
+    let completed = true;
+    for (const app of candidates) {
+      if (args.dryRun) {
+        attempts.push({ app, ok: true, summary: `[dry-run] would update ${app} image to ${targetImage}` });
+        continue;
+      }
+      try {
+        const summary = provider.deploySeller({ app, image: targetImage });
+        attempts.push({ app, ok: true, summary: String(summary) });
+      } catch (err: any) {
+        attempts.push({ app, ok: false, error: err.message || String(err) });
+        completed = false;
+        break;
+      }
+    }
+    return {
+      ok: true,
+      provider: "fly",
+      action: "roll",
+      image: targetImage,
+      dryRun: Boolean(args.dryRun),
+      candidates,
+      excluded,
+      attempts,
+      completed
+    };
+  }
 }
 
 // ===== helpers =====

package/src/ui-actions.ts

@@ -61,6 +61,8 @@ export interface UiActionsOptions {
   url?: string;
   token?: string;
   fetchJson?: (url: string, init?: RequestInit) => Promise<unknown>;
+  balanceFetch?: typeof fetch;
+  flyApps?: () => Promise<import("./seller.js").SellerAppJson[]>;
   commandRunner?: (args: string[], timeoutMs: number) => Promise<UiActionResult>;
 }
 
@@ -264,7 +266,7 @@ export class UiActions {
     // Step 14 (v1.1): tb-admin ui 现在走 vendor-scoped /platform/sellers/{id}/status.
     // 老路径 `tb-admin bootstrap sellers status` (operator-level) 保留给 platform operator 显式调用.
     // Vendor client 用当前 active profile 的 token, 跟 admin web 鉴权一致.
-    const registry = await this.state.fetchRegistry();
+    const registry = await this.state.fetchManagedRegistry();
     const target = registry.sellers.find((seller) => seller.id === id || seller.name === id || seller.app === id);
     if (!target) {
       throw new Error(`seller \`${id}\` not found in bootstrap registry`);
@@ -277,17 +279,19 @@ export class UiActions {
       throw new Error("No bootstrap profile found. Configure an admin profile or pass --url and --token.");
     }
     const client = new RegistryVendorClient(baseUrl, token);
-    const idempotencyKey = `tb-admin-ui-${target.id}-${status}-${registry.version}-${Date.now()}`;
+    const expectedVersion = Number.isFinite(registry.version) && registry.version > 0 ? registry.version : undefined;
+    const versionPart = expectedVersion === undefined ? "unversioned" : String(expectedVersion);
+    const idempotencyKey = `tb-admin-ui-${target.id}-${status}-${versionPart}-${Date.now()}`;
     const response = await client.setSellerStatus(target.id, status, {
-      expectedVersion: registry.version,
+      expectedVersion,
       idempotencyKey
     });
-    const newVersion = (response as { registry?: { version?: number } })?.registry?.version ?? registry.version + 1;
+    const newVersion = (response as { registry?: { version?: number } })?.registry?.version ?? (expectedVersion === undefined ? undefined : expectedVersion + 1);
     return {
       ok: true,
-      stdout: `Set seller ${target.id} status=${status}: version=${newVersion} (vendor path)`,
+      stdout: `Set seller ${target.id} status=${status}${newVersion === undefined ? "" : `: version=${newVersion}`} (vendor path)`,
       stderr: "",
-      command: ["PUT", `/platform/sellers/${target.id}/status`, JSON.stringify({ status, expectedVersion: registry.version })],
+      command: ["PUT", `/platform/sellers/${target.id}/status`, JSON.stringify({ status, ...(expectedVersion === undefined ? {} : { expectedVersion }) })],
       json: response
     };
   }

package/src/ui-command.ts

@@ -12,13 +12,14 @@ export function bindAdminUiCommand(program: Command, configManager: ConfigManage
     .action(async (options) => {
       try {
         const rootOptions = program.opts();
+        const mgr = rootOptions.config ? new ConfigManager(rootOptions.config) : configManager;
         const started = await startAdminUiServer({
           host: options.host,
           port: options.port,
           openBrowser: Boolean(options.open),
-          configManager,
+          configManager: mgr,
           configPath: rootOptions.config,
-          profile: rootOptions.profile || process.env.TOKENBUDDY_ADMIN_PROFILE || "bootstrap",
+          profile: rootOptions.profile || process.env.TOKENBUDDY_ADMIN_PROFILE || defaultUiProfile(mgr),
           url: rootOptions.url || process.env.TOKENBUDDY_ADMIN_URL,
           token: rootOptions.token || process.env.TOKENBUDDY_ADMIN_TOKEN
         });
@@ -37,3 +38,7 @@ function parsePort(value: string): number {
   }
   return parsed;
 }
+
+export function defaultUiProfile(configManager: ConfigManager): string {
+  return configManager.getProfile("bootstrap-vendor") ? "bootstrap-vendor" : "bootstrap";
+}

package/src/ui-server.ts

@@ -3,7 +3,7 @@ import { randomBytes } from "crypto";
 import { URL } from "url";
 import { ConfigManager } from "./config.js";
 import { RegistryVendorClient } from "./client.js";
-import { AdminUiState } from "./ui-state.js";
+import { AdminUiState, type SellerRow } from "./ui-state.js";
 import { UiActions, type CreateSellerRequest, type UiActionProgressEvent, type UiActionResult } from "./ui-actions.js";
 import { adminUiHtml } from "./ui-static.js";
 
@@ -115,10 +115,27 @@ async function routeRequest(
     sendJson(res, 200, await client.listReleaseRequests(limit ? Number(limit) : 20));
     return;
   }
+  if (req.method === "GET" && parsed.pathname === "/api/sellers/registry") {
+    sendJson(res, 200, await state.sellerRegistryRows());
+    return;
+  }
+  if (req.method === "GET" && parsed.pathname === "/api/sellers/inventory") {
+    sendJson(res, 200, await state.sellerInventory());
+    return;
+  }
   if (req.method === "GET" && parsed.pathname === "/api/sellers") {
     sendJson(res, 200, await state.sellers());
     return;
   }
+  if (parsed.pathname === "/api/sellers/status" && req.method !== "POST") {
+    sendJson(res, 405, { error: "method not allowed" });
+    return;
+  }
+  if (req.method === "POST" && parsed.pathname === "/api/sellers/status") {
+    const body = await readJson(req) as { rows?: SellerRow[] };
+    sendJson(res, 200, await state.refreshSellerRows(Array.isArray(body.rows) ? body.rows : []));
+    return;
+  }
   if (req.method === "POST" && parsed.pathname === "/api/sellers") {
     const body = await readJson(req) as CreateSellerRequest;
     const job = startCreateSellerJob(jobs, actions, body);