@dylanpiercey/work 0.2.43 → 0.2.45

package/bin/cli/session.mjs

@@ -139,9 +139,13 @@ function sentText(id, r, asked) {
 
 function printReply(r) {
   const replied = r.kind === "reply" || r.answers;
-  const head = replied
-    ? `${r.label} replied${r.answers ? ` to ${r.answers}` : ""}:`
-    : `${r.label}: ${r.text}`;
+  const head = !replied
+    ? `${r.label}: ${r.text}`
+    : r.held
+      ? `${r.label} is not done (it waits on ${r.held}), and wrote${r.answers ? ` to ${r.answers}` : ""}:`
+      : r.follows
+        ? `${r.label} followed up${r.answers ? ` on ${r.answers}` : ""}, from a turn it started on its own after its reply:`
+        : `${r.label} replied${r.answers ? ` to ${r.answers}` : ""}:`;
   console.log(head);
   if (replied) console.log(`${r.text}\n`);
   if (r.asks === "turn")
@@ -214,7 +218,7 @@ export const commands = [
   {
     name: "session",
     summary:
-      "this session and the workspace's others: new, fanout, send, wait, keep, team, kill",
+      "this session and the workspace's others: new, fanout, send, wait, hold, keep, team, kill",
     help: `work session [--json]
   This session (WORK_SESSION_ID): its id, agent, name, state, and the
   workspace it is in (id, name, path) — what a link names (/w/<id>/…).
@@ -290,6 +294,13 @@ work session wait [<id>|<group>...] [--any] [--timeout <seconds>]
   typed in too. A group's come once all its members have answered, unless
   --any: then whatever is in, as soon as anything is. Exits 124 if some
   are still working after --timeout (${WAIT_S} s).
+work session hold "<what you wait on>"
+  End this turn before your work is done — a job of yours runs on, and
+  its end wakes you — without it reading as your answer: the sessions
+  waiting on your reply get this turn's last message as an interim one,
+  saying what you wait on, and wait on; you are not closed for being
+  done meanwhile; and the last message of the turn the job's end wakes
+  you into is the reply (hold again there to wait on more).
 work session keep <id>
   Keep a session this one started open for follow-ups, as \`new --keep\`
   would have: it is never closed for being done.
@@ -559,6 +570,19 @@ work session kill --done
             );
           return;
         }
+        case "hold": {
+          const me = sessionId(ctx);
+          const what = rest.join(" ").trim();
+          if (!what) ctx.die('usage: work session hold "<what you wait on>"');
+          const r = await ctx.api.post(`/api/sessions/${me}/hold${by()}`, {
+            what,
+          });
+          return ctx.out(r, () =>
+            console.log(
+              `held: ${r.waiting.join(", ")} ${r.waiting.length === 1 ? "gets" : "get"} this turn's last message as an interim reply and ${r.waiting.length === 1 ? "waits" : "wait"} on; the last message of the turn its end wakes you into is the reply`,
+            ),
+          );
+        }
         case "keep": {
           const [id] = rest;
           if (!id) ctx.die("usage: work session keep <id>");

package/bin/work.mjs

@@ -957,37 +957,85 @@ function allowScriptsArgs() {
   return /^allow-scripts\s*=/m.test(conf) ? [`--allow-scripts=${pkgs}`] : [];
 }
 
+/** The release the registry npm uses names `latest`, or null when it
+ * cannot say (offline, or a registry that does not carry it). */
+function latestRelease() {
+  try {
+    const out = execFileSync(
+      "npm",
+      ["view", "@dylanpiercey/work@latest", "version", "--prefer-online"],
+      {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        timeout: 30_000,
+      },
+    );
+    return /^\d+\.\d+\.\d+\S*$/.exec(out.trim())?.[0] ?? null;
+  } catch {
+    return null;
+  }
+}
+
 async function update() {
-  log("updating @dylanpiercey/work");
   const before = serviceCli();
-  // `--prefer-online`: npm serves `latest` from a cached packument for a
-  // few minutes after a publish, so an update right behind a release
-  // reinstalled the version already running.
-  // Under --json, npm's own output goes to stderr: stdout is setup's JSON.
-  const stdio = jsonOut ? ["inherit", 2, 2] : "inherit";
-  sh(
-    "npm",
-    [
-      "install",
-      "-g",
-      "--prefer-online",
-      ...allowScriptsArgs(),
-      "@dylanpiercey/work@latest",
-    ],
-    { stdio },
+  const root = execFileSync("npm", ["root", "-g"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", 2],
+  }).trim();
+  const cli = path.join(root, "@dylanpiercey", "work", "bin", "work.mjs");
+  const had = installAt(cli)?.version ?? null;
+  // The release by its number: for a minute or two after a publish the
+  // metadata `npm install` reads can still name the one before, even
+  // `--prefer-online`, and `@latest` then reinstalled the release already
+  // running and called it an update. A number npm cannot find yet fails
+  // instead, and is asked for again until the registry has caught up.
+  const want = latestRelease();
+  log(`updating @dylanpiercey/work${want ? ` to ${want}` : ""}`);
+  const allow = allowScriptsArgs();
+  for (let attempt = 1; ; attempt++) {
+    // Under --json, npm's own output goes to stderr: stdout is setup's
+    // JSON. Its stderr is read for the not-found, then passed on.
+    const r = spawnSync(
+      "npm",
+      [
+        "install",
+        "-g",
+        "--prefer-online",
+        ...allow,
+        `@dylanpiercey/work@${want ?? "latest"}`,
+      ],
+      { stdio: ["inherit", jsonOut ? 2 : "inherit", "pipe"], encoding: "utf8" },
+    );
+    process.stderr.write(r.stderr || "");
+    if (r.status === 0) break;
+    const notYet = want && /\bETARGET\b|No matching version/.test(r.stderr);
+    if (!notYet)
+      die(`npm install -g failed${r.error ? `: ${r.error.message}` : ""}`);
+    if (attempt === 8)
+      die(
+        `npm still cannot find ${want}, the release the registry names latest: run \`work update\` again in a few minutes`,
+      );
+    log(
+      `npm does not have ${want} yet (it was just published); asking again in 15s`,
+    );
+    await new Promise((r) => setTimeout(r, 15_000));
+  }
+  const got = installAt(cli)?.version ?? null;
+  if (!got) die(`npm installed into ${root}, but there is no ${cli}`);
+  if (want && got !== want)
+    warn(
+      `npm installed ${got}, not ${want}, the release the registry names latest`,
+    );
+  log(
+    got === had
+      ? `${got} was already installed; setting it up again`
+      : `installed ${got}${had ? ` (was ${had})` : ""}`,
   );
   // Finish with the CLI that npm just installed, found where that npm
   // installs, never `work` by name: the npm and the `work` first on PATH
   // can be two nodes' (a Homebrew npm ahead of mise's shims), and the
   // other install's setup points the service back at itself, so every
   // update left the service on the old release.
-  const root = execFileSync("npm", ["root", "-g"], {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", 2],
-  }).trim();
-  const cli = path.join(root, "@dylanpiercey", "work", "bin", "work.mjs");
-  if (!fs.existsSync(cli))
-    die(`npm installed into ${root}, but there is no ${cli}`);
   sh(cli, [
     "setup",
     ...(yes ? ["--yes"] : []),

package/dist/{_DN2yXOe-.js → _B1mzUx3g.js}

@@ -32,152 +32,152 @@ var iconSize = {
 	xl: 18
 };
 var mobile = "screen and (max-width: 899px) and (pointer: coarse), screen and (max-width: 899px) and (pointer: none)";
-var glyphBadgeNum = "_y _x";
+var glyphBadgeNum = "_P _O";
 var usageInk = {
-	ok: "_z",
-	mid: "_A",
-	warm: "_B",
-	hot: "_C"
+	ok: "_Q",
+	mid: "_R",
+	warm: "_S",
+	hot: "_T"
 };
 var usageFill = {
-	ok: "_D",
-	mid: "_E",
-	warm: "_F",
-	hot: "_G"
+	ok: "_U",
+	mid: "_V",
+	warm: "_W",
+	hot: "_X"
 };
 var prTone = {
-	open: "_H",
-	draft: "_I",
-	merged: "_J",
-	closed: "_K"
+	open: "_Y",
+	draft: "_Z",
+	merged: "_0",
+	closed: "_1"
 };
 var phaseIcon = {
-	working: "_X _W",
-	waiting: "_Y _W",
-	idle: "_Z _W",
-	off: "_0 _W"
+	working: "_bd _bc",
+	waiting: "_be _bc",
+	idle: "_bf _bc",
+	off: "_bg _bc"
 };
-var btnSm = "_7 _r";
-var btnLg = "_8 _r";
+var btnSm = "_bn _I";
+var btnLg = "_bo _I";
 var tone = {
-	accent: "_bb",
-	ok: "_bc",
-	warn: "_bd",
-	danger: "_be",
-	merged: "_bf",
-	closed: "_bg"
+	accent: "_bs",
+	ok: "_bt",
+	warn: "_bu",
+	danger: "_bv",
+	merged: "_bw",
+	closed: "_bx"
 };
-var inputLg = "_bk _bj";
-var iconBtnXs = "_bo _m";
-var iconBtnRow = "_bp _m";
-var iconBtnLg = "_bq _m";
-var chipBtn = "_br _m";
-var toastStack = "_bF _bE";
+var inputLg = "_bB _bA";
+var iconBtnXs = "_bF _D";
+var iconBtnRow = "_bG _D";
+var iconBtnLg = "_bH _D";
+var chipBtn = "_bI _D";
+var toastStack = "_o _n";
 var toastKind = {
-	error: "_bJ",
-	warn: "_bK",
-	info: "_bL"
+	error: "_s",
+	warn: "_t",
+	info: "_u"
 };
 var toastTitle = {
-	error: "_bM",
-	warn: "_bN",
-	info: "_bO"
+	error: "_v",
+	warn: "_w",
+	info: "_x"
 };
-var tocDot = "_cS _U";
+var tocDot = "_cK _ba";
 //#endregion
 //#region src/tags/settings-agents.css.ts
-var agentRow = "_fn _d3";
-var list$3 = "_d7 _dw _d2 _d5";
-var metaChip = "_ek _bi _bh";
-var sectionCount = "_dt _9 __";
-var usageNote = "_jA _bh";
-var pop$2 = "_gp _bw";
-var spinner = "_gs _bm _2";
-var toolLead = "_ga _ef";
-var name$4 = "_gz _ef";
-var desc$1 = "_gA _eg";
+var agentRow = "_eT _dK";
+var list$3 = "_dO _dj _dJ _dM";
+var metaChip = "_d2 _bz _by";
+var sectionCount = "_dg _bp _bq";
+var usageNote = "_j3 _by";
+var pop$2 = "_hp _bN";
+var spinner = "_hs _bD _bi";
+var toolLead = "_gM _dX";
+var name$4 = "_he _dX";
+var desc$1 = "_hf _dY";
 //#endregion
 //#region src/tags/lsp-add-dialog.css.ts
-var addDlg = "_ka _b4";
-var key$1 = "_lh _lf";
-var addTile = "_lj _lf";
-var field$2 = "_lu _bj";
-var keyField = "_lv _lu _bj";
-var labelField = "_lw _lu _bj";
-var detailsToggle = "_fc _P";
-var themeSeg = "_eI _bA";
-var checkList = "_g6 _du";
+var addDlg = "_n9 _bV";
+var key$1 = "_mi _mg";
+var addTile = "_mk _mg";
+var field$2 = "_mv _bA";
+var keyField = "_mw _mv _bA";
+var labelField = "_mx _mv _bA";
+var detailsToggle = "_hL _6";
+var themeSeg = "_fE _bR";
+var checkList = "_g5 _dh";
 //#endregion
 //#region src/tags/prompt-dialog.css.ts
-var promptDlg = "_b8 _b4";
-var item$1 = "_b0 _m";
-var glance = "_dG _m";
+var promptDlg = "_bZ _bV";
+var item$1 = "_b4 _D";
+var glance = "_dG _D";
 //#endregion
 //#region src/tags/side-nav.css.ts
-var iconBtn = "_cq _m";
-var settingsDot = "_cr _bz";
-var notifyBtn = "_cw _m";
+var iconBtn = "_b7 _D";
+var settingsDot = "_b8 _bQ";
+var notifyBtn = "_cc _D";
 //#endregion
 //#region src/styles/session-pop.css.ts
-var sessionPop = "_cJ _bw";
-var sessionPopBtn = "_cK _4";
-var wsBtn = "_gH _4";
-var rowIcon = "_gJ _bo _m";
-var prChip = "_kn _v _jK";
+var sessionPop = "_ce _bN";
+var sessionPopBtn = "_cf _bk";
+var wsBtn = "_es _bk";
+var rowIcon = "_eu _bF _D";
+var prChip = "_kX _M _kR";
 //#endregion
 //#region src/tags/port-chip.css.ts
-var port = "_m3 _v _jK";
+var port = "_ny _M _kR";
 var depth = {
-	"1": "_jS",
-	"2": "_jT",
-	"3": "_jU"
+	"1": "_lp",
+	"2": "_lq",
+	"3": "_lr"
 };
-var open = "_j0 _4";
-var action = "_j5 _br _m";
-var toggle = "_ep _P";
-var fold = "_eq _d4";
+var open = "_lx _bk";
+var action = "_lC _bI _D";
+var toggle = "_d7 _6";
+var fold = "_d8 _dL";
 var statusOf = {
-	queued: "_kX",
-	starting: "_kY",
-	working: "_kZ",
-	waiting: "_k0",
-	idle: "_k1",
-	done: "_k2",
-	closed: "_k3"
+	queued: "_kA",
+	starting: "_kB",
+	working: "_kC",
+	waiting: "_kD",
+	idle: "_kE",
+	done: "_kF",
+	closed: "_kG"
 };
-var item = "_ki _4";
-var menu = "_mU _cJ _bw";
-var menuItem = "_mW _4";
-var findBtn$1 = "_ir _ic _bp _m";
-var tool = "_ic _bp _m";
-var heldRefresh = "_ik _v";
-var pop$1 = "_nl _cJ _bw";
-var fileFilter = "_o1 _o";
-var findInput = "_dM _o";
-var keybarIconBtn = "_dV _br _m";
-var input = "_c_ _o";
-var group = "_dc _P";
-var hint$1 = "_oc _9 _M";
-var sheetDir = "_nC _by";
-var upBtn = "_lS _bp _m";
-var findBtn = "_lW _ic _bp _m";
-var goBtn = "_lX _ic _bp _m";
-var note = "_nJ _bh";
+var item = "_li _bk";
+var menu = "_m1 _ce _bN";
+var menuItem = "_m3 _bk";
+var findBtn$1 = "_jc _ic _bG _D";
+var tool = "_ic _bG _D";
+var heldRefresh = "_ik _M";
+var pop$1 = "_ne _ce _bN";
+var fileFilter = "_oP _F";
+var findInput = "_e4 _F";
+var keybarIconBtn = "_fc _bI _D";
+var input = "_du _F";
+var group = "_dx _6";
+var hint$1 = "_n0 _bp _3";
+var sheetDir = "_nR _bP";
+var upBtn = "_ix _bG _D";
+var findBtn = "_iB _ic _bG _D";
+var goBtn = "_iC _ic _bG _D";
+var note = "_nh _by";
 //#endregion
 //#region src/tags/manage-workspace.css.ts
-var procCmd = "_h1 _ef";
-var factCopy = "_h8 _br _m";
-var resultRow = "_nQ _4";
-var resultBranch = "_nR _ek _bi _bh _bo _m";
-var urlAction = "_nS _ek _bi _bh _el";
-var curRow = "_hP _d_";
+var procCmd = "_gs _dX";
+var factCopy = "_gz _bI _D";
+var resultRow = "_l0 _bk";
+var resultBranch = "_l1 _d2 _bz _by _bF _D";
+var urlAction = "_l2 _d2 _bz _by _d3";
+var curRow = "_fh _dR";
 //#endregion
 //#region src/tags/join-dialog.css.ts
-var dlg = "_mr _b4";
-var hint = "_ms _bh";
-var kbtn = "_ci _bq _m";
-var repeat = "_cl _ck";
-var dpadUser = "_co _ck";
-var dpadEsc = "_cp _ck";
+var dlg = "_n1 _bV";
+var hint = "_n2 _by";
+var kbtn = "_c0 _bH _D";
+var repeat = "_c3 _c2";
+var dpadUser = "_c6 _c2";
+var dpadEsc = "_c7 _c2";
 //#endregion
 export { field$2 as $, item as A, usageInk as At, wsBtn as B, fileFilter as C, iconBtnRow as Ct, findBtn$1 as D, prTone as Dt, tool as E, phaseIcon as Et, depth as F, settingsDot as G, sessionPopBtn as H, open as I, promptDlg as J, glance as K, port as L, fold as M, iconSize as Mt, toggle as N, mobile as Nt, menu as O, tone as Ot, action as P, sans as Pt, addTile as Q, prChip as R, keybarIconBtn as S, iconBtnLg as St, heldRefresh as T, inputLg as Tt, iconBtn as U, sessionPop as V, notifyBtn as W, themeSeg as X, checkList as Y, detailsToggle as Z, sheetDir as _, toastTitle as _t, dlg as a, name$4 as at, input as b, chipBtn as bt, resultBranch as c, spinner as ct, factCopy as d, list$3 as dt, key$1 as et, procCmd as f, metaChip as ft, upBtn as g, toastStack as gt, goBtn as h, toastKind as ht, repeat as i, desc$1 as it, statusOf as j, color as jt, menuItem as k, usageFill as kt, resultRow as l, usageNote as lt, findBtn as m, tocDot as mt, dpadUser as n, labelField as nt, hint as o, toolLead as ot, note as p, agentRow as pt, item$1 as q, kbtn as r, addDlg as rt, curRow as s, pop$2 as st, dpadEsc as t, keyField as tt, urlAction as u, sectionCount as ut, hint$1 as v, btnLg as vt, pop$1 as w, iconBtnXs as wt, findInput as x, glyphBadgeNum as xt, group as y, btnSm as yt, rowIcon as z };

package/dist/{_Cv5RrCSW.js → _B_Wl8EDh.js}

@@ -750,6 +750,16 @@ var STEPS = [
 		up(db) {
 			db.exec("ALTER TABLE session_messages ADD COLUMN by_send INTEGER NOT NULL DEFAULT 0");
 		}
+	},
+	{
+		version: 12,
+		name: "follow-ups and held replies",
+		up(db) {
+			db.exec(`
+        ALTER TABLE session_messages ADD COLUMN follows TEXT;
+        ALTER TABLE session_messages ADD COLUMN held TEXT;
+      `);
+		}
 	}
 ];
 var LATEST = STEPS.at(-1).version;
@@ -9478,7 +9488,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("./_BKkT73fv.js").then((m) => m.notifySessionsChanged(workspaceId));
+		import("./_COxuRDjJ.js").then((m) => m.notifySessionsChanged(workspaceId));
 		return;
 	}
 	publish("sessions.changed");
@@ -17576,7 +17586,7 @@ function notifySessionsChanged(workspaceId) {
 async function emitSessionsChanged(workspaceId) {
 	try {
 		const states = await sessionStates();
-		const { teamsOf } = await import("./_BviTiVOB.js");
+		const { teamsOf } = await import("./_CXys7J6U.js");
 		publish("sessions.changed", {
 			workspaceId,
 			sessions: listSessions(workspaceId).map((s) => ({