@nowcrew/daemon 0.6.19 → 0.6.21

package/dist/serve.js

@@ -8,7 +8,7 @@ import { randomUUID } from "node:crypto";
 import { initSlog, dslog, setSlogDefaults, drainSpool, flushSlog } from "./slog.js";
 import { mergeRunAgentResults, reportScheduledStartFailure, runAgent } from "./runner.js";
 import { buildOriginDecisionRetryPrompt, buildScheduledPrompt } from "./prompt.js";
-import { collectMachineHello, cliVersion, daemonCapabilityBindings, daemonVersion, detectExecutionRuntimesWithSignal, } from "./machine-info.js";
+import { collectMachineHello, cliVersion, daemonCapabilities, daemonVersion, detectExecutionRuntimesWithSignal, } from "./machine-info.js";
 import { conservativeExecutionRuntimes, createRuntimeProbeCoordinator, } from "./runtime-probe.js";
 import { listWorkspace, readWorkspaceFile } from "./workspace-fs.js";
 import { listSkills } from "./skills.js";
@@ -18,16 +18,15 @@ import { normalizeScheduledContext } from "./scheduled-report.js";
 import { formatDaemonLogLine } from "./log-format.js";
 import { reportAgentRunComplete } from "./scheduled-run-report.js";
 import { runWithOriginDecisionGuard } from "./origin-decision.js";
-import { createExecutionJournal } from "./execution-journal.js";
 import { createExecutionTelemetryJournal } from "./execution-telemetry-journal.js";
 import { ExecutionRejectedSchema, ExecutionSnapshotSchema, LegacyAgentStartSchema, ServerToDaemonExecutionFrameSchema, } from "./execution-protocol.js";
 import { hashExecutionSpec, projectWorkspaceCapabilityRejection, runExecution, } from "./execution-runner.js";
 import { awaitWithCancellation, createRuntimeCancellation, RuntimeCancelledError, } from "./runtime-cancellation.js";
 import { createShutdownDeadline, readTestShutdownConfiguration } from "./shutdown-deadline.js";
 import { closeWebSocketWithinDeadline } from "./websocket-shutdown.js";
-import { reconcileExecutionJournal } from "./execution-recovery.js";
 import { createSharedSlotManager } from "./shared-execution-slots.js";
 import { createCompletionRetransmitter } from "./completion-retransmitter.js";
+import { completionRetransmitterOptions } from "./completion-retransmitter-logging.js";
 import { createAgentMemoryBridge } from "./agent-memory/bridge.js";
 import { createRuntimeStartupGate } from "./runtime-startup-gate.js";
 import { createHostExecutionCoordinator, hostCoordinatedSlotManager, hostCoordinatedStartupGate, } from "./host-execution-coordinator.js";
@@ -39,6 +38,10 @@ import { createProjectRegistry } from "./project-skills/registry.js";
 import { createProjectSkillsController, } from "./project-skills/controller.js";
 import { PROJECT_SKILLS_CAPABILITY } from "./project-skills/types.js";
 import { createAgentProjectionCoordinator } from "./project-skills/agent-projection-coordinator.js";
+import { createProjectSkillRuntimeRootStartup, } from "./project-skills/runtime-root-startup.js";
+import { createProjectSkillControllerReadiness, withProjectSkillCapabilityStatus } from "./project-skills/capability.js";
+import { initializeProjectSkillProtectedExecutionJournal } from "./project-skills/serve-startup.js";
+import { createProjectSkillConnectionCapabilityProvider, createProjectSkillMachineHelloPublisher } from "./project-skills/serve-capability.js";
 import { createAgentAbilityRuntime } from "./agent-ability/runtime.js";
 import { createProjectSkillsReconciler, } from "./project-skills/reconciler.js";
 import { initializedProjectSkillsReconciler } from "./project-skills/initialized-reconciler.js";
