u1s1-cli 0.17.0 → 0.18.0

package/dist/agent-setup.js

@@ -332,6 +332,8 @@ If it is a fit:
    - \`subagent(task)\` or \`subagent({ task, model })\` — runs one sub-agent, resolves to its final output text
    - \`parallel([() => ..., ...])\` — concurrent fan-out; each thunk's error becomes \`null\`; barrier semantics
    - \`pipeline(items, [stage1, stage2, ...])\` — each item flows through all stages independently (prefer over parallel)
+   - \`judge(question)\` — cheap tool-free model call returning true/false; use for loop-until-done checks
+   - \`subagent({ task, worktree: true })\` — run in an isolated temp git worktree (auto-cleaned) when tasks would write conflicting files
    - \`log(...)\`, \`setTimeout/clearTimeout\`, standard JS builtins (Promise/JSON/Math/...)
    - NO require/import/process/fetch/fs access — the static validator rejects scripts that try
 2. Every task string must be fully self-contained: which files to read/write, what "done" means, how to self-verify.

package/dist/subagent.d.ts

@@ -15,10 +15,20 @@ export interface SubagentOptions {
     model?: string;
     timeoutMs?: number;
     signal?: AbortSignal;
+    /** 禁用全部工具(纯文本推理,判分等廉价场景用)。 */
+    noTools?: boolean;
+    /** 子 agent 的工作目录(git worktree 隔离等场景);缺省继承主进程 cwd。 */
+    cwd?: string;
+}
+/** 单个子 agent 的 token/费用用量(汇总自会话内全部 assistant 消息)。 */
+export interface SubagentUsage {
+    totalTokens: number;
+    costUsd: number;
 }
 export interface SubagentOutcome {
     ok: boolean;
     text: string;
+    usage: SubagentUsage;
 }
 /**
  * Spawn 一个独立上下文的子 agent 执行任务,返回其最终文本输出。

package/dist/subagent.js

@@ -1,4 +1,4 @@
-import { createAgentSession, ModelRuntime, SessionManager, } from "@earendil-works/pi-coding-agent";
+import { createAgentSession, DefaultResourceLoader, getAgentDir, ModelRuntime, SessionManager, } from "@earendil-works/pi-coding-agent";
 // ---- 子 agent spawn 基础设施:spawn_subagent 工具与 workflow runner 共用 ----
 /** 同时在跑的子 agent 上限;超额排队,防止打爆网关。 */
 export const SUBAGENT_CONCURRENCY = 4;
@@ -22,6 +22,36 @@ function extractFinalText(messages) {
     }
     return "(子 agent 结束但没有文本输出)";
 }
+/**
+ * 汇总会话内全部 assistant 消息的 token 与费用。
+ * pi-ai 对自定义 provider(models.json)不算钱(usage.cost.total 恒 0),
+ * 所以优先用自带费用,否则按模型价率(美元/百万 token)自算。
+ */
+function extractUsage(messages, model) {
+    let totalTokens = 0;
+    let costUsd = 0;
+    const rates = model?.cost;
+    for (const m of messages) {
+        const msg = m;
+        const usage = msg?.usage;
+        if (!usage || msg.role !== "assistant")
+            continue;
+        totalTokens += usage.totalTokens ?? 0;
+        const reported = usage.cost?.total ?? 0;
+        if (reported > 0) {
+            costUsd += reported;
+        }
+        else if (rates) {
+            costUsd +=
+                ((usage.input ?? 0) * rates.input +
+                    (usage.output ?? 0) * rates.output +
+                    (usage.cacheRead ?? 0) * rates.cacheRead +
+                    (usage.cacheWrite ?? 0) * rates.cacheWrite) /
+                    1_000_000;
+        }
+    }
+    return { totalTokens, costUsd };
+}
 /**
  * Spawn 一个独立上下文的子 agent 执行任务,返回其最终文本输出。
  * 模型解析:"provider/id" 精确匹配;裸 id(如 deepseek-v4-flash)先按原样找,
@@ -48,10 +78,25 @@ export async function runSubagent(opts) {
     else {
         model = undefined;
     }
+    // 子会话不加载精简 UI 扩展:它用 process.cwd() 重建内置工具,会破坏自定义
+    // cwd(worktree 隔离)下的路径解析;且 UI 美化对无界面的子 agent 毫无意义
+    const loader = new DefaultResourceLoader({
+        agentDir: getAgentDir(),
+        cwd: opts.cwd ?? process.cwd(),
+        extensionsOverride: (base) => ({
+            ...base,
+            extensions: base.extensions.filter((e) => !JSON.stringify(e).includes("u1s1-compact-ui")),
+        }),
+    });
+    await loader.reload();
     const { session } = await createAgentSession({
-        sessionManager: SessionManager.inMemory(process.cwd()),
+        // cwd 必须同时传给顶层(工具的路径解析基于它)和 sessionManager
+        ...(opts.cwd ? { cwd: opts.cwd } : {}),
+        resourceLoader: loader,
+        sessionManager: SessionManager.inMemory(opts.cwd ?? process.cwd()),
         modelRuntime: sharedModelRuntime,
         ...(model ? { model } : {}),
+        ...(opts.noTools ? { noTools: "all" } : {}),
     });
     const timeoutMs = opts.timeoutMs ?? SUBAGENT_TIMEOUT_MS;
     const timer = setTimeout(() => void session.abort(), timeoutMs);
@@ -67,7 +112,8 @@ export async function runSubagent(opts) {
     }
     if (opts.signal?.aborted)
         throw new Error("已取消");
-    return { ok: true, text: extractFinalText(session.messages) };
+    const messages = session.messages;
+    return { ok: true, text: extractFinalText(messages), usage: extractUsage(messages, model) };
 }
 /**
  * 固定并发的工作池:limit 个工人依次领任务跑完一个补位一个。

package/dist/tools.js

@@ -213,7 +213,7 @@ export function createSubagentTool(getParentModel) {
             const outcomes = new Array(list.length);
             try {
                 await runPool(list, SUBAGENT_CONCURRENCY, async (task, i) => {
-                    outcomes[i] = await runSubagent({ task, parentModel, model: params.model, timeoutMs, signal }).catch((e) => ({ ok: false, text: e.message }));
+                    outcomes[i] = await runSubagent({ task, parentModel, model: params.model, timeoutMs, signal }).catch((e) => ({ ok: false, text: e.message, usage: { totalTokens: 0, costUsd: 0 } }));
                 }, signal);
             }
             finally {

package/dist/web.js

@@ -2,7 +2,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { mkdirSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
-import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, writeWebToolsExtension, } from "./agent-setup.js";
+import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureWorkflowPromptTemplate, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, writeWebToolsExtension, } from "./agent-setup.js";
 import { agentDir, apiModelToDef, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
 import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
@@ -47,6 +47,8 @@ export async function prepareWebEnv(cfg) {
     }
     await endpointsReady;
     ensureBrandPrompt(await shellReady);
+    // /workflow 提示词模板与 TUI 同源,web/桌面版也要有
+    ensureWorkflowPromptTemplate();
     ensureProviderModels(cfg);
     // pi-web-ui 靠 auth.json 判断「已配置」,否则网页会弹 pi 安装引导
     ensureAuthCredential();

package/dist/workflow/runner.d.ts

@@ -1,6 +1,8 @@
 import { type ParentModelRef } from "../subagent.js";
 /** 整个 run 的默认墙钟上限。 */
 export declare const WORKFLOW_TIMEOUT_MS: number;
+/** 默认整个 run 的 token 预算;0 或负数表示不设限。 */
+export declare const WORKFLOW_DEFAULT_BUDGET_TOKENS = 20000000;
 /** 静态白名单校验:语法能编译 + 不碰沙箱之外的任何能力。 */
 export declare function validateScript(code: string): string[];
 export interface WorkflowRunResult {
@@ -15,6 +17,15 @@ export interface WorkflowRunResult {
         aborted: boolean;
     };
 }
+export interface WorkflowProgress {
+    spawns: number;
+    ok: number;
+    failed: number;
+    cached: number;
+    running: number;
+    spentTokens: number;
+    budgetTokens: number;
+}
 export interface WorkflowRunOptions {
     /** 脚本源码(调用方负责落盘)。 */
     code: string;
@@ -24,6 +35,10 @@ export interface WorkflowRunOptions {
     parentModel: ParentModelRef;
     signal?: AbortSignal;
     timeoutMs?: number;
+    /** 整个 run 的 token 上限;缺省 WORKFLOW_DEFAULT_BUDGET_TOKENS,<=0 不限。 */
+    budgetTokens?: number;
+    /** 每次子任务状态变化时回调(工具层节流后转成流式进度)。 */
+    onProgress?: (p: WorkflowProgress) => void;
 }
 /** 执行一个 workflow 脚本,返回给主对话的报告。不抛错——失败也进报告让模型自行修复。 */
 export declare function runWorkflow(opts: WorkflowRunOptions): Promise<WorkflowRunResult>;

package/dist/workflow/runner.js

@@ -1,5 +1,6 @@
 import { createHash } from "node:crypto";
-import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import vm from "node:vm";
 import { dirname, resolve } from "node:path";
 import { runPool, runSubagent, SUBAGENT_CONCURRENCY } from "../subagent.js";
@@ -11,6 +12,8 @@ export const WORKFLOW_TIMEOUT_MS = 30 * 60_000;
 const PER_TASK_TIMEOUT_MS = 15 * 60_000;
 /** 报告里最多保留多少行脚本 log 输出。 */
 const MAX_LOG_LINES = 60;
+/** 默认整个 run 的 token 预算;0 或负数表示不设限。 */
+export const WORKFLOW_DEFAULT_BUDGET_TOKENS = 20_000_000;
 /** JSONL 进度存档:一行一个已完成的子任务,断点续跑时按 key 跳过。 */
 class ProgressStore {
     path;
@@ -108,7 +111,36 @@ export async function runWorkflow(opts) {
         internal.abort(new Error(`整个工作流超时(${Math.round((opts.timeoutMs ?? WORKFLOW_TIMEOUT_MS) / 60_000)} 分钟)`));
     }, opts.timeoutMs ?? WORKFLOW_TIMEOUT_MS);
     const store = new ProgressStore(opts.progressPath);
-    /** 注入沙箱的 subagent():字符串或 {task, model} 都行,返回最终输出文本。 */
+    const budgetTokens = opts.budgetTokens ?? WORKFLOW_DEFAULT_BUDGET_TOKENS;
+    let spentTokens = 0;
+    let running = 0;
+    const progress = { spawns: 0, ok: 0, failed: 0, cached: 0, running: 0, spentTokens: 0, budgetTokens };
+    const reportProgress = () => {
+        progress.spentTokens = spentTokens;
+        opts.onProgress?.({ ...progress });
+    };
+    /** git worktree 隔离:在 .u1s1/worktrees/ 下建临时工作树,返回其路径。 */
+    let worktreeSeq = 0;
+    function createTempWorktree() {
+        const dir = resolve(workflowsDir(), "../../.u1s1-worktrees", `wf-${Date.now()}-${++worktreeSeq}`);
+        execFileSync("git", ["worktree", "add", "--detach", dir], { stdio: "pipe" });
+        return dir;
+    }
+    function removeWorktree(dir) {
+        try {
+            execFileSync("git", ["worktree", "remove", "--force", dir], { stdio: "pipe" });
+        }
+        catch {
+            rmSync(dir, { recursive: true, force: true });
+            try {
+                execFileSync("git", ["worktree", "prune"], { stdio: "pipe" });
+            }
+            catch {
+                // 尽力清理即可
+            }
+        }
+    }
+    /** 注入沙箱的 subagent():字符串或 {task, model, worktree} 都行,返回最终输出文本。 */
     async function subagentImpl(input) {
         const o = typeof input === "string" ? { task: input } : (input ?? {});
         const task = typeof o.task === "string" ? o.task.trim() : "";
@@ -117,18 +149,30 @@ export async function runWorkflow(opts) {
         const model = typeof o.model === "string" && o.model ? o.model : undefined;
         if (internal.signal.aborted)
             throw new Error("工作流已中止,不再派发新子任务");
+        if (budgetTokens > 0 && spentTokens >= budgetTokens) {
+            throw new Error(`token 预算已用尽(已用 ${spentTokens.toLocaleString()} / 上限 ${budgetTokens.toLocaleString()}),不再派发新子任务`);
+        }
         const key = taskKey(task, model);
         if (opts.resume) {
             const prev = store.get(key);
             if (prev) {
                 stats.cached++;
+                progress.cached = stats.cached;
+                reportProgress();
                 if (prev.ok)
                     return prev.text;
                 throw new Error(prev.text);
             }
         }
         stats.spawns++;
+        progress.spawns = stats.spawns;
+        running++;
+        progress.running = running;
+        reportProgress();
         const t0 = Date.now();
+        let worktreeDir;
+        if (o.worktree === true)
+            worktreeDir = createTempWorktree();
         try {
             const out = await runSubagent({
                 task,
@@ -136,17 +180,42 @@ export async function runWorkflow(opts) {
                 parentModel: opts.parentModel,
                 timeoutMs: PER_TASK_TIMEOUT_MS,
                 signal: internal.signal,
+                cwd: worktreeDir,
+                noTools: o.noTools === true,
             });
             stats.ok++;
+            progress.ok = stats.ok;
+            spentTokens += out.usage.totalTokens;
             store.append({ key, task: task.slice(0, 120), ok: true, text: out.text, ms: Date.now() - t0 });
             return out.text;
         }
         catch (e) {
             stats.failed++;
+            progress.failed = stats.failed;
             const msg = e.message || "未知错误";
             store.append({ key, task: task.slice(0, 120), ok: false, text: msg, ms: Date.now() - t0 });
             throw new Error(msg);
         }
+        finally {
+            if (worktreeDir)
+                removeWorktree(worktreeDir);
+            running--;
+            progress.running = running;
+            reportProgress();
+        }
+    }
+    /** 注入沙箱的 judge():廉价无工具模型调用,严格回答 PASS/FAIL,转成布尔。 */
+    async function judgeImpl(question) {
+        if (typeof question !== "string" || !question.trim())
+            throw new Error("judge() 需要问题字符串");
+        const answer = await subagentImpl({
+            task: `回答以下判定问题。只允许回答一个词:PASS 或 FAIL,不要任何其他内容。\n\n判定问题:${question.trim()}`,
+            noTools: true,
+        });
+        const pass = /\bPASS\b/i.test(answer) && !/\bFAIL\b/i.test(answer);
+        if (!pass && !/\bFAIL\b/i.test(answer))
+            logs.push(`⚠ judge 回答无法解析,按 FAIL 处理:${answer.slice(0, 120)}`);
+        return pass;
     }
     /** barrier 扇出:全部并发(封顶排队),单个失败该项为 null,不拖垮整批。 */
     async function parallel(thunks) {
@@ -201,6 +270,7 @@ export async function runWorkflow(opts) {
         subagent: subagentImpl,
         parallel,
         pipeline,
+        judge: judgeImpl,
         log: pushLog,
         console: { log: pushLog, info: pushLog, warn: pushLog, error: pushLog },
         setTimeout: (fn, ms) => setTimeout(fn, Math.max(0, Math.min(Number(ms) || 0, 120_000))),
@@ -223,8 +293,9 @@ export async function runWorkflow(opts) {
     }
     const seconds = Math.round((Date.now() - started) / 1000);
     const aborted = internal.signal.aborted;
-    const details = { ...stats, seconds, aborted };
-    const lines = [`工作流结束,用时 ${seconds}s · 子任务 ✓${stats.ok} ✗${stats.failed}${stats.cached ? ` · 续跑命中 ${stats.cached}` : ""}${timedOut ? " · ⏱ 整体超时" : ""}${aborted && !timedOut ? " · 已中止" : ""}`, ""];
+    const budgetExhausted = budgetTokens > 0 && spentTokens >= budgetTokens;
+    const details = { ...stats, seconds, aborted, spentTokens, budgetExhausted };
+    const lines = [`工作流结束,用时 ${seconds}s · 子任务 ✓${stats.ok} ✗${stats.failed}${stats.cached ? ` · 续跑命中 ${stats.cached}` : ""} · 用 ${spentTokens.toLocaleString()} tokens${budgetTokens > 0 ? ` / 预算 ${budgetTokens.toLocaleString()}` : " (不限)"}${timedOut ? " · ⏱ 整体超时" : ""}${aborted && !timedOut ? " · 已中止" : ""}`, ""];
     if (completionValue !== undefined) {
         let shown;
         try {

package/dist/workflow/tool.d.ts

@@ -9,4 +9,5 @@ export declare function createRunWorkflowTool(getParentModel: () => ParentModelR
     script_path: Type.TOptional<Type.TString>;
     resume: Type.TOptional<Type.TBoolean>;
     timeout_minutes: Type.TOptional<Type.TNumber>;
+    budget_tokens: Type.TOptional<Type.TNumber>;
 }>, unknown, any> & import("@earendil-works/pi-coding-agent").ToolDefinition<any, any, any>;

package/dist/workflow/tool.js

@@ -4,7 +4,7 @@ import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import { compactResultRender, truncate } from "../tools.js";
-import { runWorkflow, saveWorkflowScript, validateScript, workflowsDir, WORKFLOW_TIMEOUT_MS, } from "./runner.js";
+import { runWorkflow, saveWorkflowScript, validateScript, workflowsDir, WORKFLOW_DEFAULT_BUDGET_TOKENS, WORKFLOW_TIMEOUT_MS, } from "./runner.js";
 /**
  * run_workflow 工具:主 agent 把模型生成的编排脚本交给 WorkflowRunner 执行。
  * 脚本在 vm 沙箱里跑,只能用注入的 subagent/parallel/pipeline 原语。
@@ -38,6 +38,11 @@ export function createRunWorkflowTool(getParentModel) {
                 minimum: 1,
                 maximum: 180,
             })),
+            budget_tokens: Type.Optional(Type.Number({
+                description: `Total token ceiling for the whole run across all sub-agents (default ${WORKFLOW_DEFAULT_BUDGET_TOKENS}). Once exceeded, no new sub-agents are spawned; running ones finish. Use 0 for unlimited.`,
+                minimum: 0,
+                maximum: 1_000_000_000,
+            })),
         }),
         // 精简展示与 spawn_subagent 同款:收起一行摘要,ctrl+o 展开报告
         renderShell: "self",
@@ -53,7 +58,7 @@ export function createRunWorkflowTool(getParentModel) {
                 : "🧭 工作流";
             return compactResultRender(result, options, theme, context, summary);
         },
-        async execute(_toolCallId, params, signal) {
+        async execute(_toolCallId, params, signal, onUpdate) {
             let code = params.script?.trim();
             let scriptPath;
             if (code) {
@@ -76,6 +81,25 @@ export function createRunWorkflowTool(getParentModel) {
                 throw new Error("script 和 script_path 至少填一个");
             }
             const progressPath = scriptPath.replace(/\.mjs$/, ".progress.jsonl");
+            // 流式进度:onProgress 高频触发,节流到 ≥2s 一次才推给 TUI
+            let lastPush = 0;
+            const onProgress = onUpdate
+                ? (p) => {
+                    const now = Date.now();
+                    if (now - lastPush < 2_000)
+                        return;
+                    lastPush = now;
+                    onUpdate({
+                        content: [
+                            {
+                                type: "text",
+                                text: `🧭 子任务 ✓${p.ok} ✗${p.failed}${p.cached ? ` 缓存${p.cached}` : ""} · 在跑 ${p.running} · ${(p.spentTokens / 1000).toFixed(0)}k${p.budgetTokens > 0 ? ` / ${(p.budgetTokens / 1000).toFixed(0)}k tokens` : ""}`,
+                            },
+                        ],
+                        details: p,
+                    });
+                }
+                : undefined;
             const result = await runWorkflow({
                 code: code ?? "",
                 progressPath,
@@ -83,6 +107,8 @@ export function createRunWorkflowTool(getParentModel) {
                 parentModel: getParentModel(),
                 signal,
                 timeoutMs: Math.min(180, params.timeout_minutes ?? WORKFLOW_TIMEOUT_MS / 60_000) * 60_000,
+                budgetTokens: params.budget_tokens,
+                onProgress,
             });
             return {
                 content: [{ type: "text", text: truncate(result.report) }],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {