feihong-code 0.5.1 → 0.6.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/CHANGELOG.md +465 -405
- package/README.md +59 -0
- package/dist/agent/code-writer.js +6 -3
- package/dist/agent/code-writer.js.map +1 -1
- package/dist/agent/experience.js +105 -70
- package/dist/agent/experience.js.map +1 -1
- package/dist/agent/orchestrator.js +103 -21
- package/dist/agent/orchestrator.js.map +1 -1
- package/dist/agent/planner.js +30 -7
- package/dist/agent/planner.js.map +1 -1
- package/dist/agent/prompts.js +9 -0
- package/dist/agent/prompts.js.map +1 -1
- package/dist/agent/self-heal.js +43 -13
- package/dist/agent/self-heal.js.map +1 -1
- package/dist/cli/run.js +13 -14
- package/dist/cli/run.js.map +1 -1
- package/dist/cli/version.js +1 -1
- package/dist/enterprise/audit.js +70 -11
- package/dist/enterprise/audit.js.map +1 -1
- package/dist/models/model-router.js +83 -23
- package/dist/models/model-router.js.map +1 -1
- package/dist/models/model.dto.js +25 -3
- package/dist/models/model.dto.js.map +1 -1
- package/dist/models/providers/ollama.provider.js +12 -0
- package/dist/models/providers/ollama.provider.js.map +1 -1
- package/dist/models/providers/openai-compatible.provider.js +14 -1
- package/dist/models/providers/openai-compatible.provider.js.map +1 -1
- package/dist/self-evolve/hook.js +2 -2
- package/dist/self-evolve/hook.js.map +1 -1
- package/dist/self-evolve/hook.ts +80 -0
- package/dist/self-evolve/manager.d.ts +8 -0
- package/dist/self-evolve/manager.js +401 -0
- package/dist/shared/errors.js +6 -2
- package/dist/shared/errors.js.map +1 -1
- package/dist/shared/secure-store.js +117 -0
- package/dist/shared/secure-store.js.map +1 -0
- package/dist/tools/mcp/mcp-client.js +35 -13
- package/dist/tools/mcp/mcp-client.js.map +1 -1
- package/dist/tools/shell/exec.js +47 -3
- package/dist/tools/shell/exec.js.map +1 -1
- package/dist/tools/shell/run-shell.tool.js +33 -6
- package/dist/tools/shell/run-shell.tool.js.map +1 -1
- package/dist/tools/tool.registry.js +32 -0
- package/dist/tools/tool.registry.js.map +1 -1
- package/dist/web/auth.js +143 -7
- package/dist/web/auth.js.map +1 -1
- package/dist/web/public/css/style.css +1546 -0
- package/dist/web/public/index.html +806 -3253
- package/dist/web/public/js/api.js +309 -0
- package/dist/web/public/js/app.js +1472 -0
- package/dist/web/public/js/ui.js +832 -0
- package/dist/web/public/js/utils.js +170 -0
- package/dist/web/server.js +224 -77
- package/dist/web/server.js.map +1 -1
- package/dist/web/task-queue.js +128 -10
- package/dist/web/task-queue.js.map +1 -1
- package/docs/App/344/275/277/347/224/250/350/257/264/346/230/216/344/271/246.md +299 -0
- package/docs/App/346/212/200/346/234/257/350/257/264/346/230/216/344/271/246.md +554 -0
- package/docs/SELF-EVOLVE-GUIDE.md +313 -0
- package/docs/error-codes.md +198 -0
- package/docs/screenshots/cli-demo.png +0 -0
- package/docs/screenshots/feature-comparison.png +0 -0
- package/docs/screenshots/web-console.png +0 -0
- package/docs//351/241/265/351/235/242/345/212/237/350/203/275/345/244/215/347/233/230/344/270/216/345/206/222/347/203/237/346/265/213/350/257/225/346/212/245/345/221/212.html +117 -0
- package/package.json +9 -15
- package/tool-schema.json +198 -127
- package/dist/web/public/index.html.tmp +0 -3117
- package/dist/web/public/index_new.html +0 -3196
package/dist/enterprise/audit.js
CHANGED
|
@@ -60,6 +60,25 @@ function monthFile(dir, d = new Date()) {
|
|
|
60
60
|
const ym = `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, '0')}`;
|
|
61
61
|
return (0, path_1.join)(dir, `audit-${ym}.jsonl`);
|
|
62
62
|
}
|
|
63
|
+
/**
|
|
64
|
+
* 备用审计文件:当主文件被外部进程独占锁定(Windows EPERM,如杀软/预览面板)
|
|
65
|
+
* 导致 append 失败时,降级写入 fallback,保证任务不被审计阻断(审计是记录,
|
|
66
|
+
* 不是操作的前置条件)。fallback 与主文件共享 seq/prevHash 链,仅物理分片。
|
|
67
|
+
*/
|
|
68
|
+
function fallbackFile(dir, d = new Date()) {
|
|
69
|
+
const ym = `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, '0')}`;
|
|
70
|
+
return (0, path_1.join)(dir, `audit-${ym}.fallback.jsonl`);
|
|
71
|
+
}
|
|
72
|
+
/** 跨主/备用文件取最后一条记录(取 seq 更大者,保证哈希链连续) */
|
|
73
|
+
function readLastRecordAcross(dir) {
|
|
74
|
+
const a = readLastRecord(monthFile(dir));
|
|
75
|
+
const b = readLastRecord(fallbackFile(dir));
|
|
76
|
+
if (!a)
|
|
77
|
+
return b;
|
|
78
|
+
if (!b)
|
|
79
|
+
return a;
|
|
80
|
+
return a.seq >= b.seq ? a : b;
|
|
81
|
+
}
|
|
63
82
|
/**
|
|
64
83
|
* M5 修复:读取审计文件最后一条有效记录(用于跨进程重算 seq/prevHash)。
|
|
65
84
|
* 空文件或无有效行返回 null。
|
|
@@ -214,13 +233,20 @@ function withAuditLock(dir, fn) {
|
|
|
214
233
|
}
|
|
215
234
|
}
|
|
216
235
|
}
|
|
217
|
-
/**
|
|
236
|
+
/** 列出审计目录下按时间排序的全部分片文件(含 fallback 备用分片) */
|
|
218
237
|
function auditFiles(dir) {
|
|
219
238
|
if (!(0, fs_1.existsSync)(dir))
|
|
220
239
|
return [];
|
|
221
240
|
return (0, fs_1.readdirSync)(dir)
|
|
222
|
-
.filter((f) => /^audit-\d{4}-\d{2}\.jsonl$/.test(f))
|
|
223
|
-
.sort()
|
|
241
|
+
.filter((f) => /^audit-\d{4}-\d{2}(\.fallback)?\.jsonl$/.test(f))
|
|
242
|
+
.sort((a, b) => {
|
|
243
|
+
// 主文件在前,fallback 在后(同月内保持链顺序)
|
|
244
|
+
const aFb = a.includes('.fallback') ? 1 : 0;
|
|
245
|
+
const bFb = b.includes('.fallback') ? 1 : 0;
|
|
246
|
+
if (aFb !== bFb)
|
|
247
|
+
return aFb - bFb;
|
|
248
|
+
return a.localeCompare(b);
|
|
249
|
+
})
|
|
224
250
|
.map((f) => (0, path_1.join)(dir, f));
|
|
225
251
|
}
|
|
226
252
|
function readAudit(dir) {
|
|
@@ -272,10 +298,13 @@ class AuditLog {
|
|
|
272
298
|
record(input) {
|
|
273
299
|
// M5 修复:跨进程加锁,并在锁内从文件尾部重算 seq/prevHash,
|
|
274
300
|
// 避免多进程各自维护的内存计数相互覆盖而破坏哈希链。
|
|
301
|
+
// P1.2:主文件被外部进程独占锁定(EPERM)时自动降级到 fallback 分片,
|
|
302
|
+
// 保证审计不阻断任务执行(审计是记录,不是操作前置条件)。
|
|
275
303
|
let rec;
|
|
276
304
|
withAuditLock(this.dir, () => {
|
|
277
305
|
const file = monthFile(this.dir);
|
|
278
|
-
const
|
|
306
|
+
const fbFile = fallbackFile(this.dir);
|
|
307
|
+
const last = readLastRecordAcross(this.dir);
|
|
279
308
|
const seq = last ? last.seq : 0;
|
|
280
309
|
const prevHash = last ? last.hash : GENESIS;
|
|
281
310
|
const base = {
|
|
@@ -292,18 +321,48 @@ class AuditLog {
|
|
|
292
321
|
prevHash,
|
|
293
322
|
};
|
|
294
323
|
const next = { ...base, hash: computeHash(base) };
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
(0
|
|
324
|
+
// 瞬时锁(Windows Defender/杀软扫描新写入文件)偶发 EPERM:重试 3 次,30ms 退避
|
|
325
|
+
const tryAppend = (target) => {
|
|
326
|
+
for (let attempt = 0; attempt < 3; attempt++) {
|
|
327
|
+
try {
|
|
328
|
+
(0, fs_1.mkdirSync)(this.dir, { recursive: true });
|
|
329
|
+
(0, fs_1.appendFileSync)(target, JSON.stringify(next) + '\n', 'utf8');
|
|
330
|
+
return true;
|
|
331
|
+
}
|
|
332
|
+
catch (e) {
|
|
333
|
+
if (attempt === 2) {
|
|
334
|
+
logger_1.logger.warn('审计写入重试耗尽,追加失败', {
|
|
335
|
+
file: target,
|
|
336
|
+
error: e instanceof Error ? e.message : String(e),
|
|
337
|
+
});
|
|
338
|
+
return false;
|
|
339
|
+
}
|
|
340
|
+
sleepSync(30 * (attempt + 1));
|
|
341
|
+
}
|
|
342
|
+
}
|
|
343
|
+
return false;
|
|
344
|
+
};
|
|
345
|
+
if (tryAppend(file)) {
|
|
346
|
+
this.seq = next.seq;
|
|
347
|
+
this.prevHash = next.hash;
|
|
348
|
+
rec = next;
|
|
349
|
+
}
|
|
350
|
+
else if (tryAppend(fbFile)) {
|
|
351
|
+
logger_1.logger.warn('审计主文件写入失败,已降级写入 fallback 分片', {
|
|
352
|
+
file: fbFile,
|
|
353
|
+
seq: next.seq,
|
|
354
|
+
error: 'EPERM-like lock on primary audit file',
|
|
355
|
+
});
|
|
298
356
|
this.seq = next.seq;
|
|
299
357
|
this.prevHash = next.hash;
|
|
300
358
|
rec = next;
|
|
301
359
|
}
|
|
302
|
-
|
|
303
|
-
logger_1.logger.error('
|
|
304
|
-
|
|
360
|
+
else {
|
|
361
|
+
logger_1.logger.error('审计写入失败(主文件与 fallback 均不可写,操作将被拒绝)', {
|
|
362
|
+
primary: file,
|
|
363
|
+
fallback: fbFile,
|
|
305
364
|
});
|
|
306
|
-
throw
|
|
365
|
+
throw new Error(`审计写入失败:主文件与备用文件均不可写(${file})`);
|
|
307
366
|
}
|
|
308
367
|
});
|
|
309
368
|
return rec;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit.js","sourceRoot":"","sources":["../../src/enterprise/audit.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"audit.js","sourceRoot":"","sources":["../../src/enterprise/audit.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,11 @@ exports.ModelRouter = void 0;
|
|
|
12
12
|
* - 模型性能追踪(成功/失败统计)
|
|
13
13
|
* - 自动择优(基于历史成功率)
|
|
14
14
|
* - model-stats 命令支持
|
|
15
|
+
*
|
|
16
|
+
* 模型异常自动轮换:
|
|
17
|
+
* - 上游返回 400/401/403/404(模型/鉴权类):立即轮换到下一个可用模型,不重试同一模型
|
|
18
|
+
* - 上游返回 429/500/502/503/504(瞬时/服务端):轮换下个模型并退避后重试整轮,直到任务完成或达到上限
|
|
19
|
+
* - 网络/未知错误:按可重试处理,同样触发轮换与重试
|
|
15
20
|
*/
|
|
16
21
|
const promises_1 = require("fs/promises");
|
|
17
22
|
const fs_1 = require("fs");
|
|
@@ -22,24 +27,31 @@ const openai_compatible_provider_1 = require("./providers/openai-compatible.prov
|
|
|
22
27
|
const ollama_provider_1 = require("./providers/ollama.provider");
|
|
23
28
|
const STATS_VERSION = 1;
|
|
24
29
|
const DEFAULT_STATS_FILE = 'model-stats.jsonl';
|
|
30
|
+
/** 模型/鉴权类错误:直接轮换到下一个可用模型,重试无意义 */
|
|
31
|
+
const ROTATE_ONLY_STATUS = new Set([400, 401, 403, 404]);
|
|
32
|
+
/** 其余状态码(429/500/502/503/504 等瞬时错误)均视为可退避重试 */
|
|
25
33
|
class ModelRouter {
|
|
26
34
|
providers;
|
|
27
35
|
strategy;
|
|
28
36
|
budget;
|
|
29
37
|
statsFile;
|
|
30
38
|
statsHomeDir;
|
|
39
|
+
maxRetries;
|
|
40
|
+
backoffMs;
|
|
31
41
|
statsCache = null;
|
|
32
|
-
constructor(providers, strategy, budget, statsFile = '', statsHomeDir = '') {
|
|
42
|
+
constructor(providers, strategy, budget, statsFile = '', statsHomeDir = '', maxRetries = 3, backoffMs = 1000) {
|
|
33
43
|
this.providers = providers;
|
|
34
44
|
this.strategy = strategy;
|
|
35
45
|
this.budget = budget;
|
|
36
46
|
this.statsFile = statsFile || DEFAULT_STATS_FILE;
|
|
37
47
|
this.statsHomeDir = statsHomeDir;
|
|
48
|
+
this.maxRetries = Math.max(1, maxRetries);
|
|
49
|
+
this.backoffMs = Math.max(0, backoffMs);
|
|
38
50
|
}
|
|
39
51
|
/** 从 AppConfig 构建(默认路由,联调真实模型时使用);homeDir 用于统计自动落盘 */
|
|
40
52
|
static fromConfig(cfg, statsFile) {
|
|
41
53
|
const providers = cfg.models.providers.map((p) => p.type === 'ollama' ? new ollama_provider_1.OllamaProvider(p) : new openai_compatible_provider_1.OpenAICompatibleProvider(p));
|
|
42
|
-
return new ModelRouter(providers, cfg.models.defaultStrategy, cfg.models.budgetPerTaskUsd, statsFile, cfg.app.homeDir);
|
|
54
|
+
return new ModelRouter(providers, cfg.models.defaultStrategy, cfg.models.budgetPerTaskUsd, statsFile, cfg.app.homeDir, cfg.runtime.maxRetries);
|
|
43
55
|
}
|
|
44
56
|
/** 加载性能统计缓存 */
|
|
45
57
|
async loadStats(homeDir) {
|
|
@@ -149,34 +161,82 @@ class ModelRouter {
|
|
|
149
161
|
}
|
|
150
162
|
return base;
|
|
151
163
|
}
|
|
152
|
-
/**
|
|
164
|
+
/**
|
|
165
|
+
* 从错误中提取上游 HTTP 状态码(优先 ModelError.statusCode,兼容从消息解析 "HTTP <n>")。
|
|
166
|
+
* 网络/未知错误返回 undefined。
|
|
167
|
+
*/
|
|
168
|
+
statusOf(e) {
|
|
169
|
+
if (e instanceof errors_1.ModelError)
|
|
170
|
+
return e.statusCode;
|
|
171
|
+
if (e instanceof Error) {
|
|
172
|
+
const m = /HTTP\s+(\d{3})/.exec(e.message);
|
|
173
|
+
if (m)
|
|
174
|
+
return Number(m[1]);
|
|
175
|
+
}
|
|
176
|
+
return undefined;
|
|
177
|
+
}
|
|
178
|
+
/** 该错误是否值得退避重试(模型/鉴权类 400/401/403/404 不重试,其余默认重试) */
|
|
179
|
+
isRetryable(e) {
|
|
180
|
+
const status = this.statusOf(e);
|
|
181
|
+
if (status === undefined)
|
|
182
|
+
return true; // 网络/未知错误默认可重试
|
|
183
|
+
return !ROTATE_ONLY_STATUS.has(status);
|
|
184
|
+
}
|
|
185
|
+
sleep(ms) {
|
|
186
|
+
return ms > 0 ? new Promise((r) => setTimeout(r, ms)) : Promise.resolve();
|
|
187
|
+
}
|
|
188
|
+
/**
|
|
189
|
+
* 调用并自动轮换。按状态码分类:
|
|
190
|
+
* - 400/401/403/404(模型/鉴权类):立即轮换下个可用模型,不做退避重试
|
|
191
|
+
* - 429/500/502/503/504(瞬时/服务端):轮换下个模型,整轮结束后退避重试,直到任务完成或达到上限
|
|
192
|
+
* - 网络/未知错误:按可重试处理
|
|
193
|
+
* 全部 provider 均不可用时抛出最后错误。
|
|
194
|
+
*/
|
|
153
195
|
async chat(req, tags) {
|
|
154
196
|
const order = this.rank(tags);
|
|
197
|
+
if (order.length === 0) {
|
|
198
|
+
throw new errors_1.ModelError('未配置任何可用模型 provider', 'router', 500);
|
|
199
|
+
}
|
|
200
|
+
const maxCycles = this.maxRetries;
|
|
155
201
|
let lastErr;
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
const
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
202
|
+
let lastRetryable = true;
|
|
203
|
+
for (let cycle = 0; cycle < maxCycles; cycle++) {
|
|
204
|
+
for (const p of order) {
|
|
205
|
+
const startTime = Date.now();
|
|
206
|
+
try {
|
|
207
|
+
const resp = await p.chat(req);
|
|
208
|
+
const latency = Date.now() - startTime;
|
|
209
|
+
// M6: 更新性能统计(成功记录响应模型名)
|
|
210
|
+
await this.updateStat(p.id, resp.model, true, resp.costUsd, latency);
|
|
211
|
+
if (this.budget > 0 && resp.costUsd > this.budget) {
|
|
212
|
+
logger_1.logger.warn('cost over budget', { provider: p.id, cost: resp.costUsd, budget: this.budget });
|
|
213
|
+
}
|
|
214
|
+
return resp;
|
|
215
|
+
}
|
|
216
|
+
catch (e) {
|
|
217
|
+
const latency = Date.now() - startTime;
|
|
218
|
+
// M6: 记录失败(用 provider 配置的模型名,避免统计出 model='' 的空条目)
|
|
219
|
+
await this.updateStat(p.id, p.model, false, 0, latency);
|
|
220
|
+
const status = this.statusOf(e);
|
|
221
|
+
lastErr = e;
|
|
222
|
+
lastRetryable = this.isRetryable(e);
|
|
223
|
+
logger_1.logger.warn('模型调用失败,自动轮换下个模型', {
|
|
224
|
+
provider: p.id,
|
|
225
|
+
status,
|
|
226
|
+
cycle: cycle + 1,
|
|
227
|
+
error: e instanceof Error ? e.message : String(e),
|
|
228
|
+
});
|
|
165
229
|
}
|
|
166
|
-
return resp;
|
|
167
230
|
}
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
error: e instanceof Error ? e.message : String(e),
|
|
175
|
-
});
|
|
176
|
-
lastErr = e;
|
|
231
|
+
// 整轮结束:若原因是模型/鉴权类(400/401 等),退避重试无意义,直接终止
|
|
232
|
+
if (!lastRetryable)
|
|
233
|
+
break;
|
|
234
|
+
// 瞬时错误(429/500 等):退避后重试下一轮,直到任务完成或达到上限
|
|
235
|
+
if (cycle < maxCycles - 1) {
|
|
236
|
+
await this.sleep(this.backoffMs * Math.pow(2, cycle));
|
|
177
237
|
}
|
|
178
238
|
}
|
|
179
|
-
throw lastErr instanceof Error ? lastErr : new errors_1.ModelError('
|
|
239
|
+
throw lastErr instanceof Error ? lastErr : new errors_1.ModelError('所有可用模型均调用失败', 'router', 500);
|
|
180
240
|
}
|
|
181
241
|
}
|
|
182
242
|
exports.ModelRouter = ModelRouter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-router.js","sourceRoot":"","sources":["../../src/models/model-router.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"model-router.js","sourceRoot":"","sources":["../../src/models/model-router.ts"],"names":[],"mappings":"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"}
|
package/dist/models/model.dto.js
CHANGED
|
@@ -44,14 +44,36 @@ exports.ollamaChatResponseSchema = zod_1.z.object({
|
|
|
44
44
|
prompt_eval_count: zod_1.z.number().optional(),
|
|
45
45
|
eval_count: zod_1.z.number().optional(),
|
|
46
46
|
});
|
|
47
|
-
/** 将模型返回的工具参数(可能是 JSON
|
|
47
|
+
/** 将模型返回的工具参数(可能是 JSON 字符串或对象)归一为对象。
|
|
48
|
+
* 对畸形字符串尝试提取 JSON(处理 markdown 代码块、前后多余文本等),
|
|
49
|
+
* 仍失败时返回 { __parse_error__: raw } 让上游能感知并给模型反馈,而非静默 {}。 */
|
|
48
50
|
function parseToolArgs(raw) {
|
|
49
51
|
if (typeof raw === 'string') {
|
|
52
|
+
const trimmed = raw.trim();
|
|
53
|
+
// 1. 直接解析
|
|
50
54
|
try {
|
|
51
|
-
return JSON.parse(
|
|
55
|
+
return JSON.parse(trimmed);
|
|
52
56
|
}
|
|
53
57
|
catch {
|
|
54
|
-
|
|
58
|
+
// 2. 尝试从 markdown 代码块中提取
|
|
59
|
+
const codeBlockMatch = trimmed.match(/```(?:json)?\s*([\s\S]*?)```/i);
|
|
60
|
+
if (codeBlockMatch) {
|
|
61
|
+
try {
|
|
62
|
+
return JSON.parse(codeBlockMatch[1].trim());
|
|
63
|
+
}
|
|
64
|
+
catch { /* fall through */ }
|
|
65
|
+
}
|
|
66
|
+
// 3. 尝试提取第一个 { ... } 块
|
|
67
|
+
const objMatch = trimmed.match(/\{[\s\S]*\}/);
|
|
68
|
+
if (objMatch) {
|
|
69
|
+
try {
|
|
70
|
+
return JSON.parse(objMatch[0]);
|
|
71
|
+
}
|
|
72
|
+
catch { /* fall through */ }
|
|
73
|
+
}
|
|
74
|
+
// 4. 全部失败:保留原始文本供上游警告,不静默丢弃
|
|
75
|
+
console.warn('[parseToolArgs] 无法解析工具参数,保留原始文本', { raw: trimmed.slice(0, 200) });
|
|
76
|
+
return { __parse_error__: trimmed };
|
|
55
77
|
}
|
|
56
78
|
}
|
|
57
79
|
if (raw && typeof raw === 'object')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.dto.js","sourceRoot":"","sources":["../../src/models/model.dto.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"model.dto.js","sourceRoot":"","sources":["../../src/models/model.dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,13 @@ class OllamaProvider {
|
|
|
39
39
|
if (req.timeoutMs && req.timeoutMs > 0) {
|
|
40
40
|
timer = setTimeout(() => controller.abort(), req.timeoutMs);
|
|
41
41
|
}
|
|
42
|
+
const onExternalAbort = () => controller.abort();
|
|
43
|
+
if (req.signal) {
|
|
44
|
+
if (req.signal.aborted)
|
|
45
|
+
controller.abort();
|
|
46
|
+
else
|
|
47
|
+
req.signal.addEventListener('abort', onExternalAbort, { once: true });
|
|
48
|
+
}
|
|
42
49
|
let res;
|
|
43
50
|
try {
|
|
44
51
|
res = await fetch(`${this.baseURL}/api/chat`, {
|
|
@@ -49,11 +56,16 @@ class OllamaProvider {
|
|
|
49
56
|
});
|
|
50
57
|
}
|
|
51
58
|
catch (e) {
|
|
59
|
+
const aborted = controller.signal.aborted;
|
|
60
|
+
if (aborted)
|
|
61
|
+
throw new errors_1.ModelError('任务已被用户中断', this.id);
|
|
52
62
|
throw new errors_1.ModelError(`网络请求失败: ${e instanceof Error ? e.message : String(e)}`, this.id);
|
|
53
63
|
}
|
|
54
64
|
finally {
|
|
55
65
|
if (timer)
|
|
56
66
|
clearTimeout(timer);
|
|
67
|
+
if (req.signal)
|
|
68
|
+
req.signal.removeEventListener('abort', onExternalAbort);
|
|
57
69
|
}
|
|
58
70
|
if (!res.ok) {
|
|
59
71
|
const text = await res.text().catch(() => '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../../../src/models/providers/ollama.provider.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,gDAAiD;AAIjD,4CAAuE;AACvE,kCAAuC;AAEvC,MAAa,cAAc;IAChB,EAAE,CAAS;IACX,KAAK,CAAS;IACd,IAAI,CAAkB;IACtB,SAAS,CAAS;IACV,OAAO,CAAS;IAEjC,YAAY,GAAmB;QAC7B,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,EAAE,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAgB;QACzB,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACjC,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,UAAU,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;aAC5E,CAAC,CAAC;YACH,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YAChE,MAAM,EAAE,KAAK;SACd,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,IAAI,KAAiC,CAAC;QACtC,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;YACvC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,GAAa,CAAC;QAClB,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,WAAW,EAAE;gBAC5C,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC1B,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,mBAAU,CAAC,WAAW,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACzF,CAAC;gBAAS,CAAC;YACT,IAAI,KAAK;gBAAE,YAAY,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../../../src/models/providers/ollama.provider.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,gDAAiD;AAIjD,4CAAuE;AACvE,kCAAuC;AAEvC,MAAa,cAAc;IAChB,EAAE,CAAS;IACX,KAAK,CAAS;IACd,IAAI,CAAkB;IACtB,SAAS,CAAS;IACV,OAAO,CAAS;IAEjC,YAAY,GAAmB;QAC7B,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,EAAE,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAgB;QACzB,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACjC,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,UAAU,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;aAC5E,CAAC,CAAC;YACH,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YAChE,MAAM,EAAE,KAAK;SACd,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,IAAI,KAAiC,CAAC;QACtC,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;YACvC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,eAAe,GAAG,GAAS,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACvD,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO;gBAAE,UAAU,CAAC,KAAK,EAAE,CAAC;;gBACtC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,GAAa,CAAC;QAClB,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,WAAW,EAAE;gBAC5C,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC1B,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC;YAC1C,IAAI,OAAO;gBAAE,MAAM,IAAI,mBAAU,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACvD,MAAM,IAAI,mBAAU,CAAC,WAAW,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACzF,CAAC;gBAAS,CAAC;YACT,IAAI,KAAK;gBAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,GAAG,CAAC,MAAM;gBAAE,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YAC9C,MAAM,IAAI,mBAAU,CAAC,QAAQ,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,IAAI,GAAY,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,oCAAwB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,mBAAU,CAAC,aAAa,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;QAChC,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7C,EAAE,EAAE,EAAE,CAAC,EAAE;YACT,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;YACtB,SAAS,EAAE,IAAA,yBAAa,EAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;SAChD,CAAC,CAAC,CAAC;QAEJ,MAAM,KAAK,GAAG;YACZ,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC;YAChD,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC;YAC7C,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;SAClF,CAAC;QAEF,OAAO;YACL,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,EAAE,SAAS,EAAE;YACrE,KAAK;YACL,UAAU,EAAE,IAAI,CAAC,EAAE;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAA,mBAAY,EAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;SAC7C,CAAC;IACJ,CAAC;CACF;AAvFD,wCAuFC"}
|
|
@@ -52,6 +52,14 @@ class OpenAICompatibleProvider {
|
|
|
52
52
|
if (req.timeoutMs && req.timeoutMs > 0) {
|
|
53
53
|
timer = setTimeout(() => controller.abort(), req.timeoutMs);
|
|
54
54
|
}
|
|
55
|
+
// 外部中断信号(任务停止):链接到本地 controller,触发即中断 fetch
|
|
56
|
+
const onExternalAbort = () => controller.abort();
|
|
57
|
+
if (req.signal) {
|
|
58
|
+
if (req.signal.aborted)
|
|
59
|
+
controller.abort();
|
|
60
|
+
else
|
|
61
|
+
req.signal.addEventListener('abort', onExternalAbort, { once: true });
|
|
62
|
+
}
|
|
55
63
|
let res;
|
|
56
64
|
try {
|
|
57
65
|
res = await fetch(`${this.baseURL}/chat/completions`, {
|
|
@@ -65,15 +73,20 @@ class OpenAICompatibleProvider {
|
|
|
65
73
|
});
|
|
66
74
|
}
|
|
67
75
|
catch (e) {
|
|
76
|
+
const aborted = controller.signal.aborted;
|
|
77
|
+
if (aborted)
|
|
78
|
+
throw new errors_1.ModelError('任务已被用户中断', this.id);
|
|
68
79
|
throw new errors_1.ModelError(`网络请求失败: ${e instanceof Error ? e.message : String(e)}`, this.id);
|
|
69
80
|
}
|
|
70
81
|
finally {
|
|
71
82
|
if (timer)
|
|
72
83
|
clearTimeout(timer);
|
|
84
|
+
if (req.signal)
|
|
85
|
+
req.signal.removeEventListener('abort', onExternalAbort);
|
|
73
86
|
}
|
|
74
87
|
if (!res.ok) {
|
|
75
88
|
const text = await res.text().catch(() => '');
|
|
76
|
-
throw new errors_1.ModelError(`HTTP ${res.status} ${text.slice(0, 200)}`, this.id);
|
|
89
|
+
throw new errors_1.ModelError(`HTTP ${res.status} ${text.slice(0, 200)}`, this.id, res.status);
|
|
77
90
|
}
|
|
78
91
|
const json = await res.json().catch(() => undefined);
|
|
79
92
|
const parsed = model_dto_1.openAIChatResponseSchema.safeParse(json);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible.provider.js","sourceRoot":"","sources":["../../../src/models/providers/openai-compatible.provider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"openai-compatible.provider.js","sourceRoot":"","sources":["../../../src/models/providers/openai-compatible.provider.ts"],"names":[],"mappings":"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"}
|
package/dist/self-evolve/hook.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.selfEvolveHook = exports.SelfEvolveHook = void 0;
|
|
4
|
-
const
|
|
4
|
+
const manager_1 = require("./manager");
|
|
5
5
|
/**
|
|
6
6
|
* Hook: 任务完成后自动检查是否需要记录失败
|
|
7
7
|
* 集成到工具调用流程中
|
|
@@ -9,7 +9,7 @@ const manager_js_1 = require("./manager.js");
|
|
|
9
9
|
class SelfEvolveHook {
|
|
10
10
|
manager;
|
|
11
11
|
constructor() {
|
|
12
|
-
this.manager = new
|
|
12
|
+
this.manager = new manager_1.SelfEvolveManager();
|
|
13
13
|
this.manager.init();
|
|
14
14
|
}
|
|
15
15
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook.js","sourceRoot":"","sources":["../../src/self-evolve/hook.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"hook.js","sourceRoot":"","sources":["../../src/self-evolve/hook.ts"],"names":[],"mappings":";;;AAAA,uCAA8C;AAE9C;;;GAGG;AACH,MAAa,cAAc;IACjB,OAAO,CAAoB;IAEnC;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,2BAAiB,EAAE,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,OAKb;QACC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;QAE3D,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,CAAC;QAEzC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CACxC,GAAG,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EACjD,KAAK,EACL,kBAAkB,IAAI,EAAE,CACzB,CAAC;QAEF,aAAa;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;QAEzF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,oBAAoB,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACrD,eAAe;QACjB,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,OAId;QACC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC,aAAa,CAAC;gBACxB,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;gBAC7B,KAAK,EAAE,OAAO,CAAC,KAAK;aACrB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW;QACf,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAElD,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtED,wCAsEC;AAED,OAAO;AACM,QAAA,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import { SelfEvolveManager } from './manager';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Hook: 任务完成后自动检查是否需要记录失败
|
|
5
|
+
* 集成到工具调用流程中
|
|
6
|
+
*/
|
|
7
|
+
export class SelfEvolveHook {
|
|
8
|
+
private manager: SelfEvolveManager;
|
|
9
|
+
|
|
10
|
+
constructor() {
|
|
11
|
+
this.manager = new SelfEvolveManager();
|
|
12
|
+
this.manager.init();
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* 在工具调用失败时触发
|
|
17
|
+
*/
|
|
18
|
+
onToolFailure(context: {
|
|
19
|
+
tool: string,
|
|
20
|
+
input: any,
|
|
21
|
+
error: Error | string,
|
|
22
|
+
attemptedSolutions?: string[]
|
|
23
|
+
}) {
|
|
24
|
+
const { tool, input, error, attemptedSolutions } = context;
|
|
25
|
+
|
|
26
|
+
console.log(`[自我迭代] 检测到工具 ${tool} 调用失败`);
|
|
27
|
+
|
|
28
|
+
const failure = this.manager.recordFailure(
|
|
29
|
+
`${tool}: ${JSON.stringify(input).slice(0, 100)}`,
|
|
30
|
+
error,
|
|
31
|
+
attemptedSolutions || []
|
|
32
|
+
);
|
|
33
|
+
|
|
34
|
+
// 尝试查找已知解决方案
|
|
35
|
+
const solutions = this.manager.searchSolution(failure.error_type, failure.error_message);
|
|
36
|
+
|
|
37
|
+
if (solutions.length > 0) {
|
|
38
|
+
console.log(`[自我迭代] 找到已知解决方案: ${solutions[0].name}`);
|
|
39
|
+
// 这里可以自动应用解决方案
|
|
40
|
+
} else {
|
|
41
|
+
console.log(`[自我迭代] 新问题,建议创建技能解决`);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
return failure;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* 在任务完成时触发
|
|
49
|
+
*/
|
|
50
|
+
onTaskComplete(context: {
|
|
51
|
+
success: boolean,
|
|
52
|
+
task: string,
|
|
53
|
+
error?: Error | string
|
|
54
|
+
}) {
|
|
55
|
+
if (!context.success && context.error) {
|
|
56
|
+
return this.onToolFailure({
|
|
57
|
+
tool: 'task',
|
|
58
|
+
input: { task: context.task },
|
|
59
|
+
error: context.error
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* 每日自动复盘
|
|
67
|
+
*/
|
|
68
|
+
async dailyReview() {
|
|
69
|
+
const report = this.manager.generateDailyReport();
|
|
70
|
+
|
|
71
|
+
if (report.pending > 0) {
|
|
72
|
+
console.warn(`[自我迭代] 今日仍有 ${report.pending} 个未解决问题`);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
return report;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
// 导出单例
|
|
80
|
+
export const selfEvolveHook = new SelfEvolveHook();
|