nolo-cli 0.96.0-alpha.1 → 0.97.0-alpha.2

package/{chunk-3SJQXXGY.js → chunk-NUVMWYJM.js}

@@ -21,6 +21,7 @@ import {
   commitRunRecordClaim,
   findRunRecord,
   gcRunRecords,
+  isRunTerminalStatus,
   popAllQueueEntries,
   queryRunRecords,
   releaseRunRecordAck,
@@ -29,7 +30,7 @@ import {
   terminateRunProcess,
   transitionRunToTerminal,
   withQueueLock
-} from "./chunk-CPH3W5A7.js";
+} from "./chunk-WGR3J4Q6.js";
 import {
   clearCredentialAvailability,
   markCredentialUnavailable,
@@ -60,7 +61,7 @@ import {
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-XOVEWFLK.js";
+} from "./chunk-QLNJRTKI.js";
 import {
   getServerProviderSecret
 } from "./chunk-HS7MLR74.js";
@@ -69,6 +70,7 @@ import {
   CONTROL_AGENT_RUN_ACTIONS,
   buildControlAgentRunFunctionSchema,
   buildStartAgentRunFunctionSchema,
+  checkCredentialFanout,
   deleteMemoryFunctionSchema,
   queryMemoryFunctionSchema,
   readXPostFunc,
@@ -78,7 +80,7 @@ import {
   rememberMemoryFunctionSchema,
   resolveAgentRequiredPackIds,
   setTodoListFunc
-} from "./chunk-MMPXJXHT.js";
+} from "./chunk-X4QAVDFE.js";
 import {
   fetchWithTransientRetry,
   isTransientFetchError
@@ -94,7 +96,10 @@ import {
   isAgentRunTerminalStatus,
   resolveRunLabel,
   shortRunId
-} from "./chunk-NTW5GWDM.js";
+} from "./chunk-3VNWWVKB.js";
+import {
+  deriveCredentialGroup
+} from "./chunk-RG6JBBX5.js";
 import {
   getModelPricing
 } from "./chunk-EYAQT56M.js";
@@ -104,14 +109,14 @@ import {
   prepareTokenUsageData,
   resolveBuiltinPlatformAgentConfig,
   runKeyed
-} from "./chunk-FOWEGIMF.js";
+} from "./chunk-WRFW73PB.js";
 import {
   BUILTIN_DIALOG_LLM_CHAT_FALLBACK_MODEL,
   BUILTIN_TITLE_LLM_CONFIG
 } from "./chunk-MC4XLIJ7.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-ZLR5JN3E.js";
+} from "./chunk-RSJECD7I.js";
 import {
   require_date_fns
 } from "./chunk-M76ECQRD.js";
@@ -165,7 +170,7 @@ import {
   resolveOpenAiCompatibleProviderConfig,
   shouldUseGeminiNativeToolRoute,
   summarizeToolArguments
-} from "./chunk-4MY4GLIW.js";
+} from "./chunk-SDTTBMBU.js";
 import {
   PlatformStreamInterruptedError,
   buildPlatformChatCompletionRequest,
@@ -177,11 +182,11 @@ import {
   readSseDataValues,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-OF7AQZUG.js";
+} from "./chunk-2YMRWISD.js";
 import {
   resolveAgentRuntimeConfigFromRecord,
   resolveHistoricalToolContentCap
-} from "./chunk-3IIEFNGY.js";
+} from "./chunk-4EZHSKTB.js";
 import {
   isDevinOAuthAgent
 } from "./chunk-5ZUL4CUO.js";
@@ -213,14 +218,14 @@ import {
 } from "./chunk-2MBTWINN.js";
 import {
   normalizeUsage
-} from "./chunk-JAXOVNM4.js";
+} from "./chunk-NEDZDG3M.js";
 import {
   clipCompactText,
   createProviderCallTimingTracker,
   finalizeProviderCallTiming,
   observeMeaningfulProviderResponseAt,
   withProviderCallTimingFields
-} from "./chunk-WADCY6G6.js";
+} from "./chunk-ASQYTZTR.js";
 import {
   estimateTokenCount
 } from "./chunk-PSCNXBYA.js";
