@automagik/omni 2.260430.13 → 2.260430.15

package/dist/commands/doctor.d.ts

@@ -41,7 +41,7 @@ import { type Config, type ServerConfig } from '../config.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';
+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';
 export interface CheckResult {
     id: CheckId;
     level: CheckLevel;
@@ -135,6 +135,18 @@ export interface DoctorDeps {
      * that as a WARN so it's caught before the operator hits the wall.
      */
     cliHasSigningKey: () => boolean;
+    /**
+     * Run canonical pgserve setup (probe binary → `pgserve install` →
+     * `pgserve url`). Returns the canonical URL on success or null on
+     * failure. Stubbed in tests.
+     */
+    setupCanonicalPgserve: () => Promise<string | null>;
+    /**
+     * Persist a partial server config (merges with existing). Stubbed in
+     * tests so the canonical-pgserve fix can be validated without writing
+     * to ~/.omni/config.json.
+     */
+    saveServerConfig: (partial: Partial<ServerConfig>) => void;
 }
 /**
  * Run all checks and optionally apply fixes. Returns a structured

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/commands/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwBpC;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,8FAA8F;AAC9F,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IAAE,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAIvF;AAYD,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAyLD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAmCzF;AA2DD,wBAAgB,oBAAoB,IAAI,OAAO,CAU9C"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAyBpC;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,8FAA8F;AAC9F,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IAAE,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAIvF;AAYD,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AA0MD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAmCzF;AAiED,wBAAgB,oBAAoB,IAAI,OAAO,CAU9C"}

package/dist/config.d.ts

@@ -12,6 +12,17 @@ export interface ServerConfig {
     dataDir: string;
     logLevel: string;
     nodeEnv: string;
+    /**
+     * When true, omni-api connects to an externally-managed canonical pgserve
+     * (the one registered by `pgserve install` from pgserve@^2.1.0) and SKIPS
+     * its embedded pgserve startup path. Persisted by `omni install` (default
+     * true on fresh installs; preserved on reinstalls) and by
+     * `omni doctor --fix` when migrating an embedded install onto canonical.
+     *
+     * Default behavior on legacy configs (field absent): treated as false →
+     * embedded mode continues. Operators migrate via `omni doctor --fix`.
+     */
+    useCanonicalPgserve?: boolean;
 }
 /** Valid config keys (top-level and dot-notation server.* keys) */
 export type ConfigKey = 'apiUrl' | 'apiKey' | 'defaultInstance' | 'format' | 'showCommands' | 'telemetry' | 'updateChannel' | 'server.port' | 'server.databaseUrl' | 'server.dataDir' | 'server.logLevel' | 'server.nodeEnv';

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,oCAAoC;AACpC,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC;AAEzE,gCAAgC;AAChC,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,mEAAmE;AACnE,MAAM,MAAM,SAAS,GACjB,QAAQ,GACR,QAAQ,GACR,iBAAiB,GACjB,QAAQ,GACR,cAAc,GACd,WAAW,GACX,eAAe,GACf,aAAa,GACb,oBAAoB,GACpB,gBAAgB,GAChB,iBAAiB,GACjB,gBAAgB,CAAC;AAErB,4BAA4B;AAC5B,MAAM,WAAW,MAAM;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;CAChC;AAQD,qDAAqD;AACrD,eAAO,MAAM,qBAAqB,EAAE,YAMnC,CAAC;AAEF,0CAA0C;AAC1C,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CA4BrF,CAAC;AAEF,gCAAgC;AAChC,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,2BAA2B;AAC3B,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAUD,4BAA4B;AAC5B,wBAAgB,UAAU,IAAI,MAAM,CAcnC;AAED,0BAA0B;AAC1B,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAI/C;AAED,gCAAgC;AAChC,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAcjE;AA6CD,gCAAgC;AAChC,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CASlE;AAED,4BAA4B;AAC5B,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAmBtD;AAED,mCAAmC;AACnC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,SAAS,CAE9D;AAED,2DAA2D;AAC3D,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAE/D;AAED,8EAA8E;AAC9E,wBAAgB,eAAe,IAAI,OAAO,GAAG,MAAM,CAqBlD;AAED,yDAAyD;AACzD,wBAAgB,gBAAgB,IAAI,YAAY,CAG/C;AAED,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAIrE;AAED,kCAAkC;AAClC,wBAAgB,OAAO,IAAI,OAAO,CAGjC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,oCAAoC;AACpC,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC;AAEzE,gCAAgC;AAChC,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;;;;OASG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,mEAAmE;AACnE,MAAM,MAAM,SAAS,GACjB,QAAQ,GACR,QAAQ,GACR,iBAAiB,GACjB,QAAQ,GACR,cAAc,GACd,WAAW,GACX,eAAe,GACf,aAAa,GACb,oBAAoB,GACpB,gBAAgB,GAChB,iBAAiB,GACjB,gBAAgB,CAAC;AAErB,4BAA4B;AAC5B,MAAM,WAAW,MAAM;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;CAChC;AAQD,qDAAqD;AACrD,eAAO,MAAM,qBAAqB,EAAE,YAMnC,CAAC;AAEF,0CAA0C;AAC1C,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CA4BrF,CAAC;AAEF,gCAAgC;AAChC,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,2BAA2B;AAC3B,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAUD,4BAA4B;AAC5B,wBAAgB,UAAU,IAAI,MAAM,CAcnC;AAED,0BAA0B;AAC1B,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAI/C;AAED,gCAAgC;AAChC,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAcjE;AA6CD,gCAAgC;AAChC,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CASlE;AAED,4BAA4B;AAC5B,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAmBtD;AAED,mCAAmC;AACnC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,SAAS,CAE9D;AAED,2DAA2D;AAC3D,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAE/D;AAED,8EAA8E;AAC9E,wBAAgB,eAAe,IAAI,OAAO,GAAG,MAAM,CAqBlD;AAED,yDAAyD;AACzD,wBAAgB,gBAAgB,IAAI,YAAY,CAG/C;AAED,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAIrE;AAED,kCAAkC;AAClC,wBAAgB,OAAO,IAAI,OAAO,CAGjC"}

