@agent-native/core 0.107.1 → 0.108.0

package/dist/integrations/webhook-handler.d.ts

@@ -1,8 +1,28 @@
 import type { H3Event } from "h3";
+import { type A2AArtifactIdentity } from "../a2a/artifact-response.js";
 import type { AgentEngine } from "../agent/engine/types.js";
 import { type ActionEntry } from "../agent/production-agent.js";
 import { type PendingTask } from "./pending-tasks-store.js";
-import type { PlatformAdapter, IncomingMessage } from "./types.js";
+import type { PlatformAdapter, IncomingMessage, OutgoingMessage, PlatformDeliveryReceipt } from "./types.js";
+export type IntegrationResponseDeliveryTaskPayload = {
+    kind: "response-delivery";
+    incoming: IncomingMessage;
+    message: OutgoingMessage;
+    placeholderRef?: string;
+    internalThreadId?: string;
+    userMessageId?: string;
+    assistantMessageId?: string;
+    deliveryReceipt?: PlatformDeliveryReceipt;
+    deliveredAt?: string;
+    artifacts?: A2AArtifactIdentity[];
+};
+export type ProcessIntegrationTaskResult = {
+    status: "completed";
+} | {
+    status: "delivery-pending";
+    payload: IntegrationResponseDeliveryTaskPayload;
+    errorMessage: string;
+};
 export interface WebhookHandlerOptions {
     adapter: PlatformAdapter;
     /** Resolved system prompt string */
@@ -85,5 +105,6 @@ export declare function resolveBaseUrl(event: H3Event): string;
  * processor endpoint in `plugin.ts`. This is a fresh function execution, so
  * it gets its own timeout budget independent of the inbound webhook handler.
  */
-export declare function processIntegrationTask(task: PendingTask, options: WebhookHandlerOptions): Promise<void>;
+export declare function processIntegrationTask(task: PendingTask, options: WebhookHandlerOptions): Promise<ProcessIntegrationTaskResult>;
+export declare function recordIntegrationResponseDelivery(payload: IntegrationResponseDeliveryTaskPayload, receipt: PlatformDeliveryReceipt): Promise<void>;
 //# sourceMappingURL=webhook-handler.d.ts.map

package/dist/integrations/webhook-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook-handler.d.ts","sourceRoot":"","sources":["../../src/integrations/webhook-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAqBlC,OAAO,KAAK,EAAE,WAAW,EAAiB,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAOL,KAAK,WAAW,EACjB,MAAM,8BAA8B,CAAC;AA+BtC,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EAEhB,MAAM,YAAY,CAAC;AAsDpB,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,eAAe,CAAC;IACzB,oCAAoC;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACrC;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,qEAAqE;IACrE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wBAAwB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,MAAM,CAAC,EACH,WAAW,GACX,MAAM,GACN;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;IACtD,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wDAAwD;IACxD,UAAU,EAAE,MAAM,CAAC;IACnB,oEAAoE;IACpE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,yEAAyE;IACzE,aAAa,CAAC,EAAE,CACd,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,eAAe,KACrB,OAAO,CACR;QACE,OAAO,EAAE,IAAI,CAAC;QACd,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GACD;QAAE,OAAO,EAAE,KAAK,CAAA;KAAE,CACrB,CAAC;CACH;AAyDD,wBAAsB,wBAAwB,CAC5C,YAAY,EAAE,qBAAqB,CAAC,QAAQ,CAAC,EAC7C,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAyB7B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,aAAa,CACjC,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CA0E5C;AA6ID;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAgCrD;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAgBf"}
+{"version":3,"file":"webhook-handler.d.ts","sourceRoot":"","sources":["../../src/integrations/webhook-handler.ts"],"names":[],"mappings":"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"}

package/dist/integrations/webhook-handler.js

@@ -12,7 +12,7 @@ import { attachToolSearch } from "../agent/tool-search.js";
 import { createThread, getThread } from "../chat-threads/store.js";
 import { updateThreadData } from "../chat-threads/store.js";
 import { isLocalDatabase } from "../db/client.js";
-import { resolveOrgIdForEmail } from "../org/context.js";
+import { getOrgA2ASecret, resolveOrgIdForEmail } from "../org/context.js";
 import { withConfiguredAppBasePath } from "../server/app-base-path.js";
 import { FRAMEWORK_ROUTE_PREFIX } from "../server/core-routes-plugin.js";
 import { canUseDeployCredentialFallbackForRequest, readDeployCredentialEnv, } from "../server/credential-provider.js";
@@ -22,7 +22,7 @@ import { A2A_CONTINUATION_QUEUED_MARKER } from "./a2a-continuation-marker.js";
 import { clearIntegrationAwaitingInput, setIntegrationAwaitingInput, } from "./awaiting-input-store.js";
 import { loadIntegrationMemoryPrompt } from "./integration-memory.js";
 import { signInternalToken } from "./internal-token.js";
-import { insertPendingTask, isDuplicateEventError, } from "./pending-tasks-store.js";
+import { insertPendingTask, isDuplicateEventError, stageTaskDeliveryPayload, } from "./pending-tasks-store.js";
 import { integrationScopeSubjectKey } from "./scope-store.js";
 import { getThreadMapping, saveThreadMapping } from "./thread-mapping-store.js";
 import { listIntegrationUsageBudgets, releaseIntegrationUsageBudget, reserveIntegrationUsageBudget, settleIntegrationUsageBudget, } from "./usage-budget-store.js";
@@ -59,6 +59,13 @@ function buildEventDedupKey(incoming) {
         : String(incoming.timestamp);
     return `${incoming.platform}:${incoming.externalThreadId}:${eventReference}`;
 }
+function buildDeliveryHistoryMessageIds(incoming) {
+    const eventKey = buildEventDedupKey(incoming);
+    return {
+        userMessageId: `integration-${eventKey}-user`,
+        assistantMessageId: `integration-${eventKey}-assistant`,
+    };
+}
 function explicitEngineName(engineOption) {
     if (!engineOption)
         return undefined;
@@ -361,7 +368,7 @@ export function resolveBaseUrl(event) {
 export async function processIntegrationTask(task, options) {
     const parsed = JSON.parse(task.payload);
     await recordInboundIntegrationAudit(task, parsed.incoming);
-    await processIncomingMessage(parsed.incoming, options, {
+    return processIncomingMessage(parsed.incoming, options, {
         taskId: task.id,
         attempts: task.attempts,
         placeholderRef: parsed.placeholderRef,
@@ -458,10 +465,41 @@ async function processIncomingMessage(incoming, options, opts = {}) {
     });
     if (!budgetReservations.allowed) {
         const outgoing = adapter.formatAgentResponse("This channel or requester has reached its configured AI usage budget. An admin can review the budget in Messaging settings.");
-        await adapter.sendResponse(outgoing, incoming, {
-            placeholderRef: opts.placeholderRef,
-        });
-        return;
+        let deliveryPayload = {
+            kind: "response-delivery",
+            incoming,
+            message: outgoing,
+            ...(opts.placeholderRef ? { placeholderRef: opts.placeholderRef } : {}),
+        };
+        try {
+            if (opts.taskId) {
+                await stageTaskDeliveryPayload(opts.taskId, JSON.stringify(deliveryPayload));
+            }
+            const receipt = await adapter.sendResponse(outgoing, incoming, {
+                placeholderRef: opts.placeholderRef,
+            });
+            if (receipt?.status !== "delivered") {
+                throw new Error(`${incoming.platform} response completed without delivery proof`);
+            }
+            deliveryPayload = {
+                ...deliveryPayload,
+                deliveryReceipt: receipt,
+                deliveredAt: new Date().toISOString(),
+            };
+            if (opts.taskId) {
+                await stageTaskDeliveryPayload(opts.taskId, JSON.stringify(deliveryPayload));
+            }
+            return { status: "completed" };
+        }
+        catch (error) {
+            return {
+                status: "delivery-pending",
+                payload: deliveryPayload,
+                errorMessage: error instanceof Error
+                    ? error.message.slice(0, 1000)
+                    : `${incoming.platform} response delivery failed`,
+            };
+        }
     }
     let threadId;
     let thread;
@@ -530,11 +568,13 @@ async function processIncomingMessage(incoming, options, opts = {}) {
     // A2A delegation. Without this, getRequestOrgId() returns undefined and
     // call-agent can't look up the org's a2a_secret or org_domain.
     let orgId;
+    let artifactSecrets;
     let runnableActions;
     let tools;
     let availableTools;
     try {
         orgId = opts.orgId ?? (await resolveOrgIdForEmail(ownerEmail));
+        artifactSecrets = await resolveIntegrationArtifactSecrets(orgId);
         // Attach tool-search on a shallow copy so framework additions merged in
         // by `createIntegrationsPlugin` (integration memory, `call-agent`) can be
         // deferred behind it without mutating the plugin's long-lived registry.
@@ -555,7 +595,7 @@ async function processIncomingMessage(incoming, options, opts = {}) {
     let budgetsSettled = false;
     // Wait for the run to complete inside this fresh function execution.
     // We use a Promise so the processor endpoint can await the full lifecycle.
-    await new Promise((resolve) => {
+    return new Promise((resolve) => {
         startRun(runId, threadId, async (send, signal) => {
             await runWithRequestContext({
                 userEmail: ownerEmail,
@@ -638,6 +678,10 @@ async function processIncomingMessage(incoming, options, opts = {}) {
         }, async (completedRun) => {
             let keepSlackInputWindow = false;
             let queuedA2AContinuation = false;
+            let outgoingForDelivery;
+            let stagedDeliveryPayload;
+            let threadCheckpoint;
+            let outcome = { status: "completed" };
             try {
                 queuedA2AContinuation = hasQueuedA2AContinuation(completedRun);
                 const slackInputRequest = incoming.platform === "slack"
@@ -720,6 +764,23 @@ async function processIncomingMessage(incoming, options, opts = {}) {
                     const outgoing = adapter.formatAgentResponse(responseText, {
                         threadDeepLinkUrl,
                     });
+                    outgoingForDelivery = outgoing;
+                    stagedDeliveryPayload = {
+                        kind: "response-delivery",
+                        incoming,
+                        message: outgoing,
+                        ...(opts.placeholderRef
+                            ? { placeholderRef: opts.placeholderRef }
+                            : {}),
+                        internalThreadId: threadId,
+                        ...buildDeliveryHistoryMessageIds(incoming),
+                        artifacts: extractA2AArtifactIdentities(toolResults, {
+                            persistedArtifactSecrets: artifactSecrets,
+                        }),
+                    };
+                    if (opts.taskId) {
+                        await stageTaskDeliveryPayload(opts.taskId, JSON.stringify(stagedDeliveryPayload));
+                    }
                     let deliveryReceipt;
                     if (queuedA2AContinuation && progress?.ref) {
                         // Post substantive parent results as a normal thread reply while
@@ -744,22 +805,28 @@ async function processIncomingMessage(incoming, options, opts = {}) {
                             placeholderRef: opts.placeholderRef,
                         });
                     }
-                    const delivered = deliveryReceipt?.status === "delivered";
-                    if (!delivered) {
+                    if (deliveryReceipt?.status !== "delivered") {
                         throw new Error(`${incoming.platform} response completed without delivery proof`);
                     }
-                    if (delivered) {
-                        deliveredResponse = {
-                            platform: incoming.platform,
-                            status: "delivered",
-                            text: outgoing.text,
-                            deliveredAt: new Date().toISOString(),
-                            ...(deliveryReceipt?.messageRefs?.length
-                                ? { messageRefs: deliveryReceipt.messageRefs }
-                                : {}),
-                        };
+                    const deliveredAt = new Date().toISOString();
+                    stagedDeliveryPayload = {
+                        ...stagedDeliveryPayload,
+                        deliveryReceipt,
+                        deliveredAt,
+                    };
+                    if (opts.taskId) {
+                        await stageTaskDeliveryPayload(opts.taskId, JSON.stringify(stagedDeliveryPayload));
                     }
-                    if (slackInputRequest && delivered && incoming.senderId) {
+                    deliveredResponse = {
+                        platform: incoming.platform,
+                        status: "delivered",
+                        text: outgoing.text,
+                        deliveredAt,
+                        ...(deliveryReceipt.messageRefs?.length
+                            ? { messageRefs: deliveryReceipt.messageRefs }
+                            : {}),
+                    };
+                    if (slackInputRequest && incoming.senderId) {
                         await setIntegrationAwaitingInput({
                             platform: "slack",
                             externalThreadId: incoming.externalThreadId,
@@ -798,7 +865,22 @@ async function processIncomingMessage(incoming, options, opts = {}) {
                     }
                 }
                 // Persist thread data
-                await persistThreadData(threadId, incoming.text, completedRun, thread, deliveredResponse, toolResults);
+                threadCheckpoint = await persistThreadData(threadId, incoming.text, completedRun, thread, deliveredResponse, toolResults, stagedDeliveryPayload, artifactSecrets);
+                if (outgoingForDelivery && stagedDeliveryPayload) {
+                    if (!threadCheckpoint) {
+                        throw new Error("Integration response history checkpoint failed");
+                    }
+                    stagedDeliveryPayload = {
+                        ...stagedDeliveryPayload,
+                        userMessageId: threadCheckpoint.userMessageId,
+                        ...(threadCheckpoint.assistantMessageId
+                            ? { assistantMessageId: threadCheckpoint.assistantMessageId }
+                            : {}),
+                    };
+                    if (opts.taskId) {
+                        await stageTaskDeliveryPayload(opts.taskId, JSON.stringify(stagedDeliveryPayload));
+                    }
+                }
                 await recordIntegrationUsage({
                     usage,
                     ownerEmail,
@@ -814,9 +896,52 @@ async function processIncomingMessage(incoming, options, opts = {}) {
             }
             catch (err) {
                 console.error(`[integrations] Error sending response to ${incoming.platform}:`, err);
+                if (outgoingForDelivery) {
+                    const errorMessage = err instanceof Error
+                        ? err.message.slice(0, 1000)
+                        : `${incoming.platform} response delivery failed`;
+                    if (!stagedDeliveryPayload?.deliveryReceipt) {
+                        threadCheckpoint = await persistThreadData(threadId, incoming.text, completedRun, thread, undefined, collectToolResultSummaries(completedRun), stagedDeliveryPayload, artifactSecrets);
+                    }
+                    if (usage) {
+                        await recordIntegrationUsage({
+                            usage,
+                            ownerEmail,
+                            appId: options.appId,
+                            runId,
+                            threadId,
+                            taskId: opts.taskId,
+                            orgId: orgId ?? undefined,
+                            incoming,
+                        }).catch(() => { });
+                        try {
+                            await settleApplicableIntegrationBudgets(budgetReservations.reservations, usage);
+                            budgetsSettled = true;
+                        }
+                        catch { }
+                    }
+                    outcome = {
+                        status: "delivery-pending",
+                        payload: {
+                            ...(stagedDeliveryPayload ?? {
+                                kind: "response-delivery",
+                                incoming,
+                                message: outgoingForDelivery,
+                                internalThreadId: threadId,
+                            }),
+                            ...(threadCheckpoint?.userMessageId
+                                ? { userMessageId: threadCheckpoint.userMessageId }
+                                : {}),
+                            ...(threadCheckpoint?.assistantMessageId
+                                ? { assistantMessageId: threadCheckpoint.assistantMessageId }
+                                : {}),
+                        },
+                        errorMessage,
+                    };
+                    return;
+                }
                 // A queued continuation owns the final platform response. Later
-                // bookkeeping failures (for example, persisting this parent run)
-                // must not close its resumable native stream with a false failure.
+                // bookkeeping failures must not close its stream with a false failure.
                 if (queuedA2AContinuation)
                     return;
                 // Last-ditch: try to post a brief apology so the thread isn't silent.
@@ -838,7 +963,7 @@ async function processIncomingMessage(incoming, options, opts = {}) {
                 if (!budgetsSettled) {
                     await releaseApplicableIntegrationBudgets(budgetReservations.reservations);
                 }
-                resolve();
+                resolve(outcome);
             }
         }, 
         // Integration workers are ordinary self-dispatched serverless requests,
@@ -1130,7 +1255,7 @@ function hasSubstantiveA2APartialAnswer(text) {
  * Persist the user message and agent response to the thread data,
  * so the conversation history is available in the web UI too.
  */
-async function persistThreadData(threadId, userText, completedRun, thread, deliveredResponse, toolResults = []) {
+async function persistThreadData(threadId, userText, completedRun, thread, deliveredResponse, toolResults = [], messageIds, artifactSecrets = []) {
     try {
         let repo;
         try {
@@ -1143,32 +1268,129 @@ async function persistThreadData(threadId, userText, completedRun, thread, deliv
             repo.messages = [];
         // Add user message
         const userMsg = {
-            id: `msg-${Date.now()}-user`,
+            id: messageIds?.userMessageId ?? `msg-${Date.now()}-user`,
             role: "user",
             content: [{ type: "text", text: userText }],
             createdAt: new Date().toISOString(),
         };
         // Build assistant message from run events
-        const assistantMsg = buildAssistantMessage(completedRun.events ?? [], completedRun.runId);
+        const builtAssistantMsg = buildAssistantMessage(completedRun.events ?? [], completedRun.runId);
+        if (builtAssistantMsg && messageIds?.assistantMessageId) {
+            builtAssistantMsg.id = messageIds.assistantMessageId;
+        }
+        const existingAssistantMsg = builtAssistantMsg
+            ? repo.messages.find((message) => message?.id === builtAssistantMsg.id)
+            : undefined;
+        const assistantMsg = existingAssistantMsg ?? builtAssistantMsg;
         if (assistantMsg) {
             assistantMsg.metadata.integrationDeliveryAttempted = true;
+            const artifactIdentities = extractA2AArtifactIdentities(toolResults, {
+                persistedArtifactSecrets: artifactSecrets,
+            });
+            if (artifactIdentities.length > 0) {
+                assistantMsg.metadata.integrationArtifacts = artifactIdentities;
+            }
             if (deliveredResponse) {
                 assistantMsg.metadata.integrationDelivery = deliveredResponse;
-                const artifactIdentities = extractA2AArtifactIdentities(toolResults);
-                if (artifactIdentities.length > 0) {
-                    assistantMsg.metadata.integrationArtifacts = artifactIdentities;
-                }
             }
         }
-        repo.messages.push(userMsg);
-        if (assistantMsg) {
-            repo.messages.push(assistantMsg);
+        if (!repo.messages.some((message) => message?.id === userMsg.id)) {
+            repo.messages.push(userMsg);
+        }
+        if (builtAssistantMsg && !existingAssistantMsg) {
+            repo.messages.push(builtAssistantMsg);
         }
         const meta = extractThreadMeta(repo);
         await updateThreadData(threadId, JSON.stringify(repo), meta.title || thread?.title || "Integration Chat", meta.preview || thread?.preview || "", repo.messages.length);
+        return {
+            userMessageId: userMsg.id,
+            ...(assistantMsg?.id ? { assistantMessageId: assistantMsg.id } : {}),
+        };
     }
     catch {
         // Best-effort persistence
+        return undefined;
+    }
+}
+async function resolveIntegrationArtifactSecrets(orgId) {
+    const secrets = [];
+    const add = (secret) => {
+        const value = secret?.trim();
+        if (value && !secrets.includes(value))
+            secrets.push(value);
+    };
+    add(process.env.A2A_SECRET);
+    if (orgId) {
+        try {
+            add(await getOrgA2ASecret(orgId));
+        }
+        catch { }
     }
+    return secrets;
+}
+export async function recordIntegrationResponseDelivery(payload, receipt) {
+    if (!payload.internalThreadId)
+        return;
+    const thread = await getThread(payload.internalThreadId);
+    if (!thread)
+        throw new Error("Integration delivery thread was not found");
+    let repo;
+    try {
+        repo = JSON.parse(thread.threadData || "{}");
+    }
+    catch {
+        throw new Error("Integration delivery thread data is invalid");
+    }
+    if (!Array.isArray(repo.messages)) {
+        repo.messages = [];
+    }
+    const stableMessageIds = buildDeliveryHistoryMessageIds(payload.incoming);
+    const userMessageId = payload.userMessageId ?? stableMessageIds.userMessageId;
+    const assistantMessageId = payload.assistantMessageId ?? stableMessageIds.assistantMessageId;
+    const userMsg = userMessageId
+        ? repo.messages.find((message) => message?.id === userMessageId)
+        : undefined;
+    let assistantMsg = assistantMessageId
+        ? repo.messages.find((message) => message?.id === assistantMessageId)
+        : undefined;
+    const createdAt = payload.deliveredAt ?? new Date().toISOString();
+    if (!userMsg) {
+        repo.messages.push({
+            id: userMessageId,
+            role: "user",
+            content: [{ type: "text", text: payload.incoming.text }],
+            createdAt,
+        });
+    }
+    if (!assistantMsg) {
+        assistantMsg = {
+            id: assistantMessageId,
+            role: "assistant",
+            content: [{ type: "text", text: payload.message.text }],
+            createdAt,
+            metadata: {
+                integrationDeliveryAttempted: true,
+                ...(payload.artifacts?.length
+                    ? { integrationArtifacts: payload.artifacts }
+                    : {}),
+            },
+        };
+        repo.messages.push(assistantMsg);
+    }
+    if (!assistantMsg.metadata || typeof assistantMsg.metadata !== "object") {
+        assistantMsg.metadata = {};
+    }
+    assistantMsg.metadata.integrationDeliveryAttempted = true;
+    assistantMsg.metadata.integrationDelivery = {
+        platform: payload.incoming.platform,
+        status: "delivered",
+        text: payload.message.text,
+        deliveredAt: payload.deliveredAt ?? new Date().toISOString(),
+        ...(receipt.messageRefs?.length
+            ? { messageRefs: receipt.messageRefs }
+            : {}),
+    };
+    const meta = extractThreadMeta(repo);
+    await updateThreadData(payload.internalThreadId, JSON.stringify(repo), meta.title || thread.title || "Integration Chat", meta.preview || thread.preview || "", repo.messages.length);
 }
 //# sourceMappingURL=webhook-handler.js.map