nolo-cli 0.95.0-alpha.6 → 0.95.1

package/{chunk-CPH3W5A7.js → chunk-Q4GP72HX.js}

@@ -1,6 +1,6 @@
 import {
   isAgentRunTerminalStatus
-} from "./chunk-NTW5GWDM.js";
+} from "./chunk-I3QNET24.js";
 import {
   isCompiledBinary,
   resolveCliEntrypointPath
@@ -11,6 +11,60 @@ import { homedir as nodeHomedir } from "node:os";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import * as nodeFs from "node:fs";
 import { execFileSync as nodeExecFileSync, spawn as nodeSpawn } from "node:child_process";
+
+// packages/ai/tools/agent/runFailureClass.ts
+var RATE_LIMIT_PATTERN = /429|rate.?limit|quota|insufficient.?balance|UPSTREAM_402|cooling|冷却/i;
+var PROVIDER_ERROR_PATTERN = /provider|upstream|5\d\d|bad.?gateway|service.?unavailable|overloaded/i;
+var MALFORMED_PATTERN = /MALFORMED_FUNCTION_CALL|malformed|invalid.?function.?call|invalid.?tool.?call/i;
+var STALLED_PATTERN = /stall|no.?progress|repetition|stagnant|无进展|卡死/i;
+var TOOL_ERROR_PATTERN = /tool.?error|tool.?fail|工具/i;
+function classifyRunFailure(input) {
+  const status = typeof input.status === "string" ? input.status : "";
+  if (status === "done" || status === "killed" || status === "cancelled") {
+    return void 0;
+  }
+  const reason = typeof input.failureReason === "string" ? input.failureReason : "";
+  const message = typeof input.errorMessage === "string" ? input.errorMessage : "";
+  switch (reason) {
+    case "provider_rate_limited":
+      return { failureClass: "rate_limited", retryable: true };
+    case "provider_error":
+      return MALFORMED_PATTERN.test(message) ? { failureClass: "provider_error", retryable: false } : { failureClass: "provider_error", retryable: true };
+    case "stalled":
+      return { failureClass: "stalled", retryable: false };
+    case "tool_error":
+      return { failureClass: "tool_error", retryable: false };
+    case "config_unresolved":
+      return { failureClass: "unknown", retryable: false };
+    case "cancelled":
+      return void 0;
+    default:
+      break;
+  }
+  if (message) {
+    if (RATE_LIMIT_PATTERN.test(message)) {
+      return { failureClass: "rate_limited", retryable: true };
+    }
+    if (MALFORMED_PATTERN.test(message)) {
+      return { failureClass: "provider_error", retryable: false };
+    }
+    if (STALLED_PATTERN.test(message)) {
+      return { failureClass: "stalled", retryable: false };
+    }
+    if (TOOL_ERROR_PATTERN.test(message)) {
+      return { failureClass: "tool_error", retryable: false };
+    }
+    if (PROVIDER_ERROR_PATTERN.test(message)) {
+      return { failureClass: "provider_error", retryable: true };
+    }
+  }
+  if (status === "failed" || status === "timeout" || status === "orphaned") {
+    return { failureClass: "unknown", retryable: false };
+  }
+  return void 0;
+}
+
+// packages/cli/agentRunControl.ts
 var RUN_TERMINAL_STATUSES = /* @__PURE__ */ new Set([
   "done",
   "failed",
@@ -794,6 +848,7 @@ async function spawnLocalBackgroundRun(input, deps = {}) {
     logPath,
     queuePath,
     batchId,
+    ...typeof input.credentialGroup === "string" && input.credentialGroup.trim() ? { credentialGroup: input.credentialGroup.trim() } : {},
     ...typeof input.parentDialogId === "string" && input.parentDialogId.trim() ? { parentDialogId: input.parentDialogId.trim() } : {},
     ...dodCommands && dodCommands.length > 0 ? { dodCommands } : {},
     ...spawnHead ? { spawnHead } : {},
@@ -925,6 +980,15 @@ function transitionRunToTerminal(runId, update, deps = {}, options = {}) {
     } else if (update.status === "killed") {
       record2.failureReason = "cancelled";
     }
+    const classification = classifyRunFailure({
+      status: update.status,
+      failureReason: record2.failureReason,
+      errorMessage: update.note ?? record2.note
+    });
+    if (classification) {
+      record2.failureClass = classification.failureClass;
+      record2.retryable = classification.retryable;
+    }
     const resolvedToolCount = typeof update.toolCallCount === "number" ? update.toolCallCount : record2.activity?.counters?.toolCalls;
     if (typeof resolvedToolCount === "number") {
       record2.toolCallCount = resolvedToolCount;
@@ -1044,6 +1108,15 @@ function checkStaleRun(runId, deps = {}) {
     const at = now().toISOString();
     latest.status = "orphaned";
     latest.note = pidReused ? "orphaned: process gone (pid reused by another process)" : "orphaned: process gone without writing terminal status";
+    const orphanClassification = classifyRunFailure({
+      status: "orphaned",
+      failureReason: latest.failureReason,
+      errorMessage: latest.note
+    });
+    if (orphanClassification) {
+      latest.failureClass = orphanClassification.failureClass;
+      latest.retryable = orphanClassification.retryable;
+    }
     latest.endedAt = at;
     latest.reconciledAt = at;
     latest.pid = void 0;
@@ -1259,6 +1332,18 @@ function printStatusOnce(record, deps) {
   }
   if (record.note) deps.output.write(`note:     ${record.note}
 `);
+  if (record.failureReason) deps.output.write(`failure:  ${record.failureReason}
+`);
+  if (record.failureClass) {
+    deps.output.write(
+      `class:    ${record.failureClass}${typeof record.retryable === "boolean" ? ` (retryable=${record.retryable})` : ""}
+`
+    );
+  }
+  if (record.credentialGroup) {
+    deps.output.write(`credGroup: ${record.credentialGroup}
+`);
+  }
   const activitySummary = formatActivitySummary(record.activity);
   if (activitySummary) deps.output.write(`${activitySummary}
 `);
@@ -1388,14 +1473,20 @@ async function terminateRunProcess(record, initialSignal, deps) {
   signalGroup(initialSignal);
   if (initialSignal === "SIGTERM") {
     const deadline = nowMs() + TERMINATE_GRACE_MS;
-    while (!isPidGone(pid, deps) && nowMs() < deadline) {
+    const maxIterations = Math.ceil(TERMINATE_GRACE_MS / TERMINATE_POLL_MS) + 1;
+    let iterations = 0;
+    while (!isPidGone(pid, deps) && nowMs() < deadline && iterations < maxIterations) {
+      iterations += 1;
       await sleep(TERMINATE_POLL_MS);
     }
   }
   if (!isPidGone(pid, deps)) {
     signalGroup("SIGKILL");
     const killDeadline = nowMs() + TERMINATE_KILL_GRACE_MS;
-    while (!isPidGone(pid, deps) && nowMs() < killDeadline) {
+    const maxIterations = Math.ceil(TERMINATE_KILL_GRACE_MS / TERMINATE_POLL_MS) + 1;
+    let iterations = 0;
+    while (!isPidGone(pid, deps) && nowMs() < killDeadline && iterations < maxIterations) {
+      iterations += 1;
       await sleep(TERMINATE_POLL_MS);
     }
   }

package/{chunk-A6G32FNX.js → chunk-QYFBT4CV.js}

@@ -1,44 +1,44 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-3SJQXXGY.js";
+} from "./chunk-LYS4T7MY.js";
 import {
   clipMultilineText
-} from "./chunk-MMPXJXHT.js";
+} from "./chunk-HZH7RULB.js";
 import {
   runLocalAgentTurn
-} from "./chunk-4MY4GLIW.js";
+} from "./chunk-6IHBIRPK.js";
 import {
   applyToolSurfaceConstraints
-} from "./chunk-IIVGDG4I.js";
+} from "./chunk-LNPYTNMG.js";
 import {
   resolveLocalRuntimeEnvFromPolicy
-} from "./chunk-HVURBGF3.js";
+} from "./chunk-ESRMFY7G.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import {
-  readPipeText,
-  spawnProcess
-} from "./chunk-X7HHHIOZ.js";
 import {
   parseUserIdFromAuthToken
 } from "./chunk-A7GB5UGH.js";
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
+import {
+  readPipeText,
+  spawnProcess
+} from "./chunk-Y6ROFCZO.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
 import {
   asTrimmedNonEmptyStringArray
-} from "./chunk-VMFTFOWF.js";
-import {
-  ownedAgentKey
-} from "./chunk-M2EJHDJP.js";
+} from "./chunk-3AH7LNUB.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
+import {
+  ownedAgentKey
+} from "./chunk-M2EJHDJP.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";

package/{chunk-Z77CRGTW.js → chunk-R4SQ3LGW.js}

@@ -1,7 +1,7 @@
 import {
   buildAgentRuntimeAgentLookupKeys,
   shouldFetchAgentRuntimeRecordRemotely
-} from "./chunk-IIVGDG4I.js";
+} from "./chunk-LNPYTNMG.js";
 
 // packages/cli/client/localAgentRecords.ts
 var buildLocalAgentLookupKeys = buildAgentRuntimeAgentLookupKeys;

package/{chunk-DEUUPHOO.js → chunk-RKGKDQGJ.js}

@@ -1,17 +1,15 @@
 import {
   listUserRecordsFromServers,
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-BLJWCTRL.js";
+} from "./chunk-LVITW736.js";
 import {
   agentRecordHasConfiguredCredential
-} from "./chunk-76WEAXJB.js";
+} from "./chunk-M3LRSBOX.js";
 import {
-  deriveCredentialGroup,
-  toSafeAgentSummary
-} from "./chunk-IAO6JBYW.js";
+  deriveCredentialGroup
+} from "./chunk-5B7XS6UO.js";
 import {
   PUBLIC_AGENT_KEY_PREFIX,
-  isOwnedAgentKey,
   ownedAgentKey,
   ownedAgentKeyPrefix,
   parseOwnedAgentId,
@@ -67,16 +65,10 @@ function normalizeListedAgent(record) {
     ...credentialKind !== void 0 ? { credentialKind } : {},
     ...typeof record?.apiSource === "string" && record.apiSource ? { apiSource: record.apiSource } : {},
     ...typeof record?.cliProvider === "string" && record.cliProvider ? { cliProvider: record.cliProvider } : {},
-    ...typeof record?.nextAvailableAt === "number" && Number.isFinite(record.nextAvailableAt) ? { nextAvailableAt: record.nextAvailableAt } : {}
+    ...typeof record?.nextAvailableAt === "number" && Number.isFinite(record.nextAvailableAt) ? { nextAvailableAt: record.nextAvailableAt } : {},
+    ...record?.quota && typeof record.quota === "object" && Array.isArray(record.quota.windows) ? { quota: record.quota } : {}
   };
 }