@@ -11034,6 +11039,7 @@ function waitForRunTerminal(args) {
   };
   const loop = Effect_exports.gen(function* () {
     token = args.claim?.acquire() ?? null;
+    const deadline = Date.now() + args.timeoutMs;
     while (true) {
       const state = yield* readEffect(args.read);
       lastState = state;
@@ -11044,6 +11050,9 @@ function waitForRunTerminal(args) {
         }
         return { kind: "terminal", state };
       }
+      if (Date.now() >= deadline) {
+        return { kind: "timeout", waitedMs: args.timeoutMs, lastState };
+      }
       const slept = yield* sleep(args.pollIntervalMs);
       if (slept === "aborted") return { kind: "aborted" };
     }
@@ -11468,6 +11477,12 @@ function buildRunStatusPayload(reconciled, deps, opts = {}) {
       endedAt: reconciled.endedAt ?? null,
       exitCode: reconciled.exitCode ?? null,
       ...reconciled.failureReason ? { failureReason: reconciled.failureReason } : {},
+      // 结构化失败分类 + 可重试性：编排者据此决策，不再肉读 logTail。
+      ...reconciled.failureClass ? { failureClass: reconciled.failureClass } : {},
+      ...typeof reconciled.retryable === "boolean" ? { retryable: reconciled.retryable } : {},
+      // 日志落盘路径始终暴露：stalled/failed 且 dialogId 缺失（如 ephemeral）
+      // 时 logTail 只能靠它读，不能只留在进程内存。
+      ...reconciled.logPath ? { logPath: reconciled.logPath } : {},
       ...typeof reconciled.toolCallCount === "number" ? { toolCallCount: reconciled.toolCallCount } : {},
       ...reconciled.lastAssistantText ? { lastAssistantText: reconciled.lastAssistantText } : {},
       // Non-ephemeral runs expose dialogId so the caller can read the
@@ -11502,6 +11517,39 @@ function buildRunStatusPayload(reconciled, deps, opts = {}) {
     }
   };
 }
