From 28c2579fd21d0d4c60b5f861b53a026541dbc294 Mon Sep 17 00:00:00 2001
From: leemour <leemour@gmail.com>
Date: Tue, 20 Oct 2026 17:32:42 +0200
Subject: [PATCH] fix(search): take a WhatsApp chat id unquoted, on cli-base
 0.47.3

cli-base 0.47.3 keeps an `@` followed by a letter inside a term, so
`chat:<n>@lid` and `chat:<n>@g.us` no longer fail with
query.unsupported-operator. cli-core now requires cli-base >=0.47.3 so a
CLI cannot pair it with a parser that still refuses them.

The `email` field help and docs/mentions.md said emails must be quoted
because `@` is an operator; that was already false for addresses, and
the examples are unquoted now. STANDARD.md is regenerated from the
cli-base 0.47.3 standards (`--qr-file` gone, `--alias` added).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 CHANGELOG.md                       |  7 +++++++
 docs/dev/STANDARD.md               |  2 +-
 docs/mentions.md                   |  2 +-
 docs/search/query-language.md      |  2 +-
 package.json                       |  4 ++--
 pnpm-lock.yaml                     | 10 +++++-----
 src/search/lucene/registry.test.ts |  9 +++++++++
 src/search/lucene/registry.ts      |  2 +-
 8 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c002d358f..f73ed43ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ shape of this file.
 
 ## Unreleased
 
+### Fixed
+
+- **A WhatsApp chat id works unquoted in a query.** `chat:133…@lid` and `chat:120…@g.us` parse as one term; before,
+  `@lid` was refused with `query.unsupported-operator`. The fix is in cli-base 0.47.3, so cli-core now needs
+  `@wirecat/cli-base >=0.47.3`: a CLI pinned to 0.47.0–0.47.2 must raise its own cli-base pin with this release.
+  Emails in the `email` field help and the search docs are unquoted too.
+
 ## 0.374.0 — 20.10.2026
 
 ### Added
diff --git a/docs/dev/STANDARD.md b/docs/dev/STANDARD.md
index cff960335..535daaf95 100644
--- a/docs/dev/STANDARD.md
+++ b/docs/dev/STANDARD.md
@@ -333,7 +333,6 @@ table. "Not" lists the words a term replaces. How `cli-dev lint` runs over a CLI
 | `--by` | `<group>` | choice | what the answer counts or groups by: a field or a calendar unit |  |
 | `--context` | `<n>` | count | how many messages before and after each hit | messages |
 | `--events` |  | switch | also print edits, deletions and other changes; every line names its event |  |
-| `--qr-file` | `<png>` | path | write the login QR code to this PNG instead of drawing it |  |
 | `--all-versions` |  | switch | also the earlier versions a newer one replaced |  |
 | `--measure` | `<name>` | choice | the metric a ranking is ordered by |  |
 | `--newest` |  | switch | newest first instead of best first |  |
@@ -483,6 +482,7 @@ table. "Not" lists the words a term replaces. How `cli-dev lint` runs over a CLI
 | `--render` | `<mode>` | choice | how returned cell values are represented: formatted display values, unformatted values or formulas |  |
 | `--context-source` | `<id=cursor>` | string | explicitly selected communications source, optionally with its scoped continuation cursor; repeat for more sources |  |
 | `--context-query` | `<words>` | string | literal words to find within the communications selected for preparation |  |
+| `--alias` | `<name>` | string | another name of the thing, searched as its own alternative beside its name; repeat for more |  |
 | `--context-since-time` | `<time>` | time | inclusive start of the selected communications window used for preparation |  |
 | `--context-before-time` | `<time>` | time | exclusive end of the selected communications window used for preparation |  |
 | `--account` | `<account>` | string | the account to use; never assumed |  |
