@andreprado/agentkit 0.1.0 → 0.2.0

package/src/runtime/channels/whatsapp-evolution.ts

@@ -12,9 +12,19 @@ import type {
   WebhookVerificationResult,
 } from "../channels";
 import { AgentKitError } from "../errors";
+import {
+  CHANNEL_DOWNLOAD_TIMEOUT_MS,
+  CHANNEL_SEND_TIMEOUT_MS,
+  CHANNEL_STATUS_TIMEOUT_MS,
+  classifySendRequestError,
+  isRetryableReadRequestError,
+} from "./provider-fetch";
+import { createPublicHttpsFetch, isBlockedOutboundHost } from "./net-guard";
 
 type EvolutionFetch = (url: string, init?: RequestInit) => Promise<Response>;
 
+const evolutionFetch: EvolutionFetch = createPublicHttpsFetch("EVOLUTION_API_BASE_URL");
+
 type EvolutionSendTextRequest = {
   method: "POST";
   url: string;
@@ -218,7 +228,7 @@ export function buildEvolutionSendTextRequest(input: ChannelSendInput): Evolutio
 
 export async function sendEvolutionMessage(
   input: ChannelSendInput,
-  fetcher: EvolutionFetch = fetch,
+  fetcher: EvolutionFetch = evolutionFetch,
 ): Promise<ChannelSendResult> {
   if (input.secrets.AGENTKIT_CHANNEL_SEND_DRY_RUN === "1") {
     const request = buildEvolutionSendTextRequest(input);
@@ -267,6 +277,7 @@ export async function sendEvolutionMessage(
 
   try {
     response = await fetcher(actualRequest.url, {
+      signal: AbortSignal.timeout(CHANNEL_SEND_TIMEOUT_MS),
       method: actualRequest.method,
       headers: {
         apikey: apiKey,
@@ -276,11 +287,12 @@ export async function sendEvolutionMessage(
       body: JSON.stringify(actualRequest.body),
     });
   } catch (error) {
+    const failure = classifySendRequestError(error);
     return {
       ok: false,
-      retryable: true,
-      code: "channel_provider_unavailable",
-      message: `Evolution sendText request failed before a response: ${redactString(
+      retryable: failure.retryable,
+      code: failure.code,
+      message: `Evolution sendText request ${failure.reason}: ${redactString(
         error instanceof Error ? error.message : String(error),
         [apiKey, baseUrl, instanceName],
       )}`,
@@ -293,7 +305,7 @@ export async function sendEvolutionMessage(
     };
   }
 
-  const payload = await readEvolutionResponseBody(response);
+  const payload = await readEvolutionResponseBody(response).catch(() => null);
   const redactedPayload = redactValue(payload, [apiKey, baseUrl, instanceName]);
   const messageId = readEvolutionProviderMessageId(payload);
 
@@ -345,7 +357,7 @@ export async function sendEvolutionMessage(
 
 export async function downloadEvolutionMedia(
   input: ChannelMediaDownloadInput,
-  fetcher: EvolutionFetch = fetch,
+  fetcher: EvolutionFetch = evolutionFetch,
 ): Promise<ChannelMediaDownloadResult> {
   const baseUrl = input.secrets.EVOLUTION_API_BASE_URL;
   const apiKey = input.secrets.EVOLUTION_API_KEY;
@@ -388,6 +400,7 @@ export async function downloadEvolutionMedia(
 
   try {
     response = await fetcher(url, {
+      signal: AbortSignal.timeout(CHANNEL_DOWNLOAD_TIMEOUT_MS),
       method: "POST",
       headers: {
         apikey: apiKey,
@@ -406,7 +419,7 @@ export async function downloadEvolutionMedia(
   } catch (error) {
     return {
       ok: false,
-      retryable: true,
+      retryable: isRetryableReadRequestError(error),
       code: "channel_provider_unavailable",
       message: `Evolution media download failed before a response: ${redactString(
         error instanceof Error ? error.message : String(error),
@@ -435,7 +448,15 @@ export async function downloadEvolutionMedia(
       };
     }
 
-    throw error;
+    return {
+      ok: false,
+      retryable: true,
+      code: "channel_provider_unavailable",
+      message: `Evolution media download response could not be read: ${error instanceof Error ? error.message : String(error)}`,
+      providerMetadata: {
+        status: response.status,
+      },
+    };
   }
 
   if (!response.ok) {
@@ -540,7 +561,7 @@ export async function downloadEvolutionMedia(
 
 export async function getEvolutionStatus(
   input: ChannelStatusInput,
-  fetcher: EvolutionFetch = fetch,
+  fetcher: EvolutionFetch = evolutionFetch,
 ): Promise<ChannelStatusResult> {
   const missingSecrets = ["EVOLUTION_API_BASE_URL", "EVOLUTION_API_KEY", "EVOLUTION_INSTANCE_NAME"].filter(
     (secret) => !input.secrets[secret],
@@ -573,6 +594,7 @@ export async function getEvolutionStatus(
 
   try {
     response = await fetcher(url, {
+      signal: AbortSignal.timeout(CHANNEL_STATUS_TIMEOUT_MS),
       method: "GET",
       headers: {
         apikey: input.secrets.EVOLUTION_API_KEY,
@@ -590,7 +612,7 @@ export async function getEvolutionStatus(
     };
   }
 
-  const payload = await readEvolutionResponseBody(response);
+  const payload = await readEvolutionResponseBody(response).catch(() => null);
 
   if (!response.ok) {
     return {
@@ -1160,64 +1182,15 @@ function validateEvolutionBaseUrl(baseUrl: string): string {
 
   const host = parsed.hostname.toLowerCase();
 
-  if (isBlockedHost(host)) {
+  if (isBlockedOutboundHost(host)) {
     throw new Error("EVOLUTION_API_BASE_URL must be a public HTTPS origin.");
   }
 
   return parsed.origin;
 }
 
-function isBlockedHost(host: string): boolean {
-  return (
-    host === "localhost" ||
-    host === "metadata.google.internal" ||
-    host.endsWith(".localhost") ||
-    host.endsWith(".local") ||
-    host.endsWith(".internal") ||
-    isBlockedIpv4(host) ||
-    isBlockedIpv6(host)
-  );
-}
 
-function isBlockedIpv4(host: string): boolean {
-  const match = host.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/);
 
-  if (!match) {
-    return false;
-  }
-
-  const parts = match.slice(1).map((part) => Number(part));
-
-  if (parts.some((part) => !Number.isInteger(part) || part < 0 || part > 255)) {
-    return true;
-  }
-
-  const [a, b] = parts;
-
-  return (
-    a === 0 ||
-    a === 10 ||
-    a === 127 ||
-    (a === 100 && b >= 64 && b <= 127) ||
-    (a === 169 && b === 254) ||
-    (a === 172 && b >= 16 && b <= 31) ||
-    (a === 192 && b === 168) ||
-    (a === 198 && (b === 18 || b === 19)) ||
-    a >= 224
-  );
-}
-
-function isBlockedIpv6(host: string): boolean {
-  const normalized = host.replace(/^\[/, "").replace(/\]$/, "").toLowerCase();
-
-  return (
-    normalized === "::1" ||
-    normalized === "::" ||
-    normalized.startsWith("fc") ||
-    normalized.startsWith("fd") ||
-    normalized.startsWith("fe80:")
-  );
-}
 
 function readRecord(record: Record<string, unknown>, key: string): Record<string, unknown> {
   const value = record[key];

package/src/runtime/channels/whatsapp-uazapi.ts

@@ -12,9 +12,19 @@ import type {
   WebhookVerificationResult,
 } from "../channels";
 import { AgentKitError } from "../errors";
+import {
+  CHANNEL_DOWNLOAD_TIMEOUT_MS,
+  CHANNEL_SEND_TIMEOUT_MS,
+  CHANNEL_STATUS_TIMEOUT_MS,
+  classifySendRequestError,
+  isRetryableReadRequestError,
+} from "./provider-fetch";
+import { createPublicHttpsFetch, isBlockedOutboundHost } from "./net-guard";
 
 type UazapiFetch = (url: string, init?: RequestInit) => Promise<Response>;
 
+const uazapiFetch: UazapiFetch = createPublicHttpsFetch("UAZAPI_BASE_URL");
+
 type UazapiSendTextRequest = {
   method: "POST";
   url: string;
@@ -195,7 +205,7 @@ export function buildUazapiSendTextRequest(input: ChannelSendInput): UazapiSendT
 
 export async function sendUazapiMessage(
   input: ChannelSendInput,
-  fetcher: UazapiFetch = fetch,
+  fetcher: UazapiFetch = uazapiFetch,
 ): Promise<ChannelSendResult> {
   if (input.secrets.AGENTKIT_CHANNEL_SEND_DRY_RUN === "1") {
     const request = buildUazapiSendTextRequest(input);
@@ -243,6 +253,7 @@ export async function sendUazapiMessage(
 
   try {
     response = await fetcher(actualRequest.url, {
+      signal: AbortSignal.timeout(CHANNEL_SEND_TIMEOUT_MS),
       method: actualRequest.method,
       headers: {
         token,
@@ -252,13 +263,14 @@ export async function sendUazapiMessage(
       body: JSON.stringify(actualRequest.body),
     });
   } catch (error) {
+    const failure = classifySendRequestError(error);
     const message = redactString(error instanceof Error ? error.message : String(error), [token, baseUrl]);
 
     return {
       ok: false,
-      retryable: true,
-      code: "channel_provider_unavailable",
-      message: `UAZAPI sendText request failed before a response: ${message}`,
+      retryable: failure.retryable,
+      code: failure.code,
+      message: `UAZAPI sendText request ${failure.reason}: ${message}`,
       providerRequestId: request.idempotencyKey,
       providerMetadata: {
         method: request.method,
@@ -268,7 +280,7 @@ export async function sendUazapiMessage(
     };
   }
 
-  const payload = await readUazapiResponseBody(response);
+  const payload = await readUazapiResponseBody(response).catch(() => null);
   const redactedPayload = redactValue(payload, [token, baseUrl]);
   const messageId = readUazapiProviderMessageId(payload);
 
@@ -320,7 +332,7 @@ export async function sendUazapiMessage(
 
 export async function downloadUazapiMedia(
   input: ChannelMediaDownloadInput,
-  fetcher: UazapiFetch = fetch,
+  fetcher: UazapiFetch = uazapiFetch,
 ): Promise<ChannelMediaDownloadResult> {
   const token = input.secrets.UAZAPI_TOKEN;
   const baseUrl = input.secrets.UAZAPI_BASE_URL;
@@ -362,6 +374,7 @@ export async function downloadUazapiMedia(
 
   try {
     response = await fetcher(url, {
+      signal: AbortSignal.timeout(CHANNEL_DOWNLOAD_TIMEOUT_MS),
       method: "POST",
       headers: {
         token,
@@ -379,7 +392,7 @@ export async function downloadUazapiMedia(
   } catch (error) {
     return {
       ok: false,
-      retryable: true,
+      retryable: isRetryableReadRequestError(error),
       code: "channel_provider_unavailable",
       message: `UAZAPI media download failed before a response: ${redactString(
         error instanceof Error ? error.message : String(error),
@@ -408,7 +421,15 @@ export async function downloadUazapiMedia(
       };
     }
 
-    throw error;
+    return {
+      ok: false,
+      retryable: true,
+      code: "channel_provider_unavailable",
+      message: `UAZAPI media download response could not be read: ${error instanceof Error ? error.message : String(error)}`,
+      providerMetadata: {
+        status: response.status,
+      },
+    };
   }
 
   if (!response.ok) {
@@ -511,7 +532,7 @@ export async function downloadUazapiMedia(
 
 export async function getUazapiStatus(
   input: ChannelStatusInput,
-  fetcher: UazapiFetch = fetch,
+  fetcher: UazapiFetch = uazapiFetch,
 ): Promise<ChannelStatusResult> {
   const missingSecrets = ["UAZAPI_BASE_URL", "UAZAPI_TOKEN", "UAZAPI_WEBHOOK_TOKEN"].filter(
     (secret) => !input.secrets[secret],
@@ -541,6 +562,7 @@ export async function getUazapiStatus(
 
   try {
     response = await fetcher(url, {
+      signal: AbortSignal.timeout(CHANNEL_STATUS_TIMEOUT_MS),
       method: "GET",
       headers: {
         token: input.secrets.UAZAPI_TOKEN,
@@ -558,7 +580,7 @@ export async function getUazapiStatus(
     };
   }
 
-  const payload = await readUazapiResponseBody(response);
+  const payload = await readUazapiResponseBody(response).catch(() => null);
 
   if (!response.ok) {
     return {
@@ -1034,7 +1056,7 @@ function validateUazapiBaseUrl(rawBaseUrl: string): string {
     throw new Error("UAZAPI_BASE_URL must not include credentials.");
   }
 
-  if (isBlockedHostname(url.hostname)) {
+  if (isBlockedOutboundHost(url.hostname)) {
     throw new Error("UAZAPI_BASE_URL host is not allowed.");
   }
 
@@ -1045,165 +1067,12 @@ function validateUazapiBaseUrl(rawBaseUrl: string): string {
   return url.href.replace(/\/$/, "");
 }
 
-function isBlockedHostname(hostname: string): boolean {
-  const host = normalizeUrlHostname(hostname);
-
-  if (
-    host === "localhost" ||
-    host.endsWith(".localhost") ||
-    host === "metadata.google.internal" ||
-    host === "169.254.169.254"
-  ) {
-    return true;
-  }
 
-  const ipv4 = parseIpv4Octets(host);
 
-  if (ipv4) {
-    return isBlockedIpv4Octets(ipv4);
-  }
 
-  if (host.includes(":")) {
-    return isBlockedIpv6Hostname(host);
-  }
-
-  return false;
-}
-
-function normalizeUrlHostname(hostname: string): string {
-  const host = hostname.toLowerCase().replace(/\.$/, "");
-  return host.startsWith("[") && host.endsWith("]") ? host.slice(1, -1) : host;
-}
 
-function isBlockedIpv4Octets(parts: number[]): boolean {
-  const [a, b] = parts;
 
-  return (
-    a === 10 ||
-    a === 127 ||
-    (a === 169 && b === 254) ||
-    (a === 172 && b !== undefined && b >= 16 && b <= 31) ||
-    (a === 192 && b === 168) ||
-    a === 0
-  );
-}
-
-function isBlockedIpv6Hostname(host: string): boolean {
-  if (host.includes("%")) {
-    return true;
-  }
-
-  const segments = parseIpv6Segments(host);
-
-  if (!segments) {
-    return false;
-  }
-
-  const first = segments[0] ?? 0;
-  const isUnspecified = segments.every((segment) => segment === 0);
-  const isLoopback = segments.slice(0, 7).every((segment) => segment === 0) && segments[7] === 1;
-  const isUniqueLocal = (first & 0xfe00) === 0xfc00;
-  const isLinkLocal = (first & 0xffc0) === 0xfe80;
-  const isIpv4Mapped = segments.slice(0, 5).every((segment) => segment === 0) && segments[5] === 0xffff;
-  const isIpv4Compatible = segments.slice(0, 6).every((segment) => segment === 0) && (segments[6] !== 0 || segments[7] !== 0);
-
-  if (isUnspecified || isLoopback || isUniqueLocal || isLinkLocal) {
-    return true;
-  }
-
-  if (isIpv4Mapped || isIpv4Compatible) {
-    return isBlockedIpv4Octets([
-      (segments[6] >> 8) & 255,
-      segments[6] & 255,
-      (segments[7] >> 8) & 255,
-      segments[7] & 255,
-    ]);
-  }
-
-  return false;
-}
-
-function parseIpv6Segments(host: string): number[] | undefined {
-  if (!host.includes(":")) {
-    return undefined;
-  }
 
-  if ((host.match(/::/g) ?? []).length > 1) {
-    return undefined;
-  }
-
-  const [left = "", right = ""] = host.split("::");
-  const leftSegments = parseIpv6SegmentSide(left);
-  const rightSegments = parseIpv6SegmentSide(right);
-
-  if (!leftSegments || !rightSegments) {
-    return undefined;
-  }
-
-  if (!host.includes("::")) {
-    return leftSegments.length === 8 ? leftSegments : undefined;
-  }
-
-  const missing = 8 - leftSegments.length - rightSegments.length;
-
-  if (missing < 1) {
-    return undefined;
-  }
-
-  return [...leftSegments, ...Array.from({ length: missing }, () => 0), ...rightSegments];
-}
-
-function parseIpv6SegmentSide(value: string): number[] | undefined {
-  if (!value) {
-    return [];
-  }
-
-  const parts = value.split(":");
-  const segments: number[] = [];
-
-  for (const [index, part] of parts.entries()) {
-    if (!part) {
-      return undefined;
-    }
-
-    if (part.includes(".")) {
-      if (index !== parts.length - 1) {
-        return undefined;
-      }
-
-      const ipv4 = parseIpv4Octets(part);
-
-      if (!ipv4) {
-        return undefined;
-      }
-
-      segments.push((ipv4[0] << 8) | ipv4[1], (ipv4[2] << 8) | ipv4[3]);
-      continue;
-    }
-
-    if (!/^[0-9a-f]{1,4}$/i.test(part)) {
-      return undefined;
-    }
-
-    segments.push(Number.parseInt(part, 16));
-  }
-
-  return segments;
-}
-
-function parseIpv4Octets(host: string): number[] | undefined {
-  if (!/^\d+\.\d+\.\d+\.\d+$/.test(host)) {
-    return undefined;
-  }
-
-  const parts = host.split(".").map(Number);
-
-  if (parts.some((part) => !Number.isInteger(part) || part < 0 || part > 255)) {
-    return undefined;
-  }
-
-  return parts;
-}
 
 function stripWhatsappJid(value: string): string {
   return value

package/src/runtime/channels/whatsapp-zapster.ts

@@ -9,6 +9,12 @@ import type {
   WebhookVerificationResult,
 } from "../channels";
 import { AgentKitError } from "../errors";
+import {
+  CHANNEL_DOWNLOAD_TIMEOUT_MS,
+  CHANNEL_SEND_TIMEOUT_MS,
+  classifySendRequestError,
+  isRetryableReadRequestError,
+} from "./provider-fetch";
 
 export const zapsterWhatsappChannelAdapter: ChannelAdapter = {
   type: "whatsapp",
@@ -364,6 +370,7 @@ export async function sendZapsterMessage(
 
   try {
     response = await fetcher(actualRequest.url, {
+      signal: AbortSignal.timeout(CHANNEL_SEND_TIMEOUT_MS),
       method: actualRequest.method,
       headers: {
         Authorization: `Bearer ${apiKey}`,
@@ -373,13 +380,14 @@ export async function sendZapsterMessage(
       body: JSON.stringify(actualRequest.body),
     });
   } catch (error) {
+    const failure = classifySendRequestError(error);
     const errorMessage = redactString(error instanceof Error ? error.message : String(error), [apiKey, instanceId]);
 
     return {
       ok: false,
-      retryable: true,
-      code: "channel_provider_unavailable",
-      message: `Zapster sendMessage request failed before a response: ${errorMessage}`,
+      retryable: failure.retryable,
+      code: failure.code,
+      message: `Zapster sendMessage request ${failure.reason}: ${errorMessage}`,
       providerRequestId: request.idempotencyKey,
       providerMetadata: {
         method: request.method,
@@ -476,6 +484,7 @@ export async function downloadZapsterMedia(
 
   try {
     response = await fetcher(mediaUrl.url, {
+      signal: AbortSignal.timeout(CHANNEL_DOWNLOAD_TIMEOUT_MS),
       method: "GET",
       headers: {
         Authorization: `Bearer ${apiKey}`,
@@ -484,7 +493,7 @@ export async function downloadZapsterMedia(
   } catch (error) {
     return {
       ok: false,
-      retryable: true,
+      retryable: isRetryableReadRequestError(error),
       code: "channel_provider_unavailable",
       message: `Zapster media download failed before a response: ${redactString(
         error instanceof Error ? error.message : String(error),
@@ -591,8 +600,8 @@ async function readResponseBytesWithLimit(
     }
   | {
       ok: false;
-      retryable: false;
-      code: "channel_audio_too_large";
+      retryable: boolean;
+      code: "channel_audio_too_large" | "channel_provider_unavailable";
       message: string;
       providerMetadata?: Record<string, unknown>;
     }
@@ -613,7 +622,18 @@ async function readResponseBytesWithLimit(
   }
 
   if (!response.body) {
-    const audio = new Uint8Array(await response.arrayBuffer());
+    let audio: Uint8Array;
+
+    try {
+      audio = new Uint8Array(await response.arrayBuffer());
+    } catch (error) {
+      return {
+        ok: false,
+        retryable: true,
+        code: "channel_provider_unavailable",
+        message: `Media download response could not be read: ${error instanceof Error ? error.message : String(error)}`,
+      };
+    }
 
     if (audio.byteLength > maxBytes) {
       return {
@@ -659,6 +679,14 @@ async function readResponseBytesWithLimit(
 
       chunks.push(chunk.value);
     }
+  } catch (error) {
+    await reader.cancel().catch(() => undefined);
+    return {
+      ok: false,
+      retryable: true,
+      code: "channel_provider_unavailable",
+      message: `Media download response could not be read: ${error instanceof Error ? error.message : String(error)}`,
+    };
   } finally {
     reader.releaseLock();
   }

package/src/runtime/chat.ts

@@ -6,9 +6,8 @@ import type { ConversationRecord, ConversationSummary, PersistedChatRun } from "
 import type { LoadedAgentCapsule } from "./config";
 import { loadAgentCapsule } from "./config";
 import { openPreparedCapsuleStore } from "./database";
-import { loadCapsuleEnv } from "./env";
+import { collectSecretValues, loadCapsuleEnv } from "./env";
 import { AgentKitError, isAgentKitError } from "./errors";
-import { createManagedComposioTools } from "./integrations/composio";
 import { syncConfiguredKnowledgeSources } from "./knowledge/ingest";
 import { appendKnowledgePromptPolicy } from "./knowledge/prompt-policy";
 import { createKnowledgeSearchTool } from "./knowledge/tool";
@@ -46,6 +45,7 @@ export async function runAgentMessage(
 
   const adapter = getProviderAdapter(capsule.config.provider);
   const env = await loadCapsuleEnv(capsule.root);
+  const secretValues = collectSecretValues(capsule.config, env);
   await syncConfiguredKnowledgeSources(capsule);
   const conversationId = normalizeConversationId(options.conversationId);
   const { store } = await openPreparedCapsuleStore(capsule);
@@ -81,6 +81,7 @@ export async function runAgentMessage(
       runId: run.id,
       conversationId: conversation.id,
       env,
+      secretValues,
       signal: options.signal,
       clock,
       runtime: {
@@ -140,6 +141,7 @@ export async function runAgentMessage(
         status: "failed",
         errorCode: isAgentKitError(error) ? error.code : "runtime_error",
         errorMessage: error instanceof Error ? error.message : String(error),
+        secretValues,
       });
     }
 
@@ -150,7 +152,7 @@ export async function runAgentMessage(
 }
 
 function withKnowledgeTools(capsule: LoadedAgentCapsule): NonNullable<LoadedAgentCapsule["config"]["tools"]> {
-  const tools = [...createManagedComposioTools(capsule.config), ...(capsule.config.tools ?? [])];
+  const tools = capsule.config.tools ?? [];
   const knowledgeTool = createKnowledgeSearchTool(capsule);
 
   if (knowledgeTool) {