@automagik/omni 2.260704.7 → 2.260704.9

package/dist/index.js

@@ -125010,7 +125010,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260704.7",
+  version: "2.260704.9",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -35059,52 +35059,80 @@ var init_download_guard = __esm(() => {
 });
 
 // ../channel-sdk/src/media-backends/config.ts
-function parseBool(value, defaultValue) {
-  if (value === undefined)
+function boolFromEnv(defaultValue) {
+  return exports_external.string().optional().transform((value) => {
+    if (value === undefined)
+      return defaultValue;
+    const normalized = value.trim().toLowerCase();
+    if (["1", "true", "yes", "on"].includes(normalized))
+      return true;
+    if (["0", "false", "no", "off"].includes(normalized))
+      return false;
     return defaultValue;
-  const normalized = value.trim().toLowerCase();
-  if (["1", "true", "yes", "on"].includes(normalized))
-    return true;
-  if (["0", "false", "no", "off"].includes(normalized))
-    return false;
-  return defaultValue;
+  });
 }
-function parseTtl(value, defaultValue) {
-  if (value === undefined)
-    return defaultValue;
-  const parsed = Number.parseInt(value.trim(), 10);
-  return Number.isFinite(parsed) && parsed > 0 ? parsed : defaultValue;
+function ttlFromEnv(defaultValue) {
+  return exports_external.string().optional().transform((value) => {
+    if (value === undefined)
+      return defaultValue;
+    const parsed = Number.parseInt(value.trim(), 10);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : defaultValue;
+  });
 }
 function resolveMediaBackendConfig(env = process.env) {
-  const mode = (env.OMNI_MEDIA_MODE ?? "local").trim().toLowerCase();
-  if (mode !== "remote") {
+  const parsed = MediaEnvSchema.safeParse(env);
+  if (!parsed.success) {
+    throw new Error(parsed.error.issues.map((issue) => issue.message).join("; "));
+  }
+  const vars = parsed.data;
+  if (vars.OMNI_MEDIA_MODE !== "remote") {
     return { mode: "local" };
   }
-  const bucket = env.OMNI_MEDIA_S3_BUCKET?.trim();
-  const accessKeyId = env.OMNI_MEDIA_S3_ACCESS_KEY?.trim();
-  const secretKey = env.OMNI_MEDIA_S3_SECRET_KEY?.trim();
-  const missing = [
-    ["OMNI_MEDIA_S3_BUCKET", bucket],
-    ["OMNI_MEDIA_S3_ACCESS_KEY", accessKeyId],
-    ["OMNI_MEDIA_S3_SECRET_KEY", secretKey]
-  ].filter(([, value]) => !value).map(([name]) => name);
-  if (missing.length > 0) {
+  const bucket = vars.OMNI_MEDIA_S3_BUCKET;
+  const accessKeyId = vars.OMNI_MEDIA_S3_ACCESS_KEY;
+  const secretKey = vars.OMNI_MEDIA_S3_SECRET_KEY;
+  if (!bucket || !accessKeyId || !secretKey) {
+    const missing = [
+      ["OMNI_MEDIA_S3_BUCKET", bucket],
+      ["OMNI_MEDIA_S3_ACCESS_KEY", accessKeyId],
+      ["OMNI_MEDIA_S3_SECRET_KEY", secretKey]
+    ].filter(([, value]) => !value).map(([name]) => name);
     throw new Error(`OMNI_MEDIA_MODE=remote requires these env vars: ${missing.join(", ")}`);
   }
   return {
     mode: "remote",
     s3: {
-      endpoint: env.OMNI_MEDIA_S3_ENDPOINT?.trim() || undefined,
+      endpoint: vars.OMNI_MEDIA_S3_ENDPOINT,
+      publicEndpoint: vars.OMNI_MEDIA_S3_PUBLIC_ENDPOINT,
       bucket,
-      region: env.OMNI_MEDIA_S3_REGION?.trim() || DEFAULT_REGION,
+      region: vars.OMNI_MEDIA_S3_REGION ?? DEFAULT_REGION,
       accessKeyId,
       secretKey,
-      forcePathStyle: parseBool(env.OMNI_MEDIA_S3_FORCE_PATH_STYLE, true),
-      presignTtlSeconds: parseTtl(env.OMNI_MEDIA_S3_PRESIGN_TTL_SECONDS, DEFAULT_PRESIGN_TTL_SECONDS)
+      forcePathStyle: vars.OMNI_MEDIA_S3_FORCE_PATH_STYLE,
+      presignTtlSeconds: vars.OMNI_MEDIA_S3_PRESIGN_TTL_SECONDS
     }
   };
 }
-var DEFAULT_PRESIGN_TTL_SECONDS = 3600, DEFAULT_REGION = "us-east-1";
+var DEFAULT_PRESIGN_TTL_SECONDS = 3600, DEFAULT_REGION = "us-east-1", optionalTrimmedString, MediaEnvSchema;
+var init_config = __esm(() => {
+  init_zod();
+  optionalTrimmedString = exports_external.string().optional().transform((value) => value?.trim() || undefined);
+  MediaEnvSchema = exports_external.object({
+    OMNI_MEDIA_MODE: exports_external.string().optional().transform((value) => (value ?? "local").trim().toLowerCase()).pipe(exports_external.enum(["local", "remote"], {
+      errorMap: (_issue, ctx) => ({
+        message: `Invalid OMNI_MEDIA_MODE="${String(ctx.data)}" \u2014 expected "local" or "remote" (unset defaults to local). Refusing to silently fall back to local disk.`
+      })
+    })),
+    OMNI_MEDIA_S3_ENDPOINT: optionalTrimmedString,
+    OMNI_MEDIA_S3_PUBLIC_ENDPOINT: optionalTrimmedString,
+    OMNI_MEDIA_S3_BUCKET: optionalTrimmedString,
+    OMNI_MEDIA_S3_REGION: optionalTrimmedString,
+    OMNI_MEDIA_S3_ACCESS_KEY: optionalTrimmedString,
+    OMNI_MEDIA_S3_SECRET_KEY: optionalTrimmedString,
+    OMNI_MEDIA_S3_FORCE_PATH_STYLE: boolFromEnv(true),
+    OMNI_MEDIA_S3_PRESIGN_TTL_SECONDS: ttlFromEnv(DEFAULT_PRESIGN_TTL_SECONDS)
+  });
+});
 
 // ../channel-sdk/src/media-backends/local-backend.ts
 import { createWriteStream, existsSync, mkdirSync, writeFileSync } from "fs";
@@ -35176,20 +35204,26 @@ var init_local_backend = __esm(() => {
 class S3MediaBackend {
   mode = "remote";
   client;
+  presignClient;
   presignTtlSeconds;
   constructor(config2) {
     this.presignTtlSeconds = config2.presignTtlSeconds;
-    this.client = new Bun.S3Client({
+    const clientOptions = {
       accessKeyId: config2.accessKeyId,
       secretAccessKey: config2.secretKey,
       bucket: config2.bucket,
       region: config2.region,
-      ...config2.endpoint ? { endpoint: config2.endpoint } : {},
       ...config2.forcePathStyle ? {} : { virtualHostedStyle: true }
+    };
+    this.client = new Bun.S3Client({
+      ...clientOptions,
+      ...config2.endpoint ? { endpoint: config2.endpoint } : {}
     });
+    this.presignClient = config2.publicEndpoint ? new Bun.S3Client({ ...clientOptions, endpoint: config2.publicEndpoint }) : this.client;
     log19.info("Initialized S3 media backend", {
       bucket: config2.bucket,
       endpoint: config2.endpoint ?? "aws",
+      publicEndpoint: config2.publicEndpoint ?? config2.endpoint ?? "aws",
       forcePathStyle: config2.forcePathStyle
     });
   }
@@ -35212,19 +35246,32 @@ class S3MediaBackend {
       }
     } catch (error) {
       await Promise.resolve(writer.end(error)).catch(() => {});
+      await this.deleteQuietly(key);
       throw error;
     }
     await writer.end();
+    if (size === 0) {
+      await this.deleteQuietly(key);
+      log19.debug("Removed empty media object from S3", { key });
+      return { reference: key, size, mimeType };
+    }
     log19.debug("Streamed media to S3", { key, size });
     return { reference: key, size, mimeType };
   }
+  async deleteQuietly(key) {
+    try {
+      await this.client.delete(key);
+    } catch (error) {
+      log19.warn("Failed to delete orphaned S3 object", { key, error: String(error) });
+    }
+  }
   async read(key) {
     const bytes = await this.client.file(key).arrayBuffer();
     log19.debug("Read media from S3", { key, size: bytes.byteLength });
     return Buffer.from(bytes);
   }
   async presignedUrl(key, ttlSeconds = this.presignTtlSeconds) {
-    return this.client.presign(key, { expiresIn: ttlSeconds, method: "GET" });
+    return this.presignClient.presign(key, { expiresIn: ttlSeconds, method: "GET" });
   }
 }
 var log19;
@@ -35242,8 +35289,10 @@ function createMediaBackend(basePath, config2 = resolveMediaBackendConfig()) {
   return new LocalMediaBackend(basePath);
 }
 var init_media_backends = __esm(() => {
+  init_config();
   init_local_backend();
   init_s3_backend();
+  init_config();
   init_local_backend();
   init_s3_backend();
 });
@@ -225489,7 +225538,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260704.7",
+    version: "2.260704.9",
     type: "module",
     exports: {
       ".": {
@@ -281330,15 +281379,20 @@ function countMigrationFiles(migrationsFolder) {
 }
 async function applyMigrations(db2, migrationsFolder) {
   const fileCount = countMigrationFiles(migrationsFolder);
-  await migrate(db2, { migrationsFolder });
-  const result = await db2.execute(sql`SELECT count(*) AS count FROM drizzle.__drizzle_migrations`);
-  const appliedCount = Number(result[0].count);
-  if (appliedCount < fileCount) {
-    throw new Error(`Migration count mismatch: ${appliedCount} applied, ${fileCount} files. ${fileCount - appliedCount} migration(s) were silently skipped. Ensure _journal.json "when" timestamps are strictly increasing.`);
-  }
-  log56.info("All migrations applied", { appliedCount, fileCount });
+  await db2.transaction(async (tx) => {
+    log56.info("Acquiring migration advisory lock", { lockId: MIGRATION_LOCK_ID });
+    await tx.execute(sql`SELECT pg_advisory_xact_lock(${MIGRATION_LOCK_ID})`);
+    log56.info("Migration advisory lock acquired");
+    await migrate(db2, { migrationsFolder });
+    const result = await db2.execute(sql`SELECT count(*) AS count FROM drizzle.__drizzle_migrations`);
+    const appliedCount = Number(result[0].count);
+    if (appliedCount < fileCount) {
+      throw new Error(`Migration count mismatch: ${appliedCount} applied, ${fileCount} files. ${fileCount - appliedCount} migration(s) were silently skipped. Ensure _journal.json "when" timestamps are strictly increasing.`);
+    }
+    log56.info("All migrations applied", { appliedCount, fileCount });
+  });
 }
-var log56;
+var log56, MIGRATION_LOCK_ID = 772005770;
 var init_migrate = __esm(() => {
   init_src();
   init_drizzle_orm();
@@ -316249,7 +316303,7 @@ var init_audio2 = __esm(() => {
         return [
           () => this.transcribeWithOpenAiAudioChat(language, options, preferredModel ?? OPENAI_AUDIO_CHAT_MODEL, getNormalizedAudio),
           () => this.transcribeWithOpenAiTranscriptions(language, options, OPENAI_TRANSCRIBE_MODEL, getNormalizedAudio),
-          () => this.transcribeWithGemini(language, options, GEMINI_AUDIO_MODEL, getNormalizedAudio),
+          () => this.transcribeWithGemini(language, options, this.resolveGeminiAudioModel(undefined), getNormalizedAudio),
           () => this.transcribeWithGroq(language, getNormalizedAudio)
         ];
       }
@@ -333162,7 +333216,10 @@ var init_batch_pricing = __esm(() => {
 });
 
 // ../api/src/services/media-storage.ts
+import { randomUUID as randomUUID2 } from "crypto";
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync6, statSync as statSync3 } from "fs";
+import { rm as rm3, writeFile as writeFile5 } from "fs/promises";
+import { tmpdir as tmpdir11 } from "os";
 import { extname as extname2, join as join21 } from "path";
 function normalizeMimeType2(value) {
   return value?.split(";")[0]?.trim().toLowerCase() || undefined;
@@ -333398,6 +333455,26 @@ class MediaStorageService {
   async presignedUrl(reference, ttlSeconds) {
     return this.backend.presignedUrl(reference, ttlSeconds);
   }
+  async materializeForProcessing(reference) {
+    if (this.backend.mode === "local") {
+      return { path: join21(this.basePath, reference), cleanup: async () => {} };
+    }
+    const buffer3 = await this.backend.read(reference);
+    const ext = extname2(reference) || ".bin";
+    const tempPath = join21(tmpdir11(), `omni-media-${randomUUID2()}${ext}`);
+    try {
+      await writeFile5(tempPath, buffer3);
+    } catch (error3) {
+      await rm3(tempPath, { force: true }).catch(() => {});
+      throw error3;
+    }
+    return {
+      path: tempPath,
+      cleanup: async () => {
+        await rm3(tempPath, { force: true });
+      }
+    };
+  }
 }
 var log83, DEFAULT_MEDIA_PATH = "./data/media";
 var init_media_storage = __esm(() => {
@@ -333409,8 +333486,6 @@ var init_media_storage = __esm(() => {
 });
 
 // ../api/src/services/batch-jobs.ts
-import { join as join22 } from "path";
-
 class BatchJobService {
   db;
   eventBus;
@@ -333837,10 +333912,15 @@ class BatchJobService {
     if (!resolved.ok) {
       return this.failedResult(resolved.reason);
     }
-    const fullPath = join22(this.mediaStorage.getBasePath(), resolved.path);
-    const result = await mediaService.process(fullPath, mimeType, {
-      caption: message2.textContent ?? undefined
-    });
+    const materialized = await this.mediaStorage.materializeForProcessing(resolved.path);
+    let result;
+    try {
+      result = await mediaService.process(materialized.path, mimeType, {
+        caption: message2.textContent ?? undefined
+      });
+    } finally {
+      await materialized.cleanup();
+    }
     if (result.success && result.content) {
       await this.persistProcessingResult(message2.id, result, batchJobId);
     }
@@ -337596,12 +337676,12 @@ var init_context3 = __esm(() => {
 
 // ../api/src/plugins/loader.ts
 import { existsSync as existsSync4 } from "fs";
-import { dirname as dirname6, join as join23 } from "path";
+import { dirname as dirname6, join as join22 } from "path";
 import { fileURLToPath } from "url";
 function findMonorepoRoot(startDir) {
   let current = startDir;
   while (current !== dirname6(current)) {
-    if (existsSync4(join23(current, "turbo.json"))) {
+    if (existsSync4(join22(current, "turbo.json"))) {
       return current;
     }
     current = dirname6(current);
@@ -337620,7 +337700,7 @@ function getMonorepoPackagesDir() {
   if (!monorepoRoot) {
     throw new Error("Could not find monorepo root (no turbo.json found). " + "Ensure you run from repo root or set OMNI_PACKAGES_DIR env var.");
   }
-  return join23(monorepoRoot, "packages");
+  return join22(monorepoRoot, "packages");
 }
 async function loadChannelPlugins2(options) {
   const { eventBus, db: db2 } = options;
@@ -338509,9 +338589,9 @@ var init_session_storage = __esm(() => {
 
 // ../api/src/plugins/agent-dispatcher.ts
 import { createHash as createHash10 } from "crypto";
-import { unlink, writeFile as writeFile5 } from "fs/promises";
-import { tmpdir as tmpdir11 } from "os";
-import { join as join24, resolve as resolve3 } from "path";
+import { unlink, writeFile as writeFile6 } from "fs/promises";
+import { tmpdir as tmpdir12 } from "os";
+import { join as join23, resolve as resolve3 } from "path";
 function sha256Digest(value) {
   return `sha256:${createHash10("sha256").update(value).digest("hex")}`;
 }
@@ -338962,7 +339042,7 @@ async function resolveDispatchMediaPath(mediaStorage, reference) {
       return null;
     }
   }
-  return resolve3(join24(MEDIA_BASE_PATH3, reference));
+  return resolve3(join23(MEDIA_BASE_PATH3, reference));
 }
 async function remoteMediaFile(m2, mimeType, mediaStorage, allowedTypes) {
   const key = m2.payload.rawPayload?.mediaLocalPath;
@@ -339021,7 +339101,7 @@ function checkProcessedColumn(msg, column2) {
   if (typeof processed === "string" && processed.startsWith("[error"))
     return "error";
   if (processed) {
-    const localPath = msg.mediaLocalPath ? resolve3(join24(MEDIA_BASE_PATH3, msg.mediaLocalPath)) : null;
+    const localPath = msg.mediaLocalPath ? resolve3(join23(MEDIA_BASE_PATH3, msg.mediaLocalPath)) : null;
     return {
       content: processed,
       localPath
@@ -340193,8 +340273,8 @@ async function downloadToTempFile(url, mimeType) {
       return null;
     const buffer3 = Buffer.from(await res.arrayBuffer());
     const ext = (mimeType.split("/")[1]?.split(";")[0] ?? "bin").replace(/[^a-z0-9]/gi, "");
-    const tmpPath = join24(tmpdir11(), `omni-hist-${Date.now()}-${Math.random().toString(36).slice(2)}.${ext}`);
-    await writeFile5(tmpPath, buffer3);
+    const tmpPath = join23(tmpdir12(), `omni-hist-${Date.now()}-${Math.random().toString(36).slice(2)}.${ext}`);
+    await writeFile6(tmpPath, buffer3);
     return tmpPath;
   } catch {
     return null;
@@ -342655,8 +342735,8 @@ var init_sync_jobs = __esm(() => {
 // ../api/src/services/tts.ts
 import { spawn as spawn5 } from "child_process";
 import { promises as fs15 } from "fs";
-import { tmpdir as tmpdir12 } from "os";
-import { join as join25 } from "path";
+import { tmpdir as tmpdir13 } from "os";
+import { join as join24 } from "path";
 function spawnWithEvents5(command, args) {
   return spawn5(command, args);
 }
@@ -342764,8 +342844,8 @@ var init_tts3 = __esm(() => {
       return Buffer.from(await response.arrayBuffer());
     }
     async convertToOggOpus(mp3Buffer) {
-      const inputPath = join25(tmpdir12(), `omni-tts-${Date.now()}-input.mp3`);
-      const outputPath = join25(tmpdir12(), `omni-tts-${Date.now()}-output.ogg`);
+      const inputPath = join24(tmpdir13(), `omni-tts-${Date.now()}-input.mp3`);
+      const outputPath = join24(tmpdir13(), `omni-tts-${Date.now()}-output.ogg`);
       try {
         await fs15.writeFile(inputPath, mp3Buffer);
         await new Promise((resolve4, reject) => {
@@ -342811,7 +342891,7 @@ var init_tts3 = __esm(() => {
       }
     }
     async getAudioDurationMs(audioBuffer) {
-      const tempPath = join25(tmpdir12(), `omni-tts-${Date.now()}-duration.ogg`);
+      const tempPath = join24(tmpdir13(), `omni-tts-${Date.now()}-duration.ogg`);
       try {
         await fs15.writeFile(tempPath, audioBuffer);
         return await new Promise((resolve4) => {
@@ -343632,12 +343712,12 @@ var init_timeout = __esm(() => {
 
 // ../api/src/middleware/version-headers.ts
 import { existsSync as existsSync5, readFileSync as readFileSync7 } from "fs";
-import { join as join26 } from "path";
+import { join as join25 } from "path";
 function loadRepoPackageVersion() {
   try {
     for (const candidate of [
-      join26(import.meta.dir, "..", "..", "..", "..", "package.json"),
-      join26(process.cwd(), "package.json")
+      join25(import.meta.dir, "..", "..", "..", "..", "package.json"),
+      join25(process.cwd(), "package.json")
     ]) {
       if (!existsSync5(candidate))
         continue;
@@ -343659,8 +343739,8 @@ function resolveFallbackVersion() {
 function loadServerVersionInfo() {
   try {
     for (const candidate of [
-      join26(import.meta.dir, "..", "..", "..", "..", "version.json"),
-      join26(process.cwd(), "version.json")
+      join25(import.meta.dir, "..", "..", "..", "..", "version.json"),
+      join25(process.cwd(), "version.json")
     ]) {
       if (!existsSync5(candidate)) {
         continue;
@@ -356969,7 +357049,7 @@ var init__close_contact_config = __esm(() => {
 
 // ../api/src/routes/v2/messages.ts
 import { existsSync as existsSync6 } from "fs";
-import { extname as extname3, join as join27 } from "path";
+import { extname as extname3, join as join26 } from "path";
 function inferMediaMimeType(type, filename) {
   if (filename) {
     const fromExtension = MIME_BY_EXTENSION[extname3(filename).toLowerCase()];
@@ -357528,7 +357608,7 @@ var init_messages5 = __esm(() => {
     let mediaLocalPath = message2.mediaLocalPath;
     let cached = false;
     if (mediaLocalPath) {
-      const fullPath = join27(mediaStorage2.getBasePath(), mediaLocalPath);
+      const fullPath = join26(mediaStorage2.getBasePath(), mediaLocalPath);
       if (existsSync6(fullPath)) {
         cached = true;
       } else {
@@ -360766,10 +360846,6 @@ var init_event_persistence = __esm(() => {
 });
 
 // ../api/src/plugins/media-processor.ts
-import { randomUUID as randomUUID2 } from "crypto";
-import { rm as rm3, writeFile as writeFile6 } from "fs/promises";
-import { tmpdir as tmpdir13 } from "os";
-import { extname as extname4, join as join28 } from "path";
 function getContentFieldForType(processingType, contentType) {
   switch (processingType) {
     case "transcription":
@@ -360880,26 +360956,6 @@ async function resolveMediaPath2(ctx, instanceId, chatId, externalId, content, m
     filePath
   };
 }
-async function materializeForProcessing(ctx, filePath) {
-  if (ctx.mediaStorage.getStorageMode() === "local") {
-    return { path: join28(ctx.mediaStorage.getBasePath(), filePath), cleanup: async () => {} };
-  }
-  const buffer3 = await ctx.mediaStorage.read(filePath);
-  const ext = extname4(filePath) || ".bin";
-  const tempPath = join28(tmpdir13(), `omni-media-${randomUUID2()}${ext}`);
-  try {
-    await writeFile6(tempPath, buffer3);
-  } catch (error3) {
-    await rm3(tempPath, { force: true }).catch(() => {});
-    throw error3;
-  }
-  return {
-    path: tempPath,
-    cleanup: async () => {
-      await rm3(tempPath, { force: true });
-    }
-  };
-}
 async function resolveSafeMediaContentEventId(ctx, eventId) {
   if (!isUuid(eventId))
     return null;
@@ -360973,7 +361029,7 @@ async function processMessageMedia(ctx, payload, metadata) {
   const media = await resolveMediaPath2(ctx, instanceId, payload.chatId, externalId, content, mimeType, metadata.channelType);
   if (!media)
     return;
-  const processable = await materializeForProcessing(ctx, media.filePath);
+  const processable = await ctx.mediaStorage.materializeForProcessing(media.filePath);
   log113.info("Processing media", { messageId: media.messageId, mimeType, filePath: processable.path });
   let result;
   try {

package/package.json

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