@tutti-os/agent-gui 0.0.53 → 0.0.54

package/dist/index.js

@@ -18,11 +18,11 @@ import {
   localAgentGUIProviderTargetId,
   normalizeAgentGUIProviderTargets,
   resolveAgentGUIProviderTarget
-} from "./chunk-4K22O34C.js";
+} from "./chunk-7GM7UQXD.js";
 import {
   AgentInteractivePromptSurface,
   approvalOptionDisplayLabel
-} from "./chunk-BFIYBPFD.js";
+} from "./chunk-6AXH2BOD.js";
 import {
   PLAN_IMPLEMENTATION_ACTION_FEEDBACK,
   PLAN_IMPLEMENTATION_ACTION_IMPLEMENT,
@@ -41,7 +41,7 @@ import {
   resolveAgentGUIExplicitConversationTitle,
   resolveAgentGUIProviderDisplayLabel,
   resolveAgentGUIProviderIdentity
-} from "./chunk-DPG2J7N5.js";
+} from "./chunk-CMOGPJ23.js";
 import {
   AgentConversationFlow,
   Button,
@@ -63,13 +63,14 @@ import {
   skillTriggerForPrefix,
   toLocalShortDateTime,
   useProjectedAgentConversation
-} from "./chunk-3ZVVFQH5.js";
+} from "./chunk-EXZH66UE.js";
 import {
   AgentMessageMarkdown,
+  AgentTargetPresentationProvider,
   ZoomableImage,
   cn,
   resolveWorkspaceLinkAction
-} from "./chunk-PIKG746A.js";
+} from "./chunk-ZFDO72FE.js";
 import {
   AGENT_MENTION_FILTER_TAB_ORDER,
   AgentFileMentionPalette,
@@ -77,7 +78,7 @@ import {
   DEFAULT_AGENT_MENTION_FILTER,
   agentMentionItemKey,
   preloadAgentMentionBrowse
-} from "./chunk-2OLYX32K.js";
+} from "./chunk-7ZDLFTVL.js";
 import {
   WORKSPACE_AGENT_ACTIVITY_RUNTIME_SESSION_ORIGIN,
   buildWorkspaceAgentActivityListViewModel,
@@ -87,17 +88,13 @@ import {
   isWorkspaceAgentUntitledTask,
   mergeWorkspaceAgentActivityDurableAndOverlayMessages,
   selectWorkspaceAgentActivityOverlayMessages
-} from "./chunk-GWHPTB4L.js";
+} from "./chunk-PBHTLI3E.js";
 import {
-  MANAGED_AGENT_ICON_FALLBACK_URL,
-  MANAGED_AGENT_ICON_URLS,
-  Spinner,
-  normalizeManagedAgentProvider
-} from "./chunk-HDBKB5RA.js";
+  Spinner
+} from "./chunk-WMQN7SZC.js";
 import {
   resolveWorkspaceAgentSessionSortTimeUnixMs
 } from "./chunk-IBIMGLCD.js";
-import "./chunk-MTFSQWZ6.js";
 import {
   AGENT_RICH_TEXT_CARET_ANCHOR,
   exitAgentFileMentionSuggestion,
@@ -105,15 +102,18 @@ import {
   mentionItemToAttrs,
   normalizeAgentSessionMentionTitle,
   parseMentionItemFromHref
-} from "./chunk-UKDC63WG.js";
+} from "./chunk-JRA44NYI.js";
 import "./chunk-Y35GDLP2.js";
 import "./chunk-LUGELG5V.js";
 import {
   AgentActivityHostProvider,
   AgentActivityRuntimeProvider,
+  MANAGED_AGENT_ICON_FALLBACK_URL,
+  MANAGED_AGENT_ICON_URLS,
   getAgentActivityRuntime,
   getOptionalAgentActivityRuntime,
   getOptionalAgentHostApi,
+  normalizeManagedAgentProvider,
   resetAgentActivityRuntimeForTests,
   setAgentActivityRuntimeForTests,
   useAgentActivityRuntime,
@@ -121,9 +121,10 @@ import {
   useAgentHostApi,
   useOptionalAgentActivityRuntime,
   useOptionalAgentHostApi
-} from "./chunk-66EQ6EQO.js";
+} from "./chunk-GL54NRMB.js";
 import "./chunk-TYGL25EL.js";
 import "./chunk-PJP5BUU6.js";
+import "./chunk-MTFSQWZ6.js";
 import {
   AGENT_CONTEXT_MENTION_PROVIDER_IDS
 } from "./chunk-JM24HADP.js";
