@dylanpiercey/work 0.2.21 → 0.2.22

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. */
@@ -207,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
@@ -270,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`,
@@ -364,7 +374,7 @@ 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,
@@ -404,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 },
             () =>
@@ -440,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;
@@ -471,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(
@@ -502,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/dist/{_D2c8RJYx.js → _BdBBZphI.js}

@@ -8624,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("./_CwRrg_5F.js").then((m) => m.notifySessionsChanged(workspaceId));
+		import("./_C9UcJEf9.js").then((m) => m.notifySessionsChanged(workspaceId));
 		return;
 	}
 	publish("sessions.changed");
@@ -10645,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
@@ -10775,7 +10789,7 @@ function notifySessionsChanged(workspaceId) {
 async function emitSessionsChanged(workspaceId) {
 	try {
 		const states = await sessionStates();
-		const { teamsOf } = await import("./_D_EchrLM.js");
+		const { teamsOf } = await import("./_Bu1xx1j4.js");
 		publish("sessions.changed", {
 			workspaceId,
 			sessions: listSessions(workspaceId).map((s) => ({
@@ -11236,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/{_ChI2bucF.js → _DdVpb0NT.js}

@@ -85,95 +85,95 @@ var iconSize = {
 };
 //#endregion
 //#region src/tags/settings-agents.css.ts
-var agentRow = "_f0 _dX";
+var agentRow = "_fG _dX";
 var list$3 = "_d1 _dJ _dW _dZ";
 var metaChip = "_ee _bz _by";
 var sectionCount = "_dG _bp _bq";
-var usageNote = "_ko _by";
-var pop$2 = "_hx _bN";
-var spinner = "_hA _bD _bi";
-var toolLead = "_hc _d_";
-var name$4 = "_hm _d_";
-var desc$1 = "_hn _ea";
+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 = "_kx _bX";
-var key$1 = "_l2 _l0";
-var addTile = "_l4 _l0";
-var field$2 = "_me _bA";
-var keyField = "_mf _me _bA";
-var labelField = "_mg _me _bA";
-var detailsToggle = "_gq _6";
-var themeSeg = "_fJ _bR";
-var checkList = "_ig _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 = "_b1 _bX";
-var item$1 = "_ci _D";
+var item$1 = "_b6 _D";
 var glance = "_dT _D";
 //#endregion
 //#region src/tags/side-nav.css.ts
-var iconBtn = "_cl _D";
-var settingsDot = "_cm _bQ";
-var notifyBtn = "_cr _D";
+var iconBtn = "_ca _D";
+var settingsDot = "_cb _bQ";
+var notifyBtn = "_cg _D";
 //#endregion
 //#region src/styles/session-pop.css.ts
-var sessionPop = "_ct _bN";
-var sessionPopBtn = "_cu _bk";
-var wsBtn = "_eS _bk";
-var rowIcon = "_eU _bF _D";
-var prChip = "_lc _M _k7";
+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 = "_oN _M _k7";
+var port = "_oP _M _l1";
 var depth = {
-	"1": "_lv",
-	"2": "_lw",
-	"3": "_lx"
+	"1": "_kT",
+	"2": "_kU",
+	"3": "_kV"
 };
-var open = "_lD _bk";
-var action = "_lI _bI _D";
+var open = "_k1 _bk";
+var action = "_k6 _bI _D";
 var toggle = "_ej _6";
 var fold = "_ek _dY";
-var item = "_kF _bk";
+var item = "_kA _bk";
 var statusOf = {
-	queued: "_mZ",
-	starting: "_m0",
-	working: "_m1",
-	waiting: "_m2",
-	idle: "_m3",
-	done: "_m4",
-	closed: "_m5"
+	queued: "_m0",
+	starting: "_m1",
+	working: "_m2",
+	waiting: "_m3",
+	idle: "_m4",
+	done: "_m5",
+	closed: "_m6"
 };
-var menu = "_mv _ct _bN";
-var menuItem = "_mx _bk";
-var findBtn$1 = "_jp _ip _bG _D";
-var tool = "_ip _bG _D";
-var heldRefresh = "_ix _M";
-var pop$1 = "_ni _ct _bN";
-var fileFilter = "_oS _F";
-var findInput = "_ex _F";
-var keybarIconBtn = "_eG _bI _D";
-var input = "_b4 _F";
-var group = "_b7 _6";
-var hint$1 = "_nD _bp _3";
+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 = "_iJ _bG _D";
-var findBtn = "_iN _ip _bG _D";
-var goBtn = "_iO _ip _bG _D";
-var note = "_nl _by";
+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 = "_hL _d_";
-var factCopy = "_hS _bI _D";
-var resultRow = "_kS _bk";
-var resultBranch = "_kT _ee _bz _by _bF _D";
-var urlAction = "_kU _ee _bz _by _ef";
-var curRow = "_hJ _d4";
+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 = "_lQ _bX";
-var hint = "_lR _by";
+var dlg = "_kH _bX";
+var hint = "_kI _by";
 var kbtn = "_c4 _bH _D";
 var repeat = "_c7 _c6";
 var dpadUser = "_c_ _c6";

package/dist/{_D4MBRSvk.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 "./_D2c8RJYx.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;
@@ -413,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) {
@@ -727,4 +742,4 @@ function startTeam() {
 	kickPool();
 }
 //#endregion
-export { kickPool as a, startTeam as c, messageStates as d, sendMessage as f, takeReplies as h, createGroup as i, teamOf as l, startMessages as m, closeDone as n, retryMember as o, sessionGone as p, closeFinished as r, skipMember as s, clearGroup as t, teamsOf as u };
+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 };