@@ -320,6 +320,7 @@
         "buttonText": "string",
         "buttonPosition": "string",
         "buttonUseIcon": "boolean",
+        "query": "searchQuery",
         "lock": "lock",
         "metadata": "metadata",
         "className": "string",
@@ -1201,6 +1202,9 @@
     "rows": {
       "check": "rows"
     },
+    "searchQuery": {
+      "check": "searchQuery"
+    },
     "string": {
       "check": "string"
     },
 
@@ -934,6 +934,11 @@ def field(self, node, label):
         label_attrs = label if isinstance(label, dict) else {'text': label}
         label = label_attrs.get('text', '')
         kind = node.tag if node.tag in {'textarea', 'select'} else node.attrs.get('type', 'text')
+        # A search box in a form that is no site search (search_form) is the
+        # form's text field; rules on input[type=search] no longer match it.
+        if kind == 'search':
+            self.finding('field-type', 'search field kept as a text field: ' + (node.attrs.get('name') or node.attrs.get('id') or ''))
+            kind = 'text'
         if kind not in {'text', 'email', 'tel', 'url', 'number', 'textarea', 'select', 'checkbox', 'radio'}:
             self.finding('unmapped-field', kind)
             return None
@@ -965,6 +970,80 @@ def field(self, node, label):
             self.finding('field-default', 'Preserve textarea default content: ' + name)
         return {'name': 'h2wp/field', 'attributes': result}
 
+    def search_form(self, node):
+        """core/search for a site search, else None: a GET to the front page
+        with one box named `s`, the way WordPress searches (a WordPress export
+        keeps its theme's form). No mail form: WordPress answers it with its
+        search results. Its hidden inputs are the search's own parameters
+        (`post_type=post`: notes only). An icon or text beside the box keeps
+        the form's classes on an element around the search, so the design
+        lays them out as it did."""
+        if (node.attrs.get('method') or 'get').strip().lower() != 'get':
+            return None
+        # The front page: `/`, a path to it, or the site's own address as an
+        # export writes it (home_url(): any host, no path).
+        action, home = (node.attrs.get('action') or '').strip(), self.resolve_quiet('/')
+        address = urlsplit(action)
+        if action != '/' and not (address.scheme in ('http', 'https') and address.path in ('', '/') and not address.query) \
+                and not (action and home.startswith('page:') and self.resolve_quiet(action).split('#')[0].split('?')[0] == home):
+            return None
+        kind = lambda n: (n.attrs.get('type') or ('submit' if n.tag == 'button' else 'text')).lower()
+        controls = [n for n in walk(node) if n.tag in ('input', 'select', 'textarea', 'button')]
+        box = [n for n in controls if n.tag == 'input' and kind(n) in ('search', 'text') and n.attrs.get('name') == 's']
+        hidden = [n for n in controls if n.tag == 'input' and kind(n) == 'hidden']
+        submit = [n for n in controls if (n.tag == 'button' and kind(n) == 'submit') or (n.tag == 'input' and kind(n) in ('submit', 'image'))]
+        query = {n.attrs.get('name') or '': n.attrs.get('value') or '' for n in hidden}
+        if len(box) != 1 or len(submit) > 1 or len(box) + len(hidden) + len(submit) != len(controls) or len(query) != len(hidden) \
+                or any(not re.fullmatch(r'[a-z_][a-z0-9_-]{0,31}', k, re.I) or k == 's' or len(v) > 200 for k, v in query.items()):
+            return None
+        field = box[0]
+        labels = [n for n in walk(node) if n.tag == 'label']
+        named = self.labels.get(field.attrs.get('id')) if field.attrs.get('id') else None
+        words = norm(plain(labels[0])) if labels else norm((named or {}).get('text') or '')
+        attrs = {'label': words or norm(field.attrs.get('aria-label') or '') or norm(field.attrs.get('placeholder') or '') or 'Search',
+                 'showLabel': bool(labels), 'buttonPosition': 'no-button'}
+        if field.attrs.get('placeholder'):
+            attrs['placeholder'] = field.attrs['placeholder']
+        if submit:
+            button = submit[0]
+            text = norm(plain(button)) if button.tag == 'button' else norm(button.attrs.get('value') or '')
+            attrs.update({'buttonPosition': 'button-outside', 'buttonText': text or 'Search'})
+            if button.tag == 'button' and not text and any(n.tag == 'svg' for n in walk(button)):
+                attrs['buttonUseIcon'] = True
+            self.finding('search-button', 'core/search draws its own button (wp-block-search__button): the source button\'s markup and classes "' + (button.attrs.get('class') or '') + '" are not carried; review its style')
+        if labels:
+            self.finding('search-label', 'core/search draws its own label (wp-block-search__label): the source label\'s classes "' + (labels[0].attrs.get('class') or '') + '" are not carried; review its style')
+        if query:
+            attrs['query'] = query
+        own, extra = self.attrs(node, ('action', 'method', 'role'))
+        if extra:
+            self.finding('search-attributes', 'core/search keeps only the form\'s classes and id: ' + json.dumps(extra, sort_keys=True))
+        parts = {id(n) for n in box + hidden + submit + labels}
+        decoration = [c for c in node.children if (isinstance(c, str) and c.strip()) or (isinstance(c, Node) and id(c) not in parts)]
+        search = {'name': 'core/search', 'attributes': attrs}
+        if not decoration:
+            search['attributes'].update(own)
+            return search
+        if any(not any(c is n for c in node.children) for n in box + hidden + submit + labels):
+            # The box sits inside the form's own markup: the search stands for
+            # the whole form, and that markup is not kept.
+            self.finding('search-markup', 'core/search stands for the whole form; the markup around its box is not kept: ' + ', '.join(sorted({c.tag for c in decoration if isinstance(c, Node)})))
+            search['attributes'].update(own)
+            return search
+        # The box was the form's own item: the search form takes its place and
+        # its room (a box that fills the pill fills it still; with no room to
+        # spare it keeps its size).
+        search['attributes']['className'] = self.style_class('flex:1 1 auto;min-width:0')
+        inner = []
+        for child in node.children:
+            if isinstance(child, Node) and child is field:
+                inner.append(search)
+            elif (isinstance(child, str) and child.strip()) or (isinstance(child, Node) and id(child) not in parts):
+                block = self.block(child)
+                if block:
+                    inner.append(block)
+        return {'name': 'h2wp/element', 'attributes': {**own, 'tagName': 'div'}, 'innerBlocks': inner}
+
     def simple_attrs(self, node, extra=()):
         """class/id/style only (no findings); None when other attributes exist."""
         if set(node.attrs) - {'class', 'id', 'style', *extra}:
@@ -1613,6 +1692,9 @@ def block_default(self, node, texts=None):
             self.finding('unmapped-element', tag)
             return None
         if tag == 'form':
+            search = self.search_form(node)
+            if search:
+                return search
             attrs, extra = self.attrs(node, ('action', 'method', 'data-spa-success', 'data-spa-validate'))
             # The feedback the source app showed on a successful submit
             # (stage -1 records it; see prerender-spa.py), shown by the
 
@@ -1010,6 +1010,45 @@ def test_empty_wrappers_stay_elements(self):
         self.assertEqual(section['name'], 'core/group')
         self.assertEqual([b['name'] for b in section['innerBlocks']], ['h2wp/element', 'core/paragraph'])
 
+    def test_a_site_search_form_is_the_wordpress_search(self):
+        # A GET to the front page with a box named s is how WordPress searches
+        # (a WordPress export keeps its theme's form): core/search, never a
+        # mail form. The hidden post_type is the search's own parameter, and
+        # the icon beside the box keeps the form's classes around it.
+        icon = '<svg width="15" height="15" viewBox="0 0 24 24" aria-hidden="true"><circle cx="11" cy="11" r="7"></circle></svg>'
+        _, proposals, findings = self.plan({'index.html': '<body><div class="bar"><h1>Home</h1></div></body>', 'notes.html': '<body><div class="bar">'
+            '<form class="topic-search" role="search" method="get" action="/">' + icon + '<input type="search" name="s" placeholder="Search notes" aria-label="Search notes">'
+            '<input type="hidden" name="post_type" value="post"></form>'
+            '<form class="plain" action="index.html"><input type="text" name="s"><button type="submit" class="btn">Go</button></form>'
+            '<form class="export" action="https://example.com/"><input type="search" name="s"></form></div></body>'})
+        wrapper, plain_search, exported = [dict(b, attributes={k: v for k, v in b['attributes'].items() if k != 'metadata'}) for b in proposals['notes']['blocks']]
+        self.assertEqual((wrapper['name'], wrapper['attributes']), ('h2wp/element', {'className': 'topic-search', 'tagName': 'div'}))
+        self.assertEqual([b['name'] for b in wrapper['innerBlocks']], ['h2wp/icon', 'core/search'])
+        search = dict(wrapper['innerBlocks'][1]['attributes'])
+        room = search.pop('className')
+        self.assertEqual(search, {'label': 'Search notes', 'showLabel': False, 'buttonPosition': 'no-button', 'placeholder': 'Search notes', 'query': {'post_type': 'post'}})
+        self.assertIn('.' + room + '{flex:1 1 auto;min-width:0}', (self.dist / 'assets/gutenberg-inline.css').read_text(), 'the search form takes the box\'s room')
+        # The site's own address, as a WordPress export writes home_url().
+        self.assertEqual((exported['name'], exported['attributes']['className']), ('core/search', 'export'))
+        self.assertEqual({k: plain_search[k] for k in ('name', 'attributes')}, {'name': 'core/search', 'attributes': {'label': 'Search', 'showLabel': False, 'buttonPosition': 'button-outside', 'buttonText': 'Go', 'className': 'plain'}})
+        codes = [f['code'] for f in findings['notes']]
+        self.assertEqual(codes, ['search-button'], 'no mail-form finding, no dropped field')
+        self.assertNotIn('h2wp/form', json.dumps(proposals['notes']))
+
+    def test_a_search_box_in_a_mail_form_is_its_text_field(self):
+        # Not a site search (a POST, another action, another name): the box is
+        # the form's text field, reported; a kind no field draws stays unmapped.
+        _, proposals, findings = self.plan({'index.html': '<body><h1>Home</h1></body>', 'contact.html': '<body>'
+            '<form method="post" action="/send"><input type="search" name="topic"><input type="file" name="cv"><input type="hidden" name="ref" value="x"><button type="submit">Send</button></form>'
+            '<form method="get" action="/catalog"><input type="search" name="q"></form></body>'})
+        mail, other = proposals['contact']['blocks']
+        self.assertEqual((mail['name'], other['name']), ('h2wp/form', 'h2wp/form'))
+        self.assertEqual([(b['attributes'].get('name'), b['attributes'].get('type')) for b in mail['innerBlocks'] if b['name'] == 'h2wp/field'], [('topic', 'text')])
+        items = [(f['code'], i['detail']) for f in findings['contact'] for i in planner.finding_items(f)]
+        self.assertIn(('field-type', 'search field kept as a text field: topic'), items)
+        self.assertIn(('unmapped-field', 'file'), items)
+        self.assertIn(('unmapped-field', 'hidden'), items)
+
     def test_rich_text_collapses_source_whitespace_except_pre(self):
         _, proposals, _ = self.plan({'index.html': self.app(body='<p class="x">Every   program\n      is built</p><pre>a\n   b</pre>')})
         para, pre = proposals['index']['blocks'][1]['innerBlocks'][:2] if proposals['index']['blocks'][1].get('innerBlocks') else proposals['index']['blocks'][1:3]
 