@@ -137,8 +138,8 @@ import {
   agentGuiI18nResources,
   translate,
   useTranslation
-} from "./chunk-Y7ZVTWMZ.js";
-import "./chunk-ZTSS2NU2.js";
+} from "./chunk-H2YWXFYX.js";
+import "./chunk-2XVECUTU.js";
 
 // shared/agentActivitySnapshotProjection.ts
 import {
@@ -2338,6 +2339,35 @@ var DEFAULT_AGENT_SETTINGS = {
   hideWorktreeMismatchDropWarning: false
 };
 
+// agent-gui/agentGuiNode/model/agentGuiConversationFilter.ts
+function createAgentGUIConversationFilterState(filter = { kind: "all" }) {
+  return {
+    filter: normalizeAgentGUIConversationFilter(filter)
+  };
+}
+function normalizeAgentGUIConversationFilter(filter) {
+  if (filter?.kind === "agentTarget") {
+    const agentTargetId = filter.agentTargetId?.trim() ?? "";
+    return agentTargetId ? { kind: "agentTarget", agentTargetId } : { kind: "all" };
+  }
+  return { kind: "all" };
+}
+function filterAgentGUIConversationSummaries(conversations, filter) {
+  const normalizedFilter = normalizeAgentGUIConversationFilter(filter);
+  return conversations.filter(
+    (conversation) => matchesAgentGUIConversationFilterAgentTarget(
+      conversation.agentTargetId,
+      normalizedFilter
+    )
+  );
+}
+function matchesAgentGUIConversationFilterAgentTarget(agentTargetId, filter) {
+  if (filter.kind === "all") {
+    return true;
+  }
+  return (agentTargetId?.trim() ?? "") === filter.agentTargetId;
+}
+
 // agent-gui/agentGuiNode/model/agentGuiConversationProjectResolver.ts
 import { resolveWorkspaceUserProjectDisplayLabel } from "@tutti-os/workspace-user-project/core";
 var AGENT_GUI_CONVERSATION_PROJECT_SUMMARY_CACHE_LIMIT = 512;
@@ -2470,6 +2500,7 @@ function resolveAgentGUIConversationSortTimeUnixMs(conversation) {
   return conversation.sortTimeUnixMs ?? conversation.updatedAtUnixMs;
 }
 function buildAgentGUIConversationSummaries({
+  conversationFilter,
   isNoProjectPath,
   snapshot: snapshot3,
   provider,
@@ -2484,15 +2515,25 @@ function buildAgentGUIConversationSummaries({
     userProjects,
     { isNoProjectPath }
   );
-  return buildWorkspaceAgentActivityListViewModel(runtimeSnapshot, {
-    sessionMessagesById
-  }).activities.map(
+  const conversations = buildWorkspaceAgentActivityListViewModel(
+    runtimeSnapshot,
+    {
+      sessionMessagesById
+    }
+  ).activities.map(
     (activity) => conversationSummaryFromActivity(
       activity,
       sessionsById.get(activity.sessionId),
       { projectResolver }
     )
-  ).filter(
+  );
+  if (conversationFilter) {
+    return filterAgentGUIConversationSummaries(
+      conversations,
+      normalizeAgentGUIConversationFilter(conversationFilter)
+    );
+  }
+  return conversations.filter(
     (conversation) => conversation.provider === provider || conversation.provider === "unknown"
   );
 }
@@ -2588,6 +2629,7 @@ function conversationSummaryFromAgentSession(session, options = {}) {
   return {
     id: session.agentSessionId.trim(),
     userId: "",
+    agentTargetId: session.agentTargetId ?? null,
     provider,
     resumable: session.resumable,
     title,
@@ -2684,6 +2726,7 @@ function conversationSummaryFromActivity(activity, session, options) {
   return {
     id: activity.sessionId,
     userId: session?.userId?.trim() ?? "",
+    agentTargetId: session?.agentTargetId ?? null,
     provider,
     resumable: session?.resumable,
     title,
@@ -2768,6 +2811,7 @@ function timelineSessionFromItems(timelineItems, conversation) {
     cwd: conversation?.cwd?.trim() ?? "",
     lifecycleStatus: sessionLifecycleStatus(conversation?.status ?? "ready"),
     turnPhase: conversation?.status === "working" ? "working" : "idle",
+    turnLifecycle: conversation?.turnLifecycle ?? null,
     effectiveStatus: conversation?.status ?? "ready",
     status: conversation?.status ?? "ready",
     title: conversation?.title,
@@ -3377,6 +3421,7 @@ function projectWorkspaceAgentMessagesToTimelineItems(messages) {
         ...message.status?.trim() ? { status: message.status.trim() } : {}
       });
       mergedToolPayloadByKey.set(toolKey, mergedPayload);
+      const callType = firstNonEmptyString(stringValue(mergedPayload.callType)) || "tool";
       const workspaceId = workspaceIdFromMessage(message);
       return {
         id,
@@ -3389,7 +3434,7 @@ function projectWorkspaceAgentMessagesToTimelineItems(messages) {
         actorId: message.agentSessionId,
         itemType: toolCallItemType(message.status ?? void 0),
         role: "assistant",
-        callType: "tool",
+        callType,
         callId,
         name: firstNonEmptyString(toolName, titleToolName) || "Tool",
         ...message.status !== void 0 ? { status: message.status } : {},
@@ -4830,20 +4875,43 @@ function normalizeQuery(input) {
     return null;
   }
   return {
+    conversationFilter: normalizeAgentGUIConversationListFilter(input),
     workspaceId,
     userId,
     provider,
     sessionOrigin
   };
 }
+function normalizeAgentGUIConversationListFilter(input) {
+  if (input.conversationFilter) {
+    return normalizeAgentGUIConversationFilter(input.conversationFilter);
+  }
+  return null;
+}
+function conversationFilterKey(filter, provider) {
+  if (!filter) {
+    return `legacy-provider:${provider}`;
+  }
+  const normalized = normalizeAgentGUIConversationFilter(filter);
+  if (normalized.kind === "all") {
+    return "all";
+  }
+  return `agent-target:${normalized.agentTargetId}`;
+}
 function createAgentGUIConversationListQueryKey(input) {
   const normalized = normalizeQuery(input);
-  return normalized ? [
+  if (!normalized) {
+    return null;
+  }
+  const providerScope = normalized.conversationFilter ? "conversation-filter" : normalized.provider;
+  const queryKey = [
     normalized.workspaceId,
     normalized.userId,
-    normalized.provider,
+    providerScope,
+    conversationFilterKey(normalized.conversationFilter, normalized.provider),
     normalized.sessionOrigin
-  ].join("::") : null;
+  ].join("::");
+  return queryKey;
 }
 function createEmptyQueryState(query) {
   const normalized = normalizeQuery(query);
@@ -5531,6 +5599,9 @@ function getWorkspaceAgentSnapshotForConversations(input) {
   const snapshot3 = getAgentActivityRuntime().getSnapshot(input.workspaceId);
   return workspaceAgentSnapshotForConversations(snapshot3);
 }
+function shouldUseCurrentWorkspaceAgentSnapshotForRefresh(reason) {
+  return reason === "workspace-agent-update" || reason === "session-overlay-update";
+}
 async function refreshAgentGUIConversationListQuery(query, reason, options = {}) {
   const state = ensureQueryState(query);
   if (!state) {
@@ -5558,7 +5629,9 @@ async function refreshAgentGUIConversationListQuery(query, reason, options = {})
       sessionOrigin: state.query.sessionOrigin,
       userId: state.query.userId
     };
-    const workspaceAgentSnapshot = reason === "workspace-agent-update" || reason === "session-overlay-update" ? getWorkspaceAgentSnapshotForConversations(workspaceAgentsInput) : await loadWorkspaceAgentSnapshotForConversations(
+    const currentWorkspaceAgentSnapshot = getWorkspaceAgentSnapshotForConversations(workspaceAgentsInput);
+    const canProjectExplicitFilterFromCurrentSnapshot = reason === "projection-sync" && state.query.conversationFilter !== null && currentWorkspaceAgentSnapshot.sessions.length > 0;
+    const workspaceAgentSnapshot = shouldUseCurrentWorkspaceAgentSnapshotForRefresh(reason) || canProjectExplicitFilterFromCurrentSnapshot ? currentWorkspaceAgentSnapshot : await loadWorkspaceAgentSnapshotForConversations(
       workspaceAgentsInput
     );
     if (requestId !== requestIdByQueryKey.get(queryKey)) {
@@ -5613,6 +5686,7 @@ async function refreshAgentGUIConversationListQuery(query, reason, options = {})
       return agentSessionId && dirtySessionIds.has(agentSessionId) || syncSessionId && dirtySessionIds.has(syncSessionId);
     }) : workspaceAgentSnapshot.sessions;
     const baseConversations = buildAgentGUIConversationSummaries({
+      ...state.query.conversationFilter ? { conversationFilter: state.query.conversationFilter } : {},
       snapshot: canApplyDirtySessionProjection ? {
         ...workspaceAgentSnapshot,
         sessions: projectionSessions
@@ -6171,6 +6245,7 @@ function useAgentGUIActivation({
           mode: input.mode,
           workspaceId,
           agentSessionId,
+          agentTargetId: input.agentTargetId,
           provider: input.provider,
           cwd: input.cwd,
           initialContent: input.initialContent,
@@ -6481,7 +6556,8 @@ function buildNodeDefaultComposerSettings(data, options) {
   };
 }
 function nodeComposerOverridesForProvider(data) {
-  return data.composerOverridesByProvider?.[data.provider] ?? data.composerOverrides ?? null;
+  const agentTargetId = normalizeOptionalText(data.agentTargetId);
+  return (agentTargetId ? data.composerOverridesByAgentTargetId?.[agentTargetId] : null) ?? data.composerOverridesByProvider?.[data.provider] ?? data.composerOverrides ?? null;
 }
 function composerSupportForProvider(provider) {
   if (provider === "claude-code" || provider === "codex" || provider === "gemini") {
@@ -6513,6 +6589,16 @@ function nodeDataFromComposerSettings(current, settings) {
     computerUse: settings.computerUse,
     permissionModeId: normalizePermissionModeId(settings.permissionModeId)
   };
+  const agentTargetId = normalizeOptionalText(current.agentTargetId);
+  if (agentTargetId) {
+    return {
+      ...current,
+      composerOverridesByAgentTargetId: {
+        ...current.composerOverridesByAgentTargetId ?? {},
+        [agentTargetId]: composerOverrides
+      }
+    };
+  }
   return {
     ...current,
     composerOverrides,
@@ -7734,6 +7820,41 @@ function normalizeAgentGUIOpenSessionRequest(request) {
 function recordValue2(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
+function numberValue(value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value;
+  }
+  if (typeof value === "string" && value.trim() !== "") {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  return null;
+}
+function activeBackgroundAgentCount(runtimeContext) {
+  const backgroundAgents = recordValue2(runtimeContext?.backgroundAgents);
+  if (!backgroundAgents) {
+    return 0;
+  }
+  const items = Array.isArray(backgroundAgents.items) ? backgroundAgents.items : [];
+  if (items.length === 0) {
+    const count = numberValue(backgroundAgents.count);
+    return count === null ? 0 : Math.max(0, Math.floor(count));
+  }
+  return items.filter((item) => {
+    const record = recordValue2(item);
+    if (!record) {
+      return false;
+    }
+    const status = String(record.status ?? "").trim().toLowerCase();
+    return ![
+      "completed",
+      "failed",
+      "cancelled",
+      "canceled",
+      "stopped"
+    ].includes(status);
+  }).length;
+}
 function appServerStartupMetadata(runtimeContext) {
   return recordValue2(runtimeContext?.appServerStartup);
 }
@@ -8152,21 +8273,25 @@ function areAgentComposerDraftsEqual(left, right) {
     return file.id === other.id && file.name === other.name && file.mimeType === other.mimeType && file.path === other.path && file.hostPath === other.hostPath && file.assetId === other.assetId && file.sizeBytes === other.sizeBytes && file.uploading === other.uploading && file.uploadError === other.uploadError;
   });
 }
-function nodeDefaultDraftKey(agentProvider) {
+function nodeDefaultDraftKey(agentProvider, agentTargetId) {
+  const normalizedAgentTargetId = normalizeOptionalText2(agentTargetId);
+  if (normalizedAgentTargetId) {
+    return `${NODE_DEFAULT_DRAFT_KEY}:target:${normalizedAgentTargetId}`;
+  }
   return `${NODE_DEFAULT_DRAFT_KEY}:${agentProvider}`;
 }
-function nodeDefaultDraftContentKey(agentProvider) {
-  return nodeDefaultDraftKey(agentProvider);
+function nodeDefaultDraftContentKey(agentProvider, agentTargetId) {
+  return nodeDefaultDraftKey(agentProvider, agentTargetId);
 }
 function normalizeProjectDraftPath(value) {
   const normalized = value?.trim().replaceAll("\\", "/").replace(/\/+$/, "");
   return normalized ? normalized : null;
 }
 function readNodeDefaultDraftContent(input) {
-  return input.drafts[nodeDefaultDraftContentKey(input.data.provider)] ?? input.drafts[NODE_DEFAULT_DRAFT_KEY] ?? EMPTY_AGENT_COMPOSER_DRAFT;
+  return input.drafts[nodeDefaultDraftContentKey(input.data.provider, input.data.agentTargetId)] ?? input.drafts[nodeDefaultDraftContentKey(input.data.provider)] ?? input.drafts[NODE_DEFAULT_DRAFT_KEY] ?? EMPTY_AGENT_COMPOSER_DRAFT;
 }
 function readNodeDefaultDraftSettings(input) {
-  return input.drafts[nodeDefaultDraftKey(input.data.provider)] ?? input.drafts[NODE_DEFAULT_DRAFT_KEY] ?? buildNodeDefaultComposerSettings(input.data, {
+  return input.drafts[nodeDefaultDraftKey(input.data.provider, input.data.agentTargetId)] ?? input.drafts[nodeDefaultDraftKey(input.data.provider)] ?? input.drafts[NODE_DEFAULT_DRAFT_KEY] ?? buildNodeDefaultComposerSettings(input.data, {
     defaultReasoningEffort: input.defaultReasoningEffort
   });
 }
@@ -8249,7 +8374,7 @@ function isCompletedOutcomeToken(value) {
   return value?.trim().toLowerCase() === "completed";
 }
 function hasSessionControlStatePatch(patch) {
-  return normalizeOptionalText2(patch.permissionModeId) !== null || patch.settings !== void 0 || patch.runtimeContext !== void 0 || patch.submitAvailability !== void 0 || patch.turn?.submitAvailability !== void 0 || patch.turn?.phase !== void 0;
+  return normalizeOptionalText2(patch.permissionModeId) !== null || patch.settings !== void 0 || patch.runtimeContext !== void 0 || patch.submitAvailability !== void 0 || patch.pendingInteractive !== void 0 || patch.turn?.submitAvailability !== void 0 || patch.turn?.phase !== void 0;
 }
 function mergeSessionControlStatePatch(current, patch) {
   if (!current || !hasSessionControlStatePatch(patch)) {
@@ -8313,6 +8438,10 @@ function mergeSessionControlStatePatch(current, patch) {
     next.submitAvailability = submitAvailability;
     changed = true;
   }
+  if (patch.pendingInteractive !== void 0 && !sameJSONValue(current.pendingInteractive ?? null, patch.pendingInteractive)) {
+    next.pendingInteractive = patch.pendingInteractive;
+    changed = true;
+  }
   if (patch.turn?.phase) {
     next.turnLifecycle = {
       activeTurnId: patch.turn.activeTurnId !== void 0 ? patch.turn.activeTurnId : patch.turn.phase === "settled" ? null : patch.turn.turnId,
@@ -8329,6 +8458,9 @@ function mergeSessionControlStatePatch(current, patch) {
   }
   return changed ? next : current;
 }
+function sameJSONValue(left, right) {
+  return JSON.stringify(left ?? null) === JSON.stringify(right ?? null);
+}
 function conversationStatusFromSessionState(state) {
   if (state.turnLifecycle?.phase) {
     return conversationStatusFromStatePatch({
@@ -8438,7 +8570,9 @@ function useAgentGUINodeController({
   workspacePath,
   avoidGroupingEdits,
   data,
+  conversationScope = "single-provider",
   providerTargets,
+  providerTargetsLoading = false,
   defaultProviderTargetId = null,
   openSessionRequest = null,
   prefillPromptRequest = null,
@@ -8458,23 +8592,37 @@ function useAgentGUINodeController({
     [providerTargets]
   );
   const normalizedProviderTargets = useMemo4(
-    () => normalizedExplicitProviderTargets.length > 0 ? normalizedExplicitProviderTargets : normalizeAgentGUIProviderTargets(null),
-    [normalizedExplicitProviderTargets]
+    () => providerTargetsLoading ? [] : providerTargets === void 0 ? normalizeAgentGUIProviderTargets(null) : normalizedExplicitProviderTargets,
+    [normalizedExplicitProviderTargets, providerTargets, providerTargetsLoading]
   );
-  const selectedProviderTarget = useMemo4(
-    () => resolveAgentGUIProviderTarget({
+  const shouldFallbackToLocalProviderTargets = providerTargets === void 0 && !providerTargetsLoading;
+  const selectedProviderTarget = useMemo4(() => {
+    const resolved = resolveAgentGUIProviderTarget({
+      agentTargetId: data.agentTargetId,
       defaultProviderTargetId,
+      fallbackToLocal: shouldFallbackToLocalProviderTargets,
       provider: data.provider,
       providerTargetId: data.providerTargetId,
       providerTargets: normalizedProviderTargets
-    }),
-    [
-      data.provider,
-      data.providerTargetId,
-      defaultProviderTargetId,
-      normalizedProviderTargets
-    ]
-  );
+    });
+    return resolved ?? {
+      targetId: data.agentTargetId ?? "__loading__",
+      provider: data.provider,
+      ref: {
+        kind: "loading",
+        provider: data.provider
+      },
+      label: data.provider,
+      disabled: true
+    };
+  }, [
+    data.agentTargetId,
+    data.provider,
+    data.providerTargetId,
+    defaultProviderTargetId,
+    normalizedProviderTargets,
+    shouldFallbackToLocalProviderTargets
+  ]);
   const selectedProviderTargetIsExplicit = useMemo4(
     () => normalizedExplicitProviderTargets.some(
       (target) => target.provider === selectedProviderTarget.provider && target.targetId === selectedProviderTarget.targetId && agentGUIProviderTargetRefsEqual(
@@ -8495,6 +8643,17 @@ function useAgentGUINodeController({
     return stable;
   }, [agentActivitySnapshot]);
   const generatedControllerOwnerKey = useId();
+  const [conversationFilter, setConversationFilter] = useState4(
+    () => createAgentGUIConversationFilterState().filter
+  );
+  const canUseConversationTargetFilter = conversationScope === "multi-provider";
+  const queryConversationFilter = canUseConversationTargetFilter ? conversationFilter : null;
+  useEffect4(() => {
+    if (canUseConversationTargetFilter || conversationFilter.kind === "all") {
+      return;
+    }
+    setConversationFilter({ kind: "all" });
+  }, [canUseConversationTargetFilter, conversationFilter]);
   const conversationListQuery = useMemo4(() => {
     const userId = currentUserId?.trim() ?? "";
     const provider = data.provider?.trim() ?? "";
@@ -8502,12 +8661,13 @@ function useAgentGUINodeController({
       return null;
     }
     return {
+      ...queryConversationFilter ? { conversationFilter: queryConversationFilter } : {},
       workspaceId,
       userId,
       provider: data.provider,
       sessionOrigin: AGENT_GUI_RUNTIME_SESSION_ORIGIN
     };
-  }, [currentUserId, data.provider, workspaceId]);
+  }, [currentUserId, data.provider, queryConversationFilter, workspaceId]);
   const conversationListState = useAgentGuiConversationList(
     conversationListQuery
   );
@@ -8601,7 +8761,7 @@ function useAgentGUINodeController({
     sessionViewRef(activeConversationId)
   );
   const activeSessionState = activeSessionView?.controlState ?? null;
-  const providerComposerOptions = agentActivitySnapshot.composerOptionsByProvider?.[data.provider] ?? null;
+  const providerComposerOptions = (data.agentTargetId ? agentActivitySnapshot.composerOptionsByAgentTargetId?.[data.agentTargetId] : null) ?? agentActivitySnapshot.composerOptionsByProvider?.[data.provider] ?? null;
   const resolvedPromptImagesSupported = resolveAgentActivityCapability2(
     "imageInput",
     {
@@ -8615,6 +8775,10 @@ function useAgentGUINodeController({
     sessionRuntimeContext: activeSessionState?.runtimeContext
   });
   const activeSessionRuntimeContext = activeSessionState?.runtimeContext;
+  const backgroundAgentCount = useMemo4(
+    () => activeBackgroundAgentCount(activeSessionRuntimeContext),
+    [activeSessionRuntimeContext]
+  );
   const composerSupport = useMemo4(
     () => composerSettingsSupportFromOptions(
       providerComposerOptions,
@@ -9173,7 +9337,17 @@ function useAgentGUINodeController({
     const previousQuery = previousSnapshot.query;
     const previousQueryKey = previousQuery ? createAgentGUIConversationListQueryKey(previousQuery) : null;
     const nextQueryKey = conversationListQuery ? createAgentGUIConversationListQueryKey(conversationListQuery) : null;
-    if (previousQuery && conversationListQuery && previousQueryKey !== nextQueryKey && previousQuery.workspaceId === conversationListQuery.workspaceId && previousQuery.provider === conversationListQuery.provider && previousQuery.sessionOrigin === conversationListQuery.sessionOrigin && previousSnapshot.conversations.length > 0) {
+    const previousHasExplicitFilter = previousQuery?.conversationFilter != null;
+    const nextHasExplicitFilter = conversationListQuery?.conversationFilter != null;
+    const previousFilterKey = previousQuery ? JSON.stringify(
+      normalizeAgentGUIConversationFilter(previousQuery.conversationFilter)
+    ) : "";
+    const nextFilterKey = conversationListQuery ? JSON.stringify(
+      normalizeAgentGUIConversationFilter(
+        conversationListQuery.conversationFilter
+      )
+    ) : "";
+    if (previousQuery && conversationListQuery && previousQueryKey !== nextQueryKey && previousQuery.workspaceId === conversationListQuery.workspaceId && previousQuery.provider === conversationListQuery.provider && previousHasExplicitFilter === nextHasExplicitFilter && previousFilterKey === nextFilterKey && previousQuery.sessionOrigin === conversationListQuery.sessionOrigin && previousSnapshot.conversations.length > 0) {
       ensureAgentGUIConversationListQuery(conversationListQuery);
       seedAgentGUIConversationListConversationsIfEmpty({
         query: conversationListQuery,
@@ -10340,6 +10514,7 @@ function useAgentGUINodeController({
   const loadDraftComposerOptions = useCallback4(
     (options) => {
       const provider = dataRef.current.provider;
+      const agentTargetId = dataRef.current.agentTargetId ?? null;
       if (isCreatingConversationRef.current) {
         return;
       }
@@ -10355,6 +10530,7 @@ function useAgentGUINodeController({
           cwd: composerOptionsCwd,
           force: options?.force,
           provider,
+          agentTargetId,
           settings
         })
       ).catch(() => void 0);
@@ -10368,7 +10544,7 @@ function useAgentGUINodeController({
     if (!supports.model && !supports.reasoning && !supports.permission) {
       return;
     }
-    const projectKey = `${data.provider}\0${selectedProjectPath ?? ""}`;
+    const projectKey = `${data.agentTargetId ?? data.provider}\0${selectedProjectPath ?? ""}`;
     const previousProjectKey = composerOptionsProjectKeyRef.current;
     composerOptionsProjectKeyRef.current = projectKey;
     if (previousProjectKey === null || previousProjectKey === projectKey) {
@@ -10376,6 +10552,7 @@ function useAgentGUINodeController({
     }
     loadDraftComposerOptions({ force: true });
   }, [
+    data.agentTargetId,
     data.provider,
     loadDraftComposerOptions,
     previewMode,
@@ -10435,6 +10612,7 @@ function useAgentGUINodeController({
     );
   }, [
     activeConversationId,
+    data.agentTargetId,
     data.provider,
     isComposerHome,
     loadDraftComposerOptions,
@@ -11031,6 +11209,11 @@ function useAgentGUINodeController({
       if (isCreatingConversation || target.disabled === true || data.provider === "openclaw" && openclawGateway?.status !== "ready") {
         return;
       }
+      const agentTargetId = target.agentTargetId?.trim() ?? "";
+      if (!agentTargetId && selectedProviderTargetIsExplicitRef.current) {
+        setDetailError(translate("agentHost.agentGui.agentTargetRequired"));
+        return;
+      }
       const normalizedInitialContent = Array.isArray(initialContentInput) ? normalizeAgentPromptContentBlocks(
         initialContentInput
       ) : textPromptContent(normalizeOptionalPrompt(initialContentInput));
@@ -11047,14 +11230,16 @@ function useAgentGUINodeController({
       void (async () => {
         const target2 = selectedProviderTargetRef.current;
         const provider = target2.provider;
-        const shouldUseProviderTargetRef = selectedProviderTargetIsExplicitRef.current;
+        const agentTargetId2 = target2.agentTargetId?.trim() ?? "";
+        const shouldUseProviderTargetRef = !agentTargetId2 && selectedProviderTargetIsExplicitRef.current;
         onDataChangeRef.current(
-          (current) => current.provider === provider && (current.providerTargetId ?? null) === (shouldUseProviderTargetRef ? target2.targetId : null) && agentGUIProviderTargetRefsEqual(
+          (current) => current.provider === provider && (current.agentTargetId ?? null) === (agentTargetId2 || null) && (current.providerTargetId ?? null) === (shouldUseProviderTargetRef ? target2.targetId : null) && agentGUIProviderTargetRefsEqual(
             current.providerTargetRef,
             shouldUseProviderTargetRef ? target2.ref : null
           ) ? current : {
             ...current,
             provider,
+            agentTargetId: agentTargetId2 || null,
             providerTargetId: shouldUseProviderTargetRef ? target2.targetId : null,
             providerTargetRef: shouldUseProviderTargetRef ? target2.ref : null
           }
@@ -11086,7 +11271,7 @@ function useAgentGUINodeController({
           lastActiveModelByProviderRef.current[provider]
         ) : null;
         const effectiveInitialSettings = inheritedModel === null ? initialSettings : { ...initialSettings, model: inheritedModel };
-        const snapshotComposerOptions = agentActivityRuntime.getSnapshot(workspaceId).composerOptionsByProvider?.[provider] ?? null;
+        const snapshotComposerOptions = (agentTargetId2 ? agentActivityRuntime.getSnapshot(workspaceId).composerOptionsByAgentTargetId?.[agentTargetId2] : null) ?? agentActivityRuntime.getSnapshot(workspaceId).composerOptionsByProvider?.[provider] ?? null;
         const snapshotDraftAgentSessionId = normalizedInitialContent.length > 0 && provider === "claude-code" ? draftAgentSessionIdFromComposerOptions(snapshotComposerOptions) : null;
         const draftAgentSessionId = snapshotDraftAgentSessionId && !activatedConversationIdsRef.current.has(
           snapshotDraftAgentSessionId
@@ -11185,6 +11370,7 @@ function useAgentGUINodeController({
         return activation.activate({
           mode: "new",
           agentSessionId,
+          agentTargetId: agentTargetId2 || null,
           provider,
           providerTargetRef: shouldUseProviderTargetRef ? target2.ref : null,
           cwd: selectedProjectPath2 ?? "",
@@ -12472,7 +12658,10 @@ function useAgentGUINodeController({
       };
       const agentSessionId = activeConversationIdRef.current;
       if (!agentSessionId) {
-        const defaultDraftKey = nodeDefaultDraftKey(dataRef.current.provider);
+        const defaultDraftKey = nodeDefaultDraftKey(
+          dataRef.current.provider,
+          dataRef.current.agentTargetId
+        );
         const storedDefaults = readNodeDefaultDraftSettings({
           data: dataRef.current,
           defaultReasoningEffort,
@@ -13322,7 +13511,8 @@ function useAgentGUINodeController({
       return null;
     }
     const previous = projectionConversationRef.current;
-    if (previous && previous.id === activeConversation.id && previous.userId === activeConversation.userId && previous.provider === activeConversation.provider && previous.title === activeConversation.title && previous.titleFallback === activeConversation.titleFallback && previous.status === activeConversation.status && previous.cwd === activeConversation.cwd) {
+    const turnLifecycle = activeSessionState?.agentSessionId === activeConversation.id ? activeSessionState.turnLifecycle ?? null : null;
+    if (previous && previous.id === activeConversation.id && previous.userId === activeConversation.userId && previous.provider === activeConversation.provider && previous.title === activeConversation.title && previous.titleFallback === activeConversation.titleFallback && previous.status === activeConversation.status && previous.cwd === activeConversation.cwd && (previous.turnLifecycle?.activeTurnId ?? null) === (turnLifecycle?.activeTurnId ?? null) && (previous.turnLifecycle?.phase ?? null) === (turnLifecycle?.phase ?? null) && (previous.turnLifecycle?.settling ?? false) === (turnLifecycle?.settling ?? false)) {
       return previous;
     }
     const next = activeConversation ? {
@@ -13334,7 +13524,8 @@ function useAgentGUINodeController({
       status: activeConversation.status,
       cwd: activeConversation.cwd,
       updatedAtUnixMs: activeConversation.updatedAtUnixMs,
-      syncState: activeConversation.syncState
+      syncState: activeConversation.syncState,
+      turnLifecycle
     } : null;
     projectionConversationRef.current = next;
     return next;
@@ -13347,7 +13538,11 @@ function useAgentGUINodeController({
     activeConversation?.status,
     activeConversation?.title,
     activeConversation?.titleFallback,
-    activeConversation?.userId
+    activeConversation?.userId,
+    activeSessionState?.agentSessionId,
+    activeSessionState?.turnLifecycle?.activeTurnId,
+    activeSessionState?.turnLifecycle?.phase,
+    activeSessionState?.turnLifecycle?.settling
   ]);
   const draftContent = activeConversationId ? draftBySessionId[activeConversationId] ?? EMPTY_AGENT_COMPOSER_DRAFT : readNodeDefaultDraftContent({
     data,
@@ -13612,7 +13807,7 @@ function useAgentGUINodeController({
     hasProviderSessionNotFoundError,
     pendingApproval
   ]);
-  const canSubmit = activeLiveState !== "activating" && activeLiveState !== "failed" && !activeConversationResumeUnavailable && (activeConversationId !== null || selectedProviderTarget.disabled !== true) && (data.provider !== "openclaw" || openclawGateway?.status === "ready") && pendingApproval === null && pendingInteractivePrompt === null && sessionChrome.auth === null && !isCreatingConversation && !isSubmitting && !isInterrupting;
+  const canSubmit = !providerTargetsLoading && activeLiveState !== "activating" && activeLiveState !== "failed" && !activeConversationResumeUnavailable && (activeConversationId !== null || selectedProviderTarget.disabled !== true) && (data.provider !== "openclaw" || openclawGateway?.status === "ready") && pendingApproval === null && pendingInteractivePrompt === null && sessionChrome.auth === null && !isCreatingConversation && !isSubmitting && !isInterrupting;
   const canQueueWhileBusy = Boolean(activeConversationId) && (activeConversationBusy || isSubmitting || Boolean(activeSessionState?.pendingInteractive));
   useEffect4(() => {
     const firstVersion = minFiniteMessageVersion(activeMessages);
@@ -13693,6 +13888,7 @@ function useAgentGUINodeController({
     isSubmitting,
     pendingApproval,
     pendingInteractivePrompt,
+    providerTargetsLoading,
     workspaceId
   ]);
   const activeSessionReasoningSelection = useMemo4(
@@ -13801,7 +13997,115 @@ function useAgentGUINodeController({
     stableComposerSettings.availableModels.length,
     stableComposerSettings.isSettingsLoading
   ]);
+  const updateConversationFilter = useCallback4(
+    (filter) => {
+      if (!canUseConversationTargetFilter) {
+        setConversationFilter({ kind: "all" });
+        return;
+      }
+      setConversationFilter(normalizeAgentGUIConversationFilter(filter));
+    },
+    [canUseConversationTargetFilter]
+  );
+  const selectProvider = useCallback4(
+    (input) => {
+      if (previewMode) {
+        return;
+      }
+      const nextProvider = input.provider;
+      const nextTarget = resolveAgentGUIProviderTarget({
+        defaultProviderTargetId,
+        fallbackToLocal: shouldFallbackToLocalProviderTargets,
+        provider: nextProvider,
+        providerTargetId: input.providerTargetId,
+        providerTargets: normalizedProviderTargets
+      });
+      if (!nextTarget) {
+        return;
+      }
+      if (nextTarget.disabled === true) {
+        return;
+      }
+      const shouldUseProviderTargetRef = normalizedExplicitProviderTargets.some(
+        (target) => target.provider === nextTarget.provider && target.targetId === nextTarget.targetId && agentGUIProviderTargetRefsEqual(target.ref, nextTarget.ref)
+      );
+      const previous = activeConversationIdRef.current;
+      if (previous) {
+        void activation.unactivate(previous);
+      }
+      setIntent({ tag: "home" });
+      isComposerHomeRef.current = true;
+      setIsComposerHome(true);
+      activeConversationIdRef.current = null;
+      setActiveConversationId(null);
+      setIsLoadingMessages(false);
+      setDetailError(null);
+      persistActiveConversation(null);
+      onDataChangeRef.current((current) => {
+        const nextAgentTargetId = shouldUseProviderTargetRef ? nextTarget.agentTargetId ?? null : null;
+        const nextData = {
+          ...current,
+          provider: nextProvider,
+          agentTargetId: nextAgentTargetId,
+          lastActiveAgentSessionId: null,
+          providerTargetId: null,
+          providerTargetRef: null
+        };
+        dataRef.current = nextData;
+        return nextData;
+      });
+      window.setTimeout(() => {
+        loadDraftComposerOptions({ force: true });
+      }, 0);
+    },
+    [
+      activation,
+      defaultProviderTargetId,
+      loadDraftComposerOptions,
+      normalizedExplicitProviderTargets,
+      normalizedProviderTargets,
+      persistActiveConversation,
+      previewMode,
+      shouldFallbackToLocalProviderTargets
+    ]
+  );
+  const selectConversationFilterTarget = useCallback4(
+    (input) => {
+      if (!canUseConversationTargetFilter) {
+        setConversationFilter({ kind: "all" });
+        return;
+      }
+      const nextTarget = resolveAgentGUIProviderTarget({
+        defaultProviderTargetId,
+        fallbackToLocal: shouldFallbackToLocalProviderTargets,
+        provider: input.provider,
+        providerTargetId: input.providerTargetId,
+        providerTargets: normalizedProviderTargets
+      });
+      if (!nextTarget || nextTarget.disabled === true) {
+        return;
+      }
+      const agentTargetId = nextTarget.agentTargetId?.trim() ?? "";
+      const nextFilter = agentTargetId ? { kind: "agentTarget", agentTargetId } : { kind: "all" };
+      setConversationFilter(nextFilter);
+      selectProvider({
+        provider: nextTarget.provider,
+        providerTargetId: nextTarget.targetId
+      });
+    },
+    [
+      canUseConversationTargetFilter,
+      defaultProviderTargetId,
+      normalizedProviderTargets,
+      selectProvider,
+      shouldFallbackToLocalProviderTargets
+    ]
+  );
   const stableCreateConversation = useStableControllerEventCallback(createConversation);
+  const stableSelectProvider = useStableControllerEventCallback(selectProvider);
+  const stableSelectConversationFilterTarget = useStableControllerEventCallback(
+    selectConversationFilterTarget
+  );
   const stableSelectConversation = useStableControllerEventCallback(selectConversation);
   const stableSubmitPrompt = useStableControllerEventCallback(submitPrompt);
   const stableSubmitGuidancePrompt = useStableControllerEventCallback(submitGuidancePrompt);
@@ -13852,8 +14156,14 @@ function useAgentGUINodeController({
   const stableLoadOlderConversationMessages = useStableControllerEventCallback(
     loadOlderConversationMessages
   );
+  const stableUpdateConversationFilter = useStableControllerEventCallback(
+    updateConversationFilter
+  );
   const controllerActions = useMemo4(
     () => ({
+      updateConversationFilter: stableUpdateConversationFilter,
+      selectConversationFilterTarget: stableSelectConversationFilterTarget,
+      selectProvider: stableSelectProvider,
       createConversation: stableCreateConversation,
       selectConversation: stableSelectConversation,
       submitPrompt: stableSubmitPrompt,
@@ -13900,6 +14210,8 @@ function useAgentGUINodeController({
       stableRetryActivation,
       stableRetryOpenclawGateway,
       stableSelectConversation,
+      stableSelectConversationFilterTarget,
+      stableSelectProvider,
       stableSendQueuedPromptNext,
       stableSubmitGuidancePrompt,
       stableShowPromptImagesUnsupported,
@@ -13907,6 +14219,7 @@ function useAgentGUINodeController({
       stableSubmitInteractivePrompt,
       stableSubmitPrompt,
       stableToggleConversationPinned,
+      stableUpdateConversationFilter,
       stableUpdateComposerSettings,
       stableUpdateDraftContent,
       stableUpdateSelectedProjectPath
@@ -13920,6 +14233,10 @@ function useAgentGUINodeController({
         currentUserId,
         data,
         selectedProviderTarget,
+        providerTargets: normalizedProviderTargets,
+        providerTargetsLoading,
+        conversationScope,
+        conversationFilter,
         conversations: visibleConversations,
         userProjects,
         activeConversation,
@@ -13940,6 +14257,7 @@ function useAgentGUINodeController({
         promptImagesSupported,
         compactSupported,
         usage,
+        backgroundAgentCount,
         listError,
         isDeletingConversation,
         isDeletingProjectConversations,
@@ -13981,10 +14299,14 @@ function useAgentGUINodeController({
       canSubmit,
       canQueueWhileBusy,
       conversation,
+      conversationScope,
+      conversationFilter,
       conversationDetail,
       controllerActions,
       data,
       selectedProviderTarget,
+      normalizedProviderTargets,
+      providerTargetsLoading,
       detailError,
       draftContent,
       draftPrompt,
@@ -13993,6 +14315,7 @@ function useAgentGUINodeController({
       promptImagesSupported,
       compactSupported,
       usage,
+      backgroundAgentCount,
       isInterrupting,
       isCancelPending,
       isLoadingConversations,
@@ -14214,7 +14537,13 @@ import {
 } from "react";
 import { useSnapshot } from "valtio";
 import { proxy as proxy2 } from "valtio/vanilla";
-import { ChevronRight as ChevronRight2, ExternalLink, Info as Info2, Wrench } from "lucide-react";
+import {
+  ChevronRight as ChevronRight2,
+  ExternalLink,
+  Info as Info2,
+  LayoutGrid,
+  Wrench
+} from "lucide-react";
 
 // app/renderer/components/ui/popover.tsx
 import {
@@ -15015,13 +15344,11 @@ function AgentChromeNotice({
 }) {
   "use memo";
   const fullMessage = description ? `${title} ${description}` : title;
+  const toneClassName = tone === "danger" ? AgentGUIChrome_styles_default.chromeCardDanger : tone === "muted" ? AgentGUIChrome_styles_default.chromeCardMuted : AgentGUIChrome_styles_default.chromeCardWarning;
   return /* @__PURE__ */ jsx19("div", { className: AgentGUIChrome_styles_default.sessionChrome, children: /* @__PURE__ */ jsx19(
     "section",
     {
-      className: cn(
-        AgentGUIChrome_styles_default.chromeCard,
-        tone === "danger" ? AgentGUIChrome_styles_default.chromeCardDanger : AgentGUIChrome_styles_default.chromeCardWarning
-      ),
+      className: cn(AgentGUIChrome_styles_default.chromeCard, toneClassName),
       role,
       "data-testid": testId,
       children: /* @__PURE__ */ jsx19("div", { className: AgentGUIChrome_styles_default.chromeMetaRow, children: /* @__PURE__ */ jsxs7("div", { className: AgentGUIChrome_styles_default.chromeMessageSlot, children: [
@@ -15265,7 +15592,15 @@ import {
   useState as useState10
 } from "react";
 import { createPortal as createPortal3 } from "react-dom";
-import { AddIcon, Button as Button3, Select as Select2, SelectTrigger as SelectTrigger2 } from "@tutti-os/ui-system";
+import {
+  AddIcon,
+  Button as Button3,
+  Select as Select2,
+  SelectContent as SelectContent2,
+  SelectItem as SelectItem2,
+  SelectTrigger as SelectTrigger2,
+  SelectValue
+} from "@tutti-os/ui-system";
 import { ListChecks as ListChecks2, Target as Target3, X } from "lucide-react";
 import {
   createMentionPaletteStateAdapter,
@@ -15946,6 +16281,7 @@ var styles3 = {
   composerPromptTipText: "agent-gui-node__composer-prompt-tip-text",
   composerPromptTipTooltip: "agent-gui-node__composer-prompt-tip-tooltip",
   composerProjectRow: "agent-gui-node__composer-project-row",
+  composerProviderSelect: "agent-gui-node__composer-provider-select",
   composerQueuedPromptCard: "agent-gui-node__composer-queued-prompt-card",
   composerQueuedPromptHeader: "agent-gui-node__composer-queued-prompt-header",
   composerQueuedPromptExpandCue: "agent-gui-node__composer-queued-prompt-expand-cue",
@@ -16023,6 +16359,12 @@ var styles3 = {
   projectRailAddProjectTrigger: "agent-gui-node__project-rail-add-project-trigger",
   projectRailHeader: "agent-gui-node__project-rail-header",
   projectRailTitle: "agent-gui-node__project-rail-title",
+  providerRail: "agent-gui-node__provider-rail",
+  providerRailAvatar: "agent-gui-node__provider-rail-avatar",
+  providerRailAvatarIcon: "agent-gui-node__provider-rail-avatar-icon",
+  providerRailAvatarImage: "agent-gui-node__provider-rail-avatar-image",
+  providerRailTile: "agent-gui-node__provider-rail-tile",
+  providerRailTileLabel: "agent-gui-node__provider-rail-tile-label",
   rail: "agent-gui-node__rail",
   railPanel: "agent-gui-node__rail-panel",
   railPanelCollapsed: "agent-gui-node__rail-panel--collapsed",
@@ -18875,7 +19217,7 @@ function AgentReviewPickerPanel({
         {
           key: "uncommitted",
           label: labels.uncommitted,
-          onSelect: () => submit("/review")
+          onSelect: () => submit("/review uncommitted")
         },
         {
           key: "base",
@@ -19552,11 +19894,21 @@ function hasInlineOverflow(element) {
   }
   return element.scrollWidth > element.clientWidth + 1;
 }
+function resolveComposerProviderIconUrl(provider) {
+  const normalizedProvider = normalizeManagedAgentProvider(provider);
+  return MANAGED_AGENT_ICON_URLS[normalizedProvider] ?? MANAGED_AGENT_ICON_FALLBACK_URL;
+}
+function resolveComposerProviderTargetIconUrl(target) {
+  return target.iconUrl?.trim() || resolveComposerProviderIconUrl(target.provider);
+}
 function AgentComposer({
   workspaceId,
   workspacePath,
   currentUserId,
   provider,
+  selectedProviderTarget = null,
+  providerTargets = [],
+  providerSelectReadonly = false,
   slashStatus = null,
   usage = null,
   draftContent,
@@ -19575,6 +19927,7 @@ function AgentComposer({
   canQueueWhileBusy,
   showStopButton,
   activePrompt,
+  backgroundAgentStatusText = null,
   activePromptKeyboardShortcutsEnabled = true,
   promptTips = EMPTY_PROMPT_TIPS,
   isInterrupting,
@@ -19592,6 +19945,7 @@ function AgentComposer({
   onProjectPathChange = () => {
   },
   onSettingsChange,
+  onProviderSelect,
   capabilityMenuState,
   onSubmit,
   onSubmitGuidance,
@@ -20705,6 +21059,17 @@ function AgentComposer({
     }
     await applyReferencePickResult(await onRequestWorkspaceReferences());
   }, [applyReferencePickResult, onRequestWorkspaceReferences]);
+  const providerSwitchTargets = useMemo9(
+    () => providerTargets.filter((target) => target.disabled !== true),
+    [providerTargets]
+  );
+  const showProviderSelect = providerSwitchTargets.length > 1;
+  const selectedProviderTargetId = selectedProviderTarget?.targetId ?? `local:${provider}`;
+  const selectedProviderSwitchTarget = providerSwitchTargets.find(
+    (target) => target.targetId === selectedProviderTargetId
+  ) ?? selectedProviderTarget ?? providerSwitchTargets.find((target) => target.provider === provider) ?? null;
+  const selectedProviderLabel = selectedProviderSwitchTarget?.label ?? provider;
+  const providerSelectDisabled = previewMode || providerSelectReadonly || !onProviderSelect;
   const applyDroppedFileReferences = useCallback9(
     async (files) => {
       if (!promptFilesSupported || !resolveDroppedFileReferences || files.length === 0) {
@@ -21355,6 +21720,16 @@ function AgentComposer({
             ),
             "data-edge-glow": showEdgeGlow ? "true" : void 0,
             children: [
+              backgroundAgentStatusText ? /* @__PURE__ */ jsx28(
+                AgentChromeNotice,
+                {
+                  tone: "muted",
+                  role: "status",
+                  testId: "agent-gui-composer-background-agent-status",
+                  title: backgroundAgentStatusText,
+                  icon: /* @__PURE__ */ jsx28(Spinner, { className: "h-3.5 w-3.5" })
+                }
+              ) : null,
               isSelectedProjectMissing ? /* @__PURE__ */ jsx28(
                 AgentChromeNotice,
                 {
@@ -21691,6 +22066,68 @@ function AgentComposer({
                             )
                           }
                         ),
+                        showProviderSelect && selectedProviderSwitchTarget ? /* @__PURE__ */ jsxs15(
+                          Select2,
+                          {
+                            value: selectedProviderTargetId,
+                            disabled: providerSelectDisabled,
+                            onValueChange: (nextTargetId) => {
+                              const target = providerSwitchTargets.find(
+                                (candidate) => candidate.targetId === nextTargetId
+                              );
+                              if (!target) {
+                                return;
+                              }
+                              onProviderSelect?.({
+                                provider: target.provider,
+                                providerTargetId: target.targetId
+                              });
+                            },
+                            children: [
+                              /* @__PURE__ */ jsx28(
+                                SelectTrigger2,
+                                {
+                                  size: "sm",
+                                  "aria-label": labels.providerSwitchLabel,
+                                  title: labels.providerSwitchLabel,
+                                  className: cn(
+                                    AgentGUINode_styles_default.composerMenuTrigger,
+                                    AgentGUINode_styles_default.composerProviderSelect,
+                                    "max-w-[160px] text-[var(--agent-gui-text-secondary)]"
+                                  ),
+                                  children: /* @__PURE__ */ jsx28("span", { className: "min-w-0 truncate", children: /* @__PURE__ */ jsx28(SelectValue, { placeholder: selectedProviderLabel }) })
+                                }
+                              ),
+                              /* @__PURE__ */ jsx28(
+                                SelectContent2,
+                                {
+                                  align: "start",
+                                  className: cn(AgentGUINode_styles_default.composerMenuContent, "min-w-[190px]"),
+                                  children: providerSwitchTargets.map((target) => /* @__PURE__ */ jsx28(
+                                    SelectItem2,
+                                    {
+                                      value: target.targetId,
+                                      className: cn(AgentGUINode_styles_default.composerMenuItem, "gap-2"),
+                                      children: /* @__PURE__ */ jsxs15("span", { className: "flex min-w-0 items-center gap-2", children: [
+                                        /* @__PURE__ */ jsx28(
+                                          "img",
+                                          {
+                                            alt: "",
+                                            "aria-hidden": "true",
+                                            className: "size-4 shrink-0 rounded-[4px]",
+                                            src: resolveComposerProviderTargetIconUrl(target)
+                                          }
+                                        ),
+                                        /* @__PURE__ */ jsx28("span", { className: "min-w-0 truncate", children: target.label })
+                                      ] })
+                                    },
+                                    `${target.provider}:${target.targetId}`
+                                  ))
+                                }
+                              )
+                            ]
+                          }
+                        ) : null,
                         composerSettings.supportsPlanMode && composerSettings.draftSettings.planMode ? /* @__PURE__ */ jsx28(
                           "button",
                           {
@@ -22298,7 +22735,7 @@ function groupConversations(conversations, labels, userProjects = [], options =
   }
   groups.push(
     ...[...projectGroups.values()].sort(
-      (left, right) => left.sectionOrder - right.sectionOrder || Number(right.items.length > 0) - Number(left.items.length > 0) || right.projectUpdatedAtUnixMs - left.projectUpdatedAtUnixMs || left.projectOrder - right.projectOrder || left.label.localeCompare(right.label) || left.id.localeCompare(right.id)
+      (left, right) => left.sectionOrder - right.sectionOrder || right.projectUpdatedAtUnixMs - left.projectUpdatedAtUnixMs || left.projectOrder - right.projectOrder || left.label.localeCompare(right.label) || left.id.localeCompare(right.id)
     ).map(
       ({
         projectOrder: _projectOrder,
@@ -22508,7 +22945,7 @@ function resolveConversationDetailStatus(detail) {
 function objectRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
-function numberValue(value) {
+function numberValue2(value) {
   if (typeof value === "number" && Number.isFinite(value)) {
     return value;
   }
@@ -22528,8 +22965,8 @@ function resolveSlashStatus({
 }) {
   const usage = objectRecord(rawState?.runtimeContext?.usage);
   const contextWindow = objectRecord(usage?.contextWindow) ?? objectRecord(usage?.context_window) ?? (usage && (usage.used !== void 0 || usage.size !== void 0 || usage.usedTokens !== void 0 || usage.totalTokens !== void 0) ? {
-    usedTokens: numberValue(usage.usedTokens) ?? numberValue(usage.used_tokens) ?? numberValue(usage.used),
-    totalTokens: numberValue(usage.totalTokens) ?? numberValue(usage.total_tokens) ?? numberValue(usage.size)
+    usedTokens: numberValue2(usage.usedTokens) ?? numberValue2(usage.used_tokens) ?? numberValue2(usage.used),
+    totalTokens: numberValue2(usage.totalTokens) ?? numberValue2(usage.total_tokens) ?? numberValue2(usage.size)
   } : null);
   const providerConfig = objectRecord(rawState?.runtimeContext?.providerConfig);
   return {
@@ -22538,8 +22975,8 @@ function resolveSlashStatus({
     limits,
     limitsLoading: limitsLoading || isAppServerStartupLoading2(rawState, "rateLimits"),
     contextWindow: contextWindow ? {
-      usedTokens: numberValue(contextWindow.usedTokens) ?? numberValue(contextWindow.used_tokens),
-      totalTokens: numberValue(contextWindow.totalTokens) ?? numberValue(contextWindow.total_tokens)
+      usedTokens: numberValue2(contextWindow.usedTokens) ?? numberValue2(contextWindow.used_tokens),
+      totalTokens: numberValue2(contextWindow.totalTokens) ?? numberValue2(contextWindow.total_tokens)
     } : null
   };
 }
@@ -22974,7 +23411,14 @@ function AgentGUINodeView({
       openclawGateway,
       isCollapsed: conversationRailCollapsed,
       slashStatusLimits,
+      selectedProviderTarget: viewModel.selectedProviderTarget,
+      providerTargets: viewModel.providerTargets,
+      providerTargetsLoading: viewModel.providerTargetsLoading,
+      conversationScope: viewModel.conversationScope,
+      conversationFilter: viewModel.conversationFilter,
       onCreateConversation: requestCreateConversation,
+      onUpdateConversationFilter: actions.updateConversationFilter,
+      onSelectConversationFilterTarget: actions.selectConversationFilterTarget,
       onOpenAgentEnvSetup: openAgentEnvSetup,
       onRetryOpenclawGateway: retryOpenclawGateway,
       onSelectConversation: selectConversation,
@@ -23001,6 +23445,7 @@ function AgentGUINodeView({
       openConversationWindow,
       openProjectFiles,
       openclawGateway,
+      actions.updateConversationFilter,
       previewMode,
       removeProject,
       requestCreateConversation,
@@ -23009,8 +23454,13 @@ function AgentGUINodeView({
       selectConversation,
       selectProjectDirectory,
       slashStatusLimits,
+      viewModel.selectedProviderTarget,
+      viewModel.providerTargets,
+      viewModel.providerTargetsLoading,
       toggleConversationPinned,
       uiLanguage,
+      viewModel.conversationScope,
+      viewModel.conversationFilter,
       viewModel.activeConversationId,
       viewModel.isDeletingConversation,
       viewModel.isDeletingProjectConversations,
@@ -23032,7 +23482,21 @@ function AgentGUINodeView({
     conversationRailStore,
     conversationRailStoreState
   );
-  const content = /* @__PURE__ */ jsxs17(Fragment8, { children: [
+  const agentTargetPresentations = useMemo10(
+    () => viewModel.providerTargets.flatMap(
+      (target) => target.agentTargetId ? [
+        {
+          agentTargetId: target.agentTargetId,
+          iconUrl: target.iconUrl ?? null,
+          name: target.label,
+          provider: target.provider,
+          workspaceId: viewModel.workspaceId
+        }
+      ] : []
+    ),
+    [viewModel.providerTargets, viewModel.workspaceId]
+  );
+  const content = /* @__PURE__ */ jsxs17(AgentTargetPresentationProvider, { agentTargets: agentTargetPresentations, children: [
     /* @__PURE__ */ jsxs17(
       "div",
       {
@@ -23054,11 +23518,9 @@ function AgentGUINodeView({
                 AgentGUIConversationRailStorePane,
                 {
                   conversations: viewModel.conversations,
-                  provider: viewModel.data.provider,
                   store: conversationRailStore,
                   storeState: conversationRailStoreState,
-                  userProjects: viewModel.userProjects,
-                  workspaceId: viewModel.workspaceId
+                  userProjects: viewModel.userProjects
                 }
               )
             }
@@ -23560,6 +24022,7 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
       removeMention: labels.removeMention,
       addReference: labels.addReference,
       referenceWorkspaceFiles: labels.referenceWorkspaceFiles,
+      providerSwitchLabel: labels.providerSwitchLabel,
       projectLocked: labels.projectLocked,
       projectMissingDescription: labels.projectMissingDescription,
       promptTipsPrefix: labels.promptTipsPrefix,
@@ -23600,6 +24063,7 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
       labels.queuedLabel,
       labels.queuedPromptMoreActions,
       labels.referenceWorkspaceFiles,
+      labels.providerSwitchLabel,
       labels.removeMention,
       labels.reasoningDegreeLabel,
       labels.reasoningLabel,
@@ -23708,6 +24172,10 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
   const submitPromptAndScrollToBottom = useCallback10(
     (content, displayPrompt) => {
       requestSubmittedPromptScrollToBottom();
+      if (displayPrompt === void 0) {
+        submitPrompt(content);
+        return;
+      }
       submitPrompt(content, displayPrompt);
     },
     [requestSubmittedPromptScrollToBottom, submitPrompt]
@@ -23715,6 +24183,10 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
   const submitGuidancePromptAndScrollToBottom = useCallback10(
     (content, displayPrompt) => {
       requestSubmittedPromptScrollToBottom();
+      if (displayPrompt === void 0) {
+        submitGuidancePrompt(content);
+        return;
+      }
       submitGuidancePrompt(content, displayPrompt);
     },
     [requestSubmittedPromptScrollToBottom, submitGuidancePrompt]
@@ -23739,6 +24211,7 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
   );
   const stableRequestGitBranches = useOptionalStableEventCallback(onRequestGitBranches);
   const authLogin = useOptionalStableEventCallback(onAgentProviderLogin);
+  const backgroundAgentStatusText = viewModel.backgroundAgentCount > 0 ? labels.waitingForBackgroundAgent(viewModel.backgroundAgentCount) : null;
   const submitBottomDockInteractivePrompt = useCallback10(
     (input) => {
       submitInteractivePrompt(input);
@@ -23746,12 +24219,17 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
     },
     [submitInteractivePrompt]
   );
+  const canSwitchComposerProvider = viewModel.conversationScope === "multi-provider";
+  const composerProviderTargets = canSwitchComposerProvider ? viewModel.providerTargets : [viewModel.selectedProviderTarget];
   const bottomDockComposerProps = useMemo10(
     () => ({
       workspaceId: viewModel.workspaceId,
       workspacePath: viewModel.workspacePath,
       currentUserId: viewModel.currentUserId,
       provider: viewModel.data.provider,
+      selectedProviderTarget: viewModel.selectedProviderTarget,
+      providerTargets: composerProviderTargets,
+      providerSelectReadonly: !canSwitchComposerProvider || viewModel.activeConversationId !== null,
       slashStatus,
       usage: viewModel.usage,
       draftContent: viewModel.draftContent,
@@ -23773,6 +24251,7 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
       // Plan decisions replace the composer via bottomDockReplacementPrompt;
       // approval / ask-user embed here (composerActivePrompt encodes that).
       activePrompt: composerActivePrompt,
+      backgroundAgentStatusText,
       activePromptKeyboardShortcutsEnabled: isActive,
       promptTips: labels.promptTips,
       composerFocusRequestSequence,
@@ -23788,6 +24267,7 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
       onDraftContentChange: updateDraftContent,
       onProjectPathChange: updateSelectedProjectPath,
       onSettingsChange: updateComposerSettings,
+      onProviderSelect: canSwitchComposerProvider ? actions.selectProvider : void 0,
       onSubmit: submitPromptAndScrollToBottom,
       onSubmitGuidance: submitGuidancePromptAndScrollToBottom,
       onPromptImagesUnsupported: showPromptImagesUnsupported,
@@ -23806,7 +24286,10 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
     }),
     [
       canQueueWhileBusy,
+      backgroundAgentStatusText,
+      canSwitchComposerProvider,
       capabilityMenuState,
+      composerProviderTargets,
       composerDisabled,
       composerDisabledReason,
       composerFocusRequestSequence,
@@ -23838,6 +24321,7 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
       stableSelectProjectDirectory,
       stableRequestWorkspaceReferences,
       updateComposerSettings,
+      actions.selectProvider,
       updateDraftContent,
       updateSelectedProjectPath,
       viewModel.availableCommands,
@@ -23846,6 +24330,7 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
       viewModel.composerSettings,
       viewModel.currentUserId,
       viewModel.data.provider,
+      viewModel.selectedProviderTarget,
       viewModel.draftContent,
       viewModel.draftPrompt,
       viewModel.drainingQueuedPromptId,
@@ -23899,6 +24384,7 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
     sessionChrome.auth?.message ?? "",
     sessionChrome.recovery?.kind ?? "",
     sessionChrome.recovery?.message ?? "",
+    backgroundAgentStatusText ?? "",
     viewModel.queuedPrompts.map((prompt) => prompt.id).join(","),
     viewModel.drainingQueuedPromptId ?? "",
     viewModel.isRespondingApproval ? "1" : "0"
@@ -24380,8 +24866,8 @@ var AgentGUIBottomDockPane = memo(function AgentGUIBottomDockPane2({
   const goal = objectRecord(sessionChrome.rawState?.runtimeContext?.goal);
   const goalObjective = goal ? stringValue2(goal.objective) : "";
   const goalStatus = goal ? stringValue2(goal.status) : "";
-  const goalTokenBudget = goal ? numberValue(goal.tokenBudget) : null;
-  const goalTokensUsed = goal ? numberValue(goal.tokensUsed) : null;
+  const goalTokenBudget = goal ? numberValue2(goal.tokenBudget) : null;
+  const goalTokensUsed = goal ? numberValue2(goal.tokensUsed) : null;
   const showGoalBanner = isGoalBannerVisible(goalObjective, goalStatus);
   return /* @__PURE__ */ jsxs17(
     "div",
@@ -24478,16 +24964,14 @@ function syncAgentGUIConversationRailStore(store, next) {
   Object.assign(store, next);
 }
 function agentGUIConversationRailStoreSnapshotsEqual(current, next) {
-  return current.activeConversationId === next.activeConversationId && current.pendingDeleteConversationId === next.pendingDeleteConversationId && current.isLoadingConversations === next.isLoadingConversations && current.isDeletingConversation === next.isDeletingConversation && current.isDeletingProjectConversations === next.isDeletingProjectConversations && current.labels === next.labels && current.workspaceUserProjectI18n === next.workspaceUserProjectI18n && current.uiLanguage === next.uiLanguage && current.previewMode === next.previewMode && current.createConversationDisabled === next.createConversationDisabled && current.openclawGateway === next.openclawGateway && current.isCollapsed === next.isCollapsed && current.onCreateConversation === next.onCreateConversation && current.onOpenAgentEnvSetup === next.onOpenAgentEnvSetup && current.onRetryOpenclawGateway === next.onRetryOpenclawGateway && current.onSelectConversation === next.onSelectConversation && current.onToggleConversationPinned === next.onToggleConversationPinned && current.onOpenProjectFiles === next.onOpenProjectFiles && current.onOpenConversationWindow === next.onOpenConversationWindow && current.selectProjectDirectory === next.selectProjectDirectory && current.onRemoveProject === next.onRemoveProject && current.onConfirmDeleteProjectConversations === next.onConfirmDeleteProjectConversations && current.onRequestDeleteConversation === next.onRequestDeleteConversation && current.onCancelDeleteConversation === next.onCancelDeleteConversation && current.onConfirmDeleteConversation === next.onConfirmDeleteConversation;
+  return current.activeConversationId === next.activeConversationId && current.pendingDeleteConversationId === next.pendingDeleteConversationId && current.isLoadingConversations === next.isLoadingConversations && current.isDeletingConversation === next.isDeletingConversation && current.isDeletingProjectConversations === next.isDeletingProjectConversations && current.labels === next.labels && current.workspaceUserProjectI18n === next.workspaceUserProjectI18n && current.uiLanguage === next.uiLanguage && current.previewMode === next.previewMode && current.createConversationDisabled === next.createConversationDisabled && current.openclawGateway === next.openclawGateway && current.isCollapsed === next.isCollapsed && current.selectedProviderTarget === next.selectedProviderTarget && current.providerTargets === next.providerTargets && current.providerTargetsLoading === next.providerTargetsLoading && current.conversationScope === next.conversationScope && current.conversationFilter === next.conversationFilter && current.onUpdateConversationFilter === next.onUpdateConversationFilter && current.onSelectConversationFilterTarget === next.onSelectConversationFilterTarget && current.onCreateConversation === next.onCreateConversation && current.onOpenAgentEnvSetup === next.onOpenAgentEnvSetup && current.onRetryOpenclawGateway === next.onRetryOpenclawGateway && current.onSelectConversation === next.onSelectConversation && current.onToggleConversationPinned === next.onToggleConversationPinned && current.onOpenProjectFiles === next.onOpenProjectFiles && current.onOpenConversationWindow === next.onOpenConversationWindow && current.selectProjectDirectory === next.selectProjectDirectory && current.onRemoveProject === next.onRemoveProject && current.onConfirmDeleteProjectConversations === next.onConfirmDeleteProjectConversations && current.onRequestDeleteConversation === next.onRequestDeleteConversation && current.onCancelDeleteConversation === next.onCancelDeleteConversation && current.onConfirmDeleteConversation === next.onConfirmDeleteConversation;
 }
 var AgentGUIConversationRailStorePane = memo(
   function AgentGUIConversationRailStorePane2({
     conversations,
-    provider,
     store,
     storeState: _storeState,
-    userProjects,
-    workspaceId
+    userProjects
   }) {
     "use memo";
     const state = useSnapshot(store);
@@ -24496,9 +24980,7 @@ var AgentGUIConversationRailStorePane = memo(
       {
         ...state,
         conversations,
-        provider,
-        userProjects,
-        workspaceId
+        userProjects
       }
     );
   }
@@ -24510,47 +24992,6 @@ function normalizeConversationRailProjectPath(path) {
   }
   return normalized.replace(/\/+$/, "") || "/";
 }
-function buildRailSessionGroupProjects({
-  groups,
-  userProjects
-}) {
-  const userProjectByPath = new Map(
-    userProjects.map((project) => [
-      normalizeConversationRailProjectPath(project.path),
-      project
-    ])
-  );
-  const groupProjectPaths = /* @__PURE__ */ new Set();
-  const groupProjects = [];
-  for (const group of groups) {
-    const normalizedPath = normalizeConversationRailProjectPath(group.cwd);
-    if (!normalizedPath || groupProjectPaths.has(normalizedPath)) {
-      continue;
-    }
-    groupProjectPaths.add(normalizedPath);
-    const existingProject = userProjectByPath.get(normalizedPath);
-    groupProjects.push({
-      ...existingProject ?? {
-        id: `agent-session-group:${normalizedPath}`,
-        label: labelFromProjectPath(normalizedPath),
-        path: group.cwd
-      },
-      lastUsedAtUnixMs: group.latestSessionUpdatedAtUnixMs,
-      updatedAtUnixMs: group.latestSessionUpdatedAtUnixMs
-    });
-  }
-  const emptyUserProjects = userProjects.filter(
-    (project) => !groupProjectPaths.has(normalizeConversationRailProjectPath(project.path))
-  );
-  return [...groupProjects, ...emptyUserProjects];
-}
-function labelFromProjectPath(path) {
-  const normalized = normalizeConversationRailProjectPath(path);
-  if (!normalized || normalized === "/") {
-    return path || "/";
-  }
-  return normalized.split("/").filter(Boolean).at(-1) ?? normalized;
-}
 function stabilizeConversationSections(previous, next) {
   if (!previous) {
     return [...next];
@@ -24584,37 +25025,6 @@ function stabilizeConversationSections(previous, next) {
   });
   return changed ? stable : previous;
 }
-function mergeRefreshedRailSessionGroups(current, refreshed) {
-  const currentByCwd = new Map(current.map((group) => [group.cwd, group]));
-  return refreshed.map((group) => {
-    const existing = currentByCwd.get(group.cwd);
-    if (!existing || existing.sessions.length <= group.sessions.length) {
-      return group;
-    }
-    const sessionIds = new Set(
-      group.sessions.map((session) => session.agentSessionId)
-    );
-    const sessions = [...group.sessions];
-    for (const session of existing.sessions) {
-      if (sessions.length >= group.sessionCount) {
-        break;
-      }
-      if (sessionIds.has(session.agentSessionId)) {
-        continue;
-      }
-      sessionIds.add(session.agentSessionId);
-      sessions.push(session);
-    }
-    const preservedLoadedPages = sessions.length > group.sessions.length;
-    const hasMore = preservedLoadedPages ? existing.hasMore && sessions.length < group.sessionCount : group.hasMore;
-    return {
-      ...group,
-      hasMore,
-      nextCursor: hasMore ? preservedLoadedPages ? existing.nextCursor : group.nextCursor : void 0,
-      sessions
-    };
-  });
-}
 function stabilizeConversationSectionItems(previous, next) {
   if (previous.length !== next.length) {
     const previousById = /* @__PURE__ */ new Map();
@@ -24651,11 +25061,163 @@ function conversationSyncStatesRenderEqual(left, right) {
 function conversationProjectsRenderEqual2(left, right) {
   return left === right || (!left || !right ? !left && !right : left.id === right.id && left.path === right.path && left.label === right.label && left.createdAtUnixMs === right.createdAtUnixMs && left.updatedAtUnixMs === right.updatedAtUnixMs && left.lastUsedAtUnixMs === right.lastUsedAtUnixMs);
 }
+var agentGUIProviderRailOrder = [
+  "nexight",
+  "claude-code",
+  "codex",
+  "openclaw",
+  "hermes",
+  "gemini"
+];
+function agentGUIProviderRailOrderIndex(provider) {
+  const index = agentGUIProviderRailOrder.indexOf(provider);
+  return index < 0 ? agentGUIProviderRailOrder.length : index;
+}
+function agentGUIProviderRailLabel(provider, targetLabel, labels) {
+  if (targetLabel.trim() && targetLabel !== provider) {
+    return targetLabel;
+  }
+  if (provider === "codex") {
+    return labels.conversationFilterCodex;
+  }
+  if (provider === "claude-code") {
+    return labels.conversationFilterClaudeCode;
+  }
+  return targetLabel;
+}
+function agentGUIProviderTargetMatchesConversationFilter(target, filter) {
+  return filter.kind === "agentTarget" && (target.agentTargetId?.trim() ?? "") === filter.agentTargetId;
+}
+var AgentGUIProviderRail = memo(function AgentGUIProviderRail2({
+  conversationFilter,
+  labels,
+  previewMode,
+  providerTargets,
+  providerTargetsLoading,
+  onSelectConversationFilterTarget,
+  onUpdateConversationFilter
+}) {
+  "use memo";
+  const providerTiles = useMemo10(() => {
+    const enabledTargets = providerTargets.filter(
+      (target) => target.disabled !== true
+    );
+    const targets = [...enabledTargets];
+    const originalIndexByTarget = /* @__PURE__ */ new Map();
+    targets.forEach((target, index) => {
+      originalIndexByTarget.set(
+        `${target.provider}\0${target.targetId}`,
+        index
+      );
+    });
+    return targets.sort((left, right) => {
+      const orderDelta = agentGUIProviderRailOrderIndex(left.provider) - agentGUIProviderRailOrderIndex(right.provider);
+      if (orderDelta !== 0) {
+        return orderDelta;
+      }
+      return (originalIndexByTarget.get(`${left.provider}\0${left.targetId}`) ?? 0) - (originalIndexByTarget.get(
+        `${right.provider}\0${right.targetId}`
+      ) ?? 0);
+    });
+  }, [providerTargets]);
+  const allTileSelected = conversationFilter.kind === "all";
+  const selectAllProviders = useCallback10(() => {
+    onUpdateConversationFilter({ kind: "all" });
+  }, [onUpdateConversationFilter]);
+  const selectProviderTile = useCallback10(
+    (target) => {
+      onSelectConversationFilterTarget({
+        provider: target.provider,
+        providerTargetId: target.targetId
+      });
+    },
+    [onSelectConversationFilterTarget]
+  );
+  return /* @__PURE__ */ jsxs17(
+    "div",
+    {
+      className: AgentGUINode_styles_default.providerRail,
+      role: "tablist",
+      "aria-label": labels.providerSwitchLabel,
+      "aria-busy": providerTargetsLoading,
+      children: [
+        /* @__PURE__ */ jsxs17(
+          "button",
+          {
+            type: "button",
+            role: "tab",
+            "aria-selected": allTileSelected,
+            className: AgentGUINode_styles_default.providerRailTile,
+            "data-selected": allTileSelected ? "true" : "false",
+            disabled: previewMode,
+            onClick: selectAllProviders,
+            children: [
+              /* @__PURE__ */ jsx31("span", { className: AgentGUINode_styles_default.providerRailAvatar, children: /* @__PURE__ */ jsx31(LayoutGrid, { "aria-hidden": true, className: AgentGUINode_styles_default.providerRailAvatarIcon }) }),
+              /* @__PURE__ */ jsx31("span", { className: AgentGUINode_styles_default.providerRailTileLabel, children: labels.conversationFilterAll })
+            ]
+          }
+        ),
+        providerTargetsLoading ? [0, 1, 2].map((index) => /* @__PURE__ */ jsxs17(
+          "button",
+          {
+            type: "button",
+            role: "tab",
+            "aria-selected": "false",
+            className: AgentGUINode_styles_default.providerRailTile,
+            "data-loading": "true",
+            "data-selected": "false",
+            disabled: true,
+            children: [
+              /* @__PURE__ */ jsx31("span", { "aria-hidden": "true", className: AgentGUINode_styles_default.providerRailAvatar }),
+              /* @__PURE__ */ jsx31(
+                "span",
+                {
+                  "aria-hidden": "true",
+                  className: AgentGUINode_styles_default.providerRailTileLabel
+                }
+              )
+            ]
+          },
+          `provider-target-loading-${index}`
+        )) : null,
+        providerTiles.map((target) => {
+          const providerSelected = agentGUIProviderTargetMatchesConversationFilter(
+            target,
+            conversationFilter
+          );
+          return /* @__PURE__ */ jsxs17(
+            "button",
+            {
+              type: "button",
+              role: "tab",
+              "aria-selected": providerSelected,
+              className: AgentGUINode_styles_default.providerRailTile,
+              "data-selected": providerSelected ? "true" : "false",
+              disabled: previewMode,
+              onClick: () => selectProviderTile(target),
+              children: [
+                /* @__PURE__ */ jsx31("span", { className: AgentGUINode_styles_default.providerRailAvatar, children: /* @__PURE__ */ jsx31(
+                  "img",
+                  {
+                    alt: "",
+                    "aria-hidden": "true",
+                    className: AgentGUINode_styles_default.providerRailAvatarImage,
+                    src: target.iconUrl || resolveAgentGUIHeroIconUrl(target.provider)
+                  }
+                ) }),
+                /* @__PURE__ */ jsx31("span", { className: AgentGUINode_styles_default.providerRailTileLabel, children: agentGUIProviderRailLabel(target.provider, target.label, labels) })
+              ]
+            },
+            `${target.provider}:${target.targetId}`
+          );
+        })
+      ]
+    }
+  );
+});
 var AgentGUIConversationRailPane = memo(
   function AgentGUIConversationRailPane2({
     conversations,
-    provider,
-    workspaceId,
     userProjects,
     activeConversationId,
     pendingDeleteConversationId,
@@ -24670,6 +25232,12 @@ var AgentGUIConversationRailPane = memo(
     openclawGateway,
     isCollapsed,
     slashStatusLimits,
+    providerTargets,
+    providerTargetsLoading,
+    conversationScope,
+    conversationFilter,
+    onUpdateConversationFilter,
+    onSelectConversationFilterTarget,
     onCreateConversation,
     onOpenAgentEnvSetup,
     onRetryOpenclawGateway,
@@ -24686,21 +25254,14 @@ var AgentGUIConversationRailPane = memo(
     onConfirmDeleteConversation
   }) {
     "use memo";
-    const agentActivityRuntime = useAgentActivityRuntime();
+    const showProviderRail = conversationScope === "multi-provider";
     const [conversationQuery, setConversationQuery] = useState11("");
-    const [searchConversations, setSearchConversations] = useState11([]);
-    const [searchConversationQuery, setSearchConversationQuery] = useState11("");
-    const [searchHasMore, setSearchHasMore] = useState11(false);
-    const [searchNextCursor, setSearchNextCursor] = useState11(
-      null
+    const updateConversationFilter = useStableEventCallback2(
+      onUpdateConversationFilter
+    );
+    const selectConversationFilterTarget = useStableEventCallback2(
+      onSelectConversationFilterTarget
     );
-    const [
-      isLoadingMoreSearchConversations,
-      setIsLoadingMoreSearchConversations
-    ] = useState11(false);
-    const [railSessionGroups, setRailSessionGroups] = useState11([]);
-    const [activeConversationOverlay, setActiveConversationOverlay] = useState11(null);
-    const [loadingMoreSectionIds, setLoadingMoreSectionIds] = useState11(() => /* @__PURE__ */ new Set());
     const [collapsedProjectSectionIds, setCollapsedProjectSectionIds] = useState11(() => /* @__PURE__ */ new Set());
     const [currentTimeMs, setCurrentTimeMs] = useState11(() => Date.now());
     const [pendingProjectAction, setPendingProjectAction] = useState11(null);
@@ -24710,7 +25271,6 @@ var AgentGUIConversationRailPane = memo(
       /* @__PURE__ */ new Map()
     );
     const groupedConversationsRef = useRef12(null);
-    const wasDeletingConversationRef = useRef12(false);
     useEffect12(() => {
       const timer = window.setInterval(() => {
         setCurrentTimeMs(Date.now());
@@ -24719,217 +25279,25 @@ var AgentGUIConversationRailPane = memo(
         window.clearInterval(timer);
       };
     }, []);
-    const trimmedConversationQuery = conversationQuery.trim();
-    const hasConversationQuery = trimmedConversationQuery.length > 0;
-    const hasRuntimeGroupSource = !previewMode && Boolean(agentActivityRuntime.listSessionGroups);
-    const conversationIdentityKey = useMemo10(
-      () => conversations.map((conversation) => conversation.id).join("|"),
-      [conversations]
-    );
-    const railSessionGroupProjects = useMemo10(
-      () => buildRailSessionGroupProjects({
-        groups: railSessionGroups,
-        userProjects
-      }),
-      [railSessionGroups, userProjects]
-    );
-    const defaultRailGroupConversations = useMemo10(() => {
-      const freshConversationById = new Map(
-        conversations.map((conversation) => [conversation.id, conversation])
-      );
-      return buildAgentGUIConversationSummaries({
-        provider,
-        snapshot: {
-          composerOptionsByProvider: {},
-          presences: [],
-          sessionMessagesById: {},
-          sessions: railSessionGroups.flatMap((group) => group.sessions),
-          workspaceId
-        },
-        userProjects: railSessionGroupProjects
-      }).map(
-        (conversation) => freshConversationById.get(conversation.id) ?? conversation
-      );
-    }, [
-      conversations,
-      provider,
-      railSessionGroupProjects,
-      railSessionGroups,
-      workspaceId
-    ]);
-    const defaultRailSourceConversations = useMemo10(() => {
-      const source = hasRuntimeGroupSource ? defaultRailGroupConversations : conversations;
-      if (!activeConversationOverlay || source.some((item) => item.id === activeConversationOverlay.id)) {
-        return source;
-      }
-      return [...source, activeConversationOverlay];
-    }, [
-      activeConversationOverlay,
-      conversations,
-      defaultRailGroupConversations,
-      hasRuntimeGroupSource
-    ]);
-    const effectiveSearchConversations = searchConversationQuery === trimmedConversationQuery ? searchConversations : [];
-    const railSourceConversations = hasConversationQuery ? effectiveSearchConversations : defaultRailSourceConversations;
-    const runtimeSearchSessions = agentActivityRuntime.searchSessions;
-    useEffect12(() => {
-      if (!activeConversationOverlay || activeConversationOverlay.id !== activeConversationId) {
-        return;
-      }
-      if (defaultRailGroupConversations.some(
-        (item) => item.id === activeConversationOverlay.id
-      )) {
-        setActiveConversationOverlay(null);
-      }
-    }, [
-      activeConversationId,
-      activeConversationOverlay,
-      defaultRailGroupConversations
-    ]);
-    useEffect12(() => {
-      if (!hasConversationQuery) {
-        setSearchConversationQuery("");
-        setSearchConversations([]);
-        setSearchHasMore(false);
-        setSearchNextCursor(null);
-        return;
-      }
-      if (!runtimeSearchSessions) {
-        return;
-      }
-      let disposed = false;
-      const timer = window.setTimeout(() => {
-        void runtimeSearchSessions({
-          limit: 100,
-          query: trimmedConversationQuery,
-          workspaceId
-        }).then((result) => {
-          if (disposed) {
-            return;
-          }
-          setSearchConversationQuery(trimmedConversationQuery);
-          setSearchConversations(
-            buildAgentGUIConversationSummaries({
-              provider,
-              snapshot: {
-                composerOptionsByProvider: {},
-                presences: [],
-                sessionMessagesById: {},
-                sessions: result.sessions,
-                workspaceId: result.workspaceId
-              },
-              userProjects
-            })
-          );
-          setSearchHasMore(result.hasMore);
-          setSearchNextCursor(result.nextCursor ?? null);
-        }).catch(() => {
-          if (!disposed) {
-            setSearchConversationQuery(trimmedConversationQuery);
-            setSearchConversations([]);
-            setSearchHasMore(false);
-            setSearchNextCursor(null);
-          }
-        });
-      }, 150);
-      return () => {
-        disposed = true;
-        window.clearTimeout(timer);
-      };
-    }, [
-      hasConversationQuery,
-      provider,
-      runtimeSearchSessions,
-      trimmedConversationQuery,
-      userProjects,
-      workspaceId
-    ]);
-    useEffect12(() => {
-      if (!hasConversationQuery || runtimeSearchSessions) {
-        return;
-      }
-      setSearchConversationQuery(trimmedConversationQuery);
-      setSearchConversations(
-        conversations.filter(
-          (candidate) => conversationPlainTitle(candidate, labels, uiLanguage).toLowerCase().includes(trimmedConversationQuery.toLowerCase())
-        )
-      );
-      setSearchHasMore(false);
-      setSearchNextCursor(null);
-    }, [
-      conversations,
-      hasConversationQuery,
-      labels,
-      runtimeSearchSessions,
-      trimmedConversationQuery,
-      uiLanguage
-    ]);
-    useEffect12(() => {
-      if (!agentActivityRuntime.listSessionGroups || previewMode) {
-        setRailSessionGroups([]);
-        return;
-      }
-      let disposed = false;
-      const isDeletingNow = isDeletingConversation || isDeletingProjectConversations;
-      const resetLoadedGroups = wasDeletingConversationRef.current && !isDeletingNow;
-      wasDeletingConversationRef.current = isDeletingNow;
-      void agentActivityRuntime.listSessionGroups({
-        sessionLimit: AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE,
-        visibleOnly: true,
-        workspaceId
-      }).then((result) => {
-        if (!disposed) {
-          setRailSessionGroups(
-            (current) => resetLoadedGroups ? result.groups : mergeRefreshedRailSessionGroups(current, result.groups)
-          );
-        }
-      }).catch(() => {
-        if (!disposed) {
-          setRailSessionGroups([]);
-        }
-      });
-      return () => {
-        disposed = true;
-      };
-    }, [
-      agentActivityRuntime,
-      conversationIdentityKey,
-      isDeletingConversation,
-      isDeletingProjectConversations,
-      previewMode,
-      workspaceId
-    ]);
-    const groupingProjects = hasConversationQuery ? [] : hasRuntimeGroupSource ? railSessionGroupProjects : userProjects;
-    const showEmptyConversationSection = useMemo10(
-      () => !hasConversationQuery && (hasRuntimeGroupSource ? railSessionGroups.some((group) => !group.cwd.trim()) : !conversations.some(
-        (conversation) => conversation.project == null
-      )),
-      [
-        conversations,
-        hasConversationQuery,
-        hasRuntimeGroupSource,
-        railSessionGroups
-      ]
-    );
     const filteredConversationResult = useMemo10(() => {
       const startedAtMs = agentGuiPerfNowMs();
-      const query = trimmedConversationQuery.toLowerCase();
-      const items = !query ? railSourceConversations : railSourceConversations.filter(
+      const query = conversationQuery.trim().toLowerCase();
+      const items = !query ? conversations : conversations.filter(
         (candidate) => conversationPlainTitle(candidate, labels, uiLanguage).toLowerCase().includes(query)
       );
       return {
         items,
         filterMs: roundAgentGuiPerfMs(agentGuiPerfNowMs() - startedAtMs)
       };
-    }, [labels, railSourceConversations, trimmedConversationQuery, uiLanguage]);
+    }, [conversationQuery, conversations, labels, uiLanguage]);
     const filteredConversations = filteredConversationResult.items;
     const groupedConversationResult = useMemo10(() => {
       const startedAtMs = agentGuiPerfNowMs();
       const rawGroups = groupConversations(
         filteredConversations,
         labels,
-        groupingProjects,
-        { includeEmptyConversations: showEmptyConversationSection }
+        conversationQuery.trim() ? [] : userProjects,
+        { includeEmptyConversations: !conversationQuery.trim() }
       );
       const groups = stabilizeConversationSections(
         groupedConversationsRef.current,
@@ -24940,12 +25308,7 @@ var AgentGUIConversationRailPane = memo(
         groups,
         groupMs: roundAgentGuiPerfMs(agentGuiPerfNowMs() - startedAtMs)
       };
-    }, [
-      filteredConversations,
-      groupingProjects,
-      labels,
-      showEmptyConversationSection
-    ]);
+    }, [conversationQuery, filteredConversations, labels, userProjects]);
     const groupedConversations = groupedConversationResult.groups;
     const toggleProjectSectionCollapsed = useCallback10((sectionId) => {
       setCollapsedProjectSectionIds((current) => {
@@ -24966,140 +25329,17 @@ var AgentGUIConversationRailPane = memo(
     );
     const projectConversationCountsByPath = useMemo10(() => {
       const counts = /* @__PURE__ */ new Map();
-      const pathsFromGroups = /* @__PURE__ */ new Set();
-      for (const group of railSessionGroups) {
-        const normalizedPath = normalizeConversationRailProjectPath(group.cwd);
-        if (!normalizedPath) {
-          continue;
-        }
-        counts.set(normalizedPath, group.sessionCount);
-        pathsFromGroups.add(normalizedPath);
-      }
       for (const conversation of conversations) {
         const normalizedPath = normalizeConversationRailProjectPath(
           conversation.project?.path
         );
-        if (!normalizedPath || pathsFromGroups.has(normalizedPath)) {
+        if (!normalizedPath) {
           continue;
         }
         counts.set(normalizedPath, (counts.get(normalizedPath) ?? 0) + 1);
       }
       return counts;
-    }, [conversations, railSessionGroups]);
-    const railSessionGroupBySectionId = useMemo10(() => {
-      const groupsBySectionId = /* @__PURE__ */ new Map();
-      for (const group of railSessionGroups) {
-        const normalizedPath = normalizeConversationRailProjectPath(group.cwd);
-        groupsBySectionId.set(
-          normalizedPath ? `project:${normalizedPath}` : "conversations",
-          group
-        );
-      }
-      return groupsBySectionId;
-    }, [railSessionGroups]);
-    const loadMoreSectionConversations = useCallback10(
-      (sectionId) => {
-        const group = railSessionGroupBySectionId.get(sectionId);
-        const listSessionsPage = agentActivityRuntime.listSessionsPage;
-        if (!group?.hasMore || !group.nextCursor || !listSessionsPage) {
-          return;
-        }
-        setLoadingMoreSectionIds((current) => {
-          if (current.has(sectionId)) {
-            return current;
-          }
-          const next = new Set(current);
-          next.add(sectionId);
-          return next;
-        });
-        void listSessionsPage({
-          cursor: group.nextCursor,
-          cwd: group.cwd,
-          limit: AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE,
-          visibleOnly: true,
-          workspaceId
-        }).then((page) => {
-          setRailSessionGroups(
-            (current) => current.map((candidate) => {
-              if (candidate.cwd !== group.cwd) {
-                return candidate;
-              }
-              const sessionIds = new Set(
-                candidate.sessions.map((session) => session.agentSessionId)
-              );
-              const nextSessions = [...candidate.sessions];
-              for (const session of page.sessions) {
-                if (!sessionIds.has(session.agentSessionId)) {
-                  sessionIds.add(session.agentSessionId);
-                  nextSessions.push(session);
-                }
-              }
-              return {
-                ...candidate,
-                hasMore: page.hasMore,
-                nextCursor: page.nextCursor,
-                sessions: nextSessions
-              };
-            })
-          );
-        }).finally(() => {
-          setLoadingMoreSectionIds((current) => {
-            if (!current.has(sectionId)) {
-              return current;
-            }
-            const next = new Set(current);
-            next.delete(sectionId);
-            return next;
-          });
-        });
-      },
-      [agentActivityRuntime, railSessionGroupBySectionId, workspaceId]
-    );
-    const loadMoreSearchConversations = useCallback10(() => {
-      const searchSessions = agentActivityRuntime.searchSessions;
-      if (!searchSessions || !searchHasMore || !searchNextCursor || isLoadingMoreSearchConversations) {
-        return;
-      }
-      setIsLoadingMoreSearchConversations(true);
-      void searchSessions({
-        cursor: searchNextCursor,
-        limit: 100,
-        query: trimmedConversationQuery,
-        workspaceId
-      }).then((result) => {
-        const nextConversations = buildAgentGUIConversationSummaries({
-          provider,
-          snapshot: {
-            composerOptionsByProvider: {},
-            presences: [],
-            sessionMessagesById: {},
-            sessions: result.sessions,
-            workspaceId: result.workspaceId
-          },
-          userProjects
-        });
-        setSearchConversations((current) => {
-          const currentIds = new Set(current.map((item) => item.id));
-          return [
-            ...current,
-            ...nextConversations.filter((item) => !currentIds.has(item.id))
-          ];
-        });
-        setSearchHasMore(result.hasMore);
-        setSearchNextCursor(result.nextCursor ?? null);
-      }).finally(() => {
-        setIsLoadingMoreSearchConversations(false);
-      });
-    }, [
-      agentActivityRuntime,
-      isLoadingMoreSearchConversations,
-      provider,
-      searchHasMore,
-      searchNextCursor,
-      trimmedConversationQuery,
-      userProjects,
-      workspaceId
-    ]);
+    }, [conversations]);
     const registerConversationItemElement = useCallback10(
       (itemId, element) => {
         if (element) {
@@ -25110,46 +25350,6 @@ var AgentGUIConversationRailPane = memo(
       },
       []
     );
-    const handleSelectConversation = useCallback10(
-      (agentSessionId) => {
-        const normalizedAgentSessionId = agentSessionId.trim();
-        if (!normalizedAgentSessionId) {
-          return;
-        }
-        const isLoadedConversation = conversations.some(
-          (conversation) => conversation.id === normalizedAgentSessionId
-        );
-        if (!hasConversationQuery || isLoadedConversation) {
-          onSelectConversation(normalizedAgentSessionId);
-          return;
-        }
-        void agentActivityRuntime.getSession(workspaceId, normalizedAgentSessionId).then((session) => {
-          const [overlay] = buildAgentGUIConversationSummaries({
-            provider,
-            snapshot: {
-              composerOptionsByProvider: {},
-              presences: [],
-              sessionMessagesById: {},
-              sessions: [session],
-              workspaceId
-            },
-            userProjects: railSessionGroupProjects
-          });
-          setActiveConversationOverlay(overlay ?? null);
-          onSelectConversation(normalizedAgentSessionId);
-        }).catch(() => {
-        });
-      },
-      [
-        agentActivityRuntime,
-        conversations,
-        hasConversationQuery,
-        onSelectConversation,
-        provider,
-        railSessionGroupProjects,
-        workspaceId
-      ]
-    );
     useLayoutEffect4(() => {
       if (!activeConversationId) {
         return;
@@ -25189,6 +25389,18 @@ var AgentGUIConversationRailPane = memo(
               }
             )
           ] }),
+          showProviderRail ? /* @__PURE__ */ jsx31(
+            AgentGUIProviderRail,
+            {
+              conversationFilter,
+              labels,
+              previewMode,
+              providerTargets,
+              providerTargetsLoading,
+              onSelectConversationFilterTarget: selectConversationFilterTarget,
+              onUpdateConversationFilter: updateConversationFilter
+            }
+          ) : null,
           openclawGateway?.status === "starting" ? /* @__PURE__ */ jsxs17("div", { className: AgentGUINode_styles_default.gatewayStatus, "data-state": "starting", children: [
             /* @__PURE__ */ jsx31(
               StatusDot,
@@ -25232,9 +25444,6 @@ var AgentGUIConversationRailPane = memo(
                 const showProjectRailHeader = !conversationQuery.trim() && section.kind !== "pinned" && (sectionIndex === 0 || groupedConversations[sectionIndex - 1]?.kind === "pinned");
                 const isSectionCollapsed = isProjectSection && collapsedProjectSectionIds.has(section.id);
                 const projectConversationCount = normalizedProjectPath ? projectConversationCountsByPath.get(normalizedProjectPath) ?? 0 : 0;
-                const sectionSessionGroup = railSessionGroupBySectionId.get(
-                  section.id
-                );
                 return /* @__PURE__ */ jsxs17(Fragment7, { children: [
                   showProjectRailHeader ? /* @__PURE__ */ jsx31(
                     AgentGUIProjectRailHeader,
@@ -25251,13 +25460,11 @@ var AgentGUIConversationRailPane = memo(
                       createConversationDisabled,
                       currentTimeMs,
                       isDeletingConversation,
-                      isLoadingMoreConversations: hasConversationQuery ? isLoadingMoreSearchConversations : loadingMoreSectionIds.has(section.id),
                       isSectionCollapsed,
                       labels,
                       pendingDeleteConversationId,
                       previewMode,
                       projectConversationCount,
-                      sectionHasMore: hasConversationQuery ? searchHasMore : Boolean(sectionSessionGroup?.hasMore),
                       projectLabel,
                       projectPath,
                       registerItemElement: registerConversationItemElement,
@@ -25267,12 +25474,11 @@ var AgentGUIConversationRailPane = memo(
                       onConfirmDeleteConversation,
                       onCreateConversation,
                       onRequestDeleteConversation,
-                      onSelectConversation: handleSelectConversation,
+                      onSelectConversation,
                       setPendingProjectAction,
                       onToggleConversationPinned,
                       onOpenProjectFiles,
                       onOpenConversationWindow,
-                      onLoadMoreConversations: hasConversationQuery ? loadMoreSearchConversations : loadMoreSectionConversations,
                       onToggleProjectSectionCollapsed: toggleProjectSectionCollapsed
                     }
                   )
@@ -25402,8 +25608,6 @@ var AgentGUIConversationRailSection = memo(
     pendingDeleteConversationId,
     previewMode,
     isDeletingConversation,
-    isLoadingMoreConversations,
-    sectionHasMore,
     createConversationDisabled,
     currentTimeMs,
     labels,
@@ -25412,7 +25616,6 @@ var AgentGUIConversationRailSection = memo(
     onCreateConversation,
     onToggleProjectSectionCollapsed,
     onSelectConversation,
-    onLoadMoreConversations,
     setPendingProjectAction,
     onToggleConversationPinned,
     onOpenProjectFiles,
@@ -25428,29 +25631,16 @@ var AgentGUIConversationRailSection = memo(
     );
     const visibleItemCount = isSectionCollapsed ? 0 : Math.min(visibleItemLimit, section.items.length);
     const visibleItems = isSectionCollapsed ? [] : section.items.slice(0, visibleItemCount);
-    const canShowMore = !isSectionCollapsed && (visibleItemCount < section.items.length || sectionHasMore);
+    const canShowMore = !isSectionCollapsed && visibleItemCount < section.items.length;
     const canShowLess = !isSectionCollapsed && visibleItemCount > AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE;
     const showMoreConversations = useCallback10(() => {
-      if (visibleItemCount >= section.items.length && sectionHasMore) {
-        onLoadMoreConversations(section.id);
-        setVisibleItemLimit(
-          (current) => current + AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE
-        );
-        return;
-      }
       setVisibleItemLimit(
         (current) => Math.min(
           section.items.length,
           current + AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE
         )
       );
-    }, [
-      onLoadMoreConversations,
-      section.id,
-      section.items.length,
-      sectionHasMore,
-      visibleItemCount
-    ]);
+    }, [section.items.length]);
     const showLessConversations = useCallback10(() => {
       setVisibleItemLimit(AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE);
     }, []);
@@ -25743,7 +25933,6 @@ var AgentGUIConversationRailSection = memo(
                     {
                       type: "button",
                       className: AgentGUINode_styles_default.conversationSectionPaginationButton,
-                      disabled: isLoadingMoreConversations,
                       onClick: showMoreConversations,
                       children: labels.showMoreConversations
                     }
@@ -26196,6 +26385,10 @@ function formatQuotaPrimaryLine(row, t) {
 }
 function appendDockProbeUsageLines(probe, lines, isLoadingUsage, t) {
   if (probe.lastError?.code === "unsupported") {
+    lines.push({
+      label: t("agentHost.workspaceAgentProbeDetailQuota"),
+      primary: t("agentHost.workspaceAgentProbeUsageUnsupported")
+    });
     return;
   }
   if (isLoadingUsage && !probe.usage) {
@@ -26204,6 +26397,12 @@ function appendDockProbeUsageLines(probe, lines, isLoadingUsage, t) {
   }
   const quotas = probe.usage?.quotas ?? [];
   if (quotas.length === 0) {
+    if (probe.usage) {
+      lines.push({
+        label: t("agentHost.workspaceAgentProbeDetailQuota"),
+        primary: t("agentHost.workspaceAgentProbeUsageUnsupported")
+      });
+    }
     return;
   }
   const rows = buildCompactDisplayQuotas(quotas, t);
@@ -26644,11 +26843,11 @@ function slashStatusQuotasFromRuntimeUsage(value) {
       return null;
     }
     const normalized = { quotaType };
-    const percentRemaining = numberValue2(record.percentRemaining);
+    const percentRemaining = numberValue3(record.percentRemaining);
     if (percentRemaining !== null) {
       normalized.percentRemaining = percentRemaining;
     }
-    const resetsAtUnixMs = numberValue2(record.resetsAtUnixMs);
+    const resetsAtUnixMs = numberValue3(record.resetsAtUnixMs);
     if (resetsAtUnixMs !== null) {
       normalized.resetsAtUnixMs = resetsAtUnixMs;
     }
@@ -26656,7 +26855,7 @@ function slashStatusQuotasFromRuntimeUsage(value) {
     if (resetText) {
       normalized.resetText = resetText;
     }
-    const dollarRemaining = numberValue2(record.dollarRemaining);
+    const dollarRemaining = numberValue3(record.dollarRemaining);
     if (dollarRemaining !== null) {
       normalized.dollarRemaining = dollarRemaining;
     }
@@ -26683,7 +26882,7 @@ function agentUsageQuotaTypeValue(value) {
 function objectRecord2(value) {
   return value && typeof value === "object" ? value : null;
 }
-function numberValue2(value) {
+function numberValue3(value) {
   if (typeof value === "number" && Number.isFinite(value)) {
     return value;
   }
@@ -26711,12 +26910,12 @@ function normalizeSlashStatusModelName(value) {
   return value?.trim().toLowerCase().replace(/[^a-z0-9]+/gu, "-").replace(/^-+|-+$/gu, "") ?? "";
 }
 function agentGuiStateEquals(left, right) {
-  return left === right || left.provider === right.provider && (left.providerTargetId ?? null) === (right.providerTargetId ?? null) && agentGUIProviderTargetRefsEqual(
-    left.providerTargetRef,
-    right.providerTargetRef
-  ) && left.lastActiveAgentSessionId === right.lastActiveAgentSessionId && left.conversationRailWidthPx === right.conversationRailWidthPx && left.conversationRailCollapsed === right.conversationRailCollapsed && (left.composerOverrides?.model ?? null) === (right.composerOverrides?.model ?? null) && (left.composerOverrides?.reasoningEffort ?? null) === (right.composerOverrides?.reasoningEffort ?? null) && (left.composerOverrides?.planMode ?? null) === (right.composerOverrides?.planMode ?? null) && (left.composerOverrides?.permissionModeId ?? null) === (right.composerOverrides?.permissionModeId ?? null) && composerOverridesByProviderEqual(
+  return left === right || left.provider === right.provider && (left.agentTargetId ?? null) === (right.agentTargetId ?? null) && left.lastActiveAgentSessionId === right.lastActiveAgentSessionId && left.conversationRailWidthPx === right.conversationRailWidthPx && left.conversationRailCollapsed === right.conversationRailCollapsed && (left.composerOverrides?.model ?? null) === (right.composerOverrides?.model ?? null) && (left.composerOverrides?.reasoningEffort ?? null) === (right.composerOverrides?.reasoningEffort ?? null) && (left.composerOverrides?.planMode ?? null) === (right.composerOverrides?.planMode ?? null) && (left.composerOverrides?.permissionModeId ?? null) === (right.composerOverrides?.permissionModeId ?? null) && composerOverridesByProviderEqual(
     left.composerOverridesByProvider,
     right.composerOverridesByProvider
+  ) && composerOverridesByAgentTargetIdEqual(
+    left.composerOverridesByAgentTargetId,
+    right.composerOverridesByAgentTargetId
   );
 }
 function composerOverridesByProviderEqual(left, right) {
@@ -26734,8 +26933,22 @@ function composerOverridesByProviderEqual(left, right) {
   }
   return true;
 }
+function composerOverridesByAgentTargetIdEqual(left, right) {
+  const keys = /* @__PURE__ */ new Set([
+    ...Object.keys(left ?? {}),
+    ...Object.keys(right ?? {})
+  ]);
+  for (const key of keys) {
+    const leftSettings = left?.[key] ?? null;
+    const rightSettings = right?.[key] ?? null;
+    if ((leftSettings?.model ?? null) !== (rightSettings?.model ?? null) || (leftSettings?.reasoningEffort ?? null) !== (rightSettings?.reasoningEffort ?? null) || (leftSettings?.planMode ?? null) !== (rightSettings?.planMode ?? null) || (leftSettings?.permissionModeId ?? null) !== (rightSettings?.permissionModeId ?? null)) {
+      return false;
+    }
+  }
+  return true;
+}
 function areAgentGUINodePropsEqual(previous, next) {
-  return previous.nodeId === next.nodeId && previous.workspaceId === next.workspaceId && previous.currentUserId === next.currentUserId && previous.workspacePath === next.workspacePath && previous.workspaceFileReferenceAdapter === next.workspaceFileReferenceAdapter && previous.resolveDroppedFileReferences === next.resolveDroppedFileReferences && previous.selectProjectDirectory === next.selectProjectDirectory && previous.referenceSourceAggregator === next.referenceSourceAggregator && previous.resolveWorkspaceReferenceEntryIconUrl === next.resolveWorkspaceReferenceEntryIconUrl && previous.resolveMentionReferenceTarget === next.resolveMentionReferenceTarget && previous.resolveWorkspaceReferenceInitialTarget === next.resolveWorkspaceReferenceInitialTarget && previous.onWorkspaceFileReferencesAdded === next.onWorkspaceFileReferencesAdded && previous.agentSettings.avoidGroupingEdits === next.agentSettings.avoidGroupingEdits && previous.title === next.title && agentGuiStateEquals(previous.state, next.state) && previous.position.x === next.position.x && previous.position.y === next.position.y && previous.width === next.width && previous.height === next.height && previous.desktopSize.width === next.desktopSize.width && previous.desktopSize.height === next.desktopSize.height && previous.onLinkAction === next.onLinkAction && previous.onCapabilitySettingsRequest === next.onCapabilitySettingsRequest && previous.onAgentProviderLogin === next.onAgentProviderLogin && previous.providerTargets === next.providerTargets && previous.defaultProviderTargetId === next.defaultProviderTargetId && previous.onClose === next.onClose && previous.onResize === next.onResize && previous.onUpdateNode === next.onUpdateNode && previous.onRememberComposerDefaults === next.onRememberComposerDefaults && previous.onOpenConversationWindow === next.onOpenConversationWindow && previous.isMaximized === next.isMaximized && previous.isMuted === next.isMuted && previous.onMinimize === next.onMinimize && previous.onToggleMaximize === next.onToggleMaximize && previous.onShowMessage === next.onShowMessage && workspaceAgentProbeRenderStateEqualsForProvider(
+  return previous.nodeId === next.nodeId && previous.workspaceId === next.workspaceId && previous.currentUserId === next.currentUserId && previous.workspacePath === next.workspacePath && previous.workspaceFileReferenceAdapter === next.workspaceFileReferenceAdapter && previous.resolveDroppedFileReferences === next.resolveDroppedFileReferences && previous.selectProjectDirectory === next.selectProjectDirectory && previous.referenceSourceAggregator === next.referenceSourceAggregator && previous.resolveWorkspaceReferenceEntryIconUrl === next.resolveWorkspaceReferenceEntryIconUrl && previous.resolveMentionReferenceTarget === next.resolveMentionReferenceTarget && previous.resolveWorkspaceReferenceInitialTarget === next.resolveWorkspaceReferenceInitialTarget && previous.onWorkspaceFileReferencesAdded === next.onWorkspaceFileReferencesAdded && previous.agentSettings.avoidGroupingEdits === next.agentSettings.avoidGroupingEdits && previous.title === next.title && agentGuiStateEquals(previous.state, next.state) && previous.position.x === next.position.x && previous.position.y === next.position.y && previous.width === next.width && previous.height === next.height && previous.desktopSize.width === next.desktopSize.width && previous.desktopSize.height === next.desktopSize.height && previous.onLinkAction === next.onLinkAction && previous.onCapabilitySettingsRequest === next.onCapabilitySettingsRequest && previous.onAgentProviderLogin === next.onAgentProviderLogin && previous.providerTargets === next.providerTargets && previous.providerTargetsLoading === next.providerTargetsLoading && previous.defaultProviderTargetId === next.defaultProviderTargetId && previous.conversationScope === next.conversationScope && previous.onClose === next.onClose && previous.onResize === next.onResize && previous.onUpdateNode === next.onUpdateNode && previous.onRememberComposerDefaults === next.onRememberComposerDefaults && previous.onOpenConversationWindow === next.onOpenConversationWindow && previous.isMaximized === next.isMaximized && previous.isMuted === next.isMuted && previous.onMinimize === next.onMinimize && previous.onToggleMaximize === next.onToggleMaximize && previous.onShowMessage === next.onShowMessage && workspaceAgentProbeRenderStateEqualsForProvider(
     previous.workspaceAgentProbes,
     next.workspaceAgentProbes,
     previous.state.provider
@@ -26766,7 +26979,9 @@ var AgentGUINode = memo2(function AgentGUINode2({
   onCapabilitySettingsRequest,
   onAgentProviderLogin,
   providerTargets,
+  providerTargetsLoading = false,
   defaultProviderTargetId = null,
+  conversationScope = "single-provider",
   onWorkspaceFileReferencesAdded,
   onOpenConversationWindow,
   onClose,
@@ -26923,9 +27138,11 @@ var AgentGUINode = memo2(function AgentGUINode2({
     workspacePath,
     avoidGroupingEdits: agentSettings.avoidGroupingEdits,
     data: state,
+    conversationScope,
     openSessionRequest,
     prefillPromptRequest,
     providerTargets,
+    providerTargetsLoading,
     defaultProviderTargetId,
     previewMode,
     onDataChange: handleDataChange,
@@ -26964,6 +27181,36 @@ var AgentGUINode = memo2(function AgentGUINode2({
     fallbackAgentLabel: fallbackAgentTitle,
     language: locale
   }) : null;
+  useEffect14(() => {
+    if (previewMode || !viewModel.activeConversation) {
+      return;
+    }
+    const conversationTitle = activeConversationDockTitle?.trim() ?? "";
+    if (!conversationTitle) {
+      return;
+    }
+    const conversationId = viewModel.activeConversation.id;
+    if (state.lastActiveAgentSessionId === conversationId && state.lastActiveConversationTitle === conversationTitle) {
+      return;
+    }
+    onUpdateNode((current) => {
+      if (current.lastActiveAgentSessionId === conversationId && current.lastActiveConversationTitle === conversationTitle) {
+        return current;
+      }
+      return {
+        ...current,
+        lastActiveAgentSessionId: conversationId,
+        lastActiveConversationTitle: conversationTitle
+      };
+    });
+  }, [
+    activeConversationDockTitle,
+    onUpdateNode,
+    previewMode,
+    state.lastActiveAgentSessionId,
+    state.lastActiveConversationTitle,
+    viewModel.activeConversation
+  ]);
   const labels = useMemo11(
     () => ({
       initialPlaceholder: t("agentHost.agentGui.initialPlaceholder", {
@@ -27094,6 +27341,12 @@ var AgentGUINode = memo2(function AgentGUINode2({
       emptyProjectConversations: t(
         "agentHost.agentGui.emptyProjectConversations"
       ),
+      conversationFilterAll: t("agentHost.agentGui.conversationFilterAll"),
+      conversationFilterCodex: t("agentHost.agentGui.conversationFilterCodex"),
+      conversationFilterClaudeCode: t(
+        "agentHost.agentGui.conversationFilterClaudeCode"
+      ),
+      providerSwitchLabel: t("agentHost.agentGui.providerSwitchLabel"),
       startConversation: t("agentHost.agentGui.startConversation"),
       selectConversation: t("agentHost.agentGui.selectConversation"),
       loadingConversations: t("agentHost.agentGui.loadingConversations"),
@@ -27208,6 +27461,10 @@ var AgentGUINode = memo2(function AgentGUINode2({
       submitAnswers: t("agentHost.agentGui.submitAnswers"),
       answerPlaceholder: t("agentHost.agentGui.answerPlaceholder"),
       waitingForAnswer: t("agentHost.agentGui.waitingForAnswer"),
+      waitingForBackgroundAgent: (count) => {
+        const pluralKey = count === 1 ? "agentHost.agentGui.waitingForBackgroundAgent_one" : "agentHost.agentGui.waitingForBackgroundAgent_other";
+        return t(pluralKey, { count });
+      },
       thinkingLabel: t("agentHost.workspaceAgentSessionDetailThinking"),
       toolCallsLabel: (count) => t("agentHost.workspaceAgentSessionDetailToolCalls", { count }),
       openConversationWindow: t("agentHost.agentGui.openConversationWindow"),
@@ -27418,41 +27675,9 @@ var AgentGUINode = memo2(function AgentGUINode2({
     }),
     [t]
   );
-  const collapsedWindowConversationTitle = isConversationRailCollapsed ? activeConversationDockTitle ?? state.lastActiveConversationTitle ?? null : null;
+  const collapsedWindowConversationTitle = isConversationRailCollapsed ? activeConversationDockTitle : null;
   const windowTitle = collapsedWindowConversationTitle || (isConversationRailCollapsed ? activeConversationWindowTitle : null) || windowAgentTitle || title;
   const windowTitleIconUrl = agentGuiDockIconUrls[activeProvider] ?? null;
-  useEffect14(() => {
-    if (previewMode) {
-      return;
-    }
-    if (!viewModel.activeConversation) {
-      return;
-    }
-    const nextTitle = activeConversationDockTitle;
-    const previousTitle = state.lastActiveConversationTitle ?? null;
-    if (nextTitle === null && previousTitle !== null && viewModel.activeConversation.id === state.lastActiveAgentSessionId) {
-      return;
-    }
-    if ((state.lastActiveConversationTitle ?? null) === nextTitle) {
-      return;
-    }
-    onUpdateNode((current) => {
-      if ((current.lastActiveConversationTitle ?? null) === nextTitle) {
-        return current;
-      }
-      return {
-        ...current,
-        lastActiveConversationTitle: nextTitle
-      };
-    });
-  }, [
-    activeConversationDockTitle,
-    onUpdateNode,
-    previewMode,
-    state.lastActiveAgentSessionId,
-    state.lastActiveConversationTitle,
-    viewModel.activeConversation
-  ]);
   const activeProbeProvider = activeProvider;
   const activeAgentProbe = useMemo11(
     () => findWorkspaceAgentProbeForDockProvider(