@nowcrew/daemon 0.6.91 → 0.6.92

package/dist/local-runtime-environment.js

@@ -1,4 +1,4 @@
-import { delimiter, join } from "node:path";
+import { delimiter, join, resolve } from "node:path";
 import { environmentForExecution } from "./agent-environments.js";
 import { augmentedPath } from "./runtime-path.js";
 import { sanitizeEnvVars } from "./runtime-env.js";
@@ -10,6 +10,7 @@ export function buildLocalRuntimeEnvironment(context) {
     const { input, workspace, executionWorkspace, inheritedEnv, providerConfig, crewHome, contextThreadId, nativeThreadContextPath, reportContext, runtime } = context;
     const agentEnvironment = sanitizeEnvVars(providerConfig.environmentPlan === undefined ? providerConfig.envVars
         : environmentForExecution(providerConfig.environmentPlan, workspace.dir, input.projectContext?.primary?.root ?? executionWorkspace.runDir, input.projectContext?.primary?.projectId));
+    const boundImDecisionFile = input.launch.systemEnv?.CREW_BOUND_IM_DECISION_FILE;
     return mergeRuntimeEnvironments([
         inheritedEnv, agentEnvironment,
         input.trainingProjectContext === undefined ? {} : machinePackageManagerEnv(inheritedEnv),
@@ -35,6 +36,10 @@ export function buildLocalRuntimeEnvironment(context) {
             QA_REPORT_DELIVERY_CONTEXT: JSON.stringify(reportContext),
             CREW_TASK_DIR: executionWorkspace.runDir,
             CREW_TASK_LOG: executionWorkspace.workLogPath,
+            // CLI 可以从 Agent 主目录或项目目录调用，标记始终写回完成阶段读取的任务目录。
+            ...(boundImDecisionFile ? {
+                CREW_BOUND_IM_DECISION_FILE: resolve(executionWorkspace.runDir, boundImDecisionFile),
+            } : {}),
             ...(input.wakeMessageId ? { CREW_WAKE_MESSAGE_ID: input.wakeMessageId } : {}),
             XDG_CONFIG_HOME: join(workspace.homeDir, ".config"),
             XDG_DATA_HOME: join(workspace.homeDir, ".local", "share"),

package/dist/machine-environment-cache.js

@@ -31,6 +31,7 @@ export function createMachineEnvironmentProvider(options = {}) {
     let lastFailureTime = -Infinity;
     let stopped = false;
     let unsafeCleanup = false;
+    let isCleanupComplete;
     let flight;
     let controller;
     let captureEpoch = 0;
@@ -50,8 +51,19 @@ export function createMachineEnvironmentProvider(options = {}) {
         return module.captureWindowsMachineEnvironment(request);
     });
     const refresh = async (force, signal) => {
-        if (!selected.source || stopped || unsafeCleanup)
+        if (!selected.source || stopped)
             return snapshot;
+        if (unsafeCleanup) {
+            try {
+                if (!isCleanupComplete?.())
+                    return snapshot;
+            }
+            catch {
+                return snapshot;
+            }
+            unsafeCleanup = false;
+            isCleanupComplete = undefined;
+        }
         if (!force && now() - lastFailureTime < (options.backoffMs ?? 30_000))
             return snapshot;
         const attemptedAt = new Date(now()).toISOString();
@@ -64,7 +76,7 @@ export function createMachineEnvironmentProvider(options = {}) {
                 return snapshot;
             publish(snapshot.env, { state: "loading", attemptedAt, errorCode: null });
             capturing = true;
-            const deadline = Date.now() + (options.captureTimeoutMs ?? (selected.source === "windows-registry" ? 8_000 : 5_000));
+            const deadline = Date.now() + (options.captureTimeoutMs ?? (selected.source === "windows-registry" ? 8_000 : 10_000));
             const capture = selected.source === "windows-registry" ? captureWindows : options.captureShell ?? captureShellMachineEnvironment;
             for (let attempt = 0; attempt < 2; attempt++) {
                 try {
@@ -111,8 +123,10 @@ export function createMachineEnvironmentProvider(options = {}) {
         }
         catch (error) {
             const errorCode = error instanceof MachineEnvironmentCaptureError ? error.code : selected.source === "windows-registry" ? "windows_environment_unavailable" : "shell_capture_failed";
-            if (errorCode === "shell_cleanup_failed")
+            if (errorCode === "shell_cleanup_failed") {
                 unsafeCleanup = true;
+                isCleanupComplete = error instanceof MachineEnvironmentCaptureError ? error.isCleanupComplete : undefined;
+            }
             lastFailureTime = now();
             return publish(lastGood?.env ?? baseline, { state: lastGood ? "stale" : "fallback", errorCode, attemptedAt });
         }
@@ -129,7 +143,7 @@ export function createMachineEnvironmentProvider(options = {}) {
             }
             return flight;
         }
-        if (stopped || unsafeCleanup || selected.source === null)
+        if (stopped || selected.source === null)
             return Promise.resolve(snapshot);
         controller = new AbortController();
         flight = refresh(acquireOptions?.force === true, controller.signal).finally(() => { flight = undefined; controller = undefined; });

package/dist/machine-environment-contract.js

@@ -1,8 +1,10 @@
 export class MachineEnvironmentCaptureError extends Error {
     code;
-    constructor(code) {
+    isCleanupComplete;
+    constructor(code, isCleanupComplete) {
         super(code);
         this.code = code;
+        this.isCleanupComplete = isCleanupComplete;
         this.name = "MachineEnvironmentCaptureError";
     }
 }

package/dist/machine-environment-process.js

@@ -44,7 +44,11 @@ export async function runMachineEnvironmentProcess(options) {
         stdio[collectFd] = "pipe";
     if (options.metadataFd !== undefined)
         stdio[options.metadataFd] = "pipe";
-    const child = spawn(options.file, [...options.args], { cwd: options.cwd, env: options.env, detached: true, stdio });
+    // launchd Background 的 I/O 策略会让 shell 初始化停滞；只调整短命采集子进程。
+    // taskpolicy 原地 exec，保持同一 PID/进程组、环境和私有管道。
+    const file = process.platform === "darwin" ? "/usr/sbin/taskpolicy" : options.file;
+    const args = process.platform === "darwin" ? ["-a", "--", options.file, ...options.args] : [...options.args];
+    const child = spawn(file, args, { cwd: options.cwd, env: options.env, detached: true, stdio });
     const chunks = [];
     let size = 0;
     const metadata = [];
@@ -102,6 +106,22 @@ export async function runMachineEnvironmentProcess(options) {
         try {
             await cleanupOnce();
         }
+        catch (error) {
+            const pid = child.pid;
+            if (error instanceof MachineEnvironmentCaptureError && error.code === "shell_cleanup_failed" && pid !== undefined) {
+                // 后续只验证旧进程组消失，不对可能复用的 PID 再发送终止信号。
+                throw new MachineEnvironmentCaptureError("shell_cleanup_failed", () => {
+                    try {
+                        process.kill(-pid, 0);
+                        return false;
+                    }
+                    catch (cause) {
+                        return cause.code === "ESRCH";
+                    }
+                });
+            }
+            throw error;
+        }
         finally {
             for (const stream of child.stdio)
                 stream?.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.91",
+  "version": "0.6.92",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",