claude-mem-lite 6.12.0 → 6.12.1

package/.claude-plugin/marketplace.json

@@ -9,7 +9,7 @@
   "plugins": [
     {
       "name": "claude-mem-lite",
-      "version": "6.12.0",
+      "version": "6.12.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. Hybrid FTS5 + TF-IDF 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.12.0",
+  "version": "6.12.1",
   "description": "Persistent long-term memory for Claude Code via MCP — captures coding decisions, bugfixes, and context across sessions. Hybrid FTS5 + TF-IDF 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/README.md

@@ -165,7 +165,7 @@ is still outside it gets a message naming both sides of the mismatch instead of
 
 Plugin mode manages its own hooks/runtime. On session start it only **checks and reports** new claude-mem-lite versions; it does **not** self-overwrite plugin files in place. Update plugin-mode installs through Claude's plugin workflow.
 
-> **The plugin install is complete on its own** — hooks, MCP tools, and the bundled slash commands (`/mem`, `/lesson`, `/bug`, `/adopt`) all run from the plugin with no second step. The slash commands invoke the bundled CLI by an absolute path resolved from the plugin directory (`${CLAUDE_PLUGIN_ROOT}/cli.mjs <cmd>`), so they work without anything on your `PATH`. A global `claude-mem-lite` **shell** command (for running queries yourself in a terminal) is **optional** — `npm i -g claude-mem-lite` — and is a *separate* npm install: the plugin's auto-update does **not** refresh it, so re-run `npm i -g claude-mem-lite@latest` if you want that shell command kept in sync. You do **not** need it for the plugin to be fully functional.
+> **The plugin install is complete on its own** — hooks, MCP tools, and the bundled slash commands (`/mem`, `/lesson`, `/bug`, `/adopt`) all run from the plugin with no second step. The slash commands invoke the bundled CLI by an absolute path resolved from the plugin directory (`node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" <cmd>`), so they work without anything on your `PATH`. A global `claude-mem-lite` **shell** command (for running queries yourself in a terminal) is **optional** — `npm i -g claude-mem-lite` — and is a *separate* npm install: the plugin's auto-update does **not** refresh it, so re-run `npm i -g claude-mem-lite@latest` if you want that shell command kept in sync. You do **not** need it for the plugin to be fully functional.
 
 > **Auto-adopt writes into your project, on every SessionStart (v3.13+).** The plugin adds a slug-scoped **managed block** to your project's own **`<cwd>/CLAUDE.md`** — a file that is normally committed to git — plus a `<cwd>/.claude/plugin_claude_mem_lite.md` detail file. The block is a system-authority pointer that boosts Claude's proactive use of `mem_recall` / `mem_save`. Everything outside the block is preserved verbatim, and it coexists with other plugins' blocks in the same file ([details](#invited-memory-v232)). This happens on **every** SessionStart, not just the first: the sync is idempotent and re-applies the block if it is edited away, and refreshes it when the shipped template changes. It applies regardless of install path (npm, npx, `/plugin`, manual), so **no manual `/adopt` is needed**.
 >

package/README.zh-CN.md

@@ -129,7 +129,7 @@ v5.1.0 到 v6.1.0 之间，`package.json` 声明的是 `os: ["darwin", "linux"]`
 
 插件模式会管理自己的运行时与钩子。SessionStart 时它现在只会**检查并提示**新版本，不会直接覆盖插件目录中的文件。插件模式请通过 Claude 的插件更新流程完成升级。
 
-> **插件安装本身即完整** —— hooks、MCP 工具、以及捆绑的 slash 命令（`/mem`、`/lesson`、`/bug`、`/adopt`）全部从插件内运行，无需第二步。slash 命令以从插件目录解析出的绝对路径调用捆绑 CLI（`${CLAUDE_PLUGIN_ROOT}/cli.mjs <cmd>`），因此不依赖 `PATH` 上的任何东西。全局 `claude-mem-lite` **shell** 命令（用于你自己在终端里跑查询）是**可选**的 —— `npm i -g claude-mem-lite` —— 且是**独立**的 npm 安装：插件的自动更新**不会**刷新它，想保持同步就重新跑 `npm i -g claude-mem-lite@latest`。插件要完整工作**并不需要**它。
+> **插件安装本身即完整** —— hooks、MCP 工具、以及捆绑的 slash 命令（`/mem`、`/lesson`、`/bug`、`/adopt`）全部从插件内运行，无需第二步。slash 命令以从插件目录解析出的绝对路径调用捆绑 CLI（`node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" <cmd>`），因此不依赖 `PATH` 上的任何东西。全局 `claude-mem-lite` **shell** 命令（用于你自己在终端里跑查询）是**可选**的 —— `npm i -g claude-mem-lite` —— 且是**独立**的 npm 安装：插件的自动更新**不会**刷新它，想保持同步就重新跑 `npm i -g claude-mem-lite@latest`。插件要完整工作**并不需要**它。
 
 ### 方式二：npx（一行命令）
 

package/cli/common.mjs

@@ -417,6 +417,21 @@ export const KNOWN_CLI_FLAGS = new Set([
   // --has?" suggestion. Locked by tests/cli-flag-allowlist.test.mjs.
 ]);
 
+/**
+ * Flags exactly ONE subcommand reads, mapped to that command. KNOWN_CLI_FLAGS is a union, so
+ * without this `recent --apply` was accepted in silence while `--apply` did nothing there.
+ * Every other command mem-cli dispatches now reports such a flag, and the typo suggester stops
+ * offering it there. Install-family commands (doctor, status, …) route to install.mjs and are
+ * not covered. Only flags with a single reader
+ * belong here; tests/cli-flag-allowlist.test.mjs derives that from the sources.
+ */
+export const COMMAND_SCOPED_FLAGS = new Map([
+  ['apply', 'verify-apply'],
+  ['digest', 'verify-apply'],
+  ['print-project', 'verify-apply'],
+  ['undo', 'verify-apply'],
+]);
+
 /** Levenshtein distance, early-exit past `max` (cheap enough for a handful of flags). */
 function editDistance(a, b, max = 2) {
   const m = a.length,
@@ -444,16 +459,25 @@ function editDistance(a, b, max = 2) {
  * project — a typo produced a wrong result with zero signal. Returns [{flag, suggestion}].
  * Unknown flags with NO close match are omitted: they may be a valid flag we didn't
  * catalog, so silence beats a false alarm. Warning-only by contract — never fails.
+ * A flag in COMMAND_SCOPED_FLAGS given to any other `cmd` is reported too, with `owner` set.
  * @param {object} flags Parsed flags from parseArgs.
- * @returns {Array<{flag: string, suggestion: string}>}
+ * @param {string} [cmd] The subcommand being run; without it scoped flags are not checked.
+ * @returns {Array<{flag: string, suggestion: string|null, owner?: string}>}
  */
-export function suggestUnknownFlags(flags) {
+export function suggestUnknownFlags(flags, cmd) {
   const result = [];
   for (const key of Object.keys(flags)) {
+    const owner = COMMAND_SCOPED_FLAGS.get(key);
+    if (cmd && owner && owner !== cmd) {
+      result.push({ flag: key, suggestion: null, owner });
+      continue;
+    }
     if (!key || KNOWN_CLI_FLAGS.has(key)) continue;
     let best = null,
       bestDist = 3;
     for (const known of KNOWN_CLI_FLAGS) {
+      const knownOwner = COMMAND_SCOPED_FLAGS.get(known);
+      if (cmd && knownOwner && knownOwner !== cmd) continue;
       const d = editDistance(key, known);
       if (d < bestDist) {
         bestDist = d;

package/cli/verify-apply.mjs

@@ -23,6 +23,7 @@ import {
   markUndone,
 } from '../lib/verify-apply-core.mjs';
 import { parseArgs, out, fail, rejectBareStringFlags } from './common.mjs';
+import { shellWord } from '../cli-path.mjs';
 
 const USAGE =
   '[mem] Usage: claude-mem-lite verify-apply <proposals.json> [--project P]          (dry run)\n' +
@@ -34,8 +35,6 @@ const BACKUP_DIR = join(DB_DIR, 'backups');
 // The commands this prints must run as printed. `claude-mem-lite` is on PATH only after an
 // optional global npm install (which may also be a different, stale code home), so name the
 // node binary and THIS cli.mjs — the one that produced the plan.
-/** A path as one shell word: as-is when it is plain, single-quoted otherwise. */
-const shellWord = (s) => (/^[\w@%+=:,./-]+$/.test(s) ? s : `'${s.replace(/'/g, `'\\''`)}'`);
 const SELF = process.argv[1] ? `node ${shellWord(process.argv[1])}` : 'claude-mem-lite';
 
 function readJson(path, what) {

package/cli-path.mjs

@@ -22,4 +22,14 @@ import { join, dirname } from 'node:path';
 // module from its unused-export report entirely. Enforced by
 // tests/no-url-module-paths.test.mjs.
 export const CLI_PATH = join(dirname(fileURLToPath(import.meta.url)), 'cli.mjs');
-export const CLI_INVOKE = `node ${CLI_PATH}`;
+/**
+ * A path as one shell word: as-is when it is plain, single-quoted otherwise. Conditional on
+ * purpose — CLI_INVOKE is LLM-visible (MCP instructions, every "Equivalent CLI" hint), so an
+ * ordinary install path must stay byte-identical; only a path with a space or a shell
+ * metacharacter gets quotes, which it needs to survive as ONE argument.
+ * @param {string} s
+ * @returns {string}
+ */
+export const shellWord = (s) => (/^[\w@%+=:,./-]+$/.test(s) ? s : `'${s.replace(/'/g, `'\\''`)}'`);
+
+export const CLI_INVOKE = `node ${shellWord(CLI_PATH)}`;

package/commands/adopt.md

@@ -64,4 +64,4 @@ server builds its instructions once at boot, so the MCP-instructions trim
 (or re-attaches the mem-lite MCP server). A `/exit` + fresh session is enough.
 Same caveat applies in reverse for `/unadopt`.
 
-!node ${CLAUDE_PLUGIN_ROOT}/cli.mjs adopt $ARGUMENTS
+!node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" adopt $ARGUMENTS

package/commands/bug.md

@@ -49,7 +49,7 @@ goes in `--lesson` so it lands in the high-weight `lesson_learned` field.
 body in the positional content and trim `--lesson` to the core description if
 longer:
 
-    node ${CLAUDE_PLUGIN_ROOT}/cli.mjs save "<body>" \
+    node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" save "<body>" \
       --type bugfix \
       --title "<first 60 chars of description>" \
       --lesson "<description, ≤500 chars>" \

package/commands/lesson.md

@@ -42,7 +42,7 @@ field. `--lesson` is capped at 500 chars (longer values are rejected), so for a
 long lesson keep the full text in the positional content and trim `--lesson` to
 the core insight:
 
-    node ${CLAUDE_PLUGIN_ROOT}/cli.mjs save "<full text>" \
+    node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" save "<full text>" \
       --type discovery \
       --title "<first 60 chars of text>" \
       --lesson "<core insight, ≤500 chars>" \

package/commands/mem.md

@@ -23,16 +23,16 @@ Search and browse your project memory efficiently.
 
 When the user invokes `/mem`, parse their intent:
 
-- `/mem search <query>` → run `node ${CLAUDE_PLUGIN_ROOT}/cli.mjs search <query>` via Bash
-- `/mem recent` or `/mem recent 20` → run `node ${CLAUDE_PLUGIN_ROOT}/cli.mjs recent [N]` via Bash
-- `/mem recall <file>` → run `node ${CLAUDE_PLUGIN_ROOT}/cli.mjs recall <file>` via Bash
-- `/mem timeline <id>` → run `node ${CLAUDE_PLUGIN_ROOT}/cli.mjs timeline --anchor <id>` via Bash
+- `/mem search <query>` → run `node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" search <query>` via Bash
+- `/mem recent` or `/mem recent 20` → run `node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" recent [N]` via Bash
+- `/mem recall <file>` → run `node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" recall <file>` via Bash
+- `/mem timeline <id>` → run `node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" timeline --anchor <id>` via Bash
 - `/mem save <text>` → call `mem_save` MCP tool with the text as content
-- `/mem stats` → run `node ${CLAUDE_PLUGIN_ROOT}/cli.mjs stats` via Bash
-- `/mem get <ids>` → run `node ${CLAUDE_PLUGIN_ROOT}/cli.mjs get <ids>` via Bash
+- `/mem stats` → run `node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" stats` via Bash
+- `/mem get <ids>` → run `node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" get <ids>` via Bash
 - `/mem cleanup` → run `mem_maintain(action="scan")`, report pending purge count and stale items to user, ask for confirmation, then run `mem_maintain(action="execute", operations=["purge_stale"], confirm=true)` if confirmed. **`confirm=true` is required and is not optional politeness:** without it the call returns a dry-run PREVIEW and deletes nothing, while still succeeding — so you would report a cleanup that never happened.
 - `/mem cleanup Nd` (e.g. `60d`) → same as above but add `retain_days=N` to only purge items older than N days. **`retain_days` must be between 7 and 365**; anything outside that range is rejected by the schema, so `/mem cleanup 3d` cannot be honoured — say so rather than silently substituting the default.
 - `/mem cleanup keep Nd` (e.g. `keep 14d`) → same as above with `retain_days=N`, same 7–365 range.
-- `/mem <query>` (no subcommand) → treat as search, run `node ${CLAUDE_PLUGIN_ROOT}/cli.mjs search <query>` via Bash
+- `/mem <query>` (no subcommand) → treat as search, run `node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" search <query>` via Bash
 
-Use Bash commands first. For detailed data, use `node ${CLAUDE_PLUGIN_ROOT}/cli.mjs get <id>` via Bash.
+Use Bash commands first. For detailed data, use `node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" get <id>` via Bash.

package/commands/unadopt.md

@@ -43,4 +43,4 @@ Once unadopted, the conservative hook layer (SessionStart `File Lessons` /
 `Key Context`, MCP instructions `WHEN TO USE`) returns to verbose mode on the
 next session start.
 
-!node ${CLAUDE_PLUGIN_ROOT}/cli.mjs unadopt $ARGUMENTS
+!node "${CLAUDE_PLUGIN_ROOT}/cli.mjs" unadopt $ARGUMENTS

package/install.mjs

@@ -723,7 +723,7 @@ function registerMcpServer() {
       ok('MCP server registered: mem-lite');
     } catch (e) {
       fail('MCP registration failed: ' + e.message);
-      warn('Try manually: claude mcp add -s user -t stdio mem-lite -- node ' + SERVER_PATH);
+      warn('Try manually: claude mcp add -s user -t stdio mem-lite -- node "' + SERVER_PATH + '"');
     }
   }
 }
@@ -2004,7 +2004,7 @@ async function doctor() {
     // misbehaving, which is the worst moment to hand out the one entry that cannot
     // survive a missing module. Pre-ship review of v6.7.0 caught this one left behind.
     dwarn(
-      `Hook self-heal: a recent hook fire degraded to exit-0${detail} — run \`node ${join(PROJECT_DIR, 'cli.mjs')} repair\``,
+      `Hook self-heal: a recent hook fire degraded to exit-0${detail} — run \`node "${join(PROJECT_DIR, 'cli.mjs')}" repair\``,
     );
   } else {
     ok('Hook self-heal: no recent silent hook breakage');
@@ -2020,7 +2020,7 @@ async function doctor() {
   // should not pay for another round of child spawns to ask it twice.
   if (brokenRoots.length > 0) {
     fail(
-      `Native DB binding: unusable in ${brokenRoots.map((b) => b.label).join(', ')} — run \`node ${join(PROJECT_DIR, 'cli.mjs')} rebuild-binding\` (repairs every broken install, not just this one)`,
+      `Native DB binding: unusable in ${brokenRoots.map((b) => b.label).join(', ')} — run \`node "${join(PROJECT_DIR, 'cli.mjs')}" rebuild-binding\` (repairs every broken install, not just this one)`,
     );
     issues++;
   } else if (breakage) {
@@ -2136,7 +2136,9 @@ async function doctor() {
     );
     for (const p of orphanPaths.slice(0, 5)) log(`    missing: ${p}`);
     if (orphanPaths.length > 5) log(`    ... +${orphanPaths.length - 5} more`);
-    log(`    Repair: node ${join(PROJECT_DIR, 'install.mjs')} uninstall    # removes the dead hook entries`);
+    log(
+      `    Repair: node "${join(PROJECT_DIR, 'install.mjs')}" uninstall    # removes the dead hook entries`,
+    );
     issues++;
   } else if (hasHooks) {
     ok('Orphan hooks: none (all hook targets present)');
@@ -2406,12 +2408,12 @@ async function doctor() {
   // already there.
   const noCodeInstall =
     !shape.managed && !shape.activePluginVersion && !hasAnyManagedCode(INSTALL_DIR, SOURCE_FILES);
-  const installRemedy = `node ${join(PROJECT_DIR, 'install.mjs')} install`;
+  const installRemedy = `node "${join(PROJECT_DIR, 'install.mjs')}" install`;
   try {
     const skipDrift = !shape.managed && !!shape.activePluginVersion;
     const { checkDevDrift } = await import('./lib/doctor-drift.mjs');
     const r = skipDrift ? null : checkDevDrift(INSTALL_DIR, SOURCE_FILES);
-    const devRemedy = `re-run: node ${join(PROJECT_DIR, 'install.mjs')} install --dev`;
+    const devRemedy = `re-run: node "${join(PROJECT_DIR, 'install.mjs')}" install --dev`;
     const nameList = (files, count) => {
       const suffix = count > files.length ? ` +${count - files.length} more` : '';
       return `${files.join(', ')}${suffix}`;
@@ -2483,7 +2485,7 @@ async function doctor() {
               `a damaged one. Fix: ${installRemedy}`
           : `Managed files: ${r.missingCount} missing (${parts.join('; ')}) — a copy install resolves ` +
               `imports against the install dir, so these throw at hook time. Fix: claude-mem-lite self-update ` +
-              `(or: node ${join(INSTALL_DIR, 'cli.mjs')} repair)`,
+              `(or: node "${join(INSTALL_DIR, 'cli.mjs')}" repair)`,
       );
     }
     // Complete copy install: no message — drift is a dev-install concern.
@@ -2511,7 +2513,7 @@ async function doctor() {
     // `noCodeInstall` above: the `repair` route runs from an entry point that is itself absent.
     const scriptRemedy = noCodeInstall
       ? installRemedy
-      : `claude-mem-lite self-update (or: node ${join(INSTALL_DIR, 'cli.mjs')} repair)`;
+      : `claude-mem-lite self-update (or: node "${join(INSTALL_DIR, 'cli.mjs')}" repair)`;
     if (skipScripts) {
       ok('Hook scripts: n/a (plugin-only install — hooks run from the plugin cache)');
     } else if (!h.present) {

package/lib/install-shape.mjs

@@ -324,7 +324,7 @@ export function probeRuntimeRoots(roots, deps = {}) {
           // "none resolvable from a parent directory" and was caught printing that
           // next to a probe error naming the parent tree it had just loaded from.
           error: `${error} — and this install owns no node_modules/better-sqlite3, so there is nothing here to rebuild`,
-          repair: `cd ${root} && npm install --omit=dev`,
+          repair: `cd "${root}" && npm install --omit=dev`,
         };
   });
 }

package/lib/native-binding-hint.mjs

@@ -45,7 +45,7 @@ export const NATIVE_BINDING_BROKEN_MARKER = 'native-binding-broken';
 // D#207: join(), not `new URL('../cli.mjs', …)` — that form makes knip drop the named
 // module out of its unused-export report. cli.mjs is a knip entry point so nothing was
 // lost here, but the rule is enforced for the class rather than per-file.
-const CLI_REBUILD_BINDING = `node ${join(dirname(fileURLToPath(import.meta.url)), '..', 'cli.mjs')} rebuild-binding`;
+const CLI_REBUILD_BINDING = `node "${join(dirname(fileURLToPath(import.meta.url)), '..', 'cli.mjs')}" rebuild-binding`;
 
 // Stable-ish identity of a fault so DISTINCT failures get DISTINCT cooldown
 // windows: the same fault → same key (suppressed within the window), a different

package/mem-cli.mjs

@@ -3692,11 +3692,13 @@ async function runDispatch(argv) {
   // project — a misspelled flag changed results with zero signal. Warn (stderr, non-fatal)
   // when a flag looks like a misspelling of a real one; stdout + exit code stay untouched,
   // so JSON/text consumers are unaffected. Mirrors the unknown-COMMAND suggester in cli.mjs.
-  for (const { flag, suggestion } of suggestUnknownFlags(parseArgs(cmdArgs).flags)) {
+  for (const { flag, suggestion, owner } of suggestUnknownFlags(parseArgs(cmdArgs).flags, cmd)) {
     process.stderr.write(
-      suggestion
-        ? `[mem] Unknown flag --${flag}; did you mean --${suggestion}?\n`
-        : `[mem] Unknown flag --${flag} — ignored, it had no effect. Run "claude-mem-lite help" for this command's flags.\n`,
+      owner
+        ? `[mem] --${flag} is read only by ${owner}; ${cmd} does not read it.\n`
+        : suggestion
+          ? `[mem] Unknown flag --${flag}; did you mean --${suggestion}?\n`
+          : `[mem] Unknown flag --${flag} — ignored, it had no effect. Run "claude-mem-lite help" for this command's flags.\n`,
     );
   }
 

package/npm-shrinkwrap.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-mem-lite",
-  "version": "6.12.0",
+  "version": "6.12.1",
   "description": "Persistent long-term memory for Claude Code via MCP — captures coding decisions, bugfixes, and context across sessions. Hybrid FTS5 + TF-IDF 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/hook-launcher.mjs

@@ -125,7 +125,7 @@ const NB_MANUAL_CMD =
 // INSTALL_DIR (import.meta.url) so it works on a plugin-only install, where
 // bare `claude-mem-lite` is not on PATH and ~/.claude-mem-lite/ holds no source.
 // cli.mjs routes `repair` → install.mjs. (review #3)
-const CLI_REPAIR = `node ${join(INSTALL_DIR, 'cli.mjs')} repair`;
+const CLI_REPAIR = `node "${join(INSTALL_DIR, 'cli.mjs')}" repair`;
 
 // Last-resort recovery string for users whose `cli.mjs repair` path
 // itself failed (install.mjs missing / repair errored / retry still drifting).

package/scripts/pre-tool-recall.js

@@ -648,7 +648,8 @@ try {
       ORDER BY
         CASE WHEN o.lesson_learned IS NOT NULL AND o.lesson_learned != '' THEN 0 ELSE 1 END,
         ${citeFactorClause('o')} DESC,
-        o.created_at_epoch DESC
+        o.created_at_epoch DESC,
+        o.id DESC
       LIMIT ${obsLimit}
     `,
       )
@@ -691,7 +692,8 @@ try {
           ${eventsBodyFilter}
         ORDER BY
           CASE WHEN body IS NOT NULL AND body != '' THEN 0 ELSE 1 END,
-          created_at_epoch DESC
+          created_at_epoch DESC,
+          id DESC
         LIMIT ${eventsLimit}
       `,
         )