claude-mem-lite 6.30.0 → 6.30.1

package/.claude-plugin/marketplace.json

@@ -9,7 +9,7 @@
   "plugins": [
     {
       "name": "claude-mem-lite",
-      "version": "6.30.0",
+      "version": "6.30.1",
       "source": "./",
       "homepage": "https://github.com/sdsrss/claude-mem-lite",
       "description": "Persistent long-term memory for Claude Code via MCP — captures coding decisions, bugfixes, and context across sessions. FTS5 BM25 keyword search with episode batching. Single SQLite DB, no external services. A lighter, lower-cost alternative to claude-mem (episode batching + a smaller model; cost savings are an internal estimate, not a measured benchmark)."

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-mem-lite",
-  "version": "6.30.0",
+  "version": "6.30.1",
   "description": "Persistent long-term memory for Claude Code via MCP — captures coding decisions, bugfixes, and context across sessions. FTS5 BM25 keyword search with episode batching. Single SQLite DB, no external services. A lighter, lower-cost alternative to claude-mem (episode batching + a smaller model; cost savings are an internal estimate, not a measured benchmark).",
   "author": {
     "name": "sdsrss"

package/cli/common.mjs

@@ -650,10 +650,11 @@ export function formatProbeHints(probe) {
 }
 
 /**
- * The line under one side of a scan's Needs-review pair (D#461), from reviewRows: type, project,
- * date, the lesson or that there is none, and the start of the narrative — enough to tell two rows
- * with near-identical titles apart without `get`, which counts as an access.
- * @param {{id: number, type?: string, project?: string, created_at_epoch?: number,
+ * The line under one side of a scan's Needs-review pair (D#461), from reviewRows: type, importance
+ * (update.md keeps the more important row, D#497), project, date, the lesson or that there is none,
+ * and the start of the narrative — enough to tell two rows with near-identical titles apart without
+ * `get`, which counts as an access.
+ * @param {{id: number, type?: string, importance?: number, project?: string, created_at_epoch?: number,
  *   narrative?: string|null, lesson_learned?: string|null}|undefined} row
  * @returns {string}
  */
@@ -671,5 +672,5 @@ export function formatReviewSide(row) {
       ? `lesson: ${flat(row.lesson_learned, 100)}`
       : 'no lesson';
   const date = row.created_at_epoch ? new Date(row.created_at_epoch).toISOString().slice(0, 10) : '?';
-  return `#${row.id} ${row.type || '?'} · ${row.project} · ${date} · ${lesson} · ${flat(row.narrative, 120) || '(no narrative)'}`;
+  return `#${row.id} ${row.type || '?'} · importance ${row.importance ?? '?'} · ${row.project} · ${date} · ${lesson} · ${flat(row.narrative, 120) || '(no narrative)'}`;
 }

package/cli/verify-apply.mjs

@@ -153,7 +153,7 @@ export function cmdVerifyApply(db, args) {
     out(`[mem] Plan digest: ${digest}`);
     out('[mem] Dry run — nothing written. After the user approves exactly this plan, run:');
     out(
-      `  ${SELF} verify-apply ${shellWord(file)} --project ${shellWord(project)} --apply --digest ${digest}`,
+      `  ${SELF} verify-apply ${shellWord(file)} --project=${shellWord(project)} --apply --digest ${digest}`,
     );
     return;
   }

package/hook.mjs

@@ -3004,9 +3004,9 @@ function rekeyProjectOnce(db, project) {
         ? ''
         : left === 1
           ? " 1 other stays under the old id (another directory's, or nothing shows whose); " +
-            `list it with \`${CLI_INVOKE} recent 50 --project ${legacy}\`.`
+            `list it with \`${CLI_INVOKE} recent 50 --project=${legacy}\`.`
           : ` ${left} others stay under the old id (another directory's, or nothing shows whose); ` +
-            `list them with \`${CLI_INVOKE} recent 50 --project ${legacy}\`.`;
+            `list them with \`${CLI_INVOKE} recent 50 --project=${legacy}\`.`;
     queueHookSystemMessage(
       `claude-mem-lite: this project's memory now has its own id, ${project}. Its old id, ${legacy}, ` +
         'could be shared with other directories whose names are not plain ASCII. ' +

package/install.mjs

@@ -564,6 +564,15 @@ export function deployLockfile(projectDir, dataDir) {
   return shrinkwrap;
 }
 
+function devNodeModules() {
+  try {
+    const pkg = createRequire(join(PROJECT_DIR, 'package.json')).resolve('better-sqlite3/package.json');
+    return dirname(dirname(pkg));
+  } catch {
+    return join(PROJECT_DIR, 'node_modules');
+  }
+}
+
 export function deployCodeTree(IS_DEV) {
   if (IS_DEV) {
     log('Dev mode — creating symlinks in ~/.claude-mem-lite/...');
@@ -584,10 +593,12 @@ export function deployCodeTree(IS_DEV) {
     const scriptsLink = join(DATA_DIR, 'scripts');
     clearLinkPath(scriptsLink);
     symlinkSync(join(PROJECT_DIR, 'scripts'), scriptsLink);
-    // Symlink node_modules/
+    // Symlink node_modules/: the one this checkout loads its dependencies from. A worktree nested in
+    // the main checkout has none of its own and Node finds the one above it; linking
+    // PROJECT_DIR/node_modules left the link dangling there (D#489).
     const nmLink = join(DATA_DIR, 'node_modules');
     clearLinkPath(nmLink);
-    symlinkSync(join(PROJECT_DIR, 'node_modules'), nmLink);
+    symlinkSync(devNodeModules(), nmLink);
     // R10 P3-28: the registry/ symlink is gone. The directory left with the skill registry
     // in v5.0.0, so the existsSync guard was permanently false and the branch was dead —
     // clearLinkPath still ran, silently removing a stale ~/.claude-mem-lite/registry link

package/lib/db-unusable.mjs

@@ -224,7 +224,7 @@ export function dbUnusableRemedy(dbPath, err) {
  */
 export function formatDbUnusableNotice({ dbPath, remedy }) {
   const lines = [
-    '⚠️ [claude-mem-lite] Memory is OFF: the database file cannot be opened.',
+    '⚠️ [claude-mem-lite] Memory is OFF: the database file cannot be used.',
     remedy.kind === 'schema'
       ? `   ${dbPath} exists but SQLite cannot read its schema.`
       : `   ${dbPath} exists but SQLite does not recognise it as a database.`,

package/lib/maintain-core.mjs

@@ -809,7 +809,7 @@ export function purgeStale(db, { projectFilter, baseParams, opCap = OP_CAP }, re
  * lets autoBoost lift importance 1 -> 2. A plain SELECT by id touches no counter.
  * @param {import('better-sqlite3').Database} db
  * @param {number[]} ids
- * @returns {Map<number, {id: number, type: string, project: string, created_at_epoch: number,
+ * @returns {Map<number, {id: number, type: string, importance: number, project: string, created_at_epoch: number,
  *   narrative: string|null, lesson_learned: string|null}>}
  */
 export function reviewRows(db, ids) {
@@ -817,7 +817,7 @@ export function reviewRows(db, ids) {
   if (uniq.length === 0) return new Map();
   const rows = db
     .prepare(
-      `SELECT id, type, project, created_at_epoch, narrative, lesson_learned FROM observations
+      `SELECT id, type, importance, project, created_at_epoch, narrative, lesson_learned FROM observations
        WHERE id IN (${uniq.map(() => '?').join(',')})`,
     )
     .all(...uniq);

package/lib/quiet-scope.mjs

@@ -12,7 +12,7 @@ import { isAdopted as isAdoptedClaudeMd, readBlockAt } from '../claudemd.mjs';
 import { existsSync } from 'fs';
 import { dirname, join, resolve } from 'path';
 import { PLUGIN_SLUG } from '../adopt-content.mjs';
-import { isSharedAncestor, RULES_MD } from './local-steering.mjs';
+import { isSharedAncestor, RULES_MD, userInstructionFiles } from './local-steering.mjs';
 
 // Phase A (v2.31.3+): MEM_QUIET_HOOKS=1 drops descriptive hook/MCP-instruction
 // bodies (File Lessons / Key Context headers, MCP WHEN-TO-USE & decision rules,
@@ -34,8 +34,12 @@ export function isQuietHooks() {
 export function isAdoptedHere(cwd) {
   try {
     const resolved = cwd || process.env.CLAUDE_PROJECT_DIR || process.env.PWD || process.cwd();
-    if (isAdoptedClaudeMd(resolved, PLUGIN_SLUG) || isAdoptedMemdir(memdirPath(resolved), PLUGIN_SLUG))
-      return true;
+    if (isAdoptedMemdir(memdirPath(resolved), PLUGIN_SLUG)) return true;
+    // Project instructions = managed-only leaves the files below out at launch, so only steering
+    // that SessionStart injects counts, as silentAutoAdopt decides there (D#501(2)).
+    const managedOnly = userInstructionFiles() === 'managed-only';
+    if (managedOnly) return isSteeringInjectedHere(resolved, { managedOnly });
+    if (isAdoptedClaudeMd(resolved, PLUGIN_SLUG)) return true;
     // r3: the block auto-adopt wrote into CLAUDE.local.md loads whatever the switches say
     // now (MEM_NO_AUTO_ADOPT only stops new writes). A file read, not a git call: this runs
     // on every quiet check, and the project dir is the top-level in the normal case.
@@ -61,7 +65,7 @@ export function isAdoptedHere(cwd) {
  * @param {string} cwd resolved project root
  * @returns {boolean}
  */
-function isSteeringInjectedHere(cwd) {
+function isSteeringInjectedHere(cwd, { managedOnly = false } = {}) {
   if (process.env.MEM_NO_AUTO_ADOPT === '1') return false;
   if (isAutoAdoptDisabledFor(cwd)) return false;
   // silentAutoAdopt holds a subdirectory session to an opt-out recorded for the repository root,
@@ -69,8 +73,9 @@ function isSteeringInjectedHere(cwd) {
   // gets neither the steering nor the verbose sections.
   const root = workTreeTop(cwd);
   if (!root || root === resolve(cwd) || isSharedAncestor(root)) return true;
-  // Any directory up to the root, as silentAutoAdopt checks (D#177(2)).
-  for (let d = dirname(resolve(cwd)); ; d = dirname(d)) {
+  // Any directory up to the root, as silentAutoAdopt checks (D#177(2)); under managed-only it
+  // skips them, as none is loaded at launch.
+  for (let d = dirname(resolve(cwd)); !managedOnly; d = dirname(d)) {
     if (readBlockAt(join(d, 'CLAUDE.md'), PLUGIN_SLUG).body !== null) return true;
     if (d === root || dirname(d) === d) break;
   }

package/lib/startup-dashboard.mjs

@@ -10,6 +10,7 @@ import { readGitState } from './git-state.mjs';
 import { readProjectTasks } from './task-reader.mjs';
 import { recentPlans } from './plan-reader.mjs';
 import { isAdoptedHere } from './quiet-scope.mjs';
+import { userInstructionFiles } from './local-steering.mjs';
 import {
   HANDOFF_EXPIRY_EXIT,
   UNCONSUMED_HANDOFF_SQL,
@@ -160,8 +161,10 @@ export function buildDashboard({
 function buildAdoptHint({ projectPath, stubs }) {
   if (process.env.MEM_NO_ADOPT_HINT === '1') return null;
   if (process.env.MEM_QUIET_HOOKS === '1') return null;
+  // `adopt` writes CLAUDE.md, which Project instructions = managed-only leaves out at launch (D#501(1)).
+  if (userInstructionFiles() === 'managed-only') return null;
   // stubs.adopted === true/false lets tests assert both branches without touching FS.
   const adopted = stubs && 'adopted' in stubs ? stubs.adopted : isAdoptedHere(projectPath);
   if (adopted) return null;
-  return `🧷 Invited-memory 未启用：\`${CLI_INVOKE} adopt\` 写入 CLAUDE.md 托管块 → 上下文省 ~40%，MCP 调用率提升；静音 \`MEM_NO_ADOPT_HINT=1\``;
+  return `🧷 Invited-memory 未启用：\`${CLI_INVOKE} adopt\` 写入 CLAUDE.md 托管块；静音 \`MEM_NO_ADOPT_HINT=1\``;
 }

package/lib/stats-quality.mjs

@@ -224,7 +224,7 @@ export function formatQualityReport(data) {
     const purgeGap = (purgeNum - 10).toFixed(1);
     const purgeStatus = purgeNum <= 10 ? '✅' : purgeNum <= 30 ? '🟡' : '🔴';
     lines.push(
-      `    ${purgeStatus} Pending purge ≤ 10%  → currently ${purgePct}% (${purgeRow.pending_purge}/${purgeRow.compressed})  (gap ${purgeGap >= 0 ? '+' : ''}${purgeGap}pp)${purgeNum > 10 ? ` — preview: ${CLI_INVOKE} maintain execute --ops purge_stale${project ? ` --project ${shellWord(project)}` : ''} (add --confirm to delete the rows it counts)` : ''}`,
+      `    ${purgeStatus} Pending purge ≤ 10%  → currently ${purgePct}% (${purgeRow.pending_purge}/${purgeRow.compressed})  (gap ${purgeGap >= 0 ? '+' : ''}${purgeGap}pp)${purgeNum > 10 ? ` — preview: ${CLI_INVOKE} maintain execute --ops purge_stale${project ? ` --project=${shellWord(project)}` : ''} (add --confirm to delete the rows it counts)` : ''}`,
     );
   }
 

package/mem-cli.mjs

@@ -5,7 +5,7 @@
 import { ensureDbWithWalRecovery, refreshPlannerStats, DB_PATH, DB_DIR, CODE_DIR } from './schema.mjs';
 import { dirAccessError, walOpenBlocked, dataDirRemedy, WAL_BLOCKED_WHY } from './lib/wal-open-blocked.mjs';
 import { resolveRuntimeDir } from './lib/resolve-data-dir.mjs';
-import { isFtsCorruptionError, FTS_CORRUPTION_REMEDY } from './lib/db-unusable.mjs';
+import { isFtsCorruptionError, isDbUnusableError, FTS_CORRUPTION_REMEDY } from './lib/db-unusable.mjs';
 import {
   truncate,
   queryLabel,
@@ -100,7 +100,7 @@ import {
   schemaSkewRemedy,
   formatSchemaSkewNotice,
 } from './lib/schema-skew.mjs';
-import { CLI_PATH, CLI_INVOKE } from './cli-path.mjs';
+import { CLI_PATH, CLI_INVOKE, shellWord } from './cli-path.mjs';
 import {
   parseArgs,
   out,
@@ -3640,7 +3640,7 @@ async function cmdImportJsonl(db, argv) {
     // — an orphan-only first import must not fall through to the "already imported"
     // no-op branch below.
     if (projectCheck.note) out(`[mem] Imported${projectCheck.note}.`);
-    out(`[mem] Try: ${CLI_INVOKE} recent 5 --project ${project}`);
+    out(`[mem] Try: ${CLI_INVOKE} recent 5 --project=${shellWord(project)}`);
   } else if (totalRecognized > 0) {
     // Lines WERE Claude Code transcript events but produced no new rows — the file
     // was already imported (idempotent re-run) or carried no extractable content.
@@ -3932,12 +3932,14 @@ const MUTATING_FILTER_READS = {
 // A command not in MUTATING_FILTER_READS names here when its run writes (round-2 pre-tag review
 // P3-2: defer drop and fts-check rebuild ignored --dry-run silently; verify-apply --apply is left
 // to its digest, since --apply is verify-apply's own flag and the dispatcher may not read it).
+// A preview is the same command without the flag that makes it write (the user's other flags stay),
+// or another command (`preview`).
 const DRY_RUN_UNREAD = {
-  compress: { preview: 'compress without --execute' },
+  compress: { without: '--execute' },
   maintain: { preview: 'maintain scan' },
-  optimize: { preview: 'optimize without --run' },
+  optimize: { without: '--run or --run-all' },
   delete: { preview: null },
-  'activity promote': { preview: 'activity promote without --execute' },
+  'activity promote': { without: '--execute' },
   'activity delete': { preview: null },
   'import-jsonl': { preview: null, writes: () => true },
   'defer drop': { preview: null, writes: () => true },
@@ -4062,11 +4064,11 @@ async function runDispatch(argv) {
 
   if (Object.hasOwn(DRY_RUN_UNREAD, mutatingKey)) {
     const parsed = parseArgs(cmdArgs, { track: false });
-    const { preview, writes } = DRY_RUN_UNREAD[mutatingKey];
+    const { preview, without, writes } = DRY_RUN_UNREAD[mutatingKey];
     if ((mutating ? mutating.writes(parsed) : writes(parsed)) && asksDryRun(parsed.flags['dry-run'])) {
       fail(
         `[mem] ${mutatingKey} does not read --dry-run — nothing was changed, since the run would have ` +
-          `written. ${preview ? `Preview with: claude-mem-lite ${preview}.` : 'It has no preview.'}`,
+          `written. ${without ? `Run it again without ${without} to preview.` : preview ? `Preview with: \`${CLI_INVOKE} ${preview}\`.` : 'It has no preview.'}`,
       );
       return;
     }
@@ -4279,6 +4281,8 @@ async function runDispatch(argv) {
     }
     out(`[mem] Error: Cannot open database: ${e.message}`);
     out(`[mem] DB path: ${DB_PATH}`);
+    // The remedy overwrites the database, so it is doctor's to print, not this line's (D#488).
+    if (isDbUnusableError(e)) out(`[mem] Next: run \`${CLI_INVOKE} doctor\`.`);
     process.exitCode = 1;
     return;
   }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "claude-mem-lite",
-  "version": "6.30.0",
+  "version": "6.30.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "claude-mem-lite",
-      "version": "6.30.0",
+      "version": "6.30.1",
       "os": [
         "darwin",
         "linux",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-mem-lite",
-  "version": "6.30.0",
+  "version": "6.30.1",
   "description": "Persistent long-term memory for Claude Code via MCP — captures coding decisions, bugfixes, and context across sessions. FTS5 BM25 keyword search with episode batching. Single SQLite DB, no external services. A lighter, lower-cost alternative to claude-mem (episode batching + a smaller model; cost savings are an internal estimate, not a measured benchmark).",
   "type": "module",
   "packageManager": "npm@10.9.2",

package/scripts/setup.sh

@@ -425,15 +425,16 @@ fi
 #    hooks remain in the config home's settings.json. A user who installed via global
 #    `claude-mem-lite install` and later switched to the marketplace plugin
 #    will run every hook twice (direct settings.json hooks AND plugin hooks)
-#    until they run `claude-mem-lite uninstall` to clear the settings.json
-#    entries. /plugin uninstall does not touch settings.json.
+#    until they run cleanup-hooks to clear the settings.json entries (not
+#    uninstall, which removes the plugin too). /plugin uninstall does not touch
+#    settings.json.
 # CODE_DIR/runtime, same reason: the residue it warns about is stale hook entries in the config
 # home's settings.json — one warning per config home, regardless of where the data lives.
 RESIDUE_MARKER="$CODE_DIR/runtime/.residue-warned-v2.55$(marker_suffix "$CC_CONFIG_DIR/settings.json" "$CC_DEFAULT_CONFIG_DIR/settings.json")"
 if [[ -n "${CLAUDE_PLUGIN_ROOT:-}" && ! -f "$RESIDUE_MARKER" ]]; then
   SETTINGS="$CC_CONFIG_DIR/settings.json"
   if [[ -f "$SETTINGS" ]]; then
-    SETTINGS_PATH="$SETTINGS" node -e '
+    SETTINGS_PATH="$SETTINGS" CFG_DIR="$CC_CONFIG_DIR" node -e '
       const fs = require("fs");
       try {
         const raw = fs.readFileSync(process.env.SETTINGS_PATH, "utf8");
@@ -459,7 +460,13 @@ if [[ -n "${CLAUDE_PLUGIN_ROOT:-}" && ! -f "$RESIDUE_MARKER" ]]; then
           process.stderr.write("\x1b[33m⚠\x1b[0m Legacy direct-install hooks detected in " + process.env.SETTINGS_PATH + "\n");
           process.stderr.write("  Events with stale entries: " + [...new Set(found)].join(", ") + "\n");
           process.stderr.write("  These will fire alongside plugin hooks (each tool call runs twice).\n");
-          process.stderr.write("  Fix: run \x1b[1mclaude-mem-lite uninstall\x1b[0m to clear settings.json,\n");
+          // A shell word, single-quoted unless plain (cli-path.mjs shellWord); \x27 is a quote here.
+          const q = (w) => (/^[\w@%+=:,.\/-]+$/.test(w) ? w : "\x27" + w.split("\x27").join("\x27\\\x27\x27") + "\x27");
+          // The config home this warning is about, named even when it is the default one: the shell
+          // the user types into may carry a CLAUDE_CONFIG_DIR that names another profile.
+          const env = "CLAUDE_CONFIG_DIR=" + q(process.env.CFG_DIR) + " ";
+          const fix = env + "node " + q(process.env.CLAUDE_PLUGIN_ROOT + "/cli.mjs") + " cleanup-hooks";
+          process.stderr.write("  Fix: run \x1b[1m" + fix + "\x1b[0m to clear settings.json,\n");
           process.stderr.write("       then keep using the plugin install. (One-time warning.)\n\n");
           process.exit(2);
         }

package/secret-scrub.mjs

@@ -385,6 +385,35 @@ const PGP_CRC_RE = /^=[A-Za-z0-9+/]{4}$/;
 // under a PGP header, a secret-key packet in the old or new format (`lQ…`, `xc…`/`xV…`).
 const KEY_MAGIC_RE = /^(?:MII|MIG|MC4C|MHcC|b3BlbnNzaC1rZXktdjE)/;
 const PGP_MAGIC_RE = /^(?:lQ|x[cV])/;
+const B64_DIGITS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+
+/**
+ * Whether base64 `s` starts the way a DER private key starts: a SEQUENCE holding an INTEGER 0 or 1
+ * (PKCS#1, PKCS#8, SEC1, DSA) or a SEQUENCE and an OID (encrypted PKCS#8; a public key's
+ * SubjectPublicKeyInfo starts that way too, so a public-key line under a PRIVATE KEY marker is
+ * erased as well). The prefix list above missed keys whose DER header begins otherwise: secp256k1
+ * `MHQC`, P-521 `MIHc`/`MIHu`, Ed448 `MEcC`, X448 `MEYC`, the 192/224-bit curves and others (D#504 F1).
+ */
+function isDerKeyStart(s) {
+  if (s.length < 12) return false;
+  const b = [];
+  for (let i = 0; i < 12; i += 4) {
+    let n = 0;
+    for (let k = 0; k < 4; k++) {
+      const v = B64_DIGITS.indexOf(s[i + k]);
+      if (v < 0) return false;
+      n = n * 64 + v;
+    }
+    b.push(n >> 16, (n >> 8) & 255, n & 255);
+  }
+  if (b[0] !== 0x30) return false;
+  const o = b[1] < 0x80 ? 2 : b[1] <= 0x83 ? b[1] - 0x7e : -1;
+  if (o < 0) return false;
+  if (b[o] === 0x02 && b[o + 1] === 0x01 && b[o + 2] <= 1) return true;
+  return b[o] === 0x30 && b[o + (b[o + 1] === 0x81 ? 3 : 2)] === 0x06;
+}
+
+const startsLikeKey = (s) => KEY_MAGIC_RE.test(s) || isDerKeyStart(s);
 // RFC 1421 / RFC 4880 armor headers, before the body. Named, not any `Word:`: a `Note:` line is
 // prose, and taking it for a header made the lone base64 line under it a key.
 // RFC 1421's full set and tool-written `X-` headers count too (v6.19.2 pre-tag delta review F4:
@@ -684,7 +713,7 @@ function cutOffKeyEnd(text, b, be) {
   // Under an opener whose prefix does not match the diff lines below it (`'+`, `rb'+`,
   // `+KEY = '''`) the line still starts with its `+`; the magic is tested without it (D#167).
   const body = first.replace(/^[-+]/, '');
-  const magic = KEY_MAGIC_RE.test(body) || (text.slice(b, be).includes('PGP') && PGP_MAGIC_RE.test(body));
+  const magic = startsLikeKey(body) || (text.slice(b, be).includes('PGP') && PGP_MAGIC_RE.test(body));
   return longs >= 2 || armors > 0 || longest >= 40 || magic ? end : -1;
 }
 
@@ -797,7 +826,7 @@ function keyTailSpan(text, e, ee, floor) {
   // 16-39 characters over an END named in prose is not (F7).
   if (longs === 0) return null;
   const b64ish = /[0-9+]|=$/.test(topCore);
-  if (!(longs >= 2 || longest >= 40 || crc || (clean && b64ish) || KEY_MAGIC_RE.test(topCore))) return null;
+  if (!(longs >= 2 || longest >= 40 || crc || (clean && b64ish) || startsLikeKey(topCore))) return null;
   return [top, sentence ? bottom : ee];
 }