nolo-cli 0.80.0 → 0.81.0

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

@@ -8,7 +8,7 @@ import {
 import {
   deriveCredentialGroup,
   toSafeAgentSummary
-} from "./chunk-IAO6JBYW.js";
+} from "./chunk-RG6JBBX5.js";
 import {
   PUBLIC_AGENT_KEY_PREFIX,
   isOwnedAgentKey,

package/{chunk-4OZYL5FG.js → chunk-TZJJ77KQ.js}

@@ -21,7 +21,7 @@ import {
   formatStatusRunCard,
   formatStopRunCard,
   resolveRunLabel
-} from "./chunk-NTW5GWDM.js";
+} from "./chunk-3VNWWVKB.js";
 import {
   omitNullishAgentSummaryFields,
   sortSafeAgentSummaries,
@@ -29,7 +29,7 @@ import {
   toCompactAgentSummary,
   toSafeAgentSummary,
   toUnavailableAgentSummary
-} from "./chunk-IAO6JBYW.js";
+} from "./chunk-RG6JBBX5.js";
 import {
   getUserDataItemTimestamp,
   mergeAndDedupUserData
@@ -81,10 +81,10 @@ import {
 } from "./chunk-VF4K2QE6.js";
 import {
   createDocState
-} from "./chunk-NKRYKK7T.js";
+} from "./chunk-R2B3MIZA.js";
 import {
   createDialogAction
-} from "./chunk-EFVDQUCT.js";
+} from "./chunk-3WD6RUUJ.js";
 import {
   DEFAULT_COLLAPSED_CATEGORIES,
   addContentToSpace,
@@ -102,7 +102,7 @@ import {
   updateContentCategory,
   updateContentTitle,
   writeStoredCollapsedCategories
-} from "./chunk-SQZDZXP5.js";
+} from "./chunk-HWIZU4OL.js";
 import {
   getCurrentSpaceId,
   getCurrentSpaceIdRaw,
@@ -124,14 +124,14 @@ import {
   selectMsgById,
   uiAskChoiceFunc,
   uiAskChoiceFunctionSchema
-} from "./chunk-LBEDNSMY.js";
+} from "./chunk-K4YGZD3P.js";
 import {
   createAgent,
   deleteServerSyncedCredential,
   runLlm,
   streamAgentChatTurn,
   updateAgent
-} from "./chunk-H3PIH2EO.js";
+} from "./chunk-SQQVLHMH.js";
 import {
   getActiveDialogKey,
   selectCurrentDialogKey,
@@ -176,7 +176,7 @@ import {
 } from "./chunk-IIVGDG4I.js";
 import {
   isAgentUnavailableNow
-} from "./chunk-CJCJF5XB.js";
+} from "./chunk-FDTR4QJ6.js";
 import {
   buildDatabaseFileContentUrl
 } from "./chunk-WADCY6G6.js";
