@tutti-os/agent-gui 0.0.11 → 0.0.12

package/dist/index.js

@@ -18,7 +18,7 @@ import {
   mergeWorkspaceAgentActivityDurableAndOverlayMessages,
   normalizeOptionalWorkspaceAgentStatus,
   selectWorkspaceAgentActivityOverlayMessages
-} from "./chunk-ITMKZRCT.js";
+} from "./chunk-PKCJR6GC.js";
 import {
   AgentInteractivePromptSurface,
   MANAGED_AGENT_ICON_FALLBACK_URL,
@@ -29,7 +29,7 @@ import {
   normalizeManagedAgentProvider,
   user_avatar_placeholder_default,
   workspaceAgentActivityStatusLabel
-} from "./chunk-CGBRAWTD.js";
+} from "./chunk-Y5O7BVGU.js";
 import "./chunk-4ASBZ4X7.js";
 import {
   resolveWorkspaceAgentSessionSortTimeUnixMs
@@ -58,7 +58,7 @@ import {
   skillDescriptionForDisplay,
   skillTriggerForPrefix,
   useProjectedAgentConversation
-} from "./chunk-ZEFETOTS.js";
+} from "./chunk-72YSPOHX.js";
 import "./chunk-XJ34OIEQ.js";
 import {
   AgentActivityHostProvider,
@@ -75,11 +75,11 @@ import {
   useAgentActivitySnapshot,
   useAgentHostApi,
   useOptionalAgentActivityRuntime
-} from "./chunk-QTZALZIV.js";
+} from "./chunk-PONEQEJ5.js";
 import "./chunk-TYGL25EL.js";
 import {
   AGENT_GUI_MENTION_PROVIDER_IDS
-} from "./chunk-77HBKGHF.js";
+} from "./chunk-KCC3GNPB.js";
 import {
   normalizeAgentTitleText
 } from "./chunk-GCBDIQDX.js";