-function toSafeListedAgentSummary(agent, options) {
-  const summary = toSafeAgentSummary(agent, options);
-  if (agent.publicRecordExists === false) {
-    delete summary.publicKey;
-  }
-  return summary;
-}
 function sortListedAgents(agents) {
   agents.sort((a, b) => {
     const ta = a.updatedAt == null ? 0 : new Date(a.updatedAt).getTime();
@@ -97,6 +89,7 @@ function parseAgentListArgs(args) {
     publicOnly: args.includes("--public-only"),
     idsOnly: args.includes("--ids-only"),
     scope: readArgValue(args, "--scope"),
+    query: readArgValue(args, "--query"),
     showUnavailable: args.includes("--show-unavailable"),
     // --safe 默认输出精简投影（与 server listAgents 一致，防大列表被截断）；
     // --verbose 拿回完整字段集排障。
@@ -110,7 +103,7 @@ async function listLocalCachedAgents(args) {
   for (const prefix of [ownedPrefix, PUBLIC_AGENT_KEY_PREFIX]) {
     for await (const [key, value] of args.db.iterator({ gte: prefix, lte: `${prefix}\uFFFF` })) {
       if (typeof key !== "string" || !value || typeof value !== "object") continue;
-      if (isOwnedAgentKey(key, args.userId)) {
+      if (key.startsWith(ownedPrefix)) {
         privateRecords.set(key, { ...value, dbKey: key });
         continue;
       }
@@ -237,14 +230,78 @@ async function decorateAgentsWithPublicStatusAcrossServers(args) {
   return args.agents;
 }
 
+// packages/ai/agent/quotaSnapshot.ts
+function findTightestQuotaWindow(quota, now = Date.now()) {
+  if (!quota || !Array.isArray(quota.windows) || quota.windows.length === 0) {
+    return void 0;
+  }
+  let best;
+  let bestScore = -Infinity;
+  for (const w of quota.windows) {
+    let score = 0;
+    if (typeof w.utilization === "number" && w.utilization >= 0) {
+      score = 500 + Math.min(w.utilization, 1) * 500;
+    } else if (typeof w.remaining === "number" && typeof w.limit === "number" && w.limit > 0) {
+      const util = Math.max(0, 1 - w.remaining / w.limit);
+      score = 500 + util * 500;
+    } else if (typeof w.resetAt === "number" && w.resetAt > now) {
+      score = 200;
+    } else if (typeof w.remaining === "number") {
+      score = 100;
+    }
+    if (score > bestScore) {
+      bestScore = score;
+      best = w;
+    }
+  }
+  return best ?? quota.windows[0];
+}
+function formatQuotaSummary(quota, now = Date.now(), options) {
+  const tightest = findTightestQuotaWindow(quota, now);
+  if (!tightest) return void 0;
+  const compact = options?.compact === true;
+  const parts = [];
+  if (typeof tightest.utilization === "number") {
+    const pct = Math.round(tightest.utilization * 100);
+    parts.push(`${pct}%\u5DF2\u7528`);
+  } else if (typeof tightest.remaining === "number") {
+    if (typeof tightest.limit === "number") {
+      parts.push(`${tightest.remaining}/${tightest.limit}${tightest.unit ? ` ${tightest.unit}` : ""}`);
+    } else {
+      parts.push(`\u4F59${tightest.remaining}${tightest.unit ? ` ${tightest.unit}` : ""}`);
+    }
+  }
+  if (compact) return parts.length > 0 ? parts[0] : void 0;
+  if (tightest.scope && tightest.scope !== "user" && tightest.scope !== "project" && tightest.scope !== tightest.unit) {
+    parts.push(tightest.scope);
+  }
+  if (typeof tightest.resetAt === "number" && tightest.resetAt > now) {
+    const diffSec = Math.round((tightest.resetAt - now) / 1e3);
+    if (diffSec < 60) {
+      parts.push(`${diffSec}s\u540E\u91CD\u7F6E`);
+    } else if (diffSec < 3600) {
+      parts.push(`${Math.round(diffSec / 60)}m\u540E\u91CD\u7F6E`);
+    } else if (diffSec < 86400) {
+      const hours = (diffSec / 3600).toFixed(1).replace(/\.0$/, "");
+      parts.push(`${hours}h\u540E\u91CD\u7F6E`);
+    } else {
+      const days = (diffSec / 86400).toFixed(1).replace(/\.0$/, "");
+      parts.push(`${days}d\u540E\u91CD\u7F6E`);
+    }
+  }
+  if (parts.length === 0) return void 0;
+  if (parts.length === 1 && parts[0] === tightest.scope) return void 0;
+  return parts.join(" \xB7 ");
+}
+
 export {
   normalizeListedAgent,
-  toSafeListedAgentSummary,
   parseAgentListArgs,
   listLocalCachedAgents,
   listRemotePublicAgents,
   listRemoteAgents,
   listRemoteAgentsAcrossServers,
   listFavoriteAgentIdsAcrossServers,
-  decorateAgentsWithPublicStatusAcrossServers
+  decorateAgentsWithPublicStatusAcrossServers,
+  formatQuotaSummary
 };