@bolloon/bolloon-agent 0.5.5 → 0.6.1
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/agents/execution-entry.js +10 -0
- package/dist/agents/goal-flywheel/wiring/seams.js +5 -1
- package/dist/agents/parse-tool-call.js +6 -1
- package/dist/agents/pi-sdk-session-factory.js +36 -3
- package/dist/agents/pi-sdk-tools.js +18 -8
- package/dist/agents/pi-sdk.js +749 -1390
- package/dist/agents/run-context.js +20 -0
- package/dist/agents/runner-resolver.js +3 -1
- package/dist/agents/tool-capability/index.js +51 -0
- package/dist/agents/workflow-pivot-loop.js +31 -10
- package/dist/agents/write-verify.js +60 -0
- package/dist/bollharness-integration/integration.js +8 -0
- package/dist/bollharness-integration/skill-adapter.js +32 -3
- package/dist/electron-build/agents/goal-flywheel/wiring/seams.js +5 -1
- package/dist/electron-build/agents/goal-flywheel/wiring/seams.js.map +1 -1
- package/dist/electron-build/agents/parse-tool-call.js +6 -1
- package/dist/electron-build/agents/parse-tool-call.js.map +1 -1
- package/dist/electron-build/agents/pi-sdk-session-factory.js +36 -3
- package/dist/electron-build/agents/pi-sdk-session-factory.js.map +1 -1
- package/dist/electron-build/agents/pi-sdk-tools.js +21 -11
- package/dist/electron-build/agents/pi-sdk-tools.js.map +1 -1
- package/dist/electron-build/agents/pi-sdk-types.js.map +1 -1
- package/dist/electron-build/agents/pi-sdk.js +750 -1389
- package/dist/electron-build/agents/pi-sdk.js.map +1 -1
- package/dist/electron-build/agents/run-context.js +24 -0
- package/dist/electron-build/agents/run-context.js.map +1 -0
- package/dist/electron-build/agents/runner-resolver.js +3 -1
- package/dist/electron-build/agents/runner-resolver.js.map +1 -1
- package/dist/electron-build/agents/tool-capability/index.js +90 -0
- package/dist/electron-build/agents/tool-capability/index.js.map +1 -0
- package/dist/electron-build/agents/workflow-pivot-loop.js +31 -10
- package/dist/electron-build/agents/workflow-pivot-loop.js.map +1 -1
- package/dist/electron-build/agents/write-verify.js +99 -0
- package/dist/electron-build/agents/write-verify.js.map +1 -0
- package/dist/electron-build/bollharness-integration/integration.js +8 -0
- package/dist/electron-build/bollharness-integration/integration.js.map +1 -1
- package/dist/electron-build/bollharness-integration/skill-adapter.js +32 -3
- package/dist/electron-build/bollharness-integration/skill-adapter.js.map +1 -1
- package/dist/electron-build/kernel/channel-actor.js +339 -0
- package/dist/electron-build/kernel/channel-actor.js.map +1 -0
- package/dist/electron-build/kernel/control.js +102 -0
- package/dist/electron-build/kernel/control.js.map +1 -0
- package/dist/electron-build/kernel/model-runtime.js +508 -0
- package/dist/electron-build/kernel/model-runtime.js.map +1 -0
- package/dist/electron-build/kernel/run-lifecycle.js +146 -0
- package/dist/electron-build/kernel/run-lifecycle.js.map +1 -0
- package/dist/electron-build/kernel/transport.js +119 -0
- package/dist/electron-build/kernel/transport.js.map +1 -0
- package/dist/electron-build/llm/native-adapter.js +122 -0
- package/dist/electron-build/llm/native-adapter.js.map +1 -0
- package/dist/index.js +43 -19
- package/dist/ios/bolloon-web.json +3 -3
- package/dist/ios/client.js +13 -7
- package/dist/ios/mobile-core.js +7762 -6289
- package/dist/ios/mobile.js +64 -0
- package/dist/ios/routes-mobile-tasks.js +2 -1
- package/dist/ios/routes-tasks.js +16 -1
- package/dist/ios/routes-x402-info.js +28 -1
- package/dist/ios/server-storage.js +26 -5
- package/dist/ios/server.js +840 -862
- package/dist/ios/sw.js +1 -1
- package/dist/ios/ui/message-renderer.js +473 -29
- package/dist/ios/ui/step-timeline.js +13 -12
- package/dist/kernel/channel-actor.js +321 -0
- package/dist/kernel/control.js +95 -0
- package/dist/kernel/gate-scan.js +1350 -0
- package/dist/kernel/model-runtime.js +494 -0
- package/dist/kernel/plan-channel-actor.js +305 -0
- package/dist/kernel/plan-communication.js +163 -0
- package/dist/kernel/plan-constraint.js +152 -0
- package/dist/kernel/plan-deletion.js +32 -0
- package/dist/kernel/plan-harness.js +78 -0
- package/dist/kernel/plan-modelruntime.js +60 -0
- package/dist/kernel/plan-runcontext.js +163 -0
- package/dist/kernel/plan.js +149 -0
- package/dist/kernel/roster.js +244 -0
- package/dist/kernel/run-lifecycle.js +138 -0
- package/dist/kernel/transport.js +111 -0
- package/dist/llm/native-adapter.js +117 -0
- package/dist/web/bolloon-web.json +3 -3
- package/dist/web/client.js +12 -7
- package/dist/web/routes-tasks.js +16 -1
- package/dist/web/server.js +838 -862
- package/dist/web/sw.js +1 -1
- package/dist/web/ui/message-renderer.js +473 -29
- package/dist/web/ui/step-timeline.js +13 -12
- package/package.json +1 -1
- package/scripts/build-web.ts +74 -1
- package/dist/constraint-runtime/_archive_helper.d.ts +0 -1
- package/dist/constraint-runtime/_archive_helper.js +0 -9
- package/dist/constraint-runtime/assistant/index.d.ts +0 -11
- package/dist/constraint-runtime/assistant/index.js +0 -12
- package/dist/constraint-runtime/bootstrap/index.d.ts +0 -11
- package/dist/constraint-runtime/bootstrap/index.js +0 -12
- package/dist/constraint-runtime/bridge/index.d.ts +0 -11
- package/dist/constraint-runtime/bridge/index.js +0 -12
- package/dist/constraint-runtime/buddy/index.d.ts +0 -11
- package/dist/constraint-runtime/buddy/index.js +0 -12
- package/dist/constraint-runtime/cli/index.d.ts +0 -11
- package/dist/constraint-runtime/cli/index.js +0 -12
- package/dist/constraint-runtime/components/index.d.ts +0 -11
- package/dist/constraint-runtime/components/index.js +0 -12
- package/dist/constraint-runtime/constants/index.d.ts +0 -11
- package/dist/constraint-runtime/constants/index.js +0 -12
- package/dist/constraint-runtime/coordinator/index.d.ts +0 -11
- package/dist/constraint-runtime/coordinator/index.js +0 -12
- package/dist/constraint-runtime/cost_hook.d.ts +0 -2
- package/dist/constraint-runtime/cost_hook.js +0 -4
- package/dist/constraint-runtime/entrypoints/index.d.ts +0 -11
- package/dist/constraint-runtime/entrypoints/index.js +0 -12
- package/dist/constraint-runtime/execution_registry.d.ts +0 -20
- package/dist/constraint-runtime/execution_registry.js +0 -44
- package/dist/constraint-runtime/hooks/index.d.ts +0 -11
- package/dist/constraint-runtime/hooks/index.js +0 -12
- package/dist/constraint-runtime/ink.d.ts +0 -1
- package/dist/constraint-runtime/ink.js +0 -4
- package/dist/constraint-runtime/keybindings/index.d.ts +0 -11
- package/dist/constraint-runtime/keybindings/index.js +0 -12
- package/dist/constraint-runtime/memdir/index.d.ts +0 -11
- package/dist/constraint-runtime/memdir/index.js +0 -12
- package/dist/constraint-runtime/migrations/index.d.ts +0 -11
- package/dist/constraint-runtime/migrations/index.js +0 -12
- package/dist/constraint-runtime/moreright/index.d.ts +0 -11
- package/dist/constraint-runtime/moreright/index.js +0 -12
- package/dist/constraint-runtime/native_ts/index.d.ts +0 -11
- package/dist/constraint-runtime/native_ts/index.js +0 -12
- package/dist/constraint-runtime/output_styles/index.d.ts +0 -11
- package/dist/constraint-runtime/output_styles/index.js +0 -12
- package/dist/constraint-runtime/plugins/index.d.ts +0 -11
- package/dist/constraint-runtime/plugins/index.js +0 -12
- package/dist/constraint-runtime/port_manifest.d.ts +0 -7
- package/dist/constraint-runtime/port_manifest.js +0 -11
- package/dist/constraint-runtime/query.d.ts +0 -6
- package/dist/constraint-runtime/query.js +0 -1
- package/dist/constraint-runtime/remote/index.d.ts +0 -11
- package/dist/constraint-runtime/remote/index.js +0 -12
- package/dist/constraint-runtime/schemas/index.d.ts +0 -11
- package/dist/constraint-runtime/schemas/index.js +0 -12
- package/dist/constraint-runtime/screens/index.d.ts +0 -11
- package/dist/constraint-runtime/screens/index.js +0 -12
- package/dist/constraint-runtime/server/index.d.ts +0 -11
- package/dist/constraint-runtime/server/index.js +0 -12
- package/dist/constraint-runtime/services/index.d.ts +0 -11
- package/dist/constraint-runtime/services/index.js +0 -12
- package/dist/constraint-runtime/state/index.d.ts +0 -11
- package/dist/constraint-runtime/state/index.js +0 -12
- package/dist/constraint-runtime/system_init.d.ts +0 -1
- package/dist/constraint-runtime/system_init.js +0 -20
- package/dist/constraint-runtime/types/index.d.ts +0 -11
- package/dist/constraint-runtime/types/index.js +0 -12
- package/dist/constraint-runtime/upstream_proxy/index.d.ts +0 -11
- package/dist/constraint-runtime/upstream_proxy/index.js +0 -12
- package/dist/constraint-runtime/utils/index.d.ts +0 -11
- package/dist/constraint-runtime/utils/index.js +0 -12
- package/dist/constraint-runtime/vim/index.d.ts +0 -11
- package/dist/constraint-runtime/vim/index.js +0 -12
- package/dist/constraint-runtime/voice/index.d.ts +0 -11
- package/dist/constraint-runtime/voice/index.js +0 -12
|
@@ -503,9 +503,6 @@ class TargetTrackerSkill extends BaseSkill {
|
|
|
503
503
|
}
|
|
504
504
|
}
|
|
505
505
|
exports.TargetTrackerSkill = TargetTrackerSkill;
|
|
506
|
-
/**
|
|
507
|
-
* Skill Adapter - Registers all bollharness skills with Bolloon's SkillRegistry
|
|
508
|
-
*/
|
|
509
506
|
class SkillAdapter {
|
|
510
507
|
registry;
|
|
511
508
|
harnessSkills = [];
|
|
@@ -570,7 +567,39 @@ class SkillAdapter {
|
|
|
570
567
|
listHarnessSkills() {
|
|
571
568
|
return this.harnessSkills;
|
|
572
569
|
}
|
|
570
|
+
/**
|
|
571
|
+
* 2026-10-02 (K7): **受门执行端口** —— 注入后 skill 执行不再自己落地, 而是交给注入方
|
|
572
|
+
* (由 `bollharness-integration/integration.ts` 注入 harness 判定) ⇒ skill 这条路径与
|
|
573
|
+
* 主工具路径**共用一扇门**。未注入 ⇒ 行为与以前一字不差 (便于灰阶上线)。
|
|
574
|
+
* **fail-closed**: 端口抛错 ⇒ 返回带 `拒绝: [harness-error]` 前缀的串并**绝不回落** ——
|
|
575
|
+
* 门坏掉若静默变成"没门"比没有门更危险 (同 pivot loop 的教训)。
|
|
576
|
+
* 注: 这里返回串而不是结构化结果, 是因为 `executeSkill` 的返回类型是 string (公开面); 调用方
|
|
577
|
+
* 只需看前缀就能区分拒绝 (callers: `integration.ts` → `index.ts` 的 harness 入口)。
|
|
578
|
+
*/
|
|
579
|
+
guardedExecute;
|
|
580
|
+
setGuardedExecute(port) {
|
|
581
|
+
this.guardedExecute = port;
|
|
582
|
+
}
|
|
583
|
+
/**
|
|
584
|
+
* 2026-10-02 (K7) 契约 (端口只给**判定**, 执行仍在本方法里, 恰一次):
|
|
585
|
+
* ① 端口抛错 ⇒ **fail-closed**: 返回 `拒绝: [harness-error] …` 且**不进 registry**
|
|
586
|
+
* ② 判定 allow=false ⇒ 返回 `拒绝: [来源] 理由` 且**不进 registry**
|
|
587
|
+
* ③ 判定 allow=true ⇒ 落到**唯一**执行点 `registry.execute` (**恰一次**)
|
|
588
|
+
*/
|
|
573
589
|
async executeSkill(name, params) {
|
|
590
|
+
if (this.guardedExecute) {
|
|
591
|
+
let decision;
|
|
592
|
+
try {
|
|
593
|
+
decision = await this.guardedExecute(name, params);
|
|
594
|
+
}
|
|
595
|
+
catch (guardErr) {
|
|
596
|
+
const msg = String(guardErr?.message ?? guardErr);
|
|
597
|
+
return `拒绝: [harness-error] ${msg}`;
|
|
598
|
+
}
|
|
599
|
+
if (!decision.allow) {
|
|
600
|
+
return `拒绝: [${decision.rejectedBy || 'harness'}] ${decision.reason || '未说明理由'}`;
|
|
601
|
+
}
|
|
602
|
+
}
|
|
574
603
|
return this.registry.execute(name, params);
|
|
575
604
|
}
|
|
576
605
|
log(message, level = 'info') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-adapter.js","sourceRoot":"","sources":["../../../src/bollharness-integration/skill-adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"skill-adapter.js","sourceRoot":"","sources":["../../../src/bollharness-integration/skill-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,339 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* **Channel Actor** (K5 第 2 步: 容器)
|
|
4
|
+
*
|
|
5
|
+
* 为什么需要它: `messageHistory` / `currentChannelId` / `currentAgentId` / `currentGoalId` 四个字段
|
|
6
|
+
* 在 Pi 实例上被**所有入口共享** —— 这正是"多通道串台 / 同 Channel 并发改 history"的根。
|
|
7
|
+
* K2 已按 leo 口径判定它们**不是 Run 状态**, 该由 Channel Actor 承载 (见 `plan-channel-actor.ts`)。
|
|
8
|
+
*
|
|
9
|
+
* 本文件是**纯新增的容器**: 不改任何现有行为 (Pi 仍按原样跑)。它提供三件事:
|
|
10
|
+
* ① `ActorState` —— Actor 状态容器 (9 项, 与台账逐条对应);
|
|
11
|
+
* ② `SerialMailbox` —— 同 Channel **串行**执行队列 (1 个 channel 同时只有 1 个任务在跑);
|
|
12
|
+
* ③ `ChannelActor` —— 把两者绑起来: `submit()` 入队并串行执行 · `abort()` 取消当前任务。
|
|
13
|
+
*
|
|
14
|
+
* 纪律: 串行语义**真跑验证** (`src/test/kernel-channel-actor.test.ts` 的串行用例), 不靠"看起来对"。
|
|
15
|
+
*/
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
exports.ChannelActor = exports.SerialMailbox = void 0;
|
|
18
|
+
exports.currentActorContext = currentActorContext;
|
|
19
|
+
exports.createActorState = createActorState;
|
|
20
|
+
exports.getOrCreateActor = getOrCreateActor;
|
|
21
|
+
exports.peekActor = peekActor;
|
|
22
|
+
exports.actorCount = actorCount;
|
|
23
|
+
exports.abortActorsOfChannel = abortActorsOfChannel;
|
|
24
|
+
exports.resetActors = resetActors;
|
|
25
|
+
exports.deliverThroughActor = deliverThroughActor;
|
|
26
|
+
exports.getChannelQueue = getChannelQueue;
|
|
27
|
+
exports.channelQueueCount = channelQueueCount;
|
|
28
|
+
exports.createPrivateActor = createPrivateActor;
|
|
29
|
+
exports.privateActorCount = privateActorCount;
|
|
30
|
+
/** Actor 状态容器 —— 与 `ACTOR_STATE_ITEMS` 的 9 项一一对应 */
|
|
31
|
+
const node_async_hooks_1 = require("node:async_hooks");
|
|
32
|
+
/**
|
|
33
|
+
* **当前正在哪个 Actor 的 mailbox 任务里跑** (K5 第 5 步的前置安全网)。
|
|
34
|
+
*
|
|
35
|
+
* 为什么必须有: `SerialMailbox` 是**无重入**的 —— 一个已在 mailbox 里跑的任务若再往同一个 mailbox
|
|
36
|
+
* 投递并 await, 就是**自锁** (新任务排在"自己"后面)。入口投递 (步骤④) 一旦覆盖到"运行中会被调用"
|
|
37
|
+
* 的执行点 (LLM 回调 / judge / 工具内再问一次), 就会踩到这条。
|
|
38
|
+
* ⇒ 用 ALS 记住"我在谁的上下文里", 同 actor 重入时**直跑**, 不同 actor 照常排队。
|
|
39
|
+
*/
|
|
40
|
+
const actorCtx = new node_async_hooks_1.AsyncLocalStorage();
|
|
41
|
+
/** 当前是否正跑在某个 Actor 的 mailbox 任务内 (诊断用) */
|
|
42
|
+
function currentActorContext() {
|
|
43
|
+
return actorCtx.getStore();
|
|
44
|
+
}
|
|
45
|
+
function createActorState(init = {}) {
|
|
46
|
+
return {
|
|
47
|
+
channelId: init.channelId ?? '',
|
|
48
|
+
agentId: init.agentId ?? '',
|
|
49
|
+
goalBinding: init.goalBinding ?? '',
|
|
50
|
+
messageHistory: init.messageHistory ?? [],
|
|
51
|
+
mailbox: init.mailbox ?? { pending: 0, processed: 0 },
|
|
52
|
+
activeRun: init.activeRun ?? '',
|
|
53
|
+
cancellation: init.cancellation ?? null,
|
|
54
|
+
outboundStream: init.outboundStream ?? null,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* 同 Channel **串行**邮箱。
|
|
59
|
+
*
|
|
60
|
+
* 契约 (K5 验收标准 ①):
|
|
61
|
+
* · `submit()` 立即返回 promise, 任务**排队**执行;
|
|
62
|
+
* · 同一个 mailbox 内**永不并发** —— 后一个任务在前一个 settle 之后才开始;
|
|
63
|
+
* · 一个任务抛错**不阻塞**队列 (错误交给该任务自己的 promise, 队列继续);
|
|
64
|
+
* · `pending` 是"已入队未完成"的数量, 用于观测 (不是背压实现)。
|
|
65
|
+
*/
|
|
66
|
+
class SerialMailbox {
|
|
67
|
+
tail = Promise.resolve();
|
|
68
|
+
pendingCount = 0;
|
|
69
|
+
processedCount = 0;
|
|
70
|
+
get pending() { return this.pendingCount; }
|
|
71
|
+
get processed() { return this.processedCount; }
|
|
72
|
+
submit(task) {
|
|
73
|
+
this.pendingCount += 1;
|
|
74
|
+
const run = this.tail.then(async () => {
|
|
75
|
+
try {
|
|
76
|
+
return await task();
|
|
77
|
+
}
|
|
78
|
+
finally {
|
|
79
|
+
this.pendingCount -= 1;
|
|
80
|
+
this.processedCount += 1;
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
// 队列尾巴吞掉错误, 避免一个失败任务毒化后续任务 (错误仍由返回的 promise 抛给调用方)
|
|
84
|
+
this.tail = run.then(() => undefined, () => undefined);
|
|
85
|
+
return run;
|
|
86
|
+
}
|
|
87
|
+
/** 等队列跑空 (测试与收尾用) */
|
|
88
|
+
async drain() {
|
|
89
|
+
await this.tail;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
exports.SerialMailbox = SerialMailbox;
|
|
93
|
+
/**
|
|
94
|
+
* 把一个 Channel 的状态与串行队列绑在一起。
|
|
95
|
+
*
|
|
96
|
+
* 现在**只是容器**: 还没有任何入口往里投递 (K5 第 4 步才接)。
|
|
97
|
+
* 因此它不改变现有行为 —— 现有链路仍走 Pi 实例字段。
|
|
98
|
+
*/
|
|
99
|
+
class ChannelActor {
|
|
100
|
+
state;
|
|
101
|
+
mailbox = new SerialMailbox();
|
|
102
|
+
constructor(init = {}) {
|
|
103
|
+
this.state = createActorState(init);
|
|
104
|
+
}
|
|
105
|
+
/** 投递一次执行 (串行执行)。执行期间 `state.activeRun` 由调用方/后续步骤写入 */
|
|
106
|
+
submit(fn) {
|
|
107
|
+
// 任务体内建立 ALS 上下文 ⇒ 任务内部的异步续体也能认出"自己在谁的上下文里"
|
|
108
|
+
return this.mailbox.submit(() => actorCtx.run(this, () => fn(this.state)));
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* **K5 第 4 步 — hydrate**: 实现体 (load → filter → 截断 → 替换) 住在 Actor, 业务侧只给纯变换。
|
|
112
|
+
* 走邮箱 ⇒ 与 append / persist 串行, 不会再出现"读-改-写"三拍被并发踩掉。
|
|
113
|
+
* 返回灌入条数 (0 = 没历史 / 空 / 加载失败由调用方处理)。
|
|
114
|
+
*/
|
|
115
|
+
hydrateHistory(spec) {
|
|
116
|
+
return this.mailbox.submit(async () => {
|
|
117
|
+
const loaded = await spec.load();
|
|
118
|
+
if (!loaded)
|
|
119
|
+
return 0;
|
|
120
|
+
const next = spec.filter(loaded).slice(-spec.maxMessages);
|
|
121
|
+
if (next.length === 0)
|
|
122
|
+
return 0;
|
|
123
|
+
const arr = this.state.messageHistory;
|
|
124
|
+
arr.length = 0;
|
|
125
|
+
arr.push(...next);
|
|
126
|
+
return next.length;
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* **K5 第 4 步 — persist 的取数拍**: 取一份快照 (浅拷贝)。
|
|
131
|
+
* 走邮箱 ⇒ 拿到的是一致的 history, 不会与正在进行的 append 交错 (原来的 `this.messageHistory.map(...)`
|
|
132
|
+
* 是"边写边读", 压缩/工具回灌并发时可能落盘到半截状态)。
|
|
133
|
+
*/
|
|
134
|
+
historySnapshot() {
|
|
135
|
+
return this.mailbox.submit(() => [...this.state.messageHistory]);
|
|
136
|
+
}
|
|
137
|
+
/** **K5 第 4 步 — append (排队版)**: 串行追加 (同 Channel 内排队) */
|
|
138
|
+
appendMessage(msg) {
|
|
139
|
+
return this.mailbox.submit(() => { this.state.messageHistory.push(msg); });
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* **K5 第 4 步 — append (同步漏斗版)**: 给"写完立刻要读到"的调用面用 (Pi 的 ReAct 循环里大量
|
|
143
|
+
* `push` 后马上读 `length`/索引) —— 不能改成 await, 否则会改变同拍可见性。
|
|
144
|
+
*
|
|
145
|
+
* 它提供的是**归属与可数性** (所有 history 写入收敛到唯一漏斗, 门可以断言"零处直写"),
|
|
146
|
+
* **不是并发安全** —— 并发安全由"入口投递进 mailbox"负责 (K5 第 5 步 / entriesWired)。
|
|
147
|
+
*/
|
|
148
|
+
appendMessageSync(msg) {
|
|
149
|
+
this.state.messageHistory.push(msg);
|
|
150
|
+
}
|
|
151
|
+
/** **K5 第 4 步 — pop 漏斗** (与 appendMessageSync 同性质: 归属可数, 不负责并发) */
|
|
152
|
+
popMessageSync() {
|
|
153
|
+
return this.state.messageHistory.pop();
|
|
154
|
+
}
|
|
155
|
+
/**
|
|
156
|
+
* **K5 第 4 步 — compact 的落地拍 (rebase)**: 用压缩结果替换 history, 但**保住**变换期间新追加的尾部。
|
|
157
|
+
*
|
|
158
|
+
* 为什么必须有这一拍: 压缩流水线是 **async** —— 从"取快照"(`snapshotLen`) 到"落地"之间是 await 窗口,
|
|
159
|
+
* 期间 append 进来的消息会被整块替换**丢掉** (lost update)。这里把尾部原样接回去。
|
|
160
|
+
* (同步压缩路径不受影响: 取快照与替换在同一拍相邻两行, 没有窗口 —— 见 pi-sdk 的注释。)
|
|
161
|
+
*/
|
|
162
|
+
rebaseHistory(compacted, snapshotLen) {
|
|
163
|
+
return this.mailbox.submit(() => {
|
|
164
|
+
const arr = this.state.messageHistory;
|
|
165
|
+
const at = Math.max(0, Math.min(snapshotLen, arr.length));
|
|
166
|
+
const tail = arr.slice(at);
|
|
167
|
+
arr.length = 0;
|
|
168
|
+
arr.push(...compacted, ...tail);
|
|
169
|
+
return { keptTail: tail.length };
|
|
170
|
+
});
|
|
171
|
+
}
|
|
172
|
+
/** **K5 第 4 步 — 整体替换漏斗** (hydrate 回灌 / 压缩后的整体赋值都走这里) */
|
|
173
|
+
replaceHistory(next) {
|
|
174
|
+
const arr = this.state.messageHistory;
|
|
175
|
+
arr.length = 0;
|
|
176
|
+
arr.push(...next);
|
|
177
|
+
}
|
|
178
|
+
/** 取消当前任务: 中断 signal, 队列继续 (后续任务看到的是新的 controller) */
|
|
179
|
+
abort(reason = 'aborted') {
|
|
180
|
+
this.state.cancellation?.abort(reason);
|
|
181
|
+
this.state.cancellation = null;
|
|
182
|
+
}
|
|
183
|
+
/** 开一个新的取消位 (进入一次执行时用) */
|
|
184
|
+
beginCancellation() {
|
|
185
|
+
const ac = new AbortController();
|
|
186
|
+
this.state.cancellation = ac;
|
|
187
|
+
return ac.signal;
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
exports.ChannelActor = ChannelActor;
|
|
191
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
192
|
+
// Actor 注册表 (K5 第 3 步): 一个 channel 一个 actor
|
|
193
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
194
|
+
/**
|
|
195
|
+
* 进程内注册表: **会话身份 → ChannelActor**。
|
|
196
|
+
*
|
|
197
|
+
* ⚠️ 键是**会话身份** (SessionStore key / 整条 peerId), **不是** channel 前缀 —— 这条是被全量回归打出来的:
|
|
198
|
+
* 第一版取 `peerId` 的 `:` 前段当键 ⇒ 同一 channel 下不同会话落进同一个桶 ⇒ 新 session 一构造
|
|
199
|
+
* 就看到别人的 history (4742 测试里 5 红, 症状统一 `expected 2/5/6 to be 0`)。
|
|
200
|
+
* 隔离粒度必须与被迁移状态原有的粒度一致: history 属于**会话**, 不属于 channel 前缀。
|
|
201
|
+
*
|
|
202
|
+
* ⚠️ **没有身份就不归属** (没有 'default' 兜底桶) —— 宁可不共享, 不许串台。这里先把"落点"建起来。
|
|
203
|
+
*
|
|
204
|
+
* ⚠️ 现在的定位 (不许夸大):
|
|
205
|
+
* · 只做**归属**: 同一 channelId 永远拿到同一个 actor 实例, 不同 channelId 互不相干;
|
|
206
|
+
* · **还没有任何入口把执行投递进来** (`submit()` 尚未被业务调用) ⇒ K5 进度里
|
|
207
|
+
* `entriesWired` 仍是 **0/4**, 行为与迁移前一致;
|
|
208
|
+
* · 进程内 (非持久): 重启后 actor 表为空 —— 持久化是后续步骤 (history/Goal/Run 的恢复)。
|
|
209
|
+
*/
|
|
210
|
+
const actors = new Map();
|
|
211
|
+
/**
|
|
212
|
+
* 取(或建)某 channel 的 actor。
|
|
213
|
+
* `init` **只在新建时生效** (既有 actor 不会被 init 覆盖 —— 避免"后到的调用把先建的会话状态冲掉")。
|
|
214
|
+
*/
|
|
215
|
+
function getOrCreateActor(actorKey, init = {}) {
|
|
216
|
+
const key = actorKey;
|
|
217
|
+
const existing = actors.get(key);
|
|
218
|
+
if (existing)
|
|
219
|
+
return existing;
|
|
220
|
+
// ⚠️ **不拿身份键当 channel 绑定**: `state.channelId` 的语义 = 会话当前绑定的 channel
|
|
221
|
+
// (与 Pi 的 currentChannelId 一致, 由 prompt/入口设置)。工厂若预置成 peerId 前缀,
|
|
222
|
+
// 会让会话在入口设置之前就读到非空值 (snapshot / compaction cacheScope 都会跟着变) —— 静默行为变化。
|
|
223
|
+
const created = new ChannelActor({ ...init });
|
|
224
|
+
actors.set(key, created);
|
|
225
|
+
return created;
|
|
226
|
+
}
|
|
227
|
+
/** 只读探查 (不建) —— 测试与诊断用 */
|
|
228
|
+
function peekActor(actorKey) {
|
|
229
|
+
return actors.get(actorKey);
|
|
230
|
+
}
|
|
231
|
+
/** 当前 actor 数 (诊断用) */
|
|
232
|
+
function actorCount() {
|
|
233
|
+
return actors.size;
|
|
234
|
+
}
|
|
235
|
+
/**
|
|
236
|
+
* K8 收尾: **按 channel 中止** —— 给 UI 的终止按钮用 (`POST /api/chat/abort`)。
|
|
237
|
+
*
|
|
238
|
+
* 为什么是"扫描"而不是"按 channel 分桶": 注册表的键是**会话身份** (channel 前缀分桶曾被全量回归打红 ——
|
|
239
|
+
* 同 channel 下不同会话会互相看见 history)。终止只是**只读查找 + 动作**, 不改归属粒度 ⇒ 扫 `state.channelId` 即可。
|
|
240
|
+
*
|
|
241
|
+
* 返回**真的被中止了几个** —— 调用方据此回 `aborted: true/false`;
|
|
242
|
+
* 不许把"没找到 / 没在跑"说成"已中止" (那是谎报)。
|
|
243
|
+
*/
|
|
244
|
+
function abortActorsOfChannel(channelId, reason = 'aborted') {
|
|
245
|
+
const cid = String(channelId || '');
|
|
246
|
+
if (!cid)
|
|
247
|
+
return 0;
|
|
248
|
+
let aborted = 0;
|
|
249
|
+
for (const actor of actors.values()) {
|
|
250
|
+
if (actor.state.channelId !== cid)
|
|
251
|
+
continue;
|
|
252
|
+
if (!actor.state.cancellation)
|
|
253
|
+
continue; // 没在跑 ⇒ 不算中止 (不强造一个 controller)
|
|
254
|
+
actor.abort(reason);
|
|
255
|
+
aborted += 1;
|
|
256
|
+
}
|
|
257
|
+
return aborted;
|
|
258
|
+
}
|
|
259
|
+
/** 清空注册表 —— **仅测试用** (避免测试之间互相污染) */
|
|
260
|
+
function resetActors() {
|
|
261
|
+
actors.clear();
|
|
262
|
+
channelQueues.clear();
|
|
263
|
+
privateActorsCreated = 0;
|
|
264
|
+
}
|
|
265
|
+
async function deliverThroughActor(
|
|
266
|
+
// 形参故意放宽成 `unknown`: 调用点的 receiver 类型五花八门 (AgentSession / 结构子集 / any),
|
|
267
|
+
// 写成 `{ actor?: ChannelActor }` 会触发 TS 的弱类型检查 ("no properties in common") 而误报。
|
|
268
|
+
// 实际用法由下面这行运行时取值保证 (取不到 actor 就直跑)。
|
|
269
|
+
holder, run, opts = {}) {
|
|
270
|
+
const actor = holder?.actor;
|
|
271
|
+
if (!actor || typeof actor.submit !== 'function')
|
|
272
|
+
return run();
|
|
273
|
+
// **重入保护**: 已经跑在同一个 actor 的 mailbox 任务里 ⇒ 直跑。
|
|
274
|
+
// 否则"运行中被调用的执行点"(LLM 回调 / judge / 工具内再问) 会往自己的队列尾投递 ⇒ **自锁**。
|
|
275
|
+
if (actorCtx.getStore() === actor)
|
|
276
|
+
return run();
|
|
277
|
+
// channel 级串行 (opt-in): 走 channel 队列; 同样要防重入 (已在同一 channel 队列任务里 ⇒ 直跑)
|
|
278
|
+
if (opts.serializeByChannel) {
|
|
279
|
+
const ch = actor.state.channelId;
|
|
280
|
+
if (ch) {
|
|
281
|
+
const q = getChannelQueue(ch);
|
|
282
|
+
if (channelCtx.getStore() === q)
|
|
283
|
+
return run();
|
|
284
|
+
return q.submit(() => channelCtx.run(q, () => actor.submit(() => actorCtx.run(actor, () => run()))));
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
return actor.submit(run);
|
|
288
|
+
}
|
|
289
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
290
|
+
// channel 级串行锁 (K5 步骤⑤) —— **能力先落地, 默认不启用**
|
|
291
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
292
|
+
/**
|
|
293
|
+
* channel 级队列注册表: `channelId → 串行队列`。
|
|
294
|
+
*
|
|
295
|
+
* 为什么要它 / 为什么默认不启用 (证据在 `plan-channel-actor.ts` 的 `K5_CHANNEL_LOCK`):
|
|
296
|
+
* · **证据**: web 的 channel 只有一个 `currentSessionId` ⇒ 用户消息都投到**同一个会话身份**
|
|
297
|
+
* ⇒ 身份级串行 (mailbox) **已经把该 channel 的输入串起来了** —— 验收①在活跃会话上已成立。
|
|
298
|
+
* · **能力**: 会话切换 (`[新会话] 已切换`) 后旧会话仍在内存, 此时两个身份可能并行 —— 若要"跨会话切换也串行",
|
|
299
|
+
* 需要 channel 级锁。
|
|
300
|
+
* · **代价**: 同 channel 的**多个 agent** (P2P 多智能体) 也会被串起来 ⇒ 吞吐下降。
|
|
301
|
+
* ⇒ 是否全局启用是**意图层**的决定 (leo), 这里只把能力与证据备好, 由台账的 `enabled` 开关控制。
|
|
302
|
+
*/
|
|
303
|
+
const channelQueues = new Map();
|
|
304
|
+
/** 取(或建)某 channel 的串行队列 */
|
|
305
|
+
function getChannelQueue(channelId) {
|
|
306
|
+
const key = channelId || 'default';
|
|
307
|
+
let q = channelQueues.get(key);
|
|
308
|
+
if (!q) {
|
|
309
|
+
q = new SerialMailbox();
|
|
310
|
+
channelQueues.set(key, q);
|
|
311
|
+
}
|
|
312
|
+
return q;
|
|
313
|
+
}
|
|
314
|
+
/** 当前 channel 队列数 (诊断用) */
|
|
315
|
+
function channelQueueCount() {
|
|
316
|
+
return channelQueues.size;
|
|
317
|
+
}
|
|
318
|
+
/** channel 队列上下文 (重入判定用; 与 actorCtx 同理 —— 不许自锁) */
|
|
319
|
+
const channelCtx = new node_async_hooks_1.AsyncLocalStorage();
|
|
320
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
321
|
+
// 私有 actor (K5 步骤⑧): 给"没有会话身份"的 session 用
|
|
322
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
323
|
+
let privateActorsCreated = 0;
|
|
324
|
+
/**
|
|
325
|
+
* 造一个**私有** actor: **不注册**进 `actors`, 所以别人拿不到它 ⇒ 不可能串台。
|
|
326
|
+
*
|
|
327
|
+
* 为什么需要它 (K5 步骤⑧ 的前提): 要删掉 Pi 实例侧的"绑定前暂存"字段, 就必须保证**任何 session 都有 actor**。
|
|
328
|
+
* 没有身份时不许猜键 (猜就会共享) —— 那就给它一个**谁也拿不到**的私有 actor:
|
|
329
|
+
* 隔离性比"共享"更保守, 语义与"暂存字段"完全等价 (每个 session 自己一份)。
|
|
330
|
+
*/
|
|
331
|
+
function createPrivateActor() {
|
|
332
|
+
privateActorsCreated += 1;
|
|
333
|
+
return new ChannelActor();
|
|
334
|
+
}
|
|
335
|
+
/** 已创建的私有 actor 数 (诊断/测试用: 证明"每个无身份 session 各拿一份") */
|
|
336
|
+
function privateActorCount() {
|
|
337
|
+
return privateActorsCreated;
|
|
338
|
+
}
|
|
339
|
+
//# sourceMappingURL=channel-actor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channel-actor.js","sourceRoot":"","sources":["../../../src/kernel/channel-actor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RUN_CONTROL_REQUIRED = exports.RUN_CONTROL_KINDS = void 0;
|
|
4
|
+
exports.runControlAudit = runControlAudit;
|
|
5
|
+
exports.resetRunControlAudit = resetRunControlAudit;
|
|
6
|
+
exports.submitRunControl = submitRunControl;
|
|
7
|
+
exports.RUN_CONTROL_KINDS = ['record-recovery', 'set-run-status', 'wake-goal'];
|
|
8
|
+
/** 每种请求**必须**携带的定位字段 (校验用; 缺了直接拒, 不许猜) */
|
|
9
|
+
exports.RUN_CONTROL_REQUIRED = {
|
|
10
|
+
'record-recovery': 'runId',
|
|
11
|
+
'set-run-status': 'runId',
|
|
12
|
+
'wake-goal': 'goalId',
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* 端口**不抛异常但明确拒绝** (`{ ok: false, reason }`) 的归一化判定。
|
|
16
|
+
* 为什么必须有: store 类原语用返回值表达"状态迁移被拒绝", 而控制面若只看"有没有抛",
|
|
17
|
+
* 就会把**被拒当成成功** (实测: pause/abort 路由依赖 `r.ok`/`r.reason` 回 409)。
|
|
18
|
+
* ⇒ 约定: 端口返回 `{ ok: false }` ⇒ 控制面也报 ok=false, detail = `端口拒绝: <reason>`。
|
|
19
|
+
*/
|
|
20
|
+
function portRefusal(res) {
|
|
21
|
+
if (res && typeof res === 'object' && 'ok' in res) {
|
|
22
|
+
const r = res;
|
|
23
|
+
if (r.ok === false)
|
|
24
|
+
return `端口拒绝: ${String(r.reason ?? '未给原因')}`;
|
|
25
|
+
}
|
|
26
|
+
return null;
|
|
27
|
+
}
|
|
28
|
+
const audit = [];
|
|
29
|
+
const AUDIT_MAX = 200;
|
|
30
|
+
/** 审计流水 (最近 N 条; 测试与运维可读) */
|
|
31
|
+
function runControlAudit() {
|
|
32
|
+
return audit;
|
|
33
|
+
}
|
|
34
|
+
function resetRunControlAudit() {
|
|
35
|
+
audit.length = 0;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* 提交一条控制请求。**唯一入口** —— 校验 (kind 合法 / 定位字段齐 / origin 非空) → 派发到 port → 记审计。
|
|
39
|
+
* 一律**返回结果对象**, 不抛 (调用方不该用 try/catch 表达"请求被拒")。
|
|
40
|
+
*/
|
|
41
|
+
async function submitRunControl(req, ports) {
|
|
42
|
+
const kind = req?.kind;
|
|
43
|
+
const finish = (ok, detail, port, result) => {
|
|
44
|
+
audit.push({
|
|
45
|
+
at: Date.now(),
|
|
46
|
+
kind,
|
|
47
|
+
origin: req?.origin ?? '(anonymous)',
|
|
48
|
+
target: String(req?.runId ?? req?.goalId ?? ''),
|
|
49
|
+
ok,
|
|
50
|
+
detail,
|
|
51
|
+
});
|
|
52
|
+
if (audit.length > AUDIT_MAX)
|
|
53
|
+
audit.splice(0, audit.length - AUDIT_MAX);
|
|
54
|
+
return { ok, kind, via: 'kernel-control', detail, port, result };
|
|
55
|
+
};
|
|
56
|
+
if (!exports.RUN_CONTROL_KINDS.includes(kind))
|
|
57
|
+
return finish(false, `未知请求类型: ${String(req?.kind)}`);
|
|
58
|
+
if (!req.origin)
|
|
59
|
+
return finish(false, '缺少 origin (审计要求: 不许匿名请求)');
|
|
60
|
+
const need = exports.RUN_CONTROL_REQUIRED[kind];
|
|
61
|
+
const target = need === 'runId' ? req.runId : req.goalId;
|
|
62
|
+
if (!target)
|
|
63
|
+
return finish(false, `${kind} 缺少 ${need}`);
|
|
64
|
+
if (kind === 'record-recovery') {
|
|
65
|
+
if (typeof ports.recordRecovery !== 'function')
|
|
66
|
+
return finish(false, 'port 未注入: recordRecovery');
|
|
67
|
+
try {
|
|
68
|
+
const res = await ports.recordRecovery(target, req.payload ?? {});
|
|
69
|
+
const refusal = portRefusal(res);
|
|
70
|
+
return refusal ? finish(false, refusal, 'recordRecovery', res) : finish(true, undefined, 'recordRecovery', res);
|
|
71
|
+
}
|
|
72
|
+
catch (err) {
|
|
73
|
+
return finish(false, `recordRecovery 失败: ${String(err?.message ?? err).slice(0, 160)}`);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
if (kind === 'set-run-status') {
|
|
77
|
+
if (typeof ports.setRunStatus !== 'function')
|
|
78
|
+
return finish(false, 'port 未注入: setRunStatus');
|
|
79
|
+
const status = String(req.payload?.status ?? '');
|
|
80
|
+
if (!status)
|
|
81
|
+
return finish(false, 'set-run-status 缺少 payload.status');
|
|
82
|
+
try {
|
|
83
|
+
const res = await ports.setRunStatus(target, status, req.payload);
|
|
84
|
+
const refusal = portRefusal(res);
|
|
85
|
+
return refusal ? finish(false, refusal, 'setRunStatus', res) : finish(true, undefined, 'setRunStatus', res);
|
|
86
|
+
}
|
|
87
|
+
catch (err) {
|
|
88
|
+
return finish(false, `setRunStatus 失败: ${String(err?.message ?? err).slice(0, 160)}`);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
if (typeof ports.setContinuation !== 'function')
|
|
92
|
+
return finish(false, 'port 未注入: setContinuation');
|
|
93
|
+
try {
|
|
94
|
+
const res = await ports.setContinuation(target, req.payload ?? {});
|
|
95
|
+
const refusal = portRefusal(res);
|
|
96
|
+
return refusal ? finish(false, refusal, 'setContinuation', res) : finish(true, undefined, 'setContinuation', res);
|
|
97
|
+
}
|
|
98
|
+
catch (err) {
|
|
99
|
+
return finish(false, `setContinuation 失败: ${String(err?.message ?? err).slice(0, 160)}`);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=control.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"control.js","sourceRoot":"","sources":["../../../src/kernel/control.ts"],"names":[],"mappings":"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"}
|