@bolloon/bolloon-agent 0.5.5 → 0.6.1

package/dist/kernel/transport.js

@@ -0,0 +1,111 @@
+/**
+ * transport.ts — K10 ④: **通信入口端口** (与 `control.ts` / `run-lifecycle.ts` 同一套端口写法)
+ *
+ * 目标形态 (设计页): `transport → router → channel mailbox` —— 也就是说:
+ *   **上层只对"通信端口"说话, 不直接对某条传输 (hyperswarm / iroh / p2pNetwork) 说话**。
+ *   Pi 现在自己持有 3 个薄包装 (`getPeers` / `sendMessage` / `broadcast` → `p2pNetwork`),
+ *   那正是"Pi 内部通信发送逻辑"还没迁完的形状 (K10 ④)。
+ *
+ * 为什么用端口而不是直接调传输:
+ *   - 传输是可替换的 (hyperswarm / iroh / 以后的东西) ⇒ 上层不该 import 具体实现;
+ *   - 发送是**有副作用**的动作 ⇒ 要能审计 (谁发的 / 发给谁 / 成没成), 且**未注入即拒** (不静默丢弃消息);
+ *   - 与 `control.ts` / `run-lifecycle.ts` 保持同一种形状, 免得仓里出现第三种端口写法。
+ *
+ * 注: 本模块只做"入口收口", **不搬传输实现** (传输仍在 `src/network/**`); 判据见 `src/test/k10-transport-port.test.ts`。
+ */
+export const TRANSPORT_OPS = ['send', 'broadcast', 'peers'];
+/** 哪些操作必须有目标 (send 要 peerId; broadcast / peers 不需要) */
+export const TRANSPORT_NEEDS_TARGET = {
+    send: true,
+    broadcast: false,
+    peers: false,
+};
+/**
+ * 同步读对端 (K10 ④ 后半) —— 与 `submitTransport` 分开是因为**签名**而不是因为语义:
+ *   传输层是异步的, 但上层有同步调用点 (sync 签名不能凭空变 async)。
+ *   返回 `null` = 端口未注入 (调用方必须自己决定降级, 不许假装"没有对端" —— 那是两回事)。
+ */
+export function transportPeersSync(ports) {
+    if (typeof ports?.peersSync !== 'function')
+        return null;
+    return ports.peersSync();
+}
+/** 端口用 `{ok:false}` 表达拒绝的归一化 (与另外两个端口同口径) */
+function portRefusal(res) {
+    if (res && typeof res === 'object' && 'ok' in res) {
+        const r = res;
+        if (r.ok === false)
+            return `端口拒绝: ${String(r.reason ?? '(未给原因)')}`;
+    }
+    return null;
+}
+const audit = [];
+const AUDIT_MAX = 200;
+/** 审计流水 (最近 N 条; 测试与运维可读) */
+export function transportAudit() {
+    return audit;
+}
+export function resetTransportAudit() {
+    audit.length = 0;
+}
+/** 提交一次通信动作。**唯一入口** —— 校验 → 派发到 port → 记审计; 一律返回结果对象, 不抛。 */
+export async function submitTransport(req, ports) {
+    const op = req?.op;
+    const finish = (ok, detail, port, result) => {
+        audit.push({
+            at: Date.now(),
+            op,
+            origin: req?.origin ?? '(anonymous)',
+            target: String(req?.peerId ?? '(all)'),
+            ok,
+            detail,
+        });
+        if (audit.length > AUDIT_MAX)
+            audit.splice(0, audit.length - AUDIT_MAX);
+        return { ok, op, via: 'kernel-transport', detail, port, result };
+    };
+    if (!TRANSPORT_OPS.includes(op))
+        return finish(false, `未知通信动作: ${String(req?.op)}`);
+    if (!req.origin)
+        return finish(false, '缺少 origin (审计要求: 不许匿名发送)');
+    if (TRANSPORT_NEEDS_TARGET[op] && !req.peerId)
+        return finish(false, `${op} 缺少 peerId`);
+    const kind = req.kind ?? 'message';
+    const payload = req.payload ?? '';
+    if (op === 'send') {
+        if (typeof ports.send !== 'function')
+            return finish(false, 'port 未注入: send');
+        try {
+            const res = await ports.send(req.peerId, kind, payload);
+            const refusal = portRefusal(res);
+            return refusal ? finish(false, refusal, 'send', res) : finish(true, undefined, 'send', res);
+        }
+        catch (err) {
+            return finish(false, `send 失败: ${String(err?.message ?? err).slice(0, 160)}`);
+        }
+    }
+    if (op === 'broadcast') {
+        if (typeof ports.broadcast !== 'function')
+            return finish(false, 'port 未注入: broadcast');
+        try {
+            const res = await ports.broadcast(kind, payload);
+            const refusal = portRefusal(res);
+            return refusal ? finish(false, refusal, 'broadcast', res) : finish(true, undefined, 'broadcast', res);
+        }
+        catch (err) {
+            return finish(false, `broadcast 失败: ${String(err?.message ?? err).slice(0, 160)}`);
+        }
+    }
+    if (op === 'peers') {
+        if (typeof ports.peers !== 'function')
+            return finish(false, 'port 未注入: peers');
+        try {
+            const res = await ports.peers();
+            return finish(true, undefined, 'peers', res);
+        }
+        catch (err) {
+            return finish(false, `peers 失败: ${String(err?.message ?? err).slice(0, 160)}`);
+        }
+    }
+    return finish(false, `未处理的通信动作: ${String(op)}`);
+}