@@ -90,7 +90,7 @@ import {
   getActiveUiLanguage,
   translate,
   useTranslation
-} from "./chunk-B7K776UD.js";
+} from "./chunk-Y3AQGWJA.js";
 import {
   resolveAgentMentionFileThumbnailUrl,
   resolveAgentMentionFileVisualKind
@@ -2219,7 +2219,14 @@ function WorkspaceNodeWindow({
 }
 
 // agent-gui/agentGuiNode/controller/useAgentGUINodeController.ts
-import { useCallback as useCallback4, useEffect as useEffect4, useMemo as useMemo4, useRef as useRef4, useState as useState4 } from "react";
+import {
+  useCallback as useCallback4,
+  useEffect as useEffect4,
+  useId,
+  useMemo as useMemo4,
+  useRef as useRef4,
+  useState as useState4
+} from "react";
 import { toast } from "@tutti-os/ui-system";
 import {
   resolveAgentActivityCapability as resolveAgentActivityCapability2,
@@ -2922,9 +2929,10 @@ function messageRole(message) {
   return null;
 }
 function messageText(message) {
+  const payloadDisplayPrompt = typeof message.payload?.displayPrompt === "string" ? message.payload.displayPrompt : "";
   const payloadContent = typeof message.payload?.content === "string" ? message.payload.content : "";
   const payloadText = typeof message.payload?.text === "string" ? message.payload.text : "";
-  return (payloadContent || payloadText).replace(/\s+/g, " ").trim();
+  return (payloadDisplayPrompt || payloadText || payloadContent).replace(/\s+/g, " ").trim();
 }
 function compareMessagesAscending(left, right) {
   const leftTime = left.occurredAtUnixMs ?? left.completedAtUnixMs ?? left.startedAtUnixMs ?? 0;
@@ -2953,9 +2961,10 @@ function timelineItemRole(item) {
   return null;
 }
 function timelineItemText(item) {
+  const payloadDisplayPrompt = typeof item.payload?.displayPrompt === "string" ? item.payload.displayPrompt : "";
   const payloadContent = typeof item.payload?.content === "string" ? item.payload.content : "";
   const payloadText = typeof item.payload?.text === "string" ? item.payload.text : "";
-  return (payloadContent || item.content || payloadText).replace(/\s+/g, " ").trim();
+  return (payloadDisplayPrompt || payloadText || item.content || payloadContent).replace(/\s+/g, " ").trim();
 }
 function compareTimelineItemsAscending(left, right) {
   const leftTime = left.occurredAtUnixMs ?? left.createdAtUnixMs ?? 0;
@@ -3039,7 +3048,7 @@ function isOptimisticUserPromptItem(item) {
   return item.payload?.__agentGuiOptimisticPrompt === true;
 }
 function normalizedTimelineItemBody(item) {
-  const content = typeof item.content === "string" && item.content.trim() ? item.content : typeof item.payload?.content === "string" && item.payload.content.trim() ? item.payload.content : typeof item.payload?.text === "string" ? item.payload.text : "";
+  const content = typeof item.payload?.displayPrompt === "string" && item.payload.displayPrompt.trim() ? item.payload.displayPrompt : typeof item.payload?.text === "string" && item.payload.text.trim() ? item.payload.text : typeof item.payload?.content === "string" && item.payload.content.trim() ? item.payload.content : typeof item.content === "string" ? item.content : "";
   return content.trim();
 }
 function timelineItemMergeKey(item) {
@@ -3357,6 +3366,7 @@ function messageText2(message) {
   const payload = normalizedPayload(message.payload);
   const title = messagePayloadString(message, "title");
   return firstNonEmptyString(
+    stringValue(payload.displayPrompt),
     stringValue(payload.text),
     stringValue(payload.content),
     stringValue(payload.message),
@@ -4508,6 +4518,7 @@ var requestIdByQueryKey = /* @__PURE__ */ new Map();
 var localCreatedConversationIdsByQueryKey = /* @__PURE__ */ new Map();
 var deletedConversationIdsByQueryKey = /* @__PURE__ */ new Map();
 var runtimeRefreshUnsubscribeByWorkspaceId = /* @__PURE__ */ new Map();
+var activeConversationIdsByQueryKey = /* @__PURE__ */ new Map();
 function normalizeQuery(input) {
   const workspaceId = input.workspaceId.trim();
   const userId = input.userId.trim();
@@ -4599,6 +4610,22 @@ function getQueryState(query) {
   const queryKey = createAgentGUIConversationListQueryKey(normalized);
   return snapshot2.statesByQueryKey[queryKey] ?? null;
 }
+function hasActiveConversationOwner(queryKey, conversationId) {
+  const normalizedConversationId = conversationId.trim();
+  if (!normalizedConversationId) {
+    return false;
+  }
+  const activeByOwner = activeConversationIdsByQueryKey.get(queryKey);
+  if (!activeByOwner) {
+    return false;
+  }
+  for (const activeConversationId of activeByOwner.values()) {
+    if (activeConversationId === normalizedConversationId) {
+      return true;
+    }
+  }
+  return false;
+}
 function describeError(error) {
   if (error instanceof Error) {
     return error.message;
@@ -4719,7 +4746,7 @@ function areConversationProjectsEqual(left, right) {
   if (!left || !right) {
     return false;
   }
-  return left.id === right.id && left.path === right.path && left.label === right.label;
+  return left.id === right.id && left.path === right.path && left.label === right.label && left.createdAtUnixMs === right.createdAtUnixMs && left.updatedAtUnixMs === right.updatedAtUnixMs && left.lastUsedAtUnixMs === right.lastUsedAtUnixMs;
 }
 function areConversationsEqual(left, right) {
   return left.id === right.id && left.userId === right.userId && left.provider === right.provider && left.title === right.title && left.status === right.status && left.cwd === right.cwd && areConversationProjectsEqual(left.project, right.project) && left.sortTimeUnixMs === right.sortTimeUnixMs && left.updatedAtUnixMs === right.updatedAtUnixMs && (left.pinnedAtUnixMs ?? 0) === (right.pinnedAtUnixMs ?? 0) && left.hasUnreadCompletion === right.hasUnreadCompletion && areConversationTitleFallbacksEqual(
@@ -5087,6 +5114,91 @@ function updateAgentGUIConversationListConversations(query, updater) {
     };
   });
 }
+function setAgentGUIConversationListActiveConversation(input) {
+  const ownerKey = input.ownerKey.trim();
+  if (!ownerKey) {
+    return;
+  }
+  const queryState = ensureQueryState(input.query);
+  if (!queryState) {
+    return;
+  }
+  const conversationId = input.conversationId?.trim() ?? "";
+  const activeByOwner = activeConversationIdsByQueryKey.get(queryState.queryKey) ?? /* @__PURE__ */ new Map();
+  const previousConversationId = activeByOwner.get(ownerKey) ?? null;
+  if (!conversationId) {
+    if (previousConversationId === null) {
+      return;
+    }
+    activeByOwner.delete(ownerKey);
+    if (activeByOwner.size === 0) {
+      activeConversationIdsByQueryKey.delete(queryState.queryKey);
+    } else {
+      activeConversationIdsByQueryKey.set(queryState.queryKey, activeByOwner);
+    }
+    return;
+  }
+  if (previousConversationId !== conversationId) {
+    activeByOwner.set(ownerKey, conversationId);
+    activeConversationIdsByQueryKey.set(queryState.queryKey, activeByOwner);
+  }
+  clearAgentGUIConversationUnreadCompletion({
+    query: input.query,
+    conversationId
+  });
+}
+function clearAgentGUIConversationUnreadCompletion(input) {
+  const conversationId = input.conversationId.trim();
+  if (!conversationId) {
+    return;
+  }
+  updateAgentGUIConversationListConversations(input.query, (current) => {
+    let changed = false;
+    const next = current.map((conversation) => {
+      if (conversation.id !== conversationId || conversation.hasUnreadCompletion !== true) {
+        return conversation;
+      }
+      changed = true;
+      return {
+        ...conversation,
+        hasUnreadCompletion: false
+      };
+    });
+    return changed ? next : current;
+  });
+}
+function markAgentGUIConversationCompletionObserved(input) {
+  const conversationId = input.conversationId.trim();
+  if (!conversationId) {
+    return;
+  }
+  const queryState = ensureQueryState(input.query);
+  if (!queryState) {
+    return;
+  }
+  const shouldMarkUnread = !hasActiveConversationOwner(
+    queryState.queryKey,
+    conversationId
+  );
+  updateAgentGUIConversationListConversations(input.query, (current) => {
+    let changed = false;
+    const next = current.map((conversation) => {
+      if (conversation.id !== conversationId) {
+        return conversation;
+      }
+      const hasUnreadCompletion = conversation.status === "completed" && shouldMarkUnread;
+      if (conversation.hasUnreadCompletion === hasUnreadCompletion) {
+        return conversation;
+      }
+      changed = true;
+      return {
+        ...conversation,
+        hasUnreadCompletion
+      };
+    });
+    return changed ? next : current;
+  });
+}
 function upsertLocalCreatedAgentGUIConversation(input) {
   const queryState = ensureQueryState(input.query);
   if (!queryState) {
@@ -5369,6 +5481,7 @@ function composerSettingsSupportFromOptions(composerOptions, sessionRuntimeConte
   return {
     model: composerOptions?.modelConfigurable ?? false,
     reasoning: composerOptions?.reasoningConfigurable ?? false,
+    speed: composerOptions?.speedConfigurable ?? false,
     permission: composerOptions?.permissionConfig?.configurable ?? false,
     plan: resolveAgentActivityCapability("planMode", {
       composerOptions,
@@ -5436,6 +5549,7 @@ var AGENT_SESSION_ACTIVE_TURN_CONFLICT_MESSAGE = "agent session already has an a
 var AGENT_PROVIDER_SESSION_NOT_FOUND_FALLBACK_MESSAGE = "The previous agent session can no longer be restored.";
 var AGENT_RESUME_SESSION_NOT_LOCAL_FALLBACK_MESSAGE = "The previous agent session is not available on this machine.";
 var AGENT_GUI_CAUGHT_ERROR_STACK_LIMIT = 4e3;
+var SELECTED_SESSION_NOT_FOUND_RETRY_DELAY_MS = 150;
 function reportAgentGUIRuntimeError(input) {
   const reportDiagnostic = input.runtime.reportDiagnostic;
   if (!reportDiagnostic) {
@@ -5998,6 +6112,9 @@ function normalizeConfigOptionValue(value) {
 function reasoningConfigOptionIdForProvider(provider) {
   return provider === "codex" ? "reasoning_effort" : "effort";
 }
+function speedConfigOptionIdForProvider(provider) {
+  return provider === "codex" ? "service_tier" : "fast";
+}
 function composerSettingOptionsFromActivity(options) {
   return options.map((option) => ({ ...option }));
 }
@@ -6019,6 +6136,15 @@ function reasoningSelectionFromComposerOptions(options, currentValue) {
     currentValue
   };
 }
+function speedSelectionFromComposerOptions(options, currentValue) {
+  if (!options) {
+    return null;
+  }
+  return {
+    options: composerSettingOptionsFromActivity(options.speeds ?? []),
+    currentValue
+  };
+}
 function providerSkillsFromComposerOptions(options) {
   return options?.skills.map((skill) => ({ ...skill })) ?? [];
 }
@@ -6066,6 +6192,9 @@ function resolveEffectiveComposerSettings(input) {
     reasoningEffort: normalizeOptionalText(
       input.settings.reasoningEffort
     ) ?? null,
+    speed: normalizeOptionalText(
+      input.settings.speed
+    ) ?? null,
     planMode: Boolean(input.settings.planMode),
     permissionModeId: normalizePermissionModeId(input.settings.permissionModeId)
   };
@@ -6074,6 +6203,9 @@ function runtimeConfigKeyForSetting(provider, setting) {
   if (setting === "reasoningEffort") {
     return reasoningConfigOptionIdForProvider(provider);
   }
+  if (setting === "speed") {
+    return speedConfigOptionIdForProvider(provider);
+  }
   if (setting === "permissionModeId") {
     return "mode";
   }
@@ -6086,6 +6218,9 @@ function shouldUpdateRuntimeConfigOption(provider, id, setting) {
   if (setting === "permissionModeId") {
     return id === "mode";
   }
+  if (setting === "speed") {
+    return id === speedConfigOptionIdForProvider(provider) || id === "service_tier" || id === "speed" || id === "fast";
+  }
   return id === reasoningConfigOptionIdForProvider(provider) || id === "model_reasoning_effort" || id === "reasoning_effort" || id === "effort";
 }
 function mergeRuntimeContextComposerSettings(provider, runtimeContext, settings) {
@@ -6105,6 +6240,11 @@ function mergeRuntimeContextComposerSettings(provider, runtimeContext, settings)
     runtimeConfigPatch[runtimeConfigKeyForSetting(provider, "reasoningEffort")] = value;
     optionPatches.push({ setting: "reasoningEffort", value });
   }
+  if (settings.speed !== void 0) {
+    const value = normalizeOptionalText(settings.speed);
+    runtimeConfigPatch[runtimeConfigKeyForSetting(provider, "speed")] = value;
+    optionPatches.push({ setting: "speed", value });
+  }
   if (settings.permissionModeId !== void 0) {
     const value = normalizeOptionalText(settings.permissionModeId);
     runtimeConfigPatch[runtimeConfigKeyForSetting(provider, "permissionModeId")] = value;
@@ -6144,7 +6284,7 @@ function cloneComposerSettings(settings) {
   return { ...settings };
 }
 function sameComposerSettings(left, right) {
-  return (left?.model ?? null) === (right?.model ?? null) && (left?.reasoningEffort ?? null) === (right?.reasoningEffort ?? null) && Boolean(left?.planMode) === Boolean(right?.planMode) && (left?.permissionModeId ?? null) === (right?.permissionModeId ?? null);
+  return (left?.model ?? null) === (right?.model ?? null) && (left?.reasoningEffort ?? null) === (right?.reasoningEffort ?? null) && (left?.speed ?? null) === (right?.speed ?? null) && Boolean(left?.planMode) === Boolean(right?.planMode) && (left?.permissionModeId ?? null) === (right?.permissionModeId ?? null);
 }
 function useStableComposerSettings(settings) {
   const settingsRef = useRef4(null);
@@ -6181,6 +6321,21 @@ function promptRequestId(prompt) {
 function conversationBusyStatus2(status) {
   return status === "working" || status === "waiting";
 }
+function stringArraysEqual(first, second) {
+  if (!first || !second) {
+    return first === second;
+  }
+  return first.length === second.length && first.every((value, index) => value === second[index]);
+}
+function useStableStringArrayByValue(values) {
+  const valuesRef = useRef4(null);
+  const currentValues = valuesRef.current;
+  if (!stringArraysEqual(currentValues, values)) {
+    valuesRef.current = values;
+    return values;
+  }
+  return currentValues ?? values;
+}
 function agentSessionStatusBusy(input) {
   const normalized = normalizeOptionalWorkspaceAgentStatus(input);
   return normalized?.kind === "working" || normalized?.kind === "waiting";
@@ -6210,6 +6365,9 @@ function buildNodeDefaultComposerSettings(data, options) {
     reasoningEffort: normalizeOptionalText(
       composerOverrides.reasoningEffort
     ) ?? options?.defaultReasoningEffort ?? null,
+    speed: normalizeOptionalText(
+      composerOverrides.speed
+    ) ?? options?.defaultSpeed ?? null,
     planMode: Boolean(composerOverrides.planMode),
     permissionModeId: normalizePermissionModeId(
       composerOverrides.permissionModeId
@@ -6225,6 +6383,7 @@ function composerSupportForProvider(provider) {
       model: true,
       permission: provider === "claude-code" || provider === "codex",
       reasoning: true,
+      speed: provider === "claude-code" || provider === "codex",
       plan: false
     };
   }
@@ -6232,6 +6391,7 @@ function composerSupportForProvider(provider) {
     model: false,
     permission: provider === "nexight",
     reasoning: false,
+    speed: false,
     plan: false
   };
 }
@@ -6249,6 +6409,7 @@ function nodeDataFromComposerSettings(current, settings) {
   const composerOverrides = {
     model: normalizeOptionalText(settings.model),
     reasoningEffort: normalizeOptionalText(settings.reasoningEffort),
+    speed: normalizeOptionalText(settings.speed),
     planMode: Boolean(settings.planMode),
     permissionModeId: normalizePermissionModeId(settings.permissionModeId)
   };
@@ -6365,6 +6526,11 @@ function mergeSessionControlStatePatch(current, patch) {
         patch.settings.reasoningEffort
       );
     }
+    if (patch.settings.speed !== void 0) {
+      nextSettings.speed = normalizeOptionalText(
+        patch.settings.speed
+      );
+    }
     if (patch.settings.planMode !== void 0) {
       nextSettings.planMode = Boolean(patch.settings.planMode);
     }
@@ -6582,6 +6748,7 @@ function useAgentGUINodeController({
   const agentActivityRuntime = useAgentActivityRuntime();
   const agentHostApi = useAgentHostApi();
   const agentActivitySnapshot = useAgentActivitySnapshot(workspaceId);
+  const generatedControllerOwnerKey = useId();
   const conversationListQuery = useMemo4(() => {
     const userId = currentUserId?.trim() ?? "";
     const provider = data.provider?.trim() ?? "";
@@ -6599,6 +6766,7 @@ function useAgentGUINodeController({
     conversationListQuery
   );
   const pendingCreateOwnerKey = nodeId?.trim() ?? "";
+  const conversationListActiveOwnerKey = pendingCreateOwnerKey || generatedControllerOwnerKey;
   const resolvePendingCreateConversationId = useCallback4(
     () => conversationListQuery && pendingCreateOwnerKey ? getAgentGUIConversationCreatePending({
       query: conversationListQuery,
@@ -6860,12 +7028,24 @@ function useAgentGUINodeController({
     },
     []
   );
-  const backgroundBusyConversationIds = useMemo4(
+  const projectedBackgroundBusyConversationIds = useMemo4(
     () => conversations.filter(
       (conversation2) => conversation2.id !== activeConversationId && conversationBusyStatus2(conversation2.status)
-    ).map((conversation2) => conversation2.id),
+    ).map((conversation2) => conversation2.id).sort(),
+    [activeConversationId, conversations]
+  );
+  const backgroundBusyConversationIds = useStableStringArrayByValue(
+    projectedBackgroundBusyConversationIds
+  );
+  const projectedReleasedBackgroundConversationIds = useMemo4(
+    () => conversations.filter(
+      (conversation2) => conversation2.id === activeConversationId || conversation2.status === "completed" || conversation2.status === "failed" || conversation2.status === "canceled"
+    ).map((conversation2) => conversation2.id).sort(),
     [activeConversationId, conversations]
   );
+  const releasedBackgroundConversationIds = useStableStringArrayByValue(
+    projectedReleasedBackgroundConversationIds
+  );
   const [
     retainedBackgroundConversationIds,
     setRetainedBackgroundConversationIds
@@ -6874,26 +7054,24 @@ function useAgentGUINodeController({
     if (previewMode) {
       return;
     }
+    if (backgroundBusyConversationIds.length === 0 && releasedBackgroundConversationIds.length === 0) {
+      return;
+    }
     setRetainedBackgroundConversationIds((current) => {
       const next = new Set(current);
       for (const conversationId of backgroundBusyConversationIds) {
         next.add(conversationId);
       }
-      for (const conversation2 of conversations) {
-        if (conversation2.id === activeConversationId || conversation2.status === "completed" || conversation2.status === "failed" || conversation2.status === "canceled") {
-          next.delete(conversation2.id);
-        }
+      for (const conversationId of releasedBackgroundConversationIds) {
+        next.delete(conversationId);
       }
       const nextIds = [...next].sort();
-      return nextIds.length === current.length && nextIds.every(
-        (conversationId, index) => conversationId === current[index]
-      ) ? current : nextIds;
+      return stringArraysEqual(nextIds, current) ? current : nextIds;
     });
   }, [
-    activeConversationId,
     backgroundBusyConversationIds,
-    conversations,
-    previewMode
+    previewMode,
+    releasedBackgroundConversationIds
   ]);
   const backgroundWatchedConversationIds = useMemo4(
     () => previewMode ? [] : [
@@ -6955,7 +7133,19 @@ function useAgentGUINodeController({
   const stateReloadInFlightRef = useRef4(false);
   const stateReloadQueuedRef = useRef4(false);
   const stateReloadTargetSessionIdRef = useRef4(null);
+  const selectedConversationMessageLoadSeqRef = useRef4(0);
+  const selectedConversationPendingMessageLoadIdsRef = useRef4(
+    /* @__PURE__ */ new Set()
+  );
+  const selectedConversationInitialStateLoadedIdsRef = useRef4(
+    /* @__PURE__ */ new Set()
+  );
+  const selectedConversationInitialMessagesLoadedIdsRef = useRef4(
+    /* @__PURE__ */ new Set()
+  );
   const stateReloadCauseRef = useRef4(null);
+  const selectedConversationNotFoundRetryIdsRef = useRef4(/* @__PURE__ */ new Set());
+  const selectedConversationNotFoundRetryTimerRef = useRef4(null);
   const sessionStateSnapshotCauseBySessionIdRef = useRef4({});
   const blockedActivityStreamStateReloadSessionIdsRef = useRef4(
     /* @__PURE__ */ new Set()
@@ -7050,6 +7240,7 @@ function useAgentGUINodeController({
     if (snapshotConversations.length === 0) {
       return;
     }
+    const completedConversationIds = /* @__PURE__ */ new Set();
     updateConversationList((current) => {
       const currentById = new Map(
         current.map((conversation2) => [conversation2.id, conversation2])
@@ -7063,7 +7254,7 @@ function useAgentGUINodeController({
           if (!existing) {
             return {
               ...conversation2,
-              hasUnreadCompletion: conversation2.hasUnreadCompletion ?? (conversation2.status === "completed" && activeConversationIdRef.current !== conversation2.id)
+              hasUnreadCompletion: conversation2.hasUnreadCompletion ?? false
             };
           }
           const titleFields = hasPromptConversationTitle2(existing) && isWorkspaceAgentUntitledTask(conversation2.title) ? {
@@ -7076,11 +7267,14 @@ function useAgentGUINodeController({
           const incomingWouldSettleBusyStatus = conversationBusyStatus2(existing.status) && !conversationBusyStatus2(conversation2.status);
           const shouldKeepExistingStatus = existing.updatedAtUnixMs > conversation2.updatedAtUnixMs && incomingWouldSettleBusyStatus;
           const status = shouldKeepExistingStatus ? existing.status : conversation2.status;
+          if (status === "completed" && existing.status !== "completed") {
+            completedConversationIds.add(conversation2.id);
+          }
           const syncState = conversation2.syncState && shouldApplySyncState(existing.syncState, conversation2.syncState) && !syncStateRenderFieldsEqual(
             existing.syncState,
             conversation2.syncState
           ) ? conversation2.syncState : existing.syncState;
-          const hasUnreadCompletion = conversation2.status === "completed" ? activeConversationIdRef.current !== conversation2.id : existing.hasUnreadCompletion ?? false;
+          const hasUnreadCompletion = conversation2.status === "completed" ? existing.hasUnreadCompletion ?? conversation2.hasUnreadCompletion ?? false : false;
           return {
             ...existing,
             ...conversation2,
@@ -7101,6 +7295,12 @@ function useAgentGUINodeController({
         isNoProjectPath
       });
     });
+    for (const conversationId of completedConversationIds) {
+      markAgentGUIConversationCompletionObserved({
+        query: conversationListQuery,
+        conversationId
+      });
+    }
   }, [
     agentActivitySnapshot,
     conversationListQuery,
@@ -7136,7 +7336,6 @@ function useAgentGUINodeController({
       })[0] ?? current : current
     );
   }, [
-    conversations,
     isNoProjectPath,
     previewMode,
     setTransientConversation,
@@ -7248,6 +7447,28 @@ function useAgentGUINodeController({
   useEffect4(() => {
     activeConversationIdRef.current = activeConversationId;
   }, [activeConversationId]);
+  useEffect4(() => {
+    if (previewMode || !conversationListQuery) {
+      return void 0;
+    }
+    setAgentGUIConversationListActiveConversation({
+      query: conversationListQuery,
+      ownerKey: conversationListActiveOwnerKey,
+      conversationId: activeConversationId
+    });
+    return () => {
+      setAgentGUIConversationListActiveConversation({
+        query: conversationListQuery,
+        ownerKey: conversationListActiveOwnerKey,
+        conversationId: null
+      });
+    };
+  }, [
+    activeConversationId,
+    conversationListActiveOwnerKey,
+    conversationListQuery,
+    previewMode
+  ]);
   useEffect4(() => {
     selectedProjectPathRef.current = selectedProjectPath;
   }, [selectedProjectPath]);
@@ -7301,6 +7522,58 @@ function useAgentGUINodeController({
     },
     []
   );
+  const clearSelectedConversationNotFoundRetry = useCallback4(() => {
+    if (selectedConversationNotFoundRetryTimerRef.current !== null) {
+      window.clearTimeout(selectedConversationNotFoundRetryTimerRef.current);
+      selectedConversationNotFoundRetryTimerRef.current = null;
+    }
+  }, []);
+  const clearSelectedConversationNotFoundRetryWhenInitialLoadsSettled = useCallback4((agentSessionId) => {
+    const normalizedAgentSessionId = agentSessionId.trim();
+    if (normalizedAgentSessionId && selectedConversationInitialStateLoadedIdsRef.current.has(
+      normalizedAgentSessionId
+    ) && selectedConversationInitialMessagesLoadedIdsRef.current.has(
+      normalizedAgentSessionId
+    )) {
+      selectedConversationNotFoundRetryIdsRef.current.delete(
+        normalizedAgentSessionId
+      );
+      selectedConversationInitialStateLoadedIdsRef.current.delete(
+        normalizedAgentSessionId
+      );
+      selectedConversationInitialMessagesLoadedIdsRef.current.delete(
+        normalizedAgentSessionId
+      );
+    }
+  }, []);
+  const markSelectedConversationDetailPending = useCallback4(
+    (agentSessionId) => {
+      const normalizedAgentSessionId = agentSessionId.trim();
+      if (!normalizedAgentSessionId) {
+        return null;
+      }
+      clearSelectedConversationNotFoundRetry();
+      selectedConversationNotFoundRetryIdsRef.current.add(
+        normalizedAgentSessionId
+      );
+      selectedConversationInitialStateLoadedIdsRef.current.delete(
+        normalizedAgentSessionId
+      );
+      selectedConversationInitialMessagesLoadedIdsRef.current.delete(
+        normalizedAgentSessionId
+      );
+      selectedConversationPendingMessageLoadIdsRef.current.add(
+        normalizedAgentSessionId
+      );
+      setIsLoadingMessages(true);
+      setAgentSessionViewMessagesLoading(
+        sessionViewRef(normalizedAgentSessionId),
+        true
+      );
+      return normalizedAgentSessionId;
+    },
+    [clearSelectedConversationNotFoundRetry, sessionViewRef]
+  );
   const updateSelectedProjectPath = useCallback4(
     (path, metadata) => {
       const normalizedPath = normalizeProjectDraftPath(path);
@@ -7369,6 +7642,9 @@ function useAgentGUINodeController({
         activatedConversationIdsRef.current.delete(previous);
         void activation.unactivate(previous);
       }
+      if (previous !== normalized) {
+        markSelectedConversationDetailPending(normalized);
+      }
       if (pendingNewConversationId && pendingNewConversationId !== normalized) {
         activatedConversationIdsRef.current.delete(pendingNewConversationId);
         void activation.unactivate(pendingNewConversationId);
@@ -7391,11 +7667,12 @@ function useAgentGUINodeController({
           reloadDetail: true
         });
       }
-      updateConversationList(
-        (current) => current.map(
-          (conversation2) => conversation2.id === normalized ? { ...conversation2, hasUnreadCompletion: false } : conversation2
-        )
-      );
+      if (conversationListQuery) {
+        clearAgentGUIConversationUnreadCompletion({
+          query: conversationListQuery,
+          conversationId: normalized
+        });
+      }
       if (transientConversationRef.current?.id === normalized) {
         setTransientConversation(
           (current) => current?.id === normalized ? { ...current, hasUnreadCompletion: false } : current
@@ -7403,7 +7680,12 @@ function useAgentGUINodeController({
       }
       persistActiveConversation(normalized);
     },
-    [activation, persistActiveConversation]
+    [
+      activation,
+      conversationListQuery,
+      markSelectedConversationDetailPending,
+      persistActiveConversation
+    ]
   );
   const syncConversationListProjection = useCallback4(
     async (_preferredSessionId) => {
@@ -7421,6 +7703,62 @@ function useAgentGUINodeController({
     },
     [conversationListQuery, persistActiveConversation]
   );
+  const scheduleSelectedConversationNotFoundRetry = useCallback4(
+    (agentSessionId) => {
+      const normalizedAgentSessionId = agentSessionId.trim();
+      if (!normalizedAgentSessionId || !selectedConversationNotFoundRetryIdsRef.current.has(
+        normalizedAgentSessionId
+      )) {
+        return false;
+      }
+      setAgentSessionViewError(sessionViewRef(normalizedAgentSessionId), null);
+      setAgentSessionViewMessagesLoading(
+        sessionViewRef(normalizedAgentSessionId),
+        true
+      );
+      if (activeConversationIdRef.current === normalizedAgentSessionId) {
+        setIsLoadingMessages(true);
+      }
+      if (conversationListQuery) {
+        scheduleAgentGUIConversationListProjection(
+          conversationListQuery,
+          "projection-sync"
+        );
+      }
+      selectedConversationPendingMessageLoadIdsRef.current.add(
+        normalizedAgentSessionId
+      );
+      clearSelectedConversationNotFoundRetry();
+      selectedConversationNotFoundRetryTimerRef.current = window.setTimeout(
+        () => {
+          selectedConversationNotFoundRetryTimerRef.current = null;
+          selectedConversationNotFoundRetryIdsRef.current.delete(
+            normalizedAgentSessionId
+          );
+          selectedConversationInitialStateLoadedIdsRef.current.delete(
+            normalizedAgentSessionId
+          );
+          selectedConversationInitialMessagesLoadedIdsRef.current.delete(
+            normalizedAgentSessionId
+          );
+          if (!isMountedRef.current || activeConversationIdRef.current !== normalizedAgentSessionId) {
+            return;
+          }
+          reloadSelectedConversationRef.current(normalizedAgentSessionId, {
+            reloadConversations: false,
+            reloadDetail: true
+          });
+        },
+        SELECTED_SESSION_NOT_FOUND_RETRY_DELAY_MS
+      );
+      return true;
+    },
+    [
+      clearSelectedConversationNotFoundRetry,
+      conversationListQuery,
+      sessionViewRef
+    ]
+  );
   useEffect4(() => {
     const requestedConversationId = data.lastActiveAgentSessionId?.trim() ?? "";
     const requestedConversationExists = requestedConversationId !== "" ? resolveConversationSummaryById(
@@ -7564,7 +7902,7 @@ function useAgentGUINodeController({
         false
       );
     },
-    [agentActivityRuntime, sessionViewRef, updateConversationList, workspaceId]
+    [sessionViewRef, updateConversationList]
   );
   const applySessionStateSnapshot = useCallback4(
     (snapshot3, cause) => {
@@ -7616,11 +7954,17 @@ function useAgentGUINodeController({
                 source: cause?.source
               }
             ),
-            hasUnreadCompletion: status === "completed" && activeConversationIdRef.current !== agentSessionId
+            hasUnreadCompletion: status === "completed" ? conversation2.hasUnreadCompletion ?? false : false
           };
           return nextConversation;
         })
       );
+      if (nextStatus === "completed" && conversationListQuery) {
+        markAgentGUIConversationCompletionObserved({
+          query: conversationListQuery,
+          conversationId: agentSessionId
+        });
+      }
       const transient = transientConversationRef.current;
       if (transient?.id === agentSessionId) {
         const timelineItems = projectAgentGUIMessagesToTimelineItems(
@@ -7653,7 +7997,7 @@ function useAgentGUINodeController({
         });
       }
     },
-    [sessionViewRef, setTransientConversation]
+    [conversationListQuery, sessionViewRef, setTransientConversation]
   );
   useEffect4(() => {
     const snapshot3 = activeSessionView?.controlState ?? null;
@@ -7699,6 +8043,12 @@ function useAgentGUINodeController({
           return;
         }
         clearFailedLiveState(agentSessionId);
+        selectedConversationInitialStateLoadedIdsRef.current.add(
+          agentSessionId
+        );
+        clearSelectedConversationNotFoundRetryWhenInitialLoadsSettled(
+          agentSessionId
+        );
         blockedActivityStreamStateReloadSessionIdsRef.current.delete(
           agentSessionId
         );
@@ -7718,6 +8068,14 @@ function useAgentGUINodeController({
           return;
         }
         const errorCode = getAgentGUIErrorCode(error);
+        if (isSessionNotFoundErrorCode(errorCode) && cause?.source === "conversation-selected" && scheduleSelectedConversationNotFoundRetry(agentSessionId)) {
+          return;
+        }
+        if (cause?.source === "conversation-selected") {
+          selectedConversationNotFoundRetryIdsRef.current.delete(
+            agentSessionId
+          );
+        }
         reportAgentGUIRuntimeError({
           agentSessionId,
           context: {
@@ -7788,14 +8146,101 @@ function useAgentGUINodeController({
       }
     },
     [
+      agentActivityRuntime,
       applySessionStateSnapshot,
       clearFailedLiveState,
+      clearSelectedConversationNotFoundRetryWhenInitialLoadsSettled,
       markFailedLiveState,
       persistActiveConversation,
+      scheduleSelectedConversationNotFoundRetry,
       workspaceId,
+      conversationListQuery,
       sessionViewRef
     ]
   );
+  const loadSelectedConversationMessages = useCallback4(
+    async (agentSessionId) => {
+      const normalizedAgentSessionId = agentSessionId.trim();
+      if (!normalizedAgentSessionId) {
+        return;
+      }
+      const requestId = ++selectedConversationMessageLoadSeqRef.current;
+      setDetailError(null);
+      setAgentSessionViewError(sessionViewRef(normalizedAgentSessionId), null);
+      setAgentSessionViewMessagesLoading(
+        sessionViewRef(normalizedAgentSessionId),
+        true
+      );
+      if (activeConversationIdRef.current === normalizedAgentSessionId) {
+        setIsLoadingMessages(true);
+      }
+      try {
+        const page = await agentActivityRuntime.listSessionMessages({
+          workspaceId,
+          agentSessionId: normalizedAgentSessionId
+        });
+        if (!isMountedRef.current || activeConversationIdRef.current !== normalizedAgentSessionId || selectedConversationMessageLoadSeqRef.current !== requestId) {
+          return;
+        }
+        selectedConversationInitialMessagesLoadedIdsRef.current.add(
+          normalizedAgentSessionId
+        );
+        clearSelectedConversationNotFoundRetryWhenInitialLoadsSettled(
+          normalizedAgentSessionId
+        );
+        const durableMessages = mergeWorkspaceAgentMessages(
+          [],
+          agentActivitySnapshotRef.current.sessionMessagesById[normalizedAgentSessionId] ?? []
+        );
+        const currentOverlayMessages = getAgentSessionView(sessionViewRef(normalizedAgentSessionId))?.overlayMessages ?? [];
+        const localMessages = mergeWorkspaceAgentMessages(
+          currentOverlayMessages,
+          page.messages
+        );
+        const overlayMessages = selectWorkspaceAgentActivityOverlayMessages({
+          durableMessages,
+          localMessages
+        });
+        setAgentSessionViewOverlayMessages(
+          sessionViewRef(normalizedAgentSessionId),
+          overlayMessages
+        );
+        refreshMessagesFromSnapshot(normalizedAgentSessionId);
+      } catch (error) {
+        if (!isMountedRef.current || activeConversationIdRef.current !== normalizedAgentSessionId || selectedConversationMessageLoadSeqRef.current !== requestId) {
+          return;
+        }
+        const errorCode = getAgentGUIErrorCode(error);
+        if (isSessionNotFoundErrorCode(errorCode) && scheduleSelectedConversationNotFoundRetry(normalizedAgentSessionId)) {
+          return;
+        }
+        selectedConversationNotFoundRetryIdsRef.current.delete(
+          normalizedAgentSessionId
+        );
+        reportAgentGUIRuntimeError({
+          agentSessionId: normalizedAgentSessionId,
+          error,
+          phase: "load_session_messages",
+          provider: dataRef.current.provider,
+          runtime: agentActivityRuntime,
+          workspaceId
+        });
+        setAgentSessionViewMessagesLoading(
+          sessionViewRef(normalizedAgentSessionId),
+          false
+        );
+        setIsLoadingMessages(false);
+      }
+    },
+    [
+      agentActivityRuntime,
+      clearSelectedConversationNotFoundRetryWhenInitialLoadsSettled,
+      refreshMessagesFromSnapshot,
+      scheduleSelectedConversationNotFoundRetry,
+      sessionViewRef,
+      workspaceId
+    ]
+  );
   const reloadSelectedConversation = useCallback4(
     (agentSessionId, options) => {
       if (!agentSessionId) {
@@ -7811,7 +8256,15 @@ function useAgentGUINodeController({
         void syncConversationListProjection(agentSessionId);
       }
       if (options.reloadDetail) {
-        void refreshMessagesFromSnapshot(agentSessionId);
+        const normalizedAgentSessionId = agentSessionId.trim();
+        const hadPendingMessageLoad = selectedConversationPendingMessageLoadIdsRef.current.delete(
+          normalizedAgentSessionId
+        );
+        if (hadPendingMessageLoad) {
+          void loadSelectedConversationMessages(normalizedAgentSessionId);
+        } else {
+          void refreshMessagesFromSnapshot(normalizedAgentSessionId);
+        }
         void loadSessionState(agentSessionId, {
           source: "conversation-selected"
         });
@@ -7819,6 +8272,7 @@ function useAgentGUINodeController({
     },
     [
       syncConversationListProjection,
+      loadSelectedConversationMessages,
       refreshMessagesFromSnapshot,
       loadSessionState
     ]
@@ -8183,7 +8637,7 @@ function useAgentGUINodeController({
             status: nextStatus ?? conversation2.status,
             timelineItems
           });
-          const hasUnreadCompletion = status === "completed" && activeConversationIdRef.current !== agentSessionId;
+          const hasUnreadCompletion = status === "completed" ? conversation2.hasUnreadCompletion ?? false : false;
           if (titleFields.title === conversation2.title && titleFields.titleFallback === conversation2.titleFallback && status === conversation2.status && hasUnreadCompletion === conversation2.hasUnreadCompletion && !clearedPendingSubmittedTurn) {
             return conversation2;
           }
@@ -8197,6 +8651,12 @@ function useAgentGUINodeController({
         });
         return changed ? next : current;
       });
+      if (nextStatus === "completed" && conversationListQuery) {
+        markAgentGUIConversationCompletionObserved({
+          query: conversationListQuery,
+          conversationId: agentSessionId
+        });
+      }
       const transient = transientConversationRef.current;
       if (transient?.id === agentSessionId) {
         const transientTitleFields = mergeConversationTitleUpdateFields(
@@ -8224,6 +8684,7 @@ function useAgentGUINodeController({
       setTransientConversation,
       statePatchErrorBySessionId,
       agentActivityRuntime,
+      conversationListQuery,
       workspaceId
     ]
   );
@@ -8356,6 +8817,7 @@ function useAgentGUINodeController({
     isMountedRef.current = true;
     return () => {
       clearPendingSessionStateReload();
+      clearSelectedConversationNotFoundRetry();
       const current = activeConversationIdRef.current;
       const pendingNewConversationId = startingConversationIdRef.current;
       isMountedRef.current = false;
@@ -8369,7 +8831,7 @@ function useAgentGUINodeController({
         void unactivateRef.current(pendingNewConversationId);
       }
     };
-  }, [clearPendingSessionStateReload]);
+  }, [clearPendingSessionStateReload, clearSelectedConversationNotFoundRetry]);
   const startConversation = useCallback4(
     (initialContentInput) => {
       if (isCreatingConversation || data.provider === "openclaw" && openclawGateway?.status !== "ready") {
@@ -9452,6 +9914,7 @@ function useAgentGUINodeController({
         ...currentDefaults,
         model: sessionSettings2?.model ?? currentDefaults.model,
         reasoningEffort: sessionSettings2?.reasoningEffort ?? currentDefaults.reasoningEffort,
+        speed: sessionSettings2?.speed ?? currentDefaults.speed,
         planMode: sessionSettings2?.planMode ?? currentDefaults.planMode,
         permissionModeId: sessionSettings2?.permissionModeId ?? currentDefaults.permissionModeId
       };
@@ -9459,6 +9922,7 @@ function useAgentGUINodeController({
         ...baseDefaultsFromSession,
         model: supportedNextSettings.model !== void 0 ? supportedNextSettings.model : baseDefaultsFromSession.model,
         reasoningEffort: supportedNextSettings.reasoningEffort !== void 0 ? supportedNextSettings.reasoningEffort : baseDefaultsFromSession.reasoningEffort,
+        speed: supportedNextSettings.speed !== void 0 ? supportedNextSettings.speed : baseDefaultsFromSession.speed,
         planMode: supportedNextSettings.planMode ?? baseDefaultsFromSession.planMode,
         permissionModeId: supportedNextSettings.permissionModeId !== void 0 ? supportedNextSettings.permissionModeId : baseDefaultsFromSession.permissionModeId
       };
@@ -9482,6 +9946,8 @@ function useAgentGUINodeController({
       const currentModel = normalizeOptionalText(sessionSettings2?.model);
       const nextReasoningEffort = supportedNextSettings.reasoningEffort !== void 0 ? supportedNextSettings.reasoningEffort ?? null : void 0;
       const currentReasoningEffort = sessionSettings2?.reasoningEffort ?? null;
+      const nextSpeed = supportedNextSettings.speed !== void 0 ? supportedNextSettings.speed ?? null : void 0;
+      const currentSpeed = sessionSettings2?.speed ?? null;
       const nextPlanMode = supportedNextSettings.planMode;
       const currentPlanMode = resolveEffectivePlanModeFromStates({
         sessionPlanModeState: planModeStateFromSessionState(activeSessionState2),
@@ -9495,6 +9961,9 @@ function useAgentGUINodeController({
       if (nextReasoningEffort !== void 0 && nextReasoningEffort !== currentReasoningEffort) {
         sessionSettingsPatch.reasoningEffort = nextReasoningEffort;
       }
+      if (nextSpeed !== void 0 && nextSpeed !== currentSpeed) {
+        sessionSettingsPatch.speed = nextSpeed;
+      }
       if (nextPlanMode !== void 0 && nextPlanMode !== currentPlanMode) {
         sessionSettingsPatch.planMode = nextPlanMode;
       }
@@ -9972,6 +10441,11 @@ function useAgentGUINodeController({
     }
     setIsDeletingConversation(true);
     setDetailError(null);
+    if (activeConversationIdRef.current === target.id) {
+      clearSelectedConversationNotFoundRetry();
+      setIsLoadingMessages(true);
+      setAgentSessionViewMessagesLoading(sessionViewRef(target.id), true);
+    }
     void activation.unactivate(target.id).then(
       () => agentActivityRuntime.deleteSession({
         workspaceId,
@@ -10030,21 +10504,28 @@ function useAgentGUINodeController({
         return next;
       });
       deleteAgentSessionView(sessionViewRef(target.id));
-      updateConversationList((current) => {
-        const targetIndex = current.findIndex(
-          (conversation2) => conversation2.id === target.id
-        );
-        const next = current.filter(
-          (conversation2) => conversation2.id !== target.id
-        );
-        if (activeConversationIdRef.current === target.id) {
-          const nextActive = next[Math.max(0, targetIndex)]?.id ?? next[Math.max(0, targetIndex - 1)]?.id ?? null;
-          activeConversationIdRef.current = nextActive;
-          setActiveConversationId(nextActive);
-          persistActiveConversation(nextActive);
+      const currentConversations = conversationsRef.current;
+      const targetIndex = currentConversations.findIndex(
+        (conversation2) => conversation2.id === target.id
+      );
+      const nextConversations = currentConversations.filter(
+        (conversation2) => conversation2.id !== target.id
+      );
+      if (activeConversationIdRef.current === target.id) {
+        const nextActive = nextConversations[Math.max(0, targetIndex)]?.id ?? nextConversations[Math.max(0, targetIndex - 1)]?.id ?? null;
+        if (nextActive) {
+          markSelectedConversationDetailPending(nextActive);
+        } else {
+          clearSelectedConversationNotFoundRetry();
+          setIsLoadingMessages(false);
         }
-        return next;
-      });
+        activeConversationIdRef.current = nextActive;
+        setActiveConversationId(nextActive);
+        persistActiveConversation(nextActive);
+      }
+      updateConversationList(
+        (current) => current.filter((conversation2) => conversation2.id !== target.id)
+      );
       setPendingDeleteConversation(null);
     }).catch((error) => {
       const message = getAgentGUIErrorMessage(error);
@@ -10058,17 +10539,25 @@ function useAgentGUINodeController({
       });
       toast.error(message);
       setDetailError(message);
+      if (activeConversationIdRef.current === target.id) {
+        setIsLoadingMessages(false);
+        setAgentSessionViewMessagesLoading(sessionViewRef(target.id), false);
+      }
     }).finally(() => {
       setIsDeletingConversation(false);
     });
   }, [
     activation,
+    conversationListQuery,
     isDeletingConversation,
     pendingDeleteConversation,
+    clearSelectedConversationNotFoundRetry,
+    markSelectedConversationDetailPending,
     persistActiveConversation,
     workspaceId,
     sessionViewRef,
-    agentActivityRuntime
+    agentActivityRuntime,
+    updateConversationList
   ]);
   const confirmDeleteProjectConversations = useCallback4(
     (path) => {
@@ -10100,6 +10589,15 @@ function useAgentGUINodeController({
       setIsDeletingProjectConversations(true);
       setDetailError(null);
       setListError(null);
+      const activeDeletedConversationId = activeConversationIdRef.current;
+      if (activeDeletedConversationId && targetIds.has(activeDeletedConversationId)) {
+        clearSelectedConversationNotFoundRetry();
+        setIsLoadingMessages(true);
+        setAgentSessionViewMessagesLoading(
+          sessionViewRef(activeDeletedConversationId),
+          true
+        );
+      }
       void Promise.all(
         targetConversations.map(async (conversation2) => {
           await activation.unactivate(conversation2.id);
@@ -10143,19 +10641,25 @@ function useAgentGUINodeController({
         setQueuedPromptRetryBlockBySessionId(
           (current) => omitConversationLocalState(current, targetIds)
         );
-        updateConversationList((current) => {
-          const next = current.filter(
-            (conversation2) => !targetIds.has(conversation2.id)
-          );
-          const currentActiveId = activeConversationIdRef.current;
-          if (currentActiveId && targetIds.has(currentActiveId)) {
-            const nextActive = next[0]?.id ?? null;
-            activeConversationIdRef.current = nextActive;
-            setActiveConversationId(nextActive);
-            persistActiveConversation(nextActive);
+        const nextConversations = conversationsRef.current.filter(
+          (conversation2) => !targetIds.has(conversation2.id)
+        );
+        const currentActiveId = activeConversationIdRef.current;
+        if (currentActiveId && targetIds.has(currentActiveId)) {
+          const nextActive = nextConversations[0]?.id ?? null;
+          if (nextActive) {
+            markSelectedConversationDetailPending(nextActive);
+          } else {
+            clearSelectedConversationNotFoundRetry();
+            setIsLoadingMessages(false);
           }
-          return next;
-        });
+          activeConversationIdRef.current = nextActive;
+          setActiveConversationId(nextActive);
+          persistActiveConversation(nextActive);
+        }
+        updateConversationList(
+          (current) => current.filter((conversation2) => !targetIds.has(conversation2.id))
+        );
         setPendingDeleteProjectConversations(null);
       }).catch((error) => {
         const message = getAgentGUIErrorMessage(error);
@@ -10173,6 +10677,13 @@ function useAgentGUINodeController({
         setListError(message);
         toast.error(message);
         setDetailError(message);
+        if (activeDeletedConversationId && activeConversationIdRef.current === activeDeletedConversationId) {
+          setIsLoadingMessages(false);
+          setAgentSessionViewMessagesLoading(
+            sessionViewRef(activeDeletedConversationId),
+            false
+          );
+        }
       }).finally(() => {
         setIsDeletingProjectConversations(false);
       });
@@ -10181,7 +10692,9 @@ function useAgentGUINodeController({
       activation,
       agentActivityRuntime,
       conversationListQuery,
+      clearSelectedConversationNotFoundRetry,
       isDeletingProjectConversations,
+      markSelectedConversationDetailPending,
       pendingDeleteProjectConversations,
       persistActiveConversation,
       sessionViewRef,
@@ -10508,6 +11021,9 @@ function useAgentGUINodeController({
   const draftReasoningEffort = normalizeOptionalText(
     draftSettings.reasoningEffort
   );
+  const draftSpeed = normalizeOptionalText(
+    draftSettings.speed
+  );
   const planImplementationTurnId = activeConversationId !== null && dataRef.current.provider === "codex" && composerSupport.plan && Boolean(draftSettings.planMode) && activeConversation?.status !== "working" ? latestPlanTurnId(activeTimelineItems) : null;
   planImplementationTurnIdRef.current = planImplementationTurnId;
   const planImplementationPromptVM = planImplementationTurnId !== null && activeConversationId !== null && dismissedPlanTurnIdBySessionId[activeConversationId] !== planImplementationTurnId ? planImplementationPromptFromPlanTurn(
@@ -10574,6 +11090,10 @@ function useAgentGUINodeController({
     () => modelSelectionFromComposerOptions(providerComposerOptions, draftModel),
     [draftModel, providerComposerOptions]
   );
+  const activeSessionSpeedSelection = useMemo4(
+    () => speedSelectionFromComposerOptions(providerComposerOptions, draftSpeed),
+    [draftSpeed, providerComposerOptions]
+  );
   const effectivePlanMode = useMemo4(
     () => resolveEffectivePlanModeFromStates({
       sessionPlanModeState,
@@ -10594,12 +11114,14 @@ function useAgentGUINodeController({
     const isSettingsLoading = !hasACPSettings;
     const selectedModelValue = draftModel;
     const selectedReasoningEffortValue = draftReasoningEffort;
+    const selectedSpeedValue = draftSpeed;
     const selectedPermissionModeValue = normalizePermissionModeId(draftSettings.permissionModeId) ?? normalizePermissionModeId(permissionConfig?.defaultValue);
     return {
       sessionSettings,
       draftSettings: {
         model: draftModel,
         reasoningEffort: draftReasoningEffort,
+        speed: draftSpeed,
         planMode: Boolean(draftSettings.planMode),
         permissionModeId: normalizePermissionModeId(
           draftSettings.permissionModeId
@@ -10608,21 +11130,25 @@ function useAgentGUINodeController({
       effectivePlanMode: composerSupport.plan ? effectivePlanMode : false,
       supportsModel: composerSupport.model,
       supportsReasoningEffort: composerSupport.reasoning,
+      supportsSpeed: composerSupport.speed,
       supportsPermissionMode,
       supportsPlanMode: composerSupport.plan,
       isSettingsLoading,
       modelUnavailable: activeConversationId !== null && sessionSettings === null && composerSupport.model && draftModel === null,
       reasoningUnavailable: activeConversationId !== null && sessionSettings === null && composerSupport.reasoning && draftReasoningEffort === null,
+      speedUnavailable: activeConversationId !== null && sessionSettings === null && composerSupport.speed && draftSpeed === null,
       permissionModeUnavailable: activeConversationId !== null && sessionSettings === null && supportsPermissionMode && selectedPermissionModeValue === null,
       planUnavailable: activeConversationId !== null && sessionSettings === null && composerSupport.plan && !effectivePlanMode,
       selectedModelValue,
       selectedReasoningEffortValue,
+      selectedSpeedValue,
       selectedPermissionModeValue,
       permissionConfig,
       selectedProjectPath: activeConversationId !== null ? activeConversation?.cwd ?? null : selectedProjectPath,
       projectLocked: activeConversationId !== null,
       availableModels: composerSupport.model && hasOptionsSource && activeSessionModelSelection !== null ? activeSessionModelSelection.options : [],
       availableReasoningEfforts: composerSupport.reasoning && hasOptionsSource && activeSessionReasoningSelection !== null ? activeSessionReasoningSelection.options : [],
+      availableSpeeds: composerSupport.speed && hasOptionsSource && activeSessionSpeedSelection !== null ? activeSessionSpeedSelection.options : [],
       availablePermissionModes: supportsPermissionMode ? permissionModeOptions(data.provider, permissionConfig) : []
     };
   }, [
@@ -10630,6 +11156,7 @@ function useAgentGUINodeController({
     activeConversation?.cwd,
     activeSessionModelSelection,
     activeSessionReasoningSelection,
+    activeSessionSpeedSelection,
     draftSettings.permissionModeId,
     draftSettings.planMode,
     effectivePlanMode,
@@ -10639,7 +11166,8 @@ function useAgentGUINodeController({
     composerSupport,
     timelinePlanModeState,
     draftModel,
-    draftReasoningEffort
+    draftReasoningEffort,
+    draftSpeed
   ]);
   const stableCreateConversation = useStableControllerEventCallback(createConversation);
   const stableSelectConversation = useStableControllerEventCallback(selectConversation);
@@ -11002,7 +11530,7 @@ import {
   useLayoutEffect as useLayoutEffect4,
   useMemo as useMemo8,
   useRef as useRef12,
-  useState as useState9
+  useState as useState10
 } from "react";
 import { useSnapshot } from "valtio";
 import { ChevronRight as ChevronRight2, Info, X as X2 } from "lucide-react";
@@ -12144,7 +12672,7 @@ import {
   useLayoutEffect as useLayoutEffect3,
   useMemo as useMemo7,
   useRef as useRef11,
-  useState as useState8,
+  useState as useState9,
   Fragment as Fragment6
 } from "react";
 import { createPortal } from "react-dom";
@@ -12169,13 +12697,7 @@ import {
 } from "@tutti-os/ui-system";
 
 // agent-gui/agentGuiNode/AgentComposer.tsx
-import {
-  AddIcon,
-  Select as Select2,
-  SelectContent as SelectContent2,
-  SelectItem as SelectItem2,
-  SelectTrigger as SelectTrigger2
-} from "@tutti-os/ui-system";
+import { AddIcon, Select as Select2, SelectTrigger as SelectTrigger2 } from "@tutti-os/ui-system";
 import { X } from "lucide-react";
 
 // agent-gui/agentGuiNode/model/agentSlashCommands.ts
@@ -12272,6 +12794,7 @@ function labelForSlashCommand(command) {
 var CODEX_IMMEDIATE_SLASH_COMMANDS = /* @__PURE__ */ new Set(["init", "compact"]);
 var PROVIDER_NATIVE_IMMEDIATE_COMMANDS = /* @__PURE__ */ new Set(["compact"]);
 var LOCAL_STATUS_COMMANDS = /* @__PURE__ */ new Set(["status"]);
+var LOCAL_TOGGLE_SPEED_COMMANDS = /* @__PURE__ */ new Set(["fast"]);
 var CLAUDE_CODE_PROVIDER_NATIVE_COMMANDS = /* @__PURE__ */ new Set([
   "compact",
   "context",
@@ -12279,11 +12802,13 @@ var CLAUDE_CODE_PROVIDER_NATIVE_COMMANDS = /* @__PURE__ */ new Set([
 ]);
 var CODEX_FALLBACK_COMMANDS = [
   { name: "compact" },
-  { name: "status" }
+  { name: "status" },
+  { name: "fast" }
 ];
 var CLAUDE_CODE_FALLBACK_COMMANDS = [
   { name: "compact" },
-  { name: "status" }
+  { name: "status" },
+  { name: "fast" }
 ];
 function resolveSlashCommandsForProvider({
   provider,
@@ -12313,6 +12838,9 @@ function resolveSlashCommandSelectionEffect({
   if (isBlockedSlashCommand(provider, commandName)) {
     return { kind: "blockCommand" };
   }
+  if (isLocalToggleSpeedCommand(provider, commandName)) {
+    return { kind: "toggleSpeed" };
+  }
   if (isLocalStatusCommand(provider, commandName)) {
     return { kind: "showStatus" };
   }
@@ -12352,6 +12880,9 @@ function resolveSlashCommandSubmitEffect({
     return null;
   }
   const commandName = normalizedCommandName(command);
+  if (isLocalToggleSpeedCommand(provider, commandName)) {
+    return { kind: "toggleSpeed" };
+  }
   if (isLocalStatusCommand(provider, commandName)) {
     return { kind: "showStatus" };
   }
@@ -12384,6 +12915,9 @@ function fallbackCommandsForProvider(provider) {
 function isLocalStatusCommand(provider, commandName) {
   return (provider === "codex" || provider === "claude-code") && LOCAL_STATUS_COMMANDS.has(commandName);
 }
+function isLocalToggleSpeedCommand(provider, commandName) {
+  return (provider === "codex" || provider === "claude-code") && LOCAL_TOGGLE_SPEED_COMMANDS.has(commandName);
+}
 function isProviderNativeImmediateCommand(provider, commandName) {
   if (PROVIDER_NATIVE_IMMEDIATE_COMMANDS.has(commandName)) {
     return true;
@@ -12883,28 +13417,218 @@ function AgentQueuedPromptPanel({
 }
 
 // agent-gui/agentGuiNode/AgentComposerSettingsMenus.tsx
-import { useEffect as useEffect7, useMemo as useMemo5 } from "react";
+import { useEffect as useEffect7, useMemo as useMemo5, useState as useState7 } from "react";
 import {
   WorkspaceUserProjectSelect
 } from "@tutti-os/workspace-user-project/ui";
 import { prepareWorkspaceUserProjectSelection } from "@tutti-os/workspace-user-project/core";
 import {
+  CheckIcon,
+  ChevronDownIcon,
+  DropdownMenu as DropdownMenu2,
+  DropdownMenuContent as DropdownMenuContent2,
+  DropdownMenuItem as DropdownMenuItem2,
+  DropdownMenuLabel as DropdownMenuLabel2,
+  DropdownMenuSeparator as DropdownMenuSeparator2,
+  DropdownMenuSub as DropdownMenuSub2,
+  DropdownMenuSubContent as DropdownMenuSubContent2,
+  DropdownMenuSubTrigger as DropdownMenuSubTrigger2,
+  DropdownMenuTrigger as DropdownMenuTrigger2,
   NewWorkspaceLinedIcon,
   RoomsHintIcon,
   Select,
   SelectContent,
   SelectItem,
-  SelectSplitColumn,
-  SelectSplitColumnItems,
-  SelectSplitColumnLabel,
-  SelectSplitDivider,
-  SelectSplitLayout,
   SelectTrigger,
   Tooltip as Tooltip2,
   TooltipContent as TooltipContent2,
   TooltipTrigger as TooltipTrigger2,
   cn as cn2
 } from "@tutti-os/ui-system";
+
+// agent-gui/agentGuiNode/model/composerSettingsMenuModel.ts
+function buildComposerModelMenuModel(composerSettings, labels) {
+  const modelItems = modelOptionsWithSelectedValue(composerSettings);
+  const reasoningItems = reasoningOptionsWithSelectedValue(composerSettings);
+  const speedItems = speedOptionsWithSelectedValue(composerSettings);
+  const showModel = composerSettings.supportsModel && modelItems.length > 0 && !composerSettings.modelUnavailable;
+  const showReasoning = composerSettings.supportsReasoningEffort && reasoningItems.length > 0 && !composerSettings.reasoningUnavailable;
+  const showSpeed = composerSettings.supportsSpeed && speedItems.length > 0 && !composerSettings.speedUnavailable;
+  const selectedModelValue = selectedComposerModelValue(composerSettings) ?? "";
+  const selectedReasoningValue = selectedComposerReasoningValue(composerSettings) ?? "";
+  const selectedSpeedValue = selectedComposerSpeedValue(composerSettings) ?? "";
+  const modelLabel = resolveSelectedModelLabel(composerSettings, labels);
+  const reasoningLabel = resolveSelectedReasoningLabel(
+    composerSettings,
+    labels
+  );
+  const disabled = composerSettings.isSettingsLoading || !showModel && !showReasoning && !showSpeed;
+  return {
+    disabled,
+    trigger: {
+      isFast: selectedSpeedValue === "fast",
+      modelLabel,
+      reasoningLabel,
+      combinedLabel: modelLabel === reasoningLabel ? modelLabel : `${modelLabel} ${reasoningLabel}`.trim(),
+      showCombined: modelLabel === reasoningLabel || reasoningLabel.length === 0
+    },
+    model: {
+      show: showModel,
+      selectedValue: selectedModelValue,
+      selectedLabel: modelLabel,
+      options: modelItems.map((option) => ({
+        value: option.value,
+        label: formatModelDisplayLabel(option.label),
+        description: resolveModelDescription(option.description, labels)
+      }))
+    },
+    reasoning: {
+      show: showReasoning,
+      selectedValue: selectedReasoningValue,
+      selectedLabel: reasoningLabel,
+      options: reasoningItems.map((option) => ({
+        value: option.value,
+        label: resolveReasoningOptionLabel(option.value, labels)
+      }))
+    },
+    speed: {
+      show: showSpeed,
+      selectedValue: selectedSpeedValue,
+      selectedLabel: resolveSpeedOptionLabel(selectedSpeedValue, labels),
+      options: speedItems.map((option) => ({
+        value: option.value,
+        label: resolveSpeedOptionLabel(option.value, labels),
+        description: option.description
+      }))
+    }
+  };
+}
+function formatModelDisplayLabel(label) {
+  const trimmed = label.trim();
+  if (!trimmed) {
+    return label;
+  }
+  return `${trimmed.charAt(0).toUpperCase()}${trimmed.slice(1)}`;
+}
+function resolveModelDescription(description, labels) {
+  switch (description) {
+    case "Frontier model for complex coding, research, and real-world work.":
+      return labels.modelDescriptions.frontierComplexCoding;
+    case "Strong model for everyday coding.":
+      return labels.modelDescriptions.everydayCoding;
+    case "Small, fast, and cost-efficient model for simpler coding tasks.":
+      return labels.modelDescriptions.smallFastCostEfficient;
+    case "Coding-optimized model.":
+      return labels.modelDescriptions.codingOptimized;
+    case "Ultra-fast coding model.":
+      return labels.modelDescriptions.ultraFastCoding;
+    case "Optimized for professional work and long-running agents.":
+      return labels.modelDescriptions.professionalLongRunning;
+    default:
+      return description;
+  }
+}
+function resolveSelectedModelLabel(composerSettings, labels) {
+  const selectedValue = selectedComposerModelValue(composerSettings);
+  const selected = modelOptionsWithSelectedValue(composerSettings).find(
+    (option) => option.value === selectedValue
+  );
+  if (selected) {
+    return formatModelDisplayLabel(selected.label);
+  }
+  if (composerSettings.modelUnavailable) {
+    return labels.inheritedUnavailable;
+  }
+  if (composerSettings.isSettingsLoading) {
+    return labels.loadingSettings;
+  }
+  const firstAvailableModel = composerSettings.availableModels[0]?.label;
+  if (firstAvailableModel) {
+    return formatModelDisplayLabel(firstAvailableModel);
+  }
+  return labels.defaultModel;
+}
+function resolveSelectedReasoningLabel(composerSettings, labels) {
+  const selectedValue = selectedComposerReasoningValue(composerSettings);
+  const selected = reasoningOptionsWithSelectedValue(composerSettings).find(
+    (option) => option.value === selectedValue
+  );
+  if (selected) {
+    const resolved = resolveReasoningOptionLabel(selected.value, labels);
+    return resolved === selected.value && selected.label ? selected.label : resolved;
+  }
+  if (composerSettings.reasoningUnavailable) {
+    return labels.inheritedUnavailable;
+  }
+  if (composerSettings.isSettingsLoading) {
+    return "";
+  }
+  if (composerSettings.availableReasoningEfforts.length === 0) {
+    return "";
+  }
+  return labels.reasoningLabel;
+}
+function resolveReasoningOptionLabel(value, labels) {
+  switch (value) {
+    case "minimal":
+      return labels.reasoningOptionMinimal;
+    case "low":
+      return labels.reasoningOptionLow;
+    case "medium":
+      return labels.reasoningOptionMedium;
+    case "high":
+      return labels.reasoningOptionHigh;
+    case "xhigh":
+      return labels.reasoningOptionXHigh;
+    default:
+      return value;
+  }
+}
+function resolveSpeedOptionLabel(value, labels) {
+  switch (value) {
+    case "standard":
+      return labels.speedOptionStandard;
+    case "fast":
+      return labels.speedOptionFast;
+    default:
+      return value;
+  }
+}
+function selectedComposerModelValue(composerSettings) {
+  return composerSettings.selectedModelValue ?? composerSettings.draftSettings.model ?? null;
+}
+function selectedComposerReasoningValue(composerSettings) {
+  return composerSettings.selectedReasoningEffortValue ?? composerSettings.draftSettings.reasoningEffort ?? null;
+}
+function selectedComposerSpeedValue(composerSettings) {
+  return composerSettings.selectedSpeedValue ?? composerSettings.draftSettings.speed ?? null;
+}
+function modelOptionsWithSelectedValue(composerSettings) {
+  return optionsWithSelectedValue(
+    composerSettings.availableModels,
+    selectedComposerModelValue(composerSettings)
+  );
+}
+function reasoningOptionsWithSelectedValue(composerSettings) {
+  return optionsWithSelectedValue(
+    composerSettings.availableReasoningEfforts,
+    selectedComposerReasoningValue(composerSettings)
+  );
+}
+function speedOptionsWithSelectedValue(composerSettings) {
+  return optionsWithSelectedValue(
+    composerSettings.availableSpeeds,
+    selectedComposerSpeedValue(composerSettings)
+  );
+}
+function optionsWithSelectedValue(options, selectedValue) {
+  if (!selectedValue || options.some((o) => o.value === selectedValue)) {
+    return [...options];
+  }
+  return [{ value: selectedValue, label: selectedValue }, ...options];
+}
+
+// agent-gui/agentGuiNode/AgentComposerSettingsMenus.tsx
 import { Fragment as Fragment4, jsx as jsx21, jsxs as jsxs9 } from "react/jsx-runtime";
 function AgentProjectDropdown({
   composerSettings,
@@ -12965,6 +13689,7 @@ function AgentPermissionModeDropdown({
   onSettingsChange
 }) {
   "use memo";
+  const [isSelectOpen, setIsSelectOpen] = useState7(false);
   const availableOptions = composerSettings.availablePermissionModes ?? [];
   const planModeActive = Boolean(
     composerSettings.supportsPlanMode && (composerSettings.effectivePlanMode ?? composerSettings.draftSettings.planMode)
@@ -13003,8 +13728,10 @@ function AgentPermissionModeDropdown({
   return /* @__PURE__ */ jsxs9(
     Select,
     {
+      open: isSelectOpen,
       value: selectedValue ?? void 0,
       disabled: selectDisabled,
+      onOpenChange: setIsSelectOpen,
       onValueChange: applyPermissionModeId,
       children: [
         /* @__PURE__ */ jsx21(
@@ -13021,7 +13748,7 @@ function AgentPermissionModeDropdown({
             children: /* @__PURE__ */ jsx21("span", { className: "flex min-w-0 flex-1 items-center", children: /* @__PURE__ */ jsx21("span", { className: "truncate", children: triggerLabel }) })
           }
         ),
-        /* @__PURE__ */ jsx21(
+        isSelectOpen ? /* @__PURE__ */ jsx21(
           SelectContent,
           {
             align: "end",
@@ -13047,7 +13774,7 @@ function AgentPermissionModeDropdown({
               option.value
             ))
           }
-        )
+        ) : null
       ]
     }
   );
@@ -13129,111 +13856,6 @@ function PermissionModeOptionInfo({
     /* @__PURE__ */ jsx21(TooltipContent2, { side: "right", className: "max-w-[240px] whitespace-normal", children: description })
   ] });
 }
-function resolveSelectedModelLabel(composerSettings, labels) {
-  const selectedValue = selectedComposerModelValue(composerSettings);
-  const selected = modelOptionsWithSelectedValue(composerSettings).find(
-    (option) => option.value === selectedValue
-  );
-  if (selected) {
-    return formatModelDisplayLabel(selected.label);
-  }
-  if (composerSettings.modelUnavailable) {
-    return labels.inheritedUnavailable;
-  }
-  if (composerSettings.isSettingsLoading) {
-    return labels.loadingSettings;
-  }
-  const firstAvailableModel = composerSettings.availableModels[0]?.label;
-  if (firstAvailableModel) {
-    return formatModelDisplayLabel(firstAvailableModel);
-  }
-  return labels.defaultModel;
-}
-function resolveSelectedReasoningLabel(composerSettings, labels) {
-  const selectedValue = selectedComposerReasoningValue(composerSettings);
-  const selected = reasoningOptionsWithSelectedValue(composerSettings).find(
-    (option) => option.value === selectedValue
-  );
-  if (selected) {
-    switch (selected.value) {
-      case "minimal":
-        return labels.reasoningOptionMinimal;
-      case "low":
-        return labels.reasoningOptionLow;
-      case "medium":
-        return labels.reasoningOptionMedium;
-      case "high":
-        return labels.reasoningOptionHigh;
-      case "xhigh":
-        return labels.reasoningOptionXHigh;
-      default:
-        return selected.label;
-    }
-  }
-  if (composerSettings.reasoningUnavailable) {
-    return labels.inheritedUnavailable;
-  }
-  if (composerSettings.isSettingsLoading) {
-    return "";
-  }
-  if (composerSettings.availableReasoningEfforts.length === 0) {
-    return "";
-  }
-  return labels.reasoningLabel;
-}
-function selectedComposerModelValue(composerSettings) {
-  return composerSettings.selectedModelValue ?? composerSettings.draftSettings.model ?? null;
-}
-function selectedComposerReasoningValue(composerSettings) {
-  return composerSettings.selectedReasoningEffortValue ?? composerSettings.draftSettings.reasoningEffort ?? null;
-}
-function modelOptionsWithSelectedValue(composerSettings) {
-  const selectedValue = selectedComposerModelValue(composerSettings);
-  if (!selectedValue || composerSettings.availableModels.some(
-    (option) => option.value === selectedValue
-  )) {
-    return composerSettings.availableModels;
-  }
-  return [
-    { value: selectedValue, label: selectedValue },
-    ...composerSettings.availableModels
-  ];
-}
-function reasoningOptionsWithSelectedValue(composerSettings) {
-  const selectedValue = selectedComposerReasoningValue(composerSettings);
-  if (!selectedValue || composerSettings.availableReasoningEfforts.some(
-    (option) => option.value === selectedValue
-  )) {
-    return composerSettings.availableReasoningEfforts;
-  }
-  return [
-    { value: selectedValue, label: selectedValue },
-    ...composerSettings.availableReasoningEfforts
-  ];
-}
-function resolveReasoningOptionLabel(value, labels) {
-  switch (value) {
-    case "minimal":
-      return labels.reasoningOptionMinimal;
-    case "low":
-      return labels.reasoningOptionLow;
-    case "medium":
-      return labels.reasoningOptionMedium;
-    case "high":
-      return labels.reasoningOptionHigh;
-    case "xhigh":
-      return labels.reasoningOptionXHigh;
-    default:
-      return value;
-  }
-}
-function formatModelDisplayLabel(label) {
-  const trimmed = label.trim();
-  if (!trimmed) {
-    return label;
-  }
-  return `${trimmed.charAt(0).toUpperCase()}${trimmed.slice(1)}`;
-}
 function resolvePermissionModeTriggerTone(value) {
   switch (normalizePermissionModeValue(value)) {
     case "read-only":
@@ -13256,24 +13878,6 @@ function normalizePermissionModeValue(value) {
   const normalized = value?.trim().toLowerCase().replace(/\s+/g, "-");
   return normalized || void 0;
 }
-function resolveModelDescription(description, labels) {
-  switch (description) {
-    case "Frontier model for complex coding, research, and real-world work.":
-      return labels.modelDescriptions.frontierComplexCoding;
-    case "Strong model for everyday coding.":
-      return labels.modelDescriptions.everydayCoding;
-    case "Small, fast, and cost-efficient model for simpler coding tasks.":
-      return labels.modelDescriptions.smallFastCostEfficient;
-    case "Coding-optimized model.":
-      return labels.modelDescriptions.codingOptimized;
-    case "Ultra-fast coding model.":
-      return labels.modelDescriptions.ultraFastCoding;
-    case "Optimized for professional work and long-running agents.":
-      return labels.modelDescriptions.professionalLongRunning;
-    default:
-      return description;
-  }
-}
 function AgentModelReasoningDropdown({
   composerSettings,
   disabled = false,
@@ -13281,193 +13885,161 @@ function AgentModelReasoningDropdown({
   onSettingsChange
 }) {
   "use memo";
-  const selectedModelLabel = resolveSelectedModelLabel(
-    composerSettings,
-    labels
-  );
-  const selectedReasoningLabel = resolveSelectedReasoningLabel(
-    composerSettings,
-    labels
-  );
-  const triggerLabel = selectedModelLabel === selectedReasoningLabel ? selectedModelLabel : `${selectedModelLabel} ${selectedReasoningLabel}`.trim();
-  const modelItems = modelOptionsWithSelectedValue(composerSettings);
-  const reasoningItems = reasoningOptionsWithSelectedValue(composerSettings);
-  const triggerDisabled = disabled || composerSettings.isSettingsLoading || !composerSettings.supportsModel && !composerSettings.supportsReasoningEffort;
-  const showReasoningSection = composerSettings.supportsReasoningEffort && reasoningItems.length > 0 && !composerSettings.reasoningUnavailable;
-  const showModelSection = composerSettings.supportsModel && modelItems.length > 0 && !composerSettings.modelUnavailable;
-  const selectedReasoningValue = selectedComposerReasoningValue(composerSettings) ?? "";
-  const selectedModelValue = selectedComposerModelValue(composerSettings) ?? "";
-  const selectDisabled = triggerDisabled || !showModelSection && !showReasoningSection;
-  const selectedModelSelectValue = selectedModelValue ? `model:${selectedModelValue}` : "";
-  const selectedReasoningSelectValue = selectedReasoningValue ? `reasoning:${selectedReasoningValue}` : "";
-  const selectValue = showModelSection ? selectedModelSelectValue : selectedReasoningSelectValue;
-  const applySettingsValue = (nextValue) => {
-    if (selectDisabled) {
-      return;
-    }
-    if (nextValue.startsWith("reasoning:")) {
-      onSettingsChange({
-        reasoningEffort: nextValue.slice("reasoning:".length)
-      });
-      return;
-    }
-    if (nextValue.startsWith("model:")) {
-      onSettingsChange({ model: nextValue.slice("model:".length) });
-    }
-  };
-  const handleSelectedItemPointerDown = (event, optionValue) => {
-    if (selectDisabled || event.button !== 0 || event.ctrlKey) {
-      return;
-    }
-    applySettingsValue(optionValue);
+  const [menuOpen, setMenuOpen] = useState7(false);
+  const menu = buildComposerModelMenuModel(composerSettings, labels);
+  const menuDisabled = disabled || menu.disabled;
+  const applySettingsChange = (patch) => {
+    onSettingsChange(patch);
+    setMenuOpen(false);
   };
-  return /* @__PURE__ */ jsxs9(
-    Select,
-    {
-      value: selectValue,
-      disabled: selectDisabled,
-      onValueChange: applySettingsValue,
-      children: [
-        /* @__PURE__ */ jsx21(
-          SelectTrigger,
-          {
-            className: cn2(
-              "w-auto",
-              AgentGUINode_styles_default.composerMenuTrigger,
-              selectDisabled && "cursor-not-allowed text-[var(--agent-gui-text-tertiary)] opacity-60 hover:text-[var(--agent-gui-text-tertiary)]",
-              composerSettings.isSettingsLoading && "animate-pulse"
-            ),
-            "aria-label": `${labels.modelLabel} / ${labels.reasoningLabel}`,
-            "data-agent-model-reasoning-trigger": "true",
-            children: /* @__PURE__ */ jsx21("span", { className: "flex min-w-0 flex-1 items-center gap-2 overflow-hidden", children: selectedModelLabel === selectedReasoningLabel || selectedReasoningLabel.length === 0 ? /* @__PURE__ */ jsx21("span", { className: "min-w-0 truncate", children: triggerLabel }) : /* @__PURE__ */ jsxs9(Fragment4, { children: [
-              /* @__PURE__ */ jsx21("span", { className: "min-w-0 truncate", children: selectedModelLabel }),
-              /* @__PURE__ */ jsx21("span", { className: "shrink-0", children: selectedReasoningLabel })
-            ] }) })
-          }
+  return /* @__PURE__ */ jsxs9(DropdownMenu2, { open: menuOpen, onOpenChange: setMenuOpen, children: [
+    /* @__PURE__ */ jsx21(DropdownMenuTrigger2, { asChild: true, disabled: menuDisabled, children: /* @__PURE__ */ jsxs9(
+      "button",
+      {
+        type: "button",
+        className: cn2(
+          "w-auto",
+          AgentGUINode_styles_default.composerMenuTrigger,
+          menuDisabled && "cursor-not-allowed text-[var(--agent-gui-text-tertiary)] opacity-60 hover:text-[var(--agent-gui-text-tertiary)]",
+          composerSettings.isSettingsLoading && "animate-pulse"
         ),
-        /* @__PURE__ */ jsx21(
-          SelectContent,
-          {
-            align: "end",
-            side: "top",
-            sideOffset: 4,
-            collisionPadding: 16,
-            className: cn2(
-              AgentGUINode_styles_default.composerMenuContent,
-              "data-[side=top]:!translate-y-0",
-              showReasoningSection && showModelSection ? "w-[430px] max-w-[calc(100vw-32px)]" : "w-max min-w-[240px] max-w-[calc(100vw-32px)]"
+        "aria-label": `${labels.modelLabel} / ${labels.reasoningLabel}`,
+        "data-agent-model-reasoning-trigger": "true",
+        children: [
+          /* @__PURE__ */ jsxs9("span", { className: "flex min-w-0 flex-1 items-center gap-2 overflow-hidden", children: [
+            menu.speed.show && menu.trigger.isFast ? /* @__PURE__ */ jsx21(
+              "span",
+              {
+                "aria-hidden": true,
+                className: "shrink-0",
+                "data-agent-speed-indicator": "fast",
+                children: "\u26A1"
+              }
+            ) : null,
+            menu.trigger.showCombined ? /* @__PURE__ */ jsx21("span", { className: "min-w-0 truncate", children: menu.trigger.combinedLabel }) : /* @__PURE__ */ jsxs9(Fragment4, { children: [
+              /* @__PURE__ */ jsx21("span", { className: "min-w-0 truncate", children: menu.trigger.modelLabel }),
+              /* @__PURE__ */ jsx21("span", { className: "shrink-0", children: menu.trigger.reasoningLabel })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsx21(ChevronDownIcon, { "aria-hidden": true, className: "ml-1 size-3 shrink-0" })
+        ]
+      }
+    ) }),
+    /* @__PURE__ */ jsxs9(
+      DropdownMenuContent2,
+      {
+        align: "end",
+        side: "top",
+        sideOffset: 4,
+        collisionPadding: 16,
+        className: cn2(
+          AgentGUINode_styles_default.composerMenuContent,
+          "w-max min-w-[240px] max-w-[calc(100vw-32px)] data-[side=top]:!translate-y-0"
+        ),
+        "data-agent-composer-settings-layout": "model-primary",
+        children: [
+          menu.model.show ? /* @__PURE__ */ jsxs9(Fragment4, { children: [
+            /* @__PURE__ */ jsx21(DropdownMenuLabel2, { children: labels.modelSelectionLabel }),
+            /* @__PURE__ */ jsx21(
+              ComposerMenuOptionItems,
+              {
+                options: menu.model.options,
+                selectedValue: menu.model.selectedValue,
+                withDescription: true,
+                onSelect: (value) => applySettingsChange({ model: value })
+              }
+            )
+          ] }) : null,
+          menu.model.show && (menu.reasoning.show || menu.speed.show) ? /* @__PURE__ */ jsx21(DropdownMenuSeparator2, {}) : null,
+          menu.reasoning.show ? /* @__PURE__ */ jsxs9(DropdownMenuSub2, { children: [
+            /* @__PURE__ */ jsxs9(
+              DropdownMenuSubTrigger2,
+              {
+                className: AgentGUINode_styles_default.composerMenuItem,
+                "data-agent-reasoning-submenu-trigger": "true",
+                children: [
+                  /* @__PURE__ */ jsx21("span", { className: "min-w-0 flex-1 truncate", children: labels.reasoningLabel }),
+                  /* @__PURE__ */ jsx21("span", { className: "pl-3 text-[var(--text-tertiary)]", children: menu.reasoning.selectedLabel })
+                ]
+              }
             ),
-            children: showReasoningSection && showModelSection ? /* @__PURE__ */ jsxs9(SelectSplitLayout, { "data-agent-composer-settings-layout": "split", children: [
-              /* @__PURE__ */ jsxs9(SelectSplitColumn, { children: [
-                /* @__PURE__ */ jsx21(SelectSplitColumnLabel, { children: labels.modelSelectionLabel }),
-                /* @__PURE__ */ jsx21(SelectSplitColumnItems, { children: /* @__PURE__ */ jsx21(
-                  ComposerSettingsModelItems,
-                  {
-                    disabled: selectDisabled,
-                    labels,
-                    models: modelItems,
-                    onSelectedItemPointerDown: handleSelectedItemPointerDown
-                  }
-                ) })
-              ] }),
-              /* @__PURE__ */ jsx21(SelectSplitDivider, {}),
-              /* @__PURE__ */ jsxs9(SelectSplitColumn, { children: [
-                /* @__PURE__ */ jsx21(SelectSplitColumnLabel, { children: labels.reasoningDegreeLabel }),
-                /* @__PURE__ */ jsx21(SelectSplitColumnItems, { children: /* @__PURE__ */ jsx21(
-                  ComposerSettingsReasoningItems,
-                  {
-                    composerSettings,
-                    disabled: selectDisabled,
-                    labels,
-                    reasoningEfforts: reasoningItems,
-                    showManualSelectedIndicator: true,
-                    onSelectedItemPointerDown: handleSelectedItemPointerDown
-                  }
-                ) })
-              ] })
-            ] }) : /* @__PURE__ */ jsxs9(Fragment4, { children: [
-              showModelSection ? /* @__PURE__ */ jsxs9(Fragment4, { children: [
-                /* @__PURE__ */ jsx21("div", { className: AgentGUINode_styles_default.composerMenuLabel, children: labels.modelSelectionLabel }),
-                /* @__PURE__ */ jsx21(
-                  ComposerSettingsModelItems,
+            /* @__PURE__ */ jsx21(
+              DropdownMenuSubContent2,
+              {
+                className: cn2(AgentGUINode_styles_default.composerMenuContent, "min-w-[160px]"),
+                children: /* @__PURE__ */ jsx21(
+                  ComposerMenuOptionItems,
                   {
-                    disabled: selectDisabled,
-                    labels,
-                    models: modelItems,
-                    onSelectedItemPointerDown: handleSelectedItemPointerDown
+                    options: menu.reasoning.options,
+                    selectedValue: menu.reasoning.selectedValue,
+                    onSelect: (value) => applySettingsChange({ reasoningEffort: value })
                   }
                 )
-              ] }) : null,
-              showReasoningSection ? /* @__PURE__ */ jsxs9(Fragment4, { children: [
-                /* @__PURE__ */ jsx21("div", { className: AgentGUINode_styles_default.composerMenuLabel, children: labels.reasoningDegreeLabel }),
-                /* @__PURE__ */ jsx21(
-                  ComposerSettingsReasoningItems,
+              }
+            )
+          ] }) : null,
+          menu.speed.show ? /* @__PURE__ */ jsxs9(DropdownMenuSub2, { children: [
+            /* @__PURE__ */ jsxs9(
+              DropdownMenuSubTrigger2,
+              {
+                className: AgentGUINode_styles_default.composerMenuItem,
+                "data-agent-speed-submenu-trigger": "true",
+                children: [
+                  /* @__PURE__ */ jsx21("span", { className: "min-w-0 flex-1 truncate", children: labels.speedLabel }),
+                  /* @__PURE__ */ jsx21("span", { className: "pl-3 text-[var(--text-tertiary)]", children: menu.speed.selectedLabel })
+                ]
+              }
+            ),
+            /* @__PURE__ */ jsx21(
+              DropdownMenuSubContent2,
+              {
+                className: cn2(AgentGUINode_styles_default.composerMenuContent, "min-w-[200px]"),
+                children: /* @__PURE__ */ jsx21(
+                  ComposerMenuOptionItems,
                   {
-                    composerSettings,
-                    disabled: selectDisabled,
-                    labels,
-                    reasoningEfforts: reasoningItems,
-                    showManualSelectedIndicator: false,
-                    onSelectedItemPointerDown: handleSelectedItemPointerDown
+                    options: menu.speed.options,
+                    selectedValue: menu.speed.selectedValue,
+                    withDescription: true,
+                    onSelect: (value) => applySettingsChange({ speed: value })
                   }
                 )
-              ] }) : null
-            ] })
-          }
-        )
-      ]
-    }
-  );
+              }
+            )
+          ] }) : null
+        ]
+      }
+    )
+  ] });
 }
-function ComposerSettingsModelItems({
-  disabled,
-  labels,
-  models,
-  onSelectedItemPointerDown
+function ComposerMenuOptionItems({
+  options,
+  selectedValue,
+  withDescription = false,
+  onSelect
 }) {
-  return /* @__PURE__ */ jsx21(Fragment4, { children: models.map((model) => {
-    const optionValue = `model:${model.value}`;
-    return /* @__PURE__ */ jsx21(
-      SelectItem,
-      {
-        value: optionValue,
-        disabled,
-        className: AgentGUINode_styles_default.composerMenuItem,
-        onPointerDown: (event) => onSelectedItemPointerDown(event, optionValue),
-        children: /* @__PURE__ */ jsxs9("span", { className: "flex min-w-0 flex-1 flex-col gap-0.5", children: [
-          /* @__PURE__ */ jsx21("span", { className: "min-w-0 truncate", children: formatModelDisplayLabel(model.label) }),
-          model.description ? /* @__PURE__ */ jsx21("span", { className: "whitespace-normal text-[11px] leading-[1.3] text-[var(--text-tertiary)]", children: resolveModelDescription(model.description, labels) }) : null
-        ] })
+  return /* @__PURE__ */ jsx21(Fragment4, { children: options.map((option) => /* @__PURE__ */ jsxs9(
+    DropdownMenuItem2,
+    {
+      className: AgentGUINode_styles_default.composerMenuItem,
+      onPointerDown: (event) => {
+        if (event.button === 0 && !event.ctrlKey) {
+          event.preventDefault();
+          onSelect(option.value);
+        }
       },
-      model.value
-    );
-  }) });
-}
-function ComposerSettingsReasoningItems({
-  composerSettings,
-  disabled,
-  labels,
-  reasoningEfforts,
-  showManualSelectedIndicator,
-  onSelectedItemPointerDown
-}) {
-  const selectedReasoningValue = composerSettings.selectedReasoningEffortValue ?? composerSettings.draftSettings.reasoningEffort ?? "";
-  return /* @__PURE__ */ jsx21(Fragment4, { children: reasoningEfforts.map((option) => {
-    const optionValue = `reasoning:${option.value}`;
-    const isSelected = selectedReasoningValue === option.value;
-    return /* @__PURE__ */ jsx21(
-      SelectItem,
-      {
-        value: optionValue,
-        disabled,
-        className: AgentGUINode_styles_default.composerMenuItem,
-        forceSelectedIndicator: showManualSelectedIndicator && isSelected,
-        onPointerDown: (event) => onSelectedItemPointerDown(event, optionValue),
-        children: /* @__PURE__ */ jsx21("span", { className: "min-w-0 truncate", children: resolveReasoningOptionLabel(option.value, labels) })
+      onSelect: () => {
+        onSelect(option.value);
       },
-      option.value
-    );
-  }) });
+      children: [
+        /* @__PURE__ */ jsxs9("span", { className: "flex min-w-0 flex-1 flex-col gap-0.5", children: [
+          /* @__PURE__ */ jsx21("span", { className: "min-w-0 truncate", children: option.label }),
+          withDescription && option.description ? /* @__PURE__ */ jsx21("span", { className: "whitespace-normal text-[11px] leading-[1.3] text-[var(--text-tertiary)]", children: option.description }) : null
+        ] }),
+        option.value === selectedValue ? /* @__PURE__ */ jsx21(CheckIcon, { className: "ml-2 size-3.5 shrink-0 text-[var(--tutti-purple)]" }) : null
+      ]
+    },
+    option.value
+  )) });
 }
 
 // agent-gui/agentGuiNode/agentRichText/AgentRichTextEditor.tsx
@@ -14410,11 +14982,7 @@ var DEFAULT_DEBOUNCE_MS = 120;
 var DEFAULT_FILE_LIMIT = 30;
 var DEFAULT_ISSUE_LIMIT = 25;
 var DEFAULT_SESSION_LIMIT = 30;
-var WORKSPACE_APP_REFERENCE_PAGE_SIZE = 5;
-var EMPTY_PROVIDER_REFERENCE_ITEMS_RESULT = {
-  items: [],
-  nextCursor: null
-};
+var DEFAULT_PROVIDER_TIMEOUT_MS = 3500;
 var BROWSE_CATEGORIES = AGENT_MENTION_FILTER_TAB_ORDER.map((id) => ({ id }));
 var {
   agentGeneratedFile: AGENT_GENERATED_FILE_PROVIDER_ID,
@@ -14428,6 +14996,7 @@ var AgentMentionSearchController = class {
   debounceMs;
   fileLimit;
   issueLimit;
+  providerTimeoutMs;
   listeners = /* @__PURE__ */ new Set();
   expandedCounts = {};
   totalCounts = {};
@@ -14441,7 +15010,6 @@ var AgentMentionSearchController = class {
   currentFileSearchLimit;
   currentIssueSearchLimit;
   agentGeneratedBrowsePath = null;
-  workspaceAppReferenceSources = /* @__PURE__ */ new Map();
   rawGroups = {
     apps: [],
     opened_files: [],
@@ -14469,6 +15037,7 @@ var AgentMentionSearchController = class {
     this.debounceMs = options.debounceMs ?? DEFAULT_DEBOUNCE_MS;
     this.fileLimit = options.fileLimit ?? DEFAULT_FILE_LIMIT;
     this.issueLimit = options.issueLimit ?? DEFAULT_ISSUE_LIMIT;
+    this.providerTimeoutMs = options.providerTimeoutMs ?? DEFAULT_PROVIDER_TIMEOUT_MS;
     this.currentFileSearchLimit = this.fileLimit;
     this.currentIssueSearchLimit = this.issueLimit;
   }
@@ -14489,7 +15058,6 @@ var AgentMentionSearchController = class {
     this.clearTimer();
     const requestId = ++this.requestId;
     this.resetAgentGeneratedBrowsePath();
-    this.resetWorkspaceAppReferenceSources();
     this.resetExpandedCounts();
     this.resetSearchLimits();
     if (!this.activeWorkspaceId) {
@@ -14673,35 +15241,11 @@ var AgentMentionSearchController = class {
       error: null
     });
   }
-  expandWorkspaceAppReferences(appId) {
-    const normalizedAppId = compactText(appId);
-    if (this.disposed || !normalizedAppId) {
-      return;
-    }
-    const source = this.workspaceAppReferenceSources.get(normalizedAppId);
-    if (!source || !source.nextCursor || source.workspaceId !== this.activeWorkspaceId || source.query !== this.currentQuery || this.isWorkspaceAppReferenceLoading(normalizedAppId)) {
-      return;
-    }
-    const requestId = this.requestId;
-    const cursor = source.nextCursor;
-    this.updateWorkspaceAppReferenceItem(normalizedAppId, (item) => ({
-      ...item,
-      referenceItemsLoading: true
-    }));
-    this.emitCurrentState();
-    void this.loadMoreWorkspaceAppReferences({
-      appId: normalizedAppId,
-      cursor,
-      requestId,
-      source
-    });
-  }
   close() {
     this.clearTimer();
     this.requestId += 1;
     this.currentFilter = "all";
     this.resetAgentGeneratedBrowsePath();
-    this.resetWorkspaceAppReferenceSources();
     this.resetExpandedCounts();
     this.resetSearchLimits();
     this.rawGroups = {
@@ -14734,11 +15278,9 @@ var AgentMentionSearchController = class {
     this.clearTimer();
     this.listeners.clear();
     this.requestId += 1;
-    this.resetWorkspaceAppReferenceSources();
   }
   startBrowseModeFetch(filter) {
     if (!this.activeWorkspaceId || !shouldPrefetchBrowseFilter(filter)) {
-      this.resetWorkspaceAppReferenceSources();
       this.rawGroups = {
         apps: [],
         opened_files: [],
@@ -14752,7 +15294,6 @@ var AgentMentionSearchController = class {
     }
     this.clearTimer();
     const requestId = ++this.requestId;
-    this.resetWorkspaceAppReferenceSources();
     this.rawGroups = {
       apps: [],
       opened_files: [],
@@ -14769,68 +15310,8 @@ var AgentMentionSearchController = class {
       filter
     });
   }
-  async loadMoreWorkspaceAppReferences(input) {
-    try {
-      const referenceResult = await Promise.resolve(
-        input.source.provider.getItemReferenceItems?.(input.source.item, {
-          keyword: input.source.query,
-          maxResults: WORKSPACE_APP_REFERENCE_PAGE_SIZE,
-          cursor: input.cursor,
-          context: {
-            metadata: {
-              currentUserId: input.source.currentUserId,
-              target: "agent-gui",
-              workspaceId: input.source.workspaceId
-            }
-          }
-        }) ?? []
-      ).then(normalizeProviderReferenceItemsResult);
-      if (!this.canApply(
-        input.requestId,
-        input.source.workspaceId,
-        input.source.query
-      )) {
-        return;
-      }
-      const currentSource = this.workspaceAppReferenceSources.get(input.appId);
-      if (!currentSource || currentSource.nextCursor !== input.cursor) {
-        return;
-      }
-      const fileReferenceItems = referenceResult.items.map(providerReferenceItemToFileMentionItem).filter(
-        (referenceItem) => referenceItem !== null
-      );
-      this.workspaceAppReferenceSources.set(input.appId, {
-        ...currentSource,
-        nextCursor: referenceResult.nextCursor
-      });
-      this.updateWorkspaceAppReferenceItem(input.appId, (item) => ({
-        ...item,
-        referenceItems: mergeWorkspaceAppReferenceItems(
-          item.referenceItems ?? [],
-          fileReferenceItems
-        ),
-        referenceItemsLoading: false,
-        referenceNextCursor: referenceResult.nextCursor
-      }));
-      this.emitCurrentState();
-    } catch {
-      if (!this.canApply(
-        input.requestId,
-        input.source.workspaceId,
-        input.source.query
-      )) {
-        return;
-      }
-      this.updateWorkspaceAppReferenceItem(input.appId, (item) => ({
-        ...item,
-        referenceItemsLoading: false
-      }));
-      this.emitCurrentState();
-    }
-  }
   async runSearch(input) {
     try {
-      const appReferenceSources = [];
       const [fileItems, appItems, issueItems, sessionItems] = await Promise.all(
         [
           this.queryProviderMentionItemsById({
@@ -14845,8 +15326,7 @@ var AgentMentionSearchController = class {
             workspaceId: input.workspaceId,
             currentUserId: input.currentUserId,
             query: input.query,
-            limit: DEFAULT_MENTION_GROUP_PAGE_SIZE,
-            workspaceAppReferenceSources: appReferenceSources
+            limit: DEFAULT_MENTION_GROUP_PAGE_SIZE
           }),
           this.queryProviderMentionItemsById({
             providerId: WORKSPACE_ISSUE_PROVIDER_ID,
@@ -14867,7 +15347,6 @@ var AgentMentionSearchController = class {
       if (!this.canApply(input.requestId, input.workspaceId, input.query)) {
         return;
       }
-      this.replaceWorkspaceAppReferenceSources(appReferenceSources);
       this.rawGroups = {
         apps: appItems.filter((item) => item.kind === "workspace-app"),
         opened_files: fileItems.filter((item) => item.kind === "file"),
@@ -14949,19 +15428,16 @@ var AgentMentionSearchController = class {
         this.totalCounts.collab_sessions = 0;
         this.totalCounts.issues = 0;
       } else if (input.filter === "app") {
-        const appReferenceSources = [];
         const appItems = await this.queryProviderMentionItemsById({
           providerId: WORKSPACE_APP_PROVIDER_ID,
           workspaceId: input.workspaceId,
           currentUserId: input.currentUserId,
           query: "",
-          limit: DEFAULT_MENTION_GROUP_PAGE_SIZE,
-          workspaceAppReferenceSources: appReferenceSources
+          limit: DEFAULT_MENTION_GROUP_PAGE_SIZE
         });
         if (!this.canApply(input.requestId, input.workspaceId, "")) {
           return;
         }
-        this.replaceWorkspaceAppReferenceSources(appReferenceSources);
         this.rawGroups = {
           apps: appItems.filter((item) => item.kind === "workspace-app"),
           opened_files: [],
@@ -15035,7 +15511,6 @@ var AgentMentionSearchController = class {
         this.totalCounts.collab_sessions = this.rawGroups.collab_sessions.length;
         this.totalCounts.issues = 0;
       } else {
-        const appReferenceSources = [];
         const [
           appItems,
           fileItems,
@@ -15048,8 +15523,7 @@ var AgentMentionSearchController = class {
             workspaceId: input.workspaceId,
             currentUserId: input.currentUserId,
             query: "",
-            limit: DEFAULT_MENTION_GROUP_PAGE_SIZE,
-            workspaceAppReferenceSources: appReferenceSources
+            limit: DEFAULT_MENTION_GROUP_PAGE_SIZE
           }),
           this.queryProviderMentionItemsById({
             providerId: FILE_PROVIDER_ID,
@@ -15083,7 +15557,6 @@ var AgentMentionSearchController = class {
         if (!this.canApply(input.requestId, input.workspaceId, "")) {
           return;
         }
-        this.replaceWorkspaceAppReferenceSources(appReferenceSources);
         this.rawGroups = {
           apps: appItems.filter((item) => item.kind === "workspace-app"),
           opened_files: fileItems.filter((item) => item.kind === "file"),
@@ -15130,127 +15603,93 @@ var AgentMentionSearchController = class {
     }
   }
   async queryProviderMentionItems(input) {
-    const providerContext = {
-      metadata: {
-        currentUserId: input.currentUserId,
-        target: "agent-gui",
-        workspaceId: input.workspaceId
-      }
-    };
-    const directItems = await input.provider.query({
+    const items = await input.provider.query({
       keyword: input.query,
       maxResults: input.limit,
-      context: providerContext
-    });
-    const itemCandidates = directItems.map(
-      (item) => ({
-        includeWorkspaceAppWithoutReferences: true,
-        item
-      })
-    );
-    if (input.provider.id === WORKSPACE_APP_PROVIDER_ID && input.query.trim() && input.provider.getItemReferenceItems) {
-      const seenKeys = new Set(
-        directItems.map((item) => compactText(input.provider.getItemKey(item))).filter(Boolean)
-      );
-      const referenceCandidateItems = await input.provider.query({
-        keyword: "",
-        context: providerContext
-      });
-      for (const item of referenceCandidateItems) {
-        const key = compactText(input.provider.getItemKey(item));
-        if (key && seenKeys.has(key)) {
-          continue;
-        }
-        if (key) {
-          seenKeys.add(key);
+      abortSignal: input.abortSignal,
+      context: {
+        metadata: {
+          currentUserId: input.currentUserId,
+          target: "agent-gui",
+          workspaceId: input.workspaceId
         }
-        itemCandidates.push({
-          includeWorkspaceAppWithoutReferences: false,
-          item
-        });
       }
+    });
+    if (input.abortSignal.aborted) {
+      return [];
     }
     const mentionItems = await Promise.all(
-      itemCandidates.map(
-        async ({ includeWorkspaceAppWithoutReferences, item }) => {
-          const mentionItem = providerItemToAgentMentionItem({
-            currentUserId: input.currentUserId,
-            insertResult: input.provider.toInsertResult(item),
-            label: input.provider.getItemLabel(item),
-            providerId: input.provider.id,
-            subtitle: input.provider.getItemSubtitle?.(item) ?? "",
-            workspaceId: input.workspaceId
-          });
-          if (mentionItem?.kind === "workspace-app") {
-            const referenceResult = await Promise.resolve(
-              input.provider.getItemReferenceItems?.(item, {
-                keyword: input.query,
-                maxResults: WORKSPACE_APP_REFERENCE_PAGE_SIZE,
-                context: providerContext
-              }) ?? []
-            ).then(normalizeProviderReferenceItemsResult).catch(() => EMPTY_PROVIDER_REFERENCE_ITEMS_RESULT);
-            const fileReferenceItems = referenceResult.items.map(providerReferenceItemToFileMentionItem).filter(
-              (referenceItem) => referenceItem !== null
-            );
-            const resolvedMentionItem = fileReferenceItems.length > 0 ? {
-              ...mentionItem,
-              referenceItems: fileReferenceItems,
-              referenceNextCursor: referenceResult.nextCursor
-            } : includeWorkspaceAppWithoutReferences ? {
-              ...mentionItem,
-              referenceNextCursor: referenceResult.nextCursor
-            } : null;
-            if (resolvedMentionItem) {
-              input.workspaceAppReferenceSources?.push({
-                appId: resolvedMentionItem.appId,
-                currentUserId: input.currentUserId,
-                item,
-                nextCursor: referenceResult.nextCursor,
-                provider: input.provider,
-                query: input.query,
-                workspaceId: input.workspaceId
-              });
-            }
-            return resolvedMentionItem;
-          }
-          if (!mentionItem || mentionItem.kind !== "file") {
-            return mentionItem;
-          }
-          const thumbnailUrl = await Promise.resolve(
-            input.provider.getItemThumbnailUrl?.(item) ?? null
-          ).catch(() => null);
-          const resolvedThumbnailUrl = resolveAgentMentionFileThumbnailUrl({
-            ...mentionItem,
-            thumbnailUrl
-          });
-          if (!resolvedThumbnailUrl) {
-            return mentionItem;
-          }
-          return {
-            ...mentionItem,
-            thumbnailUrl: resolvedThumbnailUrl
-          };
+      items.map(async (item) => {
+        const mentionItem = providerItemToAgentMentionItem({
+          currentUserId: input.currentUserId,
+          insertResult: input.provider.toInsertResult(item),
+          label: input.provider.getItemLabel(item),
+          providerId: input.provider.id,
+          subtitle: input.provider.getItemSubtitle?.(item) ?? "",
+          workspaceId: input.workspaceId
+        });
+        if (!mentionItem || mentionItem.kind !== "file") {
+          return mentionItem;
         }
-      )
+        const thumbnailUrl = await Promise.resolve(
+          input.provider.getItemThumbnailUrl?.(item) ?? null
+        ).catch(() => null);
+        const resolvedThumbnailUrl = resolveAgentMentionFileThumbnailUrl({
+          ...mentionItem,
+          thumbnailUrl
+        });
+        if (!resolvedThumbnailUrl) {
+          return mentionItem;
+        }
+        return {
+          ...mentionItem,
+          thumbnailUrl: resolvedThumbnailUrl
+        };
+      })
     );
-    const resolvedItems = mentionItems.filter(
+    return mentionItems.filter(
       (item) => item !== null
     );
-    return input.provider.id === WORKSPACE_APP_PROVIDER_ID ? sortMentionItemsByMatchScore(resolvedItems, input.query) : resolvedItems;
   }
   async queryProviderMentionItemsById(input) {
     const provider = this.richTextAtProviders.get(input.providerId);
     if (!provider) {
       return [];
     }
-    return this.queryProviderMentionItems({
-      provider,
-      workspaceId: input.workspaceId,
-      currentUserId: input.currentUserId,
-      query: input.query,
-      limit: input.limit,
-      workspaceAppReferenceSources: input.workspaceAppReferenceSources
+    return this.runProviderQuery(
+      (abortSignal) => this.queryProviderMentionItems({
+        provider,
+        workspaceId: input.workspaceId,
+        currentUserId: input.currentUserId,
+        query: input.query,
+        limit: input.limit,
+        abortSignal
+      }),
+      []
+    );
+  }
+  async runProviderQuery(query, fallback) {
+    const abortController = new AbortController();
+    const queryPromise = Promise.resolve().then(
+      () => query(abortController.signal)
+    );
+    if (this.providerTimeoutMs <= 0 || !Number.isFinite(this.providerTimeoutMs)) {
+      return queryPromise;
+    }
+    let timeout = null;
+    const timeoutPromise = new Promise((resolve) => {
+      timeout = setTimeout(() => {
+        abortController.abort();
+        resolve(fallback);
+      }, this.providerTimeoutMs);
     });
+    try {
+      return await Promise.race([queryPromise, timeoutPromise]);
+    } finally {
+      if (timeout !== null) {
+        clearTimeout(timeout);
+      }
+    }
   }
   groupsFromRawGroups() {
     const orderedGroupIds = groupIdsForFilter(this.currentFilter);
@@ -15338,48 +15777,6 @@ var AgentMentionSearchController = class {
   resetAgentGeneratedBrowsePath() {
     this.agentGeneratedBrowsePath = null;
   }
-  resetWorkspaceAppReferenceSources() {
-    this.workspaceAppReferenceSources.clear();
-  }
-  replaceWorkspaceAppReferenceSources(sources) {
-    this.workspaceAppReferenceSources.clear();
-    for (const source of sources) {
-      this.workspaceAppReferenceSources.set(source.appId, source);
-    }
-  }
-  isWorkspaceAppReferenceLoading(appId) {
-    return this.rawGroups.apps.some(
-      (item) => item.kind === "workspace-app" && item.appId === appId && item.referenceItemsLoading === true
-    );
-  }
-  updateWorkspaceAppReferenceItem(appId, updater) {
-    let updated = false;
-    const apps = this.rawGroups.apps.map((item) => {
-      if (item.kind !== "workspace-app" || item.appId !== appId) {
-        return item;
-      }
-      updated = true;
-      return updater(item);
-    });
-    if (updated) {
-      this.rawGroups = {
-        ...this.rawGroups,
-        apps
-      };
-    }
-    return updated;
-  }
-  emitCurrentState() {
-    this.setState({
-      status: this.state.status === "loading" ? "loading" : "ready",
-      query: this.currentQuery,
-      mode: this.currentQuery ? "results" : "browse",
-      filter: this.currentFilter,
-      categories: BROWSE_CATEGORIES,
-      groups: this.groupsFromRawGroups(),
-      error: null
-    });
-  }
   setState(state) {
     this.state = state;
     for (const listener of this.listeners) {
@@ -15416,71 +15813,14 @@ function mentionGroupBestMatchScore(group, query) {
     0
   );
 }
-function normalizeProviderReferenceItemsResult(result) {
-  return "items" in result ? {
-    items: result.items,
-    nextCursor: normalizeOptionalCursor(result.nextCursor)
-  } : {
-    items: result,
-    nextCursor: null
-  };
-}
-function normalizeOptionalCursor(value) {
-  const trimmed = value?.trim() ?? "";
-  return trimmed ? trimmed : null;
-}
-function mergeWorkspaceAppReferenceItems(existingItems, nextItems) {
-  const seen = new Set(existingItems.map(workspaceAppReferenceItemKey));
-  const merged = [...existingItems];
-  for (const item of nextItems) {
-    const key = workspaceAppReferenceItemKey(item);
-    if (seen.has(key)) {
-      continue;
-    }
-    seen.add(key);
-    merged.push(item);
-  }
-  return merged;
-}
-function workspaceAppReferenceItemKey(item) {
-  return item.sourceKey?.trim() || item.href;
-}
-function sortMentionItemsByMatchScore(items, query) {
-  const normalizedQuery = normalizeQuery2(query).toLowerCase();
-  if (!normalizedQuery) {
-    return items;
-  }
-  return items.map((item, index) => ({
-    index,
-    item,
-    score: mentionItemMatchScore(item, normalizedQuery)
-  })).sort((left, right) => {
-    if (left.score !== right.score) {
-      return right.score - left.score;
-    }
-    return left.index - right.index;
-  }).map((entry) => entry.item);
-}
 function mentionItemMatchScore(item, query) {
   const primary = [];
   const secondary = [];
   let kindBoost = 0;
   if (item.kind === "workspace-app") {
     kindBoost = 8;
-    primary.push(
-      item.name,
-      item.appId,
-      item.targetId,
-      ...(item.referenceItems ?? []).map((referenceItem) => referenceItem.name)
-    );
-    secondary.push(
-      item.description ?? "",
-      ...(item.referenceItems ?? []).flatMap((referenceItem) => [
-        referenceItem.path,
-        referenceItem.directoryPath,
-        referenceItem.sourceKey ?? ""
-      ])
-    );
+    primary.push(item.name, item.appId, item.targetId);
+    secondary.push(item.description ?? "");
   } else if (item.kind === "file") {
     primary.push(item.name);
     secondary.push(item.path, item.directoryPath);
@@ -15628,46 +15968,6 @@ function providerItemToAgentMentionItem(input) {
   }
   return null;
 }
-function providerReferenceItemToFileMentionItem(referenceItem) {
-  const label = compactText(referenceItem.label);
-  if (!label || referenceItem.insertResult.kind !== "markdown-link") {
-    return null;
-  }
-  const href = referenceItem.insertResult.href.trim();
-  if (!href) {
-    return null;
-  }
-  if (!isProviderReferenceFileHref(href)) {
-    return null;
-  }
-  const entryKind = href.endsWith("/") ? "directory" : "unknown";
-  const directoryPath = dirnameFromProviderWorkspaceFileHref(href);
-  const thumbnailUrl = referenceItem.thumbnailUrl?.trim() || resolveAgentMentionFileThumbnailUrl({
-    href,
-    path: href,
-    name: label,
-    entryKind
-  });
-  return {
-    kind: "file",
-    href,
-    path: href,
-    name: label,
-    entryKind,
-    directoryPath,
-    ...referenceItem.key?.trim() ? { sourceKey: referenceItem.key.trim() } : {},
-    ...thumbnailUrl ? { thumbnailUrl } : {}
-  };
-}
-function isProviderReferenceFileHref(href) {
-  if (href.startsWith("#")) {
-    return false;
-  }
-  if (/^[A-Za-z]:[\\/]/u.test(href)) {
-    return true;
-  }
-  return !/^[A-Za-z][A-Za-z\d+.-]*:/u.test(href);
-}
 function normalizeSessionInitiatorDisplayName(value) {
   const trimmed = value.trim();
   return trimmed.toLowerCase() === "local" ? "User" : trimmed;
@@ -15701,7 +16001,7 @@ import {
   useCallback as useCallback7,
   useEffect as useEffect9,
   useRef as useRef10,
-  useState as useState7
+  useState as useState8
 } from "react";
 import {
   normalizeAgentActivityDisplayStatus
@@ -15810,29 +16110,11 @@ function flattenAgentMentionPaletteEntries(state) {
   for (const group of state.groups) {
     for (const item of group.items) {
       entries.push({
-        key: mentionPaletteItemKey(group.id, item),
+        key: `${group.id}:${item.kind}:${item.kind === "file" ? agentGeneratedMentionItemKey(item) : item.targetId}`,
         type: "item",
         groupId: group.id,
         item
       });
-      if (item.kind === "workspace-app") {
-        for (const referenceItem of item.referenceItems ?? []) {
-          entries.push({
-            key: mentionPaletteReferenceItemKey(group.id, item, referenceItem),
-            type: "item",
-            groupId: group.id,
-            item: referenceItem
-          });
-        }
-        if (item.referenceNextCursor) {
-          entries.push({
-            key: mentionPaletteReferenceExpandKey(group.id, item),
-            type: "app-reference-expand",
-            appId: item.appId,
-            groupId: group.id
-          });
-        }
-      }
     }
     if (group.hasMore) {
       entries.push({
@@ -15844,15 +16126,6 @@ function flattenAgentMentionPaletteEntries(state) {
   }
   return entries;
 }
-function mentionPaletteItemKey(groupId, item) {
-  return `${groupId}:${item.kind}:${item.kind === "file" ? agentGeneratedMentionItemKey(item) : item.targetId}`;
-}
-function mentionPaletteReferenceItemKey(groupId, parentItem, referenceItem) {
-  return `${groupId}:workspace-app-reference:${parentItem.appId}:${referenceItem.sourceKey ?? referenceItem.href}`;
-}
-function mentionPaletteReferenceExpandKey(groupId, parentItem) {
-  return `${groupId}:workspace-app-reference-expand:${parentItem.appId}`;
-}
 function AgentFileMentionPalette({
   state,
   highlightedKey,
@@ -15868,7 +16141,6 @@ function AgentFileMentionPalette({
   onSelectCategory,
   onSelectFilter,
   onExpandGroup,
-  onExpandWorkspaceAppReferences = () => void 0,
   onCycleFilter,
   onMoveSelection
 }) {
@@ -15879,7 +16151,7 @@ function AgentFileMentionPalette({
   const loadingHideTimerRef = useRef10(
     null
   );
-  const [loadingIndicatorVisible, setLoadingIndicatorVisible] = useState7(
+  const [loadingIndicatorVisible, setLoadingIndicatorVisible] = useState8(
     state.status === "loading"
   );
   const browseFilter = state.filter;
@@ -15987,7 +16259,6 @@ function AgentFileMentionPalette({
               highlightedOptionRef,
               mode: state.mode,
               onExpandGroup,
-              onExpandWorkspaceAppReferences,
               onHighlightChange,
               onSelectItem,
               query: state.query
@@ -16048,7 +16319,6 @@ function AgentFileMentionPalette({
             highlightedOptionRef,
             mode: state.mode,
             onExpandGroup,
-            onExpandWorkspaceAppReferences,
             onHighlightChange,
             onSelectItem,
             query: state.query
@@ -16215,12 +16485,12 @@ function MentionPaletteScrollbar({
   "use memo";
   const trackRef = useRef10(null);
   const dragStateRef = useRef10(null);
-  const [scrollbarState, setScrollbarState] = useState7({
+  const [scrollbarState, setScrollbarState] = useState8({
     scrollable: false,
     thumbHeight: 0,
     thumbTop: 0
   });
-  const [dragging, setDragging] = useState7(false);
+  const [dragging, setDragging] = useState8(false);
   const hideScrollbar = useCallback7(() => {
     setScrollbarState(
       (previous) => previous.scrollable || previous.thumbHeight !== 0 || previous.thumbTop !== 0 ? MENTION_PALETTE_SCROLLBAR_HIDDEN_STATE : previous
@@ -16403,8 +16673,7 @@ function renderMentionPaletteGroups(input) {
       input.highlightedOptionRef,
       input.onHighlightChange,
       input.onSelectItem,
-      input.onExpandGroup,
-      input.onExpandWorkspaceAppReferences
+      input.onExpandGroup
     ),
     shouldShowFileSearchMoreHint(input) ? /* @__PURE__ */ jsx25(MentionFileSearchMoreHint, {}) : null
   ] });
@@ -16420,7 +16689,7 @@ function MentionFileSearchMoreHint() {
     }
   );
 }
-function renderMentionGroups(groups, query, filter, highlightedKey, highlightedOptionRef, onHighlightChange, onSelectItem, onExpandGroup, onExpandWorkspaceAppReferences) {
+function renderMentionGroups(groups, query, filter, highlightedKey, highlightedOptionRef, onHighlightChange, onSelectItem, onExpandGroup) {
   return groups.map((group, index) => {
     const followsMySessions = group.id === "collab_sessions" && groups[index - 1]?.id === "my_sessions";
     const showGroupLabel = shouldRenderMentionGroupLabel({
@@ -16447,82 +16716,26 @@ function renderMentionGroups(groups, query, filter, highlightedKey, highlightedO
           /* @__PURE__ */ jsxs10("div", { className: "grid gap-1", children: [
             group.items.length === 0 && !shouldSuppressFileSearchGroupChrome(filter, query) ? /* @__PURE__ */ jsx25("div", { className: "px-3 py-1 text-[13px] font-normal text-[var(--text-tertiary)]", children: agentMentionEmptyGroupLabel(group.id, query) }) : null,
             group.items.map((item) => {
-              const itemKey = mentionPaletteItemKey(group.id, item);
+              const itemKey = `${group.id}:${item.kind}:${item.kind === "file" ? agentGeneratedMentionItemKey(item) : item.targetId}`;
               const isHighlighted = itemKey === highlightedKey;
-              return /* @__PURE__ */ jsxs10("div", { className: "grid gap-1", children: [
-                /* @__PURE__ */ jsx25(
-                  "button",
-                  {
-                    ref: isHighlighted ? highlightedOptionRef : null,
-                    type: "button",
-                    className: cn(
-                      paletteStyles2.rowButton,
-                      isHighlighted && "bg-[var(--transparency-block)]"
-                    ),
-                    role: "option",
-                    "aria-selected": isHighlighted,
-                    onMouseEnter: () => onHighlightChange(itemKey),
-                    onMouseDown: (event) => event.preventDefault(),
-                    onClick: () => onSelectItem(item),
-                    children: renderMentionRow(item)
-                  }
-                ),
-                item.kind === "workspace-app" ? /* @__PURE__ */ jsxs10(Fragment5, { children: [
-                  (item.referenceItems ?? []).map((referenceItem) => {
-                    const referenceKey = mentionPaletteReferenceItemKey(
-                      group.id,
-                      item,
-                      referenceItem
-                    );
-                    const isReferenceHighlighted = referenceKey === highlightedKey;
-                    return /* @__PURE__ */ jsx25(
-                      "button",
-                      {
-                        ref: isReferenceHighlighted ? highlightedOptionRef : null,
-                        type: "button",
-                        className: cn(
-                          paletteStyles2.rowButton,
-                          "pl-8",
-                          isReferenceHighlighted && "bg-[var(--transparency-block)]"
-                        ),
-                        role: "option",
-                        "aria-selected": isReferenceHighlighted,
-                        onMouseEnter: () => onHighlightChange(referenceKey),
-                        onMouseDown: (event) => event.preventDefault(),
-                        onClick: () => onSelectItem(referenceItem),
-                        children: renderMentionRow(referenceItem)
-                      },
-                      referenceKey
-                    );
-                  }),
-                  item.referenceNextCursor ? /* @__PURE__ */ jsx25(
-                    "button",
-                    {
-                      ref: mentionPaletteReferenceExpandKey(group.id, item) === highlightedKey ? highlightedOptionRef : null,
-                      type: "button",
-                      disabled: item.referenceItemsLoading === true,
-                      className: cn(
-                        paletteStyles2.expandButton,
-                        "ml-8 w-[calc(100%-2rem)]",
-                        item.referenceItemsLoading === true && "opacity-60",
-                        mentionPaletteReferenceExpandKey(group.id, item) === highlightedKey && "bg-[var(--transparency-block)] text-[var(--text-primary)]"
-                      ),
-                      onMouseEnter: () => onHighlightChange(
-                        mentionPaletteReferenceExpandKey(group.id, item)
-                      ),
-                      onMouseDown: (event) => event.preventDefault(),
-                      onClick: () => onExpandWorkspaceAppReferences(item.appId),
-                      children: translate(
-                        "agentHost.agentGui.contextPickerExpandMore",
-                        {
-                          count: WORKSPACE_APP_REFERENCE_PAGE_SIZE
-                        }
-                      )
-                    },
-                    mentionPaletteReferenceExpandKey(group.id, item)
-                  ) : null
-                ] }) : null
-              ] }, itemKey);
+              return /* @__PURE__ */ jsx25(
+                "button",
+                {
+                  ref: isHighlighted ? highlightedOptionRef : null,
+                  type: "button",
+                  className: cn(
+                    paletteStyles2.rowButton,
+                    isHighlighted && "bg-[var(--transparency-block)]"
+                  ),
+                  role: "option",
+                  "aria-selected": isHighlighted,
+                  onMouseEnter: () => onHighlightChange(itemKey),
+                  onMouseDown: (event) => event.preventDefault(),
+                  onClick: () => onSelectItem(item),
+                  children: renderMentionRow(item)
+                },
+                itemKey
+              );
             }),
             group.hasMore ? /* @__PURE__ */ jsx25(
               "button",
@@ -17170,27 +17383,27 @@ function AgentComposer({
   richTextAtProviders = EMPTY_RICH_TEXT_AT_PROVIDERS
 }) {
   "use memo";
-  const [isPaletteOpen, setIsPaletteOpen] = useState8(true);
-  const [highlightedIndex, setHighlightedIndex] = useState8(0);
-  const [mentionHighlightedKey, setMentionHighlightedKey] = useState8(null);
-  const [shouldCenterMentionHighlight, setShouldCenterMentionHighlight] = useState8(false);
+  const [isPaletteOpen, setIsPaletteOpen] = useState9(true);
+  const [highlightedIndex, setHighlightedIndex] = useState9(0);
+  const [mentionHighlightedKey, setMentionHighlightedKey] = useState9(null);
+  const [shouldCenterMentionHighlight, setShouldCenterMentionHighlight] = useState9(false);
   const [
     shouldResetMentionHighlightToFilter,
     setShouldResetMentionHighlightToFilter
-  ] = useState8(false);
-  const [paletteDraftPrompt, setPaletteDraftPrompt] = useState8(draftPrompt);
-  const [fileMentionSuggestion, setFileMentionSuggestion] = useState8(null);
-  const [isSelectedProjectMissing, setIsSelectedProjectMissing] = useState8(false);
-  const [draftImages, setDraftImages] = useState8([]);
-  const [submittedImagePreview, setSubmittedImagePreview] = useState8([]);
-  const [isSlashStatusPanelOpen, setIsSlashStatusPanelOpen] = useState8(false);
+  ] = useState9(false);
+  const [paletteDraftPrompt, setPaletteDraftPrompt] = useState9(draftPrompt);
+  const [fileMentionSuggestion, setFileMentionSuggestion] = useState9(null);
+  const [isSelectedProjectMissing, setIsSelectedProjectMissing] = useState9(false);
+  const [draftImages, setDraftImages] = useState9([]);
+  const [submittedImagePreview, setSubmittedImagePreview] = useState9([]);
+  const [isSlashStatusPanelOpen, setIsSlashStatusPanelOpen] = useState9(false);
   const slashStatusAgentSessionId = slashStatus?.agentSessionId ?? null;
   const previousSlashStatusAgentSessionIdRef = useRef11(
     slashStatusAgentSessionId
   );
   const selectedProjectPath = composerSettings.selectedProjectPath?.trim() ?? "";
   const previousSelectedProjectPathRef = useRef11(selectedProjectPath);
-  const [mentionSearchState, setMentionSearchState] = useState8({
+  const [mentionSearchState, setMentionSearchState] = useState9({
     status: "idle",
     query: "",
     mode: "browse",
@@ -17212,7 +17425,7 @@ function AgentComposer({
   const wasActiveRef = useRef11(isActive);
   const lastComposerFocusRequestRef = useRef11(null);
   const autoMentionHighlightedKeyRef = useRef11(null);
-  const [isPromptTipOverflowing, setIsPromptTipOverflowing] = useState8(false);
+  const [isPromptTipOverflowing, setIsPromptTipOverflowing] = useState9(false);
   const slashQuery = getSlashCommandQuery(paletteDraftPrompt);
   const promptBeforeSelection = editorHandleRef.current?.getPromptTextBeforeSelection() ?? "";
   const skillQueryDraft = promptBeforeSelection || paletteDraftPrompt;
@@ -17276,8 +17489,8 @@ function AgentComposer({
     () => flattenAgentMentionPaletteEntries(mentionSearchState),
     [mentionSearchState]
   );
-  const [mentionPaletteFrame, setMentionPaletteFrame] = useState8(null);
-  const [slashPaletteFrame, setSlashPaletteFrame] = useState8(null);
+  const [mentionPaletteFrame, setMentionPaletteFrame] = useState9(null);
+  const [slashPaletteFrame, setSlashPaletteFrame] = useState9(null);
   useEffect10(() => {
     setHighlightedIndex(0);
   }, [skillQueryMatch?.prefix, skillQueryMatch?.query, slashQuery]);
@@ -17365,6 +17578,16 @@ function AgentComposer({
         });
         return;
       }
+      if (effect.kind === "toggleSpeed") {
+        clearSlashCommandDraft();
+        if (composerSettings.supportsSpeed) {
+          const currentSpeed = composerSettings.selectedSpeedValue ?? composerSettings.draftSettings.speed ?? "standard";
+          onSettingsChange({
+            speed: currentSpeed === "fast" ? "standard" : "fast"
+          });
+        }
+        return;
+      }
       const nextDraft = effect.draft;
       draftPromptRef.current = nextDraft;
       setPaletteDraftPrompt(nextDraft);
@@ -17374,6 +17597,9 @@ function AgentComposer({
     [
       clearSlashCommandDraft,
       composerSettings.draftSettings.planMode,
+      composerSettings.draftSettings.speed,
+      composerSettings.selectedSpeedValue,
+      composerSettings.supportsSpeed,
       onDraftChange,
       onSettingsChange,
       onSubmit
@@ -17445,6 +17671,9 @@ function AgentComposer({
       setSubmittedImagePreview([]);
       submittedImagePreviewObservedBusyRef.current = false;
     }
+    draftPromptRef.current = "";
+    setPaletteDraftPrompt("");
+    onDraftChange("");
     setDraftImages([]);
   };
   const submit = (event) => {
@@ -17615,10 +17844,6 @@ function AgentComposer({
           mentionControllerRef.current?.setFilter(activeEntry.categoryId);
         } else if (activeEntry.type === "expand" && activeEntry.groupId) {
           mentionControllerRef.current?.expandGroup(activeEntry.groupId);
-        } else if (activeEntry.type === "app-reference-expand" && activeEntry.appId) {
-          mentionControllerRef.current?.expandWorkspaceAppReferences(
-            activeEntry.appId
-          );
         } else if (activeEntry.type === "item" && activeEntry.item) {
           selectFileMention(activeEntry.item);
         }
@@ -18148,7 +18373,7 @@ function AgentComposer({
   const sendButtonBusy = isSendingTurn && !isQueueMode;
   const settingsControlsDisabled = isSendingTurn || isSubmittingPrompt || showStopButton;
   const activePromptRequestId = activePrompt?.requestId ?? null;
-  const [dismissedPromptRequestId, setDismissedPromptRequestId] = useState8(null);
+  const [dismissedPromptRequestId, setDismissedPromptRequestId] = useState9(null);
   const visibleActivePrompt = activePrompt && dismissedPromptRequestId !== activePromptRequestId ? activePrompt : null;
   const disabledReasonText = disabledReason?.trim() ?? "";
   const effectivePlaceholder = disabledReasonText || placeholder;
@@ -18429,9 +18654,6 @@ function AgentComposer({
                                 onSelectCategory: (filter) => mentionControllerRef.current?.setFilter(filter),
                                 onSelectFilter: (filter) => mentionControllerRef.current?.setFilter(filter),
                                 onExpandGroup: (groupId) => mentionControllerRef.current?.expandGroup(groupId),
-                                onExpandWorkspaceAppReferences: (appId) => mentionControllerRef.current?.expandWorkspaceAppReferences(
-                                  appId
-                                ),
                                 onCycleFilter: cycleFileMentionFilter,
                                 onMoveSelection: moveFileMentionSelection
                               }
@@ -18473,7 +18695,7 @@ function AgentComposer({
                   }
                 ),
                 /* @__PURE__ */ jsxs11("div", { className: AgentGUINode_styles_default.composerFooter, children: [
-                  /* @__PURE__ */ jsx26("div", { className: composerStyles.footerGroup, children: /* @__PURE__ */ jsxs11(
+                  /* @__PURE__ */ jsx26("div", { className: composerStyles.footerGroup, children: /* @__PURE__ */ jsx26(
                     Select2,
                     {
                       open: false,
@@ -18489,47 +18711,27 @@ function AgentComposer({
                           void handleWorkspaceReferencePicker();
                         }
                       },
-                      children: [
-                        /* @__PURE__ */ jsx26(
-                          SelectTrigger2,
-                          {
-                            size: "sm",
-                            "aria-label": labels.referenceWorkspaceFiles,
-                            title: labels.referenceWorkspaceFiles,
-                            className: cn(
-                              AgentGUINode_styles_default.composerMenuTrigger,
-                              AgentGUINode_styles_default.composerReferenceTrigger,
-                              "w-auto justify-center px-1 text-[var(--agent-gui-text-secondary)] [&>svg:last-child]:hidden [&_svg]:shrink-0"
-                            ),
-                            children: /* @__PURE__ */ jsx26(
-                              AddIcon,
-                              {
-                                "aria-hidden": true,
-                                className: "size-3.5",
-                                "data-agent-reference-add-icon": "true"
-                              }
-                            )
-                          }
-                        ),
-                        /* @__PURE__ */ jsx26(
-                          SelectContent2,
-                          {
-                            align: "start",
-                            side: "top",
-                            sideOffset: 8,
-                            collisionPadding: 16,
-                            className: cn(AgentGUINode_styles_default.composerMenuContent, "min-w-[180px]"),
-                            children: /* @__PURE__ */ jsx26(
-                              SelectItem2,
-                              {
-                                value: workspaceReferenceOptionValue,
-                                className: AgentGUINode_styles_default.composerMenuItem,
-                                children: labels.referenceWorkspaceFiles
-                              }
-                            )
-                          }
-                        )
-                      ]
+                      children: /* @__PURE__ */ jsx26(
+                        SelectTrigger2,
+                        {
+                          size: "sm",
+                          "aria-label": labels.referenceWorkspaceFiles,
+                          title: labels.referenceWorkspaceFiles,
+                          className: cn(
+                            AgentGUINode_styles_default.composerMenuTrigger,
+                            AgentGUINode_styles_default.composerReferenceTrigger,
+                            "w-auto justify-center px-1 text-[var(--agent-gui-text-secondary)] [&>svg:last-child]:hidden [&_svg]:shrink-0"
+                          ),
+                          children: /* @__PURE__ */ jsx26(
+                            AddIcon,
+                            {
+                              "aria-hidden": true,
+                              className: "size-3.5",
+                              "data-agent-reference-add-icon": "true"
+                            }
+                          )
+                        }
+                      )
                     }
                   ) }),
                   /* @__PURE__ */ jsxs11("div", { className: composerStyles.footerGroupRight, children: [
@@ -18561,6 +18763,10 @@ function AgentComposer({
                           reasoningOptionMedium: labels.reasoningOptionMedium,
                           reasoningOptionHigh: labels.reasoningOptionHigh,
                           reasoningOptionXHigh: labels.reasoningOptionXHigh,
+                          speedLabel: labels.speedLabel,
+                          speedSelectionLabel: labels.speedSelectionLabel,
+                          speedOptionStandard: labels.speedOptionStandard,
+                          speedOptionFast: labels.speedOptionFast,
                           permissionLabel: labels.permissionLabel,
                           modelDescriptions: labels.modelDescriptions,
                           defaultModel: labels.defaultModel,
@@ -19270,12 +19476,12 @@ function AgentGUINodeView({
 }) {
   "use memo";
   const railResizeInteractionRef = useRef12(null);
-  const [isRailResizing, setIsRailResizing] = useState9(false);
-  const [workspaceReferencePickerOpen, setWorkspaceReferencePickerOpen] = useState9(false);
+  const [isRailResizing, setIsRailResizing] = useState10(false);
+  const [workspaceReferencePickerOpen, setWorkspaceReferencePickerOpen] = useState10(false);
   const [
     localComposerFocusRequestSequence,
     setLocalComposerFocusRequestSequence
-  ] = useState9(0);
+  ] = useState10(0);
   const workspaceReferencePickerResolverRef = useRef12(null);
   const requestWorkspaceReferences = useCallback9(async () => {
     if (previewMode) {
@@ -19605,7 +19811,7 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
   const [
     bottomDockDismissedPromptRequestId,
     setBottomDockDismissedPromptRequestId
-  ] = useState9(null);
+  ] = useState10(null);
   const conversation = useProjectedAgentConversation({
     conversation: viewModel.conversation,
     detail: viewModel.conversationDetail,
@@ -19807,6 +20013,10 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
       reasoningOptionMedium: labels.reasoningOptionMedium,
       reasoningOptionHigh: labels.reasoningOptionHigh,
       reasoningOptionXHigh: labels.reasoningOptionXHigh,
+      speedLabel: labels.speedLabel,
+      speedSelectionLabel: labels.speedSelectionLabel,
+      speedOptionStandard: labels.speedOptionStandard,
+      speedOptionFast: labels.speedOptionFast,
       permissionLabel: labels.permissionLabel,
       permissionModeReadOnly: labels.permissionModeReadOnly,
       permissionModeAuto: labels.permissionModeAuto,
@@ -19887,6 +20097,10 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
       labels.reasoningOptionMedium,
       labels.reasoningOptionMinimal,
       labels.reasoningOptionXHigh,
+      labels.speedLabel,
+      labels.speedSelectionLabel,
+      labels.speedOptionStandard,
+      labels.speedOptionFast,
       labels.send,
       labels.sendQueuedPromptNext,
       labels.slashCommandPalette,
@@ -20432,7 +20646,7 @@ function AgentGUICompactButton({
   onSubmitCompact
 }) {
   "use memo";
-  const [pendingConversationId, setPendingConversationId] = useState9(null);
+  const [pendingConversationId, setPendingConversationId] = useState10(null);
   const lastStatusRef = useRef12(status);
   useEffect11(() => {
     const previousStatus = lastStatusRef.current;
@@ -20812,10 +21026,10 @@ var AgentGUIConversationRailPane = memo(
     onConfirmDeleteConversation
   }) {
     "use memo";
-    const [conversationQuery, setConversationQuery] = useState9("");
-    const [collapsedProjectSectionIds, setCollapsedProjectSectionIds] = useState9(() => /* @__PURE__ */ new Set());
-    const [currentTimeMs, setCurrentTimeMs] = useState9(() => Date.now());
-    const [pendingProjectAction, setPendingProjectAction] = useState9(null);
+    const [conversationQuery, setConversationQuery] = useState10("");
+    const [collapsedProjectSectionIds, setCollapsedProjectSectionIds] = useState10(() => /* @__PURE__ */ new Set());
+    const [currentTimeMs, setCurrentTimeMs] = useState10(() => Date.now());
+    const [pendingProjectAction, setPendingProjectAction] = useState10(null);
     const railElementRef = useRef12(null);
     const conversationListRef = useRef12(null);
     const conversationItemElementsRef = useRef12(
@@ -21551,7 +21765,7 @@ import {
   useEffect as useEffect12,
   useLayoutEffect as useLayoutEffect5,
   useRef as useRef13,
-  useState as useState10
+  useState as useState11
 } from "react";
 import { createPortal as createPortal2 } from "react-dom";
 import { Fragment as Fragment10, jsx as jsx30, jsxs as jsxs14 } from "react/jsx-runtime";
@@ -21589,8 +21803,8 @@ function AgentProbeInfoPopover({
   "use memo";
   const anchorRef = useRef13(null);
   const popoverRef = useRef13(null);
-  const [isOpen, setIsOpen] = useState10(false);
-  const [popoverStyle, setPopoverStyle] = useState10(null);
+  const [isOpen, setIsOpen] = useState11(false);
+  const [popoverStyle, setPopoverStyle] = useState11(null);
   const closeIfPointerLeavesPopover = useCallback10((event) => {
     const nextTarget = event.relatedTarget;
     if (nextTarget instanceof Node && (anchorRef.current?.contains(nextTarget) || popoverRef.current?.contains(nextTarget))) {
@@ -22231,6 +22445,10 @@ var AgentGUINode = memo2(function AgentGUINode2({
       reasoningOptionMedium: t("agentHost.agentGui.reasoningOptionMedium"),
       reasoningOptionHigh: t("agentHost.agentGui.reasoningOptionHigh"),
       reasoningOptionXHigh: t("agentHost.agentGui.reasoningOptionXHigh"),
+      speedLabel: t("agentHost.agentGui.speedLabel"),
+      speedSelectionLabel: t("agentHost.agentGui.speedSelectionLabel"),
+      speedOptionStandard: t("agentHost.agentGui.speedOptionStandard"),
+      speedOptionFast: t("agentHost.agentGui.speedOptionFast"),
       permissionLabel: t("agentHost.agentGui.permissionLabel"),
       permissionModeReadOnly: t("agentHost.agentGui.permissionModeReadOnly"),
       permissionModeAuto: t("agentHost.agentGui.permissionModeAuto"),