nolo-cli 0.212.0-alpha.1 → 0.222.0-alpha.2

package/{agentFavoriteCommands-EDK743YA.js → agentFavoriteCommands-2LKGKSUD.js}

@@ -1,6 +1,6 @@
 import {
   resolveCliAgentKeyInput
-} from "./chunk-NBTY7YJF.js";
+} from "./chunk-BR3GT6MR.js";
 import "./chunk-M2EJHDJP.js";
 import {
   toErrorMessage
@@ -10,13 +10,13 @@ import {
   resolveAuthToken,
   resolveServerCandidates,
   resolveServerUrl
-} from "./chunk-WACI5I6V.js";
+} from "./chunk-2THCNKE4.js";
 import "./chunk-OLZBQWZU.js";
 import "./chunk-LCBAMY2M.js";
+import "./chunk-G3SUCT4W.js";
 import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
-import "./chunk-G3SUCT4W.js";
-import "./chunk-4VNS5WPM.js";
+import "./chunk-U67V476Y.js";
 
 // packages/cli/agentFavoriteCommands.ts
 function wantsHelp(args) {
@@ -125,6 +125,7 @@ async function runAgentFavoriteCommand(args, deps = {}) {
   const isFavorite = !args.includes("--off");
   const primaryServerUrl = resolveServerUrl(args, env);
   const serverUrls = resolveServerCandidates(args, env, primaryServerUrl);
+  const favoritedAt = Date.now();
   try {
     const attempts = await setFavoriteAcrossServers({
       serverUrls,
@@ -132,9 +133,7 @@ async function runAgentFavoriteCommand(args, deps = {}) {
       fetchImpl: deps.fetchImpl ?? fetch,
       agentKey,
       isFavorite,
-      // 同一批写入共享同一个收藏时间戳：list 合并多服务器时按 favoritedAt 取最新，
-      // 各自取 Date.now() 会让各服务器时间错开毫秒级。
-      favoritedAt: Date.now()
+      favoritedAt
     });
     const failures = attempts.filter((attempt) => !attempt.ok);
     if (failures.length === attempts.length) {
@@ -151,7 +150,7 @@ async function runAgentFavoriteCommand(args, deps = {}) {
             targetType: "agent",
             targetKey: agentKey,
             isFavorite,
-            favoritedAt: attempts[0]?.response?.favoritedAt ?? null,
+            favoritedAt,
             servers: attempts
           },
           null,

package/{agentGrantCommands-RQWK2TEV.js → agentGrantCommands-QQV4N4JW.js}

@@ -1,6 +1,6 @@
 import {
   resolveCliAgentKeyInput
-} from "./chunk-NBTY7YJF.js";
+} from "./chunk-BR3GT6MR.js";
 import "./chunk-M2EJHDJP.js";
 import {
   toErrorMessage
@@ -11,15 +11,15 @@ import {
   readOption,
   resolveAuthToken,
   resolveServerUrl
-} from "./chunk-WACI5I6V.js";
+} from "./chunk-2THCNKE4.js";
 import "./chunk-OLZBQWZU.js";
 import "./chunk-LCBAMY2M.js";
-import "./chunk-4SN6J65J.js";
-import "./chunk-CF7PE763.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
-import "./chunk-4VNS5WPM.js";
+import "./chunk-4SN6J65J.js";
+import "./chunk-CF7PE763.js";
+import "./chunk-U67V476Y.js";
 
 // packages/cli/agentGrantCommands.ts
 function wantsHelp(args) {

package/{agentListCommands-HE7L2A6L.js → agentListCommands-HIZODBF3.js}

@@ -10,60 +10,58 @@ import {
   listRemotePublicAgents,
   normalizeListedAgent,
   parseAgentListArgs
-} from "./chunk-WXYLV624.js";
+} from "./chunk-AIHYNKGV.js";
 import {
   buildSpaceLookup,
   getSpaceContentKeys
 } from "./chunk-ID4G2MAR.js";
 import {
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-3AKFVZ2I.js";
+} from "./chunk-MYHNBEXD.js";
 import {
   refreshSubscriptionQuotas
-} from "./chunk-YGILMZ7N.js";
+} from "./chunk-QVBXJNZ2.js";
 import {
   getReadableCliDb
-} from "./chunk-J5JTMQIA.js";
+} from "./chunk-YFLVRVYK.js";
 import {
   applyCredentialAvailability,
   clearCredentialAvailabilityIfMarkedAt,
   readCredentialAvailability,
   readEffectiveCredentialEntry
-} from "./chunk-GSQNH63I.js";
+} from "./chunk-FIYSMXHY.js";
 import {
   queryUserRecords,
   readDbRecord
-} from "./chunk-IF45XG7K.js";
-import "./chunk-LKZPX6YH.js";
-import "./chunk-NBTY7YJF.js";
+} from "./chunk-6WU5572L.js";
 import {
   buildAgentDiscoveryResult,
   matchesAgentQuery,
   resolvePaginationArgs,
   summarizeCredentialGroups,
   toDiscoverySafeAgentSummary
-} from "./chunk-CJRONOYL.js";
-import "./chunk-OXME3PEE.js";
-import {
-  resolveNoloHome
-} from "./chunk-GLKOYSRU.js";
+} from "./chunk-34J5K2YA.js";
+import "./chunk-GBWGPTA7.js";
 import "./chunk-UEILX4EV.js";
