@openhands/agent-canvas 1.0.0-rc.2 → 1.0.0-rc.4

package/dist/components/conversation-events/chat/event-message.js

@@ -1,114 +1,123 @@
 import { AgentState as e } from "../../../types/agent-state.js";
 import { useConversationStore as t } from "../../../stores/conversation-store.js";
-import { isACPToolCallEvent as n, isActionEvent as r, isAgentErrorEvent as i, isHookExecutionEvent as a, isObservationEvent as o, isPlanningFileEditorObservationEvent as s, isUserMessageEvent as c } from "../../../types/agent-server/type-guards.js";
-import { useAgentState as l } from "../../../hooks/use-agent-state.js";
-import { useConfig as u } from "../../../hooks/query/use-config.js";
-import { PlanPreview as d } from "../../features/chat/plan-preview.js";
-import { ErrorEventMessage as f } from "./event-message-components/error-event-message.js";
-import { UserAssistantEventMessage as p } from "./event-message-components/user-assistant-event-message.js";
-import { createSkillReadyEvent as m } from "./event-content-helpers/create-skill-ready-event.js";
-import { FinishEventMessage as h } from "./event-message-components/finish-event-message.js";
-import { GenericEventMessageWrapper as g } from "./event-message-components/generic-event-message-wrapper.js";
-import { ThoughtEventMessage as _ } from "./event-message-components/thought-event-message.js";
-import { CollapsibleThinking as v } from "./event-message-components/collapsible-thinking.js";
-import { HookExecutionEventMessage as y } from "../../shared/hook-execution-event-message.js";
+import { isACPToolCallEvent as n, isActionEvent as r, isAgentErrorEvent as i, isHookExecutionEvent as a, isObservationEvent as o, isPlanningFileEditorObservationEvent as s, isStreamingDeltaEvent as c, isUserMessageEvent as l } from "../../../types/agent-server/type-guards.js";
+import { useAgentState as u } from "../../../hooks/use-agent-state.js";
+import { useConfig as d } from "../../../hooks/query/use-config.js";
+import { ChatMessage as f } from "../../features/chat/chat-message.js";
+import { PlanPreview as p } from "../../features/chat/plan-preview.js";
+import { ErrorEventMessage as m } from "./event-message-components/error-event-message.js";
+import { UserAssistantEventMessage as h } from "./event-message-components/user-assistant-event-message.js";
+import { createSkillReadyEvent as g } from "./event-content-helpers/create-skill-ready-event.js";
+import { FinishEventMessage as _ } from "./event-message-components/finish-event-message.js";
+import { GenericEventMessageWrapper as v } from "./event-message-components/generic-event-message-wrapper.js";
+import { ThoughtEventMessage as y } from "./event-message-components/thought-event-message.js";
+import { CollapsibleThinking as b } from "./event-message-components/collapsible-thinking.js";
+import { HookExecutionEventMessage as x } from "../../shared/hook-execution-event-message.js";
 import "./event-message-components/hook-execution-event-message.js";
-import { shouldShowPlanPreview as b } from "./hooks/use-plan-preview-events.js";
-import { getReasoningContent as x } from "./event-thought-helpers.js";
+import { shouldShowPlanPreview as S } from "./hooks/use-plan-preview-events.js";
+import { getReasoningContent as C } from "./event-thought-helpers.js";
 import "react";
-import { Fragment as S, jsx as C, jsxs as w } from "react/jsx-runtime";
+import { Fragment as w, jsx as T, jsxs as E } from "react/jsx-runtime";
 //#region src/components/conversation-events/chat/event-message.tsx
