@agent-native/core 0.0.0-beta-20260820222620 → 0.0.0-beta-20260820224008

package/dist/chat-threads/store.d.ts

@@ -26,6 +26,13 @@ export interface ChatThreadScope {
     id: string;
     label?: string;
 }
+export declare function isAppOwnedChatScope(scope?: ChatThreadScope | null): boolean;
+/**
+ * A scoped rail may claim a legacy unscoped thread on its first write, but
+ * once a thread has a scope, a non-null incoming scope must match it. App-
+ * owned threads additionally require a scope on every subsequent write.
+ */
+export declare function threadScopeMismatch(existing?: ChatThreadScope | null, incoming?: ChatThreadScope | null): boolean;
 export interface ChatThreadSource {
     platform?: string | null;
     appId?: string | null;

package/dist/chat-threads/store.js

@@ -241,6 +241,21 @@ export async function repairLegacyChatThreadMessageCounts(options = {}) {
 function generateId() {
     return `thread-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
 }
+export function isAppOwnedChatScope(scope) {
+    return scope?.type === "workspace-app" || scope?.type === "desktop-app";
+}
+/**
+ * A scoped rail may claim a legacy unscoped thread on its first write, but
+ * once a thread has a scope, a non-null incoming scope must match it. App-
+ * owned threads additionally require a scope on every subsequent write.
+ */
+export function threadScopeMismatch(existing, incoming) {
+    if (!existing)
+        return false;
+    if (!incoming)
+        return isAppOwnedChatScope(existing);
+    return existing.type !== incoming.type || existing.id !== incoming.id;
+}
 function readScope(r) {
     const type = r.scope_type;
     const id = r.scope_id;

package/dist/client/AgentPanel.d.ts

@@ -107,6 +107,8 @@ export interface AgentPanelProps extends Omit<AssistantChatProps, "onSwitchToCli
     restoreActiveThread?: boolean;
     /** Ambient resource context rendered as a composer chip. */
     scope?: import("./use-chat-threads.js").ChatThreadScope | null;
+    /** Keep app-owned chat history isolated to the supplied scope. */
+    isolateHistoryByScope?: boolean;
     /** @deprecated Scope context now appears inside the composer. */
     showScopeBadge?: MultiTabAssistantChatProps["showScopeBadge"];
     /** Stable browser tab id used for tab-scoped app-state context. */
@@ -239,6 +241,8 @@ export interface AgentSidebarProps {
     onFullscreenRequest?: () => void;
     /** Ambient resource context rendered as a composer chip. */
     scope?: import("./use-chat-threads.js").ChatThreadScope | null;
+    /** Keep app-owned chat history isolated to the supplied scope. */
+    isolateHistoryByScope?: boolean;
     /** @deprecated Scope context now appears inside the composer. */
     showScopeBadge?: MultiTabAssistantChatProps["showScopeBadge"];
     /** Stable browser tab id used for tab-scoped app-state context. */
@@ -254,7 +258,7 @@ export interface AgentSidebarProps {
  * Wraps app content with a toggleable agent sidebar.
  * Use AgentToggleButton in your header to open/close it.
  */
-export declare function AgentSidebar({ children, emptyStateText, suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, availableAgents, availableModels, modelListLoading, selectedAgent, onAgentChange, onConnectLocalRuntime, runtime, adapterReloadKey, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position, defaultOpen, animateMobile, animateDesktop, chatViewTransition, chatViewTransitionHandoff, storageKey, openStorageKey, apiUrl, agentChatSurface, desktopIdentityUnauthenticated, desktopIdentityAuthenticated, showTabBar, suppressInlineOpenApp, composerPlaceholder, openOnChatRunning, onFullscreenRequest, scope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, suppressFirstRunOnboarding, }: AgentSidebarProps): React.JSX.Element;
+export declare function AgentSidebar({ children, emptyStateText, suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, availableAgents, availableModels, modelListLoading, selectedAgent, onAgentChange, onConnectLocalRuntime, runtime, adapterReloadKey, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position, defaultOpen, animateMobile, animateDesktop, chatViewTransition, chatViewTransitionHandoff, storageKey, openStorageKey, apiUrl, agentChatSurface, desktopIdentityUnauthenticated, desktopIdentityAuthenticated, showTabBar, suppressInlineOpenApp, composerPlaceholder, openOnChatRunning, onFullscreenRequest, scope, isolateHistoryByScope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, suppressFirstRunOnboarding, }: AgentSidebarProps): React.JSX.Element;
 /**
  * Focus the agent chat composer input.
  * Opens the sidebar if closed, then focuses the text input.

package/dist/client/AgentPanel.js

@@ -436,7 +436,7 @@ function CodeAccessUnavailablePanel({ title, description, ctaLabel, ctaHref, sec
                             });
                         }, className: "inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-xs font-medium text-foreground hover:bg-accent", children: secondaryCtaLabel })] })] }));
 }
-function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, emptyStateText, emptyStateAddon, suggestions, dynamicSuggestions, showHeader = true, onCollapse, isFullscreen, onToggleFullscreen, onFullViewRequest, onSnapTo75Percent, isWideDrawer, onExitWideDrawer, devAppUrl, storageKey, restoreActiveThread = true, scope, showScopeBadge, browserTabId, threadUrlSync, chatNotice, showTabBar = true, showPageNewChatButton = false, allowSettingsMode = true, chatOnly = false, agentPageHref, codeAccess, ...assistantChatProps }) {
+function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, emptyStateText, emptyStateAddon, suggestions, dynamicSuggestions, showHeader = true, onCollapse, isFullscreen, onToggleFullscreen, onFullViewRequest, onSnapTo75Percent, isWideDrawer, onExitWideDrawer, devAppUrl, storageKey, restoreActiveThread = true, scope, isolateHistoryByScope = false, showScopeBadge, browserTabId, threadUrlSync, chatNotice, showTabBar = true, showPageNewChatButton = false, allowSettingsMode = true, chatOnly = false, agentPageHref, codeAccess, ...assistantChatProps }) {
     const t = useT();
     const navigate = useNavigate();
     const location = useLocation();
@@ -838,7 +838,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                                     const isActive = tab.id === activeTabId ||
                                         (tab.id === focusParentId &&
                                             activeTab?.parentThreadId === tab.id);
-                                    return (_jsxs("div", { role: "button", tabIndex: 0, ref: isActive ? activeTabRefCb : undefined, onClick: () => setActiveTabId(tab.id), onKeyDown: activateOnKeyDown(() => setActiveTabId(tab.id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer max-w-[150px]", isActive
+                                    return (_jsxs("div", { role: "button", tabIndex: 0, ref: isActive ? activeTabRefCb : undefined, onClick: () => setActiveTabId(tab.id), onKeyDown: activateOnKeyDown(() => setActiveTabId(tab.id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer min-w-[56px] max-w-[150px]", isActive
                                             ? "bg-accent text-foreground"
                                             : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsx("span", { className: "truncate pe-1", children: tab.label }), tab.status === "running" && (_jsx("span", { className: "h-1.5 w-1.5 shrink-0 rounded-full bg-muted-foreground/50 animate-pulse" })), _jsx("button", { type: "button", "aria-label": t("agentPanel.closeTab"), onClick: (e) => {
                                                     e.stopPropagation();
@@ -881,7 +881,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                                                 const isActive = tab.id === activeTabId ||
                                                     (tab.id === focusParentId &&
                                                         activeTab?.parentThreadId === tab.id);
-                                                return (_jsxs("div", { role: "button", tabIndex: 0, ref: isActive ? activeTabRefCb : undefined, onClick: () => setActiveTabId(tab.id), onKeyDown: activateOnKeyDown(() => setActiveTabId(tab.id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer max-w-[150px]", isActive
+                                                return (_jsxs("div", { role: "button", tabIndex: 0, ref: isActive ? activeTabRefCb : undefined, onClick: () => setActiveTabId(tab.id), onKeyDown: activateOnKeyDown(() => setActiveTabId(tab.id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer min-w-[56px] max-w-[150px]", isActive
                                                         ? "bg-accent text-foreground"
                                                         : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsx("span", { className: "truncate pe-1", children: tab.label }), tab.status === "running" && (_jsx("span", { className: "h-1.5 w-1.5 shrink-0 rounded-full bg-muted-foreground/50 animate-pulse" })), _jsx("button", { type: "button", "aria-label": t("agentPanel.closeTab"), onClick: (e) => {
                                                                 e.stopPropagation();
@@ -899,7 +899,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                                             })
                                             : cliTabs.map((id, i) => (_jsxs("div", { role: "button", tabIndex: 0, ref: id === activeCliTab
                                                     ? activeTabRefCb
-                                                    : undefined, onClick: () => setActiveCliTab(id), onKeyDown: activateOnKeyDown(() => setActiveCliTab(id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer", id === activeCliTab
+                                                    : undefined, onClick: () => setActiveCliTab(id), onKeyDown: activateOnKeyDown(() => setActiveCliTab(id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2.5 py-1.5 text-[11px] font-medium cursor-pointer min-w-[56px]", id === activeCliTab
                                                     ? "bg-accent text-foreground"
                                                     : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsxs("span", { children: ["Terminal ", i + 1] }), _jsx("button", { type: "button", "aria-label": t("agentPanel.closeTab"), onClick: (e) => {
                                                             e.stopPropagation();
@@ -917,7 +917,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                                                     ? "bg-accent text-foreground"
                                                     : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: "Main" }), childTabs.map((tab) => (_jsxs("div", { role: "button", tabIndex: 0, ref: tab.id === activeTabId
                                                     ? activeTabRefCb
-                                                    : undefined, onClick: () => setActiveTabId(tab.id), onKeyDown: activateOnKeyDown(() => setActiveTabId(tab.id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2 py-1 text-[10px] font-medium cursor-pointer max-w-[140px]", tab.id === activeTabId
+                                                    : undefined, onClick: () => setActiveTabId(tab.id), onKeyDown: activateOnKeyDown(() => setActiveTabId(tab.id)), className: cn("agent-tab relative flex shrink-0 items-center gap-1 rounded-md px-2 py-1 text-[10px] font-medium cursor-pointer min-w-[48px] max-w-[140px]", tab.id === activeTabId
                                                     ? "bg-accent text-foreground"
                                                     : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsx("span", { className: "truncate pe-1", children: tab.subAgentName || tab.label }), tab.status === "running" && (_jsx("span", { className: "h-1 w-1 shrink-0 rounded-full bg-muted-foreground/50 animate-pulse" })), _jsx("button", { type: "button", "aria-label": t("agentPanel.closeTab"), onClick: (e) => {
                                                             e.stopPropagation();
@@ -981,7 +981,7 @@ function AgentPanelInner({ defaultMode = "chat", className, style, apiUrl, empty
                         `margin-left:auto;margin-right:auto;width:100%;}`,
                 } }), SHOW_ONBOARDING && mounted && (_jsx(Suspense, { fallback: null, children: _jsx(OnboardingPanel, {}) })), showFirstRunOnboarding && mounted && !insideAgentSidebar && (_jsx(Suspense, { fallback: null, children: _jsx(FirstRunOnboarding, {}) })), _jsx("div", { className: cn("flex flex-col min-h-0", mode === "chat" ? "flex-1" : "shrink-0"), children: mounted && (_jsx(Suspense, { fallback: _jsx(ChatLoadingSkeleton, { renderHeader: showHeader ? renderChatHeader : undefined, centerComposerWhenEmpty: assistantChatProps.centerComposerWhenEmpty, composerSlot: assistantChatProps.composerSlot, composerAreaClassName: assistantChatProps.composerAreaClassName, composerLayoutVariant: assistantChatProps.composerLayoutVariant }), children: _jsx(MultiTabAssistantChatLazy, { ...assistantChatProps, agentChatSurface: effectiveAgentChatSurface, apiUrl: apiUrl, showHeader: false, renderHeader: showHeader ? renderChatHeader : undefined, showTabBar: showTabBar, renderOverlay: showPageNewChatButton && !showHeader
                             ? renderPageChatOverlay
-                            : undefined, contentHidden: mode !== "chat", emptyStateText: emptyStateText, emptyStateAddon: emptyStateAddon, suggestions: suggestions, dynamicSuggestions: dynamicSuggestions, onSwitchToCli: () => switchMode("cli"), execMode: execMode, onExecModeChange: switchExecMode, storageKey: storageKey, restoreActiveThread: restoreActiveThread, scope: scope, showScopeBadge: showScopeBadge, browserTabId: browserTabId, threadUrlSync: threadUrlSync }) })) }), canUseCodeTools
+                            : undefined, contentHidden: mode !== "chat", emptyStateText: emptyStateText, emptyStateAddon: emptyStateAddon, suggestions: suggestions, dynamicSuggestions: dynamicSuggestions, onSwitchToCli: () => switchMode("cli"), execMode: execMode, onExecModeChange: switchExecMode, storageKey: storageKey, restoreActiveThread: restoreActiveThread, scope: scope, isolateHistoryByScope: isolateHistoryByScope, showScopeBadge: showScopeBadge, browserTabId: browserTabId, threadUrlSync: threadUrlSync }) })) }), canUseCodeTools
                 ? mode === "cli" &&
                     cliTabs.map((id) => (_jsx("div", { className: "min-h-0 relative flex-1", style: {
                             display: id === activeCliTab ? undefined : "none",
@@ -1418,7 +1418,7 @@ export function AgentChatSurface({ mode = "panel", className, defaultMode = "cha
  * Wraps app content with a toggleable agent sidebar.
  * Use AgentToggleButton in your header to open/close it.
  */
-export function AgentSidebar({ children, emptyStateText = "How can I help you?", suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, availableAgents, availableModels, modelListLoading, selectedAgent, onAgentChange, onConnectLocalRuntime, runtime, adapterReloadKey, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position = "right", defaultOpen = false, animateMobile = true, animateDesktop = true, chatViewTransition = false, chatViewTransitionHandoff = false, storageKey, openStorageKey, apiUrl, agentChatSurface, desktopIdentityUnauthenticated, desktopIdentityAuthenticated, showTabBar = true, suppressInlineOpenApp, composerPlaceholder, openOnChatRunning = false, onFullscreenRequest, scope, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, suppressFirstRunOnboarding = false, }) {
+export function AgentSidebar({ children, emptyStateText = "How can I help you?", suggestions, dynamicSuggestions, composerToolbarSlot, composerSlot, onComposerTextChange, imageModelMenu, availableAgents, availableModels, modelListLoading, selectedAgent, onAgentChange, onConnectLocalRuntime, runtime, adapterReloadKey, threadFooterSlot, defaultSidebarWidth, sidebarWidth, position = "right", defaultOpen = false, animateMobile = true, animateDesktop = true, chatViewTransition = false, chatViewTransitionHandoff = false, storageKey, openStorageKey, apiUrl, agentChatSurface, desktopIdentityUnauthenticated, desktopIdentityAuthenticated, showTabBar = true, suppressInlineOpenApp, composerPlaceholder, openOnChatRunning = false, onFullscreenRequest, scope, isolateHistoryByScope = false, showScopeBadge, browserTabId, threadUrlSync, agentPageHref, suppressFirstRunOnboarding = false, }) {
     const staticHostedHarnessEnabled = isHostedHarnessConfigured(injectedAgentNativeConfig().harness);
     const hostedHarnessQuery = useActionQuery("get-hosted-harness-config", undefined, { enabled: staticHostedHarnessEnabled });
     const hostedHarnessStatus = hostedHarnessQuery.data;
@@ -2059,7 +2059,7 @@ export function AgentSidebar({ children, emptyStateText = "How can I help you?",
                             ? "desktop"
                             : undefined, "data-agent-sidebar-layout": panelLayout, "data-agent-sidebar-position": effectivePosition, "data-agent-native-hosted-harness-ui": hostedHarnessUi ? "desktop" : undefined, "data-agent-sidebar-state": panelOpen ? "open" : "closed", "data-agent-sidebar-per-app-chat": isPerAppChatSidebar ? "true" : undefined, "data-agent-sidebar-resizing": isResizing ? "true" : undefined, "data-agent-sidebar-chat-handoff": chatViewTransitionHandoff ? "true" : undefined, style: chatViewTransition
                     ? getAgentChatViewTransitionStyle(panelStyle)
-                    : panelStyle, inert: sidebarAnimationEnabled && !panelOpen ? true : undefined, "aria-hidden": sidebarAnimationEnabled && !panelOpen ? true : undefined, children: _jsx("div", { className: "agent-sidebar-panel-inner flex min-h-0 flex-1 flex-col", children: _jsx(AgentPanel, { emptyStateText: emptyStateText, suggestions: suggestions, dynamicSuggestions: dynamicSuggestions, composerToolbarSlot: composerToolbarSlot, composerSlot: composerSlot, onComposerTextChange: onComposerTextChange, imageModelMenu: imageModelMenu, availableAgents: effectiveAvailableAgents, availableModels: availableModels, modelListLoading: modelListLoading, selectedAgent: effectiveSelectedAgent, onAgentChange: effectiveOnAgentChange, hostedHarness: hostedHarnessEnabled, onConnectLocalRuntime: onConnectLocalRuntime, runtime: runtime, adapterReloadKey: adapterReloadKey, threadFooterSlot: threadFooterSlot, apiUrl: apiUrl, agentChatSurface: agentChatSurface, desktopIdentityUnauthenticated: desktopIdentityUnauthenticated, desktopIdentityAuthenticated: desktopIdentityAuthenticated, showTabBar: effectiveShowTabBar, suppressInlineOpenApp: suppressInlineOpenApp, composerPlaceholder: composerPlaceholder, missingApiKeySetupLayout: "sidebar", onCollapse: () => setOpenPersisted(false), onSnapTo75Percent: isMobile ? undefined : snapTo75Percent, isWideDrawer: isMobile ? false : isWideDrawer, onExitWideDrawer: isMobile ? undefined : exitWideDrawer, onFullViewRequest: onFullscreenRequest, storageKey: storageKey, scope: scope, showScopeBadge: showScopeBadge, browserTabId: browserTabId, threadUrlSync: threadUrlSync, agentPageHref: agentPageHref, allowSettingsMode: false, chatOnly: true }) }) }), showResizeHandle && isLeft && (_jsx(ResizeHandle, { position: effectivePosition, onDrag: handleDrag, onResizeStart: handleResizeStart, onResizeEnd: handleResizeEnd }))] })) : null;
+                    : panelStyle, inert: sidebarAnimationEnabled && !panelOpen ? true : undefined, "aria-hidden": sidebarAnimationEnabled && !panelOpen ? true : undefined, children: _jsx("div", { className: "agent-sidebar-panel-inner flex min-h-0 flex-1 flex-col", children: _jsx(AgentPanel, { emptyStateText: emptyStateText, suggestions: suggestions, dynamicSuggestions: dynamicSuggestions, composerToolbarSlot: composerToolbarSlot, composerSlot: composerSlot, onComposerTextChange: onComposerTextChange, imageModelMenu: imageModelMenu, availableAgents: effectiveAvailableAgents, availableModels: availableModels, modelListLoading: modelListLoading, selectedAgent: effectiveSelectedAgent, onAgentChange: effectiveOnAgentChange, hostedHarness: hostedHarnessEnabled, onConnectLocalRuntime: onConnectLocalRuntime, runtime: runtime, adapterReloadKey: adapterReloadKey, threadFooterSlot: threadFooterSlot, apiUrl: apiUrl, agentChatSurface: agentChatSurface, desktopIdentityUnauthenticated: desktopIdentityUnauthenticated, desktopIdentityAuthenticated: desktopIdentityAuthenticated, showTabBar: effectiveShowTabBar, suppressInlineOpenApp: suppressInlineOpenApp, composerPlaceholder: composerPlaceholder, missingApiKeySetupLayout: "sidebar", onCollapse: () => setOpenPersisted(false), onSnapTo75Percent: isMobile ? undefined : snapTo75Percent, isWideDrawer: isMobile ? false : isWideDrawer, onExitWideDrawer: isMobile ? undefined : exitWideDrawer, onFullViewRequest: onFullscreenRequest, storageKey: storageKey, scope: scope, isolateHistoryByScope: isolateHistoryByScope, showScopeBadge: showScopeBadge, browserTabId: browserTabId, threadUrlSync: threadUrlSync, agentPageHref: agentPageHref, allowSettingsMode: false, chatOnly: true }) }) }), showResizeHandle && isLeft && (_jsx(ResizeHandle, { position: effectivePosition, onDrag: handleDrag, onResizeStart: handleResizeStart, onResizeEnd: handleResizeEnd }))] })) : null;
     const drawerPlaceholder = wideDrawerEnabled && !presentationMode && panelOpen ? (_jsx("div", { "aria-hidden": "true", className: "agent-sidebar-drawer-placeholder shrink-0", "data-agent-sidebar-placeholder": "true", style: { width: drawerPlaceholderWidth + 1 } })) : null;
     return (_jsx(AgentSidebarOnboardingContext.Provider, { value: true, children: _jsxs(RealtimeVoiceModeProvider, { browserTabId: browserTabId, children: [showFirstRunOnboarding && (_jsx(Suspense, { fallback: null, children: _jsx(FirstRunOnboarding, {}) })), _jsxs("div", { className: "agent-sidebar-shell flex min-w-0 flex-1 h-screen overflow-hidden", "data-agent-sidebar-position": effectivePosition, "data-agent-native-hosted-harness-ui": hostedHarnessUi ? "desktop" : undefined, "data-agent-native-hosted-chat": isPerAppChatHosted ? "true" : undefined, "data-agent-sidebar-resizing": isResizing ? "true" : undefined, children: [isMobile &&
                             !isPerAppChatHosted &&

package/dist/client/AssistantChat.d.ts

@@ -11,7 +11,7 @@ import { type AgentChatRuntime } from "./chat/runtime.js";
 import { type AgentComposerLayoutVariant, type ComposerSubmitIntent, type Reference } from "./composer/index.js";
 import { type AgentDynamicSuggestionsOption } from "./dynamic-suggestions.js";
 import { type ContentPart } from "./sse-event-processor.js";
-import type { ChatThreadScope, ChatThreadSnapshot } from "./use-chat-threads.js";
+import { type ChatThreadScope, type ChatThreadSnapshot } from "./use-chat-threads.js";
 export { AssistantMessageListErrorBoundary, AssistantUiStaleIndexErrorBoundary, assistantUiRecoverableRenderErrorKind, isAssistantUiRecoverableRenderError, isAssistantUiStaleIndexError, } from "./assistant-ui-recovery.js";
 export { displayableUserMessageText } from "./chat/message-components.js";
 export declare function shouldSuppressUnauthenticatedDesktopThreadRestore(surface: AgentChatSurfaceKind, status: number, desktopIdentityUnauthenticated?: boolean): boolean;
@@ -269,6 +269,8 @@ export interface AssistantChatProps {
     threadId?: string;
     /** Resource scope to include with chat requests for server-side context. */
     contextScope?: ChatThreadScope | null;
+    /** Restrict server-side thread restores to the supplied app scope. */
+    isolateHistoryByScope?: boolean;
     /** Namespace used to hide ambient composer context from other host surfaces. */
     contextNamespace?: string;
     /** Whether this chat owns the active visible composer context snapshot. */

package/dist/client/AssistantChat.js

@@ -39,6 +39,7 @@ import { McpConnectionSuggestion } from "./resources/McpConnectionSuggestion.js"
 import { claimRunStream, createRunStreamToken, ownsRunStream, releaseRunStream, } from "./run-stream-ownership.js";
 import { AgentAutoContinueSignal, readSSEStreamRaw, settleInterruptedToolCalls, } from "./sse-event-processor.js";
 import { useAgentEngineConfigured } from "./use-agent-engine-configured.js";
+import { appendChatThreadScopeParams, } from "./use-chat-threads.js";
 import { useDevMode } from "./use-dev-mode.js";
 import { useRunStuckDetection } from "./use-run-stuck-detection.js";
 import { cn } from "./utils.js";
@@ -1386,7 +1387,7 @@ function approvalResolutionIdentity(approvalKey, toolCallId,
 askId) {
     return `${toolCallId ?? ""}\u0000${approvalKey}\u0000${askId ?? ""}`;
 }
-const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateText, suggestions, dynamicSuggestions, threadFooterSlot, emptyStateAddon, showHeader = true, onSwitchToCli, className, apiUrl, tabId, browserTabId, threadId, contextScope, contextNamespace, isActiveComposer = true, onMessageCountChange, onSaveThread, onGenerateTitle, composerSlot, onComposerTextChange, composerAreaClassName, composerPlaceholder, missingApiKeySetupLayout = "default", composerLayoutVariant = "default", centerComposerWhenEmpty = false, emptyStateDisplay = "default", composerToolbarSlot, composerExtraActionButton, showModelSelector = true, composerDisabled = false, composerDisabledPlaceholder, isNewThread, isThreadStateLoading, onSlashCommand, execMode, onExecModeChange, approvalActions, planModeDisabled, planModeDisabledReason, selectedModel, defaultModel, selectedEngine, selectedEffort, availableModels, modelListLoading, onModelChange, onEffortChange, availableAgents, selectedAgent, hostedHarness, onAgentChange, imageModelMenu, onForkChat, onConnectProvider, onConnectLocalRuntime, plusMenuMode = "full", providerStatusChecksEnabled = true, loadHistoryRepository, historyReloadKey, externalStreaming = false, agentChatSurface = "app", desktopIdentityUnauthenticated = false, desktopIdentityAuthenticated = false, suppressInlineOpenApp = false, }, ref) {
+const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateText, suggestions, dynamicSuggestions, threadFooterSlot, emptyStateAddon, showHeader = true, onSwitchToCli, className, apiUrl, tabId, browserTabId, threadId, contextScope, isolateHistoryByScope = false, contextNamespace, isActiveComposer = true, onMessageCountChange, onSaveThread, onGenerateTitle, composerSlot, onComposerTextChange, composerAreaClassName, composerPlaceholder, missingApiKeySetupLayout = "default", composerLayoutVariant = "default", centerComposerWhenEmpty = false, emptyStateDisplay = "default", composerToolbarSlot, composerExtraActionButton, showModelSelector = true, composerDisabled = false, composerDisabledPlaceholder, isNewThread, isThreadStateLoading, onSlashCommand, execMode, onExecModeChange, approvalActions, planModeDisabled, planModeDisabledReason, selectedModel, defaultModel, selectedEngine, selectedEffort, availableModels, modelListLoading, onModelChange, onEffortChange, availableAgents, selectedAgent, hostedHarness, onAgentChange, imageModelMenu, onForkChat, onConnectProvider, onConnectLocalRuntime, plusMenuMode = "full", providerStatusChecksEnabled = true, loadHistoryRepository, historyReloadKey, externalStreaming = false, agentChatSurface = "app", desktopIdentityUnauthenticated = false, desktopIdentityAuthenticated = false, suppressInlineOpenApp = false, }, ref) {
     const t = useT();
     const thread = useThread();
     const threadRuntime = useThreadRuntime();
@@ -1418,6 +1419,14 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         enabled: messages.length === 0,
     });
     const messageListResetKey = useMemo(() => assistantUiMessageListStructureKey(messages), [messages]);
+    const threadScopeQuery = useMemo(() => {
+        if (!isolateHistoryByScope || !contextScope)
+            return "";
+        const params = new URLSearchParams();
+        appendChatThreadScopeParams(params, contextScope);
+        const query = params.toString();
+        return query ? `?${query}` : "";
+    }, [contextScope?.id, contextScope?.type, isolateHistoryByScope]);
     // Chat-wide drag-and-drop: users expect to drop a file anywhere on the agent
     // sidebar (thread, header, composer) and have it attach — same as ChatGPT,
     // Claude.ai, Linear, Slack, etc. Tiptap's own `handleDrop` only fires inside
@@ -1989,7 +1998,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             ? setTimeout(() => ownAbort.abort(), getPollAbortMs(2000))
             : null;
         try {
-            const refreshRes = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}`, { signal: signal ?? ownAbort?.signal });
+            const refreshRes = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}${threadScopeQuery}`, { signal: signal ?? ownAbort?.signal });
             if (!refreshRes.ok)
                 return null;
             const refreshData = await refreshRes.json();
@@ -2006,7 +2015,13 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             if (ownAbortTimer)
                 clearTimeout(ownAbortTimer);
         }
-    }, [apiUrl, importThreadData, loadHistoryRepository, threadId]);
+    }, [
+        apiUrl,
+        importThreadData,
+        loadHistoryRepository,
+        threadId,
+        threadScopeQuery,
+    ]);
     const exportCleanThreadRepo = useCallback(() => ensureMessageMetadata(normalizeThreadRepository(threadRuntime.export())), [threadRuntime]);
     const exportPersistableThreadRepo = useCallback(() => withLastAssistantRunDuration(exportCleanThreadRepo(), showRunningInUI ? null : lastChatRunDurationMs), [exportCleanThreadRepo, lastChatRunDurationMs, showRunningInUI]);
     useEffect(() => {
@@ -2698,7 +2713,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             (async () => {
                 let canReconnect = false;
                 try {
-                    const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}`);
+                    const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}${threadScopeQuery}`);
                     if (!res.ok) {
                         if (!cancelled) {
                             setThreadRestoreError(shouldSuppressUnauthenticatedDesktopThreadRestore(agentChatSurface, res.status, desktopIdentityUnauthenticated)
@@ -2811,6 +2826,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         isThreadStateLoading,
         desktopIdentityUnauthenticated,
         restoreAttempt,
+        threadScopeQuery,
     ]);
     useEffect(() => {
         if (!loadHistoryRepository ||
@@ -2992,7 +3008,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         const timer = setTimeout(() => {
             (async () => {
                 try {
-                    const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}/queued`, {
+                    const res = await fetch(`${apiUrl}/threads/${encodeURIComponent(threadId)}/queued${threadScopeQuery}`, {
                         method: "POST",
                         headers: { "Content-Type": "application/json" },
                         body: JSON.stringify({ queuedMessages }),
@@ -3010,7 +3026,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             })();
         }, 300);
         return () => clearTimeout(timer);
