@agent-native/core 0.32.1 → 0.32.17

package/dist/client/MultiTabAssistantChat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiTabAssistantChat.d.ts","sourceRoot":"","sources":["../../src/client/MultiTabAssistantChat.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAUf,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,oBAAoB,CAAC;AAc5B,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,uBAAuB,CAAC;AAwnB/B,UAAU,OAAO;IACf,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC;IACzC,uDAAuD;IACvD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qEAAqE;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,6EAA6E;IAC7E,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAC3C,kBAAkB,EAClB,OAAO,GAAG,UAAU,CACrB,GAAG;IACF,sCAAsC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iDAAiD;IACjD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,gCAAgC,KAAK,KAAK,CAAC,SAAS,CAAC;IAC5E,2DAA2D;IAC3D,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,gCAAgC,KAAK,KAAK,CAAC,SAAS,CAAC;IAC7E,sGAAsG;IACtG,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,yFAAyF;IACzF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4EAA4E;IAC5E,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,mEAAmE;IACnE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,EACpC,UAAiB,EACjB,YAAY,EACZ,aAAa,EACb,aAAqB,EACrB,MAAqD,EACrD,UAAU,EACV,mBAA0B,EAC1B,YAAY,EACZ,KAAY,EACZ,GAAG,KAAK,EACT,EAAE,0BAA0B,2CA82C5B"}
+{"version":3,"file":"MultiTabAssistantChat.d.ts","sourceRoot":"","sources":["../../src/client/MultiTabAssistantChat.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAUf,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,oBAAoB,CAAC;AAc5B,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,uBAAuB,CAAC;AA8nB/B,UAAU,OAAO;IACf,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC;IACzC,uDAAuD;IACvD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qEAAqE;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AA4ED,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,6EAA6E;IAC7E,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAC3C,kBAAkB,EAClB,OAAO,GAAG,UAAU,CACrB,GAAG;IACF,sCAAsC;IACtC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iDAAiD;IACjD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,gCAAgC,KAAK,KAAK,CAAC,SAAS,CAAC;IAC5E,2DAA2D;IAC3D,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,gCAAgC,KAAK,KAAK,CAAC,SAAS,CAAC;IAC7E,sGAAsG;IACtG,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,yFAAyF;IACzF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4EAA4E;IAC5E,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,mEAAmE;IACnE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,EACpC,UAAiB,EACjB,YAAY,EACZ,aAAa,EACb,aAAqB,EACrB,MAAqD,EACrD,UAAU,EACV,mBAA0B,EAC1B,YAAY,EACZ,KAAY,EACZ,GAAG,KAAK,EACT,EAAE,0BAA0B,2CAykD5B"}

package/dist/client/MultiTabAssistantChat.js

@@ -11,6 +11,7 @@ import { agentNativePath } from "./api-path.js";
 import { RunStuckBanner } from "./RunStuckBanner.js";
 import { DEFAULT_MODEL } from "../agent/default-model.js";
 import { getReasoningEffortOptionsForModel, isReasoningEffort, } from "../shared/reasoning-effort.js";
+import { appendAgentChatContextToMessage, normalizeAgentChatContextItem, } from "./agent-chat.js";
 const MODEL_SELECTION_STORAGE_KEY = "agent-native:chat-models:selection";
 function readStoredModelSelection(key) {
     if (typeof window === "undefined")
@@ -266,6 +267,41 @@ function HelpPopover({ onClose }) {
     ];
     return (_jsxs(_Fragment, { children: [_jsx("div", { className: "fixed inset-0 z-40", onClick: onClose }), _jsxs("div", { className: "absolute right-2 top-0 z-50 w-72 rounded-lg border border-border bg-popover shadow-lg", children: [_jsxs("div", { className: "flex items-center justify-between px-3 py-2 border-b border-border", children: [_jsx("span", { className: "text-xs font-medium text-foreground", children: "Available Commands" }), _jsx("button", { onClick: onClose, "aria-label": "Close help", className: "flex h-5 w-5 items-center justify-center rounded text-muted-foreground hover:text-foreground", children: _jsx(IconX, { size: 12 }) })] }), _jsx("div", { className: "py-1", children: commands.map((cmd) => (_jsxs("div", { className: "px-3 py-1.5", children: [_jsx("div", { className: "text-xs font-medium text-foreground", children: cmd.name }), _jsx("div", { className: "text-[11px] text-muted-foreground", children: cmd.description })] }, cmd.name))) })] })] }));
 }
+function readString(value) {
+    return typeof value === "string" ? value.trim() : "";
+}
+function isActiveAgentTeamStatus(status) {
+    return (status === "queued" ||
+        status === "running" ||
+        status === "paused" ||
+        status === "needs-approval");
+}
+function chatTabStatusFromAgentTeamStatus(status) {
+    if (!status)
+        return undefined;
+    return isActiveAgentTeamStatus(status) ? "running" : "completed";
+}
+function runToAgentTeamTabInfo(run) {
+    if (run.sourceRecord?.type && run.sourceRecord.type !== "agent-team-task") {
+        return null;
+    }
+    const metadata = run.metadata ?? {};
+    const threadId = readString(run.sourceRecord?.threadId) || readString(metadata.threadId);
+    const parentThreadId = readString(run.sourceRecord?.parentThreadId) ||
+        readString(metadata.parentThreadId);
+    if (!threadId || !parentThreadId || threadId === parentThreadId)
+        return null;
+    const name = readString(run.sourceRecord?.name) ||
+        readString(metadata.name) ||
+        readString(run.title) ||
+        "Sub-agent";
+    return {
+        threadId,
+        parentThreadId,
+        name,
+        status: run.status ?? "unknown",
+    };
+}
 export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderOverlay, contentHidden = false, apiUrl = agentNativePath("/_agent-native/agent-chat"), storageKey, restoreActiveThread = true, browserTabId, scope = null, ...props }) {
     const { threads, activeThreadId, isLoading, createThread, switchThread, detachThread, forkThread, saveThreadData, generateTitle, searchThreads, refreshThreads, isNewThread, } = useChatThreads(apiUrl, storageKey, scope, { restoreActiveThread });
     // Namespace all localStorage keys by storageKey when provided (for per-app isolation in frame)
@@ -280,6 +316,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         mountedTabsRef.current.add(activeThreadId);
     const chatRefs = useRef(new Map());
     const pendingSends = useRef(new Map());
+    const pendingContextItems = useRef(new Map());
     const [runningThreads, setRunningThreads] = useState(new Set());
     const [showHistory, setShowHistory] = useState(false);
     const newThreadIds = useRef(new Set());
@@ -296,6 +333,19 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         setModelSelectionVersion((version) => version + 1);
     }, []);
     const postMessageSubmissionsDisabled = props.composerDisabled === true;
