@automagik/omni 2.260916.8 → 2.260916.9

package/db/drizzle/0077_instances_close_contact_config.sql

@@ -0,0 +1,19 @@
+-- Per-instance close-contact cooldown/escalation overrides.
+--
+-- POST /messages/send/close-contact computes the chat's terminal state from
+-- hardcoded per-outcome defaults (packages/api/src/routes/v2/_close-contact-config.ts).
+-- The resolver already accepted overrides, but nothing persisted them, so an
+-- operator could not tune an outcome (e.g. stop a repeated system-initiated
+-- close from auto-promoting to terminal) without a code change.
+--
+--   instances.close_contact_config  jsonb  { [outcome]?: { cooldownMs?: number | null,
+--                                                          escalationThreshold?: number | null,
+--                                                          escalationWindowMs?: number | null } }
+--
+-- Nullable; NULL keeps the defaults. Validated by the instances API (Zod).
+--
+-- Hand-written following the 0043/0044/0052 precedent (additive, idempotent).
+-- No explicit BEGIN/COMMIT — the boot migrator executes this file on a pooled
+-- postgres-js connection, which rejects raw transaction control.
+
+ALTER TABLE "instances" ADD COLUMN IF NOT EXISTS "close_contact_config" jsonb;

package/db/drizzle/meta/_journal.json

@@ -540,6 +540,13 @@
       "when": 1787600000000,
       "tag": "0076_instances_history_identity",
       "breakpoints": true
+    },
+    {
+      "idx": 77,
+      "version": "7",
+      "when": 1787700000000,
+      "tag": "0077_instances_close_contact_config",
+      "breakpoints": true
     }
   ]
 }

package/dist/index.js

@@ -82431,6 +82431,7 @@ var init_schema2 = __esm(() => {
     }),
     chainMode: varchar("chain_mode", { length: 20 }).notNull().default("off"),
     followUpConfig: jsonb("follow_up_config").$type(),
+    closeContactConfig: jsonb("close_contact_config").$type(),
     bridgeTmuxSession: text("bridge_tmux_session"),
     requireGenieSignature: boolean2("require_genie_signature").notNull().default(false),
     allowFirstParty: boolean2("allow_first_party").notNull().default(false),