package/dist/llm/native-adapter.js

@@ -0,0 +1,117 @@
+import { sanitizeToolsForApi } from './tool-name.js';
+/** 可被 abort 打断的 sleep (退避用) */
+function sleep(ms, signal) {
+    return new Promise((resolve, reject) => {
+        const t = setTimeout(() => { signal?.removeEventListener?.('abort', onAbort); resolve(); }, ms);
+        const onAbort = () => { clearTimeout(t); reject(new Error('aborted during backoff')); };
+        if (signal?.aborted)
+            onAbort();
+        else
+            signal?.addEventListener?.('abort', onAbort, { once: true });
+    });
+}
+export function createNativeAdapter(cfg) {
+    const timeoutMs = cfg.timeoutMs ?? 120_000;
+    const maxRetries = cfg.maxRetries ?? 3;
+    const url = `${String(cfg.baseUrl || '').replace(/\/+$/, '')}/chat/completions`;
+    let calls = 0; // 观测: 真发出去几次 (重试也算)
+    let retries = 0;
+    const adapter = {
+        providerId: cfg.providerId ?? 'native',
+        stats: () => ({ calls, retries }),
+        async chat(context, systemPrompt, signal, tools, purpose) {
+            const messages = [
+                { role: 'system', content: String(systemPrompt ?? '') },
+                { role: 'user', content: String(context ?? '') },
+            ];
+            let attempt = 0;
+            let lastErr;
+            while (attempt <= maxRetries) {
+                const ac = new AbortController();
+                const onAbort = () => ac.abort();
+                if (signal?.aborted)
+                    ac.abort();
+                else
+                    signal?.addEventListener?.('abort', onAbort, { once: true });
+                const timer = setTimeout(() => ac.abort(), timeoutMs);
+                try {
+                    calls += 1;
+                    // ⚠️ 出程必须**净化工具名** —— 端点只接受 `^[a-zA-Z0-9_-]{1,64}$` (实测: 原样转发 183 个工具
+                    //   里第 124 个不合规 ⇒ HTTP 400, 整轮空回复)。净化会把映射登记进**全局路由表**,
+                    //   回程由 pivot 的 `resolveApiToolName` 还原 ⇒ 上下层协议不变 (这正是"适配器边界"的一部分)。
+                    const wireTools = Array.isArray(tools) && tools.length > 0 ? sanitizeToolsForApi(tools) : undefined;
+                    const res = await fetch(url, {
+                        method: 'POST',
+                        headers: { 'content-type': 'application/json', authorization: `Bearer ${cfg.apiKey}` },
+                        body: JSON.stringify({
+                            model: cfg.model,
+                            messages,
+                            ...(wireTools ? { tools: wireTools } : {}),
+                            stream: false,
+                        }),
+                        signal: ac.signal,
+                    });
+                    if (!res.ok) {
+                        const text = await res.text().catch(() => '');
+                        const retryable = res.status === 429 || res.status >= 500;
+                        if (retryable && attempt < maxRetries) {
+                            lastErr = new Error(`native-adapter HTTP ${res.status}: ${text.slice(0, 160)}`);
+                            attempt += 1;
+                            retries += 1;
+                            await sleep(1000 * 2 ** (attempt - 1), signal);
+                            continue;
+                        }
+                        // 非 429 的 4xx ⇒ **不重试** (重试无意义)。这里必须打标记: 否则下面的 catch
+                        //   会把它当"网络错"再退避重试 —— 踩过 (用例⑤: 一个 400 被发了 4 次)。
+                        const fatal = new Error(`native-adapter HTTP ${res.status}: ${text.slice(0, 200)}`);
+                        fatal.noRetry = true;
+                        throw fatal;
+                    }
+                    const data = await res.json();
+                    const msg = data?.choices?.[0]?.message ?? {};
+                    const toolCalls = Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0 ? msg.tool_calls : undefined;
+                    return {
+                        reply: String(msg.content ?? ''),
+                        tokens: data?.usage?.total_tokens,
+                        toolCalls,
+                        messages: messages.concat([{ role: 'assistant', content: String(msg.content ?? '') }]),
+                    };
+                }
+                catch (e) {
+                    // 调用方主动 abort ⇒ 原样抛出 (别当网络错去重试)
+                    if (signal?.aborted)
+                        throw e;
+                    if (e?.noRetry)
+                        throw e; // 非 429 的 4xx 等: 不重试
+                    lastErr = e;
+                    if (attempt >= maxRetries)
+                        throw e;
+                    attempt += 1;
+                    retries += 1;
+                    await sleep(1000 * 2 ** (attempt - 1), signal);
+                }
+                finally {
+                    clearTimeout(timer);
+                    signal?.removeEventListener?.('abort', onAbort);
+                }
+            }
+            throw lastErr ?? new Error('native-adapter: 不可达');
+        },
+    };
+    return adapter;
+}
+/**
+ * 从环境装配一个 native 适配器 (供 `BOLLOON_NATIVE_ADAPTER=1` 开关使用)。
+ * 缺 key ⇒ 返回 null (调用方回落到原适配器, 不假装可用)。
+ */
+export function nativeAdapterFromEnv(env = process.env) {
+    const apiKey = env.BOLLOON_NATIVE_API_KEY || env.DEEPSEEK_API_KEY || '';
+    if (!apiKey)
+        return null;
+    return createNativeAdapter({
+        baseUrl: env.BOLLOON_NATIVE_BASE_URL || 'https://api.deepseek.com/v1',
+        apiKey,
+        model: env.BOLLOON_NATIVE_MODEL || 'deepseek-chat',
+        providerId: 'native-openai-compatible',
+    });
+}

