@micdrop/ai-sdk 2.1.0 → 2.2.0

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/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # @micdrop/ai-sdk
2
2
 
3
- [Micdrop website](https://micdrop.dev) | [Documentation](https://micdrop.dev/docs/ai-integration/provided-integrations/ai-sdk)
3
+ [Micdrop website](https://micdrop.dev) | [Documentation](https://micdrop.dev/docs/agents/ai-sdk)
4
4
 
5
5
  AI SDK implementation for [@micdrop/server](https://micdrop.dev/docs/server).
6
6
 
@@ -87,7 +87,7 @@ agent.answer().on('data', (chunk) => process.stdout.write(chunk))
87
87
  | `EndCall` | none | The agent decided that the call is over. |
88
88
  | `Failed` | none | The agent gave up generating an answer after its retries. |
89
89
 
90
- See the [Agent interface](https://micdrop.dev/docs/ai-integration/custom-integrations/custom-agent) for the full contract.
90
+ See the [Agent interface](https://micdrop.dev/docs/agents/custom) for the full contract.
91
91
 
92
92
  ### Supported Providers
93
93
 
@@ -96,12 +96,12 @@ The AI SDK Agent supports any provider compatible with the Vercel AI SDK:
96
96
  - **OpenAI**: `openai('gpt-4o')`, `openai('gpt-5.6-luna')`
97
97
  - **Anthropic**: `anthropic('claude-3-5-sonnet-20241022')`
98
98
  - **Google**: `google('gemini-1.5-pro')`, `google('gemini-1.5-flash')`
99
- - **Mistral**: `mistral('mistral-large-latest')`
99
+ - **Mistral**: `mistral('mistral-medium-latest')`
100
100
  - **And many more**: See [AI SDK Providers](https://sdk.vercel.ai/providers/ai-sdk-providers)
101
101
 
102
102
  ## Documentation
103
103
 
104
- Read full [documentation of the AI SDK integration for Micdrop](https://micdrop.dev/docs/ai-integration/provided-integrations/ai-sdk) on the [website](https://micdrop.dev).
104
+ Read full [documentation of the AI SDK integration for Micdrop](https://micdrop.dev/docs/agents/ai-sdk) on the [website](https://micdrop.dev).
105
105
 
106
106
  ## License
107
107
 
package/dist/index.js CHANGED
@@ -33,8 +33,7 @@ var FIRST_MESSAGE_PROMPT = "The call starts now.";
33
33
  var AiSdkAgent = class extends import_server.Agent {
34
34
  async generateAnswer(stream, signal) {
35
35
  let skipAnswer = false;
36
- let extracting = false;
37
- const extractOptions = this.getExtractOptions();
36
+ const write = this.answerWriter(stream);
38
37
  try {
39
38
  const result = (0, import_ai.streamText)({
40
39
  model: this.options.model,
@@ -58,20 +57,7 @@ var AiSdkAgent = class extends import_server.Agent {
58
57
  for await (const textPart of result.textStream) {
59
58
  if (skipAnswer || signal.aborted) return;
60
59
  this.log(`Answer chunk: "${textPart}"`);
61
- if (extractOptions) {
62
- if (!extracting) {
63
- const startTagIndex = textPart.indexOf(extractOptions.startTag);
64
- if (startTagIndex !== -1) {
65
- extracting = true;
66
- const messagePart = textPart.slice(0, startTagIndex).trimEnd();
67
- stream.write(messagePart);
68
- continue;
69
- }
70
- } else {
71
- continue;
72
- }
73
- }
74
- stream.write(textPart);
60
+ write(textPart);
75
61
  }
76
62
  if (skipAnswer || signal.aborted) return;
77
63
  const fullText = await result.text;
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts","../src/AiSdkAgent.ts"],"sourcesContent":["export * from './AiSdkAgent'","import { ProviderOptions } from '@ai-sdk/provider-utils'\nimport { 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 /**\n * Parameters read by a single provider, keyed by provider name, for anything\n * `settings` has no field for. `{ openai: { reasoningEffort: 'none' } }`\n * turns reasoning off, which a spoken turn needs.\n */\n providerOptions?: ProviderOptions\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nconst FIRST_MESSAGE_PROMPT = 'The call starts now.'\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n protected async generateAnswer(\n stream: PassThrough,\n signal: AbortSignal\n ): Promise<void> {\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 instructions: this.buildInstructions(),\n messages: this.buildMessages(),\n tools: this.buildTools(),\n maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,\n providerOptions: this.options.providerOptions,\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 || signal.aborted) 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 || signal.aborted) return\n\n const fullText = await result.text\n // A cancelled answer was never heard in full, it stays out of the\n // conversation\n if (signal.aborted) return\n const { message, metadata } = this.extract(fullText)\n\n // Emit message\n this.addAssistantMessage(message, metadata)\n } catch (error: any) {\n // An aborted request throws too, but that is the cancellation the base\n // asked for, not a failure to report\n if (!signal.aborted) {\n console.error('[AiSdkAgent] Error answering:', error)\n this.log('Generation failed, giving up')\n this.emit('Failed')\n }\n }\n }\n\n // The AI SDK takes the system prompt apart from the conversation\n private buildInstructions() {\n return this.conversation\n .flatMap((message) => (message.role === 'system' ? message.content : []))\n .join('\\n\\n')\n }\n\n private buildMessages(): ModelMessage[] {\n const messages = this.conversation.flatMap((message): ModelMessage | [] => {\n switch (message.role) {\n case 'system':\n return []\n case 'user':\n case 'assistant':\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 // Asked for the opening line, with nothing said yet: the SDK refuses a\n // prompt without a message, and the model needs something to answer to\n if (messages.length === 0) {\n messages.push({ role: 'user', content: FIRST_MESSAGE_PROMPT })\n }\n return messages\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"],"mappings":"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","names":[]}
1
+ {"version":3,"sources":["../src/index.ts","../src/AiSdkAgent.ts"],"sourcesContent":["export * from './AiSdkAgent'","import { ProviderOptions } from '@ai-sdk/provider-utils'\nimport { 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 /**\n * Parameters read by a single provider, keyed by provider name, for anything\n * `settings` has no field for. `{ openai: { reasoningEffort: 'none' } }`\n * turns reasoning off, which a spoken turn needs.\n */\n providerOptions?: ProviderOptions\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nconst FIRST_MESSAGE_PROMPT = 'The call starts now.'\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n protected async generateAnswer(\n stream: PassThrough,\n signal: AbortSignal\n ): Promise<void> {\n let skipAnswer = false\n\n const write = this.answerWriter(stream)\n\n try {\n // Generate response using AI SDK\n const result = streamText({\n model: this.options.model,\n instructions: this.buildInstructions(),\n messages: this.buildMessages(),\n tools: this.buildTools(),\n maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,\n providerOptions: this.options.providerOptions,\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 || signal.aborted) return\n this.log(`Answer chunk: \"${textPart}\"`)\n write(textPart)\n }\n if (skipAnswer || signal.aborted) return\n\n const fullText = await result.text\n // A cancelled answer was never heard in full, it stays out of the\n // conversation\n if (signal.aborted) return\n const { message, metadata } = this.extract(fullText)\n\n // Emit message\n this.addAssistantMessage(message, metadata)\n } catch (error: any) {\n // An aborted request throws too, but that is the cancellation the base\n // asked for, not a failure to report\n if (!signal.aborted) {\n console.error('[AiSdkAgent] Error answering:', error)\n this.log('Generation failed, giving up')\n this.emit('Failed')\n }\n }\n }\n\n // The AI SDK takes the system prompt apart from the conversation\n private buildInstructions() {\n return this.conversation\n .flatMap((message) => (message.role === 'system' ? message.content : []))\n .join('\\n\\n')\n }\n\n private buildMessages(): ModelMessage[] {\n const messages = this.conversation.flatMap((message): ModelMessage | [] => {\n switch (message.role) {\n case 'system':\n return []\n case 'user':\n case 'assistant':\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 // Asked for the opening line, with nothing said yet: the SDK refuses a\n // prompt without a message, and the model needs something to answer to\n if (messages.length === 0) {\n messages.push({ role: 'user', content: FIRST_MESSAGE_PROMPT })\n }\n return messages\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"],"mappings":"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","names":[]}
package/dist/index.mjs CHANGED
@@ -11,8 +11,7 @@ var FIRST_MESSAGE_PROMPT = "The call starts now.";
11
11
  var AiSdkAgent = class extends Agent {
12
12
  async generateAnswer(stream, signal) {
13
13
  let skipAnswer = false;
14
- let extracting = false;
15
- const extractOptions = this.getExtractOptions();
14
+ const write = this.answerWriter(stream);
16
15
  try {
17
16
  const result = streamText({
18
17
  model: this.options.model,
@@ -36,20 +35,7 @@ var AiSdkAgent = class extends Agent {
36
35
  for await (const textPart of result.textStream) {
37
36
  if (skipAnswer || signal.aborted) return;
38
37
  this.log(`Answer chunk: "${textPart}"`);
39
- if (extractOptions) {
40
- if (!extracting) {
41
- const startTagIndex = textPart.indexOf(extractOptions.startTag);
42
- if (startTagIndex !== -1) {
43
- extracting = true;
44
- const messagePart = textPart.slice(0, startTagIndex).trimEnd();
45
- stream.write(messagePart);
46
- continue;
47
- }
48
- } else {
49
- continue;
50
- }
51
- }
52
- stream.write(textPart);
38
+ write(textPart);
53
39
  }
54
40
  if (skipAnswer || signal.aborted) return;
55
41
  const fullText = await result.text;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/AiSdkAgent.ts"],"sourcesContent":["import { ProviderOptions } from '@ai-sdk/provider-utils'\nimport { 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 /**\n * Parameters read by a single provider, keyed by provider name, for anything\n * `settings` has no field for. `{ openai: { reasoningEffort: 'none' } }`\n * turns reasoning off, which a spoken turn needs.\n */\n providerOptions?: ProviderOptions\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nconst FIRST_MESSAGE_PROMPT = 'The call starts now.'\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n protected async generateAnswer(\n stream: PassThrough,\n signal: AbortSignal\n ): Promise<void> {\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 instructions: this.buildInstructions(),\n messages: this.buildMessages(),\n tools: this.buildTools(),\n maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,\n providerOptions: this.options.providerOptions,\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 || signal.aborted) 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 || signal.aborted) return\n\n const fullText = await result.text\n // A cancelled answer was never heard in full, it stays out of the\n // conversation\n if (signal.aborted) return\n const { message, metadata } = this.extract(fullText)\n\n // Emit message\n this.addAssistantMessage(message, metadata)\n } catch (error: any) {\n // An aborted request throws too, but that is the cancellation the base\n // asked for, not a failure to report\n if (!signal.aborted) {\n console.error('[AiSdkAgent] Error answering:', error)\n this.log('Generation failed, giving up')\n this.emit('Failed')\n }\n }\n }\n\n // The AI SDK takes the system prompt apart from the conversation\n private buildInstructions() {\n return this.conversation\n .flatMap((message) => (message.role === 'system' ? message.content : []))\n .join('\\n\\n')\n }\n\n private buildMessages(): ModelMessage[] {\n const messages = this.conversation.flatMap((message): ModelMessage | [] => {\n switch (message.role) {\n case 'system':\n return []\n case 'user':\n case 'assistant':\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 // Asked for the opening line, with nothing said yet: the SDK refuses a\n // prompt without a message, and the model needs something to answer to\n if (messages.length === 0) {\n messages.push({ role: 'user', content: FIRST_MESSAGE_PROMPT })\n }\n return messages\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"],"mappings":"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","names":[]}
1
+ {"version":3,"sources":["../src/AiSdkAgent.ts"],"sourcesContent":["import { ProviderOptions } from '@ai-sdk/provider-utils'\nimport { 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 /**\n * Parameters read by a single provider, keyed by provider name, for anything\n * `settings` has no field for. `{ openai: { reasoningEffort: 'none' } }`\n * turns reasoning off, which a spoken turn needs.\n */\n providerOptions?: ProviderOptions\n maxRetry?: number\n}\n\nconst DEFAULT_MAX_RETRY = 3\n\nconst FIRST_MESSAGE_PROMPT = 'The call starts now.'\n\nexport class AiSdkAgent extends Agent<AiSdkAgentOptions> {\n protected async generateAnswer(\n stream: PassThrough,\n signal: AbortSignal\n ): Promise<void> {\n let skipAnswer = false\n\n const write = this.answerWriter(stream)\n\n try {\n // Generate response using AI SDK\n const result = streamText({\n model: this.options.model,\n instructions: this.buildInstructions(),\n messages: this.buildMessages(),\n tools: this.buildTools(),\n maxRetries: this.options.maxRetry ?? DEFAULT_MAX_RETRY,\n providerOptions: this.options.providerOptions,\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 || signal.aborted) return\n this.log(`Answer chunk: \"${textPart}\"`)\n write(textPart)\n }\n if (skipAnswer || signal.aborted) return\n\n const fullText = await result.text\n // A cancelled answer was never heard in full, it stays out of the\n // conversation\n if (signal.aborted) return\n const { message, metadata } = this.extract(fullText)\n\n // Emit message\n this.addAssistantMessage(message, metadata)\n } catch (error: any) {\n // An aborted request throws too, but that is the cancellation the base\n // asked for, not a failure to report\n if (!signal.aborted) {\n console.error('[AiSdkAgent] Error answering:', error)\n this.log('Generation failed, giving up')\n this.emit('Failed')\n }\n }\n }\n\n // The AI SDK takes the system prompt apart from the conversation\n private buildInstructions() {\n return this.conversation\n .flatMap((message) => (message.role === 'system' ? message.content : []))\n .join('\\n\\n')\n }\n\n private buildMessages(): ModelMessage[] {\n const messages = this.conversation.flatMap((message): ModelMessage | [] => {\n switch (message.role) {\n case 'system':\n return []\n case 'user':\n case 'assistant':\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 // Asked for the opening line, with nothing said yet: the SDK refuses a\n // prompt without a message, and the model needs something to answer to\n if (messages.length === 0) {\n messages.push({ role: 'user', content: FIRST_MESSAGE_PROMPT })\n }\n return messages\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"],"mappings":"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","names":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@micdrop/ai-sdk",
3
- "version": "2.1.0",
3
+ "version": "2.2.0",
4
4
  "description": "AI SDK implementation for @micdrop/server",
5
5
  "author": "Godefroy de Compreignac",
6
6
  "license": "MIT",
@@ -41,7 +41,7 @@
41
41
  "ai": "^7.0.155"
42
42
  },
43
43
  "peerDependencies": {
44
- "@micdrop/server": ">=2.10.0",
44
+ "@micdrop/server": ">=2.11.0",
45
45
  "zod": "^4"
46
46
  },
47
47
  "devDependencies": {