@bolloon/bolloon-agent 0.4.32 → 0.5.0

package/dist/agents/task/task-runner.js

@@ -17,13 +17,15 @@ import * as os from 'os';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as crypto from 'crypto';
-import { createGoal, attachRun, markCriterion, completeGoalIfEligible, readGoal, setCriteria, } from '../goal-store.js';
+import { createGoal, attachRun, markCriterion, readGoal, setCriteria, } from '../goal-store.js';
 import { startRun, recordStep, finishRun, readRun } from '../run-store.js';
 import { listTransactions, updateTransaction, setTransactionStatus } from '../x402/transaction-store.js';
 import { bridgeTransactionToRunGoal } from '../x402/goal-run-bridge.js';
 import { buyInfoAsTransaction } from '../x402/trade.js';
 import { publishInfo, listInfo } from '../x402/paid-info-store.js';
 import { planTransactionRecovery } from '../x402/payment-recovery.js';
+// 2026-09-25 (M0 接线冻结): CLI 的 Run 终止也必须过唯一责任链 (规则 ③④)
+import * as wiring from '../goal-flywheel-wiring.js';
 import { executeContractSkill, validateResourceOutput, verifyInstallFidelity, loadResourceContract } from '../x402/resource-contract.js';
 import { adviseResource } from './resource-advisor.js';
 import { resolveTaskBudget, checkPurchaseAllowed, previewPurchaseImpact } from './task-budget.js';
@@ -55,6 +57,30 @@ function faultPoint(name) {
         process.exit(97); // 模拟进程被杀
     process.kill(process.pid, 'SIGKILL');
 }
+/**
+ * 数值字段的锚点词: 字段名本身 + 常见别名 —— 只有「锚点词紧邻数字」才算, 数字不搬家。
+ * 为什么需要: 早先的实现把「任务文本里第一个数字」塞给**每一个**数值字段。任务里出现
+ * 技术符号 (如 `μ0H_P`) 时第一个数字就是那个 `0` → field_T/tc_K/factor 全被编成 0 →
+ * 技能判「输入不合格→未知」→ 输出缺 required 字段 → 托管已注资但拿不到 proof (钱卡住)。
+ * 编造数字比缺输入更糟: 宁可让 inputSchema 报「缺字段」, 也不给一个看着像真值的假数字。
+ */
+const NUMBER_ANCHORS = {
+    budgetusd: ['预算', 'budget'], budget: ['预算', 'budget'],
+    price: ['价格', '单价', 'price'], amount: ['金额', 'amount'], usd: ['美元', 'usd'],
+    count: ['数量', 'count'], qty: ['数量', 'qty'], quantity: ['数量', 'quantity'],
+    tol: ['容差', 'tol'], tolerance: ['容差', 'tolerance'],
+};
+const escapeRe = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+/** 只在任务里该字段有明确锚点 (字段名/别名 后紧跟数字) 时才取数; 取不到 = 不填, 不编 */
+function anchoredNumber(task, key) {
+    const anchors = [key, ...(NUMBER_ANCHORS[key.toLowerCase()] || [])].filter(Boolean);
+    for (const a of anchors) {
+        const m = task.match(new RegExp(`${escapeRe(a)}[^0-9\\n]{0,6}?(\\d+(?:\\.\\d+)?)`, 'i'));
+        if (m)
+            return Number(m[1]);
+    }
+    return undefined;
+}
 /** 从任务文本 + 契约 inputSchema 推导输入 (确定性; M1 不做语义抽取, 用 --input 兜底) */
 export function deriveSkillInput(contract, task) {
     const schema = contract?.inputSchema || {};
@@ -75,9 +101,9 @@ export function deriveSkillInput(contract, task) {
         const isRequired = required.includes(key);
         const type = String(p.type || 'string');
         if (type === 'number' || type === 'integer') {
-            const n = task.match(/\d+(\.\d+)?/);
-            if (n)
-                out[key] = Number(n[0]); // 任务里真有数字才填 (可选字段也不硬塞)
+            const n = anchoredNumber(task, key); // 任务里该字段有明确锚点才填 (可选字段也不硬塞)
+            if (n !== undefined)
+                out[key] = n;
             continue;
         }
         if (/market|国家|市场|地区|country|region/i.test(key)) {
@@ -294,6 +320,9 @@ export async function runTask(opts) {
     const fail = async (stage, note, cardOpts, runStatus = 'needs_human') => {
         mark(stage, note);
         await finishRun(run.runId, { status: runStatus, summary: note.slice(0, 200) });
+        // ★ 2026-09-25 (M0 接线冻结, 规则 ④): CLI 任务的每条失败出口也是 Run 的终止 →
+        //   同样过收尾漏斗 (旧写法只 finishRun, 于是这条路径上没有 Memory / Skill 候选 / 权威 continuation)。
+        await wiring.closeTaskRun(run.runId, goal.goalId, note, 'cli');
         const card = buildReportCard({ ...cardOpts, evidenceRef: { goalId: goal.goalId, runId: run.runId, transactionId: cardOpts.evidenceRef?.transactionId }, budgetLines: [...budget.why, ...(cardOpts.budgetLines || [])] });
         return { ok: false, card, text: renderReportCard(card), goalId: goal.goalId, runId: run.runId, transactionId: card.evidenceRef.transactionId, stages, budget, outputIssues: cardOpts.blocker ? [cardOpts.blocker] : [] };
     };
@@ -530,8 +559,9 @@ export async function runTask(opts) {
         summary: evidenceOk ? `任务完成: ${concl.conclusion || '已产出'}` : '未达标 (证据/契约不完整)',
         evidence: [`bridge: step=${bridge.stepWritten} evidence=${bridge.evidenceWritten} goal=${bridge.goalEvidenceWritten}`],
     });
-    if (evidenceOk)
-        await completeGoalIfEligible(goal.goalId);
+    // ★ M0 (规则 ③④): 成功出口也走同一个收尾漏斗 —— 完不完成由飞轮决策 + 完成门判,
+    //   不再在这里直接调 completeGoalIfEligible (那是一条绕过 closeRun 的旧收尾路径)。
+    await wiring.closeTaskRun(run.runId, goal.goalId, card.conclusion || card.status, 'cli');
     mark('report', card.status);
     return {
         ok: card.status === '已完成',