@agent-native/core 0.101.5 → 0.101.7

package/dist/integrations/webhook-handler.js

@@ -1,4 +1,4 @@
-import { appendA2AArtifactLinks, } from "../a2a/artifact-response.js";
+import { appendA2AArtifactLinks, extractA2AArtifactIdentities, } from "../a2a/artifact-response.js";
 import { collectFinalResponseTextFromAgentEvents } from "../a2a/response-text.js";
 import { formatLlmCredentialErrorMessage, isLlmCredentialError, } from "../agent/engine/credential-errors.js";
 import { getConfiguredEngineNameForRequest, getStoredModelForEngine, normalizeModelForEngine, resolveEngine, } from "../agent/engine/index.js";
@@ -7,7 +7,7 @@ import { PROVIDER_TO_ENV } from "../agent/engine/provider-env-vars.js";
 import { runAgentLoop, actionsToEngineTools, filterInitialEngineTools, getOwnerActiveApiKey, getOwnerApiKey, engineToProvider, } from "../agent/production-agent.js";
 import { startRun } from "../agent/run-manager.js";
 import { buildCurrentTimeUserContext, buildRuntimeContextPrompt, } from "../agent/runtime-context.js";
-import { buildAssistantMessage, extractThreadMeta, } from "../agent/thread-data-builder.js";
+import { buildAssistantMessage, extractThreadMeta, threadDataToEngineMessages, } from "../agent/thread-data-builder.js";
 import { attachToolSearch } from "../agent/tool-search.js";
 import { createThread, getThread } from "../chat-threads/store.js";
 import { updateThreadData } from "../chat-threads/store.js";
@@ -478,35 +478,7 @@ async function processIncomingMessage(incoming, options, opts = {}) {
     }
     const existingMessages = [];
     if (thread?.threadData) {
-        try {
-            const data = JSON.parse(thread.threadData);
-            if (Array.isArray(data.messages)) {
-                for (const msg of data.messages) {
-                    const m = msg.message ?? msg;
-                    const textContent = typeof m.content === "string"
-                        ? m.content
-                        : Array.isArray(m.content)
-                            ? m.content
-                                .filter((c) => c.type === "text")
-                                .map((c) => c.text)
-                                .join("\n")
-                            : "";
-                    if (m.role === "user") {
-                        existingMessages.push({
-                            role: "user",
-                            content: [{ type: "text", text: textContent }],
-                        });
-                    }
-                    else if (m.role === "assistant") {
-                        existingMessages.push({
-                            role: "assistant",
-                            content: [{ type: "text", text: textContent }],
-                        });
-                    }
-                }
-            }
-        }
-        catch { }
+        existingMessages.push(...threadDataToEngineMessages(thread.threadData));
     }
     // Add the new user message. Include verified platform identity as lightweight
     // context so app-specific agents can attribute requests without guessing.
@@ -713,45 +685,60 @@ async function processIncomingMessage(incoming, options, opts = {}) {
                 // preview card.
                 const baseUrl = process.env.APP_URL || process.env.URL || "";
                 const appBaseUrl = baseUrl ? withConfiguredAppBasePath(baseUrl) : "";
+                const toolResults = collectToolResultSummaries(completedRun);
                 if (!suppressPlatformReply) {
-                    responseText = appendA2AArtifactLinks(responseText, collectToolResultSummaries(completedRun), { baseUrl: appBaseUrl || undefined });
+                    responseText = appendA2AArtifactLinks(responseText, toolResults, {
+                        baseUrl: appBaseUrl || undefined,
+                    });
                 }
                 const threadDeepLinkUrl = appBaseUrl && threadId
                     ? `${appBaseUrl}/chat/${encodeURIComponent(threadId)}`
                     : undefined;
                 // Format and send back to platform — update the "thinking…"
                 // placeholder in place if the adapter supplied one.
+                let deliveredResponse;
                 if (!suppressPlatformReply) {
                     const outgoing = adapter.formatAgentResponse(responseText, {
                         threadDeepLinkUrl,
                     });
-                    let delivered = false;
+                    let deliveryReceipt;
                     if (queuedA2AContinuation && progress?.ref) {
                         // Post substantive parent results as a normal thread reply while
                         // the one continuation that claimed this resumable stream keeps
                         // it open for its eventual terminal result.
-                        await adapter.sendResponse(outgoing, incoming, {
+                        deliveryReceipt = await adapter.sendResponse(outgoing, incoming, {
                             placeholderRef: opts.placeholderRef,
                         });
-                        delivered = true;
                     }
                     else if (progress) {
                         try {
-                            await progress.complete(outgoing);
-                            delivered = true;
+                            deliveryReceipt = await progress.complete(outgoing);
                         }
                         catch {
-                            await adapter.sendResponse(outgoing, incoming, {
+                            deliveryReceipt = await adapter.sendResponse(outgoing, incoming, {
                                 placeholderRef: opts.placeholderRef,
                             });
-                            delivered = true;
                         }
                     }
                     else {
-                        await adapter.sendResponse(outgoing, incoming, {
+                        deliveryReceipt = await adapter.sendResponse(outgoing, incoming, {
                             placeholderRef: opts.placeholderRef,
                         });
-                        delivered = true;
+                    }
+                    const delivered = deliveryReceipt?.status === "delivered";
+                    if (!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 }
+                                : {}),
+                        };
                     }
                     if (slackInputRequest && delivered && incoming.senderId) {
                         await setIntegrationAwaitingInput({
@@ -792,7 +779,7 @@ async function processIncomingMessage(incoming, options, opts = {}) {
                     }
                 }
                 // Persist thread data
-                await persistThreadData(threadId, incoming.text, completedRun, thread);
+                await persistThreadData(threadId, incoming.text, completedRun, thread, deliveredResponse, toolResults);
                 await recordIntegrationUsage({
                     usage,
                     ownerEmail,
@@ -1124,7 +1111,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) {
+async function persistThreadData(threadId, userText, completedRun, thread, deliveredResponse, toolResults = []) {
     try {
         let repo;
         try {
@@ -1144,6 +1131,16 @@ async function persistThreadData(threadId, userText, completedRun, thread) {
         };
         // Build assistant message from run events
         const assistantMsg = buildAssistantMessage(completedRun.events ?? [], completedRun.runId);
+        if (assistantMsg) {
+            assistantMsg.metadata.integrationDeliveryAttempted = true;
+            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);