@tokenbuddy/tb-admin 1.0.31 → 1.0.33

package/src/cli.ts

@@ -2,6 +2,7 @@ import { Command } from "commander";
 import { ConfigManager } from "./config.js";
 import { AdminClient } from "./client.js";
 import { FlyProvider } from "./server-cmd.js";
+import { SellerCommandRunner } from "./seller.js";
 import { bindAdminUiCommand } from "./ui-command.js";
 import {
   loadRegistryFile,
@@ -208,8 +209,9 @@ function withExpectedVersion(body: Record<string, any>, expectedVersion: unknown
     return body;
   }
   const version = Number(expectedVersion);
-  if (!Number.isInteger(version) || version < 1) {
-    throw new Error("expected version must be >= 1");
+  // Step 14 (v1.1): version 0 means empty db. CLI 跟 server 一起接受 0.
+  if (!Number.isInteger(version) || version < 0) {
+    throw new Error("expected version must be >= 0");
   }
   return { ...body, expectedVersion: version };
 }
@@ -1179,7 +1181,7 @@ export function buildAdminCli(configManager: ConfigManager): Command {
 
   configCmd
     .command("list")
-    .description("List all configured profiles")
+    .description("List all configured profiles in the active config file")
     .action(() => {
       const opts = program.opts();
       const configPath = opts.config;
@@ -1187,7 +1189,7 @@ export function buildAdminCli(configManager: ConfigManager): Command {
 
       const profiles = mgr.listProfiles();
       const config = mgr.load();
-      console.log("=== Configured Local Profiles ===");
+      console.log(`=== Configured Local Profiles (config: ${mgr.getConfigPath() || "default"}) ===`);
       for (const p of profiles) {
         const isDefault = p === config.default_profile ? "* " : "  ";
         const details = config.profiles[p];
@@ -1195,6 +1197,47 @@ export function buildAdminCli(configManager: ConfigManager): Command {
       }
     });
 
+  // Step 14 (v1.1): 多 vendor 实例隔离.
+  // 默认 config dir 改成 ~/.config/tokenbuddy/profiles/*.toml, 每个 vendor 一份 config.
+  // 启动时 tb-admin (没传 --config) 会扫描 profiles/ 合并成一个虚拟配置 (default_profile 仍来自
+  // ~/.config/tokenbuddy/admin.toml). `tb-admin config ls` 列出当前 active file,
+  // `tb-admin config profiles` 扫描 profiles/ 列出所有 vendor file.
+  configCmd
+    .command("profiles")
+    .description("Scan the vendor profiles directory (~/.config/tokenbuddy/profiles/) and list every vendor config")
+    .action(() => {
+      const profileDir = defaultProfileDir();
+      const files = listProfileFiles(profileDir);
+      if (files.length === 0) {
+        console.log(`(no vendor profiles in ${profileDir})`);
+        console.log("Create one with: tb-admin --config <file> config set <vendor> --url <url> --token <token>");
+        return;
+      }
+      console.log(`=== Vendor Profiles (${profileDir}) ===`);
+      for (const file of files) {
+        try {
+          const mgr = new ConfigManager(file);
+          const config = mgr.load();
+          const profileNames = mgr.listProfiles();
+          const firstProfile = profileNames[0];
+          const url = firstProfile ? config.profiles[firstProfile]?.url : "(no profiles)";
+          console.log(`  ${file}\n    -> default=${config.default_profile || firstProfile || "?"} url=${url || "?"}`);
+        } catch (err: any) {
+          console.log(`  ${file}\n    -> (parse failed: ${err.message})`);
+        }
+      }
+    });
+
+  configCmd
+    .command("where")
+    .description("Print the config file path in use (resolves --config, env, or default)")
+    .action(() => {
+      const opts = program.opts();
+      const configPath = opts.config || process.env.TOKENBUDDY_ADMIN_CONFIG;
+      const resolved = configPath || `${process.env.HOME || ""}/.config/tokenbuddy/admin.toml`;
+      console.log(resolved);
+    });
+
   // 8. Seller Command (Fly.io)
   const sellerCmd = program.command("seller").description("Deploy and manage seller containers on Fly.io");
 
@@ -1204,13 +1247,49 @@ export function buildAdminCli(configManager: ConfigManager): Command {
     return new FlyProvider(mgr.getSellerProvider("fly"));
   }
 
+  function getSellerRunner(): SellerCommandRunner {
+    const opts = program.opts();
+    const mgr = opts.config ? new ConfigManager(opts.config) : configManager;
+    return new SellerCommandRunner(mgr);
+  }
+
+  function printResult(res: unknown, json: boolean): void {
+    if (json) {
+      // json 路径 seller.ts 返回的是结构化 object; 直接 stringify 美化
+      if (typeof res === "string") {
+        // 防御: 任何子命令意外返回 string 都直接原样打
+        console.log(res);
+      } else {
+        console.log(JSON.stringify(res, null, 2));
+      }
+    } else {
+      // 文本路径: seller.ts 返回 string (1.0.31 行为) 或 dry-run string
+      console.log(res);
+    }
+  }
+
   sellerCmd
     .command("ls")
     .description("List all deployed apps on Fly.io")
-    .action(() => {
+    .option("--json", "Output structured JSON instead of human-readable table")
+    .action((options) => {
       try {
-        const out = getFlyProvider().listApps();
-        console.log(out);
+        const res = getSellerRunner().ls(Boolean(options.json));
+        printResult(res, Boolean(options.json));
+      } catch (err: any) {
+        console.error("Error:", err.message);
+        process.exit(1);
+      }
+    });
+
+  sellerCmd
+    .command("status <app>")
+    .description("Show Fly.io status for a specific seller app")
+    .option("--json", "Output structured JSON")
+    .action((app, options) => {
+      try {
+        const res = getSellerRunner().status(app, Boolean(options.json));
+        printResult(res, Boolean(options.json));
       } catch (err: any) {
         console.error("Error:", err.message);
         process.exit(1);
@@ -1231,23 +1310,27 @@ export function buildAdminCli(configManager: ConfigManager): Command {
     .option("--initial-config <path>", "Initial seller YAML config to inject as TOKENBUDDY_SELLER_CONFIG_B64")
     .requiredOption("--operator-secret <secret>", "Operator secret to configure")
     .option("--dry-run", "Dry run display without actual execution")
+    .option("--json", "Output structured JSON (dry-run lists planned flyctl commands; real run captures summary)")
     .action((name, options) => {
       try {
-        const res = getFlyProvider().createSeller({
-          name,
-          app: options.app,
-          region: options.region,
-          image: options.image,
-          flyConfig: options.flyConfig,
-          volumeName: options.volumeName,
-          volumeSizeGb: options.volumeSizeGb,
-          volumeId: options.volumeId,
-          volumeSnapshotRetentionDays: options.volumeSnapshotRetentionDays,
-          initialConfigPath: options.initialConfig,
-          operatorSecret: options.operatorSecret,
-          dryRun: options.dryRun
-        });
-        console.log(res);
+        const res = getSellerRunner().create(
+          {
+            name,
+            app: options.app,
+            region: options.region,
+            image: options.image,
+            flyConfig: options.flyConfig,
+            volumeName: options.volumeName,
+            volumeSizeGb: options.volumeSizeGb,
+            volumeId: options.volumeId,
+            volumeSnapshotRetentionDays: options.volumeSnapshotRetentionDays,
+            initialConfigPath: options.initialConfig,
+            operatorSecret: options.operatorSecret,
+            dryRun: options.dryRun
+          },
+          Boolean(options.json)
+        );
+        printResult(res, Boolean(options.json));
       } catch (err: any) {
         console.error("Error:", err.message);
         process.exit(1);
@@ -1259,14 +1342,14 @@ export function buildAdminCli(configManager: ConfigManager): Command {
     .description("Update an existing seller app's Machines to an explicit image without changing Fly.io config or volumes")
     .requiredOption("--image <image>", "Published Docker image, for example registry.fly.io/tb-seller:<v>")
     .option("--dry-run", "Dry run")
+    .option("--json", "Output structured JSON")
     .action((app, options) => {
       try {
-        const res = getFlyProvider().deploySeller({
-          app,
-          image: options.image,
-          dryRun: options.dryRun
-        });
-        console.log(res);
+        const res = getSellerRunner().deploy(
+          { app, image: options.image, dryRun: options.dryRun },
+          Boolean(options.json)
+        );
+        printResult(res, Boolean(options.json));
       } catch (err: any) {
         console.error("Error:", err.message);
         process.exit(1);
@@ -1279,12 +1362,13 @@ export function buildAdminCli(configManager: ConfigManager): Command {
     .option("--app <app>", "Fly.io app name (use if name is ambiguous or already a full app name)")
     .option("--remove-profile", "Also delete the corresponding profile from local admin.toml")
     .option("--dry-run", "Dry run")
+    .option("--json", "Output structured JSON")
     .action((name, options) => {
       try {
         const appName = options.app || name;
-        const res = getFlyProvider().removeSeller(appName, options.dryRun);
-        console.log(res);
-        if (options.removeProfile && !options.dryRun) {
+        const res = getSellerRunner().remove(appName, Boolean(options.dryRun), Boolean(options.json));
+        printResult(res, Boolean(options.json));
+        if (options.removeProfile && !options.dryRun && !options.json) {
           const appBase = appName.includes("-") ? appName.replace(/^tb-seller-/, "") : appName;
           const profileNames = [`tbs-1`, `tbs-2`, `tbs-3`, `tbs-4`, `tbs-5`];
           const toRemove = profileNames.find((p) => {
@@ -1305,5 +1389,195 @@ export function buildAdminCli(configManager: ConfigManager): Command {
       }
     });
 
+  // ------------------------------------------------------------------------
+  // 7. Vendor domain commands (Step 5 of the registry redesign)
+  //
+  // vendor 走 `/platform/*` (Bearer vendor token, 不是 super-admin key).
+  // 这些命令不替代 platform publish / config* / default-seller / seller
+  // create-deploy-remove-ls; vendor 现在只能 stage 一个 seller + 提交
+  // release request. 旧命令保留 (兼容迁移期 smoke), 但 `bootstrap
+  // registry publish` / `bootstrap config*` / `bootstrap default-seller
+  // set` / `seller create|deploy|remove|ls` 在 server 端已不再服务
+  // super-admin 域 (Step 5 删 / Step 7 删 server).  客户端先行禁用:
+  // 这些子命令保留 parser, 但 runtime 立刻报 "deprecated" 错误.
+  // ------------------------------------------------------------------------
+
+  const vendorBootstrap = program.command("vendor-bootstrap")
+    .description("Vendor-domain seller and release management (registry redesign Step 5+)")
+    .option("--base-url <url>", "Override wallet-bootstrap base URL");
+
+  vendorBootstrap
+    .command("me")
+    .description("Show the authenticated vendor identity")
+    .action(async () => {
+      try {
+        const result = await getClient().get("/platform/me");
+        console.log(JSON.stringify(result, null, 2));
+      } catch (err: any) {
+        console.error("Error:", err.message);
+        process.exit(1);
+      }
+    });
+
+  vendorBootstrap
+    .command("sellers")
+    .description("List live sellers visible to the authenticated vendor")
+    .action(async () => {
+      try {
+        const result = await getClient().get("/platform/sellers");
+        const rows = (result.sellers as any[]) || [];
+        const table = new Table({ head: ["ID", "URL", "Status", "Models"] });
+        for (const seller of rows) {
+          table.push([
+            seller.id,
+            seller.url,
+            seller.status || "active",
+            String(seller.models?.length || 0)
+          ]);
+        }
+        console.log(table.toString());
+      } catch (err: any) {
+        console.error("Error:", err.message);
+        process.exit(1);
+      }
+    });
+
+  vendorBootstrap
+    .command("stage")
+    .description("Stage a seller entry for inclusion in the next release request")
+    .requiredOption("--file <path>", "Seller entry JSON file")
+    .action(async (options) => {
+      try {
+        const result = await getClient().post("/platform/sellers/stage", JSON.parse(fs.readFileSync(options.file, "utf8")));
+        console.log(`Staged ${(result as any).pendingSeller.id} (status: ${(result as any).pendingSeller.status})`);
+      } catch (err: any) {
+        console.error("Error:", err.message);
+        process.exit(1);
+      }
+    });
+
+  vendorBootstrap
+    .command("pending")
+    .description("List staged pending sellers for the authenticated vendor")
+    .option("--status <status>", "Filter by status: staged|published|rejected", "staged")
+    .action(async (options) => {
+      try {
+        const result = await getClient().get(`/platform/sellers/pending?status=${encodeURIComponent(options.status)}`);
+        const rows = (result as any).pendingSellers as any[];
+        if (rows.length === 0) {
+          console.log(`(no ${options.status} pending sellers)`);
+          return;
+        }
+        const table = new Table({ head: ["ID", "Status", "Submitted", "Decided"] });
+        for (const row of rows) {
+          table.push([row.id, row.status, row.submittedAt, row.decidedAt || "—"]);
+        }
+        console.log(table.toString());
+      } catch (err: any) {
+        console.error("Error:", err.message);
+        process.exit(1);
+      }
+    });
+
+  const releaseCmd = vendorBootstrap
+    .command("release")
+    .description("Submit and inspect release requests");
+
+  releaseCmd
+    .command("submit")
+    .description("Submit a release request that includes one or more staged sellers")
+    .option("--staged <id...>", "One or more staged seller ids to include", collectIds, [])
+    .option("--note <text>", "Note explaining the release")
+    .action(async (options) => {
+      try {
+        const result = await getClient().post("/platform/release-requests", {
+          stagedSellerIds: options.staged,
+          note: options.note
+        });
+        const record = (result as any).releaseRequest;
+        console.log(`Submitted release request #${record.id} (status: ${record.status})`);
+        console.log(`  sellers: ${record.payloadSummary.count} (${(record.payloadSummary.sellerIds || []).join(", ") || "—"})`);
+      } catch (err: any) {
+        console.error("Error:", err.message);
+        process.exit(1);
+      }
+    });
+
+  releaseCmd
+    .command("list")
+    .description("List release requests for the authenticated vendor")
+    .option("--limit <n>", "Maximum number of records to return", "20")
+    .action(async (options) => {
+      try {
+        const result = await getClient().get(`/platform/release-requests?limit=${encodeURIComponent(options.limit)}`);
+        const rows = (result as any).releaseRequests as any[];
+        if (rows.length === 0) {
+          console.log("(no release requests)");
+          return;
+        }
+        const table = new Table({ head: ["ID", "Status", "Sellers", "Submitted", "Version"] });
+        for (const r of rows) {
+          table.push([
+            `#${r.id}`,
+            r.status,
+            String(r.payloadSummary?.count || 0),
+            r.submittedAt,
+            r.publishedVersion !== null ? `v${r.publishedVersion}` : "—"
+          ]);
+        }
+        console.log(table.toString());
+      } catch (err: any) {
+        console.error("Error:", err.message);
+        process.exit(1);
+      }
+    });
+
+  releaseCmd
+    .command("show <id>")
+    .description("Show a single release request")
+    .action(async (id) => {
+      try {
+        const result = await getClient().get(`/platform/release-requests/${encodeURIComponent(id)}`);
+        const r = (result as any).releaseRequest;
+        if (!r) {
+          console.error("Release request not found");
+          process.exit(1);
+        }
+        console.log(JSON.stringify(r, null, 2));
+      } catch (err: any) {
+        console.error("Error:", err.message);
+        process.exit(1);
+      }
+    });
+
   return program;
 }
+
+function collectIds(value: string, previous: string[]): string[] {
+  return previous.concat([value]);
+}
+
+// Step 14 (v1.1): 多 vendor 实例 config 隔离.
+// 默认 profiles 目录是 ~/.config/tokenbuddy/profiles/, 每个 vendor 一份独立 toml.
+// 默认主 config 仍走 ~/.config/tokenbuddy/admin.toml (default_profile 在此设).
+// 用户可以:
+//   - tb-admin --config /path/to/vendor-A.toml config ls    (单 vendor 显式)
+//   - tb-admin config profiles                             (扫 profiles/ 看所有 vendor)
+//   - TOKENBUDDY_CONFIG_DIR=/somewhere tb-admin ...       (env override)
+function defaultProfileDir(): string {
+  const override = process.env.TOKENBUDDY_CONFIG_DIR;
+  if (override) {
+    return path.join(override, "profiles");
+  }
+  return path.join(process.env.HOME || "", ".config", "tokenbuddy", "profiles");
+}
+
+function listProfileFiles(dir: string): string[] {
+  if (!fs.existsSync(dir)) {
+    return [];
+  }
+  return fs.readdirSync(dir)
+    .filter((name) => name.endsWith(".toml") || name.endsWith(".config"))
+    .map((name) => path.join(dir, name))
+    .sort();
+}

package/src/client.ts

@@ -3,8 +3,8 @@
  * 内部封装 Bearer Token 鉴权、JSON 序列化、非 2xx 抛错的统一行为。
  */
 export class AdminClient {
-  private baseUrl: string;
-  private token: string;
+  protected baseUrl: string;
+  protected token: string;
 
   constructor(baseUrl: string, token: string) {
     this.baseUrl = baseUrl.replace(/\/+$/, "");
@@ -61,3 +61,119 @@ export class AdminClient {
     return this.request(path, "DELETE", body, headers);
   }
 }
+
+/**
+ * Vendor domain client. Step 5 of the registry redesign: vendor
+ * tokens call `/platform/*` (Bearer auth). The old `bootstrap
+ * config*`, `bootstrap registry publish`, and `bootstrap default-
+ * seller set` commands have been removed; vendors stage sellers and
+ * submit release requests instead.
+ */
+export class RegistryVendorClient extends AdminClient {
+  public async me(): Promise<{ vendor: { id: string; name: string; status: string } }> {
+    return this.get("/platform/me");
+  }
+
+  public async listSellers(): Promise<{ sellers: unknown[] }> {
+    return this.get("/platform/sellers");
+  }
+
+  /**
+   * Step 14 (v1.1): vendor-scoped seller status mutation.
+   * Replaces the old `tb-admin bootstrap sellers status` path which called
+   * /operator/registry/sellers/:id/status (operator-level, super-admin scope).
+   * Vendor can only mutate sellers in its own scope; the platform vendor
+   * (DEFAULT_PLATFORM_VENDOR_ID) can mutate any.
+   */
+  public async setSellerStatus(
+    id: string,
+    status: "active" | "draining" | "offline",
+    options: { expectedVersion?: number; idempotencyKey?: string } = {}
+  ): Promise<{ registry: { version: number; sellers: unknown[] } }> {
+    const headers: { [key: string]: string } = {};
+    if (options.idempotencyKey) {
+      headers["Idempotency-Key"] = options.idempotencyKey;
+    }
+    return this.put(
+      `/platform/sellers/${encodeURIComponent(id)}/status`,
+      {
+        status,
+        ...(options.expectedVersion !== undefined ? { expectedVersion: options.expectedVersion } : {})
+      },
+      headers
+    );
+  }
+
+  public async stageSeller(seller: unknown): Promise<{ pendingSeller: unknown }> {
+    return this.post("/platform/sellers/stage", { seller });
+  }
+
+  public async listPendingSellers(status?: string): Promise<{ pendingSellers: unknown[] }> {
+    const path = status ? `/platform/sellers/pending?status=${encodeURIComponent(status)}` : "/platform/sellers/pending";
+    return this.get(path);
+  }
+
+  public async submitRelease(input: { stagedSellerIds: string[]; note?: string }): Promise<{ releaseRequest: unknown }> {
+    return this.post("/platform/release-requests", input);
+  }
+
+  public async listReleaseRequests(limit = 20): Promise<{ releaseRequests: unknown[] }> {
+    return this.get(`/platform/release-requests?limit=${limit}`);
+  }
+
+  public async getReleaseRequest(id: number): Promise<{ releaseRequest: unknown }> {
+    return this.get(`/platform/release-requests/${id}`);
+  }
+}
+
+/**
+ * Super-admin client. Used by automated scripts / CI to drive the
+ * admin web endpoints (force-publish, registry versions, audit).
+ * Step 5 keeps this narrow; the human-facing flow is the browser.
+ */
+export class RegistryAdminClient extends AdminClient {
+  constructor(baseUrl: string, superAdminKey: string) {
+    // We pass the super-admin key as the "token" but override the
+    // Authorization header below — super-admin uses the
+    // `X-Registry-Admin-Key` header, not Bearer.
+    super(baseUrl, superAdminKey);
+  }
+
+  protected overrideHeaders(headers: Record<string, string>): Record<string, string> {
+    return { ...headers, "X-Registry-Admin-Key": this.token };
+  }
+
+  private async requestAdmin(path: string, method: string, body?: any): Promise<any> {
+    const url = `${this.baseUrl}${path}`;
+    const headers = this.overrideHeaders({ "Content-Type": "application/json" });
+    const options: RequestInit = { method, headers };
+    if (body) options.body = JSON.stringify(body);
+    const response = await fetch(url, options);
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(`HTTP Error ${response.status}: ${text || response.statusText}`);
+    }
+    const text = await response.text();
+    return text ? JSON.parse(text) : {};
+  }
+
+  public async listVendors(): Promise<{ vendors: unknown[] }> {
+    return this.requestAdmin("/platform/vendors", "GET");
+  }
+
+  public async createVendor(name: string): Promise<{ vendor: unknown; token: string }> {
+    return this.requestAdmin("/platform/vendors", "POST", { name });
+  }
+
+  public async forcePublish(releaseId: number): Promise<{ releaseRequest: unknown; publishedVersion: number | null }> {
+    return this.requestAdmin(`/admin/api/release-requests/${releaseId}/force-publish`, "POST");
+  }
+
+  public async listVersions(): Promise<{ versions: unknown[] }> {
+    return this.requestAdmin("/admin/api/registry-versions", "GET");
+  }
+
+  public async listAudit(): Promise<{ records: unknown[] }> {
+    return this.requestAdmin("/admin/api/audit", "GET");
+  }
+}