@yourgpt/llm-sdk 2.1.4-alpha.1 → 2.1.4-alpha.3

package/dist/index.js

@@ -553,6 +553,54 @@ function createMessage(partial) {
   };
 }
 
+// src/server/storage-helpers.ts
+function extractInputMessages(reqMessages) {
+  if (!reqMessages?.length) return [];
+  let lastMeaningful = null;
+  for (let i = reqMessages.length - 1; i >= 0; i--) {
+    const m = reqMessages[i];
+    if (m.role === "assistant" && (!m.content || m.content === "")) continue;
+    lastMeaningful = m;
+    break;
+  }
+  if (!lastMeaningful) return [];
+  if (lastMeaningful.role === "user") {
+    const textContent = typeof lastMeaningful.content === "string" ? lastMeaningful.content : JSON.stringify(lastMeaningful.content);
+    const attachments = lastMeaningful.attachments;
+    const imageAtt = attachments?.find((a) => a.type === "image" && a.url);
+    const fileAtt = attachments?.find((a) => a.type === "file" && a.url);
+    const msg = { role: "user", content: textContent || "" };
+    if (imageAtt?.url) {
+      msg.contentType = "image";
+      msg.url = imageAtt.url;
+    } else if (fileAtt?.url) {
+      msg.contentType = "file";
+      msg.url = fileAtt.url;
+    }
+    return [msg];
+  }
+  if (lastMeaningful.role === "tool" || lastMeaningful.role === "function") {
+    const msgs = reqMessages;
+    const lastAssistantIdx = msgs.map((m) => m.role).lastIndexOf("assistant");
+    return msgs.slice(lastAssistantIdx + 1).filter(
+      (m) => !(m.role === "assistant" && (!m.content || m.content === ""))
+    ).map((m) => ({
+      role: m.role,
+      content: typeof m.content === "string" ? m.content : JSON.stringify(m.content),
+      toolCallId: m.tool_call_id
+    }));
+  }
+  return [];
+}
+function mapOutputMessages(resultMessages) {
+  return resultMessages.map((m) => ({
+    role: m.role,
+    content: m.content ?? "",
+    toolCalls: m.tool_calls,
+    toolCallId: m.tool_call_id
+  }));
+}
+
 // src/server/streaming.ts
 function createSSEHeaders() {
   return {
@@ -951,6 +999,7 @@ var StreamResult = class {
       toolCalls: [],
       requiresAction: false,
       usage: void 0,
+      threadId: void 0,
       events: []
     };
   }
@@ -996,6 +1045,9 @@ var StreamResult = class {
           this.capturedUsage = event.usage;
           collected.usage = event.usage;
         }
+        if (event.threadId) {
+          collected.threadId = event.threadId;
+        }
         break;
     }
   }
