@tutti-os/agent-gui 0.0.85 → 0.0.86

package/dist/index.js

@@ -6,33 +6,24 @@ import {
   agentGuiDockIconUrl,
   agentGuiDockIconUrls,
   clampAgentGUIConversationRailWidthPx,
+  normalizeAgentGUIAgents,
+  projectAgentGUIAgentsToInternalTargets,
   resolveAgentGUIConversationRailMaxWidthPx,
   resolveAgentGUIExpandedWindowFrame,
   resolveAgentGuiSessionProviderFlatIconUrl,
   resolveNextAgentGUIConversationRailWidthPx,
   shouldAutoCollapseAgentGUIConversationRail
-} from "./chunk-DBIJRSFG.js";
-import {
-  agentGUIDefaultTargetProviders,
-  agentGUIProviderTargetRefsEqual,
-  createDisabledPlaceholderAgentGUIProviderTarget,
-  createLocalAgentGUIProviderTarget,
-  createLocalAgentGUIProviderTargets,
-  createSharedAgentGUIProviderTarget,
-  localAgentGUIAgentTargetId,
-  localAgentGUIProviderTargetId,
-  normalizeAgentGUIProviderTargets,
-  resolveAgentGUIProviderTarget
-} from "./chunk-BEM3KDOJ.js";
-import "./chunk-L2ZMLLYL.js";
-import "./chunk-BT2DT2P7.js";
+} from "./chunk-A7RA7ORT.js";
+import "./chunk-45FF4DQU.js";
+import "./chunk-7LMJXF4R.js";
+import "./chunk-GAPTLVII.js";
 import {
   resolveAgentGuiWorkbenchProviderLabel
 } from "./chunk-XW4CVBUH.js";
 import {
   AgentInteractivePromptSurface,
   approvalOptionDisplayLabel
-} from "./chunk-N7EX6XK3.js";
+} from "./chunk-SXDLSEHO.js";
 import {
   PLAN_IMPLEMENTATION_ACTION_FEEDBACK,
   PLAN_IMPLEMENTATION_ACTION_IMPLEMENT,
@@ -51,7 +42,7 @@ import {
   resolveAgentGUIExplicitConversationTitle,
   resolveAgentGUIProviderDisplayLabel,
   resolveAgentGUIProviderIdentity
-} from "./chunk-3355GEBI.js";
+} from "./chunk-HOSX5C5V.js";
 import {
   AGENT_PASTED_TEXT_BLOCK_KIND,
   AGENT_PASTED_TEXT_MENTION_KIND,
@@ -88,14 +79,14 @@ import {
   textPromptContent,
   toLocalShortDateTime,
   useProjectedAgentConversation
-} from "./chunk-FIH7IYLX.js";
+} from "./chunk-7FZT2OYT.js";
 import {
   AgentMessageMarkdown,
   AgentTargetPresentationProvider,
   ZoomableImage,
   cn,
   resolveWorkspaceLinkAction
-} from "./chunk-HUNUSBQQ.js";
+} from "./chunk-XQUUELKF.js";
 import {
   openAgentEnvPanel
 } from "./chunk-PSLAWU25.js";
@@ -106,12 +97,12 @@ import {
   DEFAULT_AGENT_MENTION_FILTER,
   agentMentionItemKey,
   preloadAgentMentionBrowse
-} from "./chunk-UNLTQUPO.js";
+} from "./chunk-4SQNOOJ3.js";
 import {
   buildWorkspaceAgentActivityListViewModel,
   isWorkspaceAgentUntitledTask
-} from "./chunk-A2JPL5N6.js";
-import "./chunk-CVPWQHQH.js";
+} from "./chunk-3HARXLAZ.js";
+import "./chunk-AOVPGJBC.js";
 import {
   resolveWorkspaceAgentSessionSortTimeUnixMs
 } from "./chunk-IBIMGLCD.js";
@@ -125,7 +116,7 @@ import {
   mentionItemToAttrs,
   normalizeAgentSessionMentionTitle,
   parseMentionItemFromHref
-} from "./chunk-CXJEQQR5.js";
+} from "./chunk-KQE5KV2V.js";
 import "./chunk-Y35GDLP2.js";
 import "./chunk-LUGELG5V.js";
 import {
@@ -166,14 +157,14 @@ import {
   agentGuiI18nResources,
   translate,
   useTranslation
-} from "./chunk-MQ6WW3CD.js";
+} from "./chunk-U7D7G3UU.js";
 import "./chunk-PJP5BUU6.js";
 import {
   agentColorfulUrl,
   cursorColorfulUrl,
   normalizeManagedAgentProvider
 } from "./chunk-XDV4ZRVK.js";
-import "./chunk-AA75BOX3.js";
+import "./chunk-VWXFFSIM.js";
 import {
   AGENT_CONTEXT_MENTION_PROVIDER_IDS
 } from "./chunk-JM24HADP.js";
@@ -2374,6 +2365,169 @@ var DEFAULT_AGENT_SETTINGS = {
   hideWorktreeMismatchDropWarning: false
 };
 
