@dylanpiercey/work 0.2.53 → 0.2.55

package/bin/cli/session.mjs

@@ -111,12 +111,16 @@ function sentText(id, r, asked) {
       "A reply it sends before then answers what it is on now: each reply names the message of yours it answers.",
     );
   const reopened = r.reopened ? `reopened ${id} on its conversation; ` : "";
+  const what = r.promoted
+    ? `your ${r.promoted === 1 ? "queued message" : `${r.promoted} queued messages`}`
+    : "";
   const stopped = r.interrupted ? `stopped ${id}'s turn; ` : "";
   if (r.midTurn)
     lines.push(
-      `${stopped}typed into ${id}'s turn under way: it gets this at its next step, after the tool call it is on`,
+      `${stopped}typed ${what || "this"} into ${id}'s turn under way: it gets ${r.promoted > 1 ? "them" : "it"} at its next step, after the tool call it is on`,
     );
-  else if (r.delivered) lines.push(`${reopened}${stopped}sent to ${id}`);
+  else if (r.delivered)
+    lines.push(`${reopened}${stopped}sent ${what ? `${what} ` : ""}to ${id}`);
   else {
     const wait = [
       r.queued,
@@ -126,12 +130,12 @@ function sentText(id, r, asked) {
     const sooner = !r.queued.startsWith("it is working")
       ? ""
       : r.steers && !asked.now
-        ? ` To reach it sooner: \`work session send ${id} --now "…"\` (into the turn, at its next step) or --interrupt (stops the turn first).`
+        ? ` To reach it sooner: \`work session send ${id} --now\` with no text sends what you queued into the turn, at its next step (--interrupt stops the turn first); never send it again.`
         : !r.steers && r.interrupts && !asked.interrupt
-          ? ` Its CLI takes no message mid-turn: --interrupt stops the turn to send it now.`
+          ? ` Its CLI takes no message mid-turn: \`work session send ${id} --interrupt\` with no text stops the turn to send what you queued now.`
           : "";
     lines.push(
-      `${reopened}${stopped}queued for ${id} (${wait.join("; ")}): typed in once it is at its prompt${asked.now && r.steers ? ", or into its turn once nothing stands in the way" : ""}.${sooner}`,
+      `${reopened}${stopped}${what ? `${what} ${r.promoted === 1 ? "stays" : "stay"} ` : ""}queued for ${id} (${wait.join("; ")}): typed in once it is at its prompt${asked.now && r.steers ? ", or into its turn once nothing stands in the way" : ""}.${sooner}`,
     );
   }
   return lines.join("\n");
@@ -193,6 +197,47 @@ const STATUS_MARK = {
   closed: "✕",
 };
 
+/** A moment as the log shows it: the time today, else the date too. */
+function clockOf(at) {
+  const d = new Date(at);
+  const time = d.toLocaleTimeString("en-GB", {
+    hour: "2-digit",
+    minute: "2-digit",
+  });
+  return d.toDateString() === new Date().toDateString()
+    ? time
+    : `${d.toLocaleDateString("en-CA")} ${time}`;
+}
+
+/** One message of `work session log`: who to whom, what, how it went,
+ * then its text (its first line, unless `full`). */
+function printLogged(m, full) {
+  const kind =
+    m.kind === "message"
+      ? m.wants_reply
+        ? "message, wants a reply"
+        : "message"
+      : m.kind;
+  const went = [
+    m.urgent && "to go now",
+    m.delivered_at
+      ? `${m.delivered === "into its turn" ? "typed into its turn" : m.delivered === "at its prompt" ? "typed in at its prompt" : m.delivered} ${clockOf(m.delivered_at)}`
+      : !m.done_at && "queued",
+    m.done_at
+      ? m.outcome === "delivered"
+        ? null
+        : `${m.outcome} ${clockOf(m.done_at)}`
+      : m.delivered_at && m.wants_reply && "reply owed",
+  ].filter(Boolean);
+  console.log(
+    `${clockOf(m.created_at)}  ${m.from_session ?? "user"} → ${m.to_session}  ${kind}${went.length ? `  (${went.join("; ")})` : ""}`,
+  );
+  const text = full
+    ? m.body
+    : (m.body.split("\n").find((l) => l.trim()) ?? "").slice(0, 160);
+  for (const line of text.split("\n")) console.log(`    ${line}`);
+}
+
 /** One group of `work session team`: its head, then a line a member. */
 function printGroup(ctx, g) {
   const c = g.counts;
@@ -218,13 +263,22 @@ export const commands = [
   {
     name: "session",
     summary:
-      "this session and the workspace's others: new, fanout, send, wait, hold, keep, team, kill",
+      "this session and the workspace's others: new, fanout, send, wait, hold, keep, reopen, log, 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>/…).
-work session list [id|name] [--json]
+work session list [<workspace>|<session>] [--json]
   The workspace's sessions, this one marked, with how long each has been
-  in the turn under way and how many messages are queued for it.
+  in the turn under way and how many messages are queued for it. Given a
+  session's id: that one and those it started, or, closed, how and when,
+  and whether \`work session reopen\` can start it again.
+work session log [<id>] [--all] [--full] [--limit <n>] [--json]
+  What went to and from a session (this one unless <id>; --all: between
+  every session of the workspace), the last week, oldest first: each
+  message, reply and notice, when it was sent, how it went in (at its
+  prompt, into its turn, taken by wait) and how it left the queue
+  (answered, closed before a reply…) or that it is still queued or owed.
+  The first line of each unless --full.
 work session title "<name>" [--session <id>]
   Name a session in the session list (empty clears it).
 work session new [--agent <id>] [--title "<name>"] [--prompt "<text>"|-] [--no-reply] [--keep] [--topic <name> [--repo <repo>…] [--install]] [--workspace <id|name>] [--force]
@@ -280,7 +334,10 @@ work session send <id> "<text>"|- [--no-reply] [--now|--interrupt]
   step (after the tool call it is on), and that turn's end answers it;
   --interrupt stops the turn first, for one the next step is too late
   for or whose CLI takes nothing mid-turn (Grok). What is queued for it
-  goes in with it. The last line printed says whether it went in, and
+  goes in with it, and --now or --interrupt with no text sends what you
+  queued so, rather than a second copy. One with --no-reply goes into the
+  turn under way at its next step by itself: nothing waits on its answer,
+  and the turn may need it before it ends. The last line printed says whether it went in, and
   if not, how long the turn it waits out has run. A session closed for being
   done is reopened on its own conversation first, where its CLI can
   resume one (Claude, Codex); otherwise the send says to start a new one.
@@ -288,6 +345,15 @@ work session send <id> "<text>"|- [--no-reply] [--now|--interrupt]
   another workspace (\`work session list <workspace>\`) can be messaged
   when the user asks, and only while it runs; everything else here an
   agent does in its own workspace only.
+work session reopen <id> [--agent <id>]
+  Start a session again on its own conversation, where its CLI can resume
+  one (Claude, Codex): one closed — by its lead's close, the user's, or
+  for being done — back under the session that started it, or under this
+  one when that is gone; or one running, whose CLI is restarted. --agent
+  starts it as another instance of the same CLI (claude2 for claude):
+  one stuck because its account hit a limit goes on as another account's,
+  where the two share their conversations. What is queued for it and what
+  it owes you stay: send it a message to carry it on.
 work session wait [<id>|<group>...] [--any] [--timeout <seconds>]
   Wait for the replies owed to this session (by those sessions or groups,
   else by any), printing each as it comes; a reply printed here is not
@@ -307,7 +373,8 @@ work session keep <id>
 work session kill <id> [--keep-children] --yes
   Close a session and the process in it, and the sessions it started
   with theirs, unless --keep-children (they then stand on their own).
-  Whoever waits on a reply from one is told.
+  Whoever waits on a reply from one is told. Each that can resume its
+  conversation can be started again for a week: \`work session reopen\`.
 work session kill --done
   Close now the sessions this one started that are done with (answered,
   idle, not the user's): fan-out results stay in \`work session team\`,
@@ -324,6 +391,7 @@ work session kill --done
         "--repo",
         "--count",
         "--parallel",
+        "--limit",
       ]);
       switch (verb) {
         case undefined: {
@@ -351,11 +419,61 @@ work session kill --done
           });
         }
         case "list": {
-          const { ws } = await ctx.resolveWorkspace(rest[0]);
-          const list = await sessionsOf(ctx, ws.id);
+          const [arg] = rest;
+          // A session's id names that one; anything else a workspace.
+          const workspaces = arg ? await ctx.api.get("/api/workspaces") : [];
+          const isWs = workspaces.some((w) => w.id === arg || w.name === arg);
+          const one =
+            arg && !isWs
+              ? await ctx.api.get(
+                  `/api/sessions/${encodeURIComponent(arg)}?missing=null`,
+                )
+              : null;
+          if (arg && !isWs && !one)
+            ctx.die(
+              `no workspace or session named ${arg} (see: work workspaces, work session list)`,
+            );
+          if (one?.closed)
+            return ctx.out(one, (s) =>
+              console.log(
+                `${ctx.pad(s.id, 9)} ${ctx.pad(s.agent, 10)} closed   ${s.title || ""}  (${s.closed.how === "done" ? "closed for being done" : "closed"} ${clockOf(s.closed.at)}; ${!s.reopenable ? "its conversation went with it" : s.closed.how === "done" ? "a message reopens it on its conversation" : `\`work session reopen ${s.id}\` starts it again on its conversation`})`,
+              ),
+            );
+          const { ws } = await ctx.resolveWorkspace(one ? one.workspace : arg);
+          const all = await sessionsOf(ctx, ws.id);
+          // One session: it and those it started, under it.
+          const under = one ? [one.id] : null;
+          if (under)
+            for (const s of all)
+              if (s.parent && under.includes(s.parent) && !under.includes(s.id))
+                under.push(s.id);
+          const list = under ? all.filter((s) => under.includes(s.id)) : all;
+          const top = list[0]?.depth ?? 0;
           return ctx.out(list, (l) => {
             if (!l.length) return console.log("no sessions");
-            for (const s of l) console.log(sessionLine(ctx, s));
+            for (const s of l)
+              console.log(sessionLine(ctx, { ...s, depth: s.depth - top }));
+          });
+        }
+        case "log": {
+          const id = rest[0] ?? (ctx.has("--all") ? null : sessionId(ctx));
+          const limit = ctx.flag("--limit");
+          const q = `?limit=${encodeURIComponent(limit ?? 50)}${by("&")}`;
+          const r = id
+            ? await ctx.api.get(
+                `/api/sessions/${encodeURIComponent(id)}/log${q}`,
+              )
+            : await ctx.api.get(
+                `/api/workspaces/${(await ctx.resolveWorkspace(ctx.flag("--workspace"))).ws.id}/messages${q}`,
+              );
+          return ctx.out(r, (r) => {
+            if (!r.messages.length)
+              return console.log(
+                id
+                  ? `nothing went to or from ${id} in the last week`
+                  : "nothing went between this workspace's sessions in the last week",
+              );
+            for (const m of r.messages) printLogged(m, ctx.has("--full"));
           });
         }
         case "title": {
@@ -509,15 +627,16 @@ work session kill --done
         case "send": {
           const [id, ...words] = rest;
           const text = await textOf(words.join(" "));
-          if (!id || !text)
-            ctx.die(
-              'usage: work session send <id> "<text>"|- [--no-reply] [--now|--interrupt]',
-            );
-          const me = process.env.WORK_SESSION_ID;
           const asked = {
             now: ctx.has("--now"),
             interrupt: ctx.has("--interrupt"),
           };
+          // No text, to go now: what this session queued for it goes.
+          if (!id || (!text && !asked.now && !asked.interrupt))
+            ctx.die(
+              'usage: work session send <id> "<text>"|- [--no-reply] [--now|--interrupt]',
+            );
+          const me = process.env.WORK_SESSION_ID;
           const r = await ctx.api.post(`/api/sessions/${id}/messages`, {
             text,
             ...(me ? { from: me } : {}),
@@ -583,6 +702,22 @@ work session kill --done
             ),
           );
         }
+        case "reopen": {
+          const [id] = rest;
+          if (!id) ctx.die("usage: work session reopen <id> [--agent <id>]");
+          const agent = ctx.flag("--agent");
+          const r = await ctx.api.post(`/api/sessions/${id}/reopen${by()}`, {
+            ...(agent ? { agent } : {}),
+          });
+          return ctx.out(r, (r) => {
+            console.log(
+              `${r.restarted ? "restarted" : "reopened"} ${r.id} on its conversation as ${r.agent}${r.parent ? `, under ${r.parent}` : ""}`,
+            );
+            console.log(
+              `It is at its prompt: \`work session send ${r.id} "…"\` carries it on.`,
+            );
+          });
+        }
         case "keep": {
           const [id] = rest;
           if (!id) ctx.die("usage: work session keep <id>");

package/bin/work.mjs

@@ -82,6 +82,7 @@ import {
 import { installTool, repairGhHelpers } from "../lib/setup/install.mjs";
 import { bridgeCommands, bridgeIfNeeded } from "../lib/setup/bridge.mjs";
 import { dialHost, listenStream } from "../lib/setup/listen.mjs";
+import { versionManagers } from "../lib/setup/shims.mjs";
 import { commentMarkdown } from "../lib/review/markdown.mjs";
 import { formatInvite, parseInvite } from "../lib/share/manifest.mjs";
 import { duration, pctText } from "../lib/usage/format.mjs";
@@ -1160,37 +1161,6 @@ function installAt(file) {
   return null;
 }
 
-/** Version managers whose shims stand in for `work`. A shim is the
- * manager's own binary (mise links every shim to itself) or a script that
- * hands off to it, so neither its path nor its target is the install: the
- * manager's `which` names that. A global uninstalled from one of its
- * nodes leaves the shim until a reshim. */
-function versionManagers() {
-  return [
-    {
-      id: "mise",
-      shim: (file, real) => path.basename(real) === "mise",
-      which: (real) => [real, ["which", "work"]],
-      installs: /\/mise\/installs\/node\//,
-      reshim: "mise reshim",
-    },
-    {
-      id: "asdf",
-      shim: (file) => /\/\.asdf\/shims$/.test(path.dirname(file)),
-      which: () => ["asdf", ["which", "work"]],
-      installs: /\/\.asdf\/installs\/nodejs\//,
-      reshim: "asdf reshim nodejs",
-    },
-    {
-      id: "nodenv",
-      shim: (file) => /\/\.nodenv\/shims$/.test(path.dirname(file)),
-      which: () => ["nodenv", ["which", "work"]],
-      installs: /\/\.nodenv\/versions\//,
-      reshim: "nodenv rehash",
-    },
-  ];
-}
-
 /** The install a `work` on PATH runs: an npm global's bin links into the
  * package, a shim's is the one its manager names, and anything else is
  * asked its version. */
@@ -1205,7 +1175,7 @@ function workOnPath(file) {
   const real = realpathOr(file);
   const manager = versionManagers().find((m) => m.shim(file, real));
   if (manager) {
-    const [bin, argv] = manager.which(real);
+    const [bin, argv] = manager.which(real, "work");
     const out = spawnSync(bin, argv, { encoding: "utf8", timeout: 5000 });
     const target = out.status === 0 && out.stdout.trim();
     const w = target && installAt(target);

package/dist/{_tAkj84_m.js → _CKxRXoHK.js}

@@ -83,101 +83,101 @@ var toastTitle = {
 	warn: "_w",
 	info: "_x"
 };
-var tocDot = "_c5 _ba";
+var tocDot = "_de _ba";
 //#endregion
 //#region src/tags/settings-agents.css.ts
-var agentRow = "_go _d3";
-var list$3 = "_d7 _dw _d2 _d5";
-var metaChip = "_ek _bz _by";
+var agentRow = "_fH _dG";
+var list$3 = "_dK _dw _dF _dI";
+var metaChip = "_dY _bz _by";
 var sectionCount = "_dt _bp _bq";
-var usageNote = "_kh _by";
-var pop$2 = "_hX _bN";
-var spinner = "_h0 _bD _bi";
-var toolLead = "_hI _ef";
-var name$4 = "_hA _ef";
-var desc$1 = "_hB _eg";
+var usageNote = "_kq _by";
+var pop$2 = "_gL _bN";
+var spinner = "_gO _bD _bi";
+var toolLead = "_gq _dT";
+var name$4 = "_gA _dT";
+var desc$1 = "_gB _dU";
 //#endregion
 //#region src/tags/lsp-add-dialog.css.ts
-var addDlg = "_mp _bV";
-var key$1 = "_lu _ls";
-var addTile = "_lw _ls";
-var field$2 = "_lH _bA";
-var keyField = "_lI _lH _bA";
-var labelField = "_lJ _lH _bA";
-var detailsToggle = "_fD _6";
-var themeSeg = "_e9 _bR";
-var checkList = "_gg _du";
+var addDlg = "_kZ _b4";
+var key$1 = "_lO _lM";
+var addTile = "_lQ _lM";
+var field$2 = "_l1 _bA";
+var keyField = "_l2 _l1 _bA";
+var labelField = "_l3 _l1 _bA";
+var detailsToggle = "_fs _6";
+var themeSeg = "_eY _bR";
+var checkList = "_h4 _du";
 //#endregion
 //#region src/tags/prompt-dialog.css.ts
-var promptDlg = "_cn _bV";
-var item$1 = "_b3 _D";
-var glance = "_dG _D";
+var promptDlg = "_b8 _b4";
+var item$1 = "_b0 _D";
+var glance = "_ee _D";
 //#endregion
 //#region src/tags/side-nav.css.ts
-var iconBtn = "_cq _D";
-var settingsDot = "_cr _bQ";
-var notifyBtn = "_cw _D";
+var iconBtn = "_b9 _D";
+var settingsDot = "_b_ _bQ";
+var notifyBtn = "_ce _D";
 //#endregion
 //#region src/styles/session-pop.css.ts
-var sessionPop = "_cJ _bN";
-var sessionPopBtn = "_cK _bk";
-var wsBtn = "_eE _bk";
-var rowIcon = "_eG _bF _D";
-var prChip = "_lb _M _k6";
+var sessionPop = "_cg _bN";
+var sessionPopBtn = "_ch _bk";
+var wsBtn = "_fT _bk";
+var rowIcon = "_fV _bF _D";
+var prChip = "_mP _M _mJ";
 //#endregion
 //#region src/tags/port-chip.css.ts
-var port = "_oY _M _k6";
+var port = "_og _M _mJ";
 var depth = {
-	"1": "_kB",
-	"2": "_kC",
-	"3": "_kD"
+	"1": "_k8",
+	"2": "_k9",
+	"3": "_k_"
 };
-var open = "_kJ _bk";
-var action = "_kO _bI _D";
-var toggle = "_ep _6";
-var fold = "_eq _d4";
+var open = "_lf _bk";
+var action = "_lk _bI _D";
+var toggle = "_d3 _6";
+var fold = "_d4 _dH";
 var statusOf = {
-	queued: "_ox",
-	starting: "_oy",
-	working: "_oz",
-	waiting: "_oA",
-	idle: "_oB",
-	done: "_oC",
-	closed: "_oD"
+	queued: "_ms",
+	starting: "_mt",
+	working: "_mu",
+	waiting: "_mv",
+	idle: "_mw",
+	done: "_mx",
+	closed: "_my"
 };
-var item = "_ku _bk";
-var menu = "_mO _cJ _bN";
-var menuItem = "_mQ _bk";
-var findBtn$1 = "_ik _h6 _bG _D";
-var tool = "_h6 _bG _D";
-var heldRefresh = "_id _M";
-var pop$1 = "_mx _cJ _bN";
-var fileFilter = "_oX _F";
-var findInput = "_dS _F";
-var keybarIconBtn = "_d1 _bI _D";
-var input = "_cN _F";
-var group = "_cQ _6";
-var hint$1 = "_m4 _bp _3";
-var sheetDir = "_n8 _bP";
-var upBtn = "_jf _bG _D";
-var findBtn = "_jj _h6 _bG _D";
-var goBtn = "_jk _h6 _bG _D";
-var note = "_mZ _by";
+var item = "_kg _bk";
+var menu = "_nD _cg _bN";
+var menuItem = "_nF _bk";
+var findBtn$1 = "_ir _ic _bG _D";
+var tool = "_ic _bG _D";
+var heldRefresh = "_ik _M";
+var pop$1 = "_m7 _cg _bN";
+var fileFilter = "_oV _F";
+var findInput = "_eD _F";
+var keybarIconBtn = "_eM _bI _D";
+var input = "_cv _F";
+var group = "_cy _6";
+var hint$1 = "_of _bp _3";
+var sheetDir = "_n7 _bP";
+var upBtn = "_jm _bG _D";
+var findBtn = "_jq _ic _bG _D";
+var goBtn = "_jr _ic _bG _D";
+var note = "_ns _by";
 //#endregion
 //#region src/tags/manage-workspace.css.ts
-var procCmd = "_gw _ef";
-var factCopy = "_gD _bI _D";
-var resultRow = "_l5 _bk";
-var resultBranch = "_l6 _ek _bz _by _bF _D";
-var urlAction = "_l7 _ek _bz _by _el";
-var curRow = "_gL _d_";
+var procCmd = "_f7 _dT";
+var factCopy = "_gd _bI _D";
+var resultRow = "_kK _bk";
+var resultBranch = "_kL _dY _bz _by _bF _D";
+var urlAction = "_kM _dY _bz _by _dZ";
+var curRow = "_gX _dN";
 //#endregion
 //#region src/tags/join-dialog.css.ts
-var dlg = "_lR _bV";
-var hint = "_lS _by";
-var kbtn = "_cf _bH _D";
-var repeat = "_ci _ch";
-var dpadUser = "_cl _ch";
-var dpadEsc = "_cm _ch";
+var dlg = "_lq _b4";
+var hint = "_lr _by";
+var kbtn = "_cQ _bH _D";
+var repeat = "_cT _cS";
+var dpadUser = "_cW _cS";
+var dpadEsc = "_cX _cS";
 //#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/_CVNGN2QO.js

@@ -0,0 +1,2 @@
+import { J as notifySessionsChanged } from "./_Cb_JPQ7K.js";
+export { notifySessionsChanged };