@agentskit/adapters 0.12.2 → 0.13.2

package/dist/createAdapter.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/createAdapter.ts"],"names":[],"mappings":";;;AAGO,SAAS,cAAc,MAAA,EAA6C;AACzE,EAAA,OAAO;AAAA,IACL,YAAA,EAAc,CAAC,OAAA,MAA2C;AAAA,MACxD,QAAQ,mBAAuD;AAC7D,QAAA,IAAI;AACF,UAAA,MAAM,MAAA,GAAS,MAAM,MAAA,CAAO,IAAA,CAAK,OAAO,CAAA;AACxC,UAAA,MAAM,MAAA,GAAS,MAAA,YAAkB,QAAA,GAC7B,MAAA,CAAO,IAAA,GACP,MAAA;AACJ,UAAA,OAAO,MAAA,CAAO,MAAM,MAAM,CAAA;AAAA,QAC5B,SAAS,GAAA,EAAK;AACZ,UAAA,MAAM;AAAA,YACJ,IAAA,EAAM,OAAA;AAAA,YACN,SAAS,GAAA,YAAe,KAAA,GAAQ,GAAA,CAAI,OAAA,GAAU,OAAO,GAAG;AAAA,WAC1D;AAAA,QACF;AAAA,MACF,CAAA;AAAA,MACA,OAAO,MAAM;AACX,QAAA,MAAA,CAAO,KAAA,IAAQ;AAAA,MACjB;AAAA,KACF;AAAA,GACF;AACF","file":"createAdapter.cjs","sourcesContent":["import type { AdapterFactory, AdapterRequest, StreamChunk, StreamSource } from '@agentskit/core'\nimport type { CreateAdapterConfig } from './types'\n\nexport function createAdapter(config: CreateAdapterConfig): AdapterFactory {\n  return {\n    createSource: (request: AdapterRequest): StreamSource => ({\n      stream: async function* (): AsyncIterableIterator<StreamChunk> {\n        try {\n          const result = await config.send(request)\n          const stream = result instanceof Response\n            ? result.body!\n            : result\n          yield* config.parse(stream)\n        } catch (err) {\n          yield {\n            type: 'error',\n            content: err instanceof Error ? err.message : String(err),\n          }\n        }\n      },\n      abort: () => {\n        config.abort?.()\n      },\n    }),\n  }\n}\n"]}

package/dist/createAdapter.d.cts

@@ -0,0 +1,2 @@
+import '@agentskit/core';
+export { c as createAdapter } from './createAdapter-Dfnf3Iio.cjs';

package/dist/createAdapter.d.ts

@@ -0,0 +1,2 @@
+import '@agentskit/core';
+export { c as createAdapter } from './createAdapter-Dfnf3Iio.js';

package/dist/createAdapter.js

@@ -0,0 +1,3 @@
+export { createAdapter } from './chunk-6FPLWOVE.js';
+//# sourceMappingURL=createAdapter.js.map
+//# sourceMappingURL=createAdapter.js.map

package/dist/createAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"createAdapter.js"}

package/dist/index.cjs