diff --git a/docs/mentions.md b/docs/mentions.md
index 6e07396d5..be455c05e 100644
--- a/docs/mentions.md
+++ b/docs/mentions.md
@@ -21,7 +21,7 @@ Search messages by a mention:
 
 ```sh
 tg work search messages phone:"8 900 000-00-01"     # any spelling: +7…, 8…, with spaces or dashes
-tg work search messages email:"ana@example.com"     # quoted: @ is an operator in the query language
+tg work search messages email:ana@example.com       # the address, lower-cased
 tg work search messages domain:google.com           # docs.google.com, drive.google.com, google.com
 tg work search messages url:"https://example.com/a" # the link without utm_*, fbclid and the #part
 tg work search messages link:"/price"              # any link that contains this text
diff --git a/docs/search/query-language.md b/docs/search/query-language.md
index 109e22e38..559469770 100644
--- a/docs/search/query-language.md
+++ b/docs/search/query-language.md
@@ -371,7 +371,7 @@ enum или unsupported сочетание дают ошибку, а не пус
 | `author` | kw | contained, folded as text is; notes and files only | `author:ivanov` | term, phrase |
 | `keyword` | kw | whole keyword, folded as text is; notes and files only | `keyword:invoices` | term, phrase |
 | `phone` | kw | a phone found in the text, written any way; a number without + is read in phone_countries | `phone:"8 900 000-00-01"` | term, phrase |
-| `email` | kw | an address found in the text, lower-cased; quoted, since @ is an operator | `email:"ana@example.com"` | term, phrase |
+| `email` | kw | an address found in the text, lower-cased | `email:ana@example.com` | term, phrase |
 | `url` | kw | a link found in the text, without utm_*, fbclid and the fragment | `url:"https://example.com/a"` | term, phrase |
 | `domain` | kw | the site of a link or an address in the text; docs.google.com means google.com | `domain:google.com` | term, phrase |
 | `link` | kw | a part of a link, quoted; Latin letters in any case; in mail also the body of a letter with a tracking link | `link:"click?id=1"` | term, phrase |
diff --git a/package.json b/package.json
index c0d5d0929..095027103 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
     "@types/node": "^22.20.4",
     "@types/pngjs": "6.0.5",
     "@vitest/coverage-v8": "^5.0.2",
-    "@wirecat/cli-base": "0.47.0",
+    "@wirecat/cli-base": "0.47.3",
     "commander": "15.0.0",
     "cspell": "10.3.6",
     "drizzle-kit": "1.0.0-rc.4",
@@ -222,7 +222,7 @@
   },
   "peerDependencies": {
     "@napi-rs/canvas": ">=0.1.69 <2",
-    "@wirecat/cli-base": ">=0.47.0 <0.48.0",
+    "@wirecat/cli-base": ">=0.47.3 <0.48.0",
     "commander": ">=15"
   },
   "bin": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4a24ce6d0..76acf5f71 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -130,8 +130,8 @@ importers:
         specifier: ^5.0.2
         version: 5.0.2(vitest@5.0.2)
       '@wirecat/cli-base':
-        specifier: 0.47.0
-        version: 0.47.0(commander@15.0.0)(typescript@7.0.2)(vitest@5.0.2)
+        specifier: 0.47.3
+        version: 0.47.3(commander@15.0.0)(typescript@7.0.2)(vitest@5.0.2)
       commander:
         specifier: 15.0.0
         version: 15.0.0
@@ -1436,8 +1436,8 @@ packages:
   '@wasm-audio-decoders/opus-ml@0.0.3':
     resolution: {integrity: sha512-SEeTmk0eb3q5etJA/NHCRWW6BivTx9tqvNTmG0kg2ynuATEQRUZnwQE6Ibvl1BBvqIGHqI57+qyJMWmJBwb5XQ==}
 
-  '@wirecat/cli-base@0.47.0':
-    resolution: {integrity: sha512-9YV2FywCDmcrLKs+bdWrXYEkwtsDHuuBZWlEtUWGSnZd69lAI59BpinfOQeBqWsZ+xYa3RW1FvgkC/JB/AxK3g==}
+  '@wirecat/cli-base@0.47.3':
+    resolution: {integrity: sha512-+sOE85GlE/f4qHjkjpq05YajtX2SYcbAvYYoJBeIa/XSw0geK1uoIUWQ5pZm9gcAyQGylLVZdzNzw/hhUs2Z7g==}
     engines: {node: '>=22'}
     hasBin: true
     peerDependencies:
@@ -3807,7 +3807,7 @@ snapshots:
     dependencies:
       '@wasm-audio-decoders/common': 9.0.7
 
-  '@wirecat/cli-base@0.47.0(commander@15.0.0)(typescript@7.0.2)(vitest@5.0.2)':
+  '@wirecat/cli-base@0.47.3(commander@15.0.0)(typescript@7.0.2)(vitest@5.0.2)':
     dependencies:
       '@valibot/to-json-schema': 1.8.0(valibot@1.5.0(typescript@7.0.2))
       cli-table3: 0.6.5
diff --git a/src/search/lucene/registry.test.ts b/src/search/lucene/registry.test.ts
index f6743c0d4..7370e0cf3 100644
--- a/src/search/lucene/registry.test.ts
+++ b/src/search/lucene/registry.test.ts
@@ -24,6 +24,15 @@ describe("versioned structured AST and field registry", () => {
     expect(validateFields(ast)).toBe(ast)
     expect(QUERY_FIELDS.map(({ name }) => name)).toContain("body")
   })
+  it("takes a WhatsApp chat id unquoted and still refuses minimum-should-match", () => {
+    for (const id of ["133713371337@lid", "120363000000000000@g.us"])
+      expect(validateFields(parseLucene(`chat:${id}`)).root).toMatchObject({
+        field: "chat",
+        operator: "term",
+        value: id,
+      })
+    expect(reason(() => validateFields(parseLucene("(alpha beta)@2")))).toBe("query.unsupported-operator")
+  })
   it("refuses the camelCase tree cli-base built before 0.26", () => {
     const span = { start: 0, end: 1 }
     const range = { kind: "predicate", field: "date", operator: "range", value: "a", upper: "b", span }
diff --git a/src/search/lucene/registry.ts b/src/search/lucene/registry.ts
index 415ac3976..3460a592d 100644
--- a/src/search/lucene/registry.ts
+++ b/src/search/lucene/registry.ts
@@ -380,7 +380,7 @@ export const QUERY_FIELDS: readonly MessageField[] = [
         'phone:"8 900 000-00-01"',
         "a phone found in the text, written any way; a number without + is read in phone_countries",
       ],
-      ["email", 'email:"ana@example.com"', "an address found in the text, lower-cased; quoted, since @ is an operator"],
+      ["email", "email:ana@example.com", "an address found in the text, lower-cased"],
       ["url", 'url:"https://example.com/a"', "a link found in the text, without utm_*, fbclid and the fragment"],
       ["domain", "domain:google.com", "the site of a link or an address in the text; docs.google.com means google.com"],
       [