package/dist/index.js

@@ -114079,7 +114079,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260430.13",
+  version: "2.260430.15",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {
@@ -115297,13 +115297,14 @@ function resolveDatabaseUrl(serverConfig) {
 }
 function buildRuntimeEnv(serverConfig, cliConfig) {
   const pgservePort = resolvePgservePort(serverConfig);
+  const useCanonical = serverConfig.useCanonicalPgserve === true;
   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: "true",
+    PGSERVE_EMBEDDED: useCanonical ? "false" : "true",
     PGSERVE_DATA: join5(serverConfig.dataDir, "pgserve"),
     PGSERVE_PORT: String(pgservePort),
     NATS_URL: "nats://localhost:4222",
@@ -118728,6 +118729,103 @@ WantedBy=multi-user.target
   }
 }
 
+// src/lib/canonical-pgserve.ts
+init_config();
+init_output();
+var PGSERVE_REQUIRED_VERSION = "^2.1.0";
+async function isPgserveInstalled() {
+  try {
+    const code = await Bun.spawn({ cmd: ["pgserve", "port"], stdout: "pipe", stderr: "pipe" }).exited;
+    return code === 0;
+  } catch {
+    return false;
+  }
+}
+async function ensurePgserveBinary() {
+  if (await isPgserveInstalled())
+    return true;
+  raw(`  Installing pgserve@${PGSERVE_REQUIRED_VERSION} globally (bun add -g)...`);
+  const installCode = await Bun.spawn({
+    cmd: ["bun", "add", "-g", `pgserve@${PGSERVE_REQUIRED_VERSION}`],
+    stdout: "inherit",
+    stderr: "inherit"
+  }).exited;
+  if (installCode !== 0) {
+    warn(`bun add -g pgserve@${PGSERVE_REQUIRED_VERSION} exited with code ${installCode}`);
+    return false;
+  }
+  return isPgserveInstalled();
+}
+async function runPgserveInstall() {
+  raw("  Registering canonical pgserve under pm2 (idempotent)...");
+  const installCode = await Bun.spawn({ cmd: ["pgserve", "install"], stdout: "inherit", stderr: "inherit" }).exited;
+  if (installCode !== 0) {
+    warn(`pgserve install exited with code ${installCode}`);
+    return false;
+  }
+  return true;
+}
+var OMNI_DATABASE_NAME = "omni";
+async function readPgservePort() {
+  const proc = Bun.spawn({ cmd: ["pgserve", "port"], stdout: "pipe", stderr: "inherit" });
+  const stdout = await new Response(proc.stdout).text();
+  const code = await proc.exited;
+  if (code !== 0) {
+    warn(`pgserve port exited with code ${code}`);
+    return null;
+  }
+  const port = Number.parseInt(stdout.trim(), 10);
+  if (!Number.isFinite(port) || port <= 0 || port > 65535) {
+    warn(`pgserve port returned unexpected output ("${stdout.trim()}")`);
+    return null;
+  }
+  return port;
+}
+function buildOmniDatabaseUrl(port) {
+  return `postgresql://postgres:postgres@localhost:${port}/${OMNI_DATABASE_NAME}`;
+}
+async function setupCanonicalPgserve() {
+  if (!await ensurePgserveBinary()) {
+    warn("Canonical pgserve binary unavailable \u2014 install manually: bun add -g pgserve@^2.1.0");
+    return null;
+  }
+  if (!await runPgserveInstall())
+    return null;
+  const port = await readPgservePort();
+  if (port === null)
+    return null;
+  return buildOmniDatabaseUrl(port);
+}
+async function resolveCanonicalPgservePreference(isReinstall, cfg) {
+  if (isReinstall) {
+    const existing = loadServerConfig().useCanonicalPgserve === true;
+    if (!existing)
+      return false;
+    raw("  Canonical pgserve mode (preserved from previous install)");
+    const url2 = await setupCanonicalPgserve();
+    if (!url2) {
+      warn("Canonical pgserve refresh failed \u2014 keeping previous databaseUrl.");
+      return true;
+    }
+    cfg.databaseUrl = url2;
+    raw(`    \u2713 omni-api will connect to ${url2}`);
+    raw("");
+    return true;
+  }
+  raw("  Canonical pgserve mode (default for new installs)");
+  const url = await setupCanonicalPgserve();
+  if (!url) {
+    warn("Canonical pgserve setup did not complete \u2014 falling back to embedded pgserve. Run `omni doctor --fix` later to migrate.");
+    raw("");
+    return false;
+  }
+  cfg.databaseUrl = url;
+  raw(`    \u2713 omni-api will connect to ${url}`);
+  raw("    \u2713 embedded pgserve will be skipped (PGSERVE_EMBEDDED=false)");
+  raw("");
+  return true;
+}
+
 // src/commands/doctor.ts
 init_output();
 
