@nowcrew/daemon 0.6.88 → 0.6.90

package/dist/serve.js

@@ -1,21 +1,19 @@
-/**
- * 常驻模式 (M3c):连接 server 控制面 WS,注册机器,监听 agent:start 自动唤醒 agent。
- * 断线指数退避重连。一个 agent:start 进来就跑一次现有的 runAgent。
- */
+/** 常驻控制面桥接；按请求拉起本地 runtime。 */
+import { handleAgentEnvironmentFrame } from "./agent-environment-control.js";
+import { handleMachineEnvironmentFrame } from "./machine-environment-control.js";
+import { createMachineRuntimeEnvironment } from "./machine-runtime-environment.js";
 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";
 import { mergeRunAgentResults, reportScheduledStartFailure, runAgent } from "./runner.js";
 import { buildOriginDecisionRetryPrompt, buildScheduledPrompt } from "./prompt.js";
-import { collectMachineHello, daemonCapabilities, daemonCapabilityBindings, detectExecutionRuntimesWithSignal, } from "./machine-info.js";
+import { daemonCapabilities, daemonCapabilityBindings, } from "./machine-info.js";
 import { reconcileExecutionJournal } from "./execution-recovery.js";
 import { initReleaseSlog, reportDaemonConnectionClose, reportReleaseError } from "./release-channel-guard.js";
-import { conservativeExecutionRuntimes, createRuntimeProbeCoordinator, } from "./runtime-probe.js";
-import { listWorkspace, readWorkspaceFile } from "./workspace-fs.js";
-import { listSkills } from "./skills.js";
+import { handleWorkspaceControlRequest } from "./workspace-control-handler.js";
 import { inspectRaftWorkspace, importRaftWorkspace } from "./workspace-import.js";
-import { listRuntimeModels } from "./list-models.js";
 import { normalizeScheduledContext } from "./scheduled-report.js";
 import { formatDaemonLogLine } from "./log-format.js";
 import { reportAgentRunComplete } from "./scheduled-run-report.js";
@@ -49,12 +47,10 @@ import { createProjectSkillsReconciler, } from "./project-skills/reconciler.js";
 import { initializedProjectSkillsReconciler } from "./project-skills/initialized-reconciler.js";
 import { parseMemoryPruneTraceId } from "./memory-prune-diagnostics.js";
 import { probeRuntimeHealth } from "./runtime-health.js";
