@dylanpiercey/work 0.0.122 → 0.0.124

package/bin/work.mjs

@@ -657,25 +657,70 @@ function servicePath() {
   return setupPath(path.dirname(process.execPath));
 }
 
-/** Argv prefix that keeps the host awake while the server runs. A suspended
- * host is a dead host: agents keep running in tmux, but the machine stops
- * answering, so remote sessions look hung until someone wakes it by hand. The
- * inhibitor needs no privileges and lifts when the service stops — masking
- * sleep.target is the stronger machine-wide version, but that wants sudo. */
-function awakePrefix() {
+/** Argv prefixes that keep the host awake while the server runs, best first.
+ * A suspended host is a dead host: agents keep running in tmux, but the
+ * machine stops answering, so remote sessions look hung until someone wakes
+ * it by hand. The inhibitor lifts when the service stops.
+ *
+ * Linux offers two, because polkit gates them differently:
+ *
+ *   sleep:idle  also vetoes an explicit suspend, but
+ *               org.freedesktop.login1.inhibit-block-sleep is
+ *               allow_any=auth_admin_keep — permitted from a session, refused
+ *               for a caller that has none. That is the lingering user
+ *               manager at boot, so the service cannot rely on it.
+ *   idle        org.freedesktop.login1.inhibit-block-idle is allow_any=yes,
+ *               so this always works. It holds the system non-idle, which is
+ *               what stops logind's IdleAction (and a desktop's idle-suspend)
+ *               from ever firing.
+ *
+ * Idle alone is the honest target anyway — it matches `caffeinate -s`, and
+ * declining to veto a suspend the user deliberately asked for is correct.
+ * Taking the stronger one when it is allowed costs nothing, so try both. */
+function awakePrefixes() {
   if (process.platform === "darwin")
-    return have("caffeinate") ? ["/usr/bin/caffeinate", "-s"] : [];
+    return have("caffeinate") ? [["/usr/bin/caffeinate", "-s"]] : [];
   if (process.platform === "linux" && have("systemd-inhibit"))
-    return [
+    return ["sleep:idle", "idle"].map((what) => [
       "systemd-inhibit",
-      "--what=sleep:idle",
+      `--what=${what}`,
       "--who=work",
       "--why=work server is running",
       "--mode=block",
-    ];
+    ]);
   return [];
 }
 
+/** systemd's ExecStart for the linux unit, as one line.
+ *
+ * With no inhibitor this is just the argv. Otherwise it is a shell that tries
+ * each candidate in turn and execs under the first one allowed, because
+ * `systemd-inhibit` exits non-zero when polkit refuses — and since it is the
+ * unit's ExecStart, that failure takes the whole service down with it. A
+ * lingering manager at boot has no session, so the sleep block is refused
+ * every time and `Restart=always` retries forever; the server would only come
+ * up once someone logged in, defeating the unattended start
+ * `loginctl enable-linger` exists to guarantee. Falling through to the
+ * ungated idle block keeps the machine awake anyway, and running bare is
+ * still better than not running. */
+function serviceExecStart(candidates, argv) {
+  // systemd splits on whitespace, so quote any argument containing it.
+  const unit = (parts) =>
+    parts.map((a) => (a.includes(" ") ? `"${a}"` : a)).join(" ");
+  if (!candidates.length) return unit(argv);
+  const shq = (a) => `'${a.replace(/'/g, `'\\''`)}'`;
+  const cmd = argv.map(shq).join(" ");
+  // Each probe takes and drops an inhibitor around `true`; if that is allowed
+  // the real one will be too.
+  const script = candidates
+    .map((c) => {
+      const inh = c.map(shq).join(" ");
+      return `if ${inh} true 2>/dev/null; then exec ${inh} ${cmd}; fi; `;
+    })
+    .join("");
+  return `/bin/sh -c "${script}exec ${cmd}"`;
+}
+
 /** Where installService() writes the service definition — also the store we
  * read settings back out of, so there is no second config file to keep. */
 function serviceFile() {
@@ -887,9 +932,11 @@ function installService() {
   // instead of the CLI — that script carries its own sleep inhibitor and
   // PORT handling, so no awake prefix is layered on top.
   const execOverride = process.env.WORK_SERVICE_EXEC;
-  const startArgs = execOverride
-    ? [execOverride]
-    : [...awakePrefix(), cliPath, "start"];
+  const target = execOverride ? [execOverride] : [cliPath, "start"];
+  const awake = execOverride ? [] : awakePrefixes();
+  // launchd takes an argv, not a shell: caffeinate needs no authorisation, so
+  // the first candidate is simply used.
+  const startArgs = [...(awake[0] || []), ...target];
   if (process.platform === "darwin") {
     const plist = serviceFile();
     fs.mkdirSync(path.dirname(plist), { recursive: true });
@@ -958,10 +1005,7 @@ ${envXml}
     const envLines = Object.entries(serviceEnv())
       .map(([k, v]) => `Environment=${k}=${v}`)
       .join("\n");
-    // systemd splits ExecStart on whitespace, so quote the inhibitor's --why.
-    const execStart = startArgs
-      .map((a) => (a.includes(" ") ? `"${a}"` : a))
-      .join(" ");
+    const execStart = serviceExecStart(awake, target);
     fs.writeFileSync(
       unitFile,
       `[Unit]

package/dist/_8GaDFTzQ.js

@@ -0,0 +1,2 @@
+import { n as pokeStatusWatch } from "./_BJcBOXUi.js";
+export { pokeStatusWatch };

package/dist/{_DJyHc1w-.js → _930ti7l4.js}

@@ -1,4 +1,4 @@
-import { $ as setSetting, V as publish, Y as getSetting, _t as git, bt as config, c as killWorkspaceSessions, dt as all, ft as db, gt as gh, i as disposeSessions, l as listSessions, nt as ghKnownHosts, ot as DEFAULT_GITHUB_HOST, p as panePids, pt as get, vt as run } from "./_Cr71Xd0d.js";
+import { $ as setSetting, V as publish, Y as getSetting, _t as git, bt as config, c as killWorkspaceSessions, dt as all, ft as db, gt as gh, i as disposeSessions, l as listSessions, nt as ghKnownHosts, ot as DEFAULT_GITHUB_HOST, p as panePids, pt as get, vt as run } from "./_DOBRRnfU.js";
 import fs from "node:fs";
 import path from "node:path";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -1005,7 +1005,7 @@ async function materializeWorkspace(id) {
 				repo.default_branch = defaultBranch;
 				db.prepare("UPDATE repos SET base_branch = ?, default_branch = ? WHERE workspace_id = ? AND full_name = ?").run(repo.base_branch, defaultBranch, id, repo.full_name);
 			}
-			(await import("./_Dpa8WFuv.js")).muteAutoPush(repo.full_name, ws.branch);
+			(await import("./_CrVv317N.js")).muteAutoPush(repo.full_name, ws.branch);
 			await addWorkspaceWorktree(bare, path.join(ws.path, repo.worktree), ws.branch, repo.base_branch);
 			added.push(repo);
 		});
