@dylanpiercey/work 0.2.60 → 0.2.61

package/bin/cli/session.mjs

@@ -263,11 +263,36 @@ function printGroup(ctx, g) {
     );
 }
 
+/** What `work session list <id>` knows of a session; dies on none. */
+async function infoOf(ctx, id) {
+  const s = await ctx.api.get(
+    `/api/sessions/${encodeURIComponent(id)}?missing=null`,
+  );
+  if (!s) ctx.die(`no session ${id} (see: work session list)`);
+  return s;
+}
+
+/** Whether this command runs for an agent, not the user: from an agent's
+ * own pane, not a shell's or a terminal outside work. */
+async function callerIsAgent(ctx) {
+  const me = process.env.WORK_SESSION_ID;
+  if (!me) return false;
+  const s = await ctx.api.get(
+    `/api/sessions/${encodeURIComponent(me)}?missing=null`,
+  );
+  return !!s && s.agent !== "shell";
+}
+
+/** Why an agent wants --yes for a change to the user's own session. */
+function userOwn(id, what, lead) {
+  return `${id} is the user's own session (no agent started it)${lead ? `: under ${lead} its turns no longer notify them, its last message is written for ${lead}, it folds into ${lead}'s team in the list, and closing ${lead} closes it` : `, to be ${what}`}. Pass --yes only if the user asked for this`;
+}
+
 export const commands = [
   {
     name: "session",
     summary:
-      "this session and the workspace's others: new, fanout, send, wait, hold, keep, reopen, log, team, kill",
+      "this session and the workspace's others: new, fanout, send, unsend, wait, hold, forget, keep, adopt, release, retire, 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>/…).
@@ -320,7 +345,8 @@ work session retry <member>
   Rerun a closed member in a fresh session: its group waits for it again.
 work session skip <member>
   Stop a member: a queued one never starts, a running one's session
-  closes; either way its group no longer waits on it.
+  closes, ending its turn and whatever its pane runs; either way its group
+  no longer waits on it. \`forget\` stops waiting on one that works on.
 work session send <id> "<text>"|- [--no-reply] [--now|--interrupt]
   Message an agent session: typed in, headed with who it is from, once
   it is at its prompt — never into a question it asks or a draft someone
@@ -353,7 +379,10 @@ 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>]
+work session unsend <id>
+  Take back what this session queued for <id> that is not typed in yet:
+  a message that went in stays in its turn (send a correction instead).
+work session reopen <id> [--agent <id>] [--now]
   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
@@ -361,7 +390,10 @@ work session reopen <id> [--agent <id>]
   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.
+  it owes you stay: send it a message to carry it on. A restart ends the
+  turn under way and what its pane runs (a background job, a dev server),
+  so a running one mid-turn or with jobs is refused, saying what it is
+  on, unless --now.
 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
@@ -376,18 +408,48 @@ work session hold "<what you wait on>"
   nothing more until they write to you); 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 forget <id|member>…
+  Stop waiting on what a session owes this one, without stopping it: its
+  turn's end answers nobody, and what is still queued from you goes in
+  wanting no reply (a reply it sent already still comes). A fan-out
+  member's group no longer waits on it: a queued one never starts, a
+  running one works on, under you. Nothing is told to it.
 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.
+work session adopt <id>… [--lead <id>] [--from <lead>] [--close-done] [--yes]
+  Put a running session under this one (or --lead), as if this one had
+  started it, with nothing restarted: the list nests it, \`list <lead>\`,
+  \`kill <lead>\` and \`reopen\` treat it as the lead's, its replies are
+  its turns' ends, its turns no longer notify the user (the lead's news),
+  and its permission mode stays its own. What is queued for it or owed
+  keeps how it is answered. Kept open (never closed for being done)
+  unless --close-done, which closes it once it has answered from now on.
+  One under another lead moves only with --from naming it. A session the
+  user started is theirs: an agent passes --yes only when the user asked.
+work session release <id>…
+  Stand a session on its own again, as \`kill --keep-children\` leaves the
+  ones it started: nothing restarts, and what it owes stays owed.
+work session retire <id>… [--yes]
+  Close a session once closing it loses nothing: no turn under way,
+  nothing queued for it, owed by or to it, no session it leads still open,
+  not on the user's screen, and nothing left running in its pane. Now if
+  that is now, else when the last of those ends; typing into it first
+  takes this back. Closed so, a message reopens it on its conversation.
+  This one retired closes once its turn has ended. A session the user
+  started is theirs: an agent passes --yes only when the user asked.
 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. Each that can resume its
+  with theirs, unless --keep-children (they then stand on their own): the
+  turn under way, what its pane runs and what is queued for it end, and
+  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\`.
+  \`retire\` closes one without losing anything.
 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\`,
-  and a message to one reopens it, as \`send\` says.`,
+  idle, not the user's, nothing left running in its pane): fan-out
+  results stay in \`work session team\`, and a message to one reopens it,
+  as \`send\` says.`,
     async run(ctx) {
       const [verb, ...rest] = ctx.parse([
         "--agent",
@@ -401,6 +463,8 @@ work session kill --done
         "--count",
         "--parallel",
         "--limit",
+        "--lead",
+        "--from",
       ]);
       switch (verb) {
         case undefined: {
@@ -712,10 +776,12 @@ work session kill --done
         }
         case "reopen": {
           const [id] = rest;
-          if (!id) ctx.die("usage: work session reopen <id> [--agent <id>]");
+          if (!id)
+            ctx.die("usage: work session reopen <id> [--agent <id>] [--now]");
           const agent = ctx.flag("--agent");
           const r = await ctx.api.post(`/api/sessions/${id}/reopen${by()}`, {
             ...(agent ? { agent } : {}),
+            ...(ctx.has("--now") ? { now: true } : {}),
           });
           return ctx.out(r, (r) => {
             console.log(
@@ -726,6 +792,122 @@ work session kill --done
             );
           });
         }
+        case "unsend": {
+          const me = sessionId(ctx);
+          const [id] = rest;
+          if (!id) ctx.die("usage: work session unsend <id>");
+          const { withdrawn } = await ctx.api.post(
+            `/api/sessions/${encodeURIComponent(id)}/unsend?by=${encodeURIComponent(me)}`,
+          );
+          return ctx.out({ id, withdrawn }, () =>
+            console.log(
+              `took back ${withdrawn === 1 ? "your message" : `your ${withdrawn} messages`} queued for ${id}`,
+            ),
+          );
+        }
+        case "forget": {
+          const me = sessionId(ctx);
+          if (!rest.length) ctx.die("usage: work session forget <id|member>…");
+          const out = [];
+          for (const id of rest)
+            out.push({
+              id,
+              ...(await ctx.api.post(
+                `/api/sessions/${encodeURIComponent(id)}/forget?by=${encodeURIComponent(me)}`,
+              )),
+            });
+          return ctx.out(out, (rows) => {
+            for (const r of rows)
+              console.log(
+                r.member
+                  ? `forgot member ${r.member}: its group no longer waits on it${r.session ? `, and ${r.session} works on, under you` : ""}`
+                  : `forgot what ${r.id} owes you: it works on, and its turn's end answers nobody`,
+              );
+          });
+        }
+        case "adopt": {
+          if (!rest.length)
+            ctx.die(
+              "usage: work session adopt <id>… [--lead <id>] [--from <lead>] [--close-done] [--yes]",
+            );
+          const lead = ctx.flag("--lead") || process.env.WORK_SESSION_ID;
+          if (!lead)
+            ctx.die("not in a work session: pass --lead <id> to adopt under");
+          const fromAgent = await callerIsAgent(ctx);
+          for (const id of rest) {
+            const s = await infoOf(ctx, id);
+            if (s.closed)
+              ctx.die(
+                `${id} has closed: \`work session reopen ${id}\` from ${lead} starts it again under it`,
+              );
+            if (fromAgent && !s.parent && !ctx.yes)
+              ctx.die(userOwn(id, `under ${lead}`, lead));
+          }
+          const out = [];
+          for (const id of rest)
+            out.push(
+              await ctx.api.post(
+                `/api/sessions/${encodeURIComponent(id)}/parent${by()}`,
+                {
+                  parent: lead,
+                  ...(ctx.flag("--from") ? { from: ctx.flag("--from") } : {}),
+                  ...(ctx.has("--close-done") ? { closeDone: true } : {}),
+                },
+              ),
+            );
+          return ctx.out(out, (rows) => {
+            for (const r of rows)
+              console.log(
+                `${r.id} is under ${r.parent} now, ${r.kept ? "kept open (`work session retire` closes it once nothing is lost)" : "closed once it has answered and is done with"}`,
+              );
+            console.log(
+              `Its turns' ends are replies to what ${lead} asks, and notify nobody; \`work session release\` stands it on its own again.`,
+            );
+          });
+        }
+        case "release": {
+          if (!rest.length) ctx.die("usage: work session release <id>…");
+          const out = [];
+          for (const id of rest)
+            out.push(
+              await ctx.api.post(
+                `/api/sessions/${encodeURIComponent(id)}/parent${by()}`,
+                { parent: null },
+              ),
+            );
+          return ctx.out(out, (rows) => {
+            for (const r of rows)
+              console.log(
+                `${r.id} stands on its own now, in the permission mode it ran in`,
+              );
+          });
+        }
+        case "retire": {
+          if (!rest.length) ctx.die("usage: work session retire <id>… [--yes]");
+          const me = process.env.WORK_SESSION_ID;
+          const fromAgent = await callerIsAgent(ctx);
+          for (const id of rest) {
+            const s = await infoOf(ctx, id);
+            if (fromAgent && !s.parent && id !== me && !ctx.yes)
+              ctx.die(userOwn(id, "closed once it is idle"));
+          }
+          const out = [];
+          for (const id of rest)
+            out.push({
+              id,
+              ...(await ctx.api.post(
+                `/api/sessions/${encodeURIComponent(id)}/retire${by()}`,
+              )),
+            });
+          return ctx.out(out, (rows) => {
+            for (const r of rows)
+              console.log(
+                r.closed
+                  ? `closed ${r.id}, which had nothing left to lose: ${r.reopens ? "a message reopens it on its conversation" : "its conversation went with it (its CLI cannot resume one, or work never learned it)"}`
+                  : `${r.id} closes once nothing is lost by it; for now ${r.waits.join(", and ")}. Typing into it takes this back`,
+              );
+          });
+        }
         case "keep": {
           const [id] = rest;
           if (!id) ctx.die("usage: work session keep <id>");
@@ -737,16 +919,20 @@ work session kill --done
         case "kill": {
           if (ctx.has("--done")) {
             const me = sessionId(ctx);
-            const { closed } = await ctx.api.post(
+            const { closed, left = [] } = await ctx.api.post(
               `/api/sessions/${me}/close-done${by()}`,
             );
-            return ctx.out({ closed }, () =>
+            return ctx.out({ closed, left }, () => {
               console.log(
                 closed
                   ? `closed ${closed} finished ${closed === 1 ? "session" : "sessions"}`
-                  : "none of the sessions this one started is done with",
-              ),
-            );
+                  : left.length
+                    ? "closed none: closing would lose something of each"
+                    : "none of the sessions this one started is done with",
+              );
+              for (const l of left)
+                console.log(`  left ${l.id} open: ${l.why.join(", and ")}`);
+            });
           }
           const [id] = rest;
           if (!id)

package/dist/{_D2Un1mYs.js → _B9Ht5uEb.js}

@@ -83,30 +83,30 @@ var toastTitle = {
 	warn: "_w",
 	info: "_x"
 };
-var tocDot = "_dz _ba";
+var tocDot = "_c5 _ba";
 //#endregion
 //#region src/tags/settings-agents.css.ts
-var agentRow = "_fE _dK";
-var list$3 = "_dO _c_ _dJ _dM";
-var metaChip = "_d2 _bz _by";
-var sectionCount = "_c7 _bp _bq";
-var usageNote = "_kf _by";
-var pop$2 = "_gt _bN";
-var spinner = "_gw _bD _bi";
-var toolLead = "_ge _dX";
-var name$4 = "_fO _dX";
-var desc$1 = "_fP _dY";
+var agentRow = "_fZ _dX";
+var list$3 = "_d1 _dw _dW _dZ";
+var metaChip = "_ee _bz _by";
+var sectionCount = "_dt _bp _bq";
+var usageNote = "_kq _by";
+var pop$2 = "_gv _bN";
+var spinner = "_gy _bD _bi";
+var toolLead = "_ga _d_";
+var name$4 = "_gk _d_";
+var desc$1 = "_gl _ea";
 //#endregion
 //#region src/tags/lsp-add-dialog.css.ts
-var addDlg = "_k_ _bX";
-var key$1 = "_mG _mE";
-var addTile = "_mI _mE";
-var field$2 = "_mT _bA";
-var keyField = "_mU _mT _bA";
-var labelField = "_mV _mT _bA";
-var detailsToggle = "_hR _6";
-var themeSeg = "_fW _bR";
-var checkList = "_es _c8";
+var addDlg = "_lR _bX";
+var key$1 = "_la _k9";
+var addTile = "_lc _k9";
+var field$2 = "_ln _bA";
+var keyField = "_lo _ln _bA";
+var labelField = "_lp _ln _bA";
+var detailsToggle = "_fo _6";
+var themeSeg = "_eP _bR";
+var checkList = "_g6 _du";
 //#endregion
 //#region src/tags/prompt-dialog.css.ts
 var promptDlg = "_b1 _bX";
@@ -114,70 +114,70 @@ var item$1 = "_b6 _D";
 var glance = "_dG _D";
 //#endregion
 //#region src/tags/side-nav.css.ts
-var iconBtn = "_cl _D";
-var settingsDot = "_cm _bQ";
-var notifyBtn = "_cr _D";
+var iconBtn = "_cO _D";
+var settingsDot = "_cP _bQ";
+var notifyBtn = "_cU _D";
 //#endregion
 //#region src/styles/session-pop.css.ts
-var sessionPop = "_cj _bN";
-var sessionPopBtn = "_ck _bk";
-var wsBtn = "_hp _bk";
-var rowIcon = "_hr _bF _D";
-var prChip = "_nE _M _nu";
+var sessionPop = "_cW _bN";
+var sessionPopBtn = "_cX _bk";
+var wsBtn = "_gH _bk";
+var rowIcon = "_gJ _bF _D";
+var prChip = "_kS _M _kM";
 //#endregion
 //#region src/tags/port-chip.css.ts
-var port = "_oT _M _nu";
+var port = "_ni _M _kM";
 var depth = {
-	"1": "_m4",
-	"2": "_m5",
-	"3": "_m6"
+	"1": "_ly",
+	"2": "_lz",
+	"3": "_lA"
 };
-var open = "_nb _bk";
-var action = "_ng _bI _D";
-var toggle = "_d7 _6";
-var fold = "_d8 _dL";
+var open = "_lG _bk";
+var action = "_lL _bI _D";
+var toggle = "_ej _6";
+var fold = "_ek _dY";
 var statusOf = {
-	queued: "_lY",
-	starting: "_lZ",
-	working: "_l0",
-	waiting: "_l1",
-	idle: "_l2",
-	done: "_l3",
-	closed: "_l4"
+	queued: "_mg",
+	starting: "_mh",
+	working: "_mi",
+	waiting: "_mj",
+	idle: "_mk",
+	done: "_ml",
+	closed: "_mm"
 };
-var item = "_mz _bk";
-var menu = "_lu _cj _bN";
-var menuItem = "_lw _bk";
-var findBtn$1 = "_ih _h3 _bG _D";
-var tool = "_h3 _bG _D";
-var heldRefresh = "_ia _M";
-var pop$1 = "_mh _cj _bN";
-var fileFilter = "_pb _F";
-var findInput = "_eD _F";
-var keybarIconBtn = "_eM _bI _D";
-var input = "_cN _F";
-var group = "_cQ _6";
-var hint$1 = "_mm _bp _3";
-var sheetDir = "_oG _bP";
-var upBtn = "_jt _bG _D";
-var findBtn = "_jx _h3 _bG _D";
-var goBtn = "_jy _h3 _bG _D";
-var note = "_oN _by";
+var item = "_kg _bk";
+var menu = "_nv _cW _bN";
+var menuItem = "_nx _bk";
+var findBtn$1 = "_ir _ic _bG _D";
+var tool = "_ic _bG _D";
+var heldRefresh = "_ik _M";
+var pop$1 = "_m9 _cW _bN";
+var fileFilter = "_o1 _F";
+var findInput = "_dM _F";
+var keybarIconBtn = "_dV _bI _D";
+var input = "_ca _F";
+var group = "_cd _6";
+var hint$1 = "_nI _bp _3";
+var sheetDir = "_oe _bP";
+var upBtn = "_jh _bG _D";
+var findBtn = "_jl _ic _bG _D";
+var goBtn = "_jm _ic _bG _D";
+var note = "_nb _by";
 //#endregion
 //#region src/tags/manage-workspace.css.ts
-var procCmd = "_eN _dX";
-var factCopy = "_eU _bI _D";
-var resultRow = "_kH _bk";
-var resultBranch = "_kI _d2 _bz _by _bF _D";
-var urlAction = "_kJ _d2 _bz _by _d3";
-var curRow = "_fe _dR";
+var procCmd = "_h1 _d_";
+var factCopy = "_h8 _bI _D";
+var resultRow = "_mP _bk";
+var resultBranch = "_mQ _ee _bz _by _bF _D";
+var urlAction = "_mR _ee _bz _by _ef";
+var curRow = "_hP _d4";
 //#endregion
 //#region src/tags/join-dialog.css.ts
-var dlg = "_nm _bX";
-var hint = "_nn _by";
-var kbtn = "_cD _bH _D";
-var repeat = "_cG _cF";
-var dpadUser = "_cJ _cF";
-var dpadEsc = "_cK _cF";
+var dlg = "_mB _bX";
+var hint = "_mC _by";
+var kbtn = "_cv _bH _D";
+var repeat = "_cy _cx";
+var dpadUser = "_cB _cx";
+var dpadEsc = "_cC _cx";
 //#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 };