@bolloon/bolloon-agent 0.2.3 → 0.2.4

package/bin/bolloon-cli.cjs

@@ -29,11 +29,22 @@ function getMainEntry() {
   const binPath = require.main.filename; // /tmp/node_modules/.bin/bolloon
   const binDir = path.dirname(binPath); // /tmp/node_modules/.bin
   const packageDir = path.dirname(binDir); // /tmp/node_modules/@bolloon/bolloon-agent
-  const distIndex = path.join(packageDir, "dist", "index.js");
-  if (fs.existsSync(distIndex)) {
-    return distIndex;
+  // 优先用 package.json 'main' 字段 (v0.2.3+ 指向 dist/cli-entry.js).
+  // 真实 npm 安装用户拿到的是编译后的 dist, 不该再依赖 tsx.
+  const pkgJsonPath = path.join(packageDir, "package.json");
+  if (fs.existsSync(pkgJsonPath)) {
+    try {
+      const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+      if (pkg.main) {
+        const mainPath = path.join(packageDir, pkg.main);
+        if (fs.existsSync(mainPath)) return mainPath;
+      }
+    } catch {}
   }
-  // fallback to src (for development)
+  // fallback: 兼容老版本 (dist/index.js 是之前默认)
+  const distIndex = path.join(packageDir, "dist", "index.js");
+  if (fs.existsSync(distIndex)) return distIndex;
+  // 最后才 fallback 到 src (开发环境)
   return path.join(packageDir, "src", "index.ts");
 }
 

package/dist/agents/pi-sdk.js

@@ -34,6 +34,7 @@ import { ReactHarness } from '../security/react-harness.js';
 import { parseToolCall as parseToolCallImpl, isFinalResponse as isFinalResponseImpl, extractFinalAnswer as extractFinalAnswerImpl } from './parse-tool-call.js';
 import { sessionStore as defaultSessionStore } from './session-store.js';
 import { ToolRegistry } from './tool-registry.js';
+import { decideMaxIterations, decideContextOverflow, shouldCompactBeforeIteration } from './react-loop.js';
 const SHARED_SESSION_PATH = path.join(process.env.HOME || '/tmp', '.bolloon', 'sessions');
 const PERSONA_PATH = path.join(process.env.HOME || '/tmp', '.bolloon', 'persona.json');
 export class PiSessionManager {
@@ -2187,10 +2188,12 @@ ${this.getToolDefinitions()}
         while (iteration < this.MAX_REACT_ITERATIONS) {
             iteration++;
             // 停止条件 1: max turns (fail-safe 10000, 正常任务永远跑不到)
-            if (iteration >= this.MAX_REACT_ITERATIONS) {
+            //   2026-07-01 (v0.2.4 子任务 1): 委托给 react-loop.decideMaxIterations 纯函数
+            const maxIterDecision = decideMaxIterations(iteration, this.MAX_REACT_ITERATIONS);
+            if (maxIterDecision.shouldExit) {
                 console.warn(`[PiAgent] 达到最大循环数 ${this.MAX_REACT_ITERATIONS}, 强制终止 (fail-safe)`);
                 onStream?.({ type: 'error', content: `⏹️ 达到最大循环数 (${this.MAX_REACT_ITERATIONS}, fail-safe)`, tool: 'loop' });
-                finalResponse = finalResponse || '(本轮 ReAct 循环达到最大步数, 强制结束)';
+                finalResponse = finalResponse || maxIterDecision.finalAnswer;
                 break;
             }
             // 停止条件 2: signal.aborted (显式 abort / 用户中断)
@@ -2217,9 +2220,10 @@ ${this.getToolDefinitions()}
             }
             // 2026-06-16 新增: loop 内自动压缩 — token 超 80% 阈值时跑一次
             // compact 失败走 C 路径: 不强行 break, 让现有 60K 阈值兜底 (后面有检查)
+            //   2026-07-01 (v0.2.4 子任务 1): 触发判定走 shouldCompactBeforeIteration 纯函数
             const compactThreshold = this.MAX_OUTPUT_TOKEN_ESCALATION_THRESHOLD * this.LOOP_COMPACT_RATIO;
             const estimatedTokensBefore = this.estimateHistoryTokens();
-            if (estimatedTokensBefore > compactThreshold) {
+            if (shouldCompactBeforeIteration(estimatedTokensBefore, compactThreshold)) {
                 const tokensBeforeCompact = estimatedTokensBefore;
                 console.log(`[PiAgent] loop 入口 token ${tokensBeforeCompact} > ${compactThreshold}, 触发自动压缩`);
                 onStream?.({ type: 'status', content: `🗜️ loop 自动压缩 (token ${tokensBeforeCompact} > ${compactThreshold})`, tool: 'compactor' });
@@ -2232,11 +2236,13 @@ ${this.getToolDefinitions()}
                 }
             }
             // 停止条件 3: context overflow (compact 后还超, 强制终止)
+            //   2026-07-01 (v0.2.4 子任务 1): 委托给 react-loop.decideContextOverflow 纯函数
             const estimatedTokens = this.estimateHistoryTokens();
-            if (estimatedTokens > this.MAX_OUTPUT_TOKEN_ESCALATION_THRESHOLD) {
+            const overflowDecision = decideContextOverflow(estimatedTokens, this.MAX_OUTPUT_TOKEN_ESCALATION_THRESHOLD);
+            if (overflowDecision.shouldExit) {
                 console.warn(`[PiAgent] context overflow (${estimatedTokens} tokens > ${this.MAX_OUTPUT_TOKEN_ESCALATION_THRESHOLD})`);
                 onStream?.({ type: 'error', content: `⏹️ 上下文溢出 (${estimatedTokens} tokens, 阈值 ${this.MAX_OUTPUT_TOKEN_ESCALATION_THRESHOLD})`, tool: 'loop' });
-                finalResponse = finalResponse || '(本轮 ReAct 循环因上下文溢出终止)';
+                finalResponse = finalResponse || overflowDecision.finalAnswer;
                 break;
             }
             // 调试日志：显示每次循环开始

package/dist/agents/react-loop.js

@@ -78,6 +78,40 @@ export function extractFinalText(reply, marker = '<final gen>') {
 export function shouldForceExit(totalErrors, maxTotalErrors) {
     return totalErrors >= maxTotalErrors;
 }
+/**
+ * 2026-07-01 (v0.2.4 子任务 1): 迭代上限判定 — 纯函数.
+ * 之前 runReActLoop 在循环顶部硬编码 `if (iteration >= MAX_REACT_ITERATIONS)`,
+ * 抽出后 claude code 可独立单测 + 替代.
+ */
+export function decideMaxIterations(iteration, maxIterations) {
+    return {
+        shouldExit: iteration >= maxIterations,
+        finalAnswer: iteration >= maxIterations
+            ? '(本轮 ReAct 循环达到最大步数, 强制结束)'
+            : '',
+    };
+}
+/**
+ * 2026-07-01 (v0.2.4 子任务 1): context overflow 判定 — 纯函数.
+ * 之前 runReActLoop 紧接 decideMaxIterations 之后硬编码 token 阈值检查.
+ * 抽出后行为一致 + 可测.
+ */
+export function decideContextOverflow(estimatedTokens, threshold) {
+    return {
+        shouldExit: estimatedTokens > threshold,
+        finalAnswer: estimatedTokens > threshold
+            ? `(本轮 ReAct 循环因上下文溢出终止)`
+            : '',
+    };
+}
+/**
+ * 2026-07-01 (v0.2.4 子任务 1): compact 触发判定 — 纯函数.
+ * 之前 runReActLoop 入口处: estimatedTokens > compactThreshold → 跑 maybeAutoCompact.
+ * 抽出纯函数后, claude code 能 dry-run "token X 时该 compact 吗".
+ */
+export function shouldCompactBeforeIteration(estimatedTokens, compactThreshold) {
+    return estimatedTokens > compactThreshold;
+}
 /**
  * 同一工具连续失败 N 次, 提示 LLM 不要再用同一个工具 (force final).
  */

package/dist/web/server.js

@@ -1480,8 +1480,11 @@ export async function createWebServer(port = 3000, options = {}) {
         runState.running = true;
         runState.abortController = new AbortController();
         broadcastQueueUpdate(channelId);
+        // 2026-07-01 (v0.2.5): hoist sessionKey 到 try 外, 让 finally 块的 saveCurrentSession 能用
+        const sessionKey = `${channelId}:${currentSessionId}`;
+        let agent = null;
         try {
-            const agent = await getAgentForChannel(channelId, realChannelDid, realChannelName, realChannelDidDoc);
+            agent = await getAgentForChannel(channelId, realChannelDid, realChannelName, realChannelDidDoc);
             let fullResponse = '';
             // P0.5: 注入门回传的 usedIds, 落 session message metadata, UI 可查
             let usedJudgmentIds = [];
@@ -1816,6 +1819,18 @@ export async function createWebServer(port = 3000, options = {}) {
             runState.running = false;
             runState.abortController = null;
             broadcastQueueUpdate(channelId);
+            // 2026-07-01 (v0.2.5): 持久化当前 messageHistory — 让 web 用户跨刷新保留对话.
+            //   saveCurrentSession 失败静默, 不阻塞 channel 状态清理.
+            //   saveCurrentSession 内部走 SessionStore (默认 ~/.bolloon/sessions/cache/<sessionKey>.json).
+            //   agent 可能在 try 抛错后仍为 null (getAgentForChannel 失败), null-guard 跳过 save.
+            if (agent) {
+                try {
+                    await agent.saveCurrentSession(sessionKey);
+                }
+                catch (saveErr) {
+                    console.warn(`[web] saveCurrentSession failed (non-fatal): ${saveErr?.message?.slice(0, 100)}`);
+                }
+            }
         }
     });
     // ---------- 频道元数据后台修复队列 ----------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "type": "module",
   "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli-entry.js",