@agents24/chat-react 0.2.0 → 0.3.1

package/dist/index.cjs

@@ -81,12 +81,13 @@ __export(index_exports, {
   useMessageScroller: () => import_message_scroller2.useMessageScroller,
   useMessageScrollerScrollable: () => import_message_scroller2.useMessageScrollerScrollable,
   useMessageScrollerVisibility: () => import_message_scroller2.useMessageScrollerVisibility,
-  useStreamingText: () => useStreamingText
+  useStreamingText: () => useStreamingText,
+  waitForMcpOauthComplete: () => waitForMcpOauthComplete
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/controller.ts
-var import_react2 = require("react");
+var import_react4 = require("react");
 
 // src/controller-actions.ts
 var import_react = require("react");
@@ -160,6 +161,47 @@ function useControllerMessageActions(input) {
   return { handleCopy, handleDislike, handleLike, handleRetry, startNewThread, upsertLiveVoiceMessage };
 }
 
+// src/controller-hitl.ts
+var import_react2 = require("react");
+function useControllerHitl({
+  messages,
+  transport,
+  activeRunId,
+  activeRunIdRef,
+  activeThreadIdRef,
+  runStream
+}) {
+  const [isResolvingHitl, setIsResolvingHitl] = (0, import_react2.useState)(false);
+  const pendingHitl = (0, import_react2.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 = (0, import_react2.useCallback)(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
+var import_react3 = require("react");
+
 // src/context-window.ts
 var SOURCE_PRIORITY = {
   unknown: 0,
@@ -344,6 +386,22 @@ var assistantTextFromEvents = (events) => {
 };
 var asRecord = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;
 var optionalString = (value) => typeof value === "string" && value.trim() ? value.trim() : void 0;
+var HITL_ACTIONS_BY_KIND = {
+  tool_review: ["approve", "reject"],
+  mcp_auth: ["connect", "skip"],
+  user_approval: ["approve", "reject"],
+  app_data_permission: ["approve", "reject"]
+};
+var HITL_STATUSES = ["pending", "resolved", "expired", "cancelled", "invalidated"];
+function exactHitlActions(kind, value) {
+  if (!Array.isArray(value)) throw new Error("Invalid V2 HITL response block.");
+  const actions = value.map((item) => String(item));
+  const expected = HITL_ACTIONS_BY_KIND[kind];
+  if (actions.length !== expected.length || actions.some((action, index) => action !== expected[index])) {
+    throw new Error("Invalid V2 HITL response block.");
+  }
+  return actions;
+}
 var toolStateFromStatus = (status) => {
   const normalized = String(status || "").trim().toLowerCase();
   if (["failed", "error"].includes(normalized)) return "output-error";
@@ -444,13 +502,39 @@ 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";
+      if (!interruptId || !["tool_review", "mcp_auth", "user_approval", "app_data_permission"].includes(String(hitlKind)) || !HITL_STATUSES.includes(status)) {
+        throw new Error("Invalid V2 HITL response block.");
+      }
+      const kind = hitlKind;
+      const allowedActions = exactHitlActions(kind, hitl.allowed_actions);
+      const resolution = asRecord(block.resolution);
+      const resolver = asRecord(resolution?.resolver);
       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: kind,
+        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: resolver ? {
+            principalType: optionalString(resolver.principal_type) || optionalString(resolver.principalType) || null,
+            principalId: optionalString(resolver.principal_id) || optionalString(resolver.principalId) || null
+          } : null
+        } : null,
         raw: block
       });
       return;
@@ -690,6 +774,47 @@ var applyThreadSummaryEvent = (currentThreads, event) => {
   return sortByActivity(next);
 };
 
+// src/controller-thread-events.ts
+function useControllerThreadEvents({
+  transport,
+  storage,
+  refresh,
+  setThreads
+}) {
+  const cursorRef = (0, import_react3.useRef)(null);
+  (0, import_react3.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(
@@ -728,83 +853,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] = (0, import_react2.useState)(() => initialCached?.messages || []);
-  const [isLoading, setIsLoading] = (0, import_react2.useState)(false);
-  const [isLoadingHistory, setIsLoadingHistory] = (0, import_react2.useState)(() => Boolean(activeThreadId) && !initialCached?.messages?.length);
-  const [isLoadingOlder, setIsLoadingOlder] = (0, import_react2.useState)(false);
-  const [hasOlderTurns, setHasOlderTurns] = (0, import_react2.useState)(Boolean(initialCached?.hasOlderTurns));
-  const [streamingContent, setStreamingContent] = (0, import_react2.useState)("");
-  const [streamingMessageId, setStreamingMessageId] = (0, import_react2.useState)(null);
-  const [contextStatus, setContextStatus] = (0, import_react2.useState)(null);
-  const [currentReasoning, setCurrentReasoning] = (0, import_react2.useState)([]);
-  const [liked, setLiked] = (0, import_react2.useState)({});
-  const [disliked, setDisliked] = (0, import_react2.useState)({});
-  const [copiedMessageId, setCopiedMessageId] = (0, import_react2.useState)(null);
-  const [lastThinkingDurationMs, setLastThinkingDurationMs] = (0, import_react2.useState)(null);
-  const [threads, setThreads] = (0, import_react2.useState)(() => storage.listThreads());
-  const [isRefreshingThreads, setIsRefreshingThreads] = (0, import_react2.useState)(false);
-  const [isSelectingThread, setIsSelectingThread] = (0, import_react2.useState)(false);
-  const [activeRunId, setActiveRunId] = (0, import_react2.useState)(null);
-  const textareaRef = (0, import_react2.useRef)(null);
-  const activeThreadIdRef = (0, import_react2.useRef)(activeThreadId);
-  const messagesRef = (0, import_react2.useRef)(messages);
-  const nextBeforeTurnIndexRef = (0, import_react2.useRef)(initialCached?.nextBeforeTurnIndex ?? null);
-  const hasOlderTurnsRef = (0, import_react2.useRef)(Boolean(initialCached?.hasOlderTurns));
-  const isLoadingOlderRef = (0, import_react2.useRef)(false);
-  const loadedThreadIdRef = (0, import_react2.useRef)(initialCached?.messages?.length ? activeThreadId : null);
-  const requestSeqRef = (0, import_react2.useRef)(0);
-  const isLoadingHistoryRef = (0, import_react2.useRef)(isLoadingHistory);
-  const activeRunIdRef = (0, import_react2.useRef)(null);
-  const reattachedRunIdRef = (0, import_react2.useRef)(null);
-  const abortControllerRef = (0, import_react2.useRef)(null);
-  const [lifecycleAbortController] = (0, import_react2.useState)(() => new AbortController());
-  const streamingContentRef = (0, import_react2.useRef)("");
-  const streamingMessageIdRef = (0, import_react2.useRef)(null);
-  const reasoningRef = (0, import_react2.useRef)([]);
-  const liveVoiceIdsRef = (0, import_react2.useRef)({});
-  const refreshSeqRef = (0, import_react2.useRef)(0);
-  const threadEventsCursorRef = (0, import_react2.useRef)(null);
-  const setActiveRunIdValue = (0, import_react2.useCallback)((runId) => {
+  const [messages, setMessages] = (0, import_react4.useState)(() => initialCached?.messages || []);
+  const [isLoading, setIsLoading] = (0, import_react4.useState)(false);
+  const [isLoadingHistory, setIsLoadingHistory] = (0, import_react4.useState)(() => Boolean(activeThreadId) && !initialCached?.messages?.length);
+  const [isLoadingOlder, setIsLoadingOlder] = (0, import_react4.useState)(false);
+  const [hasOlderTurns, setHasOlderTurns] = (0, import_react4.useState)(Boolean(initialCached?.hasOlderTurns));
+  const [streamingContent, setStreamingContent] = (0, import_react4.useState)("");
+  const [streamingMessageId, setStreamingMessageId] = (0, import_react4.useState)(null);
+  const [contextStatus, setContextStatus] = (0, import_react4.useState)(null);
+  const [currentReasoning, setCurrentReasoning] = (0, import_react4.useState)([]);
+  const [liked, setLiked] = (0, import_react4.useState)({});
+  const [disliked, setDisliked] = (0, import_react4.useState)({});
+  const [copiedMessageId, setCopiedMessageId] = (0, import_react4.useState)(null);
+  const [lastThinkingDurationMs, setLastThinkingDurationMs] = (0, import_react4.useState)(null);
+  const [threads, setThreads] = (0, import_react4.useState)(() => storage.listThreads());
+  const [isRefreshingThreads, setIsRefreshingThreads] = (0, import_react4.useState)(false);
+  const [isSelectingThread, setIsSelectingThread] = (0, import_react4.useState)(false);
+  const [activeRunId, setActiveRunId] = (0, import_react4.useState)(null);
+  const textareaRef = (0, import_react4.useRef)(null);
+  const activeThreadIdRef = (0, import_react4.useRef)(activeThreadId);
+  const messagesRef = (0, import_react4.useRef)(messages);
+  const nextBeforeTurnIndexRef = (0, import_react4.useRef)(initialCached?.nextBeforeTurnIndex ?? null);
+  const hasOlderTurnsRef = (0, import_react4.useRef)(Boolean(initialCached?.hasOlderTurns));
+  const isLoadingOlderRef = (0, import_react4.useRef)(false);
+  const loadedThreadIdRef = (0, import_react4.useRef)(initialCached?.messages?.length ? activeThreadId : null);
+  const requestSeqRef = (0, import_react4.useRef)(0);
+  const isLoadingHistoryRef = (0, import_react4.useRef)(isLoadingHistory);
+  const activeRunIdRef = (0, import_react4.useRef)(null);
+  const reattachedRunIdRef = (0, import_react4.useRef)(null);
+  const abortControllerRef = (0, import_react4.useRef)(null);
+  const [lifecycleAbortController] = (0, import_react4.useState)(() => new AbortController());
+  const streamingContentRef = (0, import_react4.useRef)("");
+  const streamingMessageIdRef = (0, import_react4.useRef)(null);
+  const reasoningRef = (0, import_react4.useRef)([]);
+  const liveVoiceIdsRef = (0, import_react4.useRef)({});
+  const refreshSeqRef = (0, import_react4.useRef)(0);
+  const setActiveRunIdValue = (0, import_react4.useCallback)((runId) => {
     activeRunIdRef.current = runId;
     setActiveRunId(runId);
   }, []);
-  const syncThreadsFromStorage = (0, import_react2.useCallback)(() => {
+  const syncThreadsFromStorage = (0, import_react4.useCallback)(() => {
     setThreads(storage.listThreads());
   }, [storage]);
-  const upsertStoredThread = (0, import_react2.useCallback)(
+  const upsertStoredThread = (0, import_react4.useCallback)(
     (thread) => {
       storage.upsertThread(thread);
       syncThreadsFromStorage();
     },
     [storage, syncThreadsFromStorage]
   );
-  (0, import_react2.useEffect)(() => {
+  (0, import_react4.useEffect)(() => {
     messagesRef.current = messages;
   }, [messages]);
-  const persistThread = (0, import_react2.useCallback)(
-    (threadId, nextMessages, paging, options) => {
+  const persistThread = (0, import_react4.useCallback)(
+    (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,
@@ -813,7 +938,7 @@ function useAgents24ChatController({
     },
     [storage, upsertStoredThread]
   );
-  const markThreadRunStatus = (0, import_react2.useCallback)(
+  const markThreadRunStatus = (0, import_react4.useCallback)(
     (threadId, runId, status, lastEventSeq) => {
       const existing = storage.getThread(threadId);
       if (!existing || !runId) return;
@@ -843,7 +968,7 @@ function useAgents24ChatController({
     },
     [storage, upsertStoredThread]
   );
-  const refresh = (0, import_react2.useCallback)(async () => {
+  const refresh = (0, import_react4.useCallback)(async () => {
     const seq = ++refreshSeqRef.current;
     setIsRefreshingThreads(true);
     try {
@@ -857,7 +982,7 @@ function useAgents24ChatController({
       if (!lifecycleAbortController.signal.aborted && seq === refreshSeqRef.current) setIsRefreshingThreads(false);
     }
   }, [lifecycleAbortController, storage, transport]);
-  const applyThreadId = (0, import_react2.useCallback)(
+  const applyThreadId = (0, import_react4.useCallback)(
     (threadId, baseMessages) => {
       if (!threadId || activeThreadIdRef.current === threadId) return;
       activeThreadIdRef.current = threadId;
@@ -871,15 +996,15 @@ function useAgents24ChatController({
     streamingContentRef.current = value;
     setStreamingContent(value);
   };
-  const setLoadingHistory = (0, import_react2.useCallback)((value) => {
+  const setLoadingHistory = (0, import_react4.useCallback)((value) => {
     isLoadingHistoryRef.current = value;
     setIsLoadingHistory(value);
   }, []);
-  const setReasoningSteps = (0, import_react2.useCallback)((value) => {
+  const setReasoningSteps = (0, import_react4.useCallback)((value) => {
     reasoningRef.current = value || [];
     setCurrentReasoning(value || []);
   }, []);
-  const detachActiveStream = (0, import_react2.useCallback)(() => {
+  const detachActiveStream = (0, import_react4.useCallback)(() => {
     const controller = abortControllerRef.current;
     abortControllerRef.current = null;
     abortDetachedStream(controller);
@@ -893,7 +1018,7 @@ function useAgents24ChatController({
     setStreamingContent("");
     setCurrentReasoning([]);
   }, [setActiveRunIdValue]);
-  const clearMissingThread = (0, import_react2.useCallback)(
+  const clearMissingThread = (0, import_react4.useCallback)(
     (threadId) => {
       storage.deleteThread?.(threadId);
       syncThreadsFromStorage();
@@ -915,7 +1040,7 @@ function useAgents24ChatController({
     },
     [detachActiveStream, onActiveThreadIdChange, setLoadingHistory, storage, syncThreadsFromStorage]
   );
-  const setLiveAssistantMessage = (0, import_react2.useCallback)(
+  const setLiveAssistantMessage = (0, import_react4.useCallback)(
     (input) => {
       setMessages((prev) => {
         const next = upsertStableAssistantMessage(prev, {
@@ -947,7 +1072,7 @@ function useAgents24ChatController({
     },
     []
   );
-  const finalizeAssistantMessage = (0, import_react2.useCallback)(
+  const finalizeAssistantMessage = (0, import_react4.useCallback)(
     (input) => {
       const content = input.error || input.assistantText.trim();
       if (!content) return input.baseMessages;
@@ -1001,7 +1126,7 @@ function useAgents24ChatController({
     },
     [createId, persistThread, storage, upsertStoredThread]
   );
-  const loadThread = (0, import_react2.useCallback)(
+  const loadThread = (0, import_react4.useCallback)(
     async (threadId) => {
       const seq = ++requestSeqRef.current;
       setLoadingHistory(true);
@@ -1046,7 +1171,7 @@ function useAgents24ChatController({
     },
     [clearMissingThread, lifecycleAbortController, onThreadDetailLoaded, pageSize, setLoadingHistory, transport, upsertStoredThread]
   );
-  const loadOlderTurns = (0, import_react2.useCallback)(async () => {
+  const loadOlderTurns = (0, import_react4.useCallback)(async () => {
     const threadId = activeThreadIdRef.current;
     const beforeTurnIndex = nextBeforeTurnIndexRef.current;
     if (!threadId || beforeTurnIndex === null || isLoadingOlderRef.current) return;
@@ -1082,7 +1207,7 @@ function useAgents24ChatController({
       isLoadingOlderRef.current = false;
     }
   }, [clearMissingThread, lifecycleAbortController, pageSize, persistThread, transport]);
-  const handleStreamEvent = (0, import_react2.useCallback)(
+  const handleStreamEvent = (0, import_react4.useCallback)(
     (input) => {
       const { mode, event, assistantMessageId, startedAt, streamThreadIdRef, baseMessages } = input;
       const payload = event.payload || {};
@@ -1143,7 +1268,7 @@ function useAgents24ChatController({
     },
     [applyThreadId, finalizeAssistantMessage, markThreadRunStatus, onRuntimeEvent, onStreamErrorMessage, setActiveRunIdValue, setLiveAssistantMessage, setReasoningSteps]
   );
-  const runStream = (0, import_react2.useCallback)(
+  const runStream = (0, import_react4.useCallback)(
     async (input) => {
       const startedAt = Date.now();
       const controller = new AbortController();
@@ -1266,18 +1391,26 @@ function useAgents24ChatController({
     },
     [createId, finalizeAssistantMessage, handleStreamEvent, onStreamErrorMessage, persistThread, refresh, setActiveRunIdValue, setReasoningSteps, transport]
   );
-  const handleSubmit = (0, import_react2.useCallback)(
+  const handleSubmit = (0, import_react4.useCallback)(
     async (message) => {
       if (!message.text.trim() && !(message.files || []).length) return;
       await runStream({ mode: "submit", message });
     },
     [runStream]
   );
-  const attachRun = (0, import_react2.useCallback)(async (runId, threadId) => {
+  const attachRun = (0, import_react4.useCallback)(async (runId, threadId) => {
     const resolvedThreadId = threadId ?? activeThreadIdRef.current;
     if (runId && resolvedThreadId) await runStream({ mode: "attach", runId, threadId: resolvedThreadId });
   }, [runStream]);
-  const handleStop = (0, import_react2.useCallback)(() => {
+  const { pendingHitl, isResolvingHitl, resumeHitl } = useControllerHitl({
+    messages,
+    transport,
+    activeRunId,
+    activeRunIdRef,
+    activeThreadIdRef,
+    runStream
+  });
+  const handleStop = (0, import_react4.useCallback)(() => {
     const runId = activeRunIdRef.current;
     const partial = streamingContentRef.current;
     const liveMessageId = streamingMessageIdRef.current;
@@ -1301,56 +1434,25 @@ function useAgents24ChatController({
       });
     }
   }, [finalizeAssistantMessage, lastThinkingDurationMs, setActiveRunIdValue, setReasoningSteps, transport]);
-  (0, import_react2.useEffect)(() => {
+  (0, import_react4.useEffect)(() => {
     refresh().catch((error) => {
       if (!isAbortError(error) && !lifecycleAbortController.signal.aborted) {
         setThreads(storage.listThreads());
       }
     });
   }, [lifecycleAbortController, refresh, storage]);
-  (0, import_react2.useEffect)(() => {
+  (0, import_react4.useEffect)(() => {
     return () => {
       lifecycleAbortController.abort();
       abortDetachedStream(abortControllerRef.current);
       abortControllerRef.current = null;
     };
   }, [lifecycleAbortController]);
-  (0, import_react2.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();
-    return () => {
-      cancelled = true;
-      if (retryTimeout) clearTimeout(retryTimeout);
-      controller?.abort();
-    };
-  }, [refresh, storage, transport]);
-  (0, import_react2.useEffect)(() => {
+  useControllerThreadEvents({ transport, storage, refresh, setThreads });
+  (0, import_react4.useEffect)(() => {
     syncThreadsFromStorage();
   }, [storageKey, syncThreadsFromStorage]);
-  (0, import_react2.useEffect)(() => {
+  (0, import_react4.useEffect)(() => {
     const previous = activeThreadIdRef.current;
     activeThreadIdRef.current = activeThreadId;
     if (activeThreadId && previous === activeThreadId && (activeRunIdRef.current || streamingMessageIdRef.current)) {
@@ -1394,14 +1496,14 @@ function useAgents24ChatController({
     }
     void loadThread(activeThreadId).catch(() => setLoadingHistory(false));
   }, [activeThreadId, detachActiveStream, loadThread, setLoadingHistory, storage]);
-  (0, import_react2.useEffect)(() => {
+  (0, import_react4.useEffect)(() => {
     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]);
-  (0, import_react2.useEffect)(() => {
+  (0, import_react4.useEffect)(() => {
     const threadId = activeThreadId;
     if (!threadId || isLoadingHistoryRef.current || activeRunIdRef.current || streamingMessageIdRef.current) {
       return;
@@ -1442,7 +1544,7 @@ function useAgents24ChatController({
     setMessages,
     storage
   });
-  const loadThreadById = (0, import_react2.useCallback)(
+  const loadThreadById = (0, import_react4.useCallback)(
     async (threadId) => {
       if (!threadId) return;
       setIsSelectingThread(true);
@@ -1461,7 +1563,7 @@ function useAgents24ChatController({
     [detachActiveStream, loadThread, onActiveThreadIdChange, storage]
   );
   const activeThread = activeThreadId ? storage.getThread(activeThreadId) || threads.find((thread) => thread.id === activeThreadId) || null : null;
-  return (0, import_react2.useMemo)(() => ({
+  return (0, import_react4.useMemo)(() => ({
     threads,
     activeThreadId,
     activeThread,
@@ -1481,8 +1583,11 @@ function useAgents24ChatController({
     copiedMessageId,
     lastThinkingDurationMs,
     activeRunId,
+    pendingHitl,
+    isResolvingHitl,
     handleSubmit,
     attachRun,
+    resumeHitl,
     handleStop,
     handleCopy,
     handleLike,
@@ -1521,8 +1626,11 @@ function useAgents24ChatController({
     loadThreadById,
     loadOlderTurns,
     messages,
+    isResolvingHitl,
     onSourceClick,
+    pendingHitl,
     refresh,
+    resumeHitl,
     streamingContent,
     streamingMessageId,
     startNewThread,
@@ -1875,6 +1983,59 @@ var LatestThreadScroller = {
   Outline: LatestThreadScrollerOutline
 };
 
+// src/mcp-oauth.ts
+var CONNECTION_ID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+function normalizedOrigin(value) {
+  try {
+    return new URL(value).origin;
+  } catch {
+    throw new Error("MCP authorization returned an invalid callback origin.");
+  }
+}
+function waitForMcpOauthComplete({
+  popup,
+  callbackOrigin,
+  serverId,
+  timeoutMs = 12e4
+}) {
+  if (!popup) return Promise.reject(new Error("Could not open the MCP authorization popup."));
+  const expectedOrigin = normalizedOrigin(callbackOrigin);
+  const expectedServerId = String(serverId || "").trim();
+  if (!expectedServerId) return Promise.reject(new Error("MCP authorization is missing its server identity."));
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      window.clearTimeout(timeout);
+      window.clearInterval(closeTimer);
+      window.removeEventListener("message", onMessage);
+      if (result instanceof Error) reject(result);
+      else resolve(result);
+    };
+    const onMessage = (event) => {
+      if (event.source !== popup || event.origin !== expectedOrigin) return;
+      const data = event.data;
+      if (data?.type !== "mcp-oauth-complete" || data.server_id !== expectedServerId) return;
+      if (!data.success) {
+        finish(new Error("MCP authorization failed."));
+        return;
+      }
+      const connectionId = String(data.connection_id || "").trim();
+      if (!CONNECTION_ID_PATTERN.test(connectionId)) return;
+      finish({ connectionId });
+    };
+    const timeout = window.setTimeout(
+      () => finish(new Error("MCP authorization timed out.")),
+      Math.max(1, timeoutMs)
+    );
+    const closeTimer = window.setInterval(() => {
+      if (popup.closed) finish(new Error("MCP authorization window was closed before connecting."));
+    }, 500);
+    window.addEventListener("message", onMessage);
+  });
+}
+
 // src/renderers.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");
 var DefaultToolPart = ({ part }) => {
@@ -1992,7 +2153,7 @@ var consumeSseResponse = async (response, onEvent, options = {}) => {
 };
 
 // src/streaming-text.ts
-var import_react3 = require("react");
+var import_react5 = require("react");
 var DEFAULT_COMPLETED_TEXT_CACHE_SIZE = 200;
 var defaultCompletedTextCache = /* @__PURE__ */ new Map();
 var defaultStreamingTextCache = {
@@ -2020,24 +2181,24 @@ function useStreamingText({
   maxCatchupChars = 20
 }) {
   const cacheAdapter = cache === false ? null : cache;
-  const [displayedText, setDisplayedText] = (0, import_react3.useState)(() => {
+  const [displayedText, setDisplayedText] = (0, import_react5.useState)(() => {
     const cachedText = cacheAdapter?.get(id);
     return isStreaming && cachedText !== text ? "" : text;
   });
-  const targetRef = (0, import_react3.useRef)(text);
-  const displayedRef = (0, import_react3.useRef)(displayedText);
-  const rafRef = (0, import_react3.useRef)(null);
-  const lastFrameAtRef = (0, import_react3.useRef)(null);
-  const idRef = (0, import_react3.useRef)(id);
-  const shouldAnimateRef = (0, import_react3.useRef)(isStreaming);
-  (0, import_react3.useEffect)(() => {
+  const targetRef = (0, import_react5.useRef)(text);
+  const displayedRef = (0, import_react5.useRef)(displayedText);
+  const rafRef = (0, import_react5.useRef)(null);
+  const lastFrameAtRef = (0, import_react5.useRef)(null);
+  const idRef = (0, import_react5.useRef)(id);
+  const shouldAnimateRef = (0, import_react5.useRef)(isStreaming);
+  (0, import_react5.useEffect)(() => {
     if (isStreaming || !text) return;
     cacheAdapter?.set(id, text);
   }, [cacheAdapter, id, isStreaming, text]);
-  (0, import_react3.useEffect)(() => {
+  (0, import_react5.useEffect)(() => {
     targetRef.current = text;
   }, [text]);
-  (0, import_react3.useEffect)(() => {
+  (0, import_react5.useEffect)(() => {
     if (idRef.current === id) return;
     idRef.current = id;
     const cachedText = cacheAdapter?.get(id);
@@ -2051,7 +2212,7 @@ function useStreamingText({
     }
     lastFrameAtRef.current = null;
   }, [cacheAdapter, id, isStreaming, text]);
-  (0, import_react3.useEffect)(() => {
+  (0, import_react5.useEffect)(() => {
     if (typeof window === "undefined") {
       displayedRef.current = text;
       setDisplayedText(text);
@@ -2229,9 +2390,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
         })
       });
@@ -2311,6 +2473,7 @@ var import_message_scroller2 = require("@shadcn/react/message-scroller");
   useMessageScroller,
   useMessageScrollerScrollable,
   useMessageScrollerVisibility,
-  useStreamingText
+  useStreamingText,
+  waitForMcpOauthComplete
 });
 //# sourceMappingURL=index.cjs.map