@tea-agent/loop-agent 0.43.0 → 0.44.0-next.10

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

@@ -8,6 +8,8 @@ import { mergePendingSubmissionOnHydration } from "./pending-user-message.js";
 import { taskContextUnchanged } from "./format.js";
 import { upsertCompactionMessage } from "./compaction-message.js";
 import { sameTurnGroupInputs } from "./turn-group-equality.js";
+import { conversationNodesFromEvents, } from "../../chat/conversation-nodes.js";
+import { mergeTurnStateSummaries, setProjectedTurnState, } from "./turn-state-projection.js";
 const EMPTY_USAGE = {
     inputTokens: 0,
     outputTokens: 0,
@@ -140,6 +142,14 @@ export function useChatThread(params) {
     const [usage, setUsage] = useState(EMPTY_USAGE);
     const [sessionStats, setSessionStats] = useState(EMPTY_SESSION_STATS);
     const [turnTelemetry, setTurnTelemetry] = useState([]);
+    const [userTurnOutline, setUserTurnOutline] = useState([]);
+    const [operatorActions, setOperatorActions] = useState([]);
+    const [conversationNodes, setConversationNodes] = useState([]);
+    const [turnStatesById, setTurnStatesById] = useState({});
+    const reconcileTurnStates = useCallback((summaries) => {
+        setTurnStatesById((current) => mergeTurnStateSummaries(current, summaries));
+    }, []);
+    const [sddSessionIdentity, setSddSessionIdentity] = useState(null);
     const [streaming, setStreaming] = useState(false);
     const [turnPhase, setTurnPhase] = useState("idle");
     const [deferredTurn, setDeferredTurn] = useState(null);
@@ -167,11 +177,13 @@ export function useChatThread(params) {
             if (body.usage)
                 setUsage(body.usage);
             setTurnTelemetry(body.turnTelemetry ?? []);
+            setSddSessionIdentity(body.sddDataAlignment ?? null);
+            reconcileTurnStates(body.session?.turnStates);
         }
         catch {
             // Telemetry is supplementary; the normal event stream remains authoritative.
         }
-    }, [origin, refs]);
+    }, [origin, refs, reconcileTurnStates]);
     // All inputs are stable (state setters + the memoized refs bag), so the
     // applier identity is stable across renders.
     const applyChatSseEvent = useMemo(() => createChatSseEventApplier({
@@ -188,6 +200,10 @@ export function useChatThread(params) {
         setPendingQuestion,
         setTodos,
         setGoal,
+        setOperatorActions,
+        setConversationNodes,
+        setTurnState: (turnId, state) => setTurnStatesById((current) => setProjectedTurnState(current, turnId, state)),
+        setSddSessionIdentity,
         setStreamingAssistantId,
         setUnread,
         setOperationCards,
@@ -325,6 +341,8 @@ export function useChatThread(params) {
             toolCalls,
             streaming,
             activeAssistantId: streamingAssistantId,
+            conversationNodes,
+            turnStatesById,
         });
         // Preserve completed group objects across streaming tokens. Stable
         // historical groups keep their references so
@@ -343,11 +361,13 @@ export function useChatThread(params) {
         toolCalls,
         streaming,
         streamingAssistantId,
+        conversationNodes,
+        turnStatesById,
         historyLimit,
     ]);
-    const loadEarlierMessages = useCallback(async (beforePrepend) => {
+    const loadHistoryPages = useCallback(async (input) => {
         const targetSessionId = refs.sessionRef.current?.sessionId;
-        const beforeId = historyNextCursor;
+        let beforeId = historyNextCursor;
         if (!targetSessionId || !historyHasMore || !beforeId || historyLoadingRef.current)
             return false;
         const generation = refs.sessionGenerationRef.current;
@@ -355,17 +375,29 @@ export function useChatThread(params) {
         historyLoadingRef.current = request;
         setHistoryLoading(true);
         try {
-            const query = new URLSearchParams({ limit: "50", beforeId });
-            const res = await fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(targetSessionId)}/messages?${query.toString()}`, { credentials: "include" });
-            if (!res.ok || refs.sessionRef.current?.sessionId !== targetSessionId)
-                return false;
-            const body = (await res.json());
-            if (refs.sessionRef.current?.sessionId !== targetSessionId ||
-                refs.sessionGenerationRef.current !== generation ||
-                historyLoadingRef.current !== request)
-                return false;
-            const page = hydrateSessionThread(body.messages ?? []);
-            beforePrepend?.();
+            const collectedMessages = [];
+            const collectedTurnStates = [];
+            let hasMore = historyHasMore;
+            let found = false;
+            do {
+                const query = new URLSearchParams({ limit: "50", beforeId });
+                const res = await fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(targetSessionId)}/messages?${query.toString()}`, { credentials: "include" });
+                if (!res.ok || refs.sessionRef.current?.sessionId !== targetSessionId)
+                    return false;
+                const body = (await res.json());
+                if (refs.sessionRef.current?.sessionId !== targetSessionId ||
+                    refs.sessionGenerationRef.current !== generation ||
+                    historyLoadingRef.current !== request)
+                    return false;
+                const pageMessages = body.messages ?? [];
+                collectedMessages.unshift(...pageMessages);
+                collectedTurnStates.push(...(body.turnStates ?? []));
+                found = Boolean(input?.untilMessageId && pageMessages.some((message) => message.id === input.untilMessageId));
+                hasMore = body.hasMore === true;
+                beforeId = body.nextCursor ?? "";
+            } while (input?.untilMessageId && !found && hasMore && beforeId);
+            const page = hydrateSessionThread(collectedMessages);
+            input?.beforePrepend?.();
             setMessages((current) => {
                 const seen = new Set();
                 const merged = [...page.messages, ...current].filter((message) => {
@@ -382,10 +414,11 @@ export function useChatThread(params) {
                     byId.set(tool.id, tool);
                 return [...byId.values()].sort((a, b) => a.createdAt - b.createdAt);
             });
-            setHistoryHasMore(body.hasMore === true);
-            setHistoryNextCursor(body.nextCursor ?? null);
-            setHistoryLimit((value) => value + 50);
-            return true;
+            setTurnStatesById((current) => mergeTurnStateSummaries(current, collectedTurnStates));
+            setHistoryHasMore(hasMore);
+            setHistoryNextCursor(beforeId || null);
+            setHistoryLimit((value) => value + collectedMessages.length);
+            return input?.untilMessageId ? found : true;
         }
         catch (error) {
             if (refs.sessionRef.current?.sessionId === targetSessionId && refs.sessionGenerationRef.current === generation) {
@@ -400,6 +433,10 @@ export function useChatThread(params) {
             }
         }
     }, [historyHasMore, historyNextCursor, origin, refs, setError]);
+    const loadEarlierMessages = useCallback((beforePrepend) => loadHistoryPages({ beforePrepend }), [loadHistoryPages]);
+    const loadThroughMessage = useCallback((messageId) => messagesRef.current.some((message) => message.id === messageId)
+        ? Promise.resolve(true)
+        : loadHistoryPages({ untilMessageId: messageId }), [loadHistoryPages]);
     const visibleMessages = useMemo(() => {
         const next = [];
         for (const group of turnGroups) {
@@ -421,6 +458,11 @@ export function useChatThread(params) {
         setUsage(EMPTY_USAGE);
         setSessionStats(EMPTY_SESSION_STATS);
         setTurnTelemetry([]);
+        setUserTurnOutline([]);
+        setOperatorActions([]);
+        setConversationNodes([]);
+        setTurnStatesById({});
+        setSddSessionIdentity(null);
         setStreaming(false);
         setTurnPhase("idle");
         setDeferredTurn(null);
@@ -469,6 +511,8 @@ export function useChatThread(params) {
             }
             : undefined));
         setToolCalls(next.toolCalls);
+        setConversationNodes(conversationNodesFromEvents(next.conversationEvents ?? []));
+        setTurnStatesById(mergeTurnStateSummaries({}, next.turnStates));
         setOperationCards([]);
         setHumanGateCards([]);
         setArtifactCards([]);
@@ -477,6 +521,9 @@ export function useChatThread(params) {
         setUsage(next.usage ?? EMPTY_USAGE);
         setSessionStats(next.sessionStats ?? EMPTY_SESSION_STATS);
         setTurnTelemetry(next.turnTelemetry ?? []);
+        setUserTurnOutline(next.userTurnOutline ?? []);
+        setOperatorActions([]);
+        setSddSessionIdentity(next.sddSessionIdentity ?? null);
         refs.usageResponseKeysRef.current = new Set();
         setStreaming(visuallyStopped ? false : next.streaming);
         setTurnPhase(visuallyStopped
@@ -500,13 +547,15 @@ export function useChatThread(params) {
      *  operation/human-gate/artifact/interview cards, which the reconnected tail
      *  stream will not replay (they live in the ring, already consumed). */
     const recoverSession = useCallback(async (targetSessionId) => {
+        const targetGeneration = refs.sessionGenerationRef.current;
         try {
             const res = await fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(targetSessionId)}`, { credentials: "include" });
             if (!res.ok)
                 return false;
             const body = (await res.json());
             if (!body.session ||
-                refs.sessionRef.current?.sessionId !== targetSessionId)
+                refs.sessionRef.current?.sessionId !== targetSessionId ||
+                refs.sessionGenerationRef.current !== targetGeneration)
                 return false;
             const activeTurnId = body.session.activeTurnId ?? null;
             const visuallyStopped = body.session.turnPhase === "stopping";
@@ -526,6 +575,8 @@ export function useChatThread(params) {
             if (body.usage)
                 setUsage(body.usage);
             setTurnTelemetry(body.turnTelemetry ?? []);
+            setUserTurnOutline(body.userTurnOutline ?? []);
+            setSddSessionIdentity(body.sddDataAlignment ?? null);
             // Resume the events stream from the snapshot tail so the next
             // reconnect never immediately re-expires (AC-003). The refs below
             // are reset so any follow-up tail replay re-applies cleanly.
@@ -534,7 +585,15 @@ export function useChatThread(params) {
             refs.turnAssistantIdsRef.current = new Map();
             refs.sealedAssistantIdsRef.current = new Set();
             const hydrated = hydrateSessionThread(body.session.messages ?? []);
-            const pending = refs.pendingSubmissionRef.current;
+            setConversationNodes(conversationNodesFromEvents(body.conversationEvents ?? []));
+            setTurnStatesById((current) => mergeTurnStateSummaries(current, body.session?.turnStates));
+            // Recovery is addressed to targetSessionId, so an optimistic
+            // submission from another session must never be projected into
+            // this snapshot (the activation path enforces the same owner gate).
+            const pending = refs.pendingSubmissionRef.current?.sessionId === targetSessionId &&
+                refs.pendingSubmissionRef.current.sessionGeneration === targetGeneration
+                ? refs.pendingSubmissionRef.current
+                : undefined;
             const recovered = mergePendingSubmissionOnHydration(hydrated.messages, pending
                 ? {
                     clientRequestId: pending.clientRequestId,
@@ -590,6 +649,7 @@ export function useChatThread(params) {
         historyNextCursor,
         historyLoading,
         loadEarlierMessages,
+        loadThroughMessage,
         unread,
         humanGateCards,
         interview,
@@ -599,6 +659,13 @@ export function useChatThread(params) {
         usage,
         sessionStats,
         turnTelemetry,
+        userTurnOutline,
+        operatorActions,
+        conversationNodes,
+        turnStatesById,
+        reconcileTurnStates,
+        sddSessionIdentity,
+        setSddSessionIdentity,
         streaming,
         setStreaming,
         turnPhase,
@@ -621,6 +688,7 @@ export function useChatThread(params) {
         applySseBlock,
         loadTaskContext,
         applyOperationLinkMutation,
+        refreshSessionTelemetry,
         resetForNewSession,
         applyActivatedSession,
         recoverSession,

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

@@ -43,6 +43,9 @@ export function useComposer(params) {
     const input = activeSnapshot.draft;
     const pendingImages = activeSnapshot.images;
     const [fileOptions, setFileOptions] = useState([]);
+    const [fileIndex, setFileIndex] = useState(0);
+    const [fileDrilled, setFileDrilled] = useState(false);
+    const [fileDismissedQuery, setFileDismissedQuery] = useState(null);
     const [shortcutOpen, setShortcutOpen] = useState(false);
     /** Any composer text that starts with `/` should reveal the palette,
      *  including draft restore. Escape can still close it without clearing. */
@@ -123,6 +126,10 @@ export function useComposer(params) {
         forceRender();
         setShortcutOpen(false);
         setShortcutIndex(0);
+        setFileOptions([]);
+        setFileDrilled(false);
+        setFileDismissedQuery(null);
+        setFileIndex(0);
         return attempt;
     }, [ledger, refs]);
     const claimSessionSubmission = useCallback((identity, text, images = []) => {
@@ -259,6 +266,14 @@ export function useComposer(params) {
             .slice(0, textareaRef.current?.selectionStart ?? input.length)
             .match(/(?:^|\s)@([^\s@]*)$/);
         if (!match) {
+            setFileOptions([]);
+            setFileDrilled(false);
+            setFileDismissedQuery(null);
+            setFileIndex(0);
+            return;
+        }
+        const query = match[1] ?? "";
+        if (fileDismissedQuery === query) {
             setFileOptions([]);
             return;
         }
@@ -267,7 +282,7 @@ export function useComposer(params) {
         const generation = refs.sessionGenerationRef.current;
         const controller = new AbortController();
         const timer = window.setTimeout(() => {
-            void fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(sessionId)}/files?q=${encodeURIComponent(match[1] ?? "")}`, { signal: controller.signal })
+            void fetch(`${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(sessionId)}/files?q=${encodeURIComponent(query)}`, { signal: controller.signal })
                 .then((r) => (r.ok ? r.json() : null))
                 .then((body) => {
                 const active = activeIdentityRef.current;
@@ -276,7 +291,14 @@ export function useComposer(params) {
                     composerSessionKey(active) !== ownerKey ||
                     refs.sessionGenerationRef.current !== generation)
                     return;
-                setFileOptions((body?.files ?? []).map((item) => item.path));
+                const files = (body?.files ?? []);
+                setFileOptions(files
+                    .filter((item) => typeof item.path === "string" && item.path.length > 0)
+                    .map((item) => ({
+                    path: item.path,
+                    isDir: item.isDir === true || item.path.endsWith("/"),
+                })));
+                setFileIndex(0);
             })
                 .catch(() => undefined);
         }, 150);
@@ -284,16 +306,58 @@ export function useComposer(params) {
             window.clearTimeout(timer);
             controller.abort();
         };
-    }, [origin, sessionId, sessionIdentity, sessionReady, input, refs]);
-    const insertFileReference = useCallback((file) => {
+    }, [
+        origin,
+        sessionId,
+        sessionIdentity,
+        sessionReady,
+        input,
+        refs,
+        fileDismissedQuery,
+    ]);
+    const replaceAtToken = useCallback((nextPath, close) => {
         const caret = textareaRef.current?.selectionStart ?? input.length;
         const before = input.slice(0, caret);
         const start = before.search(/@[^\s@]*$/);
         if (start < 0)
+            return false;
+        const suffix = close ? " " : "";
+        setInput(`${input.slice(0, start)}@${nextPath}${suffix}${input.slice(caret)}`);
+        return true;
+    }, [input, setInput]);
+    const insertFileReference = useCallback((file) => {
+        if (!replaceAtToken(file, true))
             return;
-        setInput(`${input.slice(0, start)}@${file} ${input.slice(caret)}`);
         setFileOptions([]);
-    }, [input, setInput]);
+        setFileDrilled(false);
+        setFileDismissedQuery(null);
+        setFileIndex(0);
+    }, [replaceAtToken]);
+    const drillFileReference = useCallback((file) => {
+        if (!replaceAtToken(file, false))
+            return;
+        setFileDrilled(true);
+        setFileDismissedQuery(null);
+        setFileIndex(0);
+    }, [replaceAtToken]);
+    const pickFileCrumb = useCallback((value) => {
+        if (!replaceAtToken(value, false))
+            return;
+        setFileDrilled(true);
+        setFileDismissedQuery(null);
+        setFileIndex(0);
+    }, [replaceAtToken]);
+    const dismissFilePalette = useCallback(() => {
+        const query = input
+            .slice(0, textareaRef.current?.selectionStart ?? input.length)
+            .match(/(?:^|\s)@([^\s@]*)$/)?.[1];
+        if (query === undefined) {
+            setFileOptions([]);
+            return;
+        }
+        setFileDismissedQuery(query);
+        setFileOptions([]);
+    }, [input]);
     const addImagesFromFiles = useCallback((files) => {
         const owner = activeIdentityRef.current;
         if (!owner)
@@ -364,6 +428,9 @@ export function useComposer(params) {
     useEffect(() => {
         setShortcutIndex((index) => clampShortcutIndex(index, filteredShortcuts.length));
     }, [filteredShortcuts.length]);
+    useEffect(() => {
+        setFileIndex((index) => clampShortcutIndex(index, fileOptions.length));
+    }, [fileOptions.length]);
     const onCompositionStart = useCallback(() => {
         refs.isComposingRef.current = true;
     }, [refs]);
@@ -388,6 +455,7 @@ export function useComposer(params) {
             sessionId: sessionReady ? sessionId : undefined,
             refs,
             onUnrecoverableSession,
+            deferInitialFetch: true,
         });
     }, [origin, sessionId, sessionReady, refs, onUnrecoverableSession]);
     return {
@@ -404,6 +472,9 @@ export function useComposer(params) {
         replaceSessionDraft,
         releaseSession,
         fileOptions,
+        fileIndex,
+        setFileIndex,
+        fileDrilled,
         pendingImages,
         setPendingImages,
         addImagesFromFiles,
@@ -417,6 +488,9 @@ export function useComposer(params) {
         dynamicCommandsError,
         retryDynamicCommands,
         insertFileReference,
+        drillFileReference,
+        pickFileCrumb,
+        dismissFilePalette,
         textareaRef,
         onCompositionStart,
         onCompositionEnd,

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

@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from "react";
 import { ACTIVE_CHAT_SESSION_STORAGE_KEY } from "../../chat/workspace-landing.js";
+import { workspaceScopeReady } from "./useWorkspaceBrowserGate.js";
 const REPO_HTML_PREVIEW_ROUTE_PREFIX = "/api/operator/v1/chat/repo/html/";
 /** DSH-style path-encoded preview URL: relative HTML assets resolve under the
  * same workspace-scoped route instead of losing a query-string workspaceId. */
@@ -46,6 +47,8 @@ export function useRepoBrowser(params) {
     const loadTree = useCallback(async (directory = "") => {
         if (blocked)
             return; // AC-R5-002: fail-closed, zero repo requests
+        if (!workspaceScopeReady(workspaceId))
+            return;
         const requestWorkspaceId = workspaceId ?? null;
         try {
             setTreeError(null);
@@ -91,9 +94,11 @@ export function useRepoBrowser(params) {
         document.addEventListener("visibilitychange", onVisibility);
         return () => document.removeEventListener("visibilitychange", onVisibility);
     }, [refreshTree]);
-    const openPreview = useCallback(async (file) => {
+    const openPreview = useCallback(async (file, focusLine) => {
         if (blocked)
             return; // AC-R5-002: fail-closed
+        if (!workspaceScopeReady(workspaceId))
+            return;
         const requestWorkspaceId = workspaceId ?? null;
         setPreviewLoading(true);
         try {
@@ -103,7 +108,10 @@ export function useRepoBrowser(params) {
                 return;
             if (!res.ok || !body.data)
                 throw new Error(body.error?.message ?? "无法预览文件");
-            const loaded = withHtmlPreviewUrl(body.data, origin, workspaceId);
+            const loaded = {
+                ...withHtmlPreviewUrl(body.data, origin, workspaceId),
+                ...(focusLine ? { focusLine } : {}),
+            };
             setPreviews((current) => {
                 const next = [
                     ...current.filter((item) => item.path !== loaded.path),
@@ -177,6 +185,8 @@ export function useRepoBrowser(params) {
         }
         if (!paths.length)
             return;
+        if (!workspaceScopeReady(workspaceId))
+            return;
         void Promise.all(paths.map(async (file) => {
             const res = await fetch(`${origin}/api/operator/v1/chat/repo/file?path=${encodeURIComponent(file)}${workspaceQuery}`, { credentials: "include" });
             if (!res.ok)
@@ -192,7 +202,7 @@ export function useRepoBrowser(params) {
             setPreviews(available);
             setActivePreviewPath(available.at(-1)?.path ?? null);
         });
-    }, [origin, workspaceQuery, sessionId, refs]);
+    }, [origin, workspaceQuery, workspaceId, sessionId, refs]);
     const toggleDir = useCallback((dir) => {
         setExpandedDirs((current) => {
             const next = new Set(current);

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

@@ -3,7 +3,8 @@ import { formatModelRef, mergeSessionRuntime, sessionRuntimeMatches, } from "../
 import { confirmationToken } from "./format.js";
 import { isLostChatSessionError, mergeRuntimeContextWithSnapshot, runtimeSelectionFromSnapshot, } from "./runtime-snapshot-store.js";
 import { buildToolCatalog } from "./tools-catalog.js";
-import { adoptMutationSnapshot, dispatchRuntimeSnapshot, getRuntimeSnapshotState, refreshRuntimeSnapshot, settleMutationLifecycle, useRuntimeSnapshot, } from "./useRuntimeSnapshot.js";
+import { adoptMutationSnapshot, dispatchRuntimeSnapshot, getRuntimeSnapshotState, refreshRuntimeSnapshot, releaseDeferredRuntimeSnapshotFetch, settleMutationLifecycle, useRuntimeSnapshot, } from "./useRuntimeSnapshot.js";
+import { workspaceScopeReady } from "./useWorkspaceBrowserGate.js";
 /**
  * Monotonic mutation sequence shared across switchRuntime calls (RF-04). Each
  * mutation captures its own token; only the LATEST started token may settle
@@ -19,6 +20,7 @@ export function useRuntimeControls(params) {
     const [models, setModels] = useState([]);
     const [modelsStatus, setModelsStatus] = useState("idle");
     const [modelsError, setModelsError] = useState(null);
+    const [modelsForSessionId, setModelsForSessionId] = useState(null);
     const [thinkingLevels, setThinkingLevels] = useState([]);
     const [runtimeContext, setRuntimeContext] = useState(null);
     const [runtimeContextError, setRuntimeContextError] = useState(null);
@@ -44,13 +46,14 @@ export function useRuntimeControls(params) {
     const loadCapabilities = useCallback(async () => {
         try {
             // Workspace-scoped: the server rejects a bare capabilities call with
-            // WORKSPACE_REQUIRED in multi-workspace consoles, which would silently
-            // null the tool catalog (trajectory injection section included).
-            const scope = session?.workspaceId ?? params.workspaceId ?? undefined;
-            const query = scope
-                ? `?workspaceId=${encodeURIComponent(scope)}`
-                : "";
-            const res = await fetch(`${origin}/api/operator/v1/chat/capabilities${query}`);
+            // WORKSPACE_REQUIRED. Wait for a selected workspace instead of firing
+            // an unscoped request that shows up as a 400 in the browser Network panel.
+            const scope = (session?.workspaceId ??
+                params.workspaceId ??
+                "").trim();
+            if (!workspaceScopeReady(scope))
+                return;
+            const res = await fetch(`${origin}/api/operator/v1/chat/capabilities?workspaceId=${encodeURIComponent(scope)}`);
             if (!res.ok)
                 return;
             const body = (await res.json());
@@ -63,16 +66,17 @@ export function useRuntimeControls(params) {
     useEffect(() => {
         void loadCapabilities();
     }, [loadCapabilities]);
-    // Models + thinking levels: AC-01/AC-06 — the GET may reopen a historical
-    // session server-side; a failure is a STRUCTURED error state (with retry),
-    // never silently folded into an empty list.
+    // Models + thinking levels: GET lists the workspace catalog and does not
+    // wait for historical Pi session reopen. Failure is a STRUCTURED error
+    // (with retry), never silently folded into an empty list.
+    const sessionId = session?.sessionId ?? null;
     const loadModels = useCallback(async () => {
-        if (!session) {
+        if (!sessionId) {
             setModels([]);
             setModelsStatus("idle");
+            setModelsForSessionId(null);
             return;
         }
-        const sessionId = session.sessionId;
         setModelsStatus("loading");
         setModelsError(null);
         try {
@@ -93,27 +97,36 @@ export function useRuntimeControls(params) {
                 })) {
                     setModelsStatus("idle");
                     setModelsError(null);
+                    setModelsForSessionId(sessionId);
                     onUnrecoverableSession?.(sessionId);
                     return;
                 }
                 setModelsStatus("error");
                 setModelsError(error?.message ?? `模型列表读取失败（HTTP ${res.status}）`);
+                setModelsForSessionId(sessionId);
                 return;
             }
             setModels(body.models ?? []);
             setThinkingLevels(body.thinkingLevels ?? []);
             setModelsStatus("ready");
+            setModelsForSessionId(sessionId);
         }
         catch (reason) {
             if (refs.sessionRef.current?.sessionId !== sessionId)
                 return;
             setModelsStatus("error");
             setModelsError(reason instanceof Error ? reason.message : String(reason));
+            setModelsForSessionId(sessionId);
         }
-    }, [origin, session, refs, onUnrecoverableSession]);
+    }, [origin, sessionId, refs, onUnrecoverableSession]);
     useEffect(() => {
         void loadModels();
     }, [loadModels]);
+    useEffect(() => {
+        if (!session || modelsForSessionId !== session.sessionId)
+            return;
+        releaseDeferredRuntimeSnapshotFetch(session.sessionId);
+    }, [session, modelsForSessionId]);
     useEffect(() => {
         if (!session) {
             setRuntimeContext(null);
@@ -121,6 +134,12 @@ export function useRuntimeControls(params) {
             setRuntimeContextLoading(false);
             return;
         }
+        if (modelsForSessionId !== session.sessionId) {
+            setRuntimeContext(null);
+            setRuntimeContextError(null);
+            setRuntimeContextLoading(true);
+            return;
+        }
         const sessionId = session.sessionId;
         const base = `${origin}/api/operator/v1/chat/sessions/${encodeURIComponent(sessionId)}`;
         setRuntimeContextError(null);
@@ -181,7 +200,7 @@ export function useRuntimeControls(params) {
                 return;
             setRuntimeContextError("注入上下文读取失败，请重试");
         });
-    }, [origin, session?.sessionId, refs, onUnrecoverableSession]);
+    }, [origin, session?.sessionId, modelsForSessionId, refs, onUnrecoverableSession]);
     // AC-01/RF3-01: hydrate the Composer from the unified snapshot — real
     // model and thinking selection; `auto` displays the Pi actual effective
     // level. Derived session/runtimeContext state ONLY comes from a snapshot
@@ -348,8 +367,8 @@ export function useRuntimeControls(params) {
         capabilities,
     ]);
     // Snapshot is the single source of truth when ready; the /models fetch
-    // result is the fallback (both hit the same backend, never fake-empty).
-    const effectiveModels = snapshot
+    // result is the fallback so the picker is usable before Pi session reopen.
+    const effectiveModels = snapshot && snapshotState.status === "ready"
         ? (snapshot.models ?? []).map((model) => ({
             provider: model.provider,
             id: model.id,

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

@@ -14,6 +14,7 @@ import { confirmationToken } from "./format.js";
 import { createRuntimeSnapshotStore, isLostChatSessionError, parseRuntimeSnapshotError, } from "./runtime-snapshot-store.js";
 const store = createRuntimeSnapshotStore();
 let controller;
+let snapshotFetchStartedFor;
 function snapshotUrl(sessionId) {
     return `/api/operator/v1/chat/sessions/${encodeURIComponent(sessionId)}`;
 }
@@ -36,12 +37,28 @@ export function attachRuntimeSnapshotController(input) {
         store.dispatch({ type: "mutation-reset" });
     }
     if (!input.sessionId) {
+        snapshotFetchStartedFor = undefined;
         store.dispatch({ type: "reset" });
         return;
     }
     store.dispatch({ type: "load-start", sessionId: input.sessionId });
+    if (input.deferInitialFetch) {
+        snapshotFetchStartedFor = undefined;
+        return;
+    }
+    snapshotFetchStartedFor = input.sessionId;
     void fetchSnapshot(input.sessionId, input.origin);
 }
+/** Start the deferred GET /runtime-snapshot after the workspace model catalog settles. */
+export function releaseDeferredRuntimeSnapshotFetch(sessionId) {
+    const ctrl = controller;
+    if (!ctrl?.sessionId || ctrl.sessionId !== sessionId)
+        return;
+    if (snapshotFetchStartedFor === sessionId)
+        return;
+    snapshotFetchStartedFor = sessionId;
+    void fetchSnapshot(sessionId, ctrl.origin);
+}
 async function fetchSnapshot(sessionId, origin) {
     try {
         const res = await fetch(`${origin}${snapshotUrl(sessionId)}/runtime-snapshot`, { credentials: "include" });
@@ -144,6 +161,7 @@ export async function refreshRuntimeSnapshot() {
         return false;
     const sessionId = ctrl.sessionId;
     store.dispatch({ type: "load-start", sessionId });
+    snapshotFetchStartedFor = sessionId;
     void fetchSnapshot(sessionId, ctrl.origin);
     return true;
 }

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

@@ -2,3 +2,7 @@ export const WORKSPACE_BROWSER_OK = { status: "ok" };
 export function workspaceBrowserGateActive(gate) {
     return gate.status !== "ok";
 }
+/** Non-session chat APIs require a selected workspace; empty/whitespace is unset. */
+export function workspaceScopeReady(workspaceId) {
+    return Boolean(workspaceId?.trim());
+}

package/dist/worker/console/static-src/shell/console-update-reload.js

@@ -22,7 +22,7 @@ export async function reloadWhenConsoleReady(options = {}) {
     const fetchImpl = options.fetchImpl ?? fetch;
     const reload = options.reload ?? (() => window.location.reload());
     const started = Date.now();
-    let previousConsoleInstanceId = null;
+    let previousConsoleInstanceId = options.previousConsoleInstanceId?.trim() || null;
     while (Date.now() - started < timeoutMs) {
         try {
             const res = await fetchImpl(`/api/health?ts=${Date.now()}`, {