@whispering233/ai-editor-agent 0.0.29 → 0.0.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/context.d.ts +7 -7
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +1 -1
- package/dist/context.js.map +1 -1
- package/dist/executor.js +3 -3
- package/dist/executor.js.map +1 -1
- package/dist/prompts.d.ts +4 -4
- package/dist/prompts.d.ts.map +1 -1
- package/dist/prompts.js +4 -4
- package/dist/prompts.js.map +1 -1
- package/dist/run.d.ts +7 -7
- package/dist/run.d.ts.map +1 -1
- package/dist/run.js +10 -10
- package/dist/run.js.map +1 -1
- package/dist/session.d.ts +3 -3
- package/dist/session.js +4 -4
- package/package.json +4 -4
package/dist/context.d.ts
CHANGED
|
@@ -5,11 +5,11 @@ import { type SessionMessage } from "./session.js";
|
|
|
5
5
|
* 分层合计约 11.5K，远低于 DeepSeek 64K 窗口——各层独立校验、不设总预算校验（YAGNI：
|
|
6
6
|
* 分层裁剪已保证各层在其预算内，窗口余量充足） */
|
|
7
7
|
export interface ContextBudgets {
|
|
8
|
-
/** 基础 system 层：内核 + 项目提示词 +
|
|
8
|
+
/** 基础 system 层：内核 + 项目提示词 + 临时指令（~500；超限仅记录不裁剪——用户内容不可裁） */
|
|
9
9
|
system: number;
|
|
10
|
-
/**
|
|
10
|
+
/** 聚焦上下文层（~3000；超限截断并显式告知） */
|
|
11
11
|
focus: number;
|
|
12
|
-
/**
|
|
12
|
+
/** 对话历史层（~6000；超限走 session 成对裁剪——同裁同留不拆对） */
|
|
13
13
|
history: number;
|
|
14
14
|
}
|
|
15
15
|
export declare const DEFAULT_CONTEXT_BUDGETS: ContextBudgets;
|
|
@@ -19,18 +19,18 @@ export type ToolListEntry = Pick<ToolDefinition, "name" | "description">;
|
|
|
19
19
|
export interface BuildContextInput {
|
|
20
20
|
/**
|
|
21
21
|
* 会话历史（session 状态；本层负责超预算成对裁剪 + 末条约束收尾）。
|
|
22
|
-
* **前置条件**：必须含至少一条 user/tool
|
|
22
|
+
* **前置条件**：必须含至少一条 user/tool 消息（末条约束）；空历史属调用方错误——
|
|
23
23
|
* S7.3 应在 history 为空时走引导分支（不发请求），勿传入空数组（buildPayload 空数组
|
|
24
24
|
* 语义同源：空历史 = 无有效上下文，两者互相印证）
|
|
25
25
|
*/
|
|
26
26
|
history: SessionMessage[];
|
|
27
27
|
/** 内核提示词（默认 KERNEL_PROMPT；测试可覆盖） */
|
|
28
28
|
kernelPrompt?: string;
|
|
29
|
-
/**
|
|
29
|
+
/** 项目提示词（项目层；起数据源 = 项目目录 文件内容，调用方读取后传入；可空） */
|
|
30
30
|
projectPrompt?: string;
|
|
31
|
-
/**
|
|
31
|
+
/** 临时指令（临时层，即时输入不持久化；可空） */
|
|
32
32
|
instruction?: string;
|
|
33
|
-
/**
|
|
33
|
+
/** 聚焦上下文文本（聚焦层，调用方查询实体/大纲节点后拼好传入；空/缺省 = 无聚焦） */
|
|
34
34
|
focus?: string;
|
|
35
35
|
/** 工具清单（默认内部 listTools()；测试可注入 mock） */
|
|
36
36
|
tools?: ToolListEntry[];
|
package/dist/context.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,EAAa,KAAK,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAShF,OAAO,EAA6B,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAI9E;;4BAE4B;AAC5B,MAAM,WAAW,cAAc;IAC9B,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,EAAa,KAAK,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAShF,OAAO,EAA6B,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAI9E;;4BAE4B;AAC5B,MAAM,WAAW,cAAc;IAC9B,4DAA4D;IAC3D,MAAM,EAAE,MAAM,CAAC;IAChB,8BAA8B;IAC7B,KAAK,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC5C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,uBAAuB,EAAE,cAIrC,CAAC;AAIF,4DAA4D;AAC5D,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,aAAa,CAAC,CAAC;AAEzE,iEAAiE;AACjE,MAAM,WAAW,iBAAiB;IACjC;;;;;MAKE;IACD,OAAO,EAAE,cAAc,EAAE,CAAC;IAC3B,oCAAoC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACvB,8CAA8C;IAC7C,aAAa,CAAC,EAAE,MAAM,CAAC;IACxB,4BAA4B;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACtB,gDAAgD;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;IAChB,wCAAwC;IACvC,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACzB;;;;;;;MAOE;IACD,SAAS,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC7B,qBAAqB;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;CACnC;AAED,wDAAwD;AACxD,MAAM,WAAW,gBAAgB;IAChC,yEAAyE;IACxE,QAAQ,EAAE,UAAU,EAAE,CAAC;IACxB,yCAAyC;IACxC,MAAM,EAAE;QACT,0BAA0B;QACvB,MAAM,EAAE,MAAM,CAAC;QAClB,4CAA4C;QACzC,QAAQ,EAAE,MAAM,CAAC;QACpB,sBAAsB;QACnB,KAAK,EAAE,MAAM,CAAC;QACjB,eAAe;QACZ,OAAO,EAAE,MAAM,CAAC;QACnB,WAAW;QACR,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,IAAI,EAAE;QACP,oCAAoC;QACjC,gBAAgB,EAAE,OAAO,CAAC;QAC7B,mBAAmB;QAChB,cAAc,EAAE,OAAO,CAAC;QAC3B,uBAAuB;QACpB,cAAc,EAAE,OAAO,CAAC;QAC3B,cAAc;QACX,mBAAmB,EAAE,MAAM,CAAC;QAC/B,0CAA0C;QACvC,cAAc,EAAE,OAAO,CAAC;QAC3B;;;;;UAKE;QACC,kBAAkB,EAAE,QAAQ,GAAG,IAAI,CAAC;KACrC,CAAC;CACH;AAsED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,gBAAgB,CA2DvE"}
|
package/dist/context.js
CHANGED
|
@@ -21,7 +21,7 @@ export const DEFAULT_CONTEXT_BUDGETS = {
|
|
|
21
21
|
history: 6000,
|
|
22
22
|
};
|
|
23
23
|
// ============ 内部组装辅助（纯函数） ============
|
|
24
|
-
/** 基础 system 文本：内核 + 项目提示词 +
|
|
24
|
+
/** 基础 system 文本：内核 + 项目提示词 + 临时指令（三层注入，空层跳过） */
|
|
25
25
|
function buildSystemBase(kernel, project, instruction) {
|
|
26
26
|
const parts = [kernel];
|
|
27
27
|
if (project !== undefined && project.trim() !== "") {
|
package/dist/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,EAAE;AACF,mDAAmD;AACnD,8CAA8C;AAC9C,0EAA0E;AAC1E,6EAA6E;AAC7E,kDAAkD;AAClD,EAAE;AACF,wDAAwD;AACxD,mEAAmE;AACnE,EAAE;AACF,4DAA4D;AAC5D,oDAAoD;AAGpD,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,SAAS,EAAuB,MAAM,gCAAgC,CAAC;AAChF,OAAO,EACL,WAAW,EACX,uBAAuB,EACvB,iBAAiB,EACjB,aAAa,EACb,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAuB,MAAM,cAAc,CAAC;AAgB9E,MAAM,CAAC,MAAM,uBAAuB,GAAmB;IACrD,MAAM,EAAE,GAAG;IACX,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,IAAI;CACd,CAAC;AA6EF,wCAAwC;AAExC,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
|
package/dist/executor.js
CHANGED
|
@@ -111,7 +111,7 @@ export const PROPOSAL_BUILDERS = {
|
|
|
111
111
|
propose_resolve_hook: (ctx, args) => buildProposeResolveHook(ctx, args),
|
|
112
112
|
propose_abandon_hook: (ctx, args) => buildProposeAbandonHook(ctx, args),
|
|
113
113
|
propose_reorder_timepoints: (ctx, args) => buildProposeReorderTimepoints(ctx, args), // G2（取代 F9 的 propose_reorder_events）
|
|
114
|
-
propose_create_reference: (ctx, args) => buildProposeCreateReference(ctx, args), //
|
|
114
|
+
propose_create_reference: (ctx, args) => buildProposeCreateReference(ctx, args), //
|
|
115
115
|
};
|
|
116
116
|
/**
|
|
117
117
|
* 创建工具调度器（run.ts ToolDispatcher 真实现）：
|
|
@@ -146,7 +146,7 @@ export function createToolDispatcher(ctx, options = {}) {
|
|
|
146
146
|
}
|
|
147
147
|
return { call, def, parsed: parsed.data };
|
|
148
148
|
});
|
|
149
|
-
// ---- 2. 逐个执行（结果按输入顺序一一回填，同序等长——run.ts
|
|
149
|
+
// ---- 2. 逐个执行（结果按输入顺序一一回填，同序等长——run.ts） ----
|
|
150
150
|
const results = [];
|
|
151
151
|
for (const plan of plans) {
|
|
152
152
|
// 批量执行间隙被取消：立即中止后续工具并传播取消
|
|
@@ -177,7 +177,7 @@ export function createToolDispatcher(ctx, options = {}) {
|
|
|
177
177
|
});
|
|
178
178
|
continue;
|
|
179
179
|
}
|
|
180
|
-
// ---- 提案路径（propose_
|
|
180
|
+
// ---- 提案路径（propose_*，「提案类」） ----
|
|
181
181
|
// run 层裁剪只返回 { proposal_id, summary }；完整 Proposal 经 build 层重建入仓——
|
|
182
182
|
// proposal_id 以 run 返回为准覆盖（build 每次生成新 id），保证
|
|
183
183
|
// tool_result / proposal 事件 / 仓 key 三处同一 id（S7.5 confirm 按事件 id 取仓）
|
package/dist/executor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AAqBnE,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,oBAAoB,EACpB,uBAAuB,EACvB,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,2BAA2B,EAC3B,wBAAwB,EACxB,sBAAsB,EACtB,oBAAoB,EACpB,uBAAuB,EACvB,0BAA0B,EAC1B,6BAA6B,EAC7B,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,OAAO,EACP,cAAc,GAIf,MAAM,gCAAgC,CAAC;AAGxC,2CAA2C;AAE3C,qDAAqD;AACrD,MAAM,CAAC,MAAM,eAAe,GAAG,EAAE,GAAG,MAAM,CAAC;AAE3C;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAsCtC;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,UAAgC,EAAE;IACpE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,eAAe,CAAC;IAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,kBAAkB,CAAC;IACzD,uEAAuE;IACtE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqD,CAAC;IAC7E,MAAM,SAAS,GAAG,CAAC,KAAgD,EAAW,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,KAAK,CAAC,SAAS,CAAC;IAC/G,MAAM,YAAY,GAAG,GAAS,EAAE;QAC9B,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;YAClC,IAAI,SAAS,CAAC,KAAK,CAAC;gBAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC,CAAC;IACF,OAAO;QACL,GAAG,CAAC,QAAQ;YACV,YAAY,EAAE,CAAC;YACf,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE;gBAChC,QAAQ;gBACR,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,KAAK;aAC/D,CAAC,CAAC;YACR,iDAAiD;YAC5C,OAAO,OAAO,CAAC,IAAI,GAAG,QAAQ,EAAE,CAAC;gBAC/B,IAAI,QAAQ,GAAkB,IAAI,CAAC;gBACnC,IAAI,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC;gBAC1C,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;oBAClC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;oBAC/C,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC;wBACnB,UAAU,GAAG,CAAC,CAAC;wBACf,QAAQ,GAAG,EAAE,CAAC;oBAChB,CAAC;gBACH,CAAC;gBACD,IAAI,QAAQ,KAAK,IAAI;oBAAE,MAAM,CAAC,0BAA0B;gBACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QACD,GAAG,CAAC,UAAU,EAAE,SAAS;YACvB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACtC,IAAI,KAAK,KAAK,SAAS;gBAAE,OAAO,IAAI,CAAC;YACrC,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBACrB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;gBACrC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,KAAK,SAAS;gBAAE,OAAO,IAAI,CAAC,CAAC,OAAO;YACjE,OAAO,KAAK,CAAC,QAAQ,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,UAAU;YACb,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACtC,IAAI,KAAK,KAAK,SAAS;gBAAE,OAAO,IAAI,CAAC;YACrC,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBACrB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC3B,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,KAAK,CAAC,QAAQ,CAAC;QACxB,CAAC;QACD,MAAM,CAAC,UAAU;YACf,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC7B,CAAC;QACD,KAAK;YACH,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;QACD,IAAI;YACF,OAAO,OAAO,CAAC,IAAI,CAAC;QACtB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,uFAAuF;AACvF,MAAM,CAAC,MAAM,oBAAoB,GAAkB,mBAAmB,EAAE,CAAC;AAWzE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAoC;IAChE,qBAAqB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,GAAG,EAAE,IAA+B,CAAC;IACpG,qBAAqB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,GAAG,EAAE,IAA+B,CAAC;IACpG,qBAAqB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,GAAG,EAAE,IAA+B,CAAC;IACpG,oBAAoB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,uBAAuB,CAAC,GAAG,EAAE,IAA8B,CAAC;IACjG,uBAAuB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,0BAA0B,CAAC,GAAG,EAAE,IAAiC,CAAC;IAC1G,iBAAiB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,oBAAoB,CAAC,GAAG,EAAE,IAA2B,CAAC;IACxF,oBAAoB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,uBAAuB,CAAC,GAAG,EAAE,IAA8B,CAAC;IACjG,iBAAiB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,oBAAoB,CAAC,GAAG,EAAE,IAA2B,CAAC;IACxF,mBAAmB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,GAAG,EAAE,IAA6B,CAAC;IAC9F,mBAAmB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,GAAG,EAAE,IAA6B,CAAC;IAC9F,mBAAmB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,GAAG,EAAE,IAA6B,CAAC;IAC9F,oBAAoB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,uBAAuB,CAAC,GAAG,EAAE,IAA8B,CAAC;IACjG,oBAAoB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,uBAAuB,CAAC,GAAG,EAAE,IAA8B,CAAC;IACjG,oBAAoB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,uBAAuB,CAAC,GAAG,EAAE,IAA8B,CAAC;IACjG,0BAA0B,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,6BAA6B,CAAC,GAAG,EAAE,IAAoC,CAAC,EAAE,qCAAqC;IAC1J,wBAAwB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,2BAA2B,CAAC,GAAG,EAAE,IAAkC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
|
package/dist/prompts.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
/**
|
|
1
|
+
/** 内核提示词（内核层）：创作顾问角色定义 + 行为规范，代码固定不可用户编辑 */
|
|
2
2
|
export declare const KERNEL_PROMPT = "\u4F60\u662F\u300C\u521B\u4F5C\u987E\u95EE\u300D\uFF0C\u4E00\u540D\u8D44\u6DF1\u5C0F\u8BF4\u521B\u4F5C\u642D\u6863\uFF0C\u670D\u52A1\u4E8E\u4F5C\u8005\u7684 AI \u5199\u4F5C\u5DE5\u4F5C\u53F0\u3002\n\u4F60\u7684\u804C\u8D23\u662F\u5E2E\u52A9\u4F5C\u8005\u5206\u6790\u5927\u7EB2\u3001\u4EBA\u7269\u3001\u5173\u7CFB\u3001\u60C5\u8282\u4E0E\u4F0F\u7B14\uFF0C\u63D0\u51FA\u53EF\u6267\u884C\u7684\u4FEE\u6539\u5EFA\u8BAE\u2014\u2014\u4F60\u662F\u5206\u6790\u987E\u95EE\uFF0C\u4E0D\u662F\u64CD\u4F5C\u5458\uFF0C\u4E5F\u4E0D\u4EE3\u5199\u6B63\u6587\u3002\n\n\u884C\u4E3A\u51C6\u5219\uFF1A\n1. \u4E0D\u751F\u6210\u6B63\u6587\uFF1A\u4E0D\u4EE3\u5199\u5C0F\u8BF4\u6B63\u6587\u6216\u7AE0\u8282\u5185\u5BB9\uFF0C\u8F93\u51FA\u59CB\u7EC8\u662F\u5206\u6790\u3001\u5EFA\u8BAE\u4E0E\u65B9\u6848\u3002\n2. \u4E0D\u76F4\u63A5\u5199\u5165\uFF1A\u7EDD\u4E0D\u76F4\u63A5\u5199\u5165\u3001\u4FEE\u6539\u6216\u5220\u9664\u4EFB\u4F55\u6570\u636E\uFF08\u5B9E\u4F53/\u5173\u7CFB/\u5927\u7EB2\u8282\u70B9/\u4F0F\u7B14/Delta\uFF09\uFF1B\u5199\u64CD\u4F5C\u4E00\u5F8B\u901A\u8FC7 propose_* \u5DE5\u5177\u751F\u6210\u63D0\u6848\uFF0C\u7531\u7528\u6237\u786E\u8BA4\u540E\u6267\u884C\u2014\u2014\u7528\u6237\u59CB\u7EC8\u662F\u6700\u7EC8\u51B3\u7B56\u8005\u3002\n3. \u67E5\u8BE2\u4E0E\u5206\u6790\u81EA\u7531\uFF1A\u53EF\u968F\u65F6\u8C03\u7528\u67E5\u8BE2\u7C7B\u4E0E\u5206\u6790\u7C7B\u5DE5\u5177\u83B7\u53D6\u6570\u636E\u3001\u8FD0\u884C\u7ED3\u6784\u5316\u5206\u6790\u3002\n4. \u7ED3\u679C\u622A\u65AD\u987B\u77E5\uFF1A\u5DE5\u5177\u7ED3\u679C\u82E5\u542B\u300C\u5DF2\u622A\u65AD\u300D\u6807\u8BB0\u5373\u6570\u636E\u4E0D\u5B8C\u6574\u2014\u2014\u8BF7\u7F29\u5C0F\u67E5\u8BE2\u8303\u56F4\u6216\u5206\u9875\u83B7\u53D6\uFF0C\u4E0D\u5F97\u57FA\u4E8E\u6B8B\u7F3A\u6570\u636E\u4E0B\u7ED3\u8BBA\u3002\n5. \u957F\u5EA6\u622A\u65AD\u987B\u77E5\uFF1A\u82E5\u4F60\u7684\u56DE\u590D\u56E0\u957F\u5EA6\u9650\u5236\u88AB\u622A\u65AD\uFF0C\u7CFB\u7EDF\u4E0D\u4F1A\u91CD\u53D1\u4F60\u7684\u534A\u6761\u56DE\u590D\uFF1B\u8BF7\u63A7\u5236\u7BC7\u5E45\uFF0C\u4F18\u5148\u7ED9\u51FA\u7ED3\u8BBA\u4E0E\u8981\u70B9\u3002\n6. \u805A\u7126\u4F18\u5148\uFF1Asystem \u6D88\u606F\u4E2D\u300C\u5F53\u524D\u805A\u7126\u300D\u6BB5\u843D\u662F\u4F5C\u8005\u6B63\u5728\u67E5\u770B\u7684\u5185\u5BB9\uFF0C\u4F18\u5148\u56F4\u7ED5\u5B83\u5C55\u5F00\u3002\n7. \u63D0\u6848\u8BED\u4E49\uFF1A\u8C03\u7528\u63D0\u6848\u5DE5\u5177\u540E\u9700\u7528\u6237\u786E\u8BA4\u624D\u751F\u6548\uFF1B\u786E\u8BA4\u524D\u4E0D\u8981\u5047\u8BBE\u4EFB\u4F55\u4FEE\u6539\u5DF2\u53D1\u751F\u3002\n8. \u56DE\u590D\u4F7F\u7528\u9879\u76EE\u914D\u7F6E\u7684\u8BED\u8A00\u3002";
|
|
3
|
-
/**
|
|
3
|
+
/** 项目提示词段标题（项目层，来自 project.json 的 prompt 字段） */
|
|
4
4
|
export declare const PROJECT_PROMPT_TITLE = "## \u9879\u76EE\u8BBE\u5B9A";
|
|
5
|
-
/**
|
|
5
|
+
/** 临时指令段标题（临时层，即时输入、不持久化） */
|
|
6
6
|
export declare const INSTRUCTION_TITLE = "## \u672C\u6B21\u6307\u4EE4";
|
|
7
7
|
/** 可用工具清单段标题（name + description 一行，来自 registry listTools） */
|
|
8
8
|
export declare const TOOL_LIST_TITLE = "## \u53EF\u7528\u5DE5\u5177";
|
|
9
|
-
/**
|
|
9
|
+
/** 聚焦上下文段标题（聚焦层：当前视图中的实体/大纲节点，由调用方查询后传入） */
|
|
10
10
|
export declare const FOCUS_TITLE = "## \u5F53\u524D\u805A\u7126";
|
|
11
11
|
/** 聚焦上下文截断提示（截断必须显式告知，不得静默丢数据） */
|
|
12
12
|
export declare const FOCUS_TRUNCATION_NOTICE = "\n\n[\u805A\u7126\u4E0A\u4E0B\u6587\u5DF2\u622A\u65AD\uFF1A\u8D85\u51FA token \u9884\u7B97\uFF0C\u6570\u636E\u4E0D\u5B8C\u6574\uFF1B\u8BF7\u7F29\u5C0F\u67E5\u770B\u8303\u56F4]";
|
package/dist/prompts.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../src/prompts.ts"],"names":[],"mappings":"AAKA,
|
|
1
|
+
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../src/prompts.ts"],"names":[],"mappings":"AAKA,4CAA4C;AAC5C,eAAO,MAAM,aAAa,oiFAWV,CAAC;AAIjB,gDAAgD;AAChD,eAAO,MAAM,oBAAoB,gCAAY,CAAC;AAE9C,6BAA6B;AAC7B,eAAO,MAAM,iBAAiB,gCAAY,CAAC;AAE3C,6DAA6D;AAC7D,eAAO,MAAM,eAAe,gCAAY,CAAC;AAEzC,4CAA4C;AAC5C,eAAO,MAAM,WAAW,gCAAY,CAAC;AAErC,kCAAkC;AAClC,eAAO,MAAM,uBAAuB,oLAA6C,CAAC"}
|
package/dist/prompts.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// 开发者编辑、代码固定、不持久化）、「核心设计原则」（AI 角色是分析顾问
|
|
3
3
|
// 不是操作员、写操作走提案、截断显式告知）。
|
|
4
4
|
// 项目层（用户可编辑，project.json）与临时层（即时输入）由调用方传入 context.ts 组装。
|
|
5
|
-
/**
|
|
5
|
+
/** 内核提示词（内核层）：创作顾问角色定义 + 行为规范，代码固定不可用户编辑 */
|
|
6
6
|
export const KERNEL_PROMPT = `你是「创作顾问」，一名资深小说创作搭档，服务于作者的 AI 写作工作台。
|
|
7
7
|
你的职责是帮助作者分析大纲、人物、关系、情节与伏笔，提出可执行的修改建议——你是分析顾问，不是操作员，也不代写正文。
|
|
8
8
|
|
|
@@ -16,13 +16,13 @@ export const KERNEL_PROMPT = `你是「创作顾问」，一名资深小说创
|
|
|
16
16
|
7. 提案语义：调用提案工具后需用户确认才生效；确认前不要假设任何修改已发生。
|
|
17
17
|
8. 回复使用项目配置的语言。`;
|
|
18
18
|
// ============ 组装段标题与提示文案（context.ts 拼装 system 消息使用） ============
|
|
19
|
-
/**
|
|
19
|
+
/** 项目提示词段标题（项目层，来自 project.json 的 prompt 字段） */
|
|
20
20
|
export const PROJECT_PROMPT_TITLE = "## 项目设定";
|
|
21
|
-
/**
|
|
21
|
+
/** 临时指令段标题（临时层，即时输入、不持久化） */
|
|
22
22
|
export const INSTRUCTION_TITLE = "## 本次指令";
|
|
23
23
|
/** 可用工具清单段标题（name + description 一行，来自 registry listTools） */
|
|
24
24
|
export const TOOL_LIST_TITLE = "## 可用工具";
|
|
25
|
-
/**
|
|
25
|
+
/** 聚焦上下文段标题（聚焦层：当前视图中的实体/大纲节点，由调用方查询后传入） */
|
|
26
26
|
export const FOCUS_TITLE = "## 当前聚焦";
|
|
27
27
|
/** 聚焦上下文截断提示（截断必须显式告知，不得静默丢数据） */
|
|
28
28
|
export const FOCUS_TRUNCATION_NOTICE = "\n\n[聚焦上下文已截断：超出 token 预算，数据不完整；请缩小查看范围]";
|
package/dist/prompts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../src/prompts.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,uCAAuC;AACvC,wBAAwB;AACxB,yDAAyD;AAEzD,
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../src/prompts.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,uCAAuC;AACvC,wBAAwB;AACxB,yDAAyD;AAEzD,4CAA4C;AAC5C,MAAM,CAAC,MAAM,aAAa,GAAG;;;;;;;;;;;gBAWb,CAAC;AAEjB,kEAAkE;AAElE,gDAAgD;AAChD,MAAM,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC;AAE9C,6BAA6B;AAC7B,MAAM,CAAC,MAAM,iBAAiB,GAAG,SAAS,CAAC;AAE3C,6DAA6D;AAC7D,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAC;AAEzC,4CAA4C;AAC5C,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAC;AAErC,kCAAkC;AAClC,MAAM,CAAC,MAAM,uBAAuB,GAAG,0CAA0C,CAAC"}
|
package/dist/run.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export declare const DEFAULT_TOKEN_BUDGET = 60000;
|
|
|
15
15
|
/** 提案载荷（S7.4 工具调度层构造 preview；对齐 proposal 事件 data 形态） */
|
|
16
16
|
export interface ProposalPayload {
|
|
17
17
|
proposal_id: string;
|
|
18
|
-
/** 提案类型 = 产生它的 propose_* 工具名（
|
|
18
|
+
/** 提案类型 = 产生它的 propose_* 工具名（data.type） */
|
|
19
19
|
type: string;
|
|
20
20
|
/** 提案预览（前端提案卡渲染数据；本层透传不构造） */
|
|
21
21
|
preview: Record<string, unknown>;
|
|
@@ -26,7 +26,7 @@ export interface ProposalPayload {
|
|
|
26
26
|
* - text：AI 文本增量（实时转发，失败轮可能已流出的半条文本属重试语义，接受）
|
|
27
27
|
* - tool_call / tool_result：工具调用与结果（按 tool_call_id 配对；length 截断的调用
|
|
28
28
|
* 不发 dispatcher，仍发 tool_call 事件）
|
|
29
|
-
* - proposal：恒在对应 tool_result
|
|
29
|
+
* - proposal：恒在对应 tool_result 之后、循环继续之前发送（顺序约定）
|
|
30
30
|
* - done：自然终止（无工具调用），携带 session_id
|
|
31
31
|
* - error：终止（模型最终失败 / 8 轮上限 / 超时 / token 超限 / 调度器缺陷）或
|
|
32
32
|
* 用户取消（aborted=true）；S7.6 收到 error 后立即关闭流
|
|
@@ -74,7 +74,7 @@ export interface DispatchResult {
|
|
|
74
74
|
* 本卡不消费 ok，留 S7.4 真实现构造时使用，接口不动）
|
|
75
75
|
*/
|
|
76
76
|
ok: boolean;
|
|
77
|
-
/** 失败标记：喂回 LLM
|
|
77
|
+
/** 失败标记：喂回 LLM 的内容须含错误说明（结构化喂回自纠） */
|
|
78
78
|
isError: boolean;
|
|
79
79
|
/** 回填 LLM 的 tool 消息内容（成功 = 结果 JSON/文本；失败 = 错误说明） */
|
|
80
80
|
content: string;
|
|
@@ -87,7 +87,7 @@ export interface DispatchResult {
|
|
|
87
87
|
* 防止 tool_call ↔ tool_result 错位配对）
|
|
88
88
|
* - signal：「工具执行中检查取消」（S7.4 executor 承担；长工具执行须监听）
|
|
89
89
|
* - 本层不抛错（失败编码进 isError 结果）；抛错视为调度器缺陷 → 循环终止。
|
|
90
|
-
* **例外：AbortedError（tools analysis/utils
|
|
90
|
+
* **例外：AbortedError（tools analysis/utils，取消语义）→ 原样抛穿**——
|
|
91
91
|
* S7.4 executor 在工具执行中检查 signal，命中取消即抛 AbortedError；本层 dispatcher
|
|
92
92
|
* catch 识别后按用户取消终止（aborted=true、不重试、不视为缺陷），与循环其他环节的
|
|
93
93
|
* 取消语义一致（取消不喂回）
|
|
@@ -124,11 +124,11 @@ export interface RunAgentInput {
|
|
|
124
124
|
userMessage: string;
|
|
125
125
|
/** 初始会话（S7.6 经 loadHistory/trimSession 加载的历史；不含本轮 userMessage） */
|
|
126
126
|
session: SessionState;
|
|
127
|
-
/**
|
|
127
|
+
/** 聚焦上下文文本（聚焦层；S7.6 查询实体/大纲节点后拼好传入） */
|
|
128
128
|
focus?: string;
|
|
129
|
-
/**
|
|
129
|
+
/** 项目提示词（项目层） */
|
|
130
130
|
projectPrompt?: string;
|
|
131
|
-
/**
|
|
131
|
+
/** 临时指令（临时层） */
|
|
132
132
|
instruction?: string;
|
|
133
133
|
deps: RunAgentDeps;
|
|
134
134
|
/** 用户取消信号（全链路第 0 层；abort 永不重试） */
|
package/dist/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AASA,OAAO,EAOL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,cAAc,EAKpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAA+B,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAInG,mCAAmC;AACnC,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC,2CAA2C;AAC3C,eAAO,MAAM,wBAAwB,SAAU,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,0BAA0B,QAAS,CAAC;AAEjD,kDAAkD;AAClD,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAI3C,wDAAwD;AACxD,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACrB,
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"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"}
|
package/dist/run.js
CHANGED
|
@@ -27,7 +27,7 @@ const ATTEMPT_TIMEOUT_CODE = "ATTEMPT_TIMEOUT";
|
|
|
27
27
|
const ATTEMPT_TIMEOUT_ERROR = {
|
|
28
28
|
status: 0,
|
|
29
29
|
code: ATTEMPT_TIMEOUT_CODE,
|
|
30
|
-
message: "
|
|
30
|
+
message: "单次模型调用超时（轮次预算内可重试）",
|
|
31
31
|
};
|
|
32
32
|
const ATTEMPT_TIMEOUT_RESULT = {
|
|
33
33
|
ok: false,
|
|
@@ -35,7 +35,7 @@ const ATTEMPT_TIMEOUT_RESULT = {
|
|
|
35
35
|
error: ATTEMPT_TIMEOUT_ERROR,
|
|
36
36
|
};
|
|
37
37
|
/** length 截断兜底说明（LLMToolCallResult.error 缺失时——finalizeToolCalls 正常必已标记） */
|
|
38
|
-
const LENGTH_TRUNCATION_NOTICE = "finish_reason=length
|
|
38
|
+
const LENGTH_TRUNCATION_NOTICE = "finish_reason=length：参数可能不完整，不执行";
|
|
39
39
|
/**
|
|
40
40
|
* 终止类错误码取值（ErrorCode 单一来源；shared barrel 仅类型导出，运行时常量走 schemas 子路径——
|
|
41
41
|
* 与 tools 包同款导入策略）。
|
|
@@ -195,14 +195,14 @@ export async function runAgent(input) {
|
|
|
195
195
|
budgets,
|
|
196
196
|
tools,
|
|
197
197
|
});
|
|
198
|
-
// ---- 2.
|
|
198
|
+
// ---- 2. 取消检查（优先于预算：已取消且并发超限时先 aborted 终止，不发 token error） ----
|
|
199
199
|
if (signal?.aborted) {
|
|
200
200
|
emit({ type: "error", code: ABORT_ERROR.code ?? "ABORTED", message: ABORT_ERROR.message, aborted: true });
|
|
201
201
|
return { ok: false, aborted: true, error: ABORT_ERROR, rounds, retries };
|
|
202
202
|
}
|
|
203
203
|
// ---- 3. token 预算（三重保险之三；超限发 error 终止） ----
|
|
204
204
|
if (ctx.tokens.total > tokenBudget) {
|
|
205
|
-
const message = `上下文 token 估算 ${ctx.tokens.total} 超出预算 ${tokenBudget}
|
|
205
|
+
const message = `上下文 token 估算 ${ctx.tokens.total} 超出预算 ${tokenBudget}`;
|
|
206
206
|
emit({ type: "error", code: CODE_TOKEN_BUDGET, message, aborted: false });
|
|
207
207
|
return { ok: false, aborted: false, error: { status: 0, code: CODE_TOKEN_BUDGET, message }, rounds, retries };
|
|
208
208
|
}
|
|
@@ -300,7 +300,7 @@ export async function runAgent(input) {
|
|
|
300
300
|
const assistantMsg = calls.length > 0
|
|
301
301
|
? { role: "assistant", content: assistantContent, tool_calls: toWireToolCalls(calls) }
|
|
302
302
|
: { role: "assistant", content: assistantContent };
|
|
303
|
-
// ---- 7. 无工具调用 → done
|
|
303
|
+
// ---- 7. 无工具调用 → done 终止（done 携带 session_id） ----
|
|
304
304
|
if (calls.length === 0) {
|
|
305
305
|
session = appendMessage(session, assistantMsg);
|
|
306
306
|
emitMessages([assistantMsg]);
|
|
@@ -314,7 +314,7 @@ export async function runAgent(input) {
|
|
|
314
314
|
// ---- 9. 调度前检查轮次预算（ora S7.3 审核 M2：「单轮总预算含工具执行」——
|
|
315
315
|
// attempt 成功后若预算已耗尽，直接 AGENT_TIMEOUT 终止、不再调度工具） ----
|
|
316
316
|
if (roundDeadline - Date.now() <= 0) {
|
|
317
|
-
const message = `单轮预算耗尽（${roundTimeoutMs}ms
|
|
317
|
+
const message = `单轮预算耗尽（${roundTimeoutMs}ms 含工具执行）`;
|
|
318
318
|
emit({ type: "error", code: CODE_TIMEOUT, message, aborted: false });
|
|
319
319
|
return { ok: false, aborted: false, error: { status: 0, code: CODE_TIMEOUT, message }, rounds, retries };
|
|
320
320
|
}
|
|
@@ -345,7 +345,7 @@ export async function runAgent(input) {
|
|
|
345
345
|
dispatched = await deps.dispatcher(toDispatch, signal); // 工具执行中检查取消（S7.4 承担）
|
|
346
346
|
}
|
|
347
347
|
catch (err) {
|
|
348
|
-
// 取消语义传播（
|
|
348
|
+
// 取消语义传播（S7.4 约定）：executor 在工具执行中检查 signal，
|
|
349
349
|
// 命中取消抛 AbortedError（tools analysis/utils）——此处识别并按**用户取消**终止
|
|
350
350
|
// （aborted=true、不重试、不喂回），不得落入调度器缺陷分支（否则取消会被误报为
|
|
351
351
|
// AGENT_DISPATCH_ERROR 且 aborted=false，与「取消不重试」语义冲突）
|
|
@@ -398,7 +398,7 @@ export async function runAgent(input) {
|
|
|
398
398
|
// 调度后检查轮次预算（ora S7.3 审核 M2：工具执行可能耗时——执行中的工具无法中止
|
|
399
399
|
// （仅用户取消可中断），超出的后果 = 终止，即满足「120s 含工具执行」的预算语义）
|
|
400
400
|
if (roundDeadline - Date.now() <= 0) {
|
|
401
|
-
const message = `单轮预算耗尽（${roundTimeoutMs}ms
|
|
401
|
+
const message = `单轮预算耗尽（${roundTimeoutMs}ms 含工具执行）`;
|
|
402
402
|
emit({ type: "error", code: CODE_TIMEOUT, message, aborted: false });
|
|
403
403
|
return { ok: false, aborted: false, error: { status: 0, code: CODE_TIMEOUT, message }, rounds, retries };
|
|
404
404
|
}
|
|
@@ -413,7 +413,7 @@ export async function runAgent(input) {
|
|
|
413
413
|
toolMsgs.push({ role: "tool", content: r.content, tool_call_id: r.id });
|
|
414
414
|
emit({ type: "tool_result", tool: r.tool, result: r.content, id: r.id });
|
|
415
415
|
if (r.proposal !== undefined) {
|
|
416
|
-
emit({ type: "proposal", proposal: r.proposal });
|
|
416
|
+
emit({ type: "proposal", proposal: r.proposal }); //：proposal 在 tool_result 后、循环继续前
|
|
417
417
|
}
|
|
418
418
|
}
|
|
419
419
|
session = appendMessage(session, assistantMsg);
|
|
@@ -423,7 +423,7 @@ export async function runAgent(input) {
|
|
|
423
423
|
// 循环继续：下一轮模型看到工具结果后自纠或收尾
|
|
424
424
|
}
|
|
425
425
|
// ---- 11. 8 轮上限（三重保险之一；持续 tool_call 死循环兜底） ----
|
|
426
|
-
const message = `达到最大轮数上限 ${maxRounds}
|
|
426
|
+
const message = `达到最大轮数上限 ${maxRounds}`;
|
|
427
427
|
emit({ type: "error", code: CODE_MAX_ITERATIONS, message, aborted: false });
|
|
428
428
|
return { ok: false, aborted: false, error: { status: 0, code: CODE_MAX_ITERATIONS, message }, rounds, retries };
|
|
429
429
|
}
|
package/dist/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"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"}
|
package/dist/session.d.ts
CHANGED
|
@@ -21,7 +21,7 @@ export type SessionState = SessionMessage[];
|
|
|
21
21
|
/** 新建空会话（初始状态；随后 loadHistory 或 appendMessage 填充） */
|
|
22
22
|
export declare function createSession(): SessionState;
|
|
23
23
|
/**
|
|
24
|
-
* 加载历史：持久化行 →
|
|
24
|
+
* 加载历史：持久化行 → 运行时消息（成对重组）。
|
|
25
25
|
* 输入 ChatMessageRow[]（由 server 层经 db 包查询得到），纯内存重组、无 I/O。
|
|
26
26
|
* - 按 created_at 升序稳定排序（同时间戳保持输入序，与 db 查询口径一致）
|
|
27
27
|
* - 孤儿半对整对丢弃（tool_call 已写 tool_result 未写，或反之）
|
|
@@ -39,7 +39,7 @@ export declare function appendMessage(session: SessionState, message: SessionMes
|
|
|
39
39
|
*/
|
|
40
40
|
export declare function trimSession(session: SessionState, maxCount: number): SessionState;
|
|
41
41
|
/**
|
|
42
|
-
* 输出喂回模型的 messages
|
|
42
|
+
* 输出喂回模型的 messages 数组（末条约束的最终防御）。
|
|
43
43
|
* 末条**必须**是 user 或 tool 消息——assistant 结尾 DeepSeek 直接拒绝。
|
|
44
44
|
* 修正策略（最简防御）：从尾部丢弃连续的 assistant 消息。tool 消息的配对 assistant
|
|
45
45
|
* 位于其**前方**，丢弃尾部 assistant 不会产生新孤儿；带 tool_calls 的 assistant 若以
|
|
@@ -49,7 +49,7 @@ export declare function trimSession(session: SessionState, maxCount: number): Se
|
|
|
49
49
|
*/
|
|
50
50
|
export declare function buildPayload(session: SessionState): LLMMessage[];
|
|
51
51
|
/**
|
|
52
|
-
* 重试 payload
|
|
52
|
+
* 重试 payload 复用（末条约束补充，S7.3 主循环消费）。
|
|
53
53
|
* 模型调用失败重试时**必须复用原请求的 messages 数组**——绝不追加失败轮的半条
|
|
54
54
|
* assistant 产物（失败轮未产出完整回复，其内容不入重试序列）。
|
|
55
55
|
* 本函数返回原数组的浅拷贝，防御调用方原地修改；调用方直接传原 payload 亦等效。
|
package/dist/session.js
CHANGED
|
@@ -54,7 +54,7 @@ function collectToolResults(messages) {
|
|
|
54
54
|
return toolResults;
|
|
55
55
|
}
|
|
56
56
|
/**
|
|
57
|
-
*
|
|
57
|
+
* 把消息序列切成「配对块」（成对重组算法）：
|
|
58
58
|
* - user 消息：独立块
|
|
59
59
|
* - assistant 无 tool_calls：独立块
|
|
60
60
|
* - assistant 带 tool_calls：全部调用有对应结果才成块（assistant + 结果按 tool_calls 顺序）；
|
|
@@ -101,7 +101,7 @@ export function createSession() {
|
|
|
101
101
|
return [];
|
|
102
102
|
}
|
|
103
103
|
/**
|
|
104
|
-
* 加载历史：持久化行 →
|
|
104
|
+
* 加载历史：持久化行 → 运行时消息（成对重组）。
|
|
105
105
|
* 输入 ChatMessageRow[]（由 server 层经 db 包查询得到），纯内存重组、无 I/O。
|
|
106
106
|
* - 按 created_at 升序稳定排序（同时间戳保持输入序，与 db 查询口径一致）
|
|
107
107
|
* - 孤儿半对整对丢弃（tool_call 已写 tool_result 未写，或反之）
|
|
@@ -173,7 +173,7 @@ export function trimSession(session, maxCount) {
|
|
|
173
173
|
return kept;
|
|
174
174
|
}
|
|
175
175
|
/**
|
|
176
|
-
* 输出喂回模型的 messages
|
|
176
|
+
* 输出喂回模型的 messages 数组（末条约束的最终防御）。
|
|
177
177
|
* 末条**必须**是 user 或 tool 消息——assistant 结尾 DeepSeek 直接拒绝。
|
|
178
178
|
* 修正策略（最简防御）：从尾部丢弃连续的 assistant 消息。tool 消息的配对 assistant
|
|
179
179
|
* 位于其**前方**，丢弃尾部 assistant 不会产生新孤儿；带 tool_calls 的 assistant 若以
|
|
@@ -189,7 +189,7 @@ export function buildPayload(session) {
|
|
|
189
189
|
return messages;
|
|
190
190
|
}
|
|
191
191
|
/**
|
|
192
|
-
* 重试 payload
|
|
192
|
+
* 重试 payload 复用（末条约束补充，S7.3 主循环消费）。
|
|
193
193
|
* 模型调用失败重试时**必须复用原请求的 messages 数组**——绝不追加失败轮的半条
|
|
194
194
|
* assistant 产物（失败轮未产出完整回复，其内容不入重试序列）。
|
|
195
195
|
* 本函数返回原数组的浅拷贝，防御调用方原地修改；调用方直接传原 payload 亦等效。
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@whispering233/ai-editor-agent",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.30",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "AI 对话循环：会话管理 / 上下文组装 / 工具调度",
|
|
6
6
|
"type": "module",
|
|
@@ -26,9 +26,9 @@
|
|
|
26
26
|
"postpack": "node ../../scripts/restore-package-json.mjs"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@whispering233/ai-editor-llm": "0.0.
|
|
30
|
-
"@whispering233/ai-editor-shared": "0.0.
|
|
31
|
-
"@whispering233/ai-editor-tools": "0.0.
|
|
29
|
+
"@whispering233/ai-editor-llm": "0.0.30",
|
|
30
|
+
"@whispering233/ai-editor-shared": "0.0.30",
|
|
31
|
+
"@whispering233/ai-editor-tools": "0.0.30"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"typescript": "^5.8.0"
|