@nowcrew/daemon 0.6.98-beta.6 → 0.6.98-beta.7

package/README.md

@@ -68,10 +68,15 @@ on stderr and the final result on stdout. On Windows shells that block npm.ps1/n
 the package entry; the setup arguments and workflow are unchanged.
 
 Deployment requires `CREW_PUBLIC_URL` (or `CREW_SERVER_URL`) and
-`CREW_COMPUTER_TOKEN_SETUP_VERSION` set to an exact, published version known to support the Token flags.
-The server checks its published release catalog and channel before issuing a Token command. Leave the
-version unset until that installer has been released; it returns `computer_token_setup_unavailable`
-instead of generating a command for an unsupported package. Existing clients retain browser setup.
+a compatible published installer (beta >= 0.6.98-beta.5; stable >= 0.6.99).
+`CREW_COMPUTER_TOKEN_SETUP_VERSION` is an optional exact-version pin, not a feature switch.
+When unset or blank, the server selects the latest beta for dev or stable for production from its refreshed release catalog.
+Both the two-step installation command and the one-step npx command pin that exact version.
+An explicit pin must be published, compatible and in the same channel; invalid pins do not fall back.
+The command keeps `--machine` for target validation and `--setup-token` for the short-lived, one-time preapproval.
+The server checks its published release catalog and channel before issuing a Token command. If no
+compatible published version is available, it returns `computer_token_setup_unavailable` instead of
+generating a command for an unsupported package. Existing clients retain browser setup.
 
 ## Browser-Approved Computer Setup (Compatibility)
 

package/dist/computer-service.js

@@ -12,6 +12,8 @@ import { powershellCommandArgs } from "./powershell-command.js";
 const execFileAsync = promisify(execFile);
 const WINDOWS_STOP_TIMEOUT_MS = 5_000;
 const WINDOWS_STOP_POLL_MS = 100;
