@nowcrew/daemon 0.6.98-beta.3 → 0.6.98

package/dist/serve.js

@@ -9,7 +9,7 @@ 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 { daemonCapabilities, daemonCapabilityBindings, MACHINE_HELLO_ACK_CAPABILITY, } 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 { handleWorkspaceControlRequest } from "./workspace-control-handler.js";
@@ -65,10 +65,6 @@ export function serve(config, opts = {}) {
     let serverCapabilities = new Set();
     let backoff = 1000;
     const maxBackoff = opts.maxBackoffMs ?? 30_000;
-    // hello 重试跑满仍未 ack 时主动断连重连(破 server 侧连接归属/fence 死锁)。收到 ack 清零;
-    // 连续多次仍拿不到 ack 则停手,退回 connected-offline,避免事故期把控制面打成重连风暴。
-    const maxUnackedHelloReconnects = 3;
-    let unackedHelloReconnects = 0;
     const testShutdown = readTestShutdownConfiguration(process.env);
     const shutdownTimeoutMs = opts.shutdownTimeoutMs ?? testShutdown.timeoutMs ?? 30_000;
     const createWebSocket = opts.createWebSocket ?? ((url) => new WebSocket(url));
@@ -122,7 +118,7 @@ export function serve(config, opts = {}) {
             catch { /* reconnect/timeout reconciliation handles a lost status frame */ }
         },
     });
-    const marketplace = createServeMarketplace(config, localSlots, hostCoordinator);
+    const marketplace = createServeMarketplace(config, localSlots, hostCoordinator, async () => ({ ...(await machineRuntime.provider.acquire()).env }));
     const storageIdentityAdmission = createStorageIdentityAdmission(opts.storageRuntime);
     const projectionCoordinator = createAgentProjectionCoordinator();
     const { projectRegistry, projectWorkspaceRegistry, projectDependencyProvisioner } = createProjectRegistryWiring(config.agentsRoot, opts.execution?.dependencies);
@@ -164,41 +160,7 @@ export function serve(config, opts = {}) {
                 : configuredIdentity;
             return currentIdentity === undefined ? hello : { ...hello, ...currentIdentity };
         },