package/dist/web/bolloon-web.json

@@ -1,10 +1,10 @@
 {
   "schema": "bolloon-mobile-web/1",
-  "version": "0.5.5",
+  "version": "0.6.1",
   "channel": "stable",
   "build": "stable",
-  "commit": "02aa1a6367f30fb4d85f52c360d8cd457f852ddd",
-  "builtAt": "2026-10-01T13:11:22.558Z",
+  "commit": "18c1afa87b36043e6df5dc9ccef0417cdcf323da",
+  "builtAt": "2026-10-04T08:01:30.567Z",
   "layer": "web",
   "note": "web 资源层构建戳 (手机端 OTA 的身份第 ③ 级回退; 装机后以 OTA state.json 为准)"
 }

package/dist/web/client.js

@@ -571,12 +571,13 @@
     }
     return null;
   }
-  var SHELL_KEYWORDS, PARSE_DIAG_ON;
+  var SHELL_KEYWORDS, _parseEnv, PARSE_DIAG_ON;
   var init_parse_tool_call = __esm({
     "src/agents/parse-tool-call.ts"() {
       "use strict";
       SHELL_KEYWORDS = ["git", "npx", "npm", "tsx", "tsc", "vitest", "node", "mkdir", "touch", "ls", "echo", "cat", "head", "tail", "wc", "pwd", "date"];
-      PARSE_DIAG_ON = process.env.BOLLOON_PARSE_DIAG === "1" || process.env.BOLLOON_VERBOSE === "1";
+      _parseEnv = typeof process !== "undefined" ? process.env : void 0;
+      PARSE_DIAG_ON = !!_parseEnv && (_parseEnv.BOLLOON_PARSE_DIAG === "1" || _parseEnv.BOLLOON_VERBOSE === "1");
     }
   });
 
