@bolloon/bolloon-agent 0.5.5 → 0.6.0

package/dist/web/server.js

@@ -87,6 +87,8 @@ console.log = (...args) => {
 import { createHyperswarmCommunicator, createTopic, KeyManager, AgentAuthManager, } from '@diap/sdk';
 import { initMinimax } from '../constraints/index.js';
 import { createAgentSession } from '../agents/pi-sdk.js';
+// **K5 步骤④ (入口投递)**: 把一次入口执行投进会话 Actor 的 mailbox ⇒ 同一会话身份的输入排队执行
+import { deliverThroughActor } from '../kernel/channel-actor.js';
 import { irohTransport } from '../network/iroh-transport.js';
 import { createAgentDelegateApp } from './agent-delegate-server.js';
 import { createIrohDelegateTransport } from './iroh-delegate-transport.js';
@@ -585,7 +587,7 @@ async function triggerRemoteFollowup(channelId, remoteReply, fromPublicKey, roun
                 broadcast({ type: 'followup-step', ...event, channelId }, channelId);
             }
         };
-        const fullResponse = await agent.promptStream(markedPrompt, streamCallback, undefined, channelId);
+        const fullResponse = await deliverThroughActor(agent, () => agent.promptStream(markedPrompt, streamCallback, undefined, channelId));
         if (!fullResponse.trim())
             return;
         // 广播续看结果给 UI
@@ -913,7 +915,7 @@ async function handleV3P2PMessage(parsed, conn, comm) {
                 }
             };
             const agent = await getAgentForChannel(channelId, ch.did || '', ch.name, ch.didDocRef);
-            fullResponse = await agent.promptStream(fullPrompt, streamCallback, undefined, channelId);
+            fullResponse = await deliverThroughActor(agent, () => agent.promptStream(fullPrompt, streamCallback, undefined, channelId));
             // 2026-07-06: 防御性兜底
             if (!fullResponse.trim()) {
                 fullResponse = '⚠️ AI 未返回内容, 请重试';
@@ -1065,7 +1067,7 @@ async function handleV3P2PMessage(parsed, conn, comm) {
             // 临时用 channelId = "__collab__" 拿个一次性 agent
             const collabChannelId = `__collab_${senderKey.substring(0, 8)}__`;
             const agent = await getAgentForChannel(collabChannelId, '', `collab-${senderKey.substring(0, 8)}`, undefined);
-            const resultText = await agent.prompt(fullPrompt);
+            const resultText = await deliverThroughActor(agent, () => agent.prompt(fullPrompt));
             const reply = JSON.stringify({
                 v: 3,
                 op: 'agent.collab.reply',
@@ -1679,7 +1681,7 @@ export async function createWebServer(port = 3000, options = {}) {
                     // 跨预算继续: 新 Run 必须挂在同一个 Goal 下 (setGoalId), 并带上上一个 Run 的非幂等守卫
                     agent.setGoalId?.(goal.goalId);
                     agent.setContinuationGuards?.(r.guards || []);
-                    const reply = await agent.prompt(r.instruction);
+                    const reply = await deliverThroughActor(agent, () => agent.prompt(r.instruction));
                     // 注意: prompt 收尾会清空 currentRunId → 必须读 lastRunId (否则会拿上一条 run 做决策)
                     const runId = agent.getLastRunId?.() || agent.getRunId?.();
                     return { runId, status: 'done', reply: typeof reply === 'string' ? reply.slice(0, 500) : undefined };
@@ -2489,7 +2491,7 @@ export async function createWebServer(port = 3000, options = {}) {
                                     new Promise((res) => setTimeout(() => res(null), 8000)),
                                 ]);
                                 if (agent && typeof agent.promptStream === 'function') {
-                                    llm = (p) => agent.promptStream(p, () => { }, undefined, local.id);
+                                    llm = (p) => deliverThroughActor(agent, () => agent.promptStream(p, () => { }, undefined, local.id));
                                 }
                             }
                         }
@@ -2541,7 +2543,7 @@ export async function createWebServer(port = 3000, options = {}) {
                             throw new Error('无可用 agent, 跳过定时任务');
                         }
                         // 前缀 [cron] 标记后台执行来源 (供审计/日志区分人类消息与定时任务)
-                        await agent.promptStream(`[cron] ${job.name}: ${job.prompt}`, () => { }, undefined, target.id);
+                        await deliverThroughActor(agent, () => agent.promptStream(`[cron] ${job.name}: ${job.prompt}`, () => { }, undefined, target.id));
                     },
                 });
                 global.cronScheduler = cronHandle;
