@threaded/ai 1.0.0 → 1.0.2

package/dist/index.d.cts

@@ -100,9 +100,10 @@ interface ScopeConfig {
     system?: string;
     silent?: boolean;
     until?: (ctx: ConversationContext) => boolean;
+    stream?: (event: StreamEvent) => void;
 }
 type StepFunction = (ctx: ConversationContext) => Promise<ConversationContext>;
-type ComposedFunction = (ctxOrMessage?: ConversationContext | string) => Promise<ConversationContext>;
+type ComposedFunction = (ctxOrMessage: ConversationContext | string) => Promise<ConversationContext>;
 interface JsonSchema {
     name: string;
     schema: {
@@ -146,6 +147,34 @@ interface RetryOptions {
 
 declare const createMCPTools: (client: Client) => Promise<ToolConfig[]>;
 
+declare const toolConfigToToolDefinition: (tool: ToolConfig) => ToolDefinition;
+declare const parseModelName: (model: string) => ParsedModel;
+declare const setKeys: (keys: ApiKeys) => void;
+declare const getKey: (provider: string) => string;
+declare const maxCalls: (toolConfig: ToolConfig, maxCalls: number) => ToolConfig;
+
+/**
+ * @example
+ * // in-memory (default)
+ * const thread = getOrCreateThread('user-123');
+ *
+ * @example
+ * // sqlite
+ * const thread = getOrCreateThread('user-123', {
+ *   async get(id) {
+ *     const row = await db.get('SELECT messages FROM threads WHERE id = ?', id);
+ *     return row ? JSON.parse(row.messages) : [];
+ *   },
+ *   async set(id, messages) {
+ *     await db.run(
+ *       'INSERT OR REPLACE INTO threads (id, messages, updated_at) VALUES (?, ?, ?)',
+ *       id,
+ *       JSON.stringify(messages),
+ *       Date.now()
+ *     );
+ *   }
+ * });
+ */
 declare const getOrCreateThread: (id: string, store?: ThreadStore) => Thread;
 
 declare const isStandardSchema: (schema: any) => schema is StandardSchema;
@@ -192,8 +221,8 @@ declare const when: (condition: (ctx: ConversationContext) => boolean, action: S
 
 declare const model: ({ model, schema, }?: {
     model?: string;
-    schema?: any;
-}) => StepFunction;
+    schema?: JsonSchema | StandardSchema;
+}) => ComposedFunction;
 
 /**
  * scope({}, retry({ times: 2 }, model(...)))
@@ -204,4 +233,4 @@ declare const scope: (config: ScopeConfig, ...steps: StepFunction[]) => StepFunc
 
 declare const compose: (...steps: StepFunction[]) => ComposedFunction;
 
-export { type ApiKeys, type ApprovalRequest, type ApprovalResponse, type ComposedFunction, type ConversationContext, Inherit, type JsonSchema, type Message, type ParsedModel, type ProviderConfig, type RetryOptions, type SchemaProperty, type ScopeConfig, type StandardSchema, type StepFunction, type StreamEvent, type Thread, type ThreadStore, type ToolCall, type ToolCallResult, type ToolConfig, type ToolDefinition, type ToolExecutionConfig, appendToLastRequest, compose, convertMCPSchemaToToolSchema, convertStandardSchemaToJsonSchema, createMCPTools, everyNMessages, everyNTokens, generateApprovalToken, getOrCreateThread, isStandardSchema, model, noToolsCalled, normalizeSchema, onApprovalRequested, onApprovalResolved, removeApprovalListener, requestApproval, resolveApproval, retry, scope, tap, toolNotUsedInNTurns, toolWasCalled, when };
+export { type ApiKeys, type ApprovalRequest, type ApprovalResponse, type ComposedFunction, type ConversationContext, Inherit, type JsonSchema, type Message, type ParsedModel, type ProviderConfig, type RetryOptions, type SchemaProperty, type ScopeConfig, type StandardSchema, type StepFunction, type StreamEvent, type Thread, type ThreadStore, type ToolCall, type ToolCallResult, type ToolConfig, type ToolDefinition, type ToolExecutionConfig, appendToLastRequest, compose, convertMCPSchemaToToolSchema, convertStandardSchemaToJsonSchema, createMCPTools, everyNMessages, everyNTokens, generateApprovalToken, getKey, getOrCreateThread, isStandardSchema, maxCalls, model, noToolsCalled, normalizeSchema, onApprovalRequested, onApprovalResolved, parseModelName, removeApprovalListener, requestApproval, resolveApproval, retry, scope, setKeys, tap, toolConfigToToolDefinition, toolNotUsedInNTurns, toolWasCalled, when };

package/dist/index.d.ts

@@ -100,9 +100,10 @@ interface ScopeConfig {
     system?: string;
     silent?: boolean;
     until?: (ctx: ConversationContext) => boolean;
+    stream?: (event: StreamEvent) => void;
 }
 type StepFunction = (ctx: ConversationContext) => Promise<ConversationContext>;
-type ComposedFunction = (ctxOrMessage?: ConversationContext | string) => Promise<ConversationContext>;
+type ComposedFunction = (ctxOrMessage: ConversationContext | string) => Promise<ConversationContext>;
 interface JsonSchema {
     name: string;
     schema: {
@@ -146,6 +147,34 @@ interface RetryOptions {
 
 declare const createMCPTools: (client: Client) => Promise<ToolConfig[]>;
 
+declare const toolConfigToToolDefinition: (tool: ToolConfig) => ToolDefinition;
+declare const parseModelName: (model: string) => ParsedModel;
+declare const setKeys: (keys: ApiKeys) => void;
+declare const getKey: (provider: string) => string;
+declare const maxCalls: (toolConfig: ToolConfig, maxCalls: number) => ToolConfig;
+
+/**
+ * @example
+ * // in-memory (default)
+ * const thread = getOrCreateThread('user-123');
+ *
+ * @example
+ * // sqlite
+ * const thread = getOrCreateThread('user-123', {
+ *   async get(id) {
+ *     const row = await db.get('SELECT messages FROM threads WHERE id = ?', id);
+ *     return row ? JSON.parse(row.messages) : [];
+ *   },
+ *   async set(id, messages) {
+ *     await db.run(
+ *       'INSERT OR REPLACE INTO threads (id, messages, updated_at) VALUES (?, ?, ?)',
+ *       id,
+ *       JSON.stringify(messages),
+ *       Date.now()
+ *     );
+ *   }
+ * });
+ */
 declare const getOrCreateThread: (id: string, store?: ThreadStore) => Thread;
 
 declare const isStandardSchema: (schema: any) => schema is StandardSchema;
@@ -192,8 +221,8 @@ declare const when: (condition: (ctx: ConversationContext) => boolean, action: S
 
 declare const model: ({ model, schema, }?: {
     model?: string;
-    schema?: any;
-}) => StepFunction;
+    schema?: JsonSchema | StandardSchema;
+}) => ComposedFunction;
 
 /**
  * scope({}, retry({ times: 2 }, model(...)))
@@ -204,4 +233,4 @@ declare const scope: (config: ScopeConfig, ...steps: StepFunction[]) => StepFunc
 
 declare const compose: (...steps: StepFunction[]) => ComposedFunction;
 
-export { type ApiKeys, type ApprovalRequest, type ApprovalResponse, type ComposedFunction, type ConversationContext, Inherit, type JsonSchema, type Message, type ParsedModel, type ProviderConfig, type RetryOptions, type SchemaProperty, type ScopeConfig, type StandardSchema, type StepFunction, type StreamEvent, type Thread, type ThreadStore, type ToolCall, type ToolCallResult, type ToolConfig, type ToolDefinition, type ToolExecutionConfig, appendToLastRequest, compose, convertMCPSchemaToToolSchema, convertStandardSchemaToJsonSchema, createMCPTools, everyNMessages, everyNTokens, generateApprovalToken, getOrCreateThread, isStandardSchema, model, noToolsCalled, normalizeSchema, onApprovalRequested, onApprovalResolved, removeApprovalListener, requestApproval, resolveApproval, retry, scope, tap, toolNotUsedInNTurns, toolWasCalled, when };
+export { type ApiKeys, type ApprovalRequest, type ApprovalResponse, type ComposedFunction, type ConversationContext, Inherit, type JsonSchema, type Message, type ParsedModel, type ProviderConfig, type RetryOptions, type SchemaProperty, type ScopeConfig, type StandardSchema, type StepFunction, type StreamEvent, type Thread, type ThreadStore, type ToolCall, type ToolCallResult, type ToolConfig, type ToolDefinition, type ToolExecutionConfig, appendToLastRequest, compose, convertMCPSchemaToToolSchema, convertStandardSchemaToJsonSchema, createMCPTools, everyNMessages, everyNTokens, generateApprovalToken, getKey, getOrCreateThread, isStandardSchema, maxCalls, model, noToolsCalled, normalizeSchema, onApprovalRequested, onApprovalResolved, parseModelName, removeApprovalListener, requestApproval, resolveApproval, retry, scope, setKeys, tap, toolConfigToToolDefinition, toolNotUsedInNTurns, toolWasCalled, when };

package/dist/index.js

@@ -135,6 +135,9 @@ var parseModelName = (model2) => {
   };
 };
 var globalKeys = {};
+var setKeys = (keys) => {
+  globalKeys = { ...globalKeys, ...keys };
+};
 var getKey = (provider) => {
   const key = globalKeys[provider.toLowerCase()];
   if (!key) {
@@ -142,8 +145,28 @@ var getKey = (provider) => {
   }
   return key;
 };
+var maxCalls = (toolConfig, maxCalls2) => ({
+  ...toolConfig,
+  _maxCalls: maxCalls2
+});
 
 // src/providers/openai.ts
+var appendToolCalls = (toolCalls, tcchunklist) => {
+  for (const tcchunk of tcchunklist) {
+    while (toolCalls.length <= tcchunk.index) {
+      toolCalls.push({
+        id: "",
+        type: "function",
+        function: { name: "", arguments: "" }
+      });
+    }
+    const tc = toolCalls[tcchunk.index];
+    tc.id += tcchunk.id || "";
+    tc.function.name += tcchunk.function?.name || "";
+    tc.function.arguments += tcchunk.function?.arguments || "";
+  }
+  return toolCalls;
+};
 var callOpenAI = async (config, ctx) => {
   const { model: model2, instructions, schema } = config;
   const apiKey = getKey("openai") || process.env.OPENAI_API_KEY;
@@ -210,17 +233,19 @@ var handleOpenAIStream = async (response, ctx) => {
   const decoder = new TextDecoder();
   let fullContent = "";
   let toolCalls = [];
-  const toolCallsBuffer = {};
+  let buffer = "";
   try {
     while (true) {
       const { done, value } = await reader.read();
       if (done) break;
-      const chunk = decoder.decode(value);
-      const lines = chunk.split("\n");
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() || "";
       for (const line of lines) {
         if (line.startsWith("data: ")) {
-          const data = line.slice(6);
+          const data = line.slice(6).trim();
           if (data === "[DONE]") continue;
+          if (!data) continue;
           try {
             const parsed = JSON.parse(data);
             const delta = parsed.choices?.[0]?.delta;
@@ -231,25 +256,7 @@ var handleOpenAIStream = async (response, ctx) => {
               }
             }
             if (delta?.tool_calls) {
-              for (const toolCall of delta.tool_calls) {
-                const { index } = toolCall;
-                if (!toolCallsBuffer[index]) {
-                  toolCallsBuffer[index] = {
-                    id: toolCall.id || "",
-                    type: "function",
-                    function: { name: "", arguments: "" }
-                  };
-                }
-                if (toolCall.id) {
-                  toolCallsBuffer[index].id = toolCall.id;
-                }
-                if (toolCall.function?.name) {
-                  toolCallsBuffer[index].function.name += toolCall.function.name;
-                }
-                if (toolCall.function?.arguments) {
-                  toolCallsBuffer[index].function.arguments += toolCall.function.arguments;
-                }
-              }
+              toolCalls = appendToolCalls(toolCalls, delta.tool_calls);
             }
           } catch (e) {
           }
@@ -259,7 +266,6 @@ var handleOpenAIStream = async (response, ctx) => {
   } finally {
     reader.releaseLock();
   }
-  toolCalls = Object.values(toolCallsBuffer);
   const msg = {
     role: "assistant",
     content: fullContent
@@ -361,15 +367,18 @@ var handleAnthropicStream = async (response, ctx) => {
   const decoder = new TextDecoder();
   let fullContent = "";
   const toolCalls = [];
+  let buffer = "";
   try {
     while (true) {
       const { done, value } = await reader.read();
       if (done) break;
-      const chunk = decoder.decode(value);
-      const lines = chunk.split("\n");
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() || "";
       for (const line of lines) {
         if (line.startsWith("data: ")) {
-          const data = line.slice(6);
+          const data = line.slice(6).trim();
+          if (!data) continue;
           try {
             const parsed = JSON.parse(data);
             if (parsed.type === "content_block_delta" && parsed.delta?.text) {
@@ -498,15 +507,18 @@ var handleGoogleStream = async (response, ctx) => {
   const decoder = new TextDecoder();
   let fullContent = "";
   const toolCalls = [];
+  let buffer = "";
   try {
     while (true) {
       const { done, value } = await reader.read();
       if (done) break;
-      const chunk = decoder.decode(value);
-      const lines = chunk.split("\n");
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() || "";
       for (const line of lines) {
         if (line.startsWith("data: ")) {
-          const data = line.slice(6);
+          const data = line.slice(6).trim();
+          if (!data) continue;
           try {
             const parsed = JSON.parse(data);
             const candidate = parsed.candidates?.[0];
@@ -614,10 +626,16 @@ var model = ({
   schema
 } = {}) => {
   return async (ctxOrMessage) => {
-    const ctx = typeof ctxOrMessage === "string" ? {
-      history: [{ role: "user", content: ctxOrMessage }],
-      tools: []
-    } : ctxOrMessage;
+    const ctx = typeof ctxOrMessage === "string" ? (
+      // model()("hello!");
+      {
+        history: [{ role: "user", content: ctxOrMessage }],
+        tools: []
+      }
+    ) : (
+      // model()(/* few shot / history */);
+      ctxOrMessage
+    );
     const normalizedSchema = schema ? normalizeSchema(schema) : void 0;
     const systemMessage = ctx.history.find((m) => m.role === "system");
     const instructions = systemMessage?.content;