@@ -3945,7 +3945,7 @@ async function deleteDialogsFunc(args, thunkApi) {
   const deletedDialogIds = [];
   const deletedDialogKeys = [];
   const failures = [];
-  const { deleteDialog: deleteDialog2 } = await import("./dialogSlice-HQFQIQDZ.js");
+  const { deleteDialog: deleteDialog2 } = await import("./dialogSlice-W5BYELVR.js");
   for (const target of targets) {
     try {
       await thunkApi.dispatch(deleteDialog2(target.dbKey)).unwrap();
@@ -13027,7 +13027,61 @@ var runAgentBackground = createAsyncThunk("agent/runBackground", async (args, {
   throw lastError ?? new Error("\u4E8B\u4EF6\u6D41\u91CD\u8FDE\u5931\u8D25");
 });
 
+// packages/ai/tools/agent/credentialFanoutGuard.ts
+var UNKNOWN_CREDENTIAL_GROUP = "unknown";
+function normalizeCredentialGroupValue(group) {
+  if (typeof group !== "string") return UNKNOWN_CREDENTIAL_GROUP;
+  const trimmed2 = group.trim();
+  if (!trimmed2) return UNKNOWN_CREDENTIAL_GROUP;
+  if (trimmed2.toLowerCase() === UNKNOWN_CREDENTIAL_GROUP) {
+    return UNKNOWN_CREDENTIAL_GROUP;
+  }
+  return trimmed2;
+}
+var describeEntry = (entry) => entry.agentKey ?? entry.runId ?? "(unknown run)";
+function checkCredentialFanout(args) {
+  const candidateGroup = normalizeCredentialGroupValue(
+    args.candidate.credentialGroup
+  );
+  for (const entry of args.active) {
+    if (entry.runId && args.candidate.runId && entry.runId === args.candidate.runId) {
+      continue;
+    }
+    const entryGroup = normalizeCredentialGroupValue(entry.credentialGroup);
+    if (candidateGroup === UNKNOWN_CREDENTIAL_GROUP || entryGroup === UNKNOWN_CREDENTIAL_GROUP) {
+      if (args.allowUnknownCredential === true) continue;
+      const side = candidateGroup === UNKNOWN_CREDENTIAL_GROUP ? "candidate" : "active";
+      return {
+        allowed: false,
+        reason: "unknown_credential_group",
+        conflict: entry,
+        message: `\u62D2\u7EDD\u5E76\u53D1\u6D3E\u53D1\uFF1A${side === "candidate" ? `\u5019\u9009 agent ${describeEntry(args.candidate)} \u7684 credentialGroup \u672A\u77E5` : `\u5DF2\u6D3B\u8DC3 run ${describeEntry(entry)} \u7684 credentialGroup \u672A\u77E5`}\uFF0C\u65E0\u6CD5\u8BC1\u660E\u5B83\u4E0E\u540C\u6279\u5E76\u53D1 run \u4E0D\u5171\u7528\u4E0A\u6E38\u51ED\u8BC1\u3002\u8BF7\u6539\u4E3A\u4E32\u884C\u6D3E\u53D1\u3001\u6362\u7528 credentialGroup \u660E\u786E\u7684 agent\uFF0C\u6216\u5728\u786E\u8BA4\u98CE\u9669\u540E\u663E\u5F0F\u4F20 allowUnknownCredential: true \u5F3A\u5236\u653E\u884C\u3002`
+      };
+    }
+    if (candidateGroup === entryGroup) {
+      return {
+        allowed: false,
+        reason: "credential_group_conflict",
+        conflict: entry,
+        message: `\u62D2\u7EDD\u5E76\u53D1\u6D3E\u53D1\uFF1A\u5019\u9009 agent ${describeEntry(args.candidate)} \u4E0E\u5DF2\u6D3B\u8DC3 run ${describeEntry(entry)} \u540C\u5C5E credentialGroup "${candidateGroup}"\uFF0C\u540C\u4E00\u51ED\u8BC1\u4E0A\u7981\u6B62\u5E76\u53D1\u6247\u51FA\u3002\u8BF7\u4E32\u884C\u6D3E\u53D1\u6216\u6539\u7528\u5176\u4ED6 credentialGroup \u7684 agent\u3002`
+      };
+    }
+  }
+  return { allowed: true };
+}
+
 // packages/ai/tools/agent/startAgentRunTool.ts
+var BATCH_FANOUT_ENTRY_TTL_MS = 30 * 60 * 1e3;
+var batchFanoutRegistry = /* @__PURE__ */ new Map();
+function pruneBatchFanoutRegistry(nowMs) {
+  for (const [batchId, entries] of batchFanoutRegistry) {
+    const alive = entries.filter(
+      (e) => nowMs - e.startedAtMs < BATCH_FANOUT_ENTRY_TTL_MS
+    );
+    if (alive.length === 0) batchFanoutRegistry.delete(batchId);
+    else batchFanoutRegistry.set(batchId, alive);
+  }
+}
 function buildStartAgentRunFunctionSchema(opts) {
   const supportsWait = opts?.supportsWait !== false;
   const wakeEnabled = opts?.wakeEnabled === true;
@@ -13059,7 +13113,16 @@ function buildStartAgentRunFunctionSchema(opts) {
         // 与 server 透传保持不动，探活/烟测仍走 CLI 侧。
         batchId: {
           type: "string",
-          description: "\u53EF\u9009\u3002\u6279\u6B21 id\uFF0C\u7528\u4E8E\u628A\u591A\u4E2A\u5E76\u884C run \u5F52\u4E3A\u4E00\u7EC4\uFF0C\u4FBF\u4E8E\u540E\u7EED controlAgentRun(list, batchId=...) \u6309\u6279\u67E5\u8BE2\u3002\u672A\u4F20\u65F6\u81EA\u52A8\u751F\u6210\u4E00\u4E2A\u5E76\u5728\u8FD4\u56DE\u503C\u4E2D\u5E26\u56DE\uFF0C\u8C03\u7528\u65B9\u65E0\u9700\u5148\u521B\u5EFA\u3002"
+          description: "\u53EF\u9009\u3002\u6279\u6B21 id\uFF0C\u7528\u4E8E\u628A\u591A\u4E2A\u5E76\u884C run \u5F52\u4E3A\u4E00\u7EC4\uFF0C\u4FBF\u4E8E\u540E\u7EED controlAgentRun(list, batchId=...) \u6309\u6279\u67E5\u8BE2\u3002\u672A\u4F20\u65F6\u81EA\u52A8\u751F\u6210\u4E00\u4E2A\u5E76\u5728\u8FD4\u56DE\u503C\u4E2D\u5E26\u56DE\uFF0C\u8C03\u7528\u65B9\u65E0\u9700\u5148\u521B\u5EFA\u3002\u540C\u4E00 batchId \u5185\u7684\u5E76\u53D1\u6D3E\u53D1\u4F1A\u505A\u51ED\u8BC1\u7EC4\u9694\u79BB\u68C0\u67E5\uFF1AcredentialGroup \u76F8\u540C\u6216\u672A\u77E5\u7684\u5E76\u53D1 run \u4F1A\u88AB\u62D2\u7EDD\u3002"
+        },
+        credentialGroup: {
+          type: "string",
+          description: "\u53EF\u9009\u3002\u7167\u6284 listAgents \u8FD4\u56DE\u7684 credentialGroup \u5B57\u6BB5\uFF0C\u7528\u4E8E\u540C\u6279\u6B21\u5E76\u53D1\u6247\u51FA\u7684\u51ED\u8BC1\u9694\u79BB\u6821\u9A8C\u3002\u7F3A\u7701/\u7A7A\u503C\u89C6\u4E3A\u300C\u672A\u77E5\u300D\uFF08\u4E0D\u662F\u300C\u72EC\u7ACB\u300D\uFF09\uFF1A\u4E0E\u540C batch \u5185\u4EFB\u4F55\u5176\u4ED6 run \u5E76\u53D1\u90FD\u4F1A\u88AB\u62D2\u7EDD\u3002"
+        },
+        allowUnknownCredential: {
+          type: "boolean",
+          description: "\u53EF\u9009\u3002\u663E\u5F0F\u786E\u8BA4\u300C\u51ED\u8BC1\u5F52\u5C5E\u672A\u77E5\u300D\u7684\u5E76\u53D1\u98CE\u9669\u540E\u5F3A\u5236\u653E\u884C\uFF08\u7B49\u540C\u4E8E CLI \u7684 --force-unknown-credential\uFF09\u3002\u4EC5\u5728\u5DF2\u81EA\u884C\u786E\u8BA4\u4E24\u4FA7\u4E0D\u5171\u7528\u4E0A\u6E38\u51ED\u8BC1\u65F6\u4F7F\u7528\uFF1B\u9ED8\u8BA4 false\uFF0C\u672A\u77E5\u51ED\u8BC1\u5E76\u53D1\u4E00\u5F8B\u62D2\u7EDD\u3002",
+          default: false
         },
         trackTodo: {
           type: "boolean",
@@ -13092,13 +13155,25 @@ async function startAgentRunFunc(args, thunkApi, _context) {
   const { agentKey, task, input, agentName, batchId, wait } = args;
   const resultMode = args.resultMode ?? "full";
   const { dispatch } = thunkApi;
-  const effectiveBatchId = typeof batchId === "string" && batchId.trim() ? batchId.trim() : `batch-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${Math.random().toString(36).slice(2, 8)}`;
+  const explicitBatchId = typeof batchId === "string" && batchId.trim() ? batchId.trim() : void 0;
+  const effectiveBatchId = explicitBatchId ?? `batch-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${Math.random().toString(36).slice(2, 8)}`;
   if (!agentKey) {
     throw new Error("startAgentRun: \u7F3A\u5C11 agentKey \u53C2\u6570\u3002");
   }
   if (!task || typeof task !== "string") {
     throw new Error("startAgentRun: \u7F3A\u5C11\u6709\u6548\u7684 task \u6587\u672C\u63CF\u8FF0\u3002");
   }
+  if (explicitBatchId) {
+    const nowMs = Date.now();
+    pruneBatchFanoutRegistry(nowMs);
+    const active = batchFanoutRegistry.get(explicitBatchId) ?? [];
+    const verdict = checkCredentialFanout({
+      active,
+      candidate: { agentKey, credentialGroup: args.credentialGroup },
+      allowUnknownCredential: args.allowUnknownCredential === true
+    });
+    if (!verdict.allowed) throw new Error(verdict.message);
+  }
   const content = buildDelegatedTaskContent(task, input);
   const payloadMetrics = calculateDelegatedPayloadMetrics(task, input, content);
   const activeDialogKey = getActiveDialogKey();
@@ -13128,6 +13203,16 @@ async function startAgentRunFunc(args, thunkApi, _context) {
       };
     }
     const runId = bgResult.dialogId;
+    if (explicitBatchId) {
+      const entries = batchFanoutRegistry.get(explicitBatchId) ?? [];
+      entries.push({
+        runId,
+        agentKey,
+        ...typeof args.credentialGroup === "string" && args.credentialGroup.trim() ? { credentialGroup: args.credentialGroup.trim() } : {},
+        startedAtMs: Date.now()
+      });
+      batchFanoutRegistry.set(explicitBatchId, entries);
+    }
     const status = bgResult.status ?? "pending";
     const resolvedName = agentName?.trim() || bgResult.agentName || bgResult.name;
     const identity = { agentName: resolvedName, agentKey, runId };
@@ -14821,7 +14906,7 @@ var executeToolRun = createAsyncThunk(
     if (!executionInput) {
       throw new Error(`ToolRun ${id} has no input to execute with.`);
     }
-    const { findToolExecutor: findToolExecutor2 } = await import("./tools-4Y2EYH5D.js");
+    const { findToolExecutor: findToolExecutor2 } = await import("./tools-SX6Y4STZ.js");
     const { executor } = findToolExecutor2(run.toolName);
     toolRunStarted({
       id: run.id,
@@ -17328,7 +17413,7 @@ async function updateDocFunc(args, thunkApi) {
       updated_at: (/* @__PURE__ */ new Date()).toISOString()
     };
     await dispatch(write({ data: updatedPageData, customKey: id })).unwrap();
-    const { getDocState, applyExternalDocUpdate } = await import("./docStore-GVWEDN5E.js");
+    const { getDocState, applyExternalDocUpdate } = await import("./docStore-7LAHBFP2.js");
     if (getDocState().pageKey === id) {
       applyExternalDocUpdate({
         slateData: finalSlateData,
@@ -19634,6 +19719,7 @@ export {
   rememberMemoryFunctionSchema,
   deleteMemoryFunctionSchema,
   queryMemoryFunctionSchema,
+  checkCredentialFanout,
   buildStartAgentRunFunctionSchema,
   CONTROL_AGENT_RUN_ACTIONS,
   buildControlAgentRunFunctionSchema,

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

@@ -1,6 +1,6 @@
 import {
   isAgentRunTerminalStatus
-} from "./chunk-NTW5GWDM.js";
+} from "./chunk-3VNWWVKB.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}
 `);

package/{chunk-HMPEO3ZE.js → chunk-Y5HW6GM2.js}

@@ -1,9 +1,9 @@
 import {
   toolRegistry
-} from "./chunk-4OZYL5FG.js";
+} from "./chunk-TZJJ77KQ.js";
 import {
   i18n_default
-} from "./chunk-LBEDNSMY.js";
+} from "./chunk-K4YGZD3P.js";
 import {
   canonicalizeToolNames
 } from "./chunk-O6OSWFZQ.js";