@nowcrew/daemon 0.5.18 → 0.5.20

package/dist/external-output.js

@@ -0,0 +1,114 @@
+export const EXTERNAL_ANSWER_OPEN = "<nowwork_external_answer>";
+export const EXTERNAL_ANSWER_CLOSE = "</nowwork_external_answer>";
+function retainedMarkerPrefix(value, marker) {
+    const maximum = Math.min(value.length, marker.length - 1);
+    for (let length = maximum; length > 0; length -= 1) {
+        if (marker.startsWith(value.slice(-length)))
+            return length;
+    }
+    return 0;
+}
+export class ExternalAnswerDecoder {
+    state = "outside";
+    pending = "";
+    push(text) {
+        if (!text)
+            return [];
+        const output = [];
+        this.consume(this.pending + text, output);
+        return output;
+    }
+    finish() {
+        this.pending = "";
+        this.state = "outside";
+        return [];
+    }
+    consume(value, output) {
+        this.pending = "";
+        const marker = this.state === "outside" ? EXTERNAL_ANSWER_OPEN : EXTERNAL_ANSWER_CLOSE;
+        const markerAt = value.indexOf(marker);
+        if (markerAt >= 0) {
+            if (this.state === "inside" && markerAt > 0)
+                output.push(value.slice(0, markerAt));
+            this.state = this.state === "outside" ? "inside" : "outside";
+            const remaining = value.slice(markerAt + marker.length);
+            if (remaining)
+                this.consume(remaining, output);
+            return;
+        }
+        const retained = retainedMarkerPrefix(value, marker);
+        const safe = retained > 0 ? value.slice(0, -retained) : value;
+        this.pending = retained > 0 ? value.slice(-retained) : "";
+        if (this.state === "inside" && safe)
+            output.push(safe);
+    }
+}
+export function decodeExternalOutputEvent(runtime, event, decoder) {
+    if (runtime === "claude") {
+        const candidate = (event ?? {});
+        const delta = candidate.event?.delta;
+        if (candidate.type !== "stream_event"
+            || candidate.event?.type !== "content_block_delta"
+            || delta?.type !== "text_delta"
+            || typeof delta.text !== "string")
+            return [];
+        return decoder.push(delta.text);
+    }
+    const candidate = (event ?? {});
+    if (runtime === "codex") {
+        return candidate.type === "item.completed"
+            && candidate.item?.type === "agent_message"
+            && typeof candidate.item.text === "string"
+            ? decoder.push(candidate.item.text)
+            : [];
+    }
+    return candidate.type === undefined
+        && candidate.role === "assistant"
+        && typeof candidate.content === "string"
+        ? decoder.push(candidate.content)
+        : [];
+}
+export function stripExternalAnswerMarkers(value) {
+    const sections = [];
+    let cursor = 0;
+    while (cursor < value.length) {
+        const openAt = value.indexOf(EXTERNAL_ANSWER_OPEN, cursor);
+        if (openAt < 0)
+            break;
+        const contentAt = openAt + EXTERNAL_ANSWER_OPEN.length;
+        const closeAt = value.indexOf(EXTERNAL_ANSWER_CLOSE, contentAt);
+        if (closeAt < 0)
+            return value.slice(contentAt).trim();
+        sections.push(value.slice(contentAt, closeAt));
+        cursor = closeAt + EXTERNAL_ANSWER_CLOSE.length;
+    }
+    return (sections.length > 0 ? sections.join("") : value).trim();
+}
+/**
+ * 提取 marker 内容:有 marker 返回拼接内容(trim,空→null),无 marker 返回 null。
+ * 与 stripExternalAnswerMarkers 的区别:strip 在无 marker 时回退整段原文(finalText 展示用),
+ * 本函数用于判定"agent 是否给出了频道直接回复"——必须能区分有无 marker。
+ */
+export function extractExternalAnswer(value) {
+    const parts = [];
+    let found = false;
+    let rest = value;
+    for (;;) {
+        const open = rest.indexOf(EXTERNAL_ANSWER_OPEN);
+        if (open < 0)
+            break;
+        found = true;
+        const afterOpen = rest.slice(open + EXTERNAL_ANSWER_OPEN.length);
+        const close = afterOpen.indexOf(EXTERNAL_ANSWER_CLOSE);
+        if (close < 0) {
+            parts.push(afterOpen);
+            break;
+        }
+        parts.push(afterOpen.slice(0, close));
+        rest = afterOpen.slice(close + EXTERNAL_ANSWER_CLOSE.length);
+    }
+    if (!found)
+        return null;
+    const answer = parts.join("").trim();
+    return answer.length > 0 ? answer : null;
+}

package/dist/i18n.js

@@ -17,6 +17,8 @@ export function detectDaemonLang(env = process.env) {
 }
 const zh = {
     "Claude session started": "Claude 会话启动",
+    "Codex session started": "Codex 会话启动",
+    "Files changed": "文件变更",
     "Run failed": "运行出错",
     "Run finished": "本轮结束",
     "Missing CREW_MACHINE_TOKEN (sk_machine_*, printed by seed)": "缺少 CREW_MACHINE_TOKEN（sk_machine_*，由 seed 打印）",
@@ -40,6 +42,7 @@ const zh = {
     "Saved profile '{{name}}' with private credentials.": "已保存配置 '{{name}}'，凭证仅私有可读。",
     "Service '{{id}}' is not installed": "服务 '{{id}}' 尚未安装",
     "Upgraded daemon and restart request accepted for '{{name}}'. Verify with status.": "daemon 已升级，并已请求重启 '{{name}}'；请用 status 确认。",
+    "Upgraded daemon but skipped restart for '{{name}}': {{reason}}": "daemon 已升级，但已跳过 '{{name}}' 的重启：{{reason}}",
     "Upgraded daemon. Installed services were not restarted; pass --profile to restart one.": "daemon 已升级；已安装服务尚未重启，可传入 --profile 重启指定服务。",
     "Service lifecycle requires the built daemon entry (.js), not a TypeScript development entry": "服务生命周期必须使用已构建的 daemon 入口（.js），不能使用 TypeScript 开发入口",
     "Installed '{{id}}'. Use status to confirm runtime state.": "已安装 '{{id}}'；请用 status 确认运行状态。",
@@ -47,6 +50,7 @@ const zh = {
     "{{action}} request accepted for '{{id}}'. Verify with status.": "已接受对 '{{id}}' 的 {{action}} 请求；请用 status 确认。",
     "--token-stdin requires a token on standard input": "--token-stdin 需要从标准输入读取令牌",
     "Service lifecycle requires a global @nowcrew/daemon install; run npm install --global @nowcrew/daemon@latest": "服务生命周期需要全局安装 @nowcrew/daemon；请运行 npm install --global @nowcrew/daemon@latest",
+    "Profile '{{profile}}' conflicts with profile '{{conflict}}': both resolve to agents root '{{agentsRoot}}'. Save it with a unique root, for example: {{command}}": "配置 '{{profile}}' 与配置 '{{conflict}}' 解析到了同一个 agents root '{{agentsRoot}}'。请保存为唯一目录，例如：{{command}}",
 };
 export function translateDaemon(lang, message) {
     if (lang === "zh")
@@ -54,9 +58,5 @@ export function translateDaemon(lang, message) {
     return message;
 }
 export function formatDaemonText(lang, message, values = {}) {
-    let rendered = translateDaemon(lang, message);
-    for (const [key, value] of Object.entries(values)) {
-        rendered = rendered.replaceAll(`{{${key}}}`, String(value));
-    }
-    return rendered;
+    return translateDaemon(lang, message).replace(/\{\{([^{}]+)\}\}/g, (token, key) => Object.hasOwn(values, key) ? String(values[key]) : token);
 }

package/dist/list-models.js

@@ -2,8 +2,15 @@ import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { isWin } from "./platform.js";
 const execFileRaw = promisify(execFile);
+const MODEL_PROBE_TIMEOUT_MS = 8_000;
+const MODEL_PROBE_MAX_BUFFER_BYTES = 1024 * 1024;
 // win32 上 npm CLI 是 .cmd shim,execFile 需 shell 才能执行;参数全是固定字面量,无注入面。
-const execFileP = (bin, args) => execFileRaw(bin, args, { shell: isWin() });
+const execFileP = (bin, args) => execFileRaw(bin, args, {
+    shell: isWin(),
+    timeout: MODEL_PROBE_TIMEOUT_MS,
+    killSignal: "SIGKILL",
+    maxBuffer: MODEL_PROBE_MAX_BUFFER_BYTES,
+});
 export async function listRuntimeModels(runtime) {
     switch (runtime) {
         case "codex":
@@ -21,15 +28,44 @@ export async function listRuntimeModels(runtime) {
 function parseCodexModels(stdout) {
     try {
         const parsed = JSON.parse(stdout);
-        const rows = Array.isArray(parsed.models) ? parsed.models : [];
-        return rows
-            .filter((m) => typeof m.id === "string" && (m.visibility == null || m.visibility === "list"))
-            .map((m, index) => ({ id: m.id, label: m.name || m.id, ...((m.default || index === 0) ? { default: true } : {}) }));
+        if (typeof parsed !== "object" || parsed === null || !Array.isArray(parsed.models)) {
+            return [];
+        }
+        return normalizeCodexModels(parsed.models);
     }
     catch {
         return [];
     }
 }
+function normalizeCodexModels(rows) {
+    const normalized = rows.flatMap((value) => {
+        if (typeof value !== "object" || value === null)
+            return [];
+        const row = value;
+        if (row.visibility != null && row.visibility !== "list")
+            return [];
+        const id = nonEmptyString(row.slug) ?? nonEmptyString(row.id);
+        if (id === null)
+            return [];
+        return [{
+                id,
+                label: nonEmptyString(row.display_name) ?? nonEmptyString(row.name) ?? id,
+                explicitDefault: row.default === true,
+            }];
+    });
+    const hasExplicitDefault = normalized.some((model) => model.explicitDefault);
+    return normalized.map((model, index) => ({
+        id: model.id,
+        label: model.label,
+        ...((model.explicitDefault || (!hasExplicitDefault && index === 0)) ? { default: true } : {}),
+    }));
+}
+function nonEmptyString(value) {
+    if (typeof value !== "string")
+        return null;
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : null;
+}
 function parseCursorModels(stdout) {
     return stdout
         .split(/\r?\n/)

package/dist/local-executor.js

@@ -6,10 +6,15 @@ import { spawnClaude } from "./runtimes/claude.js";
 import { spawnCodex } from "./runtimes/codex.js";
 import { spawnKimi, KIMI_EFFORT_LEVELS } from "./runtimes/kimi.js";
 import { applyProviderEnv, providerFingerprint } from "./provider-env.js";
+import { augmentedPath } from "./runtime-path.js";
 import { extractFinalText, extractRunMeta, normalizeEvent, parseLine, } from "./normalize.js";
 import { readSession, writeSession, pickResumeId, isNearBudget } from "./session.js";
 import { toConsoleLines } from "./console.js";
 import { capMemoryForInject, capWorkLogForInject } from "./prompt.js";
+import { decodeExternalOutputEvent, extractExternalAnswer, ExternalAnswerDecoder, stripExternalAnswerMarkers, } from "./external-output.js";
+import { cleanupMaterializedAttachments as cleanupAttachments, executionAttachmentDirectory, materializeAttachments, } from "./attachments.js";
+import { routeRuntimeAttachments, runtimeCapability, } from "./runtime-capabilities.js";
+import { awaitWithCancellation, RuntimeCancelledError, } from "./runtime-cancellation.js";
 function truncateUtf8(value, maxBytes) {
     if (maxBytes <= 0)
         return "";
@@ -118,6 +123,7 @@ async function launchLegacyRuntime(request) {
         return wrapChild(spawnCodex({
             ...common,
             wakePrompt: `${request.systemPrompt}\n\n${request.wakePrompt}`,
+            ...(request.imagePaths === undefined ? {} : { imagePaths: request.imagePaths }),
         }));
     }
     return wrapChild(spawnKimi({
@@ -133,24 +139,29 @@ function resolvePrompt(prompt, context) {
     return typeof prompt === "string" ? prompt : prompt(context);
 }
 const nativeSessionLeaseTails = new Map();
-async function withKeyedLease(key, operation) {
+async function withKeyedLease(key, operation, cancellation) {
     const predecessor = nativeSessionLeaseTails.get(key) ?? Promise.resolve();
     let release;
     const current = new Promise((resolve) => { release = resolve; });
     const tail = predecessor.then(() => current);
     nativeSessionLeaseTails.set(key, tail);
-    await predecessor;
     try {
+        await awaitWithCancellation(predecessor, cancellation);
         return await operation();
     }
     finally {
         release();
-        if (nativeSessionLeaseTails.get(key) === tail)
-            nativeSessionLeaseTails.delete(key);
+        void tail.then(() => {
+            if (nativeSessionLeaseTails.get(key) === tail)
+                nativeSessionLeaseTails.delete(key);
+        });
     }
 }
 export async function executeLocal(input, callbacks = {}, dependencies = {}) {
-    if (input.runtime.name !== "claude" || !input.session.enabled) {
+    const stableProtocolRuntime = dependencies.launchRuntime !== undefined;
+    const supportsNativeResume = input.runtime.name === "claude"
+        || (stableProtocolRuntime && runtimeCapability(input.runtime.name).nativeResume);
+    if (!supportsNativeResume || !input.session.enabled) {
         return executeLocalUnlocked(input, callbacks, dependencies);
     }
     const leaseKey = JSON.stringify([
@@ -159,14 +170,14 @@ export async function executeLocal(input, callbacks = {}, dependencies = {}) {
         input.keyMode ?? "legacy",
         input.resumeKey ?? input.taskKey ?? "",
     ]);
-    return withKeyedLease(leaseKey, () => executeLocalUnlocked(input, callbacks, dependencies));
+    return withKeyedLease(leaseKey, () => executeLocalUnlocked(input, callbacks, dependencies), dependencies.cancellation);
 }
 async function executeLocalUnlocked(input, callbacks, dependencies) {
     const providerConfig = input.launch.providerConfig ?? {};
     const { runtime } = input;
     const currentModel = runtime.model ?? null;
     const providerFp = providerFingerprint(runtime.name, providerConfig);
-    const workspace = await prepareWorkspace({
+    const workspace = await awaitWithCancellation(prepareWorkspace({
         agentsRoot: input.launch.agentsRoot,
         handle: input.handle,
         cliPath: input.launch.cliPath,
@@ -175,9 +186,12 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
         ...(input.taskKey === undefined ? {} : { taskKey: input.taskKey }),
         ...(input.resumeKey === undefined ? {} : { resumeKey: input.resumeKey }),
         ...(input.launch.description ? { description: input.launch.description } : {}),
-    });
+    }), dependencies.cancellation);
+    let materialized = null;
+    let knownAttachmentDirectory = null;
     try {
-        const supportsNativeResume = runtime.name === "claude";
+        const supportsNativeResume = runtime.name === "claude"
+            || (dependencies.launchRuntime !== undefined && runtimeCapability(runtime.name).nativeResume);
         const prior = input.session.enabled && supportsNativeResume
             ? await readSession(workspace.sessionDir)
             : null;
@@ -197,13 +211,44 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
             nearBudget,
         };
         const systemPrompt = resolvePrompt(input.systemPrompt, promptContext);
-        const wakePrompt = resolvePrompt(input.wakePrompt, promptContext);
-        await writeFile(workspace.systemPromptPath, systemPrompt, "utf8");
+        if (input.attachments && input.attachments.length > 0) {
+            if (dependencies.cancellation?.isRequested())
+                throw new RuntimeCancelledError();
+            knownAttachmentDirectory = executionAttachmentDirectory(workspace.runDir, input.executionId);
+            const controller = new AbortController();
+            const materialization = Promise.resolve().then(() => (dependencies.materializeAttachments ?? materializeAttachments)({
+                serverUrl: input.launch.serverUrl,
+                token: input.launch.token,
+                runDir: workspace.runDir,
+                executionId: input.executionId,
+                attachments: input.attachments,
+                signal: controller.signal,
+            }));
+            dependencies.cancellation?.register(async () => {
+                controller.abort(new RuntimeCancelledError());
+                await materialization.then(() => undefined, () => undefined);
+            });
+            try {
+                materialized = await materialization;
+            }
+            catch (error) {
+                if (dependencies.cancellation?.isRequested())
+                    throw new RuntimeCancelledError();
+                throw error;
+            }
+            if (dependencies.cancellation?.isRequested()) {
+                await dependencies.cancellation.waitForStop();
+                throw new RuntimeCancelledError();
+            }
+        }
+        const attachmentPlan = routeRuntimeAttachments(runtime.name, materialized?.attachments ?? []);
+        const wakePrompt = `${resolvePrompt(input.wakePrompt, promptContext)}${attachmentPlan.promptSuffix}`;
+        await awaitWithCancellation(writeFile(workspace.systemPromptPath, systemPrompt, "utf8"), dependencies.cancellation);
         const baseEnv = {
             ...process.env,
             ...sanitizeEnvVars(providerConfig.envVars),
             ...input.launch.systemEnv,
-            PATH: `${workspace.crewDir}${delimiter}${process.env.PATH ?? ""}`,
+            PATH: `${workspace.crewDir}${delimiter}${augmentedPath()}`,
             CREW_SERVER_URL: input.launch.serverUrl,
             CREW_TOKEN: input.launch.token,
             CREW_CHANNEL: input.channelId,
@@ -222,6 +267,8 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
         };
         const childEnv = applyProviderEnv(baseEnv, runtime.name, providerConfig, workspace.homeDir);
         const launchRuntime = dependencies.launchRuntime ?? launchLegacyRuntime;
+        if (dependencies.cancellation?.isRequested())
+            throw new RuntimeCancelledError();
         const child = await launchRuntime({
             runtime: runtime.name,
             bin: runtime.name,
@@ -235,13 +282,24 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
             ...(runtime.reasoning === undefined ? {} : { reasoning: runtime.reasoning }),
             ...(launchSessionId === null ? {} : { sessionId: launchSessionId }),
             resume: resuming,
+            ...(attachmentPlan.nativeImagePaths.length > 0
+                ? { imagePaths: attachmentPlan.nativeImagePaths }
+                : {}),
         });
+        if (child.cancel !== undefined) {
+            dependencies.cancellation?.register(child.cancel);
+        }
+        if (dependencies.cancellation?.isRequested()) {
+            await dependencies.cancellation.waitForStop();
+            throw new RuntimeCancelledError();
+        }
         const activities = [];
         let sessionId = launchSessionId;
         let usage;
         let observedModel = currentModel;
         let finalText = null;
         let sentViaCrew = false;
+        const externalOutput = new ExternalAnswerDecoder();
         const readline = createInterface({ input: child.stdout });
         readline.on("line", (line) => {
             const event = parseLine(line);
@@ -266,6 +324,9 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
                     && "type" in event && event.type === "kimi.acp.text_delta";
                 finalText = incremental ? `${finalText ?? ""}${extracted}` : extracted;
             }
+            for (const text of decodeExternalOutputEvent(runtime.name, event, externalOutput)) {
+                callbacks.onExternalOutput?.(text);
+            }
             for (const chunk of toConsoleLines(event))
                 callbacks.onConsole?.(chunk);
         });
@@ -274,7 +335,17 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
             process.stderr.write(data);
             stderrTail = (stderrTail + String(data)).slice(-STDERR_TAIL_CAP);
         });
-        const { exitCode, spawnError, terminationSignal } = await child.exit;
+        let runtimeExit;
+        try {
+            runtimeExit = await awaitWithCancellation(child.exit, dependencies.cancellation);
+        }
+        catch (error) {
+            if (error instanceof RuntimeCancelledError) {
+                await dependencies.cancellation?.waitForStop();
+            }
+            throw error;
+        }
+        const { exitCode, spawnError, terminationSignal } = runtimeExit;
         const errorTail = [
             stderrTail.trim(),
             spawnError,
@@ -313,11 +384,29 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
             resumed: resuming,
             sessionId,
             errorMessage: errorTail || null,
-            finalText: input.captureFinal ? finalText : null,
+            finalText: input.captureFinal && finalText !== null
+                ? stripExternalAnswerMarkers(finalText)
+                : null,
+            externalAnswer: input.captureFinal && finalText !== null
+                ? extractExternalAnswer(finalText)
+                : null,
             sentViaCrew,
         };
     }
     finally {
+        const attachmentDirectories = new Set([
+            ...(knownAttachmentDirectory === null ? [] : [knownAttachmentDirectory]),
+            ...(materialized === null ? [] : [materialized.directory]),
+        ]);
+        for (const directory of attachmentDirectories) {
+            try {
+                await (dependencies.cleanupMaterializedAttachments ?? cleanupAttachments)(directory);
+            }
+            catch (error) {
+                const detail = error instanceof Error ? error.message : String(error);
+                process.stderr.write(`[execution] failed to remove attachments ${directory}: ${detail}\n`);
+            }
+        }
         try {
             await rm(workspace.systemPromptPath, { force: true });
         }

package/dist/machine-info.js

@@ -4,6 +4,7 @@
  */
 import { hostname, arch, platform as osPlatform } from "node:os";
 import { lookupCmd } from "./platform.js";
+import { augmentedPath } from "./runtime-path.js";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { readFileSync } from "node:fs";
@@ -21,6 +22,9 @@ export const DAEMON_CAPABILITIES = [
     "reply_origin_v1",
     "origin_decision_v1",
     "execution_telemetry_ack_v1",
+    "execution_external_output_v1",
+    "execution_attachments_v1",
+    "execution_answer_stream_v1",
 ];
 export const EXECUTION_PROTOCOL = Object.freeze({ min: 1, max: 1 });
 /** 候选 runtime CLI:展示名 → 可执行文件名。 */
@@ -36,7 +40,8 @@ const RUNTIME_BINS = [
 ];
 async function isInstalled(bin) {
     try {
-        await execFileP(lookupCmd(), [bin]);
+        // 用增强 PATH 探测:daemon 继承的 PATH 可能缺 ~/.local/bin 等用户级目录(Claude 原生安装器落点)。
+        await execFileP(lookupCmd(), [bin], { env: { ...process.env, PATH: augmentedPath() } });
         return true;
     }
     catch {

package/dist/main.js

@@ -6,15 +6,17 @@
  * 后续 (M3c):常驻 + 连 server 控制面 WS,由 agent:start 自动唤醒。
  */
 import { parseArgs } from "node:util";
+import { homedir } from "node:os";
 import { loadConfig, ConfigError } from "./config.js";
-import { detectDaemonLang, translateDaemon } from "./i18n.js";
+import { detectDaemonLang, formatDaemonText, translateDaemon } from "./i18n.js";
 import { cliVersion, daemonVersion } from "./machine-info.js";
 import { runAgent } from "./runner.js";
 import { serve } from "./serve.js";
 import { initSlog, flushSlog } from "./slog.js";
 import { formatDaemonLogLine } from "./log-format.js";
-import { loadProfile, applyProfileToEnv } from "./computer-profile.js";
+import { applyProfileToEnv, assertProfileAgentsRootUnique, daemonHome, loadProfile, PROFILE_AGENTS_ROOT_CONFLICT_MESSAGE, ProfileAgentsRootConflictError, } from "./computer-profile.js";
 import { runComputerCommand } from "./computer-cli.js";
+import { runServeLifecycle } from "./serve-lifecycle.js";
 async function main() {
     const computerResult = await runComputerCommand(process.argv.slice(2));
     if (computerResult !== null) {
@@ -51,8 +53,13 @@ async function main() {
     // 不把 machine token 放进 argv / plist / systemd unit / scheduled task。
     if (values["daemon-home"])
         process.env.CREW_DAEMON_HOME = values["daemon-home"];
-    if (values.profile)
-        applyProfileToEnv(await loadProfile(values.profile), process.env);
+    if (values.profile) {
+        const home = daemonHome();
+        const profile = await loadProfile(values.profile, home);
+        if (cmd === "serve")
+            await assertProfileAgentsRootUnique(profile, home, homedir());
+        applyProfileToEnv(profile, process.env);
+    }
     // 命令行参数优先于环境变量,填回 env 供 loadConfig 读取
     if (values["server-url"])
         process.env.CREW_SERVER_URL = values["server-url"];
@@ -72,8 +79,8 @@ async function main() {
     }
     if (cmd === "serve") {
         process.stdout.write(formatDaemonLogLine(`🛰️  crew-daemon v${daemonVersion()} (cli v${cliVersion()}) ${td("resident, connecting to")} ${config.serverUrl} ${td("control plane")}...`) + "\n");
-        serve(config);
-        await new Promise(() => { }); // 常驻,直到被 kill
+        const service = serve(config);
+        await runServeLifecycle(service);
         return;
     }
     if (!values.agent || !values.channel) {
@@ -93,6 +100,14 @@ async function main() {
     process.exit(result.exitCode);
 }
 main().catch((e) => {
-    process.stderr.write(`crew-daemon: ${e.message}\n`);
-    process.exit(1);
+    const message = e instanceof ProfileAgentsRootConflictError
+        ? formatDaemonText(detectDaemonLang(), PROFILE_AGENTS_ROOT_CONFLICT_MESSAGE, {
+            profile: e.profile,
+            conflict: e.conflict,
+            agentsRoot: e.agentsRoot,
+            command: e.command,
+        })
+        : e.message;
+    process.stderr.write(`crew-daemon: ${message}\n`);
+    process.exitCode = 1;
 });

package/dist/origin-decision.js

@@ -27,7 +27,9 @@ export async function readOriginDecisionFile(path) {
     }
 }
 export function shouldRetryOriginDecision(wakeOrigin, decision, attempt) {
-    return wakeOrigin === "wecom" && decision?.decision !== "reply" && attempt === 0;
+    if (attempt !== 0 || wakeOrigin === undefined)
+        return false;
+    return wakeOrigin === "wecom" ? decision?.decision !== "reply" : decision === null;
 }
 export async function runWithOriginDecisionGuard(wakeOrigin, runAttempt) {
     const first = await runAttempt(0);

package/dist/prompt.js

@@ -147,7 +147,10 @@ ${taskAndScheduleCommands}`;
         : ctx.wakeOrigin === "wecom"
             ? `
 - **本轮来自企微，结束本轮前必须给出一条完整回复**:确认、过程进展和内部协作仍用普通 \`crew message send\`，只写入 NowWork。最终只用一次 \`crew message send --reply-origin\`（同时带当前 channel/thread/content 参数）发送有实质内容的完整结果；不要把 \`--send-draft\` 当成草稿 ID 或外部回复开关。Server 仍会校验 thread 来源和机器人绑定，并在本轮未形成可交付内容时发送统一兜底回复。`
-            : `
+            : ctx.wakeOrigin
+                ? `
+- **本轮来自${ctx.wakeOrigin === "feishu" ? "飞书" : ctx.wakeOrigin}，结束本轮前必须明确选择外部回复决策**:确认、过程进展和内部协作仍用普通 \`crew message send\`，只写入 NowWork。完整结果确实要回复外部会话时，用 \`crew message send --reply-origin\`（同时带当前 channel/thread/content 参数）；判断无需回复时，用 \`crew message skip-origin --reason "简短原因"\`。两者必须选择一个；不要把 \`--send-draft\` 当成草稿 ID 或外部回复开关。Server 仍会校验 thread 来源和机器人绑定。`
+                : `
 - **本轮是 NowWork 内部唤醒**:普通 \`crew message send\` 只写入 NowWork。内部唤醒不得使用 \`--reply-origin\`，该参数只回答直接触发本轮的企微原消息。
 - **绑定会话主动通知**:用户明确要求同步，或最终结果有实质结论、变更或需群用户行动的阻塞时，才用一次 \`crew message send --notify-bound-im\`（同时带当前 channel/thread/content 参数）请求通知当前频道绑定的外部会话。Server 会校验绑定 owner 授权、绑定 Agent 和单轮边界；不能指定收件人。确认、进度、中间结果、无变化和重复内容一律留在 NowWork。`;
     const interactiveTaskRules = scheduled ? "" : `

package/dist/runner.js

@@ -4,10 +4,12 @@ import { join } from "node:path";
 import { mintAgentToken } from "./token.js";
 import { buildSystemPrompt, buildWakePrompt, capMemoryForInject, capWorkLogForInject } from "./prompt.js";
 import { deliverScheduledReport, } from "./scheduled-report.js";
-import { executeLocal } from "./local-executor.js";
+import { executeLocal, } from "./local-executor.js";
 import { ReasoningSchema } from "./execution-protocol.js";
 import { readOriginDecisionFile, resetOriginDecisionFile } from "./origin-decision.js";
 import { readBoundImDecisionFile, resetBoundImDecisionFile } from "./bound-im-decision.js";
+import { launchSupervisedRuntime } from "./supervised-runtime.js";
+import { awaitWithCancellation, } from "./runtime-cancellation.js";
 export { awaitExit, exitActivity, sanitizeEnvVars } from "./local-executor.js";
 const ICON = {
     init: "🟢", text: "💬", reading: "📖", sending: "📨", checking: "🔎",
@@ -18,24 +20,24 @@ function runtimeName(value) {
         return value;
     throw new Error(`unsupported runtime: ${value}`);
 }
-export async function runAgent(config, input, onActivity = defaultPrint, onConsole = () => { }) {
-    const credential = await mintAgentToken(config.serverUrl, config.machineToken, input.handle, input.displayName, {
+export async function runAgent(config, input, onActivity = defaultPrint, onConsole = () => { }, dependencies = {}) {
+    const credential = await awaitWithCancellation((dependencies.mintAgentToken ?? mintAgentToken)(config.serverUrl, config.machineToken, input.handle, input.displayName, {
         ...(input.wakeMessageId ? { wakeThreadRoot: input.wakeMessageId } : {}),
         ...(input.wakeContextUpToSeq === undefined ? {} : { wakeContextUpToSeq: input.wakeContextUpToSeq }),
         ...(input.runId ? { agentRunId: input.runId } : {}),
-    });
+    }), dependencies.cancellation);
     const providerConfig = credential.config ?? {};
     const runtime = runtimeName(providerConfig.runtime ?? config.runtimeBin);
     const reasoning = ReasoningSchema.safeParse(providerConfig.reasoning);
     const baseWake = input.wake ?? buildWakePrompt(input.channelId);
     const executionId = input.runId ?? `legacy-${randomUUID()}`;
-    const originDecisionFileName = input.wakeOrigin === "wecom"
+    const originDecisionFileName = input.wakeOrigin
         ? `.origin-decision-${executionId}.json`
         : null;
     const boundImDecisionFileName = input.scheduled?.externalNotificationPolicy === "agent_decides"
         ? `.bound-im-decision-${executionId}.json`
         : null;
-    const local = await executeLocal({
+    const local = await (dependencies.executeLocal ?? executeLocal)({
         executionId,
         handle: input.handle,
         channelId: input.channelId,
@@ -86,7 +88,7 @@ export async function runAgent(config, input, onActivity = defaultPrint, onConso
                 ...(providerConfig.fastMode ? { CREW_FAST_MODE: "1" } : {}),
                 ...(input.scheduled ? { CREW_SCHEDULE_OUTPUT_POLICY: input.scheduled.outputPolicy } : {}),
                 ...(originDecisionFileName ? {
-                    CREW_WAKE_ORIGIN: "wecom",
+                    CREW_WAKE_ORIGIN: input.wakeOrigin,
                     CREW_ORIGIN_DECISION_FILE: originDecisionFileName,
                 } : {}),
                 ...(boundImDecisionFileName ? {
@@ -101,7 +103,10 @@ export async function runAgent(config, input, onActivity = defaultPrint, onConso
             softTokens: config.sessionSoftTokens,
             maxTurns: config.sessionMaxTurns,
         },
-    }, { onActivity, onConsole });
+    }, { onActivity, onConsole }, {
+        launchRuntime: dependencies.launchRuntime ?? ((request) => launchSupervisedRuntime(request, dependencies.startSupervisor, dependencies.cancellation, dependencies.platform)),
+        ...(dependencies.cancellation === undefined ? {} : { cancellation: dependencies.cancellation }),
+    });
     const activities = [...local.activities];
     if (!input.scheduled && (runtime === "codex" || runtime === "kimi")
         && local.exitCode === 0 && !local.sentViaCrew && local.finalText) {
@@ -169,7 +174,7 @@ export async function runAgent(config, input, onActivity = defaultPrint, onConso
         ...(local.usage ? { usage: local.usage } : {}),
         ...(report ? { report } : {}),
         ...(boundImDecision ? { boundImDecision } : {}),
-        ...(input.wakeOrigin === "wecom" ? {
+        ...(input.wakeOrigin ? {
             originDecision: originDecision?.decision ?? "missing",
             ...(originDecision?.decision === "silent" && originDecision.reason
                 ? { originDecisionReason: originDecision.reason }