@tablation/crew 0.10.1 → 0.10.2

package/dist/cli.js

@@ -2323,9 +2323,14 @@ function programFromPlist(text) {
   const args = [...block[1].matchAll(/<string>([\s\S]*?)<\/string>/g)].map((m) => xmlUnescape(m[1]));
   return args.find((a) => a.endsWith("/bin/crew")) ?? args[0] ?? null;
 }
-function listLaunchdUnits(dir = launchAgentsDir()) {
-  if (!existsSync5(dir)) return [];
-  return readdirSync(dir).filter((f) => f.startsWith(CREW_LAUNCHD_PREFIX) && f.endsWith(".plist")).sort().map((f) => {
+function loadedCrewLabels() {
+  const list = spawnSync("launchctl", ["list"], { encoding: "utf8" });
+  if (list.status !== 0) return [];
+  return [...parseLaunchctlList(list.stdout ?? "").keys()].filter((l) => l.startsWith(CREW_LAUNCHD_PREFIX));
+}
+function listLaunchdUnits(dir = launchAgentsDir(), loaded = []) {
+  const files = existsSync5(dir) ? readdirSync(dir) : [];
+  const units = files.filter((f) => f.startsWith(CREW_LAUNCHD_PREFIX) && f.endsWith(".plist")).sort().map((f) => {
     const plistPath = join5(dir, f);
     let program = null;
     try {
@@ -2339,10 +2344,16 @@ function listLaunchdUnits(dir = launchAgentsDir()) {
       programExists: program !== null && existsSync5(program)
     };
   });
+  const seen = new Set(units.map((u) => u.label));
+  for (const label of [...loaded].sort()) {
+    if (!label.startsWith(CREW_LAUNCHD_PREFIX) || seen.has(label)) continue;
+    units.push({ label, plistPath: join5(dir, `${label}.plist`), program: null, programExists: false, orphan: true });
+  }
+  return units;
 }
-function foreignLaunchdUnits(crewHome, dir) {
+function foreignLaunchdUnits(crewHome, dir, loaded) {
   const own = new Set(["run", "release", "passengers"].map((job) => labelFor(crewHome, job)));
-  return listLaunchdUnits(dir).filter((u) => !own.has(u.label));
+  return listLaunchdUnits(dir, loaded).filter((u) => !own.has(u.label));
 }
 function removeLaunchdUnit(unit, dryRun, log) {
   if (dryRun) {
@@ -2354,9 +2365,9 @@ function removeLaunchdUnit(unit, dryRun, log) {
   if (existsSync5(unit.plistPath)) unlinkSync(unit.plistPath);
   log.emit(`removed ${unit.label} (${unit.plistPath})`);
 }
-function clearForeignLaunchdUnits(crewHome, replace, dryRun, log, dir) {
-  const foreign = foreignLaunchdUnits(crewHome, dir);
-  const blocking = foreign.filter((u) => u.program === null || u.programExists);
+function clearForeignLaunchdUnits(crewHome, replace, dryRun, log, dir, loaded) {
+  const foreign = foreignLaunchdUnits(crewHome, dir, loaded);
+  const blocking = foreign.filter((u) => !u.orphan && (u.program === null || u.programExists));
   if (blocking.length > 0 && !replace) {
     log.warn(
       `two crew installs target this machine: ${blocking.map((u) => `${u.label} runs ${u.program ?? "an unreadable ProgramArguments"}`).join("; ")}. Run \`crew uninstall\` from the other one, or pass --replace.`
@@ -2364,14 +2375,14 @@ function clearForeignLaunchdUnits(crewHome, replace, dryRun, log, dir) {
     return false;
   }
   for (const unit of foreign) {
-    const why = unit.program === null ? "replacing a unit with no readable ProgramArguments" : unit.programExists ? "replacing a live other install" : "removing a stale unit whose program is gone";
+    const why = unit.orphan ? "removing a loaded job whose plist is gone" : unit.program === null ? "replacing a unit with no readable ProgramArguments" : unit.programExists ? "replacing a live other install" : "removing a stale unit whose program is gone";
     log.emit(`${why}: ${unit.label}`);
     removeLaunchdUnit(unit, dryRun, log);
   }
   return true;
 }
-function removeAllLaunchdUnits(dryRun, log, dir) {
-  for (const unit of listLaunchdUnits(dir)) removeLaunchdUnit(unit, dryRun, log);
+function removeAllLaunchdUnits(dryRun, log, dir, loaded) {
+  for (const unit of listLaunchdUnits(dir, loaded)) removeLaunchdUnit(unit, dryRun, log);
 }
 function parseLaunchctlList(text) {
   const jobs = /* @__PURE__ */ new Map();
@@ -2383,13 +2394,13 @@ function parseLaunchctlList(text) {
   return jobs;
 }
 function describeForeignLaunchdUnits(crewHome, dir) {
-  const foreign = foreignLaunchdUnits(crewHome, dir);
-  if (foreign.length === 0) return [];
   const list = spawnSync("launchctl", ["list"], { encoding: "utf8" });
   const jobs = parseLaunchctlList(list.status === 0 ? list.stdout ?? "" : "");
+  const foreign = foreignLaunchdUnits(crewHome, dir, jobs.keys());
   return foreign.map((u) => {
     const status2 = jobs.get(u.label);
     const loaded = status2 ? `loaded, last exit ${status2.lastExit}` : "not loaded";
+    if (u.orphan) return `  ${u.label}: ${loaded}; plist gone \u2014 stale: \`crew install\` removes it`;
     const program = u.program ? `${u.program} (${u.programExists ? "present" : "GONE"})` : "no readable ProgramArguments";
     const stale = status2 && !u.programExists ? " \u2014 stale: `crew install` removes it" : "";
     return `  ${u.label}: ${loaded}; runs ${program}${stale}`;
@@ -9516,7 +9527,7 @@ if (command === "passenger-sync-daemon") {
 `),
         warn: (m) => process.stderr.write(`crew install: ${m}
 `)
-      });
+      }, void 0, loadedCrewLabels());
       if (!ok) return false;
     }
     const installPathProblem = cfg.routes.some((r) => r.enabled && r.hostPassengers) ? dockerPathProblem(cfg.ship) : void 0;
@@ -11444,7 +11455,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
 `),
           warn: (m) => process.stderr.write(`crew uninstall: ${m}
 `)
-        });
+        }, void 0, loadedCrewLabels());
       }
       break;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "A standing team of headless agents that picks work off a Tablation board, does it on a machine you control, and reports back.",
   "type": "module",
   "license": "MIT",