@automagik/omni 2.260603.1 → 2.260603.2

package/dist/index.js

@@ -36303,9 +36303,13 @@ class AgnoClient {
   async deleteSession(sessionId) {
     const url = `${this.baseUrl}/sessions/${encodeURIComponent(sessionId)}`;
     const response = await this.fetchWithTimeout(url, { method: "DELETE", headers: this.getHeaders() }, this.defaultTimeoutMs);
+    if (response.status === 404) {
+      return { ok: true, status: response.status, sessionId, existed: false };
+    }
     if (!response.ok) {
       this.handleErrorResponse(response, `deleting session ${sessionId}`);
     }
+    return { ok: true, status: response.status, sessionId, existed: true };
   }
 }
 function createAgnoClient(config2) {
@@ -124967,7 +124971,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260603.1",
+  version: "2.260603.2",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -29981,9 +29981,13 @@ class AgnoClient {
   async deleteSession(sessionId) {
     const url = `${this.baseUrl}/sessions/${encodeURIComponent(sessionId)}`;
     const response = await this.fetchWithTimeout(url, { method: "DELETE", headers: this.getHeaders() }, this.defaultTimeoutMs);
+    if (response.status === 404) {
+      return { ok: true, status: response.status, sessionId, existed: false };
+    }
     if (!response.ok) {
       this.handleErrorResponse(response, `deleting session ${sessionId}`);
     }
+    return { ok: true, status: response.status, sessionId, existed: true };
   }
 }
 function createAgnoClient(config2) {
@@ -225241,7 +225245,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260603.1",
+    version: "2.260603.2",
     type: "module",
     exports: {
       ".": {
@@ -336612,6 +336616,117 @@ var init_idempotency = __esm(() => {
   log93 = createLogger("idempotency");
 });
 
+// ../api/src/services/agent-session-identity.ts
+function computeLegacySessionId(strategy, userId, chatId, threadId2) {
+  switch (strategy) {
+    case "per_user":
+      return userId;
+    case "per_chat":
+      return chatId;
+    case "per_thread":
+      return `thread:${chatId}:${threadId2 ?? chatId}`;
+    default:
+      return `${userId}:${chatId}`;
+  }
+}
+function readHeader(headers, name) {
+  if (!headers || typeof headers !== "object")
+    return;
+  const headerMap = headers;
+  const lowerName = name.toLowerCase();
+  for (const [key, value] of Object.entries(headerMap)) {
+    if (key.toLowerCase() === lowerName && typeof value === "string" && value.trim())
+      return value.trim();
+  }
+  return;
+}
+function readStringField(source, names) {
+  if (!source)
+    return;
+  for (const name of names) {
+    const value = source[name];
+    if (typeof value === "string" && value.trim())
+      return value.trim();
+  }
+  return;
+}
+function extractKhalSessionIdFromRawPayload(rawPayload) {
+  const direct = readStringField(rawPayload, ["khalSessionId", "khal_session_id", "session_id"]);
+  if (direct)
+    return direct;
+  return readHeader(rawPayload?.headers, "x-khal-session-id");
+}
+function resolveKhalEnvironment(rawPayload, explicitEnvironment) {
+  const explicit = explicitEnvironment?.trim();
+  if (explicit)
+    return explicit;
+  const fromPayload = readStringField(rawPayload, ["khalEnv", "khalEnvironment", "environment", "env"]);
+  if (fromPayload)
+    return fromPayload;
+  return readHeader(rawPayload?.headers, "x-khal-env") ?? readHeader(rawPayload?.headers, "x-khal-environment") ?? process.env.KHAL_SESSION_ENV?.trim() ?? process.env.KHAL_ENV?.trim() ?? process.env.OMNI_ENV?.trim();
+}
+function channelToKhalSessionSegment(channel5) {
+  if (!channel5)
+    return;
+  if (channel5 === "whatsapp-gupshup")
+    return "gupshup";
+  if (channel5 === "whatsapp-cloud")
+    return "whatsapp";
+  if (channel5 === "whatsapp-baileys")
+    return "whatsapp";
+  return String(channel5).replace(/^channel-/, "");
+}
+function buildCanonicalKhalSessionId(input) {
+  return `khal:${input.environment}:omni:${input.instanceId}:${input.channelSegment}:${input.personId}`;
+}
+function resolveKhalSessionId(input) {
+  const sessionStrategy = input.sessionStrategy ?? "per_chat";
+  const legacySessionId = computeLegacySessionId(sessionStrategy, input.from, input.chatId, input.threadId);
+  const explicitKhalSessionId = extractKhalSessionIdFromRawPayload(input.rawPayload);
+  if (explicitKhalSessionId) {
+    return {
+      sessionId: explicitKhalSessionId,
+      legacySessionId,
+      sessionStrategy,
+      canonicalSessionId: explicitKhalSessionId,
+      personId: input.personId ?? undefined,
+      environment: resolveKhalEnvironment(input.rawPayload, input.environment),
+      channelSegment: channelToKhalSessionSegment(input.channel),
+      source: "explicit-khal"
+    };
+  }
+  const environment = resolveKhalEnvironment(input.rawPayload, input.environment);
+  const channelSegment = channelToKhalSessionSegment(input.channel);
+  const personId = input.personId?.trim();
+  if (input.providerSchema === "agno" && environment && channelSegment && personId) {
+    const canonicalSessionId = buildCanonicalKhalSessionId({
+      environment,
+      instanceId: input.instanceId,
+      channelSegment,
+      personId
+    });
+    return {
+      sessionId: canonicalSessionId,
+      legacySessionId,
+      sessionStrategy,
+      canonicalSessionId,
+      personId,
+      environment,
+      channelSegment,
+      source: "canonical-khal"
+    };
+  }
+  return {
+    sessionId: legacySessionId,
+    legacySessionId,
+    sessionStrategy,
+    personId: personId ?? undefined,
+    environment,
+    channelSegment,
+    source: "legacy"
+  };
+}
+
 // ../api/src/services/message-context.ts
 function extractPhoneFromJid(jid) {
   return jid.replace(/:.*$/, "").replace(/@.*$/, "").replace(/^@/, "");
@@ -338794,9 +338909,20 @@ async function dispatchViaStreamingProvider(services, instance4, messages4, trig
   if (!messageTexts.length && mediaFiles.length)
     messageTexts.push("[Media message]");
   const rawThreadId = extractThreadId(messages4);
-  const explicitKhalSessionId = extractKhalSessionId(messages4);
-  const sessionId = explicitKhalSessionId ?? computeSessionId(instance4.agentSessionStrategy ?? "per_chat", senderId, chatId, rawThreadId);
   const rawPl = messages4[0]?.payload.rawPayload ?? {};
+  const sessionIdentity = resolveKhalSessionId({
+    providerSchema: resolved.provider.schema,
+    sessionStrategy: instance4.agentSessionStrategy ?? "per_chat",
+    from: senderId,
+    chatId,
+    channel: channel5,
+    instanceId: instance4.id,
+    personId,
+    rawPayload: rawPl,
+    threadId: rawThreadId
+  });
+  const sessionId = sessionIdentity.sessionId;
+  const explicitKhalSessionId = sessionIdentity.canonicalSessionId;
   const replyToId = messages4[0]?.payload.replyToId ?? messages4[0]?.payload.externalId;
   const currentMessageIds = messages4.map((msg) => msg.payload.externalId).filter((id) => !!id);
   const dbContextMessages = await buildContextMessages(services, instance4, chatId, currentMessageIds);
@@ -339030,8 +339156,20 @@ async function dispatchViaProvider(services, instance4, messages4, triggerType,
     messageTexts.push("[Media message]");
   }
   const rawThreadId = extractThreadId(messages4);
-  const explicitKhalSessionId = extractKhalSessionId(messages4);
-  const sessionId = explicitKhalSessionId ?? computeSessionId(instance4.agentSessionStrategy ?? "per_chat", senderId, chatId, rawThreadId);
+  const rawPl = messages4[0]?.payload.rawPayload ?? {};
+  const sessionIdentity = resolveKhalSessionId({
+    providerSchema: provider.schema,
+    sessionStrategy: instance4.agentSessionStrategy ?? "per_chat",
+    from: senderId,
+    chatId,
+    channel: channel5,
+    instanceId: instance4.id,
+    personId,
+    rawPayload: rawPl,
+    threadId: rawThreadId
+  });
+  const sessionId = sessionIdentity.sessionId;
+  const explicitKhalSessionId = sessionIdentity.canonicalSessionId;
   const currentMessageIds = messages4.map((msg) => msg.payload.externalId).filter((id) => !!id);
   const dbContextMessages = await buildContextMessages(services, instance4, chatId, currentMessageIds);
   const allContextMessages = mergeContextMessages(extraContextMessages, dbContextMessages);
@@ -339970,7 +340108,16 @@ async function processReactionTrigger(services, baseInstance, payload, metadata,
     if (provider) {
       const effectivePersonId = reactionPersonId ?? metadata.personId;
       const senderName2 = await services.agentRunner.getSenderName(effectivePersonId, undefined);
-      const sessionId = computeSessionId(instance4.agentSessionStrategy ?? "per_chat", payload.from, externalChatId);
+      const sessionId = resolveKhalSessionId({
+        providerSchema: provider.schema,
+        sessionStrategy: instance4.agentSessionStrategy ?? "per_chat",
+        from: payload.from,
+        chatId: externalChatId,
+        channel: channel5,
+        instanceId: instance4.id,
+        personId: effectivePersonId,
+        rawPayload: payload.rawPayload
+      }).sessionId;
       const customerContext = await resolveCustomerContext(services, effectivePersonId);
       const trigger = {
         traceId: metadata.traceId,
@@ -349830,7 +349977,16 @@ async function sendMessage(services, instanceId, chatId, text3) {
     });
   }
 }
-async function clearAgentSession(services, db2, instanceId, from, chatId) {
+async function resolveCleanupPersonId(services, db2, instanceId, chatId, from, metadataPersonId) {
+  if (metadataPersonId?.trim())
+    return metadataPersonId.trim();
+  const dbChat = await services.chats.findByExternalIdSmart(instanceId, chatId);
+  if (!dbChat?.id)
+    return;
+  const [participant] = await db2.select({ personId: chatParticipants.personId }).from(chatParticipants).where(and2(eq(chatParticipants.chatId, dbChat.id), eq(chatParticipants.platformUserId, from))).limit(1);
+  return participant?.personId ?? undefined;
+}
+async function clearAgentSession(services, db2, instanceId, from, chatId, options = {}) {
   const instance4 = await services.agentRunner.getInstanceWithProvider(instanceId);
   if (!instance4?.agentId) {
     throw new Error("No agent configured for instance");
@@ -349840,14 +349996,31 @@ async function clearAgentSession(services, db2, instanceId, from, chatId) {
     throw new Error("Agent has no provider configured");
   }
   const providerRecord = await services.providers.getById(agentRow.agentProviderId);
-  const sessionStrategy = instance4.agentSessionStrategy ?? "per_chat";
-  const sessionId = computeSessionId(sessionStrategy, from, chatId);
+  const personId = await resolveCleanupPersonId(services, db2, instanceId, chatId, from, options.personId);
+  const identity = resolveKhalSessionId({
+    providerSchema: providerRecord.schema,
+    sessionStrategy: instance4.agentSessionStrategy ?? "per_chat",
+    from,
+    chatId,
+    channel: instance4.channel,
+    instanceId,
+    personId,
+    rawPayload: options.rawPayload
+  });
+  const { sessionId, legacySessionId } = identity;
+  const hasKhalContext = !!identity.canonicalSessionId || !!identity.environment || !!options.rawPayload?.khalSessionId;
+  if (providerRecord.schema === "agno" && hasKhalContext && identity.source === "legacy") {
+    throw new Error("Canonical KHAL session resolution failed; refusing blind legacy Agno reset");
+  }
   const dispatchInstance = { ...instance4, agentProviderId: agentRow.agentProviderId };
   await applyAgentFkOverrides(db2, instance4.agentId, dispatchInstance);
   const agentProvider = resolveProvider(providerRecord, dispatchInstance, db2);
   if (agentProvider?.resetSession) {
     await agentProvider.resetSession(sessionId, chatId, instanceId);
-    return { sessionId, sessionStrategy };
+    if (legacySessionId !== sessionId) {
+      await agentProvider.resetSession(legacySessionId, chatId, instanceId);
+    }
+    return identity;
   }
   if (providerRecord.schema !== "agno") {
     throw new Error(`Session clearing not supported for ${providerRecord.schema} providers`);
@@ -349857,18 +350030,28 @@ async function clearAgentSession(services, db2, instanceId, from, chatId) {
     apiKey: providerRecord.apiKey ?? "",
     defaultTimeoutMs: (providerRecord.defaultTimeout ?? 60) * 1000
   });
-  await client.deleteSession?.(sessionId);
-  return { sessionId, sessionStrategy };
+  const primaryDelete = await client.deleteSession?.(sessionId);
+  const legacyDelete = legacySessionId !== sessionId ? await client.deleteSession?.(legacySessionId) : undefined;
+  log105.info("Agno session delete verified", {
+    instanceId,
+    sessionId,
+    legacySessionId,
+    primaryStatus: primaryDelete?.status,
+    primaryExisted: primaryDelete?.existed,
+    legacyStatus: legacyDelete?.status,
+    legacyExisted: legacyDelete?.existed
+  });
+  return identity;
 }
 async function handleTrashEmojiMessage(services, db2, event) {
-  const { content, chatId, from } = event.payload;
+  const { content, chatId } = event.payload;
   const { instanceId } = event.metadata;
   if (!instanceId || !content?.text)
     return;
   if (!isTrashEmojiOnly2(content.text))
     return;
   const result = await withIdempotency(db2, event.id, "session-cleaner", async () => {
-    await runTrashEmojiCleanup(services, db2, instanceId, chatId, from);
+    await runTrashEmojiCleanup(services, db2, event);
   });
   if (!result.executed) {
     log105.debug("Trash emoji event already processed (NATS redelivery skipped)", {
@@ -349878,11 +350061,26 @@ async function handleTrashEmojiMessage(services, db2, event) {
     });
   }
 }
-async function runTrashEmojiCleanup(services, db2, instanceId, chatId, from) {
-  log105.info("Trash emoji detected, clearing session", { instanceId, chatId, from });
+async function runTrashEmojiCleanup(services, db2, event) {
+  const { chatId, from, rawPayload } = event.payload;
+  const { instanceId, personId } = event.metadata;
+  if (!instanceId)
+    return;
+  log105.info("Trash emoji detected, clearing session", { instanceId, chatId, from, personId });
   try {
-    const { sessionId, sessionStrategy } = await clearAgentSession(services, db2, instanceId, from, chatId);
-    log105.info("Session cleared successfully", { instanceId, sessionId, sessionStrategy });
+    const identity = await clearAgentSession(services, db2, instanceId, from, chatId, { personId, rawPayload });
+    const { sessionId, legacySessionId, sessionStrategy, source, canonicalSessionId, environment, channelSegment } = identity;
+    log105.info("Session cleared successfully", {
+      instanceId,
+      sessionId,
+      legacySessionId,
+      sessionStrategy,
+      source,
+      canonicalSessionId,
+      personId: identity.personId,
+      environment,
+      channelSegment
+    });
     try {
       const dbChat = await services.chats.findByExternalIdSmart(instanceId, chatId);
       if (dbChat?.id) {
@@ -349954,7 +350152,6 @@ var init_session_cleaner = __esm(() => {
   init_src5();
   init_drizzle_orm();
   init_idempotency();
-  init_agent_runner();
   init_agent_dispatcher();
   init_loader2();
   log105 = createLogger("session-cleaner");

package/package.json

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