@automagik/omni 2.260405.3 → 2.260407.1

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

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsQpC,wBAAgB,iBAAiB,IAAI,OAAO,CAiI3C"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuRpC,wBAAgB,iBAAiB,IAAI,OAAO,CAiI3C"}

package/dist/commands/doctor.d.ts

@@ -0,0 +1,119 @@
+/**
+ * Doctor Command
+ *
+ * omni doctor [--fix] [--json] [--verbose]
+ *
+ * In-place diagnose + repair for the embedded-omni runtime. This is the
+ * command operators are pointed at when `omni update` reports a version
+ * mismatch or an auth failure after a restart.
+ *
+ * Checks performed, in order:
+ *   1. pm2-env-drift   — pm2-stored env for omni-api vs. buildRuntimeEnv()
+ *   2. cli-key-valid   — stored CLI key still validates against the server
+ *   3. pgserve-reachable — TCP connect to localhost:PGSERVE_PORT
+ *   4. omni-db-exists  — `omni` database exists on the embedded pgserve
+ *   5. orphaned-data-dirs — `.pgserve-data/` directories under cwd
+ *   6. version-match   — CLI version vs. /api/v2/health `version` field
+ *   7. pm2-status      — omni-api and omni-nats both `online` in pm2
+ *
+ * Each check returns OK / WARN / FAIL with a one-line detail. `--fix`
+ * attempts repair for checks with a known repair path. The fix flow
+ * NEVER touches `~/.omni/data/pgserve/` — that safety constraint is
+ * load-bearing and has a dedicated mutation-safety test.
+ *
+ * Repair paths:
+ *   - pm2-env-drift:   `pm2 delete omni-api` + re-launch via the same code
+ *                      path used by `omni start`, with a sanitized env.
+ *   - cli-key-valid:   Delete `__primary__` from api_keys, restart with a
+ *                      freshly generated OMNI_API_KEY, re-validate, write
+ *                      the new key to `~/.omni/config.json`.
+ *   - orphaned-data-dirs: Print `rm -rf` commands for the user to review
+ *                      (we never auto-delete data directories).
+ */
+import { Command } from 'commander';
+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';
+export interface CheckResult {
+    id: CheckId;
+    level: CheckLevel;
+    detail: string;
+}
+export interface DoctorReport {
+    checks: CheckResult[];
+    summary: {
+        ok: number;
+        warn: number;
+        fail: number;
+    };
+    fixesApplied: string[];
+}
+export interface DoctorOptions {
+    fix?: boolean;
+    json?: boolean;
+    verbose?: boolean;
+}
+/**
+ * Narrow shape of a pm2 process entry from `pm2 jlist`. We only care about
+ * fields relevant to env-drift and status checks.
+ */
+interface Pm2Entry {
+    name?: string;
+    pm_id?: number;
+    pm2_env?: {
+        status?: string;
+        env?: Record<string, string | undefined>;
+        pm_exec_path?: string;
+        args?: string[];
+        interpreter?: string;
+        OMNI_API_KEY?: string;
+        DATABASE_URL?: string;
+        PGSERVE_DATA?: string;
+        API_PORT?: string;
+        NODE_ENV?: string;
+        LOG_LEVEL?: string;
+    } & Record<string, unknown>;
+}
+/** Shape injected by the test harness to mock slow/external inputs. */
+export interface DoctorDeps {
+    /** Return all pm2 processes (or null on error). */
+    getPm2Processes: () => Promise<Pm2Entry[] | null>;
+    /** Return true if a TCP connect to localhost:port succeeds. */
+    canConnect: (port: number) => Promise<boolean>;
+    /** Return true if the omni database exists on the embedded pgserve. */
+    omniDbExists: () => Promise<boolean>;
+    /** Walk the filesystem for orphaned `.pgserve-data` directories. */
+    findOrphanedDataDirs: () => string[];
+    /** Fetch the health body from the running server. */
+    fetchHealthVersion: (apiPort: number) => Promise<string | null>;
+    /** Validate the stored CLI key against the running server. */
+    validateStoredKey: (apiPort: number) => Promise<boolean>;
+    /** Return the current `~/.omni/` configs. */
+    loadState: () => {
+        serverConfig: ServerConfig;
+        cliConfig: Config;
+    };
+    /**
+     * Run a pm2 command. Returns the exit code. Tests stub this with a no-op
+     * to prevent fix handlers from actually mutating the host's pm2 state.
+     */
+    runPm2: (args: string[], env?: Record<string, string>) => Promise<number>;
+    /** Persist a new CLI config. Tests stub this to in-memory state. */
+    saveCliConfig: (config: Config) => void;
+    /** Re-read the CLI config from disk (stubbed in tests). */
+    reloadCliConfig: () => Config;
+    /** Generate a new API key. Tests stub for determinism. */
+    generateApiKey: () => string;
+    /** Sleep briefly after a pm2 restart. Tests stub to zero-delay. */
+    sleepMs: (ms: number) => Promise<void>;
+}
+/**
+ * Run all checks and optionally apply fixes. Returns a structured
+ * DoctorReport — the caller decides how to render it (human vs. JSON).
+ */
+export declare function runDoctor(options: DoctorOptions, depsOverride?: DoctorDeps): Promise<DoctorReport>;
+export declare function createDoctorCommand(): Command;
+export {};
+//# sourceMappingURL=doctor.d.ts.map

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

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

package/dist/commands/install.d.ts

@@ -16,5 +16,28 @@
  *  10. Done banner + next steps
  */
 import { Command } from 'commander';
