@seandong/seno 0.1.7 → 0.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/dist/agent/conversation.d.ts +19 -3
- package/dist/agent/conversation.js +40 -9
- package/dist/agent/conversation.js.map +1 -1
- package/dist/agent/loop.d.ts +3 -0
- package/dist/agent/loop.js +27 -15
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/session.js +1 -7
- package/dist/agent/session.js.map +1 -1
- package/dist/cli/commands.d.ts +2 -0
- package/dist/cli/commands.js +33 -353
- package/dist/cli/commands.js.map +1 -1
- package/dist/cli/logger.d.ts +55 -7
- package/dist/cli/logger.js +152 -16
- package/dist/cli/logger.js.map +1 -1
- package/dist/cli/output.d.ts +1 -5
- package/dist/cli/output.js +29 -59
- package/dist/cli/output.js.map +1 -1
- package/dist/cli/prompt.js +7 -5
- package/dist/cli/prompt.js.map +1 -1
- package/dist/cli/readline-wrapper.d.ts +44 -0
- package/dist/cli/readline-wrapper.js +80 -0
- package/dist/cli/readline-wrapper.js.map +1 -0
- package/dist/cli/repl.js +23 -47
- package/dist/cli/repl.js.map +1 -1
- package/dist/commands/init.js +8 -2
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/model.js +8 -2
- package/dist/commands/model.js.map +1 -1
- package/dist/commands/plugin-init.d.ts +24 -0
- package/dist/commands/plugin-init.js +313 -0
- package/dist/commands/plugin-init.js.map +1 -0
- package/dist/commands/server.d.ts +39 -0
- package/dist/commands/server.js +102 -0
- package/dist/commands/server.js.map +1 -0
- package/dist/config/manager.d.ts +14 -0
- package/dist/config/manager.js +151 -13
- package/dist/config/manager.js.map +1 -1
- package/dist/config/types.d.ts +15 -0
- package/dist/errors.d.ts +20 -3
- package/dist/errors.js +20 -5
- package/dist/errors.js.map +1 -1
- package/dist/i18n/strings.d.ts +44 -0
- package/dist/i18n/strings.js +46 -0
- package/dist/i18n/strings.js.map +1 -0
- package/dist/index.js +52 -18
- package/dist/index.js.map +1 -1
- package/dist/llm/anthropic.d.ts +0 -9
- package/dist/llm/anthropic.js +9 -62
- package/dist/llm/anthropic.js.map +1 -1
- package/dist/llm/error-handler.d.ts +28 -0
- package/dist/llm/error-handler.js +93 -0
- package/dist/llm/error-handler.js.map +1 -0
- package/dist/llm/openai-codex.js +15 -61
- package/dist/llm/openai-codex.js.map +1 -1
- package/dist/llm/openai.js +10 -57
- package/dist/llm/openai.js.map +1 -1
- package/dist/mcp/bridge.js.map +1 -1
- package/dist/mcp/manager.d.ts +4 -2
- package/dist/mcp/manager.js +36 -12
- package/dist/mcp/manager.js.map +1 -1
- package/dist/prompts/system.js +2 -1
- package/dist/prompts/system.js.map +1 -1
- package/dist/skills/registry.js.map +1 -1
- package/dist/skills/sync.js +3 -1
- package/dist/skills/sync.js.map +1 -1
- package/dist/tools/plugin-init.d.ts +6 -0
- package/dist/tools/plugin-init.js +46 -0
- package/dist/tools/plugin-init.js.map +1 -0
- package/dist/tools/registry.js +11 -2
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/server.d.ts +13 -0
- package/dist/tools/server.js +151 -0
- package/dist/tools/server.js.map +1 -0
- package/dist/tools/shell.js +1 -3
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/skills-sync.d.ts +6 -0
- package/dist/tools/skills-sync.js +39 -0
- package/dist/tools/skills-sync.js.map +1 -0
- package/dist/tools/ssh.js.map +1 -1
- package/dist/utils/retry.js.map +1 -1
- package/dist/utils/text.d.ts +45 -0
- package/dist/utils/text.js +95 -0
- package/dist/utils/text.js.map +1 -0
- package/package.json +23 -5
package/dist/llm/anthropic.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Anthropic from '@anthropic-ai/sdk';
|
|
2
2
|
import { logger } from '../cli/logger.js';
|
|
3
|
-
import { LLMError } from '../errors.js';
|
|
4
3
|
import { withRetry } from '../utils/retry.js';
|
|
4
|
+
import { classifyLLMError, isRetryableError } from './error-handler.js';
|
|
5
5
|
const DEFAULT_MODEL = 'claude-sonnet-4-20250514';
|
|
6
6
|
const DEFAULT_MAX_TOKENS = 8192;
|
|
7
7
|
/**
|
|
@@ -50,11 +50,17 @@ export class AnthropicProvider {
|
|
|
50
50
|
maxRetries: 3,
|
|
51
51
|
baseDelayMs: 1000,
|
|
52
52
|
maxDelayMs: 8000,
|
|
53
|
-
shouldRetry: (e) =>
|
|
53
|
+
shouldRetry: (e) => isRetryableError(e),
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
56
|
catch (error) {
|
|
57
|
-
yield {
|
|
57
|
+
yield {
|
|
58
|
+
type: 'error',
|
|
59
|
+
error: classifyLLMError(error, {
|
|
60
|
+
authMessage: 'API 认证失败,请检查 API Key 配置 (seno init)',
|
|
61
|
+
serviceName: 'Anthropic API',
|
|
62
|
+
}),
|
|
63
|
+
};
|
|
58
64
|
return;
|
|
59
65
|
}
|
|
60
66
|
// 2. 处理流式事件(流式阶段不重试)
|
|
@@ -126,64 +132,5 @@ export class AnthropicProvider {
|
|
|
126
132
|
};
|
|
127
133
|
}
|
|
128
134
|
}
|
|
129
|
-
/**
|
|
130
|
-
* 判断 API 错误是否可重试
|
|
131
|
-
* 429 Rate Limit、5xx Server Error、网络错误可重试
|
|
132
|
-
*/
|
|
133
|
-
isRetryableError(error) {
|
|
134
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
135
|
-
const status = error?.status;
|
|
136
|
-
if (status === 429 ||
|
|
137
|
-
status === 500 ||
|
|
138
|
-
status === 502 ||
|
|
139
|
-
status === 503) {
|
|
140
|
-
return true;
|
|
141
|
-
}
|
|
142
|
-
const message = error instanceof Error ? error.message : String(error);
|
|
143
|
-
if (message.includes('fetch') ||
|
|
144
|
-
message.includes('network') ||
|
|
145
|
-
message.includes('ECONNREFUSED') ||
|
|
146
|
-
message.includes('ETIMEDOUT')) {
|
|
147
|
-
return true;
|
|
148
|
-
}
|
|
149
|
-
return false;
|
|
150
|
-
}
|
|
151
|
-
/**
|
|
152
|
-
* 将原始错误转换为 LLMError,提供用户友好的错误信息
|
|
153
|
-
*/
|
|
154
|
-
classifyError(error) {
|
|
155
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
156
|
-
const status = error?.status;
|
|
157
|
-
const message = error instanceof Error ? error.message : String(error);
|
|
158
|
-
switch (status) {
|
|
159
|
-
case 401:
|
|
160
|
-
return new LLMError('API 认证失败,请检查 API Key 配置 (seno init)', 401, false);
|
|
161
|
-
case 400: {
|
|
162
|
-
// context length exceeded 保留原始消息,由 agent loop 处理
|
|
163
|
-
if (message.includes('context') ||
|
|
164
|
-
message.includes('too long') ||
|
|
165
|
-
message.includes('max tokens') ||
|
|
166
|
-
message.includes('too many')) {
|
|
167
|
-
return new LLMError(message, 400, false);
|
|
168
|
-
}
|
|
169
|
-
return new LLMError(`请求参数错误: ${message}`, 400, false);
|
|
170
|
-
}
|
|
171
|
-
case 429:
|
|
172
|
-
return new LLMError('API 请求频率超限,已重试仍失败', 429, true);
|
|
173
|
-
case 500:
|
|
174
|
-
case 502:
|
|
175
|
-
case 503:
|
|
176
|
-
return new LLMError(`Anthropic API 服务暂时不可用 (${status}),已重试仍失败`, status, true);
|
|
177
|
-
default: {
|
|
178
|
-
if (message.includes('fetch') ||
|
|
179
|
-
message.includes('network') ||
|
|
180
|
-
message.includes('ECONNREFUSED') ||
|
|
181
|
-
message.includes('ETIMEDOUT')) {
|
|
182
|
-
return new LLMError('网络连接失败,请检查网络', undefined, true);
|
|
183
|
-
}
|
|
184
|
-
return new LLMError(message, status);
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
}
|
|
188
135
|
}
|
|
189
136
|
//# sourceMappingURL=anthropic.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/llm/anthropic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/llm/anthropic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { LLMError } from '../errors.js';
|
|
2
|
+
/**
|
|
3
|
+
* 通用 LLM 错误分类
|
|
4
|
+
*
|
|
5
|
+
* 从原始 API 错误中提取 HTTP 状态码、错误消息和结构化错误码,
|
|
6
|
+
* 转换为统一的 LLMError。各 Provider 可直接使用,或在此基础上
|
|
7
|
+
* 覆盖特定的错误消息(如 auth 提示信息)。
|
|
8
|
+
*/
|
|
9
|
+
export declare function classifyLLMError(error: unknown, options?: {
|
|
10
|
+
/** 自定义 401 错误消息 */
|
|
11
|
+
authMessage?: string;
|
|
12
|
+
/** 自定义服务名称(用于 5xx 错误消息) */
|
|
13
|
+
serviceName?: string;
|
|
14
|
+
}): LLMError;
|
|
15
|
+
/**
|
|
16
|
+
* 判断 HTTP 状态码是否可重试
|
|
17
|
+
* 429 Rate Limit、5xx Server Error 可重试
|
|
18
|
+
*/
|
|
19
|
+
export declare function isRetryableStatusCode(statusCode: number): boolean;
|
|
20
|
+
/**
|
|
21
|
+
* 判断原始错误是否可重试
|
|
22
|
+
* 支持 HTTP 状态码和网络错误两类
|
|
23
|
+
*/
|
|
24
|
+
export declare function isRetryableError(error: unknown): boolean;
|
|
25
|
+
/**
|
|
26
|
+
* 判断错误是否为网络相关错误
|
|
27
|
+
*/
|
|
28
|
+
export declare function isNetworkError(error: unknown): boolean;
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { LLMError } from '../errors.js';
|
|
2
|
+
/**
|
|
3
|
+
* 通用 LLM 错误分类
|
|
4
|
+
*
|
|
5
|
+
* 从原始 API 错误中提取 HTTP 状态码、错误消息和结构化错误码,
|
|
6
|
+
* 转换为统一的 LLMError。各 Provider 可直接使用,或在此基础上
|
|
7
|
+
* 覆盖特定的错误消息(如 auth 提示信息)。
|
|
8
|
+
*/
|
|
9
|
+
export function classifyLLMError(error, options) {
|
|
10
|
+
const status = extractStatusCode(error);
|
|
11
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
12
|
+
const errorCode = extractErrorCode(error);
|
|
13
|
+
const authMsg = options?.authMessage ?? 'API 认证失败,请检查配置';
|
|
14
|
+
const serviceName = options?.serviceName ?? 'LLM API';
|
|
15
|
+
switch (status) {
|
|
16
|
+
case 401:
|
|
17
|
+
return new LLMError(authMsg, 'AUTH_FAILED', 401, false);
|
|
18
|
+
case 400: {
|
|
19
|
+
if (isContextLengthError(message, errorCode)) {
|
|
20
|
+
return new LLMError(message, 'CONTEXT_LENGTH_EXCEEDED', 400, false);
|
|
21
|
+
}
|
|
22
|
+
return new LLMError(`请求参数错误: ${message}`, 'UNKNOWN', 400, false);
|
|
23
|
+
}
|
|
24
|
+
case 429:
|
|
25
|
+
return new LLMError('API 请求频率超限,已重试仍失败', 'RATE_LIMITED', 429, true);
|
|
26
|
+
case 500:
|
|
27
|
+
case 502:
|
|
28
|
+
case 503:
|
|
29
|
+
return new LLMError(`${serviceName} 服务暂时不可用 (${status}),已重试仍失败`, 'SERVER_ERROR', status, true);
|
|
30
|
+
default: {
|
|
31
|
+
if (isNetworkError(error)) {
|
|
32
|
+
return new LLMError('网络连接失败,请检查网络', 'NETWORK_ERROR', undefined, true);
|
|
33
|
+
}
|
|
34
|
+
return new LLMError(message, 'UNKNOWN', status);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* 判断 HTTP 状态码是否可重试
|
|
40
|
+
* 429 Rate Limit、5xx Server Error 可重试
|
|
41
|
+
*/
|
|
42
|
+
export function isRetryableStatusCode(statusCode) {
|
|
43
|
+
return statusCode === 429 || statusCode === 500 || statusCode === 502 || statusCode === 503;
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* 判断原始错误是否可重试
|
|
47
|
+
* 支持 HTTP 状态码和网络错误两类
|
|
48
|
+
*/
|
|
49
|
+
export function isRetryableError(error) {
|
|
50
|
+
const status = extractStatusCode(error);
|
|
51
|
+
if (status !== undefined && isRetryableStatusCode(status)) {
|
|
52
|
+
return true;
|
|
53
|
+
}
|
|
54
|
+
return isNetworkError(error);
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* 判断错误是否为网络相关错误
|
|
58
|
+
*/
|
|
59
|
+
export function isNetworkError(error) {
|
|
60
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
61
|
+
return (message.includes('fetch') ||
|
|
62
|
+
message.includes('network') ||
|
|
63
|
+
message.includes('ECONNREFUSED') ||
|
|
64
|
+
message.includes('ETIMEDOUT'));
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* 判断是否为 context length exceeded 错误
|
|
68
|
+
*/
|
|
69
|
+
function isContextLengthError(message, errorCode) {
|
|
70
|
+
// OpenAI SDK 结构化错误码
|
|
71
|
+
if (errorCode === 'context_length_exceeded')
|
|
72
|
+
return true;
|
|
73
|
+
// 字符串匹配 fallback(各 Provider 错误消息格式不同)
|
|
74
|
+
return (message.includes('context') ||
|
|
75
|
+
message.includes('too long') ||
|
|
76
|
+
message.includes('max tokens') ||
|
|
77
|
+
message.includes('too many'));
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* 从错误对象中提取 HTTP 状态码
|
|
81
|
+
*/
|
|
82
|
+
function extractStatusCode(error) {
|
|
83
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
84
|
+
return error?.status;
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* 从错误对象中提取结构化错误码(如 OpenAI error.code)
|
|
88
|
+
*/
|
|
89
|
+
function extractErrorCode(error) {
|
|
90
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
91
|
+
return error?.code;
|
|
92
|
+
}
|
|
93
|
+
//# sourceMappingURL=error-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/llm/error-handler.ts"],"names":[],"mappings":"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"}
|
package/dist/llm/openai-codex.js
CHANGED
|
@@ -8,6 +8,7 @@ import ora from 'ora';
|
|
|
8
8
|
import { logger } from '../cli/logger.js';
|
|
9
9
|
import { LLMError } from '../errors.js';
|
|
10
10
|
import { withRetry } from '../utils/retry.js';
|
|
11
|
+
import { classifyLLMError, isRetryableError } from './error-handler.js';
|
|
11
12
|
// ─── Codex OAuth Auth ──────────────────────────────────────
|
|
12
13
|
const CODEX_AUTH_FILE = join(homedir(), '.codex', 'auth.json');
|
|
13
14
|
const CODEX_TOKEN_URL = 'https://auth.openai.com/oauth/token';
|
|
@@ -46,7 +47,9 @@ async function installCodexCli() {
|
|
|
46
47
|
return true;
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
|
-
catch {
|
|
50
|
+
catch {
|
|
51
|
+
/* fall through */
|
|
52
|
+
}
|
|
50
53
|
spinner.fail('@openai/codex 安装失败');
|
|
51
54
|
console.log(chalk.gray(' 手动安装: npm install -g @openai/codex'));
|
|
52
55
|
return false;
|
|
@@ -231,11 +234,17 @@ export class OpenAICodexProvider {
|
|
|
231
234
|
maxRetries: 3,
|
|
232
235
|
baseDelayMs: 1000,
|
|
233
236
|
maxDelayMs: 8000,
|
|
234
|
-
shouldRetry:
|
|
237
|
+
shouldRetry: isRetryableError,
|
|
235
238
|
});
|
|
236
239
|
}
|
|
237
240
|
catch (error) {
|
|
238
|
-
yield {
|
|
241
|
+
yield {
|
|
242
|
+
type: 'error',
|
|
243
|
+
error: classifyLLMError(error, {
|
|
244
|
+
authMessage: 'OAuth Token 认证失败,请运行 /model auth 重新授权',
|
|
245
|
+
serviceName: 'OpenAI API',
|
|
246
|
+
}),
|
|
247
|
+
};
|
|
239
248
|
return;
|
|
240
249
|
}
|
|
241
250
|
// 处理流式事件
|
|
@@ -285,11 +294,10 @@ export class OpenAICodexProvider {
|
|
|
285
294
|
const code = err?.code || '';
|
|
286
295
|
const message = err?.message || 'Responses API 请求失败';
|
|
287
296
|
// server_error 类型标记为可重试,提示用户重新输入
|
|
288
|
-
const isServerError = code === 'server_error' ||
|
|
289
|
-
message.includes('An error occurred while processing');
|
|
297
|
+
const isServerError = code === 'server_error' || message.includes('An error occurred while processing');
|
|
290
298
|
yield {
|
|
291
299
|
type: 'error',
|
|
292
|
-
error: new LLMError(message, isServerError ? 500 : undefined, isServerError),
|
|
300
|
+
error: new LLMError(message, isServerError ? 'SERVER_ERROR' : 'UNKNOWN', isServerError ? 500 : undefined, isServerError),
|
|
293
301
|
};
|
|
294
302
|
break;
|
|
295
303
|
}
|
|
@@ -386,59 +394,5 @@ function convertToResponseTools(tools) {
|
|
|
386
394
|
strict: false,
|
|
387
395
|
}));
|
|
388
396
|
}
|
|
389
|
-
//
|
|
390
|
-
/**
|
|
391
|
-
* 判断 API 错误是否可重试
|
|
392
|
-
*/
|
|
393
|
-
function isRetryableError(error) {
|
|
394
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
395
|
-
const status = error?.status;
|
|
396
|
-
if (status === 429 || status === 500 || status === 502 || status === 503) {
|
|
397
|
-
return true;
|
|
398
|
-
}
|
|
399
|
-
const message = error instanceof Error ? error.message : String(error);
|
|
400
|
-
if (message.includes('fetch') ||
|
|
401
|
-
message.includes('network') ||
|
|
402
|
-
message.includes('ECONNREFUSED') ||
|
|
403
|
-
message.includes('ETIMEDOUT')) {
|
|
404
|
-
return true;
|
|
405
|
-
}
|
|
406
|
-
return false;
|
|
407
|
-
}
|
|
408
|
-
/**
|
|
409
|
-
* 将原始错误转换为 LLMError
|
|
410
|
-
*/
|
|
411
|
-
function classifyError(error) {
|
|
412
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
413
|
-
const status = error?.status;
|
|
414
|
-
const message = error instanceof Error ? error.message : String(error);
|
|
415
|
-
switch (status) {
|
|
416
|
-
case 401:
|
|
417
|
-
return new LLMError('OAuth Token 认证失败,请运行 /model auth 重新授权', 401, false);
|
|
418
|
-
case 400: {
|
|
419
|
-
if (message.includes('context') ||
|
|
420
|
-
message.includes('too long') ||
|
|
421
|
-
message.includes('max tokens') ||
|
|
422
|
-
message.includes('too many')) {
|
|
423
|
-
return new LLMError(message, 400, false);
|
|
424
|
-
}
|
|
425
|
-
return new LLMError(`请求参数错误: ${message}`, 400, false);
|
|
426
|
-
}
|
|
427
|
-
case 429:
|
|
428
|
-
return new LLMError('API 请求频率超限,已重试仍失败', 429, true);
|
|
429
|
-
case 500:
|
|
430
|
-
case 502:
|
|
431
|
-
case 503:
|
|
432
|
-
return new LLMError(`OpenAI API 服务暂时不可用 (${status}),已重试仍失败`, status, true);
|
|
433
|
-
default: {
|
|
434
|
-
if (message.includes('fetch') ||
|
|
435
|
-
message.includes('network') ||
|
|
436
|
-
message.includes('ECONNREFUSED') ||
|
|
437
|
-
message.includes('ETIMEDOUT')) {
|
|
438
|
-
return new LLMError('网络连接失败,请检查网络', undefined, true);
|
|
439
|
-
}
|
|
440
|
-
return new LLMError(message, status);
|
|
441
|
-
}
|
|
442
|
-
}
|
|
443
|
-
}
|
|
397
|
+
// 错误分类和重试逻辑已抽取到 ./error-handler.ts
|
|
444
398
|
//# sourceMappingURL=openai-codex.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-codex.js","sourceRoot":"","sources":["../../src/llm/openai-codex.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai-codex.js","sourceRoot":"","sources":["../../src/llm/openai-codex.ts"],"names":[],"mappings":"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"}
|
package/dist/llm/openai.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import OpenAI from 'openai';
|
|
2
2
|
import { logger } from '../cli/logger.js';
|
|
3
|
-
import { LLMError } from '../errors.js';
|
|
4
3
|
import { withRetry } from '../utils/retry.js';
|
|
4
|
+
import { classifyLLMError, isRetryableError } from './error-handler.js';
|
|
5
5
|
const DEFAULT_MODEL = 'gpt-4o';
|
|
6
6
|
const DEFAULT_MAX_TOKENS = 8192;
|
|
7
7
|
/**
|
|
@@ -47,11 +47,17 @@ export class OpenAIProvider {
|
|
|
47
47
|
maxRetries: 3,
|
|
48
48
|
baseDelayMs: 1000,
|
|
49
49
|
maxDelayMs: 8000,
|
|
50
|
-
shouldRetry:
|
|
50
|
+
shouldRetry: isRetryableError,
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
53
|
catch (error) {
|
|
54
|
-
yield {
|
|
54
|
+
yield {
|
|
55
|
+
type: 'error',
|
|
56
|
+
error: classifyLLMError(error, {
|
|
57
|
+
authMessage: 'API 认证失败,请检查 API Key 或 OAuth token 配置',
|
|
58
|
+
serviceName: 'OpenAI API',
|
|
59
|
+
}),
|
|
60
|
+
};
|
|
55
61
|
return;
|
|
56
62
|
}
|
|
57
63
|
// 处理流式事件
|
|
@@ -231,58 +237,5 @@ function mapFinishReason(reason) {
|
|
|
231
237
|
return reason;
|
|
232
238
|
}
|
|
233
239
|
}
|
|
234
|
-
|
|
235
|
-
* 判断 API 错误是否可重试
|
|
236
|
-
*/
|
|
237
|
-
function isRetryableError(error) {
|
|
238
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
239
|
-
const status = error?.status;
|
|
240
|
-
if (status === 429 || status === 500 || status === 502 || status === 503) {
|
|
241
|
-
return true;
|
|
242
|
-
}
|
|
243
|
-
const message = error instanceof Error ? error.message : String(error);
|
|
244
|
-
if (message.includes('fetch') ||
|
|
245
|
-
message.includes('network') ||
|
|
246
|
-
message.includes('ECONNREFUSED') ||
|
|
247
|
-
message.includes('ETIMEDOUT')) {
|
|
248
|
-
return true;
|
|
249
|
-
}
|
|
250
|
-
return false;
|
|
251
|
-
}
|
|
252
|
-
/**
|
|
253
|
-
* 将原始错误转换为 LLMError
|
|
254
|
-
*/
|
|
255
|
-
function classifyError(error) {
|
|
256
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
257
|
-
const status = error?.status;
|
|
258
|
-
const message = error instanceof Error ? error.message : String(error);
|
|
259
|
-
switch (status) {
|
|
260
|
-
case 401:
|
|
261
|
-
return new LLMError('API 认证失败,请检查 API Key 或 OAuth token 配置', 401, false);
|
|
262
|
-
case 400: {
|
|
263
|
-
if (message.includes('context') ||
|
|
264
|
-
message.includes('too long') ||
|
|
265
|
-
message.includes('max tokens') ||
|
|
266
|
-
message.includes('too many')) {
|
|
267
|
-
return new LLMError(message, 400, false);
|
|
268
|
-
}
|
|
269
|
-
return new LLMError(`请求参数错误: ${message}`, 400, false);
|
|
270
|
-
}
|
|
271
|
-
case 429:
|
|
272
|
-
return new LLMError('API 请求频率超限,已重试仍失败', 429, true);
|
|
273
|
-
case 500:
|
|
274
|
-
case 502:
|
|
275
|
-
case 503:
|
|
276
|
-
return new LLMError(`OpenAI API 服务暂时不可用 (${status}),已重试仍失败`, status, true);
|
|
277
|
-
default: {
|
|
278
|
-
if (message.includes('fetch') ||
|
|
279
|
-
message.includes('network') ||
|
|
280
|
-
message.includes('ECONNREFUSED') ||
|
|
281
|
-
message.includes('ETIMEDOUT')) {
|
|
282
|
-
return new LLMError('网络连接失败,请检查网络', undefined, true);
|
|
283
|
-
}
|
|
284
|
-
return new LLMError(message, status);
|
|
285
|
-
}
|
|
286
|
-
}
|
|
287
|
-
}
|
|
240
|
+
// 错误分类和重试逻辑已抽取到 ./error-handler.ts
|
|
288
241
|
//# sourceMappingURL=openai.js.map
|
package/dist/llm/openai.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/llm/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAW5B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/llm/openai.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/bridge.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../src/mcp/bridge.ts"],"names":[],"mappings":"AAEA,cAAc;AACd,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAmBjC;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAmB;IACpD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,WAAW,GAAuB,EAAE,CAAC;IAE3C,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,QAAQ,EAAE,CAAC;QAC3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,WAAW,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,GAAG,UAAU,GAAG,mBAAmB,GAAG,IAAI,CAAC,IAAI,EAAE;gBACvD,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE;gBACnC,YAAY,EAAG,IAAI,CAAC,WAAuC,IAAI;oBAC7D,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE,EAAE;iBACf;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,
|
|
1
|
+
{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../src/mcp/bridge.ts"],"names":[],"mappings":"AAEA,cAAc;AACd,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAmBjC;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAmB;IACpD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,WAAW,GAAuB,EAAE,CAAC;IAE3C,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,QAAQ,EAAE,CAAC;QAC3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,WAAW,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,GAAG,UAAU,GAAG,mBAAmB,GAAG,IAAI,CAAC,IAAI,EAAE;gBACvD,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE;gBACnC,YAAY,EAAG,IAAI,CAAC,WAAuC,IAAI;oBAC7D,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE,EAAE;iBACf;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,YAAoB;IAChD,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACtD,IAAI,GAAG,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAE5B,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACtE,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAmB,EACnB,YAAoB,EACpB,IAA6B;IAE7B,MAAM,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,OAAO,EAAE,oBAAoB,YAAY,EAAE;YAC3C,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC;IAEtC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAElE,SAAS;QACT,MAAM,QAAQ,GAAG,MAGhB,CAAC;QAEF,IAAI,QAAQ,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACxD,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO;iBAC/B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC;iBAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO;gBACL,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;gBACvD,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,KAAK;aACnC,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;YAC/B,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,eAAe,UAAU,IAAI,QAAQ,MAAM,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YAC5G,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/dist/mcp/manager.d.ts
CHANGED
|
@@ -44,9 +44,11 @@ export declare class MCPManager {
|
|
|
44
44
|
getConnectedServers(): string[];
|
|
45
45
|
/**
|
|
46
46
|
* 调用指定服务器的工具
|
|
47
|
-
*
|
|
47
|
+
* 带超时保护和断线重连
|
|
48
|
+
*
|
|
49
|
+
* @param timeoutMs 超时毫秒数,默认 60s,可在 MCP server config 中覆盖
|
|
48
50
|
*/
|
|
49
|
-
callTool(serverName: string, toolName: string, args: Record<string, unknown
|
|
51
|
+
callTool(serverName: string, toolName: string, args: Record<string, unknown>, timeoutMs?: number): Promise<unknown>;
|
|
50
52
|
/**
|
|
51
53
|
* 断开所有 MCP 连接,清理子进程
|
|
52
54
|
*/
|
package/dist/mcp/manager.js
CHANGED
|
@@ -60,8 +60,24 @@ export class MCPManager {
|
|
|
60
60
|
},
|
|
61
61
|
stderr: 'pipe',
|
|
62
62
|
});
|
|
63
|
+
// 收集子进程 stderr 输出,用于连接失败时的诊断
|
|
64
|
+
let stderrOutput = '';
|
|
65
|
+
transport.stderr?.on('data', (chunk) => {
|
|
66
|
+
stderrOutput += chunk.toString();
|
|
67
|
+
});
|
|
63
68
|
const client = new Client({ name: 'seno', version: '0.1.0' }, { capabilities: {} });
|
|
64
|
-
|
|
69
|
+
try {
|
|
70
|
+
// 超时 300s,给 OAuth 浏览器授权留足时间(默认 60s 不够)
|
|
71
|
+
await client.connect(transport, { timeout: 300_000 });
|
|
72
|
+
}
|
|
73
|
+
catch (error) {
|
|
74
|
+
// 连接失败时附加 stderr 信息帮助诊断
|
|
75
|
+
if (stderrOutput.trim()) {
|
|
76
|
+
const msg = error instanceof Error ? error.message : String(error);
|
|
77
|
+
throw new Error(`${msg}\n 子进程错误输出:\n ${stderrOutput.trim()}`);
|
|
78
|
+
}
|
|
79
|
+
throw error;
|
|
80
|
+
}
|
|
65
81
|
// 发现工具列表
|
|
66
82
|
const response = await client.listTools();
|
|
67
83
|
const tools = response.tools;
|
|
@@ -115,18 +131,23 @@ export class MCPManager {
|
|
|
115
131
|
}
|
|
116
132
|
/**
|
|
117
133
|
* 调用指定服务器的工具
|
|
118
|
-
*
|
|
134
|
+
* 带超时保护和断线重连
|
|
135
|
+
*
|
|
136
|
+
* @param timeoutMs 超时毫秒数,默认 60s,可在 MCP server config 中覆盖
|
|
119
137
|
*/
|
|
120
|
-
async callTool(serverName, toolName, args) {
|
|
138
|
+
async callTool(serverName, toolName, args, timeoutMs = 60_000) {
|
|
121
139
|
const conn = this.connections.get(serverName);
|
|
122
140
|
if (!conn) {
|
|
123
141
|
throw new Error(`MCP 服务器 "${serverName}" 未连接`);
|
|
124
142
|
}
|
|
125
143
|
try {
|
|
126
|
-
return await
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
144
|
+
return await Promise.race([
|
|
145
|
+
conn.client.callTool({
|
|
146
|
+
name: toolName,
|
|
147
|
+
arguments: args,
|
|
148
|
+
}),
|
|
149
|
+
new Promise((_, reject) => setTimeout(() => reject(new Error(`MCP 工具 ${toolName} 调用超时 (${timeoutMs / 1000}s)`)), timeoutMs)),
|
|
150
|
+
]);
|
|
130
151
|
}
|
|
131
152
|
catch (error) {
|
|
132
153
|
logger.debug('mcp', `Tool call ${toolName} failed on ${serverName}, attempting reconnect...`);
|
|
@@ -135,13 +156,16 @@ export class MCPManager {
|
|
|
135
156
|
await conn.transport.close().catch(() => { });
|
|
136
157
|
this.connections.delete(serverName);
|
|
137
158
|
await this.connectServer(conn.config);
|
|
138
|
-
//
|
|
159
|
+
// 重连成功,重试调用(同样带超时保护)
|
|
139
160
|
const newConn = this.connections.get(serverName);
|
|
140
161
|
if (newConn) {
|
|
141
|
-
return await
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
162
|
+
return await Promise.race([
|
|
163
|
+
newConn.client.callTool({
|
|
164
|
+
name: toolName,
|
|
165
|
+
arguments: args,
|
|
166
|
+
}),
|
|
167
|
+
new Promise((_, reject) => setTimeout(() => reject(new Error(`MCP 工具 ${toolName} 重试调用超时 (${timeoutMs / 1000}s)`)), timeoutMs)),
|
|
168
|
+
]);
|
|
145
169
|
}
|
|
146
170
|
}
|
|
147
171
|
catch (reconnectError) {
|