+    const setContextInTab = useCallback((threadId, item) => {
+        const ref = chatRefs.current.get(threadId);
+        if (ref) {
+            ref.setComposerContextItem(item);
+            return;
+        }
+        const existing = pendingContextItems.current.get(threadId) ?? [];
+        const index = existing.findIndex((current) => current.key === item.key);
+        const next = index === -1
+            ? [...existing, item]
+            : existing.map((current, currentIndex) => currentIndex === index ? item : current);
+        pendingContextItems.current.set(threadId, next);
+    }, []);
     const resolveThreadModelSelection = useCallback((threadId) => resolveModelSelection(threadModelRef.current.get(threadId) ?? persistedModelSelection, availableModels), [availableModels, persistedModelSelection, modelSelectionVersion]);
     const persistModelSelection = useCallback((selection) => {
         setPersistedModelSelection(selection);
@@ -459,6 +509,9 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         catch { }
         return {};
     });
+    const parentMapRef = useRef(parentMap);
+    parentMapRef.current = parentMap;
+    const dismissedSubAgentTabsRef = useRef(new Set());
     // Persist parent map to localStorage
     useEffect(() => {
         try {
@@ -478,6 +531,9 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         catch { }
         return {};
     });
+    const subAgentNamesRef = useRef(subAgentNames);
+    subAgentNamesRef.current = subAgentNames;
+    const [subAgentStatuses, setSubAgentStatuses] = useState({});
     useEffect(() => {
         try {
             localStorage.setItem(SUB_AGENT_NAMES_KEY, JSON.stringify(subAgentNames));
@@ -511,6 +567,8 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         catch { }
         return [];
     });
+    const openTabIdsRef = useRef(openTabIds);
+    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
@@ -677,6 +735,107 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
             });
         }
     }, [isLoading, openTabIds, activeThreadId, createThread]);