@@ -1639,7 +1639,7 @@ async function noteRemoteRef(fullName, branch, oid) {
 	if (await revParse(barePath(fullName), `refs/heads/${branch}`) !== oid) return;
 	rememberPushed(k, oid);
 	if (failures.delete(k)) {
-		const { pokeStatusWatch } = await import("./_Bjh5JEm7.js");
+		const { pokeStatusWatch } = await import("./_8GaDFTzQ.js");
 		pokeStatusWatch();
 	}
 }
@@ -1704,7 +1704,7 @@ async function pushOnce(fullName, branch, bases) {
 }
 async function fail(k, why) {
 	failures.set(k, why);
-	const { pokeStatusWatch } = await import("./_Bjh5JEm7.js");
+	const { pokeStatusWatch } = await import("./_8GaDFTzQ.js");
 	pokeStatusWatch();
 	return why;
 }

package/dist/{_CfwTkTbL.js → _BJcBOXUi.js}

@@ -1,5 +1,5 @@
-import { U as subscriberCount, V as publish, W as subscriberJoins, dt as all, ft as db, g as sessionStates, l as listSessions } from "./_Cr71Xd0d.js";
-import { A as portsByWorkspace, J as hostToken, K as forgetToken, M as headOid, Q as ownsBranch, R as repoParent, V as DEFAULT_HOST, Y as joinRepo, Z as splitRepo, h as listWorkspaces, o as pushFailureFor, q as graphqlUrl, z as swr } from "./_DJyHc1w-.js";
+import { U as subscriberCount, V as publish, W as subscriberJoins, dt as all, ft as db, g as sessionStates, l as listSessions } from "./_DOBRRnfU.js";
+import { A as portsByWorkspace, J as hostToken, K as forgetToken, M as headOid, Q as ownsBranch, R as repoParent, V as DEFAULT_HOST, Y as joinRepo, Z as splitRepo, h as listWorkspaces, o as pushFailureFor, q as graphqlUrl, z as swr } from "./_930ti7l4.js";
 import path from "node:path";
 //#region src/server/github-api.ts
 /** Run a GraphQL query against one host.

package/dist/{_BPX2_wNT.js → _Bzb6xzDq.js}

@@ -1978,7 +1978,7 @@ var toastTitle = {
 };
 //#endregion
 //#region src/tags/icons/icon-base.marko
-var icon_base_default = _template("N", (input) => {
+var icon_base_default = _template("O", (input) => {
 	const $scope0_reason = _scope_reason();
 	const $scope0_id = _scope_id();
 	const size = input.size ?? 15;
@@ -1987,7 +1987,7 @@ var icon_base_default = _template("N", (input) => {
 });
 //#endregion
 //#region src/tags/icons/icon-xmark.marko
-var icon_xmark_default = _template("nb", (input) => {
+var icon_xmark_default = _template("ob", (input) => {
 	const $scope0_reason = _scope_reason(), $sg__input_size__OR__input_class = _serialize_guard($scope0_reason, 0);
 	const $scope0_id = _scope_id();
 	_set_serialize_reason({
@@ -2004,7 +2004,7 @@ var icon_xmark_default = _template("nb", (input) => {
 });
 //#endregion
 //#region src/tags/toast.marko
-var toast_default = _template("D", (input) => {
+var toast_default = _template("E", (input) => {
 	const $scope0_reason = _scope_reason(), $sg__input_title = _serialize_guard($scope0_reason, 7), $sg__input_title__OR__input_content__OR__input_action__OR__input_onDismiss = _serialize_guard($scope0_reason, 5), $sg__input_content = _serialize_guard($scope0_reason, 8), $sg__input_action = _serialize_guard($scope0_reason, 9), $sg__input_action__OR__input_onDismiss = _serialize_guard($scope0_reason, 3), $sg__input_onDismiss = _serialize_guard($scope0_reason, 11), $si__input_content = _serialize_if($scope0_reason, 8), $si__input_action__OR__input_onDismiss = _serialize_if($scope0_reason, 3), $si__input_action_content = _serialize_if($scope0_reason, 10);
 	const $scope0_id = _scope_id();
 	const $input_action_content__closures = /* @__PURE__ */ new Set();