-import "./chunk-D2MDMY2M.js";
-import "./chunk-FHU44LN3.js";
+import "./chunk-BV3FLP2L.js";
+import "./chunk-2ZKFCIJJ.js";
+import "./chunk-BR3GT6MR.js";
+import "./chunk-Z2PITYZN.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-4KH4J3G5.js";
-import "./chunk-CTPXME7U.js";
-import "./chunk-HNUWUO75.js";
+import "./chunk-3LMUPOHG.js";
 import "./chunk-CHOZJMJS.js";
 import "./chunk-PWTNI4N7.js";
-import "./chunk-Y63ZSOR6.js";
-import "./chunk-W4S457LU.js";
-import "./chunk-4KB6WQUL.js";
+import "./chunk-AL3TYDIF.js";
+import "./chunk-QNWG52I4.js";
+import "./chunk-HNUWUO75.js";
+import "./chunk-LKA64WH4.js";
+import "./chunk-YU4ZPWVF.js";
+import "./chunk-2WZXXAQD.js";
+import "./chunk-OBWT45ZU.js";
+import "./chunk-BGP2EDFG.js";
 import "./chunk-56GBUMO5.js";
-import "./chunk-NOMIGOST.js";
-import "./chunk-UTV2AYEG.js";
-import "./chunk-E2BESSAW.js";
-import "./chunk-25JZEIXN.js";
+import "./chunk-EIAI3PPH.js";
+import "./chunk-C4VAR65S.js";
 import {
   DEFAULT_PROVIDER_RETRY_MS,
   formatQuotaSummary,
@@ -72,79 +70,89 @@ import {
   resolveCredentialCandidateKeys,
   resolveCredentialKeyWithFallback,
   shouldClearCooldownFromQuota
-} from "./chunk-YUXQAVRD.js";
-import "./chunk-KC4XDTT3.js";
-import "./chunk-2WZXXAQD.js";
-import "./chunk-YWSEPJ7C.js";
-import "./chunk-WJZOQR2J.js";
-import "./chunk-UHJGXRJ4.js";
+} from "./chunk-HOCHUZQ7.js";
+import "./chunk-SOF4OWDM.js";
+import "./chunk-MAIITKBT.js";
+import "./chunk-E2BESSAW.js";
+import "./chunk-TLE77UJ5.js";
+import "./chunk-FS2XP5D7.js";
+import "./chunk-KQSYAIZR.js";
 import "./chunk-2MBTWINN.js";
-import "./chunk-JTDORD5P.js";
-import "./chunk-CZM5YTZ7.js";
-import "./chunk-H57T64RA.js";
+import "./chunk-NIZ2BXFD.js";
 import "./chunk-5ZUL4CUO.js";
+import "./chunk-RDH5CQ4T.js";
+import "./chunk-H57T64RA.js";
 import "./chunk-UKZX3NHN.js";
 import "./chunk-5MMAK75Q.js";
-import "./chunk-2QHFH3DR.js";
-import "./chunk-OQHIVPG4.js";
+import "./chunk-47ITIXO7.js";
 import "./chunk-KX6YBIHG.js";
+import "./chunk-SNBZZPYH.js";
 import "./chunk-DWLEOOGR.js";
+import "./chunk-OW765XBU.js";
 import "./chunk-7DPNBQSV.js";
