@nowcrew/daemon 0.5.13 → 0.5.15

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, DAEMON_CAPABILITIES, EXECUTION_PROTOCOL } from "./machine-info.js";
+import { collectMachineHello, DAEMON_CAPABILITIES, EXECUTION_PROTOCOL, } from "./machine-info.js";
 import { listWorkspace, readWorkspaceFile } from "./workspace-fs.js";
 import { listSkills } from "./skills.js";
 import { inspectRaftWorkspace, importRaftWorkspace } from "./workspace-import.js";
@@ -18,8 +18,10 @@ 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, runExecution, } from "./execution-runner.js";
+import { executionBackendCapability } from "./execution-backend.js";
 // normalize.ts 的活动种类 → activity 枚举
 const ACTIVITY_MAP = {
     init: "working", text: "thinking", reading: "reading", sending: "sending",
@@ -28,7 +30,7 @@ const ACTIVITY_MAP = {
 };
 export function buildControlPlaneUrl(serverUrl, machineToken, runtimePlatform = process.platform) {
     const query = new URLSearchParams({ key: machineToken });
-    if (runtimePlatform !== "win32") {
+    if (executionBackendCapability(runtimePlatform).supported) {
         query.set("execution_min", String(EXECUTION_PROTOCOL.min));
         query.set("execution_max", String(EXECUTION_PROTOCOL.max));
     }
@@ -43,8 +45,9 @@ export function serve(config, opts = {}) {
     let backoff = 1000;
     const maxBackoff = opts.maxBackoffMs ?? 30_000;
     const executionJournal = opts.execution?.journal ?? createExecutionJournal(config.agentsRoot);
+    const executionTelemetry = createExecutionTelemetryJournal(config.agentsRoot);
     const executeProtocol = opts.execution?.runExecution ?? runExecution;
-    let detectedRuntimes = [];
+    let detectedExecutionRuntimes = [];
     let runtimeFacts = null;
     const executionReady = executionJournal.reconcileAfterRestart().then(() => true, (error) => {
         dslog("execution.recovery_failed", "execution journal 恢复失败", {
@@ -66,6 +69,26 @@ export function serve(config, opts = {}) {
         }
         catch { /* reconnect/sync replays durable lifecycle */ }
     };
+    const reportExecutionFrame = async (frame) => {
+        if (frame.type === "execution:activity" || frame.type === "execution:console") {
+            try {
+                await executionTelemetry.append(frame);
+            }
+            catch (error) {
+                dslog("execution.telemetry_journal_failed", "execution telemetry 持久化失败", {
+                    level: "ERROR", execution_id: frame.executionId,
+                    error_message: error.message,
+                });
+                throw error;
+            }
+        }
+        safeExecutionSend(frame);
+    };
+    const replayExecutionTelemetry = async () => {
+        const frames = await executionTelemetry.replay();
+        for (const frame of frames)
+            safeExecutionSend(frame);
+    };
     const snapshotEntry = (entry) => {
         if ((entry.state === "completed" || entry.state === "interrupted") && entry.completion !== null) {
             return { executionId: entry.executionId, state: entry.state, completion: entry.completion, updatedAt: entry.updatedAt };
@@ -238,7 +261,7 @@ export function serve(config, opts = {}) {
             void drainSpool();
             // 上报本机信息 (hostname/os/daemon 版本/已装 runtimes)
             const helloPromise = collectMachineHello(config.agentsRoot, config.executionLimits);
-            runtimeFacts = helloPromise.then((hello) => hello.runtimes, (error) => {
+            runtimeFacts = helloPromise.then((hello) => hello.executionRuntimes, (error) => {
                 dslog("execution.runtime_detection_failed", "runtime 探测失败", {
                     level: "ERROR", error_message: error.message,
                 });
@@ -246,16 +269,21 @@ export function serve(config, opts = {}) {
             });
             void helloPromise
                 .then((hello) => {
-                detectedRuntimes = hello.runtimes;
+                detectedExecutionRuntimes = hello.executionRuntimes;
                 try {
                     ws?.send(JSON.stringify(hello));
-                    log(`📤 已上报机器信息: ${hello.hostname} · ${hello.os} · runtimes=[${hello.runtimes.join(",")}] · agents=[${hello.agentHandles.join(",")}]`);
+                    log(`📤 已上报机器信息: ${hello.hostname} · ${hello.os} · installed=[${hello.runtimes.join(",")}] · executable=[${hello.executionRuntimes.join(",")}] · agents=[${hello.agentHandles.join(",")}]`);
                 }
                 catch { /* 非 OPEN,忽略 */ }
             })
                 .catch(() => { });
             opts.onOpen?.(ws);
             void executionReady.then((ready) => ready ? sendSnapshot(`reconnect-${randomUUID()}`) : undefined);
+            void replayExecutionTelemetry().catch((error) => {
+                dslog("execution.telemetry_replay_failed", "execution telemetry 重放失败", {
+                    level: "ERROR", error_message: error.message,
+                });
+            });
         });
         ws.on("message", async (data) => {
             let decoded;
@@ -292,6 +320,15 @@ export function serve(config, opts = {}) {
                         await executionJournal.acknowledgeCompletion(frame.executionId).catch(() => { });
                         return;
                     }
+                    if (frame.type === "execution:event-ack") {
+                        await executionTelemetry.acknowledge(frame.executionId, frame.kind, frame.seq).catch((error) => {
+                            dslog("execution.telemetry_ack_failed", "execution telemetry ACK 处理失败", {
+                                level: "ERROR", execution_id: frame.executionId,
+                                error_message: error.message,
+                            });
+                        });
+                        return;
+                    }
                     if (frame.type === "execution:cancel") {
                         if (!knownExecutionHashes.has(frame.executionId)
                             && !executionRuns.has(frame.executionId)
@@ -352,7 +389,7 @@ export function serve(config, opts = {}) {
                     let availableRuntimes;
                     try {
                         availableRuntimes = opts.execution?.availableRuntimes?.()
-                            ?? await (runtimeFacts ?? Promise.resolve(detectedRuntimes));
+                            ?? await (runtimeFacts ?? Promise.resolve(detectedExecutionRuntimes));
                     }
                     catch (error) {
                         reservation.release();
@@ -373,7 +410,7 @@ export function serve(config, opts = {}) {
                             availableRuntimes,
                             ...reservation.facts,
                         },
-                        report: safeExecutionSend,
+                        report: reportExecutionFrame,
                         ...(reservation.state === undefined ? {} : {
                             slot: { state: reservation.state, ready: reservation.ready },
                         }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.5.13",
+  "version": "0.5.15",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -17,10 +17,11 @@
     "access": "public"
   },
   "dependencies": {
+    "@agentclientprotocol/sdk": "1.2.1",
     "cross-spawn": "^7.0.6",
     "ws": "^8",
     "zod": "^3.23.0",
-    "@nowcrew/cli": "^0.4.5"
+    "@nowcrew/cli": "^0.4.7"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",