@dylanpiercey/work 0.0.158 → 0.0.160

package/bin/work.mjs

@@ -80,9 +80,14 @@ switch (command) {
     // Service installation only — no doctor/fix, no migrate. Used by
     // scripts/setup-prod.sh so npm and source installs share one
     // definition; WORK_SERVICE_EXEC points it at a checkout's run-prod.sh.
-    if (installService()) {
+    if (!installService()) {
+      process.exitCode = 1;
+    } else if (await waitForServer(serviceEnv().PORT)) {
       log(`done — http://localhost:${serviceEnv().PORT}`);
     } else {
+      warn(
+        `service started but nothing answered on port ${serviceEnv().PORT} within 30s — check the logs`,
+      );
       process.exitCode = 1;
     }
     break;
@@ -567,8 +572,13 @@ async function setup() {
   const running = installService();
   const port = serviceEnv().PORT;
   maybeTunnel(port);
-  if (running) log(`done — http://localhost:${port}`);
-  else {
+  if (running) {
+    if (await waitForServer(port)) log(`done — http://localhost:${port}`);
+    else
+      warn(
+        `service started but nothing answered on port ${port} within 30s — check the logs`,
+      );
+  } else {
     // A fresh install's shell may not have mise on PATH yet — name the shim.
     const shim = path.join(
       os.homedir(),
@@ -952,6 +962,26 @@ function stopOldCopies(port) {
   killPids(pidsListening(port), "SIGKILL");
 }
 
+/** Wait for the service to answer before we tell anyone it is up. Both
+ * service managers return as soon as the job is spawned, so `done — http://…`
+ * used to print at a port that answers a second or two later — which reads as
+ * an update that broke the app. Any HTTP reply proves the server is serving;
+ * the status the route returns is not this function's business. */
+async function waitForServer(port, timeoutMs = 30_000) {
+  const deadline = Date.now() + timeoutMs;
+  for (;;) {
+    try {
+      await fetch(`http://127.0.0.1:${port}/`, {
+        redirect: "manual",
+        signal: AbortSignal.timeout(2000),
+      });
+      return true;
+    } catch {}
+    if (Date.now() >= deadline) return false;
+    await new Promise((r) => setTimeout(r, 150));
+  }
+}
+
 function installService() {
   const port = serviceEnv().PORT;
   stopOldCopies(port);
@@ -1001,26 +1031,37 @@ ${envXml}
     );
     log("installing launchd agent");
     const uid = process.getuid();
-    spawnSync("launchctl", ["bootout", `gui/${uid}/dev.work.app`], {
+    const label = `gui/${uid}/dev.work.app`;
+    spawnSync("launchctl", ["bootout", label], { stdio: "ignore" });
+    // Exactly one spawn, whichever verb gets us there. launchd allows a job
+    // one start per 10s: `kickstart -k` on top of the start `bootstrap`'s
+    // RunAtLoad just did kills that process and serves nothing for the rest
+    // of the throttle window — ten seconds of a dead port after `done`.
+    let started = spawnSync("launchctl", ["bootstrap", `gui/${uid}`, plist], {
       stdio: "ignore",
-    });
-    const boot = spawnSync("launchctl", ["bootstrap", `gui/${uid}`, plist], {
-      stdio: "ignore",
-    });
-    if (
-      boot.status !== 0 &&
-      spawnSync("launchctl", ["load", "-w", plist], { stdio: "ignore" })
-        .status !== 0
-    ) {
+    }).status === 0;
+    if (!started) {
+      // A launchd that only speaks the legacy verbs: `load -w` honours
+      // RunAtLoad the same way.
+      started =
+        spawnSync("launchctl", ["load", "-w", plist], { stdio: "ignore" })
+          .status === 0;
+    }
+    if (!started) {
+      // Both refused because the job is loaded already (a bootout that did
+      // not take). Nothing spawned it with the new definition, and it is old
+      // enough not to be throttled, so restart it.
+      started =
+        spawnSync("launchctl", ["kickstart", "-k", label], { stdio: "ignore" })
+          .status === 0;
+    }
+    if (!started) {
       warn(
         `could not load the agent (no GUI launchd session?). Run from a local terminal: launchctl bootstrap gui/$UID ${plist}`,
       );
       warn("or start manually: work start");
       return false;
     }
-    spawnSync("launchctl", ["kickstart", "-k", `gui/${uid}/dev.work.app`], {
-      stdio: "ignore",
-    });
     log(
       "manage with: launchctl {kickstart -k,print} gui/$UID/dev.work.app   (logs: ~/Library/Logs/work.log)",
     );

package/dist/{_B8Ruz8T9.js → _BRBF-t9p.js}

@@ -46,7 +46,7 @@ fs.mkdirSync(config.dataDir, { recursive: true });
 var TMUX_SOCKET = "work";
 var execFileAsync = promisify(execFile);
 async function run$1(cmd, args, cwd, env, opts = {}) {
-	const { stdout } = await execFileAsync(cmd, args, {
+	const child = execFileAsync(cmd, args, {
 		cwd,
 		env,
 		maxBuffer: 67108864,
@@ -55,6 +55,8 @@ async function run$1(cmd, args, cwd, env, opts = {}) {
 			killSignal: "SIGKILL"
 		}
 	});
+	if (opts.stdin !== void 0) child.child.stdin?.end(opts.stdin);
+	const { stdout } = await child;
 	return stdout.trim();
 }
 /** Ceilings for git's network verbs. A connection that stalls (GitHub
@@ -90,11 +92,11 @@ var gh = (args, host) => run$1("gh", args, void 0, host ? {
 	...process.env,
 	GH_HOST: host
 } : void 0);
-var tmux = (args, env) => run$1("tmux", [
+var tmux = (args, env, opts) => run$1("tmux", [
 	"-L",
 	TMUX_SOCKET,
 	...args
-], os.homedir(), utf8Locale(env ?? process.env));
+], os.homedir(), utf8Locale(env ?? process.env), opts);
 /** launchd starts the service with no locale at all, and under a non-UTF-8
 * locale tmux replaces characters it deems unprintable in format output —
 * including the \t separators sessionStates and the scraper split on, which
@@ -6746,7 +6748,7 @@ function publishChange(sessionId) {
 	const row = get("SELECT workspace_id FROM sessions WHERE id = ?", sessionId);
 	if (row?.workspace_id) {
 		const workspaceId = row.workspace_id;
-		import("./_wmfv4tOT.js").then((m) => m.notifySessionsChanged(workspaceId));
+		import("./_Cr-5sjB_.js").then((m) => m.notifySessionsChanged(workspaceId));
 		return;
 	}
 	publish("sessions.changed");
@@ -8347,11 +8349,11 @@ async function sendToSession(id, text, size) {
 	}
 	const buffer = `work-send-${Math.random().toString(36).slice(2, 8)}`;
 	await tmux([
-		"set-buffer",
+		"load-buffer",
 		"-b",
 		buffer,
-		text
-	], env);
+		"-"
+	], env, { stdin: text });
 	await tmux([
 		"paste-buffer",
 		"-p",

package/dist/_Cr-5sjB_.js

@@ -0,0 +1,2 @@
+import { m as notifySessionsChanged } from "./_BRBF-t9p.js";
+export { notifySessionsChanged };