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

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

@@ -1,3 +1,6 @@
+import { AcpProbeTransport } from "./acp-probe-transport.js";
+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";
@@ -6,6 +9,7 @@ import { pathToFileURL } from "node:url";
 import spawn from "cross-spawn";
 import { PROTOCOL_VERSION, RequestError, client, methods, ndJsonStream, } from "@agentclientprotocol/sdk";
 import { augmentedPath } from "../runtime-path.js";
+import { prepareThreadDelivery } from "../thread-input-delivery.js";
 import { startFirstProgressWatchdog } from "./progress-watchdog.js";
 import { assertKimiLegacyPromptFits, buildKimiArgs } from "./kimi.js";
 const ERROR_MESSAGE_CAP = 2_000;
@@ -193,18 +197,38 @@ async function stopChild(child) {
         await closed;
     }
 }
+export class AcpProbeCleanupError extends Error {
+    constructor() { super("ACP probe process cleanup unconfirmed"); this.name = "AcpProbeCleanupError"; }
+}
 /** Probe the ACP transport without starting a session or forcing an optional interactive login flow. */
 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(),
-        // probe 在 daemon 自身 PATH 下运行,补上用户级 CLI 目录,与 which 探测保持一致。
-        env: { ...providerEnv(provider, permission), PATH: augmentedPath() },
+    const probeId = options.probeId ?? randomUUID();
+    const started = performance.now();
+    const elapsed = () => Math.round(performance.now() - started);
+    const transport = new AcpProbeTransport(elapsed);
+    let spawnConfirmedMs;
+    let reason = "initializing", protocolVersion;
+    let stderrSeen = false;
+    const fields = () => ({ probe_id: probeId, runtime: provider, duration_ms: elapsed(),
+        ...transport.fields(), spawn_confirmed_ms: spawnConfirmedMs, child_pid: child.pid,
+        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 launchEnv = options.launchEnv ?? providerEnv(provider, permission);
+    const child = spawnProcess(options.bin, options.launchArgs ?? providerArgs(provider, options.configPath), {
+        cwd: options.launchCwd ?? process.cwd(),
+        // 显式 launchEnv 也决定 PATH/HOME;不能把它与父进程 PATH 混用。
+        env: { ...launchEnv, PATH: augmentedPath(launchEnv) },
         stdio: ["pipe", "pipe", "pipe"],
     });
+    child.once("spawn", () => {
+        spawnConfirmedMs = elapsed();
+        dslog("execution.acp_probe_spawned", "ACP 探测子进程已启动", fields());
+    });
     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, () => ({
@@ -214,25 +238,36 @@ export async function probeKimiAcp(options, spawnProcess = spawn) {
     let timeout;
     let onAbort;
     try {
-        const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
+        const stream = ndJsonStream(transport.writable(child.stdin), transport.readable(child.stdout));
         const connected = app.connectWith(stream, async (context) => {
-            await context.request(methods.agent.initialize, {
+            transport.initializeRequested();
+            const initialized = await context.request(methods.agent.initialize, {
                 protocolVersion: PROTOCOL_VERSION,
                 clientCapabilities: {},
                 clientInfo: { name: "nowcrew-daemon", version: "1" },
             });
-            return true;
+            transport.initializeResponse();
+            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);
                 };
@@ -245,6 +280,8 @@ export async function probeKimiAcp(options, spawnProcess = spawn) {
         return result;
     }
     catch {
+        if (reason === "initializing")
+            reason = options.signal?.aborted ? "aborted" : "transport_error";
         return false;
     }
     finally {
@@ -252,17 +289,33 @@ 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;
+        }
+        catch {
+            throw new AcpProbeCleanupError();
+        }
+        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(options) {
+export async function runKimiAcp(requestedOptions) {
+    // Until this adapter verifies native restoration, thread-bound runs are cold.
+    const options = process.env.CREW_THREAD_ROOT ? { ...requestedOptions, resume: false } : requestedOptions;
     const provider = options.provider ?? "kimi";
     const displayName = providerDisplayName(provider);
     const permission = options.effectivePermission ?? "full_access";
     if (provider === "deepseek-harness" && options.resume) {
         throw new Error("DeepSeek Harness ACP does not support session resume");
     }
-    const prompt = await readPrompt();
+    const prompt = (await prepareThreadDelivery({ env: process.env, resumed: false,
+        sessionId: "unverified-cold-acp", wakePrompt: await readPrompt() })).prompt;
     const child = spawn(options.bin, providerArgs(provider, options.configPath), {
         cwd: process.cwd(),
         env: providerEnv(provider, permission),

package/dist/runtimes/opencode-runner.js

@@ -4,6 +4,7 @@ import { parseArgs } from "node:util";
 import { pathToFileURL } from "node:url";
 import spawn from "cross-spawn";
 import { augmentedPath } from "../runtime-path.js";
+import { prepareThreadDelivery } from "../thread-input-delivery.js";
 import { buildOpenCodeArgs, createOpenCodeEventDecoder } from "./opencode.js";
 const ERROR_CAP = 2_000;
 async function readPrompt() {
@@ -86,7 +87,12 @@ async function runAttempt(options, prompt) {
     return { code: 0, staleSession: false };
 }
 export async function runOpenCode(options) {
-    const prompt = await readPrompt();
+    const prompt = (await prepareThreadDelivery({ env: process.env, resumed: false,
+        sessionId: "unverified-cold-opencode", wakePrompt: await readPrompt() })).prompt;
+    if (process.env.CREW_THREAD_ROOT) {
+        const { sessionId: _unverified, ...coldOptions } = options;
+        return (await runAttempt(coldOptions, prompt)).code;
+    }
     const first = await runAttempt(options, prompt);
     if (!first.staleSession)
         return first.code;

package/dist/serve.js

@@ -3,6 +3,7 @@
  * 断线指数退避重连。一个 agent:start 进来就跑一次现有的 runAgent。
  */
 import { WebSocket } from "ws";
+import { persistPreAdmissionRejection, rejectQueuedAdmission } from "./pre-admission-rejection.js";
 import { join } from "node:path";
 import { randomUUID } from "node:crypto";
 import { dslog, setSlogDefaults, drainSpool, flushSlog } from "./slog.js";
@@ -51,10 +52,8 @@ 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,28 +126,13 @@ 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 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));
-        }
-        catch { /* reconnect */ } } });
+    const storageIdentityAdmission = createStorageIdentityAdmission(opts.storageRuntime);
     const projectionCoordinator = createAgentProjectionCoordinator();
     const { projectRegistry, projectWorkspaceRegistry, projectDependencyProvisioner } = createProjectRegistryWiring(config.agentsRoot, opts.execution?.dependencies);
     const agentAbilityRuntime = createAgentAbilityRuntime(config.agentsRoot, {
         ...opts.agentAbility,
         coordinator: projectionCoordinator,
-        isAdmissionClosed: () => storageMigrationAdmissionClosed(),
+        isAdmissionClosed: storageIdentityAdmission.isAdmissionClosed,
     });
     let projectSkillsController;
     const projectSkillsReconciler = opts.projectSkills?.reconciler ?? createProjectSkillsReconciler({
@@ -169,7 +153,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 +161,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 +171,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)
@@ -237,6 +205,11 @@ export function serve(config, opts = {}) {
             return;
         }
         safeExecutionSend(frame);
+        if (frame.type === "execution:rejected" && frame.preAdmissionProof) {
+            const entry = await executionJournal.get(frame.executionId);
+            if (entry?.completion)
+                completionRetransmitter.track(entry.completion);
+        }
     };
     const replayExecutionTelemetry = async () => {
         const frames = await executionTelemetry.replay();
@@ -316,57 +289,64 @@ 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 } : {}),
                 ...(opts.profileName === undefined ? {} : { profileName: opts.profileName }),
                 // First hello must not wait for third-party handshakes; optional transports arrive in the refresh.
                 detectExecutable: async (installed) => conservativeExecutionRuntimes(installed),
-                additionalCapabilities: async () => [...(await managedDaemonCapabilities(updateEligibility)), ...(opts.profileName === undefined ? [] : ["codex_home_mode_v1"])],
+                additionalCapabilities: async () => managedDaemonCapabilities(updateEligibility),
                 capabilities: capabilities.machineHello,
-                codexHomeMode: config.codexHomeMode,
             });
             runtimeFacts = helloPromise
                 .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 +394,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 +402,6 @@ 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 +463,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;
@@ -560,18 +525,8 @@ export function serve(config, opts = {}) {
                         : spec.context.scheduledRunId === undefined ? "normal" : "scheduled";
                     let reservation = sharedSlots.reserve(spec.agent.handle, "execution", executionClass);
                     if (!reservation.accepted) {
-                        dslog("execution.machine_queue_rejected", "机器执行队列已满", {
-                            level: "WARN",
-                            execution_id: spec.executionId,
-                            agent_handle: spec.agent.handle,
-                            execution_class: executionClass,
-                            ...reservation.facts,
-                        });
-                        safeExecutionSend(ExecutionRejectedSchema.parse({
-                            type: "execution:rejected", protocolVersion: 1, executionId: spec.executionId,
-                            reason: "resource_limit", message: "Local machine execution queue is full",
-                            at: new Date().toISOString(),
-                        }));
+                        await rejectQueuedAdmission({ journal: executionJournal, knownExecutionHashes, executionRuns,
+                            report: reportExecutionFrame, replay: sendJournalStatus }, spec, executionClass, reservation.facts);
                         return;
                     }
                     knownExecutionHashes.set(spec.executionId, hash);
@@ -741,6 +696,13 @@ export function serve(config, opts = {}) {
                             ...reservation.facts,
                         },
                         report: reportExecutionFrame,
+                        confirmPreAdmission: async (rejection) => {
+                            const prior = await executionJournal.get(spec.executionId);
+                            if (prior !== null || stopped || knownExecutionHashes.get(spec.executionId) !== hash
+                                || executionRuns.get(spec.executionId) !== execution)
+                                return false;
+                            return await persistPreAdmissionRejection(executionJournal, spec, rejection) !== null;
+                        },
                         startupGate: runtimeStartupGate,
                         startupTimeoutMs: config.executionLimits.startupTimeoutMs,
                         onRuntimePhase: (phase, runtime) => {
@@ -812,17 +774,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 +887,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 重复投递");普通唤醒仍是 线程锚点 ?? 频道。
@@ -1090,15 +1052,14 @@ export function serve(config, opts = {}) {
                 const ackHint = `\n**协作礼仪:决定接手后,先用 \`${sendCmd}\` 在该任务线程说一声你来跟进**——用日常语言带上你对问题的理解或打算先查什么,不要写"我接 task #N"这类内部编号;写不出实质内容就不单发,并进第一条实质进展,但不要长时间闷头干活把线程空着。`;
                 // 图片/文件附件:crew message read 会在消息下列出附件及其 id;图片需下载后用 Read 工具查看,才能真正"看到"内容。
                 const attHint = `\n若消息带图片/文件附件(read 会列出 id),用 \`crew attachment get <id>\` 下载到本地,图片再用 Read 工具打开查看后再处理。`;
-                // 线程隔离:有 threadId 时用 `crew thread read` 只读本线程(避免被其他线程消息干扰);
-                // 顶层消息(无 threadId)用 `crew message read` 读整个频道。
-                const readCmd = threadId
-                    ? `crew thread read`
-                    : `crew message read --channel ${msg.channelId}`;
+                // 启动上下文由执行层交付;legacy 提示词也不能要求模型补读或退回频道历史。
+                const contextHint = threadId
+                    ? "直接依据程序交付的本线程上下文与新消息处理,无需启动补读历史。"
+                    : "没有线程锚点,只处理明确来信或请求补充当前任务线程,不读取频道历史猜测。";
                 const wakeText = scheduled
                     ? buildScheduledPrompt(msg.channelId, msg.wake?.content ?? "", scheduled.outputPolicy, scheduled.externalNotificationPolicy)
                     : (msg.wake?.content
-                        ? `你被唤醒(${msg.reason}): ${msg.wake.content}\n用 ${readCmd} 读${threadId ? "本线程" : "频道"}后按需处理。${reasonHint}${ackHint}${threadHint}${attHint}`
+                        ? `你被唤醒(${msg.reason}): ${msg.wake.content}\n${contextHint}${reasonHint}${ackHint}${threadHint}${attHint}`
                         : undefined);
                 const wakeOrigin = scheduled ? undefined : msg.wake?.origin;
                 const guarded = await runWithOriginDecisionGuard(wakeOrigin, async (attempt) => {
@@ -1124,8 +1085,8 @@ export function serve(config, opts = {}) {
                             },
                         } : {}),
                         ...(wakeOrigin ? { wakeOrigin, originDecisionAttempt: attempt } : {}),
-                        // 唤醒锚点是具体消息(非纯频道唤醒)时,把它透传下去,供 `crew task create` 锚定到该消息。
-                        ...(!scheduled && threadId ? { wakeMessageId: threadId } : {}),
+                        // legacy wake.threadId 已由 Server 归一到线程根;与普通触发消息 id 分开透传。
+                        ...(!scheduled && threadId ? { threadId, wakeMessageId: threadId } : {}),
                         ...(!scheduled && msg.wake?.seq !== undefined ? { wakeContextUpToSeq: msg.wake.seq } : {}),
                         ...(attemptWake ? { wake: attemptWake } : {}),
                     }, reportActivity, reportConsole, {
@@ -1358,7 +1319,6 @@ export function serve(config, opts = {}) {
             concurrencyTelemetry.stop();
             runtimeProbe.stop();
             completionRetransmitter.stop();
-            storageStatusDelivery.stop();
             const deadline = createShutdownDeadline(shutdownTimeoutMs);
             if (reconnectTimer !== null) {
                 clearTimeout(reconnectTimer);
@@ -1368,8 +1328,6 @@ export function serve(config, opts = {}) {
             const pending = [
                 webSocketClosed,
                 updateController.drain(),
-                ...(migrationController === null ? [] : [migrationController.drain()]),
-                codexHomeModeController.drain(),
                 executionFrameQueue,
                 ...executionRuns.values(),
                 ...[...legacyRuns.values()].map((run) => run.done),

package/dist/session.js

@@ -24,6 +24,10 @@ export async function readSession(runDir) {
         if (typeof o.sessionId !== "string" || !o.sessionId)
             return null;
         return {
+            ...(typeof o.runtime === "string" ? { runtime: o.runtime } : {}),
+            ...(typeof o.threadRoot === "string" ? { threadRoot: o.threadRoot } : {}),
+            ...(Number.isSafeInteger(o.threadContextSeq) && o.threadContextSeq >= 0 ? { threadContextSeq: o.threadContextSeq } : {}),
+            ...(typeof o.threadHistoryComplete === "boolean" ? { threadHistoryComplete: o.threadHistoryComplete } : {}),
             sessionId: o.sessionId,
             lastRunAt: typeof o.lastRunAt === "number" ? o.lastRunAt : 0,
             turns: typeof o.turns === "number" ? o.turns : 0,

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 }),
     });
 }

package/dist/storage-serve-adapter.js

@@ -1,55 +1,12 @@
-import { STORAGE_MIGRATION_CAPABILITY, STORAGE_MIGRATION_STATUS_CAPABILITY, } from "./storage-control.js";
-import { createStorageStatusDelivery } from "./storage-status-delivery.js";
-export function storageMigrationCapabilities(configured, options) {
-    if (options === undefined)
-        return configured;
-    return Object.freeze([...new Set([
-            ...configured,
-            STORAGE_MIGRATION_STATUS_CAPABILITY,
-            ...(options.ready ? [STORAGE_MIGRATION_CAPABILITY] : []),
-        ])]);
+export function bindStorageServerIdentity(options, identity, callbacks) {
+    void Promise.resolve().then(() => options.bindServerIdentity?.(identity))
+        .then(callbacks.onBound).catch(callbacks.onError);
 }
-export function bindStorageMigrationServerIdentity(options, identity, callbacks) {
-    const bind = options?.bindServerIdentity;
-    if (bind === undefined) {
-        if (options?.ready === true)
-            callbacks.onBound();
-        return;
-    }
-    void Promise.resolve().then(() => bind(identity)).then(callbacks.onBound).catch(callbacks.onError);
-}
-export function createServeStorageStatusDelivery(options, dependencies) {
-    return createStorageStatusDelivery({
-        ...(options?.statusOutboxPath === undefined ? {} : { outboxPath: options.statusOutboxPath }),
-        ...(options?.statusRetryMs === undefined ? {} : { retryMs: options.statusRetryMs }),
-        ...dependencies,
-    });
-}
-export function attachStorageMigrationRuntime(options, dependencies) {
-    let migrationAdmissionClosed = false;
+/** 新连接必须重新验证 Server 身份，不能沿用上一次连接的执行准入。 */
+export function createStorageIdentityAdmission(options) {
     let identityAdmissionClosed = options?.bindServerIdentity !== undefined;
-    if (options?.ready === true) {
-        options.attach?.({
-            gate: {
-                isBusy: dependencies.isBusy,
-                closeAndFlush: async () => {
-                    migrationAdmissionClosed = true;
-                    await dependencies.waitForExecutionFrames();
-                    if (dependencies.isBusy()) {
-                        migrationAdmissionClosed = false;
-                        throw Object.assign(new Error("active execution entered before storage migration quiesce"), {
-                            code: "runtime_busy",
-                        });
-                    }
-                    await dependencies.flushLocalState();
-                },
-                reopen: () => { migrationAdmissionClosed = false; },
-            },
-            sendStatus: dependencies.sendStatus,
-        });
-    }
     return Object.freeze({
-        isAdmissionClosed: () => migrationAdmissionClosed || identityAdmissionClosed,
+        isAdmissionClosed: () => identityAdmissionClosed,
         beginIdentityBinding: () => {
             if (options?.bindServerIdentity !== undefined)
                 identityAdmissionClosed = true;
@@ -57,26 +14,3 @@ export function attachStorageMigrationRuntime(options, dependencies) {
         completeIdentityBinding: () => { identityAdmissionClosed = false; },
     });
 }
-export function replayStorageMigrationStatus(options, socket, isCurrent, onError, deliver) {
-    return options?.replayStatus?.((frame) => {
-        if (!isCurrent())
-            return;
-        if (deliver !== undefined)
-            deliver(frame);
-        else if (socket.readyState === socket.OPEN)
-            socket.send(JSON.stringify(frame));
-    }).catch(onError) ?? Promise.resolve();
-}
-export function handleStorageMigrationControl(options, rawType, raw, sendStatus, onError) {
-    if (rawType === "daemon:storage-doctor" || rawType === "daemon:storage-migrate") {
-        if (options?.ready === true)
-            void options.controller.handle(raw).catch((error) => onError("migration", error));
-        return true;
-    }
-    if (rawType !== "daemon:storage-migration-confirmed")
-        return false;
-    const confirm = options?.ready === false ? options.confirm : undefined;
-    if (confirm !== undefined)
-        void confirm(raw, sendStatus).catch((error) => onError("confirmation", error));
-    return true;
-}