@@ -9,13 +9,8 @@ const { outputMenuState } = vi.hoisted(() => ({
   outputMenuState: { includeNestedWorkflow: true },
 }))
 
-vi.mock('@sim/emcn', () => ({
-  cn: (...values: unknown[]) => values.flat().filter(Boolean).join(' '),
-  Combobox: ({
-    groups,
-    multiSelectValues = [],
-    onMultiSelectChange,
-  }: {
+vi.mock('@sim/emcn', () => {
+  interface MockComboboxProps {
     groups: Array<{
       section?: string
       sectionElement?: ReactNode
@@ -29,7 +24,13 @@ vi.mock('@sim/emcn', () => ({
     }>
     multiSelectValues?: string[]
     onMultiSelectChange?: (values: string[]) => void
-  }) => (
+  }
+
+  const MockCombobox = ({
+    groups,
+    multiSelectValues = [],
+    onMultiSelectChange,
+  }: MockComboboxProps) => (
     <div>
       {groups.map((group, groupIndex) => (
         <div key={group.section ?? groupIndex}>
@@ -59,31 +60,18 @@ vi.mock('@sim/emcn', () => ({
         </div>
       ))}
     </div>
-  ),
-  ChipCombobox: ({
-    groups,
-    multiSelectValues,
-    onMultiSelectChange,
-  }: {
-    groups: Array<{ section?: string; items: Array<{ label: string; value: string }> }>
-    multiSelectValues?: string[]
-    onMultiSelectChange?: (values: string[]) => void
-  }) => (
-    <div data-chip-combobox>
-      {groups.flatMap((group) =>
-        group.items.map((option) => (
-          <button
-            key={option.value}
-            type='button'
-            onClick={() => onMultiSelectChange?.([...(multiSelectValues ?? []), option.value])}
-          >
-            {option.label}
-          </button>
-        ))
-      )}
-    </div>
-  ),
-}))
+  )
+
+  return {
+    cn: (...values: unknown[]) => values.flat().filter(Boolean).join(' '),
+    Combobox: MockCombobox,
+    ChipCombobox: (props: MockComboboxProps) => (
+      <div data-chip-combobox>
+        <MockCombobox {...props} />
+      </div>
+    ),
+  }
+})
 
 vi.mock('zustand/react/shallow', () => ({ useShallow: (selector: unknown) => selector }))
 
@@ -186,29 +174,32 @@ function outputSelect(
   workflowId: string,
   selectedOutputs: string[],
   onOutputSelect: (outputIds: string[]) => void,
-  valueMode: 'id' | 'label' | 'public' = 'id'
+  valueMode: 'id' | 'label' | 'public' = 'id',
+  size: 'sm' | 'md' = 'sm'
 ) {
   return (
     <OutputSelect
       workflowId={workflowId}
       selectedOutputs={selectedOutputs}
       onOutputSelect={onOutputSelect}
       valueMode={valueMode}
+      size={size}
     />
   )
 }
 
 function renderOutputSelect(
   selectedOutputs: string[],
   onOutputSelect = vi.fn(),
-  valueMode: 'id' | 'label' | 'public' = 'id'
+  valueMode: 'id' | 'label' | 'public' = 'id',
+  size: 'sm' | 'md' = 'sm'
 ) {
   ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
   container = document.createElement('div')
   document.body.appendChild(container)
   root = createRoot(container)
   act(() => {
-    root?.render(outputSelect('root', selectedOutputs, onOutputSelect, valueMode))
+    root?.render(outputSelect('root', selectedOutputs, onOutputSelect, valueMode, size))
   })
   return onOutputSelect
 }
@@ -263,6 +254,35 @@ describe('OutputSelect nested workflow menu', () => {
     expect(onOutputSelect).toHaveBeenCalledWith(['child-workflow.agent_answer'])
   })
 
+  it('keeps every selected output at the top and deselects nested outputs from there', () => {
+    const onOutputSelect = renderOutputSelect(['child-workflow.agent_answer'])
+
+    const sections = [...document.querySelectorAll('[data-section]')]
+    expect(sections[0]?.textContent).toBe('Selected')
+    expect(document.body.textContent).toContain('Research / Writer / answer')
+
+    clickOption('Research / Writer / answer')
+    expect(onOutputSelect).toHaveBeenCalledWith([])
+  })
+
+  it('preserves existing selections when choosing a nested output', () => {
+    const onOutputSelect = renderOutputSelect(['summary_content'])
+
+    clickOption('Outputs')
+    clickOption('answer')
+
+    expect(onOutputSelect).toHaveBeenCalledWith(['summary_content', 'child-workflow.agent_answer'])
+  })
+
+  it('selects outputs from the medium chat deployment picker', () => {
+    const onOutputSelect = renderOutputSelect([], vi.fn(), 'id', 'md')
+
+    expect(document.querySelector('[data-chip-combobox]')).not.toBeNull()
+    clickOption('content')
+
+    expect(onOutputSelect).toHaveBeenCalledWith(['summary_content'])
+  })
+
   it('emits public dot selectors for trigger authoring', () => {
     const onOutputSelect = renderOutputSelect([], vi.fn(), 'public')
 
 
@@ -250,23 +250,44 @@ function OutputSelectMenu({
   const [menuPath, setMenuPath] = useState<string[]>([])
   const activeMenuNode = resolveOutputMenuNode(outputMenu, menuPath)
 
-  const validOutputCount = selectedOutputs.filter((val) =>
-    workflowOutputs.some((output) => output.id === val || output.label === val)
-  ).length
+  const selectedOutputOptions = selectedOutputs
+    .map((selectedValue) =>
+      workflowOutputs.find(
+        (output) =>
+          output.id === selectedValue ||
+          output.label === selectedValue ||
+          getOutputValue(output, valueMode) === selectedValue
+      )
+    )
+    .filter((output): output is WorkflowOutputOption => output !== undefined)
+  const validOutputCount = selectedOutputOptions.length
   let selectedDisplayText = placeholder
   if (validOutputCount === 1) {
     selectedDisplayText = '1 output'
   } else if (validOutputCount > 1) {
     selectedDisplayText = `${validOutputCount} outputs`
   }
 
-  const normalizedSelectedValues = selectedOutputs
-    .map((val) => {
-      const output = workflowOutputs.find((item) => item.id === val || item.label === val)
-      if (!output) return null
-      return getOutputValue(output, valueMode)
-    })
-    .filter((value): value is string => value !== null)
+  const normalizedSelectedValues = selectedOutputOptions.map((output) =>
+    getOutputValue(output, valueMode)
+  )
+  const selectedValueSet = new Set(normalizedSelectedValues)
+
+  const outputOption = (output: WorkflowOutputOption, label = output.path): ComboboxOption => {
+    const value = getOutputValue(output, valueMode)
+    return {
+      label,
+      value,
+      onSelect: () => {
+        onOutputSelect(
+          selectedValueSet.has(value)
+            ? normalizedSelectedValues.filter((selectedValue) => selectedValue !== value)
+            : [...normalizedSelectedValues, value]
+        )
+      },
+      keepOpen: true,
+    }
+  }
 
   const folderOption = (node: WorkflowOutputMenuNode): ComboboxOption => ({
     label: 'Outputs',
@@ -288,15 +309,14 @@ function OutputSelectMenu({
       </div>
     ),
     items: [
-      ...node.outputs.map((output) => ({
-        label: output.path,
-        value: getOutputValue(output, valueMode),
-      })),
+      ...node.outputs
+        .filter((output) => !selectedValueSet.has(getOutputValue(output, valueMode)))
+        .map((output) => outputOption(output)),
       ...(node.children.length > 0 ? [folderOption(node)] : []),
     ],
   })
 
-  const comboboxGroups: ComboboxOptionGroup[] = activeMenuNode
+  const menuGroups: ComboboxOptionGroup[] = activeMenuNode
     ? [
         {
           section: activeMenuNode.blockName,
@@ -313,6 +333,18 @@ function OutputSelectMenu({
         ...activeMenuNode.children.map(outputGroup),
       ]
     : outputMenu.map(outputGroup)
+  const selectedGroup: ComboboxOptionGroup[] =
+    selectedOutputOptions.length > 0
+      ? [
+          {
+            section: 'Selected',
+            items: selectedOutputOptions.map((output) =>
+              outputOption(output, `${output.groupLabel} / ${output.path}`)
+            ),
+          },
+        ]
+      : []
+  const comboboxGroups = [...selectedGroup, ...menuGroups]
   const Trigger = size === 'md' ? ChipCombobox : Combobox
 
   return (
 
@@ -1252,29 +1252,6 @@ export const ToolInput = memo(function ToolInput({
           <UnsupportedToolBadge message={UNSUPPORTED_MCP_TOOL_MESSAGE} />
         ) : undefined,
       })
-      if (supportsAdvancedMcpServer) {
-        actionItems.push({
-          label: 'MCP Server (Advanced)',
-          value: 'action-mcp-server-advanced',
-          icon: Server,
-          onSelect: () => {
-            setStoreValue([
-              ...selectedTools.map((tool) => ({ ...tool, isExpanded: false })),
-              {
-                type: MCP_SERVER_ADVANCED_TOOL_TYPE,
-                params: { serverId: '' },
-                isExpanded: true,
-                usageControl: 'auto',
-              },
-            ])
-            setOpen(false)
-          },
-          disabled: isPreview || disabled || mcpUnsupported,
-          suffixElement: mcpUnsupported ? (
-            <UnsupportedToolBadge message={UNSUPPORTED_MCP_TOOL_MESSAGE} />
-          ) : undefined,
-        })
-      }
     }
     if (actionItems.length > 0) {
       groups.push({ items: actionItems })
@@ -1412,6 +1389,35 @@ export const ToolInput = memo(function ToolInput({
       })
     }
 
+    if (!permissionConfig.disableMcpTools && supportsAdvancedMcpServer) {
+      groups.push({
+        section: 'Advanced',
+        items: [
+          {
+            label: 'MCP Server (Advanced)',
+            value: 'action-mcp-server-advanced',
+            icon: Server,
+            onSelect: () => {
+              setStoreValue([
+                ...selectedTools.map((tool) => ({ ...tool, isExpanded: false })),
+                {
+                  type: MCP_SERVER_ADVANCED_TOOL_TYPE,
+                  params: { serverId: '' },
+                  isExpanded: true,
+                  usageControl: 'auto',
+                },
+              ])
+              setOpen(false)
+            },
+            disabled: isPreview || disabled || mcpUnsupported,
+            suffixElement: mcpUnsupported ? (
+              <UnsupportedToolBadge message={UNSUPPORTED_MCP_TOOL_MESSAGE} />
+            ) : undefined,
+          },
+        ],
+      })
+    }
+
     return groups
   }, [
     open,