+const DARWIN_STOP_TIMEOUT_MS = 30_000;
+const DARWIN_STOP_POLL_MS = 100;
 /** Windows cannot spawn .cmd/.bat shims directly with shell:false; route them through cmd.exe explicitly. */
 export function systemCommandInvocation(command, args, platform = process.platform, comSpec = process.env.ComSpec ?? process.env.COMSPEC ?? "cmd.exe") {
     if (platform === "win32" && /\.(?:cmd|bat)$/iu.test(command)) {
@@ -186,6 +188,32 @@ async function checked(runner, command, args, action) {
     }
     return result;
 }
+async function stopLaunchdService(spec, initial, runner) {
+    const assertQueryable = (result) => {
+        // launchctl uses 113 for an absent service. Other failures cannot prove it stopped.
+        if (result.exitCode !== 0 && result.exitCode !== 113) {
+            throw new Error(`launchd status failed: ${result.stderr.trim() || result.stdout.trim() || `exit ${result.exitCode}`}`);
+        }
+    };
+    assertQueryable(initial);
+    if (initial.exitCode === 113)
+        return;
+    const target = `${spec.managerDomain}/${spec.id}`;
+    await checked(runner, "launchctl", ["bootout", target], "launchd stop");
+    const deadline = Date.now() + DARWIN_STOP_TIMEOUT_MS;
+    while (true) {
+        const current = await runner("launchctl", ["print", target]);
+        assertQueryable(current);
+        if (current.exitCode === 113)
+            return;
+        // bootout returns while the job is SIGTERMed and still owns its installation lease.
+        // Wait for removal, not merely a non-running state, before installing or bootstrapping.
+        if (Date.now() >= deadline) {
+            throw new Error(`launchd service '${spec.id}' did not unload within ${DARWIN_STOP_TIMEOUT_MS}ms`);
+        }
+        await new Promise((resolve) => setTimeout(resolve, DARWIN_STOP_POLL_MS));
+    }
+}
 function sameWindowsPath(left, right) {
     return left !== undefined
         && left.replaceAll("/", "\\").toLowerCase() === right.replaceAll("/", "\\").toLowerCase();
@@ -356,9 +384,7 @@ export async function uninstallService(spec, runner = systemCommandRunner) {
     }
     if (spec.platform === "darwin") {
         const status = await serviceStatus(spec, runner);
-        if (status.loaded) {
-            await checked(runner, "launchctl", ["bootout", `${spec.managerDomain}/${spec.id}`], "launchd bootout");
-        }
+        await stopLaunchdService(spec, status, runner);
     }
     else {
         const disable = await runner("systemctl", ["--user", "disable", "--now", spec.id]);
@@ -385,8 +411,7 @@ export async function serviceAction(spec, action, runner = systemCommandRunner)
                 await checked(runner, "launchctl", ["bootstrap", spec.managerDomain, spec.descriptorPath], "launchd start");
         }
         else if (action === "stop") {
-            if (status.loaded)
-                await checked(runner, "launchctl", ["bootout", target], "launchd stop");
+            await stopLaunchdService(spec, status, runner);
         }
         else {
             if (status.loaded)

package/dist/console.js

@@ -9,8 +9,8 @@
  * 会附带结构化 payload(diff/命令/todo 清单/计划…),供前端做富渲染(红绿 diff、清单勾选);
  * 前端不识别 payload.kind 时降级为纯文本行,协议向后兼容。
  *
- * 覆盖三种 runtime 的流:claude(stream-json)、codex(exec --json 的 item.* 事件)、
- * kimi(OpenAI 消息风格行)。
+ * 覆盖 runtime 的流:claude(stream-json)、codex(exec --json 的 item.* 事件)、
+ * kimi(OpenAI 消息风格行)、ACP 适配器与 Pi 适配器(pi.* 块级事件)。
  */
 import { detectDaemonLang, translateDaemon } from "./i18n.js";
 import { buildFilePreview, buildSnippetDiff } from "./console-payload.js";
@@ -280,6 +280,21 @@ export function toConsoleLines(event, runtime) {
         const text = typeof e.content === "string" ? e.content.trim() : "";
         return text ? [{ stream: "tool_result", text: clip(text, TOOL_RESULT_CAP) }] : [];
     }
+    if (e.type === "pi.text" && e.text)
+        return [{ stream: "text", text: e.text }];
+    if (e.type === "pi.thinking" && e.text)
+        return [{ stream: "thinking", text: e.text }];
+    if (e.type === "pi.tool_call") {
+        return [{ stream: "tool", text: e.title ? `⏺ ${clip(e.title, TOOL_INPUT_CAP)}` : "⏺ Pi tool" }];
+    }
+    if (e.type === "pi.tool_result") {
+        const text = typeof e.content === "string" ? e.content.trim() : "";
+        return text ? [{ stream: e.is_error ? "error" : "tool_result", text: clip(text, TOOL_RESULT_CAP) }] : [];
+    }
+    if (e.type === "pi.error") {
+        const message = event.message;
+        return typeof message === "string" && message.trim() ? [{ stream: "error", text: message.trim() }] : [];
+    }
     if (e.type === "system" && e.subtype === "init") {
         return [{ stream: "system", text: `● ${td("Claude Code session started")}` }];
     }

package/dist/machine-info.js

@@ -1,3 +1,4 @@
+import { MAINTENANCE_CAPABILITY } from "./marketplace-maintenance-protocol.js";
 import { retryHarnessProbe } from "./runtimes/harness-probe-retry.js";
 import { MARKETPLACE_CAPABILITY } from "./marketplace-protocol.js";
 /**
@@ -40,6 +41,7 @@ export const NATIVE_PROJECT_WORKSPACE_READINESS = Object.freeze({
 });
 export const DAEMON_CAPABILITIES = Object.freeze([
     MARKETPLACE_CAPABILITY,
+    MAINTENANCE_CAPABILITY,
     "scheduled_job_v1",
     "reply_origin_v1",
     "origin_decision_v1",
@@ -72,7 +74,7 @@ export const daemonCapabilities = (runtimePlatform = process.platform, readiness
     const nativeWorkspaceReady = nativeWorkspacePlatform
         && readiness.resolverReady
         && readiness.nativeRuntimeAdaptersReady;
-    return Object.freeze(DAEMON_CAPABILITIES.filter((capability) => ((capability !== MARKETPLACE_CAPABILITY || nativeWorkspacePlatform)
+    return Object.freeze(DAEMON_CAPABILITIES.filter((capability) => (((capability !== MARKETPLACE_CAPABILITY && capability !== MAINTENANCE_CAPABILITY) || nativeWorkspacePlatform)
         && (capability !== PROJECT_WORKSPACES_CAPABILITY || nativeWorkspaceReady)
         && (capability !== "message_file_preview_v1" || nativeWorkspacePlatform)
         && (nativeWorkspacePlatform

package/dist/marketplace-controller.js

@@ -1,3 +1,4 @@
+import { MaintenanceRequestSchema, MaintenanceReportSchema } from "./marketplace-maintenance-protocol.js";
 import { MarketplaceRequestSchema, marketplaceActive } from "./marketplace-protocol.js";
 import { resolveMarketplaceScopes, runMarketplaceScope } from "./marketplace-runner.js";
 export function createMarketplaceController(deps) {
@@ -11,22 +12,31 @@ export function createMarketplaceController(deps) {
         const deadline = now() + 10 * 60_000;
         let lease = null;
         try {
-            const scopes = await (deps.resolve ?? resolveMarketplaceScopes)(request.targets, deps.agentsRoot);
+            const scopes = request.type === "marketplace:operation" ? await (deps.resolve ?? resolveMarketplaceScopes)(request.targets, deps.agentsRoot) : [];
             // 查询不使用任务执行槽；只有写入运行时共用市场/插件目录时才等待独占保护。
-            if (request.mode === "update") {
+            if (request.type === "marketplace:maintenance" || request.mode === "update") {
                 while (!stopped && now() < deadline && lease === null) {
                     lease = await deps.acquire();
                     if (!lease)
                         await wait();
                 }
                 if (!lease || stopped) {
-                    operations.set(id, { operationId: id, status: "failed", results: [], errorCode: "runtime_busy" });
+                    operations.set(id, { ...operations.get(id), status: "failed", errorCode: "runtime_busy" });
                     return;
                 }
             }
             if (stopped || now() >= deadline)
                 throw new Error("operation_deadline");
-            operations.set(id, { operationId: id, status: "running", results: [], errorCode: null });
+            operations.set(id, { ...operations.get(id), status: "running" });
+            if (request.type === "marketplace:maintenance") {
+                if (!deps.maintain)
+                    throw new Error("maintenance_unavailable");
+                const result = MaintenanceReportSchema.parse(await deps.maintain(request));
+                if (result.operationId !== id)
+                    throw new Error("operation_mismatch");
+                operations.set(id, result);
+                return;
+            }
             const results = [];
             for (const scope of scopes) {
                 if (stopped || now() >= deadline)
@@ -41,7 +51,9 @@ export function createMarketplaceController(deps) {
         }
         catch {
             const previous = operations.get(id);
-            operations.set(id, { ...previous, status: previous.results.some(x => !x.errorCode) ? "partial" : "failed", errorCode: "execution_failed" });
+            operations.set(id, request.type === "marketplace:maintenance"
+                ? { ...previous, status: "unknown", errorCode: "operation_unknown" }
+                : { ...previous, status: previous.results.some(x => !x.errorCode) ? "partial" : "failed", errorCode: "execution_failed" });
         }
         finally {
             try {
@@ -55,22 +67,23 @@ export function createMarketplaceController(deps) {
     };
     return {
         handle(raw) {
-            const parsed = MarketplaceRequestSchema.safeParse(raw);
+            const parsed = MarketplaceRequestSchema.or(MaintenanceRequestSchema).safeParse(raw);
             if (!parsed.success || stopped)
                 return { ok: false, error: "invalid_request" };
             const request = parsed.data;
+            const version = request.type === "marketplace:maintenance" ? { version: 2 } : {};
             const existing = operations.get(request.operationId);
             if (existing)
                 return { ok: true, data: existing };
             if (request.action === "status")
-                return { ok: true, data: { operationId: request.operationId, status: "unknown", results: [], errorCode: "operation_unknown" } };
+                return { ok: true, data: { ...version, operationId: request.operationId, status: "unknown", results: [], errorCode: "operation_unknown" } };
             if (process.platform !== "darwin" && process.platform !== "linux")
                 return { ok: false, error: "unsupported_platform" };
             if (current !== null || [...operations.values()].some(x => marketplaceActive(x.status)))
                 return { ok: false, error: "runtime_busy" };
             if (operations.size >= 100)
                 operations.delete(operations.keys().next().value);
-            const accepted = { operationId: request.operationId, status: "queued", results: [], errorCode: null };
+            const accepted = { ...version, operationId: request.operationId, status: "queued", results: [], errorCode: null };
             operations.set(request.operationId, accepted);
             current = execute(request).finally(() => { current = null; });
             return { ok: true, data: accepted };

package/dist/marketplace-maintenance-bridge.js

@@ -0,0 +1,79 @@
+import { createHash } from "node:crypto";
+import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { spawn } from "node:child_process";
+import { augmentedPath } from "./runtime-path.js";
+import { MaintenanceReportSchema } from "./marketplace-maintenance-protocol.js";
+export function maintenanceEnvironment(env) {
+    // Keep the machine user's login/config, never forward control-plane credentials.
+    return Object.fromEntries(Object.entries(env).filter(([key]) => !/^(CREW_|NOWCREW_|NOWWORK_)/i.test(key)));
+}
+async function supervise(file, id, cwd, env) {
+    await new Promise((resolve, reject) => {
+        const child = spawn(process.execPath, [file, "--run", id], { cwd, env, detached: true, stdio: "ignore" });
+        let expired = false;
+        const kill = () => { if (child.pid) {
+            try {
+                process.kill(-child.pid, "SIGKILL");
+            }
+            catch { /* already gone */ }
+        } };
+        const timer = setTimeout(() => { expired = true; kill(); }, 18 * 60_000);
+        child.once("error", () => { clearTimeout(timer); kill(); reject(new Error("worker_failed")); });
+        child.once("close", code => {
+            clearTimeout(timer);
+            // Never release the machine lock while descendants can still write shared configuration.
+            kill();
+            if (expired || code !== 0)
+                reject(new Error("worker_failed"));
+            else
+                resolve();
+        });
+    });
+}
+export async function runMaintenanceBridge(config, request, acquireEnv) {
+    const fail = (errorCode) => ({ version: 2, operationId: request.operationId, status: "failed", results: [], errorCode });
+    let dir;
+    let started = false;
+    try {
+        const response = await fetch(`${config.serverUrl.replace(/\/+$/, "")}/machine/marketplace-maintenance/${request.operationId}/runner/${request.plan.runner.releaseId}`, {
+            headers: { authorization: `Bearer ${config.machineToken}` }, redirect: "error", signal: AbortSignal.timeout(15_000),
+        });
+        if (!response.ok)
+            return fail("runner_unavailable");
+        // Bound even a malformed server response before buffering or executing it.
+        if (!response.body)
+            return fail("runner_unavailable");
+        const chunks = [];
+        let bytes = 0;
+        for await (const chunk of response.body) {
+            bytes += chunk.length;
+            if (bytes > 256_000)
+                return fail("runner_unavailable");
+            chunks.push(chunk);
+        }
+        const content = Buffer.concat(chunks);
+        if (createHash("sha256").update(content).digest("hex") !== request.plan.runner.sha256)
+            return fail("runner_unavailable");
+        const env = maintenanceEnvironment(await acquireEnv());
+        env.PATH = augmentedPath(env, {}, process.platform, "append");
+        dir = await mkdtemp(join(tmpdir(), "nowwork-maintenance-"));
+        const file = join(dir, "runner.mjs");
+        await writeFile(file, content, { mode: 0o600 });
+        started = true;
+        await supervise(file, request.operationId, dir, env);
+        const report = MaintenanceReportSchema.parse(JSON.parse(await readFile(join(dir, "report.json"), "utf8")));
+        if (report.operationId !== request.operationId)
+            throw new Error("operation_mismatch");
+        return report;
+    }
+    catch {
+        // A killed worker may have changed files: require readback/manual confirmation before another write.
+        return started ? { ...fail("operation_unknown"), status: "unknown" } : fail("runner_unavailable");
+    }
+    finally {
+        if (dir)
+            await rm(dir, { recursive: true, force: true });
+    }
+}

package/dist/marketplace-maintenance-protocol.js

@@ -0,0 +1,40 @@
+import { z } from "zod";
+// 与 daemon 同名文件逐字一致；这是独立于旧单插件协议的版本化契约。
+export const MAINTENANCE_CAPABILITY = "marketplace_codex_maintenance_v1";
+export const MaintenancePlanSchema = z.object({
+    marketplace: z.literal("nowwork-pm"),
+    actions: z.tuple([z.literal("install-missing"), z.literal("update-installed")]),
+    hosts: z.tuple([z.literal("claude"), z.literal("codex"), z.literal("pi")]),
+    runner: z.object({ releaseId: z.string().regex(/^[a-f0-9]{64}$/), sha256: z.string().regex(/^[a-f0-9]{64}$/) }).strict(),
+}).strict();
+export const MaintenanceRequestSchema = z.discriminatedUnion("action", [
+    z.object({ type: z.literal("marketplace:maintenance"), action: z.literal("start"), operationId: z.string().uuid(), plan: MaintenancePlanSchema }).strict(),
+    z.object({ type: z.literal("marketplace:maintenance"), action: z.literal("status"), operationId: z.string().uuid() }).strict(),
+]);
+export const MaintenanceErrorSchema = z.enum(["runtime_busy", "execution_failed", "operation_unknown", "runner_unavailable",
+    "manager_missing", "cli_missing", "command_failed", "verification_failed", "source_conflict", "unsupported_platform"]);
+const Version = z.string().regex(/^[A-Za-z0-9][A-Za-z0-9._+-]{0,79}$/).nullable();
+export const MaintenanceResultSchema = z.object({
+    runtime: z.enum(["claude", "codex", "pi"]), plugin: z.string().regex(/^[a-z0-9][a-z0-9_-]{0,127}$/).nullable(),
+    status: z.enum(["installed", "updated", "unchanged", "empty", "missing_cli", "failed"]),
+    beforeVersion: Version, afterVersion: Version, targetVersion: Version,
+    activation: z.enum(["reload_required", "not_changed", "unverified"]), errorCode: MaintenanceErrorSchema.nullable(),
+}).strict();
+export const MaintenanceReportSchema = z.object({
+    version: z.literal(2), operationId: z.string().uuid(),
+    status: z.enum(["queued", "running", "completed", "partial", "failed", "unknown"]),
+    results: z.array(MaintenanceResultSchema).max(1500), errorCode: MaintenanceErrorSchema.nullable(),
+}).strict().superRefine((r, ctx) => {
+    const keys = r.results.map(x => `${x.runtime}:${x.plugin}`);
+    if (new Set(keys).size !== keys.length)
+        ctx.addIssue({ code: z.ZodIssueCode.custom, message: "Duplicate plugin result" });
+    for (const x of r.results) {
+        if (["installed", "updated", "unchanged"].includes(x.status) && (!x.plugin || !x.targetVersion || x.targetVersion !== x.afterVersion || x.errorCode)) {
+            ctx.addIssue({ code: z.ZodIssueCode.custom, message: "Successful plugin result requires a verified target version" });
+        }
+    }
+    if (r.status === "completed" && (r.errorCode || ["claude", "codex", "pi"].some(host => !r.results.some(x => x.runtime === host))
+        || r.results.some(x => x.errorCode || x.status === "failed" || x.status === "missing_cli"))) {
+        ctx.addIssue({ code: z.ZodIssueCode.custom, message: "Completion requires verified coverage of every host" });
+    }
+});

