nolo-cli 0.149.0-alpha.1 → 0.151.0-alpha.2

package/{chunk-DXHL7G2L.js → chunk-PCKVQXYV.js}

@@ -5,21 +5,25 @@ import {
   inlineImageUrlsForCustomProvider,
   prepareTools,
   shouldInlineImageUrlsForAgent
-} from "./chunk-3DAVPNFT.js";
-import {
-  parseApiError
-} from "./chunk-OCZKATRC.js";
+} from "./chunk-Z7OJUX6S.js";
 import {
+  CONFIRMATION_INPUT_KEYS,
   INVALID_TOOL_ARGS_REPLACEMENT,
   buildInvalidToolCallSelfHealResult,
   parseToolCallArguments,
   performFetchRequest,
-  sanitizeOutboundMessages
-} from "./chunk-YAQJJDC2.js";
+  sanitizeOutboundMessages,
+  stripModelToolArgs
+} from "./chunk-AOCM7HPT.js";
 import {
   findToolExecutor,
   toolDefinitionsByName
-} from "./chunk-ID7LNBWR.js";
+} from "./chunk-Y2DXOPSO.js";
+import {
+  classifyApiError,
+  classifyGenerationError,
+  extractErrorDiagnostics
+} from "./chunk-SMENBO3M.js";
 import {
   createSSEParser,
   createToolRunId,
@@ -28,27 +32,48 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-ATLTFRYJ.js";
+} from "./chunk-ES633ZS5.js";
 import {
-  getCurrentSpaceId
-} from "./chunk-ZJ7UHBJS.js";
+  getPublicImageAgentMode
+} from "./chunk-VIDPVFP3.js";
 import {
   addToolMessage,
   messageStreamEnd,
   messageStreaming,
+  toolResultNeedsUserConfirmation,
   updateToolMessage
-} from "./chunk-ACQD6YI2.js";
+} from "./chunk-556RW72X.js";
 import {
   streamAgentChatTurn
-} from "./chunk-TZZ2WRBL.js";
+} from "./chunk-IZ7OJB6K.js";
+import {
+  getCurrentSpaceId
+} from "./chunk-ZJ7UHBJS.js";
 import {
   addActiveController,
   removeActiveController,
   tokenUsageLiveUpdate
-} from "./chunk-B6SAMB33.js";
+} from "./chunk-OWYYDMGJ.js";
 import {
-  getPublicImageAgentMode
-} from "./chunk-VIDPVFP3.js";
+  selectCurrentServer
+} from "./chunk-QFEW2ULV.js";
+import {
+  write
+} from "./chunk-74RAWNQN.js";
+import {
+  createAsyncThunk
+} from "./chunk-IJERIUXS.js";
+import {
+  selectIdentityToken
+} from "./chunk-SEJ5OS6F.js";
+import {
+  classifyOutboundErrorCategory,
+  createOutboundDiagnosticCall,
+  deriveRequestFactsFromBody,
+  projectUserPartForModel,
+  resolveOutboundDiagnosticSink,
+  resolveOutboundWire
+} from "./chunk-G6OOUQWJ.js";
 import {
   accumulateToolCallDelta,
   createThinkParserState,
@@ -57,46 +82,39 @@ import {
   flushToolCallTextParserIntoCallback,
   processContentChunkWithToolCallStripping,
   processThinkChunk
-} from "./chunk-N7J63Q6C.js";
+} from "./chunk-56GBUMO5.js";
 import {
-  EMPTY_ASSISTANT_REPAIR_PROMPT,
-  getModelInfo
-} from "./chunk-AKG5W4LG.js";
+  normalizeChatCompletionsBodyForProvider
+} from "./chunk-3SZA4U64.js";
 import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+  EMPTY_ASSISTANT_REPAIR_PROMPT
