chore: 升级依赖兼容最新vercel/ai库

TBXark · TBXark · commit 8203314bed24 · 2025-04-16T12:01:29.000+08:00
Signed-off-by: tbxark &lt;tbxark@outlook.com&gt;
diff --git a/package.json b/package.json
@@ -50,22 +50,22 @@
         "wrangler": "wrangler"
     },
     "devDependencies": {
-        "@antfu/eslint-config": "^3.14.0",
-        "@rollup/plugin-node-resolve": "^16.0.0",
-        "@types/node": "^22.10.7",
-        "eslint": "^9.18.0",
+        "@antfu/eslint-config": "^4.12.0",
+        "@rollup/plugin-node-resolve": "^16.0.1",
+        "@types/node": "^22.14.1",
+        "eslint": "^9.24.0",
         "eslint-plugin-format": "^1.0.1",
         "rollup-plugin-cleanup": "^3.2.1",
         "rollup-plugin-node-externals": "^8.0.0",
-        "stylelint": "^16.13.2",
-        "telegram-bot-api-types": "^8.2.0",
+        "stylelint": "^16.18.0",
+        "telegram-bot-api-types": "^9.0.0",
         "toml": "^3.0.0",
-        "tsx": "^4.19.2",
-        "typescript": "^5.7.3",
-        "vercel": "^39.3.0",
-        "vite": "^6.0.7",
-        "vite-plugin-checker": "^0.8.0",
-        "vite-plugin-dts": "^4.5.0",
-        "wrangler": "^3.102.0"
+        "tsx": "^4.19.3",
+        "typescript": "^5.8.3",
+        "vercel": "^41.6.0",
+        "vite": "^6.2.6",
+        "vite-plugin-checker": "^0.9.1",
+        "vite-plugin-dts": "^4.5.3",
+        "wrangler": "^4.11.1"
     }
 }