+    useEffect(() => {
+        let stopped = false;
+        let timer = null;
+        const runsUrl = `${apiUrl.replace(/\/$/, "")}/runs/list?goalId=agent-team`;
+        async function hydrateAgentTeamTabs() {
+            try {
+                const res = await fetch(runsUrl);
+                if (res.ok) {
+                    const data = (await res.json());
+                    const infos = Array.isArray(data.runs)
+                        ? data.runs
+                            .map(runToAgentTeamTabInfo)
+                            .filter((info) => Boolean(info))
+                        : [];
+                    setSubAgentStatuses((prev) => {
+                        let changed = false;
+                        const next = {};
+                        for (const info of infos) {
+                            next[info.threadId] = info.status;
+                            if (prev[info.threadId] !== info.status)
+                                changed = true;
+                        }
+                        if (Object.keys(prev).length !== Object.keys(next).length) {
+                            changed = true;
+                        }
+                        return changed ? next : prev;
+                    });
+                    const openSet = new Set(openTabIdsRef.current);
+                    const candidates = infos.filter((info) => !dismissedSubAgentTabsRef.current.has(info.threadId) &&
+                        (openSet.has(info.parentThreadId) || openSet.has(info.threadId)));
+                    if (candidates.length > 0) {
+                        const shouldRefreshThreads = candidates.some((info) => !openSet.has(info.threadId) && openSet.has(info.parentThreadId));
+                        const candidateParents = new Map(candidates.map((info) => [info.threadId, info.parentThreadId]));
+                        setParentMap((prev) => {
+                            let next = prev;
+                            for (const info of candidates) {
+                                if (next[info.threadId] === info.parentThreadId)
+                                    continue;
+                                next =
+                                    next === prev
+                                        ? { ...prev, [info.threadId]: info.parentThreadId }
+                                        : { ...next, [info.threadId]: info.parentThreadId };
+                            }
+                            return next;
+                        });
+                        setSubAgentNames((prev) => {
+                            let next = prev;
+                            for (const info of candidates) {
+                                if (!info.name || next[info.threadId] === info.name)
+                                    continue;
+                                next =
+                                    next === prev
+                                        ? { ...prev, [info.threadId]: info.name }
+                                        : { ...next, [info.threadId]: info.name };
+                            }
+                            return next;
+                        });
+                        setOpenTabIds((prev) => {
+                            let next = prev;
+                            for (const info of candidates) {
+                                if (next.includes(info.threadId))
+                                    continue;
+                                const parentIdx = next.indexOf(info.parentThreadId);
+                                if (parentIdx === -1)
+                                    continue;
+                                if (next === prev)
+                                    next = [...prev];
+                                let insertIdx = parentIdx + 1;
+                                while (insertIdx < next.length) {
+                                    const siblingParent = parentMapRef.current[next[insertIdx]] ||
+                                        candidateParents.get(next[insertIdx]);
+                                    if (siblingParent !== info.parentThreadId)
+                                        break;
+                                    insertIdx++;
+                                }
+                                next.splice(insertIdx, 0, info.threadId);
+                            }
+                            return next;
+                        });
+                        if (shouldRefreshThreads) {
+                            void refreshThreads();
+                        }
+                    }
+                }
+            }
+            catch {
+                // Best effort: task cards and manual history still work if this poll fails.
+            }
+            finally {
+                if (!stopped) {
+                    timer = setTimeout(hydrateAgentTeamTabs, 3000);
+                }
+            }
+        }
+        hydrateAgentTeamTabs();
+        return () => {
+            stopped = true;
+            if (timer)
+                clearTimeout(timer);
+        };
+    }, [apiUrl, refreshThreads]);
     // Focus the composer when switching tabs
     useEffect(() => {
         if (!activeThreadId)
@@ -730,6 +889,22 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         const handler = (event) => {
             if (!isTrustedFrameMessage(event))
                 return;
+            if (event.data?.type === "agentNative.setChatContext") {
+                const item = normalizeAgentChatContextItem(event.data.data);
+                if (!item)
+                    return;
+                const openSidebar = event.data.data?.openSidebar;
+                if (openSidebar !== false) {
+                    window.dispatchEvent(new CustomEvent("agent-panel:open"));
+                }
+                if (postMessageSubmissionsDisabled)
+                    return;
+                const currentTabId = activeThreadIdRef.current;
+                if (!currentTabId)
+                    return;
+                setContextInTab(currentTabId, item);
+                return;
+            }
             if (event.data?.type !== "agentNative.submitChat")
                 return;
             const message = event.data.data?.message;
@@ -743,6 +918,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
             const tabId = event.data.data?.tabId;
             const requestedTabId = typeof tabId === "string" ? tabId : undefined;
             const background = event.data.data?.background;
+            const submit = event.data.data?.submit !== false;
             const rawImages = event.data.data?.images;
             const images = Array.isArray(rawImages)
                 ? rawImages.filter((image) => typeof image === "string" && image.length > 0)
@@ -757,7 +933,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
             // Plan mode is sent as request metadata by the chat adapter. Keep the
             // user-visible message clean so mode instructions never enter history.
             const fullMessage = context
-                ? `${message}\n\n<context>\n${context}\n</context>`
+                ? appendAgentChatContextToMessage(message, context)
                 : message;
             const sendToTab = (threadId) => {
                 // If a model override was specified, apply it only if we recognize it
@@ -780,10 +956,19 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                 }
                 const ref = chatRefs.current.get(threadId);
                 if (ref) {
-                    ref.sendMessage(fullMessage, images);
+                    if (submit) {
+                        ref.sendMessage(fullMessage, images);
+                    }
+                    else {
+                        ref.prefillMessage(fullMessage);
+                    }
                 }
                 else {
-                    pendingSends.current.set(threadId, { message: fullMessage, images });
+                    pendingSends.current.set(threadId, {
+                        message: fullMessage,
+                        images,
+                        submit,
+                    });
                 }
             };
             if (newTab) {
@@ -812,15 +997,37 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         bumpModelSelectionVersion,
         createThread,
         postMessageSubmissionsDisabled,
+        setContextInTab,
         switchThread,
     ]);
     // Process pending sends when refs mount
     useEffect(() => {
-        for (const [tabId, pending] of pendingSends.current) {
+        const pendingTabIds = new Set([
+            ...pendingSends.current.keys(),
+            ...pendingContextItems.current.keys(),
+        ]);
+        for (const tabId of pendingTabIds) {
             const ref = chatRefs.current.get(tabId);
             if (ref) {
-                setTimeout(() => ref.sendMessage(pending.message, pending.images), 50);
-                pendingSends.current.delete(tabId);
+                const pendingContext = pendingContextItems.current.get(tabId);
+                if (pendingContext) {
+                    for (const item of pendingContext) {
+                        ref.setComposerContextItem(item);
+                    }
+                    pendingContextItems.current.delete(tabId);
+                }
+                const pending = pendingSends.current.get(tabId);
+                if (pending) {
+                    setTimeout(() => {
+                        if (pending.submit) {
+                            ref.sendMessage(pending.message, pending.images);
+                        }
+                        else {
+                            ref.prefillMessage(pending.message);
+                        }
+                    }, 50);
+                    pendingSends.current.delete(tabId);
+                }
             }
         }
     }, [openTabIds]);
@@ -854,6 +1061,9 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         }
     }, [createThread]);
     const closeTab = useCallback((tabId) => {
+        if (parentMapRef.current[tabId]) {
+            dismissedSubAgentTabsRef.current.add(tabId);
+        }
         setOpenTabIds((prev) => {
             if (prev.length <= 1) {
                 // Last tab — create a new one and replace the old tab atomically
@@ -874,6 +1084,7 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         });
         chatRefs.current.delete(tabId);
         pendingSends.current.delete(tabId);
+        pendingContextItems.current.delete(tabId);
         newThreadIds.current.delete(tabId);
         threadModelRef.current.delete(tabId);
         // Clean up parent map and sub-agent names
@@ -889,8 +1100,19 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
             const { [tabId]: _, ...rest } = prev;
             return rest;
         });
+        setSubAgentStatuses((prev) => {
+            if (!(tabId in prev))
+                return prev;
+            const { [tabId]: _, ...rest } = prev;
+            return rest;
+        });
     }, [switchThread, createThread]);
     const closeOtherTabs = useCallback((tabId) => {
+        for (const id of openTabIdsRef.current) {
+            if (id !== tabId && parentMapRef.current[id]) {
+                dismissedSubAgentTabsRef.current.add(id);
+            }
+        }
         setOpenTabIds([tabId]);
         if (activeThreadIdRef.current !== tabId) {
             switchThread(tabId);
@@ -898,6 +1120,9 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         // Clean up refs for closed tabs
         for (const key of chatRefs.current.keys()) {
             if (key !== tabId) {
+                if (parentMapRef.current[key]) {
+                    dismissedSubAgentTabsRef.current.add(key);
+                }
                 chatRefs.current.delete(key);
                 pendingSends.current.delete(key);
                 newThreadIds.current.delete(key);
@@ -915,6 +1140,11 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
                 return { [tabId]: prev[tabId] };
             return {};
         });
+        setSubAgentStatuses((prev) => {
+            if (tabId in prev)
+                return { [tabId]: prev[tabId] };
+            return {};
+        });
     }, [switchThread]);
     const closeAllTabs = useCallback(async () => {
         const id = await createThread();
@@ -922,12 +1152,14 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
             newThreadIds.current.add(id);
             setOpenTabIds([id]);
             switchThread(id);
+            dismissedSubAgentTabsRef.current.clear();
             // Clean up all old refs
             chatRefs.current.clear();
             pendingSends.current.clear();
             threadModelRef.current.clear();
             setParentMap({});
             setSubAgentNames({});
+            setSubAgentStatuses({});
         }
     }, [createThread, switchThread]);
     // Keyboard shortcuts dispatched from AgentPanel based on the active mode
