Merge remote-tracking branch 'origin/main' into v2

Author: MyPrototypeWhat

package.json

@@ -110,7 +110,7 @@
     "@aws-sdk/client-bedrock-runtime": "^3.840.0",
     "@aws-sdk/client-s3": "^3.840.0",
     "@biomejs/biome": "2.2.4",
-    "@cherrystudio/ai-core": "workspace:^1.0.0-alpha.16",
+    "@cherrystudio/ai-core": "workspace:^1.0.0-alpha.17",
     "@cherrystudio/embedjs": "^0.1.31",
     "@cherrystudio/embedjs-libsql": "^0.1.31",
     "@cherrystudio/embedjs-loader-csv": "^0.1.31",
@@ -338,7 +338,7 @@
     "tsx": "^4.20.3",
     "turndown-plugin-gfm": "^1.0.2",
     "tw-animate-css": "^1.3.8",
-    "typescript": "^5.8.2",
+    "typescript": "~5.8.2",
     "undici": "6.21.2",
     "unified": "^11.0.5",
     "uuid": "^10.0.0",

packages/aiCore/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cherrystudio/ai-core",
-  "version": "1.0.0-alpha.16",
+  "version": "1.0.0-alpha.17",
   "description": "Cherry Studio AI Core - Unified AI Provider Interface Based on Vercel AI SDK",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

packages/aiCore/src/core/options/factory.ts

