@automagik/omni 2.260520.14 → 2.260520.16

package/dist/commands/doctor.d.ts

@@ -49,7 +49,7 @@ import { type EmbeddedDumpResult } from '../lib/canonical-pgserve.js';
 /** Severity levels reported by each check. */
 export type CheckLevel = 'OK' | 'WARN' | 'FAIL';
 /** Identifier used in tests and --json output. */
-export type CheckId = 'pm2-env-drift' | 'cli-key-valid' | 'pgserve-reachable' | 'omni-db-exists' | 'orphaned-data-dirs' | 'version-match' | 'pm2-status' | 'pm2-max-restarts' | 'pm2-logrotate-installed' | 'cli-signing-key-for-locked-instances' | 'pgserve-canonical' | 'port-canonical-owner';
+export type CheckId = 'pm2-env-drift' | 'cli-key-valid' | 'pgserve-reachable' | 'omni-db-exists' | 'orphaned-data-dirs' | 'version-match' | 'pm2-status' | 'pm2-max-restarts' | 'pm2-logrotate-installed' | 'cli-signing-key-for-locked-instances' | 'pgserve-canonical' | 'port-canonical-owner' | 'embedded-data-orphaned';
 export interface CheckResult {
     id: CheckId;
     level: CheckLevel;

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,271 @@ 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}`);
+  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_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 = {
@@ -13153,10 +13418,10 @@ var require_nkeys = __commonJS((exports) => {
     return createPair(Prefix.Cluster);
   }
   exports.createCluster = createCluster;
-  function createServer() {
+  function createServer2() {
     return createPair(Prefix.Server);
   }
-  exports.createServer = createServer;
+  exports.createServer = createServer2;
   function createCurve() {
     return createPair(Prefix.Curve);
   }
@@ -22772,7 +23037,7 @@ var require_node_transport = __commonJS((exports) => {
   var util_1 = require_util();
   var tls_1 = __require("tls");
   var { resolve: resolve2 } = __require("path");
-  var { readFile, existsSync: existsSync12 } = __require("fs");
+  var { readFile, existsSync: existsSync13 } = __require("fs");
   var dns = __require("dns");
   var VERSION2 = "2.29.3";
   var LANG = "nats.js";
@@ -22888,7 +23153,7 @@ var require_node_transport = __commonJS((exports) => {
       const d = (0, nats_base_client_1.deferred)();
       try {
         fn = resolve2(fn);
-        if (!existsSync12(fn)) {
+        if (!existsSync13(fn)) {
           d.reject(new Error(`${fn} doesn't exist`));
         }
         readFile(fn, (err, data2) => {
@@ -61798,12 +62063,12 @@ class A2AClient {
       if (state === "completed" || state === "failed") {
         return this.taskToProviderResponse(task, taskId, startMs);
       }
-      await sleep2(POLL_INTERVAL_MS);
+      await sleep3(POLL_INTERVAL_MS);
     }
     throw new ProviderError("A2A task polling exhausted", "TIMEOUT", undefined, { taskId });
   }
 }