+} from "./chunk-6CCFTVBP.js";
 import {
-  getApiEndpoint
-} from "./chunk-3BXNTXYI.js";
+  getModelInfo
+} from "./chunk-BPMPOFWP.js";
 import {
-  selectCurrentServer
-} from "./chunk-SONWNI3L.js";
+  isAbortError
+} from "./chunk-7DPNBQSV.js";
 import {
-  write
-} from "./chunk-HYZIYH2H.js";
+  extractCustomId
+} from "./chunk-M2EJHDJP.js";
 import {
   createDialogMessageKeyAndId,
   dialogMessageKey,
   toTrimmedString
-} from "./chunk-3AH7LNUB.js";
+} from "./chunk-5EMSBTQ6.js";
 import {
-  createAsyncThunk
-} from "./chunk-WIWM4FE3.js";
-import {
-  isAbortError
-} from "./chunk-QOKAKDPE.js";
-import {
-  selectIdentityToken
-} from "./chunk-SEJ5OS6F.js";
+  getApiEndpoint
+} from "./chunk-I4SN4NUQ.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
-import {
-  extractCustomId
-} from "./chunk-M2EJHDJP.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -123,11 +141,12 @@ var extractContent = (msg) => {
   }
   if (typeof msg.content === "string") return msg.content;
   if (Array.isArray(msg.content)) {
-    const parts = msg.content.filter(isValidMessagePart);
+    const parts = msg.role === "user" ? msg.content.flatMap((part) => projectUserPartForModel(part)) : msg.content.filter(isValidMessagePart);
     return parts.length > 0 ? parts : null;
   }
-  if (msg.content && typeof msg.content === "object" && isValidMessagePart(msg.content)) {
-    return [msg.content];
+  if (msg.content && typeof msg.content === "object") {
+    const projected = msg.role === "user" ? projectUserPartForModel(msg.content) : isValidMessagePart(msg.content) ? [msg.content] : [];
+    return projected.length ? projected : null;
   }
   return null;
 };
