@dylanpiercey/work 0.2.36 → 0.2.38

package/bin/cli/session.mjs

@@ -99,11 +99,14 @@ async function textOf(value) {
  * reach the session sooner. */
 function sentText(id, r, asked) {
   const lines = [];
+  if (r.answered) lines.push(`This answers ${r.answered}.`);
   if (r.wantsReply)
     lines.push(
-      `Its last message, as that turn ends, comes back to you as a prompt: end your turn to wait for it, or run \`work session wait ${id}\`.`,
+      r.bySend
+        ? `It is the user's own session, so it answers with a send of its own, which comes to you as a prompt: end your turn to wait for it, or run \`work session wait ${id}\`.`
+        : `Its last message, as that turn ends, comes back to you as a prompt: end your turn to wait for it, or run \`work session wait ${id}\`.`,
     );
-  if (r.wantsReply && !r.delivered)
+  if (r.wantsReply && !r.bySend && !r.delivered)
     lines.push(
       "A reply it sends before then answers what it is on now: each reply names the message of yours it answers.",
     );
@@ -135,12 +138,20 @@ function sentText(id, r, asked) {
 }
 
 function printReply(r) {
-  const head =
-    r.kind === "reply"
-      ? `${r.label} replied${r.answers ? ` to ${r.answers}` : ""}:`
-      : `${r.label}: ${r.text}`;
+  const replied = r.kind === "reply" || r.answers;
+  const head = replied
+    ? `${r.label} replied${r.answers ? ` to ${r.answers}` : ""}:`
+    : `${r.label}: ${r.text}`;
   console.log(head);
-  if (r.kind === "reply") console.log(`${r.text}\n`);
+  if (replied) console.log(`${r.text}\n`);
+  if (r.asks === "turn")
+    console.log(
+      "It asks in turn: your last message this turn goes back to it as your reply.\n",
+    );
+  else if (r.asks === "send")
+    console.log(
+      `It waits for your answer: send it with \`work session send ${r.from} "…"\`. Your last message is the user's: end on a line saying what you told it.\n`,
+    );
 }
 
 /** Start folders for `count` sessions, a topic each (`<topic>`, or
@@ -253,7 +264,10 @@ work session send <id> "<text>"|- [--no-reply] [--now|--interrupt]
   it is at its prompt — never into a question it asks 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 turn
+  session as a prompt of its own. End your turn to wait for it. A
+  session no agent started is the user's, whose last message is theirs:
+  it answers with a send back instead, and a send to an agent that asked
+  this session that way is the answer. A turn
   can run for hours, and one sent meanwhile waits for its end, then is
   answered a turn later: the reply that comes first answers what it was
   on, and each reply names the message of yours it answers and those

package/dist/_B2zjDgtj.js

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

package/dist/{_CI-r3uSO.js → _C65JTOIi.js}

@@ -743,6 +743,13 @@ var STEPS = [
 		up(db) {
 			db.exec("ALTER TABLE session_messages ADD COLUMN urgent INTEGER NOT NULL DEFAULT 0");
 		}
+	},
+	{
+		version: 11,
+		name: "answers by send",
+		up(db) {
+			db.exec("ALTER TABLE session_messages ADD COLUMN by_send INTEGER NOT NULL DEFAULT 0");
+		}
 	}
 ];
 var LATEST = STEPS.at(-1).version;
@@ -9465,7 +9472,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("./_BR4BEDyC.js").then((m) => m.notifySessionsChanged(workspaceId));
+		import("./_o6JmtS1w.js").then((m) => m.notifySessionsChanged(workspaceId));
 		return;
 	}
 	publish("sessions.changed");
@@ -12732,7 +12739,7 @@ async function stackParents(dir, ws, repo, family, open) {
 	}
 	const bases = [.../* @__PURE__ */ new Set([repo.base_branch, repo.default_branch])];
 	const landed = [...(await resolveRefs(dir, bases.map((b) => `origin/${b}`))).keys()];
-	if (names.length > 1 && landed.length) {
+	if (names.length > 1 && (landed.length || !await remoteHasHeads(dir))) {
 		const out = await git([
 			"log",
 			"--simplify-by-decoration",
@@ -12744,8 +12751,7 @@ async function stackParents(dir, ws, repo, family, open) {
 			"--parents",
 			"--format=%H%x1f%P%x1f%D",
 			...new Set(tips.values()),
-			"--not",
-			...landed
+			...landed.length ? ["--not", ...landed] : []
 		], dir).catch(() => "");
 		/** Commit → the nearest pointed-at commit under it (first parent). */
 		const under = /* @__PURE__ */ new Map();
@@ -12782,7 +12788,7 @@ async function stackParents(dir, ws, repo, family, open) {
 			const tip = tips.get(name);
 			const shared = await mergeBaseOf(dir, tip, wsTip).catch(() => "");
 			if (!shared || shared === tip) return;
-			if (!await isAncestorOf(dir, shared, landed[0])) history.set(name, ws.branch);
+			if (!(!!landed.length && await isAncestorOf(dir, shared, landed[0]))) history.set(name, ws.branch);
 		}));
 	}
 	const places = /* @__PURE__ */ new Map();
@@ -17603,7 +17609,7 @@ function notifySessionsChanged(workspaceId) {
 async function emitSessionsChanged(workspaceId) {
 	try {
 		const states = await sessionStates();
-		const { teamsOf } = await import("./_CMipQEMm.js");
+		const { teamsOf } = await import("./_B2zjDgtj.js");
 		publish("sessions.changed", {
 			workspaceId,
 			sessions: listSessions(workspaceId).map((s) => ({
@@ -19225,7 +19231,9 @@ ${repoLines}
   running as you do (it asks the user nothing you would not), and
   \`work session send <id> "<text>"\` messages one; its last message, as that
   turn ends, comes back to you as a prompt: end your turn to wait for it (or
-  \`work session wait\`). A message waits for the turn under way to end,
+  \`work session wait\`). In the user's own session (one no agent
+  started) you answer an agent with \`send\`, as its header says, and end
+  on a line for the user saying what you told it: your last message is theirs. A message waits for the turn under way to end,
   which can take hours: a correction or a stop goes with \`--now\` (into
   that turn, at its next step) or \`--interrupt\` (stops it first). \`work session fanout --agent <id>… --prompt "<task {}>" <item>…\`
   starts a group, a few at a time, whose replies come back as one prompt

package/dist/{_1Y-U-Hzk.js → _CHS_YMK8.js}

@@ -1,55 +1,55 @@
-var glyphBadgeNum = "_y _x";
+var glyphBadgeNum = "_P _O";
 var usageInk = {
-	ok: "_z",
-	mid: "_A",
-	warm: "_B",
-	hot: "_C"
+	ok: "_Q",
+	mid: "_R",
+	warm: "_S",
+	hot: "_T"
 };
 var usageFill = {
-	ok: "_D",
-	mid: "_E",
-	warm: "_F",
-	hot: "_G"
+	ok: "_U",
+	mid: "_V",
+	warm: "_W",
+	hot: "_X"
 };
 var prTone = {
-	open: "_H",
-	draft: "_I",
-	merged: "_J",
-	closed: "_K"
+	open: "_Y",
+	draft: "_Z",
+	merged: "_0",
+	closed: "_1"
 };
 var phaseIcon = {
-	working: "_X _W",
-	waiting: "_Y _W",
-	idle: "_Z _W",
-	off: "_0 _W"
+	working: "_bd _bc",
+	waiting: "_be _bc",
+	idle: "_bf _bc",
+	off: "_bg _bc"
 };
-var btnSm = "_7 _r";
-var btnLg = "_8 _r";
+var btnSm = "_bn _I";
+var btnLg = "_bo _I";
 var tone = {
-	accent: "_bb",
-	ok: "_bc",
-	warn: "_bd",
-	danger: "_be",
-	merged: "_bf",
-	closed: "_bg"
+	accent: "_bs",
+	ok: "_bt",
+	warn: "_bu",
+	danger: "_bv",
+	merged: "_bw",
+	closed: "_bx"
 };
-var inputLg = "_bk _bj";
-var iconBtnXs = "_bo _m";
-var iconBtnRow = "_bp _m";
-var iconBtnLg = "_bq _m";
-var chipBtn = "_br _m";
-var toastStack = "_bF _bE";
+var inputLg = "_bB _bA";
+var iconBtnXs = "_bF _D";
+var iconBtnRow = "_bG _D";
+var iconBtnLg = "_bH _D";
+var chipBtn = "_bI _D";
+var toastStack = "_o _n";
 var toastKind = {
-	error: "_bJ",
-	warn: "_bK",
-	info: "_bL"
+	error: "_s",
+	warn: "_t",
+	info: "_u"
 };
 var toastTitle = {
-	error: "_bM",
-	warn: "_bN",
-	info: "_bO"
+	error: "_v",
+	warn: "_w",
+	info: "_x"
 };
-var tocDot = "_cS _U";
+var tocDot = "_dz _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 = "_eO _dK";
-var list$3 = "_dO _dw _dJ _dM";
-var metaChip = "_d2 _bi _bh";
-var sectionCount = "_dt _9 __";
-var usageNote = "_j6 _bh";
-var pop$2 = "_hL _bw";
-var spinner = "_hO _bm _2";
-var toolLead = "_ho _dX";
-var name$4 = "_hA _dX";
-var desc$1 = "_hB _dY";
+var agentRow = "_gi _dK";
+var list$3 = "_dO _da _dJ _dM";
+var metaChip = "_d2 _bz _by";
+var sectionCount = "_c8 _bp _bq";
+var usageNote = "_j_ _by";
+var pop$2 = "_g4 _bN";
+var spinner = "_g7 _bD _bi";
+var toolLead = "_hd _dX";
+var name$4 = "_gu _dX";
+var desc$1 = "_gv _dY";
 //#endregion
 //#region src/tags/lsp-add-dialog.css.ts
-var addDlg = "_l3 _bX";
-var key$1 = "_mb _l_";
-var addTile = "_md _l_";
-var field$2 = "_mo _bj";
-var keyField = "_mp _mo _bj";
-var labelField = "_mq _mo _bj";
-var detailsToggle = "_f_ _P";
-var themeSeg = "_fc _bA";
-var checkList = "_h4 _du";
+var addDlg = "_lE _b4";
+var key$1 = "_lR _lP";
+var addTile = "_lT _lP";
+var field$2 = "_l4 _bA";
+var keyField = "_l5 _l4 _bA";
+var labelField = "_l6 _l4 _bA";
+var detailsToggle = "_gM _6";
+var themeSeg = "_fY _bR";
+var checkList = "_jO _c9";
 //#endregion
 //#region src/tags/prompt-dialog.css.ts
-var promptDlg = "_b1 _bX";
-var item$1 = "_b6 _m";
-var glance = "_dG _m";
+var promptDlg = "_b8 _b4";
+var item$1 = "_b0 _D";
+var glance = "_dG _D";
 //#endregion
 //#region src/tags/side-nav.css.ts
-var iconBtn = "_ca _m";
-var settingsDot = "_cb _bz";
-var notifyBtn = "_cg _m";
+var iconBtn = "_cl _D";
+var settingsDot = "_cm _bQ";
+var notifyBtn = "_cr _D";
 //#endregion
 //#region src/styles/session-pop.css.ts
-var sessionPop = "_b9 _bw";
-var sessionPopBtn = "_b_ _4";
-var wsBtn = "_fI _4";
-var rowIcon = "_fK _bo _m";
-var prChip = "_mJ _v _mD";
+var sessionPop = "_ct _bN";
+var sessionPopBtn = "_cu _bk";
+var wsBtn = "_e9 _bk";
+var rowIcon = "_fa _bF _D";
+var prChip = "_mc _M _lJ";
 //#endregion
 //#region src/tags/port-chip.css.ts
-var port = "_oI _v _mD";
+var port = "_oI _M _lJ";
 var depth = {
-	"1": "_kz",
-	"2": "_kA",
-	"3": "_kB"
+	"1": "_kt",
+	"2": "_ku",
+	"3": "_kv"
 };
-var open = "_kH _4";
-var action = "_kM _br _m";
-var toggle = "_d7 _P";
+var open = "_kB _bk";
+var action = "_kG _bI _D";
+var toggle = "_d7 _6";
 var fold = "_d8 _dL";
 var statusOf = {
-	queued: "_lM",
-	starting: "_lN",
-	working: "_lO",
-	waiting: "_lP",
-	idle: "_lQ",
-	done: "_lR",
-	closed: "_lS"
+	queued: "_mQ",
+	starting: "_mR",
+	working: "_mS",
+	waiting: "_mT",
+	idle: "_mU",
+	done: "_mV",
+	closed: "_mW"
 };
-var item = "_kV _4";
-var menu = "_nn _b9 _bw";
-var menuItem = "_np _4";
-var findBtn$1 = "_ir _ic _bp _m";
-var tool = "_ic _bp _m";
-var heldRefresh = "_ik _v";
-var pop$1 = "_m_ _b9 _bw";
-var fileFilter = "_oM _o";
-var findInput = "_ek _o";
-var keybarIconBtn = "_et _br _m";
-var input = "_c_ _o";
-var group = "_dc _P";
-var hint$1 = "_nP _9 _M";
-var sheetDir = "_n6 _by";
-var upBtn = "_jm _bp _m";
-var findBtn = "_jq _ic _bp _m";
-var goBtn = "_jr _ic _bp _m";
-var note = "_nc _bh";
+var item = "_km _bk";
+var menu = "_ns _ct _bN";
+var menuItem = "_nu _bk";
+var findBtn$1 = "_iZ _hU _bG _D";
+var tool = "_hU _bG _D";
+var heldRefresh = "_h2 _M";
+var pop$1 = "_mu _ct _bN";
+var fileFilter = "_oM _F";
+var findInput = "_er _F";
+var keybarIconBtn = "_eA _bI _D";
+var input = "_ca _F";
+var group = "_cd _6";
+var hint$1 = "_na _bp _3";
+var sheetDir = "_n1 _bP";
+var upBtn = "_ie _bG _D";
+var findBtn = "_ii _hU _bG _D";
+var goBtn = "_ij _hU _bG _D";
+var note = "_lD _by";
 //#endregion
 //#region src/tags/manage-workspace.css.ts
-var procCmd = "_go _dX";
-var factCopy = "_gv _br _m";
-var resultRow = "_lc _4";
-var resultBranch = "_ld _d2 _bi _bh _bo _m";
-var urlAction = "_le _d2 _bi _bh _d3";
-var curRow = "_hk _dR";
+var procCmd = "_eU _dX";
+var factCopy = "_e1 _bI _D";
+var resultRow = "_lc _bk";
+var resultBranch = "_ld _d2 _bz _by _bF _D";
+var urlAction = "_le _d2 _bz _by _d3";
+var curRow = "_fq _dR";
 //#endregion
 //#region src/tags/join-dialog.css.ts
-var dlg = "_mv _bX";
-var hint = "_mw _bh";
-var kbtn = "_cE _bq _m";
-var repeat = "_cH _cG";
-var dpadUser = "_cK _cG";
-var dpadEsc = "_cL _cG";
+var dlg = "_lt _b4";
+var hint = "_lu _by";
+var kbtn = "_cR _bH _D";
+var repeat = "_cU _cT";
+var dpadUser = "_cX _cT";
+var dpadEsc = "_cY _cT";
 //#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/{_DFT6xv90.js → _Ca_OVNVt.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, R as interruptSession, Sn as lastTypedAt, U as listPanesWithin, Vn as turnSettling, Y as onSessionDispose, Zr as httpError, _n as agentPhase, ai as get, an as interruptKeys, bn as hookReportedAt, cn as steerKeys, et as reopenable, gn as activityOf, ii as db, j as createSession, jn as onPhaseChange, nt as sendToSession, pn as cleanSummary, ri as all, tt as retireSession, z as killSession, zn as summaryOf } from "./_CI-r3uSO.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, R as interruptSession, Sn as lastTypedAt, U as listPanesWithin, Vn as turnSettling, Y as onSessionDispose, Zr as httpError, _n as agentPhase, ai as get, an as interruptKeys, bn as hookReportedAt, cn as steerKeys, et as reopenable, gn as activityOf, ii as db, j as createSession, jn as onPhaseChange, nt as sendToSession, pn as cleanSummary, ri as all, tt as retireSession, z as killSession, zn as summaryOf } from "./_C65JTOIi.js";
 //#region src/server/messages.ts
 var team = {
 	memberGroup: () => null,
@@ -62,9 +62,13 @@ function labelOf(session) {
 function render(row) {
 	const from = row.from_label ?? row.from_session;
 	switch (row.kind) {
-		case "message":
+		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}`;
+			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}`;
+		}
 		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}`;
@@ -81,10 +85,11 @@ function excerpt(row) {
 	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) {
+/** An asker's messages as a reply to it names them (`whose` for its
+* sender's). */
+function yours(rows, whose = "your") {
 	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)}`;
+	return each.length === 1 ? `${whose} message of ${each[0]}` : `${whose} 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. */
@@ -156,9 +161,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) {
-	return Number(db.prepare(`INSERT INTO session_messages (to_session, from_session, from_label, kind, body, wants_reply, group_id, answers, urgent)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(to, from?.id ?? null, from ? senderLabel(from, to) : null, kind, body, wantsReply ? 1 : 0, groupId, answers, urgent ? 1 : 0).lastInsertRowid);
+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 deleteIds(ids) {
 	if (!ids.length) return;
@@ -258,7 +263,9 @@ function kick() {
 /** A message from `opts.from` (a session id; none: the user's own
 * terminal) to session `to`, typed in now if it is at its prompt, else
 * queued until it is. From an agent's session it wants a reply unless
-* `reply` is false: the recipient's last message as that turn ends.
+* `reply` is false: the recipient's last message as that turn ends, or
+* the user's own session's send back (`by_send`), which a send from it
+* to an asker it owes is (`answerBySend`).
 * `opts.now` sends it into the turn under way where its CLI takes one
 * there, and `opts.interrupt` stops that turn first (never a wait on the
 * user: theirs is the answer it waits for).
@@ -288,8 +295,11 @@ async function sendMessage(to, text, opts = {}) {
 	}
 	if (!from && target.parent_id) db.prepare("UPDATE sessions SET keep = 1 WHERE id = ?").run(to);
 	const wantsReply = !!from && opts.reply !== false;
+	const bySend = wantsReply && !target.parent_id;
+	const answered = from ? answerBySend(from, to) : [];
 	const ahead = get("SELECT COUNT(*) AS n FROM session_messages WHERE to_session = ? AND delivered_at IS NULL", to)?.n ?? 0;
-	const id = insert(to, from, "message", text, wantsReply, null, null, !!(opts.now || opts.interrupt));
+	const urgent = !!(opts.now || opts.interrupt);
+	const id = insert(to, from, "message", text, wantsReply, null, answered.length ? yours(answered) : null, urgent, bySend);
 	recompute();
 	const interrupted = !!opts.interrupt && !!live && turnPhase(to) === "working" && !delivering.has(to) && await interruptSession(to);
 	const sent = await deliver(to);
@@ -318,19 +328,38 @@ async function sendMessage(to, text, opts = {}) {
 		steers: !!steerKeys(target.agent),
 		interrupts: !!interruptKeys(target.agent),
 		wantsReply,
+		/** It answers with a send back, not its turn's last message. */
+		bySend,
+		/** Its messages this answers (`answerBySend`). */
+		answered: answered.length ? yours(answered, "its") : null,
 		/** It had closed, and is back on its conversation. */
 		reopened: !live
 	};
 }
+/** `from`'s send to `to` is its answer to what `to` asked it by send:
+* those messages are answered (`answerNow`'s bookkeeping), and returned
+* for the send to name. */
+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);
+	return owed;
+}
 /** The replies (and word of sessions that closed) waiting for `me`, from
 * the sessions or groups `from` names or anyone, taken so they are not
-* typed in too; and who still owes `me` one. A group's replies are taken
-* once all of them are in, unless `any`: then as each comes. `work
-* session wait` asks this until nobody owes it anything. */
+* typed in too — a send that answers one of `me`'s messages among them,
+* owed its own answer if it asks, as one typed in is; and who still owes
+* `me` one. A group's replies are taken once all of them are in, unless
+* `any`: then as each comes. `work session wait` asks this until nobody
+* owes it anything. */
 function takeReplies(me, from, any = false) {
 	const wanted = (r) => !from?.length || r.from_session !== null && from.includes(r.from_session) || r.group_id !== null && from.includes(r.group_id);
-	const rows = delivering.has(me) ? [] : all("SELECT * FROM session_messages WHERE to_session = ? AND kind != 'message' AND delivered_at IS NULL ORDER BY id", me).filter(wanted).filter((r) => any || !r.group_id || team.groupReleased(r.group_id));
-	deleteIds(rows.map((r) => r.id));
+	const rows = delivering.has(me) ? [] : all("SELECT * FROM session_messages WHERE to_session = ? AND (kind != 'message' OR answers IS NOT NULL) AND delivered_at IS NULL ORDER BY id", me).filter(wanted).filter((r) => any || !r.group_id || team.groupReleased(r.group_id));
+	deleteIds(rows.filter((r) => !r.wants_reply).map((r) => r.id));
+	const asks = rows.filter((r) => r.wants_reply).map((r) => r.id);
+	if (asks.length) db.prepare(`UPDATE session_messages SET delivered_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
+       WHERE id IN (${asks.map(() => "?").join(",")})`).run(...asks);
 	const groups = team.openGroups(me);
 	const inGroup = new Set(groups.map((g) => g.id));
 	const owing = all(`SELECT DISTINCT m.to_session AS id, gm.group_id FROM session_messages m
@@ -354,6 +383,9 @@ function takeReplies(me, from, any = false) {
 			label: r.from_label,
 			kind: r.kind,
 			answers: r.answers,
+			/** 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,
 			text: r.body
 		})),
 		owing
@@ -375,14 +407,15 @@ function messageStates() {
 	for (const r of all("SELECT to_session AS id, COUNT(*) AS n FROM session_messages WHERE delivered_at IS NULL GROUP BY to_session")) of(r.id).queued = r.n;
 	return states;
 }
-/** A turn's end answers what the session was asked: its last message
-* goes to each session that asked, as a reply — a member's held for its
-* group. Once a message went in mid-turn, not at once (`holdAnswer`), and
-* with what the turns folded into this end said before it. */
+/** A turn's end answers what the session was asked (all but what it
+* answers by send): its last message goes to each session that asked, as
+* a reply — a member's held for its group. Once a message went in
+* 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 (!get("SELECT 1 FROM session_messages WHERE to_session = ? AND wants_reply = 1 AND delivered_at IS NOT NULL", id)) {
+	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;
 	}
@@ -431,7 +464,7 @@ function dropHold(id) {
 }
 function answerNow(id, message) {
 	steered.delete(id);
-	const owed = all("SELECT * FROM session_messages WHERE to_session = ? AND wants_reply = 1 AND delivered_at IS NOT NULL", id);
+	const owed = all("SELECT * FROM session_messages WHERE to_session = ? AND wants_reply = 1 AND by_send = 0 AND delivered_at IS NOT NULL", id);
 	const session = getSession(id);
 	if (!owed.length || !session) return false;
 	const body = replyBody(session, message);

package/dist/_o6JmtS1w.js

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