@automagik/omni 2.260423.3 → 2.260423.5

package/db/drizzle/0031_reconcile_gupshup_columns.sql

@@ -0,0 +1,45 @@
+-- Issue #407: reconcile gupshup column drift.
+--
+-- Migration 0018_supreme_puma renamed three columns on "instances":
+--   gupshup_api_key       -> gupshup_callback_url
+--   gupshup_app_name      -> gupshup_auth_token
+--   gupshup_source_phone  -> gupshup_event_id
+--
+-- On at least one deployed DB the migration was marked applied in
+-- drizzle.__drizzle_migrations but the rename never executed, leaving the
+-- live table with the old column names. Because RENAME is not idempotent,
+-- replaying 0018 would fail. This migration is safe to rerun: it adds the
+-- new columns if missing, copies any surviving data from old columns, and
+-- then drops the old columns if present.
+
+ALTER TABLE "instances" ADD COLUMN IF NOT EXISTS "gupshup_callback_url" text;
+ALTER TABLE "instances" ADD COLUMN IF NOT EXISTS "gupshup_auth_token" text;
+ALTER TABLE "instances" ADD COLUMN IF NOT EXISTS "gupshup_event_id" varchar(255);
+
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1 FROM information_schema.columns
+    WHERE table_schema = 'public' AND table_name = 'instances' AND column_name = 'gupshup_api_key'
+  ) THEN
+    EXECUTE 'UPDATE "instances" SET "gupshup_callback_url" = "gupshup_api_key" WHERE "gupshup_callback_url" IS NULL AND "gupshup_api_key" IS NOT NULL';
+  END IF;
+
+  IF EXISTS (
+    SELECT 1 FROM information_schema.columns
+    WHERE table_schema = 'public' AND table_name = 'instances' AND column_name = 'gupshup_app_name'
+  ) THEN
+    EXECUTE 'UPDATE "instances" SET "gupshup_auth_token" = "gupshup_app_name" WHERE "gupshup_auth_token" IS NULL AND "gupshup_app_name" IS NOT NULL';
+  END IF;
+
+  IF EXISTS (
+    SELECT 1 FROM information_schema.columns
+    WHERE table_schema = 'public' AND table_name = 'instances' AND column_name = 'gupshup_source_phone'
+  ) THEN
+    EXECUTE 'UPDATE "instances" SET "gupshup_event_id" = "gupshup_source_phone" WHERE "gupshup_event_id" IS NULL AND "gupshup_source_phone" IS NOT NULL';
+  END IF;
+END $$;
+
+ALTER TABLE "instances" DROP COLUMN IF EXISTS "gupshup_api_key";
+ALTER TABLE "instances" DROP COLUMN IF EXISTS "gupshup_app_name";
+ALTER TABLE "instances" DROP COLUMN IF EXISTS "gupshup_source_phone";

package/db/drizzle/meta/_journal.json

@@ -218,6 +218,13 @@
       "when": 1777300000000,
       "tag": "0030_twilio_whatsapp_channel",
       "breakpoints": true
+    },
+    {
+      "idx": 31,
+      "version": "7",
+      "when": 1777400000000,
+      "tag": "0031_reconcile_gupshup_columns",
+      "breakpoints": true
     }
   ]
 }

package/dist/index.js

@@ -62070,10 +62070,14 @@ var init_migrate = __esm(() => {
   if (false) {}
 });
 
+// ../db/src/verify-schema.ts
+var init_verify_schema = () => {};
+
 // ../db/src/index.ts
 var init_src3 = __esm(() => {
   init_client3();
   init_migrate();
+  init_verify_schema();
   init_schema2();
 });
 