package/dist/marketplace-serve.js

@@ -1,7 +1,9 @@
+import { runMaintenanceBridge } from "./marketplace-maintenance-bridge.js";
 import { createMarketplaceController } from "./marketplace-controller.js";
 import { prepareDaemonRestart } from "./daemon-updater.js";
-export function createServeMarketplace(config, localSlots, hostCoordinator) {
+export function createServeMarketplace(config, localSlots, hostCoordinator, acquireEnv = async () => ({ ...process.env })) {
     const controller = createMarketplaceController({ agentsRoot: config.agentsRoot,
+        maintain: request => runMaintenanceBridge(config, request, acquireEnv),
         acquire: async () => {
             // Marketplace updates can mutate shared Codex/Claude homes across profiles.
             const local = await prepareDaemonRestart({ localSlots });
@@ -29,7 +31,7 @@ export function createServeMarketplace(config, localSlots, hostCoordinator) {
         } });
     return {
         handle(raw, send) {
-            if (!raw || typeof raw !== "object" || !("type" in raw) || raw.type !== "marketplace:operation")
+            if (!raw || typeof raw !== "object" || !("type" in raw) || (raw.type !== "marketplace:operation" && raw.type !== "marketplace:maintenance"))
                 return false;
             const { reqId, ...request } = raw;
             if (typeof reqId === "string")

package/dist/runtimes/pi-runner.js

@@ -40,6 +40,7 @@ export async function runPi(bin) {
     if (inputError)
         throw new Error(`Pi prompt delivery failed: ${inputError.message}`);
     const result = decoder.finish();
+    await emit(result.event);
     if (!result.ok) {
         process.stderr.write(`${result.error}\n`);
         return 1;

package/dist/runtimes/pi.js

@@ -3,6 +3,23 @@ export function buildPiArgs(options) {
         ...(options.model ? ["--model", options.model] : []),
         ...(options.reasoning && options.reasoning !== "default" ? ["--thinking", options.reasoning] : [])];
 }
+const TOOL_ARG_KEYS = ["command", "path", "file_path", "pattern", "url"];
+function toolTitle(name, args) {
+    const arg = TOOL_ARG_KEYS.map(key => args?.[key]).find((value) => typeof value === "string" && !!value.trim());
+    return arg ? `${name}(${arg.trim()})` : name;
+}
+function toolResultText(result) {
+    return (result?.content ?? []).map(item => item.type === "text" && typeof item.text === "string" ? item.text : "")
+        .filter(Boolean).join("\n");
+}
+function addUsage(total, next) {
+    if (!next)
+        return total;
+    return {
+        input: (total?.input ?? 0) + (next.input ?? 0), output: (total?.output ?? 0) + (next.output ?? 0),
+        cacheRead: (total?.cacheRead ?? 0) + (next.cacheRead ?? 0), cacheWrite: (total?.cacheWrite ?? 0) + (next.cacheWrite ?? 0),
+    };
+}
 // 保留稳定的原因标识供 server 本地化；不要用 token 数量猜测结束原因。
 function failureReason(message) {
     const reason = message?.stopReason;
@@ -15,7 +32,17 @@ export function createPiEventDecoder() {
     let lastAssistant = null;
     let assistantOpen = false;
     let sawTurnEnd = false;
+    let turnUsageCounted = false;
     let usage;
+    // 正常 stop 可为空（任务可能要求静默）；length/error/aborted 或停在工具轮都必须明确失败。
+    const runFailure = () => error ?? (assistantOpen
+        ? "pi_runtime_failed: incomplete"
+        : failureReason(lastAssistant)
+            ?? (!sawTurnEnd || lastAssistant?.stopReason === "toolUse" ? "pi_runtime_failed: incomplete" : null));
+    const normalizedUsage = () => usage ? { usage: {
+            input_tokens: usage.input ?? 0, output_tokens: usage.output ?? 0,
+            cache_read_input_tokens: usage.cacheRead ?? 0, cache_creation_input_tokens: usage.cacheWrite ?? 0,
+        } } : {};
     return {
         push(raw) {
             const e = (raw ?? {});
@@ -24,8 +51,10 @@ export function createPiEventDecoder() {
                 sessionId = e.id;
                 out.push({ type: "thread.started", thread_id: e.id });
             }
-            if (e.type === "turn_start")
+            if (e.type === "turn_start") {
                 sawTurnEnd = false;
+                turnUsageCounted = false;
+            }
             if ((e.type === "message_start" || e.type === "message_update") && e.message?.role === "assistant") {
                 assistantOpen = true;
                 sawTurnEnd = false;
@@ -38,34 +67,39 @@ export function createPiEventDecoder() {
             if (e.type === "message_update" && ae?.type === "thinking_delta" && typeof ae.delta === "string") {
                 out.push({ type: "pi.thinking_delta", text: ae.delta });
             }
-            if (e.type === "message_update" && typeof ae?.type === "string" && /tool(call|_call)/iu.test(ae.type)) {
-                out.push({ type: "pi.tool_call", ...(ae.name ? { title: ae.name } : {}) });
+            // delta 逐 token 到达，console 只消费块结束事件，避免一个 token 一行。
+            if (e.type === "message_update" && ae?.type === "text_end" && ae.content?.trim()) {
+                out.push({ type: "pi.text", text: ae.content.trim() });
+            }
+            if (e.type === "message_update" && ae?.type === "thinking_end" && ae.content?.trim()) {
+                out.push({ type: "pi.thinking", text: ae.content.trim() });
+            }
+            if (e.type === "tool_execution_start" && typeof e.toolName === "string") {
+                out.push({ type: "pi.tool_call", title: toolTitle(e.toolName, e.args) });
+            }
+            if (e.type === "tool_execution_end") {
+                out.push({ type: "pi.tool_result", content: toolResultText(e.result), is_error: e.isError === true });
             }
             if (e.type === "message_end" && e.message?.role === "assistant") {
                 lastAssistant = e.message;
-                usage = e.message.usage;
+                usage = addUsage(usage, e.message.usage);
+                turnUsageCounted = true;
                 assistantOpen = false;
                 sawTurnEnd = false;
             }
             if (e.type === "turn_end") {
-                // 原生 turn_end 自带本轮消息，不能把工具调用轮的结束当成整次执行成功。
+                // turn_end 只是 Pi 内部一轮：工具调用后会继续，provider 出错还会自动重试（agent_end.willRetry）。
                 if (e.message?.role === "assistant") {
                     lastAssistant = e.message;
-                    usage = e.message.usage;
+                    if (!turnUsageCounted)
+                        usage = addUsage(usage, e.message.usage);
                     assistantOpen = false;
                 }
                 else if (e.message) {
                     lastAssistant = null;
                 }
                 sawTurnEnd = true;
-                const normalizedUsage = usage ? { usage: {
-                        input_tokens: usage.input ?? 0, output_tokens: usage.output ?? 0,
-                        cache_read_input_tokens: usage.cacheRead ?? 0, cache_creation_input_tokens: usage.cacheWrite ?? 0,
-                    } } : {};
-                const failure = failureReason(lastAssistant);
-                out.push(failure
-                    ? { type: "result", is_error: true, result: failure, ...normalizedUsage }
-                    : { type: "turn.completed", ...normalizedUsage });
+                turnUsageCounted = false;
             }
             if (e.type === "error" || e.type === "agent_error") {
                 error = typeof e.error === "string" ? e.error : (e.error?.message ?? "Pi error");
@@ -74,12 +108,12 @@ export function createPiEventDecoder() {
             return out;
         },
         finish() {
-            // 正常 stop 可为空（任务可能要求静默）；length/error/aborted 必须明确失败。
-            const failure = error ?? (assistantOpen
-                ? "pi_runtime_failed: incomplete"
-                : failureReason(lastAssistant)
-                    ?? (!sawTurnEnd || lastAssistant?.stopReason === "toolUse" ? "pi_runtime_failed: incomplete" : null));
-            return { ok: failure === null, ...(failure ? { error: failure } : {}), finalText, sessionId, usage };
+            // 终态只在 stdout 结束后产出一次：重试/中断都以最终状态为准，usage 覆盖所有已完成轮次。
+            const failure = runFailure();
+            const event = failure
+                ? { type: "result", is_error: true, result: failure, ...normalizedUsage() }
+                : { type: "turn.completed", ...normalizedUsage() };
+            return { ok: failure === null, ...(failure ? { error: failure } : {}), finalText, sessionId, usage, event };
         },
     };
 }

package/dist/serve.js

@@ -122,7 +122,7 @@ export function serve(config, opts = {}) {
             catch { /* reconnect/timeout reconciliation handles a lost status frame */ }
         },
     });
-    const marketplace = createServeMarketplace(config, localSlots, hostCoordinator);
+    const marketplace = createServeMarketplace(config, localSlots, hostCoordinator, async () => ({ ...(await machineRuntime.provider.acquire()).env }));
     const storageIdentityAdmission = createStorageIdentityAdmission(opts.storageRuntime);
     const projectionCoordinator = createAgentProjectionCoordinator();
     const { projectRegistry, projectWorkspaceRegistry, projectDependencyProvisioner } = createProjectRegistryWiring(config.agentsRoot, opts.execution?.dependencies);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.98-beta.6",
+  "version": "0.6.98-beta.7",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "build": "tsc -p tsconfig.json",
     "prepublishOnly": "pnpm build && node ../scripts/daemon-release-artifact.mjs --strict-registry",
     "test": "vitest run",
+    "test:release-critical": "vitest run test/automatic-daemon-installer.test.ts test/automatic-install-target.test.ts test/automatic-service-migration.test.ts test/computer-cli.test.ts test/computer-service.test.ts test/computer-setup-client.test.ts test/computer-setup-orchestration.test.ts test/computer-setup.test.ts test/daemon-release-version.test.ts test/daemon-update-controller.test.ts test/daemon-update-eligibility.test.ts test/daemon-updater.test.ts test/execution-protocol.test.ts test/machine-info.test.ts --maxWorkers=2 --minWorkers=1",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {