@dylanpiercey/work 0.2.70 → 0.2.72

package/bin/cli/session.mjs

@@ -382,7 +382,7 @@ work session send <id> "<text>"|- [--no-reply] [--now|--interrupt]
 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]
+work session reopen <id> [--agent <id>] [--now] [--team]
   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
@@ -392,8 +392,17 @@ work session reopen <id> [--agent <id>] [--now]
   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. 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.
+  so a running one mid-turn or with jobs moves once it is idle, saying
+  what it waits out, unless --now restarts it at once. On this session
+  itself (\`reopen $WORK_SESSION_ID --agent claude2\`, a lead moving to
+  another account) it always waits for this turn's end, --now or not:
+  finish the turn and it moves, its conversation, team and queue kept.
+  --team, for a closed lead, brings back with it the sessions closed in
+  the same close, each under its own parent again and on its own
+  conversation (as --agent too, where that is another instance of its
+  CLI), naming any that cannot be reopened; those under one come back
+  under the nearest above them that did. It needs no --force: it brings
+  back what ran, not more.
 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
@@ -777,16 +786,39 @@ work session kill --done
         case "reopen": {
           const [id] = rest;
           if (!id)
-            ctx.die("usage: work session reopen <id> [--agent <id>] [--now]");
+            ctx.die(
+              "usage: work session reopen <id> [--agent <id>] [--now] [--team]",
+            );
           const agent = ctx.flag("--agent");
           const r = await ctx.api.post(`/api/sessions/${id}/reopen${by()}`, {
             ...(agent ? { agent } : {}),
             ...(ctx.has("--now") ? { now: true } : {}),
+            ...(ctx.has("--team") ? { team: true } : {}),
           });
           return ctx.out(r, (r) => {
+            if (r.scheduled) {
+              const self = r.id === process.env.WORK_SESSION_ID;
+              console.log(
+                `${r.id} moves to ${r.scheduled} once ${self ? "this turn ends" : `it is idle (it waits out ${r.waits.join(", and ")})`}, on its own conversation, its team and queue kept.`,
+              );
+              if (self)
+                console.log(
+                  "Finish this turn: say what you were on, then stop. The move starts this conversation again as the new instance.",
+                );
+              return;
+            }
             console.log(
               `${r.restarted ? "restarted" : "reopened"} ${r.id} on its conversation as ${r.agent}${r.parent ? `, under ${r.parent}` : ""}`,
             );
+            if (r.team) {
+              console.log(
+                r.team.reopened.length
+                  ? `with its team: ${r.team.reopened.join(", ")}`
+                  : "nothing was closed with it to bring back",
+              );
+              for (const s of r.team.skipped)
+                console.log(`  not reopened ${s.id}: ${s.why}`);
+            }
             console.log(
               `It is at its prompt: \`work session send ${r.id} "…"\` carries it on.`,
             );

package/bin/cli/topic.mjs

@@ -148,9 +148,56 @@ async function context(ctx, fresh) {
     dir: path.join(ws.path, r.worktree),
     prs: prsOf.get(r.full_name) || [],
   }));
+  await withOlderPrs(ctx, ws, repos, foreign);
   return { ws, repos, foreign };
 }
 
+/** The PRs the workspace's search no longer holds, for the topics that
+ * point at one. That search keeps only its latest finished PRs, so a topic
+ * squash-merged long ago read as unmerged work for good. Its tell: pushed
+ * once (an upstream recorded) and its copy on origin gone, which is how a
+ * merged PR's branch ends when GitHub deletes it, while a topic never
+ * pushed (most of a team's) asks nothing. Those few are asked for by name,
+ * in one request, and added to the repo's list. */
+async function withOlderPrs(ctx, ws, repos, foreign) {
+  const heads = new Set();
+  for (const repo of repos) {
+    if (!fs.existsSync(repo.dir)) continue;
+    const pushed = git(
+      repo.dir,
+      [
+        "config",
+        "--get-regexp",
+        `^branch\\.${ws.branch.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}-.*\\.remote$`,
+      ],
+      { allowFail: true },
+    ).out;
+    for (const line of pushed.split("\n")) {
+      const branch = line.match(/^branch\.(.+)\.remote /)?.[1];
+      if (
+        branch &&
+        owns(branch, ws.branch, foreign) &&
+        !prFor(repo, branch) &&
+        oid(repo.dir, `refs/heads/${branch}`) &&
+        !oid(repo.dir, `refs/remotes/origin/${branch}`)
+      )
+        heads.add(branch);
+    }
+  }
+  if (!heads.size) return;
+  const found = await ctx.api
+    .get(
+      `/api/workspaces/${ws.id}/prs?heads=${encodeURIComponent([...heads].join(","))}`,
+    )
+    .catch(() => null);
+  for (const r of found?.repos || []) {
+    const repo = repos.find((x) => x.full_name === r.full_name);
+    if (!repo) continue;
+    const have = new Set(repo.prs.map((p) => p.number));
+    repo.prs.push(...(r.prs || []).filter((p) => !have.has(p.number)));
+  }
+}
+
 const topicDir = (ws, name, repo) =>
   path.join(ws.path, ".worktrees", name, repo.worktree);
 

