nolo-cli 0.107.0-alpha.4 → 0.107.0

package/{chunk-W7HLWAQ7.js → chunk-VPLUU4IX.js}

@@ -5,14 +5,14 @@ import {
   inlineImageUrlsForCustomProvider,
   prepareTools,
   shouldInlineImageUrlsForAgent
-} from "./chunk-ASIFZ2WY.js";
+} from "./chunk-YKZLFY5J.js";
 import {
   INVALID_TOOL_ARGS_REPLACEMENT,
   buildInvalidToolCallSelfHealResult,
   parseToolCallArguments,
   performFetchRequest,
   sanitizeOutboundMessages
-} from "./chunk-GL3EHUR4.js";
+} from "./chunk-N7NLLRQQ.js";
 import {
   createSSEParser,
   createToolRunId,
@@ -23,10 +23,13 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-C3M4465B.js";
+} from "./chunk-LKIVH2I2.js";
 import {
   getPublicImageAgentMode
 } from "./chunk-VIDPVFP3.js";
+import {
+  parseApiError
+} from "./chunk-OCZKATRC.js";
 import {
   getCurrentSpaceId
 } from "./chunk-ZJ7UHBJS.js";
@@ -34,16 +37,17 @@ import {
   addToolMessage,
   messageStreamEnd,
   messageStreaming,
+  toolResultNeedsUserConfirmation,
   updateToolMessage
-} from "./chunk-T75QD6AB.js";
+} from "./chunk-7AY2H3GA.js";
 import {
   streamAgentChatTurn
-} from "./chunk-NOF3HDSN.js";
+} from "./chunk-RLSF5CSE.js";
 import {
   addActiveController,
   removeActiveController,
   tokenUsageLiveUpdate
-} from "./chunk-6YTOJY35.js";
+} from "./chunk-VBG7GWWR.js";
 import {
   accumulateToolCallDelta,
   createThinkParserState,
@@ -56,39 +60,39 @@ import {
 import {
   EMPTY_ASSISTANT_REPAIR_PROMPT,
   getModelInfo
-} from "./chunk-HKNXJGEC.js";
+} from "./chunk-ECFHBYUW.js";
+import {
+  write
+} from "./chunk-WPHY3VPF.js";
 import {
   getApiEndpoint
-} from "./chunk-OIVSQH2O.js";
+} from "./chunk-CDEEFJXN.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
 import {
-  selectCurrentServer
-} from "./chunk-GP5LKBUZ.js";
+  extractCustomId
+} from "./chunk-M2EJHDJP.js";
 import {
-  write
-} from "./chunk-VRTTFDBM.js";
+  isRecord
+} from "./chunk-KUG52IAP.js";
+import {
+  selectCurrentServer
+} from "./chunk-NWENLDMM.js";
 import {
   createDialogMessageKeyAndId,
   dialogMessageKey,
   toTrimmedString
-} from "./chunk-VMFTFOWF.js";
-import {
-  extractCustomId
-} from "./chunk-M2EJHDJP.js";
+} from "./chunk-OKGVNZTL.js";
 import {
   createAsyncThunk
-} from "./chunk-UKWGR5SS.js";
+} from "./chunk-VY6VFGKR.js";
 import {
   isAbortError
-} from "./chunk-QOKAKDPE.js";
+} from "./chunk-HIM3FCLF.js";
 import {
   selectIdentityToken
 } from "./chunk-SEJ5OS6F.js";
-import {
-  isRecord
-} from "./chunk-KUG52IAP.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
@@ -275,7 +279,7 @@ async function persistToolMessage(dispatch, message, options = {}) {
     }
     throw err;
   }