-import { handleRuntimeHealthProbeFrame } from "./runtime-health-handler.js";
+import { createServeMarketplace } from "./marketplace-serve.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 = {
@@ -80,9 +76,6 @@ export function serve(config, opts = {}) {
         ?? (config.agentMemory === null ? undefined : createAgentMemoryBridge(config.agentMemory));
     const executionTelemetry = createExecutionTelemetryJournal(config.agentsRoot);
     const executeProtocol = opts.execution?.runExecution ?? runExecution;
-    let detectedExecutionRuntimes = [], executionRuntimesKnown = false;
-    let runtimeFacts = null;
-    const runtimeProbe = createRuntimeProbeCoordinator();
     const localHome = opts.localHome ?? resolveDaemonLocalStateRootFromEnv();
     const hostCoordinator = opts.execution?.hostCoordinator
         ?? createHostExecutionCoordinator({
@@ -127,28 +120,14 @@ 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 marketplace = createServeMarketplace(config, localSlots, hostCoordinator);
+    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 +148,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 +156,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;
@@ -185,25 +164,19 @@ export function serve(config, opts = {}) {
         },
         onSent: (hello) => log(`📤 已上报机器信息: ${hello.hostname} · ${hello.os} · installed=[${hello.runtimes.join(",")}] · executable=[${hello.executionRuntimes.join(",")}] · agents=[${hello.agentHandles.join(",")}]`),
     });
+    const machineRuntime = createMachineRuntimeEnvironment({
+        config,
+        ...(opts.machineEnvironment === undefined ? {} : { provider: opts.machineEnvironment }),
+        ...(opts.machineInfo === undefined ? {} : { machineInfo: opts.machineInfo }),
+        ...(opts.profileName === undefined ? {} : { profileName: opts.profileName }),
+        additionalCapabilities: async () => managedDaemonCapabilities(updateEligibility),
+        publish: machineHelloPublisher.publish,
+        onError: (code, context) => dslog("execution.runtime_detection_failed", "机器环境或 runtime 探测失败", { level: "ERROR", error_code: code, ...context }),
+    });
+    machineRuntime.prewarm();
     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 +210,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();
@@ -312,67 +290,29 @@ export function serve(config, opts = {}) {
         if (stopped)
             return;
         const wsUrl = (opts.buildControlPlaneUrl ?? buildControlPlaneUrl)(config.serverUrl, config.machineToken, process.platform, undefined, capabilities.controlPlaneUrl);
-        ws = createWebSocket(wsUrl);
+        const connectionSocket = createWebSocket(wsUrl);
+        ws = connectionSocket;
+        const sendToConnection = (frame) => {
+            try {
+                if (!stopped && ws === connectionSocket && connectionSocket.readyState === WebSocket.OPEN)
+                    connectionSocket.send(JSON.stringify(frame));
+            }
+            catch { /* 旧连接请求由服务端超时处理。 */ }
+        };
         let connectionEpochToken;
-        ws.on("open", () => {
+        connectionSocket.on("open", () => {
             connectionEpochToken = projectSkillsController.beginConnectionEpoch();
-            storageMigrationRuntime.beginIdentityBinding();
-            const openedSocket = ws;
+            storageIdentityAdmission.beginIdentityBinding();
+            const openedSocket = connectionSocket;
+            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"])],
-                capabilities: capabilities.machineHello,
-                codexHomeMode: config.codexHomeMode,
-            });
-            runtimeFacts = helloPromise
-                .then(async (hello) => {
-                if (hello.executionProtocol === undefined) {
-                    executionRuntimesKnown = true;
-                    return [];
-                }
-                const detected = await runtimeProbe.detect(hello.runtimes, detectExecutable);
-                executionRuntimesKnown = true;
-                await storageReplay;
-                if (ws === openedSocket && openedSocket.readyState === WebSocket.OPEN
-                    && detected.some((runtime) => !hello.executionRuntimes.includes(runtime))) {
-                    detectedExecutionRuntimes = detected;
-                    machineHelloPublisher.publish({ ...hello, executionRuntimes: [...detected] }, openedSocket);
-                }
-                return detected;
-            })
-                .catch((error) => {
-                executionRuntimesKnown = true;
-                dslog("execution.runtime_detection_failed", "runtime 探测失败", {
-                    level: "ERROR", error_message: error.message,
-                });
-                return [];
-            });
-            void helloPromise
-                .then(async (hello) => {
-                await storageReplay;
-                if (ws !== openedSocket || openedSocket.readyState !== WebSocket.OPEN)
-                    return;
-                detectedExecutionRuntimes = hello.executionRuntimes;
-                machineHelloPublisher.publish(hello, openedSocket);
-            })
-                .catch(() => { });
+            machineRuntime.open(openedSocket, { capabilities: capabilities.machineHello, beforePublish: Promise.resolve(), connectionId });
             opts.onOpen?.(ws);
             void sendSnapshot(`reconnect-${randomUUID()}`);
             void executionJournal.replay()
@@ -401,8 +341,8 @@ export function serve(config, opts = {}) {
                 });
             });
         });
