@archme/cli 0.14.6 → 0.14.7

package/dist/cli.js

@@ -9653,8 +9653,7 @@ var init_launchctl = __esm({
         let r = await bootstrap();
         if (r.exitCode === 0 || r.exitCode === 17) return;
         if (r.exitCode === 5) {
-          await this.opts.spawner.run("launchctl", ["bootout", SERVICE_TARGET(this.opts.uid)]);
-          await new Promise((resolve7) => setTimeout(resolve7, 500));
+          await this.stop();
           r = await bootstrap();
           if (r.exitCode === 0 || r.exitCode === 17) return;
         }
@@ -9665,9 +9664,22 @@ var init_launchctl = __esm({
           "bootout",
           SERVICE_TARGET(this.opts.uid)
         ]);
-        if (r.exitCode !== 0 && r.exitCode !== 113) {
+        if (r.exitCode === 113) return;
+        if (r.exitCode !== 0 && r.exitCode !== 3) {
           throw new Error(`launchctl bootout failed (exit ${r.exitCode}): ${r.stderr || r.stdout}`);
         }
+        const pollMs = this.opts.stopPollMs ?? 250;
+        const deadline = Date.now() + (this.opts.stopTimeoutMs ?? 25e3);
+        const registered = async () => {
+          const p = await this.opts.spawner.run("launchctl", ["print", SERVICE_TARGET(this.opts.uid)]);
+          return !(p.exitCode === 113 || /Could not find/i.test(p.stderr));
+        };
+        while (await registered()) {
+          if (Date.now() >= deadline) {
+            throw new Error(`launchctl bootout: ${LABEL} is still registered with launchd after ${this.opts.stopTimeoutMs ?? 25e3}ms`);
+          }
+          await new Promise((resolve7) => setTimeout(resolve7, pollMs));
+        }
       }
       async enable() {
         const r = await this.opts.spawner.run("launchctl", ["enable", SERVICE_TARGET(this.opts.uid)]);
@@ -9684,7 +9696,7 @@ var init_launchctl = __esm({
       async inspect() {
         const printRes = await this.opts.spawner.run("launchctl", ["print", SERVICE_TARGET(this.opts.uid)]);
         if (printRes.exitCode === 113 || /Could not find/i.test(printRes.stderr)) {
-          return { loaded: false, running: false, pid: null, enabled: false };
+          return { loaded: false, running: false, pid: null, enabled: await this.enabled() };
         }
         if (printRes.exitCode !== 0) {
           throw new Error(`launchctl print failed (exit ${printRes.exitCode}): ${printRes.stderr || printRes.stdout}`);
@@ -9693,13 +9705,13 @@ var init_launchctl = __esm({
         const stateMatch = printRes.stdout.match(/^\s*state\s*=\s*(\S+)/m);
         const pid = pidMatch ? Number(pidMatch[1]) : null;
         const running = pid != null && stateMatch?.[1] === "running";
+        return { loaded: true, running, pid, enabled: await this.enabled() };
+      }
+      async enabled() {
         const disRes = await this.opts.spawner.run("launchctl", ["print-disabled", DOMAIN(this.opts.uid)]);
-        let enabled = true;
-        if (disRes.exitCode === 0) {
-          const re = new RegExp(`"${LABEL.replace(/\./g, "\\.")}"\\s*=>\\s*true`);
-          if (re.test(disRes.stdout)) enabled = false;
-        }
-        return { loaded: true, running, pid, enabled };
+        if (disRes.exitCode !== 0) return true;
+        const re = new RegExp(`"${LABEL.replace(/\./g, "\\.")}"\\s*=>\\s*true`);
+        return !re.test(disRes.stdout);
       }
     };
   }
@@ -10653,7 +10665,7 @@ function bakedSystemdEnv(unit) {
 function mergeUnitEnv(shell, unit) {
   const out = {};
   for (const k of ENV_KEYS_TO_BAKE) {
-    const v = shell[k] !== void 0 ? shell[k] : unit[k];
+    const v = k === "PATH" ? [...new Set(`${shell.PATH ?? ""}:${unit.PATH ?? ""}`.split(":").filter(Boolean))].join(":") : shell[k] !== void 0 ? shell[k] : unit[k];
     if (v) out[k] = v;
   }
   return out;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archme/cli",
-  "version": "0.14.6",
+  "version": "0.14.7",
   "description": "Map your codebase into a living architecture diagram: run `archme init` in a repo to scan it, `archme daemon start` to keep it current on every commit.",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",
@@ -38,7 +38,7 @@
     "build": "node scripts/build.mjs",
     "build:check": "node scripts/smoke-build.mjs",
     "prepublishOnly": "npm run build:check",
-    "test": "npx tsx --test --experimental-test-module-mocks 'src/**/*.test.ts'",
+    "test": "node --liftoff-only --import tsx --test --experimental-test-module-mocks 'src/**/*.test.ts'",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {

package/sandbox-image.json

@@ -1,4 +1,4 @@
 {
   "image": "ghcr.io/architectme/archme-job",
-  "digest": "sha256:5fb1cc6d6fc5199820c05599db9ebe085b180950357686c87cfae4b9440f564b"
+  "digest": "sha256:1b84fd7691c5d22c289985083532f5642c7c6d028d76ef2e350757d87d7cb3e6"
 }