@zooique/memora 5.1.0 → 5.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/CHANGELOG.md +69 -4
- package/README.en.md +6 -2
- package/README.md +6 -2
- package/dist/agent/agent.d.ts +5 -2
- package/dist/agent/agent.d.ts.map +1 -1
- package/dist/agent/agent.js +8 -3
- package/dist/agent/agent.js.map +1 -1
- package/dist/agent/constants.d.ts +27 -0
- package/dist/agent/constants.d.ts.map +1 -1
- package/dist/agent/constants.js +27 -0
- package/dist/agent/constants.js.map +1 -1
- package/dist/agent/contextManager.d.ts +31 -3
- package/dist/agent/contextManager.d.ts.map +1 -1
- package/dist/agent/contextManager.js +39 -2
- package/dist/agent/contextManager.js.map +1 -1
- package/dist/agent/loop.d.ts +3 -3
- package/dist/agent/loop.d.ts.map +1 -1
- package/dist/agent/loop.js +6 -5
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/managers/llmCaller.d.ts.map +1 -1
- package/dist/agent/managers/llmCaller.js +14 -1
- package/dist/agent/managers/llmCaller.js.map +1 -1
- package/dist/agent/managers/sessionManager.d.ts.map +1 -1
- package/dist/agent/managers/sessionManager.js +1 -0
- package/dist/agent/managers/sessionManager.js.map +1 -1
- package/dist/agent/messageHistory.d.ts +3 -0
- package/dist/agent/messageHistory.d.ts.map +1 -1
- package/dist/agent/messageHistory.js +14 -0
- package/dist/agent/messageHistory.js.map +1 -1
- package/dist/agent/seed/orchestrator.d.ts +2 -1
- package/dist/agent/seed/orchestrator.d.ts.map +1 -1
- package/dist/agent/seed/orchestrator.js +3 -3
- package/dist/agent/seed/orchestrator.js.map +1 -1
- package/dist/agent/seed/prepare.d.ts +3 -1
- package/dist/agent/seed/prepare.d.ts.map +1 -1
- package/dist/agent/seed/prepare.js +10 -2
- package/dist/agent/seed/prepare.js.map +1 -1
- package/dist/agent/sessionStateMachine.d.ts +3 -0
- package/dist/agent/sessionStateMachine.d.ts.map +1 -1
- package/dist/agent/sessionStateMachine.js.map +1 -1
- package/dist/agent/textSanitize.d.ts +1 -1
- package/dist/agent/textSanitize.js +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/llm/factory.d.ts +21 -0
- package/dist/llm/factory.d.ts.map +1 -1
- package/dist/llm/factory.js +4 -1
- package/dist/llm/factory.js.map +1 -1
- package/dist/llm/openaiCompatible.d.ts +8 -1
- package/dist/llm/openaiCompatible.d.ts.map +1 -1
- package/dist/llm/openaiCompatible.js +26 -0
- package/dist/llm/openaiCompatible.js.map +1 -1
- package/dist/llm/provider.d.ts +65 -0
- package/dist/llm/provider.d.ts.map +1 -1
- package/dist/llm/provider.js +10 -0
- package/dist/llm/provider.js.map +1 -1
- package/dist/memory/inMemorySessionStore.d.ts.map +1 -1
- package/dist/memory/inMemorySessionStore.js +11 -0
- package/dist/memory/inMemorySessionStore.js.map +1 -1
- package/dist/memory/roundStore.d.ts +7 -0
- package/dist/memory/roundStore.d.ts.map +1 -1
- package/dist/memory/roundStore.js.map +1 -1
- package/dist/memory/sessionStore.d.ts +8 -0
- package/dist/memory/sessionStore.d.ts.map +1 -1
- package/dist/memory/sessionStore.js.map +1 -1
- package/docs/memora-api-reference.md +13 -4
- package/docs/memora-/346/216/245/345/205/245/346/214/207/345/215/227.md +45 -17
- package/package.json +3 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messageHistory.d.ts","sourceRoot":"","sources":["../../src/agent/messageHistory.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAe,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"messageHistory.d.ts","sourceRoot":"","sources":["../../src/agent/messageHistory.ts"],"names":[],"mappings":"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"}
|
|
@@ -191,6 +191,7 @@ export class MessageHistory {
|
|
|
191
191
|
content,
|
|
192
192
|
timestamp: nowIso(),
|
|
193
193
|
...(roundId ? { roundId } : {}),
|
|
194
|
+
...(opts?.attachments ? { attachments: opts.attachments } : {}),
|
|
194
195
|
};
|
|
195
196
|
// 会话日期锚点不随输入漂移：currentDate 由显式加载/新建决定，跨天续聊沿用原会话日期
|
|
196
197
|
// Round-based 路径：roundStore 注入且有 roundId 时写入
|
|
@@ -229,6 +230,7 @@ export class MessageHistory {
|
|
|
229
230
|
role: 'user',
|
|
230
231
|
content,
|
|
231
232
|
timestamp: message.timestamp,
|
|
233
|
+
...(opts?.attachments ? { attachments: opts.attachments } : {}),
|
|
232
234
|
},
|
|
233
235
|
status: 'pending',
|
|
234
236
|
createdAt: message.timestamp,
|
|
@@ -502,18 +504,30 @@ export class MessageHistory {
|
|
|
502
504
|
if (!this.roundStore || !roundIds.length)
|
|
503
505
|
return [];
|
|
504
506
|
const messages = [];
|
|
507
|
+
const currentIdx = roundIds.length - 1;
|
|
505
508
|
for (const roundId of roundIds) {
|
|
506
509
|
const round = this.roundStore.getById(roundId);
|
|
507
510
|
if (!round) {
|
|
508
511
|
logger.warn({ roundId }, 'loadRoundBasedMessages: Round 不存在，跳过');
|
|
509
512
|
continue;
|
|
510
513
|
}
|
|
514
|
+
// 历史图片窗口衰减（方案 §5.12 / D22 / D23）：只有最近 RETAIN_IMAGE_ROUNDS 轮内的
|
|
515
|
+
// attachments 带上模型上下文；更早轮次不带（content 不变，仍是那句占位）。
|
|
516
|
+
// 窗口 = `当前索引 − 消息索引`，纯计算、零状态。
|
|
517
|
+
// 注意该常量是**四个消费点同值**（见 LOOP_CONSTANTS.RETAIN_IMAGE_ROUNDS 的注释）：
|
|
518
|
+
// 此处窗口衰减 + 两个 `loadMessages` 实现的同判据衰减 + 宿主会话加载期预读
|
|
519
|
+
// （`hosts/memora-vscode/.../imageCache.ts` 的 `preloadSession`），
|
|
520
|
+
// 拆分条件的完整论证见该常量注释。
|
|
521
|
+
const idx = roundIds.indexOf(roundId);
|
|
522
|
+
const withImages = currentIdx - idx < LOOP_CONSTANTS.RETAIN_IMAGE_ROUNDS;
|
|
523
|
+
const userAttachments = withImages ? round.userMessage.attachments : undefined;
|
|
511
524
|
// User message
|
|
512
525
|
messages.push({
|
|
513
526
|
role: round.userMessage.role,
|
|
514
527
|
content: round.userMessage.content,
|
|
515
528
|
roundId: round.id,
|
|
516
529
|
timestamp: round.userMessage.timestamp,
|
|
530
|
+
...(userAttachments ? { attachments: userAttachments } : {}),
|
|
517
531
|
});
|
|
518
532
|
// Assistant message（如果存在）
|
|
519
533
|
if (round.assistantMessage) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messageHistory.js","sourceRoot":"","sources":["../../src/agent/messageHistory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"messageHistory.js","sourceRoot":"","sources":["../../src/agent/messageHistory.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
*/
|
|
13
13
|
import type { AgentChunk } from '../../agent/types.js';
|
|
14
14
|
import type { InteractiveInputKind } from '../../memory/roundStore.js';
|
|
15
|
+
import type { ImageRef } from '../../llm/provider.js';
|
|
15
16
|
import { type SeedDeps } from './types.js';
|
|
16
17
|
/**
|
|
17
18
|
* ask_user 提问超时未答的交互记录正文：
|
|
@@ -53,7 +54,7 @@ export declare class SeedOrchestrator {
|
|
|
53
54
|
* @param signal 中止信号
|
|
54
55
|
* @yields AgentChunk 事件流（thinking / 透传 loop 执行流 chunk）
|
|
55
56
|
*/
|
|
56
|
-
runChat(input: string, signal: AbortSignal): AsyncGenerator<AgentChunk, void, unknown>;
|
|
57
|
+
runChat(input: string, signal: AbortSignal, attachments?: readonly ImageRef[]): AsyncGenerator<AgentChunk, void, unknown>;
|
|
57
58
|
/**
|
|
58
59
|
* 续跑路径 turn：回答中(continueAfterPause) → 回答后。无回答前。
|
|
59
60
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../src/agent/seed/orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../src/agent/seed/orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAKlD,OAAO,EAA4B,KAAK,QAAQ,EAAkB,MAAM,YAAY,CAAC;AAKrF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,kBAAkB,uZACwC,CAAC;AAExE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B,qBAAqB;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAW;IAChC,oCAAoC;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,IAAI,EAAE,QAAQ;IAK1B;;;;;;;;OAQG;IACI,OAAO,CACZ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,WAAW,EACnB,WAAW,CAAC,EAAE,SAAS,QAAQ,EAAE,GAChC,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC;IA+B5C;;;;;;;;;;;;;OAaG;IACI,SAAS,CACd,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,MAAM,EAAE,WAAW,EACnB,IAAI,GAAE,oBAAmC,GACxC,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC;IAoD5C;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAOzB;;;;OAIG;YACY,GAAG;IAoElB,kDAAkD;YACpC,OAAO;IAIrB,2DAA2D;YAC7C,UAAU;IAoDxB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;CAG5B"}
|
|
@@ -60,9 +60,9 @@ export class SeedOrchestrator {
|
|
|
60
60
|
* @param signal 中止信号
|
|
61
61
|
* @yields AgentChunk 事件流（thinking / 透传 loop 执行流 chunk）
|
|
62
62
|
*/
|
|
63
|
-
async *runChat(input, signal) {
|
|
63
|
+
async *runChat(input, signal, attachments) {
|
|
64
64
|
// 回答前：装配上下文 + 召回记忆
|
|
65
|
-
const prepared = yield* this.prepare.run(input, signal);
|
|
65
|
+
const prepared = yield* this.prepare.run(input, signal, attachments);
|
|
66
66
|
if (prepared.aborted) {
|
|
67
67
|
yield {
|
|
68
68
|
type: 'aborted',
|
|
@@ -76,7 +76,7 @@ export class SeedOrchestrator {
|
|
|
76
76
|
// 回答中：消费 loop.processUserInput 执行流
|
|
77
77
|
const produce = () => this.deps
|
|
78
78
|
.getParts()
|
|
79
|
-
.loop.processUserInput(input, signal, this.deps.getParts().loop.getCurrentRoundId());
|
|
79
|
+
.loop.processUserInput(input, signal, this.deps.getParts().loop.getCurrentRoundId(), attachments);
|
|
80
80
|
const acted = yield* this.act(produce, signal);
|
|
81
81
|
if (acted.failed || acted.aborted || acted.paused)
|
|
82
82
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../../src/agent/seed/orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;
|
|
1
|
+
{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../../src/agent/seed/orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* ContextPreparer 唯一实现，本模块只保留编排骨架（与 ContextPreparer 文档一致）。
|
|
10
10
|
*/
|
|
11
11
|
import type { AgentChunk } from '../../agent/types.js';
|
|
12
|
+
import type { ImageRef } from '../../llm/provider.js';
|
|
12
13
|
import { type SeedDeps, type SeedPrepareResult } from './types.js';
|
|
13
14
|
/**
|
|
14
15
|
* 回答前阶段执行器
|
|
@@ -25,9 +26,10 @@ export declare class SeedPrepare {
|
|
|
25
26
|
*
|
|
26
27
|
* @param input 用户输入
|
|
27
28
|
* @param signal 中止信号（回答前中断则在技能注入前返回 aborted）
|
|
29
|
+
* @param attachments 图片附件（可选，多模态输入）；透传到 `history.appendUser` 落盘（方案 §7 P0-12）
|
|
28
30
|
* @returns 回答前结果（input + aborted；round 归属见 SeedPrepareResult）
|
|
29
31
|
*/
|
|
30
|
-
run(input: string, signal: AbortSignal): AsyncGenerator<AgentChunk, SeedPrepareResult, unknown>;
|
|
32
|
+
run(input: string, signal: AbortSignal, attachments?: readonly ImageRef[]): AsyncGenerator<AgentChunk, SeedPrepareResult, unknown>;
|
|
31
33
|
}
|
|
32
34
|
/**
|
|
33
35
|
* 会议机制：按给定任务项 rolePack 刷新本轮表层装配视角。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare.d.ts","sourceRoot":"","sources":["../../../src/agent/seed/prepare.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"prepare.d.ts","sourceRoot":"","sources":["../../../src/agent/seed/prepare.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,EAAE,KAAK,QAAQ,EAAkB,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEnF;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,qBAAqB;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAW;gBAEpB,IAAI,EAAE,QAAQ;IAI1B;;;;;;;OAOG;IACI,GAAG,CACR,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,WAAW,EACnB,WAAW,CAAC,EAAE,SAAS,QAAQ,EAAE,GAChC,cAAc,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,CAAC;CAmF1D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAK7F"}
|
|
@@ -27,9 +27,10 @@ export class SeedPrepare {
|
|
|
27
27
|
*
|
|
28
28
|
* @param input 用户输入
|
|
29
29
|
* @param signal 中止信号（回答前中断则在技能注入前返回 aborted）
|
|
30
|
+
* @param attachments 图片附件（可选，多模态输入）；透传到 `history.appendUser` 落盘（方案 §7 P0-12）
|
|
30
31
|
* @returns 回答前结果（input + aborted；round 归属见 SeedPrepareResult）
|
|
31
32
|
*/
|
|
32
|
-
async *run(input, signal) {
|
|
33
|
+
async *run(input, signal, attachments) {
|
|
33
34
|
const { loop, history, sessionManager, rolePackManager, contextPreparer, sessionNamer } = this.deps.getParts();
|
|
34
35
|
// 每次回答前先清临时 system 消息（技能/最近对话 prompt 是当轮注入，不跨轮累积）
|
|
35
36
|
loop.cleanTemporarySystemMessages();
|
|
@@ -78,7 +79,14 @@ export class SeedPrepare {
|
|
|
78
79
|
yield { type: 'thinking', phase: 'processing' };
|
|
79
80
|
const roundId = loop.allocRoundId();
|
|
80
81
|
loop.setCurrentRoundId(roundId);
|
|
81
|
-
|
|
82
|
+
// 无附件时调用形状与升级前**完全一致**（不传第 3 参）：prepare / orchestrator 的
|
|
83
|
+
// `appendUser` 断言按双参验收，无条件多出一个 `{}` 属行为变更（务必带条件传参）。
|
|
84
|
+
if (attachments) {
|
|
85
|
+
await history.appendUser(input, roundId, { attachments });
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
await history.appendUser(input, roundId);
|
|
89
|
+
}
|
|
82
90
|
// 会话标题自动命名（fire-and-forget）：仅新建会话首次问答触发（以"会话无标题"判定，不覆盖手动改名）
|
|
83
91
|
if (sessionNamer) {
|
|
84
92
|
// 后台槽位调度器归属本 Agent 实例（SeedDeps 注入）——命名 fire-and-forget 不阻塞回答前
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../../src/agent/seed/prepare.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;
|
|
1
|
+
{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../../src/agent/seed/prepare.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,9 @@
|
|
|
9
9
|
* 入口会把用户钉死在 error 态），运行时失败也不翻状态机。ERROR 保留为公开 API
|
|
10
10
|
* triggerError() 可达的预留态，待与 `Round.error` 无真实产生路径合并评估。
|
|
11
11
|
* 生产运行时异常走 `yield { type:'error' }` 事件流（agent.ts），不翻状态机。若要让运行时异常自动翻状态机，需在 yield error 处接线 triggerError（行为变更，需产品决策）。
|
|
12
|
+
* 2026-10-27 产品拍板（真源 = 台账 HOST-ERR-1）：上一行所述「产品决策」已决——**不接线**、
|
|
13
|
+
* 宿主**不建恢复入口**，error 对宿主即终态语义（展示层已持久渲染「异常中断」并落盘失败原因，
|
|
14
|
+
* 运行时失败不产生卡死面）。triggerError()/recover() 保留为库级公开 API + 测试覆盖，退役须走 deprecation 三件套。
|
|
12
15
|
* 单实例事件队列串行处理，无并发写路径。
|
|
13
16
|
*/
|
|
14
17
|
import type { SessionCheckpoint, StatusTransition, SessionStatus, PauseSource } from '../agent/types.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionStateMachine.d.ts","sourceRoot":"","sources":["../../src/agent/sessionStateMachine.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"sessionStateMachine.d.ts","sourceRoot":"","sources":["../../src/agent/sessionStateMachine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAE1B;;;GAGG;AACH,qBAAa,mBAAmB;IAC9B,WAAW;IACX,OAAO,CAAC,aAAa,CAAgB;IACrC,wBAAwB;IACxB,OAAO,CAAC,WAAW,CAAuB;IAC1C,wBAAwB;IACxB,OAAO,CAAC,WAAW,CAA4B;IAC/C,uBAAuB;IACvB,OAAO,CAAC,UAAU,CAAuB;IACzC,2CAA2C;IAC3C,OAAO,CAAC,kBAAkB,CAAC,CAAS;IACpC,0CAA0C;IAC1C,OAAO,CAAC,kBAAkB,CAAuB;IAEjD,6CAA6C;gBACjC,aAAa,GAAE,aAAyB;IAIpD,WAAW;IACX,IAAI,MAAM,IAAI,aAAa,CAE1B;IAED,mCAAmC;IACnC,IAAI,SAAS,IAAI;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAE,GAAG,IAAI,CAG9D;IAED,+BAA+B;IAC/B,IAAI,SAAS,IAAI,MAAM,GAAG,IAAI,CAE7B;IAED,0CAA0C;IAC1C,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,WAAoB,GAAG,gBAAgB;IAgBrE,8CAA8C;IAC9C,MAAM,IAAI,gBAAgB;IAgB1B,kEAAkE;IAClE,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB;IAe7C,4EAA4E;IAC5E,OAAO,CAAC,UAAU,EAAE,iBAAiB,GAAG,gBAAgB;IAoCxD,yBAAyB;IACzB,QAAQ,IAAI,OAAO;IAInB,wBAAwB;IACxB,SAAS,IAAI,OAAO;IAIpB,iBAAiB;IACjB,OAAO,IAAI,OAAO;IAIlB,iFAAiF;IACjF,cAAc,IAAI,IAAI;IAatB,yFAAyF;IACzF,OAAO,CAAC,eAAe;IAIvB,sDAAsD;IACtD,IAAI,gBAAgB,IAAI;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAE,GAAG,IAAI,CAGrE;IAED,8FAA8F;IAC9F,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,WAAoB,GAAG,OAAO;IAQnE,8DAA8D;IAC9D,mBAAmB,IAAI;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAE,GAAG,IAAI;IAQrE,iEAAiE;IACjE,kBAAkB,IAAI,IAAI;IAK1B,gDAAgD;IAChD,cAAc,IAAI,OAAO;CAG1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionStateMachine.js","sourceRoot":"","sources":["../../src/agent/sessionStateMachine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sessionStateMachine.js","sourceRoot":"","sources":["../../src/agent/sessionStateMachine.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* `skillScriptRunner`（命令结果格式化）。此前它住在 `toolExecutor.ts`，导致两个后果：
|
|
7
7
|
* ① `builtinToolHandlers` 反向 import `toolExecutor`（而 `toolExecutor` 也 import 它）——**模块循环**；
|
|
8
8
|
* ② 命令结果的**定长真源**（`RUN_SCRIPT_RESULT_MAX_LEN`）是 toolExecutor 的模块私有常量，
|
|
9
|
-
*
|
|
9
|
+
* 第二个消费面（后台完成回流）看不到它 ⇒ 回流路径裸奔、无长度上限（2MB 输出可直灌上下文）。
|
|
10
10
|
* 抽到零依赖的纯模块后，两个消费面共用同一份规则与同一个上限。
|
|
11
11
|
*
|
|
12
12
|
* 量纲纪律：本模块是**字符**层。上下文侧另有 token 入口关（`appendToolMessage` 落盘）、
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* `skillScriptRunner`（命令结果格式化）。此前它住在 `toolExecutor.ts`，导致两个后果：
|
|
7
7
|
* ① `builtinToolHandlers` 反向 import `toolExecutor`（而 `toolExecutor` 也 import 它）——**模块循环**；
|
|
8
8
|
* ② 命令结果的**定长真源**（`RUN_SCRIPT_RESULT_MAX_LEN`）是 toolExecutor 的模块私有常量，
|
|
9
|
-
*
|
|
9
|
+
* 第二个消费面（后台完成回流）看不到它 ⇒ 回流路径裸奔、无长度上限（2MB 输出可直灌上下文）。
|
|
10
10
|
* 抽到零依赖的纯模块后，两个消费面共用同一份规则与同一个上限。
|
|
11
11
|
*
|
|
12
12
|
* 量纲纪律：本模块是**字符**层。上下文侧另有 token 入口关（`appendToolMessage` 落盘）、
|
package/dist/index.d.ts
CHANGED
|
@@ -32,6 +32,8 @@ export { loadConfig } from './config/loader.js';
|
|
|
32
32
|
export { createProviderFromConfig } from './llm/factory.js';
|
|
33
33
|
export type { ProviderConfig } from './llm/factory.js';
|
|
34
34
|
export type { LlmProvider, ChatOptions } from './llm/provider.js';
|
|
35
|
+
export type { ImageRef, ImageResolver } from './llm/provider.js';
|
|
36
|
+
export { imageTokens } from './agent/contextManager.js';
|
|
35
37
|
export type { LlmChunk, ProviderRouter } from './llm/types.js';
|
|
36
38
|
export type { Config } from './config/loader.js';
|
|
37
39
|
export { TypedEventEmitter } from './utils/eventEmitter.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,YAAY,EACV,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,YAAY,GACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAMtD,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAI1E,OAAO,EAAE,sBAAsB,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC9E,YAAY,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,YAAY,EACV,cAAc,EACd,WAAW,EACX,WAAW,EACX,eAAe,GAChB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAInE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAGlE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,YAAY,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAKnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,YAAY,EACV,eAAe,EACf,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,UAAU,GACX,MAAM,qCAAqC,CAAC;AAG7C,YAAY,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAE9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE,YAAY,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAE1E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -49,6 +49,11 @@ export { loadConfig } from './config/loader.js';
|
|
|
49
49
|
// createProviderFromConfig —— 【规范入口】宿主传入 baseUrl+model+apiKey，校验后创建。
|
|
50
50
|
// createLlmProvider（从整份 Config 解析激活 provider）为内核内部便利实现，不挂公共面。
|
|
51
51
|
export { createProviderFromConfig } from './llm/factory.js';
|
|
52
|
+
// 单图 token 折算（方案 §5.9）：宿主入口限额要用「图片 token ≤ contextWindow 25%」（§6.7 / G3）
|
|
53
|
+
// 做准入判断。若宿主另写一份 ceil(w/28)×ceil(h/28) 与上界 clamp，就是同一公式的第二份实现——
|
|
54
|
+
// 将来调上界时必漂移（现行 1568 已登记为 OpenAI high 低估的已知缺口）。故在此**单点导出**，
|
|
55
|
+
// 宿主 import 复用，不在任何侧重算。函数公开不触成员面守卫，登记见 publicApiSurfaceGuard。
|
|
56
|
+
export { imageTokens } from './agent/contextManager.js';
|
|
52
57
|
// 事件系统（事件名常量表 AGENT_EVENTS 为内核内部实现，订阅用字符串字面量或 AgentEventName 类型）
|
|
53
58
|
export { TypedEventEmitter } from './utils/eventEmitter.js';
|
|
54
59
|
// 会话标识格式契约（SSOT 单点）：date/session 双向转换唯一真理源，宿主导入后不再手写 slice/split
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,iDAAiD;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAUzC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACvE,2DAA2D;AAC3D,iDAAiD;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,qDAAqD;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,0DAA0D;AAC1D,yDAAyD;AACzD,0DAA0D;AAC1D,oDAAoD;AACpD,qDAAqD;AACrD,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEvF,8BAA8B;AAC9B,sDAAsD;AACtD,2DAA2D;AAC3D,OAAO,EAAE,sBAAsB,EAAuB,MAAM,iBAAiB,CAAC;AAQ9E,0EAA0E;AAC1E,uDAAuD;AACvD,+CAA+C;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,qEAAqE;AACrE,0EAA0E;AAC1E,kCAAkC;AAClC,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAIlE,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,+CAA+C;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,6DAA6D;AAC7D,mDAAmD;AACnD,uEAAuE;AACvE,qBAAqB;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAahE,uDAAuD;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAGzE,8CAA8C;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,sDAAsD;AACtD,uEAAuE;AACvE,gEAAgE;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/llm/factory.d.ts
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
* 避免把"哪个 provider 激活"这一宿主策略委托给内核。
|
|
12
12
|
*/
|
|
13
13
|
import type { Config } from '../config/loader.js';
|
|
14
|
+
import type { ImageResolver } from '../llm/provider.js';
|
|
14
15
|
import { LlmProvider } from '../llm/provider.js';
|
|
15
16
|
/** 单个 Provider 配置（createProviderFromConfig 入参）：baseUrl 可选，缺失时内部抛 configError */
|
|
16
17
|
export interface ProviderConfig {
|
|
@@ -32,6 +33,26 @@ export interface ProviderConfig {
|
|
|
32
33
|
supportsToolCalling?: boolean;
|
|
33
34
|
/** 是否支持结构化输出（response_format / JSON mode）；未填 → 回落 false */
|
|
34
35
|
supportsStructuredOutput?: boolean;
|
|
36
|
+
/**
|
|
37
|
+
* 是否支持图片输入（多模态 vision / content parts）；未填 → 回落 **false**（失败必闭）
|
|
38
|
+
*
|
|
39
|
+
* 【持久化数据】与上面两个能力位同性质：宿主须经「DTO → 表单 → 存储 → 建房」全链路透传。
|
|
40
|
+
* 缺省方向选 false 而非 true，是因为「声称看得见图却看不懂」比「坦承不支持」危害更大——
|
|
41
|
+
* 前者让图片静默丢失且用户无法归因，后者由 llmCaller 一级门禁明确拒收并给出可执行建议。
|
|
42
|
+
*/
|
|
43
|
+
supportsVision?: boolean;
|
|
44
|
+
/**
|
|
45
|
+
* 图片解析器（运行时回调，**不可持久化**）
|
|
46
|
+
*
|
|
47
|
+
* 【运行时注入】与上面三个能力位**性质不同**：这是宿主持有的函数句柄，不能进任何 JSON 配置。
|
|
48
|
+
* 内核只调用它把 ImageRef 换成「URL 或 占位文本」，自身不读文件、不发网络请求
|
|
49
|
+
* （零外部读写是内核边界，见 provider.ts 的 ImageResolver 定义）。
|
|
50
|
+
*
|
|
51
|
+
* 因此本字段只属于**建房入参**（ProviderConfig），**不属于宿主的持久化 DTO**——
|
|
52
|
+
* 宿主 DTO 里只有 supportsVision 这一「用户声明」，resolver 由宿主在调用本函数时直接传入。
|
|
53
|
+
* 未注入 → formatMessages 走降级：推可见占位文本块，**绝不静默丢该图**（见 openaiCompatible）。
|
|
54
|
+
*/
|
|
55
|
+
imageResolver?: ImageResolver;
|
|
35
56
|
}
|
|
36
57
|
/** 从单个 Provider 配置创建 LlmProvider 实例（多 Provider 管理场景：为 providers 映射表中每个条目调用） */
|
|
37
58
|
export declare function createProviderFromConfig(name: string, providerConfig: ProviderConfig): LlmProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/llm/factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAMhD,gFAAgF;AAChF,MAAM,WAAW,cAAc;IAC7B,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+BAA+B;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,2DAA2D;IAC3D,wBAAwB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/llm/factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAMhD,gFAAgF;AAChF,MAAM,WAAW,cAAc;IAC7B,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+BAA+B;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,2DAA2D;IAC3D,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;;;;;;;OAUG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED,+EAA+E;AAC/E,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,cAAc,GAC7B,WAAW,CAsCb;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAsB7D"}
|
package/dist/llm/factory.js
CHANGED
|
@@ -28,9 +28,12 @@ export function createProviderFromConfig(name, providerConfig) {
|
|
|
28
28
|
apiKey: apiKey ?? '',
|
|
29
29
|
defaultModel: model,
|
|
30
30
|
// 能力位透传：未填（undefined）由 OpenAICompatibleProvider 内按**各自方向**回落——
|
|
31
|
-
// supportsToolCalling → true，supportsStructuredOutput → false
|
|
31
|
+
// supportsToolCalling → true，supportsStructuredOutput / supportsVision → false
|
|
32
|
+
// （见上方字段文档；勿读成「默认都开」）。
|
|
32
33
|
supportsToolCalling: providerConfig.supportsToolCalling,
|
|
33
34
|
supportsStructuredOutput: providerConfig.supportsStructuredOutput,
|
|
35
|
+
supportsVision: providerConfig.supportsVision,
|
|
36
|
+
imageResolver: providerConfig.imageResolver,
|
|
34
37
|
});
|
|
35
38
|
}
|
|
36
39
|
/**
|
package/dist/llm/factory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/llm/factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/llm/factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* 适用于：DeepSeek / 豆包 / 通义 / Ollama / 任何兼容 OpenAI 协议的 API
|
|
5
5
|
*/
|
|
6
6
|
import { LlmProvider } from '../llm/provider.js';
|
|
7
|
-
import type { Message, ChatOptions } from '../llm/provider.js';
|
|
7
|
+
import type { ImageResolver, Message, ChatOptions } from '../llm/provider.js';
|
|
8
8
|
import type { LlmChunk } from '../llm/types.js';
|
|
9
9
|
export interface OpenAICompatibleConfig {
|
|
10
10
|
baseUrl: string;
|
|
@@ -15,6 +15,13 @@ export interface OpenAICompatibleConfig {
|
|
|
15
15
|
supportsToolCalling?: boolean;
|
|
16
16
|
/** 是否支持结构化输出（response_format / JSON mode），默认 false */
|
|
17
17
|
supportsStructuredOutput?: boolean;
|
|
18
|
+
/** 是否支持视觉 / 多模态图片输入（默认 false，fail-closed；显式 true 才走图片通道） */
|
|
19
|
+
supportsVision?: boolean;
|
|
20
|
+
/**
|
|
21
|
+
* 图片解析器（宿主注入）：把 `ImageRef` 物化为可发送形式（URL 或 base64 文本）。
|
|
22
|
+
* 不注入 ⇒ 含附件的消息在 `formatMessages` 序列化期降级（推可见占位文本块，**绝不静默丢该图**，方案 §5.5 二级）。
|
|
23
|
+
*/
|
|
24
|
+
imageResolver?: ImageResolver;
|
|
18
25
|
}
|
|
19
26
|
/** 通用 OpenAI 兼容 Provider：通过 baseUrl 适配不同厂商 */
|
|
20
27
|
export declare class OpenAICompatibleProvider extends LlmProvider {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiCompatible.d.ts","sourceRoot":"","sources":["../../src/llm/openaiCompatible.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"openaiCompatible.d.ts","sourceRoot":"","sources":["../../src/llm/openaiCompatible.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,gBAAgB,CAAC;AAYzD,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB;4EACwE;IACxE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,sDAAsD;IACtD,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,4DAA4D;IAC5D,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AA2CD,8CAA8C;AAC9C,qBAAa,wBAAyB,SAAQ,WAAW;IAKrD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAGpB,IAAI,EAAE,MAAM,EACK,MAAM,EAAE,sBAAsB;IAOjD;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAQxB,mBAAmB;IACnB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAW;IAErD;;wDAEoD;IACpD,OAAO,CAAC,aAAa,CAAK;IAEnB,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,GAAE,WAAgB,GAAG,aAAa,CAAC,QAAQ,CAAC;IA4GjF,0CAA0C;YAC5B,mBAAmB;IA2CjC,uDAAuD;YACzC,cAAc;IAQ5B;;;OAGG;IACH,OAAO,CAAC,cAAc;IA6CtB;;;OAGG;YACY,cAAc;IAkN7B;yEACqE;IACrE,OAAO,CAAC,8BAA8B;IActC,iCAAiC;IACjC,OAAO,CAAC,mBAAmB;CAQ5B"}
|
|
@@ -67,6 +67,7 @@ export class OpenAICompatibleProvider extends LlmProvider {
|
|
|
67
67
|
config.supportsToolCalling ?? true;
|
|
68
68
|
this.supportsStructuredOutput =
|
|
69
69
|
config.supportsStructuredOutput ?? false;
|
|
70
|
+
this.supportsVision = config.supportsVision ?? false;
|
|
70
71
|
}
|
|
71
72
|
/** 默认请求超时：120 秒 */
|
|
72
73
|
static DEFAULT_TIMEOUT_MS = 120_000;
|
|
@@ -219,6 +220,31 @@ export class OpenAICompatibleProvider extends LlmProvider {
|
|
|
219
220
|
tool_calls: m.toolCalls,
|
|
220
221
|
};
|
|
221
222
|
}
|
|
223
|
+
// 默认分支（user 文本）：仅当携带图片附件时展开为 content 块数组（OpenAI image_url 形态）；
|
|
224
|
+
// 无附件时形状与升级前**字节级一致**（快照测试 R8-4 守门）。base64 字节**只在此处**临时物化，
|
|
225
|
+
// 经宿主注入的 ImageResolver 端口，内核零外部 IO（方案 §5.3 / §5.4）。
|
|
226
|
+
if (m.role === 'user' && m.attachments?.length) {
|
|
227
|
+
const blocks = m.content ? [{ type: 'text', text: m.content }] : [];
|
|
228
|
+
for (const att of m.attachments) {
|
|
229
|
+
const resolved = this.config.imageResolver?.(att) ?? null;
|
|
230
|
+
if (resolved && 'url' in resolved) {
|
|
231
|
+
blocks.push({ type: 'image_url', image_url: { url: resolved.url } });
|
|
232
|
+
continue;
|
|
233
|
+
}
|
|
234
|
+
// 二级降级（D7 / §5.4 / §6.13）：**推可见占位文本块，绝不静默丢该图**。
|
|
235
|
+
// 静默丢 ⇒ 用户以为图发了、模型却从没见过 ⇒ 不可发现的错误（文档明文判据）。
|
|
236
|
+
// 占位文案的生产权归宿主（只有宿主知道路径），宿主未给时内核只给最短信息
|
|
237
|
+
//（`sha256` 前 8 位）——内核不知道也不该知道路径，不伪造档名/大小。
|
|
238
|
+
blocks.push({
|
|
239
|
+
type: 'text',
|
|
240
|
+
text: resolved && 'text' in resolved
|
|
241
|
+
? resolved.text
|
|
242
|
+
: `[图片不可用 ${att.sha256.slice(0, 8)}]`,
|
|
243
|
+
});
|
|
244
|
+
}
|
|
245
|
+
// blocks 恒非空：进入本分支前提是 attachments 非空，循环每图必推一块（图块或占位块）
|
|
246
|
+
return { role: 'user', content: blocks };
|
|
247
|
+
}
|
|
222
248
|
return { role: m.role, content: m.content };
|
|
223
249
|
});
|
|
224
250
|
}
|