@dylanpiercey/work 0.2.20 → 0.2.22

package/README.md

@@ -63,7 +63,7 @@ Inside a workspace, `work branches`, `work session`, `work topic`,
 other with `work session new|send|wait` — any vendor's, each in a tab of its
 own the user watches, its last message as a turn ends coming back to the
 one that asked as a prompt — and run groups of them with
-`work session fanout` and `work plan`, which the session list shows as a
+`work session fanout`, which the session list shows as a
 lead's team; to change things,
 `work workspace create`, `work repo add`, `work config get|set` (checked
 against what each setting takes; `work config schema` lists them),

package/bin/cli/session.mjs

@@ -20,6 +20,13 @@ function sessionId(ctx) {
   return id;
 }
 
+/** The agent asking, for the routes that hold one to its own workspace:
+ * `?by=<WORK_SESSION_ID>`, nothing from a terminal outside work. */
+function by(sep = "?") {
+  const me = process.env.WORK_SESSION_ID;
+  return me ? `${sep}by=${encodeURIComponent(me)}` : "";
+}
+
 /** How long `wait` waits by default: inside an agent's own tool limit
  * (ten minutes for most), so it ends saying who is still working rather
  * than being killed. */
@@ -148,7 +155,7 @@ function printGroup(ctx, g) {
     c.closed && `${c.closed} closed`,
   ].filter(Boolean);
   console.log(
-    `${g.phase ? `[${g.phase}] ` : ""}${g.id} "${g.title}"  ${parts.join(" · ")}  (${g.parallel} at a time, ${g.fanIn ? (left ? "replies held until all answer" : "replies sent as one") : "replies as each comes"})`,
+    `${g.id} "${g.title}"  ${parts.join(" · ")}  (${g.parallel} at a time, ${g.fanIn ? (left ? "replies held until all answer" : "replies sent as one") : "replies as each comes"})`,
   );
   for (const m of g.members)
     console.log(
@@ -179,7 +186,7 @@ work session new [--agent <id>] [--title "<name>"] [--prompt "<text>"|-] [--no-r
   answered and is done with — when your job finishes, or after ten idle
   minutes — unless --keep, it is on the user's screen, or they have typed
   into it. Past ${SESSION_CAP} running sessions in the workspace it wants --force.
-work session fanout --agent <id> [--agent <id>…] [--count <n>] --prompt "<text>"|- [<item>…] [--title "<name>"] [--phase "<phase>"] [--parallel <n>] [--stream] [--close-done|--keep] [--topic <name> [--repo <repo>…] [--install]]
+work session fanout --agent <id> [--agent <id>…] [--count <n>] --prompt "<text>"|- [<item>…] [--title "<name>"] [--parallel <n>] [--stream] [--close-done|--keep] [--topic <name> [--repo <repo>…] [--install]]
   Start a group of sessions from this one: each --agent once (or --count
   times), or once for each <item> with {} in the prompt replaced by it
   ({i} is the member's number). They queue and start --parallel at a time
@@ -189,12 +196,11 @@ work session fanout --agent <id> [--agent <id>…] [--count <n>] --prompt "<text
   closes once done with, as \`new\`'s does (its result is kept);
   --close-done closes it as soon as it answers, --keep never;
   --topic gives each member a topic branch of its own (<name>-1, -2, …),
-  side by side in Review; --phase files the group under that phase of your
-  plan (\`work plan\`). For a quick sweep inside your own CLI, its own
+  side by side in Review. For a quick sweep inside your own CLI, its own
   subagents are cheaper: this is for other vendors, long work, or work the
   user may want to watch.
 work session team [--json]
-  This session's plan and groups: each member (its id, then its
+  This session's groups: each member (its id, then its
   session's), its state and its last line (what it is doing, or its
   result).
 work session retry <member>
@@ -208,7 +214,10 @@ work session send <id> "<text>"|- [--no-reply]
   or a draft someone is typing. From an agent's session it wants a reply
   unless --no-reply: the recipient's last message as that turn ends,
   typed into this session as a prompt of its own. End your turn to wait
-  for it. A file's path says more than its text pasted in.
+  for it. A file's path says more than its text pasted in. An agent in
+  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 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
@@ -234,7 +243,6 @@ work session kill --done
         "--repo",
         "--count",
         "--parallel",
-        "--phase",
       ]);
       switch (verb) {
         case undefined: {
@@ -272,7 +280,7 @@ work session kill --done
         case "title": {
           const id = sessionId(ctx);
           const title = rest.join(" ");
-          await ctx.api.patch(`/api/sessions/${id}`, { title });
+          await ctx.api.patch(`/api/sessions/${id}${by()}`, { title });
           return ctx.out({ id, title: title || null }, () =>
             console.log(
               title ? `named ${id} "${title}"` : `cleared ${id}'s name`,
@@ -366,13 +374,12 @@ work session kill --done
           const total = new Set(agents).size * (items.length || count);
           const topic = ctx.flag("--topic");
           const at = topic ? await topicDirs(ctx, topic, total) : null;
-          const g = await ctx.api.post(`/api/sessions/${me}/groups`, {
+          const g = await ctx.api.post(`/api/sessions/${me}/groups${by()}`, {
             title: ctx.flag("--title") ?? "",
             prompt,
             agents,
             ...(items.length ? { items } : { count }),
             ...(parallel ? { parallel } : {}),
-            ...(ctx.has("--phase") ? { phase: ctx.flag("--phase") } : {}),
             fanIn: !ctx.has("--stream"),
             closeDone: ctx.has("--close-done"),
             keep: ctx.has("--keep"),
@@ -398,16 +405,8 @@ work session kill --done
           const me = sessionId(ctx);
           const t = await ctx.api.get(`/api/sessions/${me}/team`);
           return ctx.out(t, (t) => {
-            if (!t.plan && !t.groups.length)
-              return console.log(
-                "no plan or groups: `work session fanout` starts one",
-              );
-            if (t.plan) {
-              console.log(
-                `plan "${t.plan.name}"${t.plan.done ? " (done)" : ""}: ${t.plan.phases.map((p) => p.title).join(" → ") || "no phases"}`,
-              );
-              for (const l of t.plan.log) console.log(`  · ${l.text}`);
-            }
+            if (!t.groups.length)
+              return console.log("no groups: `work session fanout` starts one");
             for (const g of t.groups) printGroup(ctx, g);
           });
         }
@@ -415,7 +414,7 @@ work session kill --done
         case "skip": {
           const [member] = rest;
           if (!member) ctx.die(`usage: work session ${verb} <member>`);
-          await ctx.api.post(`/api/members/${member}/${verb}`);
+          await ctx.api.post(`/api/members/${member}/${verb}${by()}`);
           return ctx.out(
             { member, [verb === "retry" ? "retried" : "skipped"]: true },
             () =>
@@ -451,7 +450,10 @@ work session kill --done
           const replies = [];
           let owing = [];
           for (;;) {
-            const r = await ctx.api.post(`/api/sessions/${me}/replies`, body);
+            const r = await ctx.api.post(
+              `/api/sessions/${me}/replies${by()}`,
+              body,
+            );
             replies.push(...r.replies);
             if (!ctx.json) r.replies.forEach(printReply);
             owing = r.owing;
@@ -482,7 +484,7 @@ work session kill --done
           if (ctx.has("--done")) {
             const me = sessionId(ctx);
             const { closed } = await ctx.api.post(
-              `/api/sessions/${me}/close-done`,
+              `/api/sessions/${me}/close-done${by()}`,
             );
             return ctx.out({ closed }, () =>
               console.log(
@@ -513,7 +515,7 @@ work session kill --done
             );
           }
           const r = await ctx.api.del(
-            `/api/sessions/${id}${keep ? "?children=keep" : ""}`,
+            `/api/sessions/${id}${keep ? `?children=keep${by("&")}` : by()}`,
           );
           const closed = r?.closed ?? [id];
           return ctx.out({ id, killed: true, closed }, () =>

package/bin/cli/topic.mjs

@@ -220,6 +220,16 @@ export function makeTopics(
     // origin, never to the base it was cut from.
     git(repo.dir, ["worktree", "add", "--no-track", "-b", branch, dest, start]);
     const stacked = from && from !== `origin/${repo.base_branch}` ? from : null;
+    // Its PR's base, said as gh reads it (branch.<b>.gh-merge-base): the
+    // branch it stacks on, else the base it was cut from.
+    const prBase = (stacked ?? repo.base_branch).replace(/^origin\//, "");
+    if (
+      has(repo.dir, `refs/heads/${prBase}`) ||
+      has(repo.dir, `refs/remotes/origin/${prBase}`)
+    )
+      git(repo.dir, ["config", `branch.${branch}.gh-merge-base`, prBase], {
+        allowFail: true,
+      });
     made.push({
       topic: name,
       repo: repo.worktree,

package/dist/{_Hb3LeA5Q.js → _BdBBZphI.js}

@@ -569,6 +569,32 @@ var STEPS = [
         CREATE INDEX group_members_session ON group_members(session_id);
 
         ALTER TABLE session_messages ADD COLUMN group_id TEXT REFERENCES session_groups(id) ON DELETE SET NULL;
+      `);
+		}
+	},
+	{
+		version: 6,
+		name: "drop work plan",
+		up(db) {
+			db.exec(`
+        CREATE TABLE session_groups_new (
+          id TEXT PRIMARY KEY,
+          workspace_id TEXT NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
+          owner TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
+          title TEXT NOT NULL,
+          parallel INTEGER NOT NULL DEFAULT 4,
+          fan_in INTEGER NOT NULL DEFAULT 1,
+          close_done INTEGER NOT NULL DEFAULT 0,
+          keep INTEGER NOT NULL DEFAULT 0,
+          created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))
+        );
+        INSERT INTO session_groups_new (id, workspace_id, owner, title, parallel, fan_in, close_done, keep, created_at)
+          SELECT id, workspace_id, owner, title, parallel, fan_in, close_done, keep, created_at FROM session_groups;
+        DROP TABLE session_groups;
+        ALTER TABLE session_groups_new RENAME TO session_groups;
+
+        DROP TABLE plan_log;
+        DROP TABLE plans;
       `);
 		}
 	}
@@ -8598,7 +8624,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("./_DrEeyoLF.js").then((m) => m.notifySessionsChanged(workspaceId));
+		import("./_C9UcJEf9.js").then((m) => m.notifySessionsChanged(workspaceId));
 		return;
 	}
 	publish("sessions.changed");
@@ -10619,6 +10645,20 @@ function listSessions(workspaceId) {
 function getSession(id) {
 	return get("SELECT * FROM sessions WHERE id = ?", id);
 }
+/** The agent a request is made for (the `WORK_SESSION_ID` the CLI sends
+* as `by`, `parent` or `from`), when it is one: a shell's is the user's. */
+function agentCaller(id) {
+	const s = id ? getSession(id) : void 0;
+	return s && s.agent !== "shell" ? s : void 0;
+}
+/** An agent runs sessions only in its own workspace — starts them, fans
+* out, closes, skips, retries, renames, takes their replies; another
+* workspace's it may only message, while running (\`sendMessage\`). The
+* user (the app, their own shell) is held to none of it. */
+function ownWorkspaceOnly(caller, workspaceId, what) {
+	const agent = agentCaller(caller);
+	if (agent && workspaceId && agent.workspace_id !== workspaceId) throw httpError(403, `an agent ${what} only in its own workspace: to reach one in another (when the user asks), message an agent running there with \`work session send\``);
+}
 /** `ifEmpty` is a first open's auto-create: two pages mounting one empty
 * workspace at once (restored tabs, a phone and a desktop) both list no
 * sessions before either POST lands. The check and the insert run in one
@@ -10749,7 +10789,7 @@ function notifySessionsChanged(workspaceId) {
 async function emitSessionsChanged(workspaceId) {
 	try {
 		const states = await sessionStates();
-		const { teamsOf } = await import("./_E0fWorAK.js");
+		const { teamsOf } = await import("./_Bu1xx1j4.js");
 		publish("sessions.changed", {
 			workspaceId,
 			sessions: listSessions(workspaceId).map((s) => ({
@@ -11210,4 +11250,4 @@ function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
 //#endregion
-export { setAgentPhase as $, DEFAULT_GITHUB_HOST as $t, blankRow as A, withLock as An, disabledAgents as At, interruptedSinceReport as B, ghKnownHosts as Bt, sendToSession as C, git as Cn, PREF_MAX as Ct, AGENTS as D, config as Dn, changePref as Dt, tmuxWasStarted as E, tmux as En, allPrefs as Et, activityOf as F, setDisabledAgents as Ft, notePermissionMode as G, tilde as Gt, noteActivity as H, miseVersions as Ht, agentPhase as I, setPref as It, notifyEventOn as J, unreachableText as Jt, noteTyped as K, which as Kt, clearAgentPhase as L, setSetting as Lt, inside as M, getSetting as Mt, realInside as N, isKnownAgent as Nt, readHookPayload as O, shared as On, deleteSetting as Ot, realInsideSync as P, preferredAgent as Pt, sessionWatched as Q, firewallProbe as Qt, hookPhase as R, discoverAgents as Rt, renameSession as S, gh as Sn, validSubscription as St, tmuxName as T, run$2 as Tn, agentChoices as Tt, noteBackground as U, setupPath as Ut, lastTypedAt as V, miseInstalls as Vt, noteInterrupt as W, stableGh as Wt, onPhaseChange as X, unsetCaches as Xt, onFinished as Y, enableUntrackedCache as Yt, onTurnEnd as Z, untrackedCacheAllowed as Zt, markTmuxStarted as _, all as _n, setInstance as _t, creationOf as a, parseAgentId as an, turnPhase as at, onSessionDispose as b, workspacePath as bn, saveSubscription as bt, ensureTmuxServer as c, FRAME_ANCESTORS as cn, agentFamily as ct, killSession as d, httpError as dn, agentMeta as dt, PROJECT_TOOLS as en, setExpecting as et, killWorkspaceSessions as f, readBody as fn, ACCENT_RE as ft, listSessions as g, subscriberCount as gn, normalizeAccent as gt, listPanesWithin as h, subscribe as hn, manifest as ht, createSession as i, catalogPin as in, summaryOf as it, cleanSummary as j, enabledAgents as jt, reportsWorking as k, swr as kn, deleteWorkspacePrefs as kt, forgetPanes as l, FRAME_HEADERS as ln, agentFromCommand as lt, listPanes as m, publishJson as mn, iconSvg as mt, cleanEnv as n, agentById as nn, setSessionViewers as nt, descendantsOf as o, toolById as on, turnSettling as ot, launchDir as p, publish as pn, getInstance as pt, noteUserAnswered as q, hostReach as qt, clearTmuxStarted as r, agentLabel$1 as rn, settleQuietWorking as rt, disposeSessions as s, applyPrefChange as sn, agentBadge as st, beginCreation as t, TOOLS as tn, setScrapedPhase as tt, getSession as u, checked as un, agentLabel as ut, newSessionArgs as v, db as vn, deleteSubscription as vt, sessionStates as w, gitEnv as wn, WORKSPACE_PREFS as wt, panePids as x, TMUX_SOCKET as xn, sendPush as xt, notifySessionsChanged as y, get as yn, pushPublicKey as yt, hookReportedAt as z, doctor as zt };
+export { onTurnEnd as $, untrackedCacheAllowed as $t, readHookPayload as A, shared as An, deleteSetting as At, hookPhase as B, discoverAgents as Bt, panePids as C, TMUX_SOCKET as Cn, sendPush as Ct, tmuxName as D, run$2 as Dn, agentChoices as Dt, sessionStates as E, gitEnv as En, WORKSPACE_PREFS as Et, realInside as F, isKnownAgent as Ft, noteBackground as G, setupPath as Gt, interruptedSinceReport as H, ghKnownHosts as Ht, realInsideSync as I, preferredAgent as It, noteTyped as J, which as Jt, noteInterrupt as K, stableGh as Kt, activityOf as L, setDisabledAgents as Lt, blankRow as M, withLock as Mn, disabledAgents as Mt, cleanSummary as N, enabledAgents as Nt, tmuxWasStarted as O, tmux as On, allPrefs as Ot, inside as P, getSetting as Pt, onPhaseChange as Q, unsetCaches as Qt, agentPhase as R, setPref as Rt, ownWorkspaceOnly as S, workspacePath as Sn, saveSubscription as St, sendToSession as T, git as Tn, PREF_MAX as Tt, lastTypedAt as U, miseInstalls as Ut, hookReportedAt as V, doctor as Vt, noteActivity as W, miseVersions as Wt, notifyEventOn as X, unreachableText as Xt, noteUserAnswered as Y, hostReach as Yt, onFinished as Z, enableUntrackedCache as Zt, listSessions as _, subscribe as _n, manifest as _t, createSession as a, agentLabel$1 as an, settleQuietWorking as at, notifySessionsChanged as b, db as bn, deleteSubscription as bt, disposeSessions as c, toolById as cn, turnSettling as ct, getSession as d, FRAME_HEADERS as dn, agentFromCommand as dt, firewallProbe as en, sessionWatched as et, killSession as f, checked as fn, agentLabel as ft, listPanesWithin as g, publishJson as gn, iconSvg as gt, listPanes as h, publish as hn, getInstance as ht, clearTmuxStarted as i, agentById as in, setSessionViewers as it, reportsWorking as j, swr as jn, deleteWorkspacePrefs as jt, AGENTS as k, config as kn, changePref as kt, ensureTmuxServer as l, applyPrefChange as ln, agentBadge as lt, launchDir as m, readBody as mn, ACCENT_RE as mt, beginCreation as n, PROJECT_TOOLS as nn, setExpecting as nt, creationOf as o, catalogPin as on, summaryOf as ot, killWorkspaceSessions as p, httpError as pn, agentMeta as pt, notePermissionMode as q, tilde as qt, cleanEnv as r, TOOLS as rn, setScrapedPhase as rt, descendantsOf as s, parseAgentId as sn, turnPhase as st, agentCaller as t, DEFAULT_GITHUB_HOST as tn, setAgentPhase as tt, forgetPanes as u, FRAME_ANCESTORS as un, agentFamily as ut, markTmuxStarted as v, subscriberCount as vn, normalizeAccent as vt, renameSession as w, gh as wn, validSubscription as wt, onSessionDispose as x, get as xn, pushPublicKey as xt, newSessionArgs as y, all as yn, setInstance as yt, clearAgentPhase as z, setSetting as zt };

package/dist/_Bu1xx1j4.js

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

package/dist/_C9UcJEf9.js

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

package/dist/{_BHlbSSAl.js → _DdVpb0NT.js}

@@ -85,98 +85,98 @@ var iconSize = {
 };
 //#endregion
 //#region src/tags/settings-agents.css.ts
-var agentRow = "_fj _ef";
-var list$3 = "_ej _dJ _ee _eh";
-var metaChip = "_ex _bz _by";
+var agentRow = "_fG _dX";
+var list$3 = "_d1 _dJ _dW _dZ";
+var metaChip = "_ee _bz _by";
 var sectionCount = "_dG _bp _bq";
-var usageNote = "_kc _by";
-var pop$2 = "_hf _bN";
-var spinner = "_hi _bD _bi";
-var toolLead = "_g1 _es";
-var name$4 = "_gT _es";
-var desc$1 = "_gU _et";
+var usageNote = "_j4 _by";
+var pop$2 = "_g0 _bN";
+var spinner = "_g3 _bD _bi";
+var toolLead = "_gg _d_";
+var name$4 = "_gq _d_";
+var desc$1 = "_gr _ea";
 //#endregion
 //#region src/tags/lsp-add-dialog.css.ts
-var addDlg = "_lK _bV";
-var key$1 = "_me _mc";
-var addTile = "_mg _mc";
-var field$3 = "_mr _bA";
-var keyField = "_ms _mr _bA";
-var labelField = "_mt _mr _bA";
-var detailsToggle = "_gA _6";
-var themeSeg = "_fR _bR";
-var checkList = "_hJ _dH";
+var addDlg = "_ly _bX";
+var key$1 = "_lH _lF";
+var addTile = "_lJ _lF";
+var field$2 = "_lU _bA";
+var keyField = "_lV _lU _bA";
+var labelField = "_lW _lU _bA";
+var detailsToggle = "_gI _6";
+var themeSeg = "_fW _bR";
+var checkList = "_h7 _dH";
 //#endregion
 //#region src/tags/prompt-dialog.css.ts
-var promptDlg = "_bZ _bV";
+var promptDlg = "_b1 _bX";
 var item$1 = "_b6 _D";
 var glance = "_dT _D";
 //#endregion
 //#region src/tags/side-nav.css.ts
-var iconBtn = "_cr _D";
-var settingsDot = "_cs _bQ";
-var notifyBtn = "_cx _D";
+var iconBtn = "_ca _D";
+var settingsDot = "_cb _bQ";
+var notifyBtn = "_cg _D";
 //#endregion
 //#region src/styles/session-pop.css.ts
-var sessionPop = "_cz _bN";
-var sessionPopBtn = "_cA _bk";
-var wsBtn = "_fz _bk";
-var rowIcon = "_fB _bF _D";
-var prChip = "_lp _M _lj";
+var sessionPop = "_b9 _bN";
+var sessionPopBtn = "_b_ _bk";
+var wsBtn = "_e5 _bk";
+var rowIcon = "_e7 _bF _D";
+var prChip = "_l7 _M _l1";
 //#endregion
 //#region src/tags/port-chip.css.ts
-var port = "_o1 _M _lj";
+var port = "_oP _M _l1";
 var depth = {
-	"1": "_ku",
-	"2": "_kv",
-	"3": "_kw"
+	"1": "_kT",
+	"2": "_kU",
+	"3": "_kV"
 };
-var open = "_kC _bk";
-var action = "_kH _bI _D";
-var toggle = "_eC _6";
-var fold = "_eD _eg";
-var item = "_ko _bk";
+var open = "_k1 _bk";
+var action = "_k6 _bI _D";
+var toggle = "_ej _6";
+var fold = "_ek _dY";
+var item = "_kA _bk";
 var statusOf = {
-	queued: "_nB",
-	starting: "_nC",
-	working: "_nD",
-	waiting: "_nE",
-	idle: "_nF",
-	done: "_nG",
-	closed: "_nH"
+	queued: "_m0",
+	starting: "_m1",
+	working: "_m2",
+	waiting: "_m3",
+	idle: "_m4",
+	done: "_m5",
+	closed: "_m6"
 };
-var menu = "_m5 _cz _bN";
-var menuItem = "_m7 _bk";
-var findBtn$1 = "_jp _hS _bG _D";
-var tool = "_hS _bG _D";
-var heldRefresh = "_h0 _M";
-var pop$1 = "_l_ _cz _bN";
-var fileFilter = "_o5 _F";
-var findInput = "_d5 _F";
-var keybarIconBtn = "_ed _bI _D";
-var input = "_c1 _F";
-var group = "_c4 _6";
-var hint$1 = "_mI _bp _3";
-var sheetDir = "_oj _bP";
-var upBtn = "_iJ _bG _D";
-var findBtn = "_iN _hS _bG _D";
-var goBtn = "_iO _hS _bG _D";
-var note = "_lZ _by";
+var menu = "_nH _b9 _bN";
+var menuItem = "_nJ _bk";
+var findBtn$1 = "_jp _if _bG _D";
+var tool = "_if _bG _D";
+var heldRefresh = "_in _M";
+var pop$1 = "_mr _b9 _bN";
+var fileFilter = "_oO _F";
+var findInput = "_eR _F";
+var keybarIconBtn = "_e0 _bI _D";
+var input = "_cI _F";
+var group = "_cL _6";
+var hint$1 = "_nk _bp _3";
+var sheetDir = "_n6 _bP";
+var upBtn = "_iz _bG _D";
+var findBtn = "_iD _if _bG _D";
+var goBtn = "_iE _if _bG _D";
+var note = "_mn _by";
 //#endregion
 //#region src/tags/manage-workspace.css.ts
-var procCmd = "_hn _es";
-var factCopy = "_hu _bI _D";
-var resultRow = "_k5 _bk";
-var resultBranch = "_k6 _ex _bz _by _bF _D";
-var urlAction = "_k7 _ex _bz _by _ey";
-var curRow = "_gP _em";
+var procCmd = "_hd _d_";
+var factCopy = "_hk _bI _D";
+var resultRow = "_lh _bk";
+var resultBranch = "_li _ee _bz _by _bF _D";
+var urlAction = "_lj _ee _bz _by _ef";
+var curRow = "_hb _d4";
 //#endregion
 //#region src/tags/join-dialog.css.ts
-var dlg = "_lP _bV";
-var hint = "_lQ _by";
-var kbtn = "_cj _bH _D";
-var repeat = "_cm _cl";
-var dpadUser = "_cp _cl";
-var dpadEsc = "_cq _cl";
+var dlg = "_kH _bX";
+var hint = "_kI _by";
+var kbtn = "_c4 _bH _D";
+var repeat = "_c7 _c6";
+var dpadUser = "_c_ _c6";
+var dpadEsc = "_da _c6";
 //#endregion
-export { field$3 as $, statusOf as A, prTone as At, wsBtn as B, fileFilter as C, chipBtn as Ct, findBtn$1 as D, iconBtnXs as Dt, tool as E, iconBtnRow 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, usageFill as Mt, toggle as N, usageInk as Nt, menu as O, inputLg as Ot, action as P, addTile as Q, prChip as R, keybarIconBtn as S, btnSm as St, heldRefresh as T, iconBtnLg as Tt, iconBtn as U, sessionPop as V, notifyBtn as W, themeSeg as X, checkList as Y, detailsToggle as Z, sheetDir as _, tocDot as _t, dlg as a, name$4 as at, input as b, toastTitle 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, sans as gt, goBtn as h, iconSize as ht, repeat as i, desc$1 as it, item as j, tone as jt, menuItem as k, phaseIcon as kt, resultRow as l, usageNote as lt, findBtn as m, color 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, toastKind as vt, pop$1 as w, glyphBadgeNum as wt, findInput as x, btnLg as xt, group as y, toastStack as yt, rowIcon as z };
+export { field$2 as $, statusOf as A, prTone as At, wsBtn as B, fileFilter as C, chipBtn as Ct, findBtn$1 as D, iconBtnXs as Dt, tool as E, iconBtnRow 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, usageFill as Mt, toggle as N, usageInk as Nt, menu as O, inputLg as Ot, action as P, addTile as Q, prChip as R, keybarIconBtn as S, btnSm as St, heldRefresh as T, iconBtnLg as Tt, iconBtn as U, sessionPop as V, notifyBtn as W, themeSeg as X, checkList as Y, detailsToggle as Z, sheetDir as _, tocDot as _t, dlg as a, name$4 as at, input as b, toastTitle 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, sans as gt, goBtn as h, iconSize as ht, repeat as i, desc$1 as it, item as j, tone as jt, menuItem as k, phaseIcon as kt, resultRow as l, usageNote as lt, findBtn as m, color 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, toastKind as vt, pop$1 as w, glyphBadgeNum as wt, findInput as x, btnLg as xt, group as y, toastStack as yt, rowIcon as z };

package/dist/{_C9c_BxRk.js → _Dqcw6PJn.js}

@@ -1,4 +1,4 @@
-import { C as sendToSession, F as activityOf, I as agentPhase, Mt as getSetting, Nt as isKnownAgent, Q as sessionWatched, S as renameSession, V as lastTypedAt, X as onPhaseChange, Y as onFinished, Z as onTurnEnd, _n as all, at as turnPhase, b as onSessionDispose, d as killSession, dn as httpError, et as setExpecting, h as listPanesWithin, i as createSession, it as summaryOf, j as cleanSummary, ot as turnSettling, u as getSession, ut as agentLabel, vn as db, y as notifySessionsChanged, yn as get, z as hookReportedAt } from "./_Hb3LeA5Q.js";
+import { $ as onTurnEnd, Ft as isKnownAgent, L as activityOf, N as cleanSummary, Pt as getSetting, Q as onPhaseChange, R as agentPhase, T as sendToSession, U as lastTypedAt, V as hookReportedAt, Z as onFinished, a as createSession, b as notifySessionsChanged, bn as db, ct as turnSettling, d as getSession, et as sessionWatched, f as killSession, ft as agentLabel, g as listPanesWithin, nt as setExpecting, ot as summaryOf, pn as httpError, st as turnPhase, w as renameSession, x as onSessionDispose, xn as get, yn as all } from "./_BdBBZphI.js";
 //#region src/server/messages.ts
 var team = {
 	memberGroup: () => null,
@@ -83,9 +83,17 @@ function replyBody(session, message) {
 	if (message.length <= MAX_REPLY) return message;
 	return `${message.slice(0, MAX_REPLY)}\n\n[cut at ${MAX_REPLY} characters: the rest is in its tab, ${tab}]`;
 }
+/** How a sender is named where its message lands: with its workspace,
+* when that is another. */
+function senderLabel(from, to) {
+	const target = getSession(to);
+	if (!from.workspace_id || from.workspace_id === target?.workspace_id) return labelOf(from);
+	const ws = get("SELECT name FROM workspaces WHERE id = ?", from.workspace_id);
+	return `${labelOf(from)} in workspace ${ws?.name ?? from.workspace_id}`;
+}
 function insert(to, from, kind, body, wantsReply = false, groupId = null) {
 	return Number(db.prepare(`INSERT INTO session_messages (to_session, from_session, from_label, kind, body, wants_reply, group_id)
-         VALUES (?, ?, ?, ?, ?, ?, ?)`).run(to, from?.id ?? null, from ? labelOf(from) : null, kind, body, wantsReply ? 1 : 0, groupId).lastInsertRowid);
+         VALUES (?, ?, ?, ?, ?, ?, ?)`).run(to, from?.id ?? null, from ? senderLabel(from, to) : null, kind, body, wantsReply ? 1 : 0, groupId).lastInsertRowid);
 }
 function deleteIds(ids) {
 	if (!ids.length) return;
@@ -190,6 +198,9 @@ async function sendMessage(to, text, opts = {}) {
 	if (text.length > MAX_BODY) throw httpError(413, `a message is at most ${MAX_BODY} characters: write the rest to a file and send its path`);
 	const sender = opts.from ? getSession(opts.from) : void 0;
 	const from = sender && sender.agent !== "shell" ? sender : null;
+	if (!!from && from.workspace_id !== target.workspace_id) {
+		if (!(await listPanesWithin(2e3))?.some((p) => p.id === to)) throw httpError(409, `${to} is not running: a message to another workspace goes only to an agent running there`);
+	}
 	if (from && !opts.member) admit(from.id);
 	if (!from && target.parent_id) db.prepare("UPDATE sessions SET keep = 1 WHERE id = ?").run(to);
 	const wantsReply = !!from && opts.reply !== false;
@@ -338,8 +349,6 @@ var MAX_BOOTING = 2;
 /** A pool with queued members looks again this often, for a slot that a
 * session freed without a hook to say so. */
 var POOL_RETRY_MS = 5e3;
-/** Lines a plan keeps of its log. */
-var MAX_LOG = 200;
 /** A finished group older than this goes as the server starts. */
 var PRUNE_AFTER = "-1 day";
 var now = () => (/* @__PURE__ */ new Date()).toISOString();
@@ -394,18 +403,19 @@ function createGroup(owner, input) {
 	const dirs = input.dirs ?? [];
 	if (dirs.length && dirs.length !== slots.length) throw httpError(400, `${dirs.length} folders for ${slots.length} members`);
 	const title = input.title.trim() || "fan-out";
+	const groupTitle = title.replace(/\s*[:·\-–]?\s*\{i?\}\s*/g, " ").trim() || "fan-out";
 	const parallel = Math.min(MAX_PARALLEL, Math.max(1, Math.floor(input.parallel ?? DEFAULT_PARALLEL)));
-	const current = openPlan(owner);
 	const id = newId("g");
-	db.prepare(`INSERT INTO session_groups (id, workspace_id, owner, plan_id, phase, title, parallel, fan_in, close_done, keep)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, lead.workspace_id, owner, current?.id ?? null, input.phase?.trim() || null, title, parallel, input.fanIn === false ? 0 : 1, input.closeDone ? 1 : 0, input.keep ? 1 : 0);
+	db.prepare(`INSERT INTO session_groups (id, workspace_id, owner, title, parallel, fan_in, close_done, keep)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?)`).run(id, lead.workspace_id, owner, groupTitle, parallel, input.fanIn === false ? 0 : 1, input.closeDone ? 1 : 0, input.keep ? 1 : 0);
 	const several = new Set(slots.map((p) => p.agent)).size > 1;
 	const insert = db.prepare(`INSERT INTO group_members (id, group_id, ord, agent, title, prompt, launch_dir)
      VALUES (?, ?, ?, ?, ?, ?, ?)`);
 	slots.forEach((p, i) => {
 		const name = p.item ?? (slots.length > agents.length ? `#${p.n}` : "");
 		const who = several ? p.agent : "";
-		const memberTitle = [title, [name, who].filter(Boolean).join(" ")].filter(Boolean).join(" · ").slice(0, 60);
+		const templated = /\{i?\}/.test(title);
+		const memberTitle = (templated ? [title.replaceAll("{}", p.item ?? name).replaceAll("{i}", String(i + 1)), who] : [title, [name, who].filter(Boolean).join(" ")]).filter(Boolean).join(templated ? " " : " · ").slice(0, 60);
 		const prompt = input.prompt.replaceAll("{}", p.item ?? "").replaceAll("{i}", String(i + 1));
 		insert.run(newId("m"), id, i + 1, p.agent, memberTitle, prompt, dirs[i] ?? null);
 	});
@@ -414,6 +424,10 @@ function createGroup(owner, input) {
 	kickPool();
 	return groupView(groupOf(id));
 }
+/** The workspace a member's group runs in. */
+function memberWorkspace(memberId) {
+	return get("SELECT g.workspace_id FROM group_members m JOIN session_groups g ON g.id = m.group_id WHERE m.id = ?", memberId)?.workspace_id;
+}
 /** Rerun a member that closed: a fresh session with the same prompt. Its
 * lead's word that it closed is taken back, so the group waits for it. */
 function retryMember(memberId) {
@@ -587,40 +601,6 @@ setTeamHooks({
 		changed(g.workspace_id);
 	}
 });
-function openPlan(owner) {
-	return get("SELECT * FROM plans WHERE owner = ? AND done_at IS NULL ORDER BY created_at DESC LIMIT 1", owner);
-}
-/** A lead's plan: the phases its groups fall under, in order. A new one
-* ends the lead's last. */
-function createPlan(owner, name, phases) {
-	const lead = getSession(owner);
-	if (!lead?.workspace_id) throw httpError(404, `no session ${owner}`);
-	if (!name.trim()) throw httpError(400, "a plan needs a name");
-	db.prepare("UPDATE plans SET done_at = ? WHERE owner = ? AND done_at IS NULL").run(now(), owner);
-	const id = newId("p");
-	const clean = phases.map((p) => ({
-		title: p.title.trim(),
-		detail: p.detail?.trim() || void 0
-	})).filter((p) => p.title);
-	db.prepare("INSERT INTO plans (id, workspace_id, owner, name, phases) VALUES (?, ?, ?, ?, ?)").run(id, lead.workspace_id, owner, name.trim(), JSON.stringify(clean));
-	changed(lead.workspace_id);
-	return planView(get("SELECT * FROM plans WHERE id = ?", id));
-}
-/** A line of what the lead is doing, over its plan's phases. */
-function logPlan(owner, text) {
-	const plan = openPlan(owner);
-	if (!plan) throw httpError(409, "no plan to log to: start one with `work plan new \"<name>\"`");
-	db.prepare("INSERT INTO plan_log (plan_id, text) VALUES (?, ?)").run(plan.id, text.trim().slice(0, 300));
-	db.prepare(`DELETE FROM plan_log WHERE plan_id = ? AND id NOT IN
-       (SELECT id FROM plan_log WHERE plan_id = ? ORDER BY id DESC LIMIT ${MAX_LOG})`).run(plan.id, plan.id);
-	changed(plan.workspace_id);
-}
-function finishPlan(owner) {
-	const plan = openPlan(owner);
-	if (!plan) throw httpError(409, "no plan under way");
-	db.prepare("UPDATE plans SET done_at = ? WHERE id = ?").run(now(), plan.id);
-	changed(plan.workspace_id);
-}
 function memberStatus(m, alive) {
 	if (m.state !== "running") return m.state;
 	if (booting.has(m.id) || !m.session_id) return "starting";
@@ -664,7 +644,6 @@ function groupView(g, alive = null) {
 	return {
 		id: g.id,
 		title: g.title,
-		phase: g.phase,
 		parallel: g.parallel,
 		fanIn: !!g.fan_in,
 		closeDone: !!g.close_done,
@@ -674,36 +653,16 @@ function groupView(g, alive = null) {
 		members
 	};
 }
-function planView(p) {
-	let phases = [];
-	try {
-		phases = JSON.parse(p.phases);
-	} catch {}
-	return {
-		id: p.id,
-		name: p.name,
-		phases,
-		log: all("SELECT text, at FROM plan_log WHERE plan_id = ? ORDER BY id DESC LIMIT 5", p.id).reverse(),
-		done: !!p.done_at,
-		createdAt: p.created_at
-	};
-}
-/** Every lead's team in a workspace: its plan (the open one, else its
-* last) and its groups. */
+/** Every lead's team in a workspace: its groups. (Its plan is its own
+* todo list, on its session row.) */
 async function teamsOf(workspaceId) {
 	const panes = await listPanesWithin(2e3);
 	const alive = panes ? new Set(panes.flatMap((p) => p.id ? [p.id] : [])) : null;
 	const groups = all("SELECT * FROM session_groups WHERE workspace_id = ? ORDER BY created_at", workspaceId);
-	const plans = all(`SELECT * FROM plans p WHERE workspace_id = ? AND created_at =
-       (SELECT MAX(created_at) FROM plans WHERE owner = p.owner)`, workspaceId);
-	return [.../* @__PURE__ */ new Set([...groups.map((g) => g.owner), ...plans.map((p) => p.owner)])].map((owner) => {
-		const plan = plans.find((p) => p.owner === owner);
-		return {
-			owner,
-			plan: plan ? planView(plan) : null,
-			groups: groups.filter((g) => g.owner === owner).map((g) => groupView(g, alive))
-		};
-	});
+	return [...new Set(groups.map((g) => g.owner))].map((owner) => ({
+		owner,
+		groups: groups.filter((g) => g.owner === owner).map((g) => groupView(g, alive))
+	}));
 }
 /** The groups `owner` runs, for `work session team`. */
 async function teamOf(owner) {
@@ -711,7 +670,6 @@ async function teamOf(owner) {
 	if (!s?.workspace_id) throw httpError(404, `no session ${owner}`);
 	return (await teamsOf(s.workspace_id)).find((t) => t.owner === owner) ?? {
 		owner,
-		plan: null,
 		groups: []
 	};
 }
@@ -784,4 +742,4 @@ function startTeam() {
 	kickPool();
 }
 //#endregion
-export { startMessages as _, createPlan as a, logPlan as c, startTeam as d, teamOf as f, sessionGone as g, sendMessage as h, createGroup as i, retryMember as l, messageStates as m, closeDone as n, finishPlan as o, teamsOf as p, closeFinished as r, kickPool as s, clearGroup as t, skipMember as u, takeReplies as v };
+export { kickPool as a, skipMember as c, teamsOf as d, messageStates as f, takeReplies as g, startMessages as h, createGroup as i, startTeam as l, sessionGone as m, closeDone as n, memberWorkspace as o, sendMessage as p, closeFinished as r, retryMember as s, clearGroup as t, teamOf as u };