@dylanpiercey/work 0.2.43 → 0.2.45

package/dist/{_DuwPQCOE.js → _B_YHcR6n.js}

@@ -1,4 +1,4 @@
-import { $ as reopenSession, A as closedSession, An as onFinished, Bn as turnPhase, Dr as getSetting, Fn as setExpecting, Hn as turnSince, J as notifySessionsChanged, Kn as agentLabel, L as getSession, Mn as onTurnEnd, Nn as sessionWatched, Or as isKnownAgent, Q as renameSession, Qr as httpError, R as interruptSession, Sn as lastTypedAt, U as listPanesWithin, Vn as turnSettling, Y as onSessionDispose, _n as agentPhase, ai as db, an as interruptKeys, bn as hookReportedAt, cn as steerKeys, et as reopenable, gn as activityOf, ii as all, j as createSession, jn as onPhaseChange, nt as sendToSession, oi as get, pn as cleanSummary, tt as retireSession, z as killSession, zn as summaryOf } from "./_Cv5RrCSW.js";
+import { $ as reopenSession, A as closedSession, An as onFinished, Bn as turnPhase, Dr as getSetting, Fn as setExpecting, Hn as turnSince, J as notifySessionsChanged, Kn as agentLabel, L as getSession, Mn as onTurnEnd, Nn as sessionWatched, Or as isKnownAgent, Q as renameSession, Qr as httpError, R as interruptSession, Sn as lastTypedAt, U as listPanesWithin, Vn as turnSettling, Y as onSessionDispose, _n as agentPhase, ai as db, an as interruptKeys, bn as hookReportedAt, cn as steerKeys, et as reopenable, gn as activityOf, ii as all, j as createSession, jn as onPhaseChange, nt as sendToSession, oi as get, pn as cleanSummary, tt as retireSession, z as killSession, zn as summaryOf } from "./_B_Wl8EDh.js";
 //#region src/server/messages.ts
 var team = {
 	memberGroup: () => null,
@@ -24,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;
+/** What a held reply says it waits on is a line, not a report. */
+var MAX_HELD = 200;
 /** A pane that has written nothing for this long is a CLI at its prompt:
 * every agent's screen animates while it works (scraper.ts). */
 var PANE_STILL_MS = 4e3;
@@ -49,6 +51,12 @@ var deliveredAt = /* @__PURE__ */ new Map();
 var steered = /* @__PURE__ */ new Set();
 /** Turn ends held back from answering (`holdAnswer`), by session. */
 var held = /* @__PURE__ */ new Map();
+/** Whom each session's turn's end last answered, and when, until a
+* message goes into it or someone types into it: till then a turn of it
+* is one it started on its own, still on what it was asked
+* (`answerOwnTurn`). A restart forgets it, as agent-state forgets
+* phases. */
+var answered = /* @__PURE__ */ new Map();
 /** Sessions any row is addressed to: the scraper asks about every session
 * without a pane on every tick, so the answer for one with none is a set
 * lookup rather than a query. */
@@ -67,21 +75,26 @@ function render(row) {
 			const owed = row.answers ? stillOwed(row.to_session, row.from_session) : "";
 			const head = row.answers ? `Reply from session ${from} to ${row.answers}${owed ? `; ${owed}` : ""}` : `From session ${from}`;
 			if (!row.wants_reply) return `[work] ${head}, no reply needed:\n\n${row.body}`;
-			return row.by_send ? `[work] ${head}, which waits for your answer: send it with work session send ${row.from_session} "…". Your last message here is the user's: end on a line saying what you told it.\n\n${row.body}` : `[work] ${head}: 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}`;
+			return row.by_send ? `[work] ${head}, which waits for your answer: send it with work session send ${row.from_session} "…". Your last message here is the user's: end on a line saying what you told it.\n\n${row.body}` : `[work] ${head}: 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} "…"; to end the turn while a job of yours runs on, first run work session hold "<what you wait on>": this turn's last message then goes as an interim reply, and the last message of the turn the job's end wakes you into is the reply).\n\n${row.body}`;
 		}
 		case "reply": {
+			if (row.held) return `[work] Interim reply from session ${from}${row.answers ? ` to ${row.answers}` : ""}: it is not done, it waits on ${row.held}, and its reply follows when it is (end your turn to wait for it, or run work session wait ${row.from_session}):\n\n${row.body}`;
 			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}`;
+			return `[work] ${row.follows ? `Follow-up from session ${from}${row.answers ? ` on ${row.answers}` : ""}: the last message of a turn it started on its own after its reply of ${clock(row.follows)}` : `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", {
+/** A moment as a reply names it ("14:05"). */
+function clock(at) {
+	return new Date(at).toLocaleTimeString("en-GB", {
 		hour: "2-digit",
 		minute: "2-digit"
 	});
+}
+/** A message as a reply names it: when it was sent, and how it begins. */
+function excerpt(row) {
+	const time = clock(row.created_at);
 	const line = row.body.split("\n").find((l) => l.trim())?.trim() ?? "";
 	return `${time} ("${line.length > EXCERPT ? `${line.slice(0, 39)}…` : line}")`;
 }
@@ -128,7 +141,7 @@ function groupClosing(rows) {
 * 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> "…"${groupClosing(rows)}`, ...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}${r.held ? ` (interim: it waits on ${r.held})` : ""}\n\n${r.body}`)].join("\n\n");
 }
 /** Rows as typed in: each on its own, a group's together where its first
 * would be. */
@@ -161,9 +174,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, answers = null, urgent = false, bySend = false) {
-	return Number(db.prepare(`INSERT INTO session_messages (to_session, from_session, from_label, kind, body, wants_reply, group_id, answers, urgent, by_send)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(to, from?.id ?? null, from ? senderLabel(from, to) : null, kind, body, wantsReply ? 1 : 0, groupId, answers, urgent ? 1 : 0, bySend ? 1 : 0).lastInsertRowid);
+function insert(to, from, kind, body, wantsReply = false, groupId = null, answers = null, urgent = false, bySend = false, follows = null, held = null) {
+	return Number(db.prepare(`INSERT INTO session_messages (to_session, from_session, from_label, kind, body, wants_reply, group_id, answers, urgent, by_send, follows, held)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(to, from?.id ?? null, from ? senderLabel(from, to) : null, kind, body, wantsReply ? 1 : 0, groupId, answers, urgent ? 1 : 0, bySend ? 1 : 0, follows, held).lastInsertRowid);
 }
 function deleteIds(ids) {
 	if (!ids.length) return;
@@ -215,6 +228,7 @@ async function deliver(id) {
 	}
 	if (keys) steered.add(id);
 	deliveredAt.set(id, Date.now());
+	answered.delete(id);
 	deleteIds(rows.filter((r) => !r.wants_reply).map((r) => r.id));
 	const owed = rows.filter((r) => r.wants_reply).map((r) => r.id);
 	if (owed.length) db.prepare(`UPDATE session_messages SET delivered_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
@@ -343,7 +357,7 @@ function answerBySend(from, to) {
 	const owed = all("SELECT * FROM session_messages WHERE to_session = ? AND from_session = ? AND kind = 'message' AND wants_reply = 1 AND by_send = 1 AND delivered_at IS NOT NULL ORDER BY id", from.id, to);
 	if (!owed.length) return owed;
 	deleteIds(owed.map((r) => r.id));
-	db.prepare("UPDATE sessions SET answered_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?").run(from.id);
+	noteAnswered(from.id);
 	return owed;
 }
 /** The replies (and word of sessions that closed) waiting for `me`, from
@@ -383,6 +397,10 @@ function takeReplies(me, from, any = false) {
 			label: r.from_label,
 			kind: r.kind,
 			answers: r.answers,
+			/** A follow-up: when the reply it follows went. */
+			follows: r.follows,
+			/** An interim reply: what it waits on before it answers. */
+			held: r.held,
 			/** It asks in turn: answered by this session's turn's end, or by
 			* a send back (`send`). */
 			asks: r.wants_reply ? r.by_send ? "send" : "turn" : null,
@@ -413,8 +431,8 @@ function messageStates() {
 * mid-turn, not at once (`holdAnswer`), and with what the turns folded
 * into this end said before it. */
 function answer(id, message, earlier = []) {
-	if (!mailboxes.has(id)) return false;
-	if (!steered.has(id)) return answerNow(id, message);
+	if (!mailboxes.has(id)) return answerOwnTurn(id, message);
+	if (!steered.has(id)) return answerNow(id, message) || answerOwnTurn(id, message);
 	if (!get("SELECT 1 FROM session_messages WHERE to_session = ? AND wants_reply = 1 AND by_send = 0 AND delivered_at IS NOT NULL", id)) {
 		steered.delete(id);
 		return false;
@@ -469,20 +487,102 @@ function answerNow(id, message) {
 	if (!owed.length || !session) return false;
 	const body = replyBody(session, message);
 	const group = team.memberGroup(id);
-	let told = false;
+	const held = owed.find((r) => r.held)?.held ?? null;
+	const askers = /* @__PURE__ */ new Map();
 	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;
-		const answers = group ? null : yours(owed.filter((r) => r.from_session === asker));
-		insert(to.id, session, "reply", body, false, group, answers);
+		const asked = owed.filter((r) => r.from_session === asker);
+		const answers = group ? null : yours(asked);
+		insert(to.id, session, "reply", body, false, group, answers, false, false, null, held);
+		askers.set(to.id, {
+			asked,
+			answers
+		});
+	}
+	if (held) db.prepare(`UPDATE session_messages SET held = NULL WHERE id IN (${owed.map(() => "?").join(",")})`).run(...owed.map((r) => r.id));
+	else {
+		deleteIds(owed.map((r) => r.id));
+		if (askers.size) {
+			answered.set(id, {
+				askers,
+				at: Date.now()
+			});
+			noteAnswered(id);
+		}
+		if (group) team.memberAnswered(id, message);
+	}
+	recompute();
+	kick();
+	return askers.size > 0;
+}
+/** `id` ends its turn under way before its work is done — a job of its
+* own runs on and wakes it as it ends — and says so (`work session
+* hold`): what it owes by its turn's end stays owed, so its askers wait
+* on, and it is not closed for being done (server/team `doneWith`), and
+* that end goes to them as an interim reply saying what it waits on. The
+* turn the job's end wakes it into answers, or holds again. Held in a
+* turn it started on its own after answering (`answerOwnTurn`), it owes
+* its askers again what they had asked. Returns who waits on it. */
+function holdReply(id, what) {
+	if (!getSession(id)) throw httpError(404, `no session ${id}`);
+	const waits = what.trim().replace(/\s+/g, " ").slice(0, MAX_HELD) || "a job of its own";
+	const bySend = get("SELECT 1 FROM session_messages WHERE to_session = ? AND wants_reply = 1 AND by_send = 1 AND delivered_at IS NOT NULL", id);
+	let held = db.prepare("UPDATE session_messages SET held = ? WHERE to_session = ? AND wants_reply = 1 AND by_send = 0 AND delivered_at IS NOT NULL").run(waits, id).changes;
+	const last = answered.get(id);
+	if (!held && last && lastTypedAt(id) <= last.at) {
+		for (const [asker, { asked }] of last.askers) {
+			const from = getSession(asker);
+			if (!from || from.agent === "shell") continue;
+			for (const row of asked) db.prepare(`INSERT INTO session_messages (to_session, from_session, from_label, kind, body, wants_reply, created_at, delivered_at, held)
+           VALUES (?, ?, ?, 'message', ?, 1, ?, strftime('%Y-%m-%dT%H:%M:%fZ', 'now'), ?)`).run(id, asker, senderLabel(from, id), row.body, row.created_at, waits);
+			held++;
+		}
+		answered.delete(id);
+	}
+	if (!held) throw httpError(409, bySend ? `${id} answers by a send (\`work session send <id> "…"\`, as its header says): send it once the work is done` : `nobody waits on a reply from ${id}: there is nothing to hold`);
+	recompute();
+	return {
+		waiting: all("SELECT DISTINCT from_session AS id FROM session_messages WHERE to_session = ? AND held IS NOT NULL AND from_session IS NOT NULL", id).map((r) => r.id),
+		held: waits
+	};
+}
+/** A turn the session started on its own since its turn's end answered
+* (nothing went into it, nobody typed into it): what it was asked, still
+* — the job it ended that turn to wait on has ended, a wakeup it set has
+* come — so its last message goes to the same askers as a follow-up, and
+* again for each such turn after. Whatever woke it, the CLI's turn end
+* is all this reads, so it is the same for every agent. A follow-up
+* leaves a group alone: its member answered when its reply went. */
+function answerOwnTurn(id, message) {
+	const last = answered.get(id);
+	const session = getSession(id);
+	if (!last || !session || !message) return false;
+	if (lastTypedAt(id) > last.at) {
+		answered.delete(id);
+		return false;
+	}
+	const body = replyBody(session, message);
+	const follows = new Date(last.at).toISOString();
+	let told = false;
+	for (const [asker, { answers }] of last.askers) {
+		const to = getSession(asker);
+		if (!to || to.agent === "shell") continue;
+		insert(to.id, session, "reply", body, false, null, answers, false, false, follows);
 		told = true;
 	}
-	deleteIds(owed.map((r) => r.id));
-	if (told) db.prepare("UPDATE sessions SET answered_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?").run(id);
-	if (group) team.memberAnswered(id, message);
+	if (!told) {
+		answered.delete(id);
+		return false;
+	}
+	last.at = Date.now();
+	noteAnswered(id);
 	recompute();
 	kick();
-	return told;
+	return true;
+}
+function noteAnswered(id) {
+	db.prepare("UPDATE sessions SET answered_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?").run(id);
 }
 /** The session's process is gone, or the session is: whoever waits on it
 * for a reply is told none is coming, and what was queued for it goes —
@@ -490,6 +590,7 @@ function answerNow(id, message) {
 function settle(id, why) {
 	dropHold(id);
 	steered.delete(id);
+	answered.delete(id);
 	const session = getSession(id);
 	const label = session ? labelOf(session) : id;
 	const group = team.memberGroup(id);
@@ -964,4 +1065,4 @@ function startTeam() {
 	kickPool();
 }
 //#endregion
-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 };
+export { startMessages as _, keepSession as a, retryMember as c, teamOf as d, teamsOf as f, sessionGone as g, sendMessage as h, createGroup as i, skipMember as l, messageStates as m, closeDone as n, kickPool as o, holdReply as p, closeFinished as r, memberWorkspace as s, clearGroup as t, startTeam as u, takeReplies as v };

package/dist/_COxuRDjJ.js

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

package/dist/_CXys7J6U.js

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