@automagik/omni 2.260520.15 → 2.260520.17

package/dist/commands/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -4660,6 +4660,277 @@ var require_cli_spinners = __commonJS((exports, module) => {
   module.exports = spinners;
 });
 
+// src/lib/embedded-canonical-migration.ts
+var exports_embedded_canonical_migration = {};
+__export(exports_embedded_canonical_migration, {
+  migrateUnmountedEmbeddedToCanonical: () => migrateUnmountedEmbeddedToCanonical,
+  compareEmbeddedVsCanonicalCounts: () => compareEmbeddedVsCanonicalCounts,
+  EMBEDDED_PGSERVE_DATA_DIR: () => EMBEDDED_PGSERVE_DATA_DIR
+});
+import { spawn, spawnSync as spawnSync2 } from "child_process";
+import { existsSync as existsSync9, mkdtempSync } from "fs";
+import { createServer } from "net";
+import { homedir as homedir7, tmpdir } from "os";
+import { join as join11 } from "path";
+import { setTimeout as sleep2 } from "timers/promises";
+function defaultLog(line) {
+  process.stdout.write(`${line}
+`);
+}
+function findAutopgPostgresBinary() {
+  const autopgRoot = join11(homedir7(), ".local", "share", "autopg");
+  if (!existsSync9(autopgRoot))
+    return null;
+  let bestPath = null;
+  for (const entry of safeReaddir(autopgRoot)) {
+    const candidate = join11(autopgRoot, entry, "postgres", "bin", "postgres");
+    if (existsSync9(candidate))
+      bestPath = candidate;
+  }
+  return bestPath;
+}
+function safeReaddir(path) {
+  try {
+    const { readdirSync: readdirSync2 } = __require("fs");
+    return readdirSync2(path);
+  } catch {
+    return [];
+  }
+}
+async function findFreePort() {
+  return new Promise((resolve, reject) => {
+    const server = createServer();
+    server.unref();
+    server.on("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      if (!addr || typeof addr === "string") {
+        server.close();
+        reject(new Error("failed to discover free port"));
+        return;
+      }
+      const port = addr.port;
+      server.close(() => resolve(port));
+    });
+  });
+}
+async function spawnTempPostmaster(binary, dataDir, port, log) {
+  const socketDir = mkdtempSync(join11(tmpdir(), "omni-migrate-pg-"));
+  log(`  spawning temp postmaster: pid=\u2026 port=${port} socket=${socketDir}`);
+  const child = spawn(binary, [
+    "-D",
+    dataDir,
+    "-p",
+    String(port),
+    "-c",
+    "listen_addresses=127.0.0.1",
+    "-c",
+    `unix_socket_directories=${socketDir}`
+  ], {
+    stdio: ["ignore", "pipe", "pipe"],
+    detached: false
+  });
+  let started = false;
+  let crashed = null;
+  child.stderr?.on("data", (chunk) => {
+    const line = chunk.toString("utf-8");
+    if (!started && /database system is ready to accept connections/.test(line))
+      started = true;
+  });
+  child.on("exit", (code) => {
+    if (!started) {
+      crashed = new Error(`temp postmaster exited with code ${code} before ready`);
+    }
+  });
+  for (let i = 0;i < 200; i++) {
+    if (started)
+      break;
+    if (crashed)
+      throw crashed;
+    await sleep2(100);
+  }
+  if (!started) {
+    child.kill("SIGTERM");
+    throw new Error("temp postmaster failed to become ready within 20s");
+  }
+  log(`  temp postmaster ready (pid=${child.pid})`);
+  return {
+    pid: child.pid ?? -1,
+    socketDir,
+    async stop() {
+      log("  stopping temp postmaster (SIGTERM)");
+      child.kill("SIGTERM");
+      await new Promise((resolve) => {
+        const onExit2 = () => resolve();
+        child.once("exit", onExit2);
+        setTimeout(() => {
+          child.kill("SIGKILL");
+          onExit2();
+        }, 1e4);
+      });
+    }
+  };
+}
+function psqlCapture(args) {
+  const result = spawnSync2("psql", args, {
+    encoding: "utf-8",
+    env: { ...process.env, PGPASSWORD: "postgres" },
+    timeout: 60000
+  });
+  if (result.status !== 0) {
+    throw new Error(`psql exited ${result.status}: ${result.stderr?.trim() ?? ""}`);
+  }
+  return result.stdout ?? "";
+}
+async function copyTable(table, srcArgs, dstArgs, log) {
+  const src = spawn("psql", [...srcArgs, "-c", `\\copy public.${table} TO STDOUT`], {
+    stdio: ["ignore", "pipe", "pipe"],
+    env: { ...process.env, PGPASSWORD: "postgres" }
+  });
+  const dst = spawn("psql", [...dstArgs, "-c", `SET session_replication_role='replica';`, "-c", `\\copy public.${table} FROM STDIN`], {
+    stdio: ["pipe", "pipe", "pipe"],
+    env: { ...process.env, PGPASSWORD: "postgres" }
+  });
+  if (!src.stdout || !dst.stdin)
+    throw new Error(`copy stream not available for ${table}`);
+  src.stdout.pipe(dst.stdin);
+  let dstErr = "";
+  dst.stderr?.on("data", (b) => {
+    dstErr += b.toString("utf-8");
+  });
+  const srcExited = new Promise((resolve) => src.once("exit", (code) => resolve(code ?? -1)));
+  const dstExited = new Promise((resolve) => dst.once("exit", (code) => resolve(code ?? -1)));
+  const [sc, dc] = await Promise.all([srcExited, dstExited]);
+  if (sc !== 0 || dc !== 0) {
+    throw new Error(`copy ${table} failed (src=${sc} dst=${dc}): ${dstErr.trim()}`);
+  }
+  log(`  copied ${table}`);
+}
+function resetSequences(dstArgs, log) {
+  const script = `
+SELECT format(
+  'SELECT setval(%L::regclass, GREATEST(COALESCE((SELECT max(%I) FROM %I.%I), 1), 1));',
+  pg_get_serial_sequence(c.table_schema || '.' || c.table_name, c.column_name),
+  c.column_name, c.table_schema, c.table_name
+)
+FROM information_schema.columns c
+WHERE pg_get_serial_sequence(c.table_schema || '.' || c.table_name, c.column_name) IS NOT NULL
+  AND c.table_schema = 'public';
+`.trim();
+  const lines = psqlCapture([...dstArgs, "-tAc", script]).split(`
+`).map((l) => l.trim()).filter(Boolean);
+  if (lines.length === 0)
+    return;
+  log(`  resetting ${lines.length} sequence(s)`);
+  psqlCapture([...dstArgs, "-c", lines.join(`
+`)]);
+}
+async function compareEmbeddedVsCanonicalCounts(opts = {}) {
+  const canonicalPort = opts.canonicalPort ?? 5432;
+  if (!existsSync9(EMBEDDED_DIR) || !existsSync9(join11(EMBEDDED_DIR, "PG_VERSION"))) {
+    return { kind: "skipped", reason: "embedded dir absent" };
+  }
+  const binary = findAutopgPostgresBinary();
+  if (!binary)
+    return { kind: "skipped", reason: "autopg postgres binary not found" };
+  const tempPort = await findFreePort();
+  let temp = null;
+  try {
+    temp = await spawnTempPostmaster(binary, EMBEDDED_DIR, tempPort, () => {});
+    const srcArgs = ["-h", "127.0.0.1", "-p", String(tempPort), "-U", "postgres", "-d", "omni"];
+    const dstArgs = ["-h", "127.0.0.1", "-p", String(canonicalPort), "-U", "postgres", "-d", "omni"];
+    const tablesRaw = psqlCapture([
+      ...srcArgs,
+      "-tAc",
+      `SELECT tablename FROM pg_tables WHERE schemaname='public' ORDER BY tablename`
+    ]);
+    const tables = tablesRaw.split(`
+`).map((s) => s.trim()).filter(Boolean);
+    if (tables.length === 0)
+      return { kind: "skipped", reason: "embedded has no public tables" };
+    const divergent = [];
+    let totalExtra = 0;
+    for (const t of tables) {
+      try {
+        const em = Number.parseInt(psqlCapture([...srcArgs, "-tAc", `SELECT count(*) FROM public.${t}`]).trim(), 10);
+        const ca = Number.parseInt(psqlCapture([...dstArgs, "-tAc", `SELECT count(*) FROM public.${t}`]).trim(), 10);
+        if (Number.isFinite(em) && Number.isFinite(ca) && em > ca) {
+          divergent.push(t);
+          totalExtra += em - ca;
+        }
+      } catch {
+        divergent.push(t);
+      }
+    }
+    if (divergent.length === 0)
+      return { kind: "in-sync" };
+    return { kind: "embedded-has-more", divergentTables: divergent, embeddedRows: totalExtra };
+  } catch (err) {
+    return { kind: "skipped", reason: err instanceof Error ? err.message : String(err) };
+  } finally {
+    if (temp)
+      await temp.stop();
+  }
+}
+async function migrateUnmountedEmbeddedToCanonical(opts = {}) {
+  const log = opts.log ?? defaultLog;
+  const canonicalPort = opts.canonicalPort ?? 5432;
+  if (!existsSync9(EMBEDDED_DIR)) {
+    return { status: "skipped", reason: "no embedded data dir" };
+  }
+  if (!existsSync9(join11(EMBEDDED_DIR, "PG_VERSION"))) {
+    return { status: "skipped", reason: "embedded dir missing PG_VERSION" };
+  }
+  const binary = findAutopgPostgresBinary();
+  if (!binary) {
+    return { status: "skipped", reason: "autopg postgres binary not found \u2014 install autopg first" };
+  }
+  log(`  using postgres binary: ${binary}`);
+  log("  stopping omni-api during data copy");
+  spawnSync2("pm2", ["stop", "omni-api"], { stdio: "inherit" });
+  const tempPort = await findFreePort();
+  const t0 = Date.now();
+  const temp = await spawnTempPostmaster(binary, EMBEDDED_DIR, tempPort, log);
+  let apiRestarted = false;
+  try {
+    const srcBaseArgs = ["-h", "127.0.0.1", "-p", String(tempPort), "-U", "postgres", "-d", "omni"];
+    const dstBaseArgs = ["-h", "127.0.0.1", "-p", String(canonicalPort), "-U", "postgres", "-d", "omni"];
+    const tablesRaw = psqlCapture([
+      ...srcBaseArgs,
+      "-tAc",
+      `SELECT tablename FROM pg_tables WHERE schemaname='public' ORDER BY tablename`
+    ]);
+    const tables = tablesRaw.split(`
+`).map((s) => s.trim()).filter(Boolean);
+    if (tables.length === 0) {
+      return { status: "skipped", reason: "embedded omni has no public tables" };
+    }
+    log(`  ${tables.length} tables to migrate`);
+    const truncateList = tables.map((t) => `public.${t}`).join(",");
+    psqlCapture([
+      ...dstBaseArgs,
+      "-c",
+      `SET session_replication_role='replica'; TRUNCATE ${truncateList} RESTART IDENTITY CASCADE;`
+    ]);
+    log("  truncated canonical (CASCADE)");
+    for (const t of tables) {
+      await copyTable(t, srcBaseArgs, dstBaseArgs, log);
+    }
+    resetSequences(dstBaseArgs, log);
+    return { status: "migrated", tables: tables.length, durationMs: Date.now() - t0 };
+  } finally {
+    await temp.stop();
+    log("  restarting omni-api");
+    spawnSync2("pm2", ["start", "omni-api"], { stdio: "inherit" });
+    apiRestarted = true;
+  }
+}
+var EMBEDDED_DIR, EMBEDDED_PGSERVE_DATA_DIR;
+var init_embedded_canonical_migration = __esm(() => {
+  EMBEDDED_DIR = join11(homedir7(), ".omni", "data", "pgserve");
+  EMBEDDED_PGSERVE_DATA_DIR = EMBEDDED_DIR;
+});
+
 // ../../node_modules/.bun/qrcode-terminal@0.12.0/node_modules/qrcode-terminal/vendor/QRCode/QRMode.js
 var require_QRMode = __commonJS((exports, module) => {
   module.exports = {
@@ -124067,7 +124338,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260520.15",
+  version: "2.260520.17",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {
@@ -129286,216 +129557,8 @@ function formatBytes(n) {
   return `${(n / 1024 / 1024 / 1024).toFixed(2)} GB`;
 }
 
-// src/lib/embedded-canonical-migration.ts
-import { spawn, spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync9, mkdtempSync } from "fs";
-import { createServer } from "net";
-import { homedir as homedir7, tmpdir } from "os";
-import { join as join11 } from "path";
-import { setTimeout as sleep2 } from "timers/promises";
-var EMBEDDED_DIR = join11(homedir7(), ".omni", "data", "pgserve");
-function defaultLog(line) {
-  process.stdout.write(`${line}
-`);
-}
-function findAutopgPostgresBinary() {
-  const autopgRoot = join11(homedir7(), ".local", "share", "autopg");
-  if (!existsSync9(autopgRoot))
-    return null;
-  let bestPath = null;
-  for (const entry of safeReaddir(autopgRoot)) {
-    const candidate = join11(autopgRoot, entry, "postgres", "bin", "postgres");
-    if (existsSync9(candidate))
-      bestPath = candidate;
-  }
-  return bestPath;
-}
-function safeReaddir(path) {
-  try {
-    const { readdirSync: readdirSync2 } = __require("fs");
-    return readdirSync2(path);
-  } catch {
-    return [];
-  }
-}
-async function findFreePort() {
-  return new Promise((resolve, reject) => {
-    const server = createServer();
-    server.unref();
-    server.on("error", reject);
-    server.listen(0, "127.0.0.1", () => {
-      const addr = server.address();
-      if (!addr || typeof addr === "string") {
-        server.close();
-        reject(new Error("failed to discover free port"));
-        return;
-      }
-      const port = addr.port;
-      server.close(() => resolve(port));
-    });
-  });
-}
-async function spawnTempPostmaster(binary, dataDir, port, log) {
-  const socketDir = mkdtempSync(join11(tmpdir(), "omni-migrate-pg-"));
-  log(`  spawning temp postmaster: pid=\u2026 port=${port} socket=${socketDir}`);
-  const child = spawn(binary, [
-    "-D",
-    dataDir,
-    "-p",
-    String(port),
-    "-c",
-    "listen_addresses=127.0.0.1",
-    "-c",
-    `unix_socket_directories=${socketDir}`
-  ], {
-    stdio: ["ignore", "pipe", "pipe"],
-    detached: false
-  });
-  let started = false;
-  let crashed = null;
-  child.stderr?.on("data", (chunk) => {
-    const line = chunk.toString("utf-8");
-    if (!started && /database system is ready to accept connections/.test(line))
-      started = true;
-  });
-  child.on("exit", (code) => {
-    if (!started) {
-      crashed = new Error(`temp postmaster exited with code ${code} before ready`);
-    }
-  });
-  for (let i = 0;i < 200; i++) {
-    if (started)
-      break;
-    if (crashed)
-      throw crashed;
-    await sleep2(100);
-  }
-  if (!started) {
-    child.kill("SIGTERM");
-    throw new Error("temp postmaster failed to become ready within 20s");
-  }
-  log(`  temp postmaster ready (pid=${child.pid})`);
-  return {
-    pid: child.pid ?? -1,
-    socketDir,
-    async stop() {
-      log("  stopping temp postmaster (SIGTERM)");
-      child.kill("SIGTERM");
-      await new Promise((resolve) => {
-        const onExit2 = () => resolve();
-        child.once("exit", onExit2);
-        setTimeout(() => {
-          child.kill("SIGKILL");
-          onExit2();
-        }, 1e4);
-      });
-    }
-  };
-}
-function psqlCapture(args) {
-  const result = spawnSync2("psql", args, {
-    encoding: "utf-8",
-    env: { ...process.env, PGPASSWORD: "postgres" },
-    timeout: 60000
-  });
-  if (result.status !== 0) {
-    throw new Error(`psql exited ${result.status}: ${result.stderr?.trim() ?? ""}`);
-  }
-  return result.stdout ?? "";
-}
-async function copyTable(table, srcArgs, dstArgs, log) {
-  const src = spawn("psql", [...srcArgs, "-c", `\\copy public.${table} TO STDOUT`], {
-    stdio: ["ignore", "pipe", "pipe"],
-    env: { ...process.env, PGPASSWORD: "postgres" }
-  });
-  const dst = spawn("psql", [...dstArgs, "-c", `SET session_replication_role='replica';`, "-c", `\\copy public.${table} FROM STDIN`], {
-    stdio: ["pipe", "pipe", "pipe"],
-    env: { ...process.env, PGPASSWORD: "postgres" }
-  });
-  if (!src.stdout || !dst.stdin)
-    throw new Error(`copy stream not available for ${table}`);
-  src.stdout.pipe(dst.stdin);
-  let dstErr = "";
-  dst.stderr?.on("data", (b) => {
-    dstErr += b.toString("utf-8");
-  });
-  const srcExited = new Promise((resolve) => src.once("exit", (code) => resolve(code ?? -1)));
-  const dstExited = new Promise((resolve) => dst.once("exit", (code) => resolve(code ?? -1)));
-  const [sc, dc] = await Promise.all([srcExited, dstExited]);
-  if (sc !== 0 || dc !== 0) {
-    throw new Error(`copy ${table} failed (src=${sc} dst=${dc}): ${dstErr.trim()}`);
-  }
-  log(`  copied ${table}`);
-}
-function resetSequences(dstArgs, log) {
-  const script = `
-SELECT format(
-  'SELECT setval(%L::regclass, GREATEST(COALESCE((SELECT max(%I) FROM %I.%I), 1), 1));',
-  pg_get_serial_sequence(c.table_schema || '.' || c.table_name, c.column_name),
-  c.column_name, c.table_schema, c.table_name
-)
-FROM information_schema.columns c
-WHERE pg_get_serial_sequence(c.table_schema || '.' || c.table_name, c.column_name) IS NOT NULL
-  AND c.table_schema = 'public';
-`.trim();
-  const lines = psqlCapture([...dstArgs, "-tAc", script]).split(`
-`).map((l) => l.trim()).filter(Boolean);
-  if (lines.length === 0)
-    return;
-  log(`  resetting ${lines.length} sequence(s)`);
-  psqlCapture([...dstArgs, "-c", lines.join(`
-`)]);
-}
-async function migrateUnmountedEmbeddedToCanonical(opts = {}) {
-  const log = opts.log ?? defaultLog;
-  const canonicalPort = opts.canonicalPort ?? 5432;
-  if (!existsSync9(EMBEDDED_DIR)) {
-    return { status: "skipped", reason: "no embedded data dir" };
-  }
-  if (!existsSync9(join11(EMBEDDED_DIR, "PG_VERSION"))) {
-    return { status: "skipped", reason: "embedded dir missing PG_VERSION" };
-  }
-  const binary = findAutopgPostgresBinary();
-  if (!binary) {
-    return { status: "skipped", reason: "autopg postgres binary not found \u2014 install autopg first" };
-  }
-  log(`  using postgres binary: ${binary}`);
-  const tempPort = await findFreePort();
-  const t0 = Date.now();
-  const temp = await spawnTempPostmaster(binary, EMBEDDED_DIR, tempPort, log);
-  try {
-    const srcBaseArgs = ["-h", "127.0.0.1", "-p", String(tempPort), "-U", "postgres", "-d", "omni"];
-    const dstBaseArgs = ["-h", "127.0.0.1", "-p", String(canonicalPort), "-U", "postgres", "-d", "omni"];
-    const tablesRaw = psqlCapture([
-      ...srcBaseArgs,
-      "-tAc",
-      `SELECT tablename FROM pg_tables WHERE schemaname='public' ORDER BY tablename`
-    ]);
-    const tables = tablesRaw.split(`
-`).map((s) => s.trim()).filter(Boolean);
-    if (tables.length === 0) {
-      return { status: "skipped", reason: "embedded omni has no public tables" };
-    }
-    log(`  ${tables.length} tables to migrate`);
-    const truncateList = tables.map((t) => `public.${t}`).join(",");
-    psqlCapture([
-      ...dstBaseArgs,
-      "-c",
-      `SET session_replication_role='replica'; TRUNCATE ${truncateList} RESTART IDENTITY CASCADE;`
-    ]);
-    log("  truncated canonical (CASCADE)");
-    for (const t of tables) {
-      await copyTable(t, srcBaseArgs, dstBaseArgs, log);
-    }
-    resetSequences(dstBaseArgs, log);
-    return { status: "migrated", tables: tables.length, durationMs: Date.now() - t0 };
-  } finally {
-    await temp.stop();
-  }
-}
-var EMBEDDED_PGSERVE_DATA_DIR = EMBEDDED_DIR;
-
 // src/commands/doctor.ts
+init_embedded_canonical_migration();
 init_output();
 
 // src/server-bundle.ts
@@ -129778,25 +129841,30 @@ async function checkEmbeddedDataOrphaned(deps) {
     };
   }
   try {
-    const resp = await fetch(`http://127.0.0.1:${serverConfig.port}/api/v2/health`, {
-      signal: AbortSignal.timeout(2000)
-    });
-    const body = await resp.json();
-    const total = body?.instances?.total ?? 0;
-    if (total === 0) {
+    const { existsSync: fsExists } = await import("fs");
+    if (!fsExists(EMBEDDED_PGSERVE_DATA_DIR)) {
+      return { id: "embedded-data-orphaned", level: "OK", detail: "no embedded data to compare" };
+    }
+    const { compareEmbeddedVsCanonicalCounts: compareEmbeddedVsCanonicalCounts2 } = await Promise.resolve().then(() => (init_embedded_canonical_migration(), exports_embedded_canonical_migration));
+    const cmp = await compareEmbeddedVsCanonicalCounts2({ canonicalPort: 5432 });
+    if (cmp.kind === "embedded-has-more") {
       return {
         id: "embedded-data-orphaned",
         level: "FAIL",
-        detail: `embedded dir at ${EMBEDDED_PGSERVE_DATA_DIR} holds data but canonical omni is empty \u2014 run \`omni doctor --fix\` to migrate`
+        detail: `embedded has ${cmp.embeddedRows} rows in ${cmp.divergentTables.length} tables canonical lacks (${cmp.divergentTables.slice(0, 3).join(", ")}${cmp.divergentTables.length > 3 ? "\u2026" : ""}) \u2014 run \`omni doctor --fix\` to migrate`
       };
     }
     return {
       id: "embedded-data-orphaned",
       level: "OK",
-      detail: `canonical omni already has ${total} instance(s)`
+      detail: cmp.kind === "in-sync" ? "embedded \u2194 canonical row counts match" : `compare unavailable: ${cmp.reason}`
+    };
+  } catch (err) {
+    return {
+      id: "embedded-data-orphaned",
+      level: "OK",
+      detail: `compare unavailable: ${err instanceof Error ? err.message : String(err)}`
     };
-  } catch {
-    return { id: "embedded-data-orphaned", level: "OK", detail: "health endpoint unreachable \u2014 defer" };
   }
 }
 async function fixEmbeddedDataOrphaned(_deps) {

package/dist/lib/embedded-canonical-migration.d.ts

@@ -70,6 +70,33 @@ export interface MigrateOptions {
  * so callers can present an actionable diagnostic without aborting the
  * larger --fix run.
  */
+/**
+ * Result of comparing embedded vs canonical row counts. Used by the
+ * doctor `embedded-data-orphaned` check to detect partial migrations
+ * (e.g. Baileys re-attach copies instance rows but the bulk historical
+ * tables stay empty until the ETL runs).
+ */
+export type CompareResult = {
+    kind: 'in-sync';
+} | {
+    kind: 'embedded-has-more';
+    divergentTables: string[];
+    embeddedRows: number;
+} | {
+    kind: 'skipped';
+    reason: string;
+};
+export interface CompareOptions {
+    canonicalPort?: number;
+}
+/**
+ * Count rows in every public table on both the embedded data dir and the
+ * canonical postmaster, return which tables have MORE rows on embedded.
+ * Boots a temp postmaster against the embedded dir (5s ready window),
+ * runs two count queries, shuts it down. Best-effort: any spawn / query
+ * failure returns `{ kind: 'skipped' }`.
+ */
+export declare function compareEmbeddedVsCanonicalCounts(opts?: CompareOptions): Promise<CompareResult>;
 export declare function migrateUnmountedEmbeddedToCanonical(opts?: MigrateOptions): Promise<MigrationResult>;
 /** Re-export the constant so callers / tests can probe the same path. */
 export declare const EMBEDDED_PGSERVE_DATA_DIR: string;

package/dist/lib/embedded-canonical-migration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"embedded-canonical-migration.d.ts","sourceRoot":"","sources":["../../src/lib/embedded-canonical-migration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AAWH,MAAM,MAAM,eAAe,GACvB;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAC1D;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AA0MD;;;;;;;;GAQG;AACH,wBAAsB,mCAAmC,CAAC,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,eAAe,CAAC,CA+D7G;AAED,yEAAyE;AACzE,eAAO,MAAM,yBAAyB,QAAe,CAAC"}
+{"version":3,"file":"embedded-canonical-migration.d.ts","sourceRoot":"","sources":["../../src/lib/embedded-canonical-migration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AAWH,MAAM,MAAM,eAAe,GACvB;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAC1D;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AA0MD;;;;;;;;GAQG;AACH;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,eAAe,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAC9E;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,MAAM,WAAW,cAAc;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;GAMG;AACH,wBAAsB,gCAAgC,CAAC,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAiDxG;AAED,wBAAsB,mCAAmC,CAAC,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,eAAe,CAAC,CA6E7G;AAED,yEAAyE;AACzE,eAAO,MAAM,yBAAyB,QAAe,CAAC"}

package/dist/server/index.js

@@ -230137,7 +230137,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package8 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260520.15",
+    version: "2.260520.17",
     type: "module",
     exports: {
       ".": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260520.15",
+  "version": "2.260520.17",
   "description": "LLM-optimized CLI for Omni",
   "type": "module",
   "bin": {