@agent-native/core 0.167.1 → 0.167.4

package/dist/client/blocks/library/diagram.config.d.ts

@@ -37,7 +37,10 @@ export interface DiagramData {
      */
     html?: string;
     css?: string;
-    /** `design` forces clean HTML/CSS rendering without the sketch overlay. */
+    /**
+     * `design` forces clean HTML/CSS rendering without the sketch overlay. Use it
+     * for UI-like blocks such as cards, logo walls, tables, and controls.
+     */
     renderMode?: "wireframe" | "design";
     caption?: string;
     /** Outer surface frame. `auto` lets the host choose the right default. */

package/dist/client/blocks/library/diagram.js

@@ -393,7 +393,7 @@ export const diagramBlock = defineBlock({
     // edit from a corner button + panel rather than inline.
     editSurface: "panel",
     label: "Diagram",
-    description: "A flexible inline architecture/code diagram. Prefer html/css with SVG or semantic HTML for polished two-dimensional layouts; use renderMode design for clean presentation or .diagram-* primitives and --wf-* tokens for theme/sketch compatibility. Legacy nodes/edges are only for simple previews.",
+    description: "A flexible inline architecture/code diagram. Prefer html/css with SVG or semantic HTML for polished two-dimensional layouts; use renderMode design for UI-like blocks such as cards, logo walls, tables, and controls, or .diagram-* primitives and --wf-* tokens for actual diagrams that need theme/sketch compatibility. Legacy nodes/edges are only for simple previews.",
     // Seed the legacy fallback shape so a fresh block validates while agents can
     // replace it with html/css when layout quality matters.
     empty: () => ({ nodes: [{ id: "n1", label: "Module" }], edges: [] }),

package/dist/client/chat/run-recovery.js

@@ -298,17 +298,25 @@ export function RunErrorRecoveryCard({ info, onContinue, onRetry, onFork, onDism
     return (_jsxs("div", { className: "rounded-lg border border-amber-500/25 bg-amber-500/[0.06] p-3 text-sm", children: [_jsxs("div", { className: "flex items-start gap-2", children: [_jsx("span", { className: "mt-0.5 flex h-6 w-6 shrink-0 items-center justify-center rounded-md bg-amber-500/10 text-amber-700 dark:text-amber-300", children: _jsx(IconAlertTriangle, { size: 14 }) }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "font-medium text-foreground", children: runErrorHeadline(info, {
                                     recoverable: t("agentChat.error.stopped"),
                                     terminal: t("agentChat.error.failed"),
-                                }) }), _jsx("p", { className: "mt-1 text-xs leading-relaxed text-muted-foreground", children: localizeKnownChatErrorText(info.message, t) }), isProviderAuthError && (_jsx("div", { className: "mt-3 rounded-md border border-border/70 bg-background/60 p-2.5", children: _jsx(BuilderSetupContent, { layout: "sidebar", onConnected: handleProviderConnected }) })), shouldShowBuilderReconnect && !builderReconnectResolved && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-muted-foreground", children: t("agentChat.recovery.credentialRejected") })), isConnectionRecoveryError && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-muted-foreground", children: t("agentChat.recovery.newChatHint") })), (info.runId || info.errorCode || info.details) && (_jsxs("button", { type: "button", onClick: () => setDetailsOpen((v) => !v), className: "mt-2 inline-flex items-center gap-1 text-[11px] font-medium text-muted-foreground hover:text-foreground", children: [_jsx(IconChevronDown, { size: 12, className: cn("transition-transform", detailsOpen && "rotate-180") }), t("agentChat.common.details")] })), detailsOpen && (_jsxs("div", { className: "mt-2 rounded-md border border-border/60 bg-background/70 p-2 font-mono text-[11px] leading-relaxed text-muted-foreground", children: [info.runId && _jsxs("div", { children: ["run: ", info.runId] }), info.errorCode && _jsxs("div", { children: ["code: ", info.errorCode] }), info.details && (_jsx("pre", { className: "mt-2 max-h-28 overflow-auto whitespace-pre-wrap break-words font-mono", children: info.details }))] }))] }), _jsx("button", { type: "button", onClick: onDismiss, "aria-label": t("agentChat.common.dismiss"), className: "flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-background/80 hover:text-foreground", children: _jsx(IconX, { size: 14 }) })] }), _jsxs("div", { className: "mt-3 flex flex-wrap items-center gap-2", children: [shouldShowBuilderReconnect && !builderReconnectResolved && (_jsxs("button", { type: "button", onClick: () => builderReconnect.start(), disabled: builderReconnect.connecting, className: "inline-flex h-8 items-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90 disabled:cursor-wait disabled:opacity-70", children: [builderReconnect.connecting ? (_jsx(IconLoader2, { size: 13, className: "animate-spin" })) : null, builderReconnect.connecting
+                                }) }), _jsx("p", { className: "mt-1 text-xs leading-relaxed text-muted-foreground", children: localizeKnownChatErrorText(info.message, t) }), isProviderAuthError && (_jsx("div", { className: "mt-3 rounded-md border border-border/70 bg-background/60 p-2.5", children: _jsx(BuilderSetupContent, { layout: "sidebar", onConnected: handleProviderConnected }) })), shouldShowBuilderReconnect && !builderReconnectResolved && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-muted-foreground", children: t("agentChat.recovery.credentialRejected") })), isConnectionRecoveryError && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-muted-foreground", children: t("agentChat.recovery.newChatHint") })), (info.runId || info.errorCode || info.details) && (_jsxs("button", { type: "button", onClick: () => setDetailsOpen((v) => !v), className: "mt-2 inline-flex items-center gap-1 text-[11px] font-medium text-muted-foreground hover:text-foreground", children: [_jsx(IconChevronDown, { size: 12, className: cn("transition-transform", detailsOpen && "rotate-180") }), t("agentChat.common.details")] })), detailsOpen && (_jsxs("div", { className: "mt-2 rounded-md border border-border/60 bg-background/70 p-2 font-mono text-[11px] leading-relaxed text-muted-foreground", children: [info.runId && _jsxs("div", { children: ["run: ", info.runId] }), info.errorCode && _jsxs("div", { children: ["code: ", info.errorCode] }), info.details && (_jsx("pre", { className: "mt-2 max-h-28 overflow-auto whitespace-pre-wrap break-words font-mono", children: info.details }))] }))] }), _jsx("button", { type: "button", onClick: onDismiss, "aria-label": t("agentChat.common.dismiss"), className: "flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-background/80 hover:text-foreground", children: _jsx(IconX, { size: 14 }) })] }), _jsxs("div", { className: "mt-3 flex min-w-0 items-center gap-2", children: [shouldShowBuilderReconnect && !builderReconnectResolved && (_jsxs("button", { type: "button", onClick: () => builderReconnect.start(), disabled: builderReconnect.connecting, className: "inline-flex h-8 items-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90 disabled:cursor-wait disabled:opacity-70", children: [builderReconnect.connecting ? (_jsx(IconLoader2, { size: 13, className: "animate-spin" })) : null, builderReconnect.connecting
                                 ? t("agentChat.recovery.connectingBuilder")
-                                : t("agentChat.recovery.reconnectBuilder")] })), canRecover && (_jsx(_Fragment, { children: _jsxs("button", { type: "button", onClick: onContinue, className: "inline-flex h-8 items-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90", children: [_jsx(IconPlayerPlay, { size: 13 }), t("agentChat.common.continue")] }) })), canRetry && (_jsxs("button", { type: "button", onClick: onRetry, className: "inline-flex h-8 items-center gap-1.5 rounded-md border border-border bg-background px-3 text-xs font-medium text-foreground hover:bg-accent", children: [_jsx(IconRefresh, { size: 13 }), isQueryError
-                                ? t("agentChat.recovery.diagnoseRetry")
-                                : t("agentChat.common.retry")] })), canRecover && isConnectionRecoveryError && (_jsxs("button", { type: "button", onClick: startNewChat, className: "inline-flex h-8 items-center gap-1.5 rounded-md border border-border bg-background px-3 text-xs font-medium text-foreground hover:bg-accent", children: [_jsx(IconPlus, { size: 13 }), t("agentChat.tabs.newChat")] })), canRecover && onFork && !isConnectionRecoveryError && (_jsxs("button", { type: "button", onClick: handleFork, disabled: forking, title: t("agentChat.recovery.forkDescription"), "aria-label": t("agentChat.recovery.forkDescription"), className: "inline-flex h-8 items-center gap-1.5 rounded-md border border-border bg-background px-3 text-xs font-medium text-foreground hover:bg-accent disabled:cursor-wait disabled:opacity-70", children: [forking ? (_jsx(IconLoader2, { size: 13, className: "animate-spin" })) : (_jsx(IconGitFork, { size: 13 })), forking
-                                ? t("agentChat.recovery.forking")
-                                : t("agentChat.message.forkChat")] })), _jsxs("button", { type: "button", onClick: copyDetails, className: "ms-auto inline-flex h-8 items-center gap-1.5 rounded-md px-2.5 text-xs font-medium text-muted-foreground hover:bg-background/80 hover:text-foreground", children: [copyState === "copied" ? (_jsx(IconCheck, { size: 13 })) : copyState === "failed" ? (_jsx(IconX, { size: 13 })) : (_jsx(IconCopy, { size: 13 })), _jsx("span", { "aria-live": "polite", children: copyState === "copied"
+                                : t("agentChat.recovery.reconnectBuilder")] })), canRecover && (_jsxs("button", { type: "button", onClick: onContinue, className: "inline-flex min-w-0 flex-1 items-center justify-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90", children: [_jsx(IconPlayerPlay, { size: 13 }), _jsx("span", { className: "truncate", children: t("agentChat.common.continue") })] })), _jsxs("div", { className: "flex shrink-0 items-center gap-0.5 rounded-md border border-border/70 bg-background/60 p-0.5", children: [canRetry && (_jsx("button", { type: "button", onClick: onRetry, title: isQueryError
+                                    ? t("agentChat.recovery.diagnoseRetry")
+                                    : t("agentChat.common.retry"), "aria-label": isQueryError
+                                    ? t("agentChat.recovery.diagnoseRetry")
+                                    : t("agentChat.common.retry"), className: "inline-flex h-7 w-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(IconRefresh, { size: 14 }) })), canRecover && isConnectionRecoveryError && (_jsx("button", { type: "button", onClick: startNewChat, title: t("agentChat.tabs.newChat"), "aria-label": t("agentChat.tabs.newChat"), className: "inline-flex h-7 w-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(IconPlus, { size: 14 }) })), canRecover && onFork && !isConnectionRecoveryError && (_jsx("button", { type: "button", onClick: handleFork, disabled: forking, title: t("agentChat.recovery.forkDescription"), "aria-label": t("agentChat.recovery.forkDescription"), className: "inline-flex h-7 w-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground disabled:cursor-wait disabled:opacity-70", children: forking ? (_jsx(IconLoader2, { size: 14, className: "animate-spin" })) : (_jsx(IconGitFork, { size: 14 })) })), _jsxs("button", { type: "button", onClick: copyDetails, title: copyState === "copied"
                                     ? t("agentChat.common.copied")
                                     : copyState === "failed"
                                         ? t("agentChat.recovery.copyFailed")
-                                        : copyLabel })] })] }), shouldShowBuilderReconnect && builderReconnect.error && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-red-500", children: builderReconnect.error })), forkError && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-red-500", children: forkError }))] }));
+                                        : copyLabel, "aria-label": copyState === "copied"
+                                    ? t("agentChat.common.copied")
+                                    : copyState === "failed"
+                                        ? t("agentChat.recovery.copyFailed")
+                                        : copyLabel, className: "inline-flex h-7 w-7 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground", children: [copyState === "copied" ? (_jsx(IconCheck, { size: 14 })) : copyState === "failed" ? (_jsx(IconX, { size: 14 })) : (_jsx(IconCopy, { size: 14 })), _jsx("span", { className: "sr-only", "aria-live": "polite", children: copyState === "copied"
+                                            ? t("agentChat.common.copied")
+                                            : copyState === "failed"
+                                                ? t("agentChat.recovery.copyFailed")
+                                                : copyLabel })] })] })] }), shouldShowBuilderReconnect && builderReconnect.error && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-red-500", children: builderReconnect.error })), forkError && (_jsx("p", { className: "mt-2 text-xs leading-relaxed text-red-500", children: forkError }))] }));
 }
 // ─── LoopLimitContinueCard ────────────────────────────────────────────────────
 export function LoopLimitContinueCard({ info, onContinue, }) {

package/dist/client/use-chat-threads.d.ts

@@ -66,7 +66,14 @@ export interface UseChatThreadsOptions {
     routeThreadId?: string | null;
     /** Include connected and other-app chats in list/search results. */
     includeExternal?: boolean;
+    /**
+     * Restrict history to the supplied scope. App-owned chat rails use this to
+     * keep one app's conversations out of another app's history; ordinary
+     * resource scopes intentionally continue to show general chats.
+     */
+    isolateHistoryByScope?: boolean;
 }
+export declare function appendChatThreadScopeParams(params: URLSearchParams, scope?: ChatThreadScope | null): void;
 export declare function useChatThreads(apiUrl?: string, storageKey?: string, scope?: ChatThreadScope | null, options?: UseChatThreadsOptions): {
     threads: ChatThreadSummary[];
     activeThreadId: string | null;

package/dist/client/use-chat-threads.js

@@ -3,12 +3,13 @@ import { agentNativePath } from "./api-path.js";
 const ACTIVE_THREAD_KEY = "agent-chat-active-thread";
 const THREADS_UPDATED_EVENT = "agent-chat:threads-updated";
 const THREADS_PAGE_SIZE = 50;
-async function fetchThreadListPage(apiUrl, offset, includeExternal) {
+async function fetchThreadListPage(apiUrl, offset, includeExternal, scope) {
     const params = new URLSearchParams();
     if (offset > 0)
         params.set("offset", String(offset));
     if (includeExternal)
         params.set("includeExternal", "1");
+    appendChatThreadScopeParams(params, scope);
     const query = params.toString();
     return fetch(`${apiUrl}/threads${query ? `?${query}` : ""}`).then(async (res) => {
         if (!res.ok)
@@ -22,9 +23,12 @@ async function fetchThreadListPage(apiUrl, offset, includeExternal) {
  * the caller must not collapse: the thread (found), `null` (the server denies it
  * exists), and `undefined` (unreachable — nothing was learned).
  */
-async function fetchThreadById(apiUrl, id) {
+async function fetchThreadById(apiUrl, id, scope) {
     try {
-        const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(id)}`);
+        const params = new URLSearchParams();
+        appendChatThreadScopeParams(params, scope);
+        const query = params.toString();
+        const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(id)}${query ? `?${query}` : ""}`);
         if (res.status === 404)
             return null;
         if (!res.ok)
@@ -35,6 +39,20 @@ async function fetchThreadById(apiUrl, id) {
         return undefined;
     }
 }
+export function appendChatThreadScopeParams(params, scope) {
+    if (!scope)
+        return;
+    params.set("scopeType", scope.type);
+    params.set("scopeId", scope.id);
+}
+function withChatThreadScope(url, scope) {
+    const params = new URLSearchParams();
+    appendChatThreadScopeParams(params, scope);
+    const query = params.toString();
+    if (!query)
+        return url;
+    return `${url}${url.includes("?") ? "&" : "?"}${query}`;
+}
 function emitThreadsUpdated() {
     if (typeof window === "undefined")
         return;
@@ -91,6 +109,12 @@ function threadCanStayVisibleInScope(threadScope, currentScope) {
         return true;
     return scopesMatch(threadScope, currentScope);
 }
+function threadCanStayVisibleInHistory(threadScope, currentScope, isolateHistoryByScope = false) {
+    if (!isolateHistoryByScope) {
+        return threadCanStayVisibleInScope(threadScope, currentScope);
+    }
+    return scopesMatch(threadScope, currentScope);
+}
 function nextThreadTitle(currentTitle, incomingTitle, incomingPreview, source = "extracted", options = {}) {
     if (options.preserveUserTitle && currentTitle)
         return currentTitle;
@@ -109,6 +133,12 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
     const autoCreate = options?.autoCreate !== false;
     const restoreActiveThread = options?.restoreActiveThread !== false;
     const includeExternal = options?.includeExternal === true;
+    const isolateHistoryByScope = options?.isolateHistoryByScope === true;
+    const isolateHistory = isolateHistoryByScope && Boolean(scope);
+    const historyScope = useMemo(() => (isolateHistory && scope ? { type: scope.type, id: scope.id } : null), [isolateHistory, scope?.id, scope?.type]);
+    const historyScopeKey = historyScope
+        ? `${historyScope.type}:${historyScope.id}`
+        : null;
     const routeControlsActiveThread = options?.routeThreadId !== undefined;
     const routeThreadId = normalizeThreadId(options?.routeThreadId);
     // Each (storageKey, scope) pair gets its own active-thread localStorage key
@@ -170,6 +200,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         ? new Set([initialActiveThreadRef.current.id])
         : new Set());
     const optimisticThreadScopesRef = useRef(new Map());
+    const knownThreadScopesRef = useRef(new Map());
     const pendingPinnedAtRef = useRef(new Map());
     const pendingArchivedAtRef = useRef(new Map());
     const userRenamedThreadIdsRef = useRef(new Set());
@@ -215,6 +246,9 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         if (optimisticThreadScopesRef.current.has(id)) {
             return optimisticThreadScopesRef.current.get(id) ?? null;
         }
+        if (knownThreadScopesRef.current.has(id)) {
+            return knownThreadScopesRef.current.get(id) ?? null;
+        }
         return undefined;
     }, []);
     // Add a client-generated thread to the local list optimistically.
@@ -290,7 +324,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
                 if (currentThreadScope === undefined) {
                     return;
                 }
-                if (threadCanStayVisibleInScope(currentThreadScope, scopeRef.current)) {
+                if (threadCanStayVisibleInHistory(currentThreadScope, scopeRef.current, isolateHistory)) {
                     persistedKeyRef.current = activeThreadKey;
                     return;
                 }
@@ -308,7 +342,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             if (nextActiveThreadId) {
                 const savedScope = readKnownThreadScope(nextActiveThreadId);
                 if (savedScope !== undefined &&
-                    !threadCanStayVisibleInScope(savedScope, scopeRef.current)) {
+                    !threadCanStayVisibleInHistory(savedScope, scopeRef.current, isolateHistory)) {
                     nextActiveThreadId = null;
                 }
             }
@@ -356,7 +390,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         const requestId = ++latestFetchRequestRef.current;
         try {
             const offset = options?.append ? nextThreadsOffsetRef.current : 0;
-            const loaded = await fetchThreadListPage(apiUrl, offset, includeExternal);
+            const loaded = await fetchThreadListPage(apiUrl, offset, includeExternal, historyScope);
             if (requestId !== latestFetchRequestRef.current)
                 return undefined;
             if (!loaded) {
@@ -365,6 +399,9 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
                 }
                 return;
             }
+            for (const thread of loaded) {
+                knownThreadScopesRef.current.set(thread.id, thread.scope ?? null);
+            }
             setThreadsLoadError(null);
             if (!options?.append) {
                 nextThreadsOffsetRef.current = loaded.length;
@@ -373,8 +410,11 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
                 nextThreadsOffsetRef.current += loaded.length;
             }
             setHasMoreThreads(loaded.length >= THREADS_PAGE_SIZE);
+            const visibleLoaded = isolateHistory
+                ? loaded.filter((thread) => threadCanStayVisibleInHistory(thread.scope, historyScope, isolateHistory))
+                : loaded;
             setThreads((prev) => {
-                const loadedIds = new Set(loaded.map((t) => t.id));
+                const loadedIds = new Set(visibleLoaded.map((t) => t.id));
                 // Preserve any optimistic threads we've created this session that
                 // haven't shown up in the server list yet — the server only learns
                 // about a thread when the user actually sends a message and the
@@ -387,13 +427,15 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
                 // and get preserved forever instead of disappearing once archived.
                 const optimisticOnly = prev.filter((t) => newlyCreatedRef.current.has(t.id) &&
                     !loadedIds.has(t.id) &&
-                    !t.archivedAt);
+                    !t.archivedAt &&
+                    (!isolateHistory ||
+                        threadCanStayVisibleInHistory(t.scope, historyScope, isolateHistory)));
                 // Reconcile each server thread against our local copy. If the local
                 // copy has a newer updatedAt or higher messageCount, keep those
                 // fields — the server probably hasn't observed the user's latest
                 // send yet, and naively replacing makes the recent-chats list
                 // visibly jump back to older timestamps right after a send.
-                const merged = loaded.map((server) => {
+                const merged = visibleLoaded.map((server) => {
                     const local = prev.find((t) => t.id === server.id);
                     if (!local)
                         return server;
@@ -438,7 +480,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
                 }
                 return [...optimisticOnly, ...merged];
             });
-            return loaded;
+            return visibleLoaded;
         }
         catch {
             if (requestId !== latestFetchRequestRef.current)
@@ -448,7 +490,28 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             }
             return undefined;
         }
-    }, [apiUrl, includeExternal]);
+    }, [apiUrl, historyScope, includeExternal, isolateHistory]);
+    const loadedHistoryScopeKeyRef = useRef(historyScopeKey);
+    useEffect(() => {
+        if (loadedHistoryScopeKeyRef.current === historyScopeKey)
+            return;
+        loadedHistoryScopeKeyRef.current = historyScopeKey;
+        if (!isolateHistoryByScope)
+            return;
+        nextThreadsOffsetRef.current = 0;
+        setHasMoreThreads(false);
+        setThreadsLoadError(null);
+        setThreads((prev) => prev.filter((thread) => !isolateHistory ||
+            threadCanStayVisibleInHistory(thread.scope, historyScope, isolateHistory)));
+        setIsLoading(true);
+        void fetchThreads().finally(() => setIsLoading(false));
+    }, [
+        fetchThreads,
+        historyScope,
+        historyScopeKey,
+        isolateHistory,
+        isolateHistoryByScope,
+    ]);
     const loadMoreThreads = useCallback(async () => {
         if (isLoadingMoreThreads || !hasMoreThreads)
             return;
@@ -509,8 +572,11 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             // One page, so absence from it is not absence from the server — this is what
             // separates an older real thread from an unavailable saved id below.
             const restoredThread = lookupRestored && !restoredOnPage
-                ? await fetchThreadById(apiUrl, restoredId)
+                ? await fetchThreadById(apiUrl, restoredId, historyScope)
                 : restoredOnPage;
+            if (restoredThread) {
+                knownThreadScopesRef.current.set(restoredThread.id, restoredThread.scope ?? null);
+            }
             if (restoredThread === undefined && lookupRestored && !restoredOnPage) {
                 // Lookup unreachable. Reclassifying now would stamp this thread with the
                 // current scope on a guess; leave it untouched for the next mount.
@@ -519,7 +585,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             }
             const restoredIsUnavailable = restoredThread === null && lookupRestored && !restoredOnPage;
             const restoredBelongsElsewhere = Boolean(restoredThread &&
-                !threadCanStayVisibleInScope(restoredThread.scope ?? null, scopeRef.current));
+                !threadCanStayVisibleInHistory(restoredThread.scope ?? null, scopeRef.current, isolateHistory));
             // A missing saved id is stale local UI state on a normal home surface,
             // not a reason to show an error above a fresh composer. Preserve it for
             // explicit routes and list-only readers, where the caller still owns
@@ -587,6 +653,8 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         fetchThreads,
         addOptimisticThread,
         autoCreate,
+        historyScope,
+        isolateHistory,
         routeControlsActiveThread,
         routeThreadId,
     ]);
@@ -641,7 +709,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
     // list right away.
     const detachThread = useCallback(async (threadId) => {
         try {
-            const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}`, {
+            const res = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(threadId)}`, historyScope), {
                 method: "PUT",
                 headers: { "Content-Type": "application/json" },
                 body: JSON.stringify({ scope: null }),
@@ -652,14 +720,42 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
                 await fetchThreads();
                 return;
             }
-            setThreads((prev) => prev.map((t) => (t.id === threadId ? { ...t, scope: null } : t)));
+            knownThreadScopesRef.current.set(threadId, null);
             optimisticThreadScopesRef.current.set(threadId, null);
+            const wasActive = activeThreadIdRef.current === threadId;
+            if (isolateHistory) {
+                setThreads((prev) => prev.filter((thread) => thread.id !== threadId &&
+                    threadCanStayVisibleInHistory(thread.scope, historyScope, isolateHistory)));
+                if (wasActive) {
+                    const remaining = threadsRef.current.filter((thread) => thread.id !== threadId &&
+                        threadCanStayVisibleInHistory(thread.scope, historyScope, isolateHistory));
+                    if (remaining.length > 0) {
+                        setActiveThreadId(remaining[0].id);
+                    }
+                    else if (autoCreate) {
+                        void createThread();
+                    }
+                    else {
+                        setActiveThreadId(null);
+                    }
+                }
+            }
+            else {
+                setThreads((prev) => prev.map((t) => (t.id === threadId ? { ...t, scope: null } : t)));
+            }
             emitThreadsUpdated();
         }
         catch {
             await fetchThreads().catch(() => { });
         }
-    }, [apiUrl, fetchThreads]);
+    }, [
+        apiUrl,
+        autoCreate,
+        createThread,
+        fetchThreads,
+        historyScope,
+        isolateHistory,
+    ]);
     const pinThread = useCallback(async (threadId, pinned) => {
         const previousPinnedAt = threadsRef.current.find((t) => t.id === threadId)?.pinnedAt ?? null;
         const previousUpdatedAt = threadsRef.current.find((t) => t.id === threadId)?.updatedAt ?? null;
@@ -680,7 +776,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         };
         setThreads((prev) => prev.map((t) => (t.id === threadId ? { ...t, pinnedAt } : t)));
         try {
-            const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}/pin`, {
+            const res = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(threadId)}/pin`, historyScope), {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
                 body: JSON.stringify({ pinned }),
@@ -701,7 +797,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             await fetchThreads();
             return false;
         }
