@nowcrew/daemon 0.6.88-beta.15 → 0.6.88-beta.17

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,71 @@
 import spawn from "cross-spawn";
 import { isAbsolute } from "node:path";
+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 } 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 {
+        return false;
+    }
+    finally {
+        if (root)
+            await rm(root, { recursive: true, force: true }).catch(() => undefined);
+    }
 }

package/dist/runtimes/kimi-acp-runner.js

@@ -1,3 +1,5 @@
+import { randomUUID } from "node:crypto";
+import { dslog } from "../slog.js";
 import { once } from "node:events";
 import { isAbsolute } from "node:path";
 import { parseArgs } from "node:util";
@@ -198,14 +200,22 @@ async function stopChild(child) {
 export async function probeKimiAcp(options, spawnProcess = spawn) {
     const provider = options.provider ?? "kimi";
     const permission = options.effectivePermission ?? "sandboxed";
-    const child = spawnProcess(options.bin, providerArgs(provider, options.configPath), {
-        cwd: process.cwd(),
+    const probeId = options.probeId ?? randomUUID();
+    const started = Date.now();
+    let reason = "initializing", protocolVersion;
+    let stderrSeen = false;
+    const fields = () => ({ probe_id: probeId, runtime: provider, duration_ms: Date.now() - started,
+        reason, protocol_version: protocolVersion, stderr_seen: stderrSeen, aborted: options.signal?.aborted ?? false });
+    dslog("execution.acp_probe_started", "ACP 探测开始", { probe_id: probeId, runtime: provider, node_version: process.version });
+    const child = spawnProcess(options.bin, options.launchArgs ?? providerArgs(provider, options.configPath), {
+        cwd: options.launchCwd ?? process.cwd(),
         // probe 在 daemon 自身 PATH 下运行,补上用户级 CLI 目录,与 which 探测保持一致。
-        env: { ...providerEnv(provider, permission), PATH: augmentedPath() },
+        env: { ...(options.launchEnv ?? providerEnv(provider, permission)), PATH: augmentedPath() },
         stdio: ["pipe", "pipe", "pipe"],
     });
     if (child.stdin === null || child.stdout === null || child.stderr === null)
         return false;
+    child.stderr.on("data", () => { stderrSeen = true; });
     child.stderr.resume();
     const app = client({ name: `nowcrew-daemon-${provider}-probe` })
         .onRequest(methods.client.session.requestPermission, () => ({
@@ -217,23 +227,32 @@ export async function probeKimiAcp(options, spawnProcess = spawn) {
     try {
         const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
         const connected = app.connectWith(stream, async (context) => {
-            await context.request(methods.agent.initialize, {
+            const initialized = await context.request(methods.agent.initialize, {
                 protocolVersion: PROTOCOL_VERSION,
                 clientCapabilities: {},
                 clientInfo: { name: "nowcrew-daemon", version: "1" },
             });
-            return true;
+            protocolVersion = initialized.protocolVersion;
+            const ready = protocolVersion === PROTOCOL_VERSION;
+            if (reason === "initializing")
+                reason = ready ? "ready" : "protocol_mismatch";
+            dslog("execution.acp_probe_handshake", "ACP 握手结果", { ...fields(), ready });
+            return ready;
         });
         const result = await Promise.race([
             connected,
             new Promise((resolve) => {
                 timeout = setTimeout(() => {
+                    if (reason === "initializing")
+                        reason = "timeout";
                     void stopChild(child);
                     resolve(false);
                 }, PROBE_TIMEOUT_MS);
             }),
             new Promise((resolve) => {
                 onAbort = () => {
+                    if (reason === "initializing")
+                        reason = "aborted";
                     void stopChild(child);
                     resolve(false);
                 };
@@ -246,6 +265,8 @@ export async function probeKimiAcp(options, spawnProcess = spawn) {
         return result;
     }
     catch {
+        if (reason === "initializing")
+            reason = options.signal?.aborted ? "aborted" : "transport_error";
         return false;
     }
     finally {
@@ -253,7 +274,17 @@ export async function probeKimiAcp(options, spawnProcess = spawn) {
             clearTimeout(timeout);
         if (onAbort !== undefined)
             options.signal?.removeEventListener("abort", onAbort);
-        await stopChild(child);
+        dslog("execution.acp_probe_cleanup_started", "ACP 探测清理开始", fields());
+        let cleanupFinished = false;
+        try {
+            await stopChild(child);
+            cleanupFinished = true;
+        }
+        finally {
+            dslog("execution.acp_probe_finished", "ACP 探测结束", { ...fields(),
+                cleanup_finished: cleanupFinished, exit_code: child.exitCode, exit_signal: child.signalCode,
+                level: reason === "ready" && cleanupFinished ? "INFO" : "WARN" });
+        }
     }
 }
 export async function runKimiAcp(requestedOptions) {

package/dist/serve.js

@@ -51,10 +51,9 @@ import { parseMemoryPruneTraceId } from "./memory-prune-diagnostics.js";
 import { probeRuntimeHealth } from "./runtime-health.js";
 import { handleRuntimeHealthProbeFrame } from "./runtime-health-handler.js";
 import { buildControlPlaneUrl } from "./control-plane-url.js";
-import { createServeMigrationController, handleMigrationControlMessage } from "./daemon-migration-wiring.js";
 import { createCodexHomeModeController } from "./codex-home-mode-controller.js";
 import { resolveDaemonLocalStateRootFromEnv } from "./daemon-local-home.js";
-import { attachStorageMigrationRuntime, bindStorageMigrationServerIdentity, createServeStorageStatusDelivery, handleStorageMigrationControl, replayStorageMigrationStatus, storageMigrationCapabilities, } from "./storage-serve-adapter.js";
+import { bindStorageServerIdentity, createStorageIdentityAdmission, } from "./storage-serve-adapter.js";
 export { buildControlPlaneUrl } from "./control-plane-url.js";
 // normalize.ts 的活动种类 → activity 枚举
 const ACTIVITY_MAP = {
@@ -127,17 +126,7 @@ export function serve(config, opts = {}) {
             catch { /* reconnect/timeout reconciliation handles a lost status frame */ }
         },
     });
-    let storageMigrationAdmissionClosed = () => false;
-    const migrationController = createServeMigrationController({
-        config,
-        ...(opts.profileName === undefined ? {} : { profileName: opts.profileName }),
-        isBusy: () => executionRuns.size > 0 || legacyRuns.size > 0,
-        sendStatus: (frame) => { try {
-            if (ws?.readyState === WebSocket.OPEN)
-                ws.send(JSON.stringify(frame));
-        }
-        catch { /* reconnect */ } },
-    });
+    const storageIdentityAdmission = createStorageIdentityAdmission(opts.storageRuntime);
     const codexHomeModeController = createCodexHomeModeController({ ...(opts.profileName === undefined ? {} : { profileName: opts.profileName }), scheduleRestart: opts.update?.scheduleRestart ?? scheduleServiceRestart, getServiceSpec: async () => { const eligibility = await updateEligibility(); return eligibility.eligible ? eligibility.serviceSpec : null; }, isBusy: () => executionRuns.size > 0 || legacyRuns.size > 0, sendStatus: (frame) => { try {
             if (ws?.readyState === WebSocket.OPEN)
                 ws.send(JSON.stringify(frame));
@@ -148,7 +137,7 @@ export function serve(config, opts = {}) {
     const agentAbilityRuntime = createAgentAbilityRuntime(config.agentsRoot, {
         ...opts.agentAbility,
         coordinator: projectionCoordinator,
-        isAdmissionClosed: () => storageMigrationAdmissionClosed(),
+        isAdmissionClosed: storageIdentityAdmission.isAdmissionClosed,
     });
     let projectSkillsController;
     const projectSkillsReconciler = opts.projectSkills?.reconciler ?? createProjectSkillsReconciler({
@@ -169,7 +158,7 @@ export function serve(config, opts = {}) {
             }
             catch { /* 下一次 ready 或项目操作会重新发送完整快照 */ }
         },
-        isAdmissionClosed: () => storageMigrationAdmissionClosed(),
+        isAdmissionClosed: storageIdentityAdmission.isAdmissionClosed,
         reconcile: (handle, bindings) => projectSkillsReconciler.reconcile(handle, bindings),
     });
     const logRegistryFailure = (error) => dslog("project_skills.registry_failed", "本机项目注册表读取失败,本次不上报项目清单(能力不受影响)", {
@@ -177,7 +166,7 @@ export function serve(config, opts = {}) {
     });
     const machineHelloPublisher = createMachineHelloPublisher({
         effective: (hello) => {
-            const configuredIdentity = opts.storageMigration?.identity;
+            const configuredIdentity = opts.storageRuntime?.identity;
             const currentIdentity = typeof configuredIdentity === "function"
                 ? configuredIdentity()
                 : configuredIdentity;
@@ -187,23 +176,7 @@ export function serve(config, opts = {}) {
     });
     const initializedProjectSkills = initializedProjectSkillsReconciler(() => projectSkillsController.ensureScanned(), projectSkillsReconciler);
     const configuredCapabilities = opts.machineInfo?.capabilities ?? daemonCapabilities(process.platform);
-    const storageCapabilities = storageMigrationCapabilities(configuredCapabilities, opts.storageMigration);
-    const storageStatusDelivery = createServeStorageStatusDelivery(opts.storageMigration, {
-        onPersistenceError: (error) => dslog("daemon.storage_status_outbox_failed", "存储迁移状态 outbox 持久化失败", { level: "ERROR", error_message: error.message }),
-        transmit: (frame) => { try {
-            if (ws?.readyState === WebSocket.OPEN)
-                ws.send(JSON.stringify(frame));
-        }
-        catch { /* retry */ } },
-    });
-    const storageMigrationRuntime = attachStorageMigrationRuntime(opts.storageMigration, {
-        isBusy: () => executionRuns.size > 0 || legacyRuns.size > 0,
-        waitForExecutionFrames: () => executionFrameQueue,
-        flushLocalState: flushSlog,
-        sendStatus: storageStatusDelivery.send,
-    });
-    storageMigrationAdmissionClosed = storageMigrationRuntime.isAdmissionClosed;
-    const prepareCapabilities = async () => daemonCapabilityBindings(process.platform, [...storageCapabilities, ...await managedDaemonCapabilities(updateEligibility)]);
+    const prepareCapabilities = async () => daemonCapabilityBindings(process.platform, [...configuredCapabilities, ...await managedDaemonCapabilities(updateEligibility)]);
     const safeExecutionSend = (frame) => {
         try {
             if (ws?.readyState !== WebSocket.OPEN)
@@ -316,21 +289,16 @@ export function serve(config, opts = {}) {
         let connectionEpochToken;
         ws.on("open", () => {
             connectionEpochToken = projectSkillsController.beginConnectionEpoch();
-            storageMigrationRuntime.beginIdentityBinding();
+            storageIdentityAdmission.beginIdentityBinding();
             const openedSocket = ws;
+            const connectionId = randomUUID();
             backoff = 1000;
             connectedAt = Date.now();
             log(`🔌 已连接控制面 ${config.serverUrl}`);
-            dslog("daemon.ws_open", "已连接控制面", { server_url: config.serverUrl });
+            dslog("daemon.ws_open", "已连接控制面", { server_url: config.serverUrl, connection_id: connectionId });
             // 连上了才有机会把离线期间(断连原因/退出前)落盘的日志补传上去
             void drainSpool();
             // 上报本机信息 (hostname/os/daemon 版本/已装 runtimes)
-            storageStatusDelivery.replayPending();
-            const storageReplay = replayStorageMigrationStatus(opts.storageMigration, openedSocket, () => ws === openedSocket, (error) => {
-                dslog("daemon.storage_status_replay_failed", "存储迁移状态重放失败", {
-                    level: "ERROR", error_message: error.message,
-                });
-            }, storageStatusDelivery.send);
             const { detectInstalled, detectExecutable = detectExecutionRuntimesWithSignal } = opts.machineInfo ?? {};
             const helloPromise = (opts.machineInfo?.collect ?? collectMachineHello)(config.agentsRoot, config.executionLimits, process.platform, {
                 ...(detectInstalled ? { detectInstalled } : {}),
@@ -345,28 +313,41 @@ export function serve(config, opts = {}) {
                 .then(async (hello) => {
                 if (hello.executionProtocol === undefined) {
                     executionRuntimesKnown = true;
+                    dslog("runtime_probe.hello_refresh", "runtime hello 刷新决策", {
+                        connection_id: connectionId, reason: "protocol_unavailable",
+                        current_socket: ws === openedSocket, socket_open: openedSocket.readyState === WebSocket.OPEN,
+                        socket_ready_state: openedSocket.readyState, installed_runtimes: JSON.stringify(hello.runtimes),
+                        execution_runtimes: JSON.stringify(hello.executionRuntimes),
+                    });
                     return [];
                 }
-                const detected = await runtimeProbe.detect(hello.runtimes, detectExecutable);
+                const detected = await runtimeProbe.detect(hello.runtimes, detectExecutable, connectionId);
                 executionRuntimesKnown = true;
-                await storageReplay;
-                if (ws === openedSocket && openedSocket.readyState === WebSocket.OPEN
-                    && detected.some((runtime) => !hello.executionRuntimes.includes(runtime))) {
+                const currentSocket = ws === openedSocket;
+                const socketOpen = openedSocket.readyState === WebSocket.OPEN;
+                const hasNewRuntime = detected.some((runtime) => !hello.executionRuntimes.includes(runtime));
+                dslog("runtime_probe.hello_refresh", "runtime hello 刷新决策", {
+                    connection_id: connectionId, current_socket: currentSocket, socket_open: socketOpen,
+                    socket_ready_state: openedSocket.readyState, installed_runtimes: JSON.stringify(hello.runtimes),
+                    initial_execution_runtimes: JSON.stringify(hello.executionRuntimes), execution_runtimes: JSON.stringify(detected),
+                    reason: !currentSocket ? "stale_connection" : !socketOpen ? "socket_not_open" : !hasNewRuntime ? "unchanged" : "publish",
+                });
+                if (currentSocket && socketOpen && hasNewRuntime) {
                     detectedExecutionRuntimes = detected;
                     machineHelloPublisher.publish({ ...hello, executionRuntimes: [...detected] }, openedSocket);
                 }
                 return detected;
             })
-                .catch((error) => {
+                .catch(() => {
                 executionRuntimesKnown = true;
                 dslog("execution.runtime_detection_failed", "runtime 探测失败", {
-                    level: "ERROR", error_message: error.message,
+                    level: "ERROR", reason: "detection_threw", connection_id: connectionId,
+                    current_socket: ws === openedSocket, socket_open: openedSocket.readyState === WebSocket.OPEN,
                 });
                 return [];
             });
             void helloPromise
                 .then(async (hello) => {
-                await storageReplay;
                 if (ws !== openedSocket || openedSocket.readyState !== WebSocket.OPEN)
                     return;
                 detectedExecutionRuntimes = hello.executionRuntimes;
@@ -414,8 +395,6 @@ export function serve(config, opts = {}) {
             if (typeof decoded !== "object" || decoded === null)
                 return;
             const rawType = "type" in decoded && typeof decoded.type === "string" ? decoded.type : "";
-            if (storageStatusDelivery.acknowledge(decoded))
-                return;
             if (rawType === "daemon:update" || rawType === "daemon:restart") {
                 void updateController.handle(decoded).catch((error) => {
                     dslog("daemon.control_failed", "daemon 控制操作处理失败", {
@@ -424,19 +403,10 @@ export function serve(config, opts = {}) {
                 });
                 return;
             }
-            if (rawType === "daemon:migrate") {
-                void handleMigrationControlMessage(migrationController, decoded).catch((error) => dslog("daemon.migration_failed", "daemon 布局迁移失败", { level: "ERROR", error_message: error.message }));
-                return;
-            }
             if (rawType === "daemon:codex-home-mode") {
                 void codexHomeModeController.handle(decoded).catch((error) => dslog("daemon.codex_home_mode_failed", "Codex Home 模式切换失败", { level: "ERROR", error_message: error.message }));
                 return;
             }
-            if (handleStorageMigrationControl(opts.storageMigration, rawType, decoded, storageStatusDelivery.send, (kind, error) => {
-                dslog(kind === "migration" ? "daemon.storage_migration_failed" : "daemon.storage_migration_confirmation_failed", kind === "migration" ? "存储迁移控制操作失败" : "存储迁移 hello 确认处理失败", { level: "ERROR", error_message: error.message });
-            })) {
-                return;
-            }
             if (rawType.startsWith("execution:")) {
                 const parsedExecution = ServerToDaemonExecutionFrameSchema.safeParse(decoded);
                 if (!parsedExecution.success) {
@@ -498,10 +468,10 @@ export function serve(config, opts = {}) {
                         return;
                     }
                     const spec = frame;
-                    if (storageMigrationRuntime.isAdmissionClosed()) {
+                    if (storageIdentityAdmission.isAdmissionClosed()) {
                         safeExecutionSend(ExecutionRejectedSchema.parse({
                             type: "execution:rejected", protocolVersion: 1, executionId: spec.executionId,
-                            reason: "resource_limit", message: "Storage migration is quiescing this machine",
+                            reason: "resource_limit", message: "Storage identity binding is not complete",
                             at: new Date().toISOString(),
                         }));
                         return;
@@ -812,17 +782,17 @@ export function serve(config, opts = {}) {
                 // ready 帧带 server 视角的 machineId/workspaceId → 作为后续所有日志的默认关联键
                 const r = msg;
                 setSlogDefaults({ machine_id: r.machineId, workspace_id: r.workspaceId });
-                if (opts.storageMigration !== undefined && typeof r.workspaceId === "string" && typeof r.machineId === "string") {
+                if (opts.storageRuntime !== undefined && typeof r.workspaceId === "string" && typeof r.machineId === "string") {
                     const bindingSocket = ws;
-                    bindStorageMigrationServerIdentity(opts.storageMigration, { workspaceId: r.workspaceId, machineId: r.machineId }, {
+                    bindStorageServerIdentity(opts.storageRuntime, { workspaceId: r.workspaceId, machineId: r.machineId }, {
                         onBound: () => {
                             if (bindingSocket !== ws || bindingSocket?.readyState !== WebSocket.OPEN)
                                 return;
-                            storageMigrationRuntime.completeIdentityBinding();
+                            storageIdentityAdmission.completeIdentityBinding();
                             machineHelloPublisher.republish();
                         },
                         onError: (error) => {
-                            dslog("daemon.storage_identity_bind_failed", "存储迁移 Workspace 身份绑定失败", { level: "ERROR", error_message: error.message });
+                            dslog("daemon.storage_identity_bind_failed", "存储 Workspace 身份绑定失败", { level: "ERROR", error_message: error.message });
                             if (bindingSocket === ws && bindingSocket?.readyState === WebSocket.OPEN)
                                 bindingSocket.close(1011, "storage identity binding failed");
                         },
@@ -925,7 +895,7 @@ export function serve(config, opts = {}) {
             }
             if (msg.type !== "agent:start")
                 return; // ready/error 等忽略
-            if (storageMigrationRuntime.isAdmissionClosed())
+            if (storageIdentityAdmission.isAdmissionClosed())
                 return;
             // 任务键:scheduled run 用 runId(每次运行独立 cwd/work-log;overlap 由 server 端 skip_if_running 管,
             // daemon 的 running 去重只兜底"同一 run 重复投递");普通唤醒仍是 线程锚点 ?? 频道。
@@ -1357,7 +1327,6 @@ export function serve(config, opts = {}) {
             concurrencyTelemetry.stop();
             runtimeProbe.stop();
             completionRetransmitter.stop();
-            storageStatusDelivery.stop();
             const deadline = createShutdownDeadline(shutdownTimeoutMs);
             if (reconnectTimer !== null) {
                 clearTimeout(reconnectTimer);
@@ -1367,7 +1336,6 @@ export function serve(config, opts = {}) {
             const pending = [
                 webSocketClosed,
                 updateController.drain(),
-                ...(migrationController === null ? [] : [migrationController.drain()]),
                 codexHomeModeController.drain(),
                 executionFrameQueue,
                 ...executionRuns.values(),

package/dist/storage-identity.js

@@ -39,8 +39,5 @@ export function storageHelloIdentity(input) {
         daemonRootFingerprint: fingerprint("daemon-root", layout.daemonRoot),
         agentRootFingerprint: fingerprint("agent-root", layout.agentItemsRoot),
         ...(ownership === undefined ? {} : { storageOwnership: ownership }),
-        ...(installation.storageMigrationId === undefined
-            ? {}
-            : { storageMigrationId: installation.storageMigrationId }),
     });
 }