@tea-agent/loop-agent 0.43.0-next.9 → 0.44.0-next.1

package/dist/worker/console/static-src/operator-chat/useChatStream.js

@@ -64,7 +64,7 @@ function clearEmptyAssistant(setMessages, assistantId) {
 export function useChatStream(params) {
     const { origin, refs, session, thread, composer, setError, setAutoScroll, setNotice, recoveryVersion = 0, watchSessionTitle, } = params;
     const { applySseBlock, setMessages, setStreaming, setStreamingAssistantId, streaming, setTurnPhase, setDeferredTurn, setDeferredTurns, } = thread;
-    const { setInput, setPendingImages, recordHistory } = composer;
+    const { settleSubmission, settleSubmissionByRequest, replaceSessionDraft, } = composer;
     const showNotice = useCallback((message) => {
         if (!setNotice)
             return;
@@ -223,15 +223,22 @@ export function useChatStream(params) {
     }, [origin]);
     const postCreateTurn = useCallback(async (input) => {
         try {
+            // Resolve against the configured Console origin and fail closed if a
+            // future URL helper ever escapes that trusted same-origin boundary.
+            const consoleOrigin = new URL(origin, window.location.href);
+            const turnsUrl = new URL(operatorChatTurnsUrl(origin, input.sessionId), consoleOrigin);
+            if (turnsUrl.origin !== consoleOrigin.origin)
+                throw new Error("create-turn URL escaped the Console origin");
             // Real create-turn path remains `${origin}/api/operator/v1/chat/sessions/:id/turns`
             // (via operatorChatTurnsUrl); source contract anchors on /turns`.
-            const res = await fetch(operatorChatTurnsUrl(origin, input.sessionId), {
+            const res = await fetch(turnsUrl, {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/json",
                     "x-loop-console-confirmation": confirmationToken(),
                 },
                 credentials: "include",
+                signal: input.signal,
                 body: JSON.stringify({
                     clientRequestId: input.clientRequestId,
                     text: input.text.trim() || "请查看附件图片。",
@@ -350,9 +357,6 @@ export function useChatStream(params) {
         bag.sessionId = refs.sessionRef.current?.sessionId ?? null;
         bag.sessionGeneration = refs.sessionGenerationRef.current;
         bag.submitGeneration = refs.submitGenerationRef.current;
-        const setPendingImagesUi = (images) => {
-            setPendingImages(images);
-        };
         settleCreateTurnOutcome(bag, outcome, {
             assistantId: ctx.assistantId,
             text: ctx.text,
@@ -363,13 +367,13 @@ export function useChatStream(params) {
             acceptedUi: {
                 setStreaming,
                 setStreamingAssistantId,
-                setPendingImages: setPendingImagesUi,
+                setPendingImages: () => undefined,
                 watchSessionTitle,
             },
             adoptUi: {
                 clearEmptyAssistant: (assistantId) => clearEmptyAssistant(setMessages, assistantId),
-                setInput,
-                setPendingImages: setPendingImagesUi,
+                setInput: () => undefined,
+                setPendingImages: () => undefined,
                 setStreaming,
                 setStreamingAssistantId,
                 removePendingMessage: (requestId) => setMessages((messages) => removePendingSubmission(messages, requestId)),
@@ -379,8 +383,8 @@ export function useChatStream(params) {
                 setStreaming,
                 setStreamingAssistantId,
                 clearEmptyAssistant: (assistantId) => clearEmptyAssistant(setMessages, assistantId),
-                setInput,
-                setPendingImages: setPendingImagesUi,
+                setInput: () => undefined,
+                setPendingImages: () => undefined,
                 formatError: formatOperatorUserError,
                 removePendingMessage: (requestId) => setMessages((messages) => removePendingSubmission(messages, requestId)),
             },
@@ -389,6 +393,14 @@ export function useChatStream(params) {
                 void postAbortForTurn(ctx.sessionId, ctx.generation, turnId);
             },
         });
+        if (outcome.kind === "accepted") {
+            settleSubmission(ctx.attempt, "accepted");
+        }
+        else if (outcome.kind === "adopt-active" ||
+            outcome.kind === "rejected" ||
+            outcome.kind === "stale") {
+            settleSubmission(ctx.attempt, "rejected");
+        }
         applyOwnershipBagToRefs(refs, bag);
         const ownershipPhase = turnPhaseFromOwnership(bag);
         setTurnPhase(visualTurnPhaseFromOwnership(bag));
@@ -403,68 +415,84 @@ export function useChatStream(params) {
         setStreaming,
         setTurnPhase,
         setStreamingAssistantId,
-        setPendingImages,
+        settleSubmission,
         watchSessionTitle,
         setMessages,
-        setInput,
         setError,
         postAbortForTurn,
     ]);
     const queueDeferredTurn = useCallback(async (input) => {
+        const { attempt } = input;
         const activeSession = refs.sessionRef.current;
-        if (!activeSession || (!input.text.trim() && input.images.length === 0))
+        const isCurrent = () => refs.sessionRef.current?.sessionId === attempt.identity.sessionId &&
+            refs.sessionGenerationRef.current === attempt.sessionGeneration;
+        if (!activeSession ||
+            activeSession.sessionId !== attempt.identity.sessionId ||
+            !isCurrent()) {
+            settleSubmission(attempt, "rejected");
             return { action: "handled" };
+        }
+        const showError = (message) => {
+            if (isCurrent())
+                setError(message);
+        };
         const acceptDeferred = (deferredTurn, deferredTurns) => {
+            settleSubmission(attempt, "accepted");
+            if (!isCurrent())
+                return;
             setDeferredTurn(deferredTurns?.[0] ?? deferredTurn);
             setDeferredTurns(deferredTurns ?? [deferredTurn]);
-            setInput("");
-            setPendingImages([]);
             setError(null);
         };
         const acceptDispatched = () => {
+            settleSubmission(attempt, "accepted");
+            if (!isCurrent())
+                return;
             setDeferredTurn(null);
             setDeferredTurns([]);
-            setInput("");
-            setPendingImages([]);
             setError(null);
         };
         const putOnce = async () => {
-            const response = await fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(activeSession.sessionId)}/deferred-turn`, {
+            const response = await fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(attempt.identity.sessionId)}/deferred-turn`, {
                 method: "PUT",
                 headers: {
                     "Content-Type": "application/json",
                     "x-loop-console-confirmation": confirmationToken(),
                 },
                 credentials: "include",
+                signal: attempt.signal,
                 body: JSON.stringify({
-                    clientRequestId: input.clientRequestId,
+                    clientRequestId: attempt.clientRequestId,
                     blockedByTurnId: input.blockedByTurnId,
-                    text: input.text,
-                    images: input.images,
+                    text: attempt.draftSnapshot,
+                    images: attempt.imageSnapshot,
                 }),
             });
             const body = (await response.json().catch(() => ({})));
             return { response, body };
         };
         try {
-            for (let attempt = 0; attempt < 2; attempt += 1) {
+            for (let retry = 0; retry < 2; retry += 1) {
                 const { response, body } = await putOnce();
                 if (response.ok && body.accepted && body.deferredTurn) {
                     acceptDeferred(body.deferredTurn, body.deferredTurns);
                     return { action: "handled" };
                 }
-                if (body.deferredTurns)
-                    setDeferredTurns(body.deferredTurns);
-                if (body.deferredTurn)
-                    setDeferredTurn(body.deferredTurn);
                 if (body.error?.code !== "TURN_NOT_ACTIVE") {
-                    setError(body.error?.message ??
+                    if (isCurrent()) {
+                        if (body.deferredTurns)
+                            setDeferredTurns(body.deferredTurns);
+                        if (body.deferredTurn)
+                            setDeferredTurn(body.deferredTurn);
+                    }
+                    settleSubmission(attempt, "rejected");
+                    showError(body.error?.message ??
                         `待发送消息未被服务端接受（HTTP ${response.status}）`);
                     return { action: "handled" };
                 }
-                const canonical = await fetchSessionState(activeSession.sessionId);
+                const canonical = await fetchSessionState(attempt.identity.sessionId);
                 const decision = reconcileDeferredSubmissionFromState({
-                    clientRequestId: input.clientRequestId,
+                    clientRequestId: attempt.clientRequestId,
                     blockedByTurnId: input.blockedByTurnId,
                     state: canonical ?? undefined,
                 });
@@ -476,20 +504,29 @@ export function useChatStream(params) {
                     acceptDispatched();
                     return { action: "handled" };
                 }
-                if (decision.action === "retry-deferred" && attempt === 0)
+                if (decision.action === "retry-deferred" && retry === 0)
                     continue;
-                if (decision.action === "send-now") {
+                if (decision.action === "send-now")
                     return { action: "send-now" };
+                if (isCurrent()) {
+                    if (body.deferredTurns)
+                        setDeferredTurns(body.deferredTurns);
+                    if (body.deferredTurn)
+                        setDeferredTurn(body.deferredTurn);
                 }
-                setError(body.error?.message ?? "停止状态已变化，当前消息仍保留在输入框");
+                settleSubmission(attempt, "rejected");
+                showError(body.error?.message ?? "停止状态已变化，当前消息仍保留在输入框");
                 return { action: "handled" };
             }
+            settleSubmission(attempt, "rejected");
             return { action: "handled" };
         }
         catch (error) {
-            const canonical = await fetchSessionState(activeSession.sessionId);
+            if (attempt.signal.aborted)
+                return { action: "handled" };
+            const canonical = await fetchSessionState(attempt.identity.sessionId);
             const decision = reconcileDeferredSubmissionFromState({
-                clientRequestId: input.clientRequestId,
+                clientRequestId: attempt.clientRequestId,
                 blockedByTurnId: input.blockedByTurnId,
                 state: canonical ?? undefined,
             });
@@ -501,10 +538,10 @@ export function useChatStream(params) {
                 acceptDispatched();
                 return { action: "handled" };
             }
-            if (decision.action === "send-now") {
+            if (decision.action === "send-now")
                 return { action: "send-now" };
-            }
-            setError(error instanceof Error
+            settleSubmission(attempt, "rejected");
+            showError(error instanceof Error
                 ? `无法确认消息是否已排队：${error.message}`
                 : "无法确认消息是否已排队，请刷新后查看服务端状态");
             return { action: "handled" };
@@ -515,8 +552,7 @@ export function useChatStream(params) {
         thread.deferredTurn,
         setDeferredTurn,
         setDeferredTurns,
-        setInput,
-        setPendingImages,
+        settleSubmission,
         setError,
         fetchSessionState,
     ]);
@@ -529,6 +565,10 @@ export function useChatStream(params) {
             : thread.deferredTurns[0] ?? thread.deferredTurn;
         if (!activeSession || !deferred)
             return;
+        const identity = { ...activeSession };
+        const generation = refs.sessionGenerationRef.current;
+        const isCurrent = () => refs.sessionRef.current?.sessionId === identity.sessionId &&
+            refs.sessionGenerationRef.current === generation;
         try {
             const response = await fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(activeSession.sessionId)}/deferred-turn`, {
                 method: "DELETE",
@@ -544,20 +584,25 @@ export function useChatStream(params) {
             });
             const body = (await response.json().catch(() => ({})));
             if (!response.ok || !body.cancelled) {
-                setError(body.error?.message ?? "待发送消息撤回失败");
+                if (isCurrent())
+                    setError(body.error?.message ?? "待发送消息撤回失败");
                 return;
             }
+            if (mode === "restore") {
+                replaceSessionDraft(identity, deferred.text ?? body.deferredTurn?.text ?? "", deferred.images ??
+                    body.deferredTurn?.images ??
+                    []);
+            }
+            if (!isCurrent())
+                return;
             const remaining = thread.deferredTurns.filter((item) => item.clientRequestId !== deferred.clientRequestId);
             setDeferredTurns(remaining);
             setDeferredTurn(remaining[0] ?? null);
-            if (mode === "restore") {
-                setInput(deferred.text ?? body.deferredTurn?.text ?? "");
-                setPendingImages(deferred.images ?? body.deferredTurn?.images ?? []);
-            }
             setError(null);
         }
         catch (error) {
-            setError(error instanceof Error ? error.message : String(error));
+            if (isCurrent())
+                setError(error instanceof Error ? error.message : String(error));
         }
     }, [
         origin,
@@ -566,8 +611,7 @@ export function useChatStream(params) {
         thread.deferredTurns,
         setDeferredTurn,
         setDeferredTurns,
-        setInput,
-        setPendingImages,
+        replaceSessionDraft,
         setError,
     ]);
     const cancelDeferredTurn = useCallback(() => requestDeferredTurnDelete("restore"), [requestDeferredTurnDelete]);
@@ -576,6 +620,9 @@ export function useChatStream(params) {
         const activeSession = refs.sessionRef.current;
         if (!activeSession)
             return;
+        const generation = refs.sessionGenerationRef.current;
+        const isCurrent = () => refs.sessionRef.current?.sessionId === activeSession.sessionId &&
+            refs.sessionGenerationRef.current === generation;
         const item = thread.deferredTurns.find((entry) => entry.clientRequestId === target.clientRequestId);
         if (!item)
             return;
@@ -587,6 +634,8 @@ export function useChatStream(params) {
                 body: JSON.stringify({ clientRequestId: target.clientRequestId, blockedByTurnId: item.blockedByTurnId, text, images: item.images ?? [], expectedRevision: target.revision }),
             });
             const body = (await response.json().catch(() => ({})));
+            if (!isCurrent())
+                return;
             if (!response.ok)
                 throw new Error(body.error?.message ?? "编辑排队消息失败");
             if (body.deferredTurns)
@@ -596,13 +645,17 @@ export function useChatStream(params) {
             setError(null);
         }
         catch (error) {
-            setError(error instanceof Error ? error.message : "编辑排队消息失败");
+            if (isCurrent())
+                setError(error instanceof Error ? error.message : "编辑排队消息失败");
         }
     }, [origin, refs, thread.deferredTurns, setDeferredTurn, setDeferredTurns, setError]);
     const steerDeferredTurn = useCallback(async (target) => {
         const activeSession = refs.sessionRef.current;
         if (!activeSession)
             return;
+        const generation = refs.sessionGenerationRef.current;
+        const isCurrent = () => refs.sessionRef.current?.sessionId === activeSession.sessionId &&
+            refs.sessionGenerationRef.current === generation;
         try {
             const response = await fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(activeSession.sessionId)}/deferred-turn/${encodeURIComponent(target.clientRequestId)}/steer`, {
                 method: "POST",
@@ -611,6 +664,8 @@ export function useChatStream(params) {
                 body: JSON.stringify({ expectedRevision: target.revision }),
             });
             const body = (await response.json().catch(() => ({})));
+            if (!isCurrent())
+                return;
             if (!response.ok)
                 throw new Error(body.error?.message ?? "插话发送失败");
             const remaining = body.deferredTurns ?? thread.deferredTurns.filter((item) => item.clientRequestId !== target.clientRequestId);
@@ -619,33 +674,39 @@ export function useChatStream(params) {
             setError(null);
         }
         catch (error) {
-            setError(error instanceof Error ? error.message : "插话发送失败");
+            if (isCurrent())
+                setError(error instanceof Error ? error.message : "插话发送失败");
         }
     }, [origin, refs, thread.deferredTurns, setDeferredTurn, setDeferredTurns, setError]);
-    const sendPrompt = useCallback(async (text, images) => {
+    const sendPrompt = useCallback(async (attempt) => {
+        const text = attempt.draftSnapshot;
+        const images = attempt.imageSnapshot;
         const initialSession = refs.sessionRef.current;
-        if (!initialSession || (!text.trim() && images.length === 0))
+        if (!initialSession ||
+            initialSession.sessionId !== attempt.identity.sessionId ||
+            refs.sessionGenerationRef.current !== attempt.sessionGeneration ||
+            (!text.trim() && images.length === 0)) {
+            settleSubmission(attempt, "rejected");
             return;
+        }
         const ownership = ownershipBagFromRefs(refs);
         const route = decideSubmissionRoute({
             turnPhase: turnPhaseFromOwnership(ownership),
             blockedByTurnId: ownership.stoppingTurnId ?? ownership.activeTurnId,
         });
-        const clientRequestId = requestId("chat-submit");
+        const clientRequestId = attempt.clientRequestId;
         if (route.action === "hold") {
             const phase = turnPhaseFromOwnership(ownership);
             if (phase === "stopping")
                 showNotice("正在确认上一轮停止状态，当前消息已保留");
             else if (phase === "running")
                 showNotice("正在确认当前回合状态，当前消息已保留");
+            settleSubmission(attempt, "rejected");
             return;
         }
-        recordHistory?.(text);
         if (route.action === "queue-deferred") {
             const deferred = await queueDeferredTurn({
-                text,
-                images,
-                clientRequestId,
+                attempt,
                 blockedByTurnId: route.blockedByTurnId,
             });
             if (deferred.action !== "send-now")
@@ -655,19 +716,22 @@ export function useChatStream(params) {
         const generation = refs.sessionGenerationRef.current;
         if (!activeSession ||
             activeSession.sessionId !== initialSession.sessionId ||
+            generation !== attempt.sessionGeneration ||
             (!text.trim() && images.length === 0) ||
             refs.streamingRef.current ||
             refs.submitInFlightRef.current ||
             // AC-R5-002: ownership lease blocks send until terminal release.
-            refs.pendingSubmissionRef.current)
+            refs.pendingSubmissionRef.current) {
+            settleSubmission(attempt, "rejected");
             return;
+        }
         // AC-001: acquire synchronous submit ownership before the first await.
         refs.submitInFlightRef.current = true;
         const submitGeneration = ++refs.submitGenerationRef.current;
         const userMessageId = requestId("u");
         const assistantId = requestId("a");
         const draftText = text.trim();
-        const draftImages = images.slice();
+        const draftImages = [...images];
         const pending = createPendingSubmission({
             clientRequestId,
             submitGeneration,
@@ -699,7 +763,6 @@ export function useChatStream(params) {
             user: userMsg,
             assistant: assistantMsg,
         }));
-        setInput("");
         setAutoScroll(true);
         setError(null);
         try {
@@ -713,8 +776,7 @@ export function useChatStream(params) {
             releaseSubmitOwnership(clientRequestId);
             setMessages((messages) => removePendingSubmission(messages, clientRequestId));
             clearEmptyAssistant(setMessages, assistantId);
-            setInput(draftText);
-            setPendingImages(draftImages);
+            settleSubmission(attempt, "rejected");
             return;
         }
         if (refs.sessionRef.current?.sessionId !== activeSession.sessionId ||
@@ -722,13 +784,11 @@ export function useChatStream(params) {
             releaseSubmitOwnership(clientRequestId);
             if (refs.sessionRef.current?.sessionId === activeSession.sessionId) {
                 // Same session, newer generation: the activation snapshot replaced
-                // the thread, so the optimistic row is gone. Restore the draft
-                // instead of losing the user's text silently (2026-09-08).
+                // the thread, so remove its obsolete optimistic projection.
                 setMessages((messages) => removePendingSubmission(messages, clientRequestId));
                 clearEmptyAssistant(setMessages, assistantId);
-                setInput(draftText);
-                setPendingImages(draftImages);
             }
+            settleSubmission(attempt, "rejected");
             return;
         }
         // Attachments stay until accepted (AC/UIS-accepted).
@@ -744,6 +804,7 @@ export function useChatStream(params) {
             assistantId,
             text: draftText,
             images: draftImages,
+            attempt,
             pending,
         };
         const first = await postCreateTurn({
@@ -751,6 +812,7 @@ export function useChatStream(params) {
             clientRequestId,
             text: draftText,
             images: draftImages,
+            signal: attempt.signal,
         });
         if (!isSubmissionCurrent({
             pending,
@@ -760,6 +822,7 @@ export function useChatStream(params) {
         })) {
             pending.resolveOutcome({ kind: "stale" });
             releaseSubmitOwnership(clientRequestId);
+            settleSubmission(attempt, first.httpOk && first.body.accepted ? "accepted" : "rejected");
             return;
         }
         let outcome = first.networkError
@@ -786,6 +849,7 @@ export function useChatStream(params) {
                     clientRequestId,
                     text: draftText,
                     images: draftImages,
+                    signal: attempt.signal,
                 });
                 if (!isSubmissionCurrent({
                     pending,
@@ -795,6 +859,7 @@ export function useChatStream(params) {
                 })) {
                     pending.resolveOutcome({ kind: "stale" });
                     releaseSubmitOwnership(clientRequestId);
+                    settleSubmission(attempt, retry.httpOk && retry.body.accepted ? "accepted" : "rejected");
                     return;
                 }
                 outcome = retry.networkError
@@ -825,14 +890,13 @@ export function useChatStream(params) {
         releaseSubmitOwnership,
         showNotice,
         setMessages,
-        setInput,
+        settleSubmission,
         setAutoScroll,
         setError,
         setStreaming,
         setTurnPhase,
         setStreamingAssistantId,
         queueDeferredTurn,
-        recordHistory,
     ]);
     const handleStop = useCallback(async () => {
         // AC-R5-001: durable stopRequested is set synchronously before any await so
@@ -888,8 +952,9 @@ export function useChatStream(params) {
                 // Intent remains; /state bind-active will fire exactly one abort.
                 return;
             }
-            else {
-                // rejected / stale — clear durable intent (settle already released).
+            if (outcome.kind === "rejected" ||
+                outcome.kind === "stale") {
+                // Rejected/stale settlement released this submission's stop intent.
                 refs.stopRequestedRef.current = false;
                 return;
             }
@@ -933,6 +998,7 @@ export function useChatStream(params) {
         if (!session || (!streaming && !hasOwnershipWork))
             return;
         const sessionId = session.sessionId;
+        const sessionIdentity = { ...session };
         const generation = refs.sessionGenerationRef.current;
         let cancelled = false;
         let syncInFlight = null;
@@ -975,11 +1041,15 @@ export function useChatStream(params) {
                     if (state && "deferredTurn" in state)
                         setDeferredTurn(state.deferredTurn ?? null);
                     if (result === "bound" && ownershipPhase !== "stopping") {
+                        settleSubmissionByRequest(sessionIdentity, pending.clientRequestId, "accepted");
                         // US-BUSY-ACTIVE-BOUND: keep streaming/busy with same id.
                         setStreaming(true);
                         return;
                     }
                     if (result === "released") {
+                        settleSubmissionByRequest(sessionIdentity, pending.clientRequestId, decision.action === "release-not-accepted"
+                            ? "rejected"
+                            : "accepted");
                         return;
                     }
                     // hold without acceptedTurnId: keep pending + busy.
@@ -1002,6 +1072,7 @@ export function useChatStream(params) {
                         stillPending.clientRequestId &&
                         isTerminalTurnState(state?.activeTurn?.state);
                     if (latestMatches || activeMatches) {
+                        settleSubmissionByRequest(sessionIdentity, stillPending.clientRequestId, "accepted");
                         const termTurnId = activeMatches
                             ? (state?.activeTurn?.turnId ?? null)
                             : (state?.latestTurn?.turnId ??
@@ -1073,7 +1144,10 @@ export function useChatStream(params) {
                 stopRetryIndex >= STOP_RECONCILE_DELAYS_MS.length ||
                 (!refs.stopRequestedRef.current && !refs.stoppingTurnIdRef.current))
                 return;
-            const delay = STOP_RECONCILE_DELAYS_MS[stopRetryIndex++];
+            const delay = STOP_RECONCILE_DELAYS_MS[stopRetryIndex];
+            stopRetryIndex += 1;
+            if (delay === undefined)
+                return;
             stopRetryTimer = window.setTimeout(() => {
                 void sync().finally(scheduleStopRetry);
             }, delay);
@@ -1095,6 +1169,7 @@ export function useChatStream(params) {
         refs,
         session,
         streaming,
+        settleSubmissionByRequest,
         setTurnPhase,
         markIdleIfCurrent,
         releaseSubmitOwnership,