-function sleep2(ms) {
+function sleep3(ms) {
   return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
 function createA2AClient(config2) {
@@ -61931,8 +62196,8 @@ var init_a2a_provider = __esm(() => {
 
 // ../core/src/providers/nats-genie-provider.ts
 import { mkdir, writeFile } from "fs/promises";
-import { homedir as homedir9 } from "os";
-import { join as join15 } from "path";
+import { homedir as homedir10 } from "os";
+import { join as join16 } from "path";
 
 class NatsGenieProvider {
   id;
@@ -62122,10 +62387,10 @@ class NatsGenieProvider {
   }
   async writeDeadLetter(payload, error2) {
     try {
-      const dlDir = join15(homedir9(), ".omni", "dead-letters");
+      const dlDir = join16(homedir10(), ".omni", "dead-letters");
       await mkdir(dlDir, { recursive: true });
       const filename = `nats-genie-${Date.now()}-${payload.chatId}.json`;
-      await writeFile(join15(dlDir, filename), JSON.stringify({
+      await writeFile(join16(dlDir, filename), JSON.stringify({
         payload,
         error: error2 instanceof Error ? error2.message : String(error2),
         timestamp: new Date().toISOString()
@@ -64004,7 +64269,7 @@ var init_sql = __esm(() => {
       return new SQL([new StringChunk(str)]);
     }
     sql2.raw = raw2;
-    function join16(chunks, separator) {
+    function join17(chunks, separator) {
       const result = [];
       for (const [i6, chunk] of chunks.entries()) {
         if (i6 > 0 && separator !== undefined) {
@@ -64014,7 +64279,7 @@ var init_sql = __esm(() => {
       }
       return new SQL(result);
     }
-    sql2.join = join16;
+    sql2.join = join17;
     function identifier(value) {
       return new Name(value);
     }
@@ -67241,7 +67506,7 @@ var init_select2 = __esm(() => {
       return (table2, on) => {
         const baseTableName = this.tableName;
         const tableName = getTableLikeName(table2);
-        if (typeof tableName === "string" && this.config.joins?.some((join16) => join16.alias === tableName)) {
+        if (typeof tableName === "string" && this.config.joins?.some((join17) => join17.alias === tableName)) {
           throw new Error(`Alias "${tableName}" is already used in this query`);
         }
         if (!this.isPartialSelect) {
@@ -67752,7 +68017,7 @@ var init_update = __esm(() => {
     createJoin(joinType) {
       return (table2, on) => {
         const tableName = getTableLikeName(table2);
-        if (typeof tableName === "string" && this.config.joins.some((join16) => join16.alias === tableName)) {
+        if (typeof tableName === "string" && this.config.joins.some((join17) => join17.alias === tableName)) {
           throw new Error(`Alias "${tableName}" is already used in this query`);
         }
         if (typeof on === "function") {
@@ -67802,10 +68067,10 @@ var init_update = __esm(() => {
             const fromFields = this.getTableLikeFields(this.config.from);
             fields[tableName] = fromFields;
           }
-          for (const join16 of this.config.joins) {
-            const tableName2 = getTableLikeName(join16.table);
-            if (typeof tableName2 === "string" && !is(join16.table, SQL)) {
-              const fromFields = this.getTableLikeFields(join16.table);
+          for (const join17 of this.config.joins) {
+            const tableName2 = getTableLikeName(join17.table);
+            if (typeof tableName2 === "string" && !is(join17.table, SQL)) {
+              const fromFields = this.getTableLikeFields(join17.table);
               fields[tableName2] = fromFields;
             }
           }
@@ -82474,7 +82739,7 @@ var require_path = __commonJS((exports) => {
   function isAbsolute(path) {
     return path.charAt(0) === "/";
   }
-  function join20(...args) {
+  function join21(...args) {
     return normalizePath(args.join("/"));
   }
   function dirname6(path) {
@@ -82499,7 +82764,7 @@ var require_path = __commonJS((exports) => {
   exports.basename = basename6;
   exports.dirname = dirname6;
   exports.isAbsolute = isAbsolute;
-  exports.join = join20;
+  exports.join = join21;
   exports.normalizePath = normalizePath;
   exports.relative = relative;
   exports.resolve = resolve4;
@@ -124067,7 +124332,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260520.14",
+  version: "2.260520.16",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {
@@ -127889,9 +128154,9 @@ function createDeadLettersCommand() {
 }
 
 // src/commands/doctor.ts
-import { existsSync as existsSync9, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
-import { homedir as homedir7 } from "os";
-import { join as join12, resolve } from "path";
+import { existsSync as existsSync10, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
+import { homedir as homedir8 } from "os";
+import { join as join13, resolve } from "path";
 init_config();
 
 // src/health.ts
@@ -129287,28 +129552,29 @@ function formatBytes(n) {
 }
 
 // src/commands/doctor.ts
+init_embedded_canonical_migration();
 init_output();
 
 // src/server-bundle.ts
 init_output();
-import { dirname as dirname2, join as join11 } from "path";
+import { dirname as dirname2, join as join12 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function getServerBundlePath() {
   try {
     const thisFile = fileURLToPath2(import.meta.url);
     const distDir = dirname2(thisFile);
-    return join11(distDir, "server", "index.js");
+    return join12(distDir, "server", "index.js");
   } catch {
-    return join11(process.cwd(), "dist", "server", "index.js");
+    return join12(process.cwd(), "dist", "server", "index.js");
   }
 }
 function getServerLauncherPath() {
   try {
     const thisFile = fileURLToPath2(import.meta.url);
     const distDir = dirname2(thisFile);
-    return join11(distDir, "..", "bin", "omni-server");
+    return join12(distDir, "..", "bin", "omni-server");
   } catch {
-    return join11(process.cwd(), "bin", "omni-server");
+    return join12(process.cwd(), "bin", "omni-server");
   }
 }
 function bundleNotFoundError(bundlePath) {
@@ -129373,10 +129639,10 @@ function productionDeps() {
       }
     },
     findOrphanedDataDirs: () => {
-      const roots = [process.cwd(), join12(homedir7(), "workspace"), join12(homedir7(), "repos")];
+      const roots = [process.cwd(), join13(homedir8(), "workspace"), join13(homedir8(), "repos")];
       const found = [];
       for (const root of roots) {
-        if (!existsSync9(root))
+        if (!existsSync10(root))
           continue;
         try {
           scanForOrphans(root, found, 0);
@@ -129484,7 +129750,7 @@ function scanForOrphans(dir, acc, depth, maxDepth = 4) {
   for (const name of entries) {
     if (name === "node_modules" || name === ".git")
       continue;
-    const full = join12(dir, name);
+    const full = join13(dir, name);
     let stats;
     try {
       stats = statSync2(full);
@@ -129553,6 +129819,60 @@ async function checkOmniDbExists(deps) {
   }
   return { id: "omni-db-exists", level: "FAIL", detail: "omni database is not reachable" };
 }
+async function checkEmbeddedDataOrphaned(deps) {
+  const { serverConfig } = deps.loadState();
+  if (serverConfig.useCanonicalPgserve !== true) {
+    return { id: "embedded-data-orphaned", level: "OK", detail: "embedded mode \u2014 no orphan check needed" };
+  }
+  if (!existsSync10(join13(EMBEDDED_PGSERVE_DATA_DIR, "PG_VERSION"))) {
+    return { id: "embedded-data-orphaned", level: "OK", detail: "no embedded data dir present" };
+  }
+  if (!await deps.omniDbExists()) {
+    return {
+      id: "embedded-data-orphaned",
+      level: "OK",
+      detail: "canonical not reachable yet \u2014 embedded check deferred"
+    };
+  }
+  try {
+    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 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: 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)}`
+    };
+  }
+}
+async function fixEmbeddedDataOrphaned(_deps) {
+  raw("  Migrating unmounted embedded pgserve \u2192 canonical autopg...");
+  const result = await migrateUnmountedEmbeddedToCanonical({
+    log: (line) => raw(line)
+  });
+  if (result.status === "skipped") {
+    throw new Error(`migration skipped: ${result.reason}`);
+  }
+  raw(`  \u2713 migrated ${result.tables} tables in ${result.durationMs}ms`);
+  raw("    Re-run `omni install --non-interactive` to re-apply scoped-role grants on the restored data.");
+  return `migrated ${result.tables} tables from embedded to canonical (${result.durationMs}ms)`;
+}
 function checkOrphanedDataDirs(deps) {
   const found = deps.findOrphanedDataDirs();
   if (found.length === 0) {
@@ -129969,7 +130289,8 @@ async function runAllChecks(deps) {
     await checkPm2LogrotateInstalled(deps),
     await checkSigningKeyForLockedInstances(deps),
     checkPgserveCanonical(deps),
-    await checkPortCanonicalOwner(deps)
+    await checkPortCanonicalOwner(deps),
+    await checkEmbeddedDataOrphaned(deps)
   ];
 }
 async function applyFix(deps, check) {
@@ -129990,6 +130311,8 @@ async function applyFix(deps, check) {
       return await fixPortCanonicalOwner(deps);
     if (check.id === "pm2-status")
       return await fixPm2Status(deps);
+    if (check.id === "embedded-data-orphaned")
+      return await fixEmbeddedDataOrphaned(deps);
     return null;
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -130107,7 +130430,7 @@ Safety:
 }
 
 // src/commands/done.ts
-import { existsSync as existsSync10, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync6 } from "fs";
 import { basename, extname } from "path";
 
 // src/context.ts
@@ -130216,7 +130539,7 @@ async function handleReact(client, ctx, emoji) {
   await closeTurn(client, "react", `Reacted ${emoji} + turn closed`);
 }
 async function handleMedia(client, ctx, mediaPath, caption) {
-  if (!existsSync10(mediaPath)) {
+  if (!existsSync11(mediaPath)) {
     return error(`File not found: ${mediaPath}`);
   }
   try {
@@ -130914,7 +131237,7 @@ function createHistoryCommand() {
 
 // src/commands/imagine.ts
 import { writeFileSync as writeFileSync8 } from "fs";
-import { basename as basename2, dirname as dirname3, extname as extname2, join as join13 } from "path";
+import { basename as basename2, dirname as dirname3, extname as extname2, join as join14 } from "path";
 init_output();
 var ALLOWED_ASPECT_RATIOS = ["1:1", "4:3", "3:4", "16:9", "9:16", "3:2", "2:3"];
 function extensionForMime(mimeType) {
@@ -130929,9 +131252,9 @@ function buildOutputPath(outputBase, index, total, mimeType) {
   const ext = extname2(outputBase) || extensionForMime(mimeType);
   const stem = basename2(outputBase, extname2(outputBase));
   if (total <= 1) {
-    return join13(dir, `${stem}${ext}`);
+    return join14(dir, `${stem}${ext}`);
   }
-  return join13(dir, `${stem}-${index + 1}${ext}`);
+  return join14(dir, `${stem}-${index + 1}${ext}`);
 }
 function parseAspectRatio(value) {
   if (!value)
@@ -131049,12 +131372,12 @@ function createImagineCommand() {
 }
 
 // src/commands/install.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync6 } from "fs";
-import { homedir as homedir8 } from "os";
-import { join as join14 } from "path";
+import { existsSync as existsSync12, mkdirSync as mkdirSync6 } from "fs";
+import { homedir as homedir9 } from "os";
+import { join as join15 } from "path";
 init_config();
 init_output();
-var DEFAULT_DATA_DIR2 = join14(homedir8(), ".omni", "data");
+var DEFAULT_DATA_DIR2 = join15(homedir9(), ".omni", "data");
 function computeDefaultDatabaseUrl() {
   return buildEmbeddedDatabaseUrl();
 }
@@ -131153,7 +131476,7 @@ async function startServices(cfg, forceCleanup, forceSystemd, useCanonicalPgserv
     return false;
   }
   const bundlePath = getServerBundlePath();
-  if (!existsSync11(bundlePath)) {
+  if (!existsSync12(bundlePath)) {
     warn(`Server bundle not found at: ${bundlePath}
   Install @automagik/omni from npm: bun add -g @automagik/omni
   Or build locally: make cli-build-full`);
@@ -131177,9 +131500,9 @@ async function startServices(cfg, forceCleanup, forceSystemd, useCanonicalPgserv
     return false;
   }
   apiSpinner.succeed(`${PM2_PROCESSES.api} started`);
-  if (existsSync11(NATS_BINARY_PATH)) {
+  if (existsSync12(NATS_BINARY_PATH)) {
     const natsSpinner = ora(`Starting ${PM2_PROCESSES.nats}...`).start();
-    const natsDataDir = join14(cfg.dataDir, "nats");
+    const natsDataDir = join15(cfg.dataDir, "nats");
     mkdirSync6(natsDataDir, { recursive: true });
     const natsArgs = buildPm2StartArgs({
       kind: "nats",
@@ -132856,7 +133179,7 @@ function createLogsCommand() {
 }
 
 // src/commands/media.ts
-import { createWriteStream as createWriteStream2, existsSync as existsSync13, mkdirSync as mkdirSync8, statSync as statSync4 } from "fs";
+import { createWriteStream as createWriteStream2, existsSync as existsSync14, mkdirSync as mkdirSync8, statSync as statSync4 } from "fs";
 import { basename as basename4, dirname as dirname4, resolve as resolve2 } from "path";
 import { Readable } from "stream";
 import { pipeline } from "stream/promises";
@@ -132919,13 +133242,13 @@ function resolveOutputPath(outputPath, result) {
   const resolved = resolve2(outputPath);
   if (isDirHint)
     return resolve2(resolved, filename);
-  if (existsSync13(resolved) && statSync4(resolved).isDirectory())
+  if (existsSync14(resolved) && statSync4(resolved).isDirectory())
     return resolve2(resolved, filename);
   return resolved;
 }
 async function downloadToFile(url, apiKey, destinationPath) {
   const destDir = dirname4(destinationPath);
-  if (!existsSync13(destDir))
+  if (!existsSync14(destDir))
     mkdirSync8(destDir, { recursive: true });
   const resp = await fetch(url, {
     method: "GET",
@@ -133879,8 +134202,8 @@ init_output();
 init_src();
 import { execFileSync as execFileSync3, execSync } from "child_process";
 import * as nodeCrypto2 from "crypto";
-import { existsSync as existsSync14, mkdirSync as mkdirSync9, readFileSync as readFileSync9, writeFileSync as writeFileSync9 } from "fs";
-import { homedir as homedir10 } from "os";
+import { existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync9, writeFileSync as writeFileSync9 } from "fs";
+import { homedir as homedir11 } from "os";
 import { dirname as dirname5, resolve as resolve3 } from "path";
 import { createInterface as createInterface2 } from "readline";
 init_config();
@@ -134107,10 +134430,10 @@ async function pairDevice(gatewayUrl, gatewayToken, keypair, spinner) {
     ws.close(1000, "pairing complete");
   }
 }
-var OPENCLAW_CONFIG_PATH = resolve3(homedir10(), ".openclaw", "openclaw.json");
+var OPENCLAW_CONFIG_PATH = resolve3(homedir11(), ".openclaw", "openclaw.json");
 var PLUGIN_MARKER = "plugin-openclaw/omni.ts";
 function readOpenClawConfig(configPath) {
-  if (!existsSync14(configPath))
+  if (!existsSync15(configPath))
     return {};
   const raw2 = readFileSync9(configPath, "utf-8").trim();
   if (!raw2)
@@ -134151,10 +134474,10 @@ function isValidUuid2(value) {
 }
 function resolvePluginPath(explicit) {
   if (explicit) {
-    return existsSync14(explicit) ? resolve3(explicit) : null;
+    return existsSync15(explicit) ? resolve3(explicit) : null;
   }
   const cwdCandidate = resolve3(process.cwd(), "packages/plugin-openclaw/omni.ts");
-  return existsSync14(cwdCandidate) ? cwdCandidate : null;
+  return existsSync15(cwdCandidate) ? cwdCandidate : null;
 }
 function registerPlugin(config2, pluginPath, configPath) {
   if (hasOpenClawCli()) {
@@ -134864,7 +135187,7 @@ ${formatExamples(examples)}`);
 }
 
 // src/lib/requirements.ts
-import { spawn } from "child_process";
+import { spawn as spawn2 } from "child_process";
 var REQUIREMENTS = Object.freeze({
   pgserve: ">=2.3",
   genie: ">=5.0"
@@ -134908,7 +135231,7 @@ function fetchPeerVersion(binary) {
     let settled = false;
     let stdout = "";
     let stderr = "";
-    const proc = spawn(binary, ["--version"], { stdio: ["ignore", "pipe", "pipe"] });
+    const proc = spawn2(binary, ["--version"], { stdio: ["ignore", "pipe", "pipe"] });
     const timer2 = setTimeout(() => {
       if (settled)
         return;
@@ -135204,7 +135527,7 @@ function createSayCommand() {
 }
 
 // src/commands/see.ts
-import { existsSync as existsSync15, readFileSync as readFileSync10, statSync as statSync5 } from "fs";
+import { existsSync as existsSync16, readFileSync as readFileSync10, statSync as statSync5 } from "fs";
 import { extname as extname4 } from "path";
 init_output();
 var MIME_BY_EXT = {
@@ -135236,7 +135559,7 @@ function parseMaxTokens(value) {
   return n2;
 }
 function loadMedia(file) {
-  if (!existsSync15(file)) {
+  if (!existsSync16(file)) {
     error(`File not found: ${file}`);
   }
   const stat = statSync5(file);
@@ -135322,7 +135645,7 @@ function createSeeCommand() {
 }
 
 // src/commands/send.ts
-import { existsSync as existsSync16, readFileSync as readFileSync11 } from "fs";
+import { existsSync as existsSync17, readFileSync as readFileSync11 } from "fs";
 import { basename as basename5, extname as extname5 } from "path";
 init_source();
 init_config();
@@ -135363,7 +135686,7 @@ var messageSenders = {
     const { to, media } = options3;
     if (!to || !media)
       return;
-    if (!existsSync16(media)) {
+    if (!existsSync17(media)) {
       error(`File not found: ${media}`);
       return;
     }
@@ -135895,9 +136218,9 @@ function pickFilename(mimeType, provider) {
 }
 
 // src/commands/start.ts
-import { existsSync as existsSync17, mkdirSync as mkdirSync10 } from "fs";
-import { homedir as homedir11 } from "os";
-import { join as join16 } from "path";
+import { existsSync as existsSync18, mkdirSync as mkdirSync10 } from "fs";
+import { homedir as homedir12 } from "os";
+import { join as join17 } from "path";
 init_config();
 init_output();
 var START_HEALTH_TIMEOUT_MS = 1e4;
@@ -135906,7 +136229,7 @@ async function runStart() {
     pm2NotFoundError();
   }
   const bundlePath = getServerBundlePath();
-  if (!existsSync17(bundlePath)) {
+  if (!existsSync18(bundlePath)) {
     bundleNotFoundError(bundlePath);
   }
   const serverConfig = loadServerConfig();
@@ -135927,10 +136250,10 @@ async function runStart() {
     error(`Failed to start ${PM2_PROCESSES.api} (pm2 exit code ${apiCode})`, undefined, 1);
     return;
   }
-  const natsPath = join16(homedir11(), ".omni", "nats-server");
-  if (existsSync17(natsPath)) {
+  const natsPath = join17(homedir12(), ".omni", "nats-server");
+  if (existsSync18(natsPath)) {
     info(`Starting ${PM2_PROCESSES.nats}...`);
-    const natsDataDir = join16(serverConfig.dataDir, "nats");
+    const natsDataDir = join17(serverConfig.dataDir, "nats");
     mkdirSync10(natsDataDir, { recursive: true });
     const natsArgs = buildPm2StartArgs({
       kind: "nats",
@@ -136351,8 +136674,8 @@ function createTurnsCommand() {
 }
 
 // src/commands/update.ts
-import { existsSync as existsSync19 } from "fs";
-import { join as join18 } from "path";
+import { existsSync as existsSync20 } from "fs";
+import { join as join19 } from "path";
 import { createInterface as createInterface3 } from "readline";
 init_source();
 init_config();
@@ -136634,9 +136957,9 @@ async function cleanupLegacyArtifacts(skipList) {
 init_output();
 
 // src/update-diagnostics.ts
-import { existsSync as existsSync18, mkdirSync as mkdirSync11, readFileSync as readFileSync12, writeFileSync as writeFileSync10 } from "fs";
-import { homedir as homedir12 } from "os";
-import { join as join17 } from "path";
+import { existsSync as existsSync19, mkdirSync as mkdirSync11, readFileSync as readFileSync12, writeFileSync as writeFileSync10 } from "fs";
+import { homedir as homedir13 } from "os";
+import { join as join18 } from "path";
 var UPDATE_DIAGNOSTICS_SCHEMA_VERSION = 1;
 function createDiagnostics(args) {
   const startedAt = new Date().toISOString();
@@ -136658,15 +136981,15 @@ function createDiagnostics(args) {
   };
 }
 function getDiagnosticsDir() {
-  const base = process.env.OMNI_CONFIG_DIR ?? join17(homedir12(), ".omni");
-  return join17(base, "logs");
+  const base = process.env.OMNI_CONFIG_DIR ?? join18(homedir13(), ".omni");
+  return join18(base, "logs");
 }
 function getDiagnosticsPath(startedAt) {
   const safe = startedAt.replace(/:/g, "-");
-  return join17(getDiagnosticsDir(), `update-diagnostics-${safe}.json`);
+  return join18(getDiagnosticsDir(), `update-diagnostics-${safe}.json`);
 }
 function tailFileLines(path, maxLines) {
-  if (!existsSync18(path))
+  if (!existsSync19(path))
     return [];
   try {
     const raw2 = readFileSync12(path, "utf8");
@@ -136702,7 +137025,7 @@ function writeDiagnostics(state, exitCode) {
   const dir = getDiagnosticsDir();
   const path = getDiagnosticsPath(state.startedAt);
   try {
-    if (!existsSync18(dir)) {
+    if (!existsSync19(dir)) {
       mkdirSync11(dir, { recursive: true, mode: 448 });
     }
     writeFileSync10(path, `${JSON.stringify(state, null, 2)}
@@ -136876,7 +137199,7 @@ function printVerifySkippedBanner(latest) {
 }
 function detectParallelNpmGlobalInstall(deps) {
   const npmRootFn = deps?.npmRoot ?? defaultNpmRoot;
-  const existsFn = deps?.exists ?? existsSync19;
+  const existsFn = deps?.exists ?? existsSync20;
   let root;
   try {
     root = npmRootFn();
@@ -136886,7 +137209,7 @@ function detectParallelNpmGlobalInstall(deps) {
   if (root === null || root.length === 0) {
     return { detected: false, skipped: "npm-not-on-path" };
   }
-  const candidate = join18(root, "@automagik", "omni");
+  const candidate = join19(root, "@automagik", "omni");
   if (existsFn(candidate)) {
     return { detected: true, path: candidate };
   }
@@ -137509,13 +137832,13 @@ init_config();
 init_output();
 
 // src/manifest-pin.ts
-import { existsSync as existsSync20, readFileSync as readFileSync13, renameSync as renameSync3, writeFileSync as writeFileSync11 } from "fs";
-import { homedir as homedir13 } from "os";
-import { join as join19 } from "path";
+import { existsSync as existsSync21, readFileSync as readFileSync13, renameSync as renameSync3, writeFileSync as writeFileSync11 } from "fs";
+import { homedir as homedir14 } from "os";
+import { join as join20 } from "path";
 var PACKAGE_NAME2 = "@automagik/omni";
-var BUN_GLOBAL_MANIFEST = join19(homedir13(), ".bun", "install", "global", "package.json");
+var BUN_GLOBAL_MANIFEST = join20(homedir14(), ".bun", "install", "global", "package.json");
 function pinManifestEntry(manifestPath, exactVersion) {
-  if (!existsSync20(manifestPath))
+  if (!existsSync21(manifestPath))
     return false;
   let manifest;
   try {

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

@@ -0,0 +1,103 @@
+/**
+ * Embedded → canonical migration for the "unmounted embedded dir" path.
+ *
+ * Background
+ * ----------
+ * The original `fixPgserveCanonical` flow (canonical-pgserve.ts +
+ * doctor.ts) assumes the embedded pgserve is LIVE: omni-api is running
+ * against it, pg_dump connects to the live instance, then we stop
+ * omni-api, set up canonical, restore, restart on canonical. That
+ * worked through the singleton-no-proxy cutover when omni-api could
+ * still spawn embedded.
+ *
+ * Phase 3 (`pgserve-singleton-no-proxy` G2) deleted omni-api's
+ * embedded-spawn code. That leaves a regression for any operator who:
+ *   - Has `useCanonicalPgserve: true` in config (cutover already
+ *     "succeeded" structurally) but
+ *   - Never actually moved data — their 8.4 GB sits at
+ *     `~/.omni/data/pgserve/` as an unmounted postmaster data dir
+ *   - The canonical `omni` database on autopg is empty
+ *
+ * Found during Felipe's 2026-05-20 dogfood: omni-api boots cleanly on
+ * canonical but `omni instances list` returns nothing — the data is
+ * stranded.
+ *
+ * Solution
+ * --------
+ * Spawn autopg's bundled `postgres` binary against the unmounted embedded
+ * data dir on a free TCP port, copy every public-schema table over to
+ * canonical via psql `COPY ... TO STDOUT | COPY ... FROM STDIN` pipes
+ * (psql 17 happily connects to a PG18 server — only pg_dump is strict),
+ * then shut the temp postmaster down. Postgres version compatibility is
+ * sidestepped: both embedded and canonical use the same autopg-bundled
+ * postgres binary on this host.
+ *
+ * Idempotency: caller is expected to gate on `canonical omni DB is
+ * empty + embedded dir has data` so re-running this isn't destructive.
+ * Within this function: TRUNCATE CASCADE before COPY, sequence reset
+ * after.
+ *
+ * Safety:
+ *   - Temp postmaster binds 127.0.0.1 only, on a free ephemeral port
+ *   - Spawned with `unix_socket_directories=/tmp/<unique>` to avoid
+ *     colliding with canonical's socket dir
+ *   - Caller takes a snapshot of `~/.omni/data/pgserve/` before invoking
+ *     (recommended) — this code does NOT mutate the embedded dir
+ *   - Temp postmaster gets SIGTERM in `finally`; on hard crash the
+ *     leftover postmaster.pid is recovered by the next spawn attempt
+ *     (postgres self-heals stale pidfiles on startup)
+ */
+export type MigrationResult = {
+    status: 'migrated';
+    tables: number;
+    durationMs: number;
+} | {
+    status: 'skipped';
+    reason: string;
+};
+export interface MigrateOptions {
+    /** TCP port the canonical postmaster is bound on (autopg default 5432). */
+    canonicalPort?: number;
+    /** Logger sink — defaults to writing prefixed lines to process.stdout. */
+    log?: (line: string) => void;
+}
+/**
+ * Public entry point — call this from `omni doctor --fix` when the
+ * `embedded-data-orphaned` check FAILs (canonical omni DB empty AND
+ * embedded dir has valid pg data).
+ *
+ * Returns `{ status: 'skipped', reason }` for any precondition mismatch
+ * 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;
+//# sourceMappingURL=embedded-canonical-migration.d.ts.map

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

@@ -0,0 +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;;;;;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,CA+D7G;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.14",
+    version: "2.260520.16",
     type: "module",
     exports: {
       ".": {

package/package.json

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