@automagik/omni 2.260423.2 → 2.260423.4

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/commands/providers.d.ts

@@ -15,6 +15,40 @@
  * omni providers test <id>
  * omni providers delete <id>
  */
+import type { AgnoAgent, AgnoTeam, AgnoWorkflow } from '@omni/sdk';
 import { Command } from 'commander';
+/**
+ * Map agno 2.5+ (`id`) and pre-2.5 (`agent_id`) agent shapes to the list row.
+ */
+declare function mapAgnoAgentRow(a: AgnoAgent): {
+    id: string | undefined;
+    name: string;
+    model: string;
+    description: string;
+};
+/**
+ * Map agno 2.5+ (`id`) and pre-2.5 (`team_id`) team shapes to the list row.
+ */
+declare function mapAgnoTeamRow(t: AgnoTeam): {
+    id: string | undefined;
+    name: string;
+    mode: string;
+    members: number;
+    description: string;
+};
+/**
+ * Map agno 2.5+ (`id`) and pre-2.5 (`workflow_id`) workflow shapes to the list row.
+ */
+declare function mapAgnoWorkflowRow(w: AgnoWorkflow): {
+    id: string | undefined;
+    name: string;
+    description: string;
+};
+export declare const __testables: {
+    mapAgnoAgentRow: typeof mapAgnoAgentRow;
+    mapAgnoTeamRow: typeof mapAgnoTeamRow;
+    mapAgnoWorkflowRow: typeof mapAgnoWorkflowRow;
+};
 export declare function createProvidersCommand(): Command;
+export {};
 //# sourceMappingURL=providers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/commands/providers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiUpC,wBAAgB,sBAAsB,IAAI,OAAO,CA6JhD"}
+{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/commands/providers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC;;GAEG;AACH,iBAAS,eAAe,CAAC,CAAC,EAAE,SAAS,GAAG;IACtC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB,CAOA;AAED;;GAEG;AACH,iBAAS,cAAc,CAAC,CAAC,EAAE,QAAQ,GAAG;IACpC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAQA;AAED;;GAEG;AACH,iBAAS,kBAAkB,CAAC,CAAC,EAAE,YAAY,GAAG;IAC5C,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB,CAMA;AAED,eAAO,MAAM,WAAW;;;;CAIvB,CAAC;AA6TF,wBAAgB,sBAAsB,IAAI,OAAO,CA8IhD"}

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.2",
+  version: "2.260423.4",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {
@@ -123139,6 +123143,30 @@ function createSetupCommand() {
 }
 
 // src/commands/providers.ts
+function mapAgnoAgentRow(a2) {
+  return {
+    id: a2.id ?? a2.agent_id,
+    name: a2.name,
+    model: a2.model?.name ?? "-",
+    description: a2.description?.slice(0, 50) ?? "-"
+  };
+}
+function mapAgnoTeamRow(t) {
+  return {
+    id: t.id ?? t.team_id,
+    name: t.name,
+    mode: t.mode ?? "-",
+    members: t.members?.length ?? 0,
+    description: t.description?.slice(0, 50) ?? "-"
+  };
+}
+function mapAgnoWorkflowRow(w) {
+  return {
+    id: w.id ?? w.workflow_id,
+    name: w.name,
+    description: w.description?.slice(0, 50) ?? "-"
+  };
+}
 var VALID_SCHEMAS = PROVIDER_SCHEMAS;
 var WS_ONLY_SCHEMAS = ["openclaw"];
 function validateUrlScheme(schema3, baseUrl) {
@@ -123401,12 +123429,7 @@ function createProvidersCommand() {
     const client = getClient();
     try {
       const agents2 = await client.providers.listAgents(resolvedId);
-      const items = agents2.map((a2) => ({
-        id: a2.agent_id,
-        name: a2.name,
-        model: a2.model?.name ?? "-",
-        description: a2.description?.slice(0, 50) ?? "-"
-      }));
+      const items = agents2.map(mapAgnoAgentRow);
       list(items, { emptyMessage: "No agents found." });
     } catch (err2) {
       const message2 = err2 instanceof Error ? err2.message : "Unknown error";
@@ -123418,13 +123441,7 @@ function createProvidersCommand() {
     const client = getClient();
     try {
       const teams = await client.providers.listTeams(resolvedId);
-      const items = teams.map((t) => ({
-        id: t.team_id,
-        name: t.name,
-        mode: t.mode ?? "-",
-        members: t.members?.length ?? 0,
-        description: t.description?.slice(0, 50) ?? "-"
-      }));
+      const items = teams.map(mapAgnoTeamRow);
       list(items, { emptyMessage: "No teams found." });
     } catch (err2) {
       const message2 = err2 instanceof Error ? err2.message : "Unknown error";
@@ -123436,11 +123453,7 @@ function createProvidersCommand() {
     const client = getClient();
     try {
       const workflows = await client.providers.listWorkflows(resolvedId);
-      const items = workflows.map((w) => ({
-        id: w.workflow_id,
-        name: w.name,
-        description: w.description?.slice(0, 50) ?? "-"
-      }));
+      const items = workflows.map(mapAgnoWorkflowRow);
       list(items, { emptyMessage: "No workflows found." });
     } catch (err2) {
       const message2 = err2 instanceof Error ? err2.message : "Unknown error";

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.2",
+    version: "2.260423.4",
     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();
 });
 
@@ -305428,6 +305486,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;

package/package.json

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