-  const { controller: _controller, ...rest } = message;
+  const { controller: _controller, dialogId: _dialogId, ...rest } = message;
   const isStreaming = options.isStreaming !== void 0 ? options.isStreaming : Boolean(rest.isStreaming);
   try {
     const writeRequest = dispatch(
@@ -391,6 +395,49 @@ function applyResponsesUsageFields(target, chunk) {
   }
 }
 
+// packages/ai/tools/stripModelConfirmationFlags.ts
+var CONFIRMATION_INPUT_KEYS = {
+  self_evolution_requires_confirmation: "__confirmedSelfEvolution",
+  agent_update_requires_confirmation: "__confirmedSelfEvolution",
+  media_job_start_requires_confirmation: "__confirmedMediaJobStart"
+};
+function stripModelConfirmationFlags(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return value;
+  return Object.fromEntries(
+    Object.entries(value).filter(
+      ([key]) => !key.startsWith("__confirmed")
+    )
+  );
+}
+var MODEL_DIALOG_BINDING_STRIPPED_TOOLS = /* @__PURE__ */ new Set([
+  "mediaJobTool",
+  "transcribe",
+  "translate",
+  "exportDocument",
+  "readArtifact"
+]);
+var TRUSTED_ONLY_MODEL_INPUT_KEYS = /* @__PURE__ */ new Set(["confirmationToken", "expectedExecutionRevision"]);
+function stripModelToolArgs(canonicalToolName, value) {
+  const base = stripModelConfirmationFlags(value);
+  if (!base || typeof base !== "object" || Array.isArray(base)) return base;
+  const withoutTrustedOnlyKeys = Object.fromEntries(
+    Object.entries(base).filter(
+      ([key]) => !TRUSTED_ONLY_MODEL_INPUT_KEYS.has(key)
+    )
+  );
+  if (!MODEL_DIALOG_BINDING_STRIPPED_TOOLS.has(canonicalToolName)) {
+    return withoutTrustedOnlyKeys;
+  }
+  if (!withoutTrustedOnlyKeys || typeof withoutTrustedOnlyKeys !== "object" || Array.isArray(withoutTrustedOnlyKeys)) {
+    return withoutTrustedOnlyKeys;
+  }
+  return Object.fromEntries(
+    Object.entries(withoutTrustedOnlyKeys).filter(
+      ([key]) => key !== "dialogId" && key !== "autoApproveCredits"
+    )
+  );
+}
+
 // packages/chat/messages/toolThunks.ts
 var TOOL_ARGS_SENTINELS = [
   "<|tool_calls_section_end|>",
@@ -414,6 +461,23 @@ var defaultSummary = (toolName, status) => {
   if (status === "failed") return `\u274C ${toolName} \u6267\u884C\u5931\u8D25`;
   return `\u2705 ${toolName} \u6267\u884C\u5B8C\u6210`;
 };
+var RAW_DATA_FALLBACK_MAX_TOTAL_BYTES = 4e3;
+var RAW_DATA_FALLBACK_MAX_HEAD_BYTES = 1e3;
+var RAW_DATA_FALLBACK_MAX_TAIL_BYTES = 2500;
+var buildRawDataLlmContextFallback = (rawData, toolCallId) => {
+  const serialized = typeof rawData === "string" ? rawData.trim() : rawData === void 0 ? "" : JSON.stringify(rawData);
+  if (!serialized) return void 0;
+  const clipped = clipHeadAndTail(serialized, {
+    maxHeadBytes: RAW_DATA_FALLBACK_MAX_HEAD_BYTES,
+    maxTailBytes: RAW_DATA_FALLBACK_MAX_TAIL_BYTES,
+    maxTotalBytes: RAW_DATA_FALLBACK_MAX_TOTAL_BYTES,
+    // 完整 rawData 已随 tool message content 原样落盘，无需另写临时日志；
+    // 浏览器 stub 本就忽略该选项。
+    saveTempLog: false,
+    ...toolCallId ? { toolCallId } : {}
+  });
+  return asOptionalTrimmedString(clipped.content);
+};
 var processToolData = createAsyncThunk(
   "message/processToolData",
   async (args, thunkApi) => {
@@ -446,7 +510,8 @@ var processToolData = createAsyncThunk(
       }
     }
     const activity = isRecord(toolArgs) && isRecord(toolArgs._activity) ? toolArgs._activity : void 0;
-    const executionToolArgs = isRecord(toolArgs) && Object.prototype.hasOwnProperty.call(toolArgs, "_activity") ? (({ _activity: _ignored, ...rest }) => rest)(toolArgs) : toolArgs;
+    const withoutActivity = isRecord(toolArgs) && Object.prototype.hasOwnProperty.call(toolArgs, "_activity") ? (({ _activity: _ignored, ...rest }) => rest)(toolArgs) : toolArgs;
+    const executionToolArgs = stripModelToolArgs(canonicalName, withoutActivity);
     const inputSummary = JSON.stringify(executionToolArgs).slice(0, 400);
     toolRunStarted({
       id: toolRunId,
@@ -473,6 +538,7 @@ var processToolData = createAsyncThunk(
         const toolPayload = {
           toolName: canonicalName,
           status: "pending",
+          interaction,
           input: executionToolArgs,
           rawToolCall: toolCall,
           toolRunId,
@@ -534,19 +600,28 @@ var processToolData = createAsyncThunk(
       });
       const rawData = toolResult?.rawData ?? toolResult;
       const llmContext = asOptionalTrimmedString(toolResult?.llmContext);
-      const summary = asOptionalTrimmedString(toolResult?.displayData) || defaultSummary(canonicalName, "succeeded");
-      toolRunSucceeded({
-        id: toolRunId,
-        outputSummary: summary
-      });
+      const displayData = asOptionalTrimmedString(toolResult?.displayData);
+      const awaitingUserConfirmation = toolResultNeedsUserConfirmation(canonicalName, rawData);
+      const summary = displayData || defaultSummary(canonicalName, awaitingUserConfirmation ? "pending" : "succeeded");
+      const llmContextFallback = llmContext || displayData || awaitingUserConfirmation ? void 0 : buildRawDataLlmContextFallback(rawData, toolCallId);
+      const effectiveLlmContext = llmContext ?? llmContextFallback;
+      if (!awaitingUserConfirmation) {
+        toolRunSucceeded({
+          id: toolRunId,
+          outputSummary: summary
+        });
+      } else {
+        toolRunSetPending({ id: toolRunId });
+      }
       const toolPayload = {
         toolName: canonicalName,
-        status: "succeeded",
+        status: awaitingUserConfirmation ? "pending" : "succeeded",
+        interaction,
         input: executionToolArgs,
         rawToolCall: toolCall,
         toolRunId,
         summary,
-        ...llmContext ? { llmContext } : {},
+        ...effectiveLlmContext ? { llmContext: effectiveLlmContext } : {},
         ...activity ? { activity } : {}
       };
       const isUiAskChoice = canonicalName === "ask_user";
@@ -564,11 +639,11 @@ var processToolData = createAsyncThunk(
     } catch (e) {
       const errorMessage = toErrorMessage(e);
       const structured = getToolResultErrorData(e);
-      const requiresConfirmation = structured?.code === "self_evolution_requires_confirmation" || structured?.code === "agent_update_requires_confirmation";
-      if (requiresConfirmation) {
+      const confirmationKey = structured?.code ? CONFIRMATION_INPUT_KEYS[structured.code] : void 0;
+      if (confirmationKey) {
         const confirmedInput = {
           ...executionToolArgs ?? {},
-          __confirmedSelfEvolution: true
+          [confirmationKey]: true
         };
         const summary2 = typeof structured?.displayData === "string" && structured.displayData.trim() || `\u26A0\uFE0F ${canonicalName} \u9700\u8981\u786E\u8BA4\u540E\u6267\u884C`;
         toolRunStarted({
@@ -584,6 +659,7 @@ var processToolData = createAsyncThunk(
         const toolPayload2 = {
           toolName: canonicalName,
           status: "pending",
+          interaction: "confirm",
           input: confirmedInput,
           rawToolCall: toolCall,
           toolRunId,
@@ -592,7 +668,11 @@ var processToolData = createAsyncThunk(
         };
         return {
           toolCallId,
-          rawResult: structured?.rawData !== void 0 ? structured.rawData : { error: "self_evolution_requires_confirmation" },
+          rawResult: structured?.rawData !== void 0 ? structured.rawData : (
+            // 按实际确认码回填（此分支内 code 必在 CONFIRMATION_INPUT_KEYS 中），
+            // 不再对所有工具写死 self_evolution 文案。
+            { error: structured?.code }
+          ),
           summary: summary2,
           toolName: canonicalName,
           toolRunId,
@@ -661,6 +741,9 @@ var handleToolCalls = createAsyncThunk(
       const runningToolMessage = {
         id: runningToolMessageId,
         dbKey: runningToolDbKey,
+        // Explicit identity: tool results belong to the run's dialog, and the
+        // message-key parse is ambiguous once a message id contains "-msg-".
+        dialogId,
         role: "tool",
         content: JSON.stringify({ pending: true }),
         toolCallId,
@@ -794,61 +877,6 @@ var handleToolCalls = createAsyncThunk(
   }
 );
 
-// packages/ai/chat/parseApiError.ts
-async function parseApiError(response) {
-  const errorBody = await response.text();
-  const truncateErrorMessage = (message, maxChars = 320) => message.length <= maxChars ? message : `${message.slice(0, maxChars)}\u2026`;
-  const isContextOverflow = (message) => /maximum context length|context length|context_length_exceeded|requested about .*tokens|too many tokens/i.test(message);
-  let defaultMessage = `\u72B6\u6001\u7801 ${response.status} ${response.statusText}`;
-  let errorMessage = defaultMessage;
-  let errorCode = `E${response.status}`;
-  try {
-    const errorJson = JSON.parse(errorBody);
-    errorMessage = errorJson?.error?.message || errorJson?.message || errorJson?.msg || errorBody || defaultMessage;
-    errorCode = errorJson?.error?.code || errorJson?.code || errorCode;
-  } catch (_e) {
-    if (errorBody) {
-      errorMessage = errorBody;
-    }
-  }
-  switch (response.status) {
-    case 400:
-      if (isContextOverflow(errorMessage) || isContextOverflow(errorBody) || errorCode === "UPSTREAM_400") {
-        return "\u4E0A\u4E0B\u6587\u8FC7\u957F\uFF1A\u672C\u8F6E\u6D88\u606F\u6216\u5DE5\u5177\u7ED3\u679C\u592A\u5927\u3002\u8BF7\u7F29\u5C0F\u8303\u56F4\uFF0C\u6216\u5148\u8BFB\u53D6\u66F4\u5C0F\u7247\u6BB5\u540E\u518D\u7EE7\u7EED\u3002";
-      }
-      if (errorCode === "MISSING_PROVIDER_API_KEY") {
-        return truncateErrorMessage(errorMessage);
-      }
-      if (errorMessage && errorMessage !== defaultMessage) {
-        return `\u8BF7\u6C42\u53C2\u6570\u9519\u8BEF: ${truncateErrorMessage(errorMessage)}`;
-      }
-      return "\u8BF7\u6C42\u53C2\u6570\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u8F93\u5165";
-    case 413:
-      return "\u8BF7\u6C42\u5185\u5BB9\u8FC7\u5927\uFF1A\u8BF7\u51CF\u5C11\u4E00\u6B21\u53D1\u9001\u7684\u6D88\u606F\u3001\u6587\u4EF6\u6216\u5DE5\u5177\u7ED3\u679C\u3002";
-    case 401:
-      switch (errorCode) {
-        case "AUTH_TOKEN_EXPIRED":
-          return "\u767B\u5F55\u72B6\u6001\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u5148\u767B\u51FA\u540E\u91CD\u65B0\u767B\u5F55";
-        case "AUTH_ACCOUNT_INVALID":
-          return "\u8D26\u6237\u65E0\u6548\u6216\u5DF2\u88AB\u505C\u7528\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458";
-        case "AUTH_NO_TOKEN":
-          return "\u672A\u68C0\u6D4B\u5230\u767B\u5F55\u72B6\u6001\uFF0C\u8BF7\u5148\u767B\u5F55";
-        case "AUTH_INVALID_TOKEN":
-          return "\u767B\u5F55\u51ED\u8BC1\u65E0\u6548\uFF0C\u8BF7\u5148\u767B\u51FA\u540E\u91CD\u65B0\u767B\u5F55";
-        case "AUTH_TOKEN_NOT_ACTIVE":
-          return "\u4EE4\u724C\u5C1A\u672A\u751F\u6548\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5";
-        default:
-          return errorMessage && errorMessage !== `\u72B6\u6001\u7801 401 Unauthorized` ? `\u8BA4\u8BC1\u9519\u8BEF: ${truncateErrorMessage(errorMessage)}` : "\u8EAB\u4EFD\u9A8C\u8BC1\u5931\u8D25\uFF0C\u8BF7\u5148\u767B\u51FA\u540E\u91CD\u65B0\u767B\u5F55";
-      }
-    case 503:
-      return errorMessage && errorMessage !== `\u72B6\u6001\u7801 503 Service Unavailable` ? truncateErrorMessage(errorMessage) : "\u670D\u52A1\u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5";
-    case 504:
-      return "\u8BF7\u6C42\u8D85\u65F6\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5";
-    default:
-      return `API\u8BF7\u6C42\u5931\u8D25: ${truncateErrorMessage(errorMessage)}`;
-  }
-}
-
 // packages/ai/chat/accumulateToolCallChunks.ts
 function accumulateToolCallChunks(currentAccumulatedCalls, toolCallChunks) {
   const accumulator = {
@@ -1348,6 +1376,7 @@ async function persistInvalidToolCallResults(invalidCalls, ctx, startIndex) {
     const toolMessage = {
       id: runningToolMessageId,
       dbKey: runningToolDbKey,
+      dialogId: ctx.dialogId,
       role: "tool",
       content: selfHealContent,
       toolCallId: callId,
@@ -1839,7 +1868,6 @@ export {
   filterAndCleanMessages,
   persistToolMessages,
   handleToolCalls,
-  parseApiError,
   updateTotalUsage,
   readStreamChunk,
   sendOpenAICompletionsRequest