-var T = (e) => e.activated_skills || e.activated_microagents || [], E = (e) => !e || e.length === 0 ? !1 : e.some((e) => e.type === "text" && e.text.trim().length > 0), D = (e) => {
-	let t = T(e).length > 0, n = E(e.extended_content);
+var D = (e) => e.activated_skills || e.activated_microagents || [], O = (e) => !e || e.length === 0 ? !1 : e.some((e) => e.type === "text" && e.text.trim().length > 0), k = (e) => {
+	let t = D(e).length > 0, n = O(e.extended_content);
 	return t && n;
-}, O = (e, t, n) => {
+}, A = (e, t, n) => {
 	try {
-		let r = m(e);
-		return /* @__PURE__ */ w(S, { children: [/* @__PURE__ */ C(p, {
+		let r = g(e);
+		return /* @__PURE__ */ E(w, { children: [/* @__PURE__ */ T(h, {
 			event: e,
 			isLastMessage: !1,
 			isFromPlanningAgent: t.isFromPlanningAgent
-		}), /* @__PURE__ */ C(g, {
+		}), /* @__PURE__ */ T(v, {
 			event: r,
 			isLastMessage: n
 		})] });
 	} catch {
-		return /* @__PURE__ */ C(p, {
+		return /* @__PURE__ */ T(h, {
 			event: e,
 			isLastMessage: n,
 			isFromPlanningAgent: t.isFromPlanningAgent
 		});
 	}
 };
-function k({ event: m, messages: T, isLastMessage: E, isInLast10Actions: k, planPreviewEventIds: A, suppressThought: j = !1 }) {
-	let { data: M } = u(), { planContent: N } = t(), { curAgentState: P } = l(), F = P === e.RUNNING || P === e.LOADING, I = m.isFromPlanningAgent || !1, L = {
-		isLastMessage: E,
-		isInLast10Actions: k,
-		config: M,
-		isFromPlanningAgent: I
+function j({ event: g, messages: D, isLastMessage: O, isInLast10Actions: j, planPreviewEventIds: M, suppressThought: N = !1 }) {
+	let { data: P } = d(), { planContent: F } = t(), { curAgentState: I } = u(), L = I === e.RUNNING || I === e.LOADING, R = g.isFromPlanningAgent || !1, z = {
+		isLastMessage: O,
+		isInLast10Actions: j,
+		config: P,
+		isFromPlanningAgent: R
 	};
-	if (i(m)) return /* @__PURE__ */ C(f, {
-		event: m,
-		...L
+	if (i(g)) return /* @__PURE__ */ T(m, {
+		event: g,
+		...z
 	});
-	if (a(m)) return /* @__PURE__ */ C(y, { event: m });
-	if (n(m)) return /* @__PURE__ */ C(g, {
-		event: m,
-		isLastMessage: E
+	if (a(g)) return /* @__PURE__ */ T(x, { event: g });
+	if (n(g)) return /* @__PURE__ */ T(v, {
+		event: g,
+		isLastMessage: O
 	});
-	if (r(m) && m.action.kind === "FinishAction") return /* @__PURE__ */ C(h, {
-		event: m,
-		...L
+	if (c(g)) {
+		let e = g.content ?? "", t = g.reasoning_content ?? "";
+		return /* @__PURE__ */ E(w, { children: [t && /* @__PURE__ */ T(b, { content: t }), e && /* @__PURE__ */ T(f, {
+			type: "agent",
+			message: e,
+			isFromPlanningAgent: R
+		})] });
+	}
+	if (r(g) && g.action.kind === "FinishAction") return /* @__PURE__ */ T(_, {
+		event: g,
+		...z
 	});
-	if (r(m) && m.action.kind === "ThinkAction") return /* @__PURE__ */ C(v, { content: m.action.thought });
-	if (r(m)) {
-		let e = x(m);
-		return /* @__PURE__ */ w(S, { children: [
-			e && /* @__PURE__ */ C(v, { content: e }),
-			!j && /* @__PURE__ */ C(_, {
-				event: m,
-				isFromPlanningAgent: I
+	if (r(g) && g.action.kind === "ThinkAction") return /* @__PURE__ */ T(b, { content: g.action.thought });
+	if (r(g)) {
+		let e = C(g);
+		return /* @__PURE__ */ E(w, { children: [
+			e && /* @__PURE__ */ T(b, { content: e }),
+			!N && /* @__PURE__ */ T(y, {
+				event: g,
+				isFromPlanningAgent: R
 			}),
-			/* @__PURE__ */ C(g, {
-				event: m,
-				isLastMessage: E
+			/* @__PURE__ */ T(v, {
+				event: g,
+				isLastMessage: O
 			})
 		] });
 	}
-	if (o(m)) {
-		if (s(m)) return A && b(m.id, A) ? /* @__PURE__ */ C(d, {
-			planContent: N,
-			isStreaming: E && P === e.RUNNING,
-			isBuildDisabled: F
+	if (o(g)) {
+		if (s(g)) return M && S(g.id, M) ? /* @__PURE__ */ T(p, {
+			planContent: F,
+			isStreaming: O && I === e.RUNNING,
+			isBuildDisabled: L
 		}) : null;
-		let t = T.find((e) => r(e) && e.id === m.action_id), n = !j && t && r(t) && t.action.kind !== "ThinkAction", i = t && r(t) ? x(t) : "";
-		return /* @__PURE__ */ w(S, { children: [
-			i && /* @__PURE__ */ C(v, { content: i }),
-			n && /* @__PURE__ */ C(_, {
+		let t = D.find((e) => r(e) && e.id === g.action_id), n = !N && t && r(t) && t.action.kind !== "ThinkAction", i = t && r(t) ? C(t) : "";
+		return /* @__PURE__ */ E(w, { children: [
+			i && /* @__PURE__ */ T(b, { content: i }),
+			n && /* @__PURE__ */ T(y, {
 				event: t,
-				isFromPlanningAgent: I
+				isFromPlanningAgent: R
 			}),
-			/* @__PURE__ */ C(g, {
-				event: m,
-				isLastMessage: E,
+			/* @__PURE__ */ T(v, {
+				event: g,
+				isLastMessage: O,
 				correspondingAction: t && r(t) ? t : void 0
 			})
 		] });
 	}
-	if (!r(m) && !o(m)) {
-		let e = m;
-		return c(m) && D(e) ? O(e, L, E) : /* @__PURE__ */ C(p, {
+	if (!r(g) && !o(g)) {
+		let e = g;
+		return l(g) && k(e) ? A(e, z, O) : /* @__PURE__ */ T(h, {
 			event: e,
-			...L,
-			isLastMessage: E
+			...z,
+			isLastMessage: O
 		});
 	}
-	return /* @__PURE__ */ C(g, {
-		event: m,
-		isLastMessage: E
+	return /* @__PURE__ */ T(v, {
+		event: g,
+		isLastMessage: O
 	});
 }
 //#endregion
-export { k as EventMessage };
+export { j as EventMessage };
 
 //# sourceMappingURL=event-message.js.map

package/dist/components/conversation-events/chat/event-message.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-message.js","names":[],"sources":["../../../../src/components/conversation-events/chat/event-message.tsx"],"sourcesContent":["import React from \"react\";\nimport {\n  OpenHandsEvent,\n  MessageEvent,\n  ActionEvent,\n} from \"#/types/agent-server/core\";\nimport {\n  FinishAction,\n  ThinkAction,\n} from \"#/types/agent-server/core/base/action\";\nimport {\n  isActionEvent,\n  isObservationEvent,\n  isAgentErrorEvent,\n  isUserMessageEvent,\n  isPlanningFileEditorObservationEvent,\n  isHookExecutionEvent,\n  isACPToolCallEvent,\n} from \"#/types/agent-server/type-guards\";\nimport { useConfig } from \"#/hooks/query/use-config\";\nimport { useConversationStore } from \"#/stores/conversation-store\";\nimport { useAgentState } from \"#/hooks/use-agent-state\";\nimport { AgentState } from \"#/types/agent-state\";\nimport { PlanPreview } from \"../../features/chat/plan-preview\";\nimport { ErrorEventMessage } from \"./event-message-components/error-event-message\";\nimport { UserAssistantEventMessage } from \"./event-message-components/user-assistant-event-message\";\nimport { FinishEventMessage } from \"./event-message-components/finish-event-message\";\nimport { GenericEventMessageWrapper } from \"./event-message-components/generic-event-message-wrapper\";\nimport { ThoughtEventMessage } from \"./event-message-components/thought-event-message\";\nimport { CollapsibleThinking } from \"./event-message-components/collapsible-thinking\";\nimport { HookExecutionEventMessage } from \"./event-message-components/hook-execution-event-message\";\nimport { createSkillReadyEvent } from \"./event-content-helpers/create-skill-ready-event\";\nimport { shouldShowPlanPreview } from \"./hooks/use-plan-preview-events\";\nimport { getReasoningContent } from \"./event-thought-helpers\";\n\ninterface EventMessageProps {\n  event: OpenHandsEvent & { isFromPlanningAgent?: boolean };\n  messages: OpenHandsEvent[];\n  isLastMessage: boolean;\n  isInLast10Actions: boolean;\n  /** Set of event IDs that should render PlanPreview (one per user message phase) */\n  planPreviewEventIds?: Set<string>;\n  /**\n   * When true, do not render the inline `ThoughtEventMessage` for action /\n   * observation events. The caller is expected to render the thought\n   * separately (e.g. via a hoisted \"thought\" rendered item) so the message\n   * pane and the in-group rendering don't double up on the same content.\n   * Has no effect on `ThinkAction`, whose thought IS its action body.\n   */\n  suppressThought?: boolean;\n}\n\n/**\n * Extracts activated skills from a MessageEvent, supporting both\n * activated_skills and activated_microagents field names.\n */\nconst getActivatedSkills = (event: MessageEvent): string[] =>\n  (event as unknown as { activated_skills?: string[] }).activated_skills ||\n  event.activated_microagents ||\n  [];\n\n/**\n * Checks if extended content contains valid text content.\n */\nconst hasValidExtendedContent = (\n  extendedContent: MessageEvent[\"extended_content\"],\n): boolean => {\n  if (!extendedContent || extendedContent.length === 0) {\n    return false;\n  }\n\n  return extendedContent.some(\n    (content) => content.type === \"text\" && content.text.trim().length > 0,\n  );\n};\n\n/**\n * Determines if a Skill Ready event should be displayed for the given message event.\n */\nconst shouldShowSkillReadyEvent = (messageEvent: MessageEvent): boolean => {\n  const activatedSkills = getActivatedSkills(messageEvent);\n  const hasActivatedSkills = activatedSkills.length > 0;\n  const hasExtendedContent = hasValidExtendedContent(\n    messageEvent.extended_content,\n  );\n\n  return hasActivatedSkills && hasExtendedContent;\n};\n\ninterface CommonProps {\n  isLastMessage: boolean;\n  isInLast10Actions: boolean;\n  config: unknown;\n  isFromPlanningAgent: boolean;\n}\n\n/**\n * Renders a user message with its corresponding Skill Ready event.\n */\nconst renderUserMessageWithSkillReady = (\n  messageEvent: MessageEvent,\n  commonProps: CommonProps,\n  isLastMessage: boolean,\n): React.ReactElement => {\n  try {\n    const skillReadyEvent = createSkillReadyEvent(messageEvent);\n    return (\n      <>\n        <UserAssistantEventMessage\n          event={messageEvent}\n          isLastMessage={false}\n          isFromPlanningAgent={commonProps.isFromPlanningAgent}\n        />\n        <GenericEventMessageWrapper\n          event={skillReadyEvent}\n          isLastMessage={isLastMessage}\n        />\n      </>\n    );\n  } catch (error) {\n    // If skill ready event creation fails, just render the user message\n    return (\n      <UserAssistantEventMessage\n        event={messageEvent}\n        isLastMessage={isLastMessage}\n        isFromPlanningAgent={commonProps.isFromPlanningAgent}\n      />\n    );\n  }\n};\n\nexport function EventMessage({\n  event,\n  messages,\n  isLastMessage,\n  isInLast10Actions,\n  planPreviewEventIds,\n  suppressThought = false,\n}: EventMessageProps) {\n  const { data: config } = useConfig();\n  const { planContent } = useConversationStore();\n  const { curAgentState } = useAgentState();\n\n  // Disable Build button while agent is running (streaming)\n  const isAgentRunning =\n    curAgentState === AgentState.RUNNING ||\n    curAgentState === AgentState.LOADING;\n\n  // Read isFromPlanningAgent directly from the event object\n  const isFromPlanningAgent = event.isFromPlanningAgent || false;\n\n  // Common props for components that need them\n  const commonProps = {\n    isLastMessage,\n    isInLast10Actions,\n    config,\n    isFromPlanningAgent,\n  };\n\n  // Agent error events\n  if (isAgentErrorEvent(event)) {\n    return <ErrorEventMessage event={event} {...commonProps} />;\n  }\n\n  // Hook execution events\n  if (isHookExecutionEvent(event)) {\n    return <HookExecutionEventMessage event={event} />;\n  }\n\n  // ACP sub-agent tool call events (Claude Code, Codex, Gemini CLI, …)\n  // render through the same generic wrapper used for observation events so\n  // the card shape, success indicator and markdown rendering all match.\n  if (isACPToolCallEvent(event)) {\n    return (\n      <GenericEventMessageWrapper event={event} isLastMessage={isLastMessage} />\n    );\n  }\n\n  // Finish actions\n  if (isActionEvent(event) && event.action.kind === \"FinishAction\") {\n    return (\n      <FinishEventMessage\n        event={event as ActionEvent<FinishAction>}\n        {...commonProps}\n      />\n    );\n  }\n\n  // ThinkAction - render the thought inside a collapsible section so it\n  // doesn't dominate the chat, especially when the thinking language\n  // (usually English) differs from the conversation language.\n  if (isActionEvent(event) && event.action.kind === \"ThinkAction\") {\n    const thinkAction = event as ActionEvent<ThinkAction>;\n    return <CollapsibleThinking content={thinkAction.action.thought} />;\n  }\n\n  // Action events - render thought + action (will be replaced by thought + observation)\n  if (isActionEvent(event)) {\n    const reasoningContent = getReasoningContent(event);\n    return (\n      <>\n        {reasoningContent && <CollapsibleThinking content={reasoningContent} />}\n        {!suppressThought && (\n          <ThoughtEventMessage\n            event={event}\n            isFromPlanningAgent={isFromPlanningAgent}\n          />\n        )}\n        <GenericEventMessageWrapper\n          event={event}\n          isLastMessage={isLastMessage}\n        />\n      </>\n    );\n  }\n\n  // Observation events - find the corresponding action and render thought + observation\n  if (isObservationEvent(event)) {\n    // Handle PlanningFileEditorObservation specially\n    if (isPlanningFileEditorObservationEvent(event)) {\n      // Only show PlanPreview if this event is marked as the one to display\n      // (last PlanningFileEditorObservation in its phase)\n      if (\n        planPreviewEventIds &&\n        shouldShowPlanPreview(event.id, planPreviewEventIds)\n      ) {\n        // Show shine effect only if this is the last message AND agent is running\n        const isStreaming =\n          isLastMessage && curAgentState === AgentState.RUNNING;\n        return (\n          <PlanPreview\n            planContent={planContent}\n            isStreaming={isStreaming}\n            isBuildDisabled={isAgentRunning}\n          />\n        );\n      }\n      // Not the designated preview event for this phase - render nothing\n      // This prevents duplicate previews within the same phase\n      return null;\n    }\n\n    // Find the action that this observation is responding to\n    const correspondingAction = messages.find(\n      (msg) => isActionEvent(msg) && msg.id === event.action_id,\n    );\n\n    // Skip ThoughtEventMessage for ThinkAction (thought IS the action)\n    const shouldShowThought =\n      !suppressThought &&\n      correspondingAction &&\n      isActionEvent(correspondingAction) &&\n      correspondingAction.action.kind !== \"ThinkAction\";\n\n    const reasoningContent =\n      correspondingAction && isActionEvent(correspondingAction)\n        ? getReasoningContent(correspondingAction)\n        : \"\";\n\n    return (\n      <>\n        {reasoningContent && <CollapsibleThinking content={reasoningContent} />}\n        {shouldShowThought && (\n          <ThoughtEventMessage\n            event={correspondingAction}\n            isFromPlanningAgent={isFromPlanningAgent}\n          />\n        )}\n        <GenericEventMessageWrapper\n          event={event}\n          isLastMessage={isLastMessage}\n          correspondingAction={\n            correspondingAction && isActionEvent(correspondingAction)\n              ? correspondingAction\n              : undefined\n          }\n        />\n      </>\n    );\n  }\n\n  // Message events (user and assistant messages)\n  if (!isActionEvent(event) && !isObservationEvent(event)) {\n    const messageEvent = event as MessageEvent;\n\n    // Check if this is a user message that should display a Skill Ready event\n    if (isUserMessageEvent(event) && shouldShowSkillReadyEvent(messageEvent)) {\n      return renderUserMessageWithSkillReady(\n        messageEvent,\n        commonProps,\n        isLastMessage,\n      );\n    }\n\n    // Render normal message event (user or assistant)\n    return (\n      <UserAssistantEventMessage\n        event={messageEvent}\n        {...commonProps}\n        isLastMessage={isLastMessage}\n      />\n    );\n  }\n\n  // Generic fallback for all other events\n  return (\n    <GenericEventMessageWrapper event={event} isLastMessage={isLastMessage} />\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"event-message.js","names":[],"sources":["../../../../src/components/conversation-events/chat/event-message.tsx"],"sourcesContent":["import React from \"react\";\nimport {\n  OpenHandsEvent,\n  MessageEvent,\n  ActionEvent,\n} from \"#/types/agent-server/core\";\nimport {\n  FinishAction,\n  ThinkAction,\n} from \"#/types/agent-server/core/base/action\";\nimport {\n  isActionEvent,\n  isObservationEvent,\n  isAgentErrorEvent,\n  isUserMessageEvent,\n  isPlanningFileEditorObservationEvent,\n  isHookExecutionEvent,\n  isACPToolCallEvent,\n  isStreamingDeltaEvent,\n} from \"#/types/agent-server/type-guards\";\nimport { useConfig } from \"#/hooks/query/use-config\";\nimport { useConversationStore } from \"#/stores/conversation-store\";\nimport { useAgentState } from \"#/hooks/use-agent-state\";\nimport { AgentState } from \"#/types/agent-state\";\nimport { ChatMessage } from \"#/components/features/chat/chat-message\";\nimport { PlanPreview } from \"../../features/chat/plan-preview\";\nimport { ErrorEventMessage } from \"./event-message-components/error-event-message\";\nimport { UserAssistantEventMessage } from \"./event-message-components/user-assistant-event-message\";\nimport { FinishEventMessage } from \"./event-message-components/finish-event-message\";\nimport { GenericEventMessageWrapper } from \"./event-message-components/generic-event-message-wrapper\";\nimport { ThoughtEventMessage } from \"./event-message-components/thought-event-message\";\nimport { CollapsibleThinking } from \"./event-message-components/collapsible-thinking\";\nimport { HookExecutionEventMessage } from \"./event-message-components/hook-execution-event-message\";\nimport { createSkillReadyEvent } from \"./event-content-helpers/create-skill-ready-event\";\nimport { shouldShowPlanPreview } from \"./hooks/use-plan-preview-events\";\nimport { getReasoningContent } from \"./event-thought-helpers\";\n\ninterface EventMessageProps {\n  event: OpenHandsEvent & { isFromPlanningAgent?: boolean };\n  messages: OpenHandsEvent[];\n  isLastMessage: boolean;\n  isInLast10Actions: boolean;\n  /** Set of event IDs that should render PlanPreview (one per user message phase) */\n  planPreviewEventIds?: Set<string>;\n  /**\n   * When true, do not render the inline `ThoughtEventMessage` for action /\n   * observation events. The caller is expected to render the thought\n   * separately (e.g. via a hoisted \"thought\" rendered item) so the message\n   * pane and the in-group rendering don't double up on the same content.\n   * Has no effect on `ThinkAction`, whose thought IS its action body.\n   */\n  suppressThought?: boolean;\n}\n\n/**\n * Extracts activated skills from a MessageEvent, supporting both\n * activated_skills and activated_microagents field names.\n */\nconst getActivatedSkills = (event: MessageEvent): string[] =>\n  (event as unknown as { activated_skills?: string[] }).activated_skills ||\n  event.activated_microagents ||\n  [];\n\n/**\n * Checks if extended content contains valid text content.\n */\nconst hasValidExtendedContent = (\n  extendedContent: MessageEvent[\"extended_content\"],\n): boolean => {\n  if (!extendedContent || extendedContent.length === 0) {\n    return false;\n  }\n\n  return extendedContent.some(\n    (content) => content.type === \"text\" && content.text.trim().length > 0,\n  );\n};\n\n/**\n * Determines if a Skill Ready event should be displayed for the given message event.\n */\nconst shouldShowSkillReadyEvent = (messageEvent: MessageEvent): boolean => {\n  const activatedSkills = getActivatedSkills(messageEvent);\n  const hasActivatedSkills = activatedSkills.length > 0;\n  const hasExtendedContent = hasValidExtendedContent(\n    messageEvent.extended_content,\n  );\n\n  return hasActivatedSkills && hasExtendedContent;\n};\n\ninterface CommonProps {\n  isLastMessage: boolean;\n  isInLast10Actions: boolean;\n  config: unknown;\n  isFromPlanningAgent: boolean;\n}\n\n/**\n * Renders a user message with its corresponding Skill Ready event.\n */\nconst renderUserMessageWithSkillReady = (\n  messageEvent: MessageEvent,\n  commonProps: CommonProps,\n  isLastMessage: boolean,\n): React.ReactElement => {\n  try {\n    const skillReadyEvent = createSkillReadyEvent(messageEvent);\n    return (\n      <>\n        <UserAssistantEventMessage\n          event={messageEvent}\n          isLastMessage={false}\n          isFromPlanningAgent={commonProps.isFromPlanningAgent}\n        />\n        <GenericEventMessageWrapper\n          event={skillReadyEvent}\n          isLastMessage={isLastMessage}\n        />\n      </>\n    );\n  } catch (error) {\n    // If skill ready event creation fails, just render the user message\n    return (\n      <UserAssistantEventMessage\n        event={messageEvent}\n        isLastMessage={isLastMessage}\n        isFromPlanningAgent={commonProps.isFromPlanningAgent}\n      />\n    );\n  }\n};\n\nexport function EventMessage({\n  event,\n  messages,\n  isLastMessage,\n  isInLast10Actions,\n  planPreviewEventIds,\n  suppressThought = false,\n}: EventMessageProps) {\n  const { data: config } = useConfig();\n  const { planContent } = useConversationStore();\n  const { curAgentState } = useAgentState();\n\n  // Disable Build button while agent is running (streaming)\n  const isAgentRunning =\n    curAgentState === AgentState.RUNNING ||\n    curAgentState === AgentState.LOADING;\n\n  // Read isFromPlanningAgent directly from the event object\n  const isFromPlanningAgent = event.isFromPlanningAgent || false;\n\n  // Common props for components that need them\n  const commonProps = {\n    isLastMessage,\n    isInLast10Actions,\n    config,\n    isFromPlanningAgent,\n  };\n\n  // Agent error events\n  if (isAgentErrorEvent(event)) {\n    return <ErrorEventMessage event={event} {...commonProps} />;\n  }\n\n  // Hook execution events\n  if (isHookExecutionEvent(event)) {\n    return <HookExecutionEventMessage event={event} />;\n  }\n\n  // ACP sub-agent tool call events (Claude Code, Codex, Gemini CLI, …)\n  // render through the same generic wrapper used for observation events so\n  // the card shape, success indicator and markdown rendering all match.\n  if (isACPToolCallEvent(event)) {\n    return (\n      <GenericEventMessageWrapper event={event} isLastMessage={isLastMessage} />\n    );\n  }\n\n  if (isStreamingDeltaEvent(event)) {\n    const content = event.content ?? \"\";\n    const reasoningContent = event.reasoning_content ?? \"\";\n    return (\n      <>\n        {reasoningContent && <CollapsibleThinking content={reasoningContent} />}\n        {content && (\n          <ChatMessage\n            type=\"agent\"\n            message={content}\n            isFromPlanningAgent={isFromPlanningAgent}\n          />\n        )}\n      </>\n    );\n  }\n\n  // Finish actions\n  if (isActionEvent(event) && event.action.kind === \"FinishAction\") {\n    return (\n      <FinishEventMessage\n        event={event as ActionEvent<FinishAction>}\n        {...commonProps}\n      />\n    );\n  }\n\n  // ThinkAction - render the thought inside a collapsible section so it\n  // doesn't dominate the chat, especially when the thinking language\n  // (usually English) differs from the conversation language.\n  if (isActionEvent(event) && event.action.kind === \"ThinkAction\") {\n    const thinkAction = event as ActionEvent<ThinkAction>;\n    return <CollapsibleThinking content={thinkAction.action.thought} />;\n  }\n\n  // Action events - render thought + action (will be replaced by thought + observation)\n  if (isActionEvent(event)) {\n    const reasoningContent = getReasoningContent(event);\n    return (\n      <>\n        {reasoningContent && <CollapsibleThinking content={reasoningContent} />}\n        {!suppressThought && (\n          <ThoughtEventMessage\n            event={event}\n            isFromPlanningAgent={isFromPlanningAgent}\n          />\n        )}\n        <GenericEventMessageWrapper\n          event={event}\n          isLastMessage={isLastMessage}\n        />\n      </>\n    );\n  }\n\n  // Observation events - find the corresponding action and render thought + observation\n  if (isObservationEvent(event)) {\n    // Handle PlanningFileEditorObservation specially\n    if (isPlanningFileEditorObservationEvent(event)) {\n      // Only show PlanPreview if this event is marked as the one to display\n      // (last PlanningFileEditorObservation in its phase)\n      if (\n        planPreviewEventIds &&\n        shouldShowPlanPreview(event.id, planPreviewEventIds)\n      ) {\n        // Show shine effect only if this is the last message AND agent is running\n        const isStreaming =\n          isLastMessage && curAgentState === AgentState.RUNNING;\n        return (\n          <PlanPreview\n            planContent={planContent}\n            isStreaming={isStreaming}\n            isBuildDisabled={isAgentRunning}\n          />\n        );\n      }\n      // Not the designated preview event for this phase - render nothing\n      // This prevents duplicate previews within the same phase\n      return null;\n    }\n\n    // Find the action that this observation is responding to\n    const correspondingAction = messages.find(\n      (msg) => isActionEvent(msg) && msg.id === event.action_id,\n    );\n\n    // Skip ThoughtEventMessage for ThinkAction (thought IS the action)\n    const shouldShowThought =\n      !suppressThought &&\n      correspondingAction &&\n      isActionEvent(correspondingAction) &&\n      correspondingAction.action.kind !== \"ThinkAction\";\n\n    const reasoningContent =\n      correspondingAction && isActionEvent(correspondingAction)\n        ? getReasoningContent(correspondingAction)\n        : \"\";\n\n    return (\n      <>\n        {reasoningContent && <CollapsibleThinking content={reasoningContent} />}\n        {shouldShowThought && (\n          <ThoughtEventMessage\n            event={correspondingAction}\n            isFromPlanningAgent={isFromPlanningAgent}\n          />\n        )}\n        <GenericEventMessageWrapper\n          event={event}\n          isLastMessage={isLastMessage}\n          correspondingAction={\n            correspondingAction && isActionEvent(correspondingAction)\n              ? correspondingAction\n              : undefined\n          }\n        />\n      </>\n    );\n  }\n\n  // Message events (user and assistant messages)\n  if (!isActionEvent(event) && !isObservationEvent(event)) {\n    const messageEvent = event as MessageEvent;\n\n    // Check if this is a user message that should display a Skill Ready event\n    if (isUserMessageEvent(event) && shouldShowSkillReadyEvent(messageEvent)) {\n      return renderUserMessageWithSkillReady(\n        messageEvent,\n        commonProps,\n        isLastMessage,\n      );\n    }\n\n    // Render normal message event (user or assistant)\n    return (\n      <UserAssistantEventMessage\n        event={messageEvent}\n        {...commonProps}\n        isLastMessage={isLastMessage}\n      />\n    );\n  }\n\n  // Generic fallback for all other events\n  return (\n    <GenericEventMessageWrapper event={event} isLastMessage={isLastMessage} />\n  );\n}\n"],"mappings":"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"}

package/dist/components/features/automations/recommended-automations-launcher.d.ts

@@ -4,6 +4,12 @@ interface RecommendedAutomationsLauncherProps {
     /** When true, only the automation card grid scrolls inside its section. */
     scrollableGrid?: boolean;
 }
-export declare function buildAutomationPrompt(basePrompt: string, backendKind: "local" | "cloud", backendHost?: string): string;
+/**
+ * The catalog prompt (or slash command) is passed through as-is.
+ * API routing (host, auth) is discovered by the agent at runtime from
+ * `<RUNTIME_SERVICES>` in the system prompt — the skills themselves
+ * contain the instructions for reading that block.
+ */
+export declare function buildAutomationPrompt(basePrompt: string): string;
 export declare function RecommendedAutomationsLauncher({ query, onLaunched, scrollableGrid, }: RecommendedAutomationsLauncherProps): import("react/jsx-runtime").JSX.Element | null;
 export {};

package/dist/components/features/home/workspace-selection-form.d.ts

@@ -10,5 +10,6 @@ interface WorkspaceSelectionFormProps {
      */
     onConfirm?: (workspace: LocalWorkspace) => void;
 }
+export declare const HOME_SELECTED_WORKSPACE_PATH_KEY = "oh:home-selected-workspace-path";
 export declare function WorkspaceSelectionForm({ isLoadingSettings, onConfirm, }: WorkspaceSelectionFormProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/features/mcp-page/custom-server-editor.cjs

@@ -1,2 +1,2 @@
-const e=require(`../../../_virtual/_rolldown/runtime.cjs`),t=require(`../../../node_modules/react-i18next/dist/es/useTranslation.cjs`),n=require(`../../../i18n/declaration.cjs`),r=require(`../../../utils/utils.cjs`),i=require(`../../../utils/custom-toast-handlers.cjs`),a=require(`../../shared/modals/modal-backdrop.cjs`),o=require(`../../../utils/modal-classes.cjs`),s=require(`../../shared/modals/modal-close-button.cjs`),c=require(`../../../utils/retrieve-axios-error-message.cjs`),l=require(`../../shared/modals/confirmation-modal.cjs`),u=require(`../../../hooks/mutation/use-delete-mcp-server.cjs`),d=require(`../../../hooks/mutation/use-add-mcp-server.cjs`),f=require(`../../../hooks/mutation/use-test-mcp-server.cjs`),p=require(`../settings/mcp-settings/mcp-server-form.cjs`),m=require(`../../../hooks/mutation/use-update-mcp-server.cjs`);let h=require(`react`);h=e.__toESM(h,1);let g=require(`react/jsx-runtime`);function _({server:e,existingServers:_,onClose:v}){let{t:y}=t.useTranslation(`openhands`),{mutate:b,isPending:x}=d.useAddMcpServer(),{mutate:S,isPending:C}=m.useUpdateMcpServer(),{mutate:w,isPending:T}=u.useDeleteMcpServer(),{mutate:E,isPending:D,data:O,reset:k}=f.useTestMcpServer(),[A,j]=h.default.useState(!1),M=!!e.id,N=x||C||T,P=N||D||A,F=e=>{switch(e.error_kind){case`timeout`:return y(n.I18nKey.MCP$TEST_ERROR_TIMEOUT);case`connection`:return y(n.I18nKey.MCP$TEST_ERROR_CONNECTION);default:return y(n.I18nKey.MCP$TEST_ERROR_UNKNOWN,{error:e.error})}},I=h.default.useMemo(()=>O?O.ok?{ok:!0,text:y(n.I18nKey.MCP$TEST_SUCCESS,{count:O.tools.length})}:{ok:!1,text:F(O)}:null,[O,y]),L=e=>{i.displayErrorToast(c.retrieveAxiosErrorMessage(e)||y(n.I18nKey.ERROR$GENERIC))};return(0,g.jsxs)(g.Fragment,{children:[(0,g.jsx)(a.ModalBackdrop,{onClose:P?void 0:v,closeOnEscape:!P,"aria-label":y(M?n.I18nKey.MCP$EDIT_CUSTOM_TITLE:n.I18nKey.MCP$ADD_CUSTOM_TITLE),children:(0,g.jsxs)(`div`,{"data-testid":`mcp-custom-editor`,className:`relative bg-base-secondary p-6 rounded-xl border border-[var(--oh-border)] w-[520px] max-w-[90vw] max-h-[90vh] overflow-y-auto custom-scrollbar`,children:[(0,g.jsx)(s.ModalCloseButton,{onClose:v,testId:`mcp-custom-editor-close`,disabled:P}),(0,g.jsx)(`h2`,{className:r.cn(`mb-4 pr-6`,o.modalTitleLgClassName),children:y(M?n.I18nKey.MCP$EDIT_CUSTOM_TITLE:n.I18nKey.MCP$ADD_CUSTOM_TITLE)}),(0,g.jsx)(p.MCPServerForm,{mode:M?`edit`:`add`,server:M?e:void 0,existingServers:_,onSubmit:t=>{k(),E(t,{onSuccess:n=>{n.ok&&(M?S({serverId:e.id,server:t},{onSuccess:v,onError:L}):b(t,{onSuccess:v,onError:L}))},onError:L})},onCancel:v,onDelete:M?()=>j(!0):void 0,isActionDisabled:N,onTest:e=>{E(e)},isTestPending:D,testMessage:I})]})}),A?(0,g.jsx)(l.ConfirmationModal,{text:y(n.I18nKey.SETTINGS$MCP_CONFIRM_DELETE),onCancel:()=>j(!1),onConfirm:()=>{w(e,{onSuccess:()=>{i.displaySuccessToast(y(n.I18nKey.MCP$REMOVE_SUCCESS)),j(!1),v()},onError:e=>{L(e),j(!1)}})},isConfirming:T}):null]})}exports.CustomServerEditor=_;
+const e=require(`../../../_virtual/_rolldown/runtime.cjs`),t=require(`../../../node_modules/react-i18next/dist/es/useTranslation.cjs`),n=require(`../../../i18n/declaration.cjs`),r=require(`../../../utils/utils.cjs`),i=require(`../../../contexts/active-backend-context.cjs`),a=require(`../../../utils/custom-toast-handlers.cjs`),o=require(`../../shared/modals/modal-backdrop.cjs`),s=require(`../../../utils/modal-classes.cjs`),c=require(`../../shared/modals/modal-close-button.cjs`),l=require(`../../../utils/retrieve-axios-error-message.cjs`),u=require(`../../shared/modals/confirmation-modal.cjs`),d=require(`../../../hooks/mutation/use-delete-mcp-server.cjs`),f=require(`../../../hooks/mutation/use-add-mcp-server.cjs`),p=require(`../../../hooks/mutation/use-test-mcp-server.cjs`),m=require(`../settings/mcp-settings/mcp-server-form.cjs`),h=require(`../../../hooks/mutation/use-update-mcp-server.cjs`);let g=require(`react`);g=e.__toESM(g,1);let _=require(`react/jsx-runtime`);function v({server:e,existingServers:v,onClose:y}){let{t:b}=t.useTranslation(`openhands`),{mutate:x,isPending:S}=f.useAddMcpServer(),{mutate:C,isPending:w}=h.useUpdateMcpServer(),{mutate:T,isPending:E}=d.useDeleteMcpServer(),{mutate:D,isPending:O,data:k,reset:A}=p.useTestMcpServer(),[j,M]=g.default.useState(!1),{backend:N}=i.useActiveBackend(),P=N.kind===`cloud`,F=!!e.id,I=S||w||E,L=I||O||j,R=e=>{switch(e.error_kind){case`timeout`:return b(n.I18nKey.MCP$TEST_ERROR_TIMEOUT);case`connection`:return b(n.I18nKey.MCP$TEST_ERROR_CONNECTION);default:return b(n.I18nKey.MCP$TEST_ERROR_UNKNOWN,{error:e.error})}},z=g.default.useMemo(()=>k?k.ok?{ok:!0,text:b(n.I18nKey.MCP$TEST_SUCCESS,{count:k.tools.length})}:{ok:!1,text:R(k)}:null,[k,b]),B=e=>{a.displayErrorToast(l.retrieveAxiosErrorMessage(e)||b(n.I18nKey.ERROR$GENERIC))};return(0,_.jsxs)(_.Fragment,{children:[(0,_.jsx)(o.ModalBackdrop,{onClose:L?void 0:y,closeOnEscape:!L,"aria-label":b(F?n.I18nKey.MCP$EDIT_CUSTOM_TITLE:n.I18nKey.MCP$ADD_CUSTOM_TITLE),children:(0,_.jsxs)(`div`,{"data-testid":`mcp-custom-editor`,className:`relative bg-base-secondary p-6 rounded-xl border border-[var(--oh-border)] w-[520px] max-w-[90vw] max-h-[90vh] overflow-y-auto custom-scrollbar`,children:[(0,_.jsx)(c.ModalCloseButton,{onClose:y,testId:`mcp-custom-editor-close`,disabled:L}),(0,_.jsx)(`h2`,{className:r.cn(`mb-4 pr-6`,s.modalTitleLgClassName),children:b(F?n.I18nKey.MCP$EDIT_CUSTOM_TITLE:n.I18nKey.MCP$ADD_CUSTOM_TITLE)}),(0,_.jsx)(m.MCPServerForm,{mode:F?`edit`:`add`,server:F?e:void 0,existingServers:v,onSubmit:t=>{A(),D(t,{onSuccess:n=>{n.ok&&(F?C({serverId:e.id,server:t},{onSuccess:y,onError:B}):x(t,{onSuccess:y,onError:B}))},onError:B})},onCancel:y,onDelete:F?()=>M(!0):void 0,isActionDisabled:I,onTest:P?void 0:e=>{D(e)},isTestPending:O,testMessage:P?null:z})]})}),j?(0,_.jsx)(u.ConfirmationModal,{text:b(n.I18nKey.SETTINGS$MCP_CONFIRM_DELETE),onCancel:()=>M(!1),onConfirm:()=>{T(e,{onSuccess:()=>{a.displaySuccessToast(b(n.I18nKey.MCP$REMOVE_SUCCESS)),M(!1),y()},onError:e=>{B(e),M(!1)}})},isConfirming:E}):null]})}exports.CustomServerEditor=v;
 //# sourceMappingURL=custom-server-editor.cjs.map

package/dist/components/features/mcp-page/custom-server-editor.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"custom-server-editor.cjs","names":[],"sources":["../../../../src/components/features/mcp-page/custom-server-editor.tsx"],"sourcesContent":["import React from \"react\";\nimport { AxiosError } from \"axios\";\nimport { useTranslation } from \"react-i18next\";\nimport type { MCPTestFailure } from \"@openhands/typescript-client\";\nimport { I18nKey } from \"#/i18n/declaration\";\nimport { ModalBackdrop } from \"#/components/shared/modals/modal-backdrop\";\nimport { ModalCloseButton } from \"#/components/shared/modals/modal-close-button\";\nimport { ConfirmationModal } from \"#/components/shared/modals/confirmation-modal\";\nimport {\n  MCPServerForm,\n  type TestMessage,\n} from \"#/components/features/settings/mcp-settings/mcp-server-form\";\nimport { useAddMcpServer } from \"#/hooks/mutation/use-add-mcp-server\";\nimport { useUpdateMcpServer } from \"#/hooks/mutation/use-update-mcp-server\";\nimport { useDeleteMcpServer } from \"#/hooks/mutation/use-delete-mcp-server\";\nimport { useTestMcpServer } from \"#/hooks/mutation/use-test-mcp-server\";\nimport { MCPServerConfig } from \"#/types/mcp-server\";\nimport {\n  displayErrorToast,\n  displaySuccessToast,\n} from \"#/utils/custom-toast-handlers\";\nimport { retrieveAxiosErrorMessage } from \"#/utils/retrieve-axios-error-message\";\nimport { cn } from \"#/utils/utils\";\nimport { modalTitleLgClassName } from \"#/utils/modal-classes\";\n\ninterface CustomServerEditorProps {\n  server: MCPServerConfig;\n  existingServers: MCPServerConfig[];\n  onClose: () => void;\n}\n\n/**\n * Modal wrapper around `MCPServerForm` so users can hand-author\n * arbitrary stdio / SSE / SHTTP entries without reaching for raw JSON.\n * An empty `server.id` means \"Add new\".\n */\nexport function CustomServerEditor({\n  server,\n  existingServers,\n  onClose,\n}: CustomServerEditorProps) {\n  const { t } = useTranslation(\"openhands\");\n  const { mutate: addMcpServer, isPending: isAdding } = useAddMcpServer();\n  const { mutate: updateMcpServer, isPending: isUpdating } =\n    useUpdateMcpServer();\n  const { mutate: deleteMcpServer, isPending: isDeleting } =\n    useDeleteMcpServer();\n  const {\n    mutate: testServer,\n    isPending: isTesting,\n    data: testResult,\n    reset: resetTest,\n  } = useTestMcpServer();\n  const [showDeleteConfirm, setShowDeleteConfirm] = React.useState(false);\n\n  const isEditing = !!server.id;\n  const isPending = isAdding || isUpdating || isDeleting;\n  const isDismissBlocked = isPending || isTesting || showDeleteConfirm;\n\n  const makeTestErrorMessage = (failure: MCPTestFailure): string => {\n    switch (failure.error_kind) {\n      case \"timeout\":\n        return t(I18nKey.MCP$TEST_ERROR_TIMEOUT);\n      case \"connection\":\n        return t(I18nKey.MCP$TEST_ERROR_CONNECTION);\n      default:\n        return t(I18nKey.MCP$TEST_ERROR_UNKNOWN, { error: failure.error });\n    }\n  };\n\n  const testMessage: TestMessage | null = React.useMemo(() => {\n    if (!testResult) return null;\n    if (testResult.ok) {\n      return {\n        ok: true,\n        text: t(I18nKey.MCP$TEST_SUCCESS, { count: testResult.tools.length }),\n      };\n    }\n    return { ok: false, text: makeTestErrorMessage(testResult) };\n  }, [testResult, t]);\n\n  // Shared error handler so both add and update surface backend errors\n  // as a toast instead of failing silently — previously these calls\n  // had no `onError` and the modal closed even on a 4xx/5xx, leaving\n  // the user to discover the failure on the next page load.\n  const handleError = (err: unknown) => {\n    const message = retrieveAxiosErrorMessage(err as AxiosError);\n    displayErrorToast(message || t(I18nKey.ERROR$GENERIC));\n  };\n\n  const handleSubmit = (payload: MCPServerConfig) => {\n    resetTest();\n    testServer(payload, {\n      onSuccess: (result) => {\n        if (!result.ok) {\n          // Test failed — modal stays open, error shown via testMessage.\n          return;\n        }\n        if (isEditing) {\n          updateMcpServer(\n            { serverId: server.id, server: payload },\n            { onSuccess: onClose, onError: handleError },\n          );\n        } else {\n          addMcpServer(payload, { onSuccess: onClose, onError: handleError });\n        }\n      },\n      onError: handleError,\n    });\n  };\n\n  const handleTestClick = (payload: MCPServerConfig) => {\n    testServer(payload);\n  };\n\n  const handleConfirmDelete = () => {\n    deleteMcpServer(server, {\n      onSuccess: () => {\n        displaySuccessToast(t(I18nKey.MCP$REMOVE_SUCCESS));\n        setShowDeleteConfirm(false);\n        onClose();\n      },\n      onError: (err) => {\n        handleError(err);\n        setShowDeleteConfirm(false);\n      },\n    });\n  };\n\n  return (\n    <>\n      <ModalBackdrop\n        // Block backdrop-click / Escape from dismissing the modal while\n        // a mutation is in flight — closing mid-request would orphan\n        // the request and leave the user with no error feedback.\n        onClose={isDismissBlocked ? undefined : onClose}\n        closeOnEscape={!isDismissBlocked}\n        aria-label={\n          isEditing\n            ? t(I18nKey.MCP$EDIT_CUSTOM_TITLE)\n            : t(I18nKey.MCP$ADD_CUSTOM_TITLE)\n        }\n      >\n        <div\n          data-testid=\"mcp-custom-editor\"\n          className=\"relative bg-base-secondary p-6 rounded-xl border border-[var(--oh-border)] w-[520px] max-w-[90vw] max-h-[90vh] overflow-y-auto custom-scrollbar\"\n        >\n          <ModalCloseButton\n            onClose={onClose}\n            testId=\"mcp-custom-editor-close\"\n            disabled={isDismissBlocked}\n          />\n          <h2 className={cn(\"mb-4 pr-6\", modalTitleLgClassName)}>\n            {isEditing\n              ? t(I18nKey.MCP$EDIT_CUSTOM_TITLE)\n              : t(I18nKey.MCP$ADD_CUSTOM_TITLE)}\n          </h2>\n          <MCPServerForm\n            mode={isEditing ? \"edit\" : \"add\"}\n            server={isEditing ? server : undefined}\n            existingServers={existingServers}\n            onSubmit={handleSubmit}\n            onCancel={onClose}\n            onDelete={isEditing ? () => setShowDeleteConfirm(true) : undefined}\n            isActionDisabled={isPending}\n            onTest={handleTestClick}\n            isTestPending={isTesting}\n            testMessage={testMessage}\n          />\n        </div>\n      </ModalBackdrop>\n\n      {showDeleteConfirm ? (\n        <ConfirmationModal\n          text={t(I18nKey.SETTINGS$MCP_CONFIRM_DELETE)}\n          onCancel={() => setShowDeleteConfirm(false)}\n          onConfirm={handleConfirmDelete}\n          isConfirming={isDeleting}\n        />\n      ) : null}\n    </>\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"custom-server-editor.cjs","names":[],"sources":["../../../../src/components/features/mcp-page/custom-server-editor.tsx"],"sourcesContent":["import React from \"react\";\nimport { AxiosError } from \"axios\";\nimport { useTranslation } from \"react-i18next\";\nimport type { MCPTestFailure } from \"@openhands/typescript-client\";\nimport { I18nKey } from \"#/i18n/declaration\";\nimport { ModalBackdrop } from \"#/components/shared/modals/modal-backdrop\";\nimport { ModalCloseButton } from \"#/components/shared/modals/modal-close-button\";\nimport { ConfirmationModal } from \"#/components/shared/modals/confirmation-modal\";\nimport {\n  MCPServerForm,\n  type TestMessage,\n} from \"#/components/features/settings/mcp-settings/mcp-server-form\";\nimport { useAddMcpServer } from \"#/hooks/mutation/use-add-mcp-server\";\nimport { useUpdateMcpServer } from \"#/hooks/mutation/use-update-mcp-server\";\nimport { useDeleteMcpServer } from \"#/hooks/mutation/use-delete-mcp-server\";\nimport { useTestMcpServer } from \"#/hooks/mutation/use-test-mcp-server\";\nimport { useActiveBackend } from \"#/contexts/active-backend-context\";\nimport { MCPServerConfig } from \"#/types/mcp-server\";\nimport {\n  displayErrorToast,\n  displaySuccessToast,\n} from \"#/utils/custom-toast-handlers\";\nimport { retrieveAxiosErrorMessage } from \"#/utils/retrieve-axios-error-message\";\nimport { cn } from \"#/utils/utils\";\nimport { modalTitleLgClassName } from \"#/utils/modal-classes\";\n\ninterface CustomServerEditorProps {\n  server: MCPServerConfig;\n  existingServers: MCPServerConfig[];\n  onClose: () => void;\n}\n\n/**\n * Modal wrapper around `MCPServerForm` so users can hand-author\n * arbitrary stdio / SSE / SHTTP entries without reaching for raw JSON.\n * An empty `server.id` means \"Add new\".\n */\nexport function CustomServerEditor({\n  server,\n  existingServers,\n  onClose,\n}: CustomServerEditorProps) {\n  const { t } = useTranslation(\"openhands\");\n  const { mutate: addMcpServer, isPending: isAdding } = useAddMcpServer();\n  const { mutate: updateMcpServer, isPending: isUpdating } =\n    useUpdateMcpServer();\n  const { mutate: deleteMcpServer, isPending: isDeleting } =\n    useDeleteMcpServer();\n  const {\n    mutate: testServer,\n    isPending: isTesting,\n    data: testResult,\n    reset: resetTest,\n  } = useTestMcpServer();\n  const [showDeleteConfirm, setShowDeleteConfirm] = React.useState(false);\n\n  // The MCP connectivity-test endpoint only exists on the local agent-server.\n  // For cloud backends `McpService.testServer` short-circuits with a synthetic\n  // success so the save still completes; we hide the manual \"Test connection\"\n  // button here so cloud users aren't shown a misleading \"0 tools\" result.\n  const { backend } = useActiveBackend();\n  const isCloudBackend = backend.kind === \"cloud\";\n\n  const isEditing = !!server.id;\n  const isPending = isAdding || isUpdating || isDeleting;\n  const isDismissBlocked = isPending || isTesting || showDeleteConfirm;\n\n  const makeTestErrorMessage = (failure: MCPTestFailure): string => {\n    switch (failure.error_kind) {\n      case \"timeout\":\n        return t(I18nKey.MCP$TEST_ERROR_TIMEOUT);\n      case \"connection\":\n        return t(I18nKey.MCP$TEST_ERROR_CONNECTION);\n      default:\n        return t(I18nKey.MCP$TEST_ERROR_UNKNOWN, { error: failure.error });\n    }\n  };\n\n  const testMessage: TestMessage | null = React.useMemo(() => {\n    if (!testResult) return null;\n    if (testResult.ok) {\n      return {\n        ok: true,\n        text: t(I18nKey.MCP$TEST_SUCCESS, { count: testResult.tools.length }),\n      };\n    }\n    return { ok: false, text: makeTestErrorMessage(testResult) };\n  }, [testResult, t]);\n\n  // Shared error handler so both add and update surface backend errors\n  // as a toast instead of failing silently — previously these calls\n  // had no `onError` and the modal closed even on a 4xx/5xx, leaving\n  // the user to discover the failure on the next page load.\n  const handleError = (err: unknown) => {\n    const message = retrieveAxiosErrorMessage(err as AxiosError);\n    displayErrorToast(message || t(I18nKey.ERROR$GENERIC));\n  };\n\n  const handleSubmit = (payload: MCPServerConfig) => {\n    resetTest();\n    testServer(payload, {\n      onSuccess: (result) => {\n        if (!result.ok) {\n          // Test failed — modal stays open, error shown via testMessage.\n          return;\n        }\n        if (isEditing) {\n          updateMcpServer(\n            { serverId: server.id, server: payload },\n            { onSuccess: onClose, onError: handleError },\n          );\n        } else {\n          addMcpServer(payload, { onSuccess: onClose, onError: handleError });\n        }\n      },\n      onError: handleError,\n    });\n  };\n\n  const handleTestClick = (payload: MCPServerConfig) => {\n    testServer(payload);\n  };\n\n  const handleConfirmDelete = () => {\n    deleteMcpServer(server, {\n      onSuccess: () => {\n        displaySuccessToast(t(I18nKey.MCP$REMOVE_SUCCESS));\n        setShowDeleteConfirm(false);\n        onClose();\n      },\n      onError: (err) => {\n        handleError(err);\n        setShowDeleteConfirm(false);\n      },\n    });\n  };\n\n  return (\n    <>\n      <ModalBackdrop\n        // Block backdrop-click / Escape from dismissing the modal while\n        // a mutation is in flight — closing mid-request would orphan\n        // the request and leave the user with no error feedback.\n        onClose={isDismissBlocked ? undefined : onClose}\n        closeOnEscape={!isDismissBlocked}\n        aria-label={\n          isEditing\n            ? t(I18nKey.MCP$EDIT_CUSTOM_TITLE)\n            : t(I18nKey.MCP$ADD_CUSTOM_TITLE)\n        }\n      >\n        <div\n          data-testid=\"mcp-custom-editor\"\n          className=\"relative bg-base-secondary p-6 rounded-xl border border-[var(--oh-border)] w-[520px] max-w-[90vw] max-h-[90vh] overflow-y-auto custom-scrollbar\"\n        >\n          <ModalCloseButton\n            onClose={onClose}\n            testId=\"mcp-custom-editor-close\"\n            disabled={isDismissBlocked}\n          />\n          <h2 className={cn(\"mb-4 pr-6\", modalTitleLgClassName)}>\n            {isEditing\n              ? t(I18nKey.MCP$EDIT_CUSTOM_TITLE)\n              : t(I18nKey.MCP$ADD_CUSTOM_TITLE)}\n          </h2>\n          <MCPServerForm\n            mode={isEditing ? \"edit\" : \"add\"}\n            server={isEditing ? server : undefined}\n            existingServers={existingServers}\n            onSubmit={handleSubmit}\n            onCancel={onClose}\n            onDelete={isEditing ? () => setShowDeleteConfirm(true) : undefined}\n            isActionDisabled={isPending}\n            onTest={isCloudBackend ? undefined : handleTestClick}\n            isTestPending={isTesting}\n            testMessage={isCloudBackend ? null : testMessage}\n          />\n        </div>\n      </ModalBackdrop>\n\n      {showDeleteConfirm ? (\n        <ConfirmationModal\n          text={t(I18nKey.SETTINGS$MCP_CONFIRM_DELETE)}\n          onCancel={() => setShowDeleteConfirm(false)}\n          onConfirm={handleConfirmDelete}\n          isConfirming={isDeleting}\n        />\n      ) : null}\n    </>\n  );\n}\n"],"mappings":"m9BAqCA,SAAgB,EAAmB,CACjC,SACA,kBACA,WAC0B,CAC1B,GAAM,CAAE,KAAM,EAAA,eAAe,YAAY,CACnC,CAAE,OAAQ,EAAc,UAAW,GAAa,EAAA,iBAAiB,CACjE,CAAE,OAAQ,EAAiB,UAAW,GAC1C,EAAA,oBAAoB,CAChB,CAAE,OAAQ,EAAiB,UAAW,GAC1C,EAAA,oBAAoB,CAChB,CACJ,OAAQ,EACR,UAAW,EACX,KAAM,EACN,MAAO,GACL,EAAA,kBAAkB,CAChB,CAAC,EAAmB,GAAwB,EAAA,QAAM,SAAS,GAAM,CAMjE,CAAE,WAAY,EAAA,kBAAkB,CAChC,EAAiB,EAAQ,OAAS,QAElC,EAAY,CAAC,CAAC,EAAO,GACrB,EAAY,GAAY,GAAc,EACtC,EAAmB,GAAa,GAAa,EAE7C,EAAwB,GAAoC,CAChE,OAAQ,EAAQ,WAAhB,CACE,IAAK,UACH,OAAO,EAAE,EAAA,QAAQ,uBAAuB,CAC1C,IAAK,aACH,OAAO,EAAE,EAAA,QAAQ,0BAA0B,CAC7C,QACE,OAAO,EAAE,EAAA,QAAQ,uBAAwB,CAAE,MAAO,EAAQ,MAAO,CAAC,GAIlE,EAAkC,EAAA,QAAM,YACvC,EACD,EAAW,GACN,CACL,GAAI,GACJ,KAAM,EAAE,EAAA,QAAQ,iBAAkB,CAAE,MAAO,EAAW,MAAM,OAAQ,CAAC,CACtE,CAEI,CAAE,GAAI,GAAO,KAAM,EAAqB,EAAW,CAAE,CAPpC,KAQvB,CAAC,EAAY,EAAE,CAAC,CAMb,EAAe,GAAiB,CAEpC,EAAA,kBADgB,EAAA,0BAA0B,EACxB,EAAW,EAAE,EAAA,QAAQ,cAAc,CAAC,EA0CxD,OACE,EAAA,EAAA,MAAA,EAAA,SAAA,CAAA,SAAA,EACE,EAAA,EAAA,KAAC,EAAA,cAAD,CAIE,QAAS,EAAmB,IAAA,GAAY,EACxC,cAAe,CAAC,EAChB,aAEM,EADJ,EACM,EAAA,QAAQ,sBACR,EAAA,QAAQ,qBAAqB,WAGrC,EAAA,EAAA,MAAC,MAAD,CACE,cAAY,oBACZ,UAAU,2JAFZ,EAIE,EAAA,EAAA,KAAC,EAAA,iBAAD,CACW,UACT,OAAO,0BACP,SAAU,EACV,CAAA,EACF,EAAA,EAAA,KAAC,KAAD,CAAI,UAAW,EAAA,GAAG,YAAa,EAAA,sBAAsB,UAE/C,EADH,EACK,EAAA,QAAQ,sBACR,EAAA,QAAQ,qBAAqB,CAChC,CAAA,EACL,EAAA,EAAA,KAAC,EAAA,cAAD,CACE,KAAM,EAAY,OAAS,MAC3B,OAAQ,EAAY,EAAS,IAAA,GACZ,kBACjB,SAvEY,GAA6B,CACjD,GAAW,CACX,EAAW,EAAS,CAClB,UAAY,GAAW,CAChB,EAAO,KAIR,EACF,EACE,CAAE,SAAU,EAAO,GAAI,OAAQ,EAAS,CACxC,CAAE,UAAW,EAAS,QAAS,EAAa,CAC7C,CAED,EAAa,EAAS,CAAE,UAAW,EAAS,QAAS,EAAa,CAAC,GAGvE,QAAS,EACV,CAAC,EAsDM,SAAU,EACV,SAAU,MAAkB,EAAqB,GAAK,CAAG,IAAA,GACzD,iBAAkB,EAClB,OAAQ,EAAiB,IAAA,GAtDV,GAA6B,CACpD,EAAW,EAAQ,EAsDX,cAAe,EACf,YAAa,EAAiB,KAAO,EACrC,CAAA,CACE,GACQ,CAAA,CAEf,GACC,EAAA,EAAA,KAAC,EAAA,kBAAD,CACE,KAAM,EAAE,EAAA,QAAQ,4BAA4B,CAC5C,aAAgB,EAAqB,GAAM,CAC3C,cA7D0B,CAChC,EAAgB,EAAQ,CACtB,cAAiB,CACf,EAAA,oBAAoB,EAAE,EAAA,QAAQ,mBAAmB,CAAC,CAClD,EAAqB,GAAM,CAC3B,GAAS,EAEX,QAAU,GAAQ,CAChB,EAAY,EAAI,CAChB,EAAqB,GAAM,EAE9B,CAAC,EAmDI,aAAc,EACd,CAAA,CACA,KACH,CAAA,CAAA"}

package/dist/components/features/mcp-page/custom-server-editor.js

@@ -1,102 +1,103 @@
 import { useTranslation as e } from "../../../node_modules/react-i18next/dist/es/useTranslation.js";
 import { I18nKey as t } from "../../../i18n/declaration.js";
 import { cn as n } from "../../../utils/utils.js";
-import { displayErrorToast as r, displaySuccessToast as i } from "../../../utils/custom-toast-handlers.js";
-import { ModalBackdrop as a } from "../../shared/modals/modal-backdrop.js";
-import { modalTitleLgClassName as o } from "../../../utils/modal-classes.js";
-import { ModalCloseButton as s } from "../../shared/modals/modal-close-button.js";
-import { retrieveAxiosErrorMessage as c } from "../../../utils/retrieve-axios-error-message.js";
-import { ConfirmationModal as l } from "../../shared/modals/confirmation-modal.js";
-import { useDeleteMcpServer as u } from "../../../hooks/mutation/use-delete-mcp-server.js";
-import { useAddMcpServer as d } from "../../../hooks/mutation/use-add-mcp-server.js";
-import { useTestMcpServer as f } from "../../../hooks/mutation/use-test-mcp-server.js";
-import { MCPServerForm as p } from "../settings/mcp-settings/mcp-server-form.js";
-import { useUpdateMcpServer as m } from "../../../hooks/mutation/use-update-mcp-server.js";
-import h from "react";
-import { Fragment as g, jsx as _, jsxs as v } from "react/jsx-runtime";
+import { useActiveBackend as r } from "../../../contexts/active-backend-context.js";
+import { displayErrorToast as i, displaySuccessToast as a } from "../../../utils/custom-toast-handlers.js";
+import { ModalBackdrop as o } from "../../shared/modals/modal-backdrop.js";
+import { modalTitleLgClassName as s } from "../../../utils/modal-classes.js";
+import { ModalCloseButton as c } from "../../shared/modals/modal-close-button.js";
+import { retrieveAxiosErrorMessage as l } from "../../../utils/retrieve-axios-error-message.js";
+import { ConfirmationModal as u } from "../../shared/modals/confirmation-modal.js";
+import { useDeleteMcpServer as d } from "../../../hooks/mutation/use-delete-mcp-server.js";
+import { useAddMcpServer as f } from "../../../hooks/mutation/use-add-mcp-server.js";
+import { useTestMcpServer as p } from "../../../hooks/mutation/use-test-mcp-server.js";
+import { MCPServerForm as m } from "../settings/mcp-settings/mcp-server-form.js";
+import { useUpdateMcpServer as h } from "../../../hooks/mutation/use-update-mcp-server.js";
+import g from "react";
+import { Fragment as _, jsx as v, jsxs as y } from "react/jsx-runtime";
 //#region src/components/features/mcp-page/custom-server-editor.tsx
-function y({ server: y, existingServers: b, onClose: x }) {
-	let { t: S } = e("openhands"), { mutate: C, isPending: w } = d(), { mutate: T, isPending: E } = m(), { mutate: D, isPending: O } = u(), { mutate: k, isPending: A, data: j, reset: M } = f(), [N, P] = h.useState(!1), F = !!y.id, I = w || E || O, L = I || A || N, R = (e) => {
+function b({ server: b, existingServers: x, onClose: S }) {
+	let { t: C } = e("openhands"), { mutate: w, isPending: T } = f(), { mutate: E, isPending: D } = h(), { mutate: O, isPending: k } = d(), { mutate: A, isPending: j, data: M, reset: N } = p(), [P, F] = g.useState(!1), { backend: I } = r(), L = I.kind === "cloud", R = !!b.id, z = T || D || k, B = z || j || P, V = (e) => {
 		switch (e.error_kind) {
-			case "timeout": return S(t.MCP$TEST_ERROR_TIMEOUT);
-			case "connection": return S(t.MCP$TEST_ERROR_CONNECTION);
-			default: return S(t.MCP$TEST_ERROR_UNKNOWN, { error: e.error });
+			case "timeout": return C(t.MCP$TEST_ERROR_TIMEOUT);
+			case "connection": return C(t.MCP$TEST_ERROR_CONNECTION);
+			default: return C(t.MCP$TEST_ERROR_UNKNOWN, { error: e.error });
 		}
-	}, z = h.useMemo(() => j ? j.ok ? {
+	}, H = g.useMemo(() => M ? M.ok ? {
 		ok: !0,
-		text: S(t.MCP$TEST_SUCCESS, { count: j.tools.length })
+		text: C(t.MCP$TEST_SUCCESS, { count: M.tools.length })
 	} : {
 		ok: !1,
-		text: R(j)
-	} : null, [j, S]), B = (e) => {
-		r(c(e) || S(t.ERROR$GENERIC));
+		text: V(M)
+	} : null, [M, C]), U = (e) => {
+		i(l(e) || C(t.ERROR$GENERIC));
 	};
-	return /* @__PURE__ */ v(g, { children: [/* @__PURE__ */ _(a, {
-		onClose: L ? void 0 : x,
-		closeOnEscape: !L,
-		"aria-label": S(F ? t.MCP$EDIT_CUSTOM_TITLE : t.MCP$ADD_CUSTOM_TITLE),
-		children: /* @__PURE__ */ v("div", {
+	return /* @__PURE__ */ y(_, { children: [/* @__PURE__ */ v(o, {
+		onClose: B ? void 0 : S,
+		closeOnEscape: !B,
+		"aria-label": C(R ? t.MCP$EDIT_CUSTOM_TITLE : t.MCP$ADD_CUSTOM_TITLE),
+		children: /* @__PURE__ */ y("div", {
 			"data-testid": "mcp-custom-editor",
 			className: "relative bg-base-secondary p-6 rounded-xl border border-[var(--oh-border)] w-[520px] max-w-[90vw] max-h-[90vh] overflow-y-auto custom-scrollbar",
 			children: [
-				/* @__PURE__ */ _(s, {
-					onClose: x,
+				/* @__PURE__ */ v(c, {
+					onClose: S,
 					testId: "mcp-custom-editor-close",
-					disabled: L
+					disabled: B
 				}),
-				/* @__PURE__ */ _("h2", {
-					className: n("mb-4 pr-6", o),
-					children: S(F ? t.MCP$EDIT_CUSTOM_TITLE : t.MCP$ADD_CUSTOM_TITLE)
+				/* @__PURE__ */ v("h2", {
+					className: n("mb-4 pr-6", s),
+					children: C(R ? t.MCP$EDIT_CUSTOM_TITLE : t.MCP$ADD_CUSTOM_TITLE)
 				}),
-				/* @__PURE__ */ _(p, {
-					mode: F ? "edit" : "add",
-					server: F ? y : void 0,
-					existingServers: b,
+				/* @__PURE__ */ v(m, {
+					mode: R ? "edit" : "add",
+					server: R ? b : void 0,
+					existingServers: x,
 					onSubmit: (e) => {
-						M(), k(e, {
+						N(), A(e, {
 							onSuccess: (t) => {
-								t.ok && (F ? T({
-									serverId: y.id,
+								t.ok && (R ? E({
+									serverId: b.id,
 									server: e
 								}, {
-									onSuccess: x,
-									onError: B
-								}) : C(e, {
-									onSuccess: x,
-									onError: B
+									onSuccess: S,
+									onError: U
+								}) : w(e, {
+									onSuccess: S,
+									onError: U
 								}));
 							},
-							onError: B
+							onError: U
 						});
 					},
-					onCancel: x,
-					onDelete: F ? () => P(!0) : void 0,
-					isActionDisabled: I,
-					onTest: (e) => {
-						k(e);
+					onCancel: S,
+					onDelete: R ? () => F(!0) : void 0,
+					isActionDisabled: z,
+					onTest: L ? void 0 : (e) => {
+						A(e);
 					},
-					isTestPending: A,
-					testMessage: z
+					isTestPending: j,
+					testMessage: L ? null : H
 				})
 			]
 		})
-	}), N ? /* @__PURE__ */ _(l, {
-		text: S(t.SETTINGS$MCP_CONFIRM_DELETE),
-		onCancel: () => P(!1),
+	}), P ? /* @__PURE__ */ v(u, {
+		text: C(t.SETTINGS$MCP_CONFIRM_DELETE),
+		onCancel: () => F(!1),
 		onConfirm: () => {
-			D(y, {
+			O(b, {
 				onSuccess: () => {
-					i(S(t.MCP$REMOVE_SUCCESS)), P(!1), x();
+					a(C(t.MCP$REMOVE_SUCCESS)), F(!1), S();
 				},
 				onError: (e) => {
-					B(e), P(!1);
+					U(e), F(!1);
 				}
 			});
 		},
-		isConfirming: O
+		isConfirming: k
 	}) : null] });
 }
 //#endregion
-export { y as CustomServerEditor };
+export { b as CustomServerEditor };
 
 //# sourceMappingURL=custom-server-editor.js.map

package/dist/components/features/mcp-page/custom-server-editor.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom-server-editor.js","names":[],"sources":["../../../../src/components/features/mcp-page/custom-server-editor.tsx"],"sourcesContent":["import React from \"react\";\nimport { AxiosError } from \"axios\";\nimport { useTranslation } from \"react-i18next\";\nimport type { MCPTestFailure } from \"@openhands/typescript-client\";\nimport { I18nKey } from \"#/i18n/declaration\";\nimport { ModalBackdrop } from \"#/components/shared/modals/modal-backdrop\";\nimport { ModalCloseButton } from \"#/components/shared/modals/modal-close-button\";\nimport { ConfirmationModal } from \"#/components/shared/modals/confirmation-modal\";\nimport {\n  MCPServerForm,\n  type TestMessage,\n} from \"#/components/features/settings/mcp-settings/mcp-server-form\";\nimport { useAddMcpServer } from \"#/hooks/mutation/use-add-mcp-server\";\nimport { useUpdateMcpServer } from \"#/hooks/mutation/use-update-mcp-server\";\nimport { useDeleteMcpServer } from \"#/hooks/mutation/use-delete-mcp-server\";\nimport { useTestMcpServer } from \"#/hooks/mutation/use-test-mcp-server\";\nimport { MCPServerConfig } from \"#/types/mcp-server\";\nimport {\n  displayErrorToast,\n  displaySuccessToast,\n} from \"#/utils/custom-toast-handlers\";\nimport { retrieveAxiosErrorMessage } from \"#/utils/retrieve-axios-error-message\";\nimport { cn } from \"#/utils/utils\";\nimport { modalTitleLgClassName } from \"#/utils/modal-classes\";\n\ninterface CustomServerEditorProps {\n  server: MCPServerConfig;\n  existingServers: MCPServerConfig[];\n  onClose: () => void;\n}\n\n/**\n * Modal wrapper around `MCPServerForm` so users can hand-author\n * arbitrary stdio / SSE / SHTTP entries without reaching for raw JSON.\n * An empty `server.id` means \"Add new\".\n */\nexport function CustomServerEditor({\n  server,\n  existingServers,\n  onClose,\n}: CustomServerEditorProps) {\n  const { t } = useTranslation(\"openhands\");\n  const { mutate: addMcpServer, isPending: isAdding } = useAddMcpServer();\n  const { mutate: updateMcpServer, isPending: isUpdating } =\n    useUpdateMcpServer();\n  const { mutate: deleteMcpServer, isPending: isDeleting } =\n    useDeleteMcpServer();\n  const {\n    mutate: testServer,\n    isPending: isTesting,\n    data: testResult,\n    reset: resetTest,\n  } = useTestMcpServer();\n  const [showDeleteConfirm, setShowDeleteConfirm] = React.useState(false);\n\n  const isEditing = !!server.id;\n  const isPending = isAdding || isUpdating || isDeleting;\n  const isDismissBlocked = isPending || isTesting || showDeleteConfirm;\n\n  const makeTestErrorMessage = (failure: MCPTestFailure): string => {\n    switch (failure.error_kind) {\n      case \"timeout\":\n        return t(I18nKey.MCP$TEST_ERROR_TIMEOUT);\n      case \"connection\":\n        return t(I18nKey.MCP$TEST_ERROR_CONNECTION);\n      default:\n        return t(I18nKey.MCP$TEST_ERROR_UNKNOWN, { error: failure.error });\n    }\n  };\n\n  const testMessage: TestMessage | null = React.useMemo(() => {\n    if (!testResult) return null;\n    if (testResult.ok) {\n      return {\n        ok: true,\n        text: t(I18nKey.MCP$TEST_SUCCESS, { count: testResult.tools.length }),\n      };\n    }\n    return { ok: false, text: makeTestErrorMessage(testResult) };\n  }, [testResult, t]);\n\n  // Shared error handler so both add and update surface backend errors\n  // as a toast instead of failing silently — previously these calls\n  // had no `onError` and the modal closed even on a 4xx/5xx, leaving\n  // the user to discover the failure on the next page load.\n  const handleError = (err: unknown) => {\n    const message = retrieveAxiosErrorMessage(err as AxiosError);\n    displayErrorToast(message || t(I18nKey.ERROR$GENERIC));\n  };\n\n  const handleSubmit = (payload: MCPServerConfig) => {\n    resetTest();\n    testServer(payload, {\n      onSuccess: (result) => {\n        if (!result.ok) {\n          // Test failed — modal stays open, error shown via testMessage.\n          return;\n        }\n        if (isEditing) {\n          updateMcpServer(\n            { serverId: server.id, server: payload },\n            { onSuccess: onClose, onError: handleError },\n          );\n        } else {\n          addMcpServer(payload, { onSuccess: onClose, onError: handleError });\n        }\n      },\n      onError: handleError,\n    });\n  };\n\n  const handleTestClick = (payload: MCPServerConfig) => {\n    testServer(payload);\n  };\n\n  const handleConfirmDelete = () => {\n    deleteMcpServer(server, {\n      onSuccess: () => {\n        displaySuccessToast(t(I18nKey.MCP$REMOVE_SUCCESS));\n        setShowDeleteConfirm(false);\n        onClose();\n      },\n      onError: (err) => {\n        handleError(err);\n        setShowDeleteConfirm(false);\n      },\n    });\n  };\n\n  return (\n    <>\n      <ModalBackdrop\n        // Block backdrop-click / Escape from dismissing the modal while\n        // a mutation is in flight — closing mid-request would orphan\n        // the request and leave the user with no error feedback.\n        onClose={isDismissBlocked ? undefined : onClose}\n        closeOnEscape={!isDismissBlocked}\n        aria-label={\n          isEditing\n            ? t(I18nKey.MCP$EDIT_CUSTOM_TITLE)\n            : t(I18nKey.MCP$ADD_CUSTOM_TITLE)\n        }\n      >\n        <div\n          data-testid=\"mcp-custom-editor\"\n          className=\"relative bg-base-secondary p-6 rounded-xl border border-[var(--oh-border)] w-[520px] max-w-[90vw] max-h-[90vh] overflow-y-auto custom-scrollbar\"\n        >\n          <ModalCloseButton\n            onClose={onClose}\n            testId=\"mcp-custom-editor-close\"\n            disabled={isDismissBlocked}\n          />\n          <h2 className={cn(\"mb-4 pr-6\", modalTitleLgClassName)}>\n            {isEditing\n              ? t(I18nKey.MCP$EDIT_CUSTOM_TITLE)\n              : t(I18nKey.MCP$ADD_CUSTOM_TITLE)}\n          </h2>\n          <MCPServerForm\n            mode={isEditing ? \"edit\" : \"add\"}\n            server={isEditing ? server : undefined}\n            existingServers={existingServers}\n            onSubmit={handleSubmit}\n            onCancel={onClose}\n            onDelete={isEditing ? () => setShowDeleteConfirm(true) : undefined}\n            isActionDisabled={isPending}\n            onTest={handleTestClick}\n            isTestPending={isTesting}\n            testMessage={testMessage}\n          />\n        </div>\n      </ModalBackdrop>\n\n      {showDeleteConfirm ? (\n        <ConfirmationModal\n          text={t(I18nKey.SETTINGS$MCP_CONFIRM_DELETE)}\n          onCancel={() => setShowDeleteConfirm(false)}\n          onConfirm={handleConfirmDelete}\n          isConfirming={isDeleting}\n        />\n      ) : null}\n    </>\n  );\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAoCA,SAAgB,EAAmB,EACjC,WACA,oBACA,cAC0B;CAC1B,IAAM,EAAE,SAAM,EAAe,YAAY,EACnC,EAAE,QAAQ,GAAc,WAAW,MAAa,GAAiB,EACjE,EAAE,QAAQ,GAAiB,WAAW,MAC1C,GAAoB,EAChB,EAAE,QAAQ,GAAiB,WAAW,MAC1C,GAAoB,EAChB,EACJ,QAAQ,GACR,WAAW,GACX,MAAM,GACN,OAAO,MACL,GAAkB,EAChB,CAAC,GAAmB,KAAwB,EAAM,SAAS,GAAM,EAEjE,IAAY,CAAC,CAAC,EAAO,IACrB,IAAY,KAAY,KAAc,GACtC,IAAmB,KAAa,KAAa,GAE7C,KAAwB,MAAoC;AAChE,UAAQ,EAAQ,YAAhB;GACE,KAAK,UACH,QAAO,EAAE,EAAQ,uBAAuB;GAC1C,KAAK,aACH,QAAO,EAAE,EAAQ,0BAA0B;GAC7C,QACE,QAAO,EAAE,EAAQ,wBAAwB,EAAE,OAAO,EAAQ,OAAO,CAAC;;IAIlE,IAAkC,EAAM,cACvC,IACD,EAAW,KACN;EACL,IAAI;EACJ,MAAM,EAAE,EAAQ,kBAAkB,EAAE,OAAO,EAAW,MAAM,QAAQ,CAAC;EACtE,GAEI;EAAE,IAAI;EAAO,MAAM,EAAqB,EAAW;EAAE,GAPpC,MAQvB,CAAC,GAAY,EAAE,CAAC,EAMb,KAAe,MAAiB;AAEpC,IADgB,EAA0B,EACxB,IAAW,EAAE,EAAQ,cAAc,CAAC;;AA0CxD,QACE,kBAAA,GAAA,EAAA,UAAA,CACE,kBAAC,GAAD;EAIE,SAAS,IAAmB,KAAA,IAAY;EACxC,eAAe,CAAC;EAChB,cAEM,EADJ,IACM,EAAQ,wBACR,EAAQ,qBAAqB;YAGrC,kBAAC,OAAD;GACE,eAAY;GACZ,WAAU;aAFZ;IAIE,kBAAC,GAAD;KACW;KACT,QAAO;KACP,UAAU;KACV,CAAA;IACF,kBAAC,MAAD;KAAI,WAAW,EAAG,aAAa,EAAsB;eAE/C,EADH,IACK,EAAQ,wBACR,EAAQ,qBAAqB;KAChC,CAAA;IACL,kBAAC,GAAD;KACE,MAAM,IAAY,SAAS;KAC3B,QAAQ,IAAY,IAAS,KAAA;KACZ;KACjB,WAvEY,MAA6B;AAEjD,MADA,GAAW,EACX,EAAW,GAAS;OAClB,YAAY,MAAW;AAChB,UAAO,OAIR,IACF,EACE;SAAE,UAAU,EAAO;SAAI,QAAQ;SAAS,EACxC;SAAE,WAAW;SAAS,SAAS;SAAa,CAC7C,GAED,EAAa,GAAS;SAAE,WAAW;SAAS,SAAS;SAAa,CAAC;;OAGvE,SAAS;OACV,CAAC;;KAsDM,UAAU;KACV,UAAU,UAAkB,EAAqB,GAAK,GAAG,KAAA;KACzD,kBAAkB;KAClB,SAtDe,MAA6B;AACpD,QAAW,EAAQ;;KAsDX,eAAe;KACF;KACb,CAAA;IACE;;EACQ,CAAA,EAEf,IACC,kBAAC,GAAD;EACE,MAAM,EAAE,EAAQ,4BAA4B;EAC5C,gBAAgB,EAAqB,GAAM;EAC3C,iBA7D0B;AAChC,KAAgB,GAAQ;IACtB,iBAAiB;AAGf,KAFA,EAAoB,EAAE,EAAQ,mBAAmB,CAAC,EAClD,EAAqB,GAAM,EAC3B,GAAS;;IAEX,UAAU,MAAQ;AAEhB,KADA,EAAY,EAAI,EAChB,EAAqB,GAAM;;IAE9B,CAAC;;EAmDI,cAAc;EACd,CAAA,GACA,KACH,EAAA,CAAA"}
+{"version":3,"file":"custom-server-editor.js","names":[],"sources":["../../../../src/components/features/mcp-page/custom-server-editor.tsx"],"sourcesContent":["import React from \"react\";\nimport { AxiosError } from \"axios\";\nimport { useTranslation } from \"react-i18next\";\nimport type { MCPTestFailure } from \"@openhands/typescript-client\";\nimport { I18nKey } from \"#/i18n/declaration\";\nimport { ModalBackdrop } from \"#/components/shared/modals/modal-backdrop\";\nimport { ModalCloseButton } from \"#/components/shared/modals/modal-close-button\";\nimport { ConfirmationModal } from \"#/components/shared/modals/confirmation-modal\";\nimport {\n  MCPServerForm,\n  type TestMessage,\n} from \"#/components/features/settings/mcp-settings/mcp-server-form\";\nimport { useAddMcpServer } from \"#/hooks/mutation/use-add-mcp-server\";\nimport { useUpdateMcpServer } from \"#/hooks/mutation/use-update-mcp-server\";\nimport { useDeleteMcpServer } from \"#/hooks/mutation/use-delete-mcp-server\";\nimport { useTestMcpServer } from \"#/hooks/mutation/use-test-mcp-server\";\nimport { useActiveBackend } from \"#/contexts/active-backend-context\";\nimport { MCPServerConfig } from \"#/types/mcp-server\";\nimport {\n  displayErrorToast,\n  displaySuccessToast,\n} from \"#/utils/custom-toast-handlers\";\nimport { retrieveAxiosErrorMessage } from \"#/utils/retrieve-axios-error-message\";\nimport { cn } from \"#/utils/utils\";\nimport { modalTitleLgClassName } from \"#/utils/modal-classes\";\n\ninterface CustomServerEditorProps {\n  server: MCPServerConfig;\n  existingServers: MCPServerConfig[];\n  onClose: () => void;\n}\n\n/**\n * Modal wrapper around `MCPServerForm` so users can hand-author\n * arbitrary stdio / SSE / SHTTP entries without reaching for raw JSON.\n * An empty `server.id` means \"Add new\".\n */\nexport function CustomServerEditor({\n  server,\n  existingServers,\n  onClose,\n}: CustomServerEditorProps) {\n  const { t } = useTranslation(\"openhands\");\n  const { mutate: addMcpServer, isPending: isAdding } = useAddMcpServer();\n  const { mutate: updateMcpServer, isPending: isUpdating } =\n    useUpdateMcpServer();\n  const { mutate: deleteMcpServer, isPending: isDeleting } =\n    useDeleteMcpServer();\n  const {\n    mutate: testServer,\n    isPending: isTesting,\n    data: testResult,\n    reset: resetTest,\n  } = useTestMcpServer();\n  const [showDeleteConfirm, setShowDeleteConfirm] = React.useState(false);\n\n  // The MCP connectivity-test endpoint only exists on the local agent-server.\n  // For cloud backends `McpService.testServer` short-circuits with a synthetic\n  // success so the save still completes; we hide the manual \"Test connection\"\n  // button here so cloud users aren't shown a misleading \"0 tools\" result.\n  const { backend } = useActiveBackend();\n  const isCloudBackend = backend.kind === \"cloud\";\n\n  const isEditing = !!server.id;\n  const isPending = isAdding || isUpdating || isDeleting;\n  const isDismissBlocked = isPending || isTesting || showDeleteConfirm;\n\n  const makeTestErrorMessage = (failure: MCPTestFailure): string => {\n    switch (failure.error_kind) {\n      case \"timeout\":\n        return t(I18nKey.MCP$TEST_ERROR_TIMEOUT);\n      case \"connection\":\n        return t(I18nKey.MCP$TEST_ERROR_CONNECTION);\n      default:\n        return t(I18nKey.MCP$TEST_ERROR_UNKNOWN, { error: failure.error });\n    }\n  };\n\n  const testMessage: TestMessage | null = React.useMemo(() => {\n    if (!testResult) return null;\n    if (testResult.ok) {\n      return {\n        ok: true,\n        text: t(I18nKey.MCP$TEST_SUCCESS, { count: testResult.tools.length }),\n      };\n    }\n    return { ok: false, text: makeTestErrorMessage(testResult) };\n  }, [testResult, t]);\n\n  // Shared error handler so both add and update surface backend errors\n  // as a toast instead of failing silently — previously these calls\n  // had no `onError` and the modal closed even on a 4xx/5xx, leaving\n  // the user to discover the failure on the next page load.\n  const handleError = (err: unknown) => {\n    const message = retrieveAxiosErrorMessage(err as AxiosError);\n    displayErrorToast(message || t(I18nKey.ERROR$GENERIC));\n  };\n\n  const handleSubmit = (payload: MCPServerConfig) => {\n    resetTest();\n    testServer(payload, {\n      onSuccess: (result) => {\n        if (!result.ok) {\n          // Test failed — modal stays open, error shown via testMessage.\n          return;\n        }\n        if (isEditing) {\n          updateMcpServer(\n            { serverId: server.id, server: payload },\n            { onSuccess: onClose, onError: handleError },\n          );\n        } else {\n          addMcpServer(payload, { onSuccess: onClose, onError: handleError });\n        }\n      },\n      onError: handleError,\n    });\n  };\n\n  const handleTestClick = (payload: MCPServerConfig) => {\n    testServer(payload);\n  };\n\n  const handleConfirmDelete = () => {\n    deleteMcpServer(server, {\n      onSuccess: () => {\n        displaySuccessToast(t(I18nKey.MCP$REMOVE_SUCCESS));\n        setShowDeleteConfirm(false);\n        onClose();\n      },\n      onError: (err) => {\n        handleError(err);\n        setShowDeleteConfirm(false);\n      },\n    });\n  };\n\n  return (\n    <>\n      <ModalBackdrop\n        // Block backdrop-click / Escape from dismissing the modal while\n        // a mutation is in flight — closing mid-request would orphan\n        // the request and leave the user with no error feedback.\n        onClose={isDismissBlocked ? undefined : onClose}\n        closeOnEscape={!isDismissBlocked}\n        aria-label={\n          isEditing\n            ? t(I18nKey.MCP$EDIT_CUSTOM_TITLE)\n            : t(I18nKey.MCP$ADD_CUSTOM_TITLE)\n        }\n      >\n        <div\n          data-testid=\"mcp-custom-editor\"\n          className=\"relative bg-base-secondary p-6 rounded-xl border border-[var(--oh-border)] w-[520px] max-w-[90vw] max-h-[90vh] overflow-y-auto custom-scrollbar\"\n        >\n          <ModalCloseButton\n            onClose={onClose}\n            testId=\"mcp-custom-editor-close\"\n            disabled={isDismissBlocked}\n          />\n          <h2 className={cn(\"mb-4 pr-6\", modalTitleLgClassName)}>\n            {isEditing\n              ? t(I18nKey.MCP$EDIT_CUSTOM_TITLE)\n              : t(I18nKey.MCP$ADD_CUSTOM_TITLE)}\n          </h2>\n          <MCPServerForm\n            mode={isEditing ? \"edit\" : \"add\"}\n            server={isEditing ? server : undefined}\n            existingServers={existingServers}\n            onSubmit={handleSubmit}\n            onCancel={onClose}\n            onDelete={isEditing ? () => setShowDeleteConfirm(true) : undefined}\n            isActionDisabled={isPending}\n            onTest={isCloudBackend ? undefined : handleTestClick}\n            isTestPending={isTesting}\n            testMessage={isCloudBackend ? null : testMessage}\n          />\n        </div>\n      </ModalBackdrop>\n\n      {showDeleteConfirm ? (\n        <ConfirmationModal\n          text={t(I18nKey.SETTINGS$MCP_CONFIRM_DELETE)}\n          onCancel={() => setShowDeleteConfirm(false)}\n          onConfirm={handleConfirmDelete}\n          isConfirming={isDeleting}\n        />\n      ) : null}\n    </>\n  );\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAqCA,SAAgB,EAAmB,EACjC,WACA,oBACA,cAC0B;CAC1B,IAAM,EAAE,SAAM,EAAe,YAAY,EACnC,EAAE,QAAQ,GAAc,WAAW,MAAa,GAAiB,EACjE,EAAE,QAAQ,GAAiB,WAAW,MAC1C,GAAoB,EAChB,EAAE,QAAQ,GAAiB,WAAW,MAC1C,GAAoB,EAChB,EACJ,QAAQ,GACR,WAAW,GACX,MAAM,GACN,OAAO,MACL,GAAkB,EAChB,CAAC,GAAmB,KAAwB,EAAM,SAAS,GAAM,EAMjE,EAAE,eAAY,GAAkB,EAChC,IAAiB,EAAQ,SAAS,SAElC,IAAY,CAAC,CAAC,EAAO,IACrB,IAAY,KAAY,KAAc,GACtC,IAAmB,KAAa,KAAa,GAE7C,KAAwB,MAAoC;AAChE,UAAQ,EAAQ,YAAhB;GACE,KAAK,UACH,QAAO,EAAE,EAAQ,uBAAuB;GAC1C,KAAK,aACH,QAAO,EAAE,EAAQ,0BAA0B;GAC7C,QACE,QAAO,EAAE,EAAQ,wBAAwB,EAAE,OAAO,EAAQ,OAAO,CAAC;;IAIlE,IAAkC,EAAM,cACvC,IACD,EAAW,KACN;EACL,IAAI;EACJ,MAAM,EAAE,EAAQ,kBAAkB,EAAE,OAAO,EAAW,MAAM,QAAQ,CAAC;EACtE,GAEI;EAAE,IAAI;EAAO,MAAM,EAAqB,EAAW;EAAE,GAPpC,MAQvB,CAAC,GAAY,EAAE,CAAC,EAMb,KAAe,MAAiB;AAEpC,IADgB,EAA0B,EACxB,IAAW,EAAE,EAAQ,cAAc,CAAC;;AA0CxD,QACE,kBAAA,GAAA,EAAA,UAAA,CACE,kBAAC,GAAD;EAIE,SAAS,IAAmB,KAAA,IAAY;EACxC,eAAe,CAAC;EAChB,cAEM,EADJ,IACM,EAAQ,wBACR,EAAQ,qBAAqB;YAGrC,kBAAC,OAAD;GACE,eAAY;GACZ,WAAU;aAFZ;IAIE,kBAAC,GAAD;KACW;KACT,QAAO;KACP,UAAU;KACV,CAAA;IACF,kBAAC,MAAD;KAAI,WAAW,EAAG,aAAa,EAAsB;eAE/C,EADH,IACK,EAAQ,wBACR,EAAQ,qBAAqB;KAChC,CAAA;IACL,kBAAC,GAAD;KACE,MAAM,IAAY,SAAS;KAC3B,QAAQ,IAAY,IAAS,KAAA;KACZ;KACjB,WAvEY,MAA6B;AAEjD,MADA,GAAW,EACX,EAAW,GAAS;OAClB,YAAY,MAAW;AAChB,UAAO,OAIR,IACF,EACE;SAAE,UAAU,EAAO;SAAI,QAAQ;SAAS,EACxC;SAAE,WAAW;SAAS,SAAS;SAAa,CAC7C,GAED,EAAa,GAAS;SAAE,WAAW;SAAS,SAAS;SAAa,CAAC;;OAGvE,SAAS;OACV,CAAC;;KAsDM,UAAU;KACV,UAAU,UAAkB,EAAqB,GAAK,GAAG,KAAA;KACzD,kBAAkB;KAClB,QAAQ,IAAiB,KAAA,KAtDV,MAA6B;AACpD,QAAW,EAAQ;;KAsDX,eAAe;KACf,aAAa,IAAiB,OAAO;KACrC,CAAA;IACE;;EACQ,CAAA,EAEf,IACC,kBAAC,GAAD;EACE,MAAM,EAAE,EAAQ,4BAA4B;EAC5C,gBAAgB,EAAqB,GAAM;EAC3C,iBA7D0B;AAChC,KAAgB,GAAQ;IACtB,iBAAiB;AAGf,KAFA,EAAoB,EAAE,EAAQ,mBAAmB,CAAC,EAClD,EAAqB,GAAM,EAC3B,GAAS;;IAEX,UAAU,MAAQ;AAEhB,KADA,EAAY,EAAI,EAChB,EAAqB,GAAM;;IAE9B,CAAC;;EAmDI,cAAc;EACd,CAAA,GACA,KACH,EAAA,CAAA"}

package/dist/components/features/onboarding/steps/setup-llm-step.d.ts

@@ -2,6 +2,14 @@ interface SetupLlmStepProps {
     onBack: () => void;
     onNext: () => void;
 }
+/**
+ * Pre-fills the LLM form with the OpenAI GPT-5.5 model. The SDK's
+ * bare default model is `gpt-5.5`; Canvas stores provider-qualified
+ * LiteLLM model ids, so the onboarding override uses this OpenAI-prefixed
+ * model id. Keeping this as an explicit override marks the model dirty so
+ * the Next button persists the suggested default immediately.
+ */
+export declare const ONBOARDING_DEFAULT_LLM_MODEL = "openai/gpt-5.5";
 /**
  * Step 2: embed the LLM settings form. The screen runs in `embedded`
  * mode (so it doesn't render its own sticky Save bar) and with