@tea-agent/loop-agent 0.43.0-next.11 → 0.43.0-next.12

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

@@ -180,7 +180,7 @@ function mergeCompactionMessages(messages, compactions) {
 export function useChatSessions(params) {
     const { origin, refs, setSession, thread, composer, browser, setError, setNotice, onCompactionChange, setProcessOpen, setAutoScroll, } = params;
     const { applyActivatedSession, resetForNewSession, setMessages } = thread;
-    const { setInput, setPendingImages } = composer;
+    const { seedSession, releaseSession } = composer;
     const { setPreviews, setActivePreviewPath } = browser;
     const { workspaceId, blocked } = params;
     const workspaceQuery = workspaceId
@@ -198,6 +198,9 @@ export function useChatSessions(params) {
         return owner ? `?workspaceId=${encodeURIComponent(owner)}` : "";
     }, [refs]);
     const [sessionList, setSessionList] = useState([]);
+    const [selectedSession, setSelectedSession] = useState(null);
+    const selectedSessionRef = useRef(null);
+    selectedSessionRef.current = selectedSession;
     const sessionListRef = useRef([]);
     const pendingDeletedIdsRef = useRef(new Set());
     const pendingCreatedRowsRef = useRef(new Map());
@@ -240,8 +243,6 @@ export function useChatSessions(params) {
         refs.settledTurnIdsRef.current = new Set();
         refs.activeTurnIdRef.current = null;
         resetForNewSession();
-        setInput("");
-        setPendingImages([]);
         setPreviews([]);
         setActivePreviewPath(null);
         setProcessOpen(false);
@@ -249,8 +250,6 @@ export function useChatSessions(params) {
     }, [
         refs,
         resetForNewSession,
-        setInput,
-        setPendingImages,
         setPreviews,
         setActivePreviewPath,
         setProcessOpen,
@@ -301,7 +300,15 @@ export function useChatSessions(params) {
         const activeSession = refs.sessionRef.current?.sessionId === sessionId
             ? refs.sessionRef.current
             : null;
-        const activeWorkspaceId = activeSession?.workspaceId ?? workspaceId;
+        const selectedForDelete = selectedSessionRef.current?.sessionId === sessionId
+            ? selectedSessionRef.current
+            : null;
+        const deletingIdentity = selectedForDelete ??
+            activeSession ?? {
+            sessionId,
+            ...(removed.workspaceId ? { workspaceId: removed.workspaceId } : {}),
+        };
+        const activeWorkspaceId = deletingIdentity.workspaceId ?? workspaceId;
         const deletingRow = {
             ...removed,
             optimisticState: "deleting",
@@ -329,7 +336,7 @@ export function useChatSessions(params) {
             setSessionList(restored);
         };
         let deletionSelectionVersion = null;
-        if (activeSession) {
+        if (activeSession || selectedForDelete) {
             deletionSelectionVersion = ++sessionSelectionVersionRef.current;
             refs.sessionRef.current = null;
             resetActiveProjection();
@@ -337,10 +344,10 @@ export function useChatSessions(params) {
             forgetActiveChatSession(window.localStorage, activeWorkspaceId, sessionId);
         }
         const restoreActiveSession = async () => {
-            if (activeSession &&
+            if ((activeSession || selectedForDelete) &&
                 deletionSelectionVersion === sessionSelectionVersionRef.current &&
                 !refs.sessionRef.current) {
-                await activateSessionRef.current?.(activeSession.sessionId, activeSession.workspaceId);
+                await activateSessionRef.current?.(deletingIdentity.sessionId, deletingIdentity.workspaceId);
             }
         };
         try {
@@ -362,6 +369,10 @@ export function useChatSessions(params) {
                 return false;
             }
             titleWatcherRef.current?.cancel(sessionId);
+            if (deletionSelectionVersion === sessionSelectionVersionRef.current &&
+                selectedSessionRef.current?.sessionId === sessionId)
+                setSelectedSession(null);
+            releaseSession(deletingIdentity);
             void refreshSessionList().finally(() => {
                 pendingDeletedIdsRef.current.delete(sessionId);
                 deleteRequestVersionsRef.current.delete(sessionId);
@@ -379,6 +390,7 @@ export function useChatSessions(params) {
         refs,
         setSession,
         resetActiveProjection,
+        releaseSession,
         refreshSessionList,
         setError,
         sessionOwnerQuery,
@@ -388,25 +400,45 @@ export function useChatSessions(params) {
         const active = refs.sessionRef.current;
         const listed = sessionListRef.current.find((item) => item.sessionId === sessionId);
         const scope = ownerWorkspaceId ?? listed?.workspaceId ?? active?.workspaceId ?? workspaceId;
+        const identity = {
+            sessionId,
+            ...(scope ? { workspaceId: scope } : {}),
+        };
         forgetActiveChatSession(window.localStorage, scope, sessionId);
+        releaseSession(identity);
         pendingDeletedIdsRef.current.add(sessionId);
         const { next } = removeSessionById(sessionListRef.current, sessionId);
         sessionListRef.current = next;
         setSessionList(next);
-        if (active?.sessionId === sessionId) {
+        if (active?.sessionId === sessionId ||
+            selectedSessionRef.current?.sessionId === sessionId) {
             sessionSelectionVersionRef.current += 1;
             refs.sessionRef.current = null;
+            setSelectedSession(null);
             resetActiveProjection();
             setSession(null);
         }
         void refreshSessionList();
-    }, [refs, resetActiveProjection, setSession, workspaceId, refreshSessionList]);
+    }, [refs, releaseSession, resetActiveProjection, setSession, workspaceId, refreshSessionList]);
     const activateSession = useCallback(async (sessionId, ownerWorkspaceId) => {
         const selectionVersion = ++sessionSelectionVersionRef.current;
+        const listedOwner = sessionListRef.current.find((item) => item.sessionId === sessionId)?.workspaceId;
+        const requestedOwner = ownerWorkspaceId ?? listedOwner;
+        const requested = {
+            sessionId,
+            ...(requestedOwner ? { workspaceId: requestedOwner } : {}),
+        };
+        // DSH-style staging: selection identity changes synchronously; detail
+        // hydration follows. The previous session loses send authority now.
+        setSelectedSession(requested);
+        resetActiveProjection({ keepStreams: true });
+        refs.sessionRef.current = null;
+        setSession(null);
+        setError(null);
         // AC-002: activation targets the session's durable owning workspace —
         // never the global active workspace (no cross-workspace leak when
         // Operate/Inspect switch their scope while a session stays open).
-        const ownerQuery = sessionOwnerQuery(ownerWorkspaceId);
+        const ownerQuery = sessionOwnerQuery(requested.workspaceId);
         try {
             const res = await fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(sessionId)}${ownerQuery}`, { credentials: "include" });
             const body = (await res.json());
@@ -427,7 +459,7 @@ export function useChatSessions(params) {
             // AC-002: session switch (same or cross workspace) never aborts other
             // sessions' background request controllers; the single /events owner is
             // re-bound by useChatStream's session effect.
-            resetActiveProjection({ keepStreams: true });
+            setSelectedSession(next);
             refs.sessionRef.current = next;
             refs.activeTurnIdRef.current = body.session.activeTurnId ?? null;
             const visuallyStopped = body.session.turnPhase === "stopping";
@@ -447,9 +479,8 @@ export function useChatSessions(params) {
             refs.assistantIdRef.current = null;
             refs.abortRef.current =
                 refs.sessionAbortControllersRef.current.get(sessionId) ?? null;
-            setPendingImages([]);
             setPreviews([]);
-            setInput(body.session.composerDraft ?? "");
+            seedSession(next, body.session.composerDraft ?? "");
             const hydrated = hydrateSessionThread(body.session.messages ?? []);
             hydrated.messages = mergeCompactionMessages(hydrated.messages, body.compactions);
             applyActivatedSession({
@@ -482,9 +513,8 @@ export function useChatSessions(params) {
         origin,
         refs,
         setSession,
-        setPendingImages,
         setPreviews,
-        setInput,
+        seedSession,
         applyActivatedSession,
         resetActiveProjection,
         setActivePreviewPath,
@@ -518,9 +548,7 @@ export function useChatSessions(params) {
     }
     const watchSessionTitle = useCallback((sessionId) => titleWatcherRef.current?.startIfEligible(sessionId), []);
     useEffect(() => {
-        titleWatcherRef.current?.reconcile(sessionList
-            .filter((item) => item.state !== "archived" && !item.title)
-            .map((item) => item.sessionId));
+        titleWatcherRef.current?.reconcile(sessionList.flatMap((item) => item.state !== "archived" && !item.title ? [item.sessionId] : []));
     }, [sessionList]);
     useEffect(() => () => titleWatcherRef.current?.dispose(), []);
     // Browser refresh/workspace-switch recovery: selection is client state keyed
@@ -537,15 +565,22 @@ export function useChatSessions(params) {
         setSession(null);
         const savedSessionId = readActiveChatSessionId(window.localStorage, workspaceId);
         if (!savedSessionId) {
+            setSelectedSession(null);
             // Keep the per-workspace map intact, but clear the legacy global pointer
             // so Operate/Models cannot link a session from another workspace.
             forgetActiveChatSession(window.localStorage, workspaceId);
             return;
         }
+        setSelectedSession({
+            sessionId: savedSessionId,
+            ...(workspaceId ? { workspaceId } : {}),
+        });
         void (async () => {
             try {
                 const res = await fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(savedSessionId)}${workspaceQuery}`, { credentials: "include" });
                 if (!res.ok) {
+                    if (selectionVersion === sessionSelectionVersionRef.current)
+                        setSelectedSession(null);
                     forgetActiveChatSession(window.localStorage, workspaceId, savedSessionId);
                     return;
                 }
@@ -557,6 +592,7 @@ export function useChatSessions(params) {
                     return;
                 const restored = projectActiveChatSession(body.session, workspaceId);
                 refs.sessionGenerationRef.current += 1;
+                setSelectedSession(restored);
                 refs.sessionRef.current = restored;
                 // Do not seed Last-Event-ID here: session messages are restored
                 // from the durable store, but tool/gate/operation projections live
@@ -577,8 +613,8 @@ export function useChatSessions(params) {
                 refs.settledTurnIdsRef.current = new Set();
                 refs.lastEventIdRef.current = null;
                 setSession(restored);
+                seedSession(restored, body.session.composerDraft ?? "");
                 rememberActiveChatSession(window.localStorage, restored.workspaceId ?? workspaceId, restored.sessionId);
-                setInput(body.session.composerDraft ?? "");
                 const hydrated = hydrateSessionThread(body.session.messages ?? []);
                 hydrated.messages = mergeCompactionMessages(hydrated.messages, body.compactions);
                 applyActivatedSession({
@@ -610,7 +646,7 @@ export function useChatSessions(params) {
         workspaceQuery,
         refs,
         setSession,
-        setInput,
+        seedSession,
         applyActivatedSession,
         blocked,
         resetActiveProjection,
@@ -622,7 +658,7 @@ export function useChatSessions(params) {
     // either explicit (sidebar create-in-workspace) or the current valid
     // selection. No scope → fail closed client-side (the server would reject
     // with WORKSPACE_REQUIRED anyway); never a default-workspace fallback.
-    const createSessionAndPrimeTitleWatcherForHook = useCallback((options) => {
+    const createSessionAndPrimeTitleWatcherForHook = useCallback(async (options) => {
         const scope = options?.workspaceId?.trim() ?? workspaceId?.trim();
         if (!scope) {
             setError("创建会话需要选择一个有效的工作区（不会回退默认工作区）");
@@ -644,25 +680,27 @@ export function useChatSessions(params) {
         const optimisticList = insertOptimisticSession(sessionListRef.current, optimisticRow);
         sessionListRef.current = optimisticList;
         setSessionList(optimisticList);
-        return createSessionAndPrimeTitleWatcher({
-            origin,
-            sessionListRef,
-            setSessionList,
-            titleWatcher: titleWatcherRef.current,
-            refreshSessionList,
-            options: { ...options, workspaceId: scope, optimisticSessionId },
-            setCreatingSession,
-            creatingRef: creatingSessionRef,
-        }).then((created) => {
+        try {
+            const created = await createSessionAndPrimeTitleWatcher({
+                origin,
+                sessionListRef,
+                setSessionList,
+                titleWatcher: titleWatcherRef.current,
+                refreshSessionList,
+                options: { ...options, workspaceId: scope, optimisticSessionId },
+                setCreatingSession,
+                creatingRef: creatingSessionRef,
+            });
             pendingCreatedRowsRef.current.delete(optimisticSessionId);
             return created;
-        }).catch((error) => {
+        }
+        catch (error) {
             pendingCreatedRowsRef.current.delete(optimisticSessionId);
             const cleaned = sessionListRef.current.filter((item) => item.sessionId !== optimisticSessionId);
             sessionListRef.current = cleaned;
             setSessionList(cleaned);
             throw error;
-        });
+        }
     }, [origin, refreshSessionList, workspaceId, setError]);
     const createSession = useCallback(async (options) => {
         // Suppress concurrent create from any entry (sidebar / Landing / chip).
@@ -708,6 +746,7 @@ export function useChatSessions(params) {
             // createSession().then(sendPrompt) reads the new session even
             // though sendPrompt's closure captured the stale (null) value.
             refs.sessionRef.current = created;
+            setSelectedSession(created);
             rememberActiveChatSession(window.localStorage, created.workspaceId ?? options?.workspaceId ?? workspaceId, created.sessionId);
             setSession(created);
             return created;
@@ -834,6 +873,7 @@ export function useChatSessions(params) {
             const activeSessionId = refs.sessionRef.current.sessionId;
             sessionSelectionVersionRef.current += 1;
             refs.sessionRef.current = null;
+            setSelectedSession(null);
             resetActiveProjection();
             setSession(null);
             forgetActiveChatSession(window.localStorage, activeWorkspaceId, activeSessionId);
@@ -841,6 +881,9 @@ export function useChatSessions(params) {
     };
     return {
         sessionList,
+        selectedSession,
+        sessionSwitching: Boolean(selectedSession &&
+            refs.sessionRef.current?.sessionId !== selectedSession.sessionId),
         creatingSession,
         activateSession,
         refreshSessionList,