@cicctencent/agent-core 0.1.19 → 0.1.21
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 +1 -1
- package/dist/cjs/a2a/index.d.ts +4 -0
- package/dist/cjs/a2a/index.d.ts.map +1 -1
- package/dist/cjs/a2a/index.js +6 -1
- package/dist/cjs/a2a/index.js.map +1 -1
- package/dist/cjs/a2a/rest-client.d.ts +111 -0
- package/dist/cjs/a2a/rest-client.d.ts.map +1 -0
- package/dist/cjs/a2a/rest-client.js +254 -0
- package/dist/cjs/a2a/rest-client.js.map +1 -0
- package/dist/cjs/a2a/rest-runner.d.ts +41 -0
- package/dist/cjs/a2a/rest-runner.d.ts.map +1 -0
- package/dist/cjs/a2a/rest-runner.js +188 -0
- package/dist/cjs/a2a/rest-runner.js.map +1 -0
- package/dist/cjs/agent/engine.d.ts +17 -0
- package/dist/cjs/agent/engine.d.ts.map +1 -1
- package/dist/cjs/agent/engine.js +218 -17
- package/dist/cjs/agent/engine.js.map +1 -1
- package/dist/cjs/agent/llm-caller.d.ts +16 -2
- package/dist/cjs/agent/llm-caller.d.ts.map +1 -1
- package/dist/cjs/agent/llm-caller.js +106 -37
- package/dist/cjs/agent/llm-caller.js.map +1 -1
- package/dist/cjs/agent/types.d.ts +1 -1
- package/dist/cjs/agent/types.d.ts.map +1 -1
- package/dist/cjs/calendar/types.d.ts +41 -0
- package/dist/cjs/calendar/types.d.ts.map +1 -0
- package/dist/cjs/calendar/types.js +6 -0
- package/dist/cjs/calendar/types.js.map +1 -0
- package/dist/cjs/email/types.d.ts +46 -0
- package/dist/cjs/email/types.d.ts.map +1 -0
- package/dist/cjs/email/types.js +6 -0
- package/dist/cjs/email/types.js.map +1 -0
- package/dist/cjs/index.d.ts +7 -1
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +21 -9
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/kb/in-memory-kb.d.ts.map +1 -1
- package/dist/cjs/kb/in-memory-kb.js +2 -1
- package/dist/cjs/kb/in-memory-kb.js.map +1 -1
- package/dist/cjs/kb/types.d.ts +33 -50
- package/dist/cjs/kb/types.d.ts.map +1 -1
- package/dist/cjs/kb/types.js +1 -1
- package/dist/cjs/llm/anthropic-provider.d.ts.map +1 -1
- package/dist/cjs/llm/anthropic-provider.js +1 -0
- package/dist/cjs/llm/anthropic-provider.js.map +1 -1
- package/dist/cjs/llm/ollama-provider.d.ts +18 -0
- package/dist/cjs/llm/ollama-provider.d.ts.map +1 -1
- package/dist/cjs/llm/ollama-provider.js +42 -0
- package/dist/cjs/llm/ollama-provider.js.map +1 -1
- package/dist/cjs/llm/openai-provider.d.ts +30 -2
- package/dist/cjs/llm/openai-provider.d.ts.map +1 -1
- package/dist/cjs/llm/openai-provider.js +278 -12
- package/dist/cjs/llm/openai-provider.js.map +1 -1
- package/dist/cjs/llm/provider.d.ts +2 -1
- package/dist/cjs/llm/provider.d.ts.map +1 -1
- package/dist/cjs/llm/provider.js +6 -1
- package/dist/cjs/llm/provider.js.map +1 -1
- package/dist/cjs/llm/types.d.ts +143 -0
- package/dist/cjs/llm/types.d.ts.map +1 -1
- package/dist/cjs/llm/types.js +74 -0
- package/dist/cjs/llm/types.js.map +1 -1
- package/dist/cjs/memory/checkpoint.d.ts.map +1 -1
- package/dist/cjs/memory/checkpoint.js +3 -2
- package/dist/cjs/memory/checkpoint.js.map +1 -1
- package/dist/cjs/memory/extractor.d.ts +7 -0
- package/dist/cjs/memory/extractor.d.ts.map +1 -1
- package/dist/cjs/memory/extractor.js +18 -1
- package/dist/cjs/memory/extractor.js.map +1 -1
- package/dist/cjs/memory/persona.d.ts +4 -0
- package/dist/cjs/memory/persona.d.ts.map +1 -1
- package/dist/cjs/memory/persona.js +15 -1
- package/dist/cjs/memory/persona.js.map +1 -1
- package/dist/cjs/memory/pipeline.d.ts +3 -0
- package/dist/cjs/memory/pipeline.d.ts.map +1 -1
- package/dist/cjs/memory/pipeline.js +7 -4
- package/dist/cjs/memory/pipeline.js.map +1 -1
- package/dist/cjs/memory/scene.d.ts +4 -0
- package/dist/cjs/memory/scene.d.ts.map +1 -1
- package/dist/cjs/memory/scene.js +15 -1
- package/dist/cjs/memory/scene.js.map +1 -1
- package/dist/cjs/middleware/audit-log.d.ts.map +1 -1
- package/dist/cjs/middleware/audit-log.js +3 -2
- package/dist/cjs/middleware/audit-log.js.map +1 -1
- package/dist/cjs/skill/router.js +1 -1
- package/dist/cjs/skill/router.js.map +1 -1
- package/dist/cjs/skill/vector-index.d.ts +32 -24
- package/dist/cjs/skill/vector-index.d.ts.map +1 -1
- package/dist/cjs/skill/vector-index.js +37 -50
- package/dist/cjs/skill/vector-index.js.map +1 -1
- package/dist/cjs/store/file-tool-result-store.d.ts.map +1 -1
- package/dist/cjs/store/file-tool-result-store.js +2 -1
- package/dist/cjs/store/file-tool-result-store.js.map +1 -1
- package/dist/cjs/store/json-store.d.ts +5 -1
- package/dist/cjs/store/json-store.d.ts.map +1 -1
- package/dist/cjs/store/json-store.js +5 -1
- package/dist/cjs/store/json-store.js.map +1 -1
- package/dist/cjs/tool/delegate.js +1 -1
- package/dist/cjs/tool/delegate.js.map +1 -1
- package/dist/cjs/utils/date.d.ts +36 -0
- package/dist/cjs/utils/date.d.ts.map +1 -0
- package/dist/cjs/utils/date.js +52 -0
- package/dist/cjs/utils/date.js.map +1 -0
- package/dist/esm/a2a/index.d.ts +4 -0
- package/dist/esm/a2a/index.d.ts.map +1 -1
- package/dist/esm/a2a/index.js +3 -0
- package/dist/esm/a2a/index.js.map +1 -1
- package/dist/esm/a2a/rest-client.d.ts +111 -0
- package/dist/esm/a2a/rest-client.d.ts.map +1 -0
- package/dist/esm/a2a/rest-client.js +250 -0
- package/dist/esm/a2a/rest-client.js.map +1 -0
- package/dist/esm/a2a/rest-runner.d.ts +41 -0
- package/dist/esm/a2a/rest-runner.d.ts.map +1 -0
- package/dist/esm/a2a/rest-runner.js +185 -0
- package/dist/esm/a2a/rest-runner.js.map +1 -0
- package/dist/esm/agent/engine.d.ts +17 -0
- package/dist/esm/agent/engine.d.ts.map +1 -1
- package/dist/esm/agent/engine.js +218 -17
- package/dist/esm/agent/engine.js.map +1 -1
- package/dist/esm/agent/llm-caller.d.ts +16 -2
- package/dist/esm/agent/llm-caller.d.ts.map +1 -1
- package/dist/esm/agent/llm-caller.js +106 -37
- package/dist/esm/agent/llm-caller.js.map +1 -1
- package/dist/esm/agent/types.d.ts +1 -1
- package/dist/esm/agent/types.d.ts.map +1 -1
- package/dist/esm/calendar/types.d.ts +41 -0
- package/dist/esm/calendar/types.d.ts.map +1 -0
- package/dist/esm/calendar/types.js +5 -0
- package/dist/esm/calendar/types.js.map +1 -0
- package/dist/esm/email/types.d.ts +46 -0
- package/dist/esm/email/types.d.ts.map +1 -0
- package/dist/esm/email/types.js +5 -0
- package/dist/esm/email/types.js.map +1 -0
- package/dist/esm/index.d.ts +7 -1
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +4 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/kb/in-memory-kb.d.ts.map +1 -1
- package/dist/esm/kb/in-memory-kb.js +2 -1
- package/dist/esm/kb/in-memory-kb.js.map +1 -1
- package/dist/esm/kb/types.d.ts +33 -50
- package/dist/esm/kb/types.d.ts.map +1 -1
- package/dist/esm/kb/types.js +1 -1
- package/dist/esm/llm/anthropic-provider.d.ts.map +1 -1
- package/dist/esm/llm/anthropic-provider.js +1 -0
- package/dist/esm/llm/anthropic-provider.js.map +1 -1
- package/dist/esm/llm/ollama-provider.d.ts +18 -0
- package/dist/esm/llm/ollama-provider.d.ts.map +1 -1
- package/dist/esm/llm/ollama-provider.js +42 -0
- package/dist/esm/llm/ollama-provider.js.map +1 -1
- package/dist/esm/llm/openai-provider.d.ts +30 -2
- package/dist/esm/llm/openai-provider.d.ts.map +1 -1
- package/dist/esm/llm/openai-provider.js +278 -12
- package/dist/esm/llm/openai-provider.js.map +1 -1
- package/dist/esm/llm/provider.d.ts +2 -1
- package/dist/esm/llm/provider.d.ts.map +1 -1
- package/dist/esm/llm/provider.js +1 -0
- package/dist/esm/llm/provider.js.map +1 -1
- package/dist/esm/llm/types.d.ts +143 -0
- package/dist/esm/llm/types.d.ts.map +1 -1
- package/dist/esm/llm/types.js +70 -1
- package/dist/esm/llm/types.js.map +1 -1
- package/dist/esm/memory/checkpoint.d.ts.map +1 -1
- package/dist/esm/memory/checkpoint.js +3 -2
- package/dist/esm/memory/checkpoint.js.map +1 -1
- package/dist/esm/memory/extractor.d.ts +7 -0
- package/dist/esm/memory/extractor.d.ts.map +1 -1
- package/dist/esm/memory/extractor.js +18 -1
- package/dist/esm/memory/extractor.js.map +1 -1
- package/dist/esm/memory/persona.d.ts +4 -0
- package/dist/esm/memory/persona.d.ts.map +1 -1
- package/dist/esm/memory/persona.js +15 -1
- package/dist/esm/memory/persona.js.map +1 -1
- package/dist/esm/memory/pipeline.d.ts +3 -0
- package/dist/esm/memory/pipeline.d.ts.map +1 -1
- package/dist/esm/memory/pipeline.js +7 -4
- package/dist/esm/memory/pipeline.js.map +1 -1
- package/dist/esm/memory/scene.d.ts +4 -0
- package/dist/esm/memory/scene.d.ts.map +1 -1
- package/dist/esm/memory/scene.js +15 -1
- package/dist/esm/memory/scene.js.map +1 -1
- package/dist/esm/middleware/audit-log.d.ts.map +1 -1
- package/dist/esm/middleware/audit-log.js +3 -2
- package/dist/esm/middleware/audit-log.js.map +1 -1
- package/dist/esm/skill/router.js +1 -1
- package/dist/esm/skill/router.js.map +1 -1
- package/dist/esm/skill/vector-index.d.ts +32 -24
- package/dist/esm/skill/vector-index.d.ts.map +1 -1
- package/dist/esm/skill/vector-index.js +36 -49
- package/dist/esm/skill/vector-index.js.map +1 -1
- package/dist/esm/store/file-tool-result-store.d.ts.map +1 -1
- package/dist/esm/store/file-tool-result-store.js +2 -1
- package/dist/esm/store/file-tool-result-store.js.map +1 -1
- package/dist/esm/store/json-store.d.ts +5 -1
- package/dist/esm/store/json-store.d.ts.map +1 -1
- package/dist/esm/store/json-store.js +5 -1
- package/dist/esm/store/json-store.js.map +1 -1
- package/dist/esm/tool/delegate.js +1 -1
- package/dist/esm/tool/delegate.js.map +1 -1
- package/dist/esm/utils/date.d.ts +36 -0
- package/dist/esm/utils/date.d.ts.map +1 -0
- package/dist/esm/utils/date.js +48 -0
- package/dist/esm/utils/date.js.map +1 -0
- package/package.json +1 -1
package/dist/cjs/llm/types.js
CHANGED
|
@@ -3,4 +3,78 @@
|
|
|
3
3
|
// LLM Provider 类型定义
|
|
4
4
|
// ============================================================
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.isBatchProvider = isBatchProvider;
|
|
7
|
+
exports.isFileProvider = isFileProvider;
|
|
8
|
+
exports.serializeBatchRequests = serializeBatchRequests;
|
|
9
|
+
exports.createBatchRequest = createBatchRequest;
|
|
10
|
+
// ============================================================
|
|
11
|
+
// 类型守卫 — 运行时检测 Provider 是否支持 Batch/File
|
|
12
|
+
// ============================================================
|
|
13
|
+
/** 检测 Provider 是否支持批处理(Ollama 等不支持 Batch 的 Provider 会覆盖方法抛错,通过 provider 名称排除) */
|
|
14
|
+
function isBatchProvider(provider) {
|
|
15
|
+
const p = provider;
|
|
16
|
+
if (typeof p.createBatch !== 'function')
|
|
17
|
+
return false;
|
|
18
|
+
// Ollama 等本地 Provider 覆盖了方法但实际不支持
|
|
19
|
+
const model = provider.getModel();
|
|
20
|
+
if (model.provider === 'ollama')
|
|
21
|
+
return false;
|
|
22
|
+
return true;
|
|
23
|
+
}
|
|
24
|
+
/** 检测 Provider 是否支持文件管理 */
|
|
25
|
+
function isFileProvider(provider) {
|
|
26
|
+
const p = provider;
|
|
27
|
+
if (typeof p.uploadFile !== 'function')
|
|
28
|
+
return false;
|
|
29
|
+
const model = provider.getModel();
|
|
30
|
+
if (model.provider === 'ollama')
|
|
31
|
+
return false;
|
|
32
|
+
return true;
|
|
33
|
+
}
|
|
34
|
+
// ============================================================
|
|
35
|
+
// 工具函数 — BatchRequest JSONL 序列化/反序列化
|
|
36
|
+
// ============================================================
|
|
37
|
+
/**
|
|
38
|
+
* 将 BatchRequest[] 序列化为 JSONL 字符串(每行一个 JSON 对象)
|
|
39
|
+
*
|
|
40
|
+
* 格式遵循 OpenAI Batch API 规范:
|
|
41
|
+
* {"custom_id":"req-001","method":"POST","url":"/v1/chat/completions","body":{...}}
|
|
42
|
+
*/
|
|
43
|
+
function serializeBatchRequests(requests) {
|
|
44
|
+
return requests.map(r => JSON.stringify({
|
|
45
|
+
custom_id: r.customId,
|
|
46
|
+
method: r.method,
|
|
47
|
+
url: r.url,
|
|
48
|
+
body: {
|
|
49
|
+
model: r.body.model,
|
|
50
|
+
messages: r.body.messages,
|
|
51
|
+
...(r.body.tools?.length ? { tools: r.body.tools } : {}),
|
|
52
|
+
...(r.body.toolChoice ? { tool_choice: r.body.toolChoice } : {}),
|
|
53
|
+
...(r.body.temperature != null ? { temperature: r.body.temperature } : {}),
|
|
54
|
+
...(r.body.maxTokens != null ? { max_tokens: r.body.maxTokens } : {}),
|
|
55
|
+
},
|
|
56
|
+
})).join('\n');
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* 从 ChatParams 快速构建 BatchRequest
|
|
60
|
+
*
|
|
61
|
+
* @param customId 自定义 ID(用于关联结果)
|
|
62
|
+
* @param model 模型名称
|
|
63
|
+
* @param params ChatParams(去掉 abortSignal)
|
|
64
|
+
*/
|
|
65
|
+
function createBatchRequest(customId, model, params) {
|
|
66
|
+
return {
|
|
67
|
+
customId,
|
|
68
|
+
method: 'POST',
|
|
69
|
+
url: '/v1/chat/completions',
|
|
70
|
+
body: {
|
|
71
|
+
model,
|
|
72
|
+
messages: params.messages,
|
|
73
|
+
tools: params.tools,
|
|
74
|
+
toolChoice: params.toolChoice,
|
|
75
|
+
temperature: params.temperature,
|
|
76
|
+
maxTokens: params.maxTokens,
|
|
77
|
+
},
|
|
78
|
+
};
|
|
79
|
+
}
|
|
6
80
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/llm/types.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,oBAAoB;AACpB,+DAA+D"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/llm/types.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,oBAAoB;AACpB,+DAA+D;;AA4O/D,0CAOC;AAGD,wCAMC;AAYD,wDAcC;AASD,gDAkBC;AA1ED,+DAA+D;AAC/D,wCAAwC;AACxC,+DAA+D;AAE/D,iFAAiF;AACjF,SAAgB,eAAe,CAAC,QAAqB;IACnD,MAAM,CAAC,GAAG,QAAoC,CAAC;IAC/C,IAAI,OAAO,CAAC,CAAC,WAAW,KAAK,UAAU;QAAE,OAAO,KAAK,CAAC;IACtD,kCAAkC;IAClC,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAClC,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,IAAI,CAAC;AACd,CAAC;AAED,2BAA2B;AAC3B,SAAgB,cAAc,CAAC,QAAqB;IAClD,MAAM,CAAC,GAAG,QAAmC,CAAC;IAC9C,IAAI,OAAO,CAAC,CAAC,UAAU,KAAK,UAAU;QAAE,OAAO,KAAK,CAAC;IACrD,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAClC,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,IAAI,CAAC;AACd,CAAC;AAED,+DAA+D;AAC/D,qCAAqC;AACrC,+DAA+D;AAE/D;;;;;GAKG;AACH,SAAgB,sBAAsB,CAAC,QAAwB;IAC7D,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;QACtC,SAAS,EAAE,CAAC,CAAC,QAAQ;QACrB,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,IAAI,EAAE;YACJ,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK;YACnB,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ;YACzB,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtE;KACF,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAChC,QAAgB,EAChB,KAAa,EACb,MAAkB;IAElB,OAAO;QACL,QAAQ;QACR,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,sBAAsB;QAC3B,IAAI,EAAE;YACJ,KAAK;YACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../../src/memory/checkpoint.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../../src/memory/checkpoint.ts"],"names":[],"mappings":"AAYA,YAAY;AACZ,MAAM,WAAW,cAAc;IAC7B,yBAAyB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,yBAAyB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAYD;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,IAAI,CAAiB;IAE7B;;OAEG;gBACS,QAAQ,CAAC,EAAE,MAAM;IAK7B,gBAAgB;IAChB,GAAG,IAAI,cAAc;IAIrB;;;;OAIG;IACH,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAInE;;;;OAIG;IACH,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAInE;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI;IAOtC;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI;IAMtC;;OAEG;IACH,KAAK,IAAI,IAAI;IAKb,OAAO,CAAC,IAAI;IAaZ,OAAO,CAAC,OAAO;CAWhB;AAKD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAKvE;AAED,0BAA0B;AAC1B,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}
|
|
@@ -45,6 +45,7 @@ exports.getMemoryCheckpoint = getMemoryCheckpoint;
|
|
|
45
45
|
exports.resetMemoryCheckpoint = resetMemoryCheckpoint;
|
|
46
46
|
const fs = __importStar(require("fs"));
|
|
47
47
|
const path = __importStar(require("path"));
|
|
48
|
+
const date_ts_1 = require("../utils/date.js");
|
|
48
49
|
const DEFAULT_CHECKPOINT = {
|
|
49
50
|
lastL1Count: 0,
|
|
50
51
|
lastL2Count: 0,
|
|
@@ -95,7 +96,7 @@ class MemoryCheckpoint {
|
|
|
95
96
|
*/
|
|
96
97
|
updateL2(currentL1Count) {
|
|
97
98
|
this.data.lastL1Count = currentL1Count;
|
|
98
|
-
this.data.lastRunAt =
|
|
99
|
+
this.data.lastRunAt = (0, date_ts_1.formatLocalDateTime)();
|
|
99
100
|
this.data.runCount++;
|
|
100
101
|
this.persist();
|
|
101
102
|
}
|
|
@@ -104,7 +105,7 @@ class MemoryCheckpoint {
|
|
|
104
105
|
*/
|
|
105
106
|
updateL3(currentL2Count) {
|
|
106
107
|
this.data.lastL2Count = currentL2Count;
|
|
107
|
-
this.data.lastRunAt =
|
|
108
|
+
this.data.lastRunAt = (0, date_ts_1.formatLocalDateTime)();
|
|
108
109
|
this.persist();
|
|
109
110
|
}
|
|
110
111
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../../src/memory/checkpoint.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,6BAA6B;AAC7B,+DAA+D;AAC/D,uBAAuB;AACvB,sBAAsB;AACtB,sBAAsB;AACtB,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../../src/memory/checkpoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,8 @@ export interface AtomFact {
|
|
|
17
17
|
export interface ExtractorOptions {
|
|
18
18
|
/** LLM Provider 实例 */
|
|
19
19
|
llmProvider: LLMProvider;
|
|
20
|
+
/** 降级 LLM Provider(可选,主 Provider 失败时切换) */
|
|
21
|
+
fallbackProvider?: LLMProvider;
|
|
20
22
|
/** 单次提取最大原子事实数,默认 5 */
|
|
21
23
|
maxFactsPerSession?: number;
|
|
22
24
|
/** 触发提取的最小迭代次数,默认 3 */
|
|
@@ -30,6 +32,7 @@ export interface ExtractorOptions {
|
|
|
30
32
|
*/
|
|
31
33
|
export declare class MemoryExtractor {
|
|
32
34
|
private llmProvider;
|
|
35
|
+
private fallbackProvider?;
|
|
33
36
|
private maxFactsPerSession;
|
|
34
37
|
private minIterations;
|
|
35
38
|
private timeoutMs;
|
|
@@ -46,6 +49,10 @@ export declare class MemoryExtractor {
|
|
|
46
49
|
* 调用 LLM 提取事实
|
|
47
50
|
*/
|
|
48
51
|
private callLLM;
|
|
52
|
+
/**
|
|
53
|
+
* 单次流式 LLM 调用
|
|
54
|
+
*/
|
|
55
|
+
private callLLMStream;
|
|
49
56
|
/**
|
|
50
57
|
* 解析 LLM 输出的 JSON 数组
|
|
51
58
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../../src/memory/extractor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAM3C,kBAAkB;AAClB,MAAM,WAAW,QAAQ;IACvB,gCAAgC;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS;IACT,QAAQ,EAAE,iBAAiB,GAAG,mBAAmB,GAAG,cAAc,GAAG,QAAQ,CAAC;IAC9E,eAAe;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc;IACd,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,WAAW;AACX,MAAM,WAAW,gBAAgB;IAC/B,sBAAsB;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,uBAAuB;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,wBAAwB;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../../src/memory/extractor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAM3C,kBAAkB;AAClB,MAAM,WAAW,QAAQ;IACvB,gCAAgC;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS;IACT,QAAQ,EAAE,iBAAiB,GAAG,mBAAmB,GAAG,cAAc,GAAG,QAAQ,CAAC;IAC9E,eAAe;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc;IACd,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,WAAW;AACX,MAAM,WAAW,gBAAgB;IAC/B,sBAAsB;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,2CAA2C;IAC3C,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,uBAAuB;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,wBAAwB;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,gBAAgB,CAAC,CAAc;IACvC,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,gBAAgB;IAQlC;;;;;;OAMG;IACG,OAAO,CACX,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,QAAQ,EAAE,CAAC;IAetB;;OAEG;YACW,OAAO;IAiBrB;;OAEG;YACW,aAAa;IAgB3B;;OAEG;IACH,OAAO,CAAC,UAAU;IAyBlB,OAAO,CAAC,iBAAiB;IAKzB;;OAEG;IACH,OAAO,CAAC,oBAAoB;CAuB7B"}
|
|
@@ -11,11 +11,13 @@ const prompts_ts_1 = require("./prompts.js");
|
|
|
11
11
|
*/
|
|
12
12
|
class MemoryExtractor {
|
|
13
13
|
llmProvider;
|
|
14
|
+
fallbackProvider;
|
|
14
15
|
maxFactsPerSession;
|
|
15
16
|
minIterations;
|
|
16
17
|
timeoutMs;
|
|
17
18
|
constructor(opts) {
|
|
18
19
|
this.llmProvider = opts.llmProvider;
|
|
20
|
+
this.fallbackProvider = opts.fallbackProvider;
|
|
19
21
|
this.maxFactsPerSession = opts.maxFactsPerSession ?? 5;
|
|
20
22
|
this.minIterations = opts.minIterations ?? 3;
|
|
21
23
|
this.timeoutMs = opts.timeoutMs ?? 30000;
|
|
@@ -48,8 +50,23 @@ class MemoryExtractor {
|
|
|
48
50
|
{ role: 'system', content: prompts_ts_1.EXTRACTION_SYSTEM_PROMPT },
|
|
49
51
|
{ role: 'user', content: userPrompt },
|
|
50
52
|
];
|
|
53
|
+
try {
|
|
54
|
+
return await this.callLLMStream(this.llmProvider, messages);
|
|
55
|
+
}
|
|
56
|
+
catch (err) {
|
|
57
|
+
if (this.fallbackProvider) {
|
|
58
|
+
console.log(`[MemoryExtractor] Primary failed (${err?.message || err}), switching to fallback`);
|
|
59
|
+
return await this.callLLMStream(this.fallbackProvider, messages);
|
|
60
|
+
}
|
|
61
|
+
throw err;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* 单次流式 LLM 调用
|
|
66
|
+
*/
|
|
67
|
+
async callLLMStream(provider, messages) {
|
|
51
68
|
const chunks = [];
|
|
52
|
-
const stream =
|
|
69
|
+
const stream = provider.chatStream({
|
|
53
70
|
messages,
|
|
54
71
|
abortSignal: AbortSignal.timeout(this.timeoutMs),
|
|
55
72
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../../../src/memory/extractor.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,mCAAmC;AACnC,+DAA+D;;;AAI/D,6CAGsB;
|
|
1
|
+
{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../../../src/memory/extractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,8 @@ export interface PersonaFacet {
|
|
|
10
10
|
/** 画像生成器配置 */
|
|
11
11
|
export interface PersonaGeneratorOptions {
|
|
12
12
|
llmProvider: LLMProvider;
|
|
13
|
+
/** 降级 LLM Provider(可选,主 Provider 失败时切换) */
|
|
14
|
+
fallbackProvider?: LLMProvider;
|
|
13
15
|
/** 超时(毫秒),默认 30000 */
|
|
14
16
|
timeoutMs?: number;
|
|
15
17
|
}
|
|
@@ -23,6 +25,7 @@ export interface PersonaGeneratorOptions {
|
|
|
23
25
|
*/
|
|
24
26
|
export declare class PersonaGenerator {
|
|
25
27
|
private llmProvider;
|
|
28
|
+
private fallbackProvider?;
|
|
26
29
|
private timeoutMs;
|
|
27
30
|
constructor(opts: PersonaGeneratorOptions);
|
|
28
31
|
/**
|
|
@@ -34,5 +37,6 @@ export declare class PersonaGenerator {
|
|
|
34
37
|
generate(scenes: SceneBlock[], existingPersona?: string): Promise<string>;
|
|
35
38
|
private buildUserPrompt;
|
|
36
39
|
private callLLM;
|
|
40
|
+
private callLLMStream;
|
|
37
41
|
}
|
|
38
42
|
//# sourceMappingURL=persona.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persona.d.ts","sourceRoot":"","sources":["../../../src/memory/persona.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,WAAW;AACX,MAAM,WAAW,YAAY;IAC3B,2CAA2C;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,qBAAqB;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,cAAc;AACd,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB;
|
|
1
|
+
{"version":3,"file":"persona.d.ts","sourceRoot":"","sources":["../../../src/memory/persona.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,WAAW;AACX,MAAM,WAAW,YAAY;IAC3B,2CAA2C;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,qBAAqB;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,cAAc;AACd,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,2CAA2C;IAC3C,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,gBAAgB,CAAC,CAAc;IACvC,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB;IAMzC;;;;;OAKG;IACG,QAAQ,CACZ,MAAM,EAAE,UAAU,EAAE,EACpB,eAAe,GAAE,MAAW,GAC3B,OAAO,CAAC,MAAM,CAAC;IAalB,OAAO,CAAC,eAAe;YAoBT,OAAO;YAiBP,aAAa;CAe5B"}
|
|
@@ -17,9 +17,11 @@ const prompts_ts_1 = require("./prompts.js");
|
|
|
17
17
|
*/
|
|
18
18
|
class PersonaGenerator {
|
|
19
19
|
llmProvider;
|
|
20
|
+
fallbackProvider;
|
|
20
21
|
timeoutMs;
|
|
21
22
|
constructor(opts) {
|
|
22
23
|
this.llmProvider = opts.llmProvider;
|
|
24
|
+
this.fallbackProvider = opts.fallbackProvider;
|
|
23
25
|
this.timeoutMs = opts.timeoutMs ?? 30000;
|
|
24
26
|
}
|
|
25
27
|
/**
|
|
@@ -62,8 +64,20 @@ class PersonaGenerator {
|
|
|
62
64
|
{ role: 'system', content: prompts_ts_1.PERSONA_GENERATION_SYSTEM_PROMPT },
|
|
63
65
|
{ role: 'user', content: userPrompt },
|
|
64
66
|
];
|
|
67
|
+
try {
|
|
68
|
+
return await this.callLLMStream(this.llmProvider, messages);
|
|
69
|
+
}
|
|
70
|
+
catch (err) {
|
|
71
|
+
if (this.fallbackProvider) {
|
|
72
|
+
console.log(`[PersonaGenerator] Primary failed (${err?.message || err}), switching to fallback`);
|
|
73
|
+
return await this.callLLMStream(this.fallbackProvider, messages);
|
|
74
|
+
}
|
|
75
|
+
throw err;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
async callLLMStream(provider, messages) {
|
|
65
79
|
const chunks = [];
|
|
66
|
-
const stream =
|
|
80
|
+
const stream = provider.chatStream({
|
|
67
81
|
messages,
|
|
68
82
|
abortSignal: AbortSignal.timeout(this.timeoutMs),
|
|
69
83
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persona.js","sourceRoot":"","sources":["../../../src/memory/persona.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,gCAAgC;AAChC,+DAA+D;AAC/D,oCAAoC;AACpC,sCAAsC;;;AAItC,6CAAgE;
|
|
1
|
+
{"version":3,"file":"persona.js","sourceRoot":"","sources":["../../../src/memory/persona.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,8 @@ import type { Message } from '../types.js';
|
|
|
5
5
|
/** 管道配置 */
|
|
6
6
|
export interface PipelineOptions {
|
|
7
7
|
llmProvider: LLMProvider;
|
|
8
|
+
/** 降级 LLM Provider(可选,各层级主 Provider 失败时切换) */
|
|
9
|
+
fallbackProvider?: LLMProvider;
|
|
8
10
|
/** 触发 L2 聚合的 L1 增量阈值(新 L1 条目数),默认 5 */
|
|
9
11
|
l2Threshold?: number;
|
|
10
12
|
/** 触发 L3 画像更新的 L2 增量阈值,默认 3 */
|
|
@@ -35,6 +37,7 @@ export interface PipelineResult {
|
|
|
35
37
|
*/
|
|
36
38
|
export declare class MemoryPipeline {
|
|
37
39
|
private llmProvider;
|
|
40
|
+
private fallbackProvider?;
|
|
38
41
|
private l2Threshold;
|
|
39
42
|
private l3Threshold;
|
|
40
43
|
constructor(opts: PipelineOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../src/memory/pipeline.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAA4B,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE9E,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAG9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../src/memory/pipeline.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAA4B,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE9E,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAG9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAG3C,WAAW;AACX,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,8CAA8C;IAC9C,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,aAAa;AACb,MAAM,WAAW,cAAc;IAC7B,qBAAqB;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,oBAAoB;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,sBAAsB;IACtB,SAAS,CAAC,EAAE,UAAU,EAAE,CAAC;IACzB,sBAAsB;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;GASG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,gBAAgB,CAAC,CAAc;IACvC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;gBAEhB,IAAI,EAAE,eAAe;IAOjC;;;;;;OAMG;IACG,GAAG,CACP,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,iBAAiB,GAC/B,OAAO,CAAC,cAAc,CAAC;CAwH3B"}
|
|
@@ -11,6 +11,7 @@ const extractor_ts_1 = require("./extractor.js");
|
|
|
11
11
|
const scene_ts_1 = require("./scene.js");
|
|
12
12
|
const persona_ts_1 = require("./persona.js");
|
|
13
13
|
const checkpoint_ts_1 = require("./checkpoint.js");
|
|
14
|
+
const date_ts_1 = require("../utils/date.js");
|
|
14
15
|
/**
|
|
15
16
|
* 记忆管道调度器
|
|
16
17
|
*
|
|
@@ -23,10 +24,12 @@ const checkpoint_ts_1 = require("./checkpoint.js");
|
|
|
23
24
|
*/
|
|
24
25
|
class MemoryPipeline {
|
|
25
26
|
llmProvider;
|
|
27
|
+
fallbackProvider;
|
|
26
28
|
l2Threshold;
|
|
27
29
|
l3Threshold;
|
|
28
30
|
constructor(opts) {
|
|
29
31
|
this.llmProvider = opts.llmProvider;
|
|
32
|
+
this.fallbackProvider = opts.fallbackProvider;
|
|
30
33
|
this.l2Threshold = opts.l2Threshold ?? 5;
|
|
31
34
|
this.l3Threshold = opts.l3Threshold ?? 3;
|
|
32
35
|
}
|
|
@@ -45,14 +48,14 @@ class MemoryPipeline {
|
|
|
45
48
|
};
|
|
46
49
|
// === Phase 1: L1 提取 ===
|
|
47
50
|
const existingKeys = memoryService.getKeys();
|
|
48
|
-
const extractor = new extractor_ts_1.MemoryExtractor({ llmProvider: this.llmProvider });
|
|
51
|
+
const extractor = new extractor_ts_1.MemoryExtractor({ llmProvider: this.llmProvider, fallbackProvider: this.fallbackProvider });
|
|
49
52
|
const facts = await extractor.extract(messages, sessionId, existingKeys);
|
|
50
53
|
// 写入 L1 条目
|
|
51
54
|
for (const fact of facts) {
|
|
52
55
|
memoryService.save(fact.key, fact.content, fact.category, fact.importance, {
|
|
53
56
|
memoryLayer: 'L1',
|
|
54
57
|
sourceSessionId: sessionId,
|
|
55
|
-
sourceTimestamp:
|
|
58
|
+
sourceTimestamp: (0, date_ts_1.formatLocalDateTime)(),
|
|
56
59
|
});
|
|
57
60
|
}
|
|
58
61
|
result.l1Extracted = facts.length;
|
|
@@ -72,7 +75,7 @@ class MemoryPipeline {
|
|
|
72
75
|
description: e.content,
|
|
73
76
|
atomIds: e.sourceIds || [],
|
|
74
77
|
}));
|
|
75
|
-
const aggregator = new scene_ts_1.SceneAggregator({ llmProvider: this.llmProvider });
|
|
78
|
+
const aggregator = new scene_ts_1.SceneAggregator({ llmProvider: this.llmProvider, fallbackProvider: this.fallbackProvider });
|
|
76
79
|
const atoms = l1Entries.map(e => ({
|
|
77
80
|
id: e.id,
|
|
78
81
|
key: e.key,
|
|
@@ -117,7 +120,7 @@ class MemoryPipeline {
|
|
|
117
120
|
try {
|
|
118
121
|
const existingL3 = memoryService.getAllEntries('L3');
|
|
119
122
|
const existingPersona = existingL3.length > 0 ? existingL3[0].content : '';
|
|
120
|
-
const generator = new persona_ts_1.PersonaGenerator({ llmProvider: this.llmProvider });
|
|
123
|
+
const generator = new persona_ts_1.PersonaGenerator({ llmProvider: this.llmProvider, fallbackProvider: this.fallbackProvider });
|
|
121
124
|
const scenes = l2Entries.map(e => ({
|
|
122
125
|
sceneId: e.sceneId || e.key,
|
|
123
126
|
title: e.key,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../src/memory/pipeline.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,oCAAoC;AACpC,+DAA+D;AAC/D,gBAAgB;AAChB,sCAAsC;AACtC,4BAA4B;;;AAI5B,iDAAiD;AACjD,yCAA8D;AAC9D,6CAAgD;AAChD,mDAAsD;
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../src/memory/pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@ export interface SceneBlock {
|
|
|
13
13
|
/** 聚合器配置 */
|
|
14
14
|
export interface SceneAggregatorOptions {
|
|
15
15
|
llmProvider: LLMProvider;
|
|
16
|
+
/** 降级 LLM Provider(可选,主 Provider 失败时切换) */
|
|
17
|
+
fallbackProvider?: LLMProvider;
|
|
16
18
|
/** 最大场景数,默认 15 */
|
|
17
19
|
maxScenes?: number;
|
|
18
20
|
/** 超时(毫秒),默认 30000 */
|
|
@@ -28,6 +30,7 @@ export interface SceneAggregatorOptions {
|
|
|
28
30
|
*/
|
|
29
31
|
export declare class SceneAggregator {
|
|
30
32
|
private llmProvider;
|
|
33
|
+
private fallbackProvider?;
|
|
31
34
|
private maxScenes;
|
|
32
35
|
private timeoutMs;
|
|
33
36
|
constructor(opts: SceneAggregatorOptions);
|
|
@@ -44,6 +47,7 @@ export declare class SceneAggregator {
|
|
|
44
47
|
}>, existingScenes?: SceneBlock[]): Promise<SceneBlock[]>;
|
|
45
48
|
private buildUserPrompt;
|
|
46
49
|
private callLLM;
|
|
50
|
+
private callLLMStream;
|
|
47
51
|
private parseScenes;
|
|
48
52
|
}
|
|
49
53
|
//# sourceMappingURL=scene.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scene.d.ts","sourceRoot":"","sources":["../../../src/memory/scene.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAInD,cAAc;AACd,MAAM,WAAW,UAAU;IACzB,wBAAwB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,YAAY;AACZ,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,WAAW,CAAC;IACzB,kBAAkB;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,sBAAsB;
|
|
1
|
+
{"version":3,"file":"scene.d.ts","sourceRoot":"","sources":["../../../src/memory/scene.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAInD,cAAc;AACd,MAAM,WAAW,UAAU;IACzB,wBAAwB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,YAAY;AACZ,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,WAAW,CAAC;IACzB,2CAA2C;IAC3C,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,kBAAkB;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,gBAAgB,CAAC,CAAc;IACvC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,sBAAsB;IAOxC;;;;OAIG;IACG,SAAS,CACb,KAAK,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,EAC5E,cAAc,GAAE,UAAU,EAAO,GAChC,OAAO,CAAC,UAAU,EAAE,CAAC;IAcxB,OAAO,CAAC,eAAe;YAqBT,OAAO;YAiBP,aAAa;IAgB3B,OAAO,CAAC,WAAW;CAsBpB"}
|
package/dist/cjs/memory/scene.js
CHANGED
|
@@ -17,10 +17,12 @@ const prompts_ts_1 = require("./prompts.js");
|
|
|
17
17
|
*/
|
|
18
18
|
class SceneAggregator {
|
|
19
19
|
llmProvider;
|
|
20
|
+
fallbackProvider;
|
|
20
21
|
maxScenes;
|
|
21
22
|
timeoutMs;
|
|
22
23
|
constructor(opts) {
|
|
23
24
|
this.llmProvider = opts.llmProvider;
|
|
25
|
+
this.fallbackProvider = opts.fallbackProvider;
|
|
24
26
|
this.maxScenes = opts.maxScenes ?? 15;
|
|
25
27
|
this.timeoutMs = opts.timeoutMs ?? 30000;
|
|
26
28
|
}
|
|
@@ -61,8 +63,20 @@ class SceneAggregator {
|
|
|
61
63
|
{ role: 'system', content: prompts_ts_1.SCENE_AGGREGATION_SYSTEM_PROMPT },
|
|
62
64
|
{ role: 'user', content: userPrompt },
|
|
63
65
|
];
|
|
66
|
+
try {
|
|
67
|
+
return await this.callLLMStream(this.llmProvider, messages);
|
|
68
|
+
}
|
|
69
|
+
catch (err) {
|
|
70
|
+
if (this.fallbackProvider) {
|
|
71
|
+
console.log(`[SceneAggregator] Primary failed (${err?.message || err}), switching to fallback`);
|
|
72
|
+
return await this.callLLMStream(this.fallbackProvider, messages);
|
|
73
|
+
}
|
|
74
|
+
throw err;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
async callLLMStream(provider, messages) {
|
|
64
78
|
const chunks = [];
|
|
65
|
-
const stream =
|
|
79
|
+
const stream = provider.chatStream({
|
|
66
80
|
messages,
|
|
67
81
|
abortSignal: AbortSignal.timeout(this.timeoutMs),
|
|
68
82
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scene.js","sourceRoot":"","sources":["../../../src/memory/scene.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,6BAA6B;AAC7B,+DAA+D;AAC/D,+BAA+B;AAC/B,yBAAyB;;;AAIzB,6CAA+D;
|
|
1
|
+
{"version":3,"file":"scene.js","sourceRoot":"","sources":["../../../src/memory/scene.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit-log.d.ts","sourceRoot":"","sources":["../../../src/middleware/audit-log.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"audit-log.d.ts","sourceRoot":"","sources":["../../../src/middleware/audit-log.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AA4BjE;;;;GAIG;AACH,qBAAa,kBAAmB,YAAW,UAAU;IACnD,IAAI,SAAe;IAEnB,OAAO,CAAC,MAAM,CAAwB;IAEtC;;;;OAIG;gBACS,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,GAAG,MAAM;IAY3D,MAAM,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,KAAK,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5C,YAAY,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAI1D,WAAW,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAIhE"}
|
|
@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
39
|
exports.AuditLogMiddleware = void 0;
|
|
40
40
|
const fs = __importStar(require("fs"));
|
|
41
41
|
const path = __importStar(require("path"));
|
|
42
|
+
const date_ts_1 = require("../utils/date.js");
|
|
42
43
|
/**
|
|
43
44
|
* 文件审计日志器 — 以 JSONL 格式追加写入日志文件
|
|
44
45
|
* 默认路径:{logDir}/audit-YYYY-MM-DD.log
|
|
@@ -50,10 +51,10 @@ function createFileAuditLogger(logDir) {
|
|
|
50
51
|
}
|
|
51
52
|
return (msg) => {
|
|
52
53
|
const now = new Date();
|
|
53
|
-
const dateStr = now.
|
|
54
|
+
const dateStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
|
|
54
55
|
const logFile = path.join(dir, `audit-${dateStr}.log`);
|
|
55
56
|
const entry = JSON.stringify({
|
|
56
|
-
ts:
|
|
57
|
+
ts: (0, date_ts_1.formatLocalDateTime)(now),
|
|
57
58
|
msg,
|
|
58
59
|
}) + '\n';
|
|
59
60
|
fs.appendFileSync(logFile, entry, 'utf-8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit-log.js","sourceRoot":"","sources":["../../../src/middleware/audit-log.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,+BAA+B;AAC/B,+DAA+D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAI/D,uCAAyB;AACzB,2CAA6B;
|
|
1
|
+
{"version":3,"file":"audit-log.js","sourceRoot":"","sources":["../../../src/middleware/audit-log.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/skill/router.js
CHANGED
|
@@ -162,7 +162,7 @@ class VectorRouteStrategy {
|
|
|
162
162
|
if (best.score < this.minScore)
|
|
163
163
|
return null;
|
|
164
164
|
// 在 skills 列表中查找对应的 Skill
|
|
165
|
-
const skill = skills.find((s) => s.id === best.id);
|
|
165
|
+
const skill = skills.find((s) => s.id === best.item.id);
|
|
166
166
|
if (!skill)
|
|
167
167
|
return null;
|
|
168
168
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/skill/router.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/skill/router.ts"],"names":[],"mappings":"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"}
|