@openhands/agent-canvas 1.1.0 → 1.2.0

package/dist/utils/handle-event-for-ui.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"handle-event-for-ui.cjs","names":[],"sources":["../../src/utils/handle-event-for-ui.ts"],"sourcesContent":["import { MessageEvent, OpenHandsEvent } from \"#/types/agent-server/core\";\nimport {\n  isACPToolCallEvent,\n  isActionEvent,\n  isMessageEvent,\n  isObservationEvent,\n  isStreamingDeltaEvent,\n} from \"#/types/agent-server/type-guards\";\nimport { StreamingDeltaEvent } from \"#/types/agent-server/core/events/streaming-delta-event\";\n\nexport const mergeStreamingDeltaEvent = (\n  incoming: StreamingDeltaEvent,\n  existing: StreamingDeltaEvent,\n): StreamingDeltaEvent => ({\n  ...existing,\n  content: `${existing.content ?? \"\"}${incoming.content ?? \"\"}` || null,\n  reasoning_content:\n    `${existing.reasoning_content ?? \"\"}${incoming.reasoning_content ?? \"\"}` ||\n    null,\n});\n\nconst appendContentToStreamingDeltaEvent = (\n  existing: StreamingDeltaEvent,\n  content: string,\n): StreamingDeltaEvent => ({\n  ...existing,\n  content: `${existing.content ?? \"\"}${content}` || null,\n});\n\nconst findLastUserMessageIndex = (events: OpenHandsEvent[]): number => {\n  for (let index = events.length - 1; index >= 0; index -= 1) {\n    const event = events[index];\n    if (isMessageEvent(event) && event.source === \"user\") {\n      return index;\n    }\n  }\n  return -1;\n};\n\n// Join text blocks WITHOUT a separator: streaming deltas concatenate content\n// tokens directly with no separator between LLM content blocks, so using \"\\n\"\n// here would cause startsWith/findTextSegmentsInOrder to miss when reconciling\n// a multi-block MessageEvent against the already-rendered streaming delta.\nconst getAgentMessageText = (event: MessageEvent): string =>\n  event.llm_message.content\n    .filter((content) => content.type === \"text\")\n    .map((content) => content.text)\n    .join(\"\");\n\nconst getFinalAgentText = (event: OpenHandsEvent): string | null => {\n  if (isActionEvent(event) && event.action.kind === \"FinishAction\") {\n    return event.action.message;\n  }\n\n  if (isMessageEvent(event) && event.source === \"agent\") {\n    return getAgentMessageText(event);\n  }\n\n  return null;\n};\n\nconst findTextSegmentsInOrder = (\n  text: string,\n  segments: string[],\n): { matched: boolean; lastMatchEnd: number } => {\n  let searchStart = 0;\n  let lastMatchEnd = 0;\n\n  for (const segment of segments) {\n    const index = text.indexOf(segment, searchStart);\n    if (index === -1) {\n      return { matched: false, lastMatchEnd };\n    }\n    lastMatchEnd = index + segment.length;\n    searchStart = lastMatchEnd;\n  }\n\n  return { matched: true, lastMatchEnd };\n};\n\nconst finalizeStreamingDeltasInPlace = (\n  finalEvent: OpenHandsEvent,\n  uiEvents: OpenHandsEvent[],\n): OpenHandsEvent[] | null => {\n  const lastUserMessageIndex = findLastUserMessageIndex(uiEvents);\n  const currentTurnStreamingDeltaIndexes = uiEvents\n    .map((uiEvent, index) => ({ uiEvent, index }))\n    .filter(\n      ({ uiEvent, index }) =>\n        index > lastUserMessageIndex && isStreamingDeltaEvent(uiEvent),\n    )\n    .map(({ index }) => index);\n\n  if (currentTurnStreamingDeltaIndexes.length === 0) {\n    return null;\n  }\n\n  const finalText = getFinalAgentText(finalEvent);\n  // Only the regular `content` field participates in reconciliation.\n  // Reasoning-only deltas (those that carry only `reasoning_content`) produce\n  // an empty streamingSegments list, causing the function to return null so\n  // the finalEvent is appended normally.  This is intentional: reasoning\n  // content renders in its own collapsed bubble and never overlaps with the\n  // assistant's regular message text in `FinishAction.message`.\n  const contentStreamingDeltas = currentTurnStreamingDeltaIndexes\n    .map((index) => ({ event: uiEvents[index], index }))\n    .filter(\n      (item): item is { event: StreamingDeltaEvent; index: number } =>\n        isStreamingDeltaEvent(item.event) &&\n        (item.event.content?.length ?? 0) > 0,\n    );\n  const streamingSegments = contentStreamingDeltas.map(\n    ({ event }) => event.content ?? \"\",\n  );\n\n  if (!finalText || streamingSegments.length === 0) {\n    return null;\n  }\n\n  const nextUiEvents = [...uiEvents];\n  const streamedText = streamingSegments.join(\"\");\n  let unstreamedSuffix = \"\";\n\n  if (finalText.startsWith(streamedText)) {\n    unstreamedSuffix = finalText.slice(streamedText.length);\n  } else {\n    const match = findTextSegmentsInOrder(finalText, streamingSegments);\n    if (!match.matched) {\n      return null;\n    }\n    unstreamedSuffix = finalText.slice(match.lastMatchEnd);\n  }\n\n  const lastDeltaIndex = contentStreamingDeltas.at(-1)?.index;\n  const lastDelta =\n    lastDeltaIndex === undefined ? undefined : nextUiEvents[lastDeltaIndex];\n  if (\n    unstreamedSuffix &&\n    lastDeltaIndex !== undefined &&\n    lastDelta &&\n    isStreamingDeltaEvent(lastDelta)\n  ) {\n    nextUiEvents[lastDeltaIndex] = appendContentToStreamingDeltaEvent(\n      lastDelta,\n      unstreamedSuffix,\n    );\n  }\n\n  // Intentionally return nextUiEvents WITHOUT appending finalEvent.\n  // The last content-bearing streaming delta (possibly extended with\n  // unstreamedSuffix above) becomes the canonical final rendered bubble for\n  // this turn. Appending finalEvent here would display the assistant message\n  // twice.\n  return nextUiEvents;\n};\n\n/**\n * Handles adding an event to the UI events array\n * Replaces actions with observations when they arrive (so UI shows observation instead of action)\n * Exception: ThinkAction is NOT replaced because the thought content is in the action, not in the observation\n *\n * ACPToolCallEvent merge: the SDK emits two events per ``tool_call_id`` — an\n * early ``started`` event (``pending`` / ``in_progress``) and one terminal\n * (completed / failed) event, the action->observation pair for a tool call.\n * Replace the started entry in place with the terminal one so a single card\n * updates from running to its result, exactly like an observation superseding\n * its action below.\n */\nexport const handleEventForUI = (\n  event: OpenHandsEvent,\n  uiEvents: OpenHandsEvent[],\n): OpenHandsEvent[] => {\n  const newUiEvents = [...uiEvents];\n\n  if (isStreamingDeltaEvent(event)) {\n    if (event.content === null && event.reasoning_content === null) {\n      return newUiEvents;\n    }\n\n    const lastIndex = newUiEvents.length - 1;\n    const lastEvent = newUiEvents[lastIndex];\n    if (lastEvent && isStreamingDeltaEvent(lastEvent)) {\n      newUiEvents[lastIndex] = mergeStreamingDeltaEvent(event, lastEvent);\n      return newUiEvents;\n    }\n\n    newUiEvents.push(event);\n    return newUiEvents;\n  }\n\n  if (\n    (isActionEvent(event) && event.action.kind === \"FinishAction\") ||\n    (isMessageEvent(event) && event.source === \"agent\")\n  ) {\n    const finalizedUiEvents = finalizeStreamingDeltasInPlace(\n      event,\n      newUiEvents,\n    );\n    if (finalizedUiEvents) {\n      // The reconciled streaming delta intentionally replaces this final event\n      // for rendering. Today streamed agent responses only render text and\n      // reasoning content; if final-event metadata such as activated\n      // microagents becomes meaningful for streamed responses, add a rendered\n      // wrapper that carries both the stable delta identity and that metadata.\n      return finalizedUiEvents;\n    }\n  }\n\n  if (isACPToolCallEvent(event)) {\n    const existingIndex = newUiEvents.findIndex(\n      (uiEvent) =>\n        isACPToolCallEvent(uiEvent) &&\n        uiEvent.tool_call_id === event.tool_call_id,\n    );\n    if (existingIndex !== -1) {\n      newUiEvents[existingIndex] = event;\n    } else {\n      newUiEvents.push(event);\n    }\n    return newUiEvents;\n  }\n\n  if (isObservationEvent(event)) {\n    // Don't add ThinkObservation at all - we keep the ThinkAction instead\n    // The thought content is in the action, not the observation\n    if (event.observation.kind === \"ThinkObservation\") {\n      return newUiEvents;\n    }\n\n    // Don't add FinishObservation at all - we keep the FinishAction instead\n    // Both contain the same message content, so we only need to display one\n    // This also prevents duplicate messages when events arrive out of order due to React batching\n    if (event.observation.kind === \"FinishObservation\") {\n      return newUiEvents;\n    }\n\n    // Find and replace the corresponding action from uiEvents\n    const actionIndex = newUiEvents.findIndex(\n      (uiEvent) => uiEvent.id === event.action_id,\n    );\n    if (actionIndex !== -1) {\n      newUiEvents[actionIndex] = event;\n    } else {\n      // Action not found in uiEvents, just add the observation\n      newUiEvents.push(event);\n    }\n  } else {\n    // For non-observation events, just add them to uiEvents\n    newUiEvents.push(event);\n  }\n\n  return newUiEvents;\n};\n"],"mappings":"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"}
+{"version":3,"file":"handle-event-for-ui.cjs","names":[],"sources":["../../src/utils/handle-event-for-ui.ts"],"sourcesContent":["import {\n  ActionEvent,\n  ImageContent,\n  OpenHandsEvent,\n  TextContent,\n} from \"#/types/agent-server/core\";\nimport {\n  isACPToolCallEvent,\n  isActionEvent,\n  isMessageEvent,\n  isObservationEvent,\n  isStreamingDeltaEvent,\n} from \"#/types/agent-server/type-guards\";\nimport { StreamingDeltaEvent } from \"#/types/agent-server/core/events/streaming-delta-event\";\nimport { getReasoningContent } from \"#/components/conversation-events/chat/event-thought-helpers\";\n\nexport const mergeStreamingDeltaEvent = (\n  incoming: StreamingDeltaEvent,\n  existing: StreamingDeltaEvent,\n): StreamingDeltaEvent => ({\n  ...existing,\n  content: `${existing.content ?? \"\"}${incoming.content ?? \"\"}` || null,\n  reasoning_content:\n    `${existing.reasoning_content ?? \"\"}${incoming.reasoning_content ?? \"\"}` ||\n    null,\n});\n\nconst appendContentToStreamingDeltaEvent = (\n  existing: StreamingDeltaEvent,\n  content: string,\n): StreamingDeltaEvent => ({\n  ...existing,\n  content: `${existing.content ?? \"\"}${content}` || null,\n});\n\nconst findLastUserMessageIndex = (events: OpenHandsEvent[]): number => {\n  for (let index = events.length - 1; index >= 0; index -= 1) {\n    const event = events[index];\n    if (isMessageEvent(event) && event.source === \"user\") {\n      return index;\n    }\n  }\n  return -1;\n};\n\n// Join text blocks WITHOUT a separator: streaming deltas concatenate content\n// tokens directly with no separator between LLM content blocks, so using \"\\n\"\n// here would cause startsWith/findTextSegmentsInOrder to miss when reconciling\n// a multi-block message/thought against the already-rendered streaming delta.\nconst joinTextBlocks = (blocks: (TextContent | ImageContent)[]): string =>\n  blocks\n    .filter((block) => block.type === \"text\")\n    .map((block) => block.text)\n    .join(\"\");\n\nconst getFinalAgentText = (event: OpenHandsEvent): string | null => {\n  if (isActionEvent(event) && event.action.kind === \"FinishAction\") {\n    return event.action.message;\n  }\n\n  if (isMessageEvent(event) && event.source === \"agent\") {\n    return joinTextBlocks(event.llm_message.content);\n  }\n\n  return null;\n};\n\nconst findTextSegmentsInOrder = (\n  text: string,\n  segments: string[],\n): { matched: boolean; lastMatchEnd: number } => {\n  let searchStart = 0;\n  let lastMatchEnd = 0;\n\n  for (const segment of segments) {\n    const index = text.indexOf(segment, searchStart);\n    if (index === -1) {\n      return { matched: false, lastMatchEnd };\n    }\n    lastMatchEnd = index + segment.length;\n    searchStart = lastMatchEnd;\n  }\n\n  return { matched: true, lastMatchEnd };\n};\n\n// Content-bearing streaming deltas of the current turn (after the last user\n// message). Reasoning-only deltas are excluded: reasoning renders in its own\n// collapsed bubble and never overlaps the message text being reconciled.\nconst getCurrentTurnContentDeltas = (\n  uiEvents: OpenHandsEvent[],\n): { event: StreamingDeltaEvent; index: number }[] => {\n  const lastUserMessageIndex = findLastUserMessageIndex(uiEvents);\n  return uiEvents\n    .map((event, index) => ({ event, index }))\n    .filter(\n      (item): item is { event: StreamingDeltaEvent; index: number } =>\n        item.index > lastUserMessageIndex &&\n        isStreamingDeltaEvent(item.event) &&\n        (item.event.content?.length ?? 0) > 0,\n    );\n};\n\n// The current step's streaming delta(s): the trailing run at the end of\n// `uiEvents`. Earlier steps' deltas are separated by their observations, so\n// this never folds an earlier step's delta into the current one.\nconst getTrailingContentDeltas = (\n  uiEvents: OpenHandsEvent[],\n): { event: StreamingDeltaEvent; index: number }[] => {\n  const deltas: { event: StreamingDeltaEvent; index: number }[] = [];\n  for (let index = uiEvents.length - 1; index >= 0; index -= 1) {\n    const event = uiEvents[index];\n    if (!isStreamingDeltaEvent(event)) {\n      break;\n    }\n    if ((event.content?.length ?? 0) > 0) {\n      deltas.unshift({ event, index });\n    }\n  }\n  return deltas;\n};\n\n// Whether the streamed `segments` (in order) reconcile against `targetText`.\n// `lastMatchEnd` is the offset past the matched text, so callers can recover\n// any not-yet-streamed suffix. The SDK strips the finalized text, so it may\n// lack trailing whitespace the model streamed; the match tolerates that by\n// also trying the trailing-trimmed streamed text.\nconst matchStreamedSegments = (\n  targetText: string,\n  segments: string[],\n): { matched: boolean; lastMatchEnd: number } => {\n  const streamedText = segments.join(\"\");\n  for (const candidate of [streamedText, streamedText.trimEnd()]) {\n    if (candidate && targetText.startsWith(candidate)) {\n      return { matched: true, lastMatchEnd: candidate.length };\n    }\n  }\n  // Segments may be interleaved with not-yet-streamed text; locate them in\n  // order, trimming the last segment's trailing whitespace.\n  const lastIndex = segments.length - 1;\n  const searchSegments = segments.map((segment, index) =>\n    index === lastIndex ? segment.trimEnd() : segment,\n  );\n  return findTextSegmentsInOrder(targetText, searchSegments);\n};\n\nconst finalizeStreamingDeltasInPlace = (\n  finalEvent: OpenHandsEvent,\n  uiEvents: OpenHandsEvent[],\n): OpenHandsEvent[] | null => {\n  const contentStreamingDeltas = getCurrentTurnContentDeltas(uiEvents);\n  if (contentStreamingDeltas.length === 0) {\n    return null;\n  }\n\n  const finalText = getFinalAgentText(finalEvent);\n  if (!finalText) {\n    return null;\n  }\n\n  const streamingSegments = contentStreamingDeltas.map(\n    ({ event }) => event.content ?? \"\",\n  );\n  const { matched, lastMatchEnd } = matchStreamedSegments(\n    finalText,\n    streamingSegments,\n  );\n  if (!matched) {\n    return null;\n  }\n\n  const nextUiEvents = [...uiEvents];\n  const unstreamedSuffix = finalText.slice(lastMatchEnd);\n\n  const lastDeltaIndex = contentStreamingDeltas.at(-1)?.index;\n  const lastDelta =\n    lastDeltaIndex === undefined ? undefined : nextUiEvents[lastDeltaIndex];\n  if (\n    unstreamedSuffix &&\n    lastDeltaIndex !== undefined &&\n    lastDelta &&\n    isStreamingDeltaEvent(lastDelta)\n  ) {\n    nextUiEvents[lastDeltaIndex] = appendContentToStreamingDeltaEvent(\n      lastDelta,\n      unstreamedSuffix,\n    );\n  }\n\n  // Intentionally return nextUiEvents WITHOUT appending finalEvent.\n  // The last content-bearing streaming delta (possibly extended with\n  // unstreamedSuffix above) becomes the canonical final rendered bubble for\n  // this turn. Appending finalEvent here would display the assistant message\n  // twice.\n  return nextUiEvents;\n};\n\n/**\n * Reconcile the current turn's streaming delta when an intermediate\n * (tool-calling) `ActionEvent` arrives. With `stream=true` the step's\n * pre-tool-call text is streamed as delta `content`, then the action's\n * `thought` repeats it and the chat hoists that into its own message (see\n * `group-events.ts`), so the text would render twice (issue #1534).\n *\n * Unlike `finalizeStreamingDeltasInPlace` (which drops the final event and\n * keeps the delta), the action must stay — it owns the tool call. So the\n * streamed text is cleared from the delta instead, and the delta is kept only\n * to carry reasoning the action itself lacks (for many models the delta is the\n * sole reasoning carrier), otherwise dropped.\n *\n * Only the current step's trailing delta run is considered. Returns the updated\n * array, or `null` when there is nothing to reconcile.\n */\nconst supersedeStreamedThoughtWithAction = (\n  action: ActionEvent,\n  uiEvents: OpenHandsEvent[],\n): OpenHandsEvent[] | null => {\n  const thoughtText = joinTextBlocks(action.thought);\n  if (!thoughtText) {\n    return null;\n  }\n\n  const contentDeltas = getTrailingContentDeltas(uiEvents);\n  if (contentDeltas.length === 0) {\n    return null;\n  }\n\n  const streamingSegments = contentDeltas.map(\n    ({ event }) => event.content ?? \"\",\n  );\n\n  // Only strip when the streamed text is the action's rendered thought.\n  if (!matchStreamedSegments(thoughtText, streamingSegments).matched) {\n    return null;\n  }\n\n  // Keeping the delta's reasoning would duplicate the action's own \"Thinking\".\n  const actionRendersReasoning = getReasoningContent(action).trim().length > 0;\n  const indexesToStrip = new Set(contentDeltas.map(({ index }) => index));\n  const nextUiEvents: OpenHandsEvent[] = [];\n  uiEvents.forEach((event, index) => {\n    if (!indexesToStrip.has(index) || !isStreamingDeltaEvent(event)) {\n      nextUiEvents.push(event);\n      return;\n    }\n    // Keep the delta only to render reasoning the action itself lacks.\n    if (!actionRendersReasoning && event.reasoning_content) {\n      nextUiEvents.push({ ...event, content: null });\n    }\n  });\n\n  return nextUiEvents;\n};\n\n/**\n * Handles adding an event to the UI events array\n * Replaces actions with observations when they arrive (so UI shows observation instead of action)\n * Exception: ThinkAction is NOT replaced because the thought content is in the action, not in the observation\n *\n * ACPToolCallEvent merge: the SDK emits two events per ``tool_call_id`` — an\n * early ``started`` event (``pending`` / ``in_progress``) and one terminal\n * (completed / failed) event, the action->observation pair for a tool call.\n * Replace the started entry in place with the terminal one so a single card\n * updates from running to its result, exactly like an observation superseding\n * its action below.\n */\nexport const handleEventForUI = (\n  event: OpenHandsEvent,\n  uiEvents: OpenHandsEvent[],\n): OpenHandsEvent[] => {\n  const newUiEvents = [...uiEvents];\n\n  if (isStreamingDeltaEvent(event)) {\n    if (event.content === null && event.reasoning_content === null) {\n      return newUiEvents;\n    }\n\n    const lastIndex = newUiEvents.length - 1;\n    const lastEvent = newUiEvents[lastIndex];\n    if (lastEvent && isStreamingDeltaEvent(lastEvent)) {\n      newUiEvents[lastIndex] = mergeStreamingDeltaEvent(event, lastEvent);\n      return newUiEvents;\n    }\n\n    newUiEvents.push(event);\n    return newUiEvents;\n  }\n\n  if (\n    (isActionEvent(event) && event.action.kind === \"FinishAction\") ||\n    (isMessageEvent(event) && event.source === \"agent\")\n  ) {\n    const finalizedUiEvents = finalizeStreamingDeltasInPlace(\n      event,\n      newUiEvents,\n    );\n    if (finalizedUiEvents) {\n      // The reconciled streaming delta intentionally replaces this final event\n      // for rendering. Today streamed agent responses only render text and\n      // reasoning content; if final-event metadata such as activated\n      // microagents becomes meaningful for streamed responses, add a rendered\n      // wrapper that carries both the stable delta identity and that metadata.\n      return finalizedUiEvents;\n    }\n  }\n\n  // Intermediate tool-calling action whose thought was streamed: clear the\n  // duplicated text from the delta (issue #1534). ThinkAction is excluded — its\n  // thought renders through its own collapsible, not a hoisted thought.\n  if (\n    isActionEvent(event) &&\n    event.action.kind !== \"FinishAction\" &&\n    event.action.kind !== \"ThinkAction\"\n  ) {\n    const reconciledUiEvents = supersedeStreamedThoughtWithAction(\n      event,\n      newUiEvents,\n    );\n    if (reconciledUiEvents) {\n      reconciledUiEvents.push(event);\n      return reconciledUiEvents;\n    }\n  }\n\n  if (isACPToolCallEvent(event)) {\n    const existingIndex = newUiEvents.findIndex(\n      (uiEvent) =>\n        isACPToolCallEvent(uiEvent) &&\n        uiEvent.tool_call_id === event.tool_call_id,\n    );\n    if (existingIndex !== -1) {\n      newUiEvents[existingIndex] = event;\n    } else {\n      newUiEvents.push(event);\n    }\n    return newUiEvents;\n  }\n\n  if (isObservationEvent(event)) {\n    // Don't add ThinkObservation at all - we keep the ThinkAction instead\n    // The thought content is in the action, not the observation\n    if (event.observation.kind === \"ThinkObservation\") {\n      return newUiEvents;\n    }\n\n    // Don't add FinishObservation at all - we keep the FinishAction instead\n    // Both contain the same message content, so we only need to display one\n    // This also prevents duplicate messages when events arrive out of order due to React batching\n    if (event.observation.kind === \"FinishObservation\") {\n      return newUiEvents;\n    }\n\n    // Find and replace the corresponding action from uiEvents\n    const actionIndex = newUiEvents.findIndex(\n      (uiEvent) => uiEvent.id === event.action_id,\n    );\n    if (actionIndex !== -1) {\n      newUiEvents[actionIndex] = event;\n    } else {\n      // Action not found in uiEvents, just add the observation\n      newUiEvents.push(event);\n    }\n  } else {\n    // For non-observation events, just add them to uiEvents\n    newUiEvents.push(event);\n  }\n\n  return newUiEvents;\n};\n"],"mappings":"oLAgBA,IAAa,GACX,EACA,KACyB,CACzB,GAAG,EACH,QAAS,GAAG,EAAS,SAAW,KAAK,EAAS,SAAW,MAAQ,KACjE,kBACE,GAAG,EAAS,mBAAqB,KAAK,EAAS,mBAAqB,MACpE,KACH,EAEK,GACJ,EACA,KACyB,CACzB,GAAG,EACH,QAAS,GAAG,EAAS,SAAW,KAAK,KAAa,KACnD,EAEK,EAA4B,GAAqC,CACrE,IAAK,IAAI,EAAQ,EAAO,OAAS,EAAG,GAAS,EAAG,IAAY,CAC1D,IAAM,EAAQ,EAAO,GACrB,GAAI,EAAA,eAAe,EAAM,EAAI,EAAM,SAAW,OAC5C,OAAO,EAGX,MAAO,IAOH,EAAkB,GACtB,EACG,OAAQ,GAAU,EAAM,OAAS,OAAO,CACxC,IAAK,GAAU,EAAM,KAAK,CAC1B,KAAK,GAAG,CAEP,EAAqB,GACrB,EAAA,cAAc,EAAM,EAAI,EAAM,OAAO,OAAS,eACzC,EAAM,OAAO,QAGlB,EAAA,eAAe,EAAM,EAAI,EAAM,SAAW,QACrC,EAAe,EAAM,YAAY,QAAQ,CAG3C,KAGH,GACJ,EACA,IAC+C,CAC/C,IAAI,EAAc,EACd,EAAe,EAEnB,IAAK,IAAM,KAAW,EAAU,CAC9B,IAAM,EAAQ,EAAK,QAAQ,EAAS,EAAY,CAChD,GAAI,IAAU,GACZ,MAAO,CAAE,QAAS,GAAO,eAAc,CAEzC,EAAe,EAAQ,EAAQ,OAC/B,EAAc,EAGhB,MAAO,CAAE,QAAS,GAAM,eAAc,EAMlC,EACJ,GACoD,CACpD,IAAM,EAAuB,EAAyB,EAAS,CAC/D,OAAO,EACJ,KAAK,EAAO,KAAW,CAAE,QAAO,QAAO,EAAE,CACzC,OACE,GACC,EAAK,MAAQ,GACb,EAAA,sBAAsB,EAAK,MAAM,GAChC,EAAK,MAAM,SAAS,QAAU,GAAK,EACvC,EAMC,EACJ,GACoD,CACpD,IAAM,EAA0D,EAAE,CAClE,IAAK,IAAI,EAAQ,EAAS,OAAS,EAAG,GAAS,EAAG,IAAY,CAC5D,IAAM,EAAQ,EAAS,GACvB,GAAI,CAAC,EAAA,sBAAsB,EAAM,CAC/B,OAEG,EAAM,SAAS,QAAU,GAAK,GACjC,EAAO,QAAQ,CAAE,QAAO,QAAO,CAAC,CAGpC,OAAO,GAQH,GACJ,EACA,IAC+C,CAC/C,IAAM,EAAe,EAAS,KAAK,GAAG,CACtC,IAAK,IAAM,IAAa,CAAC,EAAc,EAAa,SAAS,CAAC,CAC5D,GAAI,GAAa,EAAW,WAAW,EAAU,CAC/C,MAAO,CAAE,QAAS,GAAM,aAAc,EAAU,OAAQ,CAK5D,IAAM,EAAY,EAAS,OAAS,EAIpC,OAAO,EAAwB,EAHR,EAAS,KAAK,EAAS,IAC5C,IAAU,EAAY,EAAQ,SAAS,CAAG,EAED,CAAe,EAGtD,GACJ,EACA,IAC4B,CAC5B,IAAM,EAAyB,EAA4B,EAAS,CACpE,GAAI,EAAuB,SAAW,EACpC,OAAO,KAGT,IAAM,EAAY,EAAkB,EAAW,CAC/C,GAAI,CAAC,EACH,OAAO,KAMT,GAAM,CAAE,UAAS,gBAAiB,EAChC,EAJwB,EAAuB,KAC9C,CAAE,WAAY,EAAM,SAAW,GAIhC,CACD,CACD,GAAI,CAAC,EACH,OAAO,KAGT,IAAM,EAAe,CAAC,GAAG,EAAS,CAC5B,EAAmB,EAAU,MAAM,EAAa,CAEhD,EAAiB,EAAuB,GAAG,GAAG,EAAE,MAChD,EACJ,IAAmB,IAAA,GAAY,IAAA,GAAY,EAAa,GAkB1D,OAhBE,GACA,IAAmB,IAAA,IACnB,GACA,EAAA,sBAAsB,EAAU,GAEhC,EAAa,GAAkB,EAC7B,EACA,EACD,EAQI,GAmBH,GACJ,EACA,IAC4B,CAC5B,IAAM,EAAc,EAAe,EAAO,QAAQ,CAClD,GAAI,CAAC,EACH,OAAO,KAGT,IAAM,EAAgB,EAAyB,EAAS,CAUxD,GATI,EAAc,SAAW,GASzB,CAAC,EAAsB,EALD,EAAc,KACrC,CAAE,WAAY,EAAM,SAAW,GAIM,CAAkB,CAAC,QACzD,OAAO,KAIT,IAAM,EAAyB,EAAA,oBAAoB,EAAO,CAAC,MAAM,CAAC,OAAS,EACrE,EAAiB,IAAI,IAAI,EAAc,KAAK,CAAE,WAAY,EAAM,CAAC,CACjE,EAAiC,EAAE,CAYzC,OAXA,EAAS,SAAS,EAAO,IAAU,CACjC,GAAI,CAAC,EAAe,IAAI,EAAM,EAAI,CAAC,EAAA,sBAAsB,EAAM,CAAE,CAC/D,EAAa,KAAK,EAAM,CACxB,OAGE,CAAC,GAA0B,EAAM,mBACnC,EAAa,KAAK,CAAE,GAAG,EAAO,QAAS,KAAM,CAAC,EAEhD,CAEK,GAeI,GACX,EACA,IACqB,CACrB,IAAM,EAAc,CAAC,GAAG,EAAS,CAEjC,GAAI,EAAA,sBAAsB,EAAM,CAAE,CAChC,GAAI,EAAM,UAAY,MAAQ,EAAM,oBAAsB,KACxD,OAAO,EAGT,IAAM,EAAY,EAAY,OAAS,EACjC,EAAY,EAAY,GAO9B,OANI,GAAa,EAAA,sBAAsB,EAAU,EAC/C,EAAY,GAAa,EAAyB,EAAO,EAAU,CAC5D,IAGT,EAAY,KAAK,EAAM,CAChB,GAGT,GACG,EAAA,cAAc,EAAM,EAAI,EAAM,OAAO,OAAS,gBAC9C,EAAA,eAAe,EAAM,EAAI,EAAM,SAAW,QAC3C,CACA,IAAM,EAAoB,EACxB,EACA,EACD,CACD,GAAI,EAMF,OAAO,EAOX,GACE,EAAA,cAAc,EAAM,EACpB,EAAM,OAAO,OAAS,gBACtB,EAAM,OAAO,OAAS,cACtB,CACA,IAAM,EAAqB,EACzB,EACA,EACD,CACD,GAAI,EAEF,OADA,EAAmB,KAAK,EAAM,CACvB,EAIX,GAAI,EAAA,mBAAmB,EAAM,CAAE,CAC7B,IAAM,EAAgB,EAAY,UAC/B,GACC,EAAA,mBAAmB,EAAQ,EAC3B,EAAQ,eAAiB,EAAM,aAClC,CAMD,OALI,IAAkB,GAGpB,EAAY,KAAK,EAAM,CAFvB,EAAY,GAAiB,EAIxB,EAGT,GAAI,EAAA,mBAAmB,EAAM,CAAE,CAU7B,GAPI,EAAM,YAAY,OAAS,oBAO3B,EAAM,YAAY,OAAS,oBAC7B,OAAO,EAIT,IAAM,EAAc,EAAY,UAC7B,GAAY,EAAQ,KAAO,EAAM,UACnC,CACG,IAAgB,GAIlB,EAAY,KAAK,EAAM,CAHvB,EAAY,GAAe,OAO7B,EAAY,KAAK,EAAM,CAGzB,OAAO"}

