@tokenbuddy/tb-admin 1.0.31 → 1.0.33

package/src/ui-server.ts

@@ -2,6 +2,7 @@ import * as http from "http";
 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 { UiActions, type CreateSellerRequest, type UiActionProgressEvent, type UiActionResult } from "./ui-actions.js";
 import { adminUiHtml } from "./ui-static.js";
@@ -48,7 +49,7 @@ export async function startAdminUiServer(options: AdminUiServerOptions): Promise
   const jobs = new Map<string, UiJob>();
   const server = http.createServer(async (req, res) => {
     try {
-      await routeRequest(req, res, state, actions, jobs);
+      await routeRequest(req, res, options, state, actions, jobs);
     } catch (err: any) {
       sendJson(res, 500, { error: err.message || "internal error" });
     }
@@ -74,6 +75,7 @@ export async function startAdminUiServer(options: AdminUiServerOptions): Promise
 async function routeRequest(
   req: http.IncomingMessage,
   res: http.ServerResponse,
+  options: AdminUiServerOptions,
   state: AdminUiState,
   actions: UiActions,
   jobs: Map<string, UiJob>
@@ -101,6 +103,18 @@ async function routeRequest(
     sendJson(res, 200, await state.bootstrapConfig());
     return;
   }
+  if (req.method === "GET" && parsed.pathname === "/api/vendor/release-requests") {
+    const profile = state.activeBootstrapProfile();
+    const baseUrl = options.url || profile.profile?.url;
+    const token = options.token || profile.profile?.token;
+    if (!baseUrl || !token) {
+      throw new Error("No bootstrap profile found. Configure an admin profile or pass --url and --token.");
+    }
+    const limit = parsed.searchParams.get("limit") || undefined;
+    const client = new RegistryVendorClient(baseUrl, token);
+    sendJson(res, 200, await client.listReleaseRequests(limit ? Number(limit) : 20));
+    return;
+  }
   if (req.method === "GET" && parsed.pathname === "/api/sellers") {
     sendJson(res, 200, await state.sellers());
     return;

package/src/ui-state.ts

@@ -10,6 +10,13 @@ import {
 export type RegistryStatus = "active" | "draining" | "offline" | "pending" | "unknown";
 export type NodeStatus = RegistryStatus | "busy_capacity" | "auth_unknown";
 export type UpstreamStatus = "healthy" | "degraded" | "unhealthy" | "unknown";
+/**
+ * Step 13 v1.1: dataSource 标记一行 seller 在 fly.io apps list vs
+ * registry /registry/sellers 两个独立查询里的出现情况. UI 据此决定
+ * 标红 / 立即下线 / Apply 按钮. 详细见
+ * docs/processes/seller-fleet-data-sources.md.
+ */
+export type SellerDataSource = "fly" | "registry" | "both";
 
 export interface SellerRow {
   id: string;
@@ -47,6 +54,32 @@ export interface SellerRow {
     modelsCount?: number;
   };
   error?: string;
+  /**
+   * Step 13 v1.1: 数据源标记. UI 据此决定:
+   *   - "fly"      → 灰点 + 「未发布」+ Apply 按钮 (走 vendor-bootstrap stage)
+   *   - "registry" → 整行标红 + 立即下线按钮 (registry-only = 重大事故)
+   *   - "both"     → 正常色 + Activate / Drain 走 vendor path
+   */
+  dataSource: SellerDataSource;
+  /**
+   * Step 13 v1.1: 标红告警 (registry-only). UI 整行用 .registry-alert
+   * class 标红, tooltip 提示事故 + 立即下线.
+   */
+  registryAlert?: boolean;
+  /** Step 13 v1.1: 标红原因 (中文短句, UI tooltip 显示). */
+  alertReason?: string;
+  /** Step 13 v1.1: "未发布" 提示 (fly-only 行的 publishHint 按钮 caption). */
+  publishHint?: string;
+  /**
+   * Step 13 v1.1: 立即下线按钮 caption (registry-only 行). 文案
+   * 必须含 "registry-only" 让用户知道这**不**删 fly app. 详见 spec.
+   */
+  removeHint?: string;
+  /**
+   * Step 13 v1.1: 关联的 fly app (raw, 来源 flyctl apps list --json).
+   * fly-only 行一定有值; both 行有值; registry-only 行 undefined.
+   */
+  flyApp?: { name: string; status?: string; owner?: string; latestDeployAt?: string };
 }
 
 export interface SellerModelRow {
@@ -126,6 +159,12 @@ export interface AdminUiStateOptions {
   token?: string;
   fetchJson?: (url: string, init?: RequestInit) => Promise<unknown>;
   balanceFetch?: typeof fetch;
+  /**
+   * Step 13 v1.1: flyctl apps list --json 替代. 默认调 seller.ts 的
+   * runFlyctlJson 真 spawn flyctl. 测试用 closure 注入 fake 数据.
+   * 返回的 SellerAppJson 形如 { name, status, owner, latestDeployAt }.
+   */
+  flyApps?: () => Promise<import("./seller.js").SellerAppJson[]>;
 }
 
 interface ProfileMatch {
@@ -215,19 +254,146 @@ export class AdminUiState {
     }
   }
 
+  /**
+   * Step 13 v1.1: 双源 seller list.
+   *   - flyApps: flyctl apps list --json (走 fly token)
+   *   - fetchRegistry: GET <registry>/registry/sellers (走 vendor key)
+   * **不**做 union / dedupe / merge. 渲染时按 (fly ∩ registry / fly /
+   * registry) 标 dataSource, registry-only 行整行标红. 详见
+   * docs/processes/seller-fleet-data-sources.md.
+   */
   public async sellers(): Promise<SellerRow[]> {
-    const document = await this.fetchRegistry();
-    const snapshots = await Promise.all(document.sellers.map((seller) => this.sellerSnapshot(seller)));
-    return snapshots.map((snapshot) => snapshot.row);
+    const [flyApps, registryDoc] = await Promise.all([
+      this.fetchFlyApps().catch((err: any) => {
+        return { __error: err.message } as any;
+      }),
+      this.fetchRegistry().catch((err: any) => {
+        return { __error: err.message, sellers: [] } as any;
+      })
+    ]);
+
+    // Step 13: 算两个索引.
+    //   flyByName: app.name -> SellerAppJson (UI 用, 不会重复)
+    //   registryByKey: entry.id / entry.app -> entry (UI 用, 不会重复)
+    // 行数 = max(fly 数量, registry 数量); 双源都有时合并到 1 行.
+    const flyByName = new Map<string, import("./seller.js").SellerAppJson>();
+    if (Array.isArray(flyApps)) {
+      for (const app of flyApps) {
+        if (app?.name) {
+          flyByName.set(app.name, app);
+        }
+      }
+    }
+    const registryById = new Map<string, SellerRegistryEntry>();
+    const registryByApp = new Map<string, SellerRegistryEntry>();
+    for (const entry of registryDoc.sellers || []) {
+      if (entry.id) registryById.set(entry.id, entry);
+      if (entry.app) registryByApp.set(entry.app, entry);
+    }
+
+    // Step 13: 4 类行 (dataSource 决定):
+    //   - fly ∩ registry: 同一行 (both)
+    //   - fly only: dataSource=fly, 灰点 + "未发布" 提示
+    //   - registry only: dataSource=registry, **整行标红** + 立即下线按钮
+    //   - 都出现但 key 不 match (e.g. registry 没填 app 字段): 也当 both
+    //     (按 entry.url host 兜底 match)
+    const rows: SellerRow[] = [];
+    const consumedFly = new Set<string>();
+    const consumedRegistry = new Set<string>();
+
+    // Phase 1: registry first (因为有 id + url + 详细 metadata)
+    for (const entry of registryDoc.sellers || []) {
+      const flyMatch = entry.app ? flyByName.get(entry.app) : undefined;
+      const dataSource: SellerDataSource = flyMatch ? "both" : "registry";
+      if (flyMatch) {
+        consumedFly.add(flyMatch.name);
+      }
+      consumedRegistry.add(entry.id);
+      const snapshot = await this.sellerSnapshot(entry, flyMatch, dataSource);
+      rows.push(snapshot.row);
+    }
+
+    // Phase 2: fly-only apps (registry 没有)
+    for (const app of flyByName.values()) {
+      if (consumedFly.has(app.name)) continue;
+      const stubEntry: SellerRegistryEntry = {
+        id: app.name,
+        name: app.name,
+        app: app.name,
+        url: `https://${app.name}.fly.dev`,
+        supportedProtocols: [],
+        paymentMethods: [],
+        models: []
+      };
+      const snapshot = await this.sellerSnapshot(stubEntry, app, "fly");
+      rows.push(snapshot.row);
+    }
+
+    return rows;
+  }
+
+  /**
+   * Step 13 v1.1: 拉 flyctl apps list --json. 默认走 seller.ts 真实
+   * flyctl spawn, 测试或受限环境可注入 options.flyApps closure.
+   */
+  private async fetchFlyApps(): Promise<import("./seller.js").SellerAppJson[]> {
+    if (this.options.flyApps) {
+      return await this.options.flyApps();
+    }
+    // 默认路径: 走 SellerCommandRunner.ls(true) 真 spawn flyctl.
+    // 避免在 ui-state.ts 里 import 整个 seller module 引入循环依赖,
+    // 走 dynamic import; 失败 fallback 返空数组 (UI 不会崩, 只是
+    // 标 dataSource="registry" + 标红).
+    try {
+      const mod = await import("./seller.js");
+      const cfg = this.configManager.load();
+      const profile = cfg.profiles[this.options.profile || "default"];
+      const env = {
+        ...process.env,
+        ...(profile?.url ? { TB_REGISTRY_URL: profile.url } : {}),
+        ...(profile?.token ? { TB_REGISTRY_TOKEN: profile.token } : {})
+      };
+      const runner = new mod.SellerCommandRunner(this.configManager);
+      const result = await runner.ls(true);
+      if (result && typeof result === "object" && "apps" in result) {
+        return (result as { apps: import("./seller.js").SellerAppJson[] }).apps;
+      }
+      return [];
+    } catch (err: any) {
+      return [];
+    }
   }
 
   public async sellerDetail(id: string): Promise<SellerDetail> {
+    // Step 13 v1.1: detail 页也走双源. 先看 entry 在不在 registry,
+    // 不在则查 fly list (registry-only 行, 标红 detail).
     const document = await this.fetchRegistry();
-    const entry = document.sellers.find((seller) => seller.id === id || seller.name === id || seller.app === id);
+    let entry = document.sellers.find((seller) => seller.id === id || seller.name === id || seller.app === id);
+    let dataSource: SellerDataSource = "registry";
+    let flyApp: import("./seller.js").SellerAppJson | undefined;
     if (!entry) {
-      throw new Error(`seller \`${id}\` not found in bootstrap registry`);
+      const flyApps = await this.fetchFlyApps().catch(() => []);
+      const flyMatch = flyApps.find((app) => app.name === id || app.name === `tb-seller-${id}` || app.name === id.replace(/^tb-seller-/, ""));
+      if (!flyMatch) {
+        throw new Error(`seller \`${id}\` not found in fly.io apps or bootstrap registry`);
+      }
+      entry = {
+        id: flyMatch.name,
+        name: flyMatch.name,
+        app: flyMatch.name,
+        url: `https://${flyMatch.name}.fly.dev`,
+        supportedProtocols: [],
+        paymentMethods: [],
+        models: []
+      };
+      flyApp = flyMatch;
+      dataSource = "fly";
+    } else {
+      const flyApps = await this.fetchFlyApps().catch(() => []);
+      flyApp = entry.app ? flyApps.find((app) => app.name === entry!.app) : undefined;
+      dataSource = flyApp ? "both" : "registry";
     }
-    const snapshot = await this.sellerSnapshot(entry);
+    const snapshot = await this.sellerSnapshot(entry, flyApp, dataSource);
     const config = snapshot.config?.config || snapshot.config || {};
     const upstreams = snapshot.upstreams || {};
     return {
@@ -285,7 +451,7 @@ export class AdminUiState {
     return document;
   }
 
-  private activeBootstrapProfile(): ProfileMatch {
+  public activeBootstrapProfile(): ProfileMatch {
     const envProfile = process.env.TOKENBUDDY_ADMIN_PROFILE;
     const target = this.options.profile || envProfile;
     if (this.options.url) {
@@ -335,20 +501,89 @@ export class AdminUiState {
     return {};
   }
 
-  private async sellerSnapshot(entry: SellerRegistryEntry): Promise<SellerSnapshot> {
+  /**
+   * Step 13 v1.1: seller snapshot.
+   *   - 双源数据已经定好 (dataSource 由调用方传入)
+   *   - nodeStatus = fetch <seller.url>/manifest 200 → active, 否则 unknown
+   *     (**不**用 registry entry.status 决定绿点)
+   *   - registry-only 行 (dataSource="registry") → 标红 (registryAlert=true)
+   */
+  private async sellerSnapshot(
+    entry: SellerRegistryEntry,
+    flyApp: import("./seller.js").SellerAppJson | undefined,
+    dataSource: SellerDataSource
+  ): Promise<SellerSnapshot> {
     const match = this.matchSellerProfile(entry);
-    const baseRow = baseSellerRow(entry, match.name);
-    if (!match.profile) {
+    const baseRow = baseSellerRow(entry, match.name, dataSource, flyApp);
+
+    // Step 13: 立即下线 / Apply 按钮 hint 文案
+    if (dataSource === "registry") {
+      baseRow.registryAlert = true;
+      baseRow.alertReason = "registry 收录了但 fly app 失踪 — 严重事故, 立即下线";
+      baseRow.removeHint = "立即下线 (registry-only)";
+    } else if (dataSource === "fly") {
+      baseRow.publishHint = "未发布 — 可申请发布 (走 vendor-bootstrap stage)";
+    }
+
+    if (dataSource === "fly") {
+      // fly-only 行没 registry entry, 也可能没 profile. 仍然跑 manifest
+      // probe (entry.url 来自 flyApp 推断 https://<name>.fly.dev), 但
+      // 没 profile 时只算 "unknown" (灰点) — 因为 vendor 没法管控一个
+      // 还没发布的 instance, 不该 throw auth_unknown 把 UI 卡死.
+      const manifestOk = await this.probeManifest(entry.url);
       return {
         row: {
           ...baseRow,
-          nodeStatus: "auth_unknown",
+          nodeStatus: manifestOk ? "active" : "unknown",
+          error: manifestOk ? undefined : "未发布到 registry, /manifest 探测失败 (不视为事故)"
+        }
+      };
+    }
+    if (dataSource === "both" && !match.profile) {
+      // both 但 vendor profile 缺 — 还是 unknown (灰点), 1.0.31 老行为
+      // 会落 auth_unknown, 现在用 unknown 让 UI 不会显得像 "鉴权失败".
+      return {
+        row: {
+          ...baseRow,
+          nodeStatus: "unknown",
           error: "No matching local admin profile"
         }
       };
     }
 
+    // Step 13: 绿点 = fetch <entry.url>/manifest 200 OK
+    // (registry-only 行 skip 这个 fetch, 因为 entry.url 可能指向死链)
+    if (dataSource === "registry") {
+      return {
+        row: {
+          ...baseRow,
+          nodeStatus: "unknown"
+        }
+      };
+    }
+
     try {
+      // 绿点路径: 优先 <entry.url>/manifest (无 auth 公共 endpoint).
+      // fallback: 走 vendor token 调 /operator/status (老 1.0.31 行为).
+      const manifestOk = await this.probeManifest(entry.url);
+      if (manifestOk) {
+        return {
+          row: {
+            ...baseRow,
+            nodeStatus: "active"
+          }
+        };
+      }
+      // /manifest 失败: 试 /operator/status (老路径, 需要 vendor profile)
+      if (!match.profile) {
+        return {
+          row: {
+            ...baseRow,
+            nodeStatus: "auth_unknown",
+            error: "No matching local admin profile (post /manifest fallback)"
+          }
+        };
+      }
       const [status, service, upstreams, config] = await Promise.all([
         this.fetchSellerAdminJson(match.profile, "/operator/status").catch((err: any) => ({ error: err.message })),
         this.fetchSellerAdminJson(match.profile, "/operator/admin/service").catch((err: any) => ({ error: err.message })),
@@ -376,6 +611,27 @@ export class AdminUiState {
     }
   }
 
+  /**
+   * Step 13 v1.1: 探 `<entry.url>/manifest` 拿绿点. 200/204 → true;
+   * 任何非 2xx / 网络错 → false. 3s timeout 避免列表卡死.
+   */
+  private async probeManifest(url: string): Promise<boolean> {
+    try {
+      const controller = new AbortController();
+      const timer = setTimeout(() => controller.abort(), 3000);
+      const target = url.replace(/\/+$/, "") + "/manifest";
+      const res = await fetch(target, {
+        method: "GET",
+        signal: controller.signal,
+        headers: { "Content-Type": "application/json" }
+      });
+      clearTimeout(timer);
+      return res.status >= 200 && res.status < 300;
+    } catch {
+      return false;
+    }
+  }
+
   private async fetchSellerAdminJson(profile: AdminProfile, pathName: string): Promise<any> {
     return this.fetchJson(`${trimSlash(profile.url)}${pathName}`, {
       headers: {
@@ -406,7 +662,15 @@ export class AdminUiState {
 }
 
 async function defaultFetchJson(url: string, init?: RequestInit): Promise<unknown> {
-  const response = await fetch(url, init);
+  // Step 13 v1.1: 3s timeout 避免坏 host / DNS 卡死整个 admin web.
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), 3000);
+  let response: Response;
+  try {
+    response = await fetch(url, { ...init, signal: controller.signal });
+  } finally {
+    clearTimeout(timer);
+  }
   if (!response.ok) {
     const text = await response.text();
     throw new Error(`HTTP Error ${response.status}: ${text || response.statusText}`);
@@ -415,7 +679,12 @@ async function defaultFetchJson(url: string, init?: RequestInit): Promise<unknow
   return text ? JSON.parse(text) : {};
 }
 
-function baseSellerRow(entry: SellerRegistryEntry, profile?: string): SellerRow {
+function baseSellerRow(
+  entry: SellerRegistryEntry,
+  profile?: string,
+  dataSource: SellerDataSource = "registry",
+  flyApp?: import("./seller.js").SellerAppJson
+): SellerRow {
   return {
     id: entry.id,
     name: entry.id,
@@ -424,7 +693,9 @@ function baseSellerRow(entry: SellerRegistryEntry, profile?: string): SellerRow
     profile: profile || entry.profile,
     url: entry.url,
     registryStatus: registryStatus(entry.status),
-    nodeStatus: registryStatus(entry.status),
+    // Step 13 v1.1: 绿点 base 改 unknown, 真正值由 sellerSnapshot
+    // 拿 /manifest 200 决定. 老逻辑直接复用 entry.status 是错的.
+    nodeStatus: "unknown",
     region: entry.region,
     upstreamDomain: hostName(entry.url) || "unknown",
     upstreamStatus: "unknown",
@@ -432,7 +703,14 @@ function baseSellerRow(entry: SellerRegistryEntry, profile?: string): SellerRow
     specs: {
       region: entry.region,
       modelsCount: entry.modelsCount ?? entry.models?.length ?? entry.sampleModels?.length
-    }
+    },
+    dataSource,
+    flyApp: flyApp ? {
+      name: flyApp.name,
+      status: flyApp.status,
+      owner: flyApp.owner,
+      latestDeployAt: flyApp.latestDeployAt
+    } : undefined
   };
 }
 

package/src/ui-static.ts

@@ -79,6 +79,25 @@ export function adminUiHtml(): string {
     .app-table-head{min-height:34px;color:var(--muted);font-size:var(--label-fs);font-weight:var(--label-weight);text-transform:uppercase;letter-spacing:var(--label-spacing)}
     .app-row{border:1px solid var(--hairline);border-radius:8px;background:#fff;min-height:76px;text-align:left}
     .app-row:hover{border-color:var(--hairline-strong);background:#fff}
+    /* Step 13 v1.1: 双源 (fly + registry) 4 类行视觉. dataSource 决定
+       dataSource="fly"      → 灰/中性边, "未发布" 提示
+       dataSource="registry" → 整行红边 + 软红底, "立即下线 (registry-only)" 按钮
+       dataSource="both"     → 正常边, 跟 1.0.31 老样式一致
+    */
+    .app-row.app-row-fly-only{border-color:#cdd2db;background:#f8f9fc}
+    .app-row.app-row-fly-only:hover{background:#f1f3f8}
+    .app-row.app-row-registry-only{border:2px solid var(--danger);background:var(--danger-soft);box-shadow:0 0 0 3px rgba(239,91,120,.08)}
+    .app-row.app-row-registry-only:hover{background:#ffe3ea}
+    .datasource-chip{display:inline-block;padding:1px 8px;border-radius:999px;font-size:10px;font-weight:800;letter-spacing:.04em;text-transform:uppercase;line-height:16px;margin-left:6px;vertical-align:middle}
+    .datasource-chip.both{background:#e7f6ee;color:#0a8754}
+    .datasource-chip.fly{background:#e3e6ee;color:#4a5170}
+    .datasource-chip.registry{background:var(--danger-soft);color:var(--danger);border:1px solid var(--danger)}
+    .alert-reason{color:var(--danger);font-size:11px;line-height:1.4;font-weight:700;margin-top:4px;display:block}
+    .remove-hint-btn{margin-top:6px;background:var(--danger);color:#fff;border:0;border-radius:6px;padding:4px 10px;font-size:11px;font-weight:800;cursor:pointer;display:inline-block}
+    .remove-hint-btn:hover{background:#d63d5a}
+    .remove-hint-btn::before{content:"⚠ ";margin-right:2px}
+    .publish-hint-btn{margin-top:6px;background:#fff;color:var(--primary);border:1px solid var(--hairline-strong);border-radius:6px;padding:4px 10px;font-size:11px;font-weight:800;cursor:pointer;display:inline-block}
+    .publish-hint-btn:hover{background:#f5f3ff}
     /* Status dot — five spec tones (green/amber/red/blue/gray) */
     .app-dot{width:10px;height:10px;border-radius:999px;background:#c8ced8;box-shadow:0 0 0 4px #edf1f8}
     .app-dot.tone-green{background:var(--success);box-shadow:0 0 0 4px rgba(16,185,129,.18)}
@@ -195,7 +214,7 @@ export function adminUiHtml(): string {
   </style>
 </head>
 <body>
-  <nav class="topnav"><div class="logo">TOKENBUDDY ADMIN</div><div class="top-links"><button class="top-link active" data-page="sellers">Sellers</button><button class="top-link" data-page="bootstrap">Bootstrap</button></div></nav>
+  <nav class="topnav"><div class="logo">TOKENBUDDY ADMIN</div><div class="top-links"><button class="top-link active" data-page="sellers">Sellers</button><button class="top-link" data-page="releases">Release Requests</button></div></nav>
   <main class="content">
     <section id="page-sellers" class="page active">
       <div class="panel">
@@ -220,16 +239,20 @@ export function adminUiHtml(): string {
         </div>
       </div>
     </section>
-    <section id="page-bootstrap" class="page">
+    <section id="page-releases" class="page">
       <div class="bootstrap-card">
         <div class="panel-head">
-          <h1 class="title">Bootstrap</h1>
+          <h1 class="title">Release Requests</h1>
           <div class="modal-actions">
-            <button id="openBootstrapConfig" class="btn primary">Edit Bootstrap Config</button>
-            <button id="refreshBootstrap" class="btn">Refresh</button>
+            <button id="refreshReleases" class="btn">Refresh</button>
           </div>
         </div>
-        <div id="bootstrapGrid" class="bootstrap-grid"></div>
+        <p class="hint" style="color:var(--muted);font-size:12px;margin:0 0 12px;">
+          Pending and historical release requests you have submitted to the wallet-bootstrap
+          registry. Force-publish is available to the platform super-admin via the registry
+          admin web; vendors do not publish their own releases.
+        </p>
+        <div id="releasesGrid" class="bootstrap-grid"></div>
       </div>
     </section>
   </main>
@@ -334,7 +357,7 @@ const infoIcon = '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M4 7h7"><
 const balanceProbeTemplates = ["openrouter","deepseek","stepfun","siliconflow","novita","newapi_generic","usage_generic","none","auto"];
 const paymentMethods = ["clawtip","mock"];
 const loadingSpinner = label => '<div class="loading-row" role="status" aria-label="'+esc(label)+'"><span class="spinner" aria-hidden="true"></span></div>';
-document.querySelectorAll(".top-link").forEach(btn => btn.onclick = () => { document.querySelectorAll(".top-link").forEach(b => b.classList.remove("active")); btn.classList.add("active"); document.querySelectorAll(".page").forEach(p => p.classList.remove("active")); document.getElementById("page-" + btn.dataset.page).classList.add("active"); if (btn.dataset.page === "bootstrap") loadBootstrap(); });
+document.querySelectorAll(".top-link").forEach(btn => btn.onclick = () => { document.querySelectorAll(".top-link").forEach(b => b.classList.remove("active")); btn.classList.add("active"); document.querySelectorAll(".page").forEach(p => p.classList.remove("active")); document.getElementById("page-" + btn.dataset.page).classList.add("active"); if (btn.dataset.page === "releases") loadBootstrap(); });
 async function loadSellers(options={}){ if (sellerRefreshInFlight) return; clearTimeout(sellerRefreshTimer); sellerRefreshTimer = null; sellerNextRefreshAt = null; const initial = Boolean(options.initial); sellerRefreshInFlight = true; sellerRefreshError = ""; updateSellerRefreshMeta(true); if (initial) document.getElementById("sellerRows").innerHTML = loadingSpinner("Loading sellers"); try { const rows = await api("/api/sellers"); renderSellerRows(rows); sellerRefreshLoaded = true; sellerRefreshError = ""; } catch (err) { sellerRefreshError = err.message || "Refresh failed"; if (initial) document.getElementById("sellerRows").innerHTML = '<div class="status-line">'+esc(sellerRefreshError)+'</div>'; } finally { sellerRefreshInFlight = false; scheduleSellerRefresh(); updateSellerRefreshMeta(false); } }
 function renderSellerRows(rows){ sellerRowsCache = rows; document.getElementById("sellerRows").innerHTML = rows.map(row => sellerRow(row)).join(""); document.querySelectorAll("[data-detail]").forEach(btn => btn.onclick = () => openDetail(btn.dataset.detail)); }
 function startSellerRefresh(){ loadSellers({ initial:true }); sellerClockTimer = setInterval(() => updateSellerRefreshMeta(sellerRefreshInFlight), 1000); window.addEventListener("beforeunload", () => { clearTimeout(sellerRefreshTimer); clearInterval(sellerClockTimer); }); }
@@ -342,6 +365,17 @@ function scheduleSellerRefresh(){ clearTimeout(sellerRefreshTimer); sellerNextRe
 function updateSellerRefreshMeta(refreshing){ const state = document.getElementById("sellerRefreshState"); if (!state) return; const nextSeconds = sellerNextRefreshAt ? Math.max(0, Math.ceil((sellerNextRefreshAt.getTime() - Date.now()) / 1000)) : 0; state.classList.toggle("refreshing", Boolean(refreshing)); state.classList.toggle("error", Boolean(sellerRefreshError)); state.innerHTML = refreshing ? '<span class="spinner" aria-hidden="true"></span><span>Refreshing</span>' : esc(sellerRefreshError || (sellerRefreshLoaded ? "Next refresh: " + nextSeconds + "s" : "Starting")); }
 function sellerRow(row){
   const fmt = window.__tbFmt;
+  // Step 13 v1.1: dataSource 决定行 class + 标红/灰 + 按钮 + chip.
+  // row.dataSource ∈ "fly" | "registry" | "both". 老 1.0.31 没这个字段,
+  // 兜底当 "both" (老 UI 看到的所有行, 默认都按已发布处理).
+  const ds = row.dataSource || "both";
+  const rowClass = ds === "registry" ? "app-row app-row-registry-only"
+                 : ds === "fly" ? "app-row app-row-fly-only"
+                 : "app-row";
+  const dsChipLabel = ds === "registry" ? "Registry-only"
+                     : ds === "fly" ? "未发布"
+                     : "Both";
+  const dsChip = '<span class="datasource-chip '+esc(ds)+'" title="'+esc('Data source: ' + ds + '. 详见 docs/processes/seller-fleet-data-sources.md')+'">'+esc(dsChipLabel)+'</span>';
   const tip = [row.description, row.region, row.app, row.specs?.memoryGb ? row.specs.memoryGb + "GB" : "", row.specs?.machines ? row.specs.machines + " machines" : "", row.modelsCount ? row.modelsCount + " models" : ""].filter(Boolean).join(" · ") || "No specs";
   const ttftText = fmt.formatDuration(row.ttftMs);
   const ttft = "TTFT: " + (ttftText === fmt.UNKNOWN_VALUE ? "—" : ttftText);
@@ -352,9 +386,11 @@ function sellerRow(row){
   const balanceRaw = row.upstreamBalanceUsdMicros;
   const balanceText = (balanceRaw === undefined || balanceRaw === null) ? dash() : '<strong>'+esc(fmt.formatBalanceAmount(balanceRaw, row.upstreamBalanceCurrency || "USD"))+'</strong>';
   const switchText = row.lastSwitchAt ? "Switch " + esc(fmt.formatTimeCompact(row.lastSwitchAt)) : "";
+  // Step 13 v1.1: 绿点 (status + tone) 仍按 nodeStatus 决定 (probeManifest
+  // 200 → active 绿点; 失败 → unknown 灰). registryStatus 单独 tooltip.
   const status = fmt.formatSellerStatus(row.nodeStatus);
   const tone = fmt.sellerStatusTone(row.nodeStatus);
-  const statusTip = "registry: " + esc(fmt.formatSellerStatus(row.registryStatus)) + " · upstream: " + esc(fmt.normalizeStatusLabel(row.upstreamStatus));
+  const statusTip = "registry: " + esc(fmt.formatSellerStatus(row.registryStatus)) + " · upstream: " + esc(fmt.normalizeStatusLabel(row.upstreamStatus)) + " · source: " + esc(ds);
   const sellerLine = [
     disc !== fmt.UNKNOWN_VALUE ? "Disc " + esc(disc) : null,
     capacity !== fmt.UNKNOWN_VALUE ? capacity : null,
@@ -362,21 +398,57 @@ function sellerRow(row){
     balanceText.includes("<strong>") ? "Balance " + esc(balanceText.replace(/<[^>]+>/g, "")) : null,
     switchText || null
   ].filter(Boolean).join(" · ");
-  return '<button class="app-row" type="button" data-detail="'+esc(row.id)+'"><span class="app-dot tone-'+esc(tone)+'" aria-label="'+esc(status)+'"></span><span class="app-name"><span class="seller-title"><strong>'+esc(row.name)+'</strong><span class="spec-tip" title="'+esc(tip)+'" aria-label="Seller specs">'+infoIcon+'</span></span><span class="muted-value" style="font-size:12px;font-family:var(--font-mono)">'+esc(sellerLine || row.app || row.id)+'</span></span><span class="field-cell"><strong>'+esc(row.upstreamDomain)+'</strong></span><span class="field-cell"><strong>'+esc(disc === fmt.UNKNOWN_VALUE ? "—" : disc)+'</strong></span><span class="field-cell"><strong>'+esc(capacity)+'</strong></span><span class="speed-cell"><strong>'+esc(ttftText === fmt.UNKNOWN_VALUE ? "—" : ttftText)+'</strong><span>'+avgSpeed+'</span></span><span class="field-cell"><span class="balance-line">'+balanceText+(row.upstreamRechargeUrl ? '<a class="recharge-btn" href="'+esc(row.upstreamRechargeUrl)+'" target="_blank" rel="noreferrer">↗</a>' : '')+'</span></span><span class="field-cell"><strong title="'+esc(statusTip)+'">'+esc(status)+'</strong></span><span class="row-actions"><span class="detail-btn">›</span></span></button>';
+  // Step 13 v1.1: 4 类行的 status cell 文案不同.
+  //   both       → 正常 active / draining / offline
+  //   fly-only   → "未发布" (publishHint 提示走 vendor-bootstrap stage)
+  //   registry   → "**严重事故**" + alertReason 红字
+  let statusCell;
+  if (ds === "registry") {
+    statusCell = '<span class="field-cell"><strong class="registry-incident" title="'+esc(statusTip)+'">严重事故</strong>' +
+      (row.alertReason ? '<span class="alert-reason">'+esc(row.alertReason)+'</span>' : '') +
+      (row.removeHint ? '<button class="remove-hint-btn" type="button" data-action="remove" data-seller-id="'+esc(row.id)+'" title="'+esc(row.removeHint)+'">'+esc(row.removeHint)+'</button>' : '') +
+    '</span>';
+  } else if (ds === "fly") {
+    statusCell = '<span class="field-cell"><strong title="'+esc(statusTip)+'">未发布</strong>' +
+      (row.publishHint ? '<button class="publish-hint-btn" type="button" data-action="publish" data-seller-id="'+esc(row.id)+'" title="'+esc(row.publishHint)+'">'+esc(row.publishHint)+'</button>' : '') +
+    '</span>';
+  } else {
+    statusCell = '<span class="field-cell"><strong title="'+esc(statusTip)+'">'+esc(status)+'</strong></span>';
+  }
+  return '<button class="'+esc(rowClass)+'" type="button" data-detail="'+esc(row.id)+'"><span class="app-dot tone-'+esc(tone)+'" aria-label="'+esc(status)+'"></span><span class="app-name"><span class="seller-title"><strong>'+esc(row.name)+'</strong>'+dsChip+'<span class="spec-tip" title="'+esc(tip)+'" aria-label="Seller specs">'+infoIcon+'</span></span><span class="muted-value" style="font-size:12px;font-family:var(--font-mono)">'+esc(sellerLine || row.app || row.id)+'</span></span><span class="field-cell"><strong>'+esc(row.upstreamDomain)+'</strong></span><span class="field-cell"><strong>'+esc(disc === fmt.UNKNOWN_VALUE ? "—" : disc)+'</strong></span><span class="field-cell"><strong>'+esc(capacity)+'</strong></span><span class="speed-cell"><strong>'+esc(ttftText === fmt.UNKNOWN_VALUE ? "—" : ttftText)+'</strong><span>'+avgSpeed+'</span></span><span class="field-cell"><span class="balance-line">'+balanceText+(row.upstreamRechargeUrl ? '<a class="recharge-btn" href="'+esc(row.upstreamRechargeUrl)+'" target="_blank" rel="noreferrer">↗</a>' : '')+'</span></span>'+statusCell+'<span class="row-actions"><span class="detail-btn">›</span></span></button>';
 }
 async function loadBootstrap(){
+  // Step 6 of the registry redesign: the legacy Bootstrap tab now
+  // surfaces vendor release requests. We keep the function name
+  // (loadBootstrap) so the existing click wiring continues to work,
+  // but the rendered content comes from the new
+  // /api/vendor/release-requests endpoint (added in ui-server.ts).
   const fmt = window.__tbFmt;
   try {
-    const data = await api("/api/bootstrap");
-    const items = [
-      { tone: "router", label: "Status", value: data.status || "unknown", secondary: data.url ? esc(fmt.formatSellerId(data.url)) : null },
-      { tone: "spend", label: "Registry", value: data.registryVersion === undefined ? "—" : "#" + esc(String(data.registryVersion)), secondary: data.registryUpdatedAt ? "Updated " + esc(fmt.formatTimeCompact(data.registryUpdatedAt)) : null },
-      { tone: "tokens", label: "Sellers", value: data.sellerEntries === undefined ? "—" : esc(String(data.sellerEntries)), secondary: data.regions && data.regions.length ? esc(data.regions.join(", ")) : null },
-      { tone: "inventory", label: "Default", value: data.defaultSeller || "—", secondary: data.profile ? "Profile " + esc(data.profile) : null }
-    ];
-    document.getElementById("bootstrapGrid").innerHTML = items.map(item => entryCardHtml(item)).join("");
+    const data = await api("/api/vendor/release-requests");
+    const rows = (data.releaseRequests || []);
+    if (rows.length === 0) {
+      document.getElementById("releasesGrid").innerHTML = '<div class="status-line">No release requests yet. Submit one with <code>tb-admin vendor-bootstrap stage</code> + <code>release submit</code>.</div>';
+      return;
+    }
+    const table = '<table style="width:100%;border-collapse:collapse;font-size:13px;">' +
+      '<thead><tr><th style="text-align:left;padding:6px 8px;color:var(--muted);text-transform:uppercase;font-size:11px;letter-spacing:0.04em;">ID</th><th style="text-align:left;padding:6px 8px;color:var(--muted);text-transform:uppercase;font-size:11px;letter-spacing:0.04em;">Status</th><th style="text-align:left;padding:6px 8px;color:var(--muted);text-transform:uppercase;font-size:11px;letter-spacing:0.04em;">Sellers</th><th style="text-align:left;padding:6px 8px;color:var(--muted);text-transform:uppercase;font-size:11px;letter-spacing:0.04em;">Submitted</th><th style="text-align:left;padding:6px 8px;color:var(--muted);text-transform:uppercase;font-size:11px;letter-spacing:0.04em;">Version</th><th style="text-align:left;padding:6px 8px;color:var(--muted);text-transform:uppercase;font-size:11px;letter-spacing:0.04em;">Error</th></tr></thead>' +
+      '<tbody>' + rows.map((r) => {
+        const summary = r.payloadSummary || { count: 0, sellerIds: [] };
+        const sellerList = (summary.sellerIds || []).join(", ") || "—";
+        const version = r.publishedVersion !== null && r.publishedVersion !== undefined ? "v" + esc(String(r.publishedVersion)) : "—";
+        return '<tr>' +
+          '<td style="padding:6px 8px;font-family:ui-monospace,monospace;">#' + esc(String(r.id)) + '</td>' +
+          '<td style="padding:6px 8px;">' + esc(r.status) + '</td>' +
+          '<td style="padding:6px 8px;">' + esc(String(summary.count)) + ' <span style="color:var(--muted);font-size:11px;">(' + esc(sellerList) + ')</span></td>' +
+          '<td style="padding:6px 8px;font-family:ui-monospace,monospace;">' + esc(fmt.formatTimeCompact(r.submittedAt)) + '</td>' +
+          '<td style="padding:6px 8px;">' + version + '</td>' +
+          '<td style="padding:6px 8px;color:var(--danger);">' + (r.errorMessage ? esc(r.errorMessage) : "—") + '</td>' +
+        '</tr>';
+      }).join("") + '</tbody></table>';
+    document.getElementById("releasesGrid").innerHTML = table;
   } catch (err) {
-    document.getElementById("bootstrapGrid").innerHTML = '<div class="status-line">'+esc(uiErrorMessage(err))+'</div>';
+    document.getElementById("releasesGrid").innerHTML = '<div class="status-line">'+esc(uiErrorMessage(err))+'</div>';
   }
 }
 function entryCardHtml(item){
@@ -462,8 +534,14 @@ function renderCreateJob(job){ if (!job) return; currentCreateJob = job; const d
 function progressStep(event){ const result = event.result || {}; const log = [result.command ? "$ " + result.command.join(" ") : "", result.stdout || "", result.stderr || ""].filter(Boolean).join("\\n").slice(0, 1600); const expanded = expandedProgressSteps.has(event.stepId); const spinner = event.status === "running" ? '<span class="spinner" aria-hidden="true"></span>' : ""; return '<button type="button" class="progress-step '+esc(event.status)+'" data-progress-step="'+esc(event.stepId)+'" aria-expanded="'+String(expanded)+'"><div class="progress-title">'+spinner+'<strong>'+esc(event.title)+'</strong></div><div class="progress-meta"><span>'+esc(event.message || event.status)+'</span>'+(log ? '<span class="progress-toggle">'+(expanded ? "Hide details" : "Show details")+'</span>' : '')+'</div>'+(log && expanded ? '<pre class="progress-log">'+esc(log)+'</pre>' : '')+'</button>'; }
 function setCreateFormDisabled(disabled){ document.querySelectorAll("#createFields [data-field], #createFields [data-payment-tab], #createFields [data-payment-toggle]").forEach(input => { input.disabled = Boolean(disabled); }); if (!disabled) updatePaymentPanels(); }
 document.getElementById("createProgress").onclick = event => { const step = event.target.closest("[data-progress-step]"); if (!step) return; const id = step.dataset.progressStep; if (expandedProgressSteps.has(id)) expandedProgressSteps.delete(id); else expandedProgressSteps.add(id); if (currentCreateJob) renderCreateJob(currentCreateJob); };
-document.getElementById("refreshBootstrap").onclick = loadBootstrap;
-document.getElementById("openBootstrapConfig").onclick = openBootstrapConfig;
+const refreshBootstrapEl = document.getElementById("refreshBootstrap");
+if (refreshBootstrapEl) {
+  refreshBootstrapEl.onclick = loadBootstrap;
+}
+const refreshReleasesEl = document.getElementById("refreshReleases");
+if (refreshReleasesEl) {
+  refreshReleasesEl.onclick = loadBootstrap;
+}
 document.getElementById("closeBootstrapConfig").onclick = () => document.getElementById("bootstrapModal").classList.remove("open");
 function fieldValue(input){ return numeric(input.value); }
 function numeric(value){ const n = Number(value); return value !== "" && Number.isFinite(n) ? n : value; }