@@ -1,16 +1,21 @@
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import {
   BLOCK_DIMENSIONS,
+  countNoteSearchOccurrencesBefore,
   DEFAULT_NOTE_COLOR,
   estimateNoteBlockHeight,
+  forEachNoteSourceOccurrence,
   getNoteStringValue,
   isNoteColor,
   NoteBlockView,
   type NoteColor,
   type NoteContentEditorProps,
+  type NoteSearchHighlight,
+  type NoteSearchRange,
 } from '@sim/workflow-renderer'
 import dynamic from 'next/dynamic'
 import { type NodeProps, useReactFlow } from 'reactflow'
+import { useShallow } from 'zustand/react/shallow'
 import { appendNoteImageMarkdown } from '@/lib/workflows/notes/add-image'
 import {
   NOTE_ADD_IMAGE_EVENT,
@@ -26,7 +31,7 @@ import { useBlockDimensions } from '@/app/workspace/[workspaceId]/w/[workflowId]
 import { isBlockProtected } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useIsCurrentWorkflowExecuting } from '@/stores/execution'
-import { usePanelEditorStore } from '@/stores/panel'
+import { usePanelEditorSearchStore, usePanelEditorStore } from '@/stores/panel'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
@@ -48,6 +53,9 @@ const NoteMarkdownEditor = dynamic(
 
 const NOTE_EXPAND_FOCUS_DURATION_MS = 300
 
+/** The markdown body's sub-block id, as declared by the Note block config. */
+const NOTE_CONTENT_SUBBLOCK_ID = 'content'
+
 function renderNoteContentEditor(props: NoteContentEditorProps) {
   return <NoteMarkdownEditor {...props} />
 }
@@ -106,7 +114,92 @@ export const NoteBlock = memo(function NoteBlock({
     useCallback((state) => isBlockProtected(id, state.blocks), [id])
   )
   const clearCurrentBlock = usePanelEditorStore((state) => state.clearCurrentBlock)
+  /* Flattened to primitives under a shallow compare, never held as the target
+     object: the search panel re-publishes an equal target on most of its own
+     renders, and a card that subscribes to the object rebuilds its highlight on
+     every one of them. */
+  const searchTarget = usePanelEditorSearchStore(
+    useShallow((state) => {
+      const target = state.activeSearchTarget
+      return {
+        blockId: target?.blockId ?? null,
+        subBlockId: target?.subBlockId ?? null,
+        targetKind: target?.targetKind ?? null,
+        query: target?.query ?? null,
+        rawValue: target?.rawValue ?? null,
+        rangeStart: target?.range?.start ?? null,
+        rangeEnd: target?.range?.end ?? null,
+      }
+    })
+  )
   const canEditNote = canEditWorkflow && !data.isPreview && !isProtected
+
+  /** Whether the active search match belongs to this card at all. */
+  const isSearchTargetBlock =
+    !data.isPreview &&
+    !data.isEmbedded &&
+    searchTarget.blockId === id &&
+    Boolean(searchTarget.query)
+
+  /**
+   * The workflow search match this card should paint in its body.
+   *
+   * The panel editor renders nothing for a note, so the card is the only
+   * surface that can answer a search — without this a note match counts towards
+   * "1 of 6" and then highlights nowhere.
+   *
+   * The stored range is re-checked against the live content before it is
+   * trusted: the index runs over a snapshot, and a collaborator's edit between
+   * indexing and painting would shift the ordinal onto the wrong words. When it
+   * no longer holds — or the match never carried one — this falls back to the
+   * first rendered occurrence, which is the same fallback the editor panel
+   * makes for a label whose stored range does not fit.
+   */
+  const searchHighlight = useMemo<NoteSearchHighlight | null>(() => {
+    if (!isSearchTargetBlock) return null
+    if (searchTarget.targetKind !== 'subblock') return null
+    if (searchTarget.subBlockId !== NOTE_CONTENT_SUBBLOCK_ID) return null
+
+    const { query, rawValue, rangeStart, rangeEnd } = searchTarget
+    if (!query) return null
+
+    const rangeHolds =
+      rangeStart !== null && rangeEnd !== null && content.slice(rangeStart, rangeEnd) === rawValue
+    if (rangeHolds) {
+      return {
+        query,
+        occurrenceIndex: countNoteSearchOccurrencesBefore(content, query, rangeStart),
+      }
+    }
+
+    /* Asked through the same scan that will do the marking, rather than a local
+       `includes`: a bare comparison skips the whitespace fold, so a query the
+       indexer matched across a newline or a non-breaking space would read as
+       absent here and the card would paint nothing while the panel counted it. */
+    let occurs = false
+    forEachNoteSourceOccurrence(content, query, () => {
+      occurs = true
+    })
+    return occurs ? { query, occurrenceIndex: 0 } : null
+  }, [content, isSearchTargetBlock, searchTarget])
+
+  /**
+   * The match to paint in the title, for a search that hit the note's name.
+   *
+   * A name match carries an exact range over `block.name`, so unlike the body
+   * there is no occurrence to reconstruct — it is used directly, once it still
+   * describes the live name.
+   */
+  const nameSearchRange = useMemo<NoteSearchRange | null>(() => {
+    if (!isSearchTargetBlock) return null
+    if (searchTarget.targetKind !== 'block-name') return null
+
+    const { rawValue, rangeStart, rangeEnd } = searchTarget
+    if (rangeStart === null || rangeEnd === null) return null
+    if ((name ?? '').slice(rangeStart, rangeEnd) !== rawValue) return null
+
+    return { start: rangeStart, end: rangeEnd }
+  }, [isSearchTargetBlock, name, searchTarget])
   const uploadNoteImage = useNoteImageUpload()
   const imageInputRef = useRef<HTMLInputElement>(null)
   const [blockHeight, setBlockHeight] = useState(() => estimateNoteBlockHeight(content))
@@ -132,14 +225,56 @@ export const NoteBlock = memo(function NoteBlock({
     []
   )
 
+  const isExpandedRef = useRef(isExpanded)
+  useEffect(() => {
+    isExpandedRef.current = isExpanded
+  }, [isExpanded])
+
+  /**
+   * Opens the card while it holds the current search match, and closes it again
+   * when the match moves on.
+   *
+   * A compact note shows a few lines of what is often a long document, so a
+   * match found deep inside it lands in a body the user cannot read. Expanding
+   * is the same gesture a click makes, and it gives the mark somewhere to be.
+   *
+   * Two things this deliberately does not do. It does not call
+   * {@link handleExpandedChange}, whose own `setCenter` would race the camera
+   * the canvas already moved for this match. And it only closes a card it
+   * opened — a note the user expanded by hand, or collapsed by hand while the
+   * match still points here, is left exactly as they left it.
+   */
+  const searchExpandedRef = useRef(false)
+  const hasSearchMatch = searchHighlight !== null || nameSearchRange !== null
+  useEffect(() => {
+    /* Losing edit rights already force-collapses the card during render. Drop the latch with it,
+       or regaining them would hit the early return below and leave a deep match clipped in the
+       compact body until the active match moved. */
+    if (!canEditNote) {
+      searchExpandedRef.current = false
+      return
+    }
+
+    if (hasSearchMatch) {
+      if (searchExpandedRef.current || isExpandedRef.current) return
+      searchExpandedRef.current = true
+      setIsExpanded(true)
+      return
+    }
+
+    if (!searchExpandedRef.current) return
+    searchExpandedRef.current = false
+    setIsExpanded(false)
+  }, [canEditNote, hasSearchMatch])
+
   const handleNameChange = (nextName: string) => {
     if (!canEditNote) return false
     return collaborativeUpdateBlockName(id, nextName).success
   }
 
   const handleContentChange = (nextContent: string) => {
     if (!canEditNote) return
-    collaborativeSetSubblockValue(id, 'content', nextContent)
+    collaborativeSetSubblockValue(id, NOTE_CONTENT_SUBBLOCK_ID, nextContent)
   }
 
   /**
@@ -175,9 +310,14 @@ export const NoteBlock = memo(function NoteBlock({
       if (!image) continue
       /* Re-read per image: each append has to build on the previous one, and on
          anything a collaborator wrote while the upload was in flight. */
-      const current = getNoteStringValue(useSubBlockStore.getState().getValue(id, 'content')) ?? ''
+      const current =
+        getNoteStringValue(useSubBlockStore.getState().getValue(id, NOTE_CONTENT_SUBBLOCK_ID)) ?? ''
       setExternalContentWrites((count) => count + 1)
-      collaborativeSetSubblockValue(id, 'content', appendNoteImageMarkdown(current, image))
+      collaborativeSetSubblockValue(
+        id,
+        NOTE_CONTENT_SUBBLOCK_ID,
+        appendNoteImageMarkdown(current, image)
+      )
     }
   }
 
@@ -292,6 +432,8 @@ export const NoteBlock = memo(function NoteBlock({
         onExpandedChange={handleExpandedChange}
         onImageFilesDrop={(files) => void insertImages(files)}
         renderContentEditor={renderNoteContentEditor}
+        searchHighlight={searchHighlight}
+        nameSearchRange={nameSearchRange}
         actionBar={
           <ActionBar
             blockId={id}
 
@@ -145,7 +145,7 @@ import {
 } from '@/stores/execution'
 import { useSearchModalStore } from '@/stores/modals/search/store'
 import type { PendingConnect } from '@/stores/modals/search/types'
-import { usePanelEditorStore, usePanelStore } from '@/stores/panel'
+import { usePanelEditorSearchStore, usePanelEditorStore, usePanelStore } from '@/stores/panel'
 import { useUndoRedoStore } from '@/stores/undo-redo'
 import { useVariablesModalStore } from '@/stores/variables/modal'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
@@ -4608,6 +4608,73 @@ const WorkflowContent = React.memo(
       return () => window.removeEventListener('keydown', handleArrowNavigation, true)
     }, [embedded, getNodes, blocks, focusBlockInView])
 
+    /**
+     * Brings a Note holding the current search match onto the canvas.
+     *
+     * Every other block answers a search through the editor panel, which scrolls
+     * the matching field into view for free. A Note renders nothing there — the
+     * card itself is the surface — so the camera has to do that job here, and
+     * the card has to be selected before it will hold a scroll position deep in
+     * its own body rather than snapping back to the top.
+     *
+     * Keyed on the match rather than the block, so cycling between two matches
+     * in one Note re-asserts a camera that is already where it needs to be
+     * (visually inert) instead of stranding the second match off-screen after
+     * the user has panned away. Matches on every other kind of block are marked
+     * handled and otherwise left alone — without that, walking away to a block
+     * match and back to a Note one would read as the same match twice and skip
+     * the camera the second time.
+     *
+     * Also covers a match on the Note's *name*, which the card cannot underline
+     * but which at least lands the user on the right card.
+     *
+     * Subscribed as two ids and NEVER as the target object. The search panel
+     * renders inside this component and re-publishes an equal target on most of
+     * its own renders (its hydration hooks hand back fresh arrays), so holding
+     * the object here re-renders the panel, whose effect re-publishes, which
+     * re-renders it again — an unbounded update loop the moment a search opens.
+     * Two string selectors are compared by value, so a re-publish of the same
+     * match is inert.
+     */
+    const searchMatchId = usePanelEditorSearchStore(
+      (state) => state.activeSearchTarget?.matchId ?? null
+    )
+    const searchMatchBlockId = usePanelEditorSearchStore(
+      (state) => state.activeSearchTarget?.blockId ?? null
+    )
+    const focusedSearchMatchIdRef = useRef<string | null>(null)
+    useEffect(() => {
+      if (embedded) return
+      if (!searchMatchId || !searchMatchBlockId) {
+        focusedSearchMatchIdRef.current = null
+        return
+      }
+      if (searchMatchId === focusedSearchMatchIdRef.current) return
+
+      if (blocks[searchMatchBlockId]?.type !== 'note') {
+        focusedSearchMatchIdRef.current = searchMatchId
+        return
+      }
+
+      /* Read from `displayNodes` rather than `getNodes()` so a match that
+         arrives before its node has mounted is retried on the commit that
+         mounts it, instead of being dropped. */
+      const node = displayNodes.find((candidate) => candidate.id === searchMatchBlockId)
+      if (!node) return
+
+      focusedSearchMatchIdRef.current = searchMatchId
+      setDisplayNodes((currentNodes) =>
+        resolveSelectionConflicts(
+          currentNodes.map((currentNode) => ({
+            ...currentNode,
+            selected: currentNode.id === node.id,
+          })),
+          blocks
+        )
+      )
+      focusBlockInView(node)
+    }, [blocks, displayNodes, embedded, focusBlockInView, searchMatchBlockId, searchMatchId])
+
     /** Handles edge selection with container context tracking and Shift-click multi-selection. */
     const onEdgeClick = useCallback(
       (event: React.MouseEvent, edge: any) => {
 
@@ -15,6 +15,7 @@ export const NoteBlock: BlockConfig = {
     {
       id: 'content',
       type: 'long-input',
+      searchTextFormat: 'markdown',
       rows: 8,
       placeholder: 'Add context or instructions for collaborators...',
       description: 'Write your note using Markdown. YouTube links will display as embedded videos.',
 
@@ -269,6 +269,19 @@ export interface SubBlockConfig {
   type: SubBlockType
   mode?: 'basic' | 'advanced' | 'both' | 'trigger' | 'trigger-advanced' // Default is 'both' if not specified. 'trigger' means only shown in trigger mode. 'trigger-advanced' is the advanced side of a trigger field — either a canonical pair member or a standalone field shown under the block-level advanced toggle
   canonicalParamId?: string
+  /**
+   * Declares that the stored value is markdown, so workflow search matches it
+   * against the text it RENDERS as rather than its source.
+   *
+   * The rich-text editor backslash-escapes every markdown-significant character
+   * in prose, so a Note body the reader sees as `SB_ACTION` is stored as
+   * `SB\_ACTION` and would otherwise be unfindable by what is on screen. Ranges
+   * stay in source coordinates, so replace still rewrites the escaped span.
+   *
+   * Omit for every ordinary field: a code or plain-text value is searched as
+   * stored, where a backslash is the author's own character.
+   */
+  searchTextFormat?: 'markdown'
   /** Controls parameter visibility in agent/tool-input context */
   paramVisibility?: 'user-or-llm' | 'user-only' | 'llm-only' | 'hidden'
   /**
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ export const NoteBlock: BlockConfig = {`
`15`	`15`	`{`
`16`	`16`	`id: 'content',`
`17`	`17`	`type: 'long-input',`
	`18`	`+ searchTextFormat: 'markdown',`
`18`	`19`	`rows: 8,`
`19`	`20`	`placeholder: 'Add context or instructions for collaborators...',`
`20`	`21`	`description: 'Write your note using Markdown. YouTube links will display as embedded videos.',`