+// providerTargets.ts
+var agentGUIProviderTargetStaticLabels = {
+  "claude-code": "Claude Code",
+  codex: "Codex",
+  cursor: "Cursor",
+  hermes: "Hermes",
+  nexight: "Tutti Agent",
+  openclaw: "OpenClaw",
+  opencode: "Open Code",
+  "tutti-agent": "Tutti Agent"
+};
+var agentGUIDefaultTargetProviders = [
+  "codex",
+  "claude-code",
+  "cursor",
+  "tutti-agent",
+  "opencode",
+  "hermes",
+  "openclaw"
+];
+var agentGUIDisabledPlaceholderProviders = [
+  "hermes",
+  "openclaw"
+];
+function createLocalAgentGUIProviderTarget(provider) {
+  const targetId = localAgentGUIProviderTargetId(provider);
+  const agentTargetId = localAgentGUIAgentTargetId(provider);
+  return {
+    targetId,
+    ...agentTargetId ? { agentTargetId } : {},
+    provider,
+    ref: {
+      kind: "local",
+      provider
+    },
+    label: agentGUIProviderTargetStaticLabels[provider] ?? provider
+  };
+}
+function createDisabledPlaceholderAgentGUIProviderTarget(provider) {
+  return {
+    ...createLocalAgentGUIProviderTarget(provider),
+    disabled: true
+  };
+}
+function createStaticAgentGUIProviderTargets(providers = agentGUIDefaultTargetProviders, options) {
+  const disabledProviders = new Set(
+    options?.includeDisabledPlaceholders === true ? agentGUIDisabledPlaceholderProviders : []
+  );
+  return providers.map(
+    (provider) => disabledProviders.has(provider) ? createDisabledPlaceholderAgentGUIProviderTarget(provider) : createLocalAgentGUIProviderTarget(provider)
+  );
+}
+function localAgentGUIProviderTargetId(provider) {
+  return `local:${provider}`;
+}
+function localAgentGUIAgentTargetId(provider) {
+  switch (provider) {
+    case "codex":
+      return "local:codex";
+    case "claude-code":
+      return "local:claude-code";
+    case "tutti-agent":
+      return "local:tutti-agent";
+    case "cursor":
+      return "local:cursor";
+    case "hermes":
+      return "local:hermes";
+    case "nexight":
+      return "local:nexight";
+    case "openclaw":
+      return "local:openclaw";
+    case "opencode":
+      return "local:opencode";
+    default:
+      return null;
+  }
+}
+function normalizeAgentGUIProviderTargets(targets, options) {
+  const includeDisabledPlaceholders = options?.includeDisabledPlaceholders === true;
+  const useStaticCatalog = options?.useStaticCatalog !== false;
+  const source = targets && targets.length > 0 ? targets : [];
+  const normalizedTargets = [];
+  const seenTargetKeys = /* @__PURE__ */ new Set();
+  const seenProviders = /* @__PURE__ */ new Set();
+  for (const target of source) {
+    const normalized = normalizeAgentGUIProviderTarget(target);
+    if (!normalized) {
+      continue;
+    }
+    const dedupeKey = `${normalized.provider}\0${normalized.targetId}`;
+    if (seenTargetKeys.has(dedupeKey)) {
+      continue;
+    }
+    seenTargetKeys.add(dedupeKey);
+    seenProviders.add(normalized.provider);
+    normalizedTargets.push(normalized);
+  }
+  if (includeDisabledPlaceholders && normalizedTargets.length > 0) {
+    for (const provider of agentGUIDisabledPlaceholderProviders) {
+      if (seenProviders.has(provider)) {
+        continue;
+      }
+      normalizedTargets.push(
+        createDisabledPlaceholderAgentGUIProviderTarget(provider)
+      );
+    }
+  }
+  return normalizedTargets.length > 0 || !useStaticCatalog ? normalizedTargets : createStaticAgentGUIProviderTargets(void 0, {
+    includeDisabledPlaceholders
+  });
+}
+function normalizeAgentGUIProviderTarget(target) {
+  const {
+    targetId: _targetId,
+    agentTargetId: _agentTargetId,
+    provider: _provider,
+    ref: _ref,
+    label: _label,
+    badge,
+    description,
+    iconUrl,
+    ownerLabel,
+    unavailableReason,
+    ...rest
+  } = target;
+  const targetId = target.targetId.trim();
+  const agentTargetId = target.agentTargetId?.trim();
+  const label = target.label.trim();
+  const kind = typeof target.ref.kind === "string" ? target.ref.kind.trim() : "";
+  if (!targetId || !label || !kind || target.ref.provider !== target.provider) {
+    return null;
+  }
+  const normalizedBadge = normalizeAgentGUIProviderTargetBadge(badge);
+  return {
+    ...rest,
+    targetId,
+    ...agentTargetId ? { agentTargetId } : {},
+    provider: target.provider,
+    ref: {
+      ...target.ref,
+      kind,
+      provider: target.provider
+    },
+    label,
+    ...normalizedBadge ? { badge: normalizedBadge } : {},
+    ...description?.trim() ? { description: description.trim() } : {},
+    ...iconUrl?.trim() ? { iconUrl: iconUrl.trim() } : {},
+    ...ownerLabel?.trim() ? { ownerLabel: ownerLabel.trim() } : {},
+    ...unavailableReason?.trim() ? { unavailableReason: unavailableReason.trim() } : {}
+  };
+}
+function normalizeAgentGUIProviderTargetBadge(badge) {
+  const iconUrl = badge?.iconUrl?.trim() ?? "";
+  if (!iconUrl) {
+    return null;
+  }
+  const label = badge?.label?.trim() ?? "";
+  return {
+    iconUrl,
+    ...label ? { label } : {}
+  };
+}
+
 // agent-gui/agentGuiNode/model/agentGuiConversationFilter.ts
 function createAgentGUIConversationFilterState(filter = { kind: "all" }) {
   return {
@@ -6860,7 +7014,7 @@ function composerTargetDataFromProviderTarget(input) {
   const currentAgentTargetId = normalizeOptionalText2(
     input.current.agentTargetId
   );
-  const canPromoteLegacyComposerOverrides = agentTargetId !== null && currentAgentTargetId === null && normalizeOptionalText2(input.current.providerTargetId) === null && input.current.providerTargetRef == null && input.current.provider === input.target.provider && input.current.composerOverrides != null && !input.current.composerOverridesByAgentTargetId?.[agentTargetId];
+  const canPromoteLegacyComposerOverrides = agentTargetId !== null && currentAgentTargetId === null && input.current.provider === input.target.provider && input.current.composerOverrides != null && !input.current.composerOverridesByAgentTargetId?.[agentTargetId];
   const composerOverridesByAgentTargetId = canPromoteLegacyComposerOverrides ? {
     ...input.current.composerOverridesByAgentTargetId ?? {},
     [agentTargetId]: input.current.composerOverrides
@@ -6869,15 +7023,11 @@ function composerTargetDataFromProviderTarget(input) {
   return {
     agentTargetId,
     provider: input.target.provider,
-    providerTargetId: null,
-    providerTargetRef: null,
     targetId: input.target.targetId,
     data: {
       ...input.current,
       provider: input.target.provider,
       agentTargetId,
-      providerTargetId: null,
-      providerTargetRef: null,
       composerOverrides: canPromoteLegacyComposerOverrides ? null : currentTargetIdentityChanged ? null : input.current.composerOverrides,
       composerOverridesByAgentTargetId
     }
@@ -6885,7 +7035,7 @@ function composerTargetDataFromProviderTarget(input) {
 }
 function isExplicitAgentGUIProviderTarget(target, explicitTargets) {
   return explicitTargets.some(
-    (candidate) => candidate.provider === target.provider && candidate.targetId === target.targetId && agentGUIProviderTargetRefsEqual(candidate.ref, target.ref)
+    (candidate) => candidate.agentTargetId === target.agentTargetId
   );
 }
 function findAgentGUIDirectoryTarget(directory, agentTargetId) {
@@ -6896,21 +7046,26 @@ function findAgentGUIDirectoryTarget(directory, agentTargetId) {
     (target) => normalizeOptionalText2(target.agentTargetId) === agentTargetId
   );
 }
+function resolveAgentGUIDirectorySelection(input) {
+  const agentTargetId = normalizeOptionalText2(input.agentTargetId);
+  if (agentTargetId) {
+    return findAgentGUIDirectoryTarget(input.targets, agentTargetId) ?? null;
+  }
+  const providerTargets = input.provider ? input.targets.filter((target) => target.provider === input.provider) : [];
+  return providerTargets.find((target) => target.disabled !== true) ?? providerTargets[0] ?? input.targets.find((target) => target.disabled !== true) ?? input.targets[0] ?? null;
+}
 function composerTargetDataFromNodeData(data, directory) {
   const foreignKeyAgentTargetId = normalizeOptionalText2(data.agentTargetId);
-  const lookupAgentTargetId = foreignKeyAgentTargetId ?? localAgentGUIAgentTargetId(data.provider);
   const directoryTarget = findAgentGUIDirectoryTarget(
     directory,
-    lookupAgentTargetId
+    foreignKeyAgentTargetId
   );
   const agentTargetId = normalizeOptionalText2(directoryTarget?.agentTargetId) ?? foreignKeyAgentTargetId;
   const provider = directoryTarget?.provider ?? data.provider;
   return {
     agentTargetId,
     provider,
-    providerTargetId: null,
-    providerTargetRef: null,
-    targetId: directoryTarget?.targetId ?? agentTargetId ?? `local:${provider}`,
+    targetId: directoryTarget?.targetId ?? agentTargetId ?? "__missing__",
     data: directoryTarget && directoryTarget.provider !== data.provider ? { ...data, provider } : data
   };
 }
@@ -6920,18 +7075,17 @@ function resolveActiveSessionComposerTarget(input) {
   if (input.directoryLoading) {
     return { status: "loading", target, missingAgentTargetId: null };
   }
-  const resolveKey = foreignKey ?? localAgentGUIAgentTargetId(input.data.provider);
   const directoryTarget = findAgentGUIDirectoryTarget(
     input.directory,
-    resolveKey
+    foreignKey
   );
   if (directoryTarget) {
     return { status: "resolved", target, missingAgentTargetId: null };
   }
-  return { status: "missing", target, missingAgentTargetId: resolveKey };
+  return { status: "missing", target, missingAgentTargetId: foreignKey };
 }
 function agentGUINodeDataHasComposerTarget(data) {
-  return normalizeOptionalText2(data.agentTargetId) !== null || normalizeOptionalText2(data.providerTargetId) !== null || data.providerTargetRef != null;
+  return normalizeOptionalText2(data.agentTargetId) !== null;
 }
 function composerOptionsForTarget(input) {
   if (!input.target.agentTargetId) {
@@ -6985,7 +7139,7 @@ function sanitizeComposerSettingsForTarget(input) {
   return sanitizeComposerSettingsForOptions(input.settings, input.options);
 }
 function agentGUIProviderTargetsEqual(left, right) {
-  return left.provider === right.provider && left.targetId === right.targetId && (left.agentTargetId ?? null) === (right.agentTargetId ?? null) && agentGUIProviderTargetRefsEqual(left.ref, right.ref);
+  return (left.agentTargetId ?? left.targetId) === (right.agentTargetId ?? right.targetId);
 }
 function reportAgentGUIDiagnostic(runtime, input) {
   const reportDiagnostic = runtime.reportDiagnostic;
@@ -7037,9 +7191,9 @@ function showAgentGUIControllerErrorToast(hostToast, message) {
 function reportAgentGUIConversationFilterTargetUnresolved(input) {
   reportAgentGUIDiagnostic(input.runtime, {
     details: {
+      agentTargetId: input.agentTargetId,
       provider: input.provider,
       providerTargetCount: input.providerTargetCount,
-      providerTargetId: input.providerTargetId,
       reason: input.reason
     },
     event: "agent.gui.conversation_filter.target_unresolved",
@@ -8158,20 +8312,6 @@ function normalizeOptionalText2(value) {
   const trimmed = value.trim();
   return trimmed ? trimmed : null;
 }
-function resolveSameProviderActiveSessionModel(input) {
-  const agentSessionId = normalizeOptionalText2(input.agentSessionId);
-  if (agentSessionId === null) {
-    return null;
-  }
-  const runtimeSession = input.runtime.getSnapshot(input.workspaceId).sessions.find(
-    (candidate) => candidate.agentSessionId.trim() === agentSessionId
-  ) ?? null;
-  const activeProvider = normalizeOptionalText2(runtimeSession?.provider) ?? normalizeOptionalText2(input.activeProvider);
-  if (activeProvider !== input.provider) {
-    return null;
-  }
-  return normalizeOptionalText2(input.sessionState?.settings?.model) ?? normalizeOptionalText2(runtimeSession?.model);
-}
 function normalizeOptionalPrompt(value) {
   return typeof value === "string" ? value.trim() : "";
 }
@@ -9007,16 +9147,6 @@ function normalizedPositiveNumber2(value) {
 function timelineItemTime(item) {
   return item.occurredAtUnixMs ?? item.createdAtUnixMs ?? 0;
 }
-var emptyComingSoonProviders = [];
-function applyComingSoonProviderTargets(targets, comingSoonProviders) {
-  if (comingSoonProviders.length === 0) {
-    return targets;
-  }
-  const comingSoon = new Set(comingSoonProviders);
-  return targets.map(
-    (target) => comingSoon.has(target.provider) && target.disabled !== true ? { ...target, disabled: true } : target
-  );
-}
 function useAgentGUINodeController({
   nodeId,
   workspaceId,
@@ -9026,10 +9156,8 @@ function useAgentGUINodeController({
   data,
   providerTargets,
   providerTargetsLoading = false,
-  providerRailMode = "catalog",
-  comingSoonProviders,
   providerReadinessGates = null,
-  defaultProviderTargetId = null,
+  defaultAgentTargetId = null,
   openSessionRequest = null,
   prefillPromptRequest = null,
   previewMode = false,
@@ -9058,42 +9186,16 @@ function useAgentGUINodeController({
   const agentQueuedPromptRuntime = useAgentQueuedPromptRuntime();
   const agentHostApi = useAgentHostApi();
   const agentActivitySnapshot = useAgentActivitySnapshot(workspaceId);
-  const normalizedComingSoonProviders = useMemo3(
-    () => comingSoonProviders && comingSoonProviders.length > 0 ? [...comingSoonProviders] : emptyComingSoonProviders,
-    [comingSoonProviders]
-  );
-  const isExactProviderRailMode = providerRailMode === "exact";
-  const normalizedExplicitProviderTargets = useMemo3(() => {
-    const normalized = normalizeAgentGUIProviderTargets(providerTargets, {
-      includeDisabledPlaceholders: !isExactProviderRailMode,
-      useStaticCatalog: false
-    });
-    return isExactProviderRailMode ? normalized : applyComingSoonProviderTargets(
-      normalized,
-      normalizedComingSoonProviders
-    );
-  }, [isExactProviderRailMode, normalizedComingSoonProviders, providerTargets]);
-  const normalizedProviderTargets = useMemo3(() => {
-    if (providerTargetsLoading) {
-      return [];
-    }
-    if (!isExactProviderRailMode && (providerTargets === void 0 || normalizedExplicitProviderTargets.length === 0)) {
-      return applyComingSoonProviderTargets(
-        normalizeAgentGUIProviderTargets(null, {
-          includeDisabledPlaceholders: true
-        }),
-        normalizedComingSoonProviders
-      );
-    }
-    return normalizedExplicitProviderTargets;
-  }, [
-    isExactProviderRailMode,
-    normalizedExplicitProviderTargets,
-    normalizedComingSoonProviders,
-    providerTargets,
-    providerTargetsLoading
-  ]);
-  const shouldUseStaticProviderTargets = !isExactProviderRailMode && !providerTargetsLoading && (providerTargets === void 0 || normalizedExplicitProviderTargets.length === 0);
+  const normalizedExplicitProviderTargets = useMemo3(
+    () => normalizeAgentGUIProviderTargets(providerTargets, {
+      // AgentGUINode always passes the projected `/agents` array, including
+      // an explicit empty array. The undefined branch exists only for direct
+      // package-internal controller harnesses and legacy tests.
+      useStaticCatalog: providerTargets === void 0
+    }),
+    [providerTargets]
+  );
+  const normalizedProviderTargets = providerTargetsLoading ? [] : normalizedExplicitProviderTargets;
   const handoffProviderTargets = useMemo3(
     () => providerTargetsLoading ? [] : normalizedExplicitProviderTargets.filter(
       (target) => target.disabled !== true
@@ -9101,14 +9203,10 @@ function useAgentGUINodeController({
     [normalizedExplicitProviderTargets, providerTargetsLoading]
   );
   const selectedProviderTarget = useMemo3(() => {
-    const resolved = resolveAgentGUIProviderTarget({
-      agentTargetId: data.agentTargetId,
-      defaultProviderTargetId,
-      provider: data.provider,
-      providerTargetId: data.providerTargetId,
-      providerTargets: normalizedProviderTargets,
-      useStaticCatalog: shouldUseStaticProviderTargets
-    });
+    const selectedAgentTargetId = normalizeOptionalText2(data.agentTargetId) ?? normalizeOptionalText2(defaultAgentTargetId);
+    const resolved = normalizedProviderTargets.find(
+      (target) => target.agentTargetId === selectedAgentTargetId
+    ) ?? normalizedProviderTargets.find((target) => target.disabled !== true) ?? normalizedProviderTargets[0];
     return resolved ?? {
       targetId: data.agentTargetId ?? "__loading__",
       provider: data.provider,
@@ -9122,27 +9220,19 @@ function useAgentGUINodeController({
   }, [
     data.agentTargetId,
     data.provider,
-    data.providerTargetId,
-    defaultProviderTargetId,
-    normalizedProviderTargets,
-    shouldUseStaticProviderTargets
+    defaultAgentTargetId,
+    normalizedProviderTargets
   ]);
   const selectedProviderTargetIsExplicit = useMemo3(
     () => normalizedExplicitProviderTargets.some(
-      (target) => target.provider === selectedProviderTarget.provider && target.targetId === selectedProviderTarget.targetId && agentGUIProviderTargetRefsEqual(
-        target.ref,
-        selectedProviderTarget.ref
-      )
+      (target) => target.agentTargetId === selectedProviderTarget.agentTargetId
     ),
     [normalizedExplicitProviderTargets, selectedProviderTarget]
   );
   const [homeComposerTargetOverride, setHomeComposerTargetOverride] = useState4(null);
   const homeComposerTargetOverrideIsExplicit = useMemo3(
     () => homeComposerTargetOverride ? normalizedExplicitProviderTargets.some(
-      (target) => target.provider === homeComposerTargetOverride.provider && target.targetId === homeComposerTargetOverride.targetId && agentGUIProviderTargetRefsEqual(
-        target.ref,
-        homeComposerTargetOverride.ref
-      )
+      (target) => target.agentTargetId === homeComposerTargetOverride.agentTargetId
     ) : false,
     [homeComposerTargetOverride, normalizedExplicitProviderTargets]
   );
@@ -9155,10 +9245,7 @@ function useAgentGUINodeController({
       (target) => target.disabled !== true && providerReadinessGates[target.provider] === null
     ) ?? null;
   }, [normalizedProviderTargets, providerReadinessGates]);
-  const nodeComposerTargetResolvedByProviderTarget = agentGUINodeDataHasComposerTarget(data) && (normalizeOptionalText2(data.agentTargetId) !== null && selectedProviderTarget.agentTargetId === normalizeOptionalText2(data.agentTargetId) || normalizeOptionalText2(data.providerTargetId) !== null && selectedProviderTarget.targetId === normalizeOptionalText2(data.providerTargetId) || data.providerTargetRef != null && agentGUIProviderTargetRefsEqual(
-    selectedProviderTarget.ref,
-    data.providerTargetRef
-  ));
+  const nodeComposerTargetResolvedByProviderTarget = agentGUINodeDataHasComposerTarget(data) && selectedProviderTarget.agentTargetId === normalizeOptionalText2(data.agentTargetId);
   const selectedComposerTargetData = useMemo3(
     () => homeComposerTargetOverride ? composerTargetDataFromProviderTarget({
       current: data,
@@ -9168,7 +9255,7 @@ function useAgentGUINodeController({
       current: data,
       isExplicit: selectedProviderTargetIsExplicit,
       target: selectedProviderTarget
-    }) : agentGUINodeDataHasComposerTarget(data) ? composerTargetDataFromNodeData(data, normalizedProviderTargets) : composerTargetDataFromProviderTarget({
+    }) : agentGUINodeDataHasComposerTarget(data) && data.lastActiveAgentSessionId !== null ? composerTargetDataFromNodeData(data, normalizedProviderTargets) : composerTargetDataFromProviderTarget({
       current: data,
       isExplicit: selectedProviderTargetIsExplicit,
       target: selectedProviderTarget
@@ -9618,7 +9705,7 @@ function useAgentGUINodeController({
   const pendingHomeErrorRef = useRef4(null);
   const activatedConversationIdsRef = useRef4(/* @__PURE__ */ new Set());
   const failedNewConversationIdsRef = useRef4(/* @__PURE__ */ new Set());
-  const lastActiveModelByProviderRef = useRef4({});
+  const lastActiveModelByAgentTargetIdRef = useRef4({});
   const pendingTurnIdBySessionIdRef = useRef4({});
   const submitTraceBySessionIdRef = useRef4({});
   const conversationIdsRef = useRef4(
@@ -12023,14 +12110,14 @@ function useAgentGUINodeController({
     (initialContentInput, displayPrompt) => {
       const target = selectedProviderTargetRef.current;
       const targetData = selectedComposerTargetDataRef.current;
-      if (isCreatingConversation || target.disabled === true || targetData.provider === "openclaw" && openclawGateway?.status !== "ready") {
-        return;
-      }
       const agentTargetId = targetData.agentTargetId ?? "";
       if (!agentTargetId || providerTargetsProvidedRef.current && !selectedProviderTargetIsExplicitRef.current) {
         setDetailError(translate("agentHost.agentGui.agentTargetRequired"));
         return;
       }
+      if (isCreatingConversation || target.disabled === true || targetData.provider === "openclaw" && openclawGateway?.status !== "ready") {
+        return;
+      }
       const normalizedInitialContent = Array.isArray(initialContentInput) ? normalizeAgentPromptContentBlocks(
         initialContentInput
       ) : textPromptContent(normalizeOptionalPrompt(initialContentInput));
@@ -12057,15 +12144,10 @@ function useAgentGUINodeController({
         const provider = targetData.provider;
         const agentTargetId2 = targetData.agentTargetId ?? "";
         onDataChangeRef.current(
-          (current) => current.provider === provider && (current.agentTargetId ?? null) === (agentTargetId2 || null) && (current.providerTargetId ?? null) === targetData.providerTargetId && agentGUIProviderTargetRefsEqual(
-            current.providerTargetRef,
-            targetData.providerTargetRef
-          ) ? current : {
+          (current) => current.provider === provider && (current.agentTargetId ?? null) === (agentTargetId2 || null) ? current : {
             ...current,
             provider,
-            agentTargetId: agentTargetId2 || null,
-            providerTargetId: targetData.providerTargetId,
-            providerTargetRef: targetData.providerTargetRef
+            agentTargetId: agentTargetId2 || null
           }
         );
         const selectedProjectPath2 = selectedProjectPathRef.current;
@@ -12094,15 +12176,8 @@ function useAgentGUINodeController({
           currentActiveConversationId,
           transientConversationRef.current
         ) : null;
-        const inheritedModel = normalizeOptionalText2(targetSafeInitialNodeSettings.model) === null ? resolveSameProviderActiveSessionModel({
-          activeProvider: currentActiveConversation?.provider ?? null,
-          agentSessionId: currentActiveConversationId,
-          provider,
-          runtime: agentActivityRuntime,
-          sessionState: activeSessionState,
-          workspaceId
-        }) ?? normalizeOptionalText2(
-          lastActiveModelByProviderRef.current[provider]
+        const inheritedModel = normalizeOptionalText2(targetSafeInitialNodeSettings.model) === null ? normalizeOptionalText2(
+          lastActiveModelByAgentTargetIdRef.current[agentTargetId2]
         ) : null;
         const effectiveInitialSettings = inheritedModel === null ? initialSettings : { ...initialSettings, model: inheritedModel };
         const targetSafeEffectiveInitialSettings = sanitizeComposerSettingsForTarget({
@@ -12571,12 +12646,10 @@ function useAgentGUINodeController({
       }
       const filter = conversationFilterRef.current;
       if (filter.kind === "agentTarget") {
-        const filterTarget = resolveAgentGUIProviderTarget({
+        const filterTarget = resolveAgentGUIDirectorySelection({
           agentTargetId: filter.agentTargetId,
-          defaultProviderTargetId,
           provider: dataRef.current.provider,
-          providerTargets: normalizedProviderTargets,
-          useStaticCatalog: false
+          targets: normalizedProviderTargets
         });
         if (filterTarget && filterTarget.disabled !== true && (filterTarget.agentTargetId?.trim() ?? "") === filter.agentTargetId) {
           setHomeComposerTargetOverride(filterTarget);
@@ -12615,7 +12688,7 @@ function useAgentGUINodeController({
     [
       activation,
       agentActivityRuntime,
-      defaultProviderTargetId,
+      defaultAgentTargetId,
       loadDraftComposerOptions,
       normalizedProviderTargets,
       persistActiveConversation,
@@ -12629,7 +12702,20 @@ function useAgentGUINodeController({
     if (handledPrefillPromptSequenceRef.current === prefillPromptRequest.sequence) {
       return;
     }
+    if (providerTargetsLoading && prefillPromptRequest.agentTargetId?.trim()) {
+      return;
+    }
+    const selectedTargetData = selectedComposerTargetDataRef.current;
+    const prefillTargetHinted = Boolean(prefillPromptRequest.provider) || Boolean(prefillPromptRequest.agentTargetId);
+    const prefillTarget = prefillTargetHinted ? resolveAgentGUIDirectorySelection({
+      agentTargetId: prefillPromptRequest.agentTargetId,
+      provider: prefillPromptRequest.provider ?? selectedTargetData.provider,
+      targets: normalizedProviderTargets
+    }) : null;
     handledPrefillPromptSequenceRef.current = prefillPromptRequest.sequence;
+    if (prefillPromptRequest.agentTargetId?.trim() && !prefillTarget) {
+      return;
+    }
     const draftPrompt2 = prefillPromptRequest.draftPrompt.trim();
     if (!draftPrompt2) {
       return;
@@ -12660,15 +12746,6 @@ function useAgentGUINodeController({
     setActiveConversationId(null);
     setIsLoadingMessages(false);
     setDetailError(null);
-    const selectedTargetData = selectedComposerTargetDataRef.current;
-    const prefillTargetHinted = Boolean(prefillPromptRequest.provider) || Boolean(prefillPromptRequest.agentTargetId);
-    const prefillTarget = prefillTargetHinted ? resolveAgentGUIProviderTarget({
-      agentTargetId: prefillPromptRequest.agentTargetId,
-      defaultProviderTargetId,
-      provider: prefillPromptRequest.provider ?? selectedTargetData.provider,
-      providerTargets: normalizedProviderTargets,
-      useStaticCatalog: shouldUseStaticProviderTargets
-    }) : null;
     const targetData = prefillTarget ? composerTargetDataFromProviderTarget({
       current: dataRef.current,
       isExplicit: isExplicitAgentGUIProviderTarget(
@@ -12717,14 +12794,14 @@ function useAgentGUINodeController({
   }, [
     activation,
     agentActivityRuntime,
-    defaultProviderTargetId,
+    defaultAgentTargetId,
     loadDraftComposerOptions,
     normalizedExplicitProviderTargets,
     normalizedProviderTargets,
     persistActiveConversation,
     prefillPromptRequest,
     previewMode,
-    shouldUseStaticProviderTargets,
+    providerTargetsLoading,
     workspaceId
   ]);
   const continueInNewConversation = useCallback4(() => {
@@ -13815,9 +13892,7 @@ function useAgentGUINodeController({
             {
               ...current,
               provider: targetData.provider,
-              agentTargetId: targetData.agentTargetId,
-              providerTargetId: targetData.providerTargetId,
-              providerTargetRef: targetData.providerTargetRef
+              agentTargetId: targetData.agentTargetId
             },
             targetSafeMerged
           )
@@ -14871,12 +14946,10 @@ function useAgentGUINodeController({
     if (!providerMismatch && !agentTargetMismatch) {
       return;
     }
-    const sessionTarget = resolveAgentGUIProviderTarget({
+    const sessionTarget = resolveAgentGUIDirectorySelection({
       agentTargetId: summaryAgentTargetId,
-      defaultProviderTargetId,
       provider: summary.provider,
-      providerTargets: normalizedProviderTargets,
-      useStaticCatalog: shouldUseStaticProviderTargets
+      targets: normalizedProviderTargets
     });
     if (!sessionTarget || sessionTarget.provider !== summary.provider) {
       return;
@@ -14886,7 +14959,7 @@ function useAgentGUINodeController({
     }
     setHomeComposerTargetOverride(null);
     const sessionTargetIsExplicit = normalizedExplicitProviderTargets.some(
-      (target) => target.provider === sessionTarget.provider && target.targetId === sessionTarget.targetId && agentGUIProviderTargetRefsEqual(target.ref, sessionTarget.ref)
+      (target) => agentGUIProviderTargetsEqual(target, sessionTarget)
     );
     onDataChangeRef.current((current) => {
       const targetData = composerTargetDataFromProviderTarget({
@@ -14894,10 +14967,7 @@ function useAgentGUINodeController({
         isExplicit: sessionTargetIsExplicit,
         target: sessionTarget
       });
-      if (current.provider === targetData.provider && normalizeOptionalText2(current.agentTargetId) === targetData.agentTargetId && (current.providerTargetId ?? null) === targetData.providerTargetId && agentGUIProviderTargetRefsEqual(
-        current.providerTargetRef,
-        targetData.providerTargetRef
-      )) {
+      if (current.provider === targetData.provider && normalizeOptionalText2(current.agentTargetId) === targetData.agentTargetId) {
         return current;
       }
       dataRef.current = targetData.data;
@@ -14906,12 +14976,11 @@ function useAgentGUINodeController({
   }, [
     activeConversationId,
     conversations,
-    defaultProviderTargetId,
+    defaultAgentTargetId,
     normalizedExplicitProviderTargets,
     normalizedProviderTargets,
     previewMode,
-    providerTargetsLoading,
-    shouldUseStaticProviderTargets
+    providerTargetsLoading
   ]);
   const activeSessionTargetResolution = useMemo3(() => {
     if (previewMode || activeConversationId === null) {
@@ -15240,9 +15309,7 @@ function useAgentGUINodeController({
         {
           ...current,
           provider: selectedComposerTargetData.provider,
-          agentTargetId: selectedComposerTargetData.agentTargetId,
-          providerTargetId: selectedComposerTargetData.providerTargetId,
-          providerTargetRef: selectedComposerTargetData.providerTargetRef
+          agentTargetId: selectedComposerTargetData.agentTargetId
         },
         targetSafeNodeDefaultSettings
       )
@@ -15280,24 +15347,23 @@ function useAgentGUINodeController({
   ) : null;
   const pendingInteractivePrompt = serverInteractivePrompt ?? planImplementationPromptVM;
   useEffect4(() => {
-    const provider = normalizeOptionalText2(
-      activeRuntimeSession?.provider ?? activeConversation?.provider
-    );
-    if (provider === null) {
+    const agentTargetId = activeSessionTargetResolution.status === "resolved" ? normalizeOptionalText2(
+      activeSessionTargetResolution.target.agentTargetId
+    ) : null;
+    if (agentTargetId === null) {
       return;
     }
     const model = normalizeOptionalText2(activeSessionState?.settings?.model) ?? normalizeOptionalText2(activeRuntimeSession?.model);
     if (model === null) {
       return;
     }
-    lastActiveModelByProviderRef.current = {
-      ...lastActiveModelByProviderRef.current,
-      [provider]: model
+    lastActiveModelByAgentTargetIdRef.current = {
+      ...lastActiveModelByAgentTargetIdRef.current,
+      [agentTargetId]: model
     };
   }, [
-    activeConversation?.provider,
+    activeSessionTargetResolution,
     activeRuntimeSession?.model,
-    activeRuntimeSession?.provider,
     activeSessionState?.settings?.model
   ]);
   const activeActivityDisplayStatus = activeConversationId ? agentActivityDisplayStatuses.get(activeConversationId) ?? null : null;
@@ -15358,7 +15424,7 @@ function useAgentGUINodeController({
     hasProviderSessionNotFoundError,
     pendingApproval
   ]);
-  const canSubmit = !providerTargetsLoading && activeLiveState !== "activating" && activeLiveState !== "failed" && !activeConversationResumeUnavailable && (activeConversationId !== null || effectiveSelectedProviderTarget.disabled !== true) && (composerTargetData.provider !== "openclaw" || openclawGateway?.status === "ready") && pendingApproval === null && pendingInteractivePrompt === null && sessionChrome.auth === null && !activeConversationBusy && !isCreatingConversation && !isSubmitting && !isInterrupting;
+  const canSubmit = !providerTargetsLoading && activeLiveState !== "activating" && activeLiveState !== "failed" && !activeConversationResumeUnavailable && (activeConversationId !== null || effectiveSelectedProviderTarget.disabled !== true && (homeComposerTargetOverride ? homeComposerTargetOverrideIsExplicit : selectedProviderTargetIsExplicit)) && (composerTargetData.provider !== "openclaw" || openclawGateway?.status === "ready") && pendingApproval === null && pendingInteractivePrompt === null && sessionChrome.auth === null && !activeConversationBusy && !isCreatingConversation && !isSubmitting && !isInterrupting;
   const activeConversationCreatePending = Boolean(activeConversationId) && isCreatingConversation && startingConversationIdRef.current === activeConversationId;
   const canQueueWhileBusy = Boolean(activeConversationId) && (activeConversationCreatePending || activeConversationBusy || isSubmitting || Boolean(activeSessionState?.pendingInteractive));
   useEffect4(() => {
@@ -15549,12 +15615,12 @@ function useAgentGUINodeController({
   ]);
   const stableComposerSettings = useStableComposerSettingsVM(composerSettings);
   const resolveDefaultHomeComposerTarget = useCallback4(() => {
-    const defaultTargetId = defaultProviderTargetId?.trim() ?? "";
+    const defaultTargetId = defaultAgentTargetId?.trim() ?? "";
     const explicitDefaultTarget = defaultTargetId ? normalizedProviderTargets.find(
       (target) => target.targetId === defaultTargetId || target.agentTargetId === defaultTargetId
     ) ?? null : null;
     return explicitDefaultTarget ?? normalizedProviderTargets.find((target) => target.disabled !== true) ?? normalizedProviderTargets[0] ?? null;
-  }, [defaultProviderTargetId, normalizedProviderTargets]);
+  }, [defaultAgentTargetId, normalizedProviderTargets]);
   const resetHomeComposerAgentTargetToDefault = useCallback4(() => {
     if (previewMode) {
       return;
@@ -15564,7 +15630,7 @@ function useAgentGUINodeController({
       return;
     }
     const nextTargetIsExplicit = normalizedExplicitProviderTargets.some(
-      (target) => target.provider === nextTarget.provider && target.targetId === nextTarget.targetId && agentGUIProviderTargetRefsEqual(target.ref, nextTarget.ref)
+      (target) => agentGUIProviderTargetsEqual(target, nextTarget)
     );
     const nextTargetData = composerTargetDataFromProviderTarget({
       current: dataRef.current,
@@ -15617,18 +15683,16 @@ function useAgentGUINodeController({
         return;
       }
       const nextProvider = input.provider;
-      const nextTarget = resolveAgentGUIProviderTarget({
-        defaultProviderTargetId,
+      const nextTarget = resolveAgentGUIDirectorySelection({
+        agentTargetId: input.agentTargetId,
         provider: nextProvider,
-        providerTargetId: input.providerTargetId,
-        providerTargets: normalizedProviderTargets,
-        useStaticCatalog: shouldUseStaticProviderTargets
+        targets: normalizedProviderTargets
       });
       if (!nextTarget) {
         return;
       }
       const nextTargetIsExplicit = normalizedExplicitProviderTargets.some(
-        (target) => target.provider === nextTarget.provider && target.targetId === nextTarget.targetId && agentGUIProviderTargetRefsEqual(target.ref, nextTarget.ref)
+        (target) => agentGUIProviderTargetsEqual(target, nextTarget)
       );
       const nextTargetData = composerTargetDataFromProviderTarget({
         current: dataRef.current,
@@ -15703,8 +15767,6 @@ function useAgentGUINodeController({
           provider: currentNextTargetData.provider,
           agentTargetId: currentNextTargetData.agentTargetId,
           lastActiveAgentSessionId: null,
-          providerTargetId: currentNextTargetData.providerTargetId,
-          providerTargetRef: currentNextTargetData.providerTargetRef,
           composerOverrides: providerTargetChanged ? null : current.composerOverrides
         };
         dataRef.current = nextData;
@@ -15716,22 +15778,21 @@ function useAgentGUINodeController({
     },
     [
       activation,
-      defaultProviderTargetId,
+      defaultAgentTargetId,
       loadComposerOptionsForTarget,
       normalizedExplicitProviderTargets,
       normalizedProviderTargets,
       persistActiveConversation,
-      previewMode,
-      shouldUseStaticProviderTargets
+      previewMode
     ]
   );
   useEffect4(() => {
     if (previewMode || activeConversationId !== null || conversationFilter.kind !== "all" || homeComposerTargetOverride !== null || agentGUINodeDataHasComposerTarget(data) || !providerReadinessGates || !firstReadyHomeComposerProviderTarget) {
       return;
     }
-    if (firstReadyHomeComposerProviderTarget.provider === effectiveSelectedProviderTarget.provider && firstReadyHomeComposerProviderTarget.targetId === effectiveSelectedProviderTarget.targetId && agentGUIProviderTargetRefsEqual(
-      firstReadyHomeComposerProviderTarget.ref,
-      effectiveSelectedProviderTarget.ref
+    if (agentGUIProviderTargetsEqual(
+      firstReadyHomeComposerProviderTarget,
+      effectiveSelectedProviderTarget
     )) {
       return;
     }
@@ -15747,7 +15808,7 @@ function useAgentGUINodeController({
     }
     selectHomeComposerAgentTarget({
       provider: firstReadyHomeComposerProviderTarget.provider,
-      providerTargetId: firstReadyHomeComposerProviderTarget.targetId
+      agentTargetId: firstReadyHomeComposerProviderTarget.agentTargetId ?? firstReadyHomeComposerProviderTarget.targetId
     });
   }, [
     activeConversationId,
@@ -15762,17 +15823,15 @@ function useAgentGUINodeController({
   ]);
   const selectConversationFilterTarget = useCallback4(
     (input) => {
-      const nextTarget = resolveAgentGUIProviderTarget({
-        defaultProviderTargetId,
+      const nextTarget = resolveAgentGUIDirectorySelection({
+        agentTargetId: input.agentTargetId,
         provider: input.provider,
-        providerTargetId: input.providerTargetId,
-        providerTargets: normalizedProviderTargets,
-        useStaticCatalog: shouldUseStaticProviderTargets
+        targets: normalizedProviderTargets
       });
       if (!nextTarget) {
         reportAgentGUIConversationFilterTargetUnresolved({
           provider: input.provider,
-          providerTargetId: input.providerTargetId ?? null,
+          agentTargetId: input.agentTargetId ?? null,
           providerTargetCount: normalizedProviderTargets.length,
           reason: "unresolved",
           runtime: agentActivityRuntime,
@@ -15815,11 +15874,10 @@ function useAgentGUINodeController({
     },
     [
       agentActivityRuntime,
-      defaultProviderTargetId,
+      defaultAgentTargetId,
       normalizedProviderTargets,
       selectConversation,
       selectHomeComposerAgentTarget,
-      shouldUseStaticProviderTargets,
       workspaceId
     ]
   );
@@ -15838,7 +15896,7 @@ function useAgentGUINodeController({
     }
     selectHomeComposerAgentTarget({
       provider: target.provider,
-      providerTargetId: target.targetId
+      agentTargetId: target.agentTargetId ?? target.targetId
     });
   }, [
     activeConversationId,
@@ -16011,8 +16069,6 @@ function useAgentGUINodeController({
         providerTargets: normalizedProviderTargets,
         handoffProviderTargets,
         providerTargetsLoading,
-        providerRailMode,
-        comingSoonProviders: normalizedComingSoonProviders,
         conversationFilter,
         conversations: visibleConversations,
         userProjects,
@@ -16094,9 +16150,7 @@ function useAgentGUINodeController({
       data,
       effectiveSelectedProviderTarget,
       handoffProviderTargets,
-      normalizedComingSoonProviders,
       normalizedProviderTargets,
-      providerRailMode,
       providerReadinessGate,
       providerTargetsLoading,
       detailError,
@@ -17346,13 +17400,6 @@ var AgentGuiHeroCarouselScene = class _AgentGuiHeroCarouselScene {
 
 // agent-gui/agentGuiNode/AgentGUIHeroAgentCarousel.tsx
 import { jsx as jsx20, jsxs as jsxs9 } from "react/jsx-runtime";
-function agentGUILaunchpadProviderTarget(providerTargets, provider) {
-  const normalized = normalizeManagedAgentProvider(provider);
-  const matches = providerTargets.filter(
-    (target) => normalizeManagedAgentProvider(target.provider) === normalized
-  );
-  return matches.find((target) => target.disabled !== true) ?? matches[0] ?? null;
-}
 var CAROUSEL_WHEEL_STEP_THRESHOLD = 42;
 var CAROUSEL_WHEEL_STEP_COOLDOWN_MS = 110;
 var CAROUSEL_DRAG_STEP_PX = 52;
@@ -17423,18 +17470,17 @@ function useAgentGUIHeroCarouselImages(icons, iconKey) {
 }
 var AgentGUIHeroAgentCarousel = memo2(
   function AgentGUIHeroAgentCarousel2({
-    activeProvider,
+    activeAgentTargetId,
     icons,
     providerTargets,
     onProviderSelect,
     providerSelectLabel
   }) {
-    const normalizedActiveProvider = activeProvider ? normalizeManagedAgentProvider(activeProvider) : null;
     const activeIconIndex = useMemo4(
-      () => normalizedActiveProvider === null ? -1 : icons.findIndex(
-        (icon) => normalizeManagedAgentProvider(icon.provider) === normalizedActiveProvider
+      () => !activeAgentTargetId ? -1 : icons.findIndex(
+        (icon) => icon.agentTargetId === activeAgentTargetId
       ),
-      [icons, normalizedActiveProvider]
+      [activeAgentTargetId, icons]
     );
     const [centerIndex, setCenterIndex] = useState7(
       activeIconIndex >= 0 ? activeIconIndex : 0
@@ -17450,10 +17496,12 @@ var AgentGUIHeroAgentCarousel = memo2(
         if (!icon || !interactive) {
           return null;
         }
-        return agentGUILaunchpadProviderTarget(
-          providerTargets ?? [],
-          icon.provider
-        );
+        if (!icon.agentTargetId) {
+          return null;
+        }
+        return providerTargets?.find(
+          (target) => (target.agentTargetId ?? target.targetId) === icon.agentTargetId
+        ) ?? null;
       },
       [icons, interactive, providerTargets]
     );
@@ -17465,7 +17513,7 @@ var AgentGUIHeroAgentCarousel = memo2(
         }
         onProviderSelect({
           provider: target.provider,
-          providerTargetId: target.targetId
+          agentTargetId: target.targetId
         });
       },
       [onProviderSelect, targetForIndex]
@@ -17475,7 +17523,7 @@ var AgentGUIHeroAgentCarousel = memo2(
     const stageRef = useRef5(null);
     const canvasRef = useRef5(null);
     const sceneRef = useRef5(null);
-    const iconKey = icons.map((icon) => `${icon.provider}:${icon.iconUrl}`).join("|");
+    const iconKey = icons.map((icon) => `${icon.agentTargetId ?? icon.provider}:${icon.iconUrl}`).join("|");
     const carouselImages = useAgentGUIHeroCarouselImages(icons, iconKey);
     useEffect6(() => {
       const canvas = canvasRef.current;
@@ -17671,7 +17719,7 @@ var AgentGUIHeroAgentCarousel = memo2(
           icons.map((icon, index) => {
             const isCenter = index === centerIndex;
             const target = targetForIndex(index);
-            const key = `${icon.provider}:${icon.iconUrl}`;
+            const key = `${icon.agentTargetId ?? icon.provider}:${icon.iconUrl}`;
             if (target && onProviderSelect) {
               const label = providerSelectLabel ? `${providerSelectLabel}: ${target.label}` : target.label;
               return /* @__PURE__ */ jsx20(
@@ -17679,6 +17727,7 @@ var AgentGUIHeroAgentCarousel = memo2(
                 {
                   type: "button",
                   className: AgentGUINode_styles_default.emptyHeroCarouselItem,
+                  "data-agent-target-id": icon.agentTargetId,
                   "data-provider": icon.provider,
                   "data-provider-active": isCenter,
                   "aria-label": label,
@@ -24541,9 +24590,9 @@ ${normalizedText}` : normalizedText;
     () => providerSwitchTargets.filter((target) => target.disabled !== true),
     [providerSwitchTargets]
   );
-  const selectedProviderTargetId = selectedProviderTarget?.targetId ?? `local:${provider}`;
+  const selectedAgentTargetId = selectedProviderTarget?.targetId ?? `local:${provider}`;
   const selectedProviderSwitchTarget = providerSwitchTargets.find(
-    (target) => target.targetId === selectedProviderTargetId
+    (target) => target.targetId === selectedAgentTargetId
   ) ?? providerSwitchTargets.find((target) => target.provider === provider) ?? selectedProviderTarget;
   const providerMenuTargets = selectedProviderSwitchTarget && !enabledProviderSwitchTargets.some(
     (target) => target.targetId === selectedProviderSwitchTarget.targetId
@@ -24558,9 +24607,9 @@ ${normalizedText}` : normalizedText;
     if (target.targetId === selectedProviderSwitchTarget.targetId) {
       return false;
     }
-    const selectedAgentTargetId = selectedProviderSwitchTarget.agentTargetId ?? selectedProviderSwitchTarget.targetId;
+    const selectedAgentTargetId2 = selectedProviderSwitchTarget.agentTargetId ?? selectedProviderSwitchTarget.targetId;
     const targetAgentTargetId = target.agentTargetId ?? target.targetId;
-    return targetAgentTargetId !== selectedAgentTargetId;
+    return targetAgentTargetId !== selectedAgentTargetId2;
   }) : enabledHandoffProviderTargets;
   const selectedProviderLabel = selectedProviderSwitchTarget?.label ?? selectedProviderTarget?.label ?? provider;
   const effectiveHandoffLabel = handoffLabel || labels.handoffConversation;
@@ -25760,7 +25809,7 @@ ${normalizedText}` : normalizedText;
                               }
                               onProviderSelect?.({
                                 provider: target.provider,
-                                providerTargetId: target.targetId
+                                agentTargetId: target.targetId
                               });
                             },
                             children: [
@@ -26673,13 +26722,12 @@ function resolveAgentGUIHeroIconUrl(provider) {
   const normalizedProvider = normalizeManagedAgentProvider(provider);
   return MANAGED_AGENT_ICON_URLS[normalizedProvider] ?? MANAGED_AGENT_ICON_FALLBACK_URL;
 }
-var HERO_USES_PROVIDER_RAIL_ICON = /* @__PURE__ */ new Set(["cursor", "opencode"]);
 function agentGUIProviderIconPresentation(provider, iconUrl) {
   const normalizedProvider = normalizeManagedAgentProvider(provider);
   const providerRailIconUrl = MANAGED_AGENT_PROVIDER_RAIL_ICON_URLS[normalizedProvider] ?? null;
   return {
     provider: normalizedProvider,
-    iconUrl: (HERO_USES_PROVIDER_RAIL_ICON.has(normalizedProvider) ? providerRailIconUrl : null) || iconUrl?.trim() || resolveAgentGUIHeroIconUrl(normalizedProvider)
+    iconUrl: iconUrl?.trim() || providerRailIconUrl || resolveAgentGUIHeroIconUrl(normalizedProvider)
   };
 }
 function agentGUIProviderRailIconPresentation(provider, iconUrl) {
@@ -26687,7 +26735,7 @@ function agentGUIProviderRailIconPresentation(provider, iconUrl) {
   const providerRailIconUrl = MANAGED_AGENT_PROVIDER_RAIL_ICON_URLS[normalizedProvider] ?? null;
   return {
     provider: normalizedProvider,
-    iconUrl: (HERO_USES_PROVIDER_RAIL_ICON.has(normalizedProvider) ? providerRailIconUrl : null) || iconUrl?.trim() || providerRailIconUrl || resolveAgentGUIHeroIconUrl(normalizedProvider)
+    iconUrl: iconUrl?.trim() || providerRailIconUrl || resolveAgentGUIHeroIconUrl(normalizedProvider)
   };
 }
 function shouldEmphasizeEmptyHeroProvider(label) {
@@ -27487,10 +27535,8 @@ function AgentGUINodeView({
                     selectedProviderTarget: viewModel.selectedProviderTarget,
                     providerTargets: viewModel.providerTargets,
                     providerTargetsLoading: viewModel.providerTargetsLoading,
-                    providerRailMode: viewModel.providerRailMode,
                     renderProviderRailEmpty,
                     providerRailAllPresentation,
-                    comingSoonProviders: viewModel.comingSoonProviders,
                     onSelectConversationFilterTarget: actions.selectConversationFilterTarget,
                     onUpdateConversationFilter: actions.updateConversationFilter,
                     onRequestComposerFocus: requestComposerFocus
@@ -27631,6 +27677,7 @@ function AgentGUINodeView({
               contextMentionProviders,
               workspaceAppIcons: effectiveWorkspaceAppIcons,
               workspaceUserProjectI18n,
+              renderAgentsEmpty: renderProviderRailEmpty,
               renderProviderUnavailableState,
               renderProviderReadinessGateState,
               previewMode
@@ -27886,6 +27933,7 @@ var AgentGUIDetailPane = memo3(function AgentGUIDetailPane2({
   onRequestComposerFocus,
   contextMentionProviders,
   workspaceAppIcons = EMPTY_WORKSPACE_APP_ICONS3,
+  renderAgentsEmpty,
   renderProviderUnavailableState,
   renderProviderReadinessGateState
 }) {
@@ -27911,8 +27959,9 @@ var AgentGUIDetailPane = memo3(function AgentGUIDetailPane2({
     avoidGroupingEdits: viewModel.avoidGroupingEdits
   });
   const hasActiveConversation = viewModel.activeConversationId !== null;
-  const selectedProviderTargetComingSoon = viewModel.selectedProviderTarget?.disabled === true;
-  const emptyProviderReadinessGate = !hasActiveConversation ? selectedProviderTargetComingSoon ? { status: "coming_soon" } : viewModel.providerReadinessGate : null;
+  const agentsLoadedEmpty = !viewModel.providerTargetsLoading && viewModel.providerTargets.length === 0;
+  const selectedProviderTargetComingSoon = viewModel.selectedProviderTarget?.disabled === true && (viewModel.providerReadinessGate === null || viewModel.providerReadinessGate?.status === "coming_soon");
+  const emptyProviderReadinessGate = !hasActiveConversation ? viewModel.providerReadinessGate ?? (selectedProviderTargetComingSoon ? { status: "coming_soon" } : null) : null;
   const activePrompt = viewModel.pendingInteractivePrompt ?? viewModel.pendingApproval;
   const activePromptRequestId = activePrompt?.requestId ?? null;
   const sessionChrome = useMemo11(
@@ -28653,11 +28702,36 @@ var AgentGUIDetailPane = memo3(function AgentGUIDetailPane2({
     [bottomDockComposerProps]
   );
   const emptyHeroProvider = viewModel.selectedProviderTarget?.provider ?? viewModel.data.provider;
-  const emptyHeroProviderLabel = labels.emptyProviderForProvider?.(emptyHeroProvider) ?? labels.emptyProvider ?? "";
-  const emptyHeroLabel = labels.emptyForProvider?.(emptyHeroProvider) ?? labels.empty;
+  const emptyHeroRuntimeProviderLabel = labels.emptyProviderForProvider?.(emptyHeroProvider) ?? labels.emptyProvider ?? "";
+  const emptyHeroProviderLabel = viewModel.selectedProviderTarget?.label ?? emptyHeroRuntimeProviderLabel;
+  const emptyHeroBaseLabel = labels.emptyForProvider?.(emptyHeroProvider) ?? labels.empty;
+  const emptyHeroLabel = emptyHeroRuntimeProviderLabel ? emptyHeroBaseLabel.replace(
+    emptyHeroRuntimeProviderLabel,
+    emptyHeroProviderLabel
+  ) : emptyHeroBaseLabel;
   const emptyHeroIconPresentations = useMemo11(
-    () => viewModel.conversationFilter.kind === "all" ? agentGUILaunchpadIconPresentations() : [agentGUIProviderIconPresentation(emptyHeroProvider)],
-    [emptyHeroProvider, viewModel.conversationFilter]
+    () => viewModel.conversationFilter.kind === "all" ? viewModel.providerTargets.map((target) => ({
+      agentTargetId: target.agentTargetId ?? target.targetId,
+      provider: target.provider,
+      iconUrl: agentGUIProviderRailIconPresentation(
+        target.provider,
+        target.iconUrl
+      ).iconUrl
+    })) : [
+      {
+        ...agentGUIProviderIconPresentation(
+          emptyHeroProvider,
+          viewModel.selectedProviderTarget?.iconUrl
+        ),
+        agentTargetId: viewModel.selectedProviderTarget?.agentTargetId ?? viewModel.selectedProviderTarget?.targetId
+      }
+    ],
+    [
+      emptyHeroProvider,
+      viewModel.conversationFilter.kind,
+      viewModel.providerTargets,
+      viewModel.selectedProviderTarget
+    ]
   );
   const disabledProviderTarget = selectedProviderTargetComingSoon ? viewModel.selectedProviderTarget ?? null : null;
   const shouldRenderProviderUnavailableState = !hasActiveConversation && disabledProviderTarget !== null && renderProviderUnavailableState !== void 0;
@@ -29056,7 +29130,14 @@ var AgentGUIDetailPane = memo3(function AgentGUIDetailPane2({
         viewportTestId: "agent-gui-timeline",
         viewportClassName: `${AgentGUINode_styles_default.timeline} ${hasActiveConversation ? AgentGUINode_styles_default.timelineWithComposer : AgentGUINode_styles_default.timelineCentered} ${!isTimelineScrolledToTop ? AgentGUINode_styles_default.timelineScrolledFromTop : ""} ${showUnavailableChatEmpty ? AgentGUINode_styles_default.timelineUnavailableChatEmpty : ""}`.trim(),
         viewportContentStyle: AGENT_GUI_TIMELINE_SCROLL_AREA_CONTENT_STYLE,
-        children: !hasActiveConversation ? shouldRenderProviderUnavailableState && disabledProviderTarget ? /* @__PURE__ */ jsx35(Fragment9, { children: renderProviderUnavailableState?.({
+        children: !hasActiveConversation ? agentsLoadedEmpty ? renderAgentsEmpty ? /* @__PURE__ */ jsx35(Fragment9, { children: renderAgentsEmpty() }) : /* @__PURE__ */ jsx35(
+          "div",
+          {
+            className: AgentGUINode_styles_default.emptyHero,
+            "data-testid": "agent-gui-agents-empty",
+            children: /* @__PURE__ */ jsx35("div", { className: AgentGUINode_styles_default.emptyHeroBody, children: /* @__PURE__ */ jsx35("h2", { className: AgentGUINode_styles_default.emptyHeroTitle, children: labels.agentsEmpty }) })
+          }
+        ) : shouldRenderProviderUnavailableState && disabledProviderTarget ? /* @__PURE__ */ jsx35(Fragment9, { children: renderProviderUnavailableState?.({
           provider: disabledProviderTarget.provider,
           providerLabel: labels.emptyProviderForProvider?.(
             disabledProviderTarget.provider
@@ -29280,7 +29361,7 @@ var AgentGUIEmptyHeroPane = memo3(function AgentGUIEmptyHeroPane2({
     /* @__PURE__ */ jsx35("div", { className: AgentGUINode_styles_default.emptyHeroIconSlot, children: heroIconPresentations.length > 1 ? /* @__PURE__ */ jsx35(
       AgentGUIHeroAgentCarousel,
       {
-        activeProvider: provider,
+        activeAgentTargetId: selectedProviderTarget?.agentTargetId ?? selectedProviderTarget?.targetId,
         icons: heroIconPresentations,
         providerTargets,
         onProviderSelect,
@@ -29347,8 +29428,15 @@ var AgentGUIProviderReadinessGatePane = memo3(
     "use memo";
     const heroIconUrl = resolveAgentGUIHeroIconUrl(provider);
     const launchpadIconPresentations = useMemo11(
-      () => agentGUILaunchpadIconPresentations(),
-      []
+      () => providerTargets.map((target) => ({
+        agentTargetId: target.agentTargetId ?? target.targetId,
+        provider: target.provider,
+        iconUrl: agentGUIProviderRailIconPresentation(
+          target.provider,
+          target.iconUrl
+        ).iconUrl
+      })),
+      [providerTargets]
     );
     const pendingAction = gate.pendingAction ?? null;
     const isPending = pendingAction !== null;
@@ -29369,7 +29457,7 @@ var AgentGUIProviderReadinessGatePane = memo3(
           showAllProviders ? /* @__PURE__ */ jsx35(
             AgentGUIHeroAgentCarousel,
             {
-              activeProvider: provider,
+              activeAgentTargetId: selectedProviderTarget?.agentTargetId ?? selectedProviderTarget?.targetId,
               icons: launchpadIconPresentations,
               providerTargets,
               onProviderSelect,
@@ -29539,7 +29627,7 @@ function EmptyHeroTitle({
     return /* @__PURE__ */ jsx35(Fragment9, { children: label });
   }
   const providerEnd = providerStart + providerLabel.length;
-  const selectedProviderTargetId = selectedProviderTarget?.targetId ?? `local:${selectedProviderTarget?.provider ?? ""}`;
+  const selectedAgentTargetId = selectedProviderTarget?.targetId ?? `local:${selectedProviderTarget?.provider ?? ""}`;
   const canSwitchProvider = providerTargets.length > 1 && selectedProviderTarget && onProviderSelect;
   const providerName = label.slice(providerStart, providerEnd);
   return /* @__PURE__ */ jsxs22(Fragment9, { children: [
@@ -29547,7 +29635,7 @@ function EmptyHeroTitle({
     canSwitchProvider ? /* @__PURE__ */ jsxs22(
       Select3,
       {
-        value: selectedProviderTargetId,
+        value: selectedAgentTargetId,
         onValueChange: (nextTargetId) => {
           const target = providerTargets.find(
             (candidate) => candidate.targetId === nextTargetId
@@ -29557,7 +29645,7 @@ function EmptyHeroTitle({
           }
           onProviderSelect({
             provider: target.provider,
-            providerTargetId: target.targetId
+            agentTargetId: target.targetId
           });
         },
         children: [
@@ -30154,43 +30242,6 @@ 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.sectionKey === right.sectionKey && left.createdAtUnixMs === right.createdAtUnixMs && left.updatedAtUnixMs === right.updatedAtUnixMs && left.lastUsedAtUnixMs === right.lastUsedAtUnixMs);
 }
-var agentGUIProviderRailOrder = [
-  "codex",
-  "claude-code",
-  "cursor",
-  "tutti-agent",
-  "nexight",
-  "opencode",
-  "hermes",
-  "openclaw"
-];
-var agentGUIProviderRailDefaultProviders = [
-  "codex",
-  "claude-code",
-  "cursor",
-  "hermes",
-  "openclaw"
-];
-var agentGUIProviderRailDisabledProviders = /* @__PURE__ */ new Set([
-  "nexight",
-  "hermes",
-  "openclaw"
-]);
-function agentGUIProviderRailOrderIndex(provider) {
-  const index = agentGUIProviderRailOrder.indexOf(provider);
-  return index < 0 ? agentGUIProviderRailOrder.length : index;
-}
-function agentGUILaunchpadIconPresentations() {
-  return [
-    agentGUIProviderRailIconPresentation("codex"),
-    agentGUIProviderRailIconPresentation("claude-code"),
-    agentGUIProviderRailIconPresentation("cursor"),
-    agentGUIProviderRailIconPresentation("tutti"),
-    agentGUIProviderRailIconPresentation("opencode"),
-    agentGUIProviderRailIconPresentation("hermes"),
-    agentGUIProviderRailIconPresentation("openclaw")
-  ];
-}
 function agentGUIConversationProviderIconUrl(provider) {
   return resolveAgentGuiSessionProviderFlatIconUrl(provider);
 }
@@ -30219,37 +30270,8 @@ function agentGUIProviderRailAriaLabel(label, badgeLabel) {
 function agentGUIProviderTargetMatchesConversationFilter(target, filter) {
   return filter.kind === "agentTarget" && (target.agentTargetId?.trim() ?? "") === filter.agentTargetId;
 }
-function agentGUIProviderRailTargets(providerTargets, providerTargetsLoading, comingSoonProviders, providerRailMode) {
-  if (providerTargetsLoading) {
-    return [];
-  }
-  if (providerRailMode === "exact") {
-    return providerTargets;
-  }
-  const comingSoon = new Set(comingSoonProviders);
-  const source = providerTargets.length > 0 && !agentGUIProviderRailTargetsAreFullLocalFallback(providerTargets) ? providerTargets : [];
-  const seenProviders = new Set(source.map((target) => target.provider));
-  const missingDefaultProviders = agentGUIProviderRailDefaultProviders.filter(
-    (provider) => !seenProviders.has(provider)
-  );
-  if (source.length > 0 && missingDefaultProviders.length === 0) {
-    return source;
-  }
-  return [
-    ...source,
-    ...missingDefaultProviders.map(
-      (provider) => agentGUIProviderRailDisabledProviders.has(provider) || comingSoon.has(provider) ? createDisabledPlaceholderAgentGUIProviderTarget(provider) : createLocalAgentGUIProviderTarget(provider)
-    )
-  ];
-}
-function agentGUIProviderRailTargetsAreFullLocalFallback(providerTargets) {
-  if (providerTargets.length !== agentGUIProviderRailOrder.length) {
-    return false;
-  }
-  const fallbackProviders = new Set(agentGUIProviderRailOrder);
-  return providerTargets.every(
-    (target) => fallbackProviders.has(target.provider) && target.ref.kind === "local" && target.ref.provider === target.provider && target.targetId === `local:${target.provider}`
-  );
+function agentGUIProviderRailTargets(providerTargets, providerTargetsLoading) {
+  return providerTargetsLoading ? [] : providerTargets;
 }
 var AGENT_GUI_PROVIDER_RAIL_DRAG_HYSTERESIS_PX = 8;
 var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
@@ -30260,10 +30282,8 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
   selectedProviderTarget,
   providerTargets,
   providerTargetsLoading,
-  providerRailMode,
   renderProviderRailEmpty,
   providerRailAllPresentation,
-  comingSoonProviders,
   onRequestComposerFocus,
   onSelectConversationFilterTarget,
   onUpdateConversationFilter
@@ -30305,51 +30325,16 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
     [providerRailOrderStorageKey]
   );
   const railProviderTargets = useMemo11(
-    () => agentGUIProviderRailTargets(
-      providerTargets,
-      providerTargetsLoading,
-      comingSoonProviders,
-      providerRailMode
-    ),
-    [
-      comingSoonProviders,
-      providerRailMode,
-      providerTargets,
-      providerTargetsLoading
-    ]
+    () => agentGUIProviderRailTargets(providerTargets, providerTargetsLoading),
+    [providerTargets, providerTargetsLoading]
   );
   const providerTiles = useMemo11(() => {
-    const targets = [...railProviderTargets];
-    const orderedTargets = providerRailMode === "exact" ? targets : (() => {
-      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);
-      });
-    })();
-    return applyAgentGUIProviderRailOrder(orderedTargets, providerRailOrder);
-  }, [providerRailMode, providerRailOrder, railProviderTargets]);
-  const visibleProviderTiles = useMemo11(() => {
-    if (!providerTiles.some((target) => target.provider === "tutti-agent")) {
-      return providerTiles;
-    }
-    return providerTiles.filter(
-      (target) => target.provider !== "nexight" || target.disabled !== true
+    return applyAgentGUIProviderRailOrder(
+      railProviderTargets,
+      providerRailOrder
     );
-  }, [providerTiles]);
+  }, [providerRailOrder, railProviderTargets]);
+  const visibleProviderTiles = providerTiles;
   const selectedProviderTargetIsPlaceholder = selectedProviderTarget?.disabled === true;
   const allTileSelected = conversationFilter.kind === "all" && !selectedProviderTargetIsPlaceholder;
   const selectAllProviders = useCallback11(() => {
@@ -30359,7 +30344,7 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
       if (fallbackTarget) {
         onSelectConversationFilterTarget({
           provider: fallbackTarget.provider,
-          providerTargetId: fallbackTarget.targetId
+          agentTargetId: fallbackTarget.targetId
         });
       }
     }
@@ -30375,7 +30360,7 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
     (target) => {
       onSelectConversationFilterTarget({
         provider: target.provider,
-        providerTargetId: target.targetId
+        agentTargetId: target.targetId
       });
       onRequestComposerFocus();
     },
@@ -30452,7 +30437,7 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
             "[data-provider-tile='true']"
           )
         ).map((element) => {
-          const targetId = element.dataset.providerTargetId?.trim() ?? "";
+          const targetId = element.dataset.agentTargetId?.trim() ?? "";
           if (!targetId || targetId === activeDragState.draggedTargetId) {
             return null;
           }
@@ -30518,7 +30503,7 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
         )
       );
       const dropTargets = tileElements.map((element) => {
-        const targetId = element.dataset.providerTargetId?.trim() ?? "";
+        const targetId = element.dataset.agentTargetId?.trim() ?? "";
         if (!targetId || targetId === activeDragState.draggedTargetId) {
           return null;
         }
@@ -30548,7 +30533,7 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
     },
     [dragState, previewMode, providerTargetsLoading, setProviderRailDragState]
   );
-  if (providerRailMode === "exact" && !providerTargetsLoading && visibleProviderTiles.length === 0 && renderProviderRailEmpty) {
+  if (!providerTargetsLoading && visibleProviderTiles.length === 0 && renderProviderRailEmpty) {
     return /* @__PURE__ */ jsx35(
       "div",
       {
@@ -30556,8 +30541,7 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
         role: "tablist",
         "aria-label": labels.providerSwitchLabel,
         "aria-busy": providerTargetsLoading,
-        "data-empty": "true",
-        children: renderProviderRailEmpty()
+        "data-empty": "true"
       }
     );
   }
@@ -30571,29 +30555,31 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
       onDragOver: handleProviderRailContainerDragOver,
       onDrop: commitProviderRailDragDrop,
       children: [
-        /* @__PURE__ */ jsxs22(
-          "button",
-          {
-            type: "button",
-            role: "tab",
-            "aria-label": labels.conversationFilterAll,
-            "aria-selected": allTileSelected,
-            className: AgentGUINode_styles_default.providerRailTile,
-            "data-selected": allTileSelected ? "true" : "false",
-            disabled: previewMode,
-            onClick: selectAllProviders,
-            children: [
-              /* @__PURE__ */ jsx35(
-                AgentGUIUnifiedProviderIcon,
-                {
-                  presentation: providerRailAllPresentation
-                }
-              ),
-              /* @__PURE__ */ jsx35("span", { className: AgentGUINode_styles_default.providerRailTileLabel, children: labels.conversationFilterAll })
-            ]
-          }
-        ),
-        /* @__PURE__ */ jsx35("span", { "aria-hidden": "true", className: AgentGUINode_styles_default.providerRailSeparator }),
+        visibleProviderTiles.length > 1 ? /* @__PURE__ */ jsxs22(Fragment9, { children: [
+          /* @__PURE__ */ jsxs22(
+            "button",
+            {
+              type: "button",
+              role: "tab",
+              "aria-label": labels.conversationFilterAll,
+              "aria-selected": allTileSelected,
+              className: AgentGUINode_styles_default.providerRailTile,
+              "data-selected": allTileSelected ? "true" : "false",
+              disabled: previewMode,
+              onClick: selectAllProviders,
+              children: [
+                /* @__PURE__ */ jsx35(
+                  AgentGUIUnifiedProviderIcon,
+                  {
+                    presentation: providerRailAllPresentation
+                  }
+                ),
+                /* @__PURE__ */ jsx35("span", { className: AgentGUINode_styles_default.providerRailTileLabel, children: labels.conversationFilterAll })
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsx35("span", { "aria-hidden": "true", className: AgentGUINode_styles_default.providerRailSeparator })
+        ] }) : null,
         providerTargetsLoading ? [0, 1, 2].map((index) => /* @__PURE__ */ jsx35(
           "button",
           {
@@ -30615,7 +30601,7 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
           `provider-target-loading-${index}`
         )) : null,
         visibleProviderTiles.map((target) => {
-          const providerSelected = target.disabled === true ? selectedProviderTarget?.provider === target.provider && selectedProviderTarget?.targetId === target.targetId : agentGUIProviderTargetMatchesConversationFilter(
+          const providerSelected = visibleProviderTiles.length === 1 ? true : target.disabled === true ? selectedProviderTarget?.provider === target.provider && selectedProviderTarget?.targetId === target.targetId : agentGUIProviderTargetMatchesConversationFilter(
             target,
             conversationFilter
           );
@@ -30640,7 +30626,7 @@ var AgentGUIProviderRail = memo3(function AgentGUIProviderRail2({
               "data-drag-over": dragState?.overTargetId === target.targetId ? dragState.position : void 0,
               "data-dragging": dragState?.draggedTargetId === target.targetId ? "true" : void 0,
               "data-provider-tile": "true",
-              "data-provider-target-id": target.targetId,
+              "data-agent-target-id": target.targetId,
               "data-selected": providerSelected ? "true" : "false",
               disabled: previewMode,
               draggable: !previewMode && !providerTargetsLoading,
@@ -33391,10 +33377,7 @@ function resolveAgentGUIRailStatusProvider(input) {
   return target ? target.provider : null;
 }
 function agentGuiStateEquals(left, right) {
-  return left === right || left.provider === right.provider && (left.agentTargetId ?? null) === (right.agentTargetId ?? null) && (left.providerTargetId ?? null) === (right.providerTargetId ?? null) && agentGUIProviderTargetRefsEqual(
-    left.providerTargetRef,
-    right.providerTargetRef
-  ) && left.lastActiveAgentSessionId === right.lastActiveAgentSessionId && (left.lastActiveConversationTitle ?? null) === (right.lastActiveConversationTitle ?? null) && 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.lastActiveConversationTitle ?? null) === (right.lastActiveConversationTitle ?? null) && 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(
@@ -33432,7 +33415,7 @@ function composerOverridesByAgentTargetIdEqual(left, right) {
   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.onHandoffConversation === next.onHandoffConversation && previous.onCapabilitySettingsRequest === next.onCapabilitySettingsRequest && previous.onAgentProviderLogin === next.onAgentProviderLogin && previous.accountMenuState === next.accountMenuState && previous.providerTargets === next.providerTargets && previous.providerTargetsLoading === next.providerTargetsLoading && previous.providerRailAllPresentation?.iconUrl === next.providerRailAllPresentation?.iconUrl && previous.slashCommandFallbackMode === next.slashCommandFallbackMode && previous.renderSidebarFooter === next.renderSidebarFooter && previous.providerRailMode === next.providerRailMode && previous.renderProviderRailEmpty === next.renderProviderRailEmpty && previous.renderProviderUnavailableState === next.renderProviderUnavailableState && previous.renderProviderReadinessGateState === next.renderProviderReadinessGateState && previous.comingSoonProviders === next.comingSoonProviders && previous.providerReadinessGates === next.providerReadinessGates && 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 && previous.workspaceAgentProbes === next.workspaceAgentProbes && previous.onAgentProbeDemandChange === next.onAgentProbeDemandChange && previous.onAgentProbeRefreshRequest === next.onAgentProbeRefreshRequest && previous.providerAuthAccountLabels === next.providerAuthAccountLabels && previous.managedAgentsState === next.managedAgentsState && previous.contextMentionProviders === next.contextMentionProviders && previous.workspaceAppIcons === next.workspaceAppIcons && previous.embedded === next.embedded && previous.previewMode === next.previewMode && previous.isActive === next.isActive && previous.composerFocusRequestSequence === next.composerFocusRequestSequence && previous.newConversationRequestSequence === next.newConversationRequestSequence && previous.openSessionRequest === next.openSessionRequest && previous.prefillPromptRequest === next.prefillPromptRequest;
+  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.onHandoffConversation === next.onHandoffConversation && previous.onCapabilitySettingsRequest === next.onCapabilitySettingsRequest && previous.onAgentProviderLogin === next.onAgentProviderLogin && previous.accountMenuState === next.accountMenuState && previous.agents === next.agents && previous.agentsLoading === next.agentsLoading && previous.allAgentsPresentation?.iconUrl === next.allAgentsPresentation?.iconUrl && previous.slashCommandFallbackMode === next.slashCommandFallbackMode && previous.renderSidebarFooter === next.renderSidebarFooter && previous.renderAgentsEmpty === next.renderAgentsEmpty && previous.renderAgentUnavailableState === next.renderAgentUnavailableState && previous.renderAgentReadinessState === next.renderAgentReadinessState && previous.onAgentAvailabilityAction === next.onAgentAvailabilityAction && previous.defaultAgentTargetId === next.defaultAgentTargetId && 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 && previous.workspaceAgentProbes === next.workspaceAgentProbes && previous.onAgentProbeDemandChange === next.onAgentProbeDemandChange && previous.onAgentProbeRefreshRequest === next.onAgentProbeRefreshRequest && previous.providerAuthAccountLabels === next.providerAuthAccountLabels && previous.managedAgentsState === next.managedAgentsState && previous.contextMentionProviders === next.contextMentionProviders && previous.workspaceAppIcons === next.workspaceAppIcons && previous.embedded === next.embedded && previous.previewMode === next.previewMode && previous.isActive === next.isActive && previous.composerFocusRequestSequence === next.composerFocusRequestSequence && previous.newConversationRequestSequence === next.newConversationRequestSequence && previous.openSessionRequest === next.openSessionRequest && previous.prefillPromptRequest === next.prefillPromptRequest;
 }
 var AgentGUINode = memo4(function AgentGUINode2({
   nodeId,
@@ -33460,18 +33443,16 @@ var AgentGUINode = memo4(function AgentGUINode2({
   onCapabilitySettingsRequest,
   onAgentProviderLogin,
   accountMenuState = null,
-  providerTargets,
-  providerTargetsLoading = false,
-  providerRailAllPresentation = null,
+  agents = [],
+  agentsLoading = false,
+  allAgentsPresentation = null,
   slashCommandFallbackMode = "provider-default",
-  providerRailMode = "catalog",
-  renderProviderRailEmpty,
-  renderProviderUnavailableState,
-  renderProviderReadinessGateState,
+  renderAgentsEmpty,
+  renderAgentUnavailableState,
+  renderAgentReadinessState,
+  onAgentAvailabilityAction,
   renderSidebarFooter,
-  comingSoonProviders,
-  providerReadinessGates = null,
-  defaultProviderTargetId = null,
+  defaultAgentTargetId = null,
   onWorkspaceFileReferencesAdded,
   onOpenConversationWindow,
   onClose,
@@ -33508,6 +33489,67 @@ var AgentGUINode = memo4(function AgentGUINode2({
     () => typeof i18n?.t === "function" ? createWorkspaceFileManagerI18nRuntime(i18n) : null,
     [i18n]
   );
+  const normalizedAgents = useMemo12(
+    () => normalizeAgentGUIAgents(agents),
+    [agents]
+  );
+  const internalAgentTargets = useMemo12(
+    () => projectAgentGUIAgentsToInternalTargets(normalizedAgents),
+    [normalizedAgents]
+  );
+  const agentByTargetId = useMemo12(
+    () => new Map(
+      normalizedAgents.map((agent) => [agent.agentTargetId, agent])
+    ),
+    [normalizedAgents]
+  );
+  const selectedDirectoryAgent = useMemo12(() => {
+    const selectedAgentTargetId = state.agentTargetId?.trim() || defaultAgentTargetId?.trim() || "";
+    return agentByTargetId.get(selectedAgentTargetId) ?? normalizedAgents[0] ?? null;
+  }, [
+    agentByTargetId,
+    defaultAgentTargetId,
+    normalizedAgents,
+    state.agentTargetId
+  ]);
+  const internalProviderReadinessGates = useMemo12(() => {
+    if (!selectedDirectoryAgent || selectedDirectoryAgent.availability.status === "ready") {
+      return {};
+    }
+    const agentTargetId = selectedDirectoryAgent.agentTargetId;
+    return {
+      [selectedDirectoryAgent.provider]: {
+        status: selectedDirectoryAgent.availability.status,
+        pendingAction: selectedDirectoryAgent.availability.pendingAction ?? null,
+        onAction: (_provider, action) => {
+          onAgentAvailabilityAction?.({ agentTargetId, action });
+        }
+      }
+    };
+  }, [onAgentAvailabilityAction, selectedDirectoryAgent]);
+  const renderInternalAgentUnavailableState = useMemo12(() => {
+    if (!renderAgentUnavailableState) {
+      return void 0;
+    }
+    return ({ target }) => {
+      const agentTargetId = target.agentTargetId?.trim() || target.targetId;
+      const agent = agentByTargetId.get(agentTargetId);
+      return agent ? renderAgentUnavailableState({ agent }) : null;
+    };
+  }, [agentByTargetId, renderAgentUnavailableState]);
+  const renderInternalAgentReadinessState = useMemo12(() => {
+    if (!renderAgentReadinessState) {
+      return void 0;
+    }
+    return ({ target, showAllProviders }) => {
+      const agentTargetId = target?.agentTargetId?.trim() || target?.targetId;
+      const agent = agentTargetId ? agentByTargetId.get(agentTargetId) : selectedDirectoryAgent;
+      return agent ? renderAgentReadinessState({
+        agent,
+        showAllAgents: showAllProviders
+      }) : null;
+    };
+  }, [agentByTargetId, renderAgentReadinessState, selectedDirectoryAgent]);
   const handleLinkAction = useCallback13(
     (action) => {
       const agentTargetId = state.agentTargetId?.trim() || null;
@@ -33632,12 +33674,10 @@ var AgentGUINode = memo4(function AgentGUINode2({
     data: state,
     openSessionRequest,
     prefillPromptRequest,
-    providerTargets,
-    providerTargetsLoading,
-    providerRailMode,
-    comingSoonProviders,
-    providerReadinessGates,
-    defaultProviderTargetId,
+    providerTargets: internalAgentTargets,
+    providerTargetsLoading: agentsLoading,
+    providerReadinessGates: internalProviderReadinessGates,
+    defaultAgentTargetId,
     previewMode,
     onDataChange: handleDataChange,
     onRememberComposerDefaults,
@@ -33895,6 +33935,7 @@ var AgentGUINode = memo4(function AgentGUINode2({
       planImplementationSend: t("agentHost.agentGui.planImplementationSend"),
       planImplementationSkip: t("agentHost.agentGui.planImplementationSkip"),
       noRunningResponse: t("agentHost.agentGui.noRunningResponse"),
+      agentsEmpty: t("agentHost.agentGui.agentsEmpty"),
       empty: t("agentHost.agentGui.empty", { provider: displayProviderLabel }),
       homeSuggestions: buildAgentHomeSuggestions(
         t,
@@ -34519,10 +34560,10 @@ var AgentGUINode = memo4(function AgentGUINode2({
           {
             viewModel,
             renderSidebarFooter,
-            renderProviderRailEmpty,
-            renderProviderUnavailableState,
-            renderProviderReadinessGateState,
-            providerRailAllPresentation,
+            renderProviderRailEmpty: renderAgentsEmpty,
+            renderProviderUnavailableState: renderInternalAgentUnavailableState,
+            renderProviderReadinessGateState: renderInternalAgentReadinessState,
+            providerRailAllPresentation: allAgentsPresentation,
             slashCommandFallbackMode,
             actions: viewActions,
             isActive,
@@ -34617,7 +34658,6 @@ export {
   AgentGuiI18nProvider,
   AgentQueuedPromptRuntimeProvider,
   agentActivityRuntimeCapabilityEnabled,
-  agentGUIDefaultTargetProviders,
   agentGuiDockIconUrl,
   agentGuiDockIconUrls,
   agentGuiI18nModule,
@@ -34625,15 +34665,10 @@ export {
   agentHostSnapshotFromAgentActivitySnapshot,
   buildAgentActivitySnapshotProjection,
   createAgentQueuedPromptRuntime,
-  createLocalAgentGUIProviderTarget,
-  createLocalAgentGUIProviderTargets,
-  createSharedAgentGUIProviderTarget,
   getAgentActivityRuntime,
   getAgentCustomMentionKind,
   getOptionalAgentActivityRuntime,
-  localAgentGUIAgentTargetId,
-  localAgentGUIProviderTargetId,
-  normalizeAgentGUIProviderTargets,
+  normalizeAgentGUIAgents,
   preloadAgentMentionBrowse,
   projectCoreSessionStatus,
   registerAgentCustomMentionKind,
@@ -34641,7 +34676,6 @@ export {
   resetAgentCustomMentionKindsForTests,
   resetAgentQueuedPromptRuntimeForTests,
   resolveAgentGUIExpandedWindowFrame,
-  resolveAgentGUIProviderTarget,
   selectNeedsAttentionCount2 as selectNeedsAttentionCount,
   selectNeedsAttentionItems2 as selectNeedsAttentionItems,
   setAgentActivityRuntimeForTests,