@@ -2061,7 +2061,7 @@ var toast_default = _template("D", (input) => {
 					_html(`<button${_attr_class([iconBtnRow, "_bm"])} type=button title=Dismiss aria-label=Dismiss>`);
 					icon_xmark_default({ size: 14 });
 					_html(`</button>${_el_resume($scope5_id, "a")}`);
-					_script($scope5_id, "D0");
+					_script($scope5_id, "E0");
 					writeScope($scope5_id, { _: _scope_with_id($scope3_id) });
 					return 0;
 				}
@@ -2072,8 +2072,8 @@ var toast_default = _template("D", (input) => {
 		}
 	}, $scope0_id, "e", $sg__input_action__OR__input_onDismiss, $sg__input_action__OR__input_onDismiss, $sg__input_title__OR__input_content__OR__input_action__OR__input_onDismiss, 0, 1);
 	_html(`</div>${_el_resume($scope0_id, "a")}`);
-	_script($scope0_id, "D1");
-	_script($scope0_id, "D2");
+	_script($scope0_id, "E1");
+	_script($scope0_id, "E2");
 	writeScope($scope0_id, {
 		j: _serialize_if($scope0_reason, 7) && title,
 		k: _serialize_if($scope0_reason, 0) && inputClass,
@@ -2173,12 +2173,12 @@ function theme() {
 function setTheme(mode) {
 	set("theme", mode === "system" ? null : mode);
 }
-var sectionCount = "_bz _H _I";
-var row = "_bK _bC";
+var sectionCount = "_bq _H _I";
+var row = "_bB _bt";
 var iconBtn = "_Z _j";
 //#endregion
 //#region src/tags/icons/icon-refresh.marko
-var icon_refresh_default = _template("fb", (input) => {
+var icon_refresh_default = _template("gb", (input) => {
 	const $scope0_reason = _scope_reason(), $sg__input_size__OR__input_class = _serialize_guard($scope0_reason, 0);
 	const $scope0_id = _scope_id();
 	_set_serialize_reason({
@@ -2195,7 +2195,7 @@ var icon_refresh_default = _template("fb", (input) => {
 });
 //#endregion
 //#region src/tags/icons/icon-back.marko
-var icon_back_default = _template("M", (input) => {
+var icon_back_default = _template("N", (input) => {
 	const $scope0_reason = _scope_reason(), $sg__input_size__OR__input_class = _serialize_guard($scope0_reason, 0);
 	const $scope0_id = _scope_id();
 	_set_serialize_reason({
@@ -2212,7 +2212,7 @@ var icon_back_default = _template("M", (input) => {
 });
 //#endregion
 //#region src/tags/icons/icon-chevron-right.marko
-var icon_chevron_right_default = _template("S", (input) => {
+var icon_chevron_right_default = _template("T", (input) => {
 	const $scope0_reason = _scope_reason(), $sg__input_size__OR__input_class = _serialize_guard($scope0_reason, 0);
 	const $scope0_id = _scope_id();
 	_set_serialize_reason({
@@ -2229,7 +2229,7 @@ var icon_chevron_right_default = _template("S", (input) => {
 });
 //#endregion
 //#region src/tags/icons/icon-arrow-up.marko
-var icon_arrow_up_default = _template("L", (input) => {
+var icon_arrow_up_default = _template("M", (input) => {
 	const $scope0_reason = _scope_reason(), $sg__input_size__OR__input_class = _serialize_guard($scope0_reason, 0);
 	const $scope0_id = _scope_id();
 	_set_serialize_reason({
@@ -2246,7 +2246,7 @@ var icon_arrow_up_default = _template("L", (input) => {
 });
 //#endregion
 //#region src/tags/icons/icon-search.marko
-var icon_search_default = _template("gb", (input) => {
+var icon_search_default = _template("hb", (input) => {
 	const $scope0_reason = _scope_reason(), $sg__input_size__OR__input_class = _serialize_guard($scope0_reason, 0);
 	const $scope0_id = _scope_id();
 	_set_serialize_reason({
@@ -2305,7 +2305,7 @@ function fuzzy(query, text) {
 }
 //#endregion
 //#region src/tags/icons/icon-sidebar.marko
-var icon_sidebar_default = _template("jb", (input) => {
+var icon_sidebar_default = _template("kb", (input) => {
 	const $scope0_reason = _scope_reason(), $sg__input_size__OR__input_class = _serialize_guard($scope0_reason, 0);
 	const $scope0_id = _scope_id();
 	_set_serialize_reason({
@@ -2320,11 +2320,11 @@ var icon_sidebar_default = _template("jb", (input) => {
 	});
 	_serialize_if($scope0_reason, 0) && writeScope($scope0_id, { a: _existing_scope($childScope) });
 });
-var findInput = "_gc _l";
-var findIconBtn = "_gf _j";
+var findInput = "_f9 _l";
+var findIconBtn = "_gb _j";
 //#endregion
 //#region src/tags/icons/icon-arrow-down.marko
-var icon_arrow_down_default = _template("I", (input) => {
+var icon_arrow_down_default = _template("J", (input) => {
 	const $scope0_reason = _scope_reason(), $sg__input_size__OR__input_class = _serialize_guard($scope0_reason, 0);
 	const $scope0_id = _scope_id();
 	_set_serialize_reason({