-    }, [queuedMessages, threadId, apiUrl]);
+    }, [queuedMessages, threadId, apiUrl, threadScopeQuery]);
     // Nudge the shared hook to re-check after a Builder connect.
     const handleBuilderConnected = useCallback(() => {
         focusComposerAfterConnectRef.current = true;

package/dist/client/MultiTabAssistantChat.d.ts

@@ -64,9 +64,11 @@ export type MultiTabAssistantChatProps = Omit<AssistantChatProps, "tabId" | "thr
     threadUrlSync?: boolean | ChatThreadUrlSyncOptions;
     /** Ambient resource context to show as a composer chip. */
     scope?: ChatThreadScope | null;
+    /** Keep app-owned chat history isolated to the supplied scope. */
+    isolateHistoryByScope?: boolean;
     /** @deprecated Scope context is now rendered in the composer. */
     showScopeBadge?: boolean;
     /** Cadence for hydrating agent-team sub-agent tab status. Default: 3000. */
     agentTeamPollMs?: number;
 };
-export declare function MultiTabAssistantChat({ showTabBar, renderHeader, renderOverlay, contentHidden, apiUrl, storageKey, restoreActiveThread, browserTabId, threadUrlSync, scope, agentTeamPollMs, ...props }: MultiTabAssistantChatProps): React.JSX.Element;
+export declare function MultiTabAssistantChat({ showTabBar, renderHeader, renderOverlay, contentHidden, apiUrl, storageKey, restoreActiveThread, browserTabId, threadUrlSync, scope, isolateHistoryByScope, agentTeamPollMs, ...props }: MultiTabAssistantChatProps): React.JSX.Element;

package/dist/client/MultiTabAssistantChat.js

@@ -402,7 +402,7 @@ function runToAgentTeamTabInfo(run) {
         status: run.status ?? "unknown",
     };
 }
