@nowcrew/daemon 0.6.98-beta.3 → 0.6.98-beta.5

package/dist/automatic-daemon-installer.js

@@ -17,6 +17,12 @@ import { discoverExactLegacyService, } from "./automatic-service-migration.js";
 import { resolveDaemonLocalStateRootFromEnv } from "./daemon-local-home.js";
 import { serverHostIdentity } from "./server-url.js";
 import { computerSetupRecoveryGuidance } from "./computer-setup-client.js";
+export const automaticDaemonInstallStageMessage = {
+    downloading: "Downloading the Daemon package...",
+    configuring: "Configuring the Daemon service...",
+    starting: "Starting the Daemon service...",
+    confirming: "Confirming the computer connection...",
+};
 function profileStorage(platform, userHome, runner) {
     return {
         platform,
@@ -331,6 +337,7 @@ export async function installDaemonAutomatically(input, dependencies = defaultDe
         });
         let installFailure;
         try {
+            input.onProgress?.("downloading");
             await dependencies.installPackage(target.npmPrefix, dependencies.version, dependencies.platform, dependencies.runner, target.registryUrl);
         }
         catch (error) {
@@ -353,6 +360,7 @@ export async function installDaemonAutomatically(input, dependencies = defaultDe
             legacyRemovalStarted = true;
             await dependencies.removeLegacyService(legacyService);
         }
+        input.onProgress?.("configuring");
         profileSaved = true;
         await dependencies.saveTargetProfile({
             version: 1,
@@ -367,6 +375,7 @@ export async function installDaemonAutomatically(input, dependencies = defaultDe
         }, target.daemonHome);
         serviceReplacementStarted = true;
         await dependencies.replaceService(spec, target);
+        input.onProgress?.("starting");
         await dependencies.startService(spec);
         const status = await dependencies.verifyService(spec);
         if (!status.running)
@@ -380,6 +389,7 @@ export async function installDaemonAutomatically(input, dependencies = defaultDe
             daemonHome: target.daemonHome,
             agentsRoot: target.agentsRoot,
         };
+        input.onProgress?.("confirming");
         await input.verifyAfterStart?.(result);
         return result;
     }

package/dist/computer-setup-client.js

@@ -52,6 +52,13 @@ const SetupTokenTargetSchema = SetupBootstrapSchema.omit({ setupId: true, machin
         credentialMatchesConnection: z.boolean(),
     }).strict(),
 }).strict();
