@automagik/omni 2.260525.1 → 2.260528.1

package/dist/index.js

@@ -4665,15 +4665,17 @@ var exports_embedded_canonical_migration = {};
 __export(exports_embedded_canonical_migration, {
   readDataDirMajor: () => readDataDirMajor,
   migrateUnmountedEmbeddedToCanonical: () => migrateUnmountedEmbeddedToCanonical,
+  embeddedPostgresPackage: () => embeddedPostgresPackage,
   compareVersionDesc: () => compareVersionDesc,
   compareEmbeddedVsCanonicalCounts: () => compareEmbeddedVsCanonicalCounts,
+  MIGRATION_SKIP_TABLES: () => MIGRATION_SKIP_TABLES,
   EMBEDDED_PGSERVE_DATA_DIR: () => EMBEDDED_PGSERVE_DATA_DIR
 });
 import { execFileSync as execFileSync3, spawn, spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync9, mkdtempSync, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync6, mkdtempSync, readFileSync as readFileSync6, readdirSync as readdirSync2, symlinkSync } from "fs";
 import { createServer } from "net";
-import { homedir as homedir7, tmpdir } from "os";
-import { join as join11 } from "path";
+import { arch, homedir as homedir7, platform, tmpdir } from "os";
+import { dirname as dirname2, join as join11 } from "path";
 import { setTimeout as sleep2 } from "timers/promises";
 function defaultLog(line) {
   process.stdout.write(`${line}
@@ -4724,12 +4726,94 @@ function compareVersionDesc(a, b) {
 }
 function safeReaddir(path) {
   try {
-    const { readdirSync: readdirSync2 } = __require("fs");
     return readdirSync2(path);
   } catch {
     return [];
   }
 }
+function embeddedPostgresPackage() {
+  const a = arch() === "arm64" ? "arm64" : arch() === "x64" ? "x64" : null;
+  if (!a)
+    return null;
+  if (platform() === "linux")
+    return `@embedded-postgres/linux-${a}`;
+  if (platform() === "darwin")
+    return `@embedded-postgres/darwin-${a}`;
+  if (platform() === "win32" && a === "x64")
+    return "@embedded-postgres/windows-x64";
+  return null;
+}
+function latestReaderVersion(pkg, major) {
+  try {
+    const raw2 = execFileSync3("npm", ["view", pkg, "versions", "--json"], { encoding: "utf8", timeout: 30000 });
+    const versions = JSON.parse(raw2);
+    const list2 = Array.isArray(versions) ? versions : [versions];
+    const matching = list2.filter((v) => v.startsWith(`${major}.`)).sort(compareVersionDesc);
+    return matching.length ? matching[0] : null;
+  } catch {
+    return null;
+  }
+}
+function materializeReaderLibs(nativeDir) {
+  const libDir = join11(nativeDir, "lib");
+  try {
+    const pkgRoot = dirname2(nativeDir);
+    const pairs = JSON.parse(readFileSync6(join11(nativeDir, "pg-symlinks.json"), "utf8"));
+    for (const { source, target } of pairs) {
+      const tgt = join11(pkgRoot, target);
+      if (!existsSync9(tgt)) {
+        try {
+          symlinkSync(join11(pkgRoot, source), tgt);
+        } catch {}
+      }
+    }
+  } catch {}
+  for (const f of safeReaddir(libDir)) {
+    const m = f.match(/^(.*\.so\.\d+)\.\d+/);
+    if (!m)
+      continue;
+    const base = join11(libDir, m[1]);
+    if (!existsSync9(base)) {
+      try {
+        symlinkSync(join11(libDir, f), base);
+      } catch {}
+    }
+  }
+}
+function fetchEmbeddedReader(major, log) {
+  const pkg = embeddedPostgresPackage();
+  if (!pkg)
+    return null;
+  const cacheDir = join11(homedir7(), ".omni", "cache", `pg-reader-${major}`);
+  const nativeDir = join11(cacheDir, "node_modules", pkg, "native");
+  const binary = join11(nativeDir, "bin", "postgres");
+  if (existsSync9(binary) && binaryMajor(binary) === major) {
+    materializeReaderLibs(nativeDir);
+    return { binary, libDir: join11(nativeDir, "lib") };
+  }
+  const version = latestReaderVersion(pkg, major);
+  if (!version)
+    return null;
+  log(`  fetching PG ${major} reader (${pkg}@${version}) \u2014 one-time, cached at ${cacheDir}`);
+  try {
+    mkdirSync6(cacheDir, { recursive: true });
+    const res = spawnSync2("bun", ["add", `${pkg}@${version}`], { cwd: cacheDir, encoding: "utf8", timeout: 180000 });
+    if (res.status !== 0 || !existsSync9(binary))
+      return null;
+    materializeReaderLibs(nativeDir);
+    return binaryMajor(binary) === major ? { binary, libDir: join11(nativeDir, "lib") } : null;
+  } catch {
+    return null;
+  }
+}
+function resolveReaderForMajor(wantMajor, log) {
+  const installed = findAutopgPostgresBinary(wantMajor);
+  if (installed)
+    return { binary: installed };
+  if (wantMajor === null)
+    return null;
+  return fetchEmbeddedReader(wantMajor, log);
+}
 async function findFreePort() {
   return new Promise((resolve, reject) => {
     const server = createServer();
@@ -4747,10 +4831,17 @@ async function findFreePort() {
     });
   });
 }
-async function spawnTempPostmaster(binary, dataDir, port, log) {
+async function spawnTempPostmaster(reader, dataDir, port, log) {
   const socketDir = mkdtempSync(join11(tmpdir(), "omni-migrate-pg-"));
   log(`  spawning temp postmaster: pid=\u2026 port=${port} socket=${socketDir}`);
-  const child = spawn(binary, [
+  let env2 = process.env;
+  if (reader.libDir) {
+    const loaderVar = platform() === "darwin" ? "DYLD_LIBRARY_PATH" : platform() === "win32" ? "PATH" : "LD_LIBRARY_PATH";
+    const sep = platform() === "win32" ? ";" : ":";
+    const prev = process.env[loaderVar];
+    env2 = { ...process.env, [loaderVar]: prev ? `${reader.libDir}${sep}${prev}` : reader.libDir };
+  }
+  const child = spawn(reader.binary, [
     "-D",
     dataDir,
     "-p",
@@ -4761,7 +4852,8 @@ async function spawnTempPostmaster(binary, dataDir, port, log) {
     `unix_socket_directories=${socketDir}`
   ], {
     stdio: ["ignore", "pipe", "pipe"],
-    detached: false
+    detached: false,
+    env: env2
   });
   let started = false;
   let crashed = null;
@@ -4804,6 +4896,19 @@ async function spawnTempPostmaster(binary, dataDir, port, log) {
     }
   };
 }
+function listTables(args) {
+  return psqlCapture([...args, "-tAc", `SELECT tablename FROM pg_tables WHERE schemaname='public' ORDER BY tablename`]).split(`
+`).map((s) => s.trim()).filter(Boolean);
+}
+function listColumns(args, table, insertableOnly = false) {
+  const filter = insertableOnly ? `AND is_generated <> 'ALWAYS'` : "";
+  return psqlCapture([
+    ...args,
+    "-tAc",
+    `SELECT column_name FROM information_schema.columns WHERE table_schema='public' AND table_name='${table}' ${filter} ORDER BY ordinal_position`
+  ]).split(`
+`).map((s) => s.trim()).filter(Boolean);
+}
 function psqlCapture(args) {
   const result = spawnSync2("psql", args, {
     encoding: "utf-8",
@@ -4815,10 +4920,15 @@ function psqlCapture(args) {
   }
   return result.stdout ?? "";
 }
-async function copyTable(table, srcArgs, dstArgs, log) {
+async function copyTable(table, columns, srcArgs, dstArgs, log) {
+  if (columns.length === 0) {
+    log(`  skip ${table} (no shared columns)`);
+    return;
+  }
+  const colList = columns.map((c2) => `"${c2}"`).join(", ");
   const tmpFile = join11(tmpdir(), `omni-migrate-${table}-${process.pid}.copy`);
   try {
-    const srcResult = spawnSync2("psql", [...srcArgs, "-c", `\\copy public.${table} TO '${tmpFile}' WITH (FORMAT binary)`], {
+    const srcResult = spawnSync2("psql", [...srcArgs, "-c", `\\copy public."${table}" (${colList}) TO '${tmpFile}' WITH (FORMAT text)`], {
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env, PGPASSWORD: "postgres" },
       timeout: 600000,
@@ -4832,7 +4942,7 @@ async function copyTable(table, srcArgs, dstArgs, log) {
       "-c",
       `SET session_replication_role='replica';`,
       "-c",
-      `\\copy public.${table} FROM '${tmpFile}' WITH (FORMAT binary)`
+      `\\copy public."${table}" (${colList}) FROM '${tmpFile}' WITH (FORMAT text)`
     ], {
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env, PGPASSWORD: "postgres" },
@@ -4875,17 +4985,17 @@ async function compareEmbeddedVsCanonicalCounts(opts = {}) {
     return { kind: "skipped", reason: "embedded dir absent" };
   }
   const wantMajor = readDataDirMajor(EMBEDDED_DIR);
-  const binary = findAutopgPostgresBinary(wantMajor);
-  if (!binary) {
+  const reader = resolveReaderForMajor(wantMajor, () => {});
+  if (!reader) {
     return {
       kind: "skipped",
-      reason: wantMajor ? `no PostgreSQL ${wantMajor} reader under ~/.local/share/autopg (embedded dir is PG ${wantMajor})` : "autopg postgres binary not found"
+      reason: wantMajor ? `no PostgreSQL ${wantMajor} reader available (autopg or fetchable embedded-postgres) for the PG ${wantMajor} embedded dir` : "autopg postgres binary not found"
     };
   }
   const tempPort = await findFreePort();
   let temp = null;
   try {
-    temp = await spawnTempPostmaster(binary, EMBEDDED_DIR, tempPort, () => {});
+    temp = await spawnTempPostmaster(reader, EMBEDDED_DIR, tempPort, () => {});
     const srcArgs = ["-h", "127.0.0.1", "-p", String(tempPort), "-U", "postgres", "-d", "omni"];
     const dstArgs = ["-h", "127.0.0.1", "-p", String(canonicalPort), "-U", "postgres", "-d", "omni"];
     const tablesRaw = psqlCapture([
@@ -4901,8 +5011,8 @@ async function compareEmbeddedVsCanonicalCounts(opts = {}) {
     let totalExtra = 0;
     for (const t of tables) {
       try {
-        const em = Number.parseInt(psqlCapture([...srcArgs, "-tAc", `SELECT count(*) FROM public.${t}`]).trim(), 10);
-        const ca = Number.parseInt(psqlCapture([...dstArgs, "-tAc", `SELECT count(*) FROM public.${t}`]).trim(), 10);
+        const em = Number.parseInt(psqlCapture([...srcArgs, "-tAc", `SELECT count(*) FROM public."${t}"`]).trim(), 10);
+        const ca = Number.parseInt(psqlCapture([...dstArgs, "-tAc", `SELECT count(*) FROM public."${t}"`]).trim(), 10);
         if (Number.isFinite(em) && Number.isFinite(ca) && em > ca) {
           divergent.push(t);
           totalExtra += em - ca;
@@ -4931,40 +5041,42 @@ async function migrateUnmountedEmbeddedToCanonical(opts = {}) {
     return { status: "skipped", reason: "embedded dir missing PG_VERSION" };
   }
   const wantMajor = readDataDirMajor(EMBEDDED_DIR);
-  const binary = findAutopgPostgresBinary(wantMajor);
-  if (!binary) {
+  const reader = resolveReaderForMajor(wantMajor, log);
+  if (!reader) {
     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"
+      reason: wantMajor ? `could not obtain a PostgreSQL ${wantMajor} reader (no installed autopg match and embedded-postgres fetch unavailable \u2014 unsupported platform or offline)` : "autopg postgres binary not found \u2014 install autopg first"
     };
   }
-  log(`  using postgres binary: ${binary} (matched PG ${wantMajor ?? "?"})`);
+  log(`  using postgres binary: ${reader.binary} (matched PG ${wantMajor ?? "?"}${reader.libDir ? ", fetched reader" : ""})`);
   log("  stopping omni-api during data copy");
   spawnSync2("pm2", ["stop", "omni-api"], { stdio: "inherit" });
   const tempPort = await findFreePort();
   const t0 = Date.now();
-  const temp = await spawnTempPostmaster(binary, EMBEDDED_DIR, tempPort, log);
+  const temp = await spawnTempPostmaster(reader, EMBEDDED_DIR, tempPort, log);
   let apiRestarted = false;
   try {
     const srcBaseArgs = ["-h", "127.0.0.1", "-p", String(tempPort), "-U", "postgres", "-d", "omni"];
     const dstBaseArgs = ["-h", "127.0.0.1", "-p", String(canonicalPort), "-U", "postgres", "-d", "omni"];
-    const tablesRaw = psqlCapture([
-      ...srcBaseArgs,
-      "-tAc",
-      `SELECT tablename FROM pg_tables WHERE schemaname='public' ORDER BY tablename`
-    ]);
-    const tables = tablesRaw.split(`
-`).map((s) => s.trim()).filter(Boolean);
-    if (tables.length === 0) {
+    const srcTables = new Set(listTables(srcBaseArgs));
+    if (srcTables.size === 0) {
       return { status: "skipped", reason: "embedded omni has no public tables" };
     }
-    const SKIP_TABLES = new Set(["media_content"]);
-    const filteredTables = tables.filter((t) => !SKIP_TABLES.has(t));
-    const skipped = tables.filter((t) => SKIP_TABLES.has(t));
+    const dstTables = listTables(dstBaseArgs);
+    const tables = dstTables.filter((t) => srcTables.has(t));
+    const onlyEmbedded = [...srcTables].filter((t) => !dstTables.includes(t));
+    if (onlyEmbedded.length > 0) {
+      log(`  ${onlyEmbedded.length} obsolete embedded-only table(s) skipped: ${onlyEmbedded.join(", ")}`);
+    }
+    if (tables.length === 0) {
+      return { status: "skipped", reason: "no tables shared between embedded and canonical schemas" };
+    }
+    const filteredTables = tables.filter((t) => !MIGRATION_SKIP_TABLES.has(t));
+    const skipped = tables.filter((t) => MIGRATION_SKIP_TABLES.has(t));
     if (skipped.length > 0)
       log(`  skipping ${skipped.length} table(s) (rebuilt at runtime): ${skipped.join(", ")}`);
     log(`  ${filteredTables.length} tables to migrate`);
-    const truncateList = filteredTables.map((t) => `public.${t}`).join(",");
+    const truncateList = filteredTables.map((t) => `public."${t}"`).join(",");
     psqlCapture([
       ...dstBaseArgs,
       "-c",
@@ -4972,7 +5084,9 @@ async function migrateUnmountedEmbeddedToCanonical(opts = {}) {
     ]);
     log("  truncated canonical (CASCADE)");
     for (const t of filteredTables) {
-      await copyTable(t, srcBaseArgs, dstBaseArgs, log);
+      const srcCols = new Set(listColumns(srcBaseArgs, t));
+      const sharedCols = listColumns(dstBaseArgs, t, true).filter((c2) => srcCols.has(c2));
+      await copyTable(t, sharedCols, srcBaseArgs, dstBaseArgs, log);
     }
     resetSequences(dstBaseArgs, log);
     return { status: "migrated", tables: filteredTables.length, durationMs: Date.now() - t0 };
@@ -4983,9 +5097,10 @@ async function migrateUnmountedEmbeddedToCanonical(opts = {}) {
     apiRestarted = true;
   }
 }
-var EMBEDDED_DIR, EMBEDDED_PGSERVE_DATA_DIR;
+var EMBEDDED_DIR, MIGRATION_SKIP_TABLES, EMBEDDED_PGSERVE_DATA_DIR;
 var init_embedded_canonical_migration = __esm(() => {
   EMBEDDED_DIR = join11(homedir7(), ".omni", "data", "pgserve");
+  MIGRATION_SKIP_TABLES = new Set(["media_content", "api_keys", "api_key_audit_logs"]);
   EMBEDDED_PGSERVE_DATA_DIR = EMBEDDED_DIR;
 });
 
@@ -35629,6 +35744,100 @@ var init_types6 = __esm(() => {
   };
 });
 
+// ../core/src/providers/execution-context.ts
+function compactEnv(values) {
+  return Object.fromEntries(Object.entries(values).filter(([, value]) => value !== undefined));
+}
+function inferChatType(context) {
+  if (context.type === "dm")
+    return "dm";
+  if (context.source.chatId === context.sender.platformUserId)
+    return "dm";
+  if (context.source.threadId)
+    return "channel";
+  return "group";
+}
+function compactCustomer(customer) {
+  if (!customer)
+    return;
+  const compacted = Object.fromEntries(Object.entries(customer).filter(([, value]) => value !== undefined));
+  return Object.keys(compacted).length > 0 ? compacted : undefined;
+}
+function buildOmniExecutionContext(context) {
+  const userId = context.sender.personId ?? context.sender.platformUserId;
+  const sessionId = context.sessionId || context.source.threadId || context.source.chatId || userId;
+  const customer = compactCustomer(context.customer);
+  return {
+    identity: {
+      userId,
+      ...context.sender.personId ? { personId: context.sender.personId } : {},
+      platformUserId: context.sender.platformUserId,
+      ...context.sender.displayName ? { displayName: context.sender.displayName } : {}
+    },
+    source: {
+      channel: context.source.channelType,
+      instanceId: context.source.instanceId,
+      chatId: context.source.chatId,
+      ...context.source.threadId ? { threadId: context.source.threadId } : {},
+      messageId: context.source.messageId
+    },
+    session: {
+      id: sessionId,
+      ...context.sessionStrategy ? { strategy: context.sessionStrategy } : {}
+    },
+    trace: {
+      id: context.traceId
+    },
+    ...customer ? { customer } : {}
+  };
+}
+function buildOmniEnv(context, executionContext = buildOmniExecutionContext(context)) {
+  return compactEnv({
+    ...context.env ?? {},
+    OMNI_USER_ID: executionContext.identity.userId,
+    OMNI_PERSON_ID: executionContext.identity.personId,
+    OMNI_PLATFORM_USER_ID: executionContext.identity.platformUserId,
+    OMNI_SENDER: executionContext.identity.platformUserId,
+    OMNI_DISPLAY_NAME: executionContext.identity.displayName,
+    OMNI_INSTANCE: executionContext.source.instanceId,
+    OMNI_CHAT: executionContext.source.chatId,
+    OMNI_MESSAGE: executionContext.source.messageId,
+    OMNI_CHANNEL: executionContext.source.channel,
+    OMNI_SESSION: executionContext.session.id,
+    OMNI_TRACE_ID: executionContext.trace.id,
+    OMNI_THREAD: executionContext.source.threadId,
+    OMNI_EXTERNAL_USER_ID: executionContext.customer?.externalUserId,
+    OMNI_CUSTOMER_ID: executionContext.customer?.customerId,
+    OMNI_ORGANIZATION_ID: executionContext.customer?.organizationId,
+    OMNI_TENANT_ID: executionContext.customer?.tenantId
+  });
+}
+function buildProviderRequestContext(context) {
+  const executionContext = buildOmniExecutionContext(context);
+  return {
+    userId: executionContext.identity.userId,
+    sessionId: executionContext.session.id,
+    platform: {
+      id: executionContext.identity.platformUserId,
+      channel: executionContext.source.channel,
+      instanceId: executionContext.source.instanceId
+    },
+    sender: {
+      ...executionContext.identity.displayName ? { displayName: executionContext.identity.displayName } : {}
+    },
+    chat: {
+      type: inferChatType(context),
+      id: executionContext.source.chatId,
+      ...executionContext.source.threadId ? { threadId: executionContext.source.threadId } : {}
+    },
+    messageId: executionContext.source.messageId,
+    ...context.content.referencedMessageId ? { replyToMessageId: context.content.referencedMessageId } : {},
+    env: buildOmniEnv(context, executionContext),
+    executionContext
+  };
+}
+var OMNI_EXECUTION_CONTEXT_EXTENSION_URI = "https://omni.dev/extensions/execution-context/v1";
+
 // ../core/src/providers/agno-client.ts
 class AgnoClient {
   baseUrl;
@@ -35975,10 +36184,10 @@ var init_agno_client = __esm(() => {
 // ../core/src/providers/claude-code-executable.ts
 import { existsSync as nodeExistsSync } from "fs";
 import { createRequire } from "module";
-function archLinkerNames(arch) {
-  if (arch === "x64")
+function archLinkerNames(arch2) {
+  if (arch2 === "x64")
     return { musl: "x86_64", glibc: "x86-64" };
-  if (arch === "arm64")
+  if (arch2 === "arm64")
     return { musl: "aarch64", glibc: "aarch64" };
   return null;
 }
@@ -35991,41 +36200,41 @@ function glibcLinkerCandidates(glibcName, muslName, nodeArch) {
   return [`/lib64/${fileName}`, `/lib/${muslName}-linux-gnu/${fileName}`, `/lib/${fileName}`];
 }
 function detectLinuxLibc(options = {}) {
-  const platform = options.platform ?? process.platform;
-  if (platform !== "linux")
+  const platform2 = options.platform ?? process.platform;
+  if (platform2 !== "linux")
     return "unknown";
-  const arch = options.arch ?? process.arch;
-  const names = archLinkerNames(arch);
+  const arch2 = options.arch ?? process.arch;
+  const names = archLinkerNames(arch2);
   if (!names)
     return "unknown";
   const exists = options.existsSync ?? nodeExistsSync;
   if (exists(muslLinkerPath(names.musl)))
     return "musl";
-  if (glibcLinkerCandidates(names.glibc, names.musl, arch).some(exists))
+  if (glibcLinkerCandidates(names.glibc, names.musl, arch2).some(exists))
     return "glibc";
   return "unknown";
 }
 function resolveClaudeCodeExecutable(options = {}) {
-  const platform = options.platform ?? process.platform;
-  if (platform !== "linux")
+  const platform2 = options.platform ?? process.platform;
+  if (platform2 !== "linux")
     return;
-  const libc = options.libc ?? detectLinuxLibc({ platform, arch: options.arch });
+  const libc = options.libc ?? detectLinuxLibc({ platform: platform2, arch: options.arch });
   if (libc === "unknown")
     return;
-  const arch = options.arch ?? process.arch;
-  if (arch !== "x64" && arch !== "arm64")
+  const arch2 = options.arch ?? process.arch;
+  if (arch2 !== "x64" && arch2 !== "arm64")
     return;
-  const suffix = libc === "musl" ? `-${arch}-musl` : `-${arch}`;
+  const suffix = libc === "musl" ? `-${arch2}-musl` : `-${arch2}`;
   const specifier = `@anthropic-ai/claude-agent-sdk-linux${suffix}/claude`;
   const resolve2 = options.resolve ?? createRequire(import.meta.url).resolve;
   try {
     const resolved = resolve2(specifier);
-    log6.debug("Resolved Claude Code executable for host libc", { libc, arch, resolved });
+    log6.debug("Resolved Claude Code executable for host libc", { libc, arch: arch2, resolved });
     return resolved;
   } catch (error2) {
     log6.debug("Claude Code subpackage not installed; falling back to SDK default", {
       libc,
-      arch,
+      arch: arch2,
       specifier,
       error: String(error2)
     });
@@ -36034,9 +36243,9 @@ function resolveClaudeCodeExecutable(options = {}) {
 }
 function describeClaudeCodeStartupError(error2, options = {}) {
   const raw2 = String(error2);
-  const platform = options.platform ?? process.platform;
+  const platform2 = options.platform ?? process.platform;
   const isStartupCrash = /process exited with code 1/i.test(raw2);
-  if (!isStartupCrash || platform !== "linux")
+  if (!isStartupCrash || platform2 !== "linux")
     return raw2;
   const configuredHint = options.explicitExecutablePath ? `Configured pathToClaudeCodeExecutable=${options.explicitExecutablePath} did not launch \u2014 verify the binary is executable on this host.` : "Set `pathToClaudeCodeExecutable` on the provider to the correct SDK binary for this host, " + "or remove the mismatched optional subpackage " + "(e.g. `bun remove @anthropic-ai/claude-agent-sdk-linux-x64-musl` on glibc).";
   return `${raw2} \u2014 Claude Code binary failed to start. This is typically a glibc/musl ABI mismatch: the SDK resolved an optional subpackage whose native binary cannot execute on this host's dynamic linker. ${configuredHint}`;
@@ -60044,12 +60253,11 @@ class AgnoAgentProvider {
       message2 = `[${context.sender.displayName}]: ${message2}`;
     }
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: this.config.agentId,
       agentType: this.config.agentType,
       stream: false,
-      sessionId: context.sessionId,
-      userId: context.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log8.info("Triggering Agno agent", {
@@ -60105,20 +60313,6 @@ function boundContextMessages(contextMessages) {
   }
   return bounded;
 }
-function buildOmniEnv(context) {
-  return {
-    ...context.env ?? {},
-    OMNI_INSTANCE: context.source.instanceId,
-    OMNI_CHAT: context.source.chatId,
-    OMNI_MESSAGE: context.source.messageId,
-    OMNI_CHANNEL: context.source.channelType,
-    OMNI_SESSION: context.sessionId,
-    OMNI_TRACE_ID: context.traceId,
-    OMNI_SENDER: context.sender.platformUserId,
-    ...context.sender.personId ? { OMNI_PERSON_ID: context.sender.personId } : {},
-    ...context.source.threadId ? { OMNI_THREAD: context.source.threadId } : {}
-  };
-}
 
 class ClaudeCodeAgentProvider {
   id;
@@ -60242,13 +60436,12 @@ ${fileList}`;
     }
     const { message: message2, resolvedSessionId, internalSessionKey } = prepared;
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: "claude-code",
       stream: false,
       sessionId: resolvedSessionId,
-      userId: context.sender.personId ?? context.sender.platformUserId,
       timeoutMs: this.options.timeoutMs ?? 120000,
-      env: buildOmniEnv(context),
       ...context.source.chatId ? { mcpUrlParams: { chat_id: context.source.chatId } } : {}
     };
     log9.info("Triggering Claude Code agent", {
@@ -60285,13 +60478,12 @@ ${fileList}`;
     }
     const { message: message2, resolvedSessionId, internalSessionKey } = prepared;
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: "claude-code",
       stream: true,
       sessionId: resolvedSessionId,
-      userId: context.sender.personId ?? context.sender.platformUserId,
       timeoutMs: this.options.timeoutMs ?? 120000,
-      env: buildOmniEnv(context),
       ...context.source.chatId ? { mcpUrlParams: { chat_id: context.source.chatId } } : {}
     };
     log9.info("Triggering Claude Code agent (stream)", {
@@ -60387,6 +60579,7 @@ class WebhookAgentProvider {
         emoji: context.content.emoji
       },
       traceId: context.traceId,
+      executionContext: buildOmniExecutionContext(context),
       replyEndpoint: "POST /api/v2/messages/send"
     };
     log10.info("Sending webhook trigger", {
@@ -61802,10 +61995,9 @@ class AgUiAgentProvider {
       return { parts: [], metadata: { runId: "", providerId: this.id, durationMs: 0 } };
     }
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context.sessionId,
-      userId: context.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log14.info("Triggering AG-UI agent", { agentId: this.config.agentId, traceId: context.traceId });
@@ -61832,10 +62024,9 @@ class AgUiAgentProvider {
       return;
     }
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context.sessionId,
-      userId: context.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log14.info("Streaming AG-UI agent", { agentId: this.config.agentId, traceId: context.traceId });
@@ -61994,16 +62185,23 @@ class A2AClient {
     }
   }
   buildJsonRpcRequest(method, request) {
+    const message2 = {
+      role: "ROLE_USER",
+      parts: [{ text: request.message, mediaType: "text/plain" }],
+      messageId: `msg-${crypto.randomUUID()}`
+    };
+    if (request.executionContext) {
+      message2.extensions = [OMNI_EXECUTION_CONTEXT_EXTENSION_URI];
+      message2.metadata = {
+        omniExecutionContext: request.executionContext
+      };
+    }
     return {
       jsonrpc: "2.0",
       id: `omni-${crypto.randomUUID()}`,
       method,
       params: {
-        message: {
-          role: "ROLE_USER",
-          parts: [{ text: request.message, mediaType: "text/plain" }],
-          messageId: `msg-${crypto.randomUUID()}`
-        },
+        message: message2,
         configuration: {
           acceptedOutputModes: ["text/plain"],
           returnImmediately: true
@@ -62219,10 +62417,9 @@ class A2AAgentProvider {
       return { parts: [], metadata: { runId: "", providerId: this.id, durationMs: 0 } };
     }
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context.sessionId,
-      userId: context.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log16.info("Triggering A2A agent", { agentId: this.config.agentId, traceId: context.traceId });
@@ -62252,10 +62449,9 @@ class A2AAgentProvider {
       return;
     }
     const request = {
+      ...buildProviderRequestContext(context),
       message: message2,
       agentId: this.config.agentId,
-      sessionId: context.sessionId,
-      userId: context.sender.platformUserId,
       timeoutMs: this.config.timeoutMs ?? 60000
     };
     log16.info("Streaming A2A agent", { agentId: this.config.agentId, traceId: context.traceId });
@@ -62351,7 +62547,8 @@ class NatsGenieProvider {
       traceId: context.traceId,
       messageId: context.source.messageId,
       files: context.content.files,
-      env: context.env
+      env: buildOmniEnv(context),
+      executionContext: buildOmniExecutionContext(context)
     };
     try {
       await this.ensureConnected();
@@ -63334,6 +63531,9 @@ __export(exports_src, {
   calculateBackoffDelay: () => calculateBackoffDelay,
   buildSubscribePattern: () => buildSubscribePattern,
   buildSubject: () => buildSubject,
+  buildProviderRequestContext: () => buildProviderRequestContext,
+  buildOmniExecutionContext: () => buildOmniExecutionContext,
+  buildOmniEnv: () => buildOmniEnv,
   buildConversationKey: () => buildConversationKey,
   buildConsumerConfig: () => buildConsumerConfig,
   armSequence: () => armSequence,
@@ -63378,6 +63578,7 @@ __export(exports_src, {
   OpenClawAgentProvider: () => OpenClawAgentProvider,
   OmniEventRecordSchema: () => OmniEventRecordSchema,
   OmniError: () => OmniError,
+  OMNI_EXECUTION_CONTEXT_EXTENSION_URI: () => OMNI_EXECUTION_CONTEXT_EXTENSION_URI,
   NotFoundError: () => NotFoundError,
   NonEmptyStringSchema: () => NonEmptyStringSchema,
   NatsGenieProvider: () => NatsGenieProvider,
@@ -82855,7 +83056,7 @@ var require_path = __commonJS((exports) => {
   function join21(...args) {
     return normalizePath(args.join("/"));
   }
-  function dirname6(path) {
+  function dirname7(path) {
     const result = splitPath(path);
     const root = result[0] || "";
     let dir = result[1];
@@ -82875,7 +83076,7 @@ var require_path = __commonJS((exports) => {
     return f10;
   }
   exports.basename = basename6;
-  exports.dirname = dirname6;
+  exports.dirname = dirname7;
   exports.isAbsolute = isAbsolute;
   exports.join = join21;
   exports.normalizePath = normalizePath;
@@ -124502,7 +124703,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260525.1",
+  version: "2.260528.1",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {
@@ -128373,7 +128574,7 @@ function createDeadLettersCommand() {
 }
 
 // src/commands/doctor.ts
-import { existsSync as existsSync10, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
+import { existsSync as existsSync10, readdirSync as readdirSync3, statSync as statSync2 } from "fs";
 import { homedir as homedir8 } from "os";
 import { join as join13, resolve } from "path";
 init_config();
@@ -129776,12 +129977,12 @@ init_output();
 
 // src/server-bundle.ts
 init_output();
-import { dirname as dirname2, join as join12 } from "path";
+import { dirname as dirname3, join as join12 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function getServerBundlePath() {
   try {
     const thisFile = fileURLToPath2(import.meta.url);
-    const distDir = dirname2(thisFile);
+    const distDir = dirname3(thisFile);
     return join12(distDir, "server", "index.js");
   } catch {
     return join12(process.cwd(), "dist", "server", "index.js");
@@ -129790,7 +129991,7 @@ function getServerBundlePath() {
 function getServerLauncherPath() {
   try {
     const thisFile = fileURLToPath2(import.meta.url);
-    const distDir = dirname2(thisFile);
+    const distDir = dirname3(thisFile);
     return join12(distDir, "..", "bin", "omni-server");
   } catch {
     return join12(process.cwd(), "bin", "omni-server");
@@ -129962,7 +130163,7 @@ function scanForOrphans(dir, acc, depth, maxDepth = 4) {
     return;
   let entries;
   try {
-    entries = readdirSync2(dir);
+    entries = readdirSync3(dir);
   } catch {
     return;
   }
@@ -131456,7 +131657,7 @@ function createHistoryCommand() {
 
 // src/commands/imagine.ts
 import { writeFileSync as writeFileSync8 } from "fs";
-import { basename as basename2, dirname as dirname3, extname as extname2, join as join14 } from "path";
+import { basename as basename2, dirname as dirname4, extname as extname2, join as join14 } from "path";
 init_output();
 var ALLOWED_ASPECT_RATIOS = ["1:1", "4:3", "3:4", "16:9", "9:16", "3:2", "2:3"];
 function extensionForMime(mimeType) {
@@ -131467,7 +131668,7 @@ function extensionForMime(mimeType) {
   return ".png";
 }
 function buildOutputPath(outputBase, index, total, mimeType) {
-  const dir = dirname3(outputBase);
+  const dir = dirname4(outputBase);
   const ext = extname2(outputBase) || extensionForMime(mimeType);
   const stem = basename2(outputBase, extname2(outputBase));
   if (total <= 1) {
@@ -131591,7 +131792,7 @@ function createImagineCommand() {
 }
 
 // src/commands/install.ts
-import { existsSync as existsSync12, mkdirSync as mkdirSync6 } from "fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync7 } from "fs";
 import { homedir as homedir9 } from "os";
 import { join as join15 } from "path";
 init_config();
@@ -131701,7 +131902,7 @@ async function startServices(cfg, forceCleanup, forceSystemd, useCanonicalPgserv
   Or build locally: make cli-build-full`);
     return false;
   }
-  mkdirSync6(getPm2LogDir(), { recursive: true });
+  mkdirSync7(getPm2LogDir(), { recursive: true });
   await installPm2Logrotate();
   const runtimeEnv = buildInstallRuntimeEnv(cfg, forceCleanup, useCanonicalPgserve);
   await runPm2(["delete", PM2_PROCESSES.api]);
@@ -131722,7 +131923,7 @@ async function startServices(cfg, forceCleanup, forceSystemd, useCanonicalPgserv
   if (existsSync12(NATS_BINARY_PATH)) {
     const natsSpinner = ora(`Starting ${PM2_PROCESSES.nats}...`).start();
     const natsDataDir = join15(cfg.dataDir, "nats");
-    mkdirSync6(natsDataDir, { recursive: true });
+    mkdirSync7(natsDataDir, { recursive: true });
     const natsArgs = buildPm2StartArgs({
       kind: "nats",
       script: NATS_BINARY_PATH,
@@ -133399,8 +133600,8 @@ function createLogsCommand() {
 }
 
 // src/commands/media.ts
-import { createWriteStream as createWriteStream2, existsSync as existsSync14, mkdirSync as mkdirSync8, statSync as statSync4 } from "fs";
-import { basename as basename4, dirname as dirname4, resolve as resolve2 } from "path";
+import { createWriteStream as createWriteStream2, existsSync as existsSync14, mkdirSync as mkdirSync9, statSync as statSync4 } from "fs";
+import { basename as basename4, dirname as dirname5, resolve as resolve2 } from "path";
 import { Readable } from "stream";
 import { pipeline } from "stream/promises";
 init_config();
@@ -133467,9 +133668,9 @@ function resolveOutputPath(outputPath, result) {
   return resolved;
 }
 async function downloadToFile(url, apiKey, destinationPath) {
-  const destDir = dirname4(destinationPath);
+  const destDir = dirname5(destinationPath);
   if (!existsSync14(destDir))
-    mkdirSync8(destDir, { recursive: true });
+    mkdirSync9(destDir, { recursive: true });
   const resp = await fetch(url, {
     method: "GET",
     headers: apiKey ? { "x-api-key": apiKey } : undefined
@@ -134422,9 +134623,9 @@ init_output();
 init_src();
 import { execFileSync as execFileSync4, execSync } from "child_process";
 import * as nodeCrypto2 from "crypto";
-import { existsSync as existsSync15, mkdirSync as mkdirSync9, readFileSync as readFileSync10, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync10, readFileSync as readFileSync10, writeFileSync as writeFileSync9 } from "fs";
 import { homedir as homedir11 } from "os";
-import { dirname as dirname5, resolve as resolve3 } from "path";
+import { dirname as dirname6, resolve as resolve3 } from "path";
 import { createInterface as createInterface2 } from "readline";
 init_config();
 init_output();
@@ -134661,7 +134862,7 @@ function readOpenClawConfig(configPath) {
   return JSON.parse(raw2);
 }
 function writeOpenClawConfig(configPath, config2) {
-  mkdirSync9(dirname5(configPath), { recursive: true, mode: 448 });
+  mkdirSync10(dirname6(configPath), { recursive: true, mode: 448 });
   writeFileSync9(configPath, `${JSON.stringify(config2, null, 2)}
 `, { mode: 384 });
 }
@@ -136438,7 +136639,7 @@ function pickFilename(mimeType, provider) {
 }
 
 // src/commands/start.ts
-import { existsSync as existsSync18, mkdirSync as mkdirSync10 } from "fs";
+import { existsSync as existsSync18, mkdirSync as mkdirSync11 } from "fs";
 import { homedir as homedir12 } from "os";
 import { join as join17 } from "path";
 init_config();
@@ -136454,7 +136655,7 @@ async function runStart() {
   }
   const serverConfig = loadServerConfig();
   const apiPort = serverConfig.port;
-  mkdirSync10(getPm2LogDir(), { recursive: true });
+  mkdirSync11(getPm2LogDir(), { recursive: true });
   info(`Starting ${PM2_PROCESSES.api} (port ${apiPort})...`);
   const cliConfig = loadConfig();
   const env2 = buildRuntimeEnv(serverConfig, cliConfig);
@@ -136474,7 +136675,7 @@ async function runStart() {
   if (existsSync18(natsPath)) {
     info(`Starting ${PM2_PROCESSES.nats}...`);
     const natsDataDir = join17(serverConfig.dataDir, "nats");
-    mkdirSync10(natsDataDir, { recursive: true });
+    mkdirSync11(natsDataDir, { recursive: true });
     const natsArgs = buildPm2StartArgs({
       kind: "nats",
       script: natsPath,
@@ -137177,7 +137378,7 @@ async function cleanupLegacyArtifacts(skipList) {
 init_output();
 
 // src/update-diagnostics.ts
-import { existsSync as existsSync19, mkdirSync as mkdirSync11, readFileSync as readFileSync13, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync19, mkdirSync as mkdirSync12, 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;
@@ -137246,7 +137447,7 @@ function writeDiagnostics(state, exitCode) {
   const path = getDiagnosticsPath(state.startedAt);
   try {
     if (!existsSync19(dir)) {
-      mkdirSync11(dir, { recursive: true, mode: 448 });
+      mkdirSync12(dir, { recursive: true, mode: 448 });
     }
     writeFileSync10(path, `${JSON.stringify(state, null, 2)}
 `, { mode: 384 });
@@ -137826,9 +138027,9 @@ function createVoiceCommand() {
     const startTime = Date.now();
     let saveDir = "";
     if (opts.save) {
-      const { mkdirSync: mkdirSync12 } = await import("fs");
+      const { mkdirSync: mkdirSync13 } = await import("fs");
       saveDir = opts.save;
-      mkdirSync12(saveDir, { recursive: true });
+      mkdirSync13(saveDir, { recursive: true });
       info(`Saving audio to: ${saveDir}`);
     }
     ws.onopen = () => {
@@ -138137,7 +138338,7 @@ function getConfigSummary() {
 
 // src/telemetry.ts
 init_config();
-import { arch, platform, release } from "os";
+import { arch as arch2, platform as platform2, release } from "os";
 var OMNI_SENTRY_DSN = "https://2b2ca6f407e3d13409aa7dd8d12483f2@o4509714066571264.ingest.us.sentry.io/4510982636371968";
 var SENSITIVE_FLAGS = new Set([
   "--api-key",
@@ -138219,8 +138420,8 @@ function ensureSentry() {
       }
     });
     Sentry.setTag("cli.version", VERSION);
-    Sentry.setTag("os.platform", platform());
-    Sentry.setTag("os.arch", arch());
+    Sentry.setTag("os.platform", platform2());
+    Sentry.setTag("os.arch", arch2());
     Sentry.setTag("os.release", release());
     Sentry.setTag("runtime", `bun/${process.versions.bun ?? "unknown"}`);
     sentryModule = Sentry;