@nowcrew/daemon 0.6.57 → 0.6.58

package/dist/storage-runtime-controller.js

@@ -236,6 +236,7 @@ export function createStorageMigrationRuntimeController(rawInput, injected = {})
                         migrationId: operation.migrationId,
                         platform: input.platform,
                         userHome: input.userHome,
+                        ...(input.uid === undefined ? {} : { uid: input.uid }),
                     });
                     workerLaunched = true;
                     const outcome = await dependencies.monitorWorker({

package/dist/storage-runtime-readiness.js

@@ -58,9 +58,12 @@ function findSourceRecord(records, input) {
     return matches.length === 1 ? matches[0] : null;
 }
 export async function probeStorageMigrationRuntime(rawInput, injected = {}) {
-    if (rawInput.platform !== "linux") {
+    if (rawInput.platform !== "darwin" && rawInput.platform !== "linux") {
         return notReady("platform_not_supported");
     }
+    if (rawInput.platform === "darwin" && rawInput.uid === undefined) {
+        return notReady("platform_identity_missing");
+    }
     const configuredNowworkHome = rawInput.environment.NOWWORK_HOME;
     if (configuredNowworkHome === undefined)
         return notReady("nowwork_home_missing");

package/dist/storage-worker-handoff.js

@@ -62,6 +62,16 @@ function workerUnitName(migrationId) {
 function workerUnitPath(userHome, migrationId) {
     return resolve(userHome, ".config", "systemd", "user", workerUnitName(migrationId));
 }
+function workerLaunchdLabel(migrationId) {
+    return `com.nowcrew.storage-migration.${migrationId}`;
+}
+function workerLaunchdPath(userHome, migrationId) {
+    return resolve(userHome, "Library", "LaunchAgents", `${workerLaunchdLabel(migrationId)}.plist`);
+}
+function xml(value) {
+    return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;")
+        .replaceAll('"', "&quot;").replaceAll("'", "&apos;");
+}
 function systemdArg(value) {
     if (/[\0\r\n]/u.test(value))
         throw new Error("storage worker service argument must be a single line");
@@ -77,9 +87,26 @@ export async function launchStorageMigrationWorker(input, runSupervisor = system
     AbsolutePathSchema.parse(input.handoffPath);
     AbsolutePathSchema.parse(input.userHome);
     const migrationId = z.string().uuid().parse(input.migrationId).toLowerCase();
-    if (input.platform !== "linux")
-        throw new Error("Persistent storage migration workers require Linux systemd");
     const worker = [process.execPath, input.entryPath, "storage-migration-worker", "--job", input.handoffPath];
+    if (input.platform === "darwin") {
+        if (input.uid === undefined || !Number.isSafeInteger(input.uid) || input.uid < 0) {
+            throw new Error("Persistent storage migration launchd worker requires a numeric uid");
+        }
+        const label = workerLaunchdLabel(migrationId);
+        const path = workerLaunchdPath(input.userHome, migrationId);
+        const args = worker.map((arg) => `      <string>${xml(arg)}</string>`).join("\n");
+        const descriptor = `<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>\n  <key>Label</key><string>${xml(label)}</string>\n  <key>ProgramArguments</key>\n  <array>\n${args}\n  </array>\n  <key>RunAtLoad</key><true/>\n  <key>KeepAlive</key>\n  <dict>\n    <key>SuccessfulExit</key><false/>\n  </dict>\n  <key>ProcessType</key><string>Background</string>\n</dict>\n</plist>\n`;
+        await atomicPrivateWrite(path, descriptor);
+        try {
+            await checkedSupervisor(runSupervisor, "launchctl", ["bootstrap", `gui/${input.uid}`, path]);
+        }
+        catch (error) {
+            await runSupervisor("launchctl", ["bootout", `gui/${input.uid}/${label}`]).catch(() => undefined);
+            await rm(path, { force: true });
+            throw new Error("Storage migration persistent service launch failed", { cause: error });
+        }
+        return;
+    }
     const unit = workerUnitName(migrationId);
     const path = workerUnitPath(input.userHome, migrationId);
     const descriptor = `[Unit]\nDescription=NowWork storage migration ${migrationId}\nAfter=network-online.target\nWants=network-online.target\n\n[Service]\nType=exec\nExecStart=${worker.map(systemdArg).join(" ")}\nRestart=on-abnormal\nRestartSec=5\n\n[Install]\nWantedBy=default.target\n`;
@@ -97,9 +124,16 @@ export async function launchStorageMigrationWorker(input, runSupervisor = system
 }
 export async function completeStorageMigrationWorkerService(input, runSupervisor = systemSupervisorRun) {
     const migrationId = z.string().uuid().parse(input.migrationId).toLowerCase();
-    if (input.platform !== "linux")
-        return;
     AbsolutePathSchema.parse(input.userHome);
+    if (input.platform === "darwin") {
+        if (input.uid === undefined || !Number.isSafeInteger(input.uid) || input.uid < 0) {
+            throw new Error("Persistent storage migration launchd worker requires a numeric uid");
+        }
+        const label = workerLaunchdLabel(migrationId);
+        await rm(workerLaunchdPath(input.userHome, migrationId), { force: true });
+        await runSupervisor("launchctl", ["bootout", `gui/${input.uid}/${label}`]);
+        return;
+    }
     const unit = workerUnitName(migrationId);
     await checkedSupervisor(runSupervisor, "systemctl", ["--user", "disable", unit]);
     await rm(workerUnitPath(input.userHome, migrationId), { force: true });
@@ -112,5 +146,6 @@ export async function completeStorageMigrationWorkerServiceForHandoff(path) {
         migrationId: operation.migrationId,
         platform: operation.service.platform,
         userHome: operation.service.userHome,
+        ...(operation.service.uid === undefined ? {} : { uid: operation.service.uid }),
     });
 }

package/package.json

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