@tokenbuddy/tb-admin 1.0.31 → 1.0.33

package/src/vendor-client.ts

@@ -0,0 +1,23 @@
+/**
+ * Type alias for the seller entry shape vendor commands work with.
+ * Mirrors the server-side `SellerRegistryEntry` but stays decoupled
+ * from `wallet-bootstrap`'s internal types so this package does not
+ * become a build-time dependency of the registry service.
+ */
+export interface SellerRegistryEntry {
+  id: string;
+  name?: string;
+  profile?: string;
+  app?: string;
+  url: string;
+  status?: string;
+  region?: string;
+  modelsCount?: number;
+  sampleModels?: string[];
+  models?: string[];
+  supportedProtocols: string[];
+  paymentMethods: string[];
+  recommendedFor?: string[];
+}
+
+export { RegistryVendorClient, RegistryAdminClient } from "./client.js";

package/src/vendor-commands.ts

@@ -0,0 +1,65 @@
+import * as fs from "fs";
+import { RegistryVendorClient, SellerRegistryEntry } from "./vendor-client.js";
+
+/**
+ * vendor CLI helpers for the `bootstrap sellers` and
+ * `bootstrap release` subcommands. Step 5 of the registry redesign.
+ *
+ *  - `bootstrap sellers add --file <path>`: stage a single seller
+ *    for inclusion in the next release request submitted by this
+ *    vendor. The server validates the payload shape, persists it to
+ *    `seller_pending`, and returns a `pendingSeller` row.
+ *  - `bootstrap release submit --note <text> --staged <id>`: submit
+ *    a release request that includes one or more staged sellers.
+ *  - `bootstrap release list`: list the vendor's release requests.
+ *  - `bootstrap release show <id>`: show one release request.
+ *  - `bootstrap release force-publish <id>`: super-admin path; the
+ *    vendor token cannot force-publish itself (the platform owns
+ *    the scheduler loop in Step 7), but we keep the command here
+ *    so CI scripts have a single entry point.
+ */
+
+export interface StageSellerInput {
+  client: RegistryVendorClient;
+  file: string;
+}
+
+export async function stageSellerFromFile({ client, file }: StageSellerInput): Promise<{ pendingSeller: unknown }> {
+  const content = fs.readFileSync(file, "utf8");
+  const parsed = JSON.parse(content) as SellerRegistryEntry;
+  if (!parsed.id || typeof parsed.id !== "string") {
+    throw new Error(`seller id is required in ${file}`);
+  }
+  return client.stageSeller(parsed);
+}
+
+export interface SubmitReleaseInput {
+  client: RegistryVendorClient;
+  stagedSellerIds: string[];
+  note?: string;
+}
+
+export async function submitRelease({ client, stagedSellerIds, note }: SubmitReleaseInput): Promise<{ releaseRequest: unknown }> {
+  if (stagedSellerIds.length === 0) {
+    throw new Error("at least one --staged <seller-id> is required");
+  }
+  return client.submitRelease({ stagedSellerIds, note });
+}
+
+export function printReleaseRequestSummary(record: any): string {
+  if (!record) {
+    return "no release request";
+  }
+  const summary = record.payloadSummary || { count: 0, sellerIds: [] };
+  return [
+    `id:           #${record.id}`,
+    `status:       ${record.status}`,
+    `vendor:       ${record.vendorId}`,
+    `sellers:      ${summary.count} (${(summary.sellerIds || []).join(", ") || "—"})`,
+    `submittedAt:  ${record.submittedAt || "—"}`,
+    `decidedAt:    ${record.decidedAt || "—"}`,
+    `version:      ${record.publishedVersion !== null && record.publishedVersion !== undefined ? `v${record.publishedVersion}` : "—"}`,
+    record.note ? `note:         ${record.note}` : null,
+    record.errorMessage ? `error:        ${record.errorMessage}` : null
+  ].filter(Boolean).join("\n");
+}

package/tests/admin.test.ts

@@ -38,6 +38,7 @@ import * as vm from "vm";
 
 const TEMP_CONF_PATH = path.resolve(__dirname, "../../data-test/admin-config.json");
 const PACKAGE_JSON = path.resolve(__dirname, "../package.json");