@@ -668,7 +686,11 @@ var executeTools = async (ctx) => {
     const approval = approvals.find((a) => a.call.id === call.id);
     if (!approval?.approved) {
       if (ctx.stream) {
-        ctx.stream({ type: "tool_error", call, error: "Tool execution denied by user" });
+        ctx.stream({
+          type: "tool_error",
+          call,
+          error: "Tool execution denied by user"
+        });
       }
       return {
         call,
@@ -677,10 +699,10 @@ var executeTools = async (ctx) => {
     }
     const toolName = call.function.name;
     const limits = ctx.toolLimits || {};
-    const maxCalls = limits[toolName];
+    const maxCalls2 = limits[toolName];
     const currentCount = updatedCounts[toolName] || 0;
-    if (maxCalls && currentCount >= maxCalls) {
-      const error2 = `Tool ${toolName} has reached its limit of ${maxCalls} calls`;
+    if (maxCalls2 && currentCount >= maxCalls2) {
+      const error2 = `Tool ${toolName} has reached its limit of ${maxCalls2} calls`;
       if (ctx.stream) {
         ctx.stream({ type: "tool_error", call, error: error2 });
       }
@@ -789,14 +811,15 @@ var createThread = (id, store) => {
     }
   };
 };
-var defaultStore = createMemoryStore();
 var threads = /* @__PURE__ */ new Map();
-var getOrCreateThread = (id, store = defaultStore) => {
-  if (threads.has(id)) {
-    return threads.get(id);
+var getOrCreateThread = (id, store) => {
+  const cacheKey = store ? `${id}-${store}` : id;
+  if (threads.has(cacheKey)) {
+    return threads.get(cacheKey);
   }
-  const thread = createThread(id, store);
-  threads.set(id, thread);
+  const threadStore = store || createMemoryStore();
+  const thread = createThread(id, threadStore);
+  threads.set(cacheKey, thread);
   return thread;
 };
 
@@ -1027,6 +1050,9 @@ var scopeContext = (config, ctx) => {
       scopedCtx.history = [{ role: "system", content: config.system }, ...scopedCtx.history];
     }
   }
+  if (config.stream) {
+    scopedCtx.stream = config.stream;
+  }
   return scopedCtx;
 };
 var scope = (config, ...steps) => {
@@ -1058,19 +1084,24 @@ export {
   everyNMessages,
   everyNTokens,
   generateApprovalToken,
+  getKey,
   getOrCreateThread,
   isStandardSchema,
+  maxCalls,
   model,
   noToolsCalled,
   normalizeSchema,
   onApprovalRequested,
   onApprovalResolved,
+  parseModelName,
   removeApprovalListener,
   requestApproval,
   resolveApproval,
   retry,
   scope,
+  setKeys,
   tap,
+  toolConfigToToolDefinition,
   toolNotUsedInNTurns,
   toolWasCalled,
   when