@@ -115971,7 +115972,7 @@ var require_client2 = __commonJS((exports) => {
 
 // ../../node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js
 var require_esmLoader = __commonJS((exports) => {
-  var __filename = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js";
+  var __filename = "/home/runner/work/omni/omni/node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js";
   Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
   var core = require_cjs();
   var importInTheMiddle = require_import_in_the_middle();
@@ -137422,7 +137423,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260916.8",
+  version: "2.260916.9",
   repository: {
     type: "git",
     url: "git+https://github.com/automagik-dev/omni.git",
@@ -148286,7 +148287,7 @@ function createMessagesCommand() {
       error(`Failed to edit message: ${message2}`);
     }
   });
-  messages3.command("close-contact").description("Close a chat terminally (won/lost) or with a soft cooldown (redirected_sac/unqualified/no_response/other)").requiredOption("--instance <id>", "Instance ID").requiredOption("--chat <chatId>", "Chat DB UUID to close").requiredOption("--to <recipient>", "Recipient phone or platform ID").requiredOption("--text <text>", "Farewell message shown to the lead").requiredOption("--outcome <outcome>", "Outcome: won | lost | redirected_sac | unqualified | no_response | other").option("--reason <reason>", "Free-text rationale persisted in close_contact_logs").option("--close-fields <jsonOrPath>", "Structured BI/CRM payload \u2014 inline JSON or path to a JSON file").action(handleCloseContact);
+  messages3.command("close-contact").description("Close a chat terminally (won/lost) or with a soft cooldown (redirected_sac/unqualified/no_response/other)").requiredOption("--instance <id>", "Instance ID").requiredOption("--chat <chatId>", "Chat DB UUID to close").requiredOption("--to <recipient>", "Recipient phone or platform ID").option("--text <text>", "Farewell message shown to the contact (omit to close without a farewell)").requiredOption("--outcome <outcome>", "Outcome: won | lost | redirected_sac | unqualified | no_response | other").option("--reason <reason>", "Free-text rationale persisted in close_contact_logs").option("--close-fields <jsonOrPath>", "Structured BI/CRM payload \u2014 inline JSON or path to a JSON file").action(handleCloseContact);
   return messages3;
 }
 var VALID_CLOSE_OUTCOMES = ["won", "lost", "redirected_sac", "unqualified", "no_response", "other"];
@@ -148332,9 +148333,10 @@ async function buildCloseContactBody(options) {
     instanceId,
     chatId: resolvedChatId,
     to: options.to,
-    text: options.text,
     outcome: options.outcome
   };
+  if (options.text)
+    body.text = options.text;
   if (options.reason)
     body.reason = options.reason;
   if (closeFields)

package/dist/server/index.js

@@ -77147,7 +77147,7 @@ var require_ClientVoiceManager = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/@discordjs+ws@1.2.3/node_modules/@discordjs/ws/dist/index.js
 var require_dist9 = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@discordjs+ws@1.2.3/node_modules/@discordjs/ws/dist";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/@discordjs+ws@1.2.3/node_modules/@discordjs/ws/dist";
   var __create2 = Object.create;
   var __defProp2 = Object.defineProperty;
   var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -161660,7 +161660,7 @@ var require_indexes = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/thread-stream@3.1.0/node_modules/thread-stream/index.js
 var require_thread_stream = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/thread-stream@3.1.0/node_modules/thread-stream";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/thread-stream@3.1.0/node_modules/thread-stream";
   var { version } = require_package5();
   var { EventEmitter: EventEmitter3 } = __require("events");
   var { Worker } = __require("worker_threads");
@@ -162081,7 +162081,7 @@ var require_thread_stream = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/pino@9.14.0/node_modules/pino/lib/transport.js
 var require_transport2 = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/pino@9.14.0/node_modules/pino/lib";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/pino@9.14.0/node_modules/pino/lib";
   var { createRequire: createRequire2 } = __require("module");
   var getCallers = require_caller();
   var { join: join8, isAbsolute, sep: sep2 } = __require("path");
@@ -172916,6 +172916,7 @@ var init_schema2 = __esm(() => {
     }),
     chainMode: varchar("chain_mode", { length: 20 }).notNull().default("off"),
     followUpConfig: jsonb("follow_up_config").$type(),
+    closeContactConfig: jsonb("close_contact_config").$type(),
     bridgeTmuxSession: text("bridge_tmux_session"),
     requireGenieSignature: boolean2("require_genie_signature").notNull().default(false),
     allowFirstParty: boolean2("allow_first_party").notNull().default(false),
@@ -243887,7 +243888,7 @@ var require_client3 = __commonJS((exports) => {
 
 // ../../node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js
 var require_esmLoader = __commonJS((exports) => {
-  var __filename = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js";
+  var __filename = "/home/runner/work/omni/omni/node_modules/.bun/@sentry+node-core@10.52.0+2c50d7e904f6cfd7/node_modules/@sentry/node-core/build/cjs/sdk/esmLoader.js";
   Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
   var core3 = require_cjs6();
   var importInTheMiddle = require_import_in_the_middle();
@@ -251113,7 +251114,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260916.8",
+    version: "2.260916.9",
     private: true,
     type: "module",
     exports: {
@@ -278215,7 +278216,7 @@ var require_src45 = __commonJS((exports) => {
 
 // ../../node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src/channelz.js
 var require_channelz = __commonJS((exports) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.registerChannelzSocket = exports.registerChannelzServer = exports.registerChannelzSubchannel = exports.registerChannelzChannel = exports.ChannelzCallTrackerStub = exports.ChannelzCallTracker = exports.ChannelzChildrenTrackerStub = exports.ChannelzChildrenTracker = exports.ChannelzTrace = exports.ChannelzTraceStub = undefined;
   exports.unregisterChannelzRef = unregisterChannelzRef;
@@ -283618,7 +283619,7 @@ var require_duration = __commonJS((exports) => {
 
 // ../../node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src/orca.js
 var require_orca = __commonJS((exports) => {
-  var __dirname = "/home/runner/work/omni/omni/.stable-source/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
+  var __dirname = "/home/runner/work/omni/omni/node_modules/.bun/@grpc+grpc-js@1.14.3/node_modules/@grpc/grpc-js/build/src";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.OrcaOobMetricsSubchannelWrapper = exports.GRPC_METRICS_HEADER = exports.ServerMetricRecorder = exports.PerRequestMetricRecorder = undefined;
   exports.createOrcaClient = createOrcaClient;
@@ -381589,7 +381590,7 @@ function registerInstanceSchemas(registry4) {
     }
   });
 }
-var InstanceSchema2, gupshupHandoffFieldValue, gupshupHandoffFieldKey, gupshupHandoffFields, GupshupHandoffOptionsSchema, CreateInstanceSchema2, InstanceStatusSchema2, QrCodeSchema, PairingCodeRequestSchema, PairingCodeSchema, ConnectInstanceSchema, ConnectResponseSchema, UserProfileSchema, ContactSchema, GroupSchema, SupportedChannelSchema;
+var InstanceSchema2, gupshupHandoffFieldValue, gupshupHandoffFieldKey, gupshupHandoffFields, GupshupHandoffOptionsSchema, closeContactOutcomeOverride, CloseContactConfigSchema, CreateInstanceSchema2, InstanceStatusSchema2, QrCodeSchema, PairingCodeRequestSchema, PairingCodeSchema, ConnectInstanceSchema, ConnectResponseSchema, UserProfileSchema, ContactSchema, GroupSchema, SupportedChannelSchema;
 var init_instances2 = __esm(() => {
   init_src();
   init_zod_openapi();
@@ -381651,6 +381652,25 @@ var init_instances2 = __esm(() => {
       ]
     })
   }).strict();
+  closeContactOutcomeOverride = exports_external.object({
+    cooldownMs: exports_external.number().int().nonnegative().nullable().optional().openapi({
+      description: "Soft-close cooldown in ms (null = no cooldown)"
+    }),
+    escalationThreshold: exports_external.number().int().positive().nullable().optional().openapi({
+      description: "Closes with the same outcome within the window that promote to terminal (null = never)"
+    }),
+    escalationWindowMs: exports_external.number().int().positive().nullable().optional().openapi({
+      description: "Window in ms in which repeated closes are counted"
+    })
+  }).strict();
+  CloseContactConfigSchema = exports_external.object({
+    won: closeContactOutcomeOverride.optional(),
+    lost: closeContactOutcomeOverride.optional(),
+    redirected_sac: closeContactOutcomeOverride.optional(),
+    unqualified: closeContactOutcomeOverride.optional(),
+    no_response: closeContactOutcomeOverride.optional(),
+    other: closeContactOutcomeOverride.optional()
+  }).strict();
   CreateInstanceSchema2 = exports_external.object({
     name: exports_external.string().min(1).max(255).openapi({ description: "Unique name for the instance" }),
     channel: ChannelTypeSchema.openapi({ description: "Channel type" }),
@@ -381676,6 +381696,10 @@ var init_instances2 = __esm(() => {
           { apiKey: "Handled By", value: "assistant" }
         ]
       }
+    }),
+    closeContactConfig: CloseContactConfigSchema.nullable().optional().openapi({
+      description: "Per-outcome overrides for POST /messages/send/close-contact cooldown and escalation. Omitted outcomes/keys use the defaults; null clears it",
+      example: { no_response: { escalationThreshold: null } }
     })
   });
   InstanceStatusSchema2 = exports_external.object({
@@ -389572,6 +389596,7 @@ var init_instances3 = __esm(() => {
     gupshupAuthToken: exports_external.string().optional().nullable().describe("Gupshup Custom Integration auth token"),
     gupshupEventId: exports_external.string().optional().nullable().describe("Gupshup event ID (default: nx_omni_agent_reply)"),
     gupshupHandoffOptions: GupshupHandoffOptionsSchema.optional().nullable().describe("Gupshup HANDOFF routing defaults and customerFields template"),
+    closeContactConfig: CloseContactConfigSchema.optional().nullable().describe("Per-outcome close-contact cooldown/escalation overrides (null = defaults)"),
     webhookVerifyToken: exports_external.string().optional().nullable().describe("Gupshup webhook verify token"),
     twilioAccountSid: exports_external.string().optional().nullable().describe("Twilio Account SID"),
     twilioAuthToken: exports_external.string().optional().nullable().describe("Twilio Auth Token"),
@@ -389624,6 +389649,7 @@ var init_instances3 = __esm(() => {
     gupshupAuthToken: exports_external.string().nullable().optional(),
     gupshupEventId: exports_external.string().nullable().optional(),
     gupshupHandoffOptions: GupshupHandoffOptionsSchema.nullable().optional(),
+    closeContactConfig: CloseContactConfigSchema.nullable().optional(),
     webhookVerifyToken: exports_external.string().nullable().optional(),
     twilioAccountSid: exports_external.string().nullable().optional(),
     twilioAuthToken: exports_external.string().nullable().optional(),
@@ -393209,8 +393235,8 @@ function buildMediaDownloadFetchOptions(instance4) {
     preserveAuthRedirectHostSuffixes: ["slack.com"]
   };
 }
-async function computeCloseContactTerminalState(db2, chatUuid, outcome, auditRowId) {
-  const cfg = resolveCloseContactConfig(outcome, null);
+async function computeCloseContactTerminalState(db2, chatUuid, outcome, auditRowId, instanceOverrides) {
+  const cfg = resolveCloseContactConfig(outcome, instanceOverrides);
   if (isHardTerminalOutcome(outcome)) {
     return { terminal: true, escalated: false, closeUntil: null };
   }
@@ -393230,6 +393256,13 @@ async function computeCloseContactTerminalState(db2, chatUuid, outcome, auditRow
   const closeUntil = cfg.cooldownMs !== null ? new Date(Date.now() + cfg.cooldownMs) : null;
   return { terminal: false, escalated: false, closeUntil };
 }
+function planCloseContactSend(text3, capabilities3) {
+  const hasNativeClose = capabilities3?.canCloseContact === true;
+  const farewellText = text3?.trim() ? text3 : "";
+  const withoutFarewell = farewellText === "";
+  const sendNativeClose = hasNativeClose && (!withoutFarewell || capabilities3?.canCloseContactWithoutText === true);
+  return { hasNativeClose, sendNativeClose, farewellText, withoutFarewell };
+}
 function hasPresenceStatusSender(plugin13) {
   return typeof plugin13 === "object" && plugin13 !== null && typeof plugin13.sendPresenceStatus === "function";
 }
@@ -393513,7 +393546,7 @@ var init_messages5 = __esm(() => {
     instanceId: exports_external.string().uuid().describe("Instance ID \u2014 close-contact native send is Gupshup-only in v1"),
     chatId: exports_external.string().min(1).describe("Chat DB UUID to mark as closed"),
     to: exports_external.string().min(1).describe("Recipient phone or platform ID"),
-    text: exports_external.string().min(1).describe("Farewell message shown to the lead"),
+    text: exports_external.string().optional().describe("Farewell message shown to the contact. Omit (or send an empty string) to classify/close without a farewell: " + "channels declaring `canCloseContactWithoutText` still receive the native close event with an empty text " + "(the channel flow must not deliver an empty message); other channels skip the channel send."),
     outcome: exports_external.enum(["won", "lost", "redirected_sac", "unqualified", "no_response", "other"]).describe("Drives terminal/cooldown/escalation logic and BI/audit trail"),
     reason: exports_external.string().optional().describe("Free-text rationale persisted in close_contact_logs"),
     closeFields: exports_external.record(exports_external.unknown()).optional().describe("Structured BI/CRM payload \u2014 forwarded to Gupshup native send when supported")
@@ -394260,13 +394293,13 @@ var init_messages5 = __esm(() => {
       });
     }
     const resolvedTo = await resolveRecipient(data.to, instance4.channel, services);
-    const hasNativeClose = plugin13.capabilities?.canCloseContact === true;
     const outcome = data.outcome;
+    const { hasNativeClose, sendNativeClose, farewellText, withoutFarewell } = planCloseContactSend(data.text, plugin13.capabilities);
     let channelSendResult = null;
-    if (hasNativeClose) {
+    if (sendNativeClose) {
       const outgoingMessage = {
         to: resolvedTo,
-        content: { type: "text", text: data.text },
+        content: { type: "text", text: farewellText },
         metadata: {
           isCloseContact: true,
           closeReason: data.reason,
@@ -394286,7 +394319,7 @@ var init_messages5 = __esm(() => {
       chatUuid: data.chatId,
       chatId: resolvedTo,
       toPhone: resolvedTo,
-      text: data.text,
+      text: farewellText,
       outcome,
       reason: data.reason ?? null,
       closeFields: data.closeFields ?? null,
@@ -394296,10 +394329,12 @@ var init_messages5 = __esm(() => {
       sentAt: new Date,
       metadata: {
         instanceChannel: instance4.channel,
-        channelCloseSupported: hasNativeClose
+        channelCloseSupported: hasNativeClose,
+        channelCloseSent: sendNativeClose,
+        withoutFarewell
       }
     }).returning();
-    const { terminal, escalated, closeUntil } = await computeCloseContactTerminalState(db2, data.chatId, outcome, auditRow?.id ?? null);
+    const { terminal, escalated, closeUntil } = await computeCloseContactTerminalState(db2, data.chatId, outcome, auditRow?.id ?? null, instance4);
     const shouldPauseAgent = outcome === "lost";
     const closedAt = new Date;
     const closeChat = await services.chats.getById(data.chatId);
@@ -408661,6 +408696,7 @@ var GUPSHUP_CAPABILITIES = {
   canForwardMessage: false,
   canHandoff: true,
   canCloseContact: true,
+  canCloseContactWithoutText: true,
   canSendContact: false,
   canSendLocation: true,
   canSendSticker: true,
@@ -408782,6 +408818,12 @@ class GupshupClient {
       payload.handoff_fields = msg.handoff_fields;
     if (msg.customer_fields && msg.customer_fields.length > 0)
       payload.customerFields = msg.customer_fields;
+    if (msg.close_reason)
+      payload.close_reason = msg.close_reason;
+    if (msg.close_outcome)
+      payload.close_outcome = msg.close_outcome;
+    if (msg.close_fields)
+      payload.close_fields = msg.close_fields;
     const res = await fetch(this.callbackUrl, {
       method: "POST",
       headers: { "Content-Type": "application/json", Authorization: this.authToken },
@@ -409435,6 +409477,9 @@ function toGupshupPhone(phone) {
 }
 
 // ../channel-gupshup/src/plugin.ts
+function isCloseWithoutText(message2) {
+  return message2.metadata?.isCloseContact === true && !message2.content.text;
+}
 async function dispatchContent(client, dest, message2, handoffOptions) {
   const { content } = message2;
   const meta = message2.metadata;
@@ -409585,6 +409630,9 @@ class GupshupPlugin extends BaseChannelPlugin {
       const messageId = extractResponseString(response, "messageId") ?? crypto.randomUUID();
       if (correlationId)
         this.captureT11(correlationId);
+      if (isCloseWithoutText(message2)) {
+        return { success: true, messageId, timestamp: Date.now() };
+      }
       await this.emitMessageSent({
         instanceId,
         externalId: messageId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260916.8",
+  "version": "2.260916.9",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/automagik-dev/omni.git",