package/dist/_BA1HQgf_.js

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

package/dist/{_COL0wji1.js → _CY_o8akv.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 = "_G _F";
+var glyphBadgeNum = "_y _x";
 var usageInk = {
-	ok: "_H",
-	mid: "_I",
-	warm: "_J",
-	hot: "_K"
+	ok: "_z",
+	mid: "_A",
+	warm: "_B",
+	hot: "_C"
 };
 var usageFill = {
-	ok: "_L",
-	mid: "_M",
-	warm: "_N",
-	hot: "_O"
+	ok: "_D",
+	mid: "_E",
+	warm: "_F",
+	hot: "_G"
 };
 var prTone = {
-	open: "_P",
-	draft: "_Q",
-	merged: "_R",
-	closed: "_S"
+	open: "_H",
+	draft: "_I",
+	merged: "_J",
+	closed: "_K"
 };
 var phaseIcon = {
-	working: "_5 _4",
-	waiting: "_6 _4",
-	idle: "_7 _4",
-	off: "_8 _4"
+	working: "_X _W",
+	waiting: "_Y _W",
+	idle: "_Z _W",
+	off: "_0 _W"
 };
-var btnSm = "_be _z";
-var btnLg = "_bf _z";
+var btnSm = "_7 _r";
+var btnLg = "_8 _r";
 var tone = {
-	accent: "_bj",
-	ok: "_bk",
-	warn: "_bl",
-	danger: "_bm",
-	merged: "_bn",
-	closed: "_bo"
+	accent: "_bb",
+	ok: "_bc",
+	warn: "_bd",
+	danger: "_be",
+	merged: "_bf",
+	closed: "_bg"
 };
-var inputLg = "_bs _br";
-var iconBtnXs = "_bw _u";
-var iconBtnRow = "_bx _u";
-var iconBtnLg = "_by _u";
-var chipBtn = "_bz _u";
-var toastStack = "_f _e";
+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 toastKind = {
-	error: "_j",
-	warn: "_k",
-	info: "_l"
+	error: "_bJ",
+	warn: "_bK",
+	info: "_bL"
 };
 var toastTitle = {
-	error: "_m",
-	warn: "_n",
-	info: "_o"
+	error: "_bM",
+	warn: "_bN",
+	info: "_bO"
 };
-var tocDot = "_dp _2";
+var tocDot = "_c5 _U";
 //#endregion
 //#region src/tags/settings-agents.css.ts
-var agentRow = "_im _dK";
-var list$3 = "_dO _c3 _dJ _dM";
-var metaChip = "_d2 _bq _bp";
-var sectionCount = "_c0 _bg _bh";
-var usageNote = "_m8 _bp";
-var pop$2 = "_iQ _bE";
-var spinner = "_iT _bu __";
-var toolLead = "_iB _dX";
-var name$4 = "_kl _dX";
-var desc$1 = "_km _dY";
+var agentRow = "_fW _dK";
+var list$3 = "_dO _dw _dJ _dM";
+var metaChip = "_d2 _bi _bh";
+var sectionCount = "_dt _9 __";
+var usageNote = "_kf _bh";
+var pop$2 = "_g7 _bw";
+var spinner = "_g_ _bm _2";
+var toolLead = "_gS _dX";
+var name$4 = "_gM _dX";
+var desc$1 = "_gN _dY";
 //#endregion
 //#region src/tags/lsp-add-dialog.css.ts
-var addDlg = "_o1 _cy";
-var key$1 = "_oG _oE";
-var addTile = "_oI _oE";
-var field$2 = "_oT _br";
-var keyField = "_oU _oT _br";
-var labelField = "_oV _oT _br";
-var detailsToggle = "_j5 _X";
-var themeSeg = "_jA _bI";
-var checkList = "_ie _c1";
+var addDlg = "_lY _b4";
+var key$1 = "_l9 _l7";
+var addTile = "_ma _l7";
+var field$2 = "_ml _bj";
+var keyField = "_mm _ml _bj";
+var labelField = "_mn _ml _bj";
+var detailsToggle = "_gn _P";
+var themeSeg = "_fs _bA";
+var checkList = "_h8 _du";
 //#endregion
 //#region src/tags/prompt-dialog.css.ts
-var promptDlg = "_dh _cy";
-var item$1 = "_b0 _u";
-var glance = "_dG _u";
+var promptDlg = "_b8 _b4";
+var item$1 = "_b0 _m";
+var glance = "_dG _m";
 //#endregion
 //#region src/tags/side-nav.css.ts
-var iconBtn = "_cC _u";
-var settingsDot = "_cD _bH";
-var notifyBtn = "_cI _u";
+var iconBtn = "_b9 _m";
+var settingsDot = "_b_ _bz";
+var notifyBtn = "_ce _m";
 //#endregion
 //#region src/styles/session-pop.css.ts
-var sessionPop = "_cV _bE";
-var sessionPopBtn = "_cW _bb";
-var wsBtn = "_ff _bb";
-var rowIcon = "_fh _bw _u";
-var prChip = "_kX _D _kN";
+var sessionPop = "_cg _bw";
+var sessionPopBtn = "_ch _4";
+var wsBtn = "_eI _4";
+var rowIcon = "_eK _bo _m";
+var prChip = "_lJ _v _lD";
 //#endregion
 //#region src/tags/port-chip.css.ts
-var port = "_ok _D _kN";
+var port = "_o2 _v _lD";
 var depth = {
-	"1": "_jf",
-	"2": "_jg",
-	"3": "_jh"
+	"1": "_kQ",
+	"2": "_kR",
+	"3": "_kS"
 };
-var open = "_jn _bb";
-var action = "_js _bz _u";
-var toggle = "_d7 _X";
+var open = "_kY _4";
+var action = "_k3 _br _m";
+var toggle = "_d7 _P";
 var fold = "_d8 _dL";
 var statusOf = {
-	queued: "_lE",
-	starting: "_lF",
-	working: "_lG",
-	waiting: "_lH",
-	idle: "_lI",
-	done: "_lJ",
-	closed: "_lK"
+	queued: "_nj",
+	starting: "_nk",
+	working: "_nl",
+	waiting: "_nm",
+	idle: "_nn",
+	done: "_no",
+	closed: "_np"
 };
-var item = "_i5 _bb";
-var menu = "_n7 _cV _bE";
-var menuItem = "_n9 _bb";
-var findBtn$1 = "_fJ _fu _bx _u";
-var tool = "_fu _bx _u";
-var heldRefresh = "_fC _D";
-var pop$1 = "_m0 _cV _bE";
-var fileFilter = "_o7 _w";
-var findInput = "_hm _w";
-var keybarIconBtn = "_hv _bz _u";
-var input = "_b5 _w";
-var group = "_b8 _X";
-var hint$1 = "_ns _bg _U";
-var sheetDir = "_nJ _bG";
-var upBtn = "_gE _bx _u";
-var findBtn = "_gI _fu _bx _u";
-var goBtn = "_gJ _fu _bx _u";
-var note = "_nQ _bp";
+var item = "_kF _4";
+var menu = "_nK _cg _bw";
+var menuItem = "_nM _4";
+var findBtn$1 = "_iA _il _bp _m";
+var tool = "_il _bp _m";
+var heldRefresh = "_it _v";
+var pop$1 = "_mv _cg _bw";
+var fileFilter = "_o7 _o";
+var findInput = "_ek _o";
+var keybarIconBtn = "_et _br _m";
+var input = "_cN _o";
+var group = "_cQ _P";
+var hint$1 = "_mL _9 _M";
+var sheetDir = "_om _by";
+var upBtn = "_jq _bp _m";
+var findBtn = "_ju _il _bp _m";
+var goBtn = "_jv _il _bp _m";
+var note = "_mG _bh";
 //#endregion
 //#region src/tags/manage-workspace.css.ts
-var procCmd = "_eH _dX";
-var factCopy = "_eO _bz _u";
-var resultRow = "_kv _bb";
-var resultBranch = "_kw _d2 _bq _bp _bw _u";
-var urlAction = "_kx _d2 _bq _bp _d3";
-var curRow = "_eF _dR";
+var procCmd = "_hM _dX";
+var factCopy = "_hT _br _m";
+var resultRow = "_lc _4";
+var resultBranch = "_ld _d2 _bi _bh _bo _m";
+var urlAction = "_le _d2 _bi _bh _d3";
+var curRow = "_f8 _dR";
 //#endregion
 //#region src/tags/join-dialog.css.ts
-var dlg = "_lb _cy";
-var hint = "_lc _bp";
-var kbtn = "_cp _by _u";
-var repeat = "_cs _cr";
-var dpadUser = "_cv _cr";
-var dpadEsc = "_cw _cr";
+var dlg = "_mw _b4";
+var hint = "_mx _bh";
+var kbtn = "_cD _bq _m";
+var repeat = "_cG _cF";
+var dpadUser = "_cJ _cF";
+var dpadEsc = "_cK _cF";
 //#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/_CfUEaP2Y.js

@@ -0,0 +1,2 @@
+import { h as teamsOf } from "./_D7kw4Cra.js";
+export { teamsOf };