@@ -2593,7 +2595,7 @@ ${goalDesc}
 现在是否要主动联系其中某个智能体? 只输出一个 JSON 对象, 不要任何其他文字:
 {"initiate": true 或 false, "goalAchieved": true 或 false, "targetPeerPublicKey": "对方 pk", "targetChannelId": "对方渠道 id", "message": "你要说的话"}
 若不想发起, 输出 {"initiate": false}。`;
-                    const raw = await agent.promptStream(prompt, () => { }, undefined, local.id);
+                    const raw = await deliverThroughActor(agent, () => agent.promptStream(prompt, () => { }, undefined, local.id));
                     const m = raw.match(/\{[\s\S]*\}/);
                     if (!m)
                         return { initiate: false };
@@ -3406,7 +3408,16 @@ fetchState();
             if (!woke) {
                 // 没在等外部事件也要如实回答 (可能它其实在等人/在跑), 但允许显式加急
                 if (req.body?.force) {
-                    await setContinuation(goalId, { wakeReason: 'active', autoContinue: true, wakeAt: undefined, needsExternal: undefined });
+                    // **K4**: channel 不直接写 Goal —— 提交控制请求, 由内核控制面执行
+                    const { submitRunControl } = await import('../kernel/control.js');
+                    const outcome = await submitRunControl({
+                        kind: 'wake-goal', origin: 'web', goalId, reason: 'force 加急唤醒',
+                        payload: { wakeReason: 'active', autoContinue: true, wakeAt: undefined, needsExternal: undefined },
+                    }, { setContinuation });
+                    if (!outcome.ok) {
+                        res.status(500).json({ error: `控制面拒绝: ${outcome.detail}` });
+                        return;
+                    }
                     res.json({ ok: true, goalId, woke: false, forced: true, note: `原状态 ${g.status} (不在等外部事件), 已按 force 加急` });
                     return;
                 }
@@ -3467,12 +3478,17 @@ fetchState();
             let boundary = view.runBoundary;
             if (boundary.action === 'stop_running_run' && !boundary.stopped) {
                 const { setRunStatus } = await import('../agents/run-store.js');
+                const { submitRunControl } = await import('../kernel/control.js');
                 boundary = await seam.applyRunBoundary({
                     plan: view.plan,
                     now,
                     stop: async (i) => {
-                        const r = await setRunStatus(i.runId, i.runStatus, { error: `变更注入 (${i.goalId}): ${String(i.reason).slice(0, 120)}` });
-                        return { ok: !!r.ok, reason: r.reason || '' };
+                        // **K4**: 提交控制请求 (端口返回值里的"拒绝"会被控制面归一化成 ok=false + detail)
+                        const outcome = await submitRunControl({
+                            kind: 'set-run-status', origin: 'web', runId: i.runId, reason: `变更注入 (${i.goalId})`,
+                            payload: { status: i.runStatus, error: `变更注入 (${i.goalId}): ${String(i.reason).slice(0, 120)}` },
+                        }, { setRunStatus });
+                        return { ok: outcome.ok, reason: outcome.ok ? '' : String(outcome.detail ?? '') };
                     },
                 });
             }
@@ -3606,7 +3622,19 @@ fetchState();
                 res.status(409).json({ error: `只有 needs_human 的运行需要批准 (当前 ${run.status})` });
                 return;
             }
-            await recordRecovery(runId, { errorClass: run.errorClass || 'unknown', message: '人工批准后继续', action: 'resume' });
+            // **K4**: channel 不直接写 Run —— 提交控制请求, 由内核控制面执行 (这里只做 ports wiring)
+            const { submitRunControl } = await import('../kernel/control.js');
+            const outcome = await submitRunControl({
+                kind: 'record-recovery',
+                origin: 'web',
+                runId,
+                reason: '人工批准后继续',
+                payload: { errorClass: run.errorClass || 'unknown', message: '人工批准后继续', action: 'resume' },
+            }, { recordRecovery });
+            if (!outcome.ok) {
+                res.status(500).json({ error: `控制面拒绝: ${outcome.detail}` });
+                return;
+            }
             if (!run.channelId) {
                 res.status(400).json({ error: '该 run 没有 channelId, 请在 CLI 用 /approve' });
                 return;
@@ -3630,9 +3658,11 @@ fetchState();
             const runId = String(req.params.runId);
             try {
                 const { setRunStatus } = await import('../agents/run-store.js');
-                const r = await setRunStatus(runId, to, { error: `外部请求 (${suffix})` });
-                if (!r.ok) {
-                    res.status(409).json({ error: r.reason || '状态迁移被拒绝' });
+                const { submitRunControl } = await import('../kernel/control.js');
+                const outcome = await submitRunControl({ kind: 'set-run-status', origin: 'web', runId, reason: `外部请求 (${suffix})`, payload: { status: to, error: `外部请求 (${suffix})` } }, { setRunStatus });
+                // 语义不变: 端口/store 拒绝 ⇒ 409 (原因由控制面归一化进 detail)
+                if (!outcome.ok) {
+                    res.status(409).json({ error: String(outcome.detail ?? '状态迁移被拒绝').replace(/^端口拒绝: /, '') });
                     return;
                 }
                 res.json({ ok: true, runId, status: to, note: '运行中的 agent 会在下一轮循环检查时停下 (轮内不打断)' });
@@ -3911,7 +3941,7 @@ fetchState();
                 req.docContent ? `\n资料内容:\n${req.docContent}` : '',
                 `\n(来自 agent ${req.fromAgentId || 'unknown'})，请直接给出可交付结果。`,
             ].join('');
-            const out = await agent.prompt(task);
+            const out = await deliverThroughActor(agent, () => agent.prompt(task));
             const text = String(out || '').trim();
             if (!text || text.startsWith('❌') || text.startsWith('[AI 服务调用失败]')) {
                 return { ok: false, summary: text.slice(0, 800) || '(空结果)', error: 'execution-failed' };
@@ -5361,7 +5391,16 @@ fetchState();
                 }
                 // 2026-07-15 修 Bug 3: 拖拽附件 — attachmentContext 提到 contextHint 最前, LLM 第一眼看到文件清单
                 const markedPrompt = `${extraHint}【本轮用户请求】\n${text}\n【请求结束】\n\n${attachmentContext}${contextHint}`;
-                fullResponse = await agent.promptStream(markedPrompt, streamCallback, runState.abortController?.signal, channelId);
+                // 闭包里 TS 不再保留 null 收窄 ⇒ 先收成局部 const
+                const agentForRun = agent;
+                // **K5 步骤⑦**: 入口只交一个一次性 `ExecutionRequest` (绑定/流/取消都在请求里), Pi 侧 runExecution 统一派发
+                const request = {
+                    input: markedPrompt,
+                    channelId,
+                    signal: runState.abortController?.signal,
+                    onStream: streamCallback,
+                };
+                fullResponse = await deliverThroughActor(agentForRun, () => agentForRun.runExecution(request));
             }
             catch (err) {
                 // abort 抛错: 保留已输出的部分 (fullResponse 可能是空字符串)
@@ -5732,7 +5771,8 @@ fetchState();
             const contextHint = attachmentContext + `[系统上下文] 队列消息 (auto-drain)\n`;
             // 4) promptStream
             const markedPrompt = `【本轮用户请求】\n${text}\n【请求结束】\n\n${contextHint}`;
-            const fullResponse = await agent.promptStream(markedPrompt, () => { }, runState.abortController?.signal, channelId);
+            const agentForRun = agent;
+            const fullResponse = await deliverThroughActor(agentForRun, () => agentForRun.promptStream(markedPrompt, () => { }, runState.abortController?.signal, channelId));
             if (!fullResponse.trim()) {
                 broadcast({ type: 'error', content: '⚠️ AI 未返回内容' }, channelId);
             }
@@ -6934,7 +6974,7 @@ fetchState();
             // 2026-06-15: 同 /message 路径, 用显式 marker 包裹 userMessage, 避免 LLM 把它当背景信息
             const regenHint = await buildJudgmentHint(channel, channelId);
             const markedRegen = `${regenHint}\n\n【本轮用户请求】\n${userMessage}\n【请求结束】\n`;
-            fullResponse = await agent.promptStream(markedRegen, streamCallback, undefined, channelId);
+            fullResponse = await deliverThroughActor(agent, () => agent.promptStream(markedRegen, streamCallback, undefined, channelId));
             // 2026-07-06: 防御性兜底 — 同 /message 路径
             if (!fullResponse.trim()) {
                 fullResponse = '⚠️ AI 未返回内容, 请重试';

package/dist/web/sw.js

@@ -6,7 +6,7 @@
  * 现在: 代码类资源 (html/js/css/json) 一律 **network-first** (拿不到网才回退缓存),
  *   缓存名带版本号, activate 时清掉所有旧缓存; 图标等静态资源仍 cache-first。
  */
-const CACHE = 'bolloon-mobile-v0.5.5';
+const CACHE = 'bolloon-mobile-v0.6.0';
 const SHELL = [
   './mobile.html',
   './mobile.css',