-        onSent: (hello, attempt) => dslog("daemon.machine_hello_send_queued", "机器 hello 已进入发送队列", {
-            attempt, hostname: hello.hostname, daemon_version: hello.daemonVersion,
-        }),
-        onSendFailed: (hello, attempt, error) => dslog("daemon.machine_hello_send_failed", "机器 hello 发送失败", {
-            level: "WARN", attempt, hostname: hello.hostname, daemon_version: hello.daemonVersion,
-            error_message: error instanceof Error ? error.message : String(error),
-        }),
-        onAck: (hello) => {
-            unackedHelloReconnects = 0; // 拿到确认 = 本连接登记成功,清零强制重连计数。
-            dslog("daemon.machine_hello_ack_received", "机器 hello 已收到控制面确认", {
-                hostname: hello.hostname, daemon_version: hello.daemonVersion,
-            });
-        },
-        // 仅当当前 server 声明支持 ack 才重试;老 server 收不到 ack,重试无意义(退回单次上报)。
-        ackSupported: () => serverCapabilities.has(MACHINE_HELLO_ACK_CAPABILITY),
-        // 重试跑满仍未 ack → 断开当前连接,靠重连换新连接(新 epoch/token)破 server 侧 fence 死锁。
-        onExhausted: (socket) => {
-            if (stopped || ws !== socket || socket.readyState !== WebSocket.OPEN)
-                return;
-            if (unackedHelloReconnects >= maxUnackedHelloReconnects) {
-                dslog("daemon.machine_hello_unacked_giveup", "机器 hello 连续多次重连仍未确认,停止强制重连(保持连接,等待下次事件或人工介入)", {
-                    level: "ERROR", reconnects: unackedHelloReconnects,
-                });
-                return;
-            }
-            unackedHelloReconnects += 1;
-            // 抖动重连间隔:控制面回滚时多台 daemon 会同时耗尽重试,固定间隔会同步重连造成羊群。
-            // close handler 用当前 backoff 排重连,这里注入 1~4s 随机值把各机错峰(open 会再把它复位)。
-            const jitteredBackoff = 1_000 + Math.floor(Math.random() * 3_000);
-            backoff = Math.min(jitteredBackoff, maxBackoff);
-            dslog("daemon.machine_hello_unacked_reconnect", "机器 hello 重试跑满仍未确认,断开重连换新连接", {
-                level: "WARN", reconnects: unackedHelloReconnects, backoff_ms: backoff,
-            });
-            socket.close(1011, "machine hello unacknowledged");
-        },
+        onSent: (hello) => log(`📤 已上报机器信息: ${hello.hostname} · ${hello.os} · installed=[${hello.runtimes.join(",")}] · executable=[${hello.executionRuntimes.join(",")}] · agents=[${hello.agentHandles.join(",")}]`),
     });
     const machineRuntime = createMachineRuntimeEnvironment({
         config,
@@ -348,7 +310,6 @@ export function serve(config, opts = {}) {
             // 连上了才有机会把离线期间(断连原因/退出前)落盘的日志补传上去
             void drainSpool();
             // 上报本机信息 (hostname/os/daemon 版本/已装 runtimes)
-            machineHelloPublisher.attach(openedSocket);
             machineRuntime.open(openedSocket, { capabilities: capabilities.machineHello, beforePublish: Promise.resolve(), connectionId });
             opts.onOpen?.(ws);
             void sendSnapshot(`reconnect-${randomUUID()}`);
@@ -391,11 +352,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 (rawType === "machine:hello_ack") {
-                const ackSeq = "helloSeq" in decoded && typeof decoded.helloSeq === "number" ? decoded.helloSeq : undefined;
-                machineHelloPublisher.acknowledge(connectionSocket, ackSeq);
-                return;
-            }
             if (rawType === "machine:environment:get" || rawType === "machine:environment:refresh") {
                 await handleMachineEnvironmentFrame(decoded, machineRuntime.provider, sendToConnection);
                 return;
@@ -779,11 +735,6 @@ export function serve(config, opts = {}) {
                 // ready 帧带 server 视角的 machineId/workspaceId → 作为后续所有日志的默认关联键
                 const r = msg;
                 setSlogDefaults({ machine_id: r.machineId, workspace_id: r.workspaceId });
-                // 旧 server 无此字段 → 空集合(daemon 保持全部旧行为)。ackSupported() 依赖它判断是否重试,
-                // 必须在任何 republish() 之前就位;否则本轮 republish 看到空集合→不排重试→整套 ack/重连机制哑火。
-                serverCapabilities = new Set(Array.isArray(r.serverCapabilities)
-                    ? r.serverCapabilities.filter((c) => typeof c === "string")
-                    : []);
                 if (opts.storageRuntime !== undefined && typeof r.workspaceId === "string" && typeof r.machineId === "string") {
                     const bindingSocket = ws;
                     bindStorageServerIdentity(opts.storageRuntime, { workspaceId: r.workspaceId, machineId: r.machineId }, {
@@ -800,7 +751,10 @@ export function serve(config, opts = {}) {
                         },
                     });
                 }
-                machineHelloPublisher.republish();
+                // 旧 server 无此字段 → 空集合(daemon 保持全部旧行为)。
+                serverCapabilities = new Set(Array.isArray(r.serverCapabilities)
+                    ? r.serverCapabilities.filter((c) => typeof c === "string")
+                    : []);
                 if (serverCapabilities.has(PROJECT_SKILLS_CAPABILITY)) {
                     void projectSkillsController.initialize()
                         .then(() => projectSkillsController.publishCurrent())
@@ -1249,7 +1203,6 @@ export function serve(config, opts = {}) {
         });
         connectionSocket.on("close", (code) => {
             machineRuntime.close(connectionSocket);
-            machineHelloPublisher.detach(connectionSocket);
             if (stopped || ws !== connectionSocket)
                 return;
             // server 能力随连接失效;下个连接的 ready 帧重新声明(防降级重连后沿用过期能力)。

package/dist/windows-scheduled-task.js

@@ -1,6 +1,5 @@
 import { systemCommandRunner, windowsCommandArg, } from "./computer-service.js";
 import { win32 } from "node:path";
-import { powershellCommandArgs } from "./powershell-command.js";
 function encoded(value) {
     return Buffer.from(value, "utf16le").toString("base64");
 }
@@ -34,9 +33,10 @@ export async function inspectWindowsServiceUpdateScope(spec, npmPrefix, daemonPi
         "$enginePid=if($instances.Count -eq 1){[int64]$instances[0].EnginePID}else{0};",
         "[pscustomobject]@{count=1;state=[int]$task.State;execute=if($actions.Count -eq 1){$actions[0].Execute}else{$null};arguments=if($actions.Count -eq 1){$actions[0].Arguments}else{$null};instanceCount=$instances.Count;enginePid=$enginePid;engineOwned=($enginePid -eq $pidValue -or $ancestors -contains $enginePid);processIdentity=$processIdentity;conflictingPrefixes=$conflicts.Count}|ConvertTo-Json -Compress;",
     ].join("");
-    const result = await runner("powershell.exe", powershellCommandArgs(script, [
+    const result = await runner("powershell.exe", [
+        "-NoProfile", "-NonInteractive", "-Command", script,
         encoded(spec.id), encoded(entryMarker), String(daemonPid),
-    ]));
+    ]);
     if (result.exitCode !== 0)
         return { valid: false };
     let inspection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.98-beta.3",
+  "version": "0.6.98",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -18,13 +18,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "daemon": "pnpm --filter @nowcrew/cli build && tsx src/main.ts",
-    "build": "tsc -p tsconfig.json",
-    "prepublishOnly": "pnpm build && node ../scripts/daemon-release-artifact.mjs --strict-registry",
-    "test": "vitest run",
-    "typecheck": "tsc --noEmit"
-  },
   "dependencies": {
     "@agentclientprotocol/sdk": "1.2.1",
     "@nowcrew/cli": "0.4.17",
@@ -46,5 +39,11 @@
     "tsx": "^4.19.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0"
+  },
+  "scripts": {
+    "daemon": "pnpm --filter @nowcrew/cli build && tsx src/main.ts",
+    "build": "tsc -p tsconfig.json",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit"
   }
-}
+}

package/dist/computer-token-setup.js

@@ -1,46 +0,0 @@
-import { assertBootstrapMatches, localPathsMatch } from "./computer-setup-orchestration.js";
-import { redactSetupSecrets } from "./computer-setup-client.js";
-export async function runMachineTokenSetup(input, deps, machineToken) {
-    try {
-        deps.reportPairing("Checking computer connection information...");
-        const target = await deps.client.tokenTarget(machineToken);
-        assertBootstrapMatches(target, input);
-        deps.reportPairing("Downloading, installing, and starting the Daemon service...");
-        const installation = await deps.installAutomatically({
-            serverUrl: target.serverUrl, machineToken, workspaceId: target.workspaceId, machineId: target.machineId,
-            requestedProfile: target.profile,
-            ...(target.releaseTag === undefined ? {} : { requestedReleaseTag: target.releaseTag }),
-            ...(target.registryUrl === undefined ? {} : { requestedRegistryUrl: target.registryUrl }),
-            verifyAfterStart: async (candidate) => {
-                deps.reportPairing("Confirming the computer connection...");
-                const deadline = deps.now() + 120_000;
-                for (;;) {
-                    const current = await deps.client.tokenTarget(machineToken);
-                    assertBootstrapMatches(current, input);
-                    const connection = current.connection;
-                    const platform = deps.platform ?? process.platform;
-                    if (connection.status === "online" && connection.epoch > target.minimumConnectionEpoch
-                        && connection.credentialMatchesConnection && current.environment === target.environment
-                        && connection.profile === candidate.profile
-                        && connection.daemonHome !== null && localPathsMatch(connection.daemonHome, candidate.daemonHome, platform)
-                        && connection.agentsRoot !== null && localPathsMatch(connection.agentsRoot, candidate.agentsRoot, platform)
-                        && (target.storageId === undefined || connection.storageId === target.storageId))
-                        return;
-                    if (deps.now() >= deadline)
-                        throw new Error("Timed out confirming the new computer connection");
-                    await deps.sleep(Math.min(2_000, Math.max(0, deadline - deps.now())));
-                }
-            },
-        });
-        return {
-            workspaceId: target.workspaceId, workspaceSlug: target.workspaceSlug, machineId: target.machineId,
-            environment: target.environment, profile: installation.profile, daemonVersion: installation.version,
-            serviceId: installation.serviceId, serviceStatus: "running", helloConfirmed: true,
-            localNowworkHome: installation.localHome, daemonHome: installation.daemonHome, agentsRoot: installation.agentsRoot,
-            ...(target.storageId === undefined ? {} : { storageId: target.storageId }),
-        };
-    }
-    catch (error) {
-        throw new Error(redactSetupSecrets(error instanceof Error ? error.message : String(error), [machineToken]));
-    }
-}

package/dist/powershell-command.js

@@ -1,12 +0,0 @@
-/**
- * powershell.exe -Command joins trailing argv into command text, rather than
- * binding it to $args. Invoke a scriptblock with literal arguments inside one
- * UTF-16LE encoded command. Encoding is transport, not encryption.
- */
-export function powershellCommandArgs(script, args = []) {
-    // PowerShell also treats typographic single quotes as string delimiters.
-    const literals = args.map((arg) => `'${arg.replace(/['\u2018-\u201b]/gu, (quote) => quote + quote)}'`).join(" ");
-    const command = "[Console]::OutputEncoding=[Text.UTF8Encoding]::new($false);\n"
-        + `& {\n${script}\n} ${literals}`;
-    return ["-NoProfile", "-NonInteractive", "-EncodedCommand", Buffer.from(command, "utf16le").toString("base64")];
-}

package/dist/windows-task-principal.js

@@ -1,26 +0,0 @@
-/** Read only: resolve the task's account with Windows, without guessing or stripping its domain. */
-export const windowsTaskPrincipalScript = [
-    "$currentUserSid=[Security.Principal.WindowsIdentity]::GetCurrent().User.Value;",
-    "$principalSid=$null;",
-    "try{",
-    "$account=[string]$task.Principal.UserId;",
-    "if($account -match '^S-\\d-'){",
-    "$principalSid=([Security.Principal.SecurityIdentifier]::new($account)).Value;",
-    "}else{",
-    "$principalSid=([Security.Principal.NTAccount]::new($account)).Translate([Security.Principal.SecurityIdentifier]).Value;",
-    "}",
-    "}catch{$principalSid=$null};",
-].join("");
-export const windowsTaskPrincipalFields = [
-    "currentUserSid=$currentUserSid;",
-    "principalSid=$principalSid;",
-    "logonType=[int]$task.Principal.LogonType;",
-    "runLevel=[int]$task.Principal.RunLevel;",
-].join("");
-export function windowsTaskPrincipalMatches(principal) {
-    return typeof principal.currentUserSid === "string"
-        && /^S-1-(?:\d+-)*\d+$/.test(principal.currentUserSid)
-        && principal.principalSid === principal.currentUserSid
-        && principal.logonType === 3 // Interactive
-        && principal.runLevel === 0; // Limited
-}