@agent-native/core 0.103.1 → 0.105.0

package/corpus/core/src/client/AssistantChat.tsx

@@ -5145,13 +5145,11 @@ const AssistantChatInner = forwardRef<
                             "agent-empty-state",
                             emptyStateDisplay === "hidden"
                               ? "sr-only"
-                              : "flex h-full flex-col items-center justify-center gap-4 px-4 py-16",
+                              : "flex h-full flex-col items-center justify-center gap-3 px-4 py-16",
                           )}
                           aria-busy="true"
                         >
-                          <div className="flex h-10 w-10 items-center justify-center rounded-full bg-muted">
-                            <IconMessage className="h-5 w-5 text-muted-foreground" />
-                          </div>
+                          <IconMessage className="h-5 w-5 text-muted-foreground/60" />
                           <p className="sr-only">
                             {emptyStateText ?? "Loading chat..."}
                           </p>
@@ -5173,19 +5171,17 @@ const AssistantChatInner = forwardRef<
                             "agent-empty-state",
                             emptyStateDisplay === "hidden"
                               ? "sr-only"
-                              : "flex h-full flex-col items-center justify-center gap-4 px-4 py-16",
+                              : "flex h-full flex-col items-center justify-center gap-3 px-4 py-16",
                           )}
                         >
-                          <div className="flex h-10 w-10 items-center justify-center rounded-full bg-muted">
-                            <IconMessage className="h-5 w-5 text-muted-foreground" />
-                          </div>
+                          <IconMessage className="h-5 w-5 text-muted-foreground/60" />
                           <p className="sr-only">
                             {emptyStateText ?? "How can I help you?"}
                           </p>
                           {emptyStateAddon}
                           {resolvedSuggestions &&
                           resolvedSuggestions.length > 0 ? (
-                            <div className="flex flex-col gap-1.5 w-full max-w-[280px]">
+                            <div className="flex w-full max-w-[280px] flex-col gap-1">
                               {resolvedSuggestions.map((suggestion) => (
                                 <button
                                   key={suggestion}
@@ -5196,7 +5192,7 @@ const AssistantChatInner = forwardRef<
                                     }
                                     void addToQueue(suggestion);
                                   }}
-                                  className="w-full rounded-lg border border-border px-3 py-2 text-start text-[13px] text-muted-foreground hover:bg-accent hover:text-foreground"
+                                  className="w-full px-2 py-1 text-center text-[13px] text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
                                 >
                                   {suggestion}
                                 </button>

package/corpus/core/src/client/MultiTabAssistantChat.tsx

@@ -1,18 +1,5 @@
-import {
-  IconX,
-  IconPlus,
-  IconHistory,
-  IconLink,
-  IconLinkOff,
-  IconCheck,
-} from "@tabler/icons-react";
-import React, {
-  useState,
-  useRef,
-  useEffect,
-  useCallback,
-  useMemo,
-} from "react";
+import { IconPlus, IconHistory, IconX } from "@tabler/icons-react";
+import React, { useState, useRef, useEffect, useCallback } from "react";
 
 import { DEFAULT_MODEL } from "../agent/default-model.js";
 import {
@@ -30,10 +17,13 @@ import {
   claimAgentChatSubmit,
   drainBufferedAgentChatOpenRequests,
   drainBufferedAgentChatSubmits,
+  getAgentChatContextState,
   isAgentChatSubmitCancelled,
   normalizeAgentChatContextItem,
   parseSubmitChatMessage,
+  removeAgentChatContextItem,
   reportAgentChatSubmitResult,
+  setAgentChatContextItem,
   type AgentChatContextItem,
 } from "./agent-chat.js";
 import { agentNativePath, appPath } from "./api-path.js";
@@ -55,7 +45,6 @@ import {
   Popover,
   PopoverAnchor,
   PopoverContent,
-  PopoverTrigger,
 } from "./components/ui/popover.js";
 import {
   Tooltip,
@@ -228,153 +217,12 @@ function ChatSkeleton({
   );
 }
 
-// ─── Scope Badge ─────────────────────────────────────────────────────────────
+// ─── Resource context ────────────────────────────────────────────────────────
 
 function formatScopeType(type: string) {
   return type.replace(/[-_]+/g, " ");
 }
 
-function indefiniteArticleFor(value: string) {
-  return /^[aeiou]/i.test(value.trim()) ? "an" : "a";
-}
-
-function getScopeCopy(scope: ChatThreadScope, isCurrentScope: boolean) {
-  const type = formatScopeType(scope.type);
-  const fallbackObject = isCurrentScope
-    ? `this ${type}`
-    : `${indefiniteArticleFor(type)} ${type}`;
-  const objectLabel = scope.label || fallbackObject;
-  return {
-    objectLabel,
-    chipLabel:
-      scope.label || (isCurrentScope ? `this ${type}` : `${type} context`),
-  };
-}
-
-/**
- * Compact context tab above the composer. Click → popover with related chats
- * and the remove-context action. It stays attached to the chat field so scoped
- * context is visible right where the next message will be composed.
- */
-function ScopeBadge({
-  scope,
-  currentScope,
-  onDetach,
-  otherScopedThreads,
-  activeThreadId,
-  openTabIds,
-  onSelectThread,
-}: {
-  scope: ChatThreadScope;
-  currentScope?: ChatThreadScope | null;
-  onDetach: () => void;
-  /** Other threads scoped to the same resource (excluding the active one),
-   *  pre-sorted most-recent-first. The chip popover lists these so the user
-   *  can hop between this resource's chats without opening the full history. */
-  otherScopedThreads: ChatThreadSummary[];
-  activeThreadId: string;
-  openTabIds: Set<string>;
-  onSelectThread: (id: string) => void;
-}) {
-  const [open, setOpen] = useState(false);
-  const isCurrentScope = Boolean(
-    currentScope &&
-    currentScope.type === scope.type &&
-    currentScope.id === scope.id,
-  );
-  const hasDifferentCurrentScope = Boolean(currentScope && !isCurrentScope);
-  const { objectLabel, chipLabel } = getScopeCopy(scope, isCurrentScope);
-  const heading = `Using ${chipLabel}`;
-  const detailSuffix = hasDifferentCurrentScope
-    ? "Start a new chat to use the current page."
-    : isCurrentScope
-      ? "New chats here keep this context."
-      : "Start a new chat for a general conversation.";
-  const otherCount = otherScopedThreads.length;
-  return (
-    <div className="agent-scope-badge-wrapper relative z-[1] -mb-2 flex shrink-0 items-end justify-center px-3 pt-1 text-[11px] text-muted-foreground">
-      <Popover open={open} onOpenChange={setOpen}>
-        <PopoverTrigger asChild>
-          <button
-            type="button"
-            className="inline-flex h-7 min-w-0 max-w-full cursor-pointer items-center gap-1.5 rounded-t-lg border border-b-0 border-input bg-background px-3 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground sm:max-w-72"
-            aria-label={heading}
-          >
-            <IconLink size={11} className="shrink-0 opacity-70" />
-            <span className="min-w-0 truncate">{heading}</span>
-            {otherCount > 0 && (
-              <span
-                className="ms-0.5 shrink-0 rounded-full bg-muted px-1.5 py-px text-[10px] leading-none text-muted-foreground"
-                aria-label={`${otherCount} other chats for ${objectLabel}`}
-              >
-                +{otherCount}
-              </span>
-            )}
-          </button>
-        </PopoverTrigger>
-        <PopoverContent align="center" side="top" className="w-72 p-0">
-          <p className="px-3 pt-2 pb-1.5 text-[11px] text-muted-foreground">
-            This chat can see{" "}
-            <span className="text-foreground">{objectLabel}</span>.{" "}
-            {detailSuffix}
-          </p>
-          {otherCount > 0 && (
-            <div className="border-t border-border">
-              <div className="px-3 pt-1.5 pb-1 text-[10px] uppercase tracking-wider text-muted-foreground/70">
-                Chats for {objectLabel}
-              </div>
-              <div className="max-h-56 overflow-y-auto pb-1">
-                {otherScopedThreads.map((thread) =>
-                  renderThreadRow(
-                    thread,
-                    activeThreadId,
-                    openTabIds,
-                    formatThreadTime,
-                    onSelectThread,
-                    () => setOpen(false),
-                  ),
-                )}
-              </div>
-            </div>
-          )}
-          <div className="border-t border-border p-1">
-            <button
-              type="button"
-              onClick={() => {
-                setOpen(false);
-                onDetach();
-              }}
-              className="flex w-full items-center gap-2 rounded px-2 py-1.5 text-xs text-foreground hover:bg-accent cursor-pointer"
-            >
-              <IconLinkOff size={13} />
-              <span>Remove context</span>
-            </button>
-          </div>
-        </PopoverContent>
-      </Popover>
-    </div>
-  );
-}
-
-/**
- * Thin confirmation banner shown briefly after detach. The chip itself
- * unmounts the moment scope clears on the active thread, so this banner
- * holds the visual feedback long enough for the user to register what
- * just happened and learn where the chat went (History popover).
- */
-function DetachConfirmationBanner() {
-  return (
-    <div className="agent-scope-badge-wrapper relative z-[1] -mb-2 flex shrink-0 items-end justify-center px-3 pt-1 text-[11px] text-muted-foreground">
-      <span className="inline-flex h-7 min-w-0 max-w-full items-center gap-1.5 rounded-t-lg border border-b-0 border-input bg-background px-3 text-foreground shadow-[0_-8px_24px_hsl(var(--background)/0.72)] sm:max-w-80">
-        <IconCheck size={11} className="shrink-0 opacity-80" />
-        <span className="min-w-0 truncate">
-          Context removed. Find this chat in History.
-        </span>
-      </span>
-    </div>
-  );
-}
-
 // ─── History Popover ─────────────────────────────────────────────────────────
 
 function formatThreadTime(ts: number): string {
@@ -389,58 +237,10 @@ function formatThreadTime(ts: number): string {
   return d.toLocaleDateString([], { month: "short", day: "numeric" });
 }
 
-function renderThreadRow(
-  thread: ChatThreadSummary,
-  activeThreadId: string | null,
-  openTabIds: Set<string>,
-  formatTime: (ts: number) => string,
-  onSelect: (id: string) => void,
-  onClose: () => void,
-) {
-  const isActive = thread.id === activeThreadId;
-  return (
-    <button
-      key={thread.id}
-      onClick={() => {
-        onSelect(thread.id);
-        onClose();
-      }}
-      className={cn(
-        "w-full px-3 py-2 text-start hover:bg-accent/50 cursor-pointer",
-        isActive && "bg-accent/30",
-      )}
-    >
-      <div className="flex items-baseline justify-between gap-2">
-        <span className="text-xs font-medium text-foreground truncate">
-          {thread.title || thread.preview || "Chat"}
-        </span>
-        <span className="text-[10px] text-muted-foreground shrink-0">
-          {isActive
-            ? "Active"
-            : openTabIds.has(thread.id)
-              ? "Open"
-              : formatTime(thread.updatedAt)}
-        </span>
-      </div>
-      {thread.preview && thread.title !== thread.preview && (
-        <div className="text-[11px] text-muted-foreground truncate mt-0.5">
-          {thread.preview}
-        </div>
-      )}
-      {thread.scope?.label && (
-        <div className="mt-0.5 text-[10px] text-muted-foreground/70 truncate">
-          {thread.scope.label}
-        </div>
-      )}
-    </button>
-  );
-}
-
 function HistoryPopover({
   threads,
   openTabIds,
   activeThreadId,
-  currentScope,
   hasMoreThreads = false,
   isLoadingMoreThreads = false,
   loadError,
@@ -454,7 +254,6 @@ function HistoryPopover({
   threads: ChatThreadSummary[];
   openTabIds: Set<string>;
   activeThreadId: string | null;
-  currentScope?: ChatThreadScope | null;
   hasMoreThreads?: boolean;
   isLoadingMoreThreads?: boolean;
   loadError?: string | null;
@@ -531,26 +330,6 @@ function HistoryPopover({
   const pinnedThreads = filtered.filter((t) => t.pinnedAt != null);
   const unpinnedThreads = filtered.filter((t) => t.pinnedAt == null);
 
-  // When scope is set we split (unpinned) history into two sections so the
-  // user can see "this deck's chats" first without losing access to general /
-  // other-deck chats. Section labels intentionally use the current
-  // resource type (deck/design/dashboard) instead of a generic phrase.
-  const sectionedThreads = currentScope
-    ? {
-        scoped: unpinnedThreads.filter(
-          (t) =>
-            t.scope?.type === currentScope.type &&
-            t.scope?.id === currentScope.id,
-        ),
-        other: unpinnedThreads.filter(
-          (t) =>
-            !t.scope ||
-            t.scope.type !== currentScope.type ||
-            t.scope.id !== currentScope.id,
-        ),
-      }
-    : null;
-
   const toHistoryItem = (thread: ChatThreadSummary): ChatHistoryItem => {
     const isActive = thread.id === activeThreadId;
     const title = thread.title || thread.preview || "Chat";
@@ -562,7 +341,6 @@ function HistoryPopover({
         thread.preview && thread.title !== thread.preview
           ? thread.preview
           : undefined,
-      detail: thread.scope?.label || undefined,
       timestamp: isActive
         ? "Active"
         : openTabIds.has(thread.id)
@@ -582,20 +360,7 @@ function HistoryPopover({
           },
         ]
       : []),
-    ...(sectionedThreads
-      ? [
-          {
-            id: "scoped",
-            label: `This ${currentScope!.type}`,
-            items: sectionedThreads.scoped.map(toHistoryItem),
-          },
-          {
-            id: "other",
-            label: "All chats",
-            items: sectionedThreads.other.map(toHistoryItem),
-          },
-        ]
-      : [{ id: "all", items: unpinnedThreads.map(toHistoryItem) }]),
+    { id: "all", items: unpinnedThreads.map(toHistoryItem) },
   ];
 
   return (
@@ -954,15 +719,9 @@ export type MultiTabAssistantChatProps = Omit<
    * route params such as `/chat/:threadId`.
    */
   threadUrlSync?: boolean | ChatThreadUrlSyncOptions;
-  /**
-   * Bind new chats to a resource (deck, design, dashboard, etc.). When set,
-   * new chats automatically inherit this scope and scoped chats tuck away when
-   * the user leaves the resource. General chats remain visible across resource
-   * navigation, and the user can detach a scoped chat via the scope chip above
-   * the composer.
-   */
+  /** Ambient resource context to show as a composer chip. */
   scope?: ChatThreadScope | null;
-  /** Show the compact scope chip above the composer. Default: true. */
+  /** @deprecated Scope context is now rendered in the composer. */
   showScopeBadge?: boolean;
 };
 
@@ -977,7 +736,6 @@ export function MultiTabAssistantChat({
   browserTabId,
   threadUrlSync = false,
   scope = null,
-  showScopeBadge = true,
   ...props
 }: MultiTabAssistantChatProps) {
   const {
@@ -1084,7 +842,6 @@ export function MultiTabAssistantChat({
     isLoading,
     createThread,
     switchThread: switchThreadState,
-    detachThread,
     forkThread,
     saveThreadData,
     generateTitle,
@@ -1097,7 +854,7 @@ export function MultiTabAssistantChat({
     isNewThread,
     pinThread,
     renameThread,
-  } = useChatThreads(apiUrl, storageKey, scope, {
+  } = useChatThreads(apiUrl, storageKey, null, {
     restoreActiveThread,
     routeThreadId: threadUrlSyncEnabled ? urlThreadId : undefined,
   });
@@ -1370,11 +1127,7 @@ export function MultiTabAssistantChat({
   }, [subAgentNames, SUB_AGENT_NAMES_KEY]);
 
   // Open tabs — persisted to localStorage so they survive refresh.
-  // Per-scope: when scope changes (e.g. user navigates from Deck A to Deck
-  // B), the tab bar reflects whichever tabs they had open for *that*
-  // resource. We do not bleed deck A's tabs into deck B's view.
-  const scopeKeyPart = scope ? `:scope:${scope.type}:${scope.id}` : "";
-  const OPEN_TABS_KEY = `agent-chat-open-tabs${keyPrefix}${scopeKeyPart}`;
+  const OPEN_TABS_KEY = `agent-chat-open-tabs${keyPrefix}`;
   const [openTabIds, setOpenTabIds] = useState<string[]>(() => {
     if (!restoreActiveThread && activeThreadId) {
       for (const id of [activeThreadId]) mountedTabsRef.current.add(id);
@@ -1397,87 +1150,50 @@ export function MultiTabAssistantChat({
   openTabIdsRef.current = openTabIds;
   const initializedRef = useRef(false);
 
-  // Rehydrate open tabs when the scope flips. Mirrors `persistedKeyRef` in
-  // `useChatThreads`: on a scope change we need to read the new key BEFORE
-  // the persistence effect writes the current (now-wrong) tab list under
-  // that new key.
   const openTabsKeyRef = useRef(OPEN_TABS_KEY);
+
   useEffect(() => {
-    if (openTabsKeyRef.current === OPEN_TABS_KEY) return;
-    openTabsKeyRef.current = OPEN_TABS_KEY;
-    initializedRef.current = false;
-    if (!restoreActiveThread) {
-      setOpenTabIds(activeThreadId ? [activeThreadId] : []);
-      return;
-    }
-    try {
-      const saved = localStorage.getItem(OPEN_TABS_KEY);
-      if (saved) {
-        const parsed = JSON.parse(saved);
-        if (Array.isArray(parsed)) {
-          for (const id of parsed) mountedTabsRef.current.add(id);
-          setOpenTabIds(parsed);
-          return;
-        }
-      }
-    } catch {}
-    setOpenTabIds([]);
-  }, [OPEN_TABS_KEY, activeThreadId, restoreActiveThread]);
-
-  // Look up the active thread's actual scope from the list — when the
-  // user opens a chat from history that was scoped to a different
-  // resource, the badge should advertise that thread's binding, not
-  // necessarily the resource currently in the viewport. When the thread
-  // and the live prop refer to the same resource, prefer the prop's
-  // label so a rename or a deferred deck-title load shows up in the UI
-  // without waiting on the next persistence cycle.
-  const activeThreadScope = useMemo<ChatThreadScope | null>(() => {
-    if (!activeThreadId) return null;
-    const t = threads.find((x) => x.id === activeThreadId);
-    const stored = t?.scope ?? null;
-    if (!stored) return null;
-    if (scope && stored.type === scope.type && stored.id === scope.id) {
-      return { ...stored, label: scope.label || stored.label };
+    const nextScope = scope;
+    if (!nextScope) return;
+    const type = formatScopeType(nextScope.type);
+    const title =
+      nextScope.label?.trim() ||
+      type.replace(/^./, (character) => character.toUpperCase());
+    const key = nextScope.contextKey || "agent-current-resource-context";
+    const marker = `Resource context: ${nextScope.type}:${nextScope.id}`;
+    const existing = getAgentChatContextState().items.find(
+      (item) => item.key === key,
+    );
+    let ownsContextItem = false;
+    if (!existing || existing.context.startsWith(marker)) {
+      setAgentChatContextItem({
+        key,
+        title,
+        context: [
+          marker,
+          `The user is currently viewing this ${type}.`,
+          nextScope.label ? `Resource name: ${nextScope.label}` : "",
+          `Resource id: ${nextScope.id}`,
+          typeof window !== "undefined"
+            ? `Current URL: ${window.location.pathname}${window.location.search}`
+            : "",
+        ]
+          .filter(Boolean)
+          .join("\n"),
+        openSidebar: false,
+        focus: false,
+      });
+      ownsContextItem = true;
     }
-    return stored;
-  }, [threads, activeThreadId, scope?.type, scope?.id, scope?.label]);
-
-  // Brief confirmation banner shown after detach. The chip itself disappears
-  // the instant scope clears, which the user described as "nothing different
-  // happened." We hold the confirmation in the same slot for ~2s so the
-  // detach is visually acknowledged and the user is pointed at History.
-  const [detachConfirmType, setDetachConfirmType] = useState<string | null>(
-    null,
-  );
-  const detachTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  useEffect(() => {
     return () => {
-      if (detachTimerRef.current) clearTimeout(detachTimerRef.current);
+      const current = getAgentChatContextState().items.find(
+        (item) => item.key === key,
+      );
+      if (ownsContextItem && current?.context.startsWith(marker)) {
+        removeAgentChatContextItem(key);
+      }
     };
-  }, []);
-  const handleDetachActiveThread = useCallback(() => {
-    if (!activeThreadId || !activeThreadScope) return;
-    const type = activeThreadScope.type;
-    setDetachConfirmType(type);
-    if (detachTimerRef.current) clearTimeout(detachTimerRef.current);
-    detachTimerRef.current = setTimeout(() => setDetachConfirmType(null), 2200);
-    detachThread(activeThreadId);
-  }, [activeThreadId, activeThreadScope, detachThread]);
-
-  // Other chats scoped to the active thread's resource (excluding the active
-  // thread itself). Sorted most-recent-first to match user expectation in the
-  // chip popover and empty-state addon.
-  const otherScopedThreads = useMemo<ChatThreadSummary[]>(() => {
-    if (!activeThreadScope) return [];
-    return threads
-      .filter(
-        (t) =>
-          t.id !== activeThreadId &&
-          t.scope?.type === activeThreadScope.type &&
-          t.scope?.id === activeThreadScope.id,
-      )
-      .sort((a, b) => b.updatedAt - a.updatedAt);
-  }, [threads, activeThreadId, activeThreadScope]);
+  }, [scope?.contextKey, scope?.id, scope?.label, scope?.type]);
 
   // Persist open tab IDs to localStorage (exclude sub-agent tabs — they're session-only)
   useEffect(() => {
@@ -1555,9 +1271,8 @@ export function MultiTabAssistantChat({
   // Use functional update to check inside the setter — avoids race with the
   // initialization effect that may have already added the ID in the same batch.
   //
-  // Scoped navigation can reset openTabIds from a different localStorage key
-  // without changing activeThreadId. Re-check after tab-list resets so the
-  // sidebar cannot end up with a live active thread but no mounted chat.
+  // Re-check after tab-list resets so the sidebar cannot end up with a live
+  // active thread but no mounted chat.
   useEffect(() => {
     if (!activeThreadId || openTabIds.includes(activeThreadId)) return;
     if (parentMap[activeThreadId]) return;
@@ -2711,7 +2426,6 @@ export function MultiTabAssistantChat({
             threads={threads}
             openTabIds={new Set(openTabIds)}
             activeThreadId={activeThreadId}
-            currentScope={scope}
             hasMoreThreads={hasMoreThreads}
             isLoadingMoreThreads={isLoadingMoreThreads}
             loadError={threadsLoadError}
@@ -2737,37 +2451,10 @@ export function MultiTabAssistantChat({
           )
           .map((tabId) => {
             const modelSelection = resolveThreadModelSelection(tabId);
-            const tabThread = threads.find((thread) => thread.id === tabId);
-            const tabScope =
-              tabThread?.scope ??
-              (tabId === activeThreadId ? activeThreadScope : null);
             const tabDynamicSuggestions =
               tabId === activeThreadId && !contentHidden
                 ? props.dynamicSuggestions
                 : false;
-            const scopeComposerSlot =
-              showScopeBadge && tabId === activeThreadId && !contentHidden ? (
-                tabScope && activeThreadId ? (
-                  <ScopeBadge
-                    scope={tabScope}
-                    currentScope={scope}
-                    onDetach={handleDetachActiveThread}
-                    otherScopedThreads={otherScopedThreads}
-                    activeThreadId={activeThreadId}
-                    openTabIds={new Set(openTabIds)}
-                    onSelectThread={openFromHistory}
-                  />
-                ) : detachConfirmType ? (
-                  <DetachConfirmationBanner />
-                ) : null
-              ) : null;
-            const composerSlot =
-              scopeComposerSlot || props.composerSlot ? (
-                <>
-                  {props.composerSlot}
-                  {scopeComposerSlot}
-                </>
-              ) : undefined;
             return (
               <div
                 key={tabId}
@@ -2802,11 +2489,6 @@ export function MultiTabAssistantChat({
                 <AssistantChat
                   {...props}
                   dynamicSuggestions={tabDynamicSuggestions}
-                  emptyStateText={
-                    tabScope?.label && tabId === activeThreadId
-                      ? `Ask about ${tabScope.label}`
-                      : props.emptyStateText
-                  }
                   ref={(handle) => {
                     if (handle) {
                       chatRefs.current.set(tabId, handle);
@@ -2817,7 +2499,6 @@ export function MultiTabAssistantChat({
                   threadId={tabId}
                   tabId={tabId}
                   browserTabId={browserTabId}
-                  contextScope={tabScope}
                   isActiveComposer={tabId === activeThreadId}
                   apiUrl={apiUrl}
                   isNewThread={
@@ -2838,7 +2519,7 @@ export function MultiTabAssistantChat({
                   selectedEffort={
                     modelSelection?.effort ?? DEFAULT_REASONING_EFFORT
                   }
-                  composerSlot={composerSlot}
+                  composerSlot={props.composerSlot}
                   defaultModel={defaultModel}
                   availableModels={availableModels}
                   onModelChange={handleModelChange}

package/corpus/core/src/client/agent-chat-adapter.ts

@@ -529,6 +529,7 @@ function messageTextForHistory(message: {
 }
 
 type AdapterMessage = {
+  id?: string;
   role: string;
   content: readonly { type: string; text?: string }[];
   attachments?: readonly AssistantUiAttachment[];
@@ -1486,6 +1487,9 @@ export function createAgentChatAdapter(
   const browserTabId = options?.browserTabId;
   const scopeRef = options?.scopeRef;
   const surface = options?.surface ?? "app";
+  // A queued recovery can survive until a server-owned continuation finishes,
+  // and assistant-ui may ask the same memoized adapter to run that item again.
+  const claimedRecoveryMessageIds = new Set<string>();
   let runtimeDebugDetails = "";
   const runtimeDebugUrl = runtimeDebugUrlForApiUrl(apiUrl);
   if (runtimeDebugUrl && typeof fetch === "function") {
@@ -1512,6 +1516,14 @@ export function createAgentChatAdapter(
       const latestUserIsRecovery = latestUserMsg
         ? isRecoveryUserMessage(latestUserMsg)
         : false;
+      const recoveryMessageId =
+        latestUserIsRecovery && latestUserMsg?.id?.trim()
+          ? latestUserMsg.id.trim()
+          : null;
+      if (recoveryMessageId) {
+        if (claimedRecoveryMessageIds.has(recoveryMessageId)) return;
+        claimedRecoveryMessageIds.add(recoveryMessageId);
+      }
       const lastUserMsg =
         latestUserIsRecovery && latestUserIndex >= 0
           ? (latestUserMessage(adapterMessages, {
@@ -1638,7 +1650,7 @@ export function createAgentChatAdapter(
         structuredHistory;
       let includeAttachments = attachments.length > 0;
       let includeReferences = Boolean(runConfig?.custom?.references);
-      let internalContinuationRequest = false;
+      let internalContinuationRequest = latestUserIsRecovery;
       let startupRecoveryAttempts = 0;
       let queuedConflictRetries = 0;
       let staleRunContinuationAttempts = 0;