@bolloon/bolloon-agent 0.4.27 → 0.4.28

package/dist/agents/x402/resource-contract.js

@@ -35,7 +35,18 @@ const CAPABILITY_WORDS = ['schema_valid', 'source_declared', 'content_hash_bound
  */
 export function parseResourceContract(frontmatter, opts = {}) {
     const fm = frontmatter || {};
-    const raw = fm.resource && typeof fm.resource === 'object' ? fm.resource : fm;
+    // 手写 SKILL.md 的 `resource: {…}` 常被最小 YAML 解析器当成**字符串**留下 → 这里两种都吃。
+    // (真跑抓到过: 夹具技能因此被判"没有资源契约字段", 顾问直接看不到任何可执行资源。)
+    let resObj = fm.resource;
+    if (typeof resObj === 'string') {
+        try {
+            resObj = JSON.parse(resObj);
+        }
+        catch {
+            resObj = undefined;
+        }
+    }
+    const raw = resObj && typeof resObj === 'object' ? resObj : fm;
     const issues = [];
     const name = String(raw?.name || opts.skillName || fm.name || '').trim();
     const version = String(raw?.version || opts.skillVersion || fm.version || '').trim();

package/dist/cli-entry.js

@@ -161,6 +161,9 @@ function parseArgs() {
             return { mode: 'trace', args: args.slice(1) };
         case 'p2p':
             return { mode: 'p2p', args: args.slice(1) };
+        // 2026-09-18: M1 唯一入口 —— 一个任务 → 一个 Skill → 一个报告卡
+        case 'task':
+            return { mode: 'task', args: args.slice(1) };
         // 2026-09-13: 初始化向导 (用户身份 + 模型供应商 + API key)
         case 'setup':
         case 'init':
@@ -332,6 +335,93 @@ async function handleUpdateCommand(updateArgs) {
  *   无参 → 列出最近几次运行 + 每步摘要;  带 runId → 输出完整轨迹 (文本或 JSON)。
  *   文本格式与小工具/别的智能体对齐, 可直接复制粘贴交换。
  */
+/**
+ * `bolloon task "<任务>" --budget 0.05 [--input '<json>'] [--json]`
+ * `bolloon task --resume <goalId>`
+ *
+ * M1 唯一入口 (leo 2026-09-18 冻结规则 ①): 用户只给任务和预算,
+ * 不点名 Skill、不看内部状态。进度只报 4 个用户态, 结论在报告卡里。
+ */
+async function handleTaskCommand(taskArgs) {
+    const { runTask, resumeTask } = await import('./agents/task/task-runner.js');
+    const wantJson = taskArgs.includes('--json');
+    const flag = (name) => {
+        const i = taskArgs.indexOf(name);
+        return i >= 0 ? taskArgs[i + 1] : undefined;
+    };
+    const resumeId = flag('--resume');
+    const budget = flag('--budget');
+    const perPurchase = flag('--per-purchase');
+    const daily = flag('--daily');
+    const inputRaw = flag('--input');
+    let input;
+    if (inputRaw !== undefined) {
+        try {
+            input = JSON.parse(inputRaw);
+        }
+        catch (e) {
+            console.error(`${MAGENTA}--input 不是合法 JSON: ${String(e?.message || e)}${RESET}`);
+            process.exit(1);
+        }
+    }
+    const STAGE_LABEL = { prepare: '准备中', acquire: '正在获取能力', execute: '正在执行', report: '报告' };
+    const onStage = (stage, note) => {
+        if (wantJson)
+            return;
+        console.error(`  ${CYAN}${STAGE_LABEL[stage] || stage}${RESET} ${note}`);
+    };
+    if (resumeId) {
+        const r = await resumeTask({ goalId: resumeId, input, allowLocalDev: true });
+        if (wantJson)
+            console.log(JSON.stringify({ resumed: r.resumed, action: r.action, reason: r.reason, mustNotRepay: r.mustNotRepay, card: r.card }, null, 2));
+        else {
+            console.log('');
+            console.log(r.text);
+            console.log('');
+        }
+        process.exit(r.ok ? 0 : 1);
+    }
+    const words = taskArgs.filter((a, i) => {
+        if (a.startsWith('--'))
+            return false;
+        const prev = taskArgs[i - 1];
+        return !['--budget', '--per-purchase', '--daily', '--input'].includes(prev || '');
+    });
+    const task = words.join(' ').trim();
+    if (!task) {
+        console.log(`
+${BOLD}bolloon task${RESET} — 给一个任务, 让智能体买到能力并做完它
+
+${CYAN}bolloon task "判断这款厨房用品是否适合进入日本市场" --budget 0.05${RESET}
+${CYAN}bolloon task --resume <goalId>${RESET}
+
+选项:
+  --budget <USDC>        这笔任务最多花多少 (M1 硬上限 0.05; 不能中途扩大)
+  --per-purchase <USDC>  单次购买上限 (M1 硬上限 0.02)
+  --daily <USDC>         当日预算 (M1 硬上限 0.10)
+  --input '<json>'       显式给技能输入 (跳过自动推导)
+  --json                 机器可读输出
+`);
+        return;
+    }
+    const r = await runTask({ task, budget, perPurchase, daily, input, allowLocalDev: true, onStage });
+    if (wantJson) {
+        console.log(JSON.stringify({
+            ok: r.ok, status: r.card.status, conclusion: r.card.conclusion, card: r.card,
+            goalId: r.goalId, runId: r.runId, transactionId: r.transactionId,
+            advisor: r.advisor, payment: r.payment, outputIssues: r.outputIssues,
+            budget: { taskBudget: r.budget.taskBudget, perPurchase: r.budget.perPurchase, daily: r.budget.daily, clamped: r.budget.clamped },
+            stages: r.stages,
+        }, null, 2));
+    }
+    else {
+        console.log('');
+        console.log(r.text);
+        console.log('');
+    }
+    // 一次性命令: 显式收尾 (DIAP/HTTP 句柄不该吊住进程)
+    process.exit(r.ok ? 0 : 1);
+}
 async function handleTraceCommand(traceArgs) {
     const { listRuns, readRun } = await import('./agents/run-store.js');
     const { runToTraceText, runToTraceJson, summarizeTrace } = await import('./agents/trace-export.js');
@@ -677,6 +767,10 @@ async function main() {
         case 'p2p':
             await handleP2pCommand(args);
             break;
+        // 2026-09-18: M1 任务闭环 (bolloon task "<任务>" --budget 0.05 / --resume <goalId>)
+        case 'task':
+            await handleTaskCommand(args);
+            break;
         // 2026-09-13: bolloon setup — 首次运行初始化向导
         case 'setup':
             await handleSetupCommand(args);

package/package.json

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