@@ -1008,6 +1060,7 @@ var StreamResult = class {
         const usage = this.capturedUsage;
         await this.onFinishCallback({
           messages: collected.messages,
+          threadId: collected.threadId,
           usage: usage ? {
             promptTokens: usage.prompt_tokens,
             completionTokens: usage.completion_tokens,
@@ -1495,6 +1548,7 @@ var Runtime = class {
     this.actions = /* @__PURE__ */ new Map();
     this.tools = /* @__PURE__ */ new Map();
     this.config = config;
+    this.storage = config.storage;
     if ("provider" in config && config.provider) {
       this.adapter = config.provider.languageModel(config.model);
     } else if ("adapter" in config && config.adapter) {
@@ -2744,8 +2798,67 @@ var Runtime = class {
    * ```
    */
   stream(request, options) {
-    const generator = this.processChatWithLoop(request, options?.signal);
-    return new StreamResult(generator, { onFinish: options?.onFinish });
+    const storage = this.storage;
+    if (!storage) {
+      const generator = this.processChatWithLoop(request, options?.signal);
+      return new StreamResult(generator, { onFinish: options?.onFinish });
+    }
+    let resolvedThreadId = request.threadId;
+    const self = this;
+    let storageHealthy = true;
+    async function* storageWrappedGenerator() {
+      if (!resolvedThreadId) {
+        try {
+          const session = await storage.createSession();
+          resolvedThreadId = session.id;
+        } catch (err) {
+          console.error(
+            "[Runtime] storage.createSession failed \u2014 generating fallback threadId:",
+            err
+          );
+          resolvedThreadId = `local_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+          storageHealthy = false;
+        }
+      }
+      if (resolvedThreadId && storageHealthy) {
+        try {
+          const inputMsgs = extractInputMessages(request.messages);
+          if (inputMsgs.length) {
+            await storage.saveMessages(resolvedThreadId, inputMsgs);
+          }
+        } catch (err) {
+          console.error("[Runtime] storage.saveMessages (input) failed:", err);
+        }
+      }
+      for await (const event of self.processChatWithLoop(
+        request,
+        options?.signal
+      )) {
+        if (event.type === "done" && resolvedThreadId) {
+          yield { ...event, threadId: resolvedThreadId };
+        } else {
+          yield event;
+        }
+      }
+    }
+    return new StreamResult(storageWrappedGenerator(), {
+      onFinish: async (result) => {
+        if (resolvedThreadId && storageHealthy && result.messages.length > 0) {
+          try {
+            const outputMsgs = mapOutputMessages(result.messages);
+            await storage.saveMessages(resolvedThreadId, outputMsgs);
+          } catch (err) {
+            console.error(
+              "[Runtime] storage.saveMessages (output) failed:",
+              err
+            );
+          }
+        }
+        if (options?.onFinish) {
+          await options.onFinish({ ...result, threadId: resolvedThreadId });
+        }
+      }
+    });
   }
   /**
    * Chat and collect the full response (non-streaming)
@@ -3703,6 +3816,7 @@ exports.createSSEResponse = createSSEResponse;
 exports.createStreamResult = createStreamResult;
 exports.createTextStreamHeaders = createTextStreamHeaders;
 exports.createTextStreamResponse = createTextStreamResponse;
+exports.extractInputMessages = extractInputMessages;
 exports.formatSSEData = formatSSEData;
 exports.formatToolsForAnthropic = formatToolsForAnthropic;
 exports.formatToolsForGoogle = formatToolsForGoogle;
@@ -3711,6 +3825,7 @@ exports.generateMessageId = generateMessageId;
 exports.generateText = generateText;
 exports.generateThreadId = generateThreadId;
 exports.generateToolCallId = generateToolCallId;
+exports.mapOutputMessages = mapOutputMessages;
 exports.pipeSSEToResponse = pipeSSEToResponse;
 exports.pipeTextToResponse = pipeTextToResponse;
 exports.runAgentLoop = runAgentLoop;

package/dist/index.mjs

@@ -551,6 +551,54 @@ function createMessage(partial) {
   };
 }
 
+// src/server/storage-helpers.ts
+function extractInputMessages(reqMessages) {
+  if (!reqMessages?.length) return [];
+  let lastMeaningful = null;
+  for (let i = reqMessages.length - 1; i >= 0; i--) {
+    const m = reqMessages[i];
+    if (m.role === "assistant" && (!m.content || m.content === "")) continue;
+    lastMeaningful = m;
+    break;
+  }
+  if (!lastMeaningful) return [];
+  if (lastMeaningful.role === "user") {
+    const textContent = typeof lastMeaningful.content === "string" ? lastMeaningful.content : JSON.stringify(lastMeaningful.content);
+    const attachments = lastMeaningful.attachments;
+    const imageAtt = attachments?.find((a) => a.type === "image" && a.url);
+    const fileAtt = attachments?.find((a) => a.type === "file" && a.url);
+    const msg = { role: "user", content: textContent || "" };
+    if (imageAtt?.url) {
+      msg.contentType = "image";
+      msg.url = imageAtt.url;
+    } else if (fileAtt?.url) {
+      msg.contentType = "file";
+      msg.url = fileAtt.url;
+    }
+    return [msg];
+  }
+  if (lastMeaningful.role === "tool" || lastMeaningful.role === "function") {
+    const msgs = reqMessages;
+    const lastAssistantIdx = msgs.map((m) => m.role).lastIndexOf("assistant");
+    return msgs.slice(lastAssistantIdx + 1).filter(
+      (m) => !(m.role === "assistant" && (!m.content || m.content === ""))
+    ).map((m) => ({
+      role: m.role,
+      content: typeof m.content === "string" ? m.content : JSON.stringify(m.content),
+      toolCallId: m.tool_call_id
+    }));
+  }
+  return [];
+}
+function mapOutputMessages(resultMessages) {
+  return resultMessages.map((m) => ({
+    role: m.role,
+    content: m.content ?? "",
+    toolCalls: m.tool_calls,
+    toolCallId: m.tool_call_id
+  }));
+}
+
 // src/server/streaming.ts
 function createSSEHeaders() {
   return {
@@ -949,6 +997,7 @@ var StreamResult = class {
       toolCalls: [],
       requiresAction: false,
       usage: void 0,
+      threadId: void 0,
       events: []
     };
   }
@@ -994,6 +1043,9 @@ var StreamResult = class {
           this.capturedUsage = event.usage;
           collected.usage = event.usage;
         }
+        if (event.threadId) {
+          collected.threadId = event.threadId;
+        }
         break;
     }
   }
@@ -1006,6 +1058,7 @@ var StreamResult = class {
         const usage = this.capturedUsage;
         await this.onFinishCallback({
           messages: collected.messages,
+          threadId: collected.threadId,
           usage: usage ? {
             promptTokens: usage.prompt_tokens,
             completionTokens: usage.completion_tokens,
@@ -1493,6 +1546,7 @@ var Runtime = class {
     this.actions = /* @__PURE__ */ new Map();
     this.tools = /* @__PURE__ */ new Map();
     this.config = config;
+    this.storage = config.storage;
     if ("provider" in config && config.provider) {
       this.adapter = config.provider.languageModel(config.model);
     } else if ("adapter" in config && config.adapter) {
@@ -2742,8 +2796,67 @@ var Runtime = class {
    * ```
    */
   stream(request, options) {
-    const generator = this.processChatWithLoop(request, options?.signal);
-    return new StreamResult(generator, { onFinish: options?.onFinish });
+    const storage = this.storage;
+    if (!storage) {
+      const generator = this.processChatWithLoop(request, options?.signal);
+      return new StreamResult(generator, { onFinish: options?.onFinish });
+    }
+    let resolvedThreadId = request.threadId;
+    const self = this;
+    let storageHealthy = true;
+    async function* storageWrappedGenerator() {
+      if (!resolvedThreadId) {
+        try {
+          const session = await storage.createSession();
+          resolvedThreadId = session.id;
+        } catch (err) {
+          console.error(
+            "[Runtime] storage.createSession failed \u2014 generating fallback threadId:",
+            err
+          );
+          resolvedThreadId = `local_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+          storageHealthy = false;
+        }
+      }
+      if (resolvedThreadId && storageHealthy) {
+        try {
+          const inputMsgs = extractInputMessages(request.messages);
+          if (inputMsgs.length) {
+            await storage.saveMessages(resolvedThreadId, inputMsgs);
+          }
+        } catch (err) {
+          console.error("[Runtime] storage.saveMessages (input) failed:", err);
+        }
+      }
+      for await (const event of self.processChatWithLoop(
+        request,
+        options?.signal
+      )) {
+        if (event.type === "done" && resolvedThreadId) {
+          yield { ...event, threadId: resolvedThreadId };
+        } else {
+          yield event;
+        }
+      }
+    }
+    return new StreamResult(storageWrappedGenerator(), {
+      onFinish: async (result) => {
+        if (resolvedThreadId && storageHealthy && result.messages.length > 0) {
+          try {
+            const outputMsgs = mapOutputMessages(result.messages);
+            await storage.saveMessages(resolvedThreadId, outputMsgs);
+          } catch (err) {
+            console.error(
+              "[Runtime] storage.saveMessages (output) failed:",
+              err
+            );
+          }
+        }
+        if (options?.onFinish) {
+          await options.onFinish({ ...result, threadId: resolvedThreadId });
+        }
+      }
+    });
   }
   /**
    * Chat and collect the full response (non-streaming)
@@ -3683,6 +3796,6 @@ async function executeToolCalls(toolCalls, tools, executeServerTool, waitForClie
   return results;
 }
 
-export { DEFAULT_CAPABILITIES, DEFAULT_MAX_ITERATIONS, GenerateResult, Runtime, StreamResult, buildProviderToolOptions, createEventStream, createExpressHandler, createExpressMiddleware, createHonoApp, createNextHandler, createNodeHandler, createRuntime, createSSEHeaders, createSSEResponse, createStreamResult, createTextStreamHeaders, createTextStreamResponse, formatSSEData, formatToolsForAnthropic, formatToolsForGoogle, formatToolsForOpenAI, generateMessageId, generateText, generateThreadId, generateToolCallId, pipeSSEToResponse, pipeTextToResponse, runAgentLoop, searchTools, selectTools, shouldExposeToolSearch, streamText, tool };
+export { DEFAULT_CAPABILITIES, DEFAULT_MAX_ITERATIONS, GenerateResult, Runtime, StreamResult, buildProviderToolOptions, createEventStream, createExpressHandler, createExpressMiddleware, createHonoApp, createNextHandler, createNodeHandler, createRuntime, createSSEHeaders, createSSEResponse, createStreamResult, createTextStreamHeaders, createTextStreamResponse, extractInputMessages, formatSSEData, formatToolsForAnthropic, formatToolsForGoogle, formatToolsForOpenAI, generateMessageId, generateText, generateThreadId, generateToolCallId, mapOutputMessages, pipeSSEToResponse, pipeTextToResponse, runAgentLoop, searchTools, selectTools, shouldExposeToolSearch, streamText, tool };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map

package/dist/providers/anthropic/index.d.mts

@@ -1,5 +1,7 @@
-import { k as LanguageModel, _ as AnthropicProviderConfig, A as AIProvider } from '../../types-COAOEe_y.mjs';
+import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
+import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
 import 'zod';
+import '../../base-5n-UuPfS.mjs';
 
 /**
  * Anthropic Provider - Modern Pattern

package/dist/providers/anthropic/index.d.ts

@@ -1,5 +1,7 @@
-import { k as LanguageModel, _ as AnthropicProviderConfig, A as AIProvider } from '../../types-COAOEe_y.js';
+import { L as LanguageModel } from '../../types-CR8mi9I0.js';
+import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
 import 'zod';
+import '../../base-Di31iy_8.js';
 
 /**
  * Anthropic Provider - Modern Pattern

package/dist/providers/azure/index.d.mts

@@ -1,4 +1,6 @@
-import { a1 as AzureProviderConfig, A as AIProvider } from '../../types-COAOEe_y.mjs';
+import { b as AzureProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
+import '../../base-5n-UuPfS.mjs';
+import '../../types-CR8mi9I0.mjs';
 import 'zod';
 
 /**

package/dist/providers/azure/index.d.ts

@@ -1,4 +1,6 @@
-import { a1 as AzureProviderConfig, A as AIProvider } from '../../types-COAOEe_y.js';
+import { b as AzureProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
+import '../../base-Di31iy_8.js';
+import '../../types-CR8mi9I0.js';
 import 'zod';
 
 /**

package/dist/providers/google/index.d.mts

@@ -1,5 +1,7 @@
-import { k as LanguageModel, $ as GoogleProviderConfig, A as AIProvider } from '../../types-COAOEe_y.mjs';
+import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
+import { G as GoogleProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
 import 'zod';
+import '../../base-5n-UuPfS.mjs';
 
 /**
  * Google Provider - OpenAI-Compatible

package/dist/providers/google/index.d.ts

@@ -1,5 +1,7 @@
-import { k as LanguageModel, $ as GoogleProviderConfig, A as AIProvider } from '../../types-COAOEe_y.js';
+import { L as LanguageModel } from '../../types-CR8mi9I0.js';
+import { G as GoogleProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
 import 'zod';
+import '../../base-Di31iy_8.js';
 
 /**
  * Google Provider - OpenAI-Compatible

package/dist/providers/ollama/index.d.mts

@@ -1,5 +1,7 @@
-import { a2 as OllamaProviderConfig, A as AIProvider } from '../../types-COAOEe_y.mjs';
-export { a3 as OllamaModelOptions } from '../../types-COAOEe_y.mjs';
+import { c as OllamaProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
+export { d as OllamaModelOptions } from '../../types-VDgiUvH2.mjs';
+import '../../base-5n-UuPfS.mjs';
+import '../../types-CR8mi9I0.mjs';
 import 'zod';
 
 /**

package/dist/providers/ollama/index.d.ts

@@ -1,5 +1,7 @@
-import { a2 as OllamaProviderConfig, A as AIProvider } from '../../types-COAOEe_y.js';
-export { a3 as OllamaModelOptions } from '../../types-COAOEe_y.js';
+import { c as OllamaProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
+export { d as OllamaModelOptions } from '../../types-C0vLXzuw.js';
+import '../../base-Di31iy_8.js';
+import '../../types-CR8mi9I0.js';
 import 'zod';
 
 /**

package/dist/providers/openai/index.d.mts

@@ -1,5 +1,7 @@
-import { k as LanguageModel, Z as OpenAIProviderConfig, A as AIProvider } from '../../types-COAOEe_y.mjs';
+import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
+import { O as OpenAIProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
 import 'zod';
+import '../../base-5n-UuPfS.mjs';
 
 /**
  * OpenAI Provider - Modern Pattern

package/dist/providers/openai/index.d.ts

@@ -1,5 +1,7 @@
-import { k as LanguageModel, Z as OpenAIProviderConfig, A as AIProvider } from '../../types-COAOEe_y.js';
+import { L as LanguageModel } from '../../types-CR8mi9I0.js';
+import { O as OpenAIProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
 import 'zod';
+import '../../base-Di31iy_8.js';
 
 /**
  * OpenAI Provider - Modern Pattern

package/dist/providers/openrouter/index.d.mts

@@ -1,5 +1,7 @@
-import { k as LanguageModel, A as AIProvider } from '../../types-COAOEe_y.mjs';
+import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
+import { A as AIProvider } from '../../types-VDgiUvH2.mjs';
 import 'zod';
+import '../../base-5n-UuPfS.mjs';
 
 /**
  * OpenRouter Provider - Modern Pattern

package/dist/providers/openrouter/index.d.ts

@@ -1,5 +1,7 @@
-import { k as LanguageModel, A as AIProvider } from '../../types-COAOEe_y.js';
+import { L as LanguageModel } from '../../types-CR8mi9I0.js';
+import { A as AIProvider } from '../../types-C0vLXzuw.js';
 import 'zod';
+import '../../base-Di31iy_8.js';
 
 /**
  * OpenRouter Provider - Modern Pattern

package/dist/providers/xai/index.d.mts

@@ -1,5 +1,7 @@
-import { k as LanguageModel, a0 as XAIProviderConfig, A as AIProvider } from '../../types-COAOEe_y.mjs';
+import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
+import { X as XAIProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
 import 'zod';
+import '../../base-5n-UuPfS.mjs';
 
 /**
  * xAI Provider - Modern Pattern

package/dist/providers/xai/index.d.ts

@@ -1,5 +1,7 @@
-import { k as LanguageModel, a0 as XAIProviderConfig, A as AIProvider } from '../../types-COAOEe_y.js';
+import { L as LanguageModel } from '../../types-CR8mi9I0.js';
+import { X as XAIProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
 import 'zod';
+import '../../base-Di31iy_8.js';
 
 /**
  * xAI Provider - Modern Pattern