package/dist/utils/handle-event-for-ui.js

@@ -1,19 +1,20 @@
 import { isACPToolCallEvent as e, isActionEvent as t, isMessageEvent as n, isObservationEvent as r, isStreamingDeltaEvent as i } from "../types/agent-server/type-guards.js";
+import { getReasoningContent as a } from "../components/conversation-events/chat/event-thought-helpers.js";
 //#region src/utils/handle-event-for-ui.ts
-var a = (e, t) => ({
+var o = (e, t) => ({
 	...t,
 	content: `${t.content ?? ""}${e.content ?? ""}` || null,
 	reasoning_content: `${t.reasoning_content ?? ""}${e.reasoning_content ?? ""}` || null
-}), o = (e, t) => ({
+}), s = (e, t) => ({
 	...e,
 	content: `${e.content ?? ""}${t}` || null
-}), s = (e) => {
+}), c = (e) => {
 	for (let t = e.length - 1; t >= 0; --t) {
 		let r = e[t];
 		if (n(r) && r.source === "user") return t;
 	}
 	return -1;
-}, c = (e) => e.llm_message.content.filter((e) => e.type === "text").map((e) => e.text).join(""), l = (e) => t(e) && e.action.kind === "FinishAction" ? e.action.message : n(e) && e.source === "agent" ? c(e) : null, u = (e, t) => {
+}, l = (e) => e.filter((e) => e.type === "text").map((e) => e.text).join(""), u = (e) => t(e) && e.action.kind === "FinishAction" ? e.action.message : n(e) && e.source === "agent" ? l(e.llm_message.content) : null, d = (e, t) => {
 	let n = 0, r = 0;
 	for (let i of t) {
 		let t = e.indexOf(i, n);
@@ -27,49 +28,83 @@ var a = (e, t) => ({
 		matched: !0,
 		lastMatchEnd: r
 	};
-}, d = (e, t) => {
-	let n = s(t), r = t.map((e, t) => ({
-		uiEvent: e,
+}, f = (e) => {
+	let t = c(e);
+	return e.map((e, t) => ({
+		event: e,
 		index: t
-	})).filter(({ uiEvent: e, index: t }) => t > n && i(e)).map(({ index: e }) => e);
-	if (r.length === 0) return null;
-	let a = l(e), c = r.map((e) => ({
-		event: t[e],
-		index: e
-	})).filter((e) => i(e.event) && (e.event.content?.length ?? 0) > 0), d = c.map(({ event: e }) => e.content ?? "");
-	if (!a || d.length === 0) return null;
-	let f = [...t], p = d.join(""), m = "";
-	if (a.startsWith(p)) m = a.slice(p.length);
-	else {
-		let e = u(a, d);
-		if (!e.matched) return null;
-		m = a.slice(e.lastMatchEnd);
+	})).filter((e) => e.index > t && i(e.event) && (e.event.content?.length ?? 0) > 0);
+}, p = (e) => {
+	let t = [];
+	for (let n = e.length - 1; n >= 0; --n) {
+		let r = e[n];
+		if (!i(r)) break;
+		(r.content?.length ?? 0) > 0 && t.unshift({
+			event: r,
+			index: n
+		});
 	}
-	let h = c.at(-1)?.index, g = h === void 0 ? void 0 : f[h];
-	return m && h !== void 0 && g && i(g) && (f[h] = o(g, m)), f;
-}, f = (o, s) => {
+	return t;
+}, m = (e, t) => {
+	let n = t.join("");
+	for (let t of [n, n.trimEnd()]) if (t && e.startsWith(t)) return {
+		matched: !0,
+		lastMatchEnd: t.length
+	};
+	let r = t.length - 1;
+	return d(e, t.map((e, t) => t === r ? e.trimEnd() : e));
+}, h = (e, t) => {
+	let n = f(t);
+	if (n.length === 0) return null;
+	let r = u(e);
+	if (!r) return null;
+	let { matched: a, lastMatchEnd: o } = m(r, n.map(({ event: e }) => e.content ?? ""));
+	if (!a) return null;
+	let c = [...t], l = r.slice(o), d = n.at(-1)?.index, p = d === void 0 ? void 0 : c[d];
+	return l && d !== void 0 && p && i(p) && (c[d] = s(p, l)), c;
+}, g = (e, t) => {
+	let n = l(e.thought);
+	if (!n) return null;
+	let r = p(t);
+	if (r.length === 0 || !m(n, r.map(({ event: e }) => e.content ?? "")).matched) return null;
+	let o = a(e).trim().length > 0, s = new Set(r.map(({ index: e }) => e)), c = [];
+	return t.forEach((e, t) => {
+		if (!s.has(t) || !i(e)) {
+			c.push(e);
+			return;
+		}
+		!o && e.reasoning_content && c.push({
+			...e,
+			content: null
+		});
+	}), c;
+}, _ = (a, s) => {
 	let c = [...s];
-	if (i(o)) {
-		if (o.content === null && o.reasoning_content === null) return c;
+	if (i(a)) {
+		if (a.content === null && a.reasoning_content === null) return c;
 		let e = c.length - 1, t = c[e];
-		return t && i(t) ? (c[e] = a(o, t), c) : (c.push(o), c);
+		return t && i(t) ? (c[e] = o(a, t), c) : (c.push(a), c);
 	}
-	if (t(o) && o.action.kind === "FinishAction" || n(o) && o.source === "agent") {
-		let e = d(o, c);
+	if (t(a) && a.action.kind === "FinishAction" || n(a) && a.source === "agent") {
+		let e = h(a, c);
 		if (e) return e;
 	}
-	if (e(o)) {
-		let t = c.findIndex((t) => e(t) && t.tool_call_id === o.tool_call_id);
-		return t === -1 ? c.push(o) : c[t] = o, c;
+	if (t(a) && a.action.kind !== "FinishAction" && a.action.kind !== "ThinkAction") {
+		let e = g(a, c);
+		if (e) return e.push(a), e;
+	}
+	if (e(a)) {
+		let t = c.findIndex((t) => e(t) && t.tool_call_id === a.tool_call_id);
+		return t === -1 ? c.push(a) : c[t] = a, c;
 	}
-	if (r(o)) {
-		if (o.observation.kind === "ThinkObservation" || o.observation.kind === "FinishObservation") return c;
-		let e = c.findIndex((e) => e.id === o.action_id);
-		e === -1 ? c.push(o) : c[e] = o;
-	} else c.push(o);
+	if (r(a)) {
+		if (a.observation.kind === "ThinkObservation" || a.observation.kind === "FinishObservation") return c;
+		let e = c.findIndex((e) => e.id === a.action_id);
+		e === -1 ? c.push(a) : c[e] = a;
+	} else c.push(a);
 	return c;
 };
 //#endregion
-export { f as handleEventForUI, a as mergeStreamingDeltaEvent };
+export { _ as handleEventForUI, o as mergeStreamingDeltaEvent };
 
 //# sourceMappingURL=handle-event-for-ui.js.map

package/dist/utils/handle-event-for-ui.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-event-for-ui.js","names":[],"sources":["../../src/utils/handle-event-for-ui.ts"],"sourcesContent":["import { MessageEvent, OpenHandsEvent } from \"#/types/agent-server/core\";\nimport {\n  isACPToolCallEvent,\n  isActionEvent,\n  isMessageEvent,\n  isObservationEvent,\n  isStreamingDeltaEvent,\n} from \"#/types/agent-server/type-guards\";\nimport { StreamingDeltaEvent } from \"#/types/agent-server/core/events/streaming-delta-event\";\n\nexport const mergeStreamingDeltaEvent = (\n  incoming: StreamingDeltaEvent,\n  existing: StreamingDeltaEvent,\n): StreamingDeltaEvent => ({\n  ...existing,\n  content: `${existing.content ?? \"\"}${incoming.content ?? \"\"}` || null,\n  reasoning_content:\n    `${existing.reasoning_content ?? \"\"}${incoming.reasoning_content ?? \"\"}` ||\n    null,\n});\n\nconst appendContentToStreamingDeltaEvent = (\n  existing: StreamingDeltaEvent,\n  content: string,\n): StreamingDeltaEvent => ({\n  ...existing,\n  content: `${existing.content ?? \"\"}${content}` || null,\n});\n\nconst findLastUserMessageIndex = (events: OpenHandsEvent[]): number => {\n  for (let index = events.length - 1; index >= 0; index -= 1) {\n    const event = events[index];\n    if (isMessageEvent(event) && event.source === \"user\") {\n      return index;\n    }\n  }\n  return -1;\n};\n\n// Join text blocks WITHOUT a separator: streaming deltas concatenate content\n// tokens directly with no separator between LLM content blocks, so using \"\\n\"\n// here would cause startsWith/findTextSegmentsInOrder to miss when reconciling\n// a multi-block MessageEvent against the already-rendered streaming delta.\nconst getAgentMessageText = (event: MessageEvent): string =>\n  event.llm_message.content\n    .filter((content) => content.type === \"text\")\n    .map((content) => content.text)\n    .join(\"\");\n\nconst getFinalAgentText = (event: OpenHandsEvent): string | null => {\n  if (isActionEvent(event) && event.action.kind === \"FinishAction\") {\n    return event.action.message;\n  }\n\n  if (isMessageEvent(event) && event.source === \"agent\") {\n    return getAgentMessageText(event);\n  }\n\n  return null;\n};\n\nconst findTextSegmentsInOrder = (\n  text: string,\n  segments: string[],\n): { matched: boolean; lastMatchEnd: number } => {\n  let searchStart = 0;\n  let lastMatchEnd = 0;\n\n  for (const segment of segments) {\n    const index = text.indexOf(segment, searchStart);\n    if (index === -1) {\n      return { matched: false, lastMatchEnd };\n    }\n    lastMatchEnd = index + segment.length;\n    searchStart = lastMatchEnd;\n  }\n\n  return { matched: true, lastMatchEnd };\n};\n\nconst finalizeStreamingDeltasInPlace = (\n  finalEvent: OpenHandsEvent,\n  uiEvents: OpenHandsEvent[],\n): OpenHandsEvent[] | null => {\n  const lastUserMessageIndex = findLastUserMessageIndex(uiEvents);\n  const currentTurnStreamingDeltaIndexes = uiEvents\n    .map((uiEvent, index) => ({ uiEvent, index }))\n    .filter(\n      ({ uiEvent, index }) =>\n        index > lastUserMessageIndex && isStreamingDeltaEvent(uiEvent),\n    )\n    .map(({ index }) => index);\n\n  if (currentTurnStreamingDeltaIndexes.length === 0) {\n    return null;\n  }\n\n  const finalText = getFinalAgentText(finalEvent);\n  // Only the regular `content` field participates in reconciliation.\n  // Reasoning-only deltas (those that carry only `reasoning_content`) produce\n  // an empty streamingSegments list, causing the function to return null so\n  // the finalEvent is appended normally.  This is intentional: reasoning\n  // content renders in its own collapsed bubble and never overlaps with the\n  // assistant's regular message text in `FinishAction.message`.\n  const contentStreamingDeltas = currentTurnStreamingDeltaIndexes\n    .map((index) => ({ event: uiEvents[index], index }))\n    .filter(\n      (item): item is { event: StreamingDeltaEvent; index: number } =>\n        isStreamingDeltaEvent(item.event) &&\n        (item.event.content?.length ?? 0) > 0,\n    );\n  const streamingSegments = contentStreamingDeltas.map(\n    ({ event }) => event.content ?? \"\",\n  );\n\n  if (!finalText || streamingSegments.length === 0) {\n    return null;\n  }\n\n  const nextUiEvents = [...uiEvents];\n  const streamedText = streamingSegments.join(\"\");\n  let unstreamedSuffix = \"\";\n\n  if (finalText.startsWith(streamedText)) {\n    unstreamedSuffix = finalText.slice(streamedText.length);\n  } else {\n    const match = findTextSegmentsInOrder(finalText, streamingSegments);\n    if (!match.matched) {\n      return null;\n    }\n    unstreamedSuffix = finalText.slice(match.lastMatchEnd);\n  }\n\n  const lastDeltaIndex = contentStreamingDeltas.at(-1)?.index;\n  const lastDelta =\n    lastDeltaIndex === undefined ? undefined : nextUiEvents[lastDeltaIndex];\n  if (\n    unstreamedSuffix &&\n    lastDeltaIndex !== undefined &&\n    lastDelta &&\n    isStreamingDeltaEvent(lastDelta)\n  ) {\n    nextUiEvents[lastDeltaIndex] = appendContentToStreamingDeltaEvent(\n      lastDelta,\n      unstreamedSuffix,\n    );\n  }\n\n  // Intentionally return nextUiEvents WITHOUT appending finalEvent.\n  // The last content-bearing streaming delta (possibly extended with\n  // unstreamedSuffix above) becomes the canonical final rendered bubble for\n  // this turn. Appending finalEvent here would display the assistant message\n  // twice.\n  return nextUiEvents;\n};\n\n/**\n * Handles adding an event to the UI events array\n * Replaces actions with observations when they arrive (so UI shows observation instead of action)\n * Exception: ThinkAction is NOT replaced because the thought content is in the action, not in the observation\n *\n * ACPToolCallEvent merge: the SDK emits two events per ``tool_call_id`` — an\n * early ``started`` event (``pending`` / ``in_progress``) and one terminal\n * (completed / failed) event, the action->observation pair for a tool call.\n * Replace the started entry in place with the terminal one so a single card\n * updates from running to its result, exactly like an observation superseding\n * its action below.\n */\nexport const handleEventForUI = (\n  event: OpenHandsEvent,\n  uiEvents: OpenHandsEvent[],\n): OpenHandsEvent[] => {\n  const newUiEvents = [...uiEvents];\n\n  if (isStreamingDeltaEvent(event)) {\n    if (event.content === null && event.reasoning_content === null) {\n      return newUiEvents;\n    }\n\n    const lastIndex = newUiEvents.length - 1;\n    const lastEvent = newUiEvents[lastIndex];\n    if (lastEvent && isStreamingDeltaEvent(lastEvent)) {\n      newUiEvents[lastIndex] = mergeStreamingDeltaEvent(event, lastEvent);\n      return newUiEvents;\n    }\n\n    newUiEvents.push(event);\n    return newUiEvents;\n  }\n\n  if (\n    (isActionEvent(event) && event.action.kind === \"FinishAction\") ||\n    (isMessageEvent(event) && event.source === \"agent\")\n  ) {\n    const finalizedUiEvents = finalizeStreamingDeltasInPlace(\n      event,\n      newUiEvents,\n    );\n    if (finalizedUiEvents) {\n      // The reconciled streaming delta intentionally replaces this final event\n      // for rendering. Today streamed agent responses only render text and\n      // reasoning content; if final-event metadata such as activated\n      // microagents becomes meaningful for streamed responses, add a rendered\n      // wrapper that carries both the stable delta identity and that metadata.\n      return finalizedUiEvents;\n    }\n  }\n\n  if (isACPToolCallEvent(event)) {\n    const existingIndex = newUiEvents.findIndex(\n      (uiEvent) =>\n        isACPToolCallEvent(uiEvent) &&\n        uiEvent.tool_call_id === event.tool_call_id,\n    );\n    if (existingIndex !== -1) {\n      newUiEvents[existingIndex] = event;\n    } else {\n      newUiEvents.push(event);\n    }\n    return newUiEvents;\n  }\n\n  if (isObservationEvent(event)) {\n    // Don't add ThinkObservation at all - we keep the ThinkAction instead\n    // The thought content is in the action, not the observation\n    if (event.observation.kind === \"ThinkObservation\") {\n      return newUiEvents;\n    }\n\n    // Don't add FinishObservation at all - we keep the FinishAction instead\n    // Both contain the same message content, so we only need to display one\n    // This also prevents duplicate messages when events arrive out of order due to React batching\n    if (event.observation.kind === \"FinishObservation\") {\n      return newUiEvents;\n    }\n\n    // Find and replace the corresponding action from uiEvents\n    const actionIndex = newUiEvents.findIndex(\n      (uiEvent) => uiEvent.id === event.action_id,\n    );\n    if (actionIndex !== -1) {\n      newUiEvents[actionIndex] = event;\n    } else {\n      // Action not found in uiEvents, just add the observation\n      newUiEvents.push(event);\n    }\n  } else {\n    // For non-observation events, just add them to uiEvents\n    newUiEvents.push(event);\n  }\n\n  return newUiEvents;\n};\n"],"mappings":";;AAUA,IAAa,KACX,GACA,OACyB;CACzB,GAAG;CACH,SAAS,GAAG,EAAS,WAAW,KAAK,EAAS,WAAW,QAAQ;CACjE,mBACE,GAAG,EAAS,qBAAqB,KAAK,EAAS,qBAAqB,QACpE;CACH,GAEK,KACJ,GACA,OACyB;CACzB,GAAG;CACH,SAAS,GAAG,EAAS,WAAW,KAAK,OAAa;CACnD,GAEK,KAA4B,MAAqC;AACrE,MAAK,IAAI,IAAQ,EAAO,SAAS,GAAG,KAAS,GAAG,KAAY;EAC1D,IAAM,IAAQ,EAAO;AACrB,MAAI,EAAe,EAAM,IAAI,EAAM,WAAW,OAC5C,QAAO;;AAGX,QAAO;GAOH,KAAuB,MAC3B,EAAM,YAAY,QACf,QAAQ,MAAY,EAAQ,SAAS,OAAO,CAC5C,KAAK,MAAY,EAAQ,KAAK,CAC9B,KAAK,GAAG,EAEP,KAAqB,MACrB,EAAc,EAAM,IAAI,EAAM,OAAO,SAAS,iBACzC,EAAM,OAAO,UAGlB,EAAe,EAAM,IAAI,EAAM,WAAW,UACrC,EAAoB,EAAM,GAG5B,MAGH,KACJ,GACA,MAC+C;CAC/C,IAAI,IAAc,GACd,IAAe;AAEnB,MAAK,IAAM,KAAW,GAAU;EAC9B,IAAM,IAAQ,EAAK,QAAQ,GAAS,EAAY;AAChD,MAAI,MAAU,GACZ,QAAO;GAAE,SAAS;GAAO;GAAc;AAGzC,EADA,IAAe,IAAQ,EAAQ,QAC/B,IAAc;;AAGhB,QAAO;EAAE,SAAS;EAAM;EAAc;GAGlC,KACJ,GACA,MAC4B;CAC5B,IAAM,IAAuB,EAAyB,EAAS,EACzD,IAAmC,EACtC,KAAK,GAAS,OAAW;EAAE;EAAS;EAAO,EAAE,CAC7C,QACE,EAAE,YAAS,eACV,IAAQ,KAAwB,EAAsB,EAAQ,CACjE,CACA,KAAK,EAAE,eAAY,EAAM;AAE5B,KAAI,EAAiC,WAAW,EAC9C,QAAO;CAGT,IAAM,IAAY,EAAkB,EAAW,EAOzC,IAAyB,EAC5B,KAAK,OAAW;EAAE,OAAO,EAAS;EAAQ;EAAO,EAAE,CACnD,QACE,MACC,EAAsB,EAAK,MAAM,KAChC,EAAK,MAAM,SAAS,UAAU,KAAK,EACvC,EACG,IAAoB,EAAuB,KAC9C,EAAE,eAAY,EAAM,WAAW,GACjC;AAED,KAAI,CAAC,KAAa,EAAkB,WAAW,EAC7C,QAAO;CAGT,IAAM,IAAe,CAAC,GAAG,EAAS,EAC5B,IAAe,EAAkB,KAAK,GAAG,EAC3C,IAAmB;AAEvB,KAAI,EAAU,WAAW,EAAa,CACpC,KAAmB,EAAU,MAAM,EAAa,OAAO;MAClD;EACL,IAAM,IAAQ,EAAwB,GAAW,EAAkB;AACnE,MAAI,CAAC,EAAM,QACT,QAAO;AAET,MAAmB,EAAU,MAAM,EAAM,aAAa;;CAGxD,IAAM,IAAiB,EAAuB,GAAG,GAAG,EAAE,OAChD,IACJ,MAAmB,KAAA,IAAY,KAAA,IAAY,EAAa;AAkB1D,QAhBE,KACA,MAAmB,KAAA,KACnB,KACA,EAAsB,EAAU,KAEhC,EAAa,KAAkB,EAC7B,GACA,EACD,GAQI;GAeI,KACX,GACA,MACqB;CACrB,IAAM,IAAc,CAAC,GAAG,EAAS;AAEjC,KAAI,EAAsB,EAAM,EAAE;AAChC,MAAI,EAAM,YAAY,QAAQ,EAAM,sBAAsB,KACxD,QAAO;EAGT,IAAM,IAAY,EAAY,SAAS,GACjC,IAAY,EAAY;AAO9B,SANI,KAAa,EAAsB,EAAU,IAC/C,EAAY,KAAa,EAAyB,GAAO,EAAU,EAC5D,MAGT,EAAY,KAAK,EAAM,EAChB;;AAGT,KACG,EAAc,EAAM,IAAI,EAAM,OAAO,SAAS,kBAC9C,EAAe,EAAM,IAAI,EAAM,WAAW,SAC3C;EACA,IAAM,IAAoB,EACxB,GACA,EACD;AACD,MAAI,EAMF,QAAO;;AAIX,KAAI,EAAmB,EAAM,EAAE;EAC7B,IAAM,IAAgB,EAAY,WAC/B,MACC,EAAmB,EAAQ,IAC3B,EAAQ,iBAAiB,EAAM,aAClC;AAMD,SALI,MAAkB,KAGpB,EAAY,KAAK,EAAM,GAFvB,EAAY,KAAiB,GAIxB;;AAGT,KAAI,EAAmB,EAAM,EAAE;AAU7B,MAPI,EAAM,YAAY,SAAS,sBAO3B,EAAM,YAAY,SAAS,oBAC7B,QAAO;EAIT,IAAM,IAAc,EAAY,WAC7B,MAAY,EAAQ,OAAO,EAAM,UACnC;AACD,EAAI,MAAgB,KAIlB,EAAY,KAAK,EAAM,GAHvB,EAAY,KAAe;OAO7B,GAAY,KAAK,EAAM;AAGzB,QAAO"}
+{"version":3,"file":"handle-event-for-ui.js","names":[],"sources":["../../src/utils/handle-event-for-ui.ts"],"sourcesContent":["import {\n  ActionEvent,\n  ImageContent,\n  OpenHandsEvent,\n  TextContent,\n} from \"#/types/agent-server/core\";\nimport {\n  isACPToolCallEvent,\n  isActionEvent,\n  isMessageEvent,\n  isObservationEvent,\n  isStreamingDeltaEvent,\n} from \"#/types/agent-server/type-guards\";\nimport { StreamingDeltaEvent } from \"#/types/agent-server/core/events/streaming-delta-event\";\nimport { getReasoningContent } from \"#/components/conversation-events/chat/event-thought-helpers\";\n\nexport const mergeStreamingDeltaEvent = (\n  incoming: StreamingDeltaEvent,\n  existing: StreamingDeltaEvent,\n): StreamingDeltaEvent => ({\n  ...existing,\n  content: `${existing.content ?? \"\"}${incoming.content ?? \"\"}` || null,\n  reasoning_content:\n    `${existing.reasoning_content ?? \"\"}${incoming.reasoning_content ?? \"\"}` ||\n    null,\n});\n\nconst appendContentToStreamingDeltaEvent = (\n  existing: StreamingDeltaEvent,\n  content: string,\n): StreamingDeltaEvent => ({\n  ...existing,\n  content: `${existing.content ?? \"\"}${content}` || null,\n});\n\nconst findLastUserMessageIndex = (events: OpenHandsEvent[]): number => {\n  for (let index = events.length - 1; index >= 0; index -= 1) {\n    const event = events[index];\n    if (isMessageEvent(event) && event.source === \"user\") {\n      return index;\n    }\n  }\n  return -1;\n};\n\n// Join text blocks WITHOUT a separator: streaming deltas concatenate content\n// tokens directly with no separator between LLM content blocks, so using \"\\n\"\n// here would cause startsWith/findTextSegmentsInOrder to miss when reconciling\n// a multi-block message/thought against the already-rendered streaming delta.\nconst joinTextBlocks = (blocks: (TextContent | ImageContent)[]): string =>\n  blocks\n    .filter((block) => block.type === \"text\")\n    .map((block) => block.text)\n    .join(\"\");\n\nconst getFinalAgentText = (event: OpenHandsEvent): string | null => {\n  if (isActionEvent(event) && event.action.kind === \"FinishAction\") {\n    return event.action.message;\n  }\n\n  if (isMessageEvent(event) && event.source === \"agent\") {\n    return joinTextBlocks(event.llm_message.content);\n  }\n\n  return null;\n};\n\nconst findTextSegmentsInOrder = (\n  text: string,\n  segments: string[],\n): { matched: boolean; lastMatchEnd: number } => {\n  let searchStart = 0;\n  let lastMatchEnd = 0;\n\n  for (const segment of segments) {\n    const index = text.indexOf(segment, searchStart);\n    if (index === -1) {\n      return { matched: false, lastMatchEnd };\n    }\n    lastMatchEnd = index + segment.length;\n    searchStart = lastMatchEnd;\n  }\n\n  return { matched: true, lastMatchEnd };\n};\n\n// Content-bearing streaming deltas of the current turn (after the last user\n// message). Reasoning-only deltas are excluded: reasoning renders in its own\n// collapsed bubble and never overlaps the message text being reconciled.\nconst getCurrentTurnContentDeltas = (\n  uiEvents: OpenHandsEvent[],\n): { event: StreamingDeltaEvent; index: number }[] => {\n  const lastUserMessageIndex = findLastUserMessageIndex(uiEvents);\n  return uiEvents\n    .map((event, index) => ({ event, index }))\n    .filter(\n      (item): item is { event: StreamingDeltaEvent; index: number } =>\n        item.index > lastUserMessageIndex &&\n        isStreamingDeltaEvent(item.event) &&\n        (item.event.content?.length ?? 0) > 0,\n    );\n};\n\n// The current step's streaming delta(s): the trailing run at the end of\n// `uiEvents`. Earlier steps' deltas are separated by their observations, so\n// this never folds an earlier step's delta into the current one.\nconst getTrailingContentDeltas = (\n  uiEvents: OpenHandsEvent[],\n): { event: StreamingDeltaEvent; index: number }[] => {\n  const deltas: { event: StreamingDeltaEvent; index: number }[] = [];\n  for (let index = uiEvents.length - 1; index >= 0; index -= 1) {\n    const event = uiEvents[index];\n    if (!isStreamingDeltaEvent(event)) {\n      break;\n    }\n    if ((event.content?.length ?? 0) > 0) {\n      deltas.unshift({ event, index });\n    }\n  }\n  return deltas;\n};\n\n// Whether the streamed `segments` (in order) reconcile against `targetText`.\n// `lastMatchEnd` is the offset past the matched text, so callers can recover\n// any not-yet-streamed suffix. The SDK strips the finalized text, so it may\n// lack trailing whitespace the model streamed; the match tolerates that by\n// also trying the trailing-trimmed streamed text.\nconst matchStreamedSegments = (\n  targetText: string,\n  segments: string[],\n): { matched: boolean; lastMatchEnd: number } => {\n  const streamedText = segments.join(\"\");\n  for (const candidate of [streamedText, streamedText.trimEnd()]) {\n    if (candidate && targetText.startsWith(candidate)) {\n      return { matched: true, lastMatchEnd: candidate.length };\n    }\n  }\n  // Segments may be interleaved with not-yet-streamed text; locate them in\n  // order, trimming the last segment's trailing whitespace.\n  const lastIndex = segments.length - 1;\n  const searchSegments = segments.map((segment, index) =>\n    index === lastIndex ? segment.trimEnd() : segment,\n  );\n  return findTextSegmentsInOrder(targetText, searchSegments);\n};\n\nconst finalizeStreamingDeltasInPlace = (\n  finalEvent: OpenHandsEvent,\n  uiEvents: OpenHandsEvent[],\n): OpenHandsEvent[] | null => {\n  const contentStreamingDeltas = getCurrentTurnContentDeltas(uiEvents);\n  if (contentStreamingDeltas.length === 0) {\n    return null;\n  }\n\n  const finalText = getFinalAgentText(finalEvent);\n  if (!finalText) {\n    return null;\n  }\n\n  const streamingSegments = contentStreamingDeltas.map(\n    ({ event }) => event.content ?? \"\",\n  );\n  const { matched, lastMatchEnd } = matchStreamedSegments(\n    finalText,\n    streamingSegments,\n  );\n  if (!matched) {\n    return null;\n  }\n\n  const nextUiEvents = [...uiEvents];\n  const unstreamedSuffix = finalText.slice(lastMatchEnd);\n\n  const lastDeltaIndex = contentStreamingDeltas.at(-1)?.index;\n  const lastDelta =\n    lastDeltaIndex === undefined ? undefined : nextUiEvents[lastDeltaIndex];\n  if (\n    unstreamedSuffix &&\n    lastDeltaIndex !== undefined &&\n    lastDelta &&\n    isStreamingDeltaEvent(lastDelta)\n  ) {\n    nextUiEvents[lastDeltaIndex] = appendContentToStreamingDeltaEvent(\n      lastDelta,\n      unstreamedSuffix,\n    );\n  }\n\n  // Intentionally return nextUiEvents WITHOUT appending finalEvent.\n  // The last content-bearing streaming delta (possibly extended with\n  // unstreamedSuffix above) becomes the canonical final rendered bubble for\n  // this turn. Appending finalEvent here would display the assistant message\n  // twice.\n  return nextUiEvents;\n};\n\n/**\n * Reconcile the current turn's streaming delta when an intermediate\n * (tool-calling) `ActionEvent` arrives. With `stream=true` the step's\n * pre-tool-call text is streamed as delta `content`, then the action's\n * `thought` repeats it and the chat hoists that into its own message (see\n * `group-events.ts`), so the text would render twice (issue #1534).\n *\n * Unlike `finalizeStreamingDeltasInPlace` (which drops the final event and\n * keeps the delta), the action must stay — it owns the tool call. So the\n * streamed text is cleared from the delta instead, and the delta is kept only\n * to carry reasoning the action itself lacks (for many models the delta is the\n * sole reasoning carrier), otherwise dropped.\n *\n * Only the current step's trailing delta run is considered. Returns the updated\n * array, or `null` when there is nothing to reconcile.\n */\nconst supersedeStreamedThoughtWithAction = (\n  action: ActionEvent,\n  uiEvents: OpenHandsEvent[],\n): OpenHandsEvent[] | null => {\n  const thoughtText = joinTextBlocks(action.thought);\n  if (!thoughtText) {\n    return null;\n  }\n\n  const contentDeltas = getTrailingContentDeltas(uiEvents);\n  if (contentDeltas.length === 0) {\n    return null;\n  }\n\n  const streamingSegments = contentDeltas.map(\n    ({ event }) => event.content ?? \"\",\n  );\n\n  // Only strip when the streamed text is the action's rendered thought.\n  if (!matchStreamedSegments(thoughtText, streamingSegments).matched) {\n    return null;\n  }\n\n  // Keeping the delta's reasoning would duplicate the action's own \"Thinking\".\n  const actionRendersReasoning = getReasoningContent(action).trim().length > 0;\n  const indexesToStrip = new Set(contentDeltas.map(({ index }) => index));\n  const nextUiEvents: OpenHandsEvent[] = [];\n  uiEvents.forEach((event, index) => {\n    if (!indexesToStrip.has(index) || !isStreamingDeltaEvent(event)) {\n      nextUiEvents.push(event);\n      return;\n    }\n    // Keep the delta only to render reasoning the action itself lacks.\n    if (!actionRendersReasoning && event.reasoning_content) {\n      nextUiEvents.push({ ...event, content: null });\n    }\n  });\n\n  return nextUiEvents;\n};\n\n/**\n * Handles adding an event to the UI events array\n * Replaces actions with observations when they arrive (so UI shows observation instead of action)\n * Exception: ThinkAction is NOT replaced because the thought content is in the action, not in the observation\n *\n * ACPToolCallEvent merge: the SDK emits two events per ``tool_call_id`` — an\n * early ``started`` event (``pending`` / ``in_progress``) and one terminal\n * (completed / failed) event, the action->observation pair for a tool call.\n * Replace the started entry in place with the terminal one so a single card\n * updates from running to its result, exactly like an observation superseding\n * its action below.\n */\nexport const handleEventForUI = (\n  event: OpenHandsEvent,\n  uiEvents: OpenHandsEvent[],\n): OpenHandsEvent[] => {\n  const newUiEvents = [...uiEvents];\n\n  if (isStreamingDeltaEvent(event)) {\n    if (event.content === null && event.reasoning_content === null) {\n      return newUiEvents;\n    }\n\n    const lastIndex = newUiEvents.length - 1;\n    const lastEvent = newUiEvents[lastIndex];\n    if (lastEvent && isStreamingDeltaEvent(lastEvent)) {\n      newUiEvents[lastIndex] = mergeStreamingDeltaEvent(event, lastEvent);\n      return newUiEvents;\n    }\n\n    newUiEvents.push(event);\n    return newUiEvents;\n  }\n\n  if (\n    (isActionEvent(event) && event.action.kind === \"FinishAction\") ||\n    (isMessageEvent(event) && event.source === \"agent\")\n  ) {\n    const finalizedUiEvents = finalizeStreamingDeltasInPlace(\n      event,\n      newUiEvents,\n    );\n    if (finalizedUiEvents) {\n      // The reconciled streaming delta intentionally replaces this final event\n      // for rendering. Today streamed agent responses only render text and\n      // reasoning content; if final-event metadata such as activated\n      // microagents becomes meaningful for streamed responses, add a rendered\n      // wrapper that carries both the stable delta identity and that metadata.\n      return finalizedUiEvents;\n    }\n  }\n\n  // Intermediate tool-calling action whose thought was streamed: clear the\n  // duplicated text from the delta (issue #1534). ThinkAction is excluded — its\n  // thought renders through its own collapsible, not a hoisted thought.\n  if (\n    isActionEvent(event) &&\n    event.action.kind !== \"FinishAction\" &&\n    event.action.kind !== \"ThinkAction\"\n  ) {\n    const reconciledUiEvents = supersedeStreamedThoughtWithAction(\n      event,\n      newUiEvents,\n    );\n    if (reconciledUiEvents) {\n      reconciledUiEvents.push(event);\n      return reconciledUiEvents;\n    }\n  }\n\n  if (isACPToolCallEvent(event)) {\n    const existingIndex = newUiEvents.findIndex(\n      (uiEvent) =>\n        isACPToolCallEvent(uiEvent) &&\n        uiEvent.tool_call_id === event.tool_call_id,\n    );\n    if (existingIndex !== -1) {\n      newUiEvents[existingIndex] = event;\n    } else {\n      newUiEvents.push(event);\n    }\n    return newUiEvents;\n  }\n\n  if (isObservationEvent(event)) {\n    // Don't add ThinkObservation at all - we keep the ThinkAction instead\n    // The thought content is in the action, not the observation\n    if (event.observation.kind === \"ThinkObservation\") {\n      return newUiEvents;\n    }\n\n    // Don't add FinishObservation at all - we keep the FinishAction instead\n    // Both contain the same message content, so we only need to display one\n    // This also prevents duplicate messages when events arrive out of order due to React batching\n    if (event.observation.kind === \"FinishObservation\") {\n      return newUiEvents;\n    }\n\n    // Find and replace the corresponding action from uiEvents\n    const actionIndex = newUiEvents.findIndex(\n      (uiEvent) => uiEvent.id === event.action_id,\n    );\n    if (actionIndex !== -1) {\n      newUiEvents[actionIndex] = event;\n    } else {\n      // Action not found in uiEvents, just add the observation\n      newUiEvents.push(event);\n    }\n  } else {\n    // For non-observation events, just add them to uiEvents\n    newUiEvents.push(event);\n  }\n\n  return newUiEvents;\n};\n"],"mappings":"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"}

package/dist/utils/mcp-config.cjs

@@ -1,2 +1,2 @@
-require(`../_virtual/_rolldown/runtime.cjs`);var e={sse_servers:[],stdio_servers:[],shttp_servers:[]},t=`<redacted>`,n=`https://mcp.linear.app/sse`,r=`https://mcp.linear.app/mcp`;function i(e,t){return t===`sse`?e.split(`?`)[0].replace(/\/+$/,``)===n:!1}function a(e,t){return RegExp(`^${t}(_\\d+)?$`).test(e)?void 0:e}function o(e){if(Array.isArray(e))return e.map(o).find(e=>e!==void 0);if(typeof e!=`string`||e.length===0)return;let t=e.match(/^Bearer\s+(.+)$/i);return t?t[1]:e}function s(e){let t=e.headers,n=o(t&&typeof t==`object`?t.Authorization??t.authorization:void 0);if(n)return n;let r=e.auth;return typeof r==`string`&&r!==`oauth`?r:void 0}function c(e){return e?{headers:{Authorization:`Bearer ${e}`}}:{}}function l(e){return e.api_key&&e.api_key!==`<redacted>`?c(e.api_key):e.headers&&Object.keys(e.headers).length>0?{headers:e.headers}:{}}function u(t){if(!t||typeof t!=`object`)return{...e};let n=t;if(!(`mcpServers`in n)||!n.mcpServers||typeof n.mcpServers!=`object`)return{...e};let o=[],c=[],l=[],u=[],d=n.mcpServers;for(let[e,t]of Object.entries(d)){if(!t||typeof t!=`object`)continue;let n=t.url;if(n){let c=t.transport,d=s(t);if(i(n,c)){let e={url:r};d&&(e.api_key=d),u.push(e)}else if(c===`sse`){let t=a(e,`sse`),r={url:n};t&&(r.name=t),d&&(r.api_key=d),o.push(r)}else{let r=a(e,`shttp`),i={url:n};r&&(i.name=r),d&&(i.api_key=d),t.timeout!=null&&(i.timeout=t.timeout),l.push(i)}}else{let n={name:e,command:t.command};t.args&&(n.args=t.args),t.env&&(n.env=t.env),c.push(n)}}let f=e=>e.replace(/\/+$/,``);for(let e of u)l.some(t=>f(typeof t==`string`?t:t.url)===f(e.url))||l.push(e);return{sse_servers:o,stdio_servers:c,shttp_servers:l}}function d(e){let t={},n=e=>{if(!(e in t))return e;let n=1;for(;`${e}_${n}`in t;)n+=1;return`${e}_${n}`};for(let r of e.sse_servers){let e={},i;typeof r==`string`?e.url=r:(i=r.name,e.url=r.url,Object.assign(e,l(r))),e.transport=`sse`,t[n(i||`sse`)]=e}for(let r of e.shttp_servers){let e={},i;typeof r==`string`?e.url=r:(i=r.name,e.url=r.url,Object.assign(e,l(r)),r.timeout!=null&&(e.timeout=r.timeout)),t[n(i||`shttp`)]=e}for(let r of e.stdio_servers){let e={command:r.command};r.args&&(e.args=r.args),r.env&&(e.env=r.env),t[n(r.name||`stdio`)]=e}return Object.keys(t).length>0?{mcpServers:t}:null}exports.REDACTED_MCP_SECRET_VALUE=t,exports.parseMcpConfig=u,exports.toSdkMcpConfig=d;
+require(`../_virtual/_rolldown/runtime.cjs`);const e=require(`./mcp-server-name.cjs`);var t={sse_servers:[],stdio_servers:[],shttp_servers:[]},n=`**********`;function r(e,t){return RegExp(`^${t}(_\\d+)?$`).test(e)?void 0:e}function i(e){return!!e&&typeof e==`object`&&!Array.isArray(e)}function a(e){if(!i(e))return null;let t=e.mcpServers;return i(t)&&!(`url`in t)&&!(`command`in t)?t:e}function o(e){if(!i(e))return;let t=Object.entries(e).filter(e=>typeof e[1]==`string`);return t.length>0?Object.fromEntries(t):void 0}function s(e){return e===`**********`?!0:Array.isArray(e)?e.some(s):i(e)?Object.values(e).some(s):!1}function c(e){if(!i(e))return;let t={};return i(e.tokens)&&(t.tokens=e.tokens),i(e.client_info)&&(t.client_info=e.client_info),(typeof e.token_expires_at==`number`||e.token_expires_at===null)&&(t.token_expires_at=e.token_expires_at),Object.keys(t).length>0?t:void 0}function l(e){if(i(e))switch(e.strategy){case`none`:return{strategy:`none`};case`api_key`:return typeof e.value==`string`?{strategy:`api_key`,value:e.value,...typeof e.header_name==`string`&&{header_name:e.header_name}}:void 0;case`bearer`:return typeof e.value==`string`?{strategy:`bearer`,value:e.value}:void 0;case`basic`:return typeof e.username!=`string`||typeof e.password!=`string`?void 0:{strategy:`basic`,username:e.username,password:e.password};case`header`:{let t=o(e.headers);return t?{strategy:`header`,headers:t}:void 0}case`oauth2`:{let t=g(e.authentication),n=c(e.state);return{strategy:`oauth2`,...t&&{authentication:t},...n&&{state:n}}}default:return}}function u(e){return l(e.auth)}function d(e){let t={};return e.auth&&!s(e.auth)&&(t.auth=e.auth),e.headers&&Object.keys(e.headers).length>0&&(t.headers=e.headers),t}function f(e){return{...e.name&&{name:e.name},url:e.url,...e.headers&&{headers:e.headers},...e.auth&&{auth:e.auth}}}function p(e){return f(e)}function m(e){return{...f(e),...e.timeout!==void 0&&{timeout:e.timeout}}}function h(e){return{name:e.name,command:e.command,...e.args&&{args:e.args},...e.env&&{env:e.env}}}function g(e){if(!e||typeof e!=`object`)return;let t=e;if(t.type!==`oauth`)return;let n={type:`oauth`};return(t.client_auth_method===`none`||t.client_auth_method===`client_secret_post`||t.client_auth_method===`client_secret_basic`||t.client_auth_method===`private_key_jwt`)&&(n.client_auth_method=t.client_auth_method),(typeof t.scopes==`string`||Array.isArray(t.scopes)&&t.scopes.every(e=>typeof e==`string`))&&(n.scopes=t.scopes),typeof t.client_name==`string`&&(n.client_name=t.client_name),typeof t.client_metadata_url==`string`&&(n.client_metadata_url=t.client_metadata_url),typeof t.client_id==`string`&&(n.client_id=t.client_id),typeof t.client_secret==`string`&&(n.client_secret=t.client_secret),t.additional_client_metadata&&typeof t.additional_client_metadata==`object`&&!Array.isArray(t.additional_client_metadata)&&(n.additional_client_metadata=t.additional_client_metadata),n}function _(e){let n=a(e);if(!n)return{...t};let s=[],c=[],l=[];for(let[e,t]of Object.entries(n)){if(!i(t))continue;let n=t.url;if(n){let i=t.transport,a=u(t),c=o(t.headers);if(i===`sse`){let t=r(e,`sse`),i={url:n};t&&(i.name=t),a&&(i.auth=a),c&&(i.headers=c),s.push(i)}else{let i=r(e,`shttp`),o={url:n};i&&(o.name=i),t.timeout!=null&&(o.timeout=t.timeout),a&&(o.auth=a),c&&(o.headers=c),l.push(o)}}else{if(typeof t.command!=`string`)continue;let n={name:e,command:t.command};t.args&&(n.args=t.args),t.env&&(n.env=t.env),c.push(n)}}return{sse_servers:s,stdio_servers:c,shttp_servers:l}}function v(t){let n={},r=t=>{let r=e.toMcpServerName(t);if(!(r in n))return r;let i=1;for(;`${r}_${i}`in n;)i+=1;return`${r}_${i}`};for(let e of t.sse_servers){let t={},i;typeof e==`string`?t.url=e:(i=e.name,t.url=e.url,Object.assign(t,d(e))),t.transport=`sse`,n[r(i||`sse`)]=t}for(let e of t.shttp_servers){let t={transport:`http`},i;typeof e==`string`?t.url=e:(i=e.name,t.url=e.url,Object.assign(t,d(e)),e.timeout!=null&&(t.timeout=e.timeout)),n[r(i||`shttp`)]=t}for(let e of t.stdio_servers){let t={command:e.command};e.args&&(t.args=e.args),e.env&&(t.env=e.env),n[r(e.name||`stdio`)]=t}return Object.keys(n).length>0?n:null}exports.REDACTED_MCP_SECRET_VALUE=n,exports.getSdkMcpServerMap=a,exports.hasRedactedMcpSecretLeaf=s,exports.parseMcpConfig=_,exports.stringRecord=o,exports.toMcpShttpServer=m,exports.toMcpSseServer=p,exports.toMcpStdioServer=h,exports.toSdkMcpConfig=v;
 //# sourceMappingURL=mcp-config.cjs.map

package/dist/utils/mcp-config.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-config.cjs","names":[],"sources":["../../src/utils/mcp-config.ts"],"sourcesContent":["import {\n  MCPConfig,\n  MCPSSEServer,\n  MCPSHTTPServer,\n  MCPStdioServer,\n  SettingsValue,\n} from \"#/types/settings\";\n\nconst EMPTY_MCP_CONFIG: MCPConfig = {\n  sse_servers: [],\n  stdio_servers: [],\n  shttp_servers: [],\n};\n\nexport const REDACTED_MCP_SECRET_VALUE = \"<redacted>\";\n\nconst LINEAR_DEPRECATED_SSE_URL = \"https://mcp.linear.app/sse\";\nconst LINEAR_SHTTP_URL = \"https://mcp.linear.app/mcp\";\n\n/**\n * Linear removed its MCP SSE transport (the /sse endpoint rejects every\n * call since 2026-04-08). Detect persisted configs that still point at\n * the dead endpoint so they can be migrated to streamable HTTP at the\n * /mcp replacement. Matches only the exact deprecated URL (tolerating a\n * trailing slash or query string) — nothing else is rewritten.\n */\nfunction isDeprecatedLinearSse(\n  url: string,\n  transport: string | undefined,\n): boolean {\n  if (transport !== \"sse\") return false;\n  const normalized = url.split(\"?\")[0].replace(/\\/+$/, \"\");\n  return normalized === LINEAR_DEPRECATED_SSE_URL;\n}\n\ntype SdkMcpServerConfig = Record<string, SettingsValue>;\ntype SdkMcpConfig = { mcpServers: Record<string, SdkMcpServerConfig> };\n\n/**\n * The dict key for an SSE/SHTTP server doubles as its display name once a\n * user provides one. Keys that match the auto-generated fallback pattern\n * (``sse``, ``shttp``, ``shttp_1``, …) emitted by {@link toSdkMcpConfig}\n * carry no user intent, so we surface them as \"no name\" — re-serializing\n * regenerates the identical fallback key and existing configs are left\n * untouched.\n */\nfunction userGivenServerName(\n  serverName: string,\n  base: \"sse\" | \"shttp\",\n): string | undefined {\n  const autoGenerated = new RegExp(`^${base}(_\\\\d+)?$`);\n  return autoGenerated.test(serverName) ? undefined : serverName;\n}\n\nfunction apiKeyFromAuthorizationHeader(value: unknown): string | undefined {\n  if (Array.isArray(value)) {\n    return value\n      .map(apiKeyFromAuthorizationHeader)\n      .find((apiKey) => apiKey !== undefined);\n  }\n\n  if (typeof value !== \"string\" || value.length === 0) return undefined;\n  const bearer = value.match(/^Bearer\\s+(.+)$/i);\n  return bearer ? bearer[1] : value;\n}\n\nfunction apiKeyFromServerConfig(\n  serverConfig: Record<string, unknown>,\n): string | undefined {\n  const headers = serverConfig.headers;\n  const authorization =\n    headers && typeof headers === \"object\"\n      ? ((headers as Record<string, unknown>).Authorization ??\n        (headers as Record<string, unknown>).authorization)\n      : undefined;\n  const headerApiKey = apiKeyFromAuthorizationHeader(authorization);\n  if (headerApiKey) return headerApiKey;\n\n  const auth = serverConfig.auth;\n  return typeof auth === \"string\" && auth !== \"oauth\" ? auth : undefined;\n}\n\nfunction getAuthorizationHeaders(apiKey: string | undefined) {\n  if (!apiKey) return {};\n  return {\n    headers: {\n      Authorization: `Bearer ${apiKey}`,\n    },\n  };\n}\n\nfunction getRemoteCredentialFields(entry: {\n  api_key?: string;\n  headers?: Record<string, string>;\n}): Partial<SdkMcpServerConfig> {\n  if (entry.api_key && entry.api_key !== REDACTED_MCP_SECRET_VALUE) {\n    return getAuthorizationHeaders(entry.api_key);\n  }\n  if (entry.headers && Object.keys(entry.headers).length > 0) {\n    return { headers: entry.headers };\n  }\n  return {};\n}\n\n/**\n * Parse an SDK mcp_config value ({ mcpServers: { ... } }) and convert it\n * to the frontend MCPConfig format used by UI components.\n */\nexport function parseMcpConfig(value: unknown): MCPConfig {\n  if (!value || typeof value !== \"object\") {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const obj = value as Record<string, unknown>;\n\n  if (\n    !(\"mcpServers\" in obj) ||\n    !obj.mcpServers ||\n    typeof obj.mcpServers !== \"object\"\n  ) {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const sseServers: (string | MCPSSEServer)[] = [];\n  const stdioServers: MCPStdioServer[] = [];\n  const shttpServers: (string | MCPSHTTPServer)[] = [];\n  // Legacy Linear SSE entries rewritten to the /mcp endpoint. Collected\n  // separately and merged after the loop so an existing hand-added /mcp\n  // entry (with its own api_key/timeout) wins over the migrated one.\n  const migratedShttpServers: MCPSHTTPServer[] = [];\n\n  const mcpServers = obj.mcpServers as Record<string, Record<string, unknown>>;\n\n  for (const [serverName, serverConfig] of Object.entries(mcpServers)) {\n    if (!serverConfig || typeof serverConfig !== \"object\") continue;\n\n    const url = serverConfig.url as string | undefined;\n\n    if (url) {\n      const transport = serverConfig.transport as string | undefined;\n      const apiKey = apiKeyFromServerConfig(serverConfig);\n\n      if (isDeprecatedLinearSse(url, transport)) {\n        const server: MCPSHTTPServer = { url: LINEAR_SHTTP_URL };\n        if (apiKey) server.api_key = apiKey;\n        migratedShttpServers.push(server);\n      } else if (transport === \"sse\") {\n        const name = userGivenServerName(serverName, \"sse\");\n        const server: MCPSSEServer = { url };\n        if (name) server.name = name;\n        if (apiKey) server.api_key = apiKey;\n        sseServers.push(server);\n      } else {\n        const name = userGivenServerName(serverName, \"shttp\");\n        const server: MCPSHTTPServer = { url };\n        if (name) server.name = name;\n        if (apiKey) server.api_key = apiKey;\n        if (serverConfig.timeout != null) {\n          server.timeout = serverConfig.timeout as number;\n        }\n        shttpServers.push(server);\n      }\n    } else {\n      const stdioServer: MCPStdioServer = {\n        name: serverName,\n        command: serverConfig.command as string,\n      };\n      if (serverConfig.args) {\n        stdioServer.args = serverConfig.args as string[];\n      }\n      if (serverConfig.env) {\n        stdioServer.env = serverConfig.env as Record<string, string>;\n      }\n      stdioServers.push(stdioServer);\n    }\n  }\n\n  const normalizeUrl = (u: string) => u.replace(/\\/+$/, \"\");\n  for (const migrated of migratedShttpServers) {\n    const alreadyPresent = shttpServers.some((entry) => {\n      const entryUrl = typeof entry === \"string\" ? entry : entry.url;\n      return normalizeUrl(entryUrl) === normalizeUrl(migrated.url);\n    });\n    if (!alreadyPresent) shttpServers.push(migrated);\n  }\n\n  return {\n    sse_servers: sseServers,\n    stdio_servers: stdioServers,\n    shttp_servers: shttpServers,\n  };\n}\n\n/**\n * Convert the frontend MCPConfig format back to the SDK { mcpServers: { ... } }\n * shape expected by agent_settings.mcp_config on the backend.\n *\n * Names are only suffixed (``_1``, ``_2``, …) when an earlier entry has\n * already claimed the bare base name. We intentionally do NOT use a single\n * monotonic counter across server types: that would, for example, rename a\n * stdio server \"myname\" to \"myname_1\" the moment any sse/shttp entry is\n * persisted ahead of it, and shift the suffix on every save as the count\n * of other server types changes. With per-base collision suffixing,\n * unrelated entries keep their human-meaningful names stable across edits.\n */\nexport function toSdkMcpConfig(config: MCPConfig): SdkMcpConfig | null {\n  const mcpServers: Record<string, SdkMcpServerConfig> = {};\n\n  const reserve = (base: string): string => {\n    if (!(base in mcpServers)) return base;\n    let i = 1;\n    while (`${base}_${i}` in mcpServers) i += 1;\n    return `${base}_${i}`;\n  };\n\n  for (const entry of config.sse_servers) {\n    const server: SdkMcpServerConfig = {};\n    let name: string | undefined;\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      name = entry.name;\n      server.url = entry.url;\n      Object.assign(server, getRemoteCredentialFields(entry));\n    }\n    server.transport = \"sse\";\n    mcpServers[reserve(name || \"sse\")] = server;\n  }\n\n  for (const entry of config.shttp_servers) {\n    const server: SdkMcpServerConfig = {};\n    let name: string | undefined;\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      name = entry.name;\n      server.url = entry.url;\n      Object.assign(server, getRemoteCredentialFields(entry));\n      if (entry.timeout != null) server.timeout = entry.timeout;\n    }\n    mcpServers[reserve(name || \"shttp\")] = server;\n  }\n\n  for (const entry of config.stdio_servers) {\n    const server: SdkMcpServerConfig = {\n      command: entry.command,\n    };\n    if (entry.args) server.args = entry.args;\n    if (entry.env) server.env = entry.env;\n    mcpServers[reserve(entry.name || \"stdio\")] = server;\n  }\n\n  return Object.keys(mcpServers).length > 0 ? { mcpServers } : null;\n}\n"],"mappings":"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"}
+{"version":3,"file":"mcp-config.cjs","names":[],"sources":["../../src/utils/mcp-config.ts"],"sourcesContent":["import {\n  MCPConfig,\n  MCPSSEServer,\n  MCPSHTTPServer,\n  MCPStdioServer,\n  SettingsValue,\n} from \"#/types/settings\";\nimport type {\n  MCPAuthCredential,\n  MCPAuthenticationConfig,\n  MCPJsonValue,\n  MCPOAuthState,\n} from \"#/types/mcp-auth\";\nimport type { MCPServerConfig } from \"#/types/mcp-server\";\nimport { toMcpServerName } from \"#/utils/mcp-server-name\";\n\nconst EMPTY_MCP_CONFIG: MCPConfig = {\n  sse_servers: [],\n  stdio_servers: [],\n  shttp_servers: [],\n};\n\nexport const REDACTED_MCP_SECRET_VALUE = \"**********\";\n\ntype SdkMcpServerConfig = Record<string, SettingsValue | MCPAuthCredential>;\ntype SdkMcpConfig = Record<string, SdkMcpServerConfig>;\n\n/**\n * The dict key for an SSE/SHTTP server doubles as its display name once a\n * user provides one. Keys that match the auto-generated fallback pattern\n * (``sse``, ``shttp``, ``shttp_1``, …) emitted by {@link toSdkMcpConfig}\n * carry no user intent, so we surface them as \"no name\" — re-serializing\n * regenerates the identical fallback key and existing configs are left\n * untouched.\n */\nfunction userGivenServerName(\n  serverName: string,\n  base: \"sse\" | \"shttp\",\n): string | undefined {\n  const autoGenerated = new RegExp(`^${base}(_\\\\d+)?$`);\n  return autoGenerated.test(serverName) ? undefined : serverName;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n  return !!value && typeof value === \"object\" && !Array.isArray(value);\n}\n\nexport function getSdkMcpServerMap(\n  value: unknown,\n): Record<string, unknown> | null {\n  if (!isRecord(value)) return null;\n\n  const mcpServers = value.mcpServers;\n  if (\n    isRecord(mcpServers) &&\n    !(\"url\" in mcpServers) &&\n    !(\"command\" in mcpServers)\n  ) {\n    return mcpServers;\n  }\n\n  return value;\n}\n\nexport function stringRecord(\n  value: unknown,\n): Record<string, string> | undefined {\n  if (!isRecord(value)) return undefined;\n  const entries = Object.entries(value).filter(\n    (entry): entry is [string, string] => typeof entry[1] === \"string\",\n  );\n  return entries.length > 0 ? Object.fromEntries(entries) : undefined;\n}\n\nexport function hasRedactedMcpSecretLeaf(value: unknown): boolean {\n  if (value === REDACTED_MCP_SECRET_VALUE) return true;\n  if (Array.isArray(value)) return value.some(hasRedactedMcpSecretLeaf);\n  if (isRecord(value))\n    return Object.values(value).some(hasRedactedMcpSecretLeaf);\n  return false;\n}\n\nfunction getOAuthState(value: unknown): MCPOAuthState | undefined {\n  if (!isRecord(value)) return undefined;\n  const state: MCPOAuthState = {};\n  if (isRecord(value.tokens)) {\n    state.tokens = value.tokens as NonNullable<MCPOAuthState[\"tokens\"]>;\n  }\n  if (isRecord(value.client_info)) {\n    state.client_info = value.client_info as NonNullable<\n      MCPOAuthState[\"client_info\"]\n    >;\n  }\n  if (\n    typeof value.token_expires_at === \"number\" ||\n    value.token_expires_at === null\n  ) {\n    state.token_expires_at = value.token_expires_at;\n  }\n  return Object.keys(state).length > 0 ? state : undefined;\n}\n\nfunction normalizeTaggedAuthCredential(\n  value: unknown,\n): MCPAuthCredential | undefined {\n  if (!isRecord(value)) return undefined;\n  switch (value.strategy) {\n    case \"none\":\n      return { strategy: \"none\" };\n    case \"api_key\":\n      if (typeof value.value !== \"string\") return undefined;\n      return {\n        strategy: \"api_key\",\n        value: value.value,\n        ...(typeof value.header_name === \"string\" && {\n          header_name: value.header_name,\n        }),\n      };\n    case \"bearer\":\n      if (typeof value.value !== \"string\") return undefined;\n      return { strategy: \"bearer\", value: value.value };\n    case \"basic\":\n      if (\n        typeof value.username !== \"string\" ||\n        typeof value.password !== \"string\"\n      ) {\n        return undefined;\n      }\n      return {\n        strategy: \"basic\",\n        username: value.username,\n        password: value.password,\n      };\n    case \"header\": {\n      const headers = stringRecord(value.headers);\n      return headers ? { strategy: \"header\", headers } : undefined;\n    }\n    case \"oauth2\": {\n      const authentication = getAuthenticationConfig(value.authentication);\n      const state = getOAuthState(value.state);\n      return {\n        strategy: \"oauth2\",\n        ...(authentication && { authentication }),\n        ...(state && { state }),\n      };\n    }\n    default:\n      return undefined;\n  }\n}\n\nfunction authCredentialFromServerConfig(\n  serverConfig: Record<string, unknown>,\n): MCPAuthCredential | undefined {\n  return normalizeTaggedAuthCredential(serverConfig.auth);\n}\n\nfunction getRemoteSecretFields(entry: {\n  auth?: MCPAuthCredential;\n  headers?: Record<string, string>;\n}): Partial<SdkMcpServerConfig> {\n  const fields: Partial<SdkMcpServerConfig> = {};\n  if (entry.auth && !hasRedactedMcpSecretLeaf(entry.auth)) {\n    fields.auth = entry.auth;\n  }\n  if (entry.headers && Object.keys(entry.headers).length > 0) {\n    fields.headers = entry.headers;\n  }\n  return fields;\n}\n\nfunction getRemoteServerFields(server: MCPServerConfig) {\n  return {\n    ...(server.name && { name: server.name }),\n    url: server.url!,\n    ...(server.headers && { headers: server.headers }),\n    ...(server.auth && { auth: server.auth }),\n  };\n}\n\nexport function toMcpSseServer(server: MCPServerConfig): MCPSSEServer {\n  return getRemoteServerFields(server);\n}\n\nexport function toMcpShttpServer(server: MCPServerConfig): MCPSHTTPServer {\n  return {\n    ...getRemoteServerFields(server),\n    ...(server.timeout !== undefined && { timeout: server.timeout }),\n  };\n}\n\nexport function toMcpStdioServer(server: MCPServerConfig): MCPStdioServer {\n  return {\n    name: server.name!,\n    command: server.command!,\n    ...(server.args && { args: server.args }),\n    ...(server.env && { env: server.env }),\n  };\n}\n\nfunction getAuthenticationConfig(\n  value: unknown,\n): MCPAuthenticationConfig | undefined {\n  if (!value || typeof value !== \"object\") return undefined;\n  const record = value as Record<string, unknown>;\n  if (record.type !== \"oauth\") return undefined;\n  const authentication: MCPAuthenticationConfig = { type: \"oauth\" };\n  if (\n    record.client_auth_method === \"none\" ||\n    record.client_auth_method === \"client_secret_post\" ||\n    record.client_auth_method === \"client_secret_basic\" ||\n    record.client_auth_method === \"private_key_jwt\"\n  ) {\n    authentication.client_auth_method = record.client_auth_method;\n  }\n  if (typeof record.scopes === \"string\") {\n    authentication.scopes = record.scopes;\n  } else if (\n    Array.isArray(record.scopes) &&\n    record.scopes.every((scope) => typeof scope === \"string\")\n  ) {\n    authentication.scopes = record.scopes;\n  }\n  if (typeof record.client_name === \"string\") {\n    authentication.client_name = record.client_name;\n  }\n  if (typeof record.client_metadata_url === \"string\") {\n    authentication.client_metadata_url = record.client_metadata_url;\n  }\n  if (typeof record.client_id === \"string\") {\n    authentication.client_id = record.client_id;\n  }\n  if (typeof record.client_secret === \"string\") {\n    authentication.client_secret = record.client_secret;\n  }\n  if (\n    record.additional_client_metadata &&\n    typeof record.additional_client_metadata === \"object\" &&\n    !Array.isArray(record.additional_client_metadata)\n  ) {\n    authentication.additional_client_metadata =\n      record.additional_client_metadata as Record<string, MCPJsonValue>;\n  }\n  return authentication;\n}\n\n/**\n * Parse the SDK-native ``agent_settings.mcp_config`` value and convert it\n * to the frontend MCPConfig format used by UI components.\n */\nexport function parseMcpConfig(value: unknown): MCPConfig {\n  const mcpConfig = getSdkMcpServerMap(value);\n  if (!mcpConfig) {\n    return { ...EMPTY_MCP_CONFIG };\n  }\n\n  const sseServers: (string | MCPSSEServer)[] = [];\n  const stdioServers: MCPStdioServer[] = [];\n  const shttpServers: (string | MCPSHTTPServer)[] = [];\n\n  for (const [serverName, serverConfig] of Object.entries(mcpConfig)) {\n    if (!isRecord(serverConfig)) continue;\n\n    const url = serverConfig.url as string | undefined;\n\n    if (url) {\n      const transport = serverConfig.transport as string | undefined;\n      const auth = authCredentialFromServerConfig(serverConfig);\n      const headers = stringRecord(serverConfig.headers);\n\n      if (transport === \"sse\") {\n        const name = userGivenServerName(serverName, \"sse\");\n        const server: MCPSSEServer = { url };\n        if (name) server.name = name;\n        if (auth) server.auth = auth;\n        if (headers) server.headers = headers;\n        sseServers.push(server);\n      } else {\n        const name = userGivenServerName(serverName, \"shttp\");\n        const server: MCPSHTTPServer = { url };\n        if (name) server.name = name;\n        if (serverConfig.timeout != null) {\n          server.timeout = serverConfig.timeout as number;\n        }\n        if (auth) server.auth = auth;\n        if (headers) server.headers = headers;\n        shttpServers.push(server);\n      }\n    } else {\n      if (typeof serverConfig.command !== \"string\") continue;\n      const stdioServer: MCPStdioServer = {\n        name: serverName,\n        command: serverConfig.command,\n      };\n      if (serverConfig.args) {\n        stdioServer.args = serverConfig.args as string[];\n      }\n      if (serverConfig.env) {\n        stdioServer.env = serverConfig.env as Record<string, string>;\n      }\n      stdioServers.push(stdioServer);\n    }\n  }\n\n  return {\n    sse_servers: sseServers,\n    stdio_servers: stdioServers,\n    shttp_servers: shttpServers,\n  };\n}\n\n/**\n * Convert the frontend MCPConfig format back to the SDK-native server map\n * expected by agent_settings.mcp_config on the backend.\n *\n * Names are only suffixed (``_1``, ``_2``, …) when an earlier entry has\n * already claimed the bare base name. We intentionally do NOT use a single\n * monotonic counter across server types: that would, for example, rename a\n * stdio server \"myname\" to \"myname_1\" the moment any sse/shttp entry is\n * persisted ahead of it, and shift the suffix on every save as the count\n * of other server types changes. With per-base collision suffixing,\n * unrelated entries keep their human-meaningful names stable across edits.\n */\nexport function toSdkMcpConfig(config: MCPConfig): SdkMcpConfig | null {\n  const mcpConfig: SdkMcpConfig = {};\n\n  const reserve = (base: string): string => {\n    const safeBase = toMcpServerName(base);\n    if (!(safeBase in mcpConfig)) return safeBase;\n    let i = 1;\n    while (`${safeBase}_${i}` in mcpConfig) i += 1;\n    return `${safeBase}_${i}`;\n  };\n\n  for (const entry of config.sse_servers) {\n    const server: SdkMcpServerConfig = {};\n    let name: string | undefined;\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      name = entry.name;\n      server.url = entry.url;\n      Object.assign(server, getRemoteSecretFields(entry));\n    }\n    server.transport = \"sse\";\n    mcpConfig[reserve(name || \"sse\")] = server;\n  }\n\n  for (const entry of config.shttp_servers) {\n    const server: SdkMcpServerConfig = { transport: \"http\" };\n    let name: string | undefined;\n    if (typeof entry === \"string\") {\n      server.url = entry;\n    } else {\n      name = entry.name;\n      server.url = entry.url;\n      Object.assign(server, getRemoteSecretFields(entry));\n      if (entry.timeout != null) server.timeout = entry.timeout;\n    }\n    mcpConfig[reserve(name || \"shttp\")] = server;\n  }\n\n  for (const entry of config.stdio_servers) {\n    const server: SdkMcpServerConfig = {\n      command: entry.command,\n    };\n    if (entry.args) server.args = entry.args;\n    if (entry.env) server.env = entry.env;\n    mcpConfig[reserve(entry.name || \"stdio\")] = server;\n  }\n\n  return Object.keys(mcpConfig).length > 0 ? mcpConfig : null;\n}\n"],"mappings":"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"}

package/dist/utils/mcp-config.d.ts

@@ -1,17 +1,23 @@
-import { MCPConfig, SettingsValue } from "#/types/settings";
-export declare const REDACTED_MCP_SECRET_VALUE = "<redacted>";
-type SdkMcpServerConfig = Record<string, SettingsValue>;
-type SdkMcpConfig = {
-    mcpServers: Record<string, SdkMcpServerConfig>;
-};
+import { MCPConfig, MCPSSEServer, MCPSHTTPServer, MCPStdioServer, SettingsValue } from "#/types/settings";
+import type { MCPAuthCredential } from "#/types/mcp-auth";
+import type { MCPServerConfig } from "#/types/mcp-server";
+export declare const REDACTED_MCP_SECRET_VALUE = "**********";
+type SdkMcpServerConfig = Record<string, SettingsValue | MCPAuthCredential>;
+type SdkMcpConfig = Record<string, SdkMcpServerConfig>;
+export declare function getSdkMcpServerMap(value: unknown): Record<string, unknown> | null;
+export declare function stringRecord(value: unknown): Record<string, string> | undefined;
+export declare function hasRedactedMcpSecretLeaf(value: unknown): boolean;
+export declare function toMcpSseServer(server: MCPServerConfig): MCPSSEServer;
+export declare function toMcpShttpServer(server: MCPServerConfig): MCPSHTTPServer;
+export declare function toMcpStdioServer(server: MCPServerConfig): MCPStdioServer;
 /**
- * Parse an SDK mcp_config value ({ mcpServers: { ... } }) and convert it
+ * Parse the SDK-native ``agent_settings.mcp_config`` value and convert it
  * to the frontend MCPConfig format used by UI components.
  */
 export declare function parseMcpConfig(value: unknown): MCPConfig;
 /**
- * Convert the frontend MCPConfig format back to the SDK { mcpServers: { ... } }
- * shape expected by agent_settings.mcp_config on the backend.
+ * Convert the frontend MCPConfig format back to the SDK-native server map
+ * expected by agent_settings.mcp_config on the backend.
  *
  * Names are only suffixed (``_1``, ``_2``, …) when an earlier entry has
  * already claimed the bare base name. We intentionally do NOT use a single