-    }, [apiUrl, fetchThreads]);
+    }, [apiUrl, fetchThreads, historyScope]);
     const archiveThread = useCallback(async (threadId) => {
         const previousArchivedAt = threadsRef.current.find((t) => t.id === threadId)?.archivedAt ?? null;
         const previousUpdatedAt = threadsRef.current.find((t) => t.id === threadId)?.updatedAt ?? null;
@@ -726,7 +822,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         };
         setThreads((prev) => prev.map((t) => (t.id === threadId ? { ...t, archivedAt } : t)));
         try {
-            const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}/archive`, {
+            const res = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(threadId)}/archive`, historyScope), {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
                 body: JSON.stringify({ archived: true }),
@@ -750,7 +846,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             await fetchThreads();
             return false;
         }
-    }, [apiUrl, fetchThreads]);
+    }, [apiUrl, fetchThreads, historyScope]);
     const renameThread = useCallback(async (threadId, title) => {
         const nextTitle = title.replace(/\s+/g, " ").trim().slice(0, 160);
         if (!nextTitle)
@@ -768,7 +864,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         markUserRenamedThread(threadId);
         setThreads((prev) => prev.map((t) => (t.id === threadId ? { ...t, title: nextTitle } : t)));
         try {
-            const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}/rename`, {
+            const res = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(threadId)}/rename`, historyScope), {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
                 body: JSON.stringify({ title: nextTitle }),
@@ -786,7 +882,13 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             await fetchThreads();
             return false;
         }
-    }, [apiUrl, clearUserRenamedThread, fetchThreads, markUserRenamedThread]);
+    }, [
+        apiUrl,
+        clearUserRenamedThread,
+        fetchThreads,
+        historyScope,
+        markUserRenamedThread,
+    ]);
     const isNewThread = useCallback((id) => newlyCreatedRef.current.has(id), []);
     const switchThread = useCallback((id) => {
         persistActiveThreadId(id);
@@ -794,7 +896,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
     }, [persistActiveThreadId]);
     const removeThread = useCallback(async (id) => {
         try {
-            await fetch(`${apiUrl}/threads/${encodeURIComponent(id)}`, {
+            await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(id)}`, historyScope), {
                 method: "DELETE",
             });
             emitThreadsUpdated();
@@ -816,7 +918,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
                 createThread();
             }
         }
-    }, [apiUrl, clearUserRenamedThread, createThread]);
+    }, [apiUrl, clearUserRenamedThread, createThread, historyScope]);
     // Reads scope through refs so this callback survives every setThreads. Scope
     // rides only on creation: a periodic save must never move an existing thread
     // between resources, however stale this client's guess is.
@@ -828,7 +930,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             const preserveUserTitle = userRenamedThreadIdsRef.current.has(id);
             const title = nextThreadTitle(localThread?.title, data.title, data.preview, titleSource, { preserveUserTitle });
             const payload = { ...threadDataPayload, title };
-            let response = await fetch(`${apiUrl}/threads/${encodeURIComponent(id)}`, {
+            let response = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(id)}`, historyScope), {
                 method: "PUT",
                 headers: { "Content-Type": "application/json" },
                 body: JSON.stringify(payload),
@@ -837,7 +939,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             // client-created thread, so no agent run has created its SQL row yet.
             // Materialize that row idempotently and retry the same full save.
             if (response.status === 404) {
-                const created = await fetch(`${apiUrl}/threads`, {
+                const created = await fetch(withChatThreadScope(`${apiUrl}/threads`, historyScope), {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({
@@ -848,7 +950,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
                 });
                 if (!created.ok)
                     return;
-                response = await fetch(`${apiUrl}/threads/${encodeURIComponent(id)}`, {
+                response = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(id)}`, historyScope), {
                     method: "PUT",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify(payload),
@@ -894,7 +996,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             });
         }
         catch { }
-    }, [apiUrl, readKnownThreadScope]);
+    }, [apiUrl, historyScope, readKnownThreadScope]);
     const generateTitle = useCallback(async (threadId, message) => {
         try {
             const res = await fetch(`${apiUrl}/generate-title`, {
@@ -923,7 +1025,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         const fallbackForkFromSnapshot = async (source) => {
             const title = source.title ? `${source.title} (fork)` : "";
             const createdAt = Date.now();
-            const createRes = await fetch(`${apiUrl}/threads`, {
+            const createRes = await fetch(withChatThreadScope(`${apiUrl}/threads`, historyScope), {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
                 body: JSON.stringify({
@@ -934,7 +1036,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             });
             if (!createRes.ok)
                 return null;
-            const saveRes = await fetch(`${apiUrl}/threads/${encodeURIComponent(id)}`, {
+            const saveRes = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(id)}`, historyScope), {
                 method: "PUT",
                 headers: { "Content-Type": "application/json" },
                 body: JSON.stringify({
@@ -962,7 +1064,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             const source = sourceSnapshot && sourceSnapshot.messageCount > 0
                 ? { ...sourceSnapshot, scope: localScope }
                 : undefined;
-            const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(sourceId)}/fork`, {
+            const res = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(sourceId)}/fork`, historyScope), {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
                 body: JSON.stringify({ id, ...(source ? { source } : {}) }),
@@ -1003,25 +1105,27 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
             console.error(`[chat] fork threw for ${sourceId}:`, err);
             return null;
         }
-    }, [apiUrl]);
+    }, [apiUrl, historyScope]);
     const searchThreads = useCallback(async (query) => {
         try {
             const params = new URLSearchParams({ q: query });
             if (includeExternal)
                 params.set("includeExternal", "1");
+            appendChatThreadScopeParams(params, historyScope);
             const res = await fetch(`${apiUrl}/threads?${params.toString()}`);
             if (!res.ok)
                 return [];
             const data = await res.json();
-            return data.threads ?? [];
+            return (data.threads ?? []).filter((thread) => !isolateHistory ||
+                threadCanStayVisibleInHistory(thread.scope, historyScope, isolateHistory));
         }
         catch {
             return [];
         }
-    }, [apiUrl, includeExternal]);
+    }, [apiUrl, historyScope, includeExternal, isolateHistory]);
     const getThreadShareState = useCallback(async (threadId) => {
         try {
-            const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}/share`);
+            const res = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(threadId)}/share`, historyScope));
             if (!res.ok)
                 return null;
             const data = await res.json();
@@ -1030,10 +1134,10 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         catch {
             return null;
         }
-    }, [apiUrl]);
+    }, [apiUrl, historyScope]);
     const createThreadShareLink = useCallback(async (threadId) => {
         try {
-            const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}/share`, { method: "POST" });
+            const res = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(threadId)}/share`, historyScope), { method: "POST" });
             if (!res.ok)
                 return null;
             const data = await res.json();