@@ -65,7 +68,9 @@ export function serve(config, opts = {}) {
     const createWebSocket = opts.createWebSocket ?? ((url) => new WebSocket(url));
     let reconnectTimer = null;
     let stopPromise = null;
-    const executionJournal = opts.execution?.journal ?? createExecutionJournal(config.agentsRoot);
+    let executionJournal;
+    const injectedExecutionJournal = opts.execution?.journal;
+    const protectedExecutionIds = new Set();
     const agentMemory = opts.execution?.dependencies?.agentMemory
         ?? (config.agentMemory === null ? undefined : createAgentMemoryBridge(config.agentMemory));
     const executionTelemetry = createExecutionTelemetryJournal(config.agentsRoot);
@@ -126,6 +131,7 @@ export function serve(config, opts = {}) {
         agentsRoot: config.agentsRoot,
         coordinator: projectionCoordinator,
         scannedProjects: () => projectSkillsController.scannedProjects(),
+        protectedExecutionIds,
     });
     projectSkillsController = opts.projectSkills?.controller ?? createProjectSkillsController({
         registry: createProjectRegistry(config.agentsRoot),
@@ -139,53 +145,34 @@ export function serve(config, opts = {}) {
             catch { /* 下一次 ready 或项目操作会重新发送完整快照 */ }
         },
         reconcile: (handle, bindings) => projectSkillsReconciler.reconcile(handle, bindings),
-        ensureSnapshot: (handle, snapshot) => projectSkillsReconciler.ensureSnapshot(handle, snapshot),
+        ensureSnapshot: (handle, snapshot, options) => projectSkillsReconciler.ensureSnapshot(handle, snapshot, options),
     });
