@gavin-hu/my-pi-agent 0.18.0 → 0.19.0

package/extensions/session-bus/result.ts

@@ -97,21 +97,7 @@ export function resultSections(details: SessionDetails): TailResultInput<BusRow>
 				],
 			};
 		}
-		case "join": {
-			const conflicts = details.conflicts ?? [];
-			const claimed = details.claimed ?? [];
-			const rows: BusRow[] = [
-				...conflicts.map((claim) => ({ kind: "claim" as const, claim })),
-				...claimed.map((label) => ({ kind: "result" as const, label, tone: "ok" as const })),
-			];
-			if (rows.length === 0) return undefined;
-			return {
-				kind: "sections",
-				sections: [section(rows, conflicts.length > 0 ? "Conflicts" : "Claimed")],
-			};
-		}
-		case "release":
-		case "leave": {
+		case "release": {
 			const released = details.released ?? [];
 			const notOwned = details.notOwned ?? [];
 			const sections: TailSection<BusRow>[] = [];
@@ -141,9 +127,7 @@ export function resultSections(details: SessionDetails): TailResultInput<BusRow>
 				sections: [section(delivered.map((label) => ({ kind: "result", label, tone: "ok" })))],
 			};
 		}
-		case "watch":
-			return undefined;
-		case "name":
+		case "join":
 			return undefined;
 	}
 }
@@ -164,11 +148,14 @@ export function collapsedLine(theme: Theme, details: SessionDetails): string {
 			const cells = [count(board.length, "session")];
 			if (unread > 0) cells.push(`${unread} unread`);
 			cells.push(count(claims, "claim"));
-			const units = details.status?.units;
-			if (units) cells.push(`${units.joined}/${units.total} units`);
 			const watching = details.status?.watching;
 			if (watching) cells.push(watching.wake ? "watch wake" : "watch on");
-			return paint(theme, "meta", cells.join(sep));
+			const line = paint(theme, "meta", cells.join(sep));
+			// A reader that has not joined is looking at a bus it is not on.
+			if (details.status?.onBus === false) {
+				return `${line}${paint(theme, "faint", sep)}${paint(theme, "warn", "not on the bus \u2014 session join puts you on it")}`;
+			}
+			return line;
 		}
 		case "send": {
 			const delivered = details.delivered ?? [];
@@ -198,26 +185,7 @@ export function collapsedLine(theme: Theme, details: SessionDetails): string {
 			if (claimed.length === 0) return paint(theme, "meta", "Claimed nothing");
 			return paint(theme, "ok", `Claimed ${claimed.map((path) => sanitizeLine(path)).join(", ")}`);
 		}
-		case "join": {
-			const conflicts = details.conflicts ?? [];
-			const where = [details.team, details.unit]
-				.filter(Boolean)
-				.map((value) => sanitizeLine(value as string))
-				.join("/");
-			if (conflicts.length > 0) {
-				const [first] = conflicts;
-				const owner = first ? sanitizeLine(first.ownerLabel) : "a peer";
-				return paint(
-					theme,
-					"warn",
-					`Could not join ${where}${sep}${count(conflicts.length, "conflict")} held by ${owner}`,
-				);
-			}
-			const claimed = details.claimed ?? [];
-			return paint(theme, "ok", `Joined ${where}${sep}claimed ${claimed.map((path) => sanitizeLine(path)).join(", ")}`);
-		}
-		case "release":
-		case "leave": {
+		case "release": {
 			const released = details.released ?? [];
 			const notOwned = details.notOwned ?? [];
 			const parts: string[] = [];
@@ -228,16 +196,13 @@ export function collapsedLine(theme: Theme, details: SessionDetails): string {
 			}
 			return parts.length > 0 ? parts.join(paint(theme, "faint", sep)) : paint(theme, "meta", "Nothing to release");
 		}
-		case "watch": {
-			const armed = details.watching?.armed === true;
-			if (!armed) return paint(theme, "meta", "Inbox watch off");
-			return paint(
-				theme,
-				"ok",
-				details.watching?.wake === true ? "Inbox watch on: new mail wakes a turn" : "Inbox watch on",
-			);
+		case "join": {
+			const label = paint(theme, "ok", sanitizeLine(details.label ?? ""));
+			const state =
+				details.watching?.armed !== true
+					? paint(theme, "meta", "not listening")
+					: paint(theme, "meta", details.watching.wake === true ? "listening, wake" : "listening");
+			return `${label}${paint(theme, "faint", sep)}${state}`;
 		}
-		case "name":
-			return paint(theme, "ok", `Named this session "${sanitizeLine(details.label ?? "")}"`);
 	}
 }

package/extensions/session-bus/rows.ts

@@ -14,7 +14,7 @@ import { GLYPHS, SEPARATORS } from "../../lib/tui/glyphs.ts";
 import { listRow, statusRow } from "../../lib/tui/rows.ts";
 import type { TailRowLine } from "../../lib/tui/tool.ts";
 import { paint } from "../../lib/tui/tokens.ts";
-import { shortId } from "./format.ts";
+import { idSuffix } from "./format.ts";
 import type { BusMessage, ClaimRecord, SessionRecord, SessionStatus } from "./types.ts";
 
 /** Claim paths the focus block lists before it points at the pane. */
@@ -143,6 +143,7 @@ export function summaryCells(
 	theme: Theme,
 	rows: readonly SessionRow[],
 	watching: { armed: boolean; wake: boolean } | undefined,
+	onBus = true,
 ): string[] {
 	const unread = rows.reduce((total, row) => total + row.session.unread, 0);
 	const claims = rows.reduce((total, row) => total + row.claims.length, 0);
@@ -150,6 +151,7 @@ export function summaryCells(
 	if (unread > 0) cells.push(paint(theme, "label", `${unread} unread`));
 	cells.push(paint(theme, "meta", count(claims, "claim")));
 	if (watching) cells.push(paint(theme, "ok", watching.wake ? "watch wake" : "watch on"));
+	if (!onBus) cells.push(paint(theme, "warn", "not on the bus"));
 	return cells;
 }
 
@@ -162,7 +164,7 @@ export function sessionDetailBlock(row: SessionRow, now: number): string[] {
 		lines.push(`claims: ${shown.join(", ")}${hidden > 0 ? ` +${hidden} more` : ""}`);
 	}
 	lines.push(
-		`mode: ${sanitizeLine(row.session.mode)}${SEPARATORS.item}id: ${shortId(row.session.id)}` +
+		`mode: ${sanitizeLine(row.session.mode)}${SEPARATORS.item}id: ${idSuffix(row.session.id)}` +
 			`${SEPARATORS.item}last seen: ${formatDuration(Math.max(0, now - row.session.lastSeen))} ago`,
 	);
 	return lines;