+async function assertCredentialFanoutAllowed(deps, args) {
+  let candidateGroup;
+  if (deps.resolveAgentCredentialGroup) {
+    try {
+      candidateGroup = await deps.resolveAgentCredentialGroup(args.agentKey);
+    } catch {
+      candidateGroup = void 0;
+    }
+  }
+  if (!candidateGroup && typeof args.credentialGroup === "string" && args.credentialGroup.trim()) {
+    candidateGroup = args.credentialGroup.trim();
+  }
+  const { batchId, parentDialogId } = args;
+  if (!batchId && !parentDialogId) return candidateGroup;
+  const active = queryRunRecords({ limit: 500 }, deps).runs.filter((record) => {
+    if (isRunTerminalStatus(record.status)) return false;
+    if (batchId && record.batchId === batchId) return true;
+    if (parentDialogId && record.parentDialogId === parentDialogId) return true;
+    return false;
+  }).map((record) => ({
+    runId: record.runId,
+    agentKey: record.agentKey,
+    credentialGroup: record.credentialGroup
+  }));
+  if (active.length === 0) return candidateGroup;
+  const verdict = checkCredentialFanout({
+    active,
+    candidate: { agentKey: args.agentKey, credentialGroup: candidateGroup },
+    allowUnknownCredential: args.allowUnknownCredential === true
+  });
+  if (!verdict.allowed) throw new Error(verdict.message);
+  return candidateGroup;
+}
 function createCliStartAgentRunExecutor(deps = {}) {
   return async (call) => {
     const args = parseCallArgs(call);
@@ -11524,6 +11572,14 @@ function createCliStartAgentRunExecutor(deps = {}) {
     ];
     const agentName = typeof args.agentName === "string" && args.agentName.trim() ? args.agentName.trim() : typeof args.name === "string" && args.name.trim() ? args.name.trim() : void 0;
     const batchId = typeof args.batchId === "string" && args.batchId.trim() ? args.batchId.trim() : void 0;
+    const parentDialogId = typeof args.parentDialogId === "string" && args.parentDialogId.trim() ? args.parentDialogId.trim() : void 0;
+    const credentialGroup = await assertCredentialFanoutAllowed(deps, {
+      agentKey,
+      ...batchId ? { batchId } : {},
+      ...parentDialogId ? { parentDialogId } : {},
+      ...typeof args.credentialGroup === "string" && args.credentialGroup.trim() ? { credentialGroup: args.credentialGroup.trim() } : {},
+      allowUnknownCredential: args.allowUnknownCredential === true
+    });
     const dodCommands = Array.isArray(args.dodCommands) ? args.dodCommands.filter((c) => typeof c === "string" && c.trim().length > 0).map((c) => c.trim()) : typeof args.dod === "string" && args.dod.trim().length > 0 ? [args.dod.trim()] : Array.isArray(args.dod) ? args.dod.filter((c) => typeof c === "string" && c.trim().length > 0).map((c) => c.trim()) : void 0;
     const { runId, batchId: resolvedBatchId } = await spawnLocalBackgroundRun(
       {
@@ -11533,7 +11589,8 @@ function createCliStartAgentRunExecutor(deps = {}) {
         agentKey,
         ...agentName ? { agentName } : {},
         ...batchId ? { batchId } : {},
-        ...typeof args.parentDialogId === "string" && args.parentDialogId.trim() ? { parentDialogId: args.parentDialogId.trim() } : {},
+        ...credentialGroup ? { credentialGroup } : {},
+        ...parentDialogId ? { parentDialogId } : {},
         ...dodCommands && dodCommands.length > 0 ? { dodCommands } : {},
         cwd: deps.cwd ?? process.cwd(),
         message,
@@ -11619,6 +11676,8 @@ async function spawnContinuationRun(reconciled, userInput, deps) {
       ...agentName ? { agentName } : {},
       ...reconciled.batchId ? { batchId: reconciled.batchId } : {},
       ...reconciled.parentDialogId ? { parentDialogId: reconciled.parentDialogId } : {},
+      // 续跑继承原 run 的凭证组（同一 agent），供并发扇出守卫判定。
+      ...reconciled.credentialGroup ? { credentialGroup: reconciled.credentialGroup } : {},
       cwd: reconciled.cwd ?? deps.cwd ?? process.cwd(),
       message: userInput,
       ...reconciled.ephemeral ? { ephemeral: true } : {},
@@ -12217,7 +12276,8 @@ function buildLocalToolExecutors(args) {
     startAgentRun: createCliStartAgentRunExecutor({
       env: args.env,
       cliEntrypoint: args.cliEntrypoint,
-      cwd: args.workspaceRoot
+      cwd: args.workspaceRoot,
+      ...args.resolveAgentCredentialGroup ? { resolveAgentCredentialGroup: args.resolveAgentCredentialGroup } : {}
     }),
     controlAgentRun: createCliControlAgentRunExecutor({
       env: args.env
@@ -13078,6 +13138,23 @@ function createCliLocalRuntimeAdapter(deps) {
   const localToolUsage = /* @__PURE__ */ new Map();
   const buildProviderOpenAiTools = deps.buildProviderOpenAiTools ?? buildOpenAiTools;
   const additionalToolNames = deps.pastedTextStore ? ["readPastedText"] : [];
+  const resolveAgentCredentialGroup = async (agentRef) => {
+    try {
+      const record = await readAgentFromStore({
+        agentRef,
+        store: await getOrCreateSharedStore(deps),
+        userId
+      });
+      if (!record || typeof record !== "object") return void 0;
+      const rec = record;
+      const existing = typeof rec.credentialGroup === "string" && rec.credentialGroup.trim() ? rec.credentialGroup.trim() : void 0;
+      if (existing) return existing;
+      const ref = typeof rec.apiKeyRef === "string" && rec.apiKeyRef.trim() ? rec.apiKeyRef : typeof rec.credentialRef === "string" && rec.credentialRef.trim() ? rec.credentialRef : void 0;
+      return deriveCredentialGroup(ref)?.credentialGroup;
+    } catch {
+      return void 0;
+    }
+  };
   let activeAgentToolNames = [];
   const workspaceRoot = deps.cwd ?? process.cwd();
   let runtimeToolExecutionLimits = {};
@@ -13090,6 +13167,7 @@ function createCliLocalRuntimeAdapter(deps) {
     readXPost: deps.readXPost,
     readXhsProfile: deps.readXhsProfile,
     cliEntrypoint: CLI_ENTRYPOINT,
+    resolveAgentCredentialGroup,
     ...deps.confirmDestructiveAction ? { confirmDestructiveAction: deps.confirmDestructiveAction } : {},
     ...deps.requestUserChoice ? { requestUserChoice: deps.requestUserChoice } : {},
     ...deps.pastedTextStore ? { pastedTextStore: deps.pastedTextStore } : {},
@@ -13167,6 +13245,7 @@ function createCliLocalRuntimeAdapter(deps) {
         readXPost: deps.readXPost,
         readXhsProfile: deps.readXhsProfile,
         cliEntrypoint: CLI_ENTRYPOINT,
+        resolveAgentCredentialGroup,
         ...deps.confirmDestructiveAction ? { confirmDestructiveAction: deps.confirmDestructiveAction } : {},
         ...deps.requestUserChoice ? { requestUserChoice: deps.requestUserChoice } : {},
         ...deps.pastedTextStore ? { pastedTextStore: deps.pastedTextStore } : {},

package/{chunk-BZWBEHGD.js → chunk-O35EJJVP.js}

@@ -7,7 +7,7 @@ import {
 import {
   clipMultilineText,
   fetchAndSerializeTable
-} from "./chunk-MMPXJXHT.js";
+} from "./chunk-X4QAVDFE.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
@@ -28,13 +28,13 @@ import {
 } from "./chunk-MEYIRKDN.js";
 import {
   fetchAndCacheMessages
-} from "./chunk-FOWEGIMF.js";
+} from "./chunk-WRFW73PB.js";
 import {
   shouldUseServerProxy
 } from "./chunk-YYLHWIW6.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-ZLR5JN3E.js";
+} from "./chunk-RSJECD7I.js";
 import {
   buildSkillGuidancePromptBlock,
   extractRuntimePageCapabilities,
@@ -45,9 +45,10 @@ import {
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks,
   compileContextLayers,
+  detectDispatchIntentFromMessages,
   normalizeChatCompletionsBodyForProvider,
   resolveToolGuidedSections
-} from "./chunk-OA6Q2A4I.js";
+} from "./chunk-L7I247DF.js";
 import {
   convertMessagesToResponsesInput,
   getUsageRequestOptions,
@@ -619,7 +620,9 @@ var buildSystemPromptContext = (options) => {
 ${mainPrompt}` : "";
   const agentTools = canonicalizeToolNames(agentConfig.tools ?? []);
   const hasAskTool = agentTools.includes("ask_user");
-  const toolSections = resolveToolGuidedSections(agentTools);
+  const toolSections = resolveToolGuidedSections(agentTools, {
+    dispatchIntent: options.dispatchIntent === true
+  });
   const {
     startupProtocol,
     contextLayerContract,
@@ -699,8 +702,9 @@ var applyClaudeCache = (stableContent, dynamicContent) => {
 var prependPromptMessage = (messages, agentConfig, resolvedModel, language, contexts, prependSystemPrompt = true) => {
   if (!prependSystemPrompt) return messages;
   if (!contexts && !agentConfig.prompt) return messages;
+  const dispatchIntent = detectDispatchIntentFromMessages(messages);
   if (isClaudeModel(resolvedModel)) {
-    const compiled = buildSystemPromptContext({ agentConfig, language, contexts });
+    const compiled = buildSystemPromptContext({ agentConfig, language, contexts, dispatchIntent });
     if (!compiled.content.trim()) return messages;
     const content = applyClaudeCache(
       compiled.stablePrefixContent,
@@ -709,7 +713,7 @@ var prependPromptMessage = (messages, agentConfig, resolvedModel, language, cont
     const systemMessage2 = { role: "system", content };
     return [systemMessage2, ...messages];
   }
-  const promptContent = buildSystemPrompt({ agentConfig, language, contexts });
+  const promptContent = buildSystemPrompt({ agentConfig, language, contexts, dispatchIntent });
   if (!promptContent.trim()) return messages;
   const systemMessage = { role: "system", content: promptContent };
   return [systemMessage, ...messages];
@@ -892,7 +896,9 @@ function generateResponseRequestBody(agentConfig, msgs, contexts, prependSystemP
     const promptContent = buildSystemPrompt({
       agentConfig,
       language,
-      contexts
+      contexts,
+      // 按当前用户输入检测派发意图：无意图只注入最小派发协议（安全硬门常在）。
+      dispatchIntent: detectDispatchIntentFromMessages(msgs)
     });
     body.instructions = promptContent;
   }

package/{chunk-XRWZB6CF.js → chunk-OIMN34NA.js}

@@ -5,14 +5,14 @@ import {
   inlineImageUrlsForCustomProvider,
   prepareTools,
   shouldInlineImageUrlsForAgent
-} from "./chunk-XOVEWFLK.js";
+} from "./chunk-QLNJRTKI.js";
 import {
   INVALID_TOOL_ARGS_REPLACEMENT,
   buildInvalidToolCallSelfHealResult,
   parseToolCallArguments,
   performFetchRequest,
   sanitizeOutboundMessages
-} from "./chunk-BZWBEHGD.js";
+} from "./chunk-O35EJJVP.js";
 import {
   createSSEParser,
   createToolRunId,
@@ -23,7 +23,7 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-MMPXJXHT.js";
+} from "./chunk-X4QAVDFE.js";
 import {
   getPublicImageAgentMode
 } from "./chunk-VIDPVFP3.js";
@@ -35,10 +35,10 @@ import {
   messageStreamEnd,
   messageStreaming,
   updateToolMessage
-} from "./chunk-FOWEGIMF.js";
+} from "./chunk-WRFW73PB.js";
 import {
   streamAgentChatTurn
-} from "./chunk-ZLR5JN3E.js";
+} from "./chunk-RSJECD7I.js";
 import {
   addActiveController,
   removeActiveController,
@@ -56,7 +56,7 @@ import {
 import {
   EMPTY_ASSISTANT_REPAIR_PROMPT,
   getModelInfo
-} from "./chunk-JAXOVNM4.js";
+} from "./chunk-NEDZDG3M.js";
 import {
   getApiEndpoint
 } from "./chunk-OIVSQH2O.js";

package/{chunk-AFDS2CVM.js → chunk-OZPMVBJI.js}

@@ -1,11 +1,11 @@
 import {
   addContentToSpace
-} from "./chunk-ZXKVPF4K.js";
+} from "./chunk-B4ZH7KVO.js";
 import {
   prepareAndPersistMessage,
   uiAskChoiceFunc,
   uiAskChoiceFunctionSchema
-} from "./chunk-FOWEGIMF.js";
+} from "./chunk-WRFW73PB.js";
 import {
   require_date_fns
 } from "./chunk-M76ECQRD.js";

package/{chunk-XOVEWFLK.js → chunk-QLNJRTKI.js}

@@ -1,9 +1,9 @@
 import {
   toolRegistry
-} from "./chunk-MMPXJXHT.js";
+} from "./chunk-X4QAVDFE.js";
 import {
   i18n_default
-} from "./chunk-FOWEGIMF.js";
+} from "./chunk-WRFW73PB.js";
 import {
   canonicalizeToolNames
 } from "./chunk-O6OSWFZQ.js";

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

@@ -1,13 +1,13 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-3SJQXXGY.js";
+} from "./chunk-NUVMWYJM.js";
 import {
   clipMultilineText
-} from "./chunk-MMPXJXHT.js";
+} from "./chunk-X4QAVDFE.js";
 import {
   runLocalAgentTurn
-} from "./chunk-4MY4GLIW.js";
+} from "./chunk-SDTTBMBU.js";
 import {
   applyToolSurfaceConstraints
 } from "./chunk-IIVGDG4I.js";

package/{chunk-IAO6JBYW.js → chunk-RG6JBBX5.js}

@@ -420,6 +420,9 @@ function toSafeAgentSummary(record, options) {
     ...nextAvailableAt !== void 0 ? { nextAvailableAt } : {},
     ...credentialGroup !== void 0 ? { credentialGroup } : {},
     ...credentialKind !== void 0 ? { credentialKind } : {},
+    // 「未知 ≠ 独立」：无 credentialGroup 时显式 credentialed:false，调用方
+    // 不得把缺失解读成独立凭证（并发扇出守卫依赖这个区分）。
+    credentialed: credentialGroup !== void 0,
     updatedAt
   };
 }
@@ -446,7 +449,8 @@ var COMPACT_AGENT_SUMMARY_FIELDS = [
   // 所以通常根本不占字节。
   "nextAvailableAt",
   "credentialGroup",
-  "credentialKind"
+  "credentialKind",
+  "credentialed"
 ];
 function omitNullishAgentSummaryFields(summary) {
   const result = {};

package/{chunk-ZLR5JN3E.js → chunk-RSJECD7I.js}

@@ -304,7 +304,7 @@ var slice = createSliceWithThunks({
       const overrides = {};
       if (args.systemPromptOverride !== void 0) overrides.prompt = args.systemPromptOverride;
       if (args.toolsOverride !== void 0) overrides.tools = args.toolsOverride;
-      const { _executeModel } = await import("./_executeModel-AUQRMRWL.js");
+      const { _executeModel } = await import("./_executeModel-G2MRKK2K.js");
       return _executeModel(
         {
           isStreaming: args.isStreaming ?? false,
@@ -325,7 +325,7 @@ var slice = createSliceWithThunks({
      * - 循环直到无工具调用或触发其他运行时停止条件
      */
     runAgent: create.asyncThunk(async (args, thunkApi) => {
-      const { runAgentClientLoop } = await import("./runAgentClientLoop-37BXJD62.js");
+      const { runAgentClientLoop } = await import("./runAgentClientLoop-GD3APV7V.js");
       const { content: loopContent, toolCallCount } = await runAgentClientLoop(
         {
           agentKey: args.agentKey,
@@ -341,7 +341,7 @@ var slice = createSliceWithThunks({
      * 聊天轮次流式 Agent 调用
      */
     streamAgentChatTurn: create.asyncThunk(async (args, thunkApi) => {
-      const { streamAgentChatTurnHandler } = await import("./streamAgentChatTurn-FGXQXALU.js");
+      const { streamAgentChatTurnHandler } = await import("./streamAgentChatTurn-M73KWCCU.js");
       return streamAgentChatTurnHandler(args, thunkApi);
     }),
     /**