-        ws.on("message", async (data) => {
-            if (stopped)
+        connectionSocket.on("message", async (data) => {
+            if (stopped || ws !== connectionSocket)
                 return;
             let decoded;
             try {
@@ -414,8 +354,10 @@ 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))
+            if (rawType === "machine:environment:get" || rawType === "machine:environment:refresh") {
+                await handleMachineEnvironmentFrame(decoded, machineRuntime.provider, sendToConnection);
                 return;
+            }
             if (rawType === "daemon:update" || rawType === "daemon:restart") {
                 void updateController.handle(decoded).catch((error) => {
                     dslog("daemon.control_failed", "daemon 控制操作处理失败", {
@@ -424,19 +366,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 +427,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 +489,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);
@@ -710,9 +629,7 @@ export function serve(config, opts = {}) {
                     let availableRuntimes;
                     try {
                         availableRuntimes = opts.execution?.availableRuntimes?.()
-                            ?? (detectedExecutionRuntimes.includes(spec.runtime.name)
-                                ? detectedExecutionRuntimes
-                                : await (runtimeFacts ?? Promise.resolve(detectedExecutionRuntimes)));
+                            ?? await machineRuntime.availableRuntimes(spec.runtime.name);
                     }
                     catch (error) {
                         cleanupExecutionReservation("runtime_detection_failed");
@@ -729,6 +646,7 @@ export function serve(config, opts = {}) {
                     }
                     const execution = executeProtocol(config, spec, {
                         ...opts.execution?.dependencies,
+                        machineEnvironment: machineRuntime.provider,
                         capabilities: capabilities.executionRunner,
                         projectSkills: opts.execution?.dependencies?.projectSkills ?? initializedProjectSkills,
                         abilityRelease: opts.execution?.dependencies?.abilityRelease ?? agentAbilityRuntime.materializer,
@@ -741,6 +659,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 +737,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");
                         },
@@ -867,15 +792,17 @@ export function serve(config, opts = {}) {
                 return;
             }
             if (msg.type === "runtime-health:probe") {
-                const result = await handleRuntimeHealthProbeFrame(msg, opts.runtimeHealth?.probe, executionRuntimesKnown, detectedExecutionRuntimes);
+                const result = await machineRuntime.health(msg, opts.runtimeHealth?.probe);
                 if (result !== null) {
-                    try {
-                        ws?.send(JSON.stringify({ type: "fs:result", ...result }));
-                    }
-                    catch { /* server 会超时 */ }
+                    sendToConnection({ type: "fs:result", ...result });
                 }
                 return;
             }
+            if (marketplace.handle(msg, frame => { try {
+                ws?.send(JSON.stringify(frame));
+            }
+            catch { /* server 会按请求超时处理 */ } }))
+                return;
             if (await agentAbilityRuntime.tryHandleControlMessage(msg, serverCapabilities, (frame) => ws?.send(JSON.stringify(frame))))
                 return;
             // 导入 raft agent 工作区:inspect 反填 name/description;import 复制用户内容
@@ -901,31 +828,16 @@ export function serve(config, opts = {}) {
                 }
                 return;
             }
-            // workspace 文件浏览 / skills 枚举请求 (只读、沙箱;见 workspace-fs.ts / skills.ts)
-            if (msg.type === "fs:list" || msg.type === "fs:read" || msg.type === "skills:list" || msg.type === "probe-models") {
-                const req = msg;
-                const root = join(config.agentsRoot, req.handle);
-                const reply = (r) => {
-                    try {
-                        ws?.send(JSON.stringify({ type: "fs:result", reqId: req.reqId, ...r }));
-                    }
-                    catch { /* 忽略 */ }
-                };
-                try {
-                    const data2 = req.type === "fs:list" ? await listWorkspace(root, req.path)
-                        : req.type === "fs:read" ? await readWorkspaceFile(root, req.path)
-                            : req.type === "skills:list" ? await listSkills(req.runtime)
-                                : { models: await listRuntimeModels(req.type === "probe-models" ? (req.runtime ?? "") : "") };
-                    reply({ ok: true, data: data2 });
-                }
-                catch (e) {
-                    reply({ ok: false, error: e.message });
-                }
+            if (await handleAgentEnvironmentFrame(msg, config.agentsRoot, sendToConnection))
+                return;
+            const fileResult = await handleWorkspaceControlRequest(msg, config.agentsRoot, projectWorkspaceRegistry, machineRuntime.models);
+            if (fileResult) {
+                sendToConnection(fileResult);
                 return;
             }
             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 重复投递");普通唤醒仍是 线程锚点 ?? 频道。
@@ -1128,6 +1040,7 @@ export function serve(config, opts = {}) {
                         ...(!scheduled && msg.wake?.seq !== undefined ? { wakeContextUpToSeq: msg.wake.seq } : {}),
                         ...(attemptWake ? { wake: attemptWake } : {}),
                     }, reportActivity, reportConsole, {
+                        machineEnvironment: machineRuntime.provider,
                         cancellation: controller.cancellation,
                         startupGate: runtimeStartupGate,
                         startupTimeoutMs: config.executionLimits.startupTimeoutMs,
@@ -1290,8 +1203,9 @@ export function serve(config, opts = {}) {
                 void flushSlog(); // 每轮收尾冲一次,保证 run.end 尽快可查
             }
         });
-        ws.on("close", (code) => {
-            if (stopped)
+        connectionSocket.on("close", (code) => {
+            machineRuntime.close(connectionSocket);
+            if (stopped || ws !== connectionSocket)
                 return;
             // server 能力随连接失效;下个连接的 ready 帧重新声明(防降级重连后沿用过期能力)。
             serverCapabilities = new Set();
@@ -1315,9 +1229,9 @@ export function serve(config, opts = {}) {
             }, backoff);
             backoff = Math.min(backoff * 2, maxBackoff);
         });
-        ws.on("error", () => {
+        connectionSocket.on("error", () => {
             if (!stopped)
-                ws?.close();
+                connectionSocket.close();
         });
     }
     const ready = (async () => {
@@ -1355,9 +1269,7 @@ export function serve(config, opts = {}) {
         stopPromise = (async () => {
             stopped = true;
             concurrencyTelemetry.stop();
-            runtimeProbe.stop();
             completionRetransmitter.stop();
-            storageStatusDelivery.stop();
             const deadline = createShutdownDeadline(shutdownTimeoutMs);
             if (reconnectTimer !== null) {
                 clearTimeout(reconnectTimer);
@@ -1365,10 +1277,10 @@ export function serve(config, opts = {}) {
             }
             const webSocketClosed = closeWebSocketWithinDeadline(ws, deadline.signal);
             const pending = [
+                machineRuntime.stop(),
                 webSocketClosed,
                 updateController.drain(),
-                ...(migrationController === null ? [] : [migrationController.drain()]),
-                codexHomeModeController.drain(),
+                marketplace.stop(),
                 executionFrameQueue,
                 ...executionRuns.values(),
                 ...[...legacyRuns.values()].map((run) => run.done),

package/dist/server-url.js

@@ -0,0 +1,25 @@
+const CANONICAL_PRODUCTION_HOST = "nowwork.nowcoder.com";
+const PRODUCTION_HOST_ALIASES = new Set([
+    CANONICAL_PRODUCTION_HOST,
+    "nowwork-in.nowcoder.com",
+]);
+function canonicalHostname(hostname) {
+    const normalized = hostname.toLowerCase();
+    return isProductionServerHostname(normalized) ? CANONICAL_PRODUCTION_HOST : normalized;
+}
+export function isProductionServerHostname(hostname) {
+    return PRODUCTION_HOST_ALIASES.has(hostname.toLowerCase());
+}
+/** Host identity used by profile/service guards; the public and internal production names are aliases. */
+export function serverHostIdentity(serverUrl) {
+    return canonicalHostname(new URL(serverUrl).hostname);
+}
+/** URL identity used by storage records; preserve path/port/query while collapsing production host aliases. */
+export function serverUrlIdentity(serverUrl) {
+    const parsed = new URL(serverUrl);
+    parsed.hostname = canonicalHostname(parsed.hostname);
+    return parsed.toString().replace(/\/+$/u, "");
+}
+export function serverUrlsMatch(left, right) {
+    return serverUrlIdentity(left) === serverUrlIdentity(right);
+}

package/dist/slog.js

@@ -16,6 +16,7 @@ import { join, resolve } from "node:path";
 import { createHash } from "node:crypto";
 import { appendFileSync, existsSync, mkdirSync, readdirSync, readFileSync, statSync, unlinkSync } from "node:fs";
 import { resolveDaemonLocalStateRoot } from "./daemon-local-home.js";
+import { isProductionServerHostname } from "./server-url.js";
 const FLUSH_INTERVAL_MS = 1500;
 const BATCH_SIZE = 50;
 const SPOOL_MAX_FILES = 50; // spool 目录文件数上限,超出丢最旧(日志非关键数据,防无限膨胀)
@@ -30,7 +31,7 @@ let lastErrorAt = 0;
 let exitHookInstalled = false;
 let localStateRoot;
 function deploymentEnvironment(serverHost) {
-    if (serverHost === "nowwork-in.nowcoder.com")
+    if (serverHost !== undefined && isProductionServerHostname(serverHost))
         return "prod";
     if (serverHost === "nowwork-dev.nowcoder.com")
         return "dev";

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-runtime.js

@@ -2,12 +2,12 @@ import { findInstallationForProfile, readInstallations, resolveLocalStorageRoots
 import { storageHelloIdentity } from "./storage-identity.js";
 import { storageLayout } from "./storage-layout.js";
 import { readStorageOwnershipClaim, resolveWorkspaceStorageOwnershipClaim, } from "./storage-ownership.js";
-const canonicalServerUrl = (value) => value.replace(/\/+$/u, "");
+import { serverUrlsMatch } from "./server-url.js";
 export function resolveStorageRuntime(input) {
     const installation = findInstallationForProfile(input.records, input.profile);
     if (installation === null)
         return null;
-    if (canonicalServerUrl(installation.serverUrl) !== canonicalServerUrl(input.serverUrl)) {
+    if (!serverUrlsMatch(installation.serverUrl, input.serverUrl)) {
         throw new Error("installation server identity does not match the active profile");
     }
     const local = resolveLocalStorageRoots({

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