-import "./chunk-T43B7LB2.js";
-import "./chunk-ZRSNONOB.js";
-import "./chunk-4VJAC32I.js";
-import "./chunk-CJEIOP3E.js";
-import "./chunk-ZCWRMUWT.js";
-import "./chunk-ZC3CMUKU.js";
-import "./chunk-LOEO7LRC.js";
+import "./chunk-WKGQSYTB.js";
+import "./chunk-SY3C4SQ7.js";
+import "./chunk-PJCIP64Z.js";
+import "./chunk-6OVNSQHN.js";
+import "./chunk-W6RFEDN4.js";
+import "./chunk-7ET2U67U.js";
+import "./chunk-3IK6ILVW.js";
 import "./chunk-M2EJHDJP.js";
-import "./chunk-KIM6CLW5.js";
-import "./chunk-JNKSDZFS.js";
+import {
+  createKey,
+  createTokenKey
+} from "./chunk-SYTHYBMI.js";
+import "./chunk-OJKUU3LP.js";
+import "./chunk-YZMNK53S.js";
+import "./chunk-I42VC5KR.js";
+import "./chunk-JWXITTQB.js";
+import "./chunk-L5I543VB.js";
+import "./chunk-KHCLMKZZ.js";
+import "./chunk-4O22PGNQ.js";
+import {
+  t
+} from "./chunk-OB6DVWPF.js";
+import {
+  listRunRecords
+} from "./chunk-2GJKRKI6.js";
+import "./chunk-AQZ6BMRK.js";
+import "./chunk-AMEOV5VZ.js";
+import "./chunk-KEN3N2TN.js";
+import "./chunk-EWQ3HGNZ.js";
 import "./chunk-PSCNXBYA.js";
-import "./chunk-TCZHTTUU.js";
-import "./chunk-YUA6OAH5.js";
-import "./chunk-SM3NSZJV.js";
-import "./chunk-JRTNUU5Z.js";
+import "./chunk-I7WBYGBP.js";
+import "./chunk-MDLS23JK.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
+import "./chunk-3EUW3WEO.js";
+import "./chunk-2UCBGYO4.js";
+import "./chunk-JRTNUU5Z.js";
 import "./chunk-KUG52IAP.js";
-import "./chunk-GOO6G4PY.js";
+import "./chunk-CKG3PRZ7.js";
 import "./chunk-QSJ3HFEF.js";
+import "./chunk-U6VC4MU4.js";
+import "./chunk-WWC7I6TA.js";
 import {
   parseUserIdFromAuthToken,
   readOption,
   resolveAuthToken,
   resolveServerCandidates,
   resolveServerUrl
-} from "./chunk-WACI5I6V.js";
+} from "./chunk-2THCNKE4.js";
 import "./chunk-OLZBQWZU.js";
 import "./chunk-LCBAMY2M.js";
+import "./chunk-G3SUCT4W.js";
 import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
-import "./chunk-4O22PGNQ.js";
-import {
-  t
-} from "./chunk-3RQVYR4B.js";
 import "./chunk-G7Y4GXTY.js";
 import "./chunk-6UBGXX2W.js";
-import {
-  createKey,
-  createTokenKey
-} 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-4VNS5WPM.js";
+import "./chunk-U67V476Y.js";
 
 // packages/ai/agent/speedSampleCache.ts
 var SPEED_SAMPLE_DISK_CACHE_TTL_MS = 10 * 6e4;
 var SPEED_SAMPLE_SCAN_BUDGET_MS = 2500;