@@ -401,8 +401,10 @@ function createStreamSource(doFetch, parse, errorLabel, retry) {
   let abortController = new AbortController();
   return {
     stream: async function* () {
+      const controller = abortController;
+      if (!controller) return;
       try {
-        const response = await fetchWithRetry(doFetch, abortController.signal, retry ?? {});
+        const response = await fetchWithRetry(doFetch, controller.signal, retry ?? {});
         if (!response.ok || !response.body) {
           yield { type: "error", content: `${errorLabel} error: ${response.status}` };
           return;
@@ -442,8 +444,10 @@ function simulateStream(doFetch, extractText, errorLabel, options = {}) {
   let abortController = new AbortController();
   return {
     stream: async function* () {
+      const controller = abortController;
+      if (!controller) return;
       try {
-        const response = await fetchWithRetry(doFetch, abortController.signal, retry ?? {});
+        const response = await fetchWithRetry(doFetch, controller.signal, retry ?? {});
         if (!response.ok) {
           yield { type: "error", content: `${errorLabel} error: ${response.status}` };
           return;
@@ -455,7 +459,7 @@ function simulateStream(doFetch, extractText, errorLabel, options = {}) {
           if (delayMs > 0) {
             await new Promise((resolve2, reject) => {
               const timer = setTimeout(resolve2, delayMs);
-              abortController?.signal.addEventListener(
+              controller.signal.addEventListener(
                 "abort",
                 () => {
                   clearTimeout(timer);
@@ -529,7 +533,15 @@ function anthropic(config) {
 // src/openai.ts
 function openai(config) {
   const { apiKey, model, baseUrl = "https://api.openai.com", retry } = config;
-  const includeUsage = config.includeUsage ?? baseUrl.startsWith("https://api.openai.com");
+  const apiRoot = baseUrl.replace(/\/v1\/?$/, "");
+  const isCanonicalOpenAI = (() => {
+    try {
+      return new URL(baseUrl).host === "api.openai.com";
+    } catch {
+      return false;
+    }
+  })();
+  const includeUsage = config.includeUsage ?? isCanonicalOpenAI;
   return {
     capabilities: {
       streaming: true,
@@ -558,7 +570,7 @@ function openai(config) {
       };
       if (includeUsage) body.stream_options = { include_usage: true };
       return createStreamSource(
-        (signal) => fetch(`${baseUrl}/v1/chat/completions`, {
+        (signal) => fetch(`${apiRoot}/v1/chat/completions`, {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
@@ -586,15 +598,13 @@ function gemini(config) {
       usage: true
     },
     createSource: (request) => {
+      const systemMessage = request.messages.find((message) => message.role === "system");
       const body = {
         contents: request.messages.filter((message) => message.role !== "system").map((message) => ({
           role: message.role === "assistant" ? "model" : "user",
           parts: [{ text: message.content }]
         })),
-        systemInstruction: request.messages.find((message) => message.role === "system") ? {
-          role: "system",
-          parts: [{ text: request.messages.find((message) => message.role === "system").content }]
-        } : void 0
+        systemInstruction: systemMessage ? { role: "system", parts: [{ text: systemMessage.content }] } : void 0
       };
       return createStreamSource(
         (signal) => fetch(
@@ -1060,15 +1070,13 @@ function vertex(config) {
       reasoning: model.includes("pro")
     },
     createSource: (request) => {
+      const systemMessage = request.messages.find((message) => message.role === "system");
       const body = {
         contents: request.messages.filter((message) => message.role !== "system").map((message) => ({
           role: message.role === "assistant" ? "model" : "user",
           parts: [{ text: message.content }]
         })),
-        systemInstruction: request.messages.find((message) => message.role === "system") ? {
-          role: "system",
-          parts: [{ text: request.messages.find((message) => message.role === "system").content }]
-        } : void 0,
+        systemInstruction: systemMessage ? { role: "system", parts: [{ text: systemMessage.content }] } : void 0,
         tools: request.context?.tools && request.context.tools.length > 0 ? [{
           functionDeclarations: request.context.tools.map((tool) => ({
             name: tool.name,
@@ -1364,8 +1372,28 @@ function pickSyncPolicy(pool, policy) {
     const c = pool.reduce((best, x) => (x.latencyMs ?? Infinity) < (best.latencyMs ?? Infinity) ? x : best, pool[0]);
     return { c, reason: "fastest" };
   }
+  if (policy === "greenest") {
+    const c = pool.reduce((best, x) => (x.gCO2PerKtok ?? Infinity) < (best.gCO2PerKtok ?? Infinity) ? x : best, pool[0]);
+    return { c, reason: "greenest" };
+  }
+  if (policy === "green-cost") {
+    const carbonValues = pool.map((p) => p.gCO2PerKtok).filter((v) => v != null);
+    const costValues = pool.map((p) => p.cost).filter((v) => v != null);
+    const maxC = Math.max(1, ...carbonValues);
+    const maxCost = Math.max(1, ...costValues);
+    const score = (x) => {
+      const carbon = (x.gCO2PerKtok ?? maxC / 2) / maxC;
+      const cost = (x.cost ?? maxCost / 2) / maxCost;
+      return carbon + cost;
+    };
+    const c = pool.reduce((best, x) => score(x) < score(best) ? x : best, pool[0]);
+    return { c, reason: "green-cost" };
+  }
   return { c: pool[0], reason: "capability-match" };
 }
+function matchesRegion(candidate, region) {
+  return region === void 0 || candidate.region === region;
+}
 function createRouter(options) {
   const { candidates } = options;
   if (candidates.length === 0) {
@@ -1379,22 +1407,31 @@ function createRouter(options) {
   return {
     createSource: (request) => {
       const need = requireCapabilities(request);
+      const region = options.regionOf?.(request) ?? options.region;
       const capable = candidates.filter((c2) => matchesCapabilities(need, c2.capabilities ?? c2.adapter.capabilities));
+      const eligible = capable.filter((c2) => matchesRegion(c2, region));
+      if (capable.length > 0 && eligible.length === 0 && region !== void 0) {
+        throw new core.ConfigError({
+          code: core.ErrorCodes.AK_CONFIG_INVALID,
+          message: `no candidate satisfies required region: ${region}`,
+          hint: "Set candidate.region to the requested data-residency region, or remove the router region requirement."
+        });
+      }
       const classified = options.classify?.(request);
       if (typeof classified === "string") {
-        const c2 = capable.find((x) => x.id === classified);
+        const c2 = eligible.find((x) => x.id === classified);
         if (c2) {
-          options.onRoute?.({ id: c2.id, reason: "classify:id", request });
+          options.onRoute?.({ id: c2.id, reason: region ? `classify:id:${region}` : "classify:id", request });
           return c2.adapter.createSource(request);
         }
       }
-      let pool = capable;
+      let pool = eligible;
       let pickedBy;
       if (Array.isArray(classified) && classified.length > 0) {
-        const filtered = capable.filter((c2) => c2.tags && classified.every((t) => c2.tags.includes(t)));
+        const filtered = eligible.filter((c2) => c2.tags && classified.every((t) => c2.tags.includes(t)));
         if (filtered.length > 0) {
           pool = filtered;
-          pickedBy = "classify:tags";
+          pickedBy = region ? `classify:tags:${region}` : "classify:tags";
         }
       }
       if (pool.length === 0) {
@@ -1442,6 +1479,57 @@ function createRouter(options) {
     }
   };
 }
+
+// src/carbon.ts
+var DEFAULT_CARBON_TABLE = {
+  // Anthropic — primarily AWS us-east-* / eu-west-* via Bedrock-style fronts.
+  "anthropic:us-east-1": 0.42,
+  "anthropic:us-west-2": 0.18,
+  "anthropic:eu-central-1": 0.32,
+  "anthropic:eu-west-1": 0.27,
+  // OpenAI — Azure East US / West Europe / Sweden Central.
+  "openai:eastus": 0.4,
+  "openai:westus3": 0.19,
+  "openai:swedencentral": 0.04,
+  "openai:westeurope": 0.28,
+  // Google (Vertex / Gemini) — typically reports lowest PUE.
+  "google:us-central1": 0.34,
+  "google:us-west1": 0.16,
+  "google:europe-west1": 0.21,
+  "google:europe-north1": 0.05,
+  // AWS Bedrock direct.
+  "aws:us-east-1": 0.42,
+  "aws:us-west-2": 0.18,
+  "aws:eu-west-1": 0.27,
+  // Local / on-device — only the device's grid matters.
+  "ollama:local": 0.3,
+  "webllm:browser": 0.3,
+  "lmstudio:local": 0.3,
+  // Self-hosted / community.
+  "groq:us-east-1": 0.4,
+  "fireworks:us-west-2": 0.18,
+  "together:us-east-1": 0.42,
+  "cerebras:us-west-2": 0.18
+};
+function defaultKey(candidate) {
+  if (!candidate.region) return void 0;
+  const provider = candidate.id.split(/[-:]/)[0];
+  return `${provider}:${candidate.region}`;
+}
+function applyCarbonTable(candidates, options = {}) {
+  const table = options.table ?? DEFAULT_CARBON_TABLE;
+  const keyFor = options.keyFor ?? defaultKey;
+  return candidates.map((c) => {
+    if (c.gCO2PerKtok != null) return c;
+    const key = keyFor(c);
+    const value = key ? table[key] : void 0;
+    return { ...c, gCO2PerKtok: value ?? options.fallback };
+  });
+}
+function estimateCO2Grams(gCO2PerKtok, tokens) {
+  if (gCO2PerKtok == null) return 0;
+  return tokens / 1e3 * gCO2PerKtok;
+}
 async function drain(source, timeoutMs) {
   const chunks = [];
   let text = "";
@@ -1580,26 +1668,36 @@ function createFallbackAdapter(candidates, options = {}) {
             }
             active = source;
             const iter = source.stream()[Symbol.asyncIterator]();
-            let first;
+            let firstReal;
+            let branchError;
             try {
-              first = await iter.next();
+              while (true) {
+                const r = await iter.next();
+                if (r.done) {
+                  branchError = new Error(`candidate ${candidate.id} emitted no chunks`);
+                  break;
+                }
+                if (r.value.type === "error") {
+                  branchError = new Error(
+                    `candidate ${candidate.id}: ${r.value.content ?? "stream error"}`
+                  );
+                  break;
+                }
+                firstReal = r.value;
+                break;
+              }
             } catch (err) {
-              const error = err instanceof Error ? err : new Error(String(err));
-              errors.push({ id: candidate.id, error });
-              options.onFallback?.({ id: candidate.id, index: i, error });
-              if (options.shouldRetry && !options.shouldRetry(error, i)) throw error;
-              active = void 0;
-              continue;
+              branchError = err instanceof Error ? err : new Error(String(err));
             }
-            if (first.done) {
-              const error = new Error(`candidate ${candidate.id} emitted no chunks`);
+            if (branchError || !firstReal) {
+              const error = branchError ?? new Error(`candidate ${candidate.id} emitted no chunks`);
               errors.push({ id: candidate.id, error });
               options.onFallback?.({ id: candidate.id, index: i, error });
               if (options.shouldRetry && !options.shouldRetry(error, i)) throw error;
               active = void 0;
               continue;
             }
-            yield first.value;
+            yield firstReal;
             while (true) {
               const next = await iter.next();
               if (next.done) return;
@@ -1712,16 +1810,23 @@ function replayAdapter(fixture) {
   });
 }
 
+// src/embedders/shared.ts
+var ERROR_BODY_PREVIEW_CHARS = 200;
+async function throwIfNotOk(response, label, url) {
+  if (response.ok) return;
+  const body = await response.text().catch(() => "");
+  throw new Error(
+    `HTTP ${response.status} from ${label} ${url}: ${body.slice(0, ERROR_BODY_PREVIEW_CHARS)}`
+  );
+}
+
 // src/embedders/openai.ts
 async function fetchAvailableModels(baseUrl, apiKey) {
   const url = `${baseUrl}/v1/models`;
   const response = await fetch(url, {
     headers: { "Authorization": `Bearer ${apiKey}` }
   });
-  if (!response.ok) {
-    const body = await response.text().catch(() => "");
-    throw new Error(`HTTP ${response.status} from ${url}: ${body.slice(0, 200)}`);
-  }
+  await throwIfNotOk(response, "openai", url);
   const data = await response.json();
   return data.data.map((m) => m.id).filter((id) => id.includes("embed")).sort();
 }
@@ -1763,10 +1868,7 @@ function openaiEmbedder(config) {
 async function fetchAvailableModels2(baseUrl, apiKey) {
   const url = `${baseUrl}/v1beta/models?key=${apiKey}`;
   const response = await fetch(url);
-  if (!response.ok) {
-    const body = await response.text().catch(() => "");
-    throw new Error(`HTTP ${response.status} from gemini ${baseUrl}/v1beta/models: ${body.slice(0, 200)}`);
-  }
+  await throwIfNotOk(response, "gemini", `${baseUrl}/v1beta/models`);
   const data = await response.json();
   return data.models.filter((m) => m.supportedGenerationMethods.includes("embedContent")).map((m) => m.name.replace("models/", "")).sort();
 }
@@ -1815,10 +1917,7 @@ function geminiEmbedder(config) {
 async function fetchAvailableModels3(baseUrl) {
   const url = `${baseUrl}/api/tags`;
   const response = await fetch(url);
-  if (!response.ok) {
-    const body = await response.text().catch(() => "");
-    throw new Error(`HTTP ${response.status} from ollama ${url}: ${body.slice(0, 200)}`);
-  }
+  await throwIfNotOk(response, "ollama", url);
   const data = await response.json();
   return data.models.map((m) => m.name).filter((name) => name.includes("embed")).sort();
 }
@@ -1852,21 +1951,18 @@ function ollamaEmbedder(config) {
     return data.embeddings[0];
   };
 }
-async function fetchAvailableModels4(baseUrl, apiKey) {
+async function fetchAvailableModels4(provider, baseUrl, apiKey) {
   const url = `${baseUrl}/v1/models`;
   const response = await fetch(url, {
     headers: { "Authorization": `Bearer ${apiKey}` }
   });
-  if (!response.ok) {
-    const body = await response.text().catch(() => "");
-    throw new Error(`HTTP ${response.status} from ${url}: ${body.slice(0, 200)}`);
-  }
+  await throwIfNotOk(response, provider, url);
   const data = await response.json();
   return data.data.map((m) => m.id).filter((id) => id.includes("embed")).sort();
 }
 async function buildModelError4(provider, baseUrl, apiKey, originalError) {
   try {
-    const models = await fetchAvailableModels4(baseUrl, apiKey);
+    const models = await fetchAvailableModels4(provider, baseUrl, apiKey);
     const list = models.length > 0 ? models.join(", ") : "none found";
     return new Error(
       `${provider} embedding failed: ${originalError}. Available embedding models: ${list}`
@@ -1915,8 +2011,95 @@ var grokEmbedder = createOpenAICompatibleEmbedder("Grok", "https://api.x.ai");
 
 // src/embedders/kimi.ts
 var kimiEmbedder = createOpenAICompatibleEmbedder("Kimi", "https://api.moonshot.ai");
+var DEFAULT_DEPRECATION_TABLE = [
+  // OpenAI
+  { provider: "openai", model: "gpt-3.5-turbo-0301", successor: "gpt-4o-mini", sunsetOn: "2024-09-13" },
+  { provider: "openai", model: "gpt-3.5-turbo-0613", successor: "gpt-4o-mini", sunsetOn: "2024-09-13" },
+  { provider: "openai", model: "gpt-4-0314", successor: "gpt-4o", sunsetOn: "2024-06-13" },
+  { provider: "openai", model: "gpt-4-32k", successor: "gpt-4o", sunsetOn: "2024-06-06" },
+  { provider: "openai", model: "text-davinci-003", successor: "gpt-4o-mini", sunsetOn: "2024-01-04" },
+  // Anthropic
+  { provider: "anthropic", model: "claude-2.0", successor: "claude-3-5-sonnet-latest", sunsetOn: "2025-07-21" },
+  { provider: "anthropic", model: "claude-2.1", successor: "claude-3-5-sonnet-latest", sunsetOn: "2025-07-21" },
+  { provider: "anthropic", model: "claude-instant-1.2", successor: "claude-3-5-haiku-latest", sunsetOn: "2024-07-22" },
+  { provider: "anthropic", model: "claude-3-sonnet-20240229", successor: "claude-3-5-sonnet-latest", sunsetOn: "2025-07-21" },
+  // Google
+  { provider: "google", model: "gemini-1.0-pro", successor: "gemini-1.5-pro", sunsetOn: "2025-02-15" },
+  { provider: "google", model: "gemini-pro-vision", successor: "gemini-1.5-pro", sunsetOn: "2024-07-12" }
+];
+function resolveModel(input, policy) {
+  const table = policy.table ?? DEFAULT_DEPRECATION_TABLE;
+  const hit = table.find((d) => d.provider === input.provider && d.model === input.model);
+  if (!hit) return { model: input.model, remapped: false };
+  const log = policy.logger ?? ((msg) => console.warn(msg));
+  const sunset = hit.sunsetOn ? ` (sunset ${hit.sunsetOn})` : "";
+  const successor = hit.successor ? ` Suggested successor: ${hit.successor}.` : "";
+  const base = `[agentskit] Model "${input.provider}:${input.model}" is deprecated${sunset}.${successor}`;
+  switch (policy.onDeprecation) {
+    case "fail":
+      throw new core.ConfigError({
+        code: core.ErrorCodes.AK_CONFIG_INVALID,
+        message: base,
+        hint: hit.successor ? `Set model to "${hit.successor}".` : "Pick a supported model from the provider."
+      });
+    case "remap": {
+      if (!hit.successor) {
+        throw new core.ConfigError({
+          code: core.ErrorCodes.AK_CONFIG_INVALID,
+          message: `${base} No successor available \u2014 cannot remap.`
+        });
+      }
+      log(`${base} Auto-remapping to "${hit.successor}".`);
+      return { model: hit.successor, remapped: true, deprecation: hit };
+    }
+    case "warn":
+    default:
+      log(base);
+      return { model: input.model, remapped: false, deprecation: hit };
+  }
+}
+function withDeprecationPolicy(factory, options) {
+  resolveModel({ provider: options.provider, model: options.model }, options);
+  return factory;
+}
+
+// src/credential-rotation.ts
+function createRotatingCredentials(initial, options) {
+  let value = initial;
+  const handlers = /* @__PURE__ */ new Set();
+  return {
+    current: () => value,
+    rotate: async (next) => {
+      value = next;
+      const event = {
+        rotatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        id: options.id,
+        fingerprint: next.slice(-4)
+      };
+      for (const h of handlers) h(event);
+      return next;
+    },
+    onRotate: (handler) => {
+      handlers.add(handler);
+      return () => handlers.delete(handler);
+    }
+  };
+}
+async function refreshCredentials(adapter, next, options) {
+  const log = options?.logger ?? ((msg) => console.log(msg));
+  if (adapter && typeof adapter === "object" && "refreshCredentials" in adapter && typeof adapter.refreshCredentials === "function") {
+    await adapter.refreshCredentials(next);
+    log(`[agentskit] credentials refreshed${options?.id ? ` (${options.id})` : ""}`);
+    return true;
+  }
+  log(`[agentskit] adapter does not support credential rotation; restart required${options?.id ? ` (${options.id})` : ""}`);
+  return false;
+}
 
+exports.DEFAULT_CARBON_TABLE = DEFAULT_CARBON_TABLE;
+exports.DEFAULT_DEPRECATION_TABLE = DEFAULT_DEPRECATION_TABLE;
 exports.anthropic = anthropic;
+exports.applyCarbonTable = applyCarbonTable;
 exports.azureOpenAI = azureOpenAI;
 exports.azureOpenAIAdapter = azureOpenAIAdapter;
 exports.bail = bail;
@@ -1932,9 +2115,11 @@ exports.createAdapter = createAdapter;
 exports.createEnsembleAdapter = createEnsembleAdapter;
 exports.createFallbackAdapter = createFallbackAdapter;
 exports.createOpenAICompatibleEmbedder = createOpenAICompatibleEmbedder;
+exports.createRotatingCredentials = createRotatingCredentials;
 exports.createRouter = createRouter;
 exports.deepseek = deepseek;
 exports.deepseekEmbedder = deepseekEmbedder;
+exports.estimateCO2Grams = estimateCO2Grams;
 exports.fetchWithRetry = fetchWithRetry;
 exports.fireworks = fireworks;
 exports.gemini = gemini;
@@ -1961,9 +2146,11 @@ exports.openaiEmbedder = openaiEmbedder;
 exports.openrouter = openrouter;
 exports.qwen = qwen;
 exports.recordingAdapter = recordingAdapter;
+exports.refreshCredentials = refreshCredentials;
 exports.replayAdapter = replayAdapter;
 exports.replicate = replicate;
 exports.replicateAdapter = replicateAdapter;
+exports.resolveModel = resolveModel;
 exports.simulateStream = simulateStream;
 exports.together = together;
 exports.vercelAI = vercelAI;
@@ -1972,5 +2159,6 @@ exports.vertexAdapter = vertexAdapter;
 exports.vllm = vllm;
 exports.webllm = webllm;
 exports.webllmAdapter = webllmAdapter;
+exports.withDeprecationPolicy = withDeprecationPolicy;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map