-    let projectSkillsStatus = "initializing";
-    let projectSkillsInitialization = null;
-    let latestMachineHello = null;
-    let latestHelloSocket = null;
-    const effectiveMachineHello = (hello) => ({
-        ...hello,
-        projectSkillsStatus,
-        capabilities: projectSkillsStatus === "ready"
-            ? hello.capabilities
-            : hello.capabilities.filter((capability) => capability !== PROJECT_SKILLS_CAPABILITY),
+    const projectSkillRuntimeRootStartup = opts.projectSkills?.runtimeRootStartup
+        ?? createProjectSkillRuntimeRootStartup();
+    const projectSkillControllerReadiness = createProjectSkillControllerReadiness({
+        initialize: () => projectSkillsController.initialize(),
+        onUnavailable: (error) => dslog("project_skills.registry_failed", "本机项目注册表读取失败", {
+            level: "ERROR", error_code: error.code ?? "project_registry_corrupt",
+        }),
+        onSettled: () => machineHelloPublisher.republish(),
+    });
+    const machineHelloPublisher = createProjectSkillMachineHelloPublisher({
+        status: projectSkillControllerReadiness.status,
+        effective: withProjectSkillCapabilityStatus,
+        onSent: (hello) => log(`📤 已上报机器信息: ${hello.hostname} · ${hello.os} · installed=[${hello.runtimes.join(",")}] · executable=[${hello.executionRuntimes.join(",")}] · agents=[${hello.agentHandles.join(",")}]`),
+    });
+    const initializedProjectSkills = initializedProjectSkillsReconciler(projectSkillControllerReadiness.ensure, projectSkillsReconciler);
+    const prepareProjectSkillCapabilities = createProjectSkillConnectionCapabilityProvider({
+        platform: process.platform,
+        baseCapabilities: opts.machineInfo?.capabilities ?? daemonCapabilities(process.platform),
+        additionalCapabilities: () => managedDaemonCapabilities(updateEligibility),
+        probeRuntimeRootStorePrimitive: projectSkillRuntimeRootStartup.probeNativePublicationPrimitiveReadiness,
+        initializeController: projectSkillControllerReadiness.ensure,
+        recoverRuntimeRootsAndLeases: async () => projectSkillRuntimeRootStartup
+            .recover(config.agentsRoot, executionJournal, protectedExecutionIds)
+            .then(() => true, () => false),
+        applyReadiness: projectSkillControllerReadiness.applyPreflight,
     });
-    const sendEffectiveMachineHello = () => {
-        if (latestMachineHello === null || latestHelloSocket?.readyState !== WebSocket.OPEN)
-            return;
-        const hello = effectiveMachineHello(latestMachineHello);
-        try {
-            latestHelloSocket.send(JSON.stringify(hello));
-            log(`📤 已上报机器信息: ${hello.hostname} · ${hello.os} · installed=[${hello.runtimes.join(",")}] · executable=[${hello.executionRuntimes.join(",")}] · agents=[${hello.agentHandles.join(",")}]`);
-        }
-        catch { /* 非 OPEN,忽略 */ }
-    };
-    const ensureProjectSkillsInitialized = () => {
-        if (projectSkillsStatus === "ready")
-            return Promise.resolve(true);
-        if (projectSkillsInitialization !== null)
-            return projectSkillsInitialization;
-        projectSkillsStatus = "initializing";
-        const attempt = projectSkillsController.initialize().then(() => {
-            projectSkillsStatus = "ready";
-            return true;
-        }, (error) => {
-            projectSkillsStatus = "unavailable";
-            dslog("project_skills.registry_failed", "本机项目注册表读取失败", {
-                level: "ERROR", error_code: error.code ?? "project_registry_corrupt",
-            });
-            return false;
-        }).finally(() => {
-            if (projectSkillsInitialization === attempt)
-                projectSkillsInitialization = null;
-            sendEffectiveMachineHello();
-        });
-        projectSkillsInitialization = attempt;
-        return attempt;
-    };
-    const initializedProjectSkills = initializedProjectSkillsReconciler(ensureProjectSkillsInitialized, projectSkillsReconciler);
     const safeExecutionSend = (frame) => {
         try {
             if (ws?.readyState !== WebSocket.OPEN)
@@ -199,12 +186,7 @@ export function serve(config, opts = {}) {
     };
     const completionRetransmitter = createCompletionRetransmitter({
         send: safeExecutionSend,
-        ...(opts.execution?.completionRetryDelaysMs === undefined ? {} : {
-            retryDelaysMs: opts.execution.completionRetryDelaysMs,
-        }),
-        onAttempt: ({ kind, executionId, attempt, nextDelayMs }) => {
-            dslog(kind === "sent" ? "execution.completion_sent" : "execution.completion_retried", kind === "sent" ? "execution completion 已发送" : "execution completion 未确认,已重传", { execution_id: executionId, attempt, next_delay_ms: nextDelayMs });
-        },
+        ...completionRetransmitterOptions(opts.execution),
     });
     const reportExecutionFrame = async (frame) => {
         if (frame.type === "execution:activity" || frame.type === "execution:console") {
@@ -283,7 +265,6 @@ export function serve(config, opts = {}) {
             reservation.release();
     };
     let connectedAt = 0; // 本次 WS 连接建立时刻(断开日志算在线时长用)
-    const capabilities = daemonCapabilityBindings(process.platform, opts.machineInfo?.capabilities);
     initSlog(config.serverUrl, config.machineToken, { daemonVersion: daemonVersion(), cliVersion: cliVersion(), ...(opts.profileName === undefined ? {} : { profileName: opts.profileName }), agentsRoot: config.agentsRoot });
     dslog("daemon.start", "daemon 常驻模式启动", { server_url: config.serverUrl, runtime: config.runtimeBin });
     // 并行调度:同一 agent 可并行处理多个【不同任务】(线程/频道),每任务隔离 cwd+work-log。
@@ -293,12 +274,17 @@ export function serve(config, opts = {}) {
     const activeExecutionTaskKeys = new Map();
     const legacyTaskTails = new Map();
     const log = (s) => process.stdout.write(formatDaemonLogLine(s) + "\n");
-    function connect() {
+    async function connect() {
+        if (stopped)
+            return;
+        const capabilities = await prepareProjectSkillCapabilities();
         if (stopped)
             return;
-        const wsUrl = buildControlPlaneUrl(config.serverUrl, config.machineToken, process.platform, undefined, projectSkillsStatus === "ready", capabilities.controlPlaneUrl);
+        const wsUrl = (opts.buildControlPlaneUrl ?? buildControlPlaneUrl)(config.serverUrl, config.machineToken, process.platform, undefined, projectSkillControllerReadiness.status() === "ready", capabilities.controlPlaneUrl);
         ws = createWebSocket(wsUrl);
+        let connectionEpochToken;
         ws.on("open", () => {
+            connectionEpochToken = projectSkillsController.beginConnectionEpoch();
             const openedSocket = ws;
             backoff = 1000;
             connectedAt = Date.now();
@@ -308,12 +294,11 @@ export function serve(config, opts = {}) {
             void drainSpool();
             // 上报本机信息 (hostname/os/daemon 版本/已装 runtimes)
             const { detectInstalled, detectExecutable = detectExecutionRuntimesWithSignal } = opts.machineInfo ?? {};
-            const helloPromise = collectMachineHello(config.agentsRoot, config.executionLimits, process.platform, {
+            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: () => managedDaemonCapabilities(updateEligibility),
                 capabilities: capabilities.machineHello,
             });
             runtimeFacts = helloPromise
@@ -324,9 +309,7 @@ export function serve(config, opts = {}) {
                 if (ws === openedSocket && openedSocket.readyState === WebSocket.OPEN
                     && detected.some((runtime) => !hello.executionRuntimes.includes(runtime))) {
                     detectedExecutionRuntimes = detected;
-                    latestMachineHello = { ...hello, executionRuntimes: [...detected] };
-                    latestHelloSocket = openedSocket;
-                    sendEffectiveMachineHello();
+                    machineHelloPublisher.publish({ ...hello, executionRuntimes: [...detected] }, openedSocket);
                 }
                 return detected;
             })
@@ -341,9 +324,7 @@ export function serve(config, opts = {}) {
                 if (ws !== openedSocket || openedSocket.readyState !== WebSocket.OPEN)
                     return;
                 detectedExecutionRuntimes = hello.executionRuntimes;
-                latestMachineHello = hello;
-                latestHelloSocket = openedSocket;
-                sendEffectiveMachineHello();
+                machineHelloPublisher.publish(hello, openedSocket);
             })
                 .catch(() => { });
             opts.onOpen?.(ws);
@@ -678,7 +659,7 @@ export function serve(config, opts = {}) {
                     ? r.serverCapabilities.filter((c) => typeof c === "string")
                     : []);
                 if (serverCapabilities.has(PROJECT_SKILLS_CAPABILITY)) {
-                    if (await ensureProjectSkillsInitialized())
+                    if (await projectSkillControllerReadiness.ensure())
                         await projectSkillsController.publishCurrent();
                 }
                 return;
@@ -700,11 +681,11 @@ export function serve(config, opts = {}) {
                 if (typeof request.reqId !== "string")
                     return;
                 const result = serverCapabilities.has(PROJECT_SKILLS_CAPABILITY)
-                    ? await projectSkillsController.handle(msg)
+                    ? await projectSkillsController.handle(msg, connectionEpochToken)
                     : { ok: false, error: "capability_unavailable" };
                 if (result.ok && (msg.type === "project:remove"
                     || msg.type === "project:rescan")) {
-                    void ensureProjectSkillsInitialized();
+                    void projectSkillControllerReadiness.ensure();
                 }
                 try {
                     ws?.send(JSON.stringify({ type: "fs:result", reqId: request.reqId, ...result }));
@@ -1130,7 +1111,7 @@ export function serve(config, opts = {}) {
             void flushSlog();
             reconnectTimer = setTimeout(() => {
                 reconnectTimer = null;
-                connect();
+                void connect();
             }, backoff);
             backoff = Math.min(backoff * 2, maxBackoff);
         });
@@ -1140,16 +1121,14 @@ export function serve(config, opts = {}) {
         });
     }
     const ready = (async () => {
-        await reconcileExecutionJournal(executionJournal, {
-            agentsRoot: config.agentsRoot,
-            serverUrl: config.serverUrl,
+        executionJournal = await initializeProjectSkillProtectedExecutionJournal({
+            config,
             ...(opts.profileName === undefined ? {} : { profileName: opts.profileName }),
-            log: dslog,
-            flush: flushSlog,
-            writeStderr: (line) => process.stderr.write(line),
+            startup: projectSkillRuntimeRootStartup,
+            protectedExecutionIds,
+            ...(injectedExecutionJournal === undefined ? {} : { injectedJournal: injectedExecutionJournal }),
         });
-        void ensureProjectSkillsInitialized();
-        connect();
+        await connect();
     })();
     const stop = () => {
         if (stopPromise !== null)
@@ -1180,7 +1159,9 @@ export function serve(config, opts = {}) {
                     run.controller.request();
                 await deadline.waitFor(Promise.all(pending));
                 await deadline.waitFor(hostCoordinator.drain());
-                await executionJournal.close({ signal: deadline.signal });
+                if (executionJournal !== undefined) {
+                    await executionJournal.close({ signal: deadline.signal });
+                }
             }
             finally {
                 deadline.dispose();

package/dist/supervised-runtime.js

@@ -1,5 +1,4 @@
 import { fileURLToPath } from "node:url";
-import { join } from "node:path";
 import { startDormantSupervisor, } from "./execution-supervisor.js";
 import { buildClaudeArgs } from "./runtimes/claude.js";
 import { DEEPSEEK_HARNESS_CONFIG_ENV, deepSeekHarnessConfigPath, } from "./runtimes/deepseek-harness.js";
@@ -13,10 +12,7 @@ export function supervisorLaunch(request) {
         ...(request.reasoning === undefined ? {} : { reasoning: request.reasoning }),
     };
     if (request.runtime === "claude") {
-        const additionalDirectories = request.claudeAdditionalDirectories
-            ?? (request.agentRoot === undefined
-                ? undefined
-                : [join(request.agentRoot, ".crew", "claude-skills"), request.agentRoot]);
+        const additionalDirectories = request.claudeAdditionalDirectories;
         return {
             command: request.bin,
             args: buildClaudeArgs({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.19",
+  "version": "0.6.21",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -38,6 +38,7 @@
   "scripts": {
     "daemon": "pnpm --filter @nowcrew/cli build && tsx src/main.ts",
     "build": "tsc -p tsconfig.json",
+    "codex-home:migrate": "tsx src/runtimes/codex-home-migration-cli.ts",
     "test": "vitest run",
     "typecheck": "tsc --noEmit"
   }