-var SPEED_SAMPLE_CACHE_VERSION = 2;
-var SPEED_SAMPLE_LEGACY_CACHE_VERSION = 1;
+var SPEED_SAMPLE_CACHE_VERSION = 4;
 var isFiniteNumber = (value) => typeof value === "number" && Number.isFinite(value);
 var sanitizeSample = (value) => {
   if (!value || typeof value !== "object") return null;
@@ -164,7 +172,7 @@ async function parseCacheFile(cachePath, userId) {
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object") return null;
     const version = parsed.version;
-    if (version !== SPEED_SAMPLE_CACHE_VERSION && version !== SPEED_SAMPLE_LEGACY_CACHE_VERSION) {
+    if (version !== SPEED_SAMPLE_CACHE_VERSION) {
       return null;
     }
     if (parsed.userId !== userId) return null;
@@ -181,7 +189,7 @@ async function parseCacheFile(cachePath, userId) {
       }
       samples.set(model, cleaned);
     }
-    const complete = version === SPEED_SAMPLE_LEGACY_CACHE_VERSION ? true : parsed.complete === true;
+    const complete = 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 {
@@ -212,8 +220,8 @@ function resolveSpeedSamplesProgressPath(cachePath) {
 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 });
+    const path = await import("node:path");
+    await fs.mkdir(path.dirname(cachePath), { recursive: true });
     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);
@@ -295,6 +303,7 @@ function buildCandidateSpeedContext(models, samplesByModel, options = {}) {
   return formatCandidateSpeedFacts(resolveCandidateSpeedFacts(models, samplesByModel), options);
 }
 var SPEED_SAMPLE_PAGE_SIZE = 2e3;
+var DISPATCH_ENTRY_PATH = "agent-run";
 var eventTime = (value) => {
   if (isFiniteNumber2(value.timestamp)) return value.timestamp;
   if (isFiniteNumber2(value.createdAt)) return value.createdAt;
@@ -331,6 +340,25 @@ async function collectRecentSpeedSamples(db, userId, options = {}) {
   const budgetMs = isFiniteNumber2(options.budgetMs) ? options.budgetMs : Number.POSITIVE_INFINITY;
   const { start, end } = createTokenKey.rangeOfUser(userId);
   const failedPrefix = createKey("token", userId, "failed-call", "");
+  const dispatchRunCache = /* @__PURE__ */ new Map();
+  const isDispatchSampleRecord = async (record2, resolver, cache) => {
+    if (record2.entry_path !== DISPATCH_ENTRY_PATH && record2.entry_path !== "cli-local") return false;
+    const runId = typeof record2.dialogId === "string" ? record2.dialogId.trim() : "";
+    if (!runId) return false;
+    const cacheKey = `${record2.entry_path}:${runId}`;
+    const cached = cache.get(cacheKey);
+    if (cached !== void 0) return cached;
+    let dispatch = false;
+    if (resolver) {
+      try {
+        dispatch = await resolver(runId, record2.entry_path) === true;
+      } catch {
+        dispatch = false;
+      }
+    }
+    cache.set(cacheKey, dispatch);
+    return dispatch;
+  };
   const collected = /* @__PURE__ */ new Map();
   const startedAt = Date.now();
   let lastKey = options.startAfter;
@@ -356,7 +384,15 @@ async function collectRecentSpeedSamples(db, userId, options = {}) {
       newestKey = key;
       if (key.startsWith(failedPrefix)) continue;
       if (!raw || typeof raw !== "object") continue;
-      collectSample(collected, raw);
+      const record2 = raw;
+      const resolver = options.isDispatchRun ?? db.isDispatchRun;
+      if (!await isDispatchSampleRecord(
+        record2,
+        resolver ? (runId, entryPath) => resolver.call(db, runId, entryPath) : void 0,
+        dispatchRunCache
+      ))
+        continue;
+      collectSample(collected, record2);
     }
     if (accepted === 0 || accepted < pageSize) break;
     lastKey = newestKey;
@@ -507,13 +543,45 @@ async function injectSpeedContextIntoListAgentsResult(result, options = {}) {
   }
 }
 
+// packages/ai/agent/dispatchSpeedProvenance.ts
+var record = (value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
+function isServerDispatchSpeedSource(value, dialogId, userId) {
+  const dialog = record(value);
+  const proof = record(dialog.dispatchSpeedProvenance);
+  return proof.version === 1 && proof.source === "server-startAgentRun" && proof.userId === userId && record(dialog.runtimeBinding).tenantUserId === userId && dialog.id === dialogId;
+}
+function isLocalDispatchSpeedSource(value, dialogId, userId) {
+  const run = record(value);
+  const proof = record(run.dispatchSpeedProvenance);
+  return proof.version === 1 && proof.source === "cli-startAgentRun" && proof.userId === userId && typeof run.runId === "string" && run.runId.length > 0 && run.dialogId === dialogId && run.ephemeral !== true;
+}
+
 // packages/cli/agentListCommands.ts
-import path from "node:path";
-var discardOutput = { write: () => void 0 };
-function resolveSpeedSamplesCachePath(env, userId) {
-  const safeUserId = userId.replace(/[^A-Za-z0-9._-]/g, "_");
-  const mergedEnv = { ...process.env, ...env };
-  return path.join(resolveNoloHome({ env: mergedEnv }), "cache", `speed-samples-${safeUserId}.json`);
+var createCliDispatchSampleDb = (db, userId, env) => {
+  let localDialogs;
+  return {
+    iterator: (options) => db.iterator(options),
+    isDispatchRun: async (dialogId, entryPath) => {
+      if (entryPath === "cli-local") {
+        localDialogs ??= new Set(listRunRecords({ env }).filter(
+          (run) => typeof run.dialogId === "string" && isLocalDispatchSpeedSource(run, run.dialogId, userId)
+        ).map((run) => run.dialogId));
+        return localDialogs.has(dialogId);
+      }
+      if (entryPath !== "agent-run") return false;
+      try {
+        return isServerDispatchSpeedSource(await db.get(`dialog-${userId}-${dialogId}`), dialogId, userId);
+      } catch {
+        return false;
+      }
+    }
+  };
+};
+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}`;
 }
 async function runAgentListCommand(args, deps = {}) {
   const env = deps.env ?? process.env;
@@ -525,7 +593,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) {
@@ -591,7 +659,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") {
@@ -599,14 +667,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-"));
@@ -648,7 +723,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));
     }
@@ -707,12 +782,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(
@@ -748,18 +817,18 @@ async function runAgentListCommand(args, deps = {}) {
             fetchImpl,
             serverUrls
           });
-          const record = favRead.record;
-          if (!record || record.type && record.type !== "agent") continue;
-          const norm = normalizeListedAgent(record);
-          const candidateKeys = [record.dbKey, record.publicKey, record.id].filter((key) => typeof key === "string" && key.length > 0);
+          const record2 = favRead.record;
+          if (!record2 || record2.type && record2.type !== "agent") continue;
+          const norm = normalizeListedAgent(record2);
+          const candidateKeys = [record2.dbKey, record2.publicKey, record2.id].filter((key) => typeof key === "string" && key.length > 0);
           if (spaceContentKeys && !candidateKeys.some((key) => spaceContentKeys?.has(key))) {
             continue;
           }
           if (norm) {
             if (!favKey.startsWith("agent-pub-")) {
               norm.verifiedAgentKey = favKey;
-              if (typeof record.userId === "string" && record.userId) {
-                norm.ownerId = record.userId;
+              if (typeof record2.userId === "string" && record2.userId) {
+                norm.ownerId = record2.userId;
               }
             }
             agents.push(norm);
@@ -768,7 +837,7 @@ async function runAgentListCommand(args, deps = {}) {
             existingKeys.add(norm.publicKey);
             existingKeys.add(norm.id);
           } else {
-            extraFavoriteRecords.push(record);
+            extraFavoriteRecords.push(record2);
             for (const key of candidateKeys) existingKeys.add(key);
           }
         } catch {
@@ -783,7 +852,7 @@ async function runAgentListCommand(args, deps = {}) {
           serverUrls
         });
       }
-      const safeRecords = [...agents, ...extraFavoriteRecords].map((record) => toDiscoverySafeAgentSummary(record, { favoritesMap, userId })).filter((agent) => publicOnly ? agent.isPublic === true : true);
+      const safeRecords = [...agents, ...extraFavoriteRecords].map((record2) => toDiscoverySafeAgentSummary(record2, { favoritesMap, userId })).filter((agent) => publicOnly ? agent.isPublic === true : true);
       const discovery = buildAgentDiscoveryResult({
         agents: safeRecords,
         scope: requestedScope ?? (publicOnly ? "public" : "all"),
@@ -806,17 +875,19 @@ 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),
+      const cliNoloHome = env.NOLO_HOME?.trim() || (env.HOME?.trim() ? `${env.HOME.trim()}/.nolo` : "");
+      const speedAwareListResult = await injectSpeedContextIntoListAgentsResult(listResult, {
+        db: createCliDispatchSampleDb(deps.db ?? await getReadableCliDb(output), userId, env),
         userId,
-        diskCache: { cachePath: resolveSpeedSamplesCachePath(env, userId) }
+        ...cliNoloHome ? { diskCache: { cachePath: `${cliNoloHome}/cache/speed-samples-${userId}.json` } } : {}
       });
-      output.write(withSpeedContext);
+      output.write(speedAwareListResult);
       output.write("\n");
       return 0;
     }
@@ -855,17 +926,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}
 `);
@@ -879,9 +941,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(
         [
           `
@@ -914,6 +987,5 @@ async function runAgentListCommand(args, deps = {}) {
   }
 }
 export {
-  resolveSpeedSamplesCachePath,
   runAgentListCommand
 };