@@ -2886,6 +2887,11 @@ ${data.error || "channel not found"}`, "error");
   }
   var lastUsedJudgmentIds = [];
   var currentPreviewBubble = null;
+  function retirePreviewBubbles(container) {
+    if (!container) return;
+    container.querySelectorAll(".message-ai.preview").forEach((el) => el.remove());
+    currentPreviewBubble = null;
+  }
   var selfImproveCardSeq = 0;
   function getMessagesContainerForCurrent2() {
     if (currentChannelId && messagesContainers.get(currentChannelId)) {
@@ -3145,9 +3151,7 @@ ${data.error || "channel not found"}`, "error");
             addMessage2(data.content, "user", true, container);
           }
         } else if (data.type === "ai") {
-          const allPreviews = container.querySelectorAll(".message-ai.preview");
-          allPreviews.forEach((el) => el.remove());
-          currentPreviewBubble = null;
+          retirePreviewBubbles(container);
           if (!MR_hasStreamingText()) {
             addMessage2(data.content || "", "ai", true, container, lastUsedJudgmentIds || []);
           } else {
@@ -3157,8 +3161,7 @@ ${data.error || "channel not found"}`, "error");
           sendRokidText(data.content || "", { source: "ai" });
         } else if (data.type === "reply-preview") {
           const previewContent = data.content || "";
-          const oldPreviews = container.querySelectorAll(".message-ai.preview");
-          oldPreviews.forEach((el) => el.remove());
+          retirePreviewBubbles(container);
           addMessage2(previewContent, "ai", false, container, []);
           const newPreview = container.querySelector(".message-ai:not(.preview):last-of-type") || container.lastElementChild;
           if (newPreview) {
@@ -3180,6 +3183,7 @@ ${data.error || "channel not found"}`, "error");
           handleStepEvent2(data);
         } else if (data.type === "done") {
           finalizeTimelineAsMessage2();
+          retirePreviewBubbles(container);
           hideLoopStatusBar2();
           setSendMode("idle");
         } else if (data.type === "renamed") {
@@ -3193,6 +3197,7 @@ ${data.error || "channel not found"}`, "error");
           }
         } else if (data.type === "error") {
           const errContent = String(data.content || "\u672A\u77E5\u9519\u8BEF");
+          retirePreviewBubbles(container);
           addMessage2(`\u26A0\uFE0F ${errContent}`, "ai", false, container);
           if (typeof showSimpleToast === "function") {
             showSimpleToast("\u26A0\uFE0F " + errContent.slice(0, 200));

package/dist/web/routes-tasks.js

@@ -4,6 +4,7 @@
  * 从 src/web/server.ts 抽出 (~160 行).
  * 包含 /api/tasks/* (GET, POST, PATCH, DELETE, execute, execute-next)
  */
+import { deliverThroughActor } from '../kernel/channel-actor.js';
 import { loadTaskQueue, saveTaskQueue } from './server-storage.js';
 import { documentReader } from '../documents/reader.js';
 import { applyCancelRequest, shouldFinalizeAsCancelled } from './task-cancel.js';
@@ -309,7 +310,21 @@ async function executeTask(task, channelId, getAgentForChannel, broadcast) {
             case 'chat':
                 if (task.description) {
                     broadcast({ type: 'status', content: `执行任务: ${task.title}` }, channelId);
-                    result = await agent.prompt(task.description);
+                    // 闭包里 TS 不保留收窄 ⇒ 先收成局部 const
+                    const desc = task.description;
+                    const agentForRun = agent;
+                    // 2026-10-02 (K8): 走 Pi 的**唯一执行入口** `runExecution` (K5 步骤⑦ 已建), 不再由通道自己直呼 prompt
+                    if (typeof agentForRun.runExecution !== 'function') {
+                        // K8 纪律: 拿不到唯一执行入口 ⇒ **响亮失败**, 不静默回落直呼 prompt (否则收口变成纸面的)
+                        throw new Error('K8: 该 session 未提供 runExecution (唯一执行入口) ⇒ 拒绝直呼 prompt');
+                    }
+                    // 注意: 这里**显式传 channelId** —— ExecutionRequest 要求它, 且语义上本就该绑定 task 的通道。
+                    // 与旧写法 (prompt(desc), 隐式走 actor 绑定) 相比这是一处**行为差量**: 绑定从隐式变显式。
+                    // 按纪律记过"待真跑核验", **2026-10-02 已核验通过** (`src/test/k8-routes-tasks-execution.test.ts`,
+                    // 真 express + 真 HTTP + 真任务队列): ① agent 只给 runExecution (无 prompt) 也能跑通 ⇒ 活路径唯一;
+                    // ② **两半 id 一致** (解析 agent 用的 id == 绑 run 用的 id) 是自检不变量; ③ 无门时响亮失败且 prompt 调用 0 次。
+                    // 真变异: 绑成 `channelId + '-mut'` ⇒ 判红; 回落直呼 `prompt` ⇒ 判红; 还原 ⇒ 回绿无残差。
+                    result = await deliverThroughActor(agentForRun, () => agentForRun.runExecution({ input: desc, channelId }));
                 }
                 break;
             case 'read':