-export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderOverlay, contentHidden = false, apiUrl = agentNativePath("/_agent-native/agent-chat"), storageKey, restoreActiveThread = true, browserTabId, threadUrlSync = false, scope = null, agentTeamPollMs = DEFAULT_AGENT_TEAM_POLL_MS, ...props }) {
+export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderOverlay, contentHidden = false, apiUrl = agentNativePath("/_agent-native/agent-chat"), storageKey, restoreActiveThread = true, browserTabId, threadUrlSync = false, scope = null, isolateHistoryByScope = false, agentTeamPollMs = DEFAULT_AGENT_TEAM_POLL_MS, ...props }) {
     const translate = useT();
     const contextNamespace = scope
         ? scope.contextKey?.trim() || `scope:${scope.type}:${scope.id}`
@@ -520,6 +520,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         routeThreadId: threadUrlSyncEnabled
             ? urlThreadId
             : (activeDeepLinkedThreadId ?? undefined),
+        isolateHistoryByScope,
     });
     const switchThread = useCallback((threadId, options = {}) => {
         switchThreadState(threadId);
@@ -1911,7 +1912,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                                                 const isActive = tab.id === activeThreadId ||
                                                     (tab.id === focusParentId &&
                                                         activeTab?.parentThreadId === tab.id);
-                                                return (_jsxs("div", { ref: isActive ? activeTabRefCb : undefined, className: cn("agent-tab relative flex items-center rounded-md text-[11px] font-medium shrink-0 max-w-[130px]", isActive
+                                                return (_jsxs("div", { ref: isActive ? activeTabRefCb : undefined, className: cn("agent-tab relative flex items-center rounded-md text-[11px] font-medium shrink-0 min-w-[56px] max-w-[130px]", isActive
                                                         ? "bg-accent text-foreground ring-1 ring-inset ring-border/60 shadow-sm"
                                                         : "text-muted-foreground hover:text-foreground hover:bg-accent/50"), children: [_jsxs("button", { type: "button", onClick: () => switchThread(tab.id), className: "flex items-center gap-1 px-2.5 py-1.5 min-w-0 flex-1 text-start", children: [_jsx("span", { className: "truncate pe-1", children: tab.label }), tab.status === "running" && (_jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-muted-foreground/50 shrink-0 animate-pulse" }))] }), _jsx("button", { type: "button", "aria-label": translate("agentChat.tabs.closeTab"), onClick: (e) => {
                                                                 e.stopPropagation();
@@ -1931,7 +1932,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                                                     ? "bg-accent text-foreground"
                                                     : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: translate("agentChat.tabs.main") }), childTabs.map((tab) => (_jsxs("div", { ref: tab.id === activeThreadId
                                                     ? activeTabRefCb
-                                                    : undefined, className: cn("agent-tab relative flex shrink-0 items-center rounded-md text-[10px] font-medium max-w-[130px]", tab.id === activeThreadId
+                                                    : undefined, className: cn("agent-tab relative flex shrink-0 items-center rounded-md text-[10px] font-medium min-w-[48px] max-w-[130px]", tab.id === activeThreadId
                                                     ? "bg-accent text-foreground"
                                                     : "text-muted-foreground hover:bg-accent hover:text-foreground"), children: [_jsxs("button", { type: "button", onClick: () => switchThread(tab.id), className: "flex items-center gap-1 px-2 py-1 min-w-0 flex-1 text-start", children: [_jsx("span", { className: "truncate pe-1", children: tab.subAgentName || tab.label }), tab.status === "running" && (_jsx("span", { className: "w-1 h-1 rounded-full bg-muted-foreground/50 shrink-0 animate-pulse" }))] }), _jsx("button", { type: "button", "aria-label": translate("agentChat.tabs.closeTab"), onClick: (e) => {
                                                             e.stopPropagation();
@@ -1969,7 +1970,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                                         else {
                                             chatRefs.current.delete(tabId);
                                         }
-                                    }, threadId: tabId, tabId: tabId, browserTabId: browserTabId, contextNamespace: contextNamespace, isActiveComposer: tabId === activeThreadId, apiUrl: apiUrl, isNewThread: newThreadIds.current.has(tabId) || isNewThread(tabId), isThreadStateLoading: isLoading, onMessageCountChange: (count) => setMessageCounts((prev) => prev[tabId] === count
+                                    }, threadId: tabId, tabId: tabId, browserTabId: browserTabId, contextScope: scope, contextNamespace: contextNamespace, isolateHistoryByScope: isolateHistoryByScope, isActiveComposer: tabId === activeThreadId, apiUrl: apiUrl, isNewThread: newThreadIds.current.has(tabId) || isNewThread(tabId), isThreadStateLoading: isLoading, onMessageCountChange: (count) => setMessageCounts((prev) => prev[tabId] === count
                                         ? prev
                                         : { ...prev, [tabId]: count }), onSaveThread: handleSaveThread, onGenerateTitle: handleGenerateTitle, onSlashCommand: handleSlashCommand, selectedModel: modelSelection?.model, selectedEngine: modelSelection?.engine, selectedEffort: modelSelection?.effort ?? DEFAULT_REASONING_EFFORT, composerSlot: props.composerSlot, defaultModel: defaultModel, availableModels: availableModels, modelListLoading: modelListLoading, onModelChange: handleModelChange, onEffortChange: handleEffortChange, onForkChat: () => handleForkChat(tabId), 
                                     // Sub-agent tabs are read-only: sending a new message from the

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/routes.d.ts

@@ -26,8 +26,8 @@ export declare const getCollabState: import("h3").EventHandlerWithFetch<import("
  * Body: { update: string (base64), requestSource?: string }
  */
 export declare const postCollabUpdate: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/resources/handlers.d.ts

@@ -51,8 +51,8 @@ export declare function handleDeleteResource(event: any): Promise<{
     error: string;
     ok?: undefined;
 } | {
-    error?: undefined;
     ok: boolean;
+    error?: undefined;
 }>;
 /** POST /_agent-native/resources/upload — upload a file as a resource */
 export declare function handleUploadResource(event: any): Promise<import("./store.js").Resource | {
@@ -73,10 +73,10 @@ export declare function handleUploadResource(event: any): Promise<import("./stor
     runId: string | null;
     expiresAt: number | null;
     metadata: string | null;
-    error?: undefined;
     url: string;
     provider: string;
     storageSetupRequired?: undefined;
+    error?: undefined;
 } | {
     error: string;
     storageSetupRequired: boolean;

package/dist/server/agent-chat-plugin.js

@@ -23,7 +23,7 @@ import { attachToolSearch } from "../agent/tool-search.js";
 import { getAppConfig } from "../app-config/index.js";
 import { readAppStateForCurrentTab } from "../application-state/script-helpers.js";
 import { runChatThreadDataMigrations } from "../chat-threads/migrations.js";
-import { adoptThreadScopeIfUnscoped, createThread, forkThread, getThread, registerChatThreadsShareable, resolveRunThreadScope, resolveThreadAccess, listThreads, searchThreads, renameThread, createThreadShareLink, getThreadByShareToken, getThreadShareState, revokeThreadShareLink, setThreadArchived, setThreadPinned, setThreadScope, updateThreadData, withThreadDataLock, deleteThread, setThreadQueuedMessages, setThreadSourceIfMissing, } from "../chat-threads/store.js";
+import { adoptThreadScopeIfUnscoped, createThread, forkThread, getThread, registerChatThreadsShareable, resolveRunThreadScope, resolveThreadAccess, listThreads, searchThreads, renameThread, createThreadShareLink, getThreadByShareToken, getThreadShareState, revokeThreadShareLink, setThreadArchived, setThreadPinned, setThreadScope, updateThreadData, withThreadDataLock, deleteThread, setThreadQueuedMessages, setThreadSourceIfMissing, isAppOwnedChatScope, threadScopeMismatch, } from "../chat-threads/store.js";
 import { isCheckpointRestorePath } from "../checkpoints/route-match.js";
 import { createDbAdminAgentTools } from "../db-admin/agent-tools.js";
 import { isProductionServerlessFunctionRuntime, isTransientDatabaseError, } from "../db/client.js";
@@ -2290,17 +2290,23 @@ export function createAgentChatPlugin(options) {
                             thread = await getThread(threadId);
                         }
                     }
-                    if (options?.appId) {
-                        await setThreadSourceIfMissing(threadId, {
-                            appId: options.appId,
+                    if (!thread) {
+                        throw createError({
+                            statusCode: 404,
+                            statusMessage: "Thread not found",
                         });
                     }
-                    if (!thread) {
+                    if (threadScopeMismatch(thread.scope, runScope)) {
                         throw createError({
                             statusCode: 404,
                             statusMessage: "Thread not found",
                         });
                     }
+                    if (options?.appId) {
+                        await setThreadSourceIfMissing(threadId, {
+                            appId: options.appId,
+                        });
+                    }
                     const access = await resolveThreadAccess(ownerEmail, threadId, "editor", { orgId: getRequestOrgId() });
                     if (!access) {
                         throw createError({
@@ -2820,6 +2826,12 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     if (details.threadId && details.ownerEmail) {
                         const existingThread = await getThread(details.threadId);
                         if (existingThread) {
+                            if (threadScopeMismatch(existingThread.scope, getRequestRunContext()?.chatScope)) {
+                                throw createError({
+                                    statusCode: 404,
+                                    statusMessage: "Thread not found",
+                                });
+                            }
                             const access = await resolveThreadAccess(details.ownerEmail, details.threadId, "editor", { orgId: await getOrgIdFromEvent(details.event) });
                             if (!access) {
                                 throw createError({
@@ -3096,6 +3108,12 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                         if (details.threadId && details.ownerEmail) {
                             const existingThread = await getThread(details.threadId);
                             if (existingThread) {
+                                if (threadScopeMismatch(existingThread.scope, getRequestRunContext()?.chatScope)) {
+                                    throw createError({
+                                        statusCode: 404,
+                                        statusMessage: "Thread not found",
+                                    });
+                                }
                                 const access = await resolveThreadAccess(details.ownerEmail, details.threadId, "editor", { orgId: await getOrgIdFromEvent(details.event) });
                                 if (!access) {
                                     throw createError({
@@ -4473,11 +4491,16 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                 const method = getMethod(event);
                 const { threadId, tail: threadTail } = parseThreadRoute(event);
                 const isThreadSubroute = (subroute) => threadTail[0] === subroute;
+                const requestedScope = parseScopeFromQuery(getQuery(event));
+                const scopesMatch = (left, right) => Boolean(left && right && left.type === right.type && left.id === right.id);
+                const threadMatchesRequestedScope = (thread, incomingScope) => !requestedScope ||
+                    scopesMatch(thread.scope, requestedScope) ||
+                    (!thread.scope && scopesMatch(incomingScope, requestedScope));
                 // ── Specific thread: GET/PUT/DELETE /threads/:id ──
                 if (threadId) {
                     if (method === "GET") {
                         const thread = await resolveThreadAccess(owner, threadId, "viewer", { orgId });
-                        if (!thread) {
+                        if (!thread || !threadMatchesRequestedScope(thread)) {
                             setResponseStatus(event, 404);
                             return { error: "Thread not found" };
                         }
@@ -4491,12 +4514,33 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                         // run could clobber the assistant message the server just
                         // appended (and vice versa).
                         return await withThreadDataLock(threadId, async () => {
+                            const body = await readBody(event);
+                            const bodyIncludesScope = Boolean(body &&
+                                typeof body === "object" &&
+                                Object.prototype.hasOwnProperty.call(body, "scope"));
+                            const incomingScope = bodyIncludesScope
+                                ? parseScopeFromBody(body.scope)
+                                : undefined;
                             const thread = await resolveThreadAccess(owner, threadId, "editor", { orgId });
-                            if (!thread) {
+                            if (!thread ||
+                                !threadMatchesRequestedScope(thread, incomingScope)) {
+                                setResponseStatus(event, 404);
+                                return { error: "Thread not found" };
+                            }
+                            const bodyScopeMatchesRequestedScope = !requestedScope ||
+                                !incomingScope ||
+                                scopesMatch(incomingScope, requestedScope);
+                            const unauthorizedScopeChange = bodyIncludesScope &&
+                                ((incomingScope !== null &&
+                                    (threadScopeMismatch(thread.scope, incomingScope) ||
+                                        !bodyScopeMatchesRequestedScope)) ||
+                                    (incomingScope === null &&
+                                        isAppOwnedChatScope(thread.scope) &&
+                                        !requestedScope));
+                            if (unauthorizedScopeChange) {
                                 setResponseStatus(event, 404);
                                 return { error: "Thread not found" };
                             }
-                            const body = await readBody(event);
                             let newThreadData = body.threadData || thread.threadData;
                             let newMessageCount = body.messageCount ?? thread.messageCount;
                             let nextTitle = typeof body.title === "string" ? body.title : thread.title;
@@ -4543,9 +4587,8 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                             }
                             await updateThreadData(threadId, newThreadData, nextTitle, nextPreview, newMessageCount, { ignoreConflicts: true });
                             // Scope updates piggyback on the PUT — the client uses this
-                            // path for both "detach" (scope: null) and "retag" flows.
-                            // Send the field as `scope: undefined` (or omit it) when
-                            // you don't want to touch the existing scope.
+                            // path for detach and for claiming a legacy unscoped thread.
+                            // A scoped thread cannot be retagged across resources here.
                             if (Object.prototype.hasOwnProperty.call(body, "scope")) {
                                 const incomingScope = parseScopeFromBody(body.scope);
                                 await setThreadScope(threadId, incomingScope);
@@ -4559,7 +4602,7 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     // on full-thread saves.
                     if (method === "POST" && isThreadSubroute("queued")) {
                         const thread = await resolveThreadAccess(owner, threadId, "editor", { orgId });
-                        if (!thread) {
+                        if (!thread || !threadMatchesRequestedScope(thread)) {
                             setResponseStatus(event, 404);
                             return { error: "Thread not found" };
                         }
@@ -4576,7 +4619,7 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     }
                     if (method === "POST" && isThreadSubroute("rename")) {
                         const thread = await resolveThreadAccess(owner, threadId, "editor", { orgId });
-                        if (!thread) {
+                        if (!thread || !threadMatchesRequestedScope(thread)) {
                             setResponseStatus(event, 404);
                             return { error: "Thread not found" };
                         }
@@ -4597,7 +4640,7 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     }
                     if (method === "POST" && isThreadSubroute("pin")) {
                         const thread = await resolveThreadAccess(owner, threadId, "editor", { orgId });
-                        if (!thread) {
+                        if (!thread || !threadMatchesRequestedScope(thread)) {
                             setResponseStatus(event, 404);
                             return { error: "Thread not found" };
                         }
@@ -4615,7 +4658,7 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     }
                     if (method === "POST" && isThreadSubroute("archive")) {
                         const thread = await resolveThreadAccess(owner, threadId, "editor", { orgId });
-                        if (!thread) {
+                        if (!thread || !threadMatchesRequestedScope(thread)) {
                             setResponseStatus(event, 404);
                             return { error: "Thread not found" };
                         }
@@ -4634,7 +4677,7 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     // POST /threads/:id/fork — duplicate a thread with all its messages
                     if (method === "POST" && isThreadSubroute("fork")) {
                         const thread = await resolveThreadAccess(owner, threadId, "viewer", { orgId });
-                        if (!thread) {
+                        if (!thread || !threadMatchesRequestedScope(thread)) {
                             setResponseStatus(event, 404);
                             return { error: "Thread not found" };
                         }
@@ -4652,7 +4695,7 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     }
                     if (isThreadSubroute("share")) {
                         const thread = await resolveThreadAccess(owner, threadId, "admin", { orgId });
-                        if (!thread) {
+                        if (!thread || !threadMatchesRequestedScope(thread)) {
                             setResponseStatus(event, 404);
                             return { error: "Thread not found" };
                         }
@@ -4686,7 +4729,9 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     }
                     if (method === "DELETE") {
                         const thread = await getThread(threadId);
-                        if (!thread || thread.ownerEmail !== owner) {
+                        if (!thread ||
+                            thread.ownerEmail !== owner ||
+                            !threadMatchesRequestedScope(thread)) {
                             setResponseStatus(event, 404);
                             return { error: "Thread not found" };
                         }
@@ -4727,6 +4772,46 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                 }
                 if (method === "POST") {
                     const body = await readBody(event);
+                    const requestedScope = parseScopeFromQuery(getQuery(event));
+                    const bodyIncludesScope = Boolean(body &&
+                        typeof body === "object" &&
+                        Object.prototype.hasOwnProperty.call(body, "scope"));
+                    const bodyScope = bodyIncludesScope
+                        ? parseScopeFromBody(body.scope)
+                        : undefined;
+                    const bodyScopeMatchesRequestedScope = !requestedScope ||
+                        !bodyIncludesScope ||
+                        (bodyScope !== null && scopesMatch(bodyScope, requestedScope));
+                    if (!bodyScopeMatchesRequestedScope) {
+                        setResponseStatus(event, 404);
+                        return { error: "Thread not found" };
+                    }
+                    const resolveExistingOwnedThread = async (existing) => {
+                        if ((requestedScope &&
+                            threadScopeMismatch(existing.scope, requestedScope)) ||
+                            (bodyIncludesScope &&
+                                threadScopeMismatch(existing.scope, bodyScope))) {
+                            setResponseStatus(event, 404);
+                            return null;
+                        }
+                        const scopeToAdopt = bodyIncludesScope
+                            ? bodyScope
+                            : requestedScope;
+                        if (!existing.scope && scopeToAdopt) {
+                            const adoptedScope = await adoptThreadScopeIfUnscoped(existing.id, scopeToAdopt);
+                            if (!scopesMatch(adoptedScope, scopeToAdopt)) {
+                                setResponseStatus(event, 404);
+                                return null;
+                            }
+                            const adopted = await getThread(existing.id);
+                            if (!adopted) {
+                                setResponseStatus(event, 404);
+                                return null;
+                            }
+                            return adopted;
+                        }
+                        return existing;
+                    };
                     // Idempotent: when the caller supplies an id and a thread with
                     // that id already exists for this owner, return it instead of
                     // 500'ing on the UNIQUE constraint. The client can race with
@@ -4737,8 +4822,10 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     if (body?.id) {
                         const existing = await getThread(body.id);
                         if (existing) {
-                            if (existing.ownerEmail === owner)
-                                return existing;
+                            if (existing.ownerEmail === owner) {
+                                const resolved = await resolveExistingOwnedThread(existing);
+                                return resolved ?? { error: "Thread not found" };
+                            }
                             setResponseStatus(event, 409);
                             return { error: "Thread id already in use" };
                         }
@@ -4747,7 +4834,7 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                         const thread = await createThread(owner, {
                             id: body?.id,
                             title: body?.title ?? "",
-                            scope: parseScopeFromBody(body?.scope),
+                            scope: bodyIncludesScope ? bodyScope : requestedScope,
                             source: options?.appId ? { appId: options.appId } : null,
                         });
                         return thread;
@@ -4758,8 +4845,10 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                         // return the row that actually landed.
                         if (body?.id) {
                             const existing = await getThread(body.id);
-                            if (existing && existing.ownerEmail === owner)
-                                return existing;
+                            if (existing && existing.ownerEmail === owner) {
+                                const resolved = await resolveExistingOwnedThread(existing);
+                                return resolved ?? { error: "Thread not found" };
+                            }
                         }
                         throw err;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.0.0-beta-20260820222620",
+  "version": "0.0.0-beta-20260820224008",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {