@nowcrew/daemon 0.6.88-beta.2 → 0.6.88-beta.21

package/dist/runtimes/codex-app-server-runner.js

@@ -9,6 +9,7 @@ import { signalSupervisorTree } from "../execution-supervisor.js";
 import { assertCodexCollaborationVersion, assertCodexNativeWorkspaceVersion, assertCodexProjectWorkspaceResponse, assertCodexSkillsListResponse, boundedCodexPlan, codexProjectWorkspaceUnsupported, } from "./codex-contract.js";
 import { decideTurnRetry, itemMakesTurnUnsafe } from "./codex-turn-retry.js";
 import { startFirstProgressWatchdog } from "./progress-watchdog.js";
+import { prepareThreadDelivery, ThreadDeliveryColdStartRequired } from "../thread-input-delivery.js";
 const RunnerInputSchema = z.object({
     systemPrompt: z.string().min(1),
     wakePrompt: z.string().min(1),
@@ -440,7 +441,7 @@ async function stopChildTree(child) {
         throw new Error(`Codex app-server process tree ${child.pid ?? "unknown"} did not exit`);
     }
 }
-async function runCodexAppServerAttempt(bin, input, attempt, initializeTimeoutMs) {
+async function runCodexAppServerAttempt(bin, input, attempt, initializeTimeoutMs, resumeEventSessionId) {
     const attemptStartedAt = Date.now();
     const child = spawn(bin, codexAppServerArgs({
         ...(input.projectRootMarkers === undefined ? {} : { projectRootMarkers: input.projectRootMarkers }),
@@ -589,6 +590,10 @@ async function runCodexAppServerAttempt(bin, input, attempt, initializeTimeoutMs
         }
         logStage(activeStage, "ok", attempt, stageStartedAt);
         threadId = thread.thread.id;
+        if (input.resume) {
+            if (!input.sessionId || threadId !== input.sessionId)
+                throw new Error("native_resume_session_mismatch");
+        }
         if (announcedThreadId !== threadId) {
             announcedThreadId = threadId;
             await jsonLine({ type: "thread.started", thread_id: threadId });
@@ -603,6 +608,15 @@ async function runCodexAppServerAttempt(bin, input, attempt, initializeTimeoutMs
                 throw codexProjectWorkspaceUnsupported();
             }
         }
+        activeStage = "thread_context";
+        stageStartedAt = Date.now();
+        const delivery = await prepareThreadDelivery({ env: process.env, resumed: input.resume,
+            sessionId: threadId, wakePrompt: input.wakePrompt });
+        // Publish cross-execution resume only after context preparation succeeds; a
+        // missing prior cursor can still cause a fresh session before any business turn.
+        if (input.resume && threadId === resumeEventSessionId)
+            await jsonLine({ type: "nowwork.native_resume", session_id: threadId });
+        logStage(activeStage, "ok", attempt, stageStartedAt);
         firstProgress = startFirstProgressWatchdog(() => {
             completionReject(new Error("Codex produced no semantic progress within the startup window"));
             void cancel();
@@ -612,7 +626,7 @@ async function runCodexAppServerAttempt(bin, input, attempt, initializeTimeoutMs
         const started = await rpc.request("turn/start", {
             threadId,
             input: [
-                { type: "text", text: input.wakePrompt, text_elements: [] },
+                { type: "text", text: delivery.prompt, text_elements: [] },
                 ...(input.imagePaths ?? []).map((path) => ({ type: "localImage", path })),
             ],
             ...(input.reasoning === undefined || input.reasoning === "default"
@@ -622,8 +636,11 @@ async function runCodexAppServerAttempt(bin, input, attempt, initializeTimeoutMs
                 sandboxPolicy: { type: "workspaceWrite", networkAccess: true },
             } : {}),
         });
-        logStage(activeStage, "ok", attempt, stageStartedAt);
+        if (!started || typeof started.turn?.id !== "string" || !started.turn.id)
+            throw new Error("invalid_turn_start_response");
         turnId = started.turn.id;
+        await delivery.commit();
+        logStage(activeStage, "ok", attempt, stageStartedAt);
         activeStage = "turn_complete";
         stageStartedAt = Date.now();
         const completed = await completion;
@@ -656,9 +673,15 @@ async function runCodexAppServerAttempt(bin, input, attempt, initializeTimeoutMs
             initializeTimedOut: false,
             ...(retryReason === undefined ? {} : { retryReason }),
             unsafeToRetry: turnHasUnsafeSideEffect || collabStartedMissing,
+            deliveredSessionId: threadId,
         };
     }
     catch (error) {
+        if (error instanceof ThreadDeliveryColdStartRequired && activeStage === "thread_context"
+            && turnId === null && !turnHasUnsafeSideEffect) {
+            logStage(activeStage, "error", attempt, stageStartedAt, "recovery=restart_cold_before_turn");
+            return { code: 1, initializeTimedOut: false, unsafeToRetry: false, restartCold: true };
+        }
         const initializeTimedOut = error instanceof CodexRpcTimeoutError && error.method === "initialize";
         if (initializeTimedOut) {
             const tail = stderr.redactedTail();
@@ -692,8 +715,19 @@ export async function runCodexAppServer(bin, options = {}) {
     const turnRetryDelayMs = options.turnRetryDelayMs ?? TRANSIENT_TURN_RETRY_DELAY_MS;
     let initializeTimeouts = 0;
     let turnRetries = 0;
+    let coldRestarted = false;
+    let attemptInput = input;
+    const resumeEventSessionId = input.resume ? input.sessionId : undefined;
     for (let attempt = 1;; attempt += 1) {
-        const result = await runCodexAppServerAttempt(bin, input, attempt, initializeTimeoutMs);
+        const result = await runCodexAppServerAttempt(bin, attemptInput, attempt, initializeTimeoutMs, resumeEventSessionId);
+        if (result.restartCold) {
+            if (coldRestarted)
+                return result.code;
+            coldRestarted = true;
+            const { sessionId: _oldSessionId, ...freshInput } = input;
+            attemptInput = { ...freshInput, resume: false };
+            continue;
+        }
         if (result.initializeTimedOut) {
             initializeTimeouts += 1;
             if (initializeTimeouts >= MAX_INITIALIZE_ATTEMPTS)
@@ -703,6 +737,11 @@ export async function runCodexAppServer(bin, options = {}) {
         }
         const decision = decideTurnRetry(result, turnRetries, MAX_TRANSIENT_TURN_RETRIES);
         if (decision.kind === "retry") {
+            // The accepted turn is already in the native transcript. Keep its session
+            // and committed thread cursor so a safe retry cannot inject full history twice.
+            if (process.env.CREW_THREAD_ROOT && result.deliveredSessionId) {
+                attemptInput = { ...input, resume: true, sessionId: result.deliveredSessionId };
+            }
             const delayMs = turnRetryDelayMs * TRANSIENT_TURN_RETRY_BACKOFF_FACTOR ** turnRetries;
             turnRetries += 1;
             process.stderr.write(`[codex-app-server] stage=retry status=start attempt=${attempt + 1} elapsed_ms=0 reason=${decision.reason}\n`);

package/dist/runtimes/deepseek-harness-profile.js

@@ -0,0 +1,92 @@
+/** 短命执行配置:不读取全局 Harness home,不新增 daemon 状态。 */
+import { mkdtemp, mkdir, writeFile, access } from "node:fs/promises";
+import { join, isAbsolute } from "node:path";
+import { stringify } from "yaml";
+export const harnessPermissionMode = (permission) => permission === "sandboxed"
+    ? "read-only"
+    : permission === "workspace_write"
+        ? "workspace-write"
+        : "danger-full-access";
+// A variable's returned value is interpolated once: literal {{...}} in NowWork
+// instructions must not become unknown Harness template variables.
+const instructionsPlugin = `export const name = 'nowwork-instructions';
+export const inject = ['systemPrompt'];
+export function apply(ctx, config) {
+  ctx.systemPrompt.variable('nowwork_instructions', () => config.text);
+  ctx.systemPrompt.section({name: 'nowwork-instructions', order: 100000, text: '{{nowwork_instructions}}'});
+}
+`;
+export async function prepareHarnessProfile(input) {
+    if (![input.stateRoot, input.cwd, ...input.skillRoots].every(isAbsolute)) {
+        throw new Error("DeepSeek Harness execution paths must be absolute");
+    }
+    if (input.patchPath !== undefined) {
+        if (!isAbsolute(input.patchPath))
+            throw new Error("DeepSeek Harness patch must be absolute");
+        await access(input.patchPath);
+    }
+    await mkdir(input.stateRoot, { recursive: true, mode: 0o700 });
+    const home = await mkdtemp(join(input.stateRoot, ".deepseek-harness-"));
+    const pluginPath = join(home, "nowwork-instructions.mjs");
+    const policyPath = join(home, "nowwork-policy.yml");
+    const mode = harnessPermissionMode(input.effectivePermission);
+    await writeFile(pluginPath, instructionsPlugin, { mode: 0o600 });
+    await writeFile(policyPath, stringify([
+        {
+            id: "sandbox-policy",
+            disabled: false,
+            config: { mode, workspaceRoot: input.cwd },
+        },
+        { id: "approval", disabled: false, config: { policy: "never" } },
+        {
+            id: "permission",
+            disabled: false,
+            config: {
+                defaultPreset: "nowwork",
+                presets: { nowwork: { sandbox: mode, approval: "never" } },
+            },
+        },
+        {
+            id: "skill-filesystem",
+            disabled: false,
+            config: {
+                includeDefaultRoots: false,
+                customSkillDirs: [...input.skillRoots],
+                watch: false,
+            },
+        },
+        {
+            id: "session-persistence-jsonl",
+            disabled: false,
+            config: { root: join(home, "sessions") },
+        },
+        {
+            insert: [
+                {
+                    id: "nowwork-instructions",
+                    name: pluginPath,
+                    config: { text: input.systemPrompt },
+                },
+            ],
+        },
+    ]), { mode: 0o600 });
+    const env = Object.fromEntries(Object.entries(input.env).filter(([key]) => !key.toUpperCase().startsWith("DSH_")));
+    return {
+        home,
+        policyPath,
+        args: [
+            "--profile",
+            "acp",
+            ...(input.patchPath ? ["--patch", input.patchPath] : []),
+            "--patch",
+            policyPath,
+        ],
+        env: {
+            ...env,
+            DSH_HOME: home,
+            DSH_AGENTS_HOME: join(home, "agents-home"),
+            DSH_PERMISSION_MODE: mode,
+            DSH_TELEMETRY_DISABLED: "1",
+        },
+    };
+}

package/dist/runtimes/deepseek-harness-runner.js

@@ -0,0 +1,224 @@
+/** 新版 Harness 的短命 ACP 桥:产品状态与重试仍属于 server。 */
+import { once } from "node:events";
+import { Readable, Writable } from "node:stream";
+import { parseArgs } from "node:util";
+import { pathToFileURL } from "node:url";
+import { isAbsolute } from "node:path";
+import spawn from "cross-spawn";
+import { z } from "zod";
+import { client, methods, ndJsonStream, PROTOCOL_VERSION, } from "@agentclientprotocol/sdk";
+import { prepareHarnessProfile } from "./deepseek-harness-profile.js";
+import { mapAcpUpdate } from "./kimi-acp-runner.js";
+import { prepareThreadDelivery } from "../thread-input-delivery.js";
+const absolutePath = z.string().refine(isAbsolute, "must be an absolute path");
+export const HarnessInputSchema = z
+    .object({
+    systemPrompt: z.string(),
+    wakePrompt: z.string().min(1),
+    stateRoot: absolutePath,
+    skillRoots: z.array(absolutePath).default([]),
+    effectivePermission: z.enum([
+        "sandboxed",
+        "workspace_write",
+        "full_access",
+    ]),
+})
+    .strict();
+const emit = async (event) => {
+    if (!process.stdout.write(`${JSON.stringify(event)}\n`))
+        await once(process.stdout, "drain");
+};
+async function settleWithin(promise, ms) {
+    let timer;
+    try {
+        return await Promise.race([
+            promise,
+            new Promise((resolve) => {
+                timer = setTimeout(() => resolve(undefined), ms);
+            }),
+        ]);
+    }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+    }
+}
+export async function runHarness(input, bin, patchPath) {
+    const delivery = await prepareThreadDelivery({
+        env: process.env,
+        resumed: false,
+        sessionId: "cold-harness",
+        wakePrompt: input.wakePrompt,
+    });
+    const profile = await prepareHarnessProfile({
+        ...input,
+        cwd: process.cwd(),
+        env: process.env,
+        ...(patchPath ? { patchPath } : {}),
+    });
+    const child = spawn(bin, profile.args, {
+        cwd: profile.home,
+        env: profile.env,
+        stdio: ["pipe", "pipe", "pipe"],
+    });
+    // Boot away from the repository: the CLI must not load a project's .env into
+    // trusted process credentials. ACP session/new carries the real workspace.
+    let spawnError;
+    const closed = new Promise((resolve) => {
+        child.once("error", (error) => {
+            spawnError = error;
+            resolve();
+        });
+        child.once("close", () => resolve());
+    });
+    if (!child.stdin || !child.stdout || !child.stderr)
+        throw new Error("DeepSeek Harness stdio unavailable");
+    // Provider diagnostics may include secrets or prompts; do not stream raw stderr.
+    child.stderr.resume();
+    let context;
+    let sessionId;
+    let cancelled = false;
+    let stage = "initialize";
+    let exitCode = 1;
+    let stopping;
+    const stop = () => (stopping ??= (async () => {
+        child.stdin?.end();
+        if (await settleWithin(closed.then(() => true), 2000))
+            return;
+        child.kill("SIGTERM");
+        if (await settleWithin(closed.then(() => true), 1000))
+            return;
+        child.kill("SIGKILL");
+        if (!(await settleWithin(closed.then(() => true), 2000)))
+            throw new Error("DeepSeek Harness process stop unconfirmed");
+    })());
+    const cancel = () => {
+        cancelled = true;
+        void (async () => {
+            if (context && sessionId)
+                await settleWithin(context
+                    .notify(methods.agent.session.cancel, { sessionId })
+                    .catch(() => undefined), 1000);
+            await stop();
+        })().catch(() => {
+            /* finally reports stop failure; supervisor owns process tree */
+        });
+    };
+    process.once("SIGTERM", cancel);
+    process.once("SIGINT", cancel);
+    const app = client({ name: "nowwork-harness" })
+        .onRequest(methods.client.session.requestPermission, () => ({
+        outcome: { outcome: "cancelled" },
+    }))
+        .onNotification(methods.client.session.update, async ({ params }) => {
+        if (params.sessionId !== sessionId)
+            return;
+        for (const event of mapAcpUpdate("deepseek-harness", params.update))
+            await emit(event);
+    });
+    try {
+        const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
+        const result = await app.connectWith(stream, async (ctx) => {
+            context = ctx;
+            const initialized = await ctx.request(methods.agent.initialize, {
+                protocolVersion: PROTOCOL_VERSION,
+                clientCapabilities: {},
+                clientInfo: { name: "nowwork", version: "1" },
+            });
+            if (initialized.protocolVersion !== PROTOCOL_VERSION)
+                throw new Error("Incompatible ACP protocol");
+            if (cancelled)
+                throw new Error("cancelled");
+            stage = "session_new";
+            const session = await ctx.request(methods.agent.session.new, {
+                cwd: process.cwd(),
+                mcpServers: [],
+            });
+            sessionId = session.sessionId;
+            if (!sessionId || cancelled)
+                throw new Error("Harness session unavailable");
+            await emit({ type: "thread.started", thread_id: sessionId });
+            stage = "prompt";
+            const response = await ctx.request(methods.agent.session.prompt, {
+                sessionId,
+                prompt: [{ type: "text", text: delivery.prompt }],
+            });
+            if (initialized.agentCapabilities?.sessionCapabilities?.close != null) {
+                stage = "session_close";
+                const close = await settleWithin(ctx
+                    .request(methods.agent.session.close, { sessionId })
+                    .then(() => true), 5000);
+                if (!close)
+                    throw new Error("Harness session close timed out");
+            }
+            return response;
+        });
+        const usage = result.usage;
+        if (!cancelled)
+            await emit({
+                type: "turn.completed",
+                stop_reason: result.stopReason,
+                ...(usage
+                    ? {
+                        usage: {
+                            input_tokens: usage.inputTokens,
+                            output_tokens: usage.outputTokens,
+                            cache_read_input_tokens: usage.cachedReadTokens ?? 0,
+                            cache_creation_input_tokens: usage.cachedWriteTokens ?? 0,
+                        },
+                    }
+                    : {}),
+            });
+        exitCode =
+            result.stopReason === "end_turn"
+                ? 0
+                : result.stopReason === "cancelled"
+                    ? 130
+                    : 1;
+    }
+    catch {
+        if (!cancelled)
+            process.stderr.write(spawnError
+                ? "DeepSeek Harness launch failed; verify the installed dsh executable.\n"
+                : `DeepSeek Harness ACP execution failed at ${stage}; verify the pinned version, machine credentials and profile patch.\n`);
+    }
+    finally {
+        try {
+            await stop();
+        }
+        finally {
+            process.off("SIGTERM", cancel);
+            process.off("SIGINT", cancel);
+        }
+    }
+    if (cancelled)
+        return 130;
+    return child.exitCode !== 0 ? 1 : exitCode;
+}
+async function main() {
+    const { values } = parseArgs({
+        options: { bin: { type: "string" }, patch: { type: "string" } },
+    });
+    if (!values.bin)
+        throw new Error("DeepSeek Harness --bin is required");
+    process.stdin.setEncoding("utf8");
+    let text = "";
+    for await (const chunk of process.stdin) {
+        text += String(chunk);
+        if (Buffer.byteLength(text) > 16 * 1024 * 1024)
+            throw new Error("Harness input exceeds 16 MiB");
+    }
+    const input = HarnessInputSchema.parse(JSON.parse(text));
+    return runHarness(input, values.bin, values.patch);
+}
+if (process.argv[1] &&
+    import.meta.url === pathToFileURL(process.argv[1]).href) {
+    main()
+        .then((code) => {
+        process.exitCode = code;
+    })
+        .catch(() => {
+        process.stderr.write("DeepSeek Harness configuration or cleanup failed; check execution paths and machine patch.\n");
+        process.exitCode = 1;
+    });
+}

package/dist/runtimes/deepseek-harness.js

@@ -1,20 +1,73 @@
 import spawn from "cross-spawn";
 import { isAbsolute } from "node:path";
-import { probeKimiAcp } from "./kimi-acp-runner.js";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { prepareHarnessProfile } from "./deepseek-harness-profile.js";
+import { probeKimiAcp, AcpProbeCleanupError } from "./kimi-acp-runner.js";
 export const DEEPSEEK_HARNESS_CONFIG_ENV = "NOWCREW_DEEPSEEK_HARNESS_CONFIG";
+export const DEEPSEEK_HARNESS_PATCH_ENV = "NOWCREW_DEEPSEEK_HARNESS_PATCH";
+export function deepSeekHarnessLauncher(env = process.env) {
+    const configPath = env[DEEPSEEK_HARNESS_CONFIG_ENV]?.trim();
+    const patchPath = env[DEEPSEEK_HARNESS_PATCH_ENV]?.trim();
+    if (configPath && !isAbsolute(configPath))
+        throw new Error(`${DEEPSEEK_HARNESS_CONFIG_ENV} must be an absolute path`);
+    if (patchPath && !isAbsolute(patchPath))
+        throw new Error(`${DEEPSEEK_HARNESS_PATCH_ENV} must be an absolute path`);
+    if (configPath && patchPath)
+        throw new Error("DeepSeek Harness legacy config and profile patch are mutually exclusive");
+    return configPath
+        ? { kind: "legacy", bin: "dsh-acp-demo", configPath }
+        : { kind: "profile", bin: "dsh", ...(patchPath ? { patchPath } : {}) };
+}
 export function deepSeekHarnessConfigPath(env = process.env) {
     const path = env[DEEPSEEK_HARNESS_CONFIG_ENV]?.trim();
     return path && isAbsolute(path) ? path : null;
 }
 /** The published DeepSeek Harness ACP executable speaks JSON-RPC directly on stdio. */
-export function probeDeepSeekHarnessAcp(options, spawnProcess = spawn) {
-    const configPath = options.configPath ?? deepSeekHarnessConfigPath();
-    if (!configPath || !isAbsolute(configPath))
-        return Promise.resolve(false);
-    return probeKimiAcp({
-        ...options,
-        provider: "deepseek-harness",
-        configPath,
-        effectivePermission: "sandboxed",
-    }, spawnProcess);
+export async function probeDeepSeekHarnessAcp(options, spawnProcess = spawn) {
+    if (options.signal?.aborted)
+        return false;
+    let root;
+    try {
+        const launcher = options.configPath === undefined
+            ? deepSeekHarnessLauncher()
+            : deepSeekHarnessLauncher({
+                [DEEPSEEK_HARNESS_CONFIG_ENV]: options.configPath,
+            });
+        if (launcher.kind === "legacy")
+            return await probeKimiAcp({
+                ...options,
+                provider: "deepseek-harness",
+                configPath: launcher.configPath,
+                effectivePermission: "sandboxed",
+            }, spawnProcess);
+        root = await mkdtemp(join(tmpdir(), "nowwork-dsh-probe-"));
+        const profile = await prepareHarnessProfile({
+            stateRoot: root,
+            cwd: root,
+            systemPrompt: "",
+            skillRoots: [],
+            effectivePermission: "sandboxed",
+            env: process.env,
+            ...(launcher.patchPath ? { patchPath: launcher.patchPath } : {}),
+        });
+        return await probeKimiAcp({
+            ...options,
+            provider: "deepseek-harness",
+            effectivePermission: "sandboxed",
+            launchArgs: profile.args,
+            launchEnv: profile.env,
+            launchCwd: root,
+        }, spawnProcess);
+    }
+    catch (error) {
+        if (error instanceof AcpProbeCleanupError)
+            throw error;
+        return false;
+    }
+    finally {
+        if (root)
+            await rm(root, { recursive: true, force: true }).catch(() => undefined);
+    }
 }

package/dist/runtimes/harness-probe-retry.js

@@ -0,0 +1,42 @@
+import { dslog } from "../slog.js";
+const RETRY_DELAYS_MS = [1_000, 2_000];
+/** 只延迟当前启动探测,不设后台定时任务;stop 立即清除等待。 */
+function waitForRetry(ms, signal) {
+    if (signal?.aborted)
+        return Promise.resolve(false);
+    return new Promise((resolve) => {
+        const finish = (ready) => {
+            clearTimeout(timer);
+            signal?.removeEventListener("abort", onAbort);
+            resolve(ready);
+        };
+        const onAbort = () => finish(false);
+        const timer = setTimeout(() => finish(true), ms);
+        signal?.addEventListener("abort", onAbort, { once: true });
+    });
+}
+/** 成功才公布能力;每次 probe 返回前已完成进程清理,异常保持原有传播。 */
+export async function retryHarnessProbe(probe, signal, probeId) {
+    for (let attempt = 1; attempt <= RETRY_DELAYS_MS.length + 1; attempt++) {
+        if (signal?.aborted)
+            return false;
+        const ready = await probe();
+        dslog("runtime_probe.harness_attempt", "Harness 启动探测尝试结束", {
+            probe_id: probeId, runtime: "deepseek-harness", attempt, ready,
+            aborted: signal?.aborted ?? false,
+        });
+        if (signal?.aborted)
+            return false;
+        if (ready)
+            return true;
+        const delayMs = RETRY_DELAYS_MS[attempt - 1];
+        if (delayMs === undefined)
+            return false;
+        dslog("runtime_probe.harness_retry", "延迟重试 Harness 启动探测", {
+            probe_id: probeId, runtime: "deepseek-harness", next_attempt: attempt + 1, delay_ms: delayMs,
+        });
+        if (!await waitForRetry(delayMs, signal))
+            return false;
+    }
+    return false;
+}