+/**
+ * Compute the default database URL for the install wizard.
+ *
+ * Embedded mode is the default and derives the URL from the configured
+ * pgserve port (never from the calling shell, which has historically
+ * leaked foreign databases into omni-api via pm2's stored env). If an
+ * operator wants to point omni at an external PostgreSQL they must pass
+ * `--database-url <url>` explicitly — an opt-in signal that the external
+ * URL is intentional and not an accidental shell export.
+ *
+ * Exported so `install-env-leak.test.ts` can assert hermeticity.
+ */
+export declare function computeDefaultDatabaseUrl(): string;
+/**
+ * Resolve the `databaseUrl` that will be written to `~/.omni/config.json`.
+ * Exported for hermeticity tests. Never reads the calling shell's env.
+ *
+ * @param options.databaseUrlFlag — the explicit `--database-url` value, if
+ *                                  the operator passed one. Opt-in external-DB mode.
+ */
+export declare function resolveInstallDatabaseUrl(options: {
+    databaseUrlFlag?: string;
+}): string;
 export declare function createInstallCommand(): Command;
 //# sourceMappingURL=install.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+kBpC,wBAAgB,oBAAoB,IAAI,OAAO,CAO9C"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoBpC;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IAAE,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAMvF;AA0kBD,wBAAgB,oBAAoB,IAAI,OAAO,CAQ9C"}

package/dist/commands/restart.d.ts

@@ -2,6 +2,13 @@
  * Restart Command
  *
  * omni restart — Restart omni PM2 processes and wait for health check
+ *
+ * IMPORTANT: This command does NOT ask pm2 to re-read the shell environment
+ * on restart. Doing so would re-introduce env-pollution bugs (e.g. stray
+ * `DATABASE_URL` from a parent tmux session leaking into omni-api). Instead,
+ * we rely on the env that was captured at original `pm2 start` time (built
+ * by `buildRuntimeEnv` from config). If the stored env is stale, use
+ * `omni doctor --fix` to rebuild it deterministically.
  */
 import { Command } from 'commander';
 export declare function createRestartCommand(): Command;

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

@@ -1 +1 @@
-{"version":3,"file":"restart.d.ts","sourceRoot":"","sources":["../../src/commands/restart.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuEpC,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C"}
+{"version":3,"file":"restart.d.ts","sourceRoot":"","sources":["../../src/commands/restart.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoDpC,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C"}

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

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiGpC,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0EpC,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C"}

package/dist/commands/update.d.ts

@@ -6,9 +6,64 @@
  * Self-update from npm: checks latest @automagik/omni version, prompts the
  * user (unless --yes), installs with `bun add -g`, and restarts PM2 services
  * only if they were already running. When that restart path runs, update
- * checks API health on the configured API port; if restart or health checks
- * fail, exits non-zero and points operators to `omni status`.
+ * performs a 3-step visible verification:
+ *
+ *   1. CLI version matches `package.json` (trivial — known at compile time).
+ *   2. Server version matches the newly-installed CLI version (fetched from
+ *      `/api/v2/health`). If not, update exits non-zero and tells the
+ *      operator to run `omni doctor`.
+ *   3. The stored API key still validates against the (restarted) server. If
+ *      not, update exits non-zero and tells the operator to run
+ *      `omni doctor --fix`.
+ *
+ * This replaces the previous silent-success path where the CLI would report
+ * "updated to vX" even when the server was still running the old version or
+ * when the stored key no longer validated.
  */
 import { Command } from 'commander';
+/** Shape of the `/api/v2/health` response we care about. */
+export interface HealthBody {
+    status?: string;
+    version?: string;
+}
+/**
+ * Normalize a version string for comparison. Strips a git-hash suffix
+ * (e.g. `2.20260218.18+abc1234` → `2.20260218.18`) so build metadata doesn't
+ * trigger a spurious mismatch.
+ */
+export declare function normalizeVersion(version: string): string;
+/**
+ * Result of the pure 3-step update verification. Exported so tests can
+ * exercise the logic without mocking pm2 / fetch / process.exit.
+ */
+export type UpdateVerifyResult = {
+    kind: 'ok';
+    cliVersion: string;
+    serverVersion: string;
+} | {
+    kind: 'health-unreachable';
+    apiPort: number;
+} | {
+    kind: 'version-mismatch';
+    cliVersion: string;
+    serverVersion: string | null;
+} | {
+    kind: 'auth-invalid';
+};
+/**
+ * Pure decision function for update verification. Given the raw inputs
+ * (health body + key-valid flag + CLI version + port), return a tagged
+ * union describing the outcome. The caller decides how to render and
+ * whether to exit non-zero.
+ */
+export declare function decideUpdateVerify(args: {
+    latest: string;
+    apiPort: number;
+    healthBody: HealthBody | null;
+    keyValid: boolean;
+}): UpdateVerifyResult;
+/** Error message strings — exported for tests and documentation. */
+export declare function updateErrorVersionMismatch(cli: string, server: string | null): string;
+export declare const UPDATE_ERROR_AUTH_INVALID = "Auth key invalid after restart. Run: omni doctor --fix";
 export declare function createUpdateCommand(): Command;
 //# sourceMappingURL=update.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4LpC,wBAAgB,mBAAmB,IAAI,OAAO,CAkB7C"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAKH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6HpC,4DAA4D;AAC5D,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAExD;AAED;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GACzD;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC9E;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;AAE7B;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;CACnB,GAAG,kBAAkB,CAarB;AAED,oEAAoE;AACpE,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAErF;AAED,eAAO,MAAM,yBAAyB,2DAA2D,CAAC;AAuOlG,wBAAgB,mBAAmB,IAAI,OAAO,CAmC7C"}