@@ -280,7 +299,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(
@@ -419,6 +438,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) => {
@@ -451,7 +487,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,
@@ -478,6 +515,7 @@ var processToolData = createAsyncThunk(
         const toolPayload = {
           toolName: canonicalName,
           status: "pending",
+          interaction,
           input: executionToolArgs,
           rawToolCall: toolCall,
           toolRunId,
@@ -539,19 +577,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";
@@ -569,11 +616,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({
@@ -589,6 +636,7 @@ var processToolData = createAsyncThunk(
         const toolPayload2 = {
           toolName: canonicalName,
           status: "pending",
+          interaction: "confirm",
           input: confirmedInput,
           rawToolCall: toolCall,
           toolRunId,
@@ -597,7 +645,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,
@@ -666,6 +718,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,
@@ -869,8 +924,8 @@ async function readStreamChunk(reader, options) {
 
 // packages/ai/agent/utils/imageOutput.ts
 var LEGACY_IMAGE_MODELS = /* @__PURE__ */ new Set([
-  "google/gemini-3-pro-image-preview",
-  "google/gemini-3.1-flash-image-preview"
+  "google/gemini-3-pro-image",
+  "google/gemini-nano-banana-2.1"
 ]);
 function supportsImageGeneration(agent) {
   if (agent.hasImageOutput === true) return true;
@@ -916,8 +971,6 @@ function getStreamErrorMessage(data) {
   if (message) return message;
   const code = asOptionalTrimmedString(data?.error?.code) ?? asOptionalTrimmedString(data?.code);
   if (code) return code;
-  const type = asOptionalTrimmedString(data?.error?.type);
-  if (type) return type;
   return "Unknown error";
 }
 function formatStreamErrorMessage(data) {
@@ -1017,11 +1070,7 @@ function buildRequestBodyWithTools(bodyData, agentConfig, disableToolsForThisReq
   }
   const tools = prepareTools(rawTools, { provider: agentConfig.provider });
   if (!tools.length) return baseBody;
-  return {
-    ...baseBody,
-    tools,
-    tool_choice: baseBody.tool_choice ?? "auto"
-  };
+  return { ...baseBody, tools, tool_choice: baseBody.tool_choice ?? "auto" };
 }
 async function finalizeStream(state, ctx) {
   if (state.hasHandedOff || state.alreadyFinalized) return state;
@@ -1068,7 +1117,7 @@ async function finalizeStream(state, ctx) {
     alreadyFinalized: true
   };
 }
-var EMPTY_UPSTREAM_STREAM_MESSAGE = "\u6A21\u578B\u8FD4\u56DE\u4E86\u7A7A\u54CD\u5E94\uFF0C\u8BF7\u91CD\u8BD5\u6216\u5207\u6362\u5176\u4ED6\u6A21\u578B";
+var EMPTY_UPSTREAM_STREAM_MESSAGE = "\u6A21\u578B\u8FD4\u56DE\u4E86\u7A7A\u54CD\u5E94\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u68C0\u67E5\u670D\u52A1\u54CD\u5E94\u3002";
 function markEmptyCompletionAsError(state, ctx) {
   const producedNothing = state.contentBuffer.length === 0 && !state.reasoningBuffer.trim() && (state.assistantToolCalls?.length ?? 0) === 0;
   if (!producedNothing || state.hasHandedOff || state.alreadyFinalized) {
@@ -1084,13 +1133,20 @@ function markEmptyCompletionAsError(state, ctx) {
     billingFailed: true
   };
 }
-function markStreamMessageAborted(ctx, errorMessage) {
+function markStreamMessageAborted(ctx, errorMessage, classification = classifyGenerationError(errorMessage)) {
   const base = ctx.messageMetadata ?? {};
   const previousMetadata = base.metadata && typeof base.metadata === "object" ? base.metadata : {};
   ctx.messageMetadata = {
     ...base,
+    errorMeta: {
+      kind: classification.category,
+      summary: classification.message,
+      retryable: classification.retryable,
+      actions: classification.actions
+    },
     metadata: {
       ...previousMetadata,
+      providerError: { category: classification.category, ...classification.diagnostic },
       error: true,
       message: errorMessage
     }
@@ -1120,6 +1176,8 @@ function applyDelta(state, delta) {
       ...next,
       accumulatedToolCalls: accumulated,
       assistantToolCalls: accumulated.map((call) => ({
+        ...call.thought_signature !== void 0 ? { thought_signature: call.thought_signature } : {},
+        ...call.extra_content ? { extra_content: call.extra_content } : {},
         id: call.id,
         type: "function",
         function: {
@@ -1265,6 +1323,8 @@ function syncAssistantToolCallsAfterSanitize(state, invalidCalls) {
     if (call?.id) invalidById.set(call.id, call);
   }
   const base = Array.isArray(state.assistantToolCalls) ? state.assistantToolCalls : state.accumulatedToolCalls.map((call) => ({
+    ...call.thought_signature !== void 0 ? { thought_signature: call.thought_signature } : {},
+    ...call.extra_content ? { extra_content: call.extra_content } : {},
     id: call.id,
     type: "function",
     function: {
@@ -1298,6 +1358,7 @@ async function persistInvalidToolCallResults(invalidCalls, ctx, startIndex) {
     const toolMessage = {
       id: runningToolMessageId,
       dbKey: runningToolDbKey,
+      dialogId: ctx.dialogId,
       role: "tool",
       content: selfHealContent,
       toolCallId: callId,
@@ -1451,7 +1512,8 @@ var sendOpenAICompletionsRequest = async ({
   messageMetadata,
   disableToolsForThisRequest = false,
   quickChatPerfStartedAt,
-  streamThrottlerOptions
+  streamThrottlerOptions,
+  outboundDiagnostics
 }) => {
   const { dispatch, getState, signal: thunkSignal } = thunkApi;
   const dialogId = extractCustomId(dialogKey);
@@ -1471,11 +1533,11 @@ var sendOpenAICompletionsRequest = async ({
   }
   dispatch(addActiveController({ messageId, controller, dialogKey }));
   const requestBody = await inlineImageUrlsForCustomProvider(
-    buildRequestBodyWithTools(
-      bodyData,
-      agentConfig,
-      disableToolsForThisRequest
-    ),
+    normalizeChatCompletionsBodyForProvider({
+      body: buildRequestBodyWithTools(bodyData, agentConfig, disableToolsForThisRequest),
+      provider: agentConfig.provider ?? "",
+      model: agentConfig.model
+    }),
     {
       shouldInline: shouldInlineImageUrlsForAgent(agentConfig)
     }
@@ -1517,6 +1579,31 @@ var sendOpenAICompletionsRequest = async ({
     usage: streamState.totalUsage ?? void 0,
     billingFailed: streamState.billingFailed
   });
+  const diagnosticSink = resolveOutboundDiagnosticSink(outboundDiagnostics);
+  let diagnosticCall;
+  let diagnosticOutcome = "completed";
+  let diagnosticStreamStarted = false;
+  let diagnosticAttemptCount = 0;
+  let diagnosticCurrentAttempt = 0;
+  let diagnosticCurrentAttemptClosed = false;
+  const beginDiagnosticAttempt = (attemptBody) => {
+    if (!diagnosticCall) return 0;
+    diagnosticAttemptCount += 1;
+    diagnosticCurrentAttempt = diagnosticAttemptCount;
+    diagnosticCurrentAttemptClosed = false;
+    diagnosticStreamStarted = false;
+    diagnosticOutcome = "completed";
+    diagnosticCall.dispatch(
+      diagnosticCurrentAttempt,
+      deriveRequestFactsFromBody(attemptBody)
+    );
+    return diagnosticCurrentAttempt;
+  };
+  const closeDiagnosticAttempt = (attempt, outcome) => {
+    if (!diagnosticCall || attempt <= 0) return;
+    diagnosticCall.terminal(attempt, outcome);
+    if (attempt === diagnosticCurrentAttempt) diagnosticCurrentAttemptClosed = true;
+  };
   try {
     if (!parentMessageId) {
       dispatch(
@@ -1535,6 +1622,18 @@ var sendOpenAICompletionsRequest = async ({
       );
     }
     const api = getApiEndpoint(agentConfig);
+    diagnosticCall = diagnosticSink ? createOutboundDiagnosticCall({
+      sink: diagnosticSink,
+      seam: "chat",
+      host: outboundDiagnostics?.host ?? "client",
+      wire: resolveOutboundWire(api),
+      provider: agentConfig?.provider,
+      model: agentConfig?.model,
+      callId: outboundDiagnostics?.callId
+    }) : void 0;
+    if (diagnosticCall) {
+      beginDiagnosticAttempt(requestBody);
+    }
     const token = selectIdentityToken(getState()) ?? "";
     logQuickChatPerfStage(quickChatPerfStartedAt, "openai-completions-fetch-starting", {
       api,
@@ -1592,7 +1691,47 @@ var sendOpenAICompletionsRequest = async ({
       );
     }
     if (!response.ok) {
-      const errorMessage = await parseApiError(response);
+      const rawBody = await response.text();
+      let errorData;
+      try {
+        errorData = JSON.parse(rawBody);
+      } catch {
+        errorData = { message: rawBody };
+      }
+      diagnosticOutcome = "http-error";
+      diagnosticCall?.httpResult(diagnosticCurrentAttempt, {
+        status: response.status,
+        headers: response.headers,
+        errorCategory: classifyOutboundErrorCategory(response.status, rawBody)
+      });
+      const errorJson = errorData?.error ?? errorData;
+      const apiErrorMessage = errorJson?.message || errorJson?.msg || (typeof rawBody === "string" ? rawBody : "") || `\u72B6\u6001\u7801 ${response.status} ${response.statusText}`;
+      const apiErrorCode = errorJson?.code || `E${response.status}`;
+      const legacyClassified = classifyApiError({
+        status: response.status,
+        statusText: response.statusText,
+        message: apiErrorMessage,
+        body: rawBody,
+        code: apiErrorCode
+      });
+      let classified;
+      if (legacyClassified.kind === "context_overflow" || legacyClassified.kind === "context_too_large" || legacyClassified.kind === "auth" || legacyClassified.code === "MISSING_PROVIDER_API_KEY") {
+        classified = {
+          category: legacyClassified.kind,
+          message: legacyClassified.message,
+          retryable: legacyClassified.retryable ?? false,
+          actions: legacyClassified.actions ?? [],
+          diagnostic: {
+            ...legacyClassified.code ? { code: legacyClassified.code } : {},
+            status: response.status
+          }
+        };
+      } else {
+        classified = classifyGenerationError(errorData, response.status);
+      }
+      classified.diagnostic = { ...classified.diagnostic, ...extractErrorDiagnostics(errorData, response.status) };
+      const errorMessage = classified.message;
+      markStreamMessageAborted(finalizeCtx, errorMessage, classified);
       streamState = {
         ...streamState,
         contentBuffer: appendTextChunk(
@@ -1604,8 +1743,14 @@ var sendOpenAICompletionsRequest = async ({
       streamState = await finalizeStream(streamState, finalizeCtx);
       return buildMeta();
     }
+    diagnosticStreamStarted = true;
+    diagnosticCall?.httpResult(diagnosticCurrentAttempt, {
+      status: response.status,
+      headers: response.headers
+    });
     reader = response.body?.getReader();
     if (!reader) {
+      diagnosticOutcome = "stream-error";
       streamState = markEmptyCompletionAsError(streamState, finalizeCtx);
       streamState = await finalizeStream(streamState, finalizeCtx);
       return buildMeta();
@@ -1621,22 +1766,31 @@ var sendOpenAICompletionsRequest = async ({
         const producedNothing = streamState.contentBuffer.length === 0 && !streamState.reasoningBuffer.trim() && (streamState.assistantToolCalls?.length ?? 0) === 0;
         if (producedNothing && !emptyCompletionRetryUsed && !streamState.hasHandedOff && !streamState.alreadyFinalized && !signal.aborted) {
           emptyCompletionRetryUsed = true;
+          closeDiagnosticAttempt(diagnosticCurrentAttempt, "stream-error");
+          const repairRequestBody = {
+            ...requestBody,
+            messages: [
+              ...requestBody.messages ?? [],
+              { role: "user", content: EMPTY_ASSISTANT_REPAIR_PROMPT }
+            ]
+          };
+          const repairAttempt = beginDiagnosticAttempt(repairRequestBody);
           const retryResponse = await performFetchRequest({
             agentConfig,
             api,
-            bodyData: {
-              ...requestBody,
-              messages: [
-                ...requestBody.messages ?? [],
-                { role: "user", content: EMPTY_ASSISTANT_REPAIR_PROMPT }
-              ]
-            },
+            bodyData: repairRequestBody,
             currentServer: selectCurrentServer(getState()),
             signal,
             token,
             dialogId
           });
+          diagnosticCall?.httpResult(repairAttempt, {
+            status: retryResponse.status,
+            headers: retryResponse.headers,
+            ...retryResponse.ok ? {} : { errorCategory: classifyOutboundErrorCategory(retryResponse.status) }
+          });
           if (retryResponse.ok && retryResponse.body) {
+            diagnosticStreamStarted = true;
             throttler.cancel();
             streamState = createInitialStreamState();
             parseSSE = createSSEParser();
@@ -1644,6 +1798,9 @@ var sendOpenAICompletionsRequest = async ({
             reader = retryResponse.body.getReader();
             continue;
           }
+          diagnosticOutcome = retryResponse.ok ? "stream-error" : "http-error";
+        } else if (producedNothing && !signal.aborted && !streamState.hasHandedOff && !streamState.alreadyFinalized) {
+          diagnosticOutcome = "stream-error";
         }
         const completion = await handleStreamCompletion(
           streamState,
@@ -1688,7 +1845,10 @@ var sendOpenAICompletionsRequest = async ({
           }
           if (data.error) {
             throttler.flush();
-            const errorMsg = `Error: ${formatStreamErrorMessage(data)}`;
+            diagnosticOutcome = "stream-error";
+            const classified = classifyGenerationError(data);
+            markStreamMessageAborted(finalizeCtx, classified.message, classified);
+            const errorMsg = classified.message;
             streamState = {
               ...streamState,
               contentBuffer: appendTextChunk(
@@ -1730,17 +1890,33 @@ var sendOpenAICompletionsRequest = async ({
             if (finishReason === "tool_calls") {
               throttler.flush();
             } else if (finishReason !== "stop") {
-              const finishErrorMessage = finishReason === "error" ? getChoiceFinishErrorMessage(data, choice) : null;
-              streamState = {
-                ...streamState,
-                contentBuffer: appendTextChunk(
-                  streamState.contentBuffer,
-                  finishErrorMessage ? `
-[API Error] Error: ${finishErrorMessage}` : finishReason === "error" ? "\n[API Error] Error: \u6A21\u578B\u54CD\u5E94\u4EE5 error \u7ED3\u675F\uFF0C\u4F46\u4E0A\u6E38\u672A\u8FD4\u56DE\u5177\u4F53\u9519\u8BEF\u3002\u8BF7\u91CD\u8BD5\uFF0C\u6216\u5207\u6362\u5230\u5176\u4ED6\u652F\u6301\u56FE\u7247\u8F93\u5165\u7684\u6A21\u578B\u3002" : `
+              if (finishReason === "error") {
+                const finishErrorMessage = getChoiceFinishErrorMessage(data, choice);
+                const errorText = finishErrorMessage ? `[API Error] Error: ${finishErrorMessage}` : "[API Error] Error: \u6A21\u578B\u54CD\u5E94\u4EE5 error \u7ED3\u675F\uFF0C\u4F46\u4E0A\u6E38\u672A\u8FD4\u56DE\u5177\u4F53\u9519\u8BEF\u3002\u8BF7\u91CD\u8BD5\uFF0C\u6216\u5207\u6362\u5230\u5176\u4ED6\u652F\u6301\u56FE\u7247\u8F93\u5165\u7684\u6A21\u578B\u3002";
+                const classified = classifyGenerationError(
+                  choice.error ? choice : data.error ? data : { code: "UPSTREAM_FINISH_ERROR" }
+                );
+                markStreamMessageAborted(finalizeCtx, errorText, classified);
+                diagnosticOutcome = "stream-error";
+                streamState = {
+                  ...streamState,
+                  contentBuffer: appendTextChunk(
+                    streamState.contentBuffer,
+                    `
+${errorText}`
+                  ),
+                  billingFailed: true
+                };
+              } else {
+                streamState = {
+                  ...streamState,
+                  contentBuffer: appendTextChunk(
+                    streamState.contentBuffer,
+                    `
 [\u6D41\u7ED3\u675F\u539F\u56E0: ${finishReason}]`
-                ),
-                ...finishReason === "error" ? { billingFailed: true } : {}
-              };
+                  )
+                };
+              }
             }
           }
         }
@@ -1750,12 +1926,13 @@ var sendOpenAICompletionsRequest = async ({
     throttler.flush();
     let errorText;
     const isAbort = isAbortError(error);
+    diagnosticOutcome = isAbort ? "aborted" : diagnosticStreamStarted ? "stream-error" : "network-error";
     const skipBilling = shouldSkipBillingForUserAbort(error, streamState.totalUsage);
     if (isAbort) {
       errorText = "\n[\u7528\u6237\u4E2D\u65AD]";
     } else {
       errorText = `
-[\u9519\u8BEF: ${toErrorMessage(error)}]`;
+[\u9519\u8BEF: ${classifyGenerationError(toErrorMessage(error)).message}]`;
     }
     console.error("[SSE] sendOpenAICompletionsRequest error:", error);
     streamState = {
@@ -1767,7 +1944,8 @@ var sendOpenAICompletionsRequest = async ({
     if (!isAbort) {
       markStreamMessageAborted(
         finalizeCtx,
-        toErrorMessage(error)
+        classifyGenerationError(toErrorMessage(error)).message,
+        classifyGenerationError(toErrorMessage(error))
       );
     }
     streamState = await finalizeStream(streamState, finalizeCtx);
@@ -1781,6 +1959,9 @@ var sendOpenAICompletionsRequest = async ({
       await reader?.cancel();
     } catch (_e) {
     }
+    if (diagnosticCall && diagnosticCurrentAttempt > 0 && !diagnosticCurrentAttemptClosed) {
+      closeDiagnosticAttempt(diagnosticCurrentAttempt, diagnosticOutcome);
+    }
   }
   return buildMeta();
 };