@tutti-os/agent-gui 0.0.35 → 0.0.37

package/dist/index.js

@@ -13,7 +13,7 @@ import {
 import {
   AgentInteractivePromptSurface,
   approvalOptionDisplayLabel
-} from "./chunk-JYH2ITNL.js";
+} from "./chunk-BQNHPMQY.js";
 import {
   PLAN_IMPLEMENTATION_ACTION_FEEDBACK,
   PLAN_IMPLEMENTATION_ACTION_IMPLEMENT,
@@ -37,13 +37,13 @@ import {
   skillDescriptionForDisplay,
   skillTriggerForPrefix,
   useProjectedAgentConversation
-} from "./chunk-O56P2KSZ.js";
+} from "./chunk-5YJPISWJ.js";
 import {
   AgentMessageMarkdown,
   ZoomableImage,
   cn,
   resolveWorkspaceLinkAction
-} from "./chunk-CMXRLF64.js";
+} from "./chunk-UHQDBXGH.js";
 import {
   AGENT_MENTION_FILTER_TAB_ORDER,
   AgentFileMentionPalette,
@@ -51,7 +51,7 @@ import {
   DEFAULT_AGENT_MENTION_FILTER,
   agentMentionItemKey,
   preloadAgentMentionBrowse
-} from "./chunk-U3D7YI47.js";
+} from "./chunk-MKSRP5XS.js";
 import {
   WORKSPACE_AGENT_ACTIVITY_RUNTIME_SESSION_ORIGIN,
   buildWorkspaceAgentActivityListViewModel,
@@ -60,15 +60,14 @@ import {
   isWorkspaceAgentActivityRuntimeSessionOrigin,
   isWorkspaceAgentUntitledTask,
   mergeWorkspaceAgentActivityDurableAndOverlayMessages,
-  normalizeOptionalWorkspaceAgentStatus,
   selectWorkspaceAgentActivityOverlayMessages
-} from "./chunk-UN4XGHLQ.js";
+} from "./chunk-SXHVKUUI.js";
 import {
   MANAGED_AGENT_ICON_FALLBACK_URL,
   MANAGED_AGENT_ICON_URLS,
   Spinner,
   normalizeManagedAgentProvider
-} from "./chunk-3LEUGNCT.js";
+} from "./chunk-WHWZZYBV.js";
 import "./chunk-MTFSQWZ6.js";
 import {
   resolveWorkspaceAgentSessionSortTimeUnixMs
@@ -79,7 +78,7 @@ import {
   mentionItemToAttrs,
   normalizeAgentSessionMentionTitle,
   parseMentionItemFromHref
-} from "./chunk-VPC55T7P.js";
+} from "./chunk-XROBPALT.js";
 import "./chunk-Y35GDLP2.js";
 import {
   AgentActivityHostProvider,
@@ -108,12 +107,13 @@ import {
   getActiveUiLanguage,
   translate,
   useTranslation
-} from "./chunk-KFMD33UD.js";
+} from "./chunk-JL2WNRYC.js";
 import "./chunk-LUGELG5V.js";
 import "./chunk-PJP5BUU6.js";
 
 // shared/agentActivitySnapshotProjection.ts
 import {
+  normalizeAgentActivityDisplayStatus,
   selectNeedsAttentionCount,
   selectNeedsAttentionItems
 } from "@tutti-os/agent-activity-core";
