@agents24/chat-react 0.1.10 → 0.3.0

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   LatestThreadScrollerProvider,
   LatestThreadScrollerRoot,
   LatestThreadScrollerViewport
-} from "./chunk-E3TJ3I6G.js";
+} from "./chunk-FFO6KEB4.js";
 import {
   getActiveStreamingTextPartId,
   isActiveStreamingTextPart,
@@ -15,7 +15,7 @@ import {
 } from "./chunk-EWZO4QJI.js";
 
 // src/controller.ts
-import { useCallback as useCallback2, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback as useCallback3, useEffect as useEffect2, useMemo as useMemo2, useRef as useRef2, useState as useState2 } from "react";
 
 // src/controller-actions.ts
 import { useCallback } from "react";
@@ -89,6 +89,47 @@ function useControllerMessageActions(input) {
   return { handleCopy, handleDislike, handleLike, handleRetry, startNewThread, upsertLiveVoiceMessage };
 }
 
+// src/controller-hitl.ts
+import { useCallback as useCallback2, useMemo, useState } from "react";
+function useControllerHitl({
+  messages,
+  transport,
+  activeRunId,
+  activeRunIdRef,
+  activeThreadIdRef,
+  runStream
+}) {
+  const [isResolvingHitl, setIsResolvingHitl] = useState(false);
+  const pendingHitl = useMemo(() => {
+    for (let messageIndex = messages.length - 1; messageIndex >= 0; messageIndex -= 1) {
+      const parts = messages[messageIndex]?.parts || [];
+      for (let partIndex = parts.length - 1; partIndex >= 0; partIndex -= 1) {
+        const part = parts[partIndex];
+        if (part?.kind === "hitl" && part.status === "pending") return part;
+      }
+    }
+    return null;
+  }, [messages]);
+  const resumeHitl = useCallback2(async (input) => {
+    if (!transport.resumeHitl) throw new Error("HITL resume is not configured.");
+    const runId = input.runId || activeRunIdRef.current || activeRunId;
+    if (!runId) throw new Error("No paused run is available to resume.");
+    setIsResolvingHitl(true);
+    try {
+      const result = await transport.resumeHitl({ ...input, runId });
+      const threadId = result.thread_id || activeThreadIdRef.current;
+      if (threadId) await runStream({ mode: "attach", runId: result.run_id || runId, threadId });
+      return result;
+    } finally {
+      setIsResolvingHitl(false);
+    }
+  }, [activeRunId, activeRunIdRef, activeThreadIdRef, runStream, transport]);
+  return { pendingHitl, isResolvingHitl, resumeHitl };
+}
+
+// src/controller-thread-events.ts
+import { useEffect, useRef } from "react";
+
 // src/context-window.ts
 var SOURCE_PRIORITY = {
   unknown: 0,
@@ -223,12 +264,6 @@ var titleFromMessage = (text, files = []) => {
 var threadActivityDate = (thread) => String(thread.updated_at || thread.last_activity_at || thread.created_at || (/* @__PURE__ */ new Date()).toISOString());
 var assistantTextFromResponseBlocks = (blocks) => (blocks || []).filter((block) => block.kind === "assistant_text" && typeof block.text === "string").map((block) => String(block.text)).join("\n\n").trim();
 var assistantTextFromParts = (parts) => (parts || []).filter((part) => part.kind === "text").map((part) => part.text).join("\n\n").trim();
-var textFromFinalOutput = (value) => {
-  if (typeof value === "string") return value;
-  if (!value || typeof value !== "object") return "";
-  const record = value;
-  return String(record.message || record.text || record.answer || "");
-};
 var displayTextWithoutInlineAttachments = (text, hasAttachments) => {
   if (!hasAttachments) return text;
   const marker = "Attached text file (";
@@ -275,7 +310,7 @@ var responseBlocksFromTurn = (turn) => {
 var assistantTextFromEvents = (events) => {
   const assistantText = latestEventPayloadValue(events, "assistant_output_text");
   if (typeof assistantText === "string" && assistantText.trim()) return assistantText;
-  return textFromFinalOutput(latestEventPayloadValue(events, "final_output"));
+  return "";
 };
 var asRecord = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;
 var optionalString = (value) => typeof value === "string" && value.trim() ? value.trim() : void 0;
@@ -379,13 +414,34 @@ var partsFromResponseBlocks = (blocks, fallbackText) => {
     }
     if (block.kind === "hitl_request") {
       const hitl = asRecord(block.hitl) || block;
+      if (hitl.schema_version !== "agents24.hitl.interrupt.v2") {
+        throw new Error("Invalid V2 HITL response block.");
+      }
+      const interruptId = optionalString(block.interruptId) || optionalString(hitl.interrupt_id);
+      const hitlKind = optionalString(block.hitlKind) || optionalString(hitl.kind);
+      const status = optionalString(block.status) || optionalString(hitl.status) || "pending";
+      const allowedActions = Array.isArray(hitl.allowed_actions) ? hitl.allowed_actions.filter((value) => ["approve", "reject", "connect", "skip"].includes(String(value))) : [];
+      if (!interruptId || allowedActions.length === 0 || !["tool_review", "mcp_auth", "user_approval", "app_data_permission"].includes(String(hitlKind))) {
+        throw new Error("Invalid V2 HITL response block.");
+      }
+      const resolution = asRecord(block.resolution);
       parts.push({
         id,
         type: "hitl",
         kind: "hitl",
-        hitl,
-        interruptId: optionalString(block.interruptId) || optionalString(hitl.interrupt_id) || null,
-        hitlKind: optionalString(block.hitlKind) || optionalString(hitl.kind) || null,
+        interruptId,
+        hitlKind,
+        message: optionalString(hitl.message) || optionalString(block.text) || "Input is required to continue.",
+        allowedActions,
+        status,
+        presentation: asRecord(hitl.presentation) || {},
+        resolution: resolution ? {
+          action: ["approve", "reject", "connect", "skip"].includes(String(resolution.action)) ? String(resolution.action) : null,
+          outcome: optionalString(resolution.outcome),
+          reason: optionalString(resolution.reason),
+          resolvedAt: optionalString(resolution.resolved_at),
+          resolver: asRecord(resolution.resolver)
+        } : null,
         raw: block
       });
       return;
@@ -459,7 +515,7 @@ var turnToMessages = (turn, activeRunId) => {
       attachments
     });
   }
-  const assistantText = turn.assistant_output_text || assistantTextFromResponseBlocks(responseBlocks) || assistantTextFromEvents(turn.run_events) || textFromFinalOutput(turn.final_output);
+  const assistantText = turn.assistant_output_text || assistantTextFromResponseBlocks(responseBlocks) || assistantTextFromEvents(turn.run_events);
   if (assistantText || responseBlocks.length > 0 || isRunning) {
     const parts = partsFromResponseBlocks(responseBlocks, assistantText);
     messages.push({
@@ -625,6 +681,47 @@ var applyThreadSummaryEvent = (currentThreads, event) => {
   return sortByActivity(next);
 };
 
+// src/controller-thread-events.ts
+function useControllerThreadEvents({
+  transport,
+  storage,
+  refresh,
+  setThreads
+}) {
+  const cursorRef = useRef(null);
+  useEffect(() => {
+    if (!transport.subscribeThreadEvents) return;
+    let cancelled = false;
+    let retryTimeout = null;
+    let controller = null;
+    const connect = () => {
+      if (cancelled) return;
+      controller = new AbortController();
+      transport.subscribeThreadEvents?.(
+        { cursor: cursorRef.current, signal: controller.signal },
+        async (event) => {
+          if (typeof event.cursor === "number") cursorRef.current = event.cursor;
+          if (event.event === "snapshot_required") {
+            await refresh().catch(() => void 0);
+            return;
+          }
+          storage.setThreads(applyThreadSummaryEvent(storage.listThreads(), event));
+          setThreads(storage.listThreads());
+        }
+      ).catch((error) => {
+        if (cancelled || isAbortError(error)) return;
+        retryTimeout = setTimeout(connect, 1500);
+      });
+    };
+    connect();
+    return () => {
+      cancelled = true;
+      if (retryTimeout) clearTimeout(retryTimeout);
+      controller?.abort();
+    };
+  }, [refresh, setThreads, storage, transport]);
+}
+
 // src/message-lifecycle.ts
 function findStableAssistantMessageIndex(messages, input) {
   return messages.findIndex(
@@ -663,82 +760,83 @@ function upsertStableAssistantMessage(messages, input) {
 }
 
 // src/controller.ts
-function useAgents24ChatController({
-  transport,
-  storage,
-  activeThreadId: controlledActiveThreadId,
-  pageSize = DEFAULT_THREAD_PAGE_SIZE,
-  storageKey,
-  createId = createChatId,
-  onActiveThreadIdChange,
-  onSourceClick,
-  onStreamErrorMessage,
-  onRuntimeEvent,
-  onThreadDetailLoaded
-}) {
+function useAgents24ChatController(options) {
+  const {
+    transport,
+    storage,
+    activeThreadId: controlledActiveThreadId,
+    pageSize = DEFAULT_THREAD_PAGE_SIZE,
+    storageKey,
+    createId = createChatId,
+    onActiveThreadIdChange,
+    onSourceClick,
+    onStreamErrorMessage,
+    onRuntimeEvent,
+    onThreadDetailLoaded
+  } = options;
   const activeThreadId = controlledActiveThreadId ?? storage.getActiveThreadId?.() ?? null;
   const initialCached = activeThreadId ? storage.getThread(activeThreadId) : void 0;
-  const [messages, setMessages] = useState(() => initialCached?.messages || []);
-  const [isLoading, setIsLoading] = useState(false);
-  const [isLoadingHistory, setIsLoadingHistory] = useState(() => Boolean(activeThreadId) && !initialCached?.messages?.length);
-  const [isLoadingOlder, setIsLoadingOlder] = useState(false);
-  const [hasOlderTurns, setHasOlderTurns] = useState(Boolean(initialCached?.hasOlderTurns));
-  const [streamingContent, setStreamingContent] = useState("");
-  const [streamingMessageId, setStreamingMessageId] = useState(null);
-  const [contextStatus, setContextStatus] = useState(null);
-  const [currentReasoning, setCurrentReasoning] = useState([]);
-  const [liked, setLiked] = useState({});
-  const [disliked, setDisliked] = useState({});
-  const [copiedMessageId, setCopiedMessageId] = useState(null);
-  const [lastThinkingDurationMs, setLastThinkingDurationMs] = useState(null);
-  const [threads, setThreads] = useState(() => storage.listThreads());
-  const [isRefreshingThreads, setIsRefreshingThreads] = useState(false);
-  const [isSelectingThread, setIsSelectingThread] = useState(false);
-  const [activeRunId, setActiveRunId] = useState(null);
-  const textareaRef = useRef(null);
-  const activeThreadIdRef = useRef(activeThreadId);
-  const messagesRef = useRef(messages);
-  const nextBeforeTurnIndexRef = useRef(initialCached?.nextBeforeTurnIndex ?? null);
-  const hasOlderTurnsRef = useRef(Boolean(initialCached?.hasOlderTurns));
-  const isLoadingOlderRef = useRef(false);
-  const loadedThreadIdRef = useRef(initialCached?.messages?.length ? activeThreadId : null);
-  const requestSeqRef = useRef(0);
-  const isLoadingHistoryRef = useRef(isLoadingHistory);
-  const activeRunIdRef = useRef(null);
-  const reattachedRunIdRef = useRef(null);
-  const abortControllerRef = useRef(null);
-  const streamingContentRef = useRef("");
-  const streamingMessageIdRef = useRef(null);
-  const reasoningRef = useRef([]);
-  const liveVoiceIdsRef = useRef({});
-  const refreshSeqRef = useRef(0);
-  const threadEventsCursorRef = useRef(null);
-  const setActiveRunIdValue = useCallback2((runId) => {
+  const [messages, setMessages] = useState2(() => initialCached?.messages || []);
+  const [isLoading, setIsLoading] = useState2(false);
+  const [isLoadingHistory, setIsLoadingHistory] = useState2(() => Boolean(activeThreadId) && !initialCached?.messages?.length);
+  const [isLoadingOlder, setIsLoadingOlder] = useState2(false);
+  const [hasOlderTurns, setHasOlderTurns] = useState2(Boolean(initialCached?.hasOlderTurns));
+  const [streamingContent, setStreamingContent] = useState2("");
+  const [streamingMessageId, setStreamingMessageId] = useState2(null);
+  const [contextStatus, setContextStatus] = useState2(null);
+  const [currentReasoning, setCurrentReasoning] = useState2([]);
+  const [liked, setLiked] = useState2({});
+  const [disliked, setDisliked] = useState2({});
+  const [copiedMessageId, setCopiedMessageId] = useState2(null);
+  const [lastThinkingDurationMs, setLastThinkingDurationMs] = useState2(null);
+  const [threads, setThreads] = useState2(() => storage.listThreads());
+  const [isRefreshingThreads, setIsRefreshingThreads] = useState2(false);
+  const [isSelectingThread, setIsSelectingThread] = useState2(false);
+  const [activeRunId, setActiveRunId] = useState2(null);
+  const textareaRef = useRef2(null);
+  const activeThreadIdRef = useRef2(activeThreadId);
+  const messagesRef = useRef2(messages);
+  const nextBeforeTurnIndexRef = useRef2(initialCached?.nextBeforeTurnIndex ?? null);
+  const hasOlderTurnsRef = useRef2(Boolean(initialCached?.hasOlderTurns));
+  const isLoadingOlderRef = useRef2(false);
+  const loadedThreadIdRef = useRef2(initialCached?.messages?.length ? activeThreadId : null);
+  const requestSeqRef = useRef2(0);
+  const isLoadingHistoryRef = useRef2(isLoadingHistory);
+  const activeRunIdRef = useRef2(null);
+  const reattachedRunIdRef = useRef2(null);
+  const abortControllerRef = useRef2(null);
+  const [lifecycleAbortController] = useState2(() => new AbortController());
+  const streamingContentRef = useRef2("");
+  const streamingMessageIdRef = useRef2(null);
+  const reasoningRef = useRef2([]);
+  const liveVoiceIdsRef = useRef2({});
+  const refreshSeqRef = useRef2(0);
+  const setActiveRunIdValue = useCallback3((runId) => {
     activeRunIdRef.current = runId;
     setActiveRunId(runId);
   }, []);
-  const syncThreadsFromStorage = useCallback2(() => {
+  const syncThreadsFromStorage = useCallback3(() => {
     setThreads(storage.listThreads());
   }, [storage]);
-  const upsertStoredThread = useCallback2(
+  const upsertStoredThread = useCallback3(
     (thread) => {
       storage.upsertThread(thread);
       syncThreadsFromStorage();
     },
     [storage, syncThreadsFromStorage]
   );
-  useEffect(() => {
+  useEffect2(() => {
     messagesRef.current = messages;
   }, [messages]);
-  const persistThread = useCallback2(
-    (threadId, nextMessages, paging, options) => {
+  const persistThread = useCallback3(
+    (threadId, nextMessages, paging, options2) => {
       const existing = storage.getThread(threadId);
       const firstUser = nextMessages.find((message) => message.role === "user");
       upsertStoredThread({
         ...existing || {},
         id: threadId,
         title: existing?.title || (firstUser ? titleFromMessage(firstUser.content, firstUser.attachments || []) : "New chat"),
-        updated_at: options?.updatedAt || (options?.touch ? (/* @__PURE__ */ new Date()).toISOString() : existing?.updated_at) || (/* @__PURE__ */ new Date()).toISOString(),
+        updated_at: options2?.updatedAt || (options2?.touch ? (/* @__PURE__ */ new Date()).toISOString() : existing?.updated_at) || (/* @__PURE__ */ new Date()).toISOString(),
         messages: nextMessages,
         isHydrated: true,
         hasOlderTurns: paging?.hasOlderTurns ?? hasOlderTurnsRef.current,
@@ -747,7 +845,7 @@ function useAgents24ChatController({
     },
     [storage, upsertStoredThread]
   );
-  const markThreadRunStatus = useCallback2(
+  const markThreadRunStatus = useCallback3(
     (threadId, runId, status, lastEventSeq) => {
       const existing = storage.getThread(threadId);
       if (!existing || !runId) return;
@@ -777,20 +875,21 @@ function useAgents24ChatController({
     },
     [storage, upsertStoredThread]
   );
-  const refresh = useCallback2(async () => {
+  const refresh = useCallback3(async () => {
     const seq = ++refreshSeqRef.current;
     setIsRefreshingThreads(true);
     try {
-      const data = await transport.listThreads();
+      const data = await transport.listThreads({ signal: lifecycleAbortController.signal });
+      if (lifecycleAbortController.signal.aborted) return;
       if (seq !== refreshSeqRef.current) return;
       const nextThreads = (data.items || []).map((item) => threadSummaryToStored(item));
       storage.setThreads(mergeStoredThreadsForRefresh(storage.listThreads(), nextThreads));
       setThreads(storage.listThreads());
     } finally {
-      if (seq === refreshSeqRef.current) setIsRefreshingThreads(false);
+      if (!lifecycleAbortController.signal.aborted && seq === refreshSeqRef.current) setIsRefreshingThreads(false);
     }
-  }, [storage, transport]);
-  const applyThreadId = useCallback2(
+  }, [lifecycleAbortController, storage, transport]);
+  const applyThreadId = useCallback3(
     (threadId, baseMessages) => {
       if (!threadId || activeThreadIdRef.current === threadId) return;
       activeThreadIdRef.current = threadId;
@@ -804,15 +903,15 @@ function useAgents24ChatController({
     streamingContentRef.current = value;
     setStreamingContent(value);
   };
-  const setLoadingHistory = useCallback2((value) => {
+  const setLoadingHistory = useCallback3((value) => {
     isLoadingHistoryRef.current = value;
     setIsLoadingHistory(value);
   }, []);
-  const setReasoningSteps = useCallback2((value) => {
+  const setReasoningSteps = useCallback3((value) => {
     reasoningRef.current = value || [];
     setCurrentReasoning(value || []);
   }, []);
-  const detachActiveStream = useCallback2(() => {
+  const detachActiveStream = useCallback3(() => {
     const controller = abortControllerRef.current;
     abortControllerRef.current = null;
     abortDetachedStream(controller);
@@ -826,7 +925,7 @@ function useAgents24ChatController({
     setStreamingContent("");
     setCurrentReasoning([]);
   }, [setActiveRunIdValue]);
-  const clearMissingThread = useCallback2(
+  const clearMissingThread = useCallback3(
     (threadId) => {
       storage.deleteThread?.(threadId);
       syncThreadsFromStorage();
@@ -848,7 +947,7 @@ function useAgents24ChatController({
     },
     [detachActiveStream, onActiveThreadIdChange, setLoadingHistory, storage, syncThreadsFromStorage]
   );
-  const setLiveAssistantMessage = useCallback2(
+  const setLiveAssistantMessage = useCallback3(
     (input) => {
       setMessages((prev) => {
         const next = upsertStableAssistantMessage(prev, {
@@ -880,7 +979,7 @@ function useAgents24ChatController({
     },
     []
   );
-  const finalizeAssistantMessage = useCallback2(
+  const finalizeAssistantMessage = useCallback3(
     (input) => {
       const content = input.error || input.assistantText.trim();
       if (!content) return input.baseMessages;
@@ -934,7 +1033,7 @@ function useAgents24ChatController({
     },
     [createId, persistThread, storage, upsertStoredThread]
   );
-  const loadThread = useCallback2(
+  const loadThread = useCallback3(
     async (threadId) => {
       const seq = ++requestSeqRef.current;
       setLoadingHistory(true);
@@ -944,7 +1043,8 @@ function useAgents24ChatController({
         const detail = await transport.getThread({
           threadId,
           limit: pageSize,
-          includeRunEvents: false
+          includeRunEvents: false,
+          signal: lifecycleAbortController.signal
         });
         if (activeThreadIdRef.current !== threadId || seq !== requestSeqRef.current) return;
         void onThreadDetailLoaded?.(detail);
@@ -973,12 +1073,12 @@ function useAgents24ChatController({
         }
         throw error;
       } finally {
-        if (activeThreadIdRef.current === threadId && seq === requestSeqRef.current) setLoadingHistory(false);
+        if (!lifecycleAbortController.signal.aborted && activeThreadIdRef.current === threadId && seq === requestSeqRef.current) setLoadingHistory(false);
       }
     },
-    [clearMissingThread, onThreadDetailLoaded, pageSize, setLoadingHistory, transport, upsertStoredThread]
+    [clearMissingThread, lifecycleAbortController, onThreadDetailLoaded, pageSize, setLoadingHistory, transport, upsertStoredThread]
   );
-  const loadOlderTurns = useCallback2(async () => {
+  const loadOlderTurns = useCallback3(async () => {
     const threadId = activeThreadIdRef.current;
     const beforeTurnIndex = nextBeforeTurnIndexRef.current;
     if (!threadId || beforeTurnIndex === null || isLoadingOlderRef.current) return;
@@ -989,7 +1089,8 @@ function useAgents24ChatController({
         threadId,
         limit: pageSize,
         beforeTurnIndex,
-        includeRunEvents: false
+        includeRunEvents: false,
+        signal: lifecycleAbortController.signal
       });
       if (activeThreadIdRef.current !== threadId) return;
       const older = threadDetailToMessages(detail);
@@ -1009,11 +1110,11 @@ function useAgents24ChatController({
       }
       throw error;
     } finally {
-      if (activeThreadIdRef.current === threadId) setIsLoadingOlder(false);
+      if (!lifecycleAbortController.signal.aborted && activeThreadIdRef.current === threadId) setIsLoadingOlder(false);
       isLoadingOlderRef.current = false;
     }
-  }, [clearMissingThread, pageSize, persistThread, transport]);
-  const handleStreamEvent = useCallback2(
+  }, [clearMissingThread, lifecycleAbortController, pageSize, persistThread, transport]);
+  const handleStreamEvent = useCallback3(
     (input) => {
       const { mode, event, assistantMessageId, startedAt, streamThreadIdRef, baseMessages } = input;
       const payload = event.payload || {};
@@ -1059,7 +1160,7 @@ function useAgents24ChatController({
         streamThreadIdRef.current = terminalThreadId;
         applyThreadId(terminalThreadId, baseMessages);
       }
-      const finalText = String(payload.assistant_output_text || textFromFinalOutput(payload.final_output) || streamingContentRef.current || "");
+      const finalText = String(payload.assistant_output_text || assistantTextFromResponseBlocks(responseBlocks || []) || streamingContentRef.current || "");
       finalizeAssistantMessage({
         threadId: streamThreadIdRef.current || activeThreadIdRef.current,
         baseMessages: messagesRef.current,
@@ -1074,7 +1175,7 @@ function useAgents24ChatController({
     },
     [applyThreadId, finalizeAssistantMessage, markThreadRunStatus, onRuntimeEvent, onStreamErrorMessage, setActiveRunIdValue, setLiveAssistantMessage, setReasoningSteps]
   );
-  const runStream = useCallback2(
+  const runStream = useCallback3(
     async (input) => {
       const startedAt = Date.now();
       const controller = new AbortController();
@@ -1197,18 +1298,26 @@ function useAgents24ChatController({
     },
     [createId, finalizeAssistantMessage, handleStreamEvent, onStreamErrorMessage, persistThread, refresh, setActiveRunIdValue, setReasoningSteps, transport]
   );
-  const handleSubmit = useCallback2(
+  const handleSubmit = useCallback3(
     async (message) => {
       if (!message.text.trim() && !(message.files || []).length) return;
       await runStream({ mode: "submit", message });
     },
     [runStream]
   );
-  const attachRun = useCallback2(async (runId, threadId) => {
+  const attachRun = useCallback3(async (runId, threadId) => {
     const resolvedThreadId = threadId ?? activeThreadIdRef.current;
     if (runId && resolvedThreadId) await runStream({ mode: "attach", runId, threadId: resolvedThreadId });
   }, [runStream]);
-  const handleStop = useCallback2(() => {
+  const { pendingHitl, isResolvingHitl, resumeHitl } = useControllerHitl({
+    messages,
+    transport,
+    activeRunId,
+    activeRunIdRef,
+    activeThreadIdRef,
+    runStream
+  });
+  const handleStop = useCallback3(() => {
     const runId = activeRunIdRef.current;
     const partial = streamingContentRef.current;
     const liveMessageId = streamingMessageIdRef.current;
@@ -1232,45 +1341,25 @@ function useAgents24ChatController({
       });
     }
   }, [finalizeAssistantMessage, lastThinkingDurationMs, setActiveRunIdValue, setReasoningSteps, transport]);
-  useEffect(() => {
-    refresh().catch(() => setThreads(storage.listThreads()));
-  }, [refresh, storage]);
-  useEffect(() => {
-    if (!transport.subscribeThreadEvents) return;
-    let cancelled = false;
-    let retryTimeout = null;
-    let controller = null;
-    const connect = () => {
-      if (cancelled) return;
-      controller = new AbortController();
-      transport.subscribeThreadEvents?.(
-        { cursor: threadEventsCursorRef.current, signal: controller.signal },
-        async (event) => {
-          if (typeof event.cursor === "number") threadEventsCursorRef.current = event.cursor;
-          if (event.event === "snapshot_required") {
-            await refresh().catch(() => void 0);
-            return;
-          }
-          const next = applyThreadSummaryEvent(storage.listThreads(), event);
-          storage.setThreads(next);
-          setThreads(storage.listThreads());
-        }
-      ).catch((error) => {
-        if (cancelled || isAbortError(error)) return;
-        retryTimeout = setTimeout(connect, 1500);
-      });
-    };
-    connect();
+  useEffect2(() => {
+    refresh().catch((error) => {
+      if (!isAbortError(error) && !lifecycleAbortController.signal.aborted) {
+        setThreads(storage.listThreads());
+      }
+    });
+  }, [lifecycleAbortController, refresh, storage]);
+  useEffect2(() => {
     return () => {
-      cancelled = true;
-      if (retryTimeout) clearTimeout(retryTimeout);
-      controller?.abort();
+      lifecycleAbortController.abort();
+      abortDetachedStream(abortControllerRef.current);
+      abortControllerRef.current = null;
     };
-  }, [refresh, storage, transport]);
-  useEffect(() => {
+  }, [lifecycleAbortController]);
+  useControllerThreadEvents({ transport, storage, refresh, setThreads });
+  useEffect2(() => {
     syncThreadsFromStorage();
   }, [storageKey, syncThreadsFromStorage]);
-  useEffect(() => {
+  useEffect2(() => {
     const previous = activeThreadIdRef.current;
     activeThreadIdRef.current = activeThreadId;
     if (activeThreadId && previous === activeThreadId && (activeRunIdRef.current || streamingMessageIdRef.current)) {
@@ -1314,14 +1403,14 @@ function useAgents24ChatController({
     }
     void loadThread(activeThreadId).catch(() => setLoadingHistory(false));
   }, [activeThreadId, detachActiveStream, loadThread, setLoadingHistory, storage]);
-  useEffect(() => {
+  useEffect2(() => {
     const threadId = activeThreadId;
     if (!threadId || isLoadingHistory || loadedThreadIdRef.current !== threadId || activeRunIdRef.current) return;
     const runId = autoAttachRunIdFromThread(storage.getThread(threadId));
     if (!runId || reattachedRunIdRef.current === runId) return;
     void runStream({ mode: "attach", threadId, runId });
   }, [activeThreadId, isLoadingHistory, runStream, storage, storageKey]);
-  useEffect(() => {
+  useEffect2(() => {
     const threadId = activeThreadId;
     if (!threadId || isLoadingHistoryRef.current || activeRunIdRef.current || streamingMessageIdRef.current) {
       return;
@@ -1362,7 +1451,7 @@ function useAgents24ChatController({
     setMessages,
     storage
   });
-  const loadThreadById = useCallback2(
+  const loadThreadById = useCallback3(
     async (threadId) => {
       if (!threadId) return;
       setIsSelectingThread(true);
@@ -1381,7 +1470,7 @@ function useAgents24ChatController({
     [detachActiveStream, loadThread, onActiveThreadIdChange, storage]
   );
   const activeThread = activeThreadId ? storage.getThread(activeThreadId) || threads.find((thread) => thread.id === activeThreadId) || null : null;
-  return useMemo(() => ({
+  return useMemo2(() => ({
     threads,
     activeThreadId,
     activeThread,
@@ -1401,8 +1490,11 @@ function useAgents24ChatController({
     copiedMessageId,
     lastThinkingDurationMs,
     activeRunId,
+    pendingHitl,
+    isResolvingHitl,
     handleSubmit,
     attachRun,
+    resumeHitl,
     handleStop,
     handleCopy,
     handleLike,
@@ -1441,8 +1533,11 @@ function useAgents24ChatController({
     loadThreadById,
     loadOlderTurns,
     messages,
+    isResolvingHitl,
     onSourceClick,
+    pendingHitl,
     refresh,
+    resumeHitl,
     streamingContent,
     streamingMessageId,
     startNewThread,
@@ -1531,7 +1626,9 @@ var consumeSseResponse = async (response, onEvent, options = {}) => {
   let closed = false;
   const closeReader = () => {
     closed = true;
-    void reader.cancel().catch(() => {
+    queueMicrotask(() => {
+      void reader.cancel().catch(() => {
+      });
     });
   };
   if (options.signal?.aborted) {
@@ -1621,7 +1718,7 @@ var createFetchChatTransport = ({
           }
         )
       });
-      return consumeSseResponse(response, onEvent);
+      return consumeSseResponse(response, onEvent, { signal: input.signal });
     },
     async attachRun(input, onEvent) {
       const response = await fetchImpl(routes.attachRun(input), {
@@ -1630,7 +1727,7 @@ var createFetchChatTransport = ({
         headers: streamHeaders(await loadHeaders()),
         body: JSON.stringify({})
       });
-      return consumeSseResponse(response, onEvent);
+      return consumeSseResponse(response, onEvent, { signal: input.signal });
     },
     async cancelRun(input) {
       const response = await fetchImpl(routes.cancelRun(input), {
@@ -1657,7 +1754,11 @@ var createFetchChatTransport = ({
         signal: input.signal,
         headers: streamHeaders(await loadHeaders())
       });
-      await consumeSseResponse(response, (event) => onEvent(event));
+      await consumeSseResponse(
+        response,
+        (event) => onEvent(event),
+        { signal: input.signal }
+      );
     },
     async resumeHitl(input) {
       if (!routes.resumeRun) throw new ChatTransportError("HITL resume is not configured.", 501);
@@ -1665,9 +1766,10 @@ var createFetchChatTransport = ({
         method: "POST",
         headers: jsonHeaders(await loadHeaders()),
         body: JSON.stringify({
-          schema_version: "agents24.hitl.resume.v1",
+          schema_version: "agents24.hitl.resume.v2",
           interrupt_id: input.interruptId,
-          decisions: input.decisions,
+          action: input.action,
+          comment: input.comment,
           client: input.client
         })
       });
@@ -1741,7 +1843,6 @@ export {
   partsFromResponseBlocks,
   reasoningStepsFromParts,
   renderChatPart,
-  textFromFinalOutput,
   threadActivityDate,
   threadDetailToMessages,
   threadPaging,