@tokenbuddy/tb-admin 1.0.32 → 1.0.34

package/src/ui-state.ts

@@ -10,6 +10,8 @@ import {
 export type RegistryStatus = "active" | "draining" | "offline" | "pending" | "unknown";
 export type NodeStatus = RegistryStatus | "busy_capacity" | "auth_unknown";
 export type UpstreamStatus = "healthy" | "degraded" | "unhealthy" | "unknown";
+export type PublishStatus = "checking" | "published" | "unpublished" | "registry_only" | "unknown";
+export type DetailStatus = "pending" | "queued" | "loading" | "fresh" | "stale" | "error" | "skipped";
 /**
  * Step 13 v1.1: dataSource 标记一行 seller 在 fly.io apps list vs
  * registry /registry/sellers 两个独立查询里的出现情况. UI 据此决定
@@ -39,6 +41,10 @@ export interface SellerRow {
   discountRatio?: number;
   capacityUsed?: number;
   capacityLimit?: number;
+  resourceCpuPercent?: number;
+  resourceMemoryPercent?: number;
+  resourceMemoryRssMb?: number;
+  resourceMemoryLimitMb?: number;
   ttftMs?: number;
   avgInferenceMs?: number;
   lastInferenceMs?: number;
@@ -48,9 +54,15 @@ export interface SellerRow {
   lastSwitchAt?: string;
   modelsCount?: number;
   specs?: {
+    cpuKind?: string;
+    cpuCores?: number;
+    memoryMb?: number;
     memoryGb?: number;
     machines?: number;
+    runningMachines?: number;
+    volumeGb?: number;
     region?: string;
+    regions?: string[];
     modelsCount?: number;
   };
   error?: string;
@@ -80,6 +92,10 @@ export interface SellerRow {
    * fly-only 行一定有值; both 行有值; registry-only 行 undefined.
    */
   flyApp?: { name: string; status?: string; owner?: string; latestDeployAt?: string };
+  publishStatus?: PublishStatus;
+  detailStatus?: DetailStatus;
+  detailUpdatedAt?: string;
+  detailNextRefreshAt?: string;
 }
 
 export interface SellerModelRow {
@@ -165,6 +181,7 @@ export interface AdminUiStateOptions {
    * 返回的 SellerAppJson 形如 { name, status, owner, latestDeployAt }.
    */
   flyApps?: () => Promise<import("./seller.js").SellerAppJson[]>;
+  flyMachineSpecs?: (appName: string) => Promise<import("./seller.js").SellerMachineSpecs | undefined>;
 }
 
 interface ProfileMatch {
@@ -182,11 +199,18 @@ interface SellerSnapshot {
   balance?: BalanceSnapshot;
 }
 
+interface SellerTarget {
+  entry: SellerRegistryEntry;
+  flyApp?: import("./seller.js").SellerAppJson;
+  dataSource: SellerDataSource;
+}
+
 export class AdminUiState {
   private readonly configManager: ConfigManager;
   private readonly options: AdminUiStateOptions;
   private readonly fetchJson: (url: string, init?: RequestInit) => Promise<unknown>;
   private readonly balanceCache = new BalanceProbeCache();
+  private readonly machineSpecsCache = new Map<string, import("./seller.js").SellerMachineSpecs | undefined>();
 
   constructor(options: AdminUiStateOptions) {
     this.options = options;
@@ -267,7 +291,7 @@ export class AdminUiState {
       this.fetchFlyApps().catch((err: any) => {
         return { __error: err.message } as any;
       }),
-      this.fetchRegistry().catch((err: any) => {
+      this.fetchManagedRegistry().catch((err: any) => {
         return { __error: err.message, sellers: [] } as any;
       })
     ]);
@@ -300,22 +324,33 @@ export class AdminUiState {
     const rows: SellerRow[] = [];
     const consumedFly = new Set<string>();
     const consumedRegistry = new Set<string>();
+    const specsByApp = await this.fetchFlyMachineSpecsForApps(Array.from(flyByName.keys()));
+    const registryTargets: Array<{
+      entry: SellerRegistryEntry;
+      flyMatch?: import("./seller.js").SellerAppJson;
+      dataSource: SellerDataSource;
+    }> = [];
 
     // Phase 1: registry first (因为有 id + url + 详细 metadata)
     for (const entry of registryDoc.sellers || []) {
-      const flyMatch = entry.app ? flyByName.get(entry.app) : undefined;
+      const flyMatch = findFlyAppForEntry(flyByName, entry);
       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);
+      registryTargets.push({ entry, flyMatch, dataSource });
     }
+    rows.push(...await Promise.all(
+      registryTargets.map(async ({ entry, flyMatch, dataSource }) => {
+        const snapshot = await this.sellerSnapshot(entry, flyMatch, dataSource, { balanceTimeoutMs: 8000, machineSpecs: flyMatch ? specsByApp.get(flyMatch.name) : undefined });
+        return snapshot.row;
+      })
+    ));
 
     // Phase 2: fly-only apps (registry 没有)
-    for (const app of flyByName.values()) {
-      if (consumedFly.has(app.name)) continue;
+    const flyOnlyApps = Array.from(flyByName.values()).filter((app) => !consumedFly.has(app.name));
+    rows.push(...await Promise.all(flyOnlyApps.map(async (app) => {
       const stubEntry: SellerRegistryEntry = {
         id: app.name,
         name: app.name,
@@ -325,20 +360,80 @@ export class AdminUiState {
         paymentMethods: [],
         models: []
       };
-      const snapshot = await this.sellerSnapshot(stubEntry, app, "fly");
-      rows.push(snapshot.row);
+      const snapshot = await this.sellerSnapshot(stubEntry, app, "fly", { includeOperator: true, balanceTimeoutMs: 8000, machineSpecs: specsByApp.get(app.name) });
+      return snapshot.row;
+    })));
+
+    return rows;
+  }
+
+  public async sellerRegistryRows(): Promise<SellerRow[]> {
+    const registryDoc = await this.fetchManagedRegistry();
+    return (registryDoc.sellers || []).map((entry) => {
+      const match = this.matchSellerProfile(entry);
+      return {
+        ...baseSellerRow(entry, match.name, "registry"),
+        publishStatus: "checking",
+        detailStatus: "pending"
+      };
+    });
+  }
+
+  public async sellerInventory(): Promise<SellerRow[]> {
+    const registryDoc = await this.fetchManagedRegistry();
+    const flyApps = await this.fetchFlyApps().catch(() => []);
+    const flyByName = new Map<string, import("./seller.js").SellerAppJson>();
+    for (const app of flyApps) {
+      if (app?.name) {
+        flyByName.set(app.name, app);
+      }
+    }
+    const specsByApp = await this.fetchFlyMachineSpecsForApps(Array.from(flyByName.keys()));
+    const rows: SellerRow[] = [];
+    const consumedFly = new Set<string>();
+
+    for (const entry of registryDoc.sellers || []) {
+      const flyMatch = findFlyAppForEntry(flyByName, entry);
+      const dataSource: SellerDataSource = flyMatch ? "both" : "registry";
+      if (flyMatch) {
+        consumedFly.add(flyMatch.name);
+      }
+      const match = this.matchSellerProfile(entry);
+      const row = baseSellerRow(entry, match.name, dataSource, flyMatch, flyMatch ? specsByApp.get(flyMatch.name) : undefined);
+      row.publishStatus = flyMatch ? "published" : "registry_only";
+      row.detailStatus = dataSource === "registry" ? "skipped" : "pending";
+      if (dataSource === "registry") {
+        row.registryAlert = true;
+        row.alertReason = "registry 收录了但 fly app 失踪 — 严重事故, 立即下线";
+        row.removeHint = "立即下线 (registry-only)";
+      }
+      rows.push(row);
+    }
+
+    const flyOnlyApps = Array.from(flyByName.values()).filter((app) => !consumedFly.has(app.name));
+    for (const app of flyOnlyApps) {
+      const stubEntry = sellerEntryFromFlyApp(app);
+      const row = baseSellerRow(stubEntry, undefined, "fly", app, specsByApp.get(app.name));
+      row.publishStatus = "unpublished";
+      row.detailStatus = "pending";
+      row.publishHint = "未发布 — 可申请发布 (走 vendor-bootstrap stage)";
+      rows.push(row);
     }
 
     return rows;
   }
 
+  public async refreshSellerRows(rows: SellerRow[]): Promise<SellerRow[]> {
+    return await Promise.all(rows.map((row) => this.refreshSellerRow(row)));
+  }
+
   /**
    * 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();
+      return (await this.options.flyApps()).filter((app) => isSellerFlyAppName(app.name));
     }
     // 默认路径: 走 SellerCommandRunner.ls(true) 真 spawn flyctl.
     // 避免在 ui-state.ts 里 import 整个 seller module 引入循环依赖,
@@ -356,7 +451,7 @@ export class AdminUiState {
       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 (result as { apps: import("./seller.js").SellerAppJson[] }).apps.filter((app) => isSellerFlyAppName(app.name));
       }
       return [];
     } catch (err: any) {
@@ -364,36 +459,42 @@ export class AdminUiState {
     }
   }
 
-  public async sellerDetail(id: string): Promise<SellerDetail> {
-    // Step 13 v1.1: detail 页也走双源. 先看 entry 在不在 registry,
-    // 不在则查 fly list (registry-only 行, 标红 detail).
-    const document = await this.fetchRegistry();
-    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) {
-      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";
+  private async fetchFlyMachineSpecsForApps(appNames: string[]): Promise<Map<string, import("./seller.js").SellerMachineSpecs | undefined>> {
+    if (!this.options.flyMachineSpecs && this.options.flyApps) {
+      return new Map(appNames.map((appName) => [appName, undefined]));
     }
-    const snapshot = await this.sellerSnapshot(entry, flyApp, dataSource);
+    const entries: Array<readonly [string, import("./seller.js").SellerMachineSpecs | undefined]> = [];
+    for (const appName of appNames) {
+      entries.push([appName, await this.fetchFlyMachineSpecs(appName)] as const);
+    }
+    return new Map(entries);
+  }
+
+  private async fetchFlyMachineSpecs(appName: string): Promise<import("./seller.js").SellerMachineSpecs | undefined> {
+    if (this.machineSpecsCache.has(appName)) {
+      return this.machineSpecsCache.get(appName);
+    }
+    try {
+      const specs = this.options.flyMachineSpecs
+        ? await this.options.flyMachineSpecs(appName)
+        : await this.defaultFlyMachineSpecs(appName);
+      this.machineSpecsCache.set(appName, specs);
+      return specs;
+    } catch {
+      this.machineSpecsCache.set(appName, undefined);
+      return undefined;
+    }
+  }
+
+  private async defaultFlyMachineSpecs(appName: string): Promise<import("./seller.js").SellerMachineSpecs | undefined> {
+    const mod = await import("./seller.js");
+    const runner = new mod.SellerCommandRunner(this.configManager);
+    return runner.machineSpecs(appName);
+  }
+
+  public async sellerDetail(id: string): Promise<SellerDetail> {
+    const { entry, flyApp, dataSource } = await this.resolveSellerTarget(id);
+    const snapshot = await this.sellerSnapshot(entry, flyApp, dataSource, { includeOperator: true, balanceTimeoutMs: 8000 });
     const config = snapshot.config?.config || snapshot.config || {};
     const upstreams = snapshot.upstreams || {};
     return {
@@ -424,12 +525,75 @@ export class AdminUiState {
     };
   }
 
-  public async rawSellerConfig(id: string): Promise<{ entry: SellerRegistryEntry; profileName?: string; config: any }> {
-    const document = await this.fetchRegistry();
-    const entry = document.sellers.find((seller) => seller.id === id || seller.name === id || seller.app === id);
-    if (!entry) {
-      throw new Error(`seller \`${id}\` not found in bootstrap registry`);
+  private async refreshSellerRow(row: SellerRow): Promise<SellerRow> {
+    const dataSource = row.dataSource || "both";
+    if (dataSource === "registry") {
+      return { ...row, nodeStatus: "unknown", detailStatus: "skipped", detailUpdatedAt: new Date().toISOString() };
+    }
+    const entry = sellerEntryFromRow(row);
+    const match = this.matchSellerProfile(entry);
+    const manifestPromise = this.probeManifest(entry.url);
+    if (!match.profile) {
+      const manifestOk = await manifestPromise;
+      return {
+        ...row,
+        nodeStatus: manifestOk ? "active" : "unknown",
+        detailStatus: manifestOk ? "fresh" : "error",
+        detailUpdatedAt: new Date().toISOString(),
+        error: manifestOk ? row.error : (row.error || "No matching local admin profile; /manifest probe failed")
+      };
+    }
+
+    const [manifestOk, status, upstreams, config] = await Promise.all([
+      manifestPromise,
+      this.fetchSellerAdminJson(match.profile, "/operator/status").catch((err: any) => ({ error: err.message })),
+      this.fetchSellerAdminJson(match.profile, "/operator/admin/upstreams").catch((err: any) => ({ error: err.message })),
+      this.fetchSellerAdminJson(match.profile, "/operator/admin/config").catch((err: any) => ({ error: err.message }))
+    ]);
+    const balance = await this.operatorBalanceSnapshot(match.profile, 8000).catch(() => unavailableBalanceSnapshot("seller balance endpoint unavailable"));
+    const configDocument = config?.config || config || {};
+    const normalizedUpstreams = upstreamDocument(upstreams);
+    const upstreamUrl = stringValue(configDocument.upstreamUrl || normalizedUpstreams?.upstreamUrl || status?.upstream?.url || status?.upstreamUrl);
+    if (status?.error) {
+      return {
+        ...row,
+        nodeStatus: manifestOk ? "active" : "unknown",
+        upstreamDomain: upstreamUrl ? (hostName(upstreamUrl) || row.upstreamDomain) : row.upstreamDomain,
+        upstreamStatus: upstreamStatus(normalizedUpstreams?.status || row.upstreamStatus),
+        discountRatio: numberValue(configDocument.discountRatio ?? normalizedUpstreams?.discountRatio) ?? row.discountRatio,
+        modelsCount: numberValue(normalizedUpstreams?.models?.length ?? row.modelsCount) ?? row.modelsCount,
+        ...balanceFields(balance, row),
+        detailStatus: "error",
+        detailUpdatedAt: new Date().toISOString(),
+        error: status.error
+      };
     }
+    const capacity = status?.capacity || {};
+    return {
+      ...row,
+      nodeStatus: manifestOk ? "active" : nodeStatus(status?.status || row.nodeStatus),
+      upstreamDomain: upstreamUrl ? (hostName(upstreamUrl) || row.upstreamDomain) : row.upstreamDomain,
+      upstreamStatus: upstreamStatus(status?.upstream?.status || normalizedUpstreams?.status || row.upstreamStatus),
+      discountRatio: numberValue(configDocument.discountRatio ?? normalizedUpstreams?.discountRatio) ?? row.discountRatio,
+      capacityUsed: numberValue(capacity.activeConnections) ?? row.capacityUsed,
+      capacityLimit: numberValue(capacity.maxConnections) ?? row.capacityLimit,
+      ...runtimeUsageFields(status?.runtime, row),
+      ttftMs: numberValue(status?.latency?.ttftMs) ?? row.ttftMs,
+      avgInferenceMs: numberValue(status?.latency?.avgInferenceMs) ?? row.avgInferenceMs,
+      lastInferenceMs: numberValue(status?.latency?.lastInferenceMs) ?? row.lastInferenceMs,
+      avgTokensPerSecond: numberValue(status?.latency?.avgTokensPerSecond) ?? row.avgTokensPerSecond,
+      lastTokensPerSecond: numberValue(status?.latency?.lastTokensPerSecond) ?? row.lastTokensPerSecond,
+      latencySamples: numberValue(status?.latency?.sampleCount) ?? row.latencySamples,
+      modelsCount: numberValue(normalizedUpstreams?.models?.length ?? row.modelsCount) ?? row.modelsCount,
+      ...balanceFields(balance, row),
+      detailStatus: "fresh",
+      detailUpdatedAt: new Date().toISOString(),
+      error: undefined
+    };
+  }
+
+  public async rawSellerConfig(id: string): Promise<{ entry: SellerRegistryEntry; profileName?: string; config: any }> {
+    const { entry } = await this.resolveSellerTarget(id);
     const match = this.matchSellerProfile(entry);
     if (!match.profile) {
       throw new Error(`seller \`${entry.id}\` has no matching local admin profile`);
@@ -438,17 +602,76 @@ export class AdminUiState {
     return { entry, profileName: match.localProfile ? match.name : undefined, config: response.config || response };
   }
 
+  private async resolveSellerTarget(id: string): Promise<SellerTarget> {
+    let document: SellerRegistryDocument | undefined;
+    let registryError: unknown;
+    try {
+      document = await this.fetchManagedRegistry();
+    } catch (err) {
+      registryError = err;
+      document = { version: 0, sellers: [] };
+    }
+
+    const flyApps = await this.fetchFlyApps().catch(() => []);
+    const flyByName = new Map(flyApps.map((app) => [app.name, app]));
+    const entry = document.sellers.find((seller) => seller.id === id || seller.name === id || seller.app === id);
+    if (entry) {
+      const flyApp = findFlyAppForEntry(flyByName, entry);
+      return { entry, flyApp, dataSource: flyApp ? "both" : "registry" };
+    }
+
+    const flyApp = flyApps.find((app) => app.name === id || app.name === `tb-seller-${id}` || app.name === id.replace(/^tb-seller-/, ""));
+    if (flyApp) {
+      return { entry: sellerEntryFromFlyApp(flyApp), flyApp, dataSource: "fly" };
+    }
+
+    if (registryError) {
+      throw registryError;
+    }
+    throw new Error(`seller \`${id}\` not found in fly.io apps or bootstrap registry`);
+  }
+
   public async fetchRegistry(): Promise<SellerRegistryDocument> {
     const profile = this.activeBootstrapProfile();
     const baseUrl = this.options.url || profile.profile?.url;
     if (!baseUrl) {
       throw new Error("No bootstrap profile found. Configure an admin profile or pass --url.");
     }
-    const document = await this.fetchJson(`${trimSlash(baseUrl)}/registry/sellers`) as SellerRegistryDocument;
-    if (!document || !Array.isArray(document.sellers)) {
-      throw new Error("bootstrap registry response did not include sellers");
+    return normalizeRegistryDocument(
+      await this.fetchBootstrapJson(`${trimSlash(baseUrl)}/registry/sellers`),
+      "bootstrap registry response"
+    );
+  }
+
+  public async fetchManagedRegistry(): Promise<SellerRegistryDocument> {
+    const profile = this.activeBootstrapProfile();
+    const baseUrl = this.options.url || profile.profile?.url;
+    const token = this.options.token || profile.profile?.token;
+    if (!baseUrl) {
+      throw new Error("No bootstrap profile found. Configure an admin profile or pass --url.");
+    }
+    if (!token) {
+      return this.fetchRegistry();
+    }
+
+    try {
+      const managed = normalizeRegistryDocument(
+        await this.fetchBootstrapJson(`${trimSlash(baseUrl)}/platform/sellers`, {
+          headers: { Authorization: `Bearer ${token}` }
+        }),
+        "platform sellers response"
+      );
+      const publicDoc = await this.fetchRegistry().catch(() => undefined);
+      if (!publicDoc) {
+        return managed;
+      }
+      return mergeRegistryDocuments(publicDoc, managed);
+    } catch (err: any) {
+      if (isUnavailablePlatformSellersEndpoint(err)) {
+        return this.fetchRegistry();
+      }
+      throw err;
     }
-    return document;
   }
 
   public activeBootstrapProfile(): ProfileMatch {
@@ -511,10 +734,11 @@ export class AdminUiState {
   private async sellerSnapshot(
     entry: SellerRegistryEntry,
     flyApp: import("./seller.js").SellerAppJson | undefined,
-    dataSource: SellerDataSource
+    dataSource: SellerDataSource,
+    options: { includeOperator?: boolean; balanceTimeoutMs?: number; machineSpecs?: import("./seller.js").SellerMachineSpecs } = {}
   ): Promise<SellerSnapshot> {
     const match = this.matchSellerProfile(entry);
-    const baseRow = baseSellerRow(entry, match.name, dataSource, flyApp);
+    const baseRow = baseSellerRow(entry, match.name, dataSource, flyApp, options.machineSpecs);
 
     // Step 13: 立即下线 / Apply 按钮 hint 文案
     if (dataSource === "registry") {
@@ -525,86 +749,82 @@ export class AdminUiState {
       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);
+    if (dataSource === "registry") {
       return {
         row: {
           ...baseRow,
-          nodeStatus: manifestOk ? "active" : "unknown",
-          error: manifestOk ? undefined : "未发布到 registry, /manifest 探测失败 (不视为事故)"
+          nodeStatus: "unknown"
         }
       };
     }
-    if (dataSource === "both" && !match.profile) {
-      // both 但 vendor profile 缺 — 还是 unknown (灰点), 1.0.31 老行为
-      // 会落 auth_unknown, 现在用 unknown 让 UI 不会显得像 "鉴权失败".
+
+    let manifestOk = false;
+    const manifestPromise = this.probeManifest(entry.url).then((ok) => {
+      manifestOk = ok;
+      return ok;
+    });
+
+    if (dataSource === "fly" && (!options.includeOperator || !match.profile)) {
+      // fly-only 行没 registry entry, 也可能没 profile. 仍然跑 manifest
+      // probe (entry.url 来自 flyApp 推断 https://<name>.fly.dev), 但
+      // 没 profile 时只算 "unknown" (灰点) — 因为 vendor 没法管控一个
+      // 还没发布的 instance, 不该 throw auth_unknown 把 UI 卡死.
+      manifestOk = await manifestPromise;
       return {
         row: {
           ...baseRow,
-          nodeStatus: "unknown",
-          error: "No matching local admin profile"
+          nodeStatus: manifestOk ? "active" : "unknown",
+          error: manifestOk ? undefined : "未发布到 registry, /manifest 探测失败 (不视为事故)"
         }
       };
     }
 
-    // Step 13: 绿点 = fetch <entry.url>/manifest 200 OK
-    // (registry-only 行 skip 这个 fetch, 因为 entry.url 可能指向死链)
-    if (dataSource === "registry") {
+    if (!match.profile) {
+      manifestOk = await manifestPromise;
       return {
         row: {
           ...baseRow,
-          nodeStatus: "unknown"
+          nodeStatus: manifestOk ? "active" : "unknown",
+          error: manifestOk ? "No matching local admin profile" : "No matching local admin profile; /manifest probe failed"
         }
       };
     }
-
     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([
+      const [, status, service, upstreams, config] = await Promise.all([
+        manifestPromise,
         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 })),
         this.fetchSellerAdminJson(match.profile, "/operator/admin/upstreams").catch((err: any) => ({ error: err.message })),
         this.fetchSellerAdminJson(match.profile, "/operator/admin/config").catch((err: any) => ({ error: err.message }))
       ]);
       const configDocument = config?.config || config || {};
-      const balance = await this.balanceSnapshot(configDocument, upstreams);
+      const balance = await this.balanceSnapshot(match.profile, configDocument, upstreams, options.balanceTimeoutMs);
       return {
         status,
         service,
         upstreams,
         config,
         balance,
-        row: mergeSellerRow(baseRow, entry, status, service, upstreams, configDocument, balance)
+        row: mergeSellerRow(
+          {
+            ...baseRow,
+            nodeStatus: manifestOk ? "active" : baseRow.nodeStatus
+          },
+          entry,
+          status,
+          service,
+          upstreams,
+          configDocument,
+          balance,
+          manifestOk
+        )
       };
     } catch (err: any) {
+      await manifestPromise.catch(() => false);
       return {
         row: {
           ...baseRow,
-          nodeStatus: "unknown",
+          nodeStatus: manifestOk ? "active" : "unknown",
           error: err.message
         }
       };
@@ -632,22 +852,58 @@ export class AdminUiState {
     }
   }
 
-  private async fetchSellerAdminJson(profile: AdminProfile, pathName: string): Promise<any> {
-    return this.fetchJson(`${trimSlash(profile.url)}${pathName}`, {
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${profile.token}`
+  private async fetchSellerAdminJson(profile: AdminProfile, pathName: string, options: { timeoutMs?: number } = {}): Promise<any> {
+    const controller = options.timeoutMs ? new AbortController() : undefined;
+    const timer = controller ? setTimeout(() => controller.abort(), options.timeoutMs) : undefined;
+    try {
+      return await this.fetchJson(`${trimSlash(profile.url)}${pathName}`, {
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${profile.token}`
+        },
+        ...(controller ? { signal: controller.signal } : {})
+      });
+    } finally {
+      if (timer) {
+        clearTimeout(timer);
       }
-    });
+    }
+  }
+
+  private async fetchBootstrapJson(url: string, init?: RequestInit): Promise<unknown> {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), 10000);
+    try {
+      return await this.fetchJson(url, { ...init, signal: controller.signal });
+    } finally {
+      clearTimeout(timer);
+    }
   }
 
-  private async balanceSnapshot(config: any, upstreams: any): Promise<BalanceSnapshot | undefined> {
+  private async balanceSnapshot(profile: AdminProfile, config: any, upstreams: any, timeoutMs?: number): Promise<BalanceSnapshot | undefined> {
     if (config?.error) {
       return undefined;
     }
     if (stringValue(config.upstreamBalanceProbe?.template) === "none") {
       return undefined;
     }
+    const operatorBalance = await this.operatorBalanceSnapshot(profile, timeoutMs).catch(() => undefined);
+    if (operatorBalance) {
+      return operatorBalance;
+    }
+    if (isRedactedConfigSecret(config.upstreamApiKey)) {
+      return {
+        rawAmount: null,
+        amountUsdMicros: null,
+        currency: null,
+        source: "unknown",
+        fetchedAt: Date.now(),
+        error: {
+          httpStatus: 0,
+          message: "seller balance endpoint unavailable"
+        }
+      };
+    }
     return probeUpstreamBalance({
       upstreamUrl: stringValue(config.upstreamUrl || upstreams?.upstreamUrl),
       upstreamBalanceUrl: stringValue(config.upstreamBalanceUrl || upstreams?.upstreamBalanceUrl),
@@ -656,20 +912,32 @@ export class AdminUiState {
       upstreamBalanceProbe: objectValue(config.upstreamBalanceProbe)
     }, {
       fetch: this.options.balanceFetch,
-      cache: this.balanceCache
+      cache: this.balanceCache,
+      timeoutMs
     });
   }
+
+  private async operatorBalanceSnapshot(profile: AdminProfile, timeoutMs?: number): Promise<BalanceSnapshot | undefined> {
+    return await this.fetchSellerAdminJson(profile, "/operator/admin/upstream-balance", { timeoutMs })
+      .then((response) => {
+        const responseObject = objectValue(response);
+        const balance = objectValue(responseObject?.balance) || responseObject;
+        return balance as BalanceSnapshot | undefined;
+      });
+  }
 }
 
 async function defaultFetchJson(url: string, init?: RequestInit): Promise<unknown> {
   // Step 13 v1.1: 3s timeout 避免坏 host / DNS 卡死整个 admin web.
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), 3000);
+  const controller = init?.signal ? undefined : new AbortController();
+  const timer = controller ? setTimeout(() => controller.abort(), 3000) : undefined;
   let response: Response;
   try {
-    response = await fetch(url, { ...init, signal: controller.signal });
+    response = await fetch(url, controller ? { ...init, signal: controller.signal } : init);
   } finally {
-    clearTimeout(timer);
+    if (timer) {
+      clearTimeout(timer);
+    }
   }
   if (!response.ok) {
     const text = await response.text();
@@ -683,8 +951,10 @@ function baseSellerRow(
   entry: SellerRegistryEntry,
   profile?: string,
   dataSource: SellerDataSource = "registry",
-  flyApp?: import("./seller.js").SellerAppJson
+  flyApp?: import("./seller.js").SellerAppJson,
+  machineSpecs?: import("./seller.js").SellerMachineSpecs
 ): SellerRow {
+  const primaryRegion = entry.region || machineSpecs?.regions?.[0];
   return {
     id: entry.id,
     name: entry.id,
@@ -696,15 +966,25 @@ function baseSellerRow(
     // Step 13 v1.1: 绿点 base 改 unknown, 真正值由 sellerSnapshot
     // 拿 /manifest 200 决定. 老逻辑直接复用 entry.status 是错的.
     nodeStatus: "unknown",
-    region: entry.region,
+    region: primaryRegion,
     upstreamDomain: hostName(entry.url) || "unknown",
     upstreamStatus: "unknown",
     modelsCount: entry.modelsCount ?? entry.models?.length ?? entry.sampleModels?.length,
     specs: {
-      region: entry.region,
+      cpuKind: machineSpecs?.cpuKind,
+      cpuCores: machineSpecs?.cpuCores,
+      memoryMb: machineSpecs?.memoryMb,
+      memoryGb: machineSpecs?.memoryMb ? Number((machineSpecs.memoryMb / 1024).toFixed(2)) : undefined,
+      machines: machineSpecs?.machines,
+      runningMachines: machineSpecs?.runningMachines,
+      volumeGb: machineSpecs?.volumeGb,
+      region: primaryRegion,
+      regions: machineSpecs?.regions,
       modelsCount: entry.modelsCount ?? entry.models?.length ?? entry.sampleModels?.length
     },
     dataSource,
+    publishStatus: dataSource === "both" ? "published" : dataSource === "fly" ? "unpublished" : "unknown",
+    detailStatus: "pending",
     flyApp: flyApp ? {
       name: flyApp.name,
       status: flyApp.status,
@@ -714,6 +994,54 @@ function baseSellerRow(
   };
 }
 
+function isSellerFlyAppName(name: string | undefined): boolean {
+  return Boolean(name && (name.startsWith("tbs-") || name.startsWith("tb-seller-")) && name !== "tb-seller");
+}
+
+function sellerEntryFromFlyApp(app: import("./seller.js").SellerAppJson): SellerRegistryEntry {
+  return {
+    id: app.name,
+    name: app.name,
+    app: app.name,
+    url: `https://${app.name}.fly.dev`,
+    supportedProtocols: [],
+    paymentMethods: [],
+    models: []
+  };
+}
+
+function findFlyAppForEntry(
+  flyByName: Map<string, import("./seller.js").SellerAppJson>,
+  entry: SellerRegistryEntry
+): import("./seller.js").SellerAppJson | undefined {
+  for (const key of [entry.app, entry.id, entry.name]) {
+    const normalized = stringValue(key);
+    if (!normalized) {
+      continue;
+    }
+    const match = flyByName.get(normalized);
+    if (match) {
+      return match;
+    }
+  }
+  return undefined;
+}
+
+function sellerEntryFromRow(row: SellerRow): SellerRegistryEntry {
+  return {
+    id: row.id,
+    name: row.name,
+    app: row.app || row.flyApp?.name || row.id,
+    url: row.url,
+    status: row.registryStatus,
+    region: row.region,
+    modelsCount: row.modelsCount,
+    supportedProtocols: [],
+    paymentMethods: [],
+    models: []
+  };
+}
+
 function mergeSellerRow(
   base: SellerRow,
   entry: SellerRegistryEntry,
@@ -721,7 +1049,8 @@ function mergeSellerRow(
   service: any,
   upstreams: any,
   config: any,
-  balance: BalanceSnapshot | undefined
+  balance: BalanceSnapshot | undefined,
+  manifestOk = false
 ): SellerRow {
   const normalizedUpstreams = upstreamDocument(upstreams);
   const capacity = status?.capacity || service?.capacity || {};
@@ -729,12 +1058,13 @@ function mergeSellerRow(
   const error = firstError(status, service, upstreams);
   return {
     ...base,
-    nodeStatus: error ? "unknown" : nodeStatus(status?.status || entry.status),
+    nodeStatus: error ? (manifestOk ? "active" : "unknown") : (manifestOk ? "active" : nodeStatus(status?.status || entry.status)),
     upstreamDomain: hostName(upstreamUrl) || base.upstreamDomain,
     upstreamStatus: upstreamStatus(status?.upstream?.status || normalizedUpstreams?.status),
     discountRatio: numberValue(config?.discountRatio ?? normalizedUpstreams?.discountRatio),
     capacityUsed: numberValue(capacity.activeConnections),
     capacityLimit: numberValue(capacity.maxConnections),
+    ...runtimeUsageFields(status?.runtime, base),
     ttftMs: numberValue(status?.latency?.ttftMs),
     avgInferenceMs: numberValue(status?.latency?.avgInferenceMs),
     lastInferenceMs: numberValue(status?.latency?.lastInferenceMs),
@@ -750,13 +1080,50 @@ function mergeSellerRow(
     modelsCount: numberValue(service?.modelsCount ?? normalizedUpstreams?.models?.length ?? base.modelsCount),
     specs: {
       ...base.specs,
-      region: entry.region,
+      region: entry.region || base.specs?.region,
       modelsCount: numberValue(service?.modelsCount ?? normalizedUpstreams?.models?.length ?? base.modelsCount)
     },
     error
   };
 }
 
+function runtimeUsageFields(runtime: any, fallback: SellerRow): Partial<SellerRow> {
+  return {
+    resourceCpuPercent: numberValue(runtime?.cpuPercent) ?? fallback.resourceCpuPercent,
+    resourceMemoryPercent: numberValue(runtime?.memoryPercent) ?? fallback.resourceMemoryPercent,
+    resourceMemoryRssMb: numberValue(runtime?.memoryRssMb) ?? fallback.resourceMemoryRssMb,
+    resourceMemoryLimitMb: numberValue(runtime?.memoryLimitMb) ?? fallback.resourceMemoryLimitMb
+  };
+}
+
+function balanceFields(balance: BalanceSnapshot | undefined, fallback: SellerRow): Partial<SellerRow> {
+  if (!balance) {
+    return {};
+  }
+  return {
+    upstreamBalanceUsdMicros: Number.isFinite(balance.amountUsdMicros ?? NaN) ? (balance.amountUsdMicros as number) : undefined,
+    upstreamBalanceCurrency: typeof balance.currency === "string" ? balance.currency : undefined,
+    upstreamBalanceSource: balance.source,
+    upstreamBalanceFetchedAt: new Date(balance.fetchedAt).toISOString(),
+    upstreamBalanceError: balance.error?.message,
+    upstreamRechargeUrl: fallback.upstreamRechargeUrl
+  };
+}
+
+function unavailableBalanceSnapshot(message: string): BalanceSnapshot {
+  return {
+    rawAmount: null,
+    amountUsdMicros: null,
+    currency: null,
+    source: "unknown",
+    fetchedAt: Date.now(),
+    error: {
+      httpStatus: 0,
+      message
+    }
+  };
+}
+
 function modelRows(upstreams: any, config: any, status: any): SellerModelRow[] {
   const normalizedUpstreams = upstreamDocument(upstreams);
   const aliases = config.modelAliases || normalizedUpstreams.modelAliases || {};
@@ -819,6 +1186,9 @@ export function maskApiKey(value: unknown): string | undefined {
   if (!normalized) {
     return undefined;
   }
+  if (isRedactedConfigSecret(normalized)) {
+    return "configured";
+  }
   const tail = normalized.replace(/\s+/g, "").slice(-4);
   return tail ? `**** **** **** ${tail}` : "****";
 }
@@ -865,6 +1235,10 @@ function objectValue(value: unknown): Record<string, unknown> | undefined {
     : undefined;
 }
 
+function isRedactedConfigSecret(value: unknown): boolean {
+  return value === "[redacted]";
+}
+
 function priceString(value: unknown): string | undefined {
   const parsed = numberValue(value);
   if (parsed === undefined) {
@@ -890,3 +1264,51 @@ function firstError(...values: any[]): string | undefined {
   const hit = values.find((value) => value?.error);
   return hit?.error;
 }
+
+function normalizeRegistryDocument(value: unknown, label: string): SellerRegistryDocument {
+  if (!value || typeof value !== "object" || !Array.isArray((value as { sellers?: unknown }).sellers)) {
+    throw new Error(`${label} did not include sellers`);
+  }
+  const document = value as Partial<SellerRegistryDocument> & { sellers: SellerRegistryEntry[] };
+  return {
+    version: numberValue(document.version) ?? 0,
+    updatedAt: stringValue(document.updatedAt),
+    purpose: stringValue(document.purpose),
+    defaultSeller: stringValue(document.defaultSeller),
+    notes: Array.isArray(document.notes) ? document.notes.map((note) => stringValue(note)).filter((note): note is string => Boolean(note)) : undefined,
+    sellers: document.sellers
+  };
+}
+
+function mergeRegistryDocuments(publicDoc: SellerRegistryDocument, managedDoc: SellerRegistryDocument): SellerRegistryDocument {
+  const sellers = publicDoc.sellers.map((seller) => ({ ...seller }));
+  for (const managed of managedDoc.sellers) {
+    const index = sellers.findIndex((seller) => sameSellerEntry(seller, managed));
+    if (index >= 0) {
+      sellers[index] = { ...sellers[index], ...managed };
+    } else {
+      sellers.push(managed);
+    }
+  }
+  return {
+    version: publicDoc.version || managedDoc.version,
+    updatedAt: publicDoc.updatedAt || managedDoc.updatedAt,
+    purpose: publicDoc.purpose || managedDoc.purpose,
+    defaultSeller: publicDoc.defaultSeller || managedDoc.defaultSeller,
+    notes: publicDoc.notes || managedDoc.notes,
+    sellers
+  };
+}
+
+function sameSellerEntry(a: SellerRegistryEntry, b: SellerRegistryEntry): boolean {
+  const aKeys = new Set([a.id, a.app, a.name].map((value) => stringValue(value)).filter((value): value is string => Boolean(value)));
+  return [b.id, b.app, b.name].some((value) => {
+    const normalized = stringValue(value);
+    return normalized ? aKeys.has(normalized) : false;
+  });
+}
+
+function isUnavailablePlatformSellersEndpoint(err: unknown): boolean {
+  const message = err instanceof Error ? err.message : String(err || "");
+  return /HTTP Error (401|403|404)|Cannot GET \/platform\/sellers|vendor_auth|not found/i.test(message);
+}