@@ -170,22 +170,23 @@ function agentHostPresenceFromCore(presence, index) {
   };
 }
 function agentHostSessionFromCore(session, id, presenceId) {
+  const displayStatus = agentActivityDisplayStatusFromSession(session);
   return {
     agentSessionId: session.agentSessionId,
     endedAtUnixMs: session.endedAtUnixMs,
     startedAtUnixMs: session.startedAtUnixMs,
     createdAtUnixMs: session.createdAtUnixMs,
     cwd: session.cwd,
-    effectiveStatus: agentHostEffectiveStatusFromCore(session.status),
+    effectiveStatus: agentHostEffectiveStatusFromDisplay(displayStatus),
     id,
-    lifecycleStatus: agentHostLifecycleStatusFromCore(session.status),
+    lifecycleStatus: agentHostLifecycleStatusFromDisplay(displayStatus),
     presenceId,
     pinnedAtUnixMs: session.pinnedAtUnixMs,
     provider: session.provider,
     providerSessionId: session.providerSessionId ?? session.agentSessionId,
     resumable: session.resumable ?? false,
     sessionOrigin: "WORKSPACE_AGENT_SESSION_ORIGIN_RUNTIME",
-    status: agentHostSessionStatusFromCore(session.status),
+    status: agentHostSessionStatusFromDisplay(displayStatus),
     syncState: session.lastError ? {
       agentSessionId: session.agentSessionId,
       lastError: session.lastError,
@@ -194,7 +195,7 @@ function agentHostSessionFromCore(session, id, presenceId) {
       workspaceId: session.workspaceId
     } : void 0,
     title: session.title || void 0,
-    turnPhase: agentHostTurnPhaseFromCore(session.status),
+    turnPhase: agentHostTurnPhaseFromDisplay(displayStatus),
     updatedAtUnixMs: session.updatedAtUnixMs ?? session.lastEventUnixMs,
     userId: session.userId?.trim() || "local",
     workspaceId: session.workspaceId
@@ -212,7 +213,7 @@ function agentHostMessageFromCore(message) {
     role: message.role,
     startedAtUnixMs: message.startedAtUnixMs,
     status: message.status ?? void 0,
-    turnId: message.turnId ?? void 0,
+    turnId: message.turnId,
     version: message.version,
     workspaceId: message.workspaceId ?? ""
   };
@@ -222,6 +223,7 @@ function projectCoreSessionStatus(status) {
 }
 function agentHostSessionStatusFromCore(status) {
   switch (status) {
+    case "active":
     case "created":
     case "queued":
       return "ready";
@@ -233,21 +235,20 @@ function agentHostSessionStatusFromCore(status) {
       return status;
   }
 }
-function agentHostEffectiveStatusFromCore(status) {
-  switch (status) {
-    case "created":
-    case "queued":
-      return "ready";
-    case "running":
-      return "working";
-    case "waiting":
-    case "failed":
-      return status;
-    default:
-      return "idle";
-  }
+function agentActivityDisplayStatusFromSession(session) {
+  return normalizeAgentActivityDisplayStatus(session.status, {
+    currentPhase: session.currentPhase,
+    turnLifecycleOutcome: session.turnLifecycle?.outcome,
+    turnLifecyclePhase: session.turnLifecycle?.phase
+  });
 }
-function agentHostLifecycleStatusFromCore(status) {
+function agentHostSessionStatusFromDisplay(status) {
+  return status === "idle" ? "ready" : status;
+}
+function agentHostEffectiveStatusFromDisplay(status) {
+  return status === "idle" ? "ready" : status;
+}
+function agentHostLifecycleStatusFromDisplay(status) {
   switch (status) {
     case "failed":
       return "failed";
@@ -258,15 +259,12 @@ function agentHostLifecycleStatusFromCore(status) {
       return "active";
   }
 }
-function agentHostTurnPhaseFromCore(status) {
+function agentHostTurnPhaseFromDisplay(status) {
   switch (status) {
-    case "running":
     case "working":
-      return "working";
     case "waiting":
-      return "waiting";
     case "failed":
-      return "failed";
+      return status;
     default:
       return "idle";
   }
@@ -2925,28 +2923,32 @@ function firstUserMessageTitleFromMessages(messages) {
   return userMessage ? messageText(userMessage) : "";
 }
 function workspaceAgentMessagesFromTimelineItems(timelineItems) {
-  return timelineItems.map((item, index) => ({
-    id: item.id,
-    workspaceId: item.workspaceId,
-    agentSessionId: item.agentSessionId,
-    messageId: item.eventId || `${item.agentSessionId}:${item.id}:${index}`,
-    version: item.seq ?? item.id,
-    ...item.turnId ? { turnId: item.turnId } : {},
-    role: item.role ?? timelineItemRole(item) ?? item.actorType,
-    kind: item.itemType === "call" ? "tool_call" : item.itemType,
-    ...item.status ? { status: item.status } : {},
-    payload: {
-      ...item.payload,
-      content: item.payload?.content ?? item.content,
-      text: item.payload?.text ?? item.content,
-      callType: item.callType,
-      callId: item.callId,
-      name: item.name
-    },
-    occurredAtUnixMs: item.occurredAtUnixMs ?? item.createdAtUnixMs,
-    startedAtUnixMs: item.createdAtUnixMs,
-    completedAtUnixMs: item.occurredAtUnixMs
-  }));
+  return timelineItems.map((item, index) => {
+    const messageId = item.eventId || `${item.agentSessionId}:${item.id}:${index}`;
+    const version = item.seq ?? item.id;
+    return {
+      id: item.id,
+      workspaceId: item.workspaceId,
+      agentSessionId: item.agentSessionId,
+      messageId,
+      version,
+      turnId: item.turnId || `timeline:${messageId}`,
+      role: item.role ?? timelineItemRole(item) ?? item.actorType,
+      kind: item.itemType === "call" ? "tool_call" : item.itemType,
+      ...item.status ? { status: item.status } : {},
+      payload: {
+        ...item.payload,
+        content: item.payload?.content ?? item.content,
+        text: item.payload?.text ?? item.content,
+        callType: item.callType,
+        callId: item.callId,
+        name: item.name
+      },
+      occurredAtUnixMs: item.occurredAtUnixMs ?? item.createdAtUnixMs ?? version,
+      startedAtUnixMs: item.createdAtUnixMs,
+      completedAtUnixMs: item.occurredAtUnixMs
+    };
+  });
 }
 function messageRole(message) {
   const role = message.role?.trim().toLowerCase();
@@ -3354,6 +3356,120 @@ function agentPromptFileBlockToDraftFile(file, idPrefix, index) {
   };
 }
 
+// shared/workspaceAgentStatusNormalizer.ts
+var FAILED_STATUS_TOKENS = /* @__PURE__ */ new Set(["failed", "error"]);
+var CANCELED_STATUS_TOKENS = /* @__PURE__ */ new Set([
+  "canceled",
+  "cancelled",
+  "interrupted"
+]);
+var COMPLETED_STATUS_TOKENS = /* @__PURE__ */ new Set(["completed", "ended", "end"]);
+var WAITING_APPROVAL_TOKENS = /* @__PURE__ */ new Set([
+  "waiting_approval",
+  "awaiting_approval"
+]);
+var WAITING_INPUT_TOKENS = /* @__PURE__ */ new Set(["waiting_input"]);
+var WAITING_STATUS_TOKENS = /* @__PURE__ */ new Set(["waiting"]);
+var WORKING_STATUS_TOKENS = /* @__PURE__ */ new Set([
+  "submitted",
+  "working",
+  "running",
+  "streaming"
+]);
+var READY_STATUS_TOKENS = /* @__PURE__ */ new Set(["ready", "idle"]);
+function normalizeOptionalWorkspaceAgentStatus(input) {
+  const lifecycleStatus = normalizeStatusToken(input.lifecycleStatus);
+  const effectiveStatus = normalizeStatusToken(input.effectiveStatus);
+  const sessionStatus = normalizeStatusToken(input.status);
+  const turnLifecycleOutcome = normalizeStatusToken(
+    input.turnLifecycle?.outcome
+  );
+  const turnPhase = normalizeStatusToken(
+    input.turnLifecycle?.phase ?? input.turnPhase
+  );
+  const currentPhase = normalizeStatusToken(input.currentPhase);
+  const tokens = [
+    lifecycleStatus,
+    effectiveStatus,
+    sessionStatus,
+    turnPhase,
+    currentPhase
+  ].filter(Boolean);
+  if (tokens.length === 0) {
+    return null;
+  }
+  if (turnPhase === "settled") {
+    if (FAILED_STATUS_TOKENS.has(turnLifecycleOutcome)) {
+      return { kind: "failed" };
+    }
+    if (CANCELED_STATUS_TOKENS.has(turnLifecycleOutcome)) {
+      return { kind: "canceled" };
+    }
+    if (COMPLETED_STATUS_TOKENS.has(turnLifecycleOutcome)) {
+      return { kind: "completed" };
+    }
+    if (FAILED_STATUS_TOKENS.has(sessionStatus) || FAILED_STATUS_TOKENS.has(currentPhase)) {
+      return { kind: "failed" };
+    }
+    if (CANCELED_STATUS_TOKENS.has(sessionStatus) || CANCELED_STATUS_TOKENS.has(currentPhase)) {
+      return { kind: "canceled" };
+    }
+    return { kind: "completed" };
+  }
+  if ([lifecycleStatus, effectiveStatus, sessionStatus, currentPhase].some(
+    (token) => FAILED_STATUS_TOKENS.has(token)
+  )) {
+    return { kind: "failed" };
+  }
+  if ([lifecycleStatus, effectiveStatus, sessionStatus].some(
+    (token) => CANCELED_STATUS_TOKENS.has(token)
+  )) {
+    return { kind: "canceled" };
+  }
+  if ([lifecycleStatus, effectiveStatus, sessionStatus].some(
+    (token) => COMPLETED_STATUS_TOKENS.has(token)
+  )) {
+    return { kind: "completed" };
+  }
+  const waitKind = waitingKindFromTokens([
+    currentPhase,
+    turnPhase,
+    effectiveStatus,
+    sessionStatus
+  ]);
+  if (waitKind) {
+    return { kind: "waiting", waitKind };
+  }
+  if ([currentPhase, turnPhase, effectiveStatus, sessionStatus].some(
+    (token) => WAITING_STATUS_TOKENS.has(token)
+  )) {
+    return { kind: "waiting" };
+  }
+  if ([currentPhase, turnPhase, effectiveStatus, sessionStatus].some(
+    (token) => WORKING_STATUS_TOKENS.has(token)
+  )) {
+    return { kind: "working" };
+  }
+  if (lifecycleStatus === "active" || lifecycleStatus === "ready" || [currentPhase, turnPhase, effectiveStatus, sessionStatus].some(
+    (token) => READY_STATUS_TOKENS.has(token)
+  )) {
+    return { kind: "ready" };
+  }
+  return null;
+}
+function waitingKindFromTokens(tokens) {
+  if (tokens.some((token) => WAITING_APPROVAL_TOKENS.has(token))) {
+    return "approval";
+  }
+  if (tokens.some((token) => WAITING_INPUT_TOKENS.has(token))) {
+    return "input";
+  }
+  return void 0;
+}
+function normalizeStatusToken(status) {
+  return status?.trim().toLowerCase() ?? "";
+}
+
 // shared/agentConversation/projection/workspaceAgentMessageProjection.ts
 function projectWorkspaceAgentMessagesToTimelineItems(messages) {
   const sortedMessages = latestMessageSnapshots(messages).sort(
@@ -6459,6 +6575,7 @@ var EMPTY_AGENT_GUI_MESSAGES = [];
 var EMPTY_AGENT_GUI_AVAILABLE_COMMANDS = [];
 var ACTIVITY_STREAM_STATE_RELOAD_DEBOUNCE_MS = 150;
 var AGENT_GUI_DETAIL_MESSAGES_PAGE_SIZE = 100;
+var AGENT_GUI_SUBMIT_RETARGET_EARLY_MESSAGE_TOLERANCE_MS = 5e3;
 function mergeAgentModelCatalogInvalidationEvents(events) {
   const providers = /* @__PURE__ */ new Set();
   let occurredAtUnixMs = 0;
@@ -7052,8 +7169,18 @@ function filterMessagesForDetailWindowOverlay(input) {
       return newestDurableVersion !== null && Number.isFinite(message.version) && message.version >= newestDurableVersion;
     });
   }
-  const oldestDetailVersion = minFiniteMessageVersion(input.detailMessages);
-  const newestDetailVersion = maxFiniteMessageVersion(input.detailMessages);
+  const boundedDetailMessages = input.detailMessages.filter(
+    (message) => !isWorkspaceAgentActivityOptimisticMessage(message)
+  );
+  const oldestDetailVersion = minFiniteMessageVersion(boundedDetailMessages);
+  const newestDetailVersion = maxFiniteMessageVersion(boundedDetailMessages);
+  if (oldestDetailVersion === null && newestDetailVersion === null) {
+    const optimisticWindowMessages = filterMessagesForOptimisticDetailWindow({
+      detailMessages: input.detailMessages,
+      localMessages: input.localMessages
+    });
+    return optimisticWindowMessages.length > 0 || input.detailMessages.some(isWorkspaceAgentActivityOptimisticMessage) ? optimisticWindowMessages : [...input.localMessages];
+  }
   return input.localMessages.filter((message) => {
     if (isWorkspaceAgentActivityOptimisticMessage(message)) {
       return true;
@@ -7067,6 +7194,69 @@ function filterMessagesForDetailWindowOverlay(input) {
     return oldestDetailVersion !== null && message.version >= oldestDetailVersion;
   });
 }
+function filterMessagesForOptimisticDetailWindow(input) {
+  const optimisticTurnIds = new Set(
+    input.detailMessages.filter(isWorkspaceAgentActivityOptimisticMessage).map((message) => message.turnId?.trim() ?? "").filter(Boolean)
+  );
+  if (optimisticTurnIds.size === 0) {
+    return [];
+  }
+  return input.localMessages.filter((message) => {
+    if (isWorkspaceAgentActivityOptimisticMessage(message)) {
+      return true;
+    }
+    const turnId = message.turnId?.trim() ?? "";
+    return turnId !== "" && optimisticTurnIds.has(turnId);
+  });
+}
+function retargetOptimisticPromptMessages(messages, input) {
+  const clientSubmitId = input.clientSubmitId.trim();
+  const turnId = input.turnId.trim();
+  if (!clientSubmitId || !turnId || messages.length === 0) {
+    return { changed: false, messages: [...messages] };
+  }
+  const pendingTurnId = createPendingOptimisticTurnId(clientSubmitId);
+  let changed = false;
+  const retargeted = messages.map((message) => {
+    if (!isWorkspaceAgentActivityOptimisticMessage(message) || message.turnId?.trim() !== pendingTurnId) {
+      return message;
+    }
+    const messageClientSubmitId = message.payload?.clientSubmitId;
+    if (typeof messageClientSubmitId === "string" && messageClientSubmitId.trim() && messageClientSubmitId.trim() !== clientSubmitId) {
+      return message;
+    }
+    changed = true;
+    return { ...message, turnId };
+  });
+  return { changed, messages: retargeted };
+}
+function shouldRetargetOptimisticPromptFromMessage(message, trace) {
+  const turnId = message.turnId?.trim() ?? "";
+  if (!turnId || trace.turnId) {
+    return false;
+  }
+  const clientSubmitId = stringPayloadValue2(message.payload, "clientSubmitId");
+  if (clientSubmitId?.trim()) {
+    return clientSubmitId.trim() === trace.clientSubmitId;
+  }
+  if (message.role.trim().toLowerCase() === "user") {
+    return false;
+  }
+  const messageTimeUnixMs = messageActivityTimeUnixMs(message);
+  return messageTimeUnixMs === null || messageTimeUnixMs >= trace.startedAtUnixMs - AGENT_GUI_SUBMIT_RETARGET_EARLY_MESSAGE_TOLERANCE_MS;
+}
+function messageActivityTimeUnixMs(message) {
+  for (const value of [
+    message.occurredAtUnixMs,
+    message.startedAtUnixMs,
+    message.completedAtUnixMs
+  ]) {
+    if (typeof value === "number" && Number.isFinite(value) && value > 0) {
+      return value;
+    }
+  }
+  return null;
+}
 function minFiniteMessageVersion(messages) {
   let result = null;
   for (const message of messages) {
@@ -7924,7 +8114,7 @@ function messageFromMessageUpdate(update) {
     agentSessionId: update.agentSessionId,
     messageId: update.messageId.trim() || `message:${id}`,
     version: id,
-    ...update.turnId?.trim() ? { turnId: update.turnId.trim() } : {},
+    turnId: update.turnId.trim(),
     role,
     kind,
     status: update.status,
@@ -7933,7 +8123,7 @@ function messageFromMessageUpdate(update) {
       ...isToolCall && update.callId?.trim() ? { callId: update.callId.trim() } : {},
       ...isToolCall && update.title?.trim() ? { title: update.title.trim() } : {}
     },
-    ...update.occurredAtUnixMs !== void 0 ? { occurredAtUnixMs: update.occurredAtUnixMs } : {},
+    occurredAtUnixMs: update.occurredAtUnixMs,
     ...update.startedAtUnixMs !== void 0 ? { startedAtUnixMs: update.startedAtUnixMs } : {},
     ...update.completedAtUnixMs !== void 0 ? { completedAtUnixMs: update.completedAtUnixMs } : {}
   };
@@ -8487,10 +8677,22 @@ function useAgentGUINodeController({
   useEffect4(() => {
     const externalId = data.lastActiveAgentSessionId?.trim() ?? "";
     if (externalId === (activeConversationIdRef.current ?? "")) return;
-    setIntent((current) => {
-      if (!externalId) {
-        return current.tag !== "home" ? { tag: "home" } : current;
+    if (!externalId) {
+      const previous = activeConversationIdRef.current;
+      if (previous) {
+        void activation.unactivate(previous);
       }
+      setIntent({ tag: "home" });
+      isComposerHomeRef.current = true;
+      setIsComposerHome(true);
+      activeConversationIdRef.current = null;
+      setActiveConversationId(null);
+      setIsLoadingMessages(false);
+      setDetailError(null);
+      loadDraftComposerOptions();
+      return;
+    }
+    setIntent((current) => {
       if ((current.tag === "active" || current.tag === "requested") && current.id === externalId) {
         return current;
       }
@@ -9825,6 +10027,42 @@ function useAgentGUINodeController({
       sessionViewRef
     ]
   );
+  const retargetOptimisticPromptTurn = useCallback4(
+    (agentSessionId, clientSubmitId, turnId) => {
+      const normalizedAgentSessionId = agentSessionId.trim();
+      const normalizedTurnId = turnId.trim();
+      if (!normalizedAgentSessionId || !clientSubmitId.trim() || !normalizedTurnId) {
+        return;
+      }
+      const sessionView = getAgentSessionView(
+        sessionViewRef(normalizedAgentSessionId)
+      );
+      if (!sessionView) {
+        return;
+      }
+      const detail = retargetOptimisticPromptMessages(
+        sessionView.detailMessages,
+        { clientSubmitId, turnId: normalizedTurnId }
+      );
+      if (detail.changed) {
+        setAgentSessionViewDetailMessages(
+          sessionViewRef(normalizedAgentSessionId),
+          detail.messages
+        );
+      }
+      const overlay = retargetOptimisticPromptMessages(
+        sessionView.overlayMessages,
+        { clientSubmitId, turnId: normalizedTurnId }
+      );
+      if (overlay.changed) {
+        setAgentSessionViewOverlayMessages(
+          sessionViewRef(normalizedAgentSessionId),
+          overlay.messages
+        );
+      }
+    },
+    [sessionViewRef]
+  );
   const applyStatePatch = useCallback4(
     (patch) => {
       const agentSessionId = patch.agentSessionId.trim();
@@ -9842,11 +10080,8 @@ function useAgentGUINodeController({
       const structuredTurnPhase = patch.turn?.phase?.trim() ?? "";
       const submitTrace = submitTraceBySessionIdRef.current[agentSessionId];
       if (submitTrace && structuredTurnPhase) {
-        const matchesTraceTurn = !submitTrace.turnId || patchTurnId === submitTrace.turnId || patchActiveTurnId === submitTrace.turnId;
+        const matchesTraceTurn = Boolean(submitTrace.turnId) && (patchTurnId === submitTrace.turnId || patchActiveTurnId === submitTrace.turnId);
         if (matchesTraceTurn) {
-          if (!submitTrace.turnId && (patchTurnId || patchActiveTurnId)) {
-            submitTrace.turnId = patchTurnId || patchActiveTurnId;
-          }
           reportAgentSubmitTraceDiagnostic({
             event: `lifecycle.${structuredTurnPhase}`,
             runtime: agentActivityRuntime,
@@ -9959,6 +10194,7 @@ function useAgentGUINodeController({
     [
       patchConversation,
       resolveSessionMessages,
+      retargetOptimisticPromptTurn,
       sessionViewRef,
       setTransientConversation,
       statePatchErrorBySessionId,
@@ -10001,6 +10237,16 @@ function useAgentGUINodeController({
           if (!agentSessionId) {
             continue;
           }
+          const submitTrace = submitTraceBySessionIdRef.current[agentSessionId];
+          const messageTurnId = message.turnId?.trim() ?? "";
+          if (submitTrace && messageTurnId && shouldRetargetOptimisticPromptFromMessage(message, submitTrace)) {
+            submitTrace.turnId = messageTurnId;
+            retargetOptimisticPromptTurn(
+              agentSessionId,
+              submitTrace.clientSubmitId,
+              messageTurnId
+            );
+          }
           const completionKey = completionKeyFromMessage(message);
           if (completionKey) {
             pendingCompletionKeysBySessionId.set(agentSessionId, completionKey);
@@ -10024,7 +10270,8 @@ function useAgentGUINodeController({
       applyStatePatch,
       applyBackgroundTimelineStatusUpdate,
       conversationListQuery,
-      recordLocalMessages
+      recordLocalMessages,
+      retargetOptimisticPromptTurn
     ]
   );
   const handleBackgroundActivityStreamEvents = useCallback4(
@@ -18652,6 +18899,22 @@ function AgentComposer({
     setFileMentionSuggestion(null);
     setIsPaletteOpen(false);
   }, [fileMentionSuggestion]);
+  const clearActiveFileMentionTrigger = useCallback9(() => {
+    if (!fileMentionSuggestion) {
+      return;
+    }
+    const triggerLength = Math.max(
+      fileMentionSuggestion.range.to - fileMentionSuggestion.range.from,
+      fileMentionSuggestion.text.length
+    );
+    const nextDraft = triggerLength > 0 ? editorHandleRef.current?.replaceTextBeforeSelection(triggerLength, "") : null;
+    if (nextDraft === null || nextDraft === void 0) {
+      return;
+    }
+    draftPromptRef.current = nextDraft;
+    setPaletteDraftPrompt(nextDraft);
+    onDraftContentChange({ ...draftContent, prompt: nextDraft });
+  }, [draftContent, fileMentionSuggestion, onDraftContentChange]);
   const closeOpenPalette = useCallback9(() => {
     if (showFileMentionPalette) {
       closeFileMentionPalette();
@@ -19063,6 +19326,7 @@ function AgentComposer({
   }, [applyReferencePickResult, onRequestWorkspaceReferences]);
   const handleOpenReferencesForEntity = useCallback9(
     (entity) => {
+      clearActiveFileMentionTrigger();
       closeFileMentionPalette();
       if (!onRequestWorkspaceReferences) {
         return;
@@ -19072,6 +19336,7 @@ function AgentComposer({
       );
     },
     [
+      clearActiveFileMentionTrigger,
       closeFileMentionPalette,
       applyReferencePickResult,
       onRequestWorkspaceReferences
@@ -20371,6 +20636,9 @@ function resolveAgentGUIHeroIconUrl(provider) {
   const normalizedProvider = normalizeManagedAgentProvider(provider);
   return MANAGED_AGENT_ICON_URLS[normalizedProvider] ?? MANAGED_AGENT_ICON_FALLBACK_URL;
 }
+function shouldEmphasizeEmptyHeroProvider(label) {
+  return !/[\u3400-\u9fff]/u.test(label);
+}
 var fallbackWorkspaceFileReferenceCopy = {
   t(key, values) {
     return values ? `${key}:${JSON.stringify(values)}` : key;
@@ -22148,7 +22416,7 @@ function EmptyHeroTitle({
   providerLabel
 }) {
   const providerStart = providerLabel ? label.indexOf(providerLabel) : -1;
-  if (providerStart < 0) {
+  if (!shouldEmphasizeEmptyHeroProvider(label) || providerStart < 0) {
     return /* @__PURE__ */ jsx29(Fragment8, { children: label });
   }
   const providerEnd = providerStart + providerLabel.length;
@@ -22805,7 +23073,7 @@ var AgentGUIConversationRailSection = memo(
                 /* @__PURE__ */ jsx29(
                   TooltipContent3,
                   {
-                    side: "right",
+                    side: "top",
                     sideOffset: 6,
                     className: AgentGUINode_styles_default.conversationSectionActionTooltip,
                     children: createConversationLabel