@@ -113839,7 +113843,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260423.3",
+  version: "2.260423.5",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -224464,7 +224464,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package8 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260423.3",
+    version: "2.260423.5",
     type: "module",
     exports: {
       ".": {
@@ -233528,10 +233528,68 @@ var init_migrate = __esm(() => {
   if (false) {}
 });
 
+// ../db/src/verify-schema.ts
+async function verifyCriticalColumns(db2, expectations) {
+  if (expectations.length === 0) {
+    return { ok: true, drift: [] };
+  }
+  const tables = expectations.map((e) => e.table);
+  const rows = await db2.execute(sql`
+    SELECT table_name, column_name
+    FROM information_schema.columns
+    WHERE table_schema = 'public'
+      AND table_name IN (${sql.join(tables.map((t) => sql`${t}`), sql`, `)})
+  `);
+  const liveColumns = new Map;
+  for (const row of rows) {
+    const set = liveColumns.get(row.table_name) ?? new Set;
+    set.add(row.column_name);
+    liveColumns.set(row.table_name, set);
+  }
+  const drift = [];
+  for (const expectation of expectations) {
+    const live = liveColumns.get(expectation.table) ?? new Set;
+    const missing = expectation.columns.filter((col) => !live.has(col));
+    if (missing.length > 0) {
+      drift.push({ table: expectation.table, missing });
+    }
+  }
+  return { ok: drift.length === 0, drift };
+}
+function formatDriftReport(report) {
+  if (report.ok)
+    return "Schema drift check passed.";
+  const lines = [
+    "Schema drift detected \u2014 live database is missing columns Drizzle expects.",
+    "This usually means drizzle-kit push was used against a migrated database,",
+    "or a migration was marked applied but its SQL did not execute.",
+    ""
+  ];
+  for (const entry of report.drift) {
+    lines.push(`  table "${entry.table}" missing columns: ${entry.missing.join(", ")}`);
+  }
+  lines.push("");
+  lines.push("Run `bun run db:verify-drift` locally against the same DATABASE_URL,");
+  lines.push("then apply the reconcile migration (see issue #407).");
+  return lines.join(`
+`);
+}
+var API_CRITICAL_COLUMNS;
+var init_verify_schema = __esm(() => {
+  init_drizzle_orm();
+  API_CRITICAL_COLUMNS = [
+    {
+      table: "instances",
+      columns: ["gupshup_callback_url", "gupshup_auth_token", "gupshup_event_id"]
+    }
+  ];
+});
+
 // ../db/src/index.ts
 var init_src5 = __esm(() => {
   init_client5();
   init_migrate();
+  init_verify_schema();
   init_schema2();
 });
 
@@ -278915,11 +278973,11 @@ class BatchJobService {
     if (!mimeType || !this.mediaService.canProcess(mimeType)) {
       return this.failedResult(`MIME type not processable: ${mimeType}`);
     }
-    const filePath = await this.resolveFilePath(instanceId, message2, mimeType);
-    if (!filePath) {
-      return this.failedResult("No media file path available");
+    const resolved = await this.resolveFilePath(instanceId, message2, mimeType);
+    if (!resolved.ok) {
+      return this.failedResult(resolved.reason);
     }
-    const fullPath = join19(this.mediaStorage.getBasePath(), filePath);
+    const fullPath = join19(this.mediaStorage.getBasePath(), resolved.path);
     const result = await this.mediaService.process(fullPath, mimeType, {
       language: "pt",
       caption: message2.textContent ?? undefined
@@ -278943,17 +279001,23 @@ class BatchJobService {
   }
   async resolveFilePath(instanceId, message2, mimeType) {
     if (message2.mediaLocalPath) {
-      return message2.mediaLocalPath;
+      return { ok: true, path: message2.mediaLocalPath };
     }
     if (!message2.mediaUrl) {
-      return null;
+      return { ok: false, reason: "No media_url and no media_local_path on message" };
     }
     try {
       const result = await this.mediaStorage.storeFromUrl(instanceId, message2.id, message2.mediaUrl, mimeType, message2.platformTimestamp ?? undefined);
       await this.mediaStorage.updateMessageLocalPath(message2.id, result.localPath);
-      return result.localPath;
-    } catch {
-      return null;
+      return { ok: true, path: result.localPath };
+    } catch (error2) {
+      const reason = `storeFromUrl failed: ${error2 instanceof Error ? error2.message : String(error2)}`;
+      log76.warn("storeFromUrl failed during batch retrofill", {
+        messageId: message2.id,
+        mediaUrl: message2.mediaUrl,
+        error: reason
+      });
+      return { ok: false, reason };
     }
   }
   async persistProcessingResult(messageId, result, batchJobId) {
@@ -305428,6 +305492,20 @@ async function main() {
     throw error2;
   }
   log111.info("Database migrations complete", { durationMs: Date.now() - migrationStart });
+  try {
+    const driftReport = await verifyCriticalColumns(db3, API_CRITICAL_COLUMNS);
+    if (!driftReport.ok) {
+      log111.error(formatDriftReport(driftReport), { drift: driftReport.drift });
+      await closeDb();
+      await stopEmbeddedPgserve();
+      process.exit(1);
+    }
+  } catch (error2) {
+    log111.error("Schema drift check failed", { error: String(error2) });
+    await closeDb();
+    await stopEmbeddedPgserve();
+    process.exit(1);
+  }
   try {
     const [countRow] = await db3.select({ count: sql`count(*)::int` }).from(instances);
     const rowCount = countRow?.count ?? 0;
@@ -424310,14 +424388,16 @@ var contentExtractors = [
     extract: (m2) => ({
       type: "image",
       caption: m2.imageMessage?.caption ?? undefined,
-      mimeType: m2.imageMessage?.mimetype ?? "image/jpeg"
+      mimeType: m2.imageMessage?.mimetype ?? "image/jpeg",
+      mediaUrl: m2.imageMessage?.url ?? undefined
     })
   },
   {
     check: (m2) => !!m2.audioMessage,
     extract: (m2) => ({
       type: "audio",
-      mimeType: m2.audioMessage?.mimetype ?? "audio/ogg"
+      mimeType: m2.audioMessage?.mimetype ?? "audio/ogg",
+      mediaUrl: m2.audioMessage?.url ?? undefined
     })
   },
   {
@@ -424325,7 +424405,8 @@ var contentExtractors = [
     extract: (m2) => ({
       type: "video",
       caption: m2.videoMessage?.caption ?? undefined,
-      mimeType: m2.videoMessage?.mimetype ?? "video/mp4"
+      mimeType: m2.videoMessage?.mimetype ?? "video/mp4",
+      mediaUrl: m2.videoMessage?.url ?? undefined
     })
   },
   {
@@ -424334,14 +424415,16 @@ var contentExtractors = [
       type: "document",
       filename: m2.documentMessage?.fileName ?? undefined,
       mimeType: m2.documentMessage?.mimetype ?? "application/octet-stream",
-      caption: m2.documentMessage?.caption ?? undefined
+      caption: m2.documentMessage?.caption ?? undefined,
+      mediaUrl: m2.documentMessage?.url ?? undefined
     })
   },
   {
     check: (m2) => !!m2.stickerMessage,
     extract: (m2) => ({
       type: "sticker",
-      mimeType: m2.stickerMessage?.mimetype ?? "image/webp"
+      mimeType: m2.stickerMessage?.mimetype ?? "image/webp",
+      mediaUrl: m2.stickerMessage?.url ?? undefined
     })
   },
   {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260423.3",
+  "version": "2.260423.5",
   "description": "LLM-optimized CLI for Omni",
   "type": "module",
   "bin": {
@@ -39,15 +39,15 @@
     "qrcode-terminal": "^0.12.0"
   },
   "devDependencies": {
-    "@omni/api": "2.260423.2",
-    "@omni/channel-discord": "2.260423.2",
-    "@omni/channel-gupshup": "2.260423.2",
-    "@omni/channel-sdk": "2.260423.2",
-    "@omni/channel-slack": "2.260423.2",
-    "@omni/channel-telegram": "2.260423.2",
-    "@omni/channel-whatsapp": "2.260423.2",
-    "@omni/core": "2.260423.2",
-    "@omni/sdk": "2.260423.2",
+    "@omni/api": "2.260423.4",
+    "@omni/channel-discord": "2.260423.4",
+    "@omni/channel-gupshup": "2.260423.4",
+    "@omni/channel-sdk": "2.260423.4",
+    "@omni/channel-slack": "2.260423.4",
+    "@omni/channel-telegram": "2.260423.4",
+    "@omni/channel-whatsapp": "2.260423.4",
+    "@omni/core": "2.260423.4",
+    "@omni/sdk": "2.260423.4",
     "@types/node": "^22.10.3",
     "@types/qrcode-terminal": "^0.12.2",
     "typescript": "^5.7.3"