@zmzai/agent-framework 0.8.0 → 0.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapters/openai-provider.d.ts +6 -3
- package/dist/adapters/openai-provider.d.ts.map +1 -1
- package/dist/adapters/openai-provider.js +1 -1
- package/dist/adapters/openai-provider.js.map +1 -1
- package/dist/core/events/manifest.d.ts +19 -1
- package/dist/core/events/manifest.d.ts.map +1 -1
- package/dist/core/events/manifest.js +15 -0
- package/dist/core/events/manifest.js.map +1 -1
- package/dist/core/runtime/active-run-registry.d.ts +34 -0
- package/dist/core/runtime/active-run-registry.d.ts.map +1 -0
- package/dist/core/runtime/active-run-registry.js +44 -0
- package/dist/core/runtime/active-run-registry.js.map +1 -0
- package/dist/core/runtime/attempt-executor.d.ts +67 -0
- package/dist/core/runtime/attempt-executor.d.ts.map +1 -0
- package/dist/core/runtime/attempt-executor.js +683 -0
- package/dist/core/runtime/attempt-executor.js.map +1 -0
- package/dist/core/runtime/command-service.d.ts +48 -0
- package/dist/core/runtime/command-service.d.ts.map +1 -0
- package/dist/core/runtime/command-service.js +148 -0
- package/dist/core/runtime/command-service.js.map +1 -0
- package/dist/core/runtime/compaction.d.ts +30 -6
- package/dist/core/runtime/compaction.d.ts.map +1 -1
- package/dist/core/runtime/compaction.js +5 -4
- package/dist/core/runtime/compaction.js.map +1 -1
- package/dist/core/runtime/context-builder.d.ts +66 -0
- package/dist/core/runtime/context-builder.d.ts.map +1 -0
- package/dist/core/runtime/context-builder.js +187 -0
- package/dist/core/runtime/context-builder.js.map +1 -0
- package/dist/core/runtime/run-scheduler.d.ts +44 -0
- package/dist/core/runtime/run-scheduler.d.ts.map +1 -0
- package/dist/core/runtime/run-scheduler.js +136 -0
- package/dist/core/runtime/run-scheduler.js.map +1 -0
- package/dist/core/runtime/runner.d.ts +25 -178
- package/dist/core/runtime/runner.d.ts.map +1 -1
- package/dist/core/runtime/runner.js +105 -1403
- package/dist/core/runtime/runner.js.map +1 -1
- package/dist/core/runtime/task-lifecycle.d.ts +165 -0
- package/dist/core/runtime/task-lifecycle.d.ts.map +1 -0
- package/dist/core/runtime/task-lifecycle.js +424 -0
- package/dist/core/runtime/task-lifecycle.js.map +1 -0
- package/dist/core/session/sqlite-store.d.ts.map +1 -1
- package/dist/core/session/sqlite-store.js +110 -1
- package/dist/core/session/sqlite-store.js.map +1 -1
- package/dist/core/session/store.d.ts +9 -1
- package/dist/core/session/store.d.ts.map +1 -1
- package/dist/core/session/types.d.ts +16 -0
- package/dist/core/session/types.d.ts.map +1 -1
- package/dist/core/session/workflow.d.ts +49 -2
- package/dist/core/session/workflow.d.ts.map +1 -1
- package/dist/core/session/workflow.js.map +1 -1
- package/dist/core/subagents/coordinator.d.ts +140 -0
- package/dist/core/subagents/coordinator.d.ts.map +1 -0
- package/dist/core/subagents/coordinator.js +355 -0
- package/dist/core/subagents/coordinator.js.map +1 -0
- package/dist/core/subagents/parked.d.ts +50 -0
- package/dist/core/subagents/parked.d.ts.map +1 -0
- package/dist/core/subagents/parked.js +75 -0
- package/dist/core/subagents/parked.js.map +1 -0
- package/dist/core/subagents/tools.d.ts +29 -0
- package/dist/core/subagents/tools.d.ts.map +1 -0
- package/dist/core/subagents/tools.js +163 -0
- package/dist/core/subagents/tools.js.map +1 -0
- package/dist/core/subagents/types.d.ts +107 -0
- package/dist/core/subagents/types.d.ts.map +1 -0
- package/dist/core/subagents/types.js +44 -0
- package/dist/core/subagents/types.js.map +1 -0
- package/dist/core/task/completion.d.ts +11 -1
- package/dist/core/task/completion.d.ts.map +1 -1
- package/dist/core/task/completion.js +40 -2
- package/dist/core/task/completion.js.map +1 -1
- package/dist/core/task/contract.d.ts +10 -4
- package/dist/core/task/contract.d.ts.map +1 -1
- package/dist/core/task/contract.js +23 -9
- package/dist/core/task/contract.js.map +1 -1
- package/dist/core/task/index.d.ts +2 -2
- package/dist/core/task/index.d.ts.map +1 -1
- package/dist/core/task/index.js +1 -1
- package/dist/core/task/index.js.map +1 -1
- package/dist/core/task/plan.d.ts +39 -9
- package/dist/core/task/plan.d.ts.map +1 -1
- package/dist/core/task/plan.js +54 -23
- package/dist/core/task/plan.js.map +1 -1
- package/dist/core/task/types.d.ts +28 -0
- package/dist/core/task/types.d.ts.map +1 -1
- package/dist/core/task/types.js.map +1 -1
- package/dist/core/tools/adapter.d.ts.map +1 -1
- package/dist/core/tools/adapter.js +87 -61
- package/dist/core/tools/adapter.js.map +1 -1
- package/dist/core/tools/builtins.d.ts.map +1 -1
- package/dist/core/tools/builtins.js +12 -1
- package/dist/core/tools/builtins.js.map +1 -1
- package/dist/core/tools/context.d.ts +1 -0
- package/dist/core/tools/context.d.ts.map +1 -1
- package/dist/core/tools/def.d.ts +25 -0
- package/dist/core/tools/def.d.ts.map +1 -1
- package/dist/core/tools/def.js.map +1 -1
- package/dist/core/tools/git.d.ts.map +1 -1
- package/dist/core/tools/git.js +4 -0
- package/dist/core/tools/git.js.map +1 -1
- package/dist/core/tools/patch.d.ts.map +1 -1
- package/dist/core/tools/patch.js +1 -0
- package/dist/core/tools/patch.js.map +1 -1
- package/dist/core/tools/qa-check.d.ts +2 -2
- package/dist/core/tools/qa-check.d.ts.map +1 -1
- package/dist/core/tools/qa-check.js +1 -0
- package/dist/core/tools/qa-check.js.map +1 -1
- package/dist/core/tools/repomap.d.ts.map +1 -1
- package/dist/core/tools/repomap.js +1 -0
- package/dist/core/tools/repomap.js.map +1 -1
- package/dist/core/tools/task-block.d.ts.map +1 -1
- package/dist/core/tools/task-block.js +1 -0
- package/dist/core/tools/task-block.js.map +1 -1
- package/dist/core/tools/task-deliver.d.ts +55 -0
- package/dist/core/tools/task-deliver.d.ts.map +1 -0
- package/dist/core/tools/task-deliver.js +99 -0
- package/dist/core/tools/task-deliver.js.map +1 -0
- package/dist/core/tools/task.d.ts.map +1 -1
- package/dist/core/tools/task.js +3 -0
- package/dist/core/tools/task.js.map +1 -1
- package/dist/core/tools/terminal.d.ts.map +1 -1
- package/dist/core/tools/terminal.js +5 -0
- package/dist/core/tools/terminal.js.map +1 -1
- package/dist/core/tools/webfetch.d.ts.map +1 -1
- package/dist/core/tools/webfetch.js +1 -0
- package/dist/core/tools/webfetch.js.map +1 -1
- package/dist/core/tools/websearch.d.ts.map +1 -1
- package/dist/core/tools/websearch.js +1 -0
- package/dist/core/tools/websearch.js.map +1 -1
- package/dist/index.d.ts +6 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/server/create-agent-runtime.d.ts +3 -1
- package/dist/server/create-agent-runtime.d.ts.map +1 -1
- package/dist/server/create-agent-runtime.js +8 -1
- package/dist/server/create-agent-runtime.js.map +1 -1
- package/dist/server/create-server.d.ts +6 -0
- package/dist/server/create-server.d.ts.map +1 -1
- package/dist/server/create-server.js +9 -0
- package/dist/server/create-server.js.map +1 -1
- package/package.json +12 -11
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"attempt-executor.js","sourceRoot":"","sources":["../../../src/core/runtime/attempt-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import type { FrameworkEvent } from "../events/manifest.js";
|
|
2
|
+
import type { SessionStore } from "../session/store.js";
|
|
3
|
+
import type { SessionInfo } from "../session/types.js";
|
|
4
|
+
import type { PromptInput, PromptReceipt } from "../session/workflow.js";
|
|
5
|
+
import { type TaskPatch, type TaskRecord } from "../task/types.js";
|
|
6
|
+
import type { RunScheduler } from "./run-scheduler.js";
|
|
7
|
+
export type CommandDeps = {
|
|
8
|
+
store: SessionStore;
|
|
9
|
+
scheduler: RunScheduler;
|
|
10
|
+
/** 任务层 CAS(SessionRunner 提供——任务语义在 runner,W7 归 TaskLifecycle)。 */
|
|
11
|
+
casTask: (task: TaskRecord, patch: TaskPatch) => Promise<TaskRecord>;
|
|
12
|
+
publish: (event: FrameworkEvent, sessionId: string) => Promise<void>;
|
|
13
|
+
/** legacy 模式(无 workflow store)下直启一次 runLoop。 */
|
|
14
|
+
launch: (session: SessionInfo, input: PromptInput) => void;
|
|
15
|
+
};
|
|
16
|
+
/** prompt 提交链(W6 S4 自 SessionRunner 原样搬移):附件校验 → 投影用户消息 →
|
|
17
|
+
* 任务归属判定 → acceptPrompt(幂等/409 仍在 WorkflowStore)→ task.started →
|
|
18
|
+
* 触发调度。语义零变化。 */
|
|
19
|
+
export declare class CommandService {
|
|
20
|
+
private readonly deps;
|
|
21
|
+
constructor(deps: CommandDeps);
|
|
22
|
+
/** 为一条新消息决定它归属哪个任务,以及这次提交的处置(规格 §12 / §13.1)。
|
|
23
|
+
*
|
|
24
|
+
* 四种处置的判定依据是**任务当前状态**,不是模型对文本的猜测:
|
|
25
|
+
* - 无活跃任务 → 开新任务;
|
|
26
|
+
* - 任务在 waiting_permission / waiting_input / waiting_external / blocked
|
|
27
|
+
* → 这条消息就是那个「用户动作」,任务恢复;
|
|
28
|
+
* - 任务在 running → 这条消息是补充/纠正,并入约束。
|
|
29
|
+
*
|
|
30
|
+
* 【为什么不做「这是不是无关新目标」的语义分类】那需要模型判断,代价是一次
|
|
31
|
+
* 额外的往返,而且判错的后果不对称:把无关目标误并进当前任务,用户会看到
|
|
32
|
+
* 自己的话被当成补充说明;反过来把补充说明误判成新任务,则会产生两个抢同一
|
|
33
|
+
* 个工作区的任务(规格 §18.9 禁止的情况)。所以默认并入,并由约束文本明确
|
|
34
|
+
* 标注「这是用户在你执行期间补充的」,让模型自己决定是否改变方向。 */
|
|
35
|
+
private resolveTaskForPrompt;
|
|
36
|
+
/** 提交被拒时把任务改回这一步之前的样子(见 `submit` 里的调用点)。
|
|
37
|
+
*
|
|
38
|
+
* 新建的任务**不回滚**:它是这个 requestId 的幂等锚点,删掉会让「同一 requestId
|
|
39
|
+
* 重试」失去依据。留着它没有代价——下一次同 requestId 的提交会命中
|
|
40
|
+
* `findTaskByRequestId` 拿回同一个任务,别的消息则会被 `getActiveTask` 收编成
|
|
41
|
+
* steering。 */
|
|
42
|
+
private rollbackTaskResolution;
|
|
43
|
+
/** 原 SessionRunner.prompt() 主体(W6 S4 搬移)。 */
|
|
44
|
+
submit(sessionId: string, input: PromptInput): Promise<{
|
|
45
|
+
queued: boolean;
|
|
46
|
+
} & Partial<PromptReceipt>>;
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=command-service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-service.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/command-service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAQ,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAqB,WAAW,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAAmB,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAevD,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,EAAE,YAAY,CAAC;IACxB,kEAAkE;IAClE,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACrE,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,gDAAgD;IAChD,MAAM,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;CAC5D,CAAC;AAEF;;kBAEkB;AAClB,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,WAAW;IAE9C;;;;;;;;;;;;2CAYuC;YACzB,oBAAoB;IAwClC;;;;;oBAKgB;YACF,sBAAsB;IAepC,6CAA6C;IACvC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CA8D3G"}
|
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { validateAttachments, validateAttachmentRefs } from "./attachments.js";
|
|
3
|
+
import { notifyEventLogListeners } from "../events/bus.js";
|
|
4
|
+
import { PartProjector } from "./pi-bridge.js";
|
|
5
|
+
import { isWaitingStatus } from "../task/types.js";
|
|
6
|
+
import { defaultActiveRunRegistry } from "./active-run-registry.js";
|
|
7
|
+
import { RESET_GUARDS_ON_RESUME } from "./task-lifecycle.js";
|
|
8
|
+
/** prompt 提交链(W6 S4 自 SessionRunner 原样搬移):附件校验 → 投影用户消息 →
|
|
9
|
+
* 任务归属判定 → acceptPrompt(幂等/409 仍在 WorkflowStore)→ task.started →
|
|
10
|
+
* 触发调度。语义零变化。 */
|
|
11
|
+
export class CommandService {
|
|
12
|
+
deps;
|
|
13
|
+
constructor(deps) {
|
|
14
|
+
this.deps = deps;
|
|
15
|
+
}
|
|
16
|
+
/** 为一条新消息决定它归属哪个任务,以及这次提交的处置(规格 §12 / §13.1)。
|
|
17
|
+
*
|
|
18
|
+
* 四种处置的判定依据是**任务当前状态**,不是模型对文本的猜测:
|
|
19
|
+
* - 无活跃任务 → 开新任务;
|
|
20
|
+
* - 任务在 waiting_permission / waiting_input / waiting_external / blocked
|
|
21
|
+
* → 这条消息就是那个「用户动作」,任务恢复;
|
|
22
|
+
* - 任务在 running → 这条消息是补充/纠正,并入约束。
|
|
23
|
+
*
|
|
24
|
+
* 【为什么不做「这是不是无关新目标」的语义分类】那需要模型判断,代价是一次
|
|
25
|
+
* 额外的往返,而且判错的后果不对称:把无关目标误并进当前任务,用户会看到
|
|
26
|
+
* 自己的话被当成补充说明;反过来把补充说明误判成新任务,则会产生两个抢同一
|
|
27
|
+
* 个工作区的任务(规格 §18.9 禁止的情况)。所以默认并入,并由约束文本明确
|
|
28
|
+
* 标注「这是用户在你执行期间补充的」,让模型自己决定是否改变方向。 */
|
|
29
|
+
async resolveTaskForPrompt(session, input, userMessageId) {
|
|
30
|
+
const store = this.deps.store.task;
|
|
31
|
+
if (!store)
|
|
32
|
+
return null;
|
|
33
|
+
const requestId = input.requestId;
|
|
34
|
+
// 幂等:同一 requestId 重复提交返回同一任务,不创建第二个(§13.1 / §17.1.11)
|
|
35
|
+
// 重放时 disposition 描述的是「这条消息与任务的关系」,那是稳定的:
|
|
36
|
+
// 一条消息一旦开启过某个任务,它永远是那个任务的开启者。
|
|
37
|
+
const prior = await store.findTaskByRequestId(session.id, requestId);
|
|
38
|
+
if (prior)
|
|
39
|
+
return { task: prior, disposition: "task_started", startedTask: false, previous: null };
|
|
40
|
+
const active = await store.getActiveTask(session.id);
|
|
41
|
+
if (active) {
|
|
42
|
+
const resuming = isWaitingStatus(active.status);
|
|
43
|
+
const text = input.text.trim();
|
|
44
|
+
const constraints = text ? [...active.constraints, text].slice(-8) : active.constraints;
|
|
45
|
+
const task = await this.deps.casTask(active, {
|
|
46
|
+
constraints,
|
|
47
|
+
// 恢复:把任务放回可被认领的状态,drain 会接着推进它
|
|
48
|
+
...(resuming ? { status: "queued" } : {}),
|
|
49
|
+
...(resuming ? { blocker: undefined } : {}),
|
|
50
|
+
...(resuming ? RESET_GUARDS_ON_RESUME : {}),
|
|
51
|
+
});
|
|
52
|
+
return { task, disposition: resuming ? "task_resumed" : "task_steered", startedTask: false, previous: active };
|
|
53
|
+
}
|
|
54
|
+
const goal = input.text.trim().slice(0, 500) || "(未命名任务)";
|
|
55
|
+
const task = await store.createTask({
|
|
56
|
+
sessionId: session.id,
|
|
57
|
+
rootRequestId: requestId,
|
|
58
|
+
rootUserMessageId: userMessageId,
|
|
59
|
+
goal,
|
|
60
|
+
});
|
|
61
|
+
return { task, disposition: "task_started", startedTask: true, previous: null };
|
|
62
|
+
}
|
|
63
|
+
/** 提交被拒时把任务改回这一步之前的样子(见 `submit` 里的调用点)。
|
|
64
|
+
*
|
|
65
|
+
* 新建的任务**不回滚**:它是这个 requestId 的幂等锚点,删掉会让「同一 requestId
|
|
66
|
+
* 重试」失去依据。留着它没有代价——下一次同 requestId 的提交会命中
|
|
67
|
+
* `findTaskByRequestId` 拿回同一个任务,别的消息则会被 `getActiveTask` 收编成
|
|
68
|
+
* steering。 */
|
|
69
|
+
async rollbackTaskResolution(resolution) {
|
|
70
|
+
if (!resolution?.previous)
|
|
71
|
+
return;
|
|
72
|
+
const { previous, task } = resolution;
|
|
73
|
+
await this.deps.casTask(task, {
|
|
74
|
+
status: previous.status,
|
|
75
|
+
constraints: previous.constraints,
|
|
76
|
+
// 计数也要一起还原:恢复路径把它们清零了,而这次提交并没有发生。
|
|
77
|
+
noProgressCount: previous.noProgressCount,
|
|
78
|
+
attemptCount: previous.attemptCount,
|
|
79
|
+
activeMs: previous.activeMs ?? 0,
|
|
80
|
+
// 显式区分「清空 blocker」与「保持原样」:undefined 是清除指令
|
|
81
|
+
...(previous.blocker ? { blocker: previous.blocker } : { blocker: undefined }),
|
|
82
|
+
}).catch(() => undefined);
|
|
83
|
+
}
|
|
84
|
+
/** 原 SessionRunner.prompt() 主体(W6 S4 搬移)。 */
|
|
85
|
+
async submit(sessionId, input) {
|
|
86
|
+
input = { ...input, attachments: validateAttachments(input.attachments), attachmentRefs: validateAttachmentRefs(input.attachmentRefs) };
|
|
87
|
+
const session = await this.deps.store.getSession(sessionId);
|
|
88
|
+
if (!session)
|
|
89
|
+
throw new Error("SESSION_NOT_FOUND");
|
|
90
|
+
if (this.deps.store.workflow) {
|
|
91
|
+
input = { ...input, requestId: input.requestId ?? randomUUID(), model: input.model ?? session.model };
|
|
92
|
+
const projector = new PartProjector({ sessionId, agent: input.agent ?? session.agent, model: input.model });
|
|
93
|
+
const parts = [];
|
|
94
|
+
const message = projector.onUserPrompt(event => {
|
|
95
|
+
if (event.type === "message.part.updated")
|
|
96
|
+
parts.push(event.data.part);
|
|
97
|
+
}, input.text, input.images, input.skill, input.references, input.attachments, input.attachmentRefs);
|
|
98
|
+
// 先建消息再建任务:TaskRecord.rootUserMessageId 需要真实的消息 id,
|
|
99
|
+
// 事后回填会多一次 CAS,也让「任务与首条消息同生」这条不变量出现空窗。
|
|
100
|
+
const resolution = await this.resolveTaskForPrompt(session, input, message.id);
|
|
101
|
+
if (resolution)
|
|
102
|
+
input = { ...input, taskId: resolution.task.id };
|
|
103
|
+
let accepted;
|
|
104
|
+
try {
|
|
105
|
+
accepted = await this.deps.store.workflow.acceptPrompt(sessionId, input, { message, parts });
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
// 提交被拒(最常见的是 RECOVERY_REQUIRED)。必须把任务改回原样:
|
|
109
|
+
// resolveTaskForPrompt 可能已经清掉 blocker、把状态放回 queued,而这次
|
|
110
|
+
// prompt 根本没被接受——没被接受就没有任何 run 会去推进它,任务会停在
|
|
111
|
+
// queued 上永远等不到,而用户看到的只是一个 409。
|
|
112
|
+
await this.rollbackTaskResolution(resolution);
|
|
113
|
+
throw error;
|
|
114
|
+
}
|
|
115
|
+
for (const event of accepted.events)
|
|
116
|
+
notifyEventLogListeners(event);
|
|
117
|
+
if (resolution?.startedTask) {
|
|
118
|
+
const task = resolution.task;
|
|
119
|
+
await this.deps.publish({ type: "task.started", data: { taskId: task.id, revision: task.revision, goal: task.goal, steps: [], acceptanceCriteria: task.acceptanceCriteria.map((criterion) => ({ id: criterion.id, description: criterion.description, required: criterion.required, status: criterion.status })) } }, sessionId);
|
|
120
|
+
}
|
|
121
|
+
if (accepted.events.length)
|
|
122
|
+
this.deps.scheduler.drain(sessionId);
|
|
123
|
+
return {
|
|
124
|
+
...accepted.receipt,
|
|
125
|
+
...(resolution ? { disposition: resolution.disposition, taskId: resolution.task.id } : {}),
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
if (defaultActiveRunRegistry.has(sessionId)) {
|
|
129
|
+
await this.deps.store.enqueuePrompt(sessionId, {
|
|
130
|
+
text: input.text,
|
|
131
|
+
attachments: input.attachments,
|
|
132
|
+
// 排队消息必须记住附件引用:真正执行时要按 id 重新确认附件仍存在且可读(规格 2 §11)
|
|
133
|
+
...(input.attachmentRefs?.length ? { attachmentRefs: [...input.attachmentRefs] } : {}),
|
|
134
|
+
images: input.images,
|
|
135
|
+
model: input.model,
|
|
136
|
+
...(input.agent ? { agent: input.agent } : {}),
|
|
137
|
+
...(input.effort ? { effort: input.effort } : {}),
|
|
138
|
+
...(input.skill ? { skill: input.skill } : {}),
|
|
139
|
+
...(input.references?.length ? { references: [...input.references] } : {}),
|
|
140
|
+
enqueuedAt: new Date().toISOString(),
|
|
141
|
+
});
|
|
142
|
+
return { queued: true };
|
|
143
|
+
}
|
|
144
|
+
this.deps.launch(session, input);
|
|
145
|
+
return { queued: false };
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
//# sourceMappingURL=command-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-service.js","sourceRoot":"","sources":["../../../src/core/runtime/command-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C,OAAO,EAAE,eAAe,EAAmC,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AA0B7D;;kBAEkB;AAClB,MAAM,OAAO,cAAc;IACI;IAA7B,YAA6B,IAAiB;QAAjB,SAAI,GAAJ,IAAI,CAAa;IAAG,CAAC;IAElD;;;;;;;;;;;;2CAYuC;IAC/B,KAAK,CAAC,oBAAoB,CAChC,OAAoB,EACpB,KAAkB,EAClB,aAAqB;QAErB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QACnC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,MAAM,SAAS,GAAG,KAAK,CAAC,SAAU,CAAC;QAEnC,sDAAsD;QACtD,0CAA0C;QAC1C,8BAA8B;QAC9B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QACrE,IAAI,KAAK;YAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAEnG,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACrD,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;YACxF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBAC3C,WAAW;gBACX,+BAA+B;gBAC/B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClD,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3C,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAC;aAC5C,CAAC,CAAC;YACH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QACjH,CAAC;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,SAAS,CAAC;QAC1D,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC;YAClC,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,aAAa,EAAE,SAAS;YACxB,iBAAiB,EAAE,aAAa;YAChC,IAAI;SACL,CAAC,CAAC;QACH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAClF,CAAC;IAED;;;;;oBAKgB;IACR,KAAK,CAAC,sBAAsB,CAAC,UAAiC;QACpE,IAAI,CAAC,UAAU,EAAE,QAAQ;YAAE,OAAO;QAClC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QACtC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YAC5B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,kCAAkC;YAClC,eAAe,EAAE,QAAQ,CAAC,eAAe;YACzC,YAAY,EAAE,QAAQ,CAAC,YAAY;YACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,CAAC;YAChC,0CAA0C;YAC1C,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;SAC/E,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC;IAED,6CAA6C;IAC7C,KAAK,CAAC,MAAM,CAAC,SAAiB,EAAE,KAAkB;QAChD,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,cAAc,EAAE,sBAAsB,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QACxI,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAEnD,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC7B,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YACtG,MAAM,SAAS,GAAG,IAAI,aAAa,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAM,EAAE,CAAC,CAAC;YAC7G,MAAM,KAAK,GAAW,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7C,IAAI,KAAK,CAAC,IAAI,KAAK,sBAAsB;oBAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzE,CAAC,EAAE,KAAK,CAAC,IAAI,EAAC,KAAK,CAAC,MAAM,EAAC,KAAK,CAAC,KAAK,EAAC,KAAK,CAAC,UAAU,EAAC,KAAK,CAAC,WAAW,EAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAChG,oDAAoD;YACpD,uCAAuC;YACvC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YAC/E,IAAI,UAAU;gBAAE,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACjE,IAAI,QAA2E,CAAC;YAChF,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,SAAS,EAAC,KAAK,EAAC,EAAE,OAAO,EAAC,KAAK,EAAE,CAAC,CAAC;YAC5F,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,2CAA2C;gBAC3C,uDAAuD;gBACvD,2CAA2C;gBAC3C,gCAAgC;gBAChC,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;gBAC9C,MAAM,KAAK,CAAC;YACd,CAAC;YACD,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM;gBAAE,uBAAuB,CAAC,KAAK,CAAC,CAAC;YACpE,IAAI,UAAU,EAAE,WAAW,EAAE,CAAC;gBAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;gBAC7B,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CACrB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,EAC5R,SAAS,CACV,CAAC;YACJ,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM;gBAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACjE,OAAO;gBACL,GAAG,QAAQ,CAAC,OAAO;gBACnB,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC3F,CAAC;QACJ,CAAC;QAED,IAAI,wBAAwB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,EAAE;gBAC7C,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,iDAAiD;gBACjD,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtF,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9C,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjD,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9C,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1E,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACrC,CAAC,CAAC;YACH,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACjC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC3B,CAAC;CACF"}
|
|
@@ -7,9 +7,9 @@ import type { Api, Model } from "@earendil-works/pi-ai";
|
|
|
7
7
|
* request-only (never written back to state), so the previous stateless
|
|
8
8
|
* version re-summarized the whole history on every LLM request — the anchor
|
|
9
9
|
* turns compaction into an incremental, idempotent projection.
|
|
10
|
-
* Known limitation: closure state
|
|
11
|
-
*
|
|
12
|
-
*
|
|
10
|
+
* Known limitation→W7-S8: closure state can be seeded from a persisted
|
|
11
|
+
* CompactionRecord (initialState) when the rebuilt prefix is byte-identical —
|
|
12
|
+
* backends without the compaction store surface keep the per-run behavior.
|
|
13
13
|
*
|
|
14
14
|
* Harness-course retrofits (tutorial-harness 05/07) preserved:
|
|
15
15
|
* - 膨胀拒绝:新摘要比它替代的内容(新折叠段 + 旧摘要)还长时作废本次压缩。
|
|
@@ -31,8 +31,22 @@ export type CompactionOptions = {
|
|
|
31
31
|
keepRecentMessages?: number;
|
|
32
32
|
/** Streams one completion from the summary model. */
|
|
33
33
|
streamSummary: (messages: AgentMessage[]) => Promise<string>;
|
|
34
|
-
/** Called when a compaction happens so the runner can emit the part.
|
|
35
|
-
|
|
34
|
+
/** Called when a compaction happens so the runner can emit the part.
|
|
35
|
+
* 第三个参数携带折叠后状态(anchor/tailTokens/canonical 数组)——
|
|
36
|
+
* W7-S8 的 CompactionStore 持久化靠它计算前缀指纹。 */
|
|
37
|
+
onCompacted?: (summary: string, tokensBefore: number, state: {
|
|
38
|
+
anchor: number;
|
|
39
|
+
tailTokensAtCompaction: number;
|
|
40
|
+
summary: string;
|
|
41
|
+
messages: AgentMessage[];
|
|
42
|
+
}) => void | Promise<void>;
|
|
43
|
+
/** 跨 Attempt 恢复的初始状态(W7-S8:CompactionStore 播种,前缀指纹
|
|
44
|
+
* 校验通过后才传入)。 */
|
|
45
|
+
initialState?: {
|
|
46
|
+
summary: string;
|
|
47
|
+
anchor: number;
|
|
48
|
+
tailTokensAtCompaction: number;
|
|
49
|
+
};
|
|
36
50
|
/** Called when a compaction attempt fails ("summary-empty" | "summary-inflated");
|
|
37
51
|
* after any failure the transform stops retrying for this run (失败记忆). */
|
|
38
52
|
onCompactionFailed?: (reason: "summary-empty" | "summary-inflated") => void | Promise<void>;
|
|
@@ -65,7 +79,17 @@ export declare function buildCompactionTransform(input: {
|
|
|
65
79
|
contextWindow: number;
|
|
66
80
|
summaryModel: Model<Api> | null;
|
|
67
81
|
streamOne: (model: Model<Api>, messages: AgentMessage[]) => Promise<string>;
|
|
68
|
-
onCompacted?: (summary: string, tokensBefore: number
|
|
82
|
+
onCompacted?: (summary: string, tokensBefore: number, state: {
|
|
83
|
+
anchor: number;
|
|
84
|
+
tailTokensAtCompaction: number;
|
|
85
|
+
summary: string;
|
|
86
|
+
messages: AgentMessage[];
|
|
87
|
+
}) => void | Promise<void>;
|
|
69
88
|
force?: boolean;
|
|
89
|
+
initialState?: {
|
|
90
|
+
summary: string;
|
|
91
|
+
anchor: number;
|
|
92
|
+
tailTokensAtCompaction: number;
|
|
93
|
+
};
|
|
70
94
|
}): ((messages: AgentMessage[], signal?: AbortSignal) => Promise<AgentMessage[]>) | undefined;
|
|
71
95
|
//# sourceMappingURL=compaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAExD;;;;;;;;;;;;;;;;;;;0CAmB0C;AAE1C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,uEAAuE;IACvE,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,4CAA4C;IAC5C,aAAa,EAAE,MAAM,CAAC;IACtB,4DAA4D;IAC5D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qDAAqD;IACrD,aAAa,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7D
|
|
1
|
+
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/compaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,9 +39,9 @@ function summaryMessage(text) {
|
|
|
39
39
|
export function createCompactionTransform(options) {
|
|
40
40
|
const reserve = options.reserveTokens ?? 4096;
|
|
41
41
|
const keepRecent = options.keepRecentMessages ?? 8;
|
|
42
|
-
let summary = null; // 投影的唯一状态:当前摘要
|
|
43
|
-
let anchor = 0; // canonical 历史中已折叠的前缀长度
|
|
44
|
-
let tailTokensAtCompaction = 0; // 上次压缩时投影尾部的 token 量(滞回带基准)
|
|
42
|
+
let summary = options.initialState?.summary ?? null; // 投影的唯一状态:当前摘要
|
|
43
|
+
let anchor = options.initialState?.anchor ?? 0; // canonical 历史中已折叠的前缀长度
|
|
44
|
+
let tailTokensAtCompaction = options.initialState?.tailTokensAtCompaction ?? 0; // 上次压缩时投影尾部的 token 量(滞回带基准)
|
|
45
45
|
let hasFailed = false; // 失败记忆:本轮不再重试摘要
|
|
46
46
|
return async (messages, signal) => {
|
|
47
47
|
void signal;
|
|
@@ -83,7 +83,7 @@ export function createCompactionTransform(options) {
|
|
|
83
83
|
summary = next;
|
|
84
84
|
anchor = messages.length - tailCount;
|
|
85
85
|
tailTokensAtCompaction = estimateTokens(messages.slice(anchor));
|
|
86
|
-
options.onCompacted?.(summary, projectedTokens);
|
|
86
|
+
await options.onCompacted?.(summary, projectedTokens, { anchor, tailTokensAtCompaction, summary, messages });
|
|
87
87
|
return [summaryMessage(summary), ...messages.slice(anchor)];
|
|
88
88
|
};
|
|
89
89
|
}
|
|
@@ -115,6 +115,7 @@ export function buildCompactionTransform(input) {
|
|
|
115
115
|
streamSummary: (messages) => input.streamOne(input.summaryModel, messages),
|
|
116
116
|
...(input.onCompacted ? { onCompacted: input.onCompacted } : {}),
|
|
117
117
|
...(input.force ? { force: true } : {}),
|
|
118
|
+
...(input.initialState ? { initialState: input.initialState } : {}),
|
|
118
119
|
});
|
|
119
120
|
}
|
|
120
121
|
//# sourceMappingURL=compaction.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../src/core/runtime/compaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../src/core/runtime/compaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import type { Agent, AgentMessage } from "@earendil-works/pi-agent-core";
|
|
2
|
+
import type { Api, Model } from "@earendil-works/pi-ai";
|
|
3
|
+
import { type AttachmentProvider } from "./attachments.js";
|
|
4
|
+
import type { FrameworkEvent } from "../events/manifest.js";
|
|
5
|
+
import type { SessionStore } from "../session/store.js";
|
|
6
|
+
import type { MessageWithParts, ModelRef, SessionInfo } from "../session/types.js";
|
|
7
|
+
/** 上下文组装(W7 S6 自 SessionRunner 搬移,spec §9.1 的先行子集):
|
|
8
|
+
* 历史重建(同拍快照修 TOCTOU)、压缩 transform、记忆召回——runLoop 里
|
|
9
|
+
* 唯一的上下文来源。§9.1 的 ContextManifest/预算计费属 M2,不在此。 */
|
|
10
|
+
export declare class ContextBuilder {
|
|
11
|
+
private readonly deps;
|
|
12
|
+
constructor(deps: {
|
|
13
|
+
store: SessionStore;
|
|
14
|
+
attachments?: AttachmentProvider;
|
|
15
|
+
compaction?: {
|
|
16
|
+
enabled: boolean;
|
|
17
|
+
contextWindow: number;
|
|
18
|
+
summaryModel: Model<Api> | null;
|
|
19
|
+
};
|
|
20
|
+
modelFor: (ref: ModelRef) => Model<Api>;
|
|
21
|
+
streamFnFor: (session: SessionInfo) => ConstructorParameters<typeof Agent>[0]["streamFn"];
|
|
22
|
+
memoryContextFor?: (session: SessionInfo, text: string) => Promise<string | undefined>;
|
|
23
|
+
});
|
|
24
|
+
/** 「重建输入」的一致性快照:排除集与消息条目**同拍**读取。
|
|
25
|
+
*
|
|
26
|
+
* 【为什么必须同拍】此前 runLoop 先读 workflowRuns 算排除集、下一拍才
|
|
27
|
+
* getMessages——两拍之间 acceptPrompt 落库的新消息已进 messages 表但不在
|
|
28
|
+
* 排除集里,排队中的用户消息于是泄入正在运行 run 的模型上下文(W6 §8
|
|
29
|
+
* 用插桩证实的读偏斜竞态,FIFO 用例靠一拍微任务时序侥幸掩盖)。
|
|
30
|
+
* sqlite 实现走单 transaction;实现未提供 rebuildSnapshot 时回落两拍
|
|
31
|
+
* (JSONL/demo 模式可接受——无并发提交面)。 */
|
|
32
|
+
historySnapshot(sessionId: string): Promise<{
|
|
33
|
+
entries: MessageWithParts[];
|
|
34
|
+
excludedUserIds: Set<string>;
|
|
35
|
+
}>;
|
|
36
|
+
/** 从持久 parts 重建 PI 上下文(自 runner 原样搬移;entries 由
|
|
37
|
+
* historySnapshot 提供,保证排除判定与消息读取一致)。 */
|
|
38
|
+
rebuildMessages(sessionId: string, entries: MessageWithParts[], excludedUserIds: Set<string> | undefined): Promise<AgentMessage[]>;
|
|
39
|
+
/** 当前会话的压缩阈值:优先取模型目录给的真实上下文窗口,回落 runtime 级
|
|
40
|
+
* 全局配置。旧行为恒取 deps.compaction.contextWindow;模型目录未覆盖该
|
|
41
|
+
* modelId 时 model.contextWindow 即等于该全局值,行为不变。
|
|
42
|
+
* modelFor 抛错(宿主 provider 不认识该 ref)时同样回落,绝不阻断压缩。 */
|
|
43
|
+
private contextWindowFor;
|
|
44
|
+
/** Builds the compaction transformContext (spec §8.3) when the builder has a
|
|
45
|
+
* summary model configured. Emits a `compaction` part on the latest
|
|
46
|
+
* assistant message so the boundary shows in the transcript. force=true
|
|
47
|
+
* skips the threshold/滞回 early-outs (手动「压缩当前会话」)。 */
|
|
48
|
+
buildCompaction(session: SessionInfo, emit: (event: FrameworkEvent) => void, force?: boolean, initialState?: {
|
|
49
|
+
summary: string;
|
|
50
|
+
anchor: number;
|
|
51
|
+
tailTokensAtCompaction: number;
|
|
52
|
+
}): Promise<((messages: AgentMessage[], signal?: AbortSignal) => Promise<AgentMessage[]>) | undefined>;
|
|
53
|
+
/** Attempt 上下文的唯一组装入口:压缩 transform(经前缀指纹校验播种)、
|
|
54
|
+
* 同拍快照重建、记忆召回。baseline:本次 run 新增消息从这之后算(供
|
|
55
|
+
* onRunEnd 提取 retain)。 */
|
|
56
|
+
buildAttemptContext(session: SessionInfo, input: {
|
|
57
|
+
text: string;
|
|
58
|
+
}, emit: (event: FrameworkEvent) => void): Promise<{
|
|
59
|
+
compactionTransform: Awaited<ReturnType<ContextBuilder["buildCompaction"]>>;
|
|
60
|
+
history: AgentMessage[];
|
|
61
|
+
baseline: number;
|
|
62
|
+
}>;
|
|
63
|
+
/** 前缀指纹校验:record 覆盖的前缀与本次重建逐字节一致才允许播种。 */
|
|
64
|
+
private seedStateFor;
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=context-builder.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-builder.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/context-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAsE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC/H,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAoB,gBAAgB,EAAE,QAAQ,EAAQ,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAO3G;;oDAEoD;AACpD,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE;QACjC,KAAK,EAAE,YAAY,CAAC;QACpB,WAAW,CAAC,EAAE,kBAAkB,CAAC;QACjC,UAAU,CAAC,EAAE;YAAE,OAAO,EAAE,OAAO,CAAC;YAAC,aAAa,EAAE,MAAM,CAAC;YAAC,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAA;SAAE,CAAC;QAC1F,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,WAAW,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,qBAAqB,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC1F,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;KACxF;IAED;;;;;;;sCAOkC;IAC5B,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;QAAC,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC;IAShH;6CACyC;IACnC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAqDxI;;;yDAGqD;IACrD,OAAO,CAAC,gBAAgB;IAWxB;;;0DAGsD;IAChD,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,EAAE,KAAK,UAAQ,EAAE,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,sBAAsB,EAAE,MAAM,CAAA;KAAE;IA4CpL;;+BAE2B;IACrB,mBAAmB,CACvB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EACvB,IAAI,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACpC,OAAO,CAAC;QAAE,mBAAmB,EAAE,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAAC,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAqBtI,0CAA0C;YAC5B,YAAY;CAQ3B"}
|