@dylanpiercey/work 0.2.27 → 0.2.29

package/dist/{_DDAjcBsZ.js → _Dgcl4IXI.js}

@@ -49,7 +49,7 @@ var toastTitle = {
 	warn: "_w",
 	info: "_x"
 };
-var tocDot = "_dh _ba";
+var tocDot = "_cJ _ba";
 //#endregion
 //#region src/styles/tokens.css.ts
 var color = {
@@ -85,98 +85,98 @@ var iconSize = {
 };
 //#endregion
 //#region src/tags/settings-agents.css.ts
-var agentRow = "_fn _e4";
-var list$3 = "_e8 _dJ _e3 _e6";
-var metaChip = "_fl _bz _by";
-var sectionCount = "_dG _bp _bq";
-var usageNote = "_ko _by";
-var pop$2 = "_fV _bN";
-var spinner = "_fY _bD _bi";
-var toolLead = "_f5 _fg";
-var name$4 = "_hm _fg";
-var desc$1 = "_hn _fh";
+var agentRow = "_fh _dL";
+var list$3 = "_dP _dq _dK _dN";
+var metaChip = "_d3 _bz _by";
+var sectionCount = "_dn _bp _bq";
+var usageNote = "_lb _by";
+var pop$2 = "_g2 _bN";
+var spinner = "_g5 _bD _bi";
+var toolLead = "_gN _dY";
+var name$4 = "_gF _dY";
+var desc$1 = "_gG _dZ";
 //#endregion
 //#region src/tags/lsp-add-dialog.css.ts
-var addDlg = "_kS _bV";
-var key$1 = "_me _mc";
-var addTile = "_mg _mc";
-var field$2 = "_mr _bA";
-var keyField = "_ms _mr _bA";
-var labelField = "_mt _mr _bA";
-var detailsToggle = "_iZ _6";
-var themeSeg = "_gu _bR";
-var checkList = "_hS _dH";
+var addDlg = "_ll _cf";
+var key$1 = "_kc _ka";
+var addTile = "_ke _ka";
+var field$2 = "_kp _bA";
+var keyField = "_kq _kp _bA";
+var labelField = "_kr _kp _bA";
+var detailsToggle = "_fD _6";
+var themeSeg = "_em _bR";
+var checkList = "_hk _do";
 //#endregion
 //#region src/tags/prompt-dialog.css.ts
-var promptDlg = "_bZ _bV";
-var item$1 = "_b6 _D";
-var glance = "_dT _D";
+var promptDlg = "_cj _cf";
+var item$1 = "_co _D";
+var glance = "_e2 _D";
 //#endregion
 //#region src/tags/side-nav.css.ts
-var iconBtn = "_cy _D";
-var settingsDot = "_cz _bQ";
-var notifyBtn = "_cE _D";
+var iconBtn = "_b7 _D";
+var settingsDot = "_b8 _bQ";
+var notifyBtn = "_cc _D";
 //#endregion
 //#region src/styles/session-pop.css.ts
-var sessionPop = "_cw _bN";
-var sessionPopBtn = "_cx _bk";
-var wsBtn = "_ec _bk";
-var rowIcon = "_ee _bF _D";
-var prChip = "_kD _M _kx";
+var sessionPop = "_cB _bN";
+var sessionPopBtn = "_cC _bk";
+var wsBtn = "_fS _bk";
+var rowIcon = "_fU _bF _D";
+var prChip = "_l8 _M _l2";
 //#endregion
 //#region src/tags/port-chip.css.ts
-var port = "_oT _M _kx";
+var port = "_oK _M _l2";
 var depth = {
-	"1": "_lj",
-	"2": "_lk",
-	"3": "_ll"
+	"1": "_kA",
+	"2": "_kB",
+	"3": "_kC"
 };
-var open = "_lr _bk";
-var action = "_lw _bI _D";
-var toggle = "_fD _6";
-var fold = "_fE _e5";
+var open = "_kI _bk";
+var action = "_kN _bI _D";
+var toggle = "_d8 _6";
+var fold = "_d9 _dM";
 var statusOf = {
-	queued: "_nB",
-	starting: "_nC",
-	working: "_nD",
-	waiting: "_nE",
-	idle: "_nF",
-	done: "_nG",
-	closed: "_nH"
+	queued: "_lL",
+	starting: "_lM",
+	working: "_lN",
+	waiting: "_lO",
+	idle: "_lP",
+	done: "_lQ",
+	closed: "_lR"
 };
-var item = "_ke _bk";
-var menu = "_m8 _cw _bN";
-var menuItem = "_m_ _bk";
-var findBtn$1 = "_ig _h1 _bG _D";
-var tool = "_h1 _bG _D";
-var heldRefresh = "_h9 _M";
-var pop$1 = "_nV _cw _bN";
-var fileFilter = "_oY _F";
-var findInput = "_dZ _F";
-var keybarIconBtn = "_d8 _bI _D";
-var input = "_c1 _F";
-var group = "_c4 _6";
-var hint$1 = "_mX _bp _3";
-var sheetDir = "_ob _bP";
-var upBtn = "_jl _bG _D";
-var findBtn = "_jp _h1 _bG _D";
-var goBtn = "_jq _h1 _bG _D";
-var note = "_mH _by";
+var item = "_j6 _bk";
+var menu = "_nq _cB _bN";
+var menuItem = "_ns _bk";
+var findBtn$1 = "_ir _ic _bG _D";
+var tool = "_ic _bG _D";
+var heldRefresh = "_ik _M";
+var pop$1 = "_mP _cB _bN";
+var fileFilter = "_oJ _F";
+var findInput = "_hB _F";
+var keybarIconBtn = "_hK _bI _D";
+var input = "_c_ _F";
+var group = "_dc _6";
+var hint$1 = "_nH _bp _3";
+var sheetDir = "_n6 _bP";
+var upBtn = "_jm _bG _D";
+var findBtn = "_jq _ic _bG _D";
+var goBtn = "_jr _ic _bG _D";
+var note = "_nP _by";
 //#endregion
 //#region src/tags/manage-workspace.css.ts
-var procCmd = "_hq _fg";
-var factCopy = "_hx _bI _D";
-var resultRow = "_lW _bk";
-var resultBranch = "_lX _fl _bz _by _bF _D";
-var urlAction = "_lY _fl _bz _by _fm";
-var curRow = "_hF _fa";
+var procCmd = "_hR _dY";
+var factCopy = "_hY _bI _D";
+var resultRow = "_mW _bk";
+var resultBranch = "_mX _d3 _bz _by _bF _D";
+var urlAction = "_mY _d3 _bz _by _d4";
+var curRow = "_hP _dS";
 //#endregion
 //#region src/tags/join-dialog.css.ts
-var dlg = "_lI _bV";
-var hint = "_lJ _by";
-var kbtn = "_cR _bH _D";
-var repeat = "_cU _cT";
-var dpadUser = "_cX _cT";
-var dpadEsc = "_cY _cT";
+var dlg = "_mx _cf";
+var hint = "_my _by";
+var kbtn = "_c0 _bH _D";
+var repeat = "_c3 _c2";
+var dpadUser = "_c6 _c2";
+var dpadEsc = "_c7 _c2";
 //#endregion
 export { field$2 as $, item 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, statusOf 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/{_BpRTWX0Y.js → _cvaVxDgR.js}

@@ -1,4 +1,4 @@
-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 "./_DfTVXy8g.js";
+import { $ as reopenable, A as closedSession, An as onTurnEnd, H as listPanesWithin, J as onSessionDispose, Jr as httpError, L as getSession, Ln as summaryOf, Nn as setExpecting, On as onFinished, Q as reopenSession, R as killSession, Rn as turnPhase, Tr as isKnownAgent, Un as agentLabel, Z as renameSession, bn as lastTypedAt, dn as cleanSummary, ei as all, et as retireSession, hn as agentPhase, j as createSession, jn as sessionWatched, kn as onPhaseChange, mn as activityOf, ni as get, q as notifySessionsChanged, ti as db, tt as sendToSession, vn as hookReportedAt, wr as getSetting, zn as turnSettling } from "./_DQbVrULO.js";
 //#region src/server/messages.ts
 var team = {
 	memberGroup: () => null,
@@ -7,7 +7,8 @@ var team = {
 	waitingOwners: () => [],
 	openGroups: () => [],
 	memberAnswered: () => {},
-	memberGone: () => {}
+	memberGone: () => {},
+	closing: () => void 0
 };
 function setTeamHooks(hooks) {
 	team = hooks;
@@ -23,6 +24,8 @@ var RETRY_MS = 3e3;
 var MAX_BODY = 5e4;
 /** A reply past this is cut, pointing at the rest. */
 var MAX_REPLY = 2e4;
+/** How much of a message's first line a reply quotes to name it. */
+var EXCERPT = 40;
 /** A pane just started for a message can be missing from a pane list
 * taken a moment before, which is not the session exiting. */
 var START_GRACE_MS = 1e4;
@@ -50,15 +53,65 @@ function render(row) {
 		case "message":
 			if (!row.from_session) return row.body;
 			return row.wants_reply ? `[work] From session ${from}: your last message this turn goes back to it as your reply, so make it the whole answer (to ask it something first: work session send ${row.from_session} "…").\n\n${row.body}` : `[work] From session ${from}, no reply needed:\n\n${row.body}`;
-		case "reply": return `[work] Reply from session ${from} (to follow up: work session send ${row.from_session} "…"):\n\n${row.body}`;
+		case "reply": {
+			const owed = row.from_session ? stillOwed(row.to_session, row.from_session) : "";
+			return `[work] Reply from session ${from}${row.answers ? ` to ${row.answers}` : ""}${owed ? `; ${owed}` : ""}. ${followUp(row.from_session ?? "<id>", row.to_session)}:\n\n${row.body}`;
+		}
 		case "closed": return `[work] ${row.body}`;
 	}
 }
+/** A message as a reply names it: when it was sent, and how it begins. */
+function excerpt(row) {
+	const time = new Date(row.created_at).toLocaleTimeString("en-GB", {
+		hour: "2-digit",
+		minute: "2-digit"
+	});
+	const line = row.body.split("\n").find((l) => l.trim())?.trim() ?? "";
+	return `${time} ("${line.length > EXCERPT ? `${line.slice(0, 39)}…` : line}")`;
+}
+/** An asker's messages as a reply to it names them. */
+function yours(rows) {
+	const each = rows.map(excerpt);
+	return each.length === 1 ? `your message of ${each[0]}` : `your messages of ${each.slice(0, -1).join(", ")} and ${each.at(-1)}`;
+}
+/** What `asker` sent `to` that a reply from it has not answered yet: the
+* reply was to what it was on, and these come after it. */
+function stillOwed(asker, to) {
+	const rows = all("SELECT * FROM session_messages WHERE to_session = ? AND from_session = ? AND kind = 'message' ORDER BY id", to, asker);
+	if (!rows.length) return "";
+	const where = rows.every((r) => r.delivered_at) ? "in its turn now" : rows.some((r) => r.delivered_at) ? "queued for it or in its turn" : "queued for it";
+	const next = rows.some((r) => r.wants_reply) ? ", and a reply follows" : "";
+	return `${yours(rows)} ${rows.length === 1 ? "is" : "are"} still ${where}${next}`;
+}
+/** How to follow up with a session that replied, and what becomes of it
+* once it is done with (server/team). */
+function followUp(id, asker) {
+	const send = `To follow up: work session send ${id} "…"`;
+	const c = team.closing(id, asker);
+	if (!c) return send;
+	if (c.closed) return c.reopens ? `${send}, which reopens it on its conversation (it has closed since)` : "It has closed since, and its conversation with it: to follow up, start a new session";
+	return c.reopens ? `${send} (it closes ${c.when}, and a message then reopens it on its conversation; \`work session keep ${id}\` keeps it open)` : `${send} (it closes ${c.when}, and its conversation with it: \`work session keep ${id}\` keeps it for follow-ups)`;
+}
+/** What becomes of a group's members once done with, for its head. */
+function groupClosing(rows) {
+	const closings = rows.flatMap((r) => {
+		const c = r.kind === "reply" && r.from_session ? team.closing(r.from_session, r.to_session) : void 0;
+		return c ? [{
+			id: r.from_session,
+			...c
+		}] : [];
+	});
+	if (!closings.length) return "";
+	const when = closings.find((c) => !c.closed)?.when;
+	const lost = closings.filter((c) => !c.reopens).map((c) => c.id);
+	const then = lost.length === closings.length ? "its conversation closes with it" : `a message then reopens it on its conversation${lost.length ? `, but for ${lost.join(", ")}` : ""}`;
+	return when ? ` (each closes ${when} unless \`work session keep <id>\` keeps it, and ${then})` : ` (each has closed since, and ${then})`;
+}
 /** A group's replies as one: a head saying how many, then each member's
 * under its name. */
 function renderGroup(groupId, rows) {
 	const closed = rows.filter((r) => r.kind === "closed").length;
-	return [`[work] Group "${team.groupTitle(groupId)}" (${groupId}): ${rows.length - closed} ${rows.length - closed === 1 ? "reply" : "replies"}${closed ? `, ${closed} closed before replying` : ""}. To follow up with one: work session send <id> "…"`, ...rows.map((r) => `## ${r.from_label ?? r.from_session}\n\n${r.body}`)].join("\n\n");
+	return [`[work] Group "${team.groupTitle(groupId)}" (${groupId}): ${rows.length - closed} ${rows.length - closed === 1 ? "reply" : "replies"}${closed ? `, ${closed} closed before replying` : ""}. To follow up with one: work session send <id> "…"${groupClosing(rows)}`, ...rows.map((r) => `## ${r.from_label ?? r.from_session}\n\n${r.body}`)].join("\n\n");
 }
 /** Rows as typed in: each on its own, a group's together where its first
 * would be. */
@@ -91,9 +144,9 @@ function senderLabel(from, to) {
 	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 ? senderLabel(from, to) : null, kind, body, wantsReply ? 1 : 0, groupId).lastInsertRowid);
+function insert(to, from, kind, body, wantsReply = false, groupId = null, answers = null) {
+	return Number(db.prepare(`INSERT INTO session_messages (to_session, from_session, from_label, kind, body, wants_reply, group_id, answers)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?)`).run(to, from?.id ?? null, from ? senderLabel(from, to) : null, kind, body, wantsReply ? 1 : 0, groupId, answers).lastInsertRowid);
 }
 function deleteIds(ids) {
 	if (!ids.length) return;
@@ -191,17 +244,27 @@ function kick() {
 * `opts.member` is a fan-out starting a member (server/team): its group's
 * own caps bound it, not the sender's. */
 async function sendMessage(to, text, opts = {}) {
-	const target = getSession(to);
-	if (!target) throw httpError(404, `no session ${to}`);
-	if (target.agent === "shell") throw httpError(409, `${to} is a shell: a message would run as a command there, so messages go to agent sessions`);
+	const known = getSession(to) ?? closedSession(to);
+	if (!known) throw httpError(404, `no session ${to}`);
+	if (known.agent === "shell") throw httpError(409, `${to} is a shell: a message would run as a command there, so messages go to agent sessions`);
 	if (opts.from === to) throw httpError(409, "a session cannot message itself");
 	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 (!!from && from.workspace_id !== known.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);
+	const live = getSession(to);
+	let target = live;
+	if (!target) {
+		delivering.add(to);
+		try {
+			target = await reopenSession(to);
+		} finally {
+			delivering.delete(to);
+		}
+	}
 	if (!from && target.parent_id) db.prepare("UPDATE sessions SET keep = 1 WHERE id = ?").run(to);
 	const wantsReply = !!from && opts.reply !== false;
 	const id = insert(to, from, "message", text, wantsReply);
@@ -217,7 +280,9 @@ async function sendMessage(to, text, opts = {}) {
 		},
 		delivered: !row || !!row.delivered_at,
 		queued: row && !row.delivered_at ? hold ?? "queued" : null,
-		wantsReply
+		wantsReply,
+		/** It had closed, and is back on its conversation. */
+		reopened: !live
 	};
 }
 /** The replies (and word of sessions that closed) waiting for `me`, from
@@ -251,6 +316,7 @@ function takeReplies(me, from, any = false) {
 			group: r.group_id,
 			label: r.from_label,
 			kind: r.kind,
+			answers: r.answers,
 			text: r.body
 		})),
 		owing
@@ -286,7 +352,8 @@ function answer(id, message) {
 	for (const asker of new Set(owed.map((r) => r.from_session))) {
 		const to = asker ? getSession(asker) : void 0;
 		if (!to || to.agent === "shell") continue;
-		insert(to.id, session, "reply", body, false, group);
+		const answers = group ? null : yours(owed.filter((r) => r.from_session === asker));
+		insert(to.id, session, "reply", body, false, group, answers);
 		told = true;
 	}
 	deleteIds(owed.map((r) => r.id));
@@ -457,12 +524,13 @@ async function skipMember(memberId) {
 	changed(g.workspace_id);
 }
 /** Close the sessions of a group's members that have answered: their
-* results are kept, their CLIs no longer hold memory. */
+* results are kept, their CLIs no longer hold memory, and a message to
+* one reopens it. */
 async function closeDone(groupId) {
 	const g = groupOf(groupId);
 	if (!g) throw httpError(404, `no group ${groupId}`);
 	const done = membersOf(groupId).filter((m) => m.state === "done" && m.session_id);
-	for (const m of done) await killSession(m.session_id);
+	for (const m of done) await retireSession(m.session_id);
 	changed(g.workspace_id);
 	return done.length;
 }
@@ -588,10 +656,11 @@ setTeamHooks({
 		if (!m || m.state !== "running") return;
 		db.prepare("UPDATE group_members SET state = 'done', summary = ?, note = NULL, done_at = ? WHERE id = ?").run(message ? cleanSummary(message) ?? null : null, now(), m.id);
 		const g = groupOf(m.group_id);
-		if (g.close_done) setTimeout(() => void killSession(sessionId), 0);
+		if (g.close_done) setTimeout(() => void retireSession(sessionId), 0);
 		released(g);
 		changed(g.workspace_id);
 	},
+	closing,
 	memberGone(sessionId) {
 		const m = memberBySession(sessionId);
 		if (!m || m.state !== "running") return;
@@ -694,17 +763,47 @@ function doneWith(s) {
 }
 /** Close the sessions an agent started that are done with: `parent`'s
 * once its job is done (or asked: `work session kill --done`), else any
-* idle past `REAP_IDLE_MS`. A fan-out member's result stays in its group. */
+* idle past `REAP_IDLE_MS`. A fan-out member's result stays in its group,
+* and a message to one reopens it (sessions.ts `retireSession`). */
 async function closeFinished(parent) {
 	const rows = parent ? all("SELECT * FROM sessions WHERE parent_id = ?", parent) : all("SELECT * FROM sessions WHERE parent_id IS NOT NULL AND answered_at IS NOT NULL AND answered_at < ?", (/* @__PURE__ */ new Date(Date.now() - REAP_IDLE_MS)).toISOString());
 	let closed = 0;
 	for (const s of rows) {
 		if (!doneWith(s)) continue;
-		await killSession(s.id);
+		await retireSession(s.id);
 		closed++;
 	}
 	return closed;
 }
+/** Never close `id` for being done, as `--keep` would have started it
+* (`work session keep`): its lead has follow-ups for it. */
+function keepSession(id) {
+	if (!getSession(id)) {
+		const closed = closedSession(id);
+		if (!closed) throw httpError(404, `no session ${id}`);
+		throw httpError(409, reopenable(closed) ? `${id} has closed: a message reopens it on its conversation (\`work session send ${id} "…"\`), and it can be kept then` : `${id} has closed, and its conversation with it: start a new session with --keep`);
+	}
+	db.prepare("UPDATE sessions SET keep = 1 WHERE id = ?").run(id);
+}
+/** When a session that answered `asker` closes for being done, and
+* whether a message then reopens it, for the reply's follow-up line
+* (server/messages); undefined for one that stays. */
+function closing(id, asker) {
+	const s = getSession(id);
+	if (!s) {
+		const closed = closedSession(id);
+		return closed && {
+			closed: true,
+			reopens: reopenable(closed)
+		};
+	}
+	if (!s.parent_id || s.keep) return void 0;
+	return {
+		closed: false,
+		when: `when ${s.parent_id === asker ? "your" : "its lead's"} turn ends or after ${REAP_IDLE_MS / 6e4} idle minutes`,
+		reopens: reopenable(s)
+	};
+}
 /** Reaps asked for while one runs: leads whose job finished meanwhile
 * (`""` is the idle sweep), each run once, in turn. */
 var toReap = /* @__PURE__ */ new Set();
@@ -742,4 +841,4 @@ function startTeam() {
 	kickPool();
 }
 //#endregion
-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 };
+export { takeReplies as _, keepSession as a, retryMember as c, teamOf as d, teamsOf as f, startMessages as g, sessionGone as h, createGroup as i, skipMember as l, sendMessage as m, closeDone as n, kickPool as o, messageStates as p, closeFinished as r, memberWorkspace as s, clearGroup as t, startTeam as u };