@@ -118882,7 +118980,9 @@ function productionDeps() {
         return [];
       }
     },
-    cliHasSigningKey: () => loadSigningContext() !== null
+    cliHasSigningKey: () => loadSigningContext() !== null,
+    setupCanonicalPgserve,
+    saveServerConfig
   };
 }
 function scanForOrphans(dir, acc, depth, maxDepth = 4) {
@@ -119151,6 +119251,29 @@ async function fixCliKeyValid(deps) {
   deps.saveCliConfig(updated);
   return "rotated CLI key and re-validated";
 }
+async function fixPgserveCanonical(deps) {
+  const { serverConfig, cliConfig } = deps.loadState();
+  await deps.runPm2(["stop", PM2_PROCESSES.api]);
+  const url = await deps.setupCanonicalPgserve();
+  if (!url) {
+    await deps.runPm2(["start", PM2_PROCESSES.api]);
+    throw new Error("canonical pgserve setup failed (pgserve binary unavailable or install failed) \u2014 install manually: bun add -g pgserve@^2.1.0");
+  }
+  deps.saveServerConfig({ databaseUrl: url, useCanonicalPgserve: true });
+  const env2 = buildRuntimeEnv({ ...serverConfig, databaseUrl: url, useCanonicalPgserve: true }, cliConfig);
+  await deps.runPm2(["delete", PM2_PROCESSES.api], env2);
+  const startArgs = buildPm2StartArgs({
+    kind: "api",
+    script: getServerLauncherPath(),
+    name: PM2_PROCESSES.api,
+    interpreter: "bash"
+  });
+  const startCode = await deps.runPm2(startArgs, env2);
+  if (startCode !== 0) {
+    throw new Error(`pm2 start ${PM2_PROCESSES.api} exited ${startCode} after canonical migration`);
+  }
+  return `migrated to canonical pgserve@^2.1.0; omni-api now connects to ${url}`;
+}
 function fixOrphanedDataDirs(deps) {
   const found = deps.findOrphanedDataDirs();
   if (found.length === 0) {
@@ -119189,6 +119312,21 @@ async function checkSigningKeyForLockedInstances(deps) {
     detail: `${locked.length} instance(s) require signing (${names}${more}) but this CLI has no key in ~/.omni/keys/. Bearer-only admin against these instances will fail with 401 GENIE_SIGNATURE_REQUIRED. Run \`omni trust handshake\` to enable signed requests. (The unlock-only PATCH escape from omni#568 still works without a key.)`
   };
 }
+function checkPgserveCanonical(deps) {
+  const { serverConfig } = deps.loadState();
+  if (serverConfig.useCanonicalPgserve === true) {
+    return {
+      id: "pgserve-canonical",
+      level: "OK",
+      detail: "using canonical pgserve@^2.1.0 (single shared backbone with genie + others)"
+    };
+  }
+  return {
+    id: "pgserve-canonical",
+    level: "WARN",
+    detail: "using embedded pgserve \u2014 pgserve@^2.1.0 has grown up and is now the recommended shared backbone. Run `omni doctor --fix` to migrate (idempotent; preserves all data)."
+  };
+}
 async function runAllChecks(deps) {
   return [
     await checkPm2EnvDrift(deps),
@@ -119200,7 +119338,8 @@ async function runAllChecks(deps) {
     await checkPm2Status(deps),
     await checkPm2MaxRestarts(deps),
     await checkPm2LogrotateInstalled(deps),
-    await checkSigningKeyForLockedInstances(deps)
+    await checkSigningKeyForLockedInstances(deps),
+    checkPgserveCanonical(deps)
   ];
 }
 async function applyFix(deps, check) {
@@ -119215,6 +119354,8 @@ async function applyFix(deps, check) {
       return await fixPm2MaxRestarts(deps);
     if (check.id === "pm2-logrotate-installed")
       return await fixPm2LogrotateInstalled(deps);
+    if (check.id === "pgserve-canonical")
+      return await fixPgserveCanonical(deps);
     return null;
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -119238,13 +119379,21 @@ async function runDoctor(options, depsOverride) {
   let checks = await runAllChecks(deps);
   const fixesApplied = [];
   if (options.fix) {
+    const canonicalCheck = checks.find((c2) => c2.id === "pgserve-canonical");
+    if (canonicalCheck && canonicalCheck.level !== "OK") {
+      const result = await applyFix(deps, canonicalCheck);
+      if (result !== null)
+        fixesApplied.push(result);
+      checks = await runAllChecks(deps);
+    }
     for (const check of checks) {
       if (check.level === "OK")
         continue;
+      if (check.id === "pgserve-canonical")
+        continue;
       const result = await applyFix(deps, check);
-      if (result !== null) {
+      if (result !== null)
         fixesApplied.push(result);
-      }
     }
     checks = await runAllChecks(deps);
   }
@@ -119281,6 +119430,7 @@ Checks:
   pm2-status               omni-api and omni-nats both online in pm2
   pm2-max-restarts         omni-api max_restarts is in the hardened range
   pm2-logrotate-installed  pm2-logrotate module installed with expected settings
+  pgserve-canonical        using canonical pgserve@^2.1.0 (shared backbone) vs. embedded
 
 Safety:
   --fix NEVER touches ~/.omni/data/pgserve \u2014 it only operates on the pm2
@@ -120324,19 +120474,20 @@ function resolveReinstallConfig(options) {
     apiKey
   };
 }
-function buildInstallRuntimeEnv(cfg, forceCleanup) {
+function buildInstallRuntimeEnv(cfg, forceCleanup, useCanonicalPgserve) {
   const serverConfig = {
     ...DEFAULT_SERVER_CONFIG,
     port: cfg.port,
     databaseUrl: cfg.databaseUrl,
-    dataDir: cfg.dataDir
+    dataDir: cfg.dataDir,
+    useCanonicalPgserve
   };
   const env2 = buildRuntimeEnv(serverConfig, { apiKey: cfg.apiKey });
   if (forceCleanup)
     env2.OMNI_PGSERVE_FORCE_CLEANUP = "true";
   return env2;
 }
-async function startServices(cfg, forceCleanup, forceSystemd) {
+async function startServices(cfg, forceCleanup, forceSystemd, useCanonicalPgserve) {
   if (forceSystemd) {
     writeSystemdUnit(cfg.dataDir);
     return false;
@@ -120356,7 +120507,7 @@ async function startServices(cfg, forceCleanup, forceSystemd) {
   }
   mkdirSync4(getPm2LogDir(), { recursive: true });
   await installPm2Logrotate();
-  const runtimeEnv = buildInstallRuntimeEnv(cfg, forceCleanup);
+  const runtimeEnv = buildInstallRuntimeEnv(cfg, forceCleanup, useCanonicalPgserve);
   await runPm2(["delete", PM2_PROCESSES.api]);
   await runPm2(["delete", PM2_PROCESSES.nats]);
   const apiSpinner = ora(`Starting ${PM2_PROCESSES.api} on port ${cfg.port}...`).start();
@@ -120392,7 +120543,7 @@ async function startServices(cfg, forceCleanup, forceSystemd) {
   }
   return true;
 }
-function writeConfigFile(cfg) {
+function writeConfigFile(cfg, useCanonicalPgserve) {
   const existing = loadConfig();
   saveConfig({
     ...existing,
@@ -120400,7 +120551,12 @@ function writeConfigFile(cfg) {
     apiKey: cfg.apiKey,
     format: existing.format ?? "human"
   });
-  saveServerConfig({ port: cfg.port, databaseUrl: cfg.databaseUrl, dataDir: cfg.dataDir });
+  saveServerConfig({
+    port: cfg.port,
+    databaseUrl: cfg.databaseUrl,
+    dataDir: cfg.dataDir,
+    useCanonicalPgserve
+  });
 }
 async function checkHealth(port) {
   const spinner = ora(`Checking health at http://localhost:${port}/api/v2/health...`).start();
@@ -120485,9 +120641,10 @@ async function runInstall(options) {
     raw("");
   }
   await runSystemChecks(cfg.port);
+  const useCanonicalPgserve = await resolveCanonicalPgservePreference(signals2.isReinstall, cfg);
   await ensureNats();
-  const servicesStarted = await startServices(cfg, forceCleanup, forceSystemd);
-  writeConfigFile(cfg);
+  const servicesStarted = await startServices(cfg, forceCleanup, forceSystemd, useCanonicalPgserve);
+  writeConfigFile(cfg, useCanonicalPgserve);
   success(`Config written to ${getConfigPath()}`);
   if (servicesStarted)
     await checkHealth(cfg.port);

package/dist/lib/canonical-pgserve.d.ts

@@ -0,0 +1,50 @@
+/**
+ * Canonical pgserve helpers — single shared pgserve@^2.1.0 backbone.
+ *
+ * Background
+ * ----------
+ * Up through omni 2.260430, omni-api spawned its own embedded pgserve
+ * via `await import('pgserve')`. That worked, but every other service
+ * (genie-serve, future agents) that wanted Postgres span its own copy,
+ * so a single host could end up with 3+ pgserve instances on different
+ * ports with scattered data dirs. Canonical pgserve fixes this:
+ *
+ *   - `pgserve install` (from pgserve@^2.1.0) registers ONE pm2-supervised
+ *     pgserve instance on the canonical port (8432).
+ *   - `pgserve url` returns its connection string — every downstream
+ *     service (omni, genie, ...) reads this and connects there.
+ *   - `omni install` calls `pgserve install` first, writes the URL into
+ *     `~/.omni/config.json`, and starts omni-api with `PGSERVE_EMBEDDED=false`
+ *     so the API skips its own embedded boot path.
+ *
+ * Embedded mode is NOT removed. It stays as the active path on existing
+ * installs (where `serverConfig.useCanonicalPgserve` is undefined or
+ * false) until the operator opts in via `omni doctor --fix`. Fresh
+ * installs default to canonical.
+ */
+/**
+ * Full canonical pgserve setup: ensure binary → `pgserve install` → read
+ * the canonical url. Returns the URL on success, null on any failure.
+ *
+ * The caller (omni install) writes this URL into serverConfig.databaseUrl
+ * so omni-api connects there with `PGSERVE_EMBEDDED=false`.
+ */
+export declare function setupCanonicalPgserve(): Promise<string | null>;
+/**
+ * Decide whether an install run should use canonical pgserve and, when yes,
+ * mutate `cfg.databaseUrl` to the canonical url.
+ *
+ * Semantics:
+ *   - Fresh install → ALWAYS canonical (auto-installs `pgserve` globally
+ *     when missing, runs `pgserve install`, reads `pgserve url`). If
+ *     canonical setup completely fails, falls back to embedded with a warn
+ *     — the install still completes.
+ *   - Reinstall → preserves the operator's existing
+ *     `serverConfig.useCanonicalPgserve`. If `true`, re-runs setup
+ *     (idempotent) to refresh the canonical url. If `false`/undefined,
+ *     leaves embedded mode alone — operator migrates via `omni doctor --fix`.
+ */
+export declare function resolveCanonicalPgservePreference(isReinstall: boolean, cfg: {
+    databaseUrl: string;
+}): Promise<boolean>;
+//# sourceMappingURL=canonical-pgserve.d.ts.map

package/dist/lib/canonical-pgserve.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"canonical-pgserve.d.ts","sourceRoot":"","sources":["../../src/lib/canonical-pgserve.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAwHH;;;;;;GAMG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CASpE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iCAAiC,CACrD,WAAW,EAAE,OAAO,EACpB,GAAG,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,OAAO,CAAC,CA6BlB"}

package/dist/runtime-env.d.ts

@@ -72,6 +72,12 @@ export declare function resolveDatabaseUrl(serverConfig: ServerConfig): string;
  * Build the complete runtime env for the omni-api process.
  *
  * All values come from `serverConfig` / `cliConfig`. No shell env reads.
+ *
+ * `PGSERVE_EMBEDDED` is flipped off when `serverConfig.useCanonicalPgserve`
+ * is true — the omni-api code path in `packages/api/src/pgserve.ts` reads
+ * this and skips its embedded pgserve startup, connecting instead to
+ * whatever `DATABASE_URL` points at (typically the canonical pgserve
+ * registered by `pgserve install` from pgserve@^2.1.0).
  */
 export declare function buildRuntimeEnv(serverConfig: ServerConfig, cliConfig: Config): RuntimeEnv;
 //# sourceMappingURL=runtime-env.d.ts.map

package/dist/runtime-env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-env.d.ts","sourceRoot":"","sources":["../src/runtime-env.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAKF,wDAAwD;AACxD,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAEzC;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,GAAE,MAA6B,GAAG,MAAM,CAE3F;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAMrE;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAMrE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU,CAezF"}
+{"version":3,"file":"runtime-env.d.ts","sourceRoot":"","sources":["../src/runtime-env.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAKF,wDAAwD;AACxD,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAEzC;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,GAAE,MAA6B,GAAG,MAAM,CAE3F;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAMrE;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAMrE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU,CAgBzF"}