@@ -367,6 +367,10 @@ def _fieldMap(self, value, at, kind):
         if not isinstance(value, dict) or any(not re.fullmatch(r'[a-z0-9_-]{1,64}', k, AI) or not isinstance(v, str) or _u16(v) > 64 for k, v in value.items()):
             _raise(f'{at}: expected field name → plugin field name')
 
+    def _searchQuery(self, value, at, kind):
+        if not isinstance(value, dict) or any(not re.fullmatch(r'[a-z_][a-z0-9_-]{0,31}', k, AI) or k == 's' or not isinstance(v, str) or _u16(v) > 200 for k, v in value.items()):
+            _raise(f'{at}: expected search parameters (name → text, not s)')
+
     def _formSuccess(self, value, at, kind):
         _strict(value, ['kind', 'html', 'list', 'region', 'ms'], at)
         html = value.get('html', UNDEFINED)
 
@@ -46,6 +46,15 @@ paragraph/heading/list blocks, YouTube/Vimeo iframes to `core/embed`,
 `video`/`audio`/`table`/`picture`/`pre` to their core blocks, names top-level
 sections through `metadata.name`, and writes literal `:root` color, font and
 font-size custom properties to `themeJson.settings` presets.
+A site search (a GET to the front page with one box named `s`, the way
+WordPress searches; a WordPress export keeps its theme's form) becomes
+`core/search`, never a mail form: WordPress answers it with its search
+results. Its hidden inputs become the block's `query` (`post_type=post`), and
+an icon or text beside the box keeps the form's classes on an element around
+it. `search-button`/`search-label` note a source button or label the block
+draws its own way. A search box in any other form is that form's text field
+(`field-type`); a kind no field draws (file, date, hidden…) stays
+`unmapped-field`.
 
 For blogs the planner also derives the article and listing templates:
 it aligns all post pages, keeps identical sections as template content,