@automagik/omni 2.260523.1 → 2.260525.1

package/dist/index.js

@@ -4663,12 +4663,14 @@ var require_cli_spinners = __commonJS((exports, module) => {
 // src/lib/embedded-canonical-migration.ts
 var exports_embedded_canonical_migration = {};
 __export(exports_embedded_canonical_migration, {
+  readDataDirMajor: () => readDataDirMajor,
   migrateUnmountedEmbeddedToCanonical: () => migrateUnmountedEmbeddedToCanonical,
+  compareVersionDesc: () => compareVersionDesc,
   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 { execFileSync as execFileSync3, spawn, spawnSync as spawnSync2 } from "child_process";
+import { existsSync as existsSync9, mkdtempSync, readFileSync as readFileSync6 } from "fs";
 import { createServer } from "net";
 import { homedir as homedir7, tmpdir } from "os";
 import { join as join11 } from "path";
@@ -4677,17 +4679,48 @@ function defaultLog(line) {
   process.stdout.write(`${line}
 `);
 }
-function findAutopgPostgresBinary() {
+function readDataDirMajor(dataDir) {
+  try {
+    const major = Number.parseInt(readFileSync6(join11(dataDir, "PG_VERSION"), "utf8").trim(), 10);
+    return Number.isFinite(major) ? major : null;
+  } catch {
+    return null;
+  }
+}
+function binaryMajor(binary) {
+  try {
+    const out = execFileSync3(binary, ["--version"], { encoding: "utf8", timeout: 5000 });
+    const m = out.match(/(\d+)(?:[.\s]|$)/);
+    return m ? Number.parseInt(m[1], 10) : null;
+  } catch {
+    return null;
+  }
+}
+function findAutopgPostgresBinary(wantMajor) {
   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;
+  const candidates = safeReaddir(autopgRoot).sort((a, b) => compareVersionDesc(a, b)).map((entry) => join11(autopgRoot, entry, "postgres", "bin", "postgres")).filter((candidate) => existsSync9(candidate));
+  if (candidates.length === 0)
+    return null;
+  if (wantMajor === null)
+    return candidates[0];
+  for (const candidate of candidates) {
+    if (binaryMajor(candidate) === wantMajor)
+      return candidate;
   }
-  return bestPath;
+  return null;
+}
+function compareVersionDesc(a, b) {
+  const parse = (s) => (s.match(/\d+/g) ?? []).map(Number);
+  const pa = parse(a);
+  const pb = parse(b);
+  for (let i = 0;i < Math.max(pa.length, pb.length); i++) {
+    const diff = (pb[i] ?? 0) - (pa[i] ?? 0);
+    if (diff !== 0)
+      return diff;
+  }
+  return b.localeCompare(a);
 }
 function safeReaddir(path) {
   try {
@@ -4841,9 +4874,14 @@ async function compareEmbeddedVsCanonicalCounts(opts = {}) {
   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 wantMajor = readDataDirMajor(EMBEDDED_DIR);
+  const binary = findAutopgPostgresBinary(wantMajor);
+  if (!binary) {
+    return {
+      kind: "skipped",
+      reason: wantMajor ? `no PostgreSQL ${wantMajor} reader under ~/.local/share/autopg (embedded dir is PG ${wantMajor})` : "autopg postgres binary not found"
+    };
+  }
   const tempPort = await findFreePort();
   let temp = null;
   try {
@@ -4892,11 +4930,15 @@ async function migrateUnmountedEmbeddedToCanonical(opts = {}) {
   if (!existsSync9(join11(EMBEDDED_DIR, "PG_VERSION"))) {
     return { status: "skipped", reason: "embedded dir missing PG_VERSION" };
   }
-  const binary = findAutopgPostgresBinary();
+  const wantMajor = readDataDirMajor(EMBEDDED_DIR);
+  const binary = findAutopgPostgresBinary(wantMajor);
   if (!binary) {
-    return { status: "skipped", reason: "autopg postgres binary not found \u2014 install autopg first" };
+    return {
+      status: "skipped",
+      reason: wantMajor ? `no PostgreSQL ${wantMajor} reader installed under ~/.local/share/autopg \u2014 your data is PG ${wantMajor}; install a matching autopg/reader so it can be dumped into the canonical cluster` : "autopg postgres binary not found \u2014 install autopg first"
+    };
   }
-  log(`  using postgres binary: ${binary}`);
+  log(`  using postgres binary: ${binary} (matched PG ${wantMajor ?? "?"})`);
   log("  stopping omni-api during data copy");
   spawnSync2("pm2", ["stop", "omni-api"], { stdio: "inherit" });
   const tempPort = await findFreePort();
@@ -124460,7 +124502,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260523.1",
+  version: "2.260525.1",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {
@@ -125965,7 +126007,7 @@ function resolveOmniScopedCredentials() {
 // 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;
+var DEFAULT_PGSERVE_PORT = CANONICAL_PG_PORT;
 function buildEmbeddedDatabaseUrl(pgservePort = DEFAULT_PGSERVE_PORT) {
   return `postgresql://postgres:postgres@localhost:${pgservePort}/omni`;
 }
@@ -130607,7 +130649,7 @@ Safety:
 }
 
 // src/commands/done.ts
-import { existsSync as existsSync11, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync7 } from "fs";
 import { basename, extname } from "path";
 
 // src/context.ts
@@ -130721,7 +130763,7 @@ async function handleMedia(client, ctx, mediaPath, caption) {
   }
   try {
     const mediaType = getMediaType(mediaPath);
-    const buffer = readFileSync6(mediaPath);
+    const buffer = readFileSync7(mediaPath);
     const base64 = buffer.toString("base64");
     const filename = basename(mediaPath);
     await client.messages.sendMedia({
@@ -131241,7 +131283,7 @@ function createFilmCommand() {
 }
 
 // src/commands/follow-up.ts
-import { readFileSync as readFileSync7 } from "fs";
+import { readFileSync as readFileSync8 } from "fs";
 init_output();
 var VALID_SCOPES = ["agents", "instances", "chats"];
 function assertScope(scope) {
@@ -131259,9 +131301,9 @@ async function resolveScopedId(scope, id) {
 function readJsonArg(raw2) {
   let body = raw2;
   if (body === "-") {
-    body = readFileSync7(0, "utf8");
+    body = readFileSync8(0, "utf8");
   } else if (body.startsWith("@")) {
-    body = readFileSync7(body.slice(1), "utf8");
+    body = readFileSync8(body.slice(1), "utf8");
   }
   try {
     return JSON.parse(body);
@@ -134378,9 +134420,9 @@ init_output();
 
 // src/commands/providers-setup.ts
 init_src();
-import { execFileSync as execFileSync3, execSync } from "child_process";
+import { execFileSync as execFileSync4, execSync } from "child_process";
 import * as nodeCrypto2 from "crypto";
-import { existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync9, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync10, 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";
@@ -134613,7 +134655,7 @@ var PLUGIN_MARKER = "plugin-openclaw/omni.ts";
 function readOpenClawConfig(configPath) {
   if (!existsSync15(configPath))
     return {};
-  const raw2 = readFileSync9(configPath, "utf-8").trim();
+  const raw2 = readFileSync10(configPath, "utf-8").trim();
   if (!raw2)
     return {};
   return JSON.parse(raw2);
@@ -134660,7 +134702,7 @@ function resolvePluginPath(explicit) {
 function registerPlugin(config2, pluginPath, configPath) {
   if (hasOpenClawCli()) {
     try {
-      execFileSync3("openclaw", ["plugins", "install", "--link", pluginPath], { stdio: "ignore" });
+      execFileSync4("openclaw", ["plugins", "install", "--link", pluginPath], { stdio: "ignore" });
       try {
         return { config: readOpenClawConfig(configPath), registered: true };
       } catch {
@@ -135705,7 +135747,7 @@ function createSayCommand() {
 }
 
 // src/commands/see.ts
-import { existsSync as existsSync16, readFileSync as readFileSync10, statSync as statSync5 } from "fs";
+import { existsSync as existsSync16, readFileSync as readFileSync11, statSync as statSync5 } from "fs";
 import { extname as extname4 } from "path";
 init_output();
 var MIME_BY_EXT = {
@@ -135748,7 +135790,7 @@ function loadMedia(file) {
     error(`File is empty: ${file}`);
   }
   try {
-    return { buffer: readFileSync10(file), mimeType: guessMimeType(file) };
+    return { buffer: readFileSync11(file), mimeType: guessMimeType(file) };
   } catch (err2) {
     const message2 = err2 instanceof Error ? err2.message : "Unknown error";
     return error(`Failed to read ${file}: ${message2}`);
@@ -135823,7 +135865,7 @@ function createSeeCommand() {
 }
 
 // src/commands/send.ts
-import { existsSync as existsSync17, readFileSync as readFileSync11 } from "fs";
+import { existsSync as existsSync17, readFileSync as readFileSync12 } from "fs";
 import { basename as basename5, extname as extname5 } from "path";
 init_source();
 init_config();
@@ -135843,7 +135885,7 @@ function getMediaType2(path) {
   return "document";
 }
 function readFileAsBase64(path) {
-  const buffer3 = readFileSync11(path);
+  const buffer3 = readFileSync12(path);
   return buffer3.toString("base64");
 }
 var messageSenders = {
@@ -137135,7 +137177,7 @@ async function cleanupLegacyArtifacts(skipList) {
 init_output();
 
 // src/update-diagnostics.ts
-import { existsSync as existsSync19, mkdirSync as mkdirSync11, readFileSync as readFileSync12, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync19, mkdirSync as mkdirSync11, readFileSync as readFileSync13, writeFileSync as writeFileSync10 } from "fs";
 import { homedir as homedir13 } from "os";
 import { join as join18 } from "path";
 var UPDATE_DIAGNOSTICS_SCHEMA_VERSION = 1;
@@ -137170,7 +137212,7 @@ function tailFileLines(path, maxLines) {
   if (!existsSync19(path))
     return [];
   try {
-    const raw2 = readFileSync12(path, "utf8");
+    const raw2 = readFileSync13(path, "utf8");
     const lines = raw2.split(/\r?\n/);
     if (lines.length > 0 && lines[lines.length - 1] === "")
       lines.pop();
@@ -138010,7 +138052,7 @@ init_config();
 init_output();
 
 // src/manifest-pin.ts
-import { existsSync as existsSync21, readFileSync as readFileSync13, renameSync as renameSync3, writeFileSync as writeFileSync11 } from "fs";
+import { existsSync as existsSync21, readFileSync as readFileSync14, 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";
@@ -138020,7 +138062,7 @@ function pinManifestEntry(manifestPath, exactVersion) {
     return false;
   let manifest;
   try {
-    manifest = JSON.parse(readFileSync13(manifestPath, "utf-8"));
+    manifest = JSON.parse(readFileSync14(manifestPath, "utf-8"));
   } catch {
     return false;
   }

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

@@ -61,6 +61,10 @@ export interface MigrateOptions {
     /** Logger sink — defaults to writing prefixed lines to process.stdout. */
     log?: (line: string) => void;
 }
+/** Read the catalog major (e.g. 17, 18) recorded in a data dir's PG_VERSION. */
+export declare function readDataDirMajor(dataDir: string): number | null;
+/** Compare two `vX.Y.Z`-ish dir names numerically, newest first. */
+export declare function compareVersionDesc(a: string, b: string): number;
 /**
  * Public entry point — call this from `omni doctor --fix` when the
  * `embedded-data-orphaned` check FAILs (canonical omni DB empty AND

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

@@ -1 +1 @@
-{"version":3,"file":"embedded-canonical-migration.d.ts","sourceRoot":"","sources":["../../src/lib/embedded-canonical-migration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AAWH,MAAM,MAAM,eAAe,GACvB;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAC1D;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAmPD;;;;;;;;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,CAuF7G;AAED,yEAAyE;AACzE,eAAO,MAAM,yBAAyB,QAAe,CAAC"}
+{"version":3,"file":"embedded-canonical-migration.d.ts","sourceRoot":"","sources":["../../src/lib/embedded-canonical-migration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AAWH,MAAM,MAAM,eAAe,GACvB;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAC1D;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAMD,gFAAgF;AAChF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAO/D;AAoDD,oEAAoE;AACpE,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAS/D;AA4ND;;;;;;;;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,CAyDxG;AAED,wBAAsB,mCAAmC,CAAC,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,eAAe,CAAC,CA6F7G;AAED,yEAAyE;AACzE,eAAO,MAAM,yBAAyB,QAAe,CAAC"}

package/dist/runtime-env.d.ts

@@ -46,20 +46,20 @@ export type RuntimeEnv = {
     LOG_LEVEL: string;
 };
 /**
- * Default pgserve port when none is set explicitly.
+ * Default pgserve port when none is set explicitly — the CANONICAL port.
  *
  * Phase 2 of the canonical-pgserve cutover (omni#595/#596/#597) used the
  * bun-bridge port `8432`. Phase 3 (`pgserve-singleton-no-proxy`) lands the
- * postmaster directly on **5432** (canonical postgres port) and listens
- * on the canonical UDS at `$XDG_RUNTIME_DIR/pgserve/.s.PGSQL.5432`.
- *
- * Kept as the module-level default for backwards compatibility with the
- * stored `~/.omni/config.json` entries that still record `8432`. Use
- * {@link resolveDatabaseUrl} as the entry point — it prefers the canonical
- * UDS when available and falls back to the legacy port only when the
- * socket is missing AND the operator hasn't migrated their config.
+ * postmaster directly on **5432** (the canonical postgres port) and listens
+ * on the canonical UDS at `$XDG_RUNTIME_DIR/pgserve/.s.PGSQL.5432`. There is
+ * no embedded 8432 listener anymore, so the default MUST be canonical — a
+ * hardcoded 8432 here leaked into `resolvePgservePort` (→ the `PGSERVE_PORT`
+ * env that `omni doctor`'s `pgserve-reachable` check probes), making doctor
+ * false-FAIL "cannot connect to pgserve on :8432" on every healthy host.
+ * Stored `8432` entries in `~/.omni/config.json` are treated as a stale
+ * default and re-resolved by {@link resolveDatabaseUrl} (UDS-first).
  */
-export declare const DEFAULT_PGSERVE_PORT = 8432;
+export declare const DEFAULT_PGSERVE_PORT = 5432;
 /** Canonical postgres TCP port the postmaster binds in singleton mode. */
 export { CANONICAL_PG_PORT } from './lib/pgserve-transport.js';
 /**
@@ -77,9 +77,13 @@ export declare function buildEmbeddedDatabaseUrl(pgservePort?: number): string;
 export declare function buildCanonicalSocketDatabaseUrl(): string;
 /**
  * Extract the effective pgserve port. Honors an explicit override on the
- * server config first (`server.pgservePort`, if ever added), then the
- * hard-coded default. This function intentionally does NOT read
- * `process.env.PGSERVE_PORT` — env pollution is the bug we're fixing.
+ * server config first (`server.pgservePort`), then falls back to
+ * {@link DEFAULT_PGSERVE_PORT} — which is now the CANONICAL port (5432), not
+ * the legacy 8432. This value feeds the runtime `PGSERVE_PORT` env that
+ * `omni doctor`'s `pgserve-reachable` check probes.
+ *
+ * This function intentionally does NOT read `process.env.PGSERVE_PORT` —
+ * env pollution is the bug we're fixing.
  */
 export declare function resolvePgservePort(serverConfig: ServerConfig): number;
 /**

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;AASxD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IAQrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,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;AAQF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAEzC,0EAA0E;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,GAAE,MAA6B,GAAG,MAAM,CAE3F;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,IAAI,MAAM,CAKxD;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAMrE;AAgBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAiBrE;AAoBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU,CAqCzF"}
+{"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;AASxD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IAQrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,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;AAQF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,oBAAoB,OAAoB,CAAC;AAEtD,0EAA0E;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,GAAE,MAA6B,GAAG,MAAM,CAE3F;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,IAAI,MAAM,CAKxD;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAMrE;AAgBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAiBrE;AAoBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU,CAqCzF"}

package/dist/server/index.js

@@ -230186,7 +230186,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package8 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260523.1",
+    version: "2.260525.1",
     type: "module",
     exports: {
       ".": {
@@ -331824,6 +331824,40 @@ function buildChatPreview(payload, rawPayload) {
   }
   return preview.substring(0, 500);
 }
+function compactRecord(record) {
+  const compacted = Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined));
+  return Object.keys(compacted).length > 0 ? compacted : undefined;
+}
+function isSentMediaContent(content) {
+  return OUTBOUND_MEDIA_TYPES.has(content.type) || !!content.mediaUrl || !!content.localPath || !!content.mimeType;
+}
+function buildSentMediaMetadata(content, rawPayload) {
+  if (!isSentMediaContent(content))
+    return;
+  const rawSource = typeof rawPayload?.mediaSource === "string" ? rawPayload.mediaSource : undefined;
+  return compactRecord({
+    caption: content.caption,
+    filename: content.filename,
+    voiceNote: content.isVoiceNote === true ? true : undefined,
+    source: rawSource ?? (content.mediaUrl ? "url" : content.localPath ? "localPath" : "inline")
+  });
+}
+function buildSentMessageContentFields(payload) {
+  return {
+    textContent: sanitizeText(payload.content.text ?? payload.content.caption),
+    hasMedia: isSentMediaContent(payload.content),
+    mediaMimeType: truncate3(payload.content.mimeType, 100),
+    mediaUrl: payload.content.mediaUrl,
+    mediaLocalPath: payload.content.localPath,
+    mediaMetadata: buildSentMediaMetadata(payload.content, payload.rawPayload),
+    rawPayload: payload.rawPayload ? deepSanitize(payload.rawPayload) : undefined
+  };
+}
+function buildSentChatPreview(payload) {
+  const text3 = payload.content.text ?? payload.content.caption ?? "";
+  const badge = payload.content.type !== "text" ? MEDIA_BADGES2[payload.content.type] ?? `[${payload.content.type}]` : "";
+  return badge ? text3 ? `${badge} ${text3}` : badge : text3;
+}
 function extractPhoneFromSender(senderId, channel5) {
   if (!channel5.startsWith("whatsapp"))
     return;
@@ -332115,17 +332149,22 @@ async function setupMessagePersistence(eventBus, services) {
           chatType: inferChatType(payload.chatId),
           channel: metadata.channelType ?? "whatsapp"
         });
+        const sentContent = buildSentMessageContentFields(payload);
         const { message: message2, created } = await services.messages.findOrCreate(chat2.id, messageExternalId, {
           source: "realtime",
           messageType: mapContentType(payload.content.type),
-          textContent: sanitizeText(payload.content.text),
+          textContent: sentContent.textContent,
           platformTimestamp: new Date(event.timestamp),
           senderPersonId: metadata.personId,
           senderPlatformIdentityId: metadata.platformIdentityId,
           isFromMe: true,
           senderAgentId: payload.senderAgentId ?? null,
-          hasMedia: !!payload.content.mediaUrl,
-          mediaUrl: payload.content.mediaUrl,
+          hasMedia: sentContent.hasMedia,
+          mediaMimeType: sentContent.mediaMimeType,
+          mediaUrl: sentContent.mediaUrl,
+          mediaLocalPath: sentContent.mediaLocalPath,
+          mediaMetadata: sentContent.mediaMetadata,
+          rawPayload: sentContent.rawPayload,
           replyToExternalId: truncate3(payload.replyToId, 255)
         });
         if (created) {
@@ -332135,7 +332174,7 @@ async function setupMessagePersistence(eventBus, services) {
             chatId: chat2.id
           });
         }
-        services.chats.updateLastMessage(chat2.id, sanitizeText(payload.content.text ?? "") ?? "", new Date(event.timestamp), true).catch((err) => log93.debug("Failed to update chat recency (sent)", { error: String(err) }));
+        services.chats.updateLastMessage(chat2.id, sanitizeText(buildSentChatPreview(payload)) ?? "", new Date(event.timestamp), true).catch((err) => log93.debug("Failed to update chat recency (sent)", { error: String(err) }));
         if (metadata.streamSequence) {
           await services.consumerOffsets.updateOffset("message-persistence-sent", "MESSAGE", metadata.streamSequence, event.id);
         }
@@ -332304,7 +332343,7 @@ async function detectStartupGaps(services) {
     }
   }
 }
-var log93, CONTENT_TYPE_MAP, INTERNAL_JID_SUFFIXES, MEDIA_BADGES2;
+var log93, CONTENT_TYPE_MAP, INTERNAL_JID_SUFFIXES, MEDIA_BADGES2, OUTBOUND_MEDIA_TYPES;
 var init_message_persistence = __esm(() => {
   init_src();
   init_esm5();
@@ -332334,6 +332373,7 @@ var init_message_persistence = __esm(() => {
     location: "[Location]",
     poll: "[Poll]"
   };
+  OUTBOUND_MEDIA_TYPES = new Set(["audio", "image", "video", "document", "sticker"]);
 });
 
 // ../api/src/plugins/session-storage.ts
@@ -333954,7 +333994,8 @@ function createClaudeCodeProviderInstance(provider, instance4, db2) {
     model: schemaConfig.model,
     systemPrompt: schemaConfig.systemPrompt,
     mcpServers: schemaConfig.mcpServers,
-    maxTurns: schemaConfig.maxTurns
+    maxTurns: schemaConfig.maxTurns,
+    pathToClaudeCodeExecutable: schemaConfig.pathToClaudeCodeExecutable
   }, createSessionStorage(db2, provider.id), {
     timeoutMs: (instance4.agentTimeout ?? provider.defaultTimeout ?? 120) * 1000,
     enableAutoSplit: instance4.enableAutoSplit ?? true,
@@ -342723,6 +342764,9 @@ function buildA2AAgentCard(params) {
   const providerOverride = isRecord(override.provider) ? override.provider : undefined;
   if (providerOverride)
     card.provider = providerOverride;
+  const metadataOverride = isRecord(override.metadata) ? override.metadata : undefined;
+  if (metadataOverride)
+    card.metadata = metadataOverride;
   const iconUrl = stringOverride(override.iconUrl);
   if (iconUrl)
     card.iconUrl = iconUrl;
@@ -349590,7 +349634,15 @@ var init__close_contact_config = __esm(() => {
 
 // ../api/src/routes/v2/messages.ts
 import { existsSync as existsSync7 } from "fs";
-import { join as join22 } from "path";
+import { extname as extname3, join as join22 } from "path";
+function inferMediaMimeType(type, filename) {
+  if (filename) {
+    const fromExtension = MIME_BY_EXTENSION[extname3(filename).toLowerCase()];
+    if (fromExtension)
+      return fromExtension;
+  }
+  return DEFAULT_MIME_BY_MEDIA_TYPE[type];
+}
 function isUUID(value) {
   return UUID_REGEX2.test(value);
 }
@@ -349748,7 +349800,7 @@ async function verifyMessageInstanceOwnership(services, message2, instanceId) {
     });
   }
 }
-var log105, mediaDownloadLog, messagesRoutes, UUID_REGEX2, MessageSourceSchema, MessageTypeSchema, MessageStatusSchema, DeliveryStatusSchema, listQuerySchema14, createMessageSchema, updateMessageSchema, recordEditSchema, addReactionSchema, removeReactionSchema, updateDeliveryStatusSchema, MentionSchema, sendTextSchema, sendMediaSchema, sendReactionSchema, sendStickerSchema, sendContactSchema, sendLocationSchema, sendHandoffSchema, sendCloseContactSchema, messageRefSchema, _mediaStorageForDownload = null, sendTtsSchema, forwardMessageSchema, sendPresenceSchema, markMessageReadSchema, markBatchReadSchema, sendPollSchema, sendEmbedSchema, editMessageChannelSchema, deleteMessageChannelSchema, starMessageSchema;
+var log105, mediaDownloadLog, messagesRoutes, MIME_BY_EXTENSION, DEFAULT_MIME_BY_MEDIA_TYPE, UUID_REGEX2, MessageSourceSchema, MessageTypeSchema, MessageStatusSchema, DeliveryStatusSchema, listQuerySchema14, createMessageSchema, updateMessageSchema, recordEditSchema, addReactionSchema, removeReactionSchema, updateDeliveryStatusSchema, MentionSchema, sendTextSchema, sendMediaSchema, sendReactionSchema, sendStickerSchema, sendContactSchema, sendLocationSchema, sendHandoffSchema, sendCloseContactSchema, messageRefSchema, _mediaStorageForDownload = null, sendTtsSchema, forwardMessageSchema, sendPresenceSchema, markMessageReadSchema, markBatchReadSchema, sendPollSchema, sendEmbedSchema, editMessageChannelSchema, deleteMessageChannelSchema, starMessageSchema;
 var init_messages5 = __esm(() => {
   init_dist6();
   init_src2();
@@ -349766,6 +349818,29 @@ var init_messages5 = __esm(() => {
   log105 = createLogger("routes:messages");
   mediaDownloadLog = createLogger("routes:messages:media-download");
   messagesRoutes = new Hono2;
+  MIME_BY_EXTENSION = {
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".png": "image/png",
+    ".gif": "image/gif",
+    ".webp": "image/webp",
+    ".mp3": "audio/mpeg",
+    ".ogg": "audio/ogg",
+    ".opus": "audio/opus",
+    ".wav": "audio/wav",
+    ".m4a": "audio/mp4",
+    ".mp4": "video/mp4",
+    ".webm": "video/webm",
+    ".mov": "video/quicktime",
+    ".avi": "video/x-msvideo",
+    ".pdf": "application/pdf"
+  };
+  DEFAULT_MIME_BY_MEDIA_TYPE = {
+    image: "image/jpeg",
+    audio: "audio/ogg",
+    video: "video/mp4",
+    document: "application/octet-stream"
+  };
   UUID_REGEX2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
   MessageSourceSchema = exports_external.enum(["realtime", "sync", "api", "import"]);
   MessageTypeSchema = exports_external.enum([
@@ -350240,6 +350315,7 @@ var init_messages5 = __esm(() => {
       });
     }
     const resolvedTo = await resolveRecipient(data.to, instance4.channel, services);
+    const mediaMimeType = data.mimeType ?? inferMediaMimeType(data.type, data.filename);
     const outgoingMessage = {
       to: resolvedTo,
       threadId: data.threadId,
@@ -350248,7 +350324,7 @@ var init_messages5 = __esm(() => {
         mediaUrl: data.url,
         caption: data.caption,
         filename: data.filename,
-        mimeType: data.mimeType
+        mimeType: mediaMimeType
       },
       metadata: {
         base64: data.base64,
@@ -353059,16 +353135,20 @@ async function setupEventPersistence(eventBus, db2) {
           eventType: "message.sent",
           direction: "outbound",
           contentType: mapContentType2(payload.content.type),
-          textContent: sanitizeText(payload.content.text),
+          textContent: sanitizeText(payload.content.text ?? payload.content.caption),
           mediaUrl: payload.content.mediaUrl,
+          mediaMimeType: payload.content.mimeType,
           chatId: payload.chatId,
           replyToExternalId: payload.replyToId,
           status: "completed",
           receivedAt: new Date(event.timestamp),
           processedAt: new Date,
+          rawPayload: payload.rawPayload ? deepSanitize(payload.rawPayload) : undefined,
           metadata: {
             correlationId: metadata.correlationId,
-            to: payload.to
+            to: payload.to,
+            filename: payload.content.filename,
+            voiceNote: payload.content.isVoiceNote
           },
           agentId: metadata.agentId ?? null,
           conversationId: null,
@@ -479098,6 +479178,49 @@ class WhatsAppPlugin extends BaseChannelPlugin {
     }
     return phoneJid;
   }
+  getSentMediaSource(message2) {
+    if (message2.content.mediaUrl)
+      return "url";
+    if (message2.content.localPath)
+      return "localPath";
+    if (message2.metadata?.base64)
+      return "base64";
+    return;
+  }
+  buildSentRawPayload(externalId, originalMessage, processedMessage) {
+    const mediaSource = this.getSentMediaSource(processedMessage);
+    return {
+      externalId,
+      isFromMe: true,
+      to: originalMessage.to,
+      ...processedMessage.content.caption ? { caption: processedMessage.content.caption } : {},
+      ...processedMessage.content.filename ? { filename: processedMessage.content.filename } : {},
+      ...processedMessage.content.mimeType ? { mimeType: processedMessage.content.mimeType } : {},
+      ...processedMessage.metadata?.ptt === true ? { voiceNote: true } : {},
+      ...mediaSource ? { mediaSource } : {}
+    };
+  }
+  buildSentEventPayload(instanceId, externalId, chatId, originalMessage, processedMessage) {
+    return {
+      instanceId,
+      externalId,
+      chatId,
+      to: originalMessage.to,
+      content: {
+        type: processedMessage.content.type,
+        text: processedMessage.content.text ?? processedMessage.content.caption,
+        caption: processedMessage.content.caption,
+        mediaUrl: processedMessage.content.mediaUrl,
+        localPath: processedMessage.content.localPath,
+        mimeType: processedMessage.content.mimeType,
+        filename: processedMessage.content.filename,
+        isVoiceNote: processedMessage.metadata?.ptt === true
+      },
+      replyToId: originalMessage.replyTo,
+      rawPayload: this.buildSentRawPayload(externalId, originalMessage, processedMessage),
+      senderAgentId: originalMessage.metadata?.senderAgentId
+    };
+  }
   async sendMessage(instanceId, message2) {
     const sock = this.getSocket(instanceId);
     const jid = await this.resolveSendTarget(sock, instanceId, message2.to);
@@ -479124,18 +479247,7 @@ class WhatsAppPlugin extends BaseChannelPlugin {
           this.trackRecentSentMessage(instanceId, externalId, result.message);
         }
       }
-      await this.emitMessageSent({
-        instanceId,
-        externalId,
-        chatId: jid,
-        to: message2.to,
-        content: {
-          type: message2.content.type,
-          text: message2.content.text
-        },
-        replyToId: message2.replyTo,
-        senderAgentId: message2.metadata?.senderAgentId
-      });
+      await this.emitMessageSent(this.buildSentEventPayload(instanceId, externalId, jid, message2, processedMessage));
       rateLimiter.reset();
       return {
         success: true,

package/package.json

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