@@ -983,8 +1215,13 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
             const threadId = detail?.threadId;
             if (!threadId)
                 return;
-            // The current active thread is the parent that spawned this sub-agent
-            const parentId = activeThreadIdRef.current;
+            dismissedSubAgentTabsRef.current.delete(threadId);
+            // Prefer an explicit parent (RunsTray/background hydration knows it);
+            // inline task cards fall back to the active orchestrator thread.
+            const explicitParentId = typeof detail?.parentThreadId === "string"
+                ? detail.parentThreadId.trim()
+                : "";
+            const parentId = explicitParentId || activeThreadIdRef.current;
             if (parentId && parentId !== threadId) {
                 setParentMap((prev) => prev[threadId] === parentId
                     ? prev
@@ -1126,14 +1363,16 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
         .filter((id) => threadMap.has(id) || id === activeThreadId)
         .map((id) => {
         const t = threadMap.get(id);
+        const agentTeamStatus = chatTabStatusFromAgentTeamStatus(subAgentStatuses[id]);
         return {
             id,
             label: t?.title || t?.preview?.slice(0, 30) || "New chat",
-            status: runningThreads.has(id)
-                ? "running"
-                : (messageCounts[id] ?? t?.messageCount ?? 0) > 0
-                    ? "completed"
-                    : "idle",
+            status: agentTeamStatus ??
+                (runningThreads.has(id)
+                    ? "running"
+                    : (messageCounts[id] ?? t?.messageCount ?? 0) > 0
+                        ? "completed"
+                        : "idle"),
             parentThreadId: parentMap[id],
             subAgentName: subAgentNames[id],
         };
@@ -1144,7 +1383,8 @@ export function MultiTabAssistantChat({ showTabBar = true, renderHeader, renderO
             tabs.push({
                 id,
                 label: subAgentNames[id] || (parentMap[id] ? "Sub-agent..." : "New chat"),
-                status: "running",
+                status: chatTabStatusFromAgentTeamStatus(subAgentStatuses[id]) ??
+                    "running",
                 parentThreadId: parentMap[id],
                 subAgentName: subAgentNames[id],
             });