nolo-cli 0.164.0-alpha.5 → 0.166.0-alpha.1

package/{chunk-CNWKLQRL.js → chunk-KSTEXKL6.js}

@@ -7255,16 +7255,50 @@ var empty = [];
 var CONTINUE = true;
 var EXIT = false;
 var SKIP = "skip";
-function visitParents(tree, test, visitor, reverse) {
+function visitParents(tree, testOrEnterOrVisitors, enterOrVisitorsOrReverse, reverse) {
+  if (!tree || typeof tree !== "object") {
+    throw new Error("Unexpected value `" + tree + "` for `tree`, expected node");
+  }
+  let preorder = true;
   let check;
-  if (typeof test === "function" && typeof visitor !== "function") {
-    reverse = visitor;
-    visitor = test;
+  let visitors;
+  let enter;
+  let exit3;
+  if (typeof enterOrVisitorsOrReverse === "function" || enterOrVisitorsOrReverse && typeof enterOrVisitorsOrReverse === "object") {
+    check = /** @type {Test} */
+    testOrEnterOrVisitors;
+    visitors = enterOrVisitorsOrReverse;
+    if (reverse) preorder = false;
+  } else {
+    visitors = /** @type {Visitors | Visitor} */
+    testOrEnterOrVisitors;
+    if (enterOrVisitorsOrReverse) preorder = false;
+  }
+  if (typeof visitors === "function") {
+    enter = visitors;
+  } else if (visitors && typeof visitors === "object") {
+    if (visitors.enter === null || visitors.enter === void 0) {
+    } else if (typeof visitors.enter === "function") {
+      enter = visitors.enter;
+    } else {
+      throw new Error(
+        "Unexpected value `" + visitors.enter + "` for `visitors.enter`, expected optional visitor"
+      );
+    }
+    if (typeof visitors.exit === "function") {
+      exit3 = visitors.exit;
+    } else {
+      throw new Error(
+        "Unexpected value `" + visitors.exit + "` for `visitors.exit`, expected visitor (pass a visitor directly if you only want an enter visitor)"
+      );
+    }
   } else {
-    check = test;
+    throw new Error(
+      "Unexpected value `" + visitors + "` for `enter` or `visitors`, expected visitor or object with visitors"
+    );
   }
   const is2 = convert(check);
-  const step = reverse ? -1 : 1;
+  const step = preorder ? 1 : -1;
   factory(tree, void 0, [])();
   function factory(node2, index2, parents) {
     const value = (
@@ -7285,12 +7319,10 @@ function visitParents(tree, test, visitor, reverse) {
     }
     return visit;
     function visit() {
+      const matches = !check || is2(node2, index2, parents[parents.length - 1] || void 0);
       let result = empty;
-      let subresult;
-      let offset;
-      let grandparents;
-      if (!test || is2(node2, index2, parents[parents.length - 1] || void 0)) {
-        result = toResult(visitor(node2, parents));
+      if (enter && matches) {
+        result = toResult(enter(node2, parents, index2));
         if (result[0] === EXIT) {
           return result;
         }
@@ -7301,11 +7333,11 @@ function visitParents(tree, test, visitor, reverse) {
           node2
         );
         if (nodeAsParent.children && result[0] !== SKIP) {
-          offset = (reverse ? nodeAsParent.children.length : -1) + step;
-          grandparents = parents.concat(nodeAsParent);
+          let offset = (preorder ? -1 : nodeAsParent.children.length) + step;
+          const grandparents = [...parents, nodeAsParent];
           while (offset > -1 && offset < nodeAsParent.children.length) {
             const child = nodeAsParent.children[offset];
-            subresult = factory(child, offset, grandparents)();
+            const subresult = factory(child, offset, grandparents)();
             if (subresult[0] === EXIT) {
               return subresult;
             }
@@ -7313,6 +7345,17 @@ function visitParents(tree, test, visitor, reverse) {
           }
         }
       }
+      if (exit3 && matches) {
+        const exitResult = toResult(exit3(node2, parents, index2));
+        if (exitResult[0] === SKIP) {
+          throw new Error(
+            "Unexpected value `" + exitResult[0] + "` from `exit`, expected `CONTINUE`, `EXIT`, index, or nothing"
+          );
+        }
+        if (exitResult[0] === EXIT || typeof exitResult[1] === "number") {
+          return exitResult;
+        }
+      }
       return result;
     }
   }
@@ -7334,34 +7377,19 @@ function findAndReplace(tree, list2, options) {
   const pairs = toPairs(list2);
   let pairIndex = -1;
   while (++pairIndex < pairs.length) {
-    visitParents(tree, "text", visitor);
+    visitParents(tree, visitor);
   }
-  function visitor(node2, parents) {
-    let index2 = -1;
-    let grandparent;
-    while (++index2 < parents.length) {
-      const parent = parents[index2];
-      const siblings = grandparent ? grandparent.children : void 0;
-      if (ignored(
-        parent,
-        siblings ? siblings.indexOf(parent) : void 0,
-        grandparent
-      )) {
-        return;
-      }
-      grandparent = parent;
-    }
-    if (grandparent) {
-      return handler(node2, parents);
+  function visitor(node2, parents, index2) {
+    if (node2.type === "text" && typeof index2 === "number") {
+      return handler(node2, parents, index2);
     }
+    if (ignored(node2, index2, parents[parents.length - 1])) return SKIP;
   }
-  function handler(node2, parents) {
+  function handler(node2, parents, index2) {
     const parent = parents[parents.length - 1];
     const find = pairs[pairIndex][0];
     const replace2 = pairs[pairIndex][1];
     let start = 0;
-    const siblings = parent.children;
-    const index2 = siblings.indexOf(node2);
     let change = false;
     let nodes = [];
     find.lastIndex = 0;
@@ -7420,7 +7448,13 @@ function toPairs(tupleOrList) {
     throw new TypeError("Expected find and replace tuple or list of tuples");
   }
   const result = [];
-  const list2 = !tupleOrList[0] || Array.isArray(tupleOrList[0]) ? tupleOrList : [tupleOrList];
+  const list2 = !tupleOrList[0] || Array.isArray(tupleOrList[0]) ? (
+    /** @type {FindAndReplaceList} */
+    tupleOrList
+  ) : [
+    /** @type {FindAndReplaceTuple} */
+    tupleOrList
+  ];
   let index2 = -1;
   while (++index2 < list2.length) {
     const tuple = list2[index2];

package/{chunk-5IKRTRRR.js → chunk-MCGCC5BA.js}

@@ -3,7 +3,7 @@ import {
   classifyAgentApiKeyRef,
   formatUnsupportedAgentApiKeyRefMessage,
   shouldReadAgentKeyRemotely
-} from "./chunk-BL4HFN6L.js";
+} from "./chunk-YL26TH2V.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-NBTY7YJF.js";

package/{chunk-GVGQKI6E.js → chunk-MV2VYO4L.js}

@@ -9,7 +9,7 @@ import {
   resolveRawAgentInput,
   resolveServerUrl,
   writeUsage
-} from "./chunk-N665S3Z2.js";
+} from "./chunk-4M5NB6HV.js";
 import {
   getReadableCliDb
 } from "./chunk-62TBKWTV.js";
@@ -31,19 +31,19 @@ import {
   resolveFileWriteGateEnabled,
   resolveLocalUserId,
   validateInstaboxWorkspaceSelection
-} from "./chunk-35CEDQD6.js";
+} from "./chunk-P3JTVV3J.js";
 import {
   clearCredentialAvailability,
-  readCredentialEntry,
+  readEffectiveCredentialEntry,
   recordCredentialProbe
-} from "./chunk-6MXDOUMH.js";
+} from "./chunk-R4BMKAR5.js";
 import {
   agentRunCardLabels,
   getCliLocale,
   t,
   toolLabel,
   toolLabelVariants
-} from "./chunk-2AB2HA4M.js";
+} from "./chunk-TDX2L4W2.js";
 import {
   _appendEntityBatch,
   _appendEvidenceBatch,
@@ -64,7 +64,7 @@ import {
 import {
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-5IKRTRRR.js";
+} from "./chunk-MCGCC5BA.js";
 import {
   isLocalCliAgentKey
 } from "./chunk-NBTY7YJF.js";
@@ -79,14 +79,14 @@ import {
 } from "./chunk-BMQ2MJUK.js";
 import {
   resolveCliLocalRuntimeKeyCapability
-} from "./chunk-YTWGTCVW.js";
+} from "./chunk-3WYHEMHF.js";
 import {
   isTransientFetchError
 } from "./chunk-KFHREHUQ.js";
 import {
   parseUiCard,
   uiCardFallback
-} from "./chunk-RBMYJSZF.js";
+} from "./chunk-P46JXWXJ.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
@@ -95,7 +95,7 @@ import {
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-EFGBXVOC.js";
+} from "./chunk-ENZVVNIQ.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   estimateMessagesTokens,
@@ -103,7 +103,7 @@ import {
   resolveAgentContextWindow,
   resolveOccupancy,
   resolveOccupancyWindow
-} from "./chunk-OC72ZET2.js";
+} from "./chunk-V2KGGU2X.js";
 import {
   buildSkillDiscoveryContextLayer
 } from "./chunk-AU7AXHUL.js";
@@ -115,10 +115,10 @@ import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-5E5VB7PS.js";
+} from "./chunk-GHG5ONT5.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-ULQAD7ZY.js";
+} from "./chunk-CEXJ6Y3C.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -133,16 +133,18 @@ import {
 import {
   PROBE_INTERVAL_MS,
   QUOTA_ERROR_PATTERNS,
+  classifyFailureSubclass,
+  isCapacitySaturatedRateLimit,
   isQuotaExhaustedError,
-  isQuotaLimited403Body,
+  isQuotaExhaustedText,
   mergeAvailabilityDeadline,
   resolveCooldownGate,
   resolveCredentialKeyWithFallback
-} from "./chunk-3MZAGMYY.js";
+} from "./chunk-JLR5NWP2.js";
 import {
   isOAuthApiKeyRef,
   normalizeUsage
-} from "./chunk-F3SOW2EU.js";
+} from "./chunk-HEC32F3G.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
@@ -11371,7 +11373,7 @@ function isBalanceExhaustedError(error) {
 
 // packages/cli/client/agentRun.ts
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-J6I63NZC.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-3EDL6FJP.js");
   return runLocalAgentTurn;
 }
 var stripDebugNoise = (s) => s.replace(/\s*raw="[\s\S]*"/g, "").replace(/\s*raw=\S+/g, "").replace(/\s*headers=\[[^\]]*\]/g, "").replace(/\s*headers=\S+/g, "").trim();
@@ -11643,7 +11645,7 @@ function looksLikeRateLimitedText(message) {
 var AUTH_TEXT_SIGNAL_RE = /\b401\b|unauthori[sz]ed|invalid[_\s-]?(?:api[_\s-]?key|token|credential)s?|(?:api[_\s-]?key|token|credential)s?[_\s-](?:invalid|expired|rejected|missing|not[_\s-]?found)|authentication[_\s-]?(?:error|failed|required)/i;
 var QUOTA_EXHAUSTED_EXTRA_RE = /insufficient[_\s-]?(?:quota|balance|credits?)|余额不足|额度已?用尽/i;
 function looksLikeQuotaExhaustedText(message) {
-  return isQuotaLimited403Body(message) || QUOTA_EXHAUSTED_EXTRA_RE.test(message);
+  return isQuotaExhaustedText(message) || QUOTA_EXHAUSTED_EXTRA_RE.test(message);
 }
 var BARE_UPSTREAM_5XX_RE = /\bHTTP[:\s]+(5\d\d)\b|\bstatus[:\s=]+(5\d\d)\b|\breturned error\s+(5\d\d)\b/i;
 function classifyLocalRunError(message) {
@@ -11890,7 +11892,7 @@ function formatRateLimitResetHint(hint, locale) {
   return parts.join(" ");
 }
 function buildRateLimitFailure(ctx) {
-  const headlineKey = ctx.quotaExhausted ? "localRunRateLimitQuota" : "localRunRateLimitThrottled";
+  const headlineKey = isCapacitySaturatedRateLimit(ctx.message, Date.now()) ? "localRunRateLimitCapacity" : ctx.quotaExhausted ? "localRunRateLimitQuota" : "localRunRateLimitThrottled";
   const lines = [
     t(
       headlineKey,
@@ -12228,8 +12230,15 @@ async function runHttpAgentTurn(options, authToken) {
     if (options.abortSignal?.aborted) {
       return { exitCode: 0, streamInterrupted: true };
     }
+    const failureSubclass = classifyFailureSubclass({
+      message: toErrorMessage(error),
+      body: error
+    });
     options.output.write(buildTransportErrorHint(options.serverUrl, error));
-    return { exitCode: 1 };
+    return {
+      exitCode: 1,
+      ...failureSubclass && failureSubclass !== "unknown" ? { failureSubclass } : {}
+    };
   }
   if (shouldStream && isGatewayHttpStatus(res.status)) {
     const failureMeta = await readAgentRunFailureMetadata(res);
@@ -12244,8 +12253,15 @@ async function runHttpAgentTurn(options, authToken) {
         res = await postAgentRun(false);
       } catch (error) {
         spinner.stop();
+        const failureSubclass = classifyFailureSubclass({
+          message: toErrorMessage(error),
+          body: error
+        });
         options.output.write(buildTransportErrorHint(options.serverUrl, error));
-        return { exitCode: 1 };
+        return {
+          exitCode: 1,
+          ...failureSubclass && failureSubclass !== "unknown" ? { failureSubclass } : {}
+        };
       }
     }
   }
@@ -12293,7 +12309,16 @@ async function runHttpAgentTurn(options, authToken) {
 `
       );
     }
-    return dialogIdText ? { exitCode: 1, dialogId: dialogIdText } : { exitCode: 1 };
+    const failureSubclass = classifyFailureSubclass({
+      status: res.status,
+      message: `${errorText || messageText} ${reasonText || ""} ${codeText || ""}`.trim(),
+      body: data
+    });
+    return {
+      exitCode: 1,
+      ...dialogIdText ? { dialogId: dialogIdText } : {},
+      ...failureSubclass && failureSubclass !== "unknown" ? { failureSubclass } : {}
+    };
   }
   const content = formatAssistantResponseForCli(
     String(data?.content ?? data?.message ?? "")
@@ -12604,6 +12629,10 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
     return {
       exitCode: 1,
       localError: error,
+      failureSubclass: classifyFailureSubclass({
+        message: toErrorMessage(error),
+        body: error
+      }),
       ...savedDialogId ? { dialogId: savedDialogId } : {},
       ...abortedTurnCredits !== void 0 ? { turnCredits: abortedTurnCredits } : {},
       ...abortedUsageRecords?.length ? { usageRecords: abortedUsageRecords } : {}
@@ -12622,7 +12651,9 @@ async function checkLocalAvailabilityBeforeHttpDispatch(options) {
   }
   if (!config || typeof config !== "object") return null;
   const baseRecord = config.rawRecord ?? config;
-  let credentialKey = resolveCredentialKeyWithFallback(baseRecord);
+  let credentialKey = resolveCredentialKeyWithFallback(
+    baseRecord.agentKey || baseRecord.key ? baseRecord : { ...baseRecord, agentKey: options.agentKey }
+  );
   if (credentialKey && resolveOAuthChannelOwnerSkip(
     config,
     options
@@ -12636,19 +12667,30 @@ async function checkLocalAvailabilityBeforeHttpDispatch(options) {
   }
   const env = options.env;
   const now = Date.now();
-  const entry = credentialKey ? await readCredentialEntry(credentialKey, env, now).catch(() => void 0) : void 0;
+  let entry;
+  let matchedKey;
+  if (credentialKey) {
+    const effective = await readEffectiveCredentialEntry(credentialKey, env, now).catch(() => void 0);
+    if (effective) {
+      entry = effective;
+      matchedKey = effective.matchedKey;
+    }
+  }
   const entryAt = entry?.nextAvailableAt;
   const effectiveNextAvailableAt = typeof entryAt === "number" ? mergeAvailabilityDeadline(agentLevelNextAvailableAt, entryAt) : agentLevelNextAvailableAt;
-  if (typeof effectiveNextAvailableAt !== "number") return { credentialKey };
+  const activeKey = matchedKey || credentialKey;
+  if (typeof effectiveNextAvailableAt !== "number") {
+    return { credentialKey: credentialKey || activeKey, matchedKey };
+  }
   const gateDecision = resolveCooldownGate(
     { nextAvailableAt: effectiveNextAvailableAt, lastProbeAt: entry?.lastProbeAt },
     now
   );
-  if (gateDecision === "probe" && credentialKey) {
-    await recordCredentialProbe(credentialKey, env, now).catch(() => void 0);
-    return { credentialKey };
+  if (gateDecision === "probe" && activeKey) {
+    await recordCredentialProbe(activeKey, env, now).catch(() => void 0);
+    return { credentialKey: credentialKey || activeKey, matchedKey };
   }
-  if (gateDecision !== "blocked") return { credentialKey };
+  if (gateDecision !== "blocked") return { credentialKey: credentialKey || activeKey, matchedKey };
   options.output.write(
     `${t(
       "agentCooldownBlocked",
@@ -12659,7 +12701,7 @@ async function checkLocalAvailabilityBeforeHttpDispatch(options) {
     )}
 `
   );
-  return { exitCode: 1 };
+  return { exitCode: 1, failureSubclass: "rate_limit" };
 }
 function foldLocalResultForTui(localResult) {
   const folded = {
@@ -12685,7 +12727,8 @@ function foldLocalResultForTui(localResult) {
     // 上 finalText 永远到不了结算点 → agentRunCommand 的 settleRunTerminal-
     // Authoritatively 拿不到 lastAssistantText → `.result.md` 不写、status 无
     // resultFile，编排者只能去啃带 ANSI 的 .log（同坑位历史：turnCredits）。
-    ...localResult.finalText ? { finalText: localResult.finalText } : {}
+    ...localResult.finalText ? { finalText: localResult.finalText } : {},
+    ...localResult.failureSubclass ? { failureSubclass: localResult.failureSubclass } : {}
   };
   const headerMeta = getRunResultHeaderMeta(localResult);
   recordRunResultHeaderMeta(folded, headerMeta);
@@ -12760,9 +12803,14 @@ async function runAgentTurn(options) {
         }
       }
       const localErrorMessage = localResult.localError ? toErrorMessage(localResult.localError) : "local runtime failed";
+      const failureSubclass = localResult.failureSubclass ?? classifyFailureSubclass({
+        message: localErrorMessage,
+        body: localResult.localError
+      });
       options.output.write(describeLocalRunFailure(localErrorMessage, localResult.localError));
       return {
         exitCode: 1,
+        failureSubclass,
         ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
         // Keep localError so TUI can show balance/quota/dialog-preserved hints
         // instead of only the raw auto-runtime line.
@@ -12782,12 +12830,16 @@ async function runAgentTurn(options) {
   }
   const localAvailability = await checkLocalAvailabilityBeforeHttpDispatch(options);
   if (localAvailability?.exitCode) {
-    return { exitCode: localAvailability.exitCode };
+    return {
+      exitCode: localAvailability.exitCode,
+      failureSubclass: localAvailability.failureSubclass ?? "rate_limit"
+    };
   }
   const httpResult = await runHttpAgentTurn(options, authToken);
-  if (httpResult.exitCode === 0 && !httpResult.streamInterrupted && localAvailability?.credentialKey) {
+  if (httpResult.exitCode === 0 && !httpResult.streamInterrupted && (localAvailability?.credentialKey || localAvailability?.matchedKey)) {
+    const keyToClear = localAvailability.credentialKey || localAvailability.matchedKey;
     await clearCredentialAvailability(
-      localAvailability.credentialKey,
+      keyToClear,
       options.env
     ).catch(() => void 0);
   }