+const ADMIN_UI_STATE_TEST_TIMEOUT_MS = 15_000;
 
 describe("Admin CLI Config Profile Management Tests", () => {
   beforeEach(() => {
@@ -90,6 +91,17 @@ describe("Admin CLI Config Profile Management Tests", () => {
     expect(() => new vm.Script(scripts[0])).not.toThrow();
   });
 
+  test("admin UI release requests tab targets the releases page and loader", () => {
+    const html = adminUiHtml();
+
+    expect(html).toContain('data-page="releases"');
+    expect(html).toContain('id="page-releases"');
+    expect(html).toContain('id="releasesGrid"');
+    expect(html).toContain('btn.dataset.page === "releases"');
+    expect(html).not.toContain('id="page-bootstrap"');
+    expect(html).not.toContain('getElementById("bootstrapGrid")');
+  });
+
   test("Switch default profiles", () => {
     const mgr = new ConfigManager(TEMP_CONF_PATH);
     mgr.setProfile("prod", { url: "http://127.0.0.1:8000", token: "secret-op" });
@@ -406,6 +418,53 @@ describe("Admin CLI Config Profile Management Tests", () => {
     })).rejects.toThrow("loopback");
   });
 
+  test("tb-admin ui release requests endpoint proxies the active vendor profile", async () => {
+    const registry = http.createServer((req, res) => {
+      const url = new URL(req.url || "/", "http://127.0.0.1");
+      if (req.method === "GET" && url.pathname === "/platform/release-requests") {
+        expect(req.headers.authorization).toBe("Bearer vendor-token-value");
+        expect(url.searchParams.get("limit")).toBe("20");
+        sendJson(res, {
+          releaseRequests: [{
+            id: 42,
+            status: "pending",
+            submittedAt: "2026-06-11T00:00:00.000Z",
+            sellerCount: 1,
+            note: "fixture release"
+          }]
+        });
+        return;
+      }
+      res.statusCode = 404;
+      sendJson(res, { error: "not found" });
+    });
+    await new Promise<void>((resolve) => registry.listen(0, "127.0.0.1", () => resolve()));
+    const address = registry.address();
+    if (!address || typeof address !== "object") {
+      throw new Error("registry fixture did not bind a TCP port");
+    }
+
+    const mgr = new ConfigManager(TEMP_CONF_PATH);
+    mgr.setProfile("bootstrap", { url: `http://127.0.0.1:${address.port}`, token: "vendor-token-value" });
+    const started = await startAdminUiServer({
+      host: "127.0.0.1",
+      port: 0,
+      openBrowser: false,
+      configManager: mgr,
+      profile: "bootstrap"
+    });
+    try {
+      const response = await fetch(`${started.url}api/vendor/release-requests`);
+      expect(response.status).toBe(200);
+      await expect(response.json()).resolves.toMatchObject({
+        releaseRequests: [{ id: 42, status: "pending", note: "fixture release" }]
+      });
+    } finally {
+      await new Promise<void>((resolve) => started.server.close(() => resolve()));
+      await new Promise<void>((resolve) => registry.close(() => resolve()));
+    }
+  });
+
   test("tb-admin ui create seller returns a progress job", async () => {
     const mgr = new ConfigManager(TEMP_CONF_PATH);
     mgr.setSellerProvider("fly", { operator_secret: "operator-token-value" });
@@ -512,6 +571,14 @@ describe("Admin CLI Config Profile Management Tests", () => {
       const state = new AdminUiState({
         configManager: mgr,
         profile: "bootstrap",
+        // Step 13 v1.1: 双源. fixture seller tbs-sin-06 在 fly + registry
+        // 都有, dataSource=both, 走老 4-endpoint merge 路径.
+        flyApps: async () => [{
+          name: "tbs-sin-06",
+          status: "running",
+          owner: "vendor-a",
+          raw: {}
+        }],
         balanceFetch: async (url, init) => {
           expect(String(url)).toBe("https://openrouter.ai/api/v1/credits");
           expect((init?.headers as Record<string, string>)?.Authorization).toBe("Bearer fixture-live-key-27f9");
@@ -550,7 +617,7 @@ describe("Admin CLI Config Profile Management Tests", () => {
     } finally {
       await fixture.close();
     }
-  });
+  }, ADMIN_UI_STATE_TEST_TIMEOUT_MS);
 
   test("AdminUiState uses Fly provider operator secret for registry sellers without local profiles", async () => {
     const mgr = new ConfigManager(TEMP_CONF_PATH);
@@ -558,6 +625,14 @@ describe("Admin CLI Config Profile Management Tests", () => {
     const state = new AdminUiState({
       configManager: mgr,
       url: "https://bootstrap.example.test",
+      // Step 13 v1.1: 双源. fixture seller tbs-openrouter-ai-qecae 在 fly + registry
+      // 都有, dataSource=both, 走老 4-endpoint merge (用 Fly provider secret).
+      flyApps: async () => [{
+        name: "tbs-openrouter-ai-qecae",
+        status: "running",
+        owner: "vendor-a",
+        raw: {}
+      }],
       fetchJson: async (url, init) => {
         const pathName = new URL(url).pathname;
         if (pathName === "/registry/sellers") {
@@ -567,7 +642,10 @@ describe("Admin CLI Config Profile Management Tests", () => {
               id: "tbs-openrouter-ai-qecae",
               name: "tbs-openrouter-ai-qecae",
               app: "tbs-openrouter-ai-qecae",
-              url: "https://tbs-openrouter-ai-qecae.fly.dev",
+              // Step 13 v1.1: 双源下, 4 个老 endpoint 也用 entry.url. 测试
+              // 故意用 bootstrap URL, 这样 mock fetchJson 能 catch 全部 4 个
+              // fetch (manifest probe 仍走 entry.url, 404 时 fallback 走 4-endpoint).
+              url: "https://bootstrap.example.test",
               status: "active",
               region: "sin",
               modelsCount: 2,
@@ -623,7 +701,7 @@ describe("Admin CLI Config Profile Management Tests", () => {
     expect(detail.configuration.upstreamUrl).toBe("https://openrouter.ai/api");
     expect(detail.configuration.upstreamApiKeyMasked).toBe("**** **** **** abcd");
     expect(detail.models.map((model) => model.upstreamModel)).toEqual(["openai/gpt-5.4", "anthropic/claude-opus-4.7"]);
-  });
+  }, ADMIN_UI_STATE_TEST_TIMEOUT_MS);
 
   test("UiActions updates new registry seller config without a local profile", async () => {
     const mgr = new ConfigManager(TEMP_CONF_PATH);

package/tests/seller.test.ts

@@ -0,0 +1,337 @@
+/**
+ * Step 12 v1.1: tb-admin seller 子命令真实 CLI 测试.
+ *
+ * 原则: 不 mock. 全部跑真 `tb-admin` CLI (它内部调真 flyctl). 通过 --dry-run 模式
+ * 避免真改 fly 资源.
+ *
+ * 覆盖:
+ *   - ls/status/create/deploy/remove 5 op 都有 文本路径 + --json 路径
+ *   - --json 输出可被 JSON.parse
+ *   - 文本路径不破坏 1.0.31 行为 (跟 flyctl 原始 stdout 一致)
+ *   - dry-run 模式返回 commands 数组
+ *
+ * 依赖:
+ *   - 真 flyctl 在 PATH (本机已装 v0.4.53)
+ *   - tb-admin CLI 是 source-built 1:1 (跟 git checkout 一致), bin/tb-admin.js 可执行
+ *
+ * 失败模式:
+ *   - 没装 flyctl: 大部分 test skip (it.skip / describe.skip)
+ *   - 没 token: 1.0.31 行为不变, CLI 仍然跑 flyctl, 但 flyctl 鉴权失败的部分不影响 dry-run
+ */
+
+import { execFileSync } from "node:child_process";
+import { existsSync, mkdtempSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { ConfigManager } from "../src/config.js";
+import { SellerCommandRunner, parseFlyListJson, parseFlyStatusJson } from "../src/seller.js";
+import { FlyProvider, type FlyProviderRuntime } from "../src/server-cmd.js";
+
+const TB_ADMIN_BIN = join(__dirname, "..", "bin", "tb-admin.js");
+const FLYCTL = "flyctl";
+const RUN_LIVE_FLY_TESTS = process.env.TOKENBUDDY_ADMIN_LIVE_FLY_TESTS === "1";
+
+function flyctlInstalled(): boolean {
+  try {
+    execFileSync("which", [FLYCTL], { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function makeEmptyConfigManager(): ConfigManager {
+  const dir = mkdtempSync(join(tmpdir(), "tb-admin-test-"));
+  return new ConfigManager(join(dir, "admin.toml"));
+}
+
+function makeMissingFlyctlConfigManager(): ConfigManager {
+  const manager = makeEmptyConfigManager();
+  manager.setSellerProvider("fly", { flyctl_path: "/tmp/tokenbuddy-missing-flyctl" });
+  return manager;
+}
+
+function tbAdminBinInstalled(): boolean {
+  return existsSync(TB_ADMIN_BIN);
+}
+
+function runTbAdminReal(args: string[]): { ok: boolean; stdout: string; stderr: string } {
+  try {
+    const stdout = execFileSync("node", [TB_ADMIN_BIN, ...args], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
+      env: { ...process.env, NO_COLOR: "1" }
+    });
+    return { ok: true, stdout, stderr: "" };
+  } catch (err) {
+    const e = err as { stdout?: Buffer | string; stderr?: Buffer | string };
+    return {
+      ok: false,
+      stdout: typeof e.stdout === "string" ? e.stdout : e.stdout ? e.stdout.toString() : "",
+      stderr: typeof e.stderr === "string" ? e.stderr : e.stderr ? e.stderr.toString() : ""
+    };
+  }
+}
+
+describe("seller parser helpers (pure, no IO)", () => {
+  test("parseFlyListJson normalizes flyctl apps list --json", () => {
+    const jsonText = JSON.stringify([
+      { Name: "tbs-aaa", Status: "deployed", Owner: "personal", Version: 7, Deployed: true },
+      { Name: "tbs-bbb", Status: "suspended", Owner: "personal", Version: 7, Deployed: false }
+    ]);
+    const apps = parseFlyListJson(jsonText);
+    expect(apps).toHaveLength(2);
+    expect(apps[0].name).toBe("tbs-aaa");
+    expect(apps[0].status).toBe("deployed");
+    expect(apps[1].status).toBe("suspended");
+    expect(apps[0].raw).toMatchObject({ Name: "tbs-aaa" });
+  });
+
+  test("parseFlyListJson throws on invalid JSON", () => {
+    expect(() => parseFlyListJson("not-json")).toThrow(/invalid JSON/);
+  });
+
+  test("parseFlyListJson throws on non-array", () => {
+    expect(() => parseFlyListJson('{"foo":"bar"}')).toThrow(/did not return an array/);
+  });
+
+  test("parseFlyStatusJson parses single app status", () => {
+    const jsonText = JSON.stringify({ Name: "tbs-aaa", Status: "deployed", Deployed: true });
+    const status = parseFlyStatusJson(jsonText);
+    expect(status).toMatchObject({ Name: "tbs-aaa" });
+  });
+
+  test("parseFlyStatusJson throws on array input", () => {
+    expect(() => parseFlyStatusJson("[]")).toThrow(/did not return an object/);
+  });
+});
+
+describe("tb-admin seller CLI real spawn (no mock)", () => {
+  // 没用 beforeAll: 一些 jest sandbox 下 beforeAll 抛错会让整个 describe fail.
+  // 每个 test 进来时现场探测.
+  const itRequires = (name: string, fn: () => void | Promise<void>) => {
+    test(name, async () => {
+      if (!RUN_LIVE_FLY_TESTS) {
+        console.warn(`[skipped] ${name}: set TOKENBUDDY_ADMIN_LIVE_FLY_TESTS=1 to run live Fly.io checks`);
+        return;
+      }
+      const hasFlyctl = flyctlInstalled();
+      const hasBin = tbAdminBinInstalled();
+      if (!hasFlyctl || !hasBin) {
+        const reason = !hasFlyctl ? "flyctl not in PATH" : "tb-admin bin not built";
+        console.warn(`[skipped] ${name}: ${reason}`);
+        return;
+      }
+      await fn();
+    });
+  };
+
+  itRequires("ls text path returns flyctl human-readable table (1.0.31 behavior preserved)", () => {
+    const result = runTbAdminReal(["seller", "ls"]);
+    expect(result.ok).toBe(true);
+    // flyctl apps list 文本输出有 "│" 列分隔符
+    expect(result.stdout).toMatch(/│/);
+    expect(result.stdout).toMatch(/STATUS/);
+  });
+
+  itRequires("ls --json returns valid JSON object with ok, provider, action, count, apps[]", () => {
+    const result = runTbAdminReal(["seller", "ls", "--json"]);
+    expect(result.ok).toBe(true);
+    const parsed = JSON.parse(result.stdout);
+    expect(parsed).toMatchObject({ ok: true, provider: "fly", action: "list" });
+    expect(typeof parsed.count).toBe("number");
+    expect(Array.isArray(parsed.apps)).toBe(true);
+    expect(parsed.apps.length).toBe(parsed.count);
+    if (parsed.apps.length > 0) {
+      expect(parsed.apps[0]).toHaveProperty("name");
+      expect(parsed.apps[0]).toHaveProperty("status");
+      expect(parsed.apps[0]).toHaveProperty("raw");
+    }
+  });
+
+  itRequires("status --json returns valid JSON object with ok, provider, action, app, status{}", () => {
+    // 用 live 真实存在的 tbs-86d81e app (1.0.31 live)
+    const result = runTbAdminReal(["seller", "status", "tbs-86d81e", "--json"]);
+    expect(result.ok).toBe(true);
+    const parsed = JSON.parse(result.stdout);
+    expect(parsed).toMatchObject({
+      ok: true,
+      provider: "fly",
+      action: "status",
+      app: "tbs-86d81e"
+    });
+    expect(parsed.status).toBeDefined();
+    expect(typeof parsed.status).toBe("object");
+  });
+
+  itRequires("create --json --dry-run returns commands array, no real flyctl effect", () => {
+    const result = runTbAdminReal([
+      "seller", "create", "test-dry-run-app",
+      "--image", "registry.fly.io/tb-seller:1.0.31",
+      "--fly-config", "deploy/fly.io/fly.tb-seller.toml",
+      "--operator-secret", "test-secret",
+      "--region", "sin",
+      "--dry-run", "--json"
+    ]);
+    expect(result.ok).toBe(true);
+    const parsed = JSON.parse(result.stdout);
+    expect(parsed).toMatchObject({
+      ok: true,
+      provider: "fly",
+      action: "create",
+      dryRun: true
+    });
+    expect(Array.isArray(parsed.commands)).toBe(true);
+    expect(parsed.commands.length).toBeGreaterThan(0);
+    // 包含 fly deploy + fly machine update 命令
+    const allCommands = parsed.commands.join(" ");
+    expect(allCommands).toMatch(/tb-seller/);
+  });
+
+  itRequires("deploy --json --dry-run returns single machine update command", () => {
+    const result = runTbAdminReal([
+      "seller", "deploy", "tbs-86d81e",
+      "--image", "registry.fly.io/tb-seller:1.0.31",
+      "--dry-run", "--json"
+    ]);
+    expect(result.ok).toBe(true);
+    const parsed = JSON.parse(result.stdout);
+    expect(parsed).toMatchObject({
+      ok: true,
+      provider: "fly",
+      action: "deploy",
+      app: "tbs-86d81e",
+      dryRun: true
+    });
+    expect(parsed.commands[0]).toContain("machine update");
+    expect(parsed.commands[0]).toContain("tbs-86d81e");
+  });
+
+  itRequires("remove --json --dry-run returns apps destroy command", () => {
+    const result = runTbAdminReal([
+      "seller", "remove", "tbs-86d81e",
+      "--dry-run", "--json"
+    ]);
+    expect(result.ok).toBe(true);
+    const parsed = JSON.parse(result.stdout);
+    expect(parsed).toMatchObject({
+      ok: true,
+      provider: "fly",
+      action: "remove",
+      dryRun: true
+    });
+    expect(parsed.commands[0]).toContain("apps destroy tbs-86d81e");
+  });
+});
+
+describe("SellerCommandRunner integration with real ConfigManager (no mock)", () => {
+  // 验证 Runner 行为通过真 ConfigManager 拉真 config (有 token, 装好 flyctl 的环境)
+  function tryRealConfigManager(): ConfigManager | null {
+    const home = process.env.HOME || "";
+    const adminToml = join(home, ".config", "tokenbuddy", "admin.toml");
+    if (!existsSync(adminToml)) {
+      return null;
+    }
+    return new ConfigManager(adminToml);
+  }
+
+  test("ls(false) returns flyctl stdout string via real FlyProvider (no mock)", () => {
+    if (!RUN_LIVE_FLY_TESTS) {
+      const runner = new SellerCommandRunner(makeMissingFlyctlConfigManager());
+      expect(() => runner.ls(false)).toThrow(/flyctl|not installed|seller_providers/);
+      return;
+    }
+    const mgr = tryRealConfigManager();
+    if (!mgr) {
+      // 环境无 admin profile, 用空 ConfigManager 走 fallback
+      const tmp = makeEmptyConfigManager();
+      const runner = new SellerCommandRunner(tmp);
+      // 没有 provider config -> 走 FlyProvider -> flyctl not installed (test env) -> throw
+      try {
+        runner.ls(false);
+        throw new Error("expected flyctl-not-installed error");
+      } catch (err) {
+        expect((err as Error).message).toMatch(/flyctl|not installed|seller_providers/);
+      }
+      return;
+    }
+    const runner = new SellerCommandRunner(mgr);
+    const out = runner.ls(false);
+    expect(typeof out).toBe("string");
+    expect(out).toMatch(/│/);
+  });
+});
+
+describe("FlyProvider dry-run paths (no mock, real flyctl required)", () => {
+  // 1.0.31 行为 1:1 验证: FlyProvider 已有方法的 dry-run 模式不调 flyctl 真子命令,
+  // 只输出 plan. 这是 FlyProvider 的核心契约.
+
+  function makeRealProvider(): FlyProvider | null {
+    if (!RUN_LIVE_FLY_TESTS) {
+      return new FlyProvider({
+        default_region: "sin",
+        operator_secret: "test-secret",
+        volume_name: "tb_seller_data",
+        volume_size_gb: 1
+      });
+    }
+    const home = process.env.HOME || "";
+    const adminToml = join(home, ".config", "tokenbuddy", "admin.toml");
+    if (!existsSync(adminToml)) {
+      return null;
+    }
+    const mgr = new ConfigManager(adminToml);
+    const cfg = mgr.getSellerProvider("fly");
+    if (!cfg) {
+      return null;
+    }
+    // 1.0.31 FlyProvider 接口 1:1 行为验证, runtime 走真值
+    const runtime: Partial<FlyProviderRuntime> = {};
+    return new FlyProvider(cfg, runtime);
+  }
+
+  test("createSeller dry-run returns plan string without calling flyctl", () => {
+    const provider = makeRealProvider();
+    if (!provider) {
+      // 没 admin profile -> skip
+      return;
+    }
+    const plan = provider.createSeller({
+      name: "alpha",
+      region: "sin",
+      image: "registry.fly.io/tb-seller:1.0.31",
+      operatorSecret: "secret",
+      flyConfig: "deploy/fly.io/fly.tb-seller.toml",
+      volumeName: "tb_seller_data",
+      volumeSizeGb: 1,
+      dryRun: true
+    });
+    expect(plan).toMatch(/DRY-RUN/);
+    expect(plan).toContain("tb-seller-alpha");
+    expect(plan).toContain("registry.fly.io/tb-seller:1.0.31");
+  });
+
+  test("deploySeller dry-run returns plan string without calling flyctl", () => {
+    const provider = makeRealProvider();
+    if (!provider) {
+      return;
+    }
+    const plan = provider.deploySeller({
+      app: "tbs-86d81e",
+      image: "registry.fly.io/tb-seller:1.0.31",
+      dryRun: true
+    });
+    expect(plan).toMatch(/DRY-RUN/);
+    expect(plan).toContain("tbs-86d81e");
+  });
+
+  test("removeSeller dry-run returns plan string without calling flyctl", () => {
+    const provider = makeRealProvider();
+    if (!provider) {
+      return;
+    }
+    const plan = provider.removeSeller("tbs-86d81e", true);
+    expect(plan).toMatch(/DRY-RUN/);
+    expect(plan).toContain("tbs-86d81e");
+  });
+});