+const SetupReceiptSchema = z.object({
+    setupId: z.string().uuid(),
+    credentialState: z.enum(["pending", "finalized"]),
+    target: SetupTokenTargetSchema.omit({ connection: true }),
+    connection: SetupTokenTargetSchema.shape.connection,
+    connectionConfirmed: z.boolean(),
+}).strict();
 const SetupPendingSchema = z.object({
     status: z.enum(["authorization_pending", "pending"]),
     intervalSeconds: z.number().int().positive().max(300).optional(),
@@ -89,7 +96,8 @@ export class ComputerSetupHttpError extends Error {
     }
 }
 export function redactSetupSecrets(value, secrets = []) {
-    let redacted = value.replace(/\bsk_machine_[A-Za-z0-9_-]+\b/gu, "<redacted>");
+    let redacted = value.replace(/\bsk_machine_[A-Za-z0-9_-]+\b/gu, "<redacted>")
+        .replace(/(--setup-token(?:=|\s+))[A-Za-z0-9_-]+/gu, "$1<redacted>");
     for (const secret of secrets) {
         if (secret.length > 0)
             redacted = redacted.replaceAll(secret, "<redacted>");
@@ -251,7 +259,8 @@ export function createComputerSetupClient(options) {
     }));
     const now = options.now ?? Date.now;
     const request = async (method, path, body, bearer) => {
-        const secretInputs = [bearer ?? "", body?.deviceCode ?? ""];
+        const secretInputs = [bearer ?? "", body?.deviceCode ?? "",
+            body?.setupToken ?? ""];
         const controller = new AbortController();
         const timeoutId = setTimeout(() => controller.abort(), requestTimeoutMs);
         try {
@@ -283,6 +292,12 @@ export function createComputerSetupClient(options) {
         }
     };
     return {
+        receipt: async ({ setupToken, machineToken }) => {
+            const receipt = SetupReceiptSchema.safeParse(await request("POST", "/daemon/computer-setup/receipt", { setupToken }, machineToken));
+            if (!receipt.success)
+                throw new Error("Invalid computer setup receipt response");
+            return receipt.data;
+        },
         tokenTarget: async (machineToken) => SetupTokenTargetSchema.parse(await request("GET", "/daemon/computer-setup/target", undefined, machineToken)),
         start: async (input) => {
             return parseStart(await request("POST", "/api/auth/computer-setup/start", {

package/dist/computer-setup-existing.js

@@ -0,0 +1,154 @@
+import { access, readFile, readdir } from "node:fs/promises";
+import { homedir } from "node:os";
+import { posix, win32 } from "node:path";
+import { resolveAutomaticInstallTarget } from "./automatic-install-target.js";
+import { stableDaemonEntry } from "./automatic-daemon-installer.js";
+import { resolveDaemonLocalHome } from "./daemon-local-home.js";
+import { daemonGlobalInstallation } from "./daemon-installation.js";
+import { isDaemonReleaseVersion } from "./daemon-release-version.js";
+import { listProfiles, loadProfile, profileIsPrivate, profilePath } from "./computer-profile.js";
+import { buildServiceSpec, captureExactService, systemCommandRunner, windowsProfileIsPrivate } from "./computer-service.js";
+import { buildManagedServiceRecord } from "./managed-service-lifecycle.js";
+import { managedServiceIdentityMatches, readManagedServiceRegistry } from "./managed-service-registry.js";
+import { serverUrlsMatch } from "./server-url.js";
+import { assertBootstrapMatches, localPathsMatch } from "./computer-setup-orchestration.js";
+const storageKeys = ["NOWWORK_HOME", "NOWWORK_ENV_TAG", "NOWWORK_STORAGE_POLICY_PATH", "NOWWORK_LOCAL_HOME", "NOWWORK_LOCAL_HOME_MODE"];
+const decodeXml = (value) => value.replaceAll(""", '"').replaceAll("'", "'")
+    .replaceAll("&lt;", "<").replaceAll("&gt;", ">").replaceAll("&amp;", "&");
+// Only recover the generated environment fields; the rebuilt descriptor must still match byte-for-byte.
+function descriptorEnvironment(descriptor, platform) {
+    return Object.fromEntries(storageKeys.flatMap((key) => {
+        const value = platform === "darwin"
+            ? new RegExp(`<key>${key}</key><string>([^<]*)</string>`, "u").exec(descriptor)?.[1]
+            : new RegExp(`^Environment="${key}=((?:[^"\\\\]|\\\\.)*)"$`, "mu").exec(descriptor)?.[1];
+        return value === undefined ? [] : [[key, platform === "darwin" ? decodeXml(value) : value.replace(/\\(.)/gu, "$1").replaceAll("%%", "%")]];
+    }));
+}
+async function windowsNodePath(serviceId, runner) {
+    const script = "$ErrorActionPreference='Stop';$n=[Text.Encoding]::Unicode.GetString([Convert]::FromBase64String($args[0]));"
+        + "$t=@(Get-ScheduledTask -ErrorAction Stop|Where-Object{$_.TaskPath -eq '\\' -and $_.TaskName -ceq $n});"
+        + "if($t.Count -ne 1){throw 'scheduled task identity unknown'};$a=@($t[0].Actions);"
+        + "if($a.Count -ne 1){throw 'scheduled task action unknown'};$a[0].Execute|ConvertTo-Json -Compress;";
+    const result = await runner("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script,
+        Buffer.from(serviceId, "utf16le").toString("base64")]);
+    const path = result.exitCode === 0 ? JSON.parse(result.stdout) : null;
+    if (typeof path !== "string" || !win32.isAbsolute(path))
+        throw new Error("Scheduled task executable unavailable");
+    return path;
+}
+/** One-shot inspection only. Never consumes credentials or changes local/service state. */
+export async function inspectExistingComputerSetup(input, client, options = {}) {
+    if (input.args.setupToken === undefined)
+        return { status: "unavailable" };
+    const platform = options.platform ?? process.platform;
+    const userHome = options.userHome ?? homedir();
+    const environment = options.environment ?? process.env;
+    const runner = options.runner ?? systemCommandRunner;
+    const paths = platform === "win32" ? win32 : posix;
+    try {
+        const requestedLocalHome = environment.NOWWORK_LOCAL_HOME;
+        const requestedLocalHomeMode = environment.NOWWORK_LOCAL_HOME_MODE ?? environment.NOWWORK_STORAGE_MODE;
+        const localOptions = {
+            ...(requestedLocalHome === undefined ? {} : { requestedLocalHome }),
+            ...(requestedLocalHomeMode === undefined ? {} : { requestedLocalHomeMode }),
+        };
+        const configuredHome = resolveDaemonLocalHome({ userHome, platform, profile: "in", mode: "nowwork",
+            ...(requestedLocalHome === undefined ? {} : { explicit: requestedLocalHome }) }).daemonHome;
+        const legacyRoot = paths.join(userHome, ".crew");
+        const legacyEntries = await readdir(legacyRoot, { withFileTypes: true }).catch((error) => {
+            if (error.code === "ENOENT")
+                return [];
+            throw error;
+        });
+        const homes = [...new Set([configuredHome, paths.join(userHome, ".nowwork", "config"),
+                ...legacyEntries.filter((entry) => entry.isDirectory() && /^daemon(?:-[a-z0-9_-]+)?$/u.test(entry.name))
+                    .map((entry) => paths.join(legacyRoot, entry.name))])];
+        const candidates = [];
+        for (const home of homes) {
+            for (const name of await listProfiles(home)) {
+                const privateProfile = platform === "win32"
+                    ? await windowsProfileIsPrivate(profilePath(name, home), runner)
+                    : await profileIsPrivate(name, home, platform);
+                if (!privateProfile)
+                    continue;
+                const profile = await loadProfile(name, home, { platform });
+                if (profile.name !== name || profile.machineId !== input.args.machineId || profile.workspaceId === undefined
+                    || !serverUrlsMatch(profile.serverUrl, input.serverUrl)
+                    || (input.args.workspace.kind === "id" && profile.workspaceId !== input.args.workspace.value))
+                    continue;
+                const target = resolveAutomaticInstallTarget({ serverUrl: input.serverUrl, requestedProfile: name,
+                    userHome, platform, ...localOptions });
+                if (!localPathsMatch(target.daemonHome, home, platform))
+                    continue;
+                if (profile.agentsRoot === undefined || !localPathsMatch(profile.agentsRoot, target.agentsRoot, platform))
+                    continue;
+                candidates.push({ profile, target });
+            }
+        }
+        if (candidates.length !== 1)
+            return { status: "unavailable" };
+        const { profile, target } = candidates[0];
+        const receipt = await client.receipt({ setupToken: input.args.setupToken, machineToken: profile.machineToken });
+        assertBootstrapMatches(receipt.target, input);
+        if (receipt.target.workspaceId !== profile.workspaceId || receipt.target.profile !== profile.name)
+            return { status: "unavailable" };
+        if (receipt.credentialState === "pending")
+            return { status: "pending" };
+        const connection = receipt.connection;
+        if (receipt.credentialState !== "finalized" || !receipt.connectionConfirmed || connection.status !== "online"
+            || !connection.credentialMatchesConnection || connection.epoch <= receipt.target.minimumConnectionEpoch
+            || connection.profile !== profile.name || connection.daemonHome === null || connection.agentsRoot === null
+            || !localPathsMatch(connection.daemonHome, target.daemonHome, platform)
+            || !localPathsMatch(connection.agentsRoot, target.agentsRoot, platform)
+            || (receipt.target.storageId !== undefined && receipt.target.storageId !== connection.storageId))
+            return { status: "unavailable" };
+        const localHome = paths.resolve(target.npmPrefix, "..", "..");
+        const entryPath = stableDaemonEntry(target, platform);
+        const installation = daemonGlobalInstallation(entryPath, platform);
+        if (installation === null)
+            return { status: "unavailable" };
+        await access(entryPath);
+        const packageJson = JSON.parse(await readFile(paths.join(installation.packageRoot, "package.json"), "utf8"));
+        if (!packageJson || typeof packageJson !== "object" || !("name" in packageJson) || packageJson.name !== "@nowcrew/daemon"
+            || !("version" in packageJson) || typeof packageJson.version !== "string" || !isDaemonReleaseVersion(packageJson.version))
+            return { status: "unavailable" };
+        const base = { platform, profile: profile.name, profileHome: target.daemonHome, userHome,
+            uid: options.uid ?? process.getuid?.(), entryPath };
+        let spec;
+        if (platform === "win32") {
+            const identity = buildServiceSpec({ ...base, nodePath: process.execPath, environment: {} });
+            const nodePath = await windowsNodePath(identity.id, runner);
+            await access(nodePath);
+            spec = buildServiceSpec({ ...base, nodePath, environment: {} });
+        }
+        else {
+            const records = (await readManagedServiceRegistry({ userHome, localHome })).filter((record) => record.profile === profile.name
+                && localPathsMatch(record.daemonHome, target.daemonHome, platform));
+            if (records.length !== 1)
+                return { status: "unavailable" };
+            const record = records[0];
+            await access(record.nodePath);
+            const descriptor = await readFile(record.descriptorPath, "utf8");
+            spec = buildServiceSpec({ ...base, nodePath: record.nodePath, entryPath: record.entryPath,
+                environment: descriptorEnvironment(descriptor, platform) });
+            const expected = buildManagedServiceRecord({ spec, daemonHome: target.daemonHome, agentsRoot: target.agentsRoot,
+                nodePath: record.nodePath, entryPath, ...installation });
+            if (!managedServiceIdentityMatches(record, expected))
+                return { status: "unavailable" };
+        }
+        const service = await captureExactService(spec, runner);
+        if (!service.installed || !service.exact || !service.running)
+            return { status: "unavailable" };
+        return { status: "connected", result: {
+                workspaceId: receipt.target.workspaceId, workspaceSlug: receipt.target.workspaceSlug, machineId: receipt.target.machineId,
+                environment: receipt.target.environment, profile: profile.name, daemonVersion: packageJson.version,
+                serviceId: spec.id, serviceStatus: "running", helloConfirmed: true, localNowworkHome: localHome,
+                daemonHome: target.daemonHome, agentsRoot: target.agentsRoot,
+                ...(connection.storageId === undefined ? {} : { storageId: connection.storageId }),
+            } };
+    }
+    catch {
+        // Failed inspection is not proof of installation, connection, or credential ownership.
+        return { status: "unavailable" };
+    }
+}

package/dist/computer-setup-orchestration.js

@@ -1,10 +1,12 @@
 import { computerSetupRecoveryGuidance, redactSetupSecrets, } from "./computer-setup-client.js";
+import { automaticDaemonInstallStageMessage } from "./automatic-daemon-installer.js";
+import { inspectExistingComputerSetup } from "./computer-setup-existing.js";
 import { isProductionServerHostname, serverUrlsMatch } from "./server-url.js";
 import { posix, win32 } from "node:path";
 import { resolveAgentsRoot } from "./computer-profile.js";
-function safeError(error, machineToken) {
-    const message = redactSetupSecrets(error instanceof Error ? error.message : String(error), machineToken === undefined ? [] : [machineToken]);
-    return new Error(message, error instanceof Error ? { cause: error } : undefined);
+function safeError(error, machineToken, setupToken) {
+    const message = redactSetupSecrets(error instanceof Error ? error.message : String(error), [machineToken ?? "", setupToken ?? ""]);
+    return new Error(message);
 }
 export function assertBootstrapMatches(bootstrap, input) {
     if (bootstrap.machineId !== input.args.machineId) {
@@ -55,6 +57,18 @@ async function obtainBootstrap(input, deps) {
         deps.reportPairing("Checking computer connection information...");
         const result = await deps.client.poll(input.args.setupToken);
         if (result.status !== "authorized") {
+            deps.reportPairing("Checking the existing computer connection...");
+            const inspection = await (deps.inspectExistingSetup ?? ((candidate, client) => inspectExistingComputerSetup(candidate, client, {
+                ...(deps.platform === undefined ? {} : { platform: deps.platform }),
+                ...(deps.environment === undefined ? {} : { environment: deps.environment }),
+            })))(input, deps.client);
+            if (inspection.status === "connected") {
+                deps.reportPairing("This computer is already connected. No installation changes are needed.");
+                return inspection.result;
+            }
+            if (inspection.status === "pending") {
+                throw new Error("Setup is still in progress; check the original terminal and wait for it to finish");
+            }
             throw new Error("Setup command expired or unavailable; regenerate it in NowWork and run the new command");
         }
         return result.bootstrap;
@@ -120,12 +134,14 @@ export async function runComputerSetupOrchestration(input, deps) {
     };
     try {
         const authorized = await obtainBootstrap(input, deps);
+        if ("helloConfirmed" in authorized)
+            return authorized;
         const token = authorized.machineToken;
         bootstrap = authorized;
         machineToken = token;
         assertBootstrapMatches(authorized, input);
-        deps.reportPairing("Downloading, installing, and starting the Daemon service...");
         const installation = await deps.installAutomatically({
+            onProgress: (stage) => deps.reportPairing(automaticDaemonInstallStageMessage[stage]),
             serverUrl: authorized.serverUrl,
             machineToken: token,
             workspaceId: authorized.workspaceId,
@@ -137,7 +153,6 @@ export async function runComputerSetupOrchestration(input, deps) {
             ...(authorized.registryUrl === undefined ? {} : { requestedRegistryUrl: authorized.registryUrl }),
             beforeRollback: confirmRollback,
             verifyAfterStart: async (candidate) => {
-                deps.reportPairing("Confirming the computer connection...");
                 const hello = await deps.client.waitForHello({
                     machineToken: token,
                     machineId: authorized.machineId,
@@ -209,6 +224,6 @@ export async function runComputerSetupOrchestration(input, deps) {
                     + `local recovery blocked. ${computerSetupRecoveryGuidance(bootstrap)}`, { cause: error });
             }
         }
-        throw safeError(error, machineToken);
+        throw safeError(error, machineToken, input.args.setupToken);
     }
 }

package/dist/computer-setup.js

@@ -258,6 +258,7 @@ export async function runComputerSetupCommand(argv, overrides = {}) {
             reportPairing: (message) => deps[args.json === true ? "stderr" : "stdout"](`${localizedPairingMessage(lang, message)}\n`),
             now: deps.now,
             platform: deps.platform,
+            environment: deps.env,
         };
         const result = args.machineToken === undefined
             ? await runComputerSetupOrchestration({ args, serverUrl }, orchestrationDeps)

package/dist/computer-token-setup.js

@@ -1,3 +1,4 @@
+import { automaticDaemonInstallStageMessage } from "./automatic-daemon-installer.js";
 import { assertBootstrapMatches, localPathsMatch } from "./computer-setup-orchestration.js";
 import { redactSetupSecrets } from "./computer-setup-client.js";
 export async function runMachineTokenSetup(input, deps, machineToken) {
@@ -5,14 +6,13 @@ export async function runMachineTokenSetup(input, deps, machineToken) {
         deps.reportPairing("Checking computer connection information...");
         const target = await deps.client.tokenTarget(machineToken);
         assertBootstrapMatches(target, input);
-        deps.reportPairing("Downloading, installing, and starting the Daemon service...");
         const installation = await deps.installAutomatically({
+            onProgress: (stage) => deps.reportPairing(automaticDaemonInstallStageMessage[stage]),
             serverUrl: target.serverUrl, machineToken, workspaceId: target.workspaceId, machineId: target.machineId,
             requestedProfile: target.profile,
             ...(target.releaseTag === undefined ? {} : { requestedReleaseTag: target.releaseTag }),
             ...(target.registryUrl === undefined ? {} : { requestedRegistryUrl: target.registryUrl }),
             verifyAfterStart: async (candidate) => {
-                deps.reportPairing("Confirming the computer connection...");
                 const deadline = deps.now() + 120_000;
                 for (;;) {
                     const current = await deps.client.tokenTarget(machineToken);

package/dist/execution-runner.js

@@ -587,6 +587,26 @@ export async function runExecution(config, input, dependencies) {
         let activitySequence = 0;
         let consoleSequence = 0;
         let externalOutputSequence = 0;
+        const bufferedPiExternalOutput = [];
+        const reportExternalOutput = (text) => {
+            if (firstOutputTimer !== undefined) {
+                clearTimeout(firstOutputTimer);
+                firstOutputTimer = undefined;
+            }
+            const frame = DaemonToServerExecutionFrameSchema.parse({
+                type: "execution:output",
+                protocolVersion: 1,
+                executionId: spec.executionId,
+                channel: "external_answer",
+                text,
+                seq: externalOutputSequence++,
+                at: now().toISOString(),
+            });
+            try {
+                telemetry.enqueue(boundExecutionFrame(frame, config.executionLimits.maxEventBytes));
+            }
+            catch { /* final completion remains the authoritative repair */ }
+        };
         const callbacks = {
             onRuntimeStarting: () => {
                 dependencies.onRuntimePhase?.("starting", spec.runtime.name);
@@ -711,23 +731,11 @@ export async function runExecution(config, input, dependencies) {
             } : {}),
             ...(spec.context.externalResponseSessionId || spec.context.answerStream ? {
                 onExternalOutput: (text) => {
-                    if (firstOutputTimer !== undefined) {
-                        clearTimeout(firstOutputTimer);
-                        firstOutputTimer = undefined;
-                    }
-                    const frame = DaemonToServerExecutionFrameSchema.parse({
-                        type: "execution:output",
-                        protocolVersion: 1,
-                        executionId: spec.executionId,
-                        channel: "external_answer",
-                        text,
-                        seq: externalOutputSequence++,
-                        at: now().toISOString(),
-                    });
-                    try {
-                        telemetry.enqueue(boundExecutionFrame(frame, config.executionLimits.maxEventBytes));
+                    if (spec.runtime.name === "pi") {
+                        bufferedPiExternalOutput.push(text);
+                        return;
                     }
-                    catch { /* final completion remains the authoritative repair */ }
+                    reportExternalOutput(text);
                 },
             } : {}),
         };
@@ -909,6 +917,10 @@ export async function runExecution(config, input, dependencies) {
             clearTimeout(timeout);
         if (firstOutputTimer !== undefined)
             clearTimeout(firstOutputTimer);
+        if (spec.runtime.name === "pi" && result.exitCode === 0 && result.externalAnswer !== null) {
+            for (const text of bufferedPiExternalOutput)
+                reportExternalOutput(text);
+        }
         const finishedAt = now().toISOString();
         if (result.exitCode === 0 && result.finalText?.trim())
             memoryCaptureFinalText = result.finalText;

package/dist/external-output.js

@@ -110,6 +110,7 @@ export class ExternalAnswerDecoder {
     pending = "";
     block = "";
     closed = null;
+    rejected = false;
     push(text) {
         if (!text)
             return [];
@@ -125,7 +126,7 @@ export class ExternalAnswerDecoder {
     }
     /** 整轮里最后一个完整闭合的标签块(已 trim);没有闭合过任何块则为 null。 */
     get lastClosedBlock() {
-        return this.closed;
+        return this.rejected ? null : this.closed;
     }
     consume(value, output) {
         this.pending = "";
@@ -154,12 +155,21 @@ export class ExternalAnswerDecoder {
                             this.block = "";
                             this.state = "inside";
                         }
+                        else if (!tag.closing && this.state === "inside") {
+                            // 嵌套答案标记说明模型正在讨论协议或混入了思考文本;
+                            // 不要把内层短片段误当成最终答案。
+                            this.rejected = true;
+                            this.block = "";
+                            this.state = "outside";
+                        }
                         else {
+                            this.rejected = true;
                             this.block = "";
                             this.state = tag.closing ? "outside" : "inside";
                         }
                     }
                     else if (tag.kind === "suspicious" || tag.kind === "known") {
+                        this.rejected = true;
                         this.block = "";
                         this.state = "outside";
                     }
@@ -171,6 +181,7 @@ export class ExternalAnswerDecoder {
                 else if (this.pending.length > MAX_MARKER_TAG_LENGTH + 2) {
                     const tag = classifyMarkerTag(this.pending.slice(1));
                     if (tag.kind === "suspicious" || tag.kind === "known") {
+                        this.rejected = true;
                         this.block = "";
                         this.state = "outside";
                     }

package/dist/i18n.js

@@ -38,6 +38,12 @@ const zh = {
     "Starting computer setup pairing...": "正在发起电脑接入授权…",
     "Token setup does not require browser authorization. CREW_MACHINE_TOKEN is also supported.": "Token 接入无需浏览器授权，也支持 CREW_MACHINE_TOKEN。",
     "Checking computer connection information...": "正在检查接入信息…",
+    "Checking the existing computer connection...": "正在检查已有电脑连接…",
+    "Downloading the Daemon package...": "正在下载 Daemon 安装包…",
+    "Configuring the Daemon service...": "正在配置 Daemon 服务…",
+    "Starting the Daemon service...": "正在启动 Daemon 服务…",
+    "This computer is already connected. No installation changes are needed.": "此电脑已经连接，无需修改安装。",
+    "Setup is still in progress; check the original terminal and wait for it to finish": "接入仍在进行中，请查看原来的终端并等待接入完成。",
     "Downloading, installing, and starting the Daemon service...": "正在下载、安装并启动 Daemon 服务…",
     "Confirming the computer connection...": "正在确认电脑连接…",
     "Connected to {{workspace}}.": "已接入 {{workspace}}。",

package/dist/local-executor.js

@@ -962,17 +962,22 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
                 await writeFile(legacyCwdMarker, "1", "utf8");
             }
         }
+        const externalAnswer = runtime.name === "pi"
+            ? externalOutput.lastClosedBlock
+            : externalOutput.lastClosedBlock
+                ?? (finalText === null ? null : extractExternalAnswer(finalText));
+        const reportFinalText = runtime.name === "pi" && externalAnswer === null
+            ? null
+            : finalText;
         const cloudReportResult = exitCode === 0
             ? await deliverCloudReports({
-                facts: cloudReportUpload, ...reportRoots, before: reportSnapshot, finalText,
+                facts: cloudReportUpload, ...reportRoots, before: reportSnapshot, finalText: reportFinalText,
                 receiptFile: reportContext.receiptFile,
-                externalAnswer: externalOutput.lastClosedBlock
-                    ?? (finalText === null ? null : extractExternalAnswer(finalText)),
+                externalAnswer,
                 captureFinal: input.captureFinal, executionId: input.executionId, agentHandle: input.handle,
                 ...(dependencies.uploadCloudReports === undefined ? {} : { upload: dependencies.uploadCloudReports }),
             })
-            : { finalText, externalAnswer: externalOutput.lastClosedBlock
-                    ?? (finalText === null ? null : extractExternalAnswer(finalText)) };
+            : { finalText: reportFinalText, externalAnswer };
         memoryPruneExecutorCompleted = true;
         localMemoryTelemetry?.markExecutorCompleted();
         return {
@@ -988,7 +993,9 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
             errorMessage: errorTail || null,
             ...(providerError === undefined ? {} : { providerError }),
             finalText: input.captureFinal && cloudReportResult.finalText !== null
-                ? stripExternalAnswerMarkers(cloudReportResult.finalText)
+                ? runtime.name === "pi" && cloudReportResult.externalAnswer === null
+                    ? null
+                    : stripExternalAnswerMarkers(cloudReportResult.finalText)
                 : null,
             externalAnswer: input.captureFinal ? cloudReportResult.externalAnswer : null,
             sentViaCrew,

package/dist/runtimes/pi.js

@@ -1,17 +1,85 @@
-export function buildPiArgs(options) { return ["--mode", "json", "--print", "--no-session", "--system-prompt", options.systemPrompt, ...(options.model ? ["--model", options.model] : []), ...(options.reasoning && options.reasoning !== "default" ? ["--thinking", options.reasoning] : [])]; }
-export function createPiEventDecoder() { let sessionId = null; let finalText = ""; let error = null; let sawTurnEnd = false; let usage; return { push(raw) { const e = (raw ?? {}); const out = []; if (e.type === "session" && typeof e.id === "string") {
-        sessionId = e.id;
-        out.push({ type: "thread.started", thread_id: e.id });
-    } const ae = e.assistantMessageEvent; if (e.type === "message_update" && ae?.type === "text_delta" && typeof ae.delta === "string") {
-        finalText += ae.delta;
-        out.push({ type: "pi.text_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 } : {}) }); if (e.type === "message_end" && e.message?.role === "assistant")
-        usage = e.message.usage; if (e.type === "turn_end") {
-        sawTurnEnd = true;
-        const u = usage;
-        out.push({ type: "turn.completed", ...(u ? { usage: { input_tokens: u.input ?? 0, output_tokens: u.output ?? 0, cache_read_input_tokens: u.cacheRead ?? 0, cache_creation_input_tokens: u.cacheWrite ?? 0 } } : {}) });
-    } if (e.type === "error" || e.type === "agent_error") {
-        error = typeof e.error === "string" ? e.error : (e.error?.message ?? "Pi error");
-        out.push({ type: "pi.error", message: error });
-    } return out; }, finish() { return { ok: error === null && sawTurnEnd, ...(error === null && sawTurnEnd ? {} : { error: error ?? "Pi stream ended without turn completion" }), finalText, sessionId, usage }; } }; }
+export function buildPiArgs(options) {
+    return ["--mode", "json", "--print", "--no-session", "--system-prompt", options.systemPrompt,
+        ...(options.model ? ["--model", options.model] : []),
+        ...(options.reasoning && options.reasoning !== "default" ? ["--thinking", options.reasoning] : [])];
+}
+// 保留稳定的原因标识供 server 本地化；不要用 token 数量猜测结束原因。
+function failureReason(message) {
+    const reason = message?.stopReason;
+    return reason === "stop" || reason === "toolUse" ? null : `pi_runtime_failed: ${reason ?? "incomplete"}`;
+}
+export function createPiEventDecoder() {
+    let sessionId = null;
+    let finalText = "";
+    let error = null;
+    let lastAssistant = null;
+    let assistantOpen = false;
+    let sawTurnEnd = false;
+    let usage;
+    return {
+        push(raw) {
+            const e = (raw ?? {});
+            const out = [];
+            if (e.type === "session" && typeof e.id === "string") {
+                sessionId = e.id;
+                out.push({ type: "thread.started", thread_id: e.id });
+            }
+            if (e.type === "turn_start")
+                sawTurnEnd = false;
+            if ((e.type === "message_start" || e.type === "message_update") && e.message?.role === "assistant") {
+                assistantOpen = true;
+                sawTurnEnd = false;
+            }
+            const ae = e.assistantMessageEvent;
+            if (e.type === "message_update" && ae?.type === "text_delta" && typeof ae.delta === "string") {
+                finalText += ae.delta;
+                out.push({ type: "pi.text_delta", text: ae.delta });
+            }
+            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 } : {}) });
+            }
+            if (e.type === "message_end" && e.message?.role === "assistant") {
+                lastAssistant = e.message;
+                usage = e.message.usage;
+                assistantOpen = false;
+                sawTurnEnd = false;
+            }
+            if (e.type === "turn_end") {
+                // 原生 turn_end 自带本轮消息，不能把工具调用轮的结束当成整次执行成功。
+                if (e.message?.role === "assistant") {
+                    lastAssistant = e.message;
+                    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 });
+            }
+            if (e.type === "error" || e.type === "agent_error") {
+                error = typeof e.error === "string" ? e.error : (e.error?.message ?? "Pi error");
+                out.push({ type: "pi.error", message: error });
+            }
+            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 };
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.98-beta.3",
+  "version": "0.6.98-beta.5",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -18,13 +18,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "daemon": "pnpm --filter @nowcrew/cli build && tsx src/main.ts",
-    "build": "tsc -p tsconfig.json",
-    "prepublishOnly": "pnpm build && node ../scripts/daemon-release-artifact.mjs --strict-registry",
-    "test": "vitest run",
-    "typecheck": "tsc --noEmit"
-  },
   "dependencies": {
     "@agentclientprotocol/sdk": "1.2.1",
     "@nowcrew/cli": "0.4.17",
@@ -46,5 +39,11 @@
     "tsx": "^4.19.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0"
+  },
+  "scripts": {
+    "daemon": "pnpm --filter @nowcrew/cli build && tsx src/main.ts",
+    "build": "tsc -p tsconfig.json",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit"
   }
-}
+}