nolo-cli 0.211.0 → 0.213.0

package/{agentListCommands-POKMEKMS.js → agentListCommands-OBLRBLHS.js}

@@ -10,61 +10,59 @@ import {
   listRemotePublicAgents,
   normalizeListedAgent,
   parseAgentListArgs
-} from "./chunk-ET2CWLIJ.js";
-import {
-  refreshSubscriptionQuotas
-} from "./chunk-YGILMZ7N.js";
+} from "./chunk-J2NHJ7WX.js";
 import {
   buildSpaceLookup,
   getSpaceContentKeys
 } from "./chunk-ID4G2MAR.js";
 import {
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-4LEGTOSR.js";
+} from "./chunk-VO4WSAVP.js";
+import {
+  refreshSubscriptionQuotas
+} from "./chunk-YGILMZ7N.js";
 import {
   getReadableCliDb
 } from "./chunk-J5JTMQIA.js";
-import {
-  queryUserRecords,
-  readDbRecord
-} from "./chunk-XDMGY5IU.js";
 import {
   applyCredentialAvailability,
   clearCredentialAvailabilityIfMarkedAt,
   readCredentialAvailability,
   readEffectiveCredentialEntry
-} from "./chunk-GSQNH63I.js";
-import "./chunk-7AUQ3WCW.js";
+} from "./chunk-YTF4WH7J.js";
+import {
+  queryUserRecords,
+  readDbRecord
+} from "./chunk-MOIJOHA5.js";
 import "./chunk-NBTY7YJF.js";
-import "./chunk-LKZPX6YH.js";
 import {
   buildAgentDiscoveryResult,
   matchesAgentQuery,
   resolvePaginationArgs,
   summarizeCredentialGroups,
   toDiscoverySafeAgentSummary
-} from "./chunk-YXOBCDNW.js";
-import "./chunk-OXME3PEE.js";
+} from "./chunk-QG4AOSON.js";
+import "./chunk-PCLE46CE.js";
 import {
   resolveNoloHome
 } from "./chunk-GLKOYSRU.js";
 import "./chunk-UEILX4EV.js";
-import "./chunk-D2MDMY2M.js";
-import "./chunk-ZOO3WJIE.js";
+import "./chunk-SVYO6AO7.js";
+import "./chunk-RSHTSUEG.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-NTSRCTUX.js";
-import "./chunk-TCTSYFDM.js";
+import "./chunk-OQPKUBPB.js";
+import "./chunk-CTPXME7U.js";
 import "./chunk-HNUWUO75.js";
 import "./chunk-CHOZJMJS.js";
 import "./chunk-PWTNI4N7.js";
 import "./chunk-Y63ZSOR6.js";
-import "./chunk-LNYHAKBP.js";
+import "./chunk-W4S457LU.js";
 import "./chunk-4KB6WQUL.js";
 import "./chunk-56GBUMO5.js";
-import "./chunk-W5VC7F7V.js";
-import "./chunk-CVCRAO6Q.js";
+import "./chunk-5MQRBSMW.js";
+import "./chunk-H5HF7TJA.js";
 import "./chunk-E2BESSAW.js";
-import "./chunk-6HVBI6TI.js";
+import "./chunk-RZOV7OMV.js";
 import {
   DEFAULT_PROVIDER_RETRY_MS,
   formatQuotaSummary,
@@ -73,35 +71,36 @@ import {
   resolveCredentialCandidateKeys,
   resolveCredentialKeyWithFallback,
   shouldClearCooldownFromQuota
-} from "./chunk-YUXQAVRD.js";
-import "./chunk-2WZXXAQD.js";
-import "./chunk-DA7CTWT4.js";
+} from "./chunk-3UKL3HPD.js";
+import "./chunk-KC4XDTT3.js";
+import "./chunk-YB3YZK56.js";
+import "./chunk-YWSEPJ7C.js";
 import "./chunk-WJZOQR2J.js";
-import "./chunk-CKOO42G5.js";
+import "./chunk-UHJGXRJ4.js";
 import "./chunk-2MBTWINN.js";
-import "./chunk-WTKYP6QO.js";
-import "./chunk-5ZUL4CUO.js";
-import "./chunk-BTYQAODF.js";
+import "./chunk-V5Y3R6BT.js";
+import "./chunk-7BT37FK3.js";
 import "./chunk-H57T64RA.js";
+import "./chunk-5ZUL4CUO.js";
 import "./chunk-UKZX3NHN.js";
 import "./chunk-5MMAK75Q.js";
-import "./chunk-TRZP7JZ7.js";
-import "./chunk-UIOEHFF6.js";
+import "./chunk-2QHFH3DR.js";
+import "./chunk-OQHIVPG4.js";
 import "./chunk-KX6YBIHG.js";
 import "./chunk-DWLEOOGR.js";
 import "./chunk-7DPNBQSV.js";
-import "./chunk-G7Y4GXTY.js";
+import "./chunk-T43B7LB2.js";
 import "./chunk-ZRSNONOB.js";
 import "./chunk-4VJAC32I.js";
-import "./chunk-AKE53VMW.js";
+import "./chunk-CJEIOP3E.js";
+import "./chunk-ZCWRMUWT.js";
 import "./chunk-ZC3CMUKU.js";
 import "./chunk-LOEO7LRC.js";
 import "./chunk-M2EJHDJP.js";
-import "./chunk-PLYWH7XM.js";
-import "./chunk-XPHZK3PJ.js";
+import "./chunk-KIM6CLW5.js";
+import "./chunk-H4UOTUOX.js";
 import "./chunk-PSCNXBYA.js";
-import "./chunk-6UBGXX2W.js";
-import "./chunk-PV6JJAUB.js";
+import "./chunk-TCZHTTUU.js";
 import "./chunk-YUA6OAH5.js";
 import "./chunk-SM3NSZJV.js";
 import "./chunk-JRTNUU5Z.js";
@@ -109,6 +108,8 @@ import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
 import "./chunk-KUG52IAP.js";
+import "./chunk-GOO6G4PY.js";
+import "./chunk-QSJ3HFEF.js";
 import {
   parseUserIdFromAuthToken,
   readOption,
@@ -123,26 +124,26 @@ import "./chunk-CF7PE763.js";
 import "./chunk-4O22PGNQ.js";
 import {
   t
-} from "./chunk-3RQVYR4B.js";
+} from "./chunk-VNYYOX3V.js";
+import "./chunk-G7Y4GXTY.js";
+import "./chunk-6UBGXX2W.js";
 import {
   createKey,
   createTokenKey
-} from "./chunk-ECX3NKRD.js";
+} from "./chunk-JY5NGFFH.js";
 import "./chunk-XJWWBO34.js";
 import "./chunk-I42VC5KR.js";
 import "./chunk-U6VC4MU4.js";
 import "./chunk-WWC7I6TA.js";
 import "./chunk-3EUW3WEO.js";
 import "./chunk-G3SUCT4W.js";
-import "./chunk-T43B7LB2.js";
-import "./chunk-GOO6G4PY.js";
-import "./chunk-QSJ3HFEF.js";
 import "./chunk-4VNS5WPM.js";
 
 // packages/ai/agent/speedSampleCache.ts
 var SPEED_SAMPLE_DISK_CACHE_TTL_MS = 10 * 6e4;
