@agents24/chat-react 0.2.0 → 0.3.1

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export * from "./controller";
 export * from "./context-window";
 export * from "./latest-thread-scroller";
 export * from "./message-lifecycle";
+export * from "./mcp-oauth";
 export * from "./model";
 export * from "./renderers";
 export * from "./sse";

package/dist/index.js

@@ -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,
@@ -111,16 +152,16 @@ var STAGE_PRIORITY = {
 function numberOrNull(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
-function stagePriority(window) {
-  return STAGE_PRIORITY[window?.stage || "sent_prompt"] ?? STAGE_PRIORITY.sent_prompt;
+function stagePriority(window2) {
+  return STAGE_PRIORITY[window2?.stage || "sent_prompt"] ?? STAGE_PRIORITY.sent_prompt;
 }
-function hasRenderableContextWindow(window) {
-  const maxTokens = window?.max_tokens;
+function hasRenderableContextWindow(window2) {
+  const maxTokens = window2?.max_tokens;
   return typeof maxTokens === "number" && Number.isFinite(maxTokens) && maxTokens > 0;
 }
-function windowWeight(window) {
-  if (!window) return [0, 0];
-  return [stagePriority(window), SOURCE_PRIORITY[window.source] || 0];
+function windowWeight(window2) {
+  if (!window2) return [0, 0];
+  return [stagePriority(window2), SOURCE_PRIORITY[window2.source] || 0];
 }
 function normalizeContextCompression(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
@@ -273,6 +314,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";
@@ -373,13 +430,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;
@@ -619,6 +702,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(
@@ -657,83 +781,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 [lifecycleAbortController] = useState(() => new AbortController());
-  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,
@@ -742,7 +866,7 @@ function useAgents24ChatController({
     },
     [storage, upsertStoredThread]
   );
-  const markThreadRunStatus = useCallback2(
+  const markThreadRunStatus = useCallback3(
     (threadId, runId, status, lastEventSeq) => {
       const existing = storage.getThread(threadId);
       if (!existing || !runId) return;
@@ -772,7 +896,7 @@ function useAgents24ChatController({
     },
     [storage, upsertStoredThread]
   );
-  const refresh = useCallback2(async () => {
+  const refresh = useCallback3(async () => {
     const seq = ++refreshSeqRef.current;
     setIsRefreshingThreads(true);
     try {
@@ -786,7 +910,7 @@ function useAgents24ChatController({
       if (!lifecycleAbortController.signal.aborted && seq === refreshSeqRef.current) setIsRefreshingThreads(false);
     }
   }, [lifecycleAbortController, storage, transport]);
-  const applyThreadId = useCallback2(
+  const applyThreadId = useCallback3(
     (threadId, baseMessages) => {
       if (!threadId || activeThreadIdRef.current === threadId) return;
       activeThreadIdRef.current = threadId;
@@ -800,15 +924,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);
@@ -822,7 +946,7 @@ function useAgents24ChatController({
     setStreamingContent("");
     setCurrentReasoning([]);
   }, [setActiveRunIdValue]);
-  const clearMissingThread = useCallback2(
+  const clearMissingThread = useCallback3(
     (threadId) => {
       storage.deleteThread?.(threadId);
       syncThreadsFromStorage();
@@ -844,7 +968,7 @@ function useAgents24ChatController({
     },
     [detachActiveStream, onActiveThreadIdChange, setLoadingHistory, storage, syncThreadsFromStorage]
   );
-  const setLiveAssistantMessage = useCallback2(
+  const setLiveAssistantMessage = useCallback3(
     (input) => {
       setMessages((prev) => {
         const next = upsertStableAssistantMessage(prev, {
@@ -876,7 +1000,7 @@ function useAgents24ChatController({
     },
     []
   );
-  const finalizeAssistantMessage = useCallback2(
+  const finalizeAssistantMessage = useCallback3(
     (input) => {
       const content = input.error || input.assistantText.trim();
       if (!content) return input.baseMessages;
@@ -930,7 +1054,7 @@ function useAgents24ChatController({
     },
     [createId, persistThread, storage, upsertStoredThread]
   );
-  const loadThread = useCallback2(
+  const loadThread = useCallback3(
     async (threadId) => {
       const seq = ++requestSeqRef.current;
       setLoadingHistory(true);
@@ -975,7 +1099,7 @@ function useAgents24ChatController({
     },
     [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;
@@ -1011,7 +1135,7 @@ function useAgents24ChatController({
       isLoadingOlderRef.current = false;
     }
   }, [clearMissingThread, lifecycleAbortController, pageSize, persistThread, transport]);
-  const handleStreamEvent = useCallback2(
+  const handleStreamEvent = useCallback3(
     (input) => {
       const { mode, event, assistantMessageId, startedAt, streamThreadIdRef, baseMessages } = input;
       const payload = event.payload || {};
@@ -1072,7 +1196,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();
@@ -1195,18 +1319,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;
@@ -1230,56 +1362,25 @@ function useAgents24ChatController({
       });
     }
   }, [finalizeAssistantMessage, lastThinkingDurationMs, setActiveRunIdValue, setReasoningSteps, transport]);
-  useEffect(() => {
+  useEffect2(() => {
     refresh().catch((error) => {
       if (!isAbortError(error) && !lifecycleAbortController.signal.aborted) {
         setThreads(storage.listThreads());
       }
     });
   }, [lifecycleAbortController, refresh, storage]);
-  useEffect(() => {
+  useEffect2(() => {
     return () => {
       lifecycleAbortController.abort();
       abortDetachedStream(abortControllerRef.current);
       abortControllerRef.current = null;
     };
   }, [lifecycleAbortController]);
-  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]);
-  useEffect(() => {
+  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)) {
@@ -1323,14 +1424,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;
@@ -1371,7 +1472,7 @@ function useAgents24ChatController({
     setMessages,
     storage
   });
-  const loadThreadById = useCallback2(
+  const loadThreadById = useCallback3(
     async (threadId) => {
       if (!threadId) return;
       setIsSelectingThread(true);
@@ -1390,7 +1491,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,
@@ -1410,8 +1511,11 @@ function useAgents24ChatController({
     copiedMessageId,
     lastThinkingDurationMs,
     activeRunId,
+    pendingHitl,
+    isResolvingHitl,
     handleSubmit,
     attachRun,
+    resumeHitl,
     handleStop,
     handleCopy,
     handleLike,
@@ -1450,8 +1554,11 @@ function useAgents24ChatController({
     loadThreadById,
     loadOlderTurns,
     messages,
+    isResolvingHitl,
     onSourceClick,
+    pendingHitl,
     refresh,
+    resumeHitl,
     streamingContent,
     streamingMessageId,
     startNewThread,
@@ -1460,6 +1567,59 @@ function useAgents24ChatController({
   ]);
 }
 
+// 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
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 var DefaultToolPart = ({ part }) => {
@@ -1680,9 +1840,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
         })
       });
@@ -1766,6 +1927,7 @@ export {
   useMessageScroller,
   useMessageScrollerScrollable,
   useMessageScrollerVisibility,
-  useStreamingText
+  useStreamingText,
+  waitForMcpOauthComplete
 };
 //# sourceMappingURL=index.js.map