@@ -59,7 +59,7 @@ export function createGoogleOptions(options: ExtractProviderOptions<'google'>) {
 /**
  * 创建OpenRouter供应商选项的便捷函数
  */
-export function createOpenRouterOptions(options: ExtractProviderOptions<'openrouter'>) {
+export function createOpenRouterOptions(options: ExtractProviderOptions<'openrouter'> | Record<string, any>) {
   return createProviderOptions('openrouter', options)
 }
 

packages/aiCore/src/core/options/openrouter.ts

@@ -2,9 +2,8 @@ import { type AnthropicProviderOptions } from '@ai-sdk/anthropic'
 import { type GoogleGenerativeAIProviderOptions } from '@ai-sdk/google'
 import { type OpenAIResponsesProviderOptions } from '@ai-sdk/openai'
 import { type SharedV2ProviderMetadata } from '@ai-sdk/provider'
-
-import { type OpenRouterProviderOptions } from './openrouter'
-import { type XaiProviderOptions } from './xai'
+import { type XaiProviderOptions } from '@ai-sdk/xai'
+import { type OpenRouterProviderOptions } from '@openrouter/ai-sdk-provider'
 
 export type ProviderOptions<T extends keyof SharedV2ProviderMetadata> = SharedV2ProviderMetadata[T]
 

packages/aiCore/src/core/options/types.ts

@@ -7,5 +7,9 @@ export const BUILT_IN_PLUGIN_PREFIX = 'built-in:'
 export { googleToolsPlugin } from './googleToolsPlugin'
 export { createLoggingPlugin } from './logging'
 export { createPromptToolUsePlugin } from './toolUsePlugin/promptToolUsePlugin'
-export type { PromptToolUseConfig, ToolUseRequestContext, ToolUseResult } from './toolUsePlugin/type'
-export { webSearchPlugin } from './webSearchPlugin'
+export type {
+  PromptToolUseConfig,
+  ToolUseRequestContext,
+  ToolUseResult
+} from './toolUsePlugin/type'
+export { webSearchPlugin, type WebSearchPluginConfig } from './webSearchPlugin'

packages/aiCore/src/core/options/xai.ts

@@ -3,13 +3,16 @@ import type { google } from '@ai-sdk/google'
 import type { openai } from '@ai-sdk/openai'
 
 import type { ProviderOptionsMap } from '../../../options/types'
+import type { OpenRouterSearchConfig } from './openrouter'
 
 /**
  * 从 AI SDK 的工具函数中提取参数类型，以确保类型安全。
  */
-type OpenAISearchConfig = Parameters<typeof openai.tools.webSearchPreview>[0]
-type AnthropicSearchConfig = Parameters<typeof anthropic.tools.webSearch_20250305>[0]
-type GoogleSearchConfig = Parameters<typeof google.tools.googleSearch>[0]
+export type OpenAISearchConfig = NonNullable<Parameters<typeof openai.tools.webSearch>[0]>
+export type OpenAISearchPreviewConfig = NonNullable<Parameters<typeof openai.tools.webSearchPreview>[0]>
+export type AnthropicSearchConfig = NonNullable<Parameters<typeof anthropic.tools.webSearch_20250305>[0]>
+export type GoogleSearchConfig = NonNullable<Parameters<typeof google.tools.googleSearch>[0]>
+export type XAISearchConfig = NonNullable<ProviderOptionsMap['xai']['searchParameters']>
 
 /**
  * 插件初始化时接收的完整配置对象
@@ -18,10 +21,12 @@ type GoogleSearchConfig = Parameters<typeof google.tools.googleSearch>[0]
  */
 export interface WebSearchPluginConfig {
   openai?: OpenAISearchConfig
+  'openai-chat'?: OpenAISearchPreviewConfig
   anthropic?: AnthropicSearchConfig
   xai?: ProviderOptionsMap['xai']['searchParameters']
   google?: GoogleSearchConfig
   'google-vertex'?: GoogleSearchConfig
+  openrouter?: OpenRouterSearchConfig
 }
 
 /**
@@ -31,6 +36,7 @@ export const DEFAULT_WEB_SEARCH_CONFIG: WebSearchPluginConfig = {
   google: {},
   'google-vertex': {},
   openai: {},
+  'openai-chat': {},
   xai: {
     mode: 'on',
     returnCitations: true,
@@ -39,6 +45,14 @@ export const DEFAULT_WEB_SEARCH_CONFIG: WebSearchPluginConfig = {
   },
   anthropic: {
     maxUses: 5
+  },
+  openrouter: {
+    plugins: [
+      {
+        id: 'web',
+        max_results: 5
+      }
+    ]
   }
 }
 

packages/aiCore/src/core/plugins/built-in/index.ts

@@ -6,7 +6,7 @@ import { anthropic } from '@ai-sdk/anthropic'
 import { google } from '@ai-sdk/google'
 import { openai } from '@ai-sdk/openai'
 
-import { createXaiOptions, mergeProviderOptions } from '../../../options'
+import { createOpenRouterOptions, createXaiOptions, mergeProviderOptions } from '../../../options'
 import { definePlugin } from '../../'
 import type { AiRequestContext } from '../../types'
 import type { WebSearchPluginConfig } from './helper'
@@ -32,6 +32,13 @@ export const webSearchPlugin = (config: WebSearchPluginConfig = DEFAULT_WEB_SEAR
           }
           break
         }
+        case 'openai-chat': {
+          if (config['openai-chat']) {
+            if (!params.tools) params.tools = {}
+            params.tools.web_search_preview = openai.tools.webSearchPreview(config['openai-chat'])
+          }
+          break
+        }
 
         case 'anthropic': {
           if (config.anthropic) {
@@ -57,6 +64,14 @@ export const webSearchPlugin = (config: WebSearchPluginConfig = DEFAULT_WEB_SEAR
           }
           break
         }
+
+        case 'openrouter': {
+          if (config.openrouter) {
+            const searchOptions = createOpenRouterOptions(config.openrouter)
+            params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
+          }
+          break
+        }
       }
 
       return params

packages/aiCore/src/core/plugins/built-in/webSearchPlugin/helper.ts

@@ -0,0 +1,26 @@
+export type OpenRouterSearchConfig = {
+  plugins?: Array<{
+    id: 'web'
+    /**
+     * Maximum number of search results to include (default: 5)
+     */
+    max_results?: number
+    /**
+     * Custom search prompt to guide the search query
+     */
+    search_prompt?: string
+  }>
+  /**
+   * Built-in web search options for models that support native web search
+   */
+  web_search_options?: {
+    /**
+     * Maximum number of search results to include
+     */
+    max_results?: number
+    /**
+     * Custom search prompt to guide the search query
+     */
+    search_prompt?: string
+  }
+}