@qredence/fleet 0.5.11 → 0.6.0

package/dist/web/server/{routes-CRpm9-Sa-IYK6MUJO.js → routes-BBVirYfL-5WXMOT7M.js}

@@ -1,5 +1,10 @@
 import {
   ChatCommandsResponseSchema,
+  ChatMcpDeleteRequestSchema,
+  ChatMcpListResponseSchema,
+  ChatMcpOAuthLoginRequestSchema,
+  ChatMcpOAuthLoginResponseSchema,
+  ChatMcpUpsertRequestSchema,
   ChatModelsDiscoverRequestSchema,
   ChatModelsDiscoverResponseSchema,
   ChatModelsResponseSchema,
@@ -21,12 +26,12 @@ import {
   useMutation,
   useQuery,
   useQueryClient
-} from "./chunk-JUROEEWM.js";
+} from "./chunk-EH4BZ6QM.js";
 import {
   Library,
   RIGHT_PANEL_LAUNCHER_DEFINITIONS,
   getRightPanelDefinition
-} from "./chunk-O4OTWWPF.js";
+} from "./chunk-CNXJN5HN.js";
 import {
   AlertDialog,
   AlertDialogAction,
@@ -41,7 +46,6 @@ import {
   CHROME_PILL_CLASS,
   CHROME_PILL_INACTIVE_CLASS,
   PANEL_OVERLAY_CLASS,
-  Pencil,
   ProviderBrandIcon,
   Settings,
   Spinner,
@@ -51,7 +55,10 @@ import {
   useHoverFloatingInteraction,
   useHoverReferenceInteraction,
   usePopupHandleStore
-} from "./chunk-MIW4LJTV.js";
+} from "./chunk-TWYHHG5N.js";
+import {
+  Pencil
+} from "./chunk-M5RSPNYN.js";
 import {
   RightPanelProvider,
   useChatPanelDataContext,
@@ -85,7 +92,7 @@ import {
   buildAssistantElements,
   groupMessages,
   normalizeAssistantToolParts
-} from "./chunk-WILCIZYU.js";
+} from "./chunk-BBBS5AS7.js";
 import "./chunk-FJV6EQDW.js";
 import {
   RefreshCw
@@ -137,8 +144,12 @@ import {
   thinkingLevelLabel,
   toModelOption,
   toModelSelection
-} from "./chunk-WKV2Z4KO.js";
-import "./chunk-QK4CHLVV.js";
+} from "./chunk-WHBVQJ4K.js";
+import {
+  disambiguateSessionLabel,
+  fallbackSessionLabel,
+  sessionListTitle
+} from "./chunk-PTCKOR23.js";
 import {
   Folder
 } from "./chunk-GS2IZGRC.js";
@@ -230,7 +241,7 @@ import {
   Badge,
   UiErrorBoundary,
   decodeOpenPanelActionMessage
-} from "./chunk-BXWAUTTH.js";
+} from "./chunk-DZ2IC3FH.js";
 import {
   ChatOpenUIArtifactUpsertRequestSchema,
   ChatOpenUIArtifactUpsertResponseSchema,
@@ -254,7 +265,7 @@ import {
   UploadedAttachmentSchema,
   WorkspaceRelativePathSchema,
   external_exports
-} from "./chunk-GGT2ZKDB.js";
+} from "./chunk-YNUWKMNQ.js";
 import {
   CompositeList,
   Select,
@@ -415,7 +426,7 @@ import "./chunk-JDCCC7A7.js";
 import "./chunk-L547YHC4.js";
 import "./chunk-MLKGABMK.js";
 
-// web/app/dist/server/assets/routes-CRpm9-Sa.js
+// web/app/dist/server/assets/routes-BBVirYfL.js
 import * as React$1 from "react";
 import { Suspense, createContext as createContext2, createElement, forwardRef as forwardRef2, isValidElement, lazy, memo, useCallback as useCallback2, useContext as useContext2, useEffect as useEffect2, useEffectEvent, useId, useLayoutEffect, useMemo as useMemo2, useReducer, useRef as useRef2, useState as useState2, useSyncExternalStore } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
@@ -3265,8 +3276,19 @@ function newSessionResourceId(projectId) {
 function idValue(id, prefix) {
   return id.startsWith(prefix) ? id.slice(prefix.length) : null;
 }
-function sessionLabel(session) {
-  return normalizeSessionLabel(session.title || session.firstMessage || session.sessionId.slice(0, 8));
+function sessionBaseLabel(session) {
+  return normalizeSessionLabel(sessionListTitle({
+    sessionId: session.sessionId,
+    title: session.title,
+    firstMessage: session.firstMessage
+  })) || fallbackSessionLabel(session.sessionId);
+}
+function sessionLabel(session, siblings) {
+  const base = sessionBaseLabel(session);
+  if (!siblings) return base;
+  let collidingCount = 0;
+  for (const sibling of siblings) if (sessionBaseLabel(sibling) === base) collidingCount += 1;
+  return disambiguateSessionLabel(base, session.sessionId, collidingCount);
 }
 function sessionDiscoveryMeta(session, projectById) {
   return `${session.projectId ? projectById.get(session.projectId)?.name ?? "Unassigned" : "Unassigned"} \xB7 ${session.status === "idle" ? "Ready" : session.status} \xB7 ${`${String(session.messageCount)} ${session.messageCount === 1 ? "message" : "messages"}`}`;
@@ -3502,9 +3524,10 @@ function useFleetSessionSidebarViewModel({ sessions, projects = EMPTY_PROJECTS,
     const grouped = sortedProjects.map((project) => {
       const sessionsForProject = displayProjectSessions(projectSessions.filter((session) => session.projectId === project.projectId), activeSessionId);
       const revealed = revealedProjectIds.has(project.projectId);
-      const children = visibleProjectSessions(sessionsForProject, activeSessionId, revealed).map((session) => ({
+      const visible = visibleProjectSessions(sessionsForProject, activeSessionId, revealed);
+      const children = visible.map((session) => ({
         id: sessionResourceId(session.sessionId),
-        label: sessionLabel(session),
+        label: sessionLabel(session, visible),
         kind: "file",
         ...session.isSubagent ? { indent: 1 } : {}
       }));
@@ -3529,7 +3552,7 @@ function useFleetSessionSidebarViewModel({ sessions, projects = EMPTY_PROJECTS,
     if (unassigned.length > 0) {
       const unassignedChildren = visibleProjectSessions(unassigned, activeSessionId, revealedProjectIds.has("unassigned")).map((session) => ({
         id: sessionResourceId(session.sessionId),
-        label: sessionLabel(session),
+        label: sessionLabel(session, unassigned),
         kind: "file",
         ...session.isSubagent ? { indent: 1 } : {}
       }));
@@ -4406,7 +4429,7 @@ function ThreadSearch({ threads, query, activeId, onQueryChange, onSelect, class
 }
 function fleetVersion() {
   try {
-    return "0.5.11";
+    return "0.6.0";
   } catch {
     return "dev";
   }
@@ -5619,7 +5642,7 @@ function KbdHint({ children }) {
 function FleetSessionSidebarNavigation({ brandMenuOpen, setBrandMenuOpen, searchOpen, setSearchOpen, query, setQuery, projectActionsOpen, setProjectActionsOpen, expandedProjectIds, setExpandedProjectIds, setCreateOpen, projects, projectSessions, sidebarItems, sortedProjects, projectById, activeProjectId, activeSessionId, onNewSession, onNewSessionInProject, onProjectSelect, onRenameSession, onCreateProject, onOpenSettings, accountMenu, resumeResource, toggleProjectResource, selectSearchResult, renderMenu }) {
   const searchThreads = useMemo2(() => sortSessions(projectSessions).map((session) => ({
     id: session.sessionId,
-    title: sessionLabel(session),
+    title: sessionLabel(session, projectSessions),
     preview: sessionDiscoveryMeta(session, projectById),
     group: sessionSearchGroup(session.updatedAt),
     keywords: session.firstMessage ? [normalizeSessionLabel(session.firstMessage)] : []
@@ -8152,7 +8175,7 @@ var ComposerTriggerPopover = memo(function ComposerTriggerPopover2({ open, kind,
     })]
   }) : null;
 });
-var LazyModelSelectorList = lazy(() => import("./model-selector-list-OYnzNbyu-HBGCNF2L.js").then(({ ModelSelectorList: ModelSelectorList2 }) => ({ default: ModelSelectorList2 })));
+var LazyModelSelectorList = lazy(() => import("./model-selector-list-jBTZc2Mu-OXJOS5NA.js").then(({ ModelSelectorList: ModelSelectorList2 }) => ({ default: ModelSelectorList2 })));
 function ModelSelectorList(props) {
   return /* @__PURE__ */ jsx(Suspense, {
     fallback: /* @__PURE__ */ jsx("div", {
@@ -8272,6 +8295,8 @@ function slashCommandName(item) {
   return (item.value ?? item.id).trim().replace(/^\/+/, "").split(/\s+/, 1)[0] ?? item.id;
 }
 function slashArgumentHint(item) {
+  const fromMetadata = item.metadata?.argumentHint?.trim();
+  if (fromMetadata) return fromMetadata;
   return (item.value?.trim() ?? "").match(/^\/\S+\s+(.+)$/)?.[1];
 }
 function useFleetPiInputBarState({ models, status, thinkingLevel, onModelChange, onThinkingLevelChange, onSend, onSlashCommandSelect, onLocalSlashSubmit, modelPickerOpen, onModelPickerOpenChange, effortPickerOpen, onEffortPickerOpenChange, workspaceReferences = EMPTY_WORKSPACE_REFERENCES$1, workspaceSuggestions, onWorkspaceReferenceSelect, onRemoveWorkspaceReference, controlled, disabled: disabled2, questionBar, attachments, slashCommands }) {
@@ -8766,7 +8791,7 @@ function PromptSuggestions(props) {
     })
   });
 }
-var LazyFleetMessageQueue = lazy(() => import("./fleet-message-queue-j0DCU5Xy-5HKBHMPV.js").then(({ FleetMessageQueue: FleetMessageQueue2 }) => ({ default: FleetMessageQueue2 })));
+var LazyFleetMessageQueue = lazy(() => import("./fleet-message-queue-BS-cZ56r-GLZXUKDF.js").then(({ FleetMessageQueue: FleetMessageQueue2 }) => ({ default: FleetMessageQueue2 })));
 function FleetMessageQueue(props) {
   return /* @__PURE__ */ jsx(Suspense, {
     fallback: null,
@@ -9042,7 +9067,7 @@ var MemoChatComposerHost = memo(ChatComposerHost);
 function getConversationTurnKey(turn, turnIndex) {
   return turn.user?.id ?? turn.assistants[0]?.id ?? `assistant-turn-${turnIndex}`;
 }
-function FleetPiAgentChat({ toolRenderers = PI_TOOL_RENDERERS, suggestions, status, onStop, onSend, inputBar, className, messages, error, suppressQuestionTool = false, onOpenUIAction, activityLabel, presentation, artifactRuns, onOpenArtifact, onOpenUIArtifactReady, queue, onDeleteQueuedMessage }) {
+function FleetPiAgentChat({ toolRenderers = PI_TOOL_RENDERERS, suggestions, status, onStop, onSend, inputBar, className, messages, error, suppressQuestionTool = false, onOpenUIAction, activityLabel, presentation, artifactRuns, onOpenArtifact, onOpenUIArtifactReady, queue, onDeleteQueuedMessage, onEditQueuedMessage }) {
   const draftSetterRef = useRef2(null);
   const viewportRef = useRef2(null);
   const setDraft = useCallback2((value) => draftSetterRef.current?.(value), []);
@@ -9172,12 +9197,13 @@ function FleetPiAgentChat({ toolRenderers = PI_TOOL_RENDERERS, suggestions, stat
           steering: [],
           followUp: []
         },
-        onDelete: onDeleteQueuedMessage
+        onDelete: onDeleteQueuedMessage,
+        onEdit: onEditQueuedMessage
       })
     ]
   });
 }
-function ChatPanel({ messages, status, error, workspaceName, activityLabel, presentation, artifactRuns, queue, onDeleteQueuedMessage, onOpenArtifact, onOpenUIArtifactReady, inputSuggestionItems, suppressQuestionTool, inputBar, onSend, onOpenUIAction, onStop, onQuestionAnswer }) {
+function ChatPanel({ messages, status, error, workspaceName, activityLabel, presentation, artifactRuns, queue, onDeleteQueuedMessage, onEditQueuedMessage, onOpenArtifact, onOpenUIArtifactReady, inputSuggestionItems, suppressQuestionTool, inputBar, onSend, onOpenUIAction, onStop, onQuestionAnswer }) {
   const handleSend = useCallback2((msg) => {
     onSend(msg.content, msg.altKey);
   }, [onSend]);
@@ -9210,6 +9236,7 @@ function ChatPanel({ messages, status, error, workspaceName, activityLabel, pres
       artifactRuns,
       queue,
       onDeleteQueuedMessage,
+      onEditQueuedMessage,
       onOpenArtifact,
       onOpenUIArtifactReady,
       questionTool,
@@ -9446,8 +9473,8 @@ function notifyChatError(error) {
   if (isDaemonDisconnectError(error)) return;
   notify.error(error instanceof Error ? error.message : String(error));
 }
-var LazyChatCommandPalette = lazy(() => import("./chat-command-palette-Dgl5tqWn-72LLEWUD.js").then(({ ChatCommandPalette }) => ({ default: ChatCommandPalette })));
-var LazySettingsDialog = lazy(() => import("./settings-dialog-BvkgNflv-GPJ6COQO.js").then(({ SettingsDialog }) => ({ default: SettingsDialog })));
+var LazyChatCommandPalette = lazy(() => import("./chat-command-palette-7gbqEnm9-6XICQZN7.js").then(({ ChatCommandPalette }) => ({ default: ChatCommandPalette })));
+var LazySettingsDialog = lazy(() => import("./settings-dialog-DndPbM-v-RFNXXEAN.js").then(({ SettingsDialog }) => ({ default: SettingsDialog })));
 var LazyForkPickerDialog = lazy(() => import("./fork-picker-dialog-DlINz9UQ-UWIXFDJX.js").then(({ ForkPickerDialog }) => ({ default: ForkPickerDialog })));
 function ChatCommandPaletteOverlay({ chrome, conversation, dialogs, panels, session }) {
   return /* @__PURE__ */ jsx(Fragment$1, { children: dialogs.commandPaletteOpen ? /* @__PURE__ */ jsx(Suspense, {
@@ -9619,7 +9646,7 @@ var chatClient = {
       body: JSON.stringify(request)
     });
   },
-  async deleteQueuedMessage(request) {
+  async mutateQueuedMessage(request) {
     const body = ChatQueueMutationRequestSchema.parse(request);
     return fetchValidatedJson("/api/chat/session", ChatQueueMutationResponseSchema, {
       method: "PATCH",
@@ -9627,6 +9654,12 @@ var chatClient = {
       body: JSON.stringify(body)
     });
   },
+  async deleteQueuedMessage(request) {
+    return this.mutateQueuedMessage({
+      ...request,
+      mutation: request.mutation ?? { type: "delete" }
+    });
+  },
   async browseWorkspace(path, projectId) {
     const params = new URLSearchParams();
     if (projectId) params.set("projectId", projectId);
@@ -9822,6 +9855,33 @@ var chatClient = {
     };
     await attempt(true);
   },
+  async getMcpConnections() {
+    return fetchValidatedJson("/api/chat/mcp", ChatMcpListResponseSchema);
+  },
+  async upsertMcpConnection(request) {
+    const body = ChatMcpUpsertRequestSchema.parse(request);
+    return fetchValidatedJson("/api/chat/mcp", ChatMcpListResponseSchema, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
+  },
+  async removeMcpConnection(request) {
+    const body = ChatMcpDeleteRequestSchema.parse(request);
+    return fetchValidatedJson("/api/chat/mcp", ChatMcpListResponseSchema, {
+      method: "DELETE",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
+  },
+  async mcpOAuth(request) {
+    const body = ChatMcpOAuthLoginRequestSchema.parse(request);
+    return fetchValidatedJson("/api/chat/mcp/oauth", ChatMcpOAuthLoginResponseSchema, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
+  },
   async getProviders() {
     return fetchValidatedJson("/api/chat/providers", ChatProvidersResponseSchema);
   },
@@ -9850,7 +9910,7 @@ var chatClient = {
     });
   }
 };
-var keys = {
+var chatQueryKeys = {
   models: (projectId) => [
     "chat",
     "models",
@@ -9863,6 +9923,7 @@ var keys = {
     projectId ?? "default"
   ],
   providers: ["chat", "providers"],
+  mcp: ["chat", "mcp"],
   resources: (projectId) => [
     "chat",
     "resources",
@@ -9885,6 +9946,7 @@ var keys = {
   ],
   projects: ["projects"]
 };
+var keys = chatQueryKeys;
 function useChatModels(projectId) {
   return useQuery({
     queryKey: keys.models(projectId),
@@ -9958,6 +10020,43 @@ function useWorkspaceTree(projectId, options) {
     enabled: Boolean(projectId) && options?.enabled !== false
   });
 }
+function useChatMcpConnections() {
+  return useQuery({
+    queryKey: keys.mcp,
+    queryFn: () => chatClient.getMcpConnections()
+  });
+}
+function useUpdateMcpConnection() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (request) => chatClient.upsertMcpConnection(request),
+    onSuccess: (data) => {
+      queryClient.setQueryData(keys.mcp, data);
+      queryClient.invalidateQueries({ queryKey: ["chat", "resources"] });
+    }
+  });
+}
+function useRemoveMcpConnection() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (request) => chatClient.removeMcpConnection(request),
+    onSuccess: (data) => {
+      queryClient.setQueryData(keys.mcp, data);
+      queryClient.invalidateQueries({ queryKey: ["chat", "resources"] });
+    }
+  });
+}
+function useMcpOAuth() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (request) => chatClient.mcpOAuth(request),
+    onSuccess: (data) => {
+      if (data.status !== "success" || !data.connections) return;
+      queryClient.setQueryData(keys.mcp, { connections: data.connections });
+      queryClient.invalidateQueries({ queryKey: ["chat", "resources"] });
+    }
+  });
+}
 function useChatProviders() {
   return useQuery({
     queryKey: keys.providers,
@@ -10385,15 +10484,25 @@ function normalizeSlashCommandName(name) {
   const normalized = name.trim().replace(/\s+/g, "-");
   return /^[\w.-]+$/.test(normalized) ? normalized : "";
 }
+function slashSuggestionValue(name) {
+  return `/${name} `;
+}
 function toSlashSuggestion(command) {
+  const argumentHint = command.argumentHint?.trim();
   return {
     id: command.name,
     label: `/${command.name}`,
-    value: `/${command.name}${command.argumentHint ? ` ${command.argumentHint}` : ""} `,
+    value: slashSuggestionValue(command.name),
     description: command.description,
-    category: command.category ?? "builtin"
+    category: command.category ?? "builtin",
+    ...argumentHint ? { metadata: { argumentHint } } : {}
   };
 }
+function slashCommandInsertsPrefixOnSelect(item) {
+  if (item.metadata?.argumentHint?.trim()) return true;
+  const builtin = WEB_BUILTIN_SLASH_COMMANDS.find((command) => command.name === item.id);
+  return Boolean(builtin?.argumentHint?.trim());
+}
 function buildSlashCommands(resources, enabled, commandsData) {
   const byId = /* @__PURE__ */ new Map();
   for (const command of WEB_BUILTIN_SLASH_COMMANDS) byId.set(command.name, toSlashSuggestion(command));
@@ -10406,12 +10515,14 @@ function buildSlashCommands(resources, enabled, commandsData) {
     if (resource.activationStatus && resource.activationStatus !== "active") continue;
     const commandName = normalizeSlashCommandName(resource.name);
     if (!commandName || byId.has(commandName)) continue;
+    const argumentHint = resource.argumentHint?.trim();
     byId.set(commandName, {
       id: commandName,
       label: `/${commandName}`,
-      value: `/${commandName} `,
+      value: slashSuggestionValue(commandName),
       description: resource.description,
-      category
+      category,
+      ...argumentHint ? { metadata: { argumentHint } } : {}
     });
   }
   return Array.from(byId.values());
@@ -11888,6 +11999,7 @@ function useChatWorkspaceHeader({ activeTabId, tabs, onCloseTab, onNewSession, o
   };
 }
 var CHAT_COMMAND_URL = "/api/chat/command";
+var MCP_USAGE = "MCP usage: /mcp, /mcp list, /mcp login <name>, /mcp logout <name>.";
 function liveSessionId(metadata) {
   const id = metadata.sessionId?.trim();
   return id ? id : void 0;
@@ -11965,6 +12077,7 @@ ${text}`;
   }).join("\n\n---\n\n");
 }
 function useLocalSlashActions({ appendLocalMessage, getMessages, getSessionMetadata, modelKey, models, onForkPicker, openSettings, onOpenUIRequest, resumeSession, sessions, setEffortPickerOpen, setModelKey, setModelPickerOpen, setThinkingLevel, startNewSession }) {
+  const queryClient = useQueryClient();
   const chatCommand = useCallback2(async (command, args = "") => {
     const sessionId = liveSessionId(getSessionMetadata());
     if (!sessionId) return {
@@ -12207,10 +12320,35 @@ ${sessions.map((session) => {
       case "open-logout":
         appendLocalMessage("Provider sign-out is managed by Fleet Prime CLI commands.");
         return true;
-      case "open-mcp":
-        openSettings("chat");
-        if (action.args) appendLocalMessage(`MCP: ${action.args}. Manage MCP connections with Fleet Prime CLI configuration.`);
+      case "open-mcp": {
+        openSettings("mcp");
+        const parts = action.args.trim().split(/\s+/).filter(Boolean);
+        const verb = parts[0];
+        const target = parts.slice(1).join(" ");
+        if (!verb || verb === "list" || (verb === "login" || verb === "reconnect") && !target) return true;
+        if ((verb === "login" || verb === "reconnect") && target) {
+          appendLocalMessage(`Open Settings \u2192 MCP and sign in to "${target}".`);
+          return true;
+        }
+        if (verb === "logout" && target) {
+          (async () => {
+            try {
+              const result = await chatClient.mcpOAuth({
+                name: target,
+                action: "logout"
+              });
+              if (result.connections) queryClient.setQueryData(chatQueryKeys.mcp, { connections: result.connections });
+              queryClient.invalidateQueries({ queryKey: ["chat", "resources"] });
+              appendLocalMessage(`Signed out of MCP connection "${target}".`);
+            } catch (error) {
+              appendLocalMessage(error instanceof Error ? error.message : `Could not sign out of "${target}".`);
+            }
+          })();
+          return true;
+        }
+        appendLocalMessage(MCP_USAGE);
         return true;
+      }
       case "fast-toggle":
         (async () => {
           appendLocalMessage("/fast toggles OpenAI Fast mode. The web port reads this from ~/.prime/agent/settings.json \u2014 flip `fastMode` there or in Settings.");
@@ -12271,6 +12409,7 @@ ${sessions.map((session) => {
     onForkPicker,
     openSettings,
     onOpenUIRequest,
+    queryClient,
     sessions,
     setEffortPickerOpen,
     setModelKey,
@@ -12279,7 +12418,7 @@ ${sessions.map((session) => {
     startNewSession
   ]);
   const handleSlashCommandSelect = useCallback2((item) => {
-    if (item.id === "openui") return false;
+    if (slashCommandInsertsPrefixOnSelect(item)) return false;
     const action = resolveLocalSlashAction(item.id);
     if (!action) return false;
     return applyLocalSlashAction(action);
@@ -13359,7 +13498,7 @@ function usePiChat(model, options) {
   const planLabelRef = useRef2(planLabel);
   const queueRef = useRef2(queue);
   const queueRevisionRef = useRef2(0);
-  const queuedDeletionTailRef = useRef2(null);
+  const queuedMutationTailRef = useRef2(null);
   const presentationRef = useRef2(presentation);
   const pendingSendControllerRef = useRef2(null);
   const streamControllersRef = useRef2(/* @__PURE__ */ new Map());
@@ -13612,14 +13751,14 @@ function usePiChat(model, options) {
     setActivityLabelSynced,
     setQueueSynced
   ]);
-  const deleteQueuedMessage = useCallback2((lane, index, expectedText) => {
+  const mutateQueuedMessage = useCallback2((lane, index, expectedText, mutation, options2) => {
     const originatingSessionId = sessionMetadataRef.current.sessionId;
     const requestedRevision = queueRevisionRef.current;
     const requestedMatchCount = (lane === "steering" ? queueRef.current.steering : queueRef.current.followUp).filter((item) => item === expectedText).length;
-    const deletion = (queuedDeletionTailRef.current ?? Promise.resolve()).catch(() => void 0).then(async () => {
+    const queuedMutation = (queuedMutationTailRef.current ?? Promise.resolve()).catch(() => void 0).then(async () => {
       if (!originatingSessionId || sessionMetadataRef.current.sessionId !== originatingSessionId) return false;
-      const refuseStaleDeletion = (expectedRace) => {
-        if (!expectedRace) notifyChatError(/* @__PURE__ */ new Error("The queued message changed before it could be deleted."));
+      const refuseStaleMutation = (expectedRace) => {
+        if (!expectedRace && options2?.staleMessage) notifyChatError(new Error(options2.staleMessage));
         return false;
       };
       const current = queueRef.current;
@@ -13627,26 +13766,30 @@ function usePiChat(model, options) {
       let resolvedIndex;
       if (queueRevisionRef.current === requestedRevision) resolvedIndex = items[index] === expectedText ? index : void 0;
       else {
-        if (requestedMatchCount !== 1) return refuseStaleDeletion(true);
+        if (requestedMatchCount !== 1) return refuseStaleMutation(true);
         const currentMatches = items.reduce((matches2, item, itemIndex) => {
           if (item === expectedText) matches2.push(itemIndex);
           return matches2;
         }, []);
         resolvedIndex = currentMatches.length === 1 ? currentMatches[0] : void 0;
       }
-      if (resolvedIndex === void 0) return refuseStaleDeletion(queueRevisionRef.current !== requestedRevision);
-      const optimistic = {
+      if (resolvedIndex === void 0) return refuseStaleMutation(queueRevisionRef.current !== requestedRevision);
+      const optimistic = mutation.type === "delete" ? {
         ...current,
         [lane]: items.filter((_, itemIndex) => itemIndex !== resolvedIndex)
+      } : {
+        ...current,
+        [lane]: items.map((item, itemIndex) => itemIndex === resolvedIndex ? mutation.text : item)
       };
       setQueueSynced(optimistic);
       const requestRevision = queueRevisionRef.current;
       try {
-        const result = await client.deleteQueuedMessage({
+        const result = await client.mutateQueuedMessage({
           sessionId: originatingSessionId,
           lane,
           index: resolvedIndex,
-          expectedText
+          expectedText,
+          mutation
         });
         if (sessionMetadataRef.current.sessionId !== originatingSessionId || queueRevisionRef.current !== requestRevision) return result.status === "applied";
         setQueueSynced(result.queue);
@@ -13656,9 +13799,15 @@ function usePiChat(model, options) {
         throw queueError;
       }
     });
-    queuedDeletionTailRef.current = deletion.then(() => void 0, () => void 0);
-    return deletion;
+    queuedMutationTailRef.current = queuedMutation.then(() => void 0, () => void 0);
+    return queuedMutation;
   }, [client, setQueueSynced]);
+  const deleteQueuedMessage = useCallback2((lane, index, expectedText) => mutateQueuedMessage(lane, index, expectedText, { type: "delete" }, { staleMessage: "The queued message changed before it could be deleted." }), [mutateQueuedMessage]);
+  const editQueuedMessage = useCallback2((lane, index, expectedText, nextText) => mutateQueuedMessage(lane, index, expectedText, {
+    type: "replace",
+    text: nextText,
+    lane
+  }, { staleMessage: "The queued message changed before it could be updated." }), [mutateQueuedMessage]);
   const startNewSession = useCallback2(async (options2) => {
     if (options2?.preserveRunning === false) stop();
     else {
@@ -13829,6 +13978,7 @@ function usePiChat(model, options) {
     answerQuestion,
     appendLocalMessage,
     deleteQueuedMessage,
+    editQueuedMessage,
     deleteSession,
     error,
     getMessages: useCallback2(() => messagesRef.current, []),
@@ -13851,7 +14001,7 @@ function usePiChat(model, options) {
     switchProject
   };
 }
-function useRightPanelContextValue({ activityLabel, artifactRuns, chatMode, handleThemePreferenceChange, isLoadingProviders, isUpdatingProvider, loadSession, loadSubagentSession, loadWorkspaceFile: loadWorkspaceFile2, messages, onOpenSubagentTab, modelKey, models, modelCatalog, onDiscoverModels, onOAuthLogin, onRemoveProvider, onUpdateProvider, openWorkspacePath, planLabel, presentation, providers, queue, refreshResources, refreshWorkspace, resources, resourcesError, resourcesLoading, rightPanel, reopenRightPanel, saveSettings, selectedArtifactId, sessionId, selectedWorkspacePath, setRightPanel, setSelectedWorkspacePath, settings, settingsError, settingsLoading, status, thinkingLevel, themePreference, workspaceError, workspaceLoading, workspaceTree }) {
+function useRightPanelContextValue({ activityLabel, artifactRuns, chatMode, handleThemePreferenceChange, isLoadingMcp, isLoadingProviders, isUpdatingMcp, isUpdatingProvider, loadSession, loadSubagentSession, loadWorkspaceFile: loadWorkspaceFile2, messages, onOpenSubagentTab, modelKey, models, modelCatalog, onDiscoverModels, onMcpOAuth, onOAuthLogin, onRemoveMcp, onRemoveProvider, onUpdateMcp, onUpdateProvider, openWorkspacePath, planLabel, presentation, mcpConnections, providers, queue, refreshResources, refreshWorkspace, resources, resourcesError, resourcesLoading, rightPanel, reopenRightPanel, saveSettings, selectedArtifactId, sessionId, selectedWorkspacePath, setRightPanel, setSelectedWorkspacePath, settings, settingsError, settingsLoading, status, thinkingLevel, themePreference, workspaceError, workspaceLoading, workspaceTree }) {
   const chatPanelData = useMemo2(() => ({
     activityLabel,
     artifactRuns,
@@ -13923,13 +14073,19 @@ function useRightPanelContextValue({ activityLabel, artifactRuns, chatMode, hand
   return {
     chatPanelData,
     settingsActions: useMemo2(() => ({
+      isLoadingMcp,
       isLoadingProviders,
+      isUpdatingMcp,
       isUpdatingProvider,
+      mcpConnections,
       modelCatalog,
       onDiscoverModels,
+      onMcpOAuth,
       onOAuthLogin,
+      onRemoveMcp,
       onRemoveProvider,
       onThemePreferenceChange: handleThemePreferenceChange,
+      onUpdateMcp,
       onUpdateProvider,
       providers,
       saveSettings,
@@ -13939,12 +14095,18 @@ function useRightPanelContextValue({ activityLabel, artifactRuns, chatMode, hand
       themePreference
     }), [
       handleThemePreferenceChange,
+      isLoadingMcp,
       isLoadingProviders,
+      isUpdatingMcp,
       isUpdatingProvider,
+      mcpConnections,
       modelCatalog,
       onDiscoverModels,
+      onMcpOAuth,
       onOAuthLogin,
+      onRemoveMcp,
       onRemoveProvider,
+      onUpdateMcp,
       onUpdateProvider,
       providers,
       saveSettings,
@@ -14010,10 +14172,14 @@ function useChatWorkspaceData() {
     if (user) ;
   }, [user]);
   const { data: providersData, isLoading: isLoadingProviders } = useChatProviders();
+  const { data: mcpData, isLoading: isLoadingMcp } = useChatMcpConnections();
   const { data: projectsData, refetch: refetchProjects } = useChatProjects();
   const { mutateAsync: onUpdateProvider, isPending: isUpdatingProvider } = useUpdateChatProvider();
   const { mutateAsync: onOAuthLogin } = useOAuthLoginProvider();
   const { mutateAsync: onRemoveProvider, isPending: isRemovingProvider } = useRemoveChatProvider();
+  const { mutateAsync: onUpdateMcp, isPending: isUpdatingMcp } = useUpdateMcpConnection();
+  const { mutateAsync: onRemoveMcp, isPending: isRemovingMcp } = useRemoveMcpConnection();
+  const { mutateAsync: onMcpOAuth } = useMcpOAuth();
   const { data: modelsData } = useChatModels(activeProjectId);
   const { data: modelCatalogData } = useChatModelCatalog({
     enabled: settingsDialogOpen,
@@ -14063,7 +14229,7 @@ function useChatWorkspaceData() {
   const refreshWorkspace = useCallback2(() => {
     refetchWorkspace();
   }, [refetchWorkspace]);
-  const { activityLabel, answerQuestion, appendLocalMessage, deleteQueuedMessage, deleteSession, error, getMessages, getSessionMetadata, messages, planLabel, persistOpenUIArtifact, presentation, queue, renameSession, resumeSession, sendMessage, sessionMetadata, sessions, startNewSession, switchProject, status, stop } = usePiChat(modelSelection, {
+  const { activityLabel, answerQuestion, appendLocalMessage, deleteQueuedMessage, editQueuedMessage, deleteSession, error, getMessages, getSessionMetadata, messages, planLabel, persistOpenUIArtifact, presentation, queue, renameSession, resumeSession, sendMessage, sessionMetadata, sessions, startNewSession, switchProject, status, stop } = usePiChat(modelSelection, {
     initialSessionMetadata,
     projectId: activeProjectId,
     persistSession
@@ -14362,7 +14528,9 @@ function useChatWorkspaceData() {
     artifactRuns,
     chatMode,
     handleThemePreferenceChange,
+    isLoadingMcp,
     isLoadingProviders,
+    isUpdatingMcp: isUpdatingMcp || isRemovingMcp,
     isUpdatingProvider: isUpdatingProvider || isRemovingProvider,
     loadSession: loadChatSession,
     loadSubagentSession,
@@ -14373,12 +14541,16 @@ function useChatWorkspaceData() {
     models,
     modelCatalog,
     onDiscoverModels,
+    onMcpOAuth,
     onOAuthLogin,
+    onRemoveMcp,
     onRemoveProvider,
+    onUpdateMcp,
     onUpdateProvider,
     openWorkspacePath,
     planLabel,
     presentation,
+    mcpConnections: mcpData?.connections ?? [],
     providers: providersData?.providers ?? [],
     queue,
     refreshResources,
@@ -14436,6 +14608,7 @@ function useChatWorkspaceData() {
       activityLabel,
       artifactRuns,
       deleteQueuedMessage,
+      editQueuedMessage,
       error,
       messages,
       openArtifact,
@@ -14506,7 +14679,7 @@ function useChatWorkspaceData() {
     }
   };
 }
-var LazySubagentChatPanel = lazy(() => import("./subagent-chat-panel-CMuvW9Sd-M5TEEGQW.js").then(({ SubagentChatPanel }) => ({ default: SubagentChatPanel })));
+var LazySubagentChatPanel = lazy(() => import("./subagent-chat-panel-C0RpnXav-J7VYO7QY.js").then(({ SubagentChatPanel }) => ({ default: SubagentChatPanel })));
 function ChatWorkspaceShell() {
   const { session, conversation, composer, panels, dialogs, chrome, agentTabs } = useChatWorkspaceData();
   const toggleCommandPalette = useCallback2(() => {
@@ -14587,6 +14760,7 @@ function ChatWorkspaceShell() {
     artifactRuns: conversation.artifactRuns,
     queue: conversation.queue,
     onDeleteQueuedMessage: conversation.deleteQueuedMessage,
+    onEditQueuedMessage: conversation.editQueuedMessage,
     onOpenArtifact: conversation.openArtifact,
     onOpenUIArtifactReady: handleOpenUIArtifactReady,
     inputSuggestionItems: composer.inputSuggestionItems,