@@ -1044,10 +1148,10 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         catch {
             return null;
         }
-    }, [apiUrl]);
+    }, [apiUrl, historyScope]);
     const revokeThreadShareLink = useCallback(async (threadId) => {
         try {
-            const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}/share`, { method: "DELETE" });
+            const res = await fetch(withChatThreadScope(`${apiUrl}/threads/${encodeURIComponent(threadId)}/share`, historyScope), { method: "DELETE" });
             if (!res.ok)
                 return null;
             const data = await res.json();
@@ -1056,7 +1160,7 @@ export function useChatThreads(apiUrl = agentNativePath("/_agent-native/agent-ch
         catch {
             return null;
         }
-    }, [apiUrl]);
+    }, [apiUrl, historyScope]);
     const refreshThreads = useCallback(() => {
         fetchThreads();
     }, [fetchThreads]);

package/dist/collab/awareness.d.ts

@@ -62,11 +62,11 @@ export declare const postAwareness: import("h3").EventHandlerWithFetch<import("h
     error: string;
     states?: undefined;
 } | {
+    error?: undefined;
     states: {
         clientId: number;
         state: string;
     }[];
-    error?: undefined;
 }>>;
 /**
  * GET /_agent-native/collab/:docId/users
@@ -77,9 +77,9 @@ export declare const getActiveUsers: import("h3").EventHandlerWithFetch<import("
     error: string;
     users?: undefined;
 } | {
+    error?: undefined;
     users: {
         clientId: number;
         lastSeen: number;
     }[];
-    error?: undefined;
 }>>;

package/dist/collab/struct-routes.d.ts

@@ -13,8 +13,8 @@
  * Body: { json: any, fieldName?: string, type?: "map"|"array", requestSource?: string }
  */
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/deploy/build.d.ts

@@ -101,6 +101,11 @@ export declare function isDurableBackgroundDeployEnabled(): boolean;
 export declare const NETLIFY_INTEGRATION_RECOVERY_FUNCTION_NAME = "server-integration-recovery";
 export declare function isIntegrationDurableDispatchDeployEnabled(): boolean;
 export declare const NETLIFY_RECURRING_JOBS_FUNCTION_NAME = "agent-native-recurring-jobs";
+/**
+ * Routed through the same resolver that produces the runtime marker, so the gate
+ * that emits the scheduled function and the value the deployed app reports
+ * cannot drift: a build that skips the emit always ships `"disabled"`.
+ */
 export declare function isRecurringJobsDeployEnabled(): boolean;
 /**
  * Keep-warm is opt-in because a once-a-minute wake prevents autosuspend on