-var SPEED_SAMPLE_SCAN_BUDGET_MS = 8e3;
-var SPEED_SAMPLE_CACHE_VERSION = 1;
+var SPEED_SAMPLE_SCAN_BUDGET_MS = 2500;
+var SPEED_SAMPLE_CACHE_VERSION = 2;
+var SPEED_SAMPLE_LEGACY_CACHE_VERSION = 1;
 var isFiniteNumber = (value) => typeof value === "number" && Number.isFinite(value);
 var sanitizeSample = (value) => {
   if (!value || typeof value !== "object") return null;
@@ -151,23 +152,25 @@ var sanitizeSample = (value) => {
   if (isFiniteNumber(sample.firstOutputMs)) clean.firstOutputMs = sample.firstOutputMs;
   if (isFiniteNumber(sample.callDurationMs)) clean.callDurationMs = sample.callDurationMs;
   if (isFiniteNumber(sample.output_tokens)) clean.output_tokens = sample.output_tokens;
+  if (isFiniteNumber(sample.t)) clean.t = sample.t;
   return clean.firstOutputMs === void 0 && clean.callDurationMs === void 0 ? null : clean;
 };
-async function readSpeedSamplesCache(cachePath, options) {
-  const ttlMs = isFiniteNumber(options.ttlMs) ? options.ttlMs : SPEED_SAMPLE_DISK_CACHE_TTL_MS;
+var SPEED_SAMPLE_STALE_SNAPSHOT_MAX_MS = 7 * 24 * 60 * 6e4;
+async function parseCacheFile(cachePath, userId) {
   try {
     const fs = await import("node:fs/promises");
     const raw = await fs.readFile(cachePath, "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object") return null;
-    if (parsed.version !== SPEED_SAMPLE_CACHE_VERSION) return null;
-    if (parsed.userId !== options.userId) return null;
+    const version = parsed.version;
+    if (version !== SPEED_SAMPLE_CACHE_VERSION && version !== SPEED_SAMPLE_LEGACY_CACHE_VERSION) {
+      return null;
+    }
+    if (parsed.userId !== userId) return null;
     if (!isFiniteNumber(parsed.at)) return null;
-    const age = options.now - parsed.at;
-    if (age < 0 || age >= ttlMs) return null;
-    const samples = /* @__PURE__ */ new Map();
     const source = parsed.samples;
     if (!source || typeof source !== "object") return null;
+    const samples = /* @__PURE__ */ new Map();
     for (const [model, list] of Object.entries(source)) {
       if (!model || !Array.isArray(list)) continue;
       const cleaned = [];
@@ -177,17 +180,42 @@ async function readSpeedSamplesCache(cachePath, options) {
       }
       samples.set(model, cleaned);
     }
-    return samples;
+    const complete = version === SPEED_SAMPLE_LEGACY_CACHE_VERSION ? true : parsed.complete === true;
+    const cursor = typeof parsed.cursor === "string" && parsed.cursor.length > 0 ? parsed.cursor : void 0;
+    return { samples, at: parsed.at, complete, cursor: complete ? void 0 : cursor };
   } catch {
     return null;
   }
 }
+async function readSpeedSamplesSnapshot(cachePath, options) {
+  const maxAgeMs = isFiniteNumber(options.maxAgeMs) ? options.maxAgeMs : SPEED_SAMPLE_STALE_SNAPSHOT_MAX_MS;
+  const parsed = await parseCacheFile(cachePath, options.userId);
+  if (!parsed || !parsed.complete) return null;
+  const age = options.now - parsed.at;
+  if (age < 0 || age >= maxAgeMs) return null;
+  return { samples: parsed.samples, ageMs: age };
+}
+async function readSpeedSamplesProgress(cachePath, userId) {
+  const parsed = await parseCacheFile(cachePath, userId);
+  if (!parsed) return null;
+  return {
+    samples: parsed.samples,
+    at: parsed.at,
+    complete: parsed.complete,
+    ...parsed.cursor === void 0 ? {} : { cursor: parsed.cursor }
+  };
+}
+function resolveSpeedSamplesProgressPath(cachePath) {
+  return `${cachePath}.progress`;
+}
 async function writeSpeedSamplesCache(cachePath, payload) {
   try {
     const fs = await import("node:fs/promises");
     const path2 = await import("node:path");
     await fs.mkdir(path2.dirname(cachePath), { recursive: true });
-    await fs.writeFile(cachePath, JSON.stringify(payload), "utf8");
+    const tmpPath = `${cachePath}.tmp-${process.pid}-${Math.random().toString(36).slice(2, 8)}`;
+    await fs.writeFile(tmpPath, JSON.stringify(payload), "utf8");
+    await fs.rename(tmpPath, cachePath);
   } catch {
   }
 }
@@ -242,18 +270,28 @@ function resolveCandidateSpeedFacts(models, samplesByModel) {
 }
 var formatSeconds = (ms) => `${(ms / 1e3).toFixed(1)}s`;
 var formatTps = (tps) => String(Math.round(tps));
-var SPEED_CONTEXT_HEADER = "speed (observed=\u672C\u7528\u6237\u6700\u8FD1\u8C03\u7528\u4E2D\u4F4D\u6570, firstOutput \u542B\u63A8\u7406\u8F93\u51FA; tps=generation\uFF08\u4E0D\u542B\u7AEF\u5230\u7AEF\u53E3\u5F84\uFF09, tps=n/a \u8868\u793A\u65E0\u53EF\u4FE1\u541E\u5410\u6837\u672C\u3002\u672A\u5217\u51FA\u7684 model \u8868\u793A\u6CA1\u6709\u5B9E\u6D4B\u6837\u672C\uFF0C\u4E0D\u4EE3\u8868\u6162):";
-function formatCandidateSpeedFacts(facts) {
+var SPEED_CONTEXT_HEADER = "speed (observed=\u672C\u7528\u6237\u5B9E\u6D4B\u8C03\u7528\u4E2D\u4F4D\u6570, firstOutput \u542B\u63A8\u7406\u8F93\u51FA; tps=generation\uFF08\u4E0D\u542B\u7AEF\u5230\u7AEF\u53E3\u5F84\uFF09, tps=n/a \u8868\u793A\u65E0\u53EF\u4FE1\u541E\u5410\u6837\u672C\u3002\u672A\u5217\u51FA\u7684 model \u8868\u793A\u6CA1\u6709\u5B9E\u6D4B\u6837\u672C\uFF0C\u4E0D\u4EE3\u8868\u6162):";
+function formatSnapshotAge(ageMs) {
+  const minutes = Math.floor(ageMs / 6e4);
+  if (minutes < 1) return "<1min";
+  if (minutes < 60) return `${minutes}min`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) return `${hours}h`;
+  return `${Math.floor(hours / 24)}d`;
+}
+function formatCandidateSpeedFacts(facts, options = {}) {
   if (facts.length === 0) return null;
   const lines = facts.map((fact) => {
     const tps = fact.outputTps !== void 0 ? formatTps(fact.outputTps) : "n/a";
     return `  ${fact.model}: firstOutput=${formatSeconds(fact.firstOutputMs ?? 0)} tps=${tps} [observed n=${fact.firstOutputSamples ?? 0} tpsN=${fact.tpsSamples ?? 0}]`;
   });
-  return `${SPEED_CONTEXT_HEADER}
+  const age = options.snapshotAgeMs;
+  const note = typeof age === "number" && age > 0 ? `  (snapshot=${formatSnapshotAge(age)}\u524D\u91C7\u96C6\u7684\u5B8C\u6574\u7A97\u53E3, \u975E\u672C\u6B21\u5B9E\u65F6\u626B\u63CF)` : "";
+  return `${SPEED_CONTEXT_HEADER}${note}
 ${lines.join("\n")}`;
 }
-function buildCandidateSpeedContext(models, samplesByModel) {
-  return formatCandidateSpeedFacts(resolveCandidateSpeedFacts(models, samplesByModel));
+function buildCandidateSpeedContext(models, samplesByModel, options = {}) {
+  return formatCandidateSpeedFacts(resolveCandidateSpeedFacts(models, samplesByModel), options);
 }
 var SPEED_SAMPLE_PAGE_SIZE = 2e3;
 var eventTime = (value) => {
@@ -275,13 +313,14 @@ function collectSample(collected, value) {
   });
   collected.set(model, list);
 }
-function finalizeSamples(collected) {
+function finalizeSamples(collected, keepTime = false) {
   const result = /* @__PURE__ */ new Map();
   for (const [model, list] of collected) {
     list.sort((a, b) => b.t - a.t);
+    const window = list.slice(0, OBSERVED_SPEED_WINDOW);
     result.set(
       model,
-      list.slice(0, OBSERVED_SPEED_WINDOW).map(({ t: _t, ...sample }) => sample)
+      keepTime ? window : window.map(({ t: _t, ...sample }) => sample)
     );
   }
   return result;
@@ -293,8 +332,9 @@ async function collectRecentSpeedSamples(db, userId, options = {}) {
   const failedPrefix = createKey("token", userId, "failed-call", "");
   const collected = /* @__PURE__ */ new Map();
   const startedAt = Date.now();
-  let lastKey;
+  let lastKey = options.startAfter;
   let budgetExhausted = false;
+  let scanned = 0;
   while (true) {
     if (Date.now() - startedAt >= budgetMs) {
       budgetExhausted = true;
@@ -311,6 +351,7 @@ async function collectRecentSpeedSamples(db, userId, options = {}) {
       if (typeof key !== "string") continue;
       if (lastKey !== void 0 && key <= lastKey) continue;
       accepted += 1;
+      scanned += 1;
       newestKey = key;
       if (key.startsWith(failedPrefix)) continue;
       if (!raw || typeof raw !== "object") continue;
@@ -319,31 +360,75 @@ async function collectRecentSpeedSamples(db, userId, options = {}) {
     if (accepted === 0 || accepted < pageSize) break;
     lastKey = newestKey;
   }
-  return { samples: finalizeSamples(collected), budgetExhausted };
+  return {
+    samples: finalizeSamples(collected, options.keepTime === true),
+    budgetExhausted,
+    scanned,
+    ...budgetExhausted && lastKey !== void 0 ? { nextCursor: lastKey } : {}
+  };
 }
-async function loadRecentSpeedSamples(db, userId, options = {}) {
-  const { samples } = await collectRecentSpeedSamples(db, userId, options);
-  return samples;
+function mergeNewestSamples(into, from) {
+  for (const [model, list] of from) {
+    const merged = [...into.get(model) ?? [], ...list];
+    merged.sort(
+      (a, b) => (b.t ?? 0) - (a.t ?? 0)
+    );
+    into.set(model, merged.slice(0, OBSERVED_SPEED_WINDOW));
+  }
 }
 async function loadSpeedSamplesWithDiskCache(db, userId, now, cache) {
   try {
     const ttlMs = isFiniteNumber2(cache.ttlMs) ? cache.ttlMs : SPEED_SAMPLE_DISK_CACHE_TTL_MS;
-    const cached = await readSpeedSamplesCache(cache.cachePath, { userId, now, ttlMs });
-    if (cached) return cached;
-    const { samples, budgetExhausted } = await collectRecentSpeedSamples(db, userId, {
-      pageSize: cache.pageSize,
-      budgetMs: isFiniteNumber2(cache.budgetMs) ? cache.budgetMs : SPEED_SAMPLE_SCAN_BUDGET_MS
-    });
-    if (budgetExhausted) return /* @__PURE__ */ new Map();
-    await writeSpeedSamplesCache(cache.cachePath, {
+    const snapshot = await readSpeedSamplesSnapshot(cache.cachePath, { userId, now });
+    if (snapshot && snapshot.ageMs < ttlMs) return { samples: snapshot.samples };
+    const progressPath = resolveSpeedSamplesProgressPath(cache.cachePath);
+    const progress = await readSpeedSamplesProgress(progressPath, userId);
+    const resumable = progress && !progress.complete && progress.cursor ? progress : void 0;
+    const collected = new Map(resumable?.samples ?? []);
+    let step;
+    try {
+      step = await collectRecentSpeedSamples(db, userId, {
+        pageSize: cache.pageSize,
+        budgetMs: isFiniteNumber2(cache.budgetMs) ? cache.budgetMs : SPEED_SAMPLE_SCAN_BUDGET_MS,
+        keepTime: true,
+        ...resumable?.cursor ? { startAfter: resumable.cursor } : {}
+      });
+    } catch {
+      return snapshot ? { samples: snapshot.samples, snapshotAgeMs: snapshot.ageMs } : { samples: /* @__PURE__ */ new Map() };
+    }
+    if (!resumable && step.scanned === 0 && !step.budgetExhausted) {
+      return snapshot ? { samples: snapshot.samples, snapshotAgeMs: snapshot.ageMs } : { samples: /* @__PURE__ */ new Map() };
+    }
+    mergeNewestSamples(collected, step.samples);
+    if (!step.budgetExhausted) {
+      await writeSpeedSamplesCache(cache.cachePath, {
+        version: SPEED_SAMPLE_CACHE_VERSION,
+        userId,
+        at: now,
+        complete: true,
+        samples: Object.fromEntries(collected)
+      });
+      await writeSpeedSamplesCache(progressPath, {
+        version: SPEED_SAMPLE_CACHE_VERSION,
+        userId,
+        at: now,
+        complete: true,
+        samples: {}
+      });
+      return { samples: collected };
+    }
+    await writeSpeedSamplesCache(progressPath, {
       version: SPEED_SAMPLE_CACHE_VERSION,
       userId,
-      at: now,
-      samples: Object.fromEntries(samples)
+      // Progress keeps the cycle's collection start so a later stale label stays honest.
+      at: resumable?.at ?? now,
+      complete: false,
+      samples: Object.fromEntries(collected),
+      ...step.nextCursor ? { cursor: step.nextCursor } : {}
     });
-    return samples;
+    return snapshot ? { samples: snapshot.samples, snapshotAgeMs: snapshot.ageMs } : { samples: /* @__PURE__ */ new Map() };
   } catch {
-    return /* @__PURE__ */ new Map();
+    return { samples: /* @__PURE__ */ new Map() };
   }
 }
 var samplesCache = /* @__PURE__ */ new Map();
@@ -359,12 +444,36 @@ function writeSamplesCache(userId, now, samples) {
     samplesCache.delete(oldest);
   }
 }
+var SPEED_SAMPLE_REFRESH_BUDGET_MS = 6e4;
+var snapshotRefreshes = /* @__PURE__ */ new Map();
+function startSpeedSnapshotRefresh(db, userId, now = Date.now()) {
+  const inFlight = snapshotRefreshes.get(userId);
+  if (inFlight) return inFlight;
+  const job = (async () => {
+    try {
+      const { samples, budgetExhausted } = await collectRecentSpeedSamples(db, userId, {
+        budgetMs: SPEED_SAMPLE_REFRESH_BUDGET_MS
+      });
+      if (!budgetExhausted) writeSamplesCache(userId, now, samples);
+    } catch {
+    }
+  })().finally(() => {
+    snapshotRefreshes.delete(userId);
+  });
+  snapshotRefreshes.set(userId, job);
+  return job;
+}
 async function loadCachedSpeedSamples(db, userId, now) {
   const hit = samplesCache.get(userId);
-  if (hit && now - hit.at < SPEED_SAMPLES_CACHE_TTL_MS) return hit.samples;
-  const samples = await loadRecentSpeedSamples(db, userId);
-  writeSamplesCache(userId, now, samples);
-  return samples;
+  if (hit) {
+    const age = now - hit.at;
+    if (age >= 0 && age < SPEED_SAMPLE_STALE_SNAPSHOT_MAX_MS) {
+      if (age >= SPEED_SAMPLES_CACHE_TTL_MS) void startSpeedSnapshotRefresh(db, userId);
+      return age >= SPEED_SAMPLES_CACHE_TTL_MS ? { samples: hit.samples, snapshotAgeMs: age } : { samples: hit.samples };
+    }
+  }
+  void startSpeedSnapshotRefresh(db, userId);
+  return { samples: /* @__PURE__ */ new Map() };
 }
 async function injectSpeedContextIntoListAgentsResult(result, options = {}) {
   try {
@@ -379,15 +488,18 @@ async function injectSpeedContextIntoListAgentsResult(result, options = {}) {
     if (models.length === 0) return result;
     const now = options.now ?? Date.now();
     let samples = /* @__PURE__ */ new Map();
+    let snapshotAgeMs;
     const userId = typeof options.userId === "string" ? options.userId.trim() : "";
     if (options.db && userId) {
       try {
-        samples = options.diskCache ? await loadSpeedSamplesWithDiskCache(options.db, userId, now, options.diskCache) : await loadCachedSpeedSamples(options.db, userId, now);
+        const loaded = options.diskCache ? await loadSpeedSamplesWithDiskCache(options.db, userId, now, options.diskCache) : await loadCachedSpeedSamples(options.db, userId, now);
+        samples = loaded.samples;
+        snapshotAgeMs = loaded.snapshotAgeMs;
       } catch {
         samples = /* @__PURE__ */ new Map();
       }
     }
-    const speedContext = buildCandidateSpeedContext(models, samples);
+    const speedContext = buildCandidateSpeedContext(models, samples, { snapshotAgeMs });
     return speedContext ? JSON.stringify({ ...parsed, speedContext }) : result;
   } catch {
     return result;
@@ -397,6 +509,12 @@ async function injectSpeedContextIntoListAgentsResult(result, options = {}) {
 // packages/cli/agentListCommands.ts
 import path from "node:path";
 var discardOutput = { write: () => void 0 };
+function formatCooldownUntilLocal(at, now = /* @__PURE__ */ new Date()) {
+  const pad = (value) => String(value).padStart(2, "0");
+  const time = `${pad(at.getHours())}:${pad(at.getMinutes())}`;
+  const sameDay = at.getFullYear() === now.getFullYear() && at.getMonth() === now.getMonth() && at.getDate() === now.getDate();
+  return sameDay ? time : `${pad(at.getMonth() + 1)}-${pad(at.getDate())} ${time}`;
+}
 function resolveSpeedSamplesCachePath(env, userId) {
   const safeUserId = userId.replace(/[^A-Za-z0-9._-]/g, "_");
   const mergedEnv = { ...process.env, ...env };
@@ -412,7 +530,7 @@ async function runAgentListCommand(args, deps = {}) {
   if (requestedScope && publicOnly && requestedScope !== "public") {
     throw new Error(`Conflicting arguments: scope='${requestedScope}' conflicts with publicOnly=true.`);
   }
-  const scope = requestedScope ?? "preferred";
+  const scope = requestedScope ?? "all";
   const spaceInput = readOption(args, "--space") ?? readOption(args, "--space-id");
   const authToken = resolveAuthToken(args, env);
   if (!authToken) {
@@ -478,7 +596,7 @@ async function runAgentListCommand(args, deps = {}) {
         limit: upstreamLimit,
         query: hasQuery ? query : void 0
       })));
-      agents = publicResults.flatMap((r) => r.agents);
+      const publicAgents = publicResults.flatMap((r) => r.agents);
       for (const r of publicResults) {
         if (r.truncated) cliUpstreamTruncated = true;
         if (typeof r.total === "number") {
@@ -486,14 +604,21 @@ async function runAgentListCommand(args, deps = {}) {
         }
       }
       if (scope === "all") {
-        const preferred = await listRemoteAgentsAcrossServers({
-          authToken,
-          fallbackFetchImpl,
-          fetchImpl,
-          serverUrls,
-          userId
-        });
-        agents = [...preferred.agents, ...agents];
+        const seenPublicKeys = /* @__PURE__ */ new Set();
+        for (const agent of agents) {
+          if (agent.publicKey) seenPublicKeys.add(agent.publicKey);
+        }
+        agents = [
+          ...agents,
+          ...publicAgents.filter((agent) => {
+            if (!agent.publicKey) return true;
+            if (seenPublicKeys.has(agent.publicKey)) return false;
+            seenPublicKeys.add(agent.publicKey);
+            return true;
+          })
+        ];
+      } else {
+        agents = publicAgents;
       }
     }
     agents = agents.filter((agent) => agent.privateKey.startsWith("agent-"));
@@ -535,7 +660,7 @@ async function runAgentListCommand(args, deps = {}) {
       await readCredentialAvailability(env).catch(() => ({}))
     );
     let unavailableCount = agents.filter((agent) => isAgentUnavailableNow(agent)).length;
-    let agentsForOutput = showUnavailable ? agents : agents.filter((agent) => !isAgentUnavailableNow(agent));
+    let agentsForOutput = agents;
     if (query && typeof query === "string" && query.trim()) {
       agentsForOutput = agentsForOutput.filter((agent) => matchesAgentQuery(agent, query));
     }
@@ -594,12 +719,6 @@ async function runAgentListCommand(args, deps = {}) {
         }
       }
       unavailableCount = agents.filter((agent) => isAgentUnavailableNow(agent)).length;
-      if (!showUnavailable) {
-        agentsForOutput = agents.filter((agent) => !isAgentUnavailableNow(agent));
-        if (query && typeof query === "string" && query.trim()) {
-          agentsForOutput = agentsForOutput.filter((agent) => matchesAgentQuery(agent, query));
-        }
-      }
     }
     const totalCount = agentsForOutput.length;
     const pagedAgents = typeof pagination.limit === "number" || typeof pagination.offset === "number" ? agentsForOutput.slice(
@@ -693,10 +812,11 @@ async function runAgentListCommand(args, deps = {}) {
         ...discovery.truncated ? { truncated: true } : {},
         unavailableCount: discovery.unavailableCount,
         // agents 在最前：host 截断长输出时保头保尾，派发所需的 agentKey
-        // 必须落在头部；凭证分组/限流清单是说明性大块，放最后。
+        // 必须落在头部；凭证分组是说明性大块，放最后。
+        // 限流 agent 已合入 agents（带 availabilityStatus / nextAvailableAt
+        // 参考标注），不再单列 unavailableAgents，避免两套真相。
         agents: discovery.agents,
-        credentialGroups: discovery.credentialGroups,
-        unavailableAgents: discovery.unavailableAgents
+        credentialGroups: discovery.credentialGroups
       }, null, 2);
       const withSpeedContext = await injectSpeedContextIntoListAgentsResult(listResult, {
         db: deps.db ?? await getReadableCliDb(discardOutput),
@@ -742,17 +862,8 @@ async function runAgentListCommand(args, deps = {}) {
 `);
     output.write(`public agents: ${agentsForOutput.filter((agent) => agent.publicRecordExists).length}
 `);
-    if (unavailableCount > 0 && !showUnavailable) {
-      output.write(t("agent.unavailableHidden", String(unavailableCount)));
-      const unavailableList = agents.filter((agent) => isAgentUnavailableNow(agent));
-      for (const unavail of unavailableList) {
-        const remainingSec = Math.max(0, Math.ceil(((unavail.nextAvailableAt ?? 0) - Date.now()) / 1e3));
-        const quotaSummary = formatQuotaSummary(unavail.quota, Date.now(), { model: unavail.model });
-        const quotaText = quotaSummary ? ` (${quotaSummary})` : "";
-        output.write(
-          t("agent.rateLimitedRecovery", unavail.name, unavail.id, String(remainingSec), quotaText)
-        );
-      }
+    if (unavailableCount > 0) {
+      output.write(t("agent.rateLimitedSummary", String(unavailableCount)));
     }
     output.write(`source: ${source}
 `);
@@ -766,9 +877,20 @@ async function runAgentListCommand(args, deps = {}) {
       const credentialLine = agent.credentialConfigured ? `credentialConfigured=true${agent.credentialRef ? ` credentialRef=${agent.credentialRef}` : ""}${agent.apiKeyRef ? ` apiKeyRef=${agent.apiKeyRef}` : ""}` : "credentialConfigured=false";
       const availDecision = resolveAgentAvailability(agent);
       const availabilityStatusLine = `availability=${availDecision.status} (${availDecision.reason})`;
-      const availabilityLine = typeof agent.nextAvailableAt === "number" && agent.nextAvailableAt > Date.now() ? `nextAvailableAt=${new Date(agent.nextAvailableAt).toISOString()}` : "nextAvailableAt=now";
+      const availabilityLine = typeof agent.nextAvailableAt === "number" && agent.nextAvailableAt > Date.now() ? `nextAvailableAt=${new Date(agent.nextAvailableAt).toISOString()} (reference info, not a dispatch gate)` : "nextAvailableAt=now";
       const quotaSummary = formatQuotaSummary(agent.quota, Date.now(), { model: agent.model });
       const quotaLine = `quota=${quotaSummary ?? "-"}`;
+      if (isAgentUnavailableNow(agent)) {
+        const recoveryAt = agent.nextAvailableAt;
+        output.write(t(
+          "agent.rateLimitedRecovery",
+          agent.name,
+          agent.id,
+          String(typeof recoveryAt === "number" ? Math.max(0, Math.ceil((recoveryAt - Date.now()) / 1e3)) : 0),
+          quotaSummary ? ` quota=${quotaSummary}` : "",
+          typeof recoveryAt === "number" ? formatCooldownUntilLocal(new Date(recoveryAt)) : "-"
+        ));
+      }
       output.write(
         [
           `