langchain_agentx_stream_ui 0.6.8 → 0.7.1

package/dist/{chunk-UBYOUDQE.js → chunk-RNBYZF6S.js}

@@ -10,12 +10,18 @@ import {
   SILENT_TASK_TOOL_NAMES,
   SubagentTranscriptBlock,
   Write,
+  classifyFinishErrorPresentation,
+  classifyToolCancelSoftKind,
   coerceSubagentProgressEntries,
   createDefaultToolRegistry,
   extractLastToolInfoFromProgress,
+  extractToolCancelSignals,
   formatExploreSummaryText,
-  formatThoughtDurationPrefix
-} from "./chunk-7XSQYG3X.js";
+  formatThoughtDurationPrefix,
+  resolveHookStoppedMessage,
+  resolveInterruptDisplayText,
+  resolveToolCancelDisplayText
+} from "./chunk-GLUQUP3A.js";
 
 // src/types/tree.ts
 function createEmptyTree() {
@@ -79,8 +85,8 @@ var DEFAULT_EVENT_TIERS = {
   "hook-finished": "debug",
   "api-retry": "debug",
   "assistant-turn-superseded": "main",
-  "compact-start": "debug",
-  "compact-end": "debug",
+  /** D-CMP-EVT-11：主可见（非仅 debug）；淡提示 Conversation compacted */
+  "compact-boundary": "collapsed",
   "task-started": "debug",
   "task-progress": "debug",
   "task-notification-enqueued": "debug",
@@ -295,7 +301,7 @@ function updateParallelAgentTextGate(tree) {
   }
   const allTerminal = ids.every((id) => {
     const node = findAgentToolCallNodeByCallId(tree, id);
-    return node != null && (node.status === "done" || node.status === "failed");
+    return node != null && (node.status === "done" || node.status === "failed" || node.status === "cancelled");
   });
   if (allTerminal) {
     return { ...tree, parallelAgentTextGateCallIds: null };
@@ -532,40 +538,6 @@ function formatModelRetryCategoryLabel(category) {
   }
 }
 
-// src/core/finishCancel.ts
-var DEFAULT_DISPLAY_INTERRUPT_TEXT = "[Request interrupted by user]";
-var USER_CANCEL_TERMINAL_REASONS = /* @__PURE__ */ new Set([
-  "aborted_streaming",
-  "aborted_tools"
-]);
-function isUserCancelledFinish(data) {
-  if (data.error_kind === "hook_stopped") return false;
-  if (data.error_kind === "user_cancelled") return true;
-  const reason = typeof data.terminal_reason === "string" ? data.terminal_reason : "";
-  if (USER_CANCEL_TERMINAL_REASONS.has(reason)) return true;
-  return false;
-}
-function isHookStoppedFinish(data) {
-  return data.error_kind === "hook_stopped";
-}
-function classifyFinishErrorPresentation(data) {
-  if (isHookStoppedFinish(data)) return "hook_stopped";
-  if (isUserCancelledFinish(data)) return "interrupt";
-  return "error";
-}
-function resolveInterruptDisplayText(data) {
-  if (typeof data.display_interrupt_text === "string" && data.display_interrupt_text.trim()) {
-    return data.display_interrupt_text.trim();
-  }
-  return DEFAULT_DISPLAY_INTERRUPT_TEXT;
-}
-function resolveHookStoppedMessage(data) {
-  if (Array.isArray(data.errors) && data.errors.length > 0) {
-    return data.errors.map(String).join("\n");
-  }
-  return "Stopped by hook";
-}
-
 // src/core/taskNotification.ts
 function trimStr(value) {
   return typeof value === "string" ? value.trim() : "";
@@ -1090,6 +1062,7 @@ function flushDeferredMainTextToTree(tree, event, seq) {
   const text = flushDeferredMainText(tree.deferredMainText);
   tree.deferredMainText = "";
   if (!text) return;
+  clearModelRetry(tree);
   const id = `text:defer-${seq}`;
   const node = {
     kind: "text",
@@ -1351,22 +1324,47 @@ function handleToolResult(tree, event, seq) {
 }
 function handleToolError(tree, event, seq) {
   const id = toolNodeId(tree, event);
-  const data = event.data;
+  const raw = event.data ?? {};
   const existing = tree.byId[id];
-  const toolName = resolveToolName(event, data, existing);
-  const dataRecord = data;
+  const toolName = resolveToolName(event, raw, existing);
+  const dataRecord = raw;
   const isSubagentLeak = resolveSubagentToolLeak(tree, dataRecord, toolName, existing);
   const isHidden = isInternalTool(toolName) || existing?.hidden === true || isSubagentLeak;
-  const failedResult = {
+  const cancelSignals = extractToolCancelSignals(raw);
+  const softKind = classifyToolCancelSoftKind(cancelSignals);
+  const cancelled = softKind != null;
+  const message = cancelSignals.message || typeof raw.message === "string" && raw.message || typeof raw.error === "string" && raw.error || "Unknown error";
+  const errType = cancelSignals.error_type || cancelSignals.type || (typeof raw.type === "string" ? raw.type : void 0);
+  const failedResult = cancelled ? {
+    schema_version: "2",
+    status: "error",
+    summary: resolveToolCancelDisplayText(softKind),
+    payload: cancelSignals.payload ?? message,
+    blocks: [],
+    artifacts: [],
+    hints: null,
+    meta: {
+      error_kind: cancelSignals.error_kind ?? (softKind === "canceled" ? "user_cancelled" : "aborted"),
+      terminal_state: "cancelled",
+      cancel_ui_kind: softKind
+    },
+    // 保留 type=cancelled，供 AgentToolBody / finalize 识别；文案用 soft Interrupted
+    error: {
+      message: resolveToolCancelDisplayText(softKind),
+      type: "cancelled"
+    },
+    truncated: false,
+    overflow_file: null
+  } : {
     schema_version: "1",
     status: "failed",
-    summary: data.message,
+    summary: message,
     payload: null,
     blocks: [],
     artifacts: [],
     hints: null,
     meta: null,
-    error: { message: data.message, type: data.type },
+    error: { message, type: errType },
     truncated: false,
     overflow_file: null
   };
@@ -1375,7 +1373,7 @@ function handleToolError(tree, event, seq) {
     id,
     event,
     {
-      status: "failed",
+      status: cancelled ? "cancelled" : "failed",
       endedAt: eventTimeToMs(event.timestamp),
       result: failedResult,
       hidden: isHidden || void 0
@@ -1609,12 +1607,20 @@ function attachDebugToParent(tree, parentNodeId, event) {
 }
 var SYSTEM_SUMMARY_SOURCE_EVENTS = /* @__PURE__ */ new Set([
   "hook-finished",
-  "compact-start",
-  "compact-end"
+  "compact-boundary"
 ]);
 function isSystemSummarySourceEvent(eventType) {
   return SYSTEM_SUMMARY_SOURCE_EVENTS.has(eventType);
 }
+function pushSystemSummarySource(tree, event, eventIndex) {
+  if (!isSystemSummarySourceEvent(event.event_type)) return;
+  tree.systemEvents.push({
+    eventIndex,
+    eventType: event.event_type,
+    data: event.data,
+    timestamp: eventTimeToMs(event.timestamp)
+  });
+}
 function handleDebug(tree, event, eventIndex, parentNodeId, collectDebug) {
   if (TASK_DEBUG_EVENT_TYPES.has(event.event_type)) {
     appendTaskDebugEvent(tree, event, eventIndex);
@@ -1630,14 +1636,7 @@ function handleDebug(tree, event, eventIndex, parentNodeId, collectDebug) {
       handleHookFinished(tree, event);
       break;
   }
-  if (isSystemSummarySourceEvent(event.event_type)) {
-    tree.systemEvents.push({
-      eventIndex,
-      eventType: event.event_type,
-      data: event.data,
-      timestamp: eventTimeToMs(event.timestamp)
-    });
-  }
+  pushSystemSummarySource(tree, event, eventIndex);
   if (collectDebug && !TASK_DEBUG_EVENT_TYPES.has(event.event_type)) {
     tree.debugEvents.push({
       eventIndex,
@@ -1779,6 +1778,17 @@ function applyClassified(tree, classified, eventIndex, options) {
       case "task-notification":
         handleTaskNotification(tree, event);
         break;
+      case "compact-boundary":
+        pushSystemSummarySource(tree, event, eventIndex);
+        if (options?.collectDebug === true) {
+          tree.debugEvents.push({
+            eventIndex,
+            eventType: event.event_type,
+            data: event.data
+          });
+        }
+        attachDebugToParent(tree, parentNodeId, event);
+        break;
       case "start-step":
         handleStepStart(tree, event, parentNodeId, seq);
         break;
@@ -1859,13 +1869,18 @@ function applyClassified(tree, classified, eventIndex, options) {
     case "error": {
       const data = event.data;
       const { message, type } = resolveErrorEventFields(data);
+      const softKind = classifyToolCancelSoftKind(
+        extractToolCancelSignals(data)
+      );
+      clearModelRetry(tree);
       const id = `error:${seq}`;
       const node = {
         kind: "error",
         id,
-        message,
-        errorType: type,
-        startedAt: eventTimeToMs(event.timestamp)
+        message: softKind ? resolveToolCancelDisplayText(softKind) : message,
+        errorType: softKind ? "cancelled" : type,
+        startedAt: eventTimeToMs(event.timestamp),
+        ...softKind ? { variant: "interrupt" } : {}
       };
       tree.byId[id] = node;
       appendMainStageChild(tree, id, event, seq);
@@ -2694,6 +2709,8 @@ function formatSystemEventSummary(eventType, data) {
   switch (eventType) {
     case "hook-finished":
       return formatHookFinishedSummary(payload);
+    case "compact-boundary":
+      return "Conversation compacted";
     default:
       return null;
   }
@@ -2708,9 +2725,6 @@ function mergeSystemSummaryLines(lines) {
 function summarizeSystemEvents(events) {
   const lines = [];
   for (const evt of events) {
-    if (evt.eventType === "compact-start" || evt.eventType === "compact-end") {
-      continue;
-    }
     if (evt.eventType === "hook-finished" && isRecord3(evt.data) && !isHookVisibleInTimeline(evt.data)) {
       continue;
     }
@@ -2817,6 +2831,7 @@ var ExploreCollapseAccumulator = class {
         continue;
       }
       if (entry.kind === "node" && entry.payload.canonicalType === "compact") {
+        result.push(entry);
         continue;
       }
       if (entry.kind === "node" && entry.payload.canonicalType === "hook") {
@@ -3270,10 +3285,10 @@ function toolUseEntry(entry) {
 }
 function isResolved(payload) {
   const status = payload.status;
-  return status === "done" || status === "failed";
+  return status === "done" || status === "failed" || status === "cancelled";
 }
 function isErrored(payload) {
-  return payload.status === "failed" || payload.is_error === true || payload.error != null;
+  return (payload.status === "failed" || payload.is_error === true || payload.error != null) && payload.status !== "cancelled";
 }
 var GroupedToolUseAccumulator = class {
   group(entries) {
@@ -3907,7 +3922,7 @@ function mapNode(node, pendingPermissionTools) {
 }
 function systemEventCanonicalType(eventType) {
   if (eventType === "hook-finished") return "hook";
-  if (eventType === "compact-start" || eventType === "compact-end") return "compact";
+  if (eventType === "compact-boundary") return "compact";
   return null;
 }
 function mapSystemEvent(evt) {
@@ -5902,4 +5917,4 @@ export {
   VirtualTimeline,
   SessionTimeline
 };
-//# sourceMappingURL=chunk-UBYOUDQE.js.map
+//# sourceMappingURL=chunk-RNBYZF6S.js.map