diff --git a/packages/apps/interpolate/package.json b/packages/apps/interpolate/package.json
@@ -6,7 +6,7 @@
     "types": "./dist/index.d.ts",
     "scripts": {
         "build": "pnpm vite build",
-        "clean": "rm -rf dist && rm -rf node_modules",
+        "clean": "rm -rf dist && rm -rf node_modules && rm -rf tsconfig.tsbuildinfo",
         "dev": "pnpm vite"
     },
     "dependencies": {
diff --git a/packages/apps/local/package.json b/packages/apps/local/package.json
@@ -8,7 +8,7 @@
         "build": "pnpm vite build && pnpm tsx scripts/docker-package.ts",
         "start": "pnpm tsx src/index.ts",
         "start:dist": "node dist/index.js",
-        "clean": "rm -rf dist && rm -rf node_modules"
+        "clean": "rm -rf dist && rm -rf node_modules && rm -rf tsconfig.tsbuildinfo"
     },
     "dependencies": {
         "@chatgpt-telegram-workers/core": "workspace:*",
diff --git a/packages/apps/vercel/package.json b/packages/apps/vercel/package.json
@@ -6,7 +6,7 @@
     "types": "./dist/index.d.ts",
     "scripts": {
         "build": "pnpm vite build",
-        "clean": "rm -rf dist && rm -rf node_modules"
+        "clean": "rm -rf dist && rm -rf node_modules && rm -rf tsconfig.tsbuildinfo"
     },
     "dependencies": {
         "@chatgpt-telegram-workers/core": "workspace:*",
diff --git a/packages/apps/workers/package.json b/packages/apps/workers/package.json
@@ -6,7 +6,7 @@
     "types": "./dist/index.d.ts",
     "scripts": {
         "build": "pnpm vite build",
-        "clean": "rm -rf dist && rm -rf node_modules",
+        "clean": "rm -rf dist && rm -rf node_modules && rm -rf tsconfig.tsbuildinfo",
         "deploy": "wrangler deploy --config ${TOML_PATH}"
     },
     "dependencies": {
diff --git a/packages/lib/core/package.json b/packages/lib/core/package.json
@@ -6,7 +6,7 @@
     "types": "./dist/index.d.ts",
     "scripts": {
         "build": "pnpm vite build",
-        "clean": "rm -rf dist && rm -rf node_modules",
+        "clean": "rm -rf dist && rm -rf node_modules && rm -rf tsconfig.tsbuildinfo",
         "test": "jest"
     },
     "dependencies": {
diff --git a/packages/lib/core/src/agent/message.ts b/packages/lib/core/src/agent/message.ts
@@ -11,28 +11,18 @@ export interface ImagePart {
     mimeType?: string;
 }
 
-export interface ToolCallPart {
-    type: 'tool-call';
-    toolCallId: string;
-    toolName: string;
-    args: unknown;
-}
-
 export interface FilePart {
     type: 'file';
     data: DataContent | URL;
 }
 
-export interface ToolResultPart {
-    type: 'tool-result';
-    toolCallId: string;
-    toolName: string;
-    result: unknown;
+export interface AnyAdapterPart<T = any> {
+    type: string;
+    data: T;
 }
 
-export type AssistantContent = string | Array<TextPart | ToolCallPart>;
+export type AssistantContent = string | Array<TextPart | FilePart | AnyAdapterPart<any>>;
 export type UserContent = string | Array<TextPart | ImagePart | FilePart>;
-export type ToolContent = Array<ToolResultPart>;
 
 export interface CoreSystemMessage {
     role: 'system';
@@ -49,7 +39,7 @@ export interface CoreUserMessage {
     content: UserContent;
 }
 
-export interface CoreToolMessage {
-    role: 'tool';
-    content: ToolContent;
+export interface AdapterMessage<R = string, T = any> {
+    role: R;
+    content: T;
 }
diff --git a/packages/lib/core/src/agent/types.ts b/packages/lib/core/src/agent/types.ts
@@ -1,8 +1,8 @@
 import type { AgentUserConfig } from '#/config';
 import type {
+    AdapterMessage,
     CoreAssistantMessage,
     CoreSystemMessage,
-    CoreToolMessage,
     CoreUserMessage,
     DataContent,
     FilePart,
@@ -18,7 +18,7 @@ export type UserContentPart = TextPart | ImagePart | FilePart;
 export type SystemMessageItem = CoreSystemMessage;
 export type UserMessageItem = CoreUserMessage;
 export type AssistantMessageItem = CoreAssistantMessage;
-export type ToolMessageItem = CoreToolMessage;
+export type ToolMessageItem = AdapterMessage<'tool', any>;
 
 export type ResponseMessage = AssistantMessageItem | ToolMessageItem;
 export type HistoryItem = SystemMessageItem | UserMessageItem | AssistantMessageItem | ToolMessageItem;
diff --git a/packages/lib/core/src/config/env.ts b/packages/lib/core/src/config/env.ts
@@ -1,6 +1,7 @@
+import type { I18n } from '#/i18n';
 import type { APIGuardBinding, KVNamespaceBinding, WorkerAIBinding } from './binding';
 import type { AgentUserConfig, AgentUserConfigKey } from './config';
-import loadI18n from '../i18n';
+import { loadI18n } from '#/i18n';
 import { AgentShareConfig, AnthropicConfig, AzureConfig, CohereConfig, DallEConfig, DeepSeekConfig, DefineKeys, EnvironmentConfig, GeminiConfig, GroqConfig, MistralConfig, OpenAIConfig, WorkersConfig, XAIConfig } from './config';
 import { ConfigMerger } from './merger';
 import { BUILD_TIMESTAMP, BUILD_VERSION } from './version';
@@ -51,7 +52,7 @@ class Environment extends EnvironmentConfig {
     BUILD_VERSION = BUILD_VERSION;
 
     // -- 基础配置 --
-    I18N = loadI18n();
+    I18N: I18n = loadI18n();
     readonly PLUGINS_ENV: Record<string, string> = {};
     readonly USER_CONFIG: AgentUserConfig = createAgentUserConfig();
     readonly CUSTOM_COMMAND: Record<string, CommandConfig> = {};
diff --git a/packages/lib/core/src/i18n/index.ts b/packages/lib/core/src/i18n/index.ts
@@ -1,10 +1,43 @@
-import type { I18n } from './types';
 import en from './en';
 import pt from './pt';
 import zhHans from './zh-hans';
 import zhHant from './zh-hant';
 
-export default function loadI18n(lang?: string): I18n {
+interface HelpI18n {
+    summary: string;
+    help: string;
+    new: string;
+    start: string;
+    img: string;
+    version: string;
+    setenv: string;
+    setenvs: string;
+    delenv: string;
+    system: string;
+    redo: string;
+    models: string;
+    echo: string;
+}
+
+export interface I18n {
+    env: {
+        system_init_message: string;
+    };
+    command: {
+        help: HelpI18n & Record<string, string>;
+        new: {
+            new_chat_start: string;
+        };
+    };
+    callback_query: {
+        open_model_list: string;
+        select_provider: string;
+        select_model: string;
+        change_model: string;
+    };
+}
+
+export function loadI18n(lang?: string): I18n {
     switch (lang?.toLowerCase()) {
         case 'cn':
         case 'zh-cn':
diff --git a/packages/lib/core/src/i18n/types.ts b/packages/lib/core/src/i18n/types.ts
diff --git a/packages/lib/core/src/index.ts b/packages/lib/core/src/index.ts
@@ -3,6 +3,7 @@ import { createRouter } from './route';
 
 export * from './agent';
 export * from './config';
+export * from './i18n';
 export * from './route';
 export * from './telegram';
 
diff --git a/packages/lib/next/package.json b/packages/lib/next/package.json
@@ -6,7 +6,7 @@
     "types": "./dist/index.d.ts",
     "scripts": {
         "build": "pnpm vite build",
-        "clean": "rm -rf dist && rm -rf node_modules"
+        "clean": "rm -rf dist && rm -rf node_modules && rm -rf tsconfig.tsbuildinfo"
     },
     "dependencies": {
         "@ai-sdk/anthropic": "^1.0.8",
diff --git a/packages/lib/next/src/index.ts b/packages/lib/next/src/index.ts
@@ -1,6 +1,6 @@
 import type { ProviderV1 } from '@ai-sdk/provider';
-import type { AgentUserConfig, ChatAgent, ChatAgentResponse, ChatStreamTextHandler, HistoryItem, LLMChatParams } from '@chatgpt-telegram-workers/core';
-import type { CoreMessage, LanguageModelV1 } from 'ai';
+import type { AgentUserConfig, ChatAgent, ChatAgentResponse, ChatStreamTextHandler, HistoryItem, LLMChatParams, ResponseMessage } from '@chatgpt-telegram-workers/core';
+import type { CoreAssistantMessage, CoreMessage, CoreToolMessage, LanguageModelV1 } from 'ai';
 import { createAnthropic } from '@ai-sdk/anthropic';
 import { createAzure } from '@ai-sdk/azure';
 import { createCohere } from '@ai-sdk/cohere';
@@ -10,6 +10,18 @@ import { createOpenAI } from '@ai-sdk/openai';
 import { streamHandler } from '@chatgpt-telegram-workers/core';
 import { generateText, streamText } from 'ai';
 
+function convertResponseToMessages(messages: (CoreAssistantMessage | CoreToolMessage)[]): ResponseMessage[] {
+    return messages.map((message) => {
+        if (message.role && message.content) {
+            return {
+                role: message.role,
+                content: message.content,
+            } as ResponseMessage;
+        }
+        return null;
+    }).filter(message => message !== null) as ResponseMessage[];
+}
+
 export async function requestChatCompletionsV2(params: { model: LanguageModelV1; prompt?: string; messages: HistoryItem[] }, onStream: ChatStreamTextHandler | null): Promise<ChatAgentResponse> {
     if (onStream !== null) {
         const stream = streamText({
@@ -20,7 +32,7 @@ export async function requestChatCompletionsV2(params: { model: LanguageModelV1;
         await streamHandler(stream.textStream, t => t, onStream);
         return {
             text: await stream.text,
-            responses: (await stream.response).messages,
+            responses: convertResponseToMessages((await stream.response).messages),
         };
     } else {
         const result = await generateText({
@@ -30,7 +42,7 @@ export async function requestChatCompletionsV2(params: { model: LanguageModelV1;
         });
         return {
             text: result.text,
-            responses: result.response.messages,
+            responses: convertResponseToMessages(result.response.messages),
         };
     }
 }
diff --git a/packages/lib/plugins/package.json b/packages/lib/plugins/package.json
@@ -6,7 +6,7 @@
     "types": "./dist/index.d.ts",
     "scripts": {
         "build": "pnpm vite build",
-        "clean": "rm -rf dist && rm -rf node_modules",
+        "clean": "rm -rf dist && rm -rf node_modules && rm -rf tsconfig.tsbuildinfo",
         "test": "jest"
     },
     "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.json b/tsconfig.json
