@micdrop/ai-sdk 1.0.5 → 1.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.mts CHANGED
@@ -1,4 +1,4 @@
1
- import { AgentOptions, Agent } from '@micdrop/server';
1
+ import { Agent, AgentOptions } from '@micdrop/server';
2
2
  import { LanguageModel, CallSettings } from 'ai';
3
3
  import { PassThrough } from 'stream';
4
4
 
package/dist/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AgentOptions, Agent } from '@micdrop/server';
1
+ import { Agent, AgentOptions } from '@micdrop/server';
2
2
  import { LanguageModel, CallSettings } from 'ai';
3
3
  import { PassThrough } from 'stream';
4
4
 
package/dist/index.js CHANGED
@@ -81,6 +81,8 @@ var AiSdkAgent = class extends import_server.Agent {
81
81
  } catch (error) {
82
82
  if (abortController === this.abortController) {
83
83
  console.error("[AiSdkAgent] Error answering:", error);
84
+ this.log("Generation failed, giving up");
85
+ this.emit("Failed");
84
86
  }
85
87
  }
86
88
  }
@@ -130,7 +132,6 @@ var AiSdkAgent = class extends import_server.Agent {
130
132
  if (!enableTools) return tools;
131
133
  this.tools.forEach((t) => {
132
134
  tools[t.name] = (0, import_ai.tool)({
133
- name: t.name,
134
135
  description: t.description,
135
136
  inputSchema: t.inputSchema || import_zod.z.object({}),
136
137
  execute: (args, { toolCallId }) => this.executeTool({
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts","../src/AiSdkAgent.ts"],"sourcesContent":["export * from './AiSdkAgent'","import { Agent, AgentOptions } from '@micdrop/server'\nimport {\n CallSettings,\n LanguageModel,\n ModelMessage,\n stepCountIs,\n streamText,\n tool,\n ToolSet,\n} from 'ai'\nimport { PassThrough } from 'stream'\nimport { z } from 'zod'\n\nexport interface AiSdkAgentOptions extends AgentOptions {\n model: LanguageModel\n settings?: CallSettings\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n private abortController?: AbortController\n\n protected async generateAnswer(stream: PassThrough): Promise<void> {\n const abortController = new AbortController()\n this.abortController = abortController\n const signal = this.abortController.signal\n let skipAnswer = false\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n // Generate response using AI SDK\n const result = streamText({\n model: this.options.model,\n messages: this.buildMessages(),\n tools: this.buildTools(),\n maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,\n stopWhen: stepCountIs(5),\n onStepFinish: (step) => {\n const tools = step.toolCalls.map((toolCall) =>\n this.getTool(toolCall.toolName)\n )\n if (tools.some((t) => t?.skipAnswer)) {\n skipAnswer = true\n }\n },\n ...this.options.settings,\n abortSignal: signal,\n })\n\n for await (const textPart of result.textStream) {\n if (skipAnswer) return\n this.log(`Answer chunk: \"${textPart}\"`)\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = textPart.indexOf(extractOptions.startTag)\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = textPart.slice(0, startTagIndex).trimEnd()\n stream.write(messagePart)\n continue\n }\n } else {\n // Extracting, don't write to stream\n continue\n }\n }\n\n // Send chunk\n stream.write(textPart)\n }\n if (skipAnswer) return\n\n const fullText = await result.text\n const { message, metadata } = this.extract(fullText)\n\n // Emit message\n this.addAssistantMessage(message, metadata)\n this.abortController = undefined\n } catch (error: any) {\n if (abortController === this.abortController) {\n console.error('[AiSdkAgent] Error answering:', error)\n }\n }\n }\n\n private buildMessages(): ModelMessage[] {\n return this.conversation.map((message): ModelMessage => {\n switch (message.role) {\n case 'user':\n case 'assistant':\n case 'system':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n role: 'assistant',\n content: [\n {\n type: 'tool-call',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n input: JSON.parse(message.parameters),\n },\n ],\n }\n case 'tool_result':\n return {\n role: 'tool',\n content: [\n {\n type: 'tool-result',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n output: {\n type: 'json',\n value: JSON.parse(message.output),\n },\n },\n ],\n }\n }\n })\n }\n\n private buildTools() {\n const tools: ToolSet = {}\n\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return tools\n\n this.tools.forEach((t) => {\n tools[t.name] = tool({\n name: t.name,\n description: t.description,\n inputSchema: t.inputSchema || z.object({}),\n execute: (args, { toolCallId }) =>\n this.executeTool({\n role: 'tool_call',\n toolCallId,\n toolName: t.name,\n parameters: JSON.stringify(args),\n }),\n })\n })\n return tools\n }\n\n cancel() {\n if (!this.abortController) return\n this.log('Cancel')\n this.abortController.abort()\n this.abortController = undefined\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,oBAAoC;AACpC,gBAQO;AAEP,iBAAkB;AAQlB,IAAM,oBAAoB;AAEnB,IAAM,aAAN,cAAyB,oBAAyB;AAAA,EAGvD,MAAgB,eAAe,QAAoC;AACjE,UAAM,kBAAkB,IAAI,gBAAgB;AAC5C,SAAK,kBAAkB;AACvB,UAAM,SAAS,KAAK,gBAAgB;AACpC,QAAI,aAAa;AAGjB,QAAI,aAAa;AACjB,UAAM,iBAAiB,KAAK,kBAAkB;AAE9C,QAAI;AAEF,YAAM,aAAS,sBAAW;AAAA,QACxB,OAAO,KAAK,QAAQ;AAAA,QACpB,UAAU,KAAK,cAAc;AAAA,QAC7B,OAAO,KAAK,WAAW;AAAA,QACvB,YAAY,KAAK,QAAQ,YAAY;AAAA,QACrC,cAAU,uBAAY,CAAC;AAAA,QACvB,cAAc,CAAC,SAAS;AACtB,gBAAM,QAAQ,KAAK,UAAU;AAAA,YAAI,CAAC,aAChC,KAAK,QAAQ,SAAS,QAAQ;AAAA,UAChC;AACA,cAAI,MAAM,KAAK,CAAC,MAAM,GAAG,UAAU,GAAG;AACpC,yBAAa;AAAA,UACf;AAAA,QACF;AAAA,QACA,GAAG,KAAK,QAAQ;AAAA,QAChB,aAAa;AAAA,MACf,CAAC;AAED,uBAAiB,YAAY,OAAO,YAAY;AAC9C,YAAI,WAAY;AAChB,aAAK,IAAI,kBAAkB,QAAQ,GAAG;AAGtC,YAAI,gBAAgB;AAClB,cAAI,CAAC,YAAY;AACf,kBAAM,gBAAgB,SAAS,QAAQ,eAAe,QAAQ;AAC9D,gBAAI,kBAAkB,IAAI;AACxB,2BAAa;AACb,oBAAM,cAAc,SAAS,MAAM,GAAG,aAAa,EAAE,QAAQ;AAC7D,qBAAO,MAAM,WAAW;AACxB;AAAA,YACF;AAAA,UACF,OAAO;AAEL;AAAA,UACF;AAAA,QACF;AAGA,eAAO,MAAM,QAAQ;AAAA,MACvB;AACA,UAAI,WAAY;AAEhB,YAAM,WAAW,MAAM,OAAO;AAC9B,YAAM,EAAE,SAAS,SAAS,IAAI,KAAK,QAAQ,QAAQ;AAGnD,WAAK,oBAAoB,SAAS,QAAQ;AAC1C,WAAK,kBAAkB;AAAA,IACzB,SAAS,OAAY;AACnB,UAAI,oBAAoB,KAAK,iBAAiB;AAC5C,gBAAQ,MAAM,iCAAiC,KAAK;AAAA,MACtD;AAAA,IACF;AAAA,EACF;AAAA,EAEQ,gBAAgC;AACtC,WAAO,KAAK,aAAa,IAAI,CAAC,YAA0B;AACtD,cAAQ,QAAQ,MAAM;AAAA,QACpB,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AACH,iBAAO;AAAA,YACL,MAAM,QAAQ;AAAA,YACd,SAAS,QAAQ;AAAA,UACnB;AAAA,QACF,KAAK;AACH,iBAAO;AAAA,YACL,MAAM;AAAA,YACN,SAAS;AAAA,cACP;AAAA,gBACE,MAAM;AAAA,gBACN,YAAY,QAAQ;AAAA,gBACpB,UAAU,QAAQ;AAAA,gBAClB,OAAO,KAAK,MAAM,QAAQ,UAAU;AAAA,cACtC;AAAA,YACF;AAAA,UACF;AAAA,QACF,KAAK;AACH,iBAAO;AAAA,YACL,MAAM;AAAA,YACN,SAAS;AAAA,cACP;AAAA,gBACE,MAAM;AAAA,gBACN,YAAY,QAAQ;AAAA,gBACpB,UAAU,QAAQ;AAAA,gBAClB,QAAQ;AAAA,kBACN,MAAM;AAAA,kBACN,OAAO,KAAK,MAAM,QAAQ,MAAM;AAAA,gBAClC;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,MACJ;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEQ,aAAa;AACnB,UAAM,QAAiB,CAAC;AAGxB,UAAM,cAAc,KAAK,aAAa,SAAS;AAC/C,QAAI,CAAC,YAAa,QAAO;AAEzB,SAAK,MAAM,QAAQ,CAAC,MAAM;AACxB,YAAM,EAAE,IAAI,QAAI,gBAAK;AAAA,QACnB,MAAM,EAAE;AAAA,QACR,aAAa,EAAE;AAAA,QACf,aAAa,EAAE,eAAe,aAAE,OAAO,CAAC,CAAC;AAAA,QACzC,SAAS,CAAC,MAAM,EAAE,WAAW,MAC3B,KAAK,YAAY;AAAA,UACf,MAAM;AAAA,UACN;AAAA,UACA,UAAU,EAAE;AAAA,UACZ,YAAY,KAAK,UAAU,IAAI;AAAA,QACjC,CAAC;AAAA,MACL,CAAC;AAAA,IACH,CAAC;AACD,WAAO;AAAA,EACT;AAAA,EAEA,SAAS;AACP,QAAI,CAAC,KAAK,gBAAiB;AAC3B,SAAK,IAAI,QAAQ;AACjB,SAAK,gBAAgB,MAAM;AAC3B,SAAK,kBAAkB;AAAA,EACzB;AACF;","names":[]}
1
+ {"version":3,"sources":["../src/index.ts","../src/AiSdkAgent.ts"],"sourcesContent":["export * from './AiSdkAgent'","import { Agent, AgentOptions } from '@micdrop/server'\nimport {\n CallSettings,\n LanguageModel,\n ModelMessage,\n stepCountIs,\n streamText,\n tool,\n ToolSet,\n} from 'ai'\nimport { PassThrough } from 'stream'\nimport { z } from 'zod'\n\nexport interface AiSdkAgentOptions extends AgentOptions {\n model: LanguageModel\n settings?: CallSettings\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n private abortController?: AbortController\n\n protected async generateAnswer(stream: PassThrough): Promise<void> {\n const abortController = new AbortController()\n this.abortController = abortController\n const signal = this.abortController.signal\n let skipAnswer = false\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n // Generate response using AI SDK\n const result = streamText({\n model: this.options.model,\n messages: this.buildMessages(),\n tools: this.buildTools(),\n maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,\n stopWhen: stepCountIs(5),\n onStepFinish: (step) => {\n const tools = step.toolCalls.map((toolCall) =>\n this.getTool(toolCall.toolName)\n )\n if (tools.some((t) => t?.skipAnswer)) {\n skipAnswer = true\n }\n },\n ...this.options.settings,\n abortSignal: signal,\n })\n\n for await (const textPart of result.textStream) {\n if (skipAnswer) return\n this.log(`Answer chunk: \"${textPart}\"`)\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = textPart.indexOf(extractOptions.startTag)\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = textPart.slice(0, startTagIndex).trimEnd()\n stream.write(messagePart)\n continue\n }\n } else {\n // Extracting, don't write to stream\n continue\n }\n }\n\n // Send chunk\n stream.write(textPart)\n }\n if (skipAnswer) return\n\n const fullText = await result.text\n const { message, metadata } = this.extract(fullText)\n\n // Emit message\n this.addAssistantMessage(message, metadata)\n this.abortController = undefined\n } catch (error: any) {\n if (abortController === this.abortController) {\n console.error('[AiSdkAgent] Error answering:', error)\n this.log('Generation failed, giving up')\n this.emit('Failed')\n }\n }\n }\n\n private buildMessages(): ModelMessage[] {\n return this.conversation.map((message): ModelMessage => {\n switch (message.role) {\n case 'user':\n case 'assistant':\n case 'system':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n role: 'assistant',\n content: [\n {\n type: 'tool-call',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n input: JSON.parse(message.parameters),\n },\n ],\n }\n case 'tool_result':\n return {\n role: 'tool',\n content: [\n {\n type: 'tool-result',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n output: {\n type: 'json',\n value: JSON.parse(message.output),\n },\n },\n ],\n }\n }\n })\n }\n\n private buildTools() {\n const tools: ToolSet = {}\n\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return tools\n\n this.tools.forEach((t) => {\n tools[t.name] = tool({\n description: t.description,\n inputSchema: (t.inputSchema || z.object({})) as z.ZodObject,\n execute: (args: any, { toolCallId }: { toolCallId: string }) =>\n this.executeTool({\n role: 'tool_call',\n toolCallId,\n toolName: t.name,\n parameters: JSON.stringify(args),\n }),\n })\n })\n return tools\n }\n\n cancel() {\n if (!this.abortController) return\n this.log('Cancel')\n this.abortController.abort()\n this.abortController = undefined\n }\n}\n"],"mappings":"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","names":[]}
package/dist/index.mjs CHANGED
@@ -59,6 +59,8 @@ var AiSdkAgent = class extends Agent {
59
59
  } catch (error) {
60
60
  if (abortController === this.abortController) {
61
61
  console.error("[AiSdkAgent] Error answering:", error);
62
+ this.log("Generation failed, giving up");
63
+ this.emit("Failed");
62
64
  }
63
65
  }
64
66
  }
@@ -108,7 +110,6 @@ var AiSdkAgent = class extends Agent {
108
110
  if (!enableTools) return tools;
109
111
  this.tools.forEach((t) => {
110
112
  tools[t.name] = tool({
111
- name: t.name,
112
113
  description: t.description,
113
114
  inputSchema: t.inputSchema || z.object({}),
114
115
  execute: (args, { toolCallId }) => this.executeTool({
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/AiSdkAgent.ts"],"sourcesContent":["import { Agent, AgentOptions } from '@micdrop/server'\nimport {\n CallSettings,\n LanguageModel,\n ModelMessage,\n stepCountIs,\n streamText,\n tool,\n ToolSet,\n} from 'ai'\nimport { PassThrough } from 'stream'\nimport { z } from 'zod'\n\nexport interface AiSdkAgentOptions extends AgentOptions {\n model: LanguageModel\n settings?: CallSettings\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n private abortController?: AbortController\n\n protected async generateAnswer(stream: PassThrough): Promise<void> {\n const abortController = new AbortController()\n this.abortController = abortController\n const signal = this.abortController.signal\n let skipAnswer = false\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n // Generate response using AI SDK\n const result = streamText({\n model: this.options.model,\n messages: this.buildMessages(),\n tools: this.buildTools(),\n maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,\n stopWhen: stepCountIs(5),\n onStepFinish: (step) => {\n const tools = step.toolCalls.map((toolCall) =>\n this.getTool(toolCall.toolName)\n )\n if (tools.some((t) => t?.skipAnswer)) {\n skipAnswer = true\n }\n },\n ...this.options.settings,\n abortSignal: signal,\n })\n\n for await (const textPart of result.textStream) {\n if (skipAnswer) return\n this.log(`Answer chunk: \"${textPart}\"`)\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = textPart.indexOf(extractOptions.startTag)\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = textPart.slice(0, startTagIndex).trimEnd()\n stream.write(messagePart)\n continue\n }\n } else {\n // Extracting, don't write to stream\n continue\n }\n }\n\n // Send chunk\n stream.write(textPart)\n }\n if (skipAnswer) return\n\n const fullText = await result.text\n const { message, metadata } = this.extract(fullText)\n\n // Emit message\n this.addAssistantMessage(message, metadata)\n this.abortController = undefined\n } catch (error: any) {\n if (abortController === this.abortController) {\n console.error('[AiSdkAgent] Error answering:', error)\n }\n }\n }\n\n private buildMessages(): ModelMessage[] {\n return this.conversation.map((message): ModelMessage => {\n switch (message.role) {\n case 'user':\n case 'assistant':\n case 'system':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n role: 'assistant',\n content: [\n {\n type: 'tool-call',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n input: JSON.parse(message.parameters),\n },\n ],\n }\n case 'tool_result':\n return {\n role: 'tool',\n content: [\n {\n type: 'tool-result',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n output: {\n type: 'json',\n value: JSON.parse(message.output),\n },\n },\n ],\n }\n }\n })\n }\n\n private buildTools() {\n const tools: ToolSet = {}\n\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return tools\n\n this.tools.forEach((t) => {\n tools[t.name] = tool({\n name: t.name,\n description: t.description,\n inputSchema: t.inputSchema || z.object({}),\n execute: (args, { toolCallId }) =>\n this.executeTool({\n role: 'tool_call',\n toolCallId,\n toolName: t.name,\n parameters: JSON.stringify(args),\n }),\n })\n })\n return tools\n }\n\n cancel() {\n if (!this.abortController) return\n this.log('Cancel')\n this.abortController.abort()\n this.abortController = undefined\n }\n}\n"],"mappings":"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","names":[]}
1
+ {"version":3,"sources":["../src/AiSdkAgent.ts"],"sourcesContent":["import { Agent, AgentOptions } from '@micdrop/server'\nimport {\n CallSettings,\n LanguageModel,\n ModelMessage,\n stepCountIs,\n streamText,\n tool,\n ToolSet,\n} from 'ai'\nimport { PassThrough } from 'stream'\nimport { z } from 'zod'\n\nexport interface AiSdkAgentOptions extends AgentOptions {\n model: LanguageModel\n settings?: CallSettings\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n private abortController?: AbortController\n\n protected async generateAnswer(stream: PassThrough): Promise<void> {\n const abortController = new AbortController()\n this.abortController = abortController\n const signal = this.abortController.signal\n let skipAnswer = false\n\n // Prepare extracting\n let extracting = false\n const extractOptions = this.getExtractOptions()\n\n try {\n // Generate response using AI SDK\n const result = streamText({\n model: this.options.model,\n messages: this.buildMessages(),\n tools: this.buildTools(),\n maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,\n stopWhen: stepCountIs(5),\n onStepFinish: (step) => {\n const tools = step.toolCalls.map((toolCall) =>\n this.getTool(toolCall.toolName)\n )\n if (tools.some((t) => t?.skipAnswer)) {\n skipAnswer = true\n }\n },\n ...this.options.settings,\n abortSignal: signal,\n })\n\n for await (const textPart of result.textStream) {\n if (skipAnswer) return\n this.log(`Answer chunk: \"${textPart}\"`)\n\n // Extracting value?\n if (extractOptions) {\n if (!extracting) {\n const startTagIndex = textPart.indexOf(extractOptions.startTag)\n if (startTagIndex !== -1) {\n extracting = true\n const messagePart = textPart.slice(0, startTagIndex).trimEnd()\n stream.write(messagePart)\n continue\n }\n } else {\n // Extracting, don't write to stream\n continue\n }\n }\n\n // Send chunk\n stream.write(textPart)\n }\n if (skipAnswer) return\n\n const fullText = await result.text\n const { message, metadata } = this.extract(fullText)\n\n // Emit message\n this.addAssistantMessage(message, metadata)\n this.abortController = undefined\n } catch (error: any) {\n if (abortController === this.abortController) {\n console.error('[AiSdkAgent] Error answering:', error)\n this.log('Generation failed, giving up')\n this.emit('Failed')\n }\n }\n }\n\n private buildMessages(): ModelMessage[] {\n return this.conversation.map((message): ModelMessage => {\n switch (message.role) {\n case 'user':\n case 'assistant':\n case 'system':\n return {\n role: message.role,\n content: message.content,\n }\n case 'tool_call':\n return {\n role: 'assistant',\n content: [\n {\n type: 'tool-call',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n input: JSON.parse(message.parameters),\n },\n ],\n }\n case 'tool_result':\n return {\n role: 'tool',\n content: [\n {\n type: 'tool-result',\n toolCallId: message.toolCallId,\n toolName: message.toolName,\n output: {\n type: 'json',\n value: JSON.parse(message.output),\n },\n },\n ],\n }\n }\n })\n }\n\n private buildTools() {\n const tools: ToolSet = {}\n\n // Disable tools if first message\n const enableTools = this.conversation.length > 1\n if (!enableTools) return tools\n\n this.tools.forEach((t) => {\n tools[t.name] = tool({\n description: t.description,\n inputSchema: (t.inputSchema || z.object({})) as z.ZodObject,\n execute: (args: any, { toolCallId }: { toolCallId: string }) =>\n this.executeTool({\n role: 'tool_call',\n toolCallId,\n toolName: t.name,\n parameters: JSON.stringify(args),\n }),\n })\n })\n return tools\n }\n\n cancel() {\n if (!this.abortController) return\n this.log('Cancel')\n this.abortController.abort()\n this.abortController = undefined\n }\n}\n"],"mappings":"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","names":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@micdrop/ai-sdk",
3
- "version": "1.0.5",
3
+ "version": "1.0.7",
4
4
  "description": "AI SDK implementation for @micdrop/server",
5
5
  "author": "Lonestone",
6
6
  "license": "MIT",
@@ -19,7 +19,7 @@
19
19
  ],
20
20
  "repository": {
21
21
  "type": "git",
22
- "url": "git+https://github.com/lonestone/micdrop.git",
22
+ "url": "git+https://github.com/Godefroy/micdrop.git",
23
23
  "directory": "packages/ai-sdk"
24
24
  },
25
25
  "publishConfig": {
@@ -34,15 +34,15 @@
34
34
  "ai-sdk"
35
35
  ],
36
36
  "dependencies": {
37
- "ai": "^5.0.14"
37
+ "ai": "^6.0.0"
38
38
  },
39
39
  "peerDependencies": {
40
40
  "@micdrop/server": "*",
41
41
  "zod": "^4"
42
42
  },
43
43
  "devDependencies": {
44
- "@types/node": "^22.13.4",
45
- "tsup": "^8.3.6",
46
- "typescript": "^5.7.3"
44
+ "@types/node": "^22.19.13",
45
+ "tsup": "^8.5.1",
46
+ "typescript": "^5.9.3"
47
47
  }
48
48
  }