@automagik/omni 2.260508.2 → 2.260508.4

package/dist/index.js

@@ -21292,7 +21292,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: existsSync10 } = __require("fs");
+  var { readFile, existsSync: existsSync11 } = __require("fs");
   var dns = __require("dns");
   var VERSION2 = "2.29.3";
   var LANG = "nats.js";
@@ -21408,7 +21408,7 @@ var require_node_transport = __commonJS((exports) => {
       const d = (0, nats_base_client_1.deferred)();
       try {
         fn = resolve2(fn);
-        if (!existsSync10(fn)) {
+        if (!existsSync11(fn)) {
           d.reject(new Error(`${fn} doesn't exist`));
         }
         readFile(fn, (err, data2) => {
@@ -61871,7 +61871,7 @@ var init_a2a_provider = __esm(() => {
 // ../core/src/providers/nats-genie-provider.ts
 import { mkdir, writeFile } from "fs/promises";
 import { homedir as homedir8 } from "os";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 
 class NatsGenieProvider {
   id;
@@ -62061,10 +62061,10 @@ class NatsGenieProvider {
   }
   async writeDeadLetter(payload, error2) {
     try {
-      const dlDir = join13(homedir8(), ".omni", "dead-letters");
+      const dlDir = join14(homedir8(), ".omni", "dead-letters");
       await mkdir(dlDir, { recursive: true });
       const filename = `nats-genie-${Date.now()}-${payload.chatId}.json`;
-      await writeFile(join13(dlDir, filename), JSON.stringify({
+      await writeFile(join14(dlDir, filename), JSON.stringify({
         payload,
         error: error2 instanceof Error ? error2.message : String(error2),
         timestamp: new Date().toISOString()
@@ -63927,7 +63927,7 @@ var init_sql = __esm(() => {
       return new SQL([new StringChunk(str)]);
     }
     sql2.raw = raw2;
-    function join14(chunks, separator) {
+    function join15(chunks, separator) {
       const result = [];
       for (const [i6, chunk] of chunks.entries()) {
         if (i6 > 0 && separator !== undefined) {
@@ -63937,7 +63937,7 @@ var init_sql = __esm(() => {
       }
       return new SQL(result);
     }
-    sql2.join = join14;
+    sql2.join = join15;
     function identifier(value) {
       return new Name(value);
     }
@@ -67164,7 +67164,7 @@ var init_select2 = __esm(() => {
       return (table2, on) => {
         const baseTableName = this.tableName;
         const tableName = getTableLikeName(table2);
-        if (typeof tableName === "string" && this.config.joins?.some((join14) => join14.alias === tableName)) {
+        if (typeof tableName === "string" && this.config.joins?.some((join15) => join15.alias === tableName)) {
           throw new Error(`Alias "${tableName}" is already used in this query`);
         }
         if (!this.isPartialSelect) {
@@ -67675,7 +67675,7 @@ var init_update = __esm(() => {
     createJoin(joinType) {
       return (table2, on) => {
         const tableName = getTableLikeName(table2);
-        if (typeof tableName === "string" && this.config.joins.some((join14) => join14.alias === tableName)) {
+        if (typeof tableName === "string" && this.config.joins.some((join15) => join15.alias === tableName)) {
           throw new Error(`Alias "${tableName}" is already used in this query`);
         }
         if (typeof on === "function") {
@@ -67725,10 +67725,10 @@ var init_update = __esm(() => {
             const fromFields = this.getTableLikeFields(this.config.from);
             fields[tableName] = fromFields;
           }
-          for (const join14 of this.config.joins) {
-            const tableName2 = getTableLikeName(join14.table);
-            if (typeof tableName2 === "string" && !is(join14.table, SQL)) {
-              const fromFields = this.getTableLikeFields(join14.table);
+          for (const join15 of this.config.joins) {
+            const tableName2 = getTableLikeName(join15.table);
+            if (typeof tableName2 === "string" && !is(join15.table, SQL)) {
+              const fromFields = this.getTableLikeFields(join15.table);
               fields[tableName2] = fromFields;
             }
           }
@@ -82397,7 +82397,7 @@ var require_path = __commonJS((exports) => {
   function isAbsolute(path) {
     return path.charAt(0) === "/";
   }
-  function join18(...args) {
+  function join19(...args) {
     return normalizePath(args.join("/"));
   }
   function dirname6(path) {
@@ -82422,7 +82422,7 @@ var require_path = __commonJS((exports) => {
   exports.basename = basename6;
   exports.dirname = dirname6;
   exports.isAbsolute = isAbsolute;
-  exports.join = join18;
+  exports.join = join19;
   exports.normalizePath = normalizePath;
   exports.relative = relative;
   exports.resolve = resolve4;
@@ -123990,7 +123990,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260508.2",
+  version: "2.260508.4",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {
@@ -125191,12 +125191,47 @@ function pm2NotFoundError() {
 }
 
 // src/runtime-env.ts
+import { join as join6 } from "path";
+
+// src/lib/pgserve-transport.ts
+import { existsSync as existsSync4 } from "fs";
 import { join as join5 } from "path";
+var CANONICAL_PG_PORT = 5432;
+function resolvePgserveSocketDir() {
+  const xdg = process.env.XDG_RUNTIME_DIR;
+  const base = xdg && xdg.length > 0 ? xdg : "/tmp";
+  return join5(base, "pgserve");
+}
+function resolvePgserveLibpqSocketPath() {
+  return join5(resolvePgserveSocketDir(), `.s.PGSQL.${CANONICAL_PG_PORT}`);
+}
+function probeCanonicalSocketSync() {
+  return existsSync4(resolvePgserveLibpqSocketPath());
+}
+function buildDatabaseUrlForTransport(transport, database, options = {}) {
+  const username = options.username ?? "postgres";
+  const password = options.password ?? "postgres";
+  const auth = `${encodeURIComponent(username)}:${encodeURIComponent(password)}`;
+  if (transport.kind === "unix") {
+    const params = new URLSearchParams({
+      host: transport.socketDir,
+      port: String(transport.port)
+    });
+    return `postgresql://${auth}@/${encodeURIComponent(database)}?${params.toString()}`;
+  }
+  return `postgresql://${auth}@${transport.host}:${transport.port}/${encodeURIComponent(database)}`;
+}
+
+// src/runtime-env.ts
 var LEGACY_DEFAULT_DATABASE_URL = "postgresql://postgres:postgres@localhost:5432/omni";
+var LEGACY_PHASE2_DATABASE_URL = "postgresql://postgres:postgres@localhost:8432/omni";
 var DEFAULT_PGSERVE_PORT = 8432;
 function buildEmbeddedDatabaseUrl(pgservePort = DEFAULT_PGSERVE_PORT) {
   return `postgresql://postgres:postgres@localhost:${pgservePort}/omni`;
 }
+function buildCanonicalSocketDatabaseUrl() {
+  return buildDatabaseUrlForTransport({ kind: "unix", socketDir: resolvePgserveSocketDir(), port: CANONICAL_PG_PORT }, "omni");
+}
 function resolvePgservePort(serverConfig) {
   const maybe = serverConfig.pgservePort;
   if (typeof maybe === "number" && Number.isFinite(maybe) && maybe > 0) {
@@ -125204,24 +125239,27 @@ function resolvePgservePort(serverConfig) {
   }
   return DEFAULT_PGSERVE_PORT;
 }
+var LEGACY_DATABASE_URLS = [LEGACY_DEFAULT_DATABASE_URL, LEGACY_PHASE2_DATABASE_URL];
 function resolveDatabaseUrl(serverConfig) {
   const stored = serverConfig.databaseUrl?.trim() ?? "";
-  if (stored && stored !== LEGACY_DEFAULT_DATABASE_URL) {
+  if (stored && !LEGACY_DATABASE_URLS.includes(stored)) {
     return stored;
   }
+  if (probeCanonicalSocketSync()) {
+    return buildCanonicalSocketDatabaseUrl();
+  }
   return buildEmbeddedDatabaseUrl(resolvePgservePort(serverConfig));
 }
 function buildRuntimeEnv(serverConfig, cliConfig) {
   const pgservePort = resolvePgservePort(serverConfig);
-  const optOutOfCanonical = serverConfig.useCanonicalPgserve === false;
   return {
     API_PORT: String(serverConfig.port),
     DATABASE_URL: resolveDatabaseUrl(serverConfig),
     OMNI_API_KEY: cliConfig.apiKey ?? "",
-    MEDIA_STORAGE_PATH: join5(serverConfig.dataDir, "media"),
-    OMNI_PACKAGES_DIR: join5(serverConfig.dataDir, "packages"),
-    PGSERVE_EMBEDDED: optOutOfCanonical ? "true" : "false",
-    PGSERVE_DATA: join5(serverConfig.dataDir, "pgserve"),
+    MEDIA_STORAGE_PATH: join6(serverConfig.dataDir, "media"),
+    OMNI_PACKAGES_DIR: join6(serverConfig.dataDir, "packages"),
+    PGSERVE_EMBEDDED: "false",
+    PGSERVE_DATA: join6(serverConfig.dataDir, "pgserve"),
     PGSERVE_PORT: String(pgservePort),
     NATS_URL: "nats://localhost:4222",
     NODE_ENV: serverConfig.nodeEnv,
@@ -127535,9 +127573,9 @@ function createDeadLettersCommand() {
 }
 
 // src/commands/doctor.ts
-import { existsSync as existsSync7, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
+import { existsSync as existsSync8, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
 import { homedir as homedir6 } from "os";
-import { join as join10, resolve } from "path";
+import { join as join11, resolve } from "path";
 init_config();
 
 // src/health.ts
@@ -127563,14 +127601,14 @@ async function waitForHealth(port, timeoutMs = HEALTH_TIMEOUT_MS) {
 
 // src/install-helpers.ts
 init_config();
-import { existsSync as existsSync5, readdirSync, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync6, readdirSync, writeFileSync as writeFileSync4 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 
 // src/nats-install.ts
-import { chmodSync as chmodSync2, existsSync as existsSync4, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3 } from "fs";
+import { chmodSync as chmodSync2, existsSync as existsSync5, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 
 // ../../node_modules/.bun/ora@8.2.0/node_modules/ora/index.js
 init_source();
@@ -128460,8 +128498,8 @@ function ora(options) {
 
 // src/nats-install.ts
 init_output();
-var OMNI_DIR = join6(homedir3(), ".omni");
-var NATS_BINARY_PATH = join6(OMNI_DIR, "nats-server");
+var OMNI_DIR = join7(homedir3(), ".omni");
+var NATS_BINARY_PATH = join7(OMNI_DIR, "nats-server");
 var NATS_VERSION = "v2.12.4";
 function platformInfo() {
   const platform = process.platform;
@@ -128490,10 +128528,10 @@ async function downloadNats() {
       spinner.fail(`NATS download failed: HTTP ${resp.status}`);
       return false;
     }
-    const tarPath = join6(OMNI_DIR, fileName);
+    const tarPath = join7(OMNI_DIR, fileName);
     writeFileSync3(tarPath, Buffer.from(await resp.arrayBuffer()));
     spinner.text = "Extracting NATS binary...";
-    const tmpDir = join6(OMNI_DIR, "nats-tmp");
+    const tmpDir = join7(OMNI_DIR, "nats-tmp");
     mkdirSync3(tmpDir, { recursive: true });
     const tar = Bun.spawn({ cmd: ["tar", "-xzf", tarPath, "-C", tmpDir], stdout: "pipe", stderr: "pipe" });
     const [tarCode, tarErr] = await Promise.all([tar.exited, new Response(tar.stderr).text()]);
@@ -128519,7 +128557,7 @@ async function downloadNats() {
   }
 }
 async function ensureNats() {
-  if (existsSync4(NATS_BINARY_PATH)) {
+  if (existsSync5(NATS_BINARY_PATH)) {
     raw(`  \u2713 NATS binary found at ${NATS_BINARY_PATH}`);
     return;
   }
@@ -128529,7 +128567,7 @@ async function ensureNats() {
 
 // src/install-helpers.ts
 init_output();
-var DEFAULT_DATA_DIR = join7(homedir4(), ".omni", "data");
+var DEFAULT_DATA_DIR = join8(homedir4(), ".omni", "data");
 async function detectReinstall(dataDirOverride) {
   const hasConfig = detectHasConfig();
   const hasPm2Process = await detectHasPm2Process();
@@ -128542,7 +128580,7 @@ async function detectReinstall(dataDirOverride) {
   };
 }
 function detectHasConfig() {
-  if (!existsSync5(getConfigPath()))
+  if (!existsSync6(getConfigPath()))
     return false;
   try {
     const parsed = loadConfig();
@@ -128564,7 +128602,7 @@ async function detectHasPm2Process() {
 }
 function detectHasDataDir(dataDirOverride) {
   const dataDir = dataDirOverride ?? DEFAULT_DATA_DIR;
-  if (!existsSync5(dataDir))
+  if (!existsSync6(dataDir))
     return false;
   try {
     return readdirSync(dataDir).filter((e) => e !== ".DS_Store").length > 0;
@@ -128629,7 +128667,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart="${NATS_BINARY_PATH}" -js -sd "${join7(dataDir, "nats")}"
+ExecStart="${NATS_BINARY_PATH}" -js -sd "${join8(dataDir, "nats")}"
 Restart=on-failure
 RestartSec=5
 
@@ -128652,9 +128690,9 @@ WantedBy=multi-user.target
 init_config();
 init_output();
 import { spawnSync } from "child_process";
-import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync4, renameSync, statSync, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as readFileSync4, renameSync, statSync, writeFileSync as writeFileSync5 } from "fs";
 import { homedir as homedir5 } from "os";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 import { gunzipSync, gzipSync } from "zlib";
 var PGSERVE_REQUIRED_VERSION = "^2.1.0";
 async function isPgserveInstalled() {
@@ -128749,15 +128787,15 @@ async function resolveCanonicalPgservePreference(isReinstall, cfg) {
   raw("");
   return true;
 }
-var OMNI_EMBEDDED_PGSERVE_DATA_DIR = join8(homedir5(), ".omni", "data", "pgserve");
-var PGSERVE_DEFAULT_DATA_DIR = join8(homedir5(), ".pgserve", "data");
-var PGSERVE_CONFIG_PATH = join8(homedir5(), ".pgserve", "config.json");
-var OMNI_BACKUPS_DIR = join8(homedir5(), ".omni", "backups");
+var OMNI_EMBEDDED_PGSERVE_DATA_DIR = join9(homedir5(), ".omni", "data", "pgserve");
+var PGSERVE_DEFAULT_DATA_DIR = join9(homedir5(), ".pgserve", "data");
+var PGSERVE_CONFIG_PATH = join9(homedir5(), ".pgserve", "config.json");
+var OMNI_BACKUPS_DIR = join9(homedir5(), ".omni", "backups");
 function getEmbeddedPgserveDataDir() {
   return OMNI_EMBEDDED_PGSERVE_DATA_DIR;
 }
 function getCanonicalPgserveDataDir() {
-  if (!existsSync6(PGSERVE_CONFIG_PATH))
+  if (!existsSync7(PGSERVE_CONFIG_PATH))
     return PGSERVE_DEFAULT_DATA_DIR;
   try {
     const raw2 = readFileSync4(PGSERVE_CONFIG_PATH, "utf8");
@@ -128768,11 +128806,11 @@ function getCanonicalPgserveDataDir() {
   }
 }
 function looksLikePgDataDir(path) {
-  return existsSync6(join8(path, "PG_VERSION")) && existsSync6(join8(path, "base"));
+  return existsSync7(join9(path, "PG_VERSION")) && existsSync7(join9(path, "base"));
 }
 function getSnapshotPath(timestamp = new Date) {
   const ts = timestamp.toISOString().replace(/[:.]/g, "-");
-  return join8(OMNI_BACKUPS_DIR, `embedded-migration-${ts}.sql.gz`);
+  return join9(OMNI_BACKUPS_DIR, `embedded-migration-${ts}.sql.gz`);
 }
 function commandIsAvailable(cmd) {
   try {
@@ -128797,7 +128835,7 @@ function pgEnvFromUrl(url) {
 }
 async function dumpEmbeddedDb(currentDatabaseUrl) {
   const embeddedDir = getEmbeddedPgserveDataDir();
-  if (!existsSync6(embeddedDir)) {
+  if (!existsSync7(embeddedDir)) {
     return { status: "no-embedded-data", embeddedDir };
   }
   if (!looksLikePgDataDir(embeddedDir)) {
@@ -128873,24 +128911,24 @@ init_output();
 
 // src/server-bundle.ts
 init_output();
-import { dirname as dirname2, join as join9 } from "path";
+import { dirname as dirname2, join as join10 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function getServerBundlePath() {
   try {
     const thisFile = fileURLToPath2(import.meta.url);
     const distDir = dirname2(thisFile);
-    return join9(distDir, "server", "index.js");
+    return join10(distDir, "server", "index.js");
   } catch {
-    return join9(process.cwd(), "dist", "server", "index.js");
+    return join10(process.cwd(), "dist", "server", "index.js");
   }
 }
 function getServerLauncherPath() {
   try {
     const thisFile = fileURLToPath2(import.meta.url);
     const distDir = dirname2(thisFile);
-    return join9(distDir, "..", "bin", "omni-server");
+    return join10(distDir, "..", "bin", "omni-server");
   } catch {
-    return join9(process.cwd(), "bin", "omni-server");
+    return join10(process.cwd(), "bin", "omni-server");
   }
 }
 function bundleNotFoundError(bundlePath) {
@@ -128955,10 +128993,10 @@ function productionDeps() {
       }
     },
     findOrphanedDataDirs: () => {
-      const roots = [process.cwd(), join10(homedir6(), "workspace"), join10(homedir6(), "repos")];
+      const roots = [process.cwd(), join11(homedir6(), "workspace"), join11(homedir6(), "repos")];
       const found = [];
       for (const root of roots) {
-        if (!existsSync7(root))
+        if (!existsSync8(root))
           continue;
         try {
           scanForOrphans(root, found, 0);
@@ -129027,7 +129065,31 @@ function productionDeps() {
     dumpEmbeddedDb,
     restoreSnapshotToCanonical,
     getCanonicalPgserveDataDir,
-    saveServerConfig
+    saveServerConfig,
+    findPortOwner: async (port) => {
+      try {
+        const proc = Bun.spawn(["ss", "-tlnpH", `sport = :${port}`], {
+          stdout: "pipe",
+          stderr: "ignore"
+        });
+        const stdout = await new Response(proc.stdout).text();
+        const exitCode = await proc.exited;
+        if (exitCode !== 0)
+          return null;
+        const match = stdout.match(/pid=(\d+)/);
+        return match ? Number.parseInt(match[1], 10) : null;
+      } catch {
+        return null;
+      }
+    },
+    processKill: (pid, signal) => {
+      try {
+        process.kill(pid, signal);
+        return true;
+      } catch {
+        return false;
+      }
+    }
   };
 }
 function scanForOrphans(dir, acc, depth, maxDepth = 4) {
@@ -129042,7 +129104,7 @@ function scanForOrphans(dir, acc, depth, maxDepth = 4) {
   for (const name of entries) {
     if (name === "node_modules" || name === ".git")
       continue;
-    const full = join10(dir, name);
+    const full = join11(dir, name);
     let stats;
     try {
       stats = statSync2(full);
@@ -129162,36 +129224,41 @@ async function checkPm2MaxRestarts(deps) {
   if (!processes) {
     return { id: "pm2-max-restarts", level: "WARN", detail: "pm2 not reachable" };
   }
-  const apiEntry = processes.find((p) => p.name === PM2_PROCESSES.api);
-  if (!apiEntry) {
-    return { id: "pm2-max-restarts", level: "WARN", detail: `${PM2_PROCESSES.api} not found in pm2` };
-  }
-  const maxRestarts = apiEntry.pm2_env?.max_restarts;
-  if (typeof maxRestarts !== "number") {
-    return {
-      id: "pm2-max-restarts",
-      level: "FAIL",
-      detail: `${PM2_PROCESSES.api} has no max_restarts set \u2014 crash loops are unbounded`
-    };
-  }
-  if (maxRestarts === 0 || maxRestarts >= 1000) {
-    return {
-      id: "pm2-max-restarts",
-      level: "FAIL",
-      detail: `${PM2_PROCESSES.api} max_restarts=${maxRestarts} \u2014 crash loops are effectively unbounded`
-    };
+  const issues = [];
+  let hasFail = false;
+  const targets = [PM2_PROCESSES.api, PM2_PROCESSES.nats];
+  for (const name of targets) {
+    const entry = processes.find((p) => p.name === name);
+    if (!entry) {
+      issues.push(`${name} not found in pm2`);
+      continue;
+    }
+    const v = entry.pm2_env?.max_restarts;
+    if (typeof v !== "number") {
+      hasFail = true;
+      issues.push(`${name} has no max_restarts set \u2014 crash loops are unbounded`);
+      continue;
+    }
+    if (v === 0 || v >= 1000) {
+      hasFail = true;
+      issues.push(`${name} max_restarts=${v} \u2014 crash loops are effectively unbounded`);
+      continue;
+    }
+    if (!(v >= 5 && v <= 50)) {
+      issues.push(`${name} max_restarts=${v} \u2014 expected 5..50`);
+    }
   }
-  if (maxRestarts >= 5 && maxRestarts <= 50) {
+  if (issues.length === 0) {
     return {
       id: "pm2-max-restarts",
       level: "OK",
-      detail: `${PM2_PROCESSES.api} max_restarts=${maxRestarts}`
+      detail: `${PM2_PROCESSES.api} and ${PM2_PROCESSES.nats} max_restarts in hardened range`
     };
   }
   return {
     id: "pm2-max-restarts",
-    level: "WARN",
-    detail: `${PM2_PROCESSES.api} max_restarts=${maxRestarts} \u2014 expected 5..50`
+    level: hasFail ? "FAIL" : "WARN",
+    detail: issues.join("; ")
   };
 }
 async function checkPm2LogrotateInstalled(deps) {
@@ -129226,6 +129293,48 @@ async function checkPm2LogrotateInstalled(deps) {
     detail: "pm2-logrotate installed with expected settings"
   };
 }
+function canonicalPortTargets(serverConfig) {
+  return [
+    { name: PM2_PROCESSES.api, port: serverConfig.port },
+    { name: PM2_PROCESSES.nats, port: 4222 }
+  ];
+}
+async function checkPortCanonicalOwner(deps) {
+  const processes = await deps.getPm2Processes();
+  if (!processes) {
+    return { id: "port-canonical-owner", level: "WARN", detail: "pm2 not reachable" };
+  }
+  const { serverConfig } = deps.loadState();
+  const targets = canonicalPortTargets(serverConfig);
+  const issues = [];
+  for (const { name, port } of targets) {
+    const pm2Entry = processes.find((p) => p.name === name);
+    const pm2Pid = pm2Entry?.pid;
+    const ownerPid = await deps.findPortOwner(port);
+    if (ownerPid === null) {
+      continue;
+    }
+    if (typeof pm2Pid !== "number" || pm2Pid <= 0) {
+      issues.push(`${name}:${port} owned by pid=${ownerPid} but pm2 has no PID for ${name}`);
+      continue;
+    }
+    if (ownerPid !== pm2Pid) {
+      issues.push(`${name}:${port} owned by non-pm2 pid=${ownerPid} (pm2 child pid=${pm2Pid})`);
+    }
+  }
+  if (issues.length === 0) {
+    return {
+      id: "port-canonical-owner",
+      level: "OK",
+      detail: "all canonical ports owned by pm2-managed processes"
+    };
+  }
+  return {
+    id: "port-canonical-owner",
+    level: "FAIL",
+    detail: issues.join("; ")
+  };
+}
 async function fixPm2EnvDrift(deps) {
   const { serverConfig, cliConfig } = deps.loadState();
   const env2 = buildRuntimeEnv(serverConfig, cliConfig);
@@ -129335,6 +129444,83 @@ async function fixPgserveCanonical(deps) {
   const dataNote = dumpResult.status === "dumped" && restoreOutcome.status === "restored" ? `restored ${dumpResult.snapshotPath} into ${canonicalDir} (omni-api \u2192 ${url})` : dumpResult.status === "no-embedded-data" ? `no embedded data to migrate; canonical started empty at ${canonicalDir} (omni-api \u2192 ${url})` : `embedded data dir invalid; canonical started empty at ${canonicalDir} (omni-api \u2192 ${url})`;
   return `migrated to canonical pgserve@^2.1.0; ${dataNote}`;
 }
+async function waitForPortRelease(deps, pid, port) {
+  for (let i = 0;i < 10; i++) {
+    await deps.sleepMs(500);
+    const stillOwner = await deps.findPortOwner(port);
+    if (stillOwner !== pid)
+      return true;
+  }
+  return false;
+}
+async function reclaimPortFromSquatter(deps, target, pm2Pid, managedPids) {
+  const { name, port } = target;
+  const ownerPid = await deps.findPortOwner(port);
+  if (ownerPid === null)
+    return null;
+  if (typeof pm2Pid === "number" && ownerPid === pm2Pid)
+    return null;
+  if (managedPids.has(ownerPid)) {
+    return `SKIPPED ${name}:${port} squatter pid=${ownerPid} is itself pm2-managed`;
+  }
+  if (!deps.processKill(ownerPid, "SIGTERM")) {
+    return `FAILED ${name}:${port} could not signal pid=${ownerPid} (EPERM/ESRCH)`;
+  }
+  const released = await waitForPortRelease(deps, ownerPid, port);
+  if (!released) {
+    deps.processKill(ownerPid, "SIGKILL");
+    await deps.sleepMs(500);
+  }
+  const code = await deps.runPm2(["restart", name]);
+  if (code !== 0) {
+    return `FAILED ${name}:${port} pm2 restart exited ${code} after killing pid=${ownerPid}`;
+  }
+  return `reclaimed ${name}:${port} from non-pm2 pid=${ownerPid}`;
+}
+async function fixPortCanonicalOwner(deps) {
+  const processes = await deps.getPm2Processes();
+  if (!processes) {
+    throw new Error("pm2 not reachable \u2014 cannot reconcile port ownership");
+  }
+  const { serverConfig } = deps.loadState();
+  const targets = canonicalPortTargets(serverConfig);
+  const managedPids = new Set(processes.map((p) => p.pid).filter((p) => typeof p === "number" && p > 0));
+  const repairs = [];
+  for (const target of targets) {
+    const pm2Entry = processes.find((p) => p.name === target.name);
+    const outcome = await reclaimPortFromSquatter(deps, target, pm2Entry?.pid, managedPids);
+    if (outcome !== null)
+      repairs.push(outcome);
+  }
+  if (repairs.length === 0)
+    return "no port-ownership conflicts to reconcile";
+  return repairs.join("; ");
+}
+async function restartNonOnlineProcesses(deps) {
+  const processes = await deps.getPm2Processes();
+  if (!processes)
+    return [];
+  const restarted = [];
+  for (const name of [PM2_PROCESSES.api, PM2_PROCESSES.nats]) {
+    const entry = processes.find((p) => p.name === name);
+    if (entry?.pm2_env?.status !== "online") {
+      const code = await deps.runPm2(["restart", name]);
+      if (code === 0)
+        restarted.push(name);
+    }
+  }
+  return restarted;
+}
+async function fixPm2Status(deps) {
+  const portRepairs = await fixPortCanonicalOwner(deps);
+  const restarted = await restartNonOnlineProcesses(deps);
+  const parts = [];
+  if (portRepairs !== "no port-ownership conflicts to reconcile")
+    parts.push(portRepairs);
+  if (restarted.length > 0)
+    parts.push(`restarted ${restarted.join(", ")}`);
+  return parts.length > 0 ? parts.join("; ") : "no pm2 status remediation needed";
+}
 function fixOrphanedDataDirs(deps) {
   const found = deps.findOrphanedDataDirs();
   if (found.length === 0) {
@@ -129400,7 +129586,8 @@ async function runAllChecks(deps) {
     await checkPm2MaxRestarts(deps),
     await checkPm2LogrotateInstalled(deps),
     await checkSigningKeyForLockedInstances(deps),
-    checkPgserveCanonical(deps)
+    checkPgserveCanonical(deps),
+    await checkPortCanonicalOwner(deps)
   ];
 }
 async function applyFix(deps, check) {
@@ -129417,6 +129604,10 @@ async function applyFix(deps, check) {
       return await fixPm2LogrotateInstalled(deps);
     if (check.id === "pgserve-canonical")
       return await fixPgserveCanonical(deps);
+    if (check.id === "port-canonical-owner")
+      return await fixPortCanonicalOwner(deps);
+    if (check.id === "pm2-status")
+      return await fixPm2Status(deps);
     return null;
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -129508,9 +129699,10 @@ Checks:
   orphaned-data-dirs       .pgserve-data directories outside ~/.omni
   version-match            CLI version vs. /api/v2/health version field
   pm2-status               omni-api and omni-nats both online in pm2
-  pm2-max-restarts         omni-api max_restarts is in the hardened range
+  pm2-max-restarts         omni-api + omni-nats max_restarts in hardened range
   pm2-logrotate-installed  pm2-logrotate module installed with expected settings
   pgserve-canonical        using canonical pgserve@^2.1.0 (shared backbone) vs. embedded
+  port-canonical-owner     canonical ports (NATS, API) owned by pm2-managed PIDs
 
 Safety:
   --fix NEVER touches ~/.omni/data/pgserve \u2014 it only operates on the pm2
@@ -129533,7 +129725,7 @@ Safety:
 }
 
 // src/commands/done.ts
-import { existsSync as existsSync8, readFileSync as readFileSync5 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
 import { basename, extname } from "path";
 
 // src/context.ts
@@ -129642,7 +129834,7 @@ async function handleReact(client, ctx, emoji) {
   await closeTurn(client, "react", `Reacted ${emoji} + turn closed`);
 }
 async function handleMedia(client, ctx, mediaPath, caption) {
-  if (!existsSync8(mediaPath)) {
+  if (!existsSync9(mediaPath)) {
     return error(`File not found: ${mediaPath}`);
   }
   try {
@@ -130340,7 +130532,7 @@ function createHistoryCommand() {
 
 // src/commands/imagine.ts
 import { writeFileSync as writeFileSync7 } from "fs";
-import { basename as basename2, dirname as dirname3, extname as extname2, join as join11 } from "path";
+import { basename as basename2, dirname as dirname3, extname as extname2, join as join12 } 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) {
@@ -130355,9 +130547,9 @@ function buildOutputPath(outputBase, index, total, mimeType) {
   const ext = extname2(outputBase) || extensionForMime(mimeType);
   const stem = basename2(outputBase, extname2(outputBase));
   if (total <= 1) {
-    return join11(dir, `${stem}${ext}`);
+    return join12(dir, `${stem}${ext}`);
   }
-  return join11(dir, `${stem}-${index + 1}${ext}`);
+  return join12(dir, `${stem}-${index + 1}${ext}`);
 }
 function parseAspectRatio(value) {
   if (!value)
@@ -130475,12 +130667,12 @@ function createImagineCommand() {
 }
 
 // src/commands/install.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync5 } from "fs";
+import { existsSync as existsSync10, mkdirSync as mkdirSync5 } from "fs";
 import { homedir as homedir7 } from "os";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 init_config();
 init_output();
-var DEFAULT_DATA_DIR2 = join12(homedir7(), ".omni", "data");
+var DEFAULT_DATA_DIR2 = join13(homedir7(), ".omni", "data");
 function computeDefaultDatabaseUrl() {
   return buildEmbeddedDatabaseUrl();
 }
@@ -130579,7 +130771,7 @@ async function startServices(cfg, forceCleanup, forceSystemd, useCanonicalPgserv
     return false;
   }
   const bundlePath = getServerBundlePath();
-  if (!existsSync9(bundlePath)) {
+  if (!existsSync10(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`);
@@ -130603,9 +130795,9 @@ async function startServices(cfg, forceCleanup, forceSystemd, useCanonicalPgserv
     return false;
   }
   apiSpinner.succeed(`${PM2_PROCESSES.api} started`);
-  if (existsSync9(NATS_BINARY_PATH)) {
+  if (existsSync10(NATS_BINARY_PATH)) {
     const natsSpinner = ora(`Starting ${PM2_PROCESSES.nats}...`).start();
-    const natsDataDir = join12(cfg.dataDir, "nats");
+    const natsDataDir = join13(cfg.dataDir, "nats");
     mkdirSync5(natsDataDir, { recursive: true });
     const natsArgs = buildPm2StartArgs({
       kind: "nats",
@@ -132282,7 +132474,7 @@ function createLogsCommand() {
 }
 
 // src/commands/media.ts
-import { createWriteStream as createWriteStream2, existsSync as existsSync11, mkdirSync as mkdirSync7, statSync as statSync4 } from "fs";
+import { createWriteStream as createWriteStream2, existsSync as existsSync12, mkdirSync as mkdirSync7, 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";
@@ -132345,13 +132537,13 @@ function resolveOutputPath(outputPath, result) {
   const resolved = resolve2(outputPath);
   if (isDirHint)
     return resolve2(resolved, filename);
-  if (existsSync11(resolved) && statSync4(resolved).isDirectory())
+  if (existsSync12(resolved) && statSync4(resolved).isDirectory())
     return resolve2(resolved, filename);
   return resolved;
 }
 async function downloadToFile(url, apiKey, destinationPath) {
   const destDir = dirname4(destinationPath);
-  if (!existsSync11(destDir))
+  if (!existsSync12(destDir))
     mkdirSync7(destDir, { recursive: true });
   const resp = await fetch(url, {
     method: "GET",
@@ -133305,7 +133497,7 @@ init_output();
 init_src();
 import { execFileSync as execFileSync2, execSync } from "child_process";
 import * as nodeCrypto2 from "crypto";
-import { existsSync as existsSync12, mkdirSync as mkdirSync8, readFileSync as readFileSync8, writeFileSync as writeFileSync8 } from "fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync8, readFileSync as readFileSync8, writeFileSync as writeFileSync8 } from "fs";
 import { homedir as homedir9 } from "os";
 import { dirname as dirname5, resolve as resolve3 } from "path";
 import { createInterface as createInterface2 } from "readline";
@@ -133536,7 +133728,7 @@ async function pairDevice(gatewayUrl, gatewayToken, keypair, spinner) {
 var OPENCLAW_CONFIG_PATH = resolve3(homedir9(), ".openclaw", "openclaw.json");
 var PLUGIN_MARKER = "plugin-openclaw/omni.ts";
 function readOpenClawConfig(configPath) {
-  if (!existsSync12(configPath))
+  if (!existsSync13(configPath))
     return {};
   const raw2 = readFileSync8(configPath, "utf-8").trim();
   if (!raw2)
@@ -133577,10 +133769,10 @@ function isValidUuid2(value) {
 }
 function resolvePluginPath(explicit) {
   if (explicit) {
-    return existsSync12(explicit) ? resolve3(explicit) : null;
+    return existsSync13(explicit) ? resolve3(explicit) : null;
   }
   const cwdCandidate = resolve3(process.cwd(), "packages/plugin-openclaw/omni.ts");
-  return existsSync12(cwdCandidate) ? cwdCandidate : null;
+  return existsSync13(cwdCandidate) ? cwdCandidate : null;
 }
 function registerPlugin(config2, pluginPath, configPath) {
   if (hasOpenClawCli()) {
@@ -134289,6 +134481,167 @@ ${formatExamples(examples)}`);
   return cmd;
 }
 
+// src/lib/requirements.ts
+import { spawn } from "child_process";
+var REQUIREMENTS = Object.freeze({
+  pgserve: ">=2.3",
+  genie: ">=5.0"
+});
+var PEER_BINARIES = Object.freeze({
+  pgserve: "pgserve",
+  genie: "genie"
+});
+var PEER_VERSION_TIMEOUT_MS = 5000;
+function parseVersionTriple(raw2) {
+  const match = raw2.match(/(\d+)\.(\d+)(?:\.(\d+))?/);
+  if (!match)
+    return null;
+  const major = Number.parseInt(match[1] ?? "", 10);
+  const minor = Number.parseInt(match[2] ?? "", 10);
+  const patch = match[3] !== undefined ? Number.parseInt(match[3], 10) : 0;
+  if (!Number.isFinite(major) || !Number.isFinite(minor) || !Number.isFinite(patch))
+    return null;
+  return { major, minor, patch };
+}
+function parseConstraint(spec) {
+  const trimmed = spec.trim();
+  if (!trimmed.startsWith(">=")) {
+    throw new Error(`Unsupported version constraint shape: "${spec}". Only \`>=X.Y[.Z]\` is supported by REQUIREMENTS.`);
+  }
+  const triple = parseVersionTriple(trimmed.slice(2));
+  if (!triple) {
+    throw new Error(`Could not parse version triple from constraint: "${spec}"`);
+  }
+  return triple;
+}
+function compareVersions(a2, b8) {
+  if (a2.major !== b8.major)
+    return a2.major - b8.major;
+  if (a2.minor !== b8.minor)
+    return a2.minor - b8.minor;
+  return a2.patch - b8.patch;
+}
+function fetchPeerVersion(binary) {
+  return new Promise((resolve4) => {
+    let settled = false;
+    let stdout = "";
+    let stderr = "";
+    const proc = spawn(binary, ["--version"], { stdio: ["ignore", "pipe", "pipe"] });
+    const timer2 = setTimeout(() => {
+      if (settled)
+        return;
+      settled = true;
+      proc.kill("SIGTERM");
+      resolve4(null);
+    }, PEER_VERSION_TIMEOUT_MS);
+    timer2.unref();
+    proc.stdout?.setEncoding("utf8");
+    proc.stderr?.setEncoding("utf8");
+    proc.stdout?.on("data", (chunk) => {
+      stdout += chunk;
+    });
+    proc.stderr?.on("data", (chunk) => {
+      stderr += chunk;
+    });
+    proc.on("error", () => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer2);
+      resolve4(null);
+    });
+    proc.on("close", (code) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer2);
+      if (code !== 0) {
+        resolve4(null);
+        return;
+      }
+      const out = stdout.trim();
+      if (out.length > 0) {
+        resolve4(out);
+        return;
+      }
+      const err2 = stderr.trim();
+      resolve4(err2.length > 0 ? err2 : null);
+    });
+  });
+}
+async function checkPeerVersion(name, currentOverride) {
+  const required = REQUIREMENTS[name];
+  if (!required) {
+    return {
+      name,
+      required: "",
+      current: null,
+      ok: false,
+      reason: `Unknown peer: ${name}. Known peers: ${Object.keys(REQUIREMENTS).join(", ")}.`
+    };
+  }
+  const binary = PEER_BINARIES[name];
+  const raw2 = currentOverride !== undefined ? currentOverride : binary !== undefined ? await fetchPeerVersion(binary) : null;
+  if (raw2 === null) {
+    return {
+      name,
+      required,
+      current: null,
+      ok: false,
+      reason: `Peer "${name}" not installed or did not respond to \`${binary ?? name} --version\` within ${PEER_VERSION_TIMEOUT_MS}ms.`
+    };
+  }
+  const triple = parseVersionTriple(raw2);
+  if (!triple) {
+    return {
+      name,
+      required,
+      current: raw2,
+      ok: false,
+      reason: `Could not parse version triple from \`${binary ?? name} --version\` output: ${JSON.stringify(raw2)}.`
+    };
+  }
+  const ok3 = compareVersions(triple, parseConstraint(required)) >= 0;
+  const currentString = `${triple.major}.${triple.minor}.${triple.patch}`;
+  return {
+    name,
+    required,
+    current: currentString,
+    ok: ok3,
+    reason: ok3 ? undefined : `Peer "${name}" version ${currentString} does not satisfy ${required}. Run \`${binary ?? name} update\` first.`
+  };
+}
+async function checkAllPeers() {
+  const out = [];
+  for (const name of Object.keys(REQUIREMENTS)) {
+    out.push(await checkPeerVersion(name));
+  }
+  return out;
+}
+
+// src/commands/requirements.ts
+init_output();
+function createRequirementsCommand() {
+  return new Command("requirements").description("Show declared peer-version requirements (pgserve, genie) and live status").option("--check", "Exit non-zero if any peer fails its required version").action(async (opts) => {
+    const peers = await checkAllPeers();
+    const allOk = peers.every((p11) => p11.ok);
+    data({
+      requirements: REQUIREMENTS,
+      peers: peers.map((p11) => ({
+        name: p11.name,
+        required: p11.required,
+        current: p11.current,
+        ok: p11.ok,
+        ...p11.reason ? { reason: p11.reason } : {}
+      })),
+      ok: allOk
+    });
+    if (opts.check && !allOk) {
+      process.exitCode = 1;
+    }
+  });
+}
+
 // src/commands/restart.ts
 init_config();
 init_output();
@@ -134469,7 +134822,7 @@ function createSayCommand() {
 }
 
 // src/commands/see.ts
-import { existsSync as existsSync13, readFileSync as readFileSync9, statSync as statSync5 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync9, statSync as statSync5 } from "fs";
 import { extname as extname4 } from "path";
 init_output();
 var MIME_BY_EXT = {
@@ -134501,7 +134854,7 @@ function parseMaxTokens(value) {
   return n2;
 }
 function loadMedia(file) {
-  if (!existsSync13(file)) {
+  if (!existsSync14(file)) {
     error(`File not found: ${file}`);
   }
   const stat = statSync5(file);
@@ -134587,7 +134940,7 @@ function createSeeCommand() {
 }
 
 // src/commands/send.ts
-import { existsSync as existsSync14, readFileSync as readFileSync10 } from "fs";
+import { existsSync as existsSync15, readFileSync as readFileSync10 } from "fs";
 import { basename as basename5, extname as extname5 } from "path";
 init_source();
 init_config();
@@ -134628,7 +134981,7 @@ var messageSenders = {
     const { to, media } = options3;
     if (!to || !media)
       return;
-    if (!existsSync14(media)) {
+    if (!existsSync15(media)) {
       error(`File not found: ${media}`);
       return;
     }
@@ -135160,9 +135513,9 @@ function pickFilename(mimeType, provider) {
 }
 
 // src/commands/start.ts
-import { existsSync as existsSync15, mkdirSync as mkdirSync9 } from "fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync9 } from "fs";
 import { homedir as homedir10 } from "os";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 init_config();
 init_output();
 var START_HEALTH_TIMEOUT_MS = 1e4;
@@ -135171,7 +135524,7 @@ async function runStart() {
     pm2NotFoundError();
   }
   const bundlePath = getServerBundlePath();
-  if (!existsSync15(bundlePath)) {
+  if (!existsSync16(bundlePath)) {
     bundleNotFoundError(bundlePath);
   }
   const serverConfig = loadServerConfig();
@@ -135192,10 +135545,10 @@ async function runStart() {
     error(`Failed to start ${PM2_PROCESSES.api} (pm2 exit code ${apiCode})`, undefined, 1);
     return;
   }
-  const natsPath = join14(homedir10(), ".omni", "nats-server");
-  if (existsSync15(natsPath)) {
+  const natsPath = join15(homedir10(), ".omni", "nats-server");
+  if (existsSync16(natsPath)) {
     info(`Starting ${PM2_PROCESSES.nats}...`);
-    const natsDataDir = join14(serverConfig.dataDir, "nats");
+    const natsDataDir = join15(serverConfig.dataDir, "nats");
     mkdirSync9(natsDataDir, { recursive: true });
     const natsArgs = buildPm2StartArgs({
       kind: "nats",
@@ -135616,8 +135969,8 @@ function createTurnsCommand() {
 }
 
 // src/commands/update.ts
-import { existsSync as existsSync17 } from "fs";
-import { join as join16 } from "path";
+import { existsSync as existsSync18 } from "fs";
+import { join as join17 } from "path";
 import { createInterface as createInterface3 } from "readline";
 init_source();
 init_config();
@@ -135899,9 +136252,9 @@ async function cleanupLegacyArtifacts(skipList) {
 init_output();
 
 // src/update-diagnostics.ts
-import { existsSync as existsSync16, mkdirSync as mkdirSync10, readFileSync as readFileSync11, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync17, mkdirSync as mkdirSync10, readFileSync as readFileSync11, writeFileSync as writeFileSync9 } from "fs";
 import { homedir as homedir11 } from "os";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 var UPDATE_DIAGNOSTICS_SCHEMA_VERSION = 1;
 function createDiagnostics(args) {
   const startedAt = new Date().toISOString();
@@ -135923,15 +136276,15 @@ function createDiagnostics(args) {
   };
 }
 function getDiagnosticsDir() {
-  const base = process.env.OMNI_CONFIG_DIR ?? join15(homedir11(), ".omni");
-  return join15(base, "logs");
+  const base = process.env.OMNI_CONFIG_DIR ?? join16(homedir11(), ".omni");
+  return join16(base, "logs");
 }
 function getDiagnosticsPath(startedAt) {
   const safe = startedAt.replace(/:/g, "-");
-  return join15(getDiagnosticsDir(), `update-diagnostics-${safe}.json`);
+  return join16(getDiagnosticsDir(), `update-diagnostics-${safe}.json`);
 }
 function tailFileLines(path, maxLines) {
-  if (!existsSync16(path))
+  if (!existsSync17(path))
     return [];
   try {
     const raw2 = readFileSync11(path, "utf8");
@@ -135967,7 +136320,7 @@ function writeDiagnostics(state, exitCode) {
   const dir = getDiagnosticsDir();
   const path = getDiagnosticsPath(state.startedAt);
   try {
-    if (!existsSync16(dir)) {
+    if (!existsSync17(dir)) {
       mkdirSync10(dir, { recursive: true, mode: 448 });
     }
     writeFileSync9(path, `${JSON.stringify(state, null, 2)}
@@ -136141,7 +136494,7 @@ function printVerifySkippedBanner(latest) {
 }
 function detectParallelNpmGlobalInstall(deps) {
   const npmRootFn = deps?.npmRoot ?? defaultNpmRoot;
-  const existsFn = deps?.exists ?? existsSync17;
+  const existsFn = deps?.exists ?? existsSync18;
   let root;
   try {
     root = npmRootFn();
@@ -136151,7 +136504,7 @@ function detectParallelNpmGlobalInstall(deps) {
   if (root === null || root.length === 0) {
     return { detected: false, skipped: "npm-not-on-path" };
   }
-  const candidate = join16(root, "@automagik", "omni");
+  const candidate = join17(root, "@automagik", "omni");
   if (existsFn(candidate)) {
     return { detected: true, path: candidate };
   }
@@ -136302,61 +136655,6 @@ async function promptConfirm(question) {
     });
   });
 }
-var PHASE_2_CUTOFF_MINOR = 260502;
-function isAtOrPastPhase2(version2) {
-  const [_major, minorStr] = version2.split(".");
-  const minor = Number.parseInt(minorStr ?? "", 10);
-  if (!Number.isFinite(minor))
-    return false;
-  return minor >= PHASE_2_CUTOFF_MINOR;
-}
-function isPgserveOnPath() {
-  try {
-    const result = Bun.spawnSync({
-      cmd: ["pgserve", "port"],
-      stdout: "pipe",
-      stderr: "pipe",
-      timeout: 3000
-    });
-    return result.exitCode === 0;
-  } catch {
-    return false;
-  }
-}
-function checkCanonicalPgservePreflight(args) {
-  if (isAtOrPastPhase2(args.currentVersion))
-    return null;
-  if (!isAtOrPastPhase2(args.targetVersion))
-    return null;
-  if (args.useCanonicalPgserve === true)
-    return null;
-  if (args.useCanonicalPgserve === false)
-    return null;
-  if (args.pgserveOnPath)
-    return null;
-  return [
-    "Refusing to upgrade \u2014 this would break omni-api on next restart.",
-    "",
-    `  Target version v${args.targetVersion} ships the phase-2 canonical-pgserve default flip`,
-    "  (omni#596). Your current install has `useCanonicalPgserve` unset and no `pgserve`",
-    "  binary on PATH, so omni-api would boot with PGSERVE_EMBEDDED=false and fail to",
-    "  connect to a non-existent canonical pgserve.",
-    "",
-    "  Pick one of:",
-    "",
-    "    (recommended) Migrate to canonical pgserve:",
-    "      bun add -g pgserve@^2.1.0",
-    "      omni doctor --fix      # automated pg_dump \u2192 install \u2192 restore",
-    "      omni update            # then re-run",
-    "",
-    "    (transitional) Pin embedded explicitly:",
-    "      omni config set server.useCanonicalPgserve 'false'",
-    "      omni update            # then re-run",
-    "",
-    "  Bypass this check (NOT recommended) with: omni update --skip-canonical-preflight"
-  ].join(`
-`);
-}
 async function runUpdate(options3) {
   const channel2 = resolveChannel(options3);
   if (options3.next || options3.stable) {
@@ -136389,23 +136687,6 @@ async function runUpdate(options3) {
     success(`Already up to date (v${latest}, channel: ${channel2})`);
     return finalize(0);
   }
-  if (!options3.skipCanonicalPreflight) {
-    diagnostics.preflight.ran = true;
-    const serverConfig = loadServerConfig();
-    const preflightError = checkCanonicalPgservePreflight({
-      currentVersion: currentClean,
-      targetVersion: latest,
-      useCanonicalPgserve: serverConfig.useCanonicalPgserve,
-      pgserveOnPath: isPgserveOnPath()
-    });
-    if (preflightError !== null) {
-      diagnostics.preflight.blocked = true;
-      diagnostics.preflight.reason = preflightError.split(`
-`)[0];
-      warn(preflightError);
-      return finalize(1);
-    }
-  }
   info(`Update available: v${currentClean} \u2192 v${latest} (${channel2})`);
   if (!options3.yes) {
     const confirmed = await promptConfirm(`Update from v${currentClean} to v${latest}? [Y/n] `);
@@ -136451,7 +136732,7 @@ function parseSkipCleanupList(value) {
   return new Set(names);
 }
 function createUpdateCommand() {
-  return new Command("update").description(`Update ${PACKAGE_NAME} to the latest version (restart only services already running)`).option("-y, --yes", "Skip confirmation prompts (non-interactive)").option("--no-restart", "Update CLI only; skip service restarts and verification").option("--no-verify", "Restart services but skip the post-restart probe (use when a release ships a broken /api/v2/health and operators need to roll forward)").option("--no-legacy-cleanup", "Skip every registered legacy-artifact cleanup (e.g. nats-reply-sidecar)").option("--no-sidecar-cleanup", "Deprecated alias for --no-legacy-cleanup").option("--skip-cleanup <names>", 'Comma-separated list of legacy-cleanup registry entries to skip (e.g. "nats-reply-sidecar")').option("--next", "Switch to dev builds (npm @next tag) and persist as default").option("--stable", "Switch to stable releases (npm @latest tag) and persist as default").option("--skip-canonical-preflight", "Bypass the canonical-pgserve phase-2 pre-flight (NOT recommended; for operators who pre-installed pgserve via a path the auto-detector misses)").option("--skip-maintenance", `Skip the post-update maintenance hook (read-only \`omni doctor\` sweep). Also honored via the ${OMNI_UPDATE_SKIP_MAINTENANCE_ENV} env var.`).addHelpText("after", `
+  return new Command("update").description(`Update ${PACKAGE_NAME} to the latest version (restart only services already running)`).option("-y, --yes", "Skip confirmation prompts (non-interactive)").option("--no-restart", "Update CLI only; skip service restarts and verification").option("--no-verify", "Restart services but skip the post-restart probe (use when a release ships a broken /api/v2/health and operators need to roll forward)").option("--no-legacy-cleanup", "Skip every registered legacy-artifact cleanup (e.g. nats-reply-sidecar)").option("--no-sidecar-cleanup", "Deprecated alias for --no-legacy-cleanup").option("--skip-cleanup <names>", 'Comma-separated list of legacy-cleanup registry entries to skip (e.g. "nats-reply-sidecar")').option("--next", "Switch to dev builds (npm @next tag) and persist as default").option("--stable", "Switch to stable releases (npm @latest tag) and persist as default").option("--skip-maintenance", `Skip the post-update maintenance hook (read-only \`omni doctor\` sweep). Also honored via the ${OMNI_UPDATE_SKIP_MAINTENANCE_ENV} env var.`).addHelpText("after", `
 Channels:
   - stable (default) \u2014 tracks the npm @latest tag, bumped from main branch releases.
   - next (dev builds) \u2014 tracks the npm @next tag, bumped on every CI-green dev merge.
@@ -136846,13 +137127,13 @@ init_config();
 init_output();
 
 // src/manifest-pin.ts
-import { existsSync as existsSync18, readFileSync as readFileSync12, renameSync as renameSync3, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync19, readFileSync as readFileSync12, renameSync as renameSync3, writeFileSync as writeFileSync10 } from "fs";
 import { homedir as homedir12 } from "os";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 var PACKAGE_NAME2 = "@automagik/omni";
-var BUN_GLOBAL_MANIFEST = join17(homedir12(), ".bun", "install", "global", "package.json");
+var BUN_GLOBAL_MANIFEST = join18(homedir12(), ".bun", "install", "global", "package.json");
 function pinManifestEntry(manifestPath, exactVersion) {
-  if (!existsSync18(manifestPath))
+  if (!existsSync19(manifestPath))
     return false;
   let manifest;
   try {
@@ -137296,6 +137577,12 @@ var COMMANDS = [
     helpGroup: "System",
     helpDescription: "Diagnose and repair the embedded omni runtime"
   },
+  {
+    create: createRequirementsCommand,
+    category: "standard",
+    helpGroup: "System",
+    helpDescription: "Show declared peer-version requirements (pgserve, genie)"
+  },
   {
     create: createMediaCommand,
     category: "standard",