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

package/extensions/rewind/{review.ts → commands/review.ts}

@@ -10,10 +10,10 @@
  */
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { messageOf } from "../../lib/errors.ts";
-import { sanitizeLine } from "../../lib/format.ts";
-import { isPlanModeEnabled } from "../../lib/plan-state.ts";
-import { withRailsSuppressed } from "../../lib/rails.ts";
+import { messageOf } from "../../../lib/errors.ts";
+import { sanitizeLine } from "../../../lib/format.ts";
+import { isPlanModeEnabled } from "../../../lib/plan-state.ts";
+import { withRailsSuppressed } from "../../../lib/rails.ts";
 import {
 	boundDiff,
 	formatHunkRevertBody,
@@ -23,20 +23,20 @@ import {
 	formatRevertSelectedBody,
 	formatReviewListText,
 	formatReviewRevertText,
-} from "./format.ts";
-import { HunkPickerComponent } from "./hunk-picker.ts";
-import { buildHunkPatch, parseFilePatch } from "./patch.ts";
-import { entryPaths, toReviewEntries, type ReviewEntry } from "./paths.ts";
+} from "../text/format.ts";
+import { HunkPickerComponent } from "../view/hunk-picker.ts";
+import { buildHunkPatch, parseFilePatch } from "../text/patch.ts";
+import { entryPaths, toReviewEntries, type ReviewEntry } from "../text/paths.ts";
 import {
 	ReviewDiffComponent,
 	ReviewListComponent,
 	type ReviewDiffAction,
 	type ReviewListResult,
-} from "./review-tui.ts";
-import type { RestorePlan } from "./restore.ts";
-import type { RewindRuntime } from "./runtime.ts";
-import { buildRewindPoints, type RewindPoint } from "./timeline.ts";
-import type { Snapshot, RestoreSummary } from "./types.ts";
+} from "../view/review-tui.ts";
+import type { RestorePlan } from "../transport/restore.ts";
+import type { RewindRuntime } from "../state/runtime.ts";
+import { buildRewindPoints, type RewindPoint } from "../state/timeline.ts";
+import type { Snapshot, RestoreSummary } from "../types.ts";
 
 /** One reviewable view of the working tree. */
 interface ReviewView {

package/extensions/rewind/{rewind.ts → commands/rewind.ts}

@@ -9,13 +9,13 @@
  */
 
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { withRailsSuppressed } from "../../lib/rails.ts";
+import { withRailsSuppressed } from "../../../lib/rails.ts";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { formatChangeSummary, formatRestoreText, previewDiffText } from "./format.ts";
-import { PathPickerComponent } from "./path-picker.ts";
-import type { ChangedPath } from "./paths.ts";
-import type { RewindRuntime } from "./runtime.ts";
-import { rewindScopes, type RewindPoint, type RewindScope } from "./timeline.ts";
+import { formatChangeSummary, formatRestoreText, previewDiffText } from "../text/format.ts";
+import { PathPickerComponent } from "../view/path-picker.ts";
+import type { ChangedPath } from "../text/paths.ts";
+import type { RewindRuntime } from "../state/runtime.ts";
+import { rewindScopes, type RewindPoint, type RewindScope } from "../state/timeline.ts";
 
 /** Human labels for the scope picker, in menu order. */
 const SCOPE_LABELS: Record<RewindScope, string> = {

package/extensions/rewind/{config.ts → config/config.ts}

@@ -6,7 +6,7 @@
  * malformed documents are ignored, and every value is clamped to a safe range.
  */
 
-import { clampInteger, cleanString, loadConfigSection, stringList } from "../../lib/config.ts";
+import { clampInteger, cleanString, loadConfigSection, stringList } from "../../../lib/config.ts";
 
 export interface RewindConfig {
 	/** Take one automatic snapshot per user prompt. Default: true. */

package/extensions/rewind/index.ts

@@ -16,9 +16,9 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { isExtensionEnabled } from "../../lib/env.ts";
-import { registerCommands } from "./commands.ts";
-import { createRuntime } from "./runtime.ts";
-import { createSnapshotRun } from "./snapshot-run.ts";
+import { registerCommands } from "./commands/commands.ts";
+import { createRuntime } from "./state/runtime.ts";
+import { createSnapshotRun } from "./state/snapshot-run.ts";
 
 export function registerRewind(pi: ExtensionAPI): void {
 	const runtime = createRuntime(pi);

package/extensions/rewind/{policy.ts → state/policy.ts}

@@ -9,12 +9,12 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { createReadOnlyPolicy } from "../../lib/policy.ts";
-import { ASK_USER_QUESTION_TOOL, GOAL_TOOL, TODO_TOOL } from "../../lib/tool-names.ts";
-import type { RewindConfig } from "./config.ts";
+import { createReadOnlyPolicy, WORKSPACE_READERS } from "../../../lib/policy.ts";
+import { ASK_USER_QUESTION_TOOL, GOAL_TOOL, TODO_TOOL } from "../../../lib/tool-names.ts";
+import type { RewindConfig } from "../config/config.ts";
 
 /** Tools that only read files or track session state, so they never snapshot. */
-const READER_TOOLS = ["read", "grep", "find", "ls", TODO_TOOL, GOAL_TOOL];
+const READER_TOOLS = [...WORKSPACE_READERS, TODO_TOOL, GOAL_TOOL];
 
 /** The interactive tool: it prompts the user and never touches the working tree. */
 const SESSION_TOOLS = [ASK_USER_QUESTION_TOOL];

package/extensions/rewind/{runtime.ts → state/runtime.ts}

@@ -9,8 +9,8 @@
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { resolveEffectiveCwd } from "../../lib/env.ts";
-import { loadConfig, type RewindConfig } from "./config.ts";
+import { resolveEffectiveCwd } from "../../../lib/env.ts";
+import { loadConfig, type RewindConfig } from "../config/config.ts";
 import {
 	applyPatchReverse,
 	createRewindRunner,
@@ -19,16 +19,16 @@ import {
 	repoRoot,
 	revParse,
 	type RunGit,
-} from "./git.ts";
-import { createOperationQueue } from "./queue.ts";
-import { applyRestore, planRestore, type PlanResult, type RestoreInput } from "./restore.ts";
-import type { PathStat } from "./paths.ts";
-import { createSnapshot } from "./snapshot.ts";
-import { createStatusChip } from "./status.ts";
-import { belongsToRoot, listSnapshots, pruneSnapshots } from "./store.ts";
-import { createTempIndexStore } from "./temp-index.ts";
+} from "../transport/git.ts";
+import { createOperationQueue } from "../transport/queue.ts";
+import { applyRestore, planRestore, type PlanResult, type RestoreInput } from "../transport/restore.ts";
+import type { PathStat } from "../text/paths.ts";
+import { createSnapshot } from "../transport/snapshot.ts";
+import { createStatusChip } from "../view/status.ts";
+import { belongsToRoot, listSnapshots, pruneSnapshots } from "../transport/store.ts";
+import { createTempIndexStore } from "../transport/temp-index.ts";
 import { lastUserEntryId } from "./timeline.ts";
-import type { Snapshot, SnapshotReason, RestoreSummary } from "./types.ts";
+import type { Snapshot, SnapshotReason, RestoreSummary } from "../types.ts";
 
 export interface SnapshotOptions {
 	reason: SnapshotReason;

package/extensions/rewind/{snapshot-run.ts → state/snapshot-run.ts}

@@ -10,7 +10,7 @@
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { summarizePrompt } from "./format.ts";
+import { summarizePrompt } from "../text/format.ts";
 import { createSnapshotPolicy, type SnapshotPolicy } from "./policy.ts";
 import type { RewindRuntime } from "./runtime.ts";
 

package/extensions/rewind/{timeline.ts → state/timeline.ts}

@@ -9,8 +9,8 @@
  */
 
 import type { SessionEntry, SessionMessageEntry } from "@earendil-works/pi-coding-agent";
-import { summarizePrompt } from "./format.ts";
-import type { Snapshot } from "./types.ts";
+import { summarizePrompt } from "../text/format.ts";
+import type { Snapshot } from "../types.ts";
 
 /** What a rewind can restore for one point. */
 export type RewindScope = "both" | "conversation" | "code";

package/extensions/rewind/{format.ts → text/format.ts}

@@ -7,10 +7,10 @@
  */
 
 import { sliceByColumn, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { sanitizeLine, stripControlChars } from "../../lib/format.ts";
-import { GLYPHS, SEPARATORS } from "../../lib/tui/glyphs.ts";
+import { sanitizeLine, stripControlChars } from "../../../lib/format.ts";
+import { GLYPHS, SEPARATORS } from "../../../lib/tui/glyphs.ts";
 import { SELECTION_MARKS, type ReviewEntry } from "./paths.ts";
-import type { RestoreSummary } from "./types.ts";
+import type { RestoreSummary } from "../types.ts";
 
 /** Longest prompt summary shown before truncation. */
 const LABEL_WIDTH = 48;

package/extensions/rewind/{git.ts → transport/git.ts}

@@ -23,8 +23,8 @@ import {
 	revParseMany,
 	runGitOrThrow as run,
 	type RunGit,
-} from "../../lib/git/index.ts";
-import { parseNameStatus, parseNumStat, type ChangedPath, type PathStat } from "./paths.ts";
+} from "../../../lib/git/index.ts";
+import { parseNameStatus, parseNumStat, type ChangedPath, type PathStat } from "../text/paths.ts";
 
 // Re-export exactly the shared helpers this extension consumes, so rewind code
 // has one git import surface instead of reaching into `lib/git` directly.

package/extensions/rewind/{restore.ts → transport/restore.ts}

@@ -26,8 +26,8 @@ import {
 	treeFromWorkingTree,
 	type RunGit,
 } from "./git.ts";
-import { entryPaths, summarize, type ChangedPath } from "./paths.ts";
-import type { Snapshot, RestoreSummary } from "./types.ts";
+import { entryPaths, summarize, type ChangedPath } from "../text/paths.ts";
+import type { Snapshot, RestoreSummary } from "../types.ts";
 
 export interface RestoreDeps {
 	runGit: RunGit;

package/extensions/rewind/{snapshot.ts → transport/snapshot.ts}

@@ -18,7 +18,7 @@ import {
 	type RunGit,
 } from "./git.ts";
 import { encodeMessage, refFor, META_VERSION, type SnapshotMeta } from "./store.ts";
-import type { Snapshot, SnapshotReason } from "./types.ts";
+import type { Snapshot, SnapshotReason } from "../types.ts";
 
 export interface SnapshotDeps {
 	runGit: RunGit;

package/extensions/rewind/{store.ts → transport/store.ts}

@@ -7,7 +7,7 @@
  */
 
 import { commitMessages, deleteRef, listRefs, type RunGit } from "./git.ts";
-import type { Snapshot, SnapshotReason } from "./types.ts";
+import type { Snapshot, SnapshotReason } from "../types.ts";
 
 /** Prefix of the metadata line in a snapshot commit body. */
 export const META_MARKER = "pi-rewind: ";

package/extensions/rewind/{checklist.ts → view/checklist.ts}

@@ -14,12 +14,12 @@
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, type Component, type TuiMouseEvent, type TuiMouseEventResult } from "@earendil-works/pi-tui";
-import { detailBlockRows, dockListFrame, type ViewportRowsSource } from "../../lib/tui/chrome.ts";
-import { clip } from "../../lib/tui/columns.ts";
-import { fitRows, formatRange, isCloseKey, ListCursor, navigateList, scrollList } from "../../lib/tui/cursor.ts";
-import { emptyState } from "../../lib/tui/rows.ts";
-import { titleRule } from "../../lib/tui/rules.ts";
-import { paint } from "../../lib/tui/tokens.ts";
+import { detailBlockRows, dockListFrame, type ViewportRowsSource } from "../../../lib/tui/chrome.ts";
+import { clip } from "../../../lib/tui/columns.ts";
+import { fitRows, formatRange, isCloseKey, ListCursor, navigateList, scrollList } from "../../../lib/tui/cursor.ts";
+import { emptyState } from "../../../lib/tui/rows.ts";
+import { titleRule } from "../../../lib/tui/rules.ts";
+import { paint } from "../../../lib/tui/tokens.ts";
 
 /** Rows the checklist shows when the terminal height is unknown. */
 const SCREEN_DEFAULT_ITEMS = 12;

package/extensions/rewind/{hunk-picker.ts → view/hunk-picker.ts}

@@ -11,15 +11,15 @@
  */
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import { sanitizeLine } from "../../lib/format.ts";
-import { screenHint, type ViewportRowsSource } from "../../lib/tui/chrome.ts";
-import { clip } from "../../lib/tui/columns.ts";
-import { SEPARATORS } from "../../lib/tui/glyphs.ts";
-import { checkbox, listRow } from "../../lib/tui/rows.ts";
-import { paint } from "../../lib/tui/tokens.ts";
+import { sanitizeLine } from "../../../lib/format.ts";
+import { screenHint, type ViewportRowsSource } from "../../../lib/tui/chrome.ts";
+import { clip } from "../../../lib/tui/columns.ts";
+import { SEPARATORS } from "../../../lib/tui/glyphs.ts";
+import { checkbox, listRow } from "../../../lib/tui/rows.ts";
+import { paint } from "../../../lib/tui/tokens.ts";
 import { ChecklistScreen } from "./checklist.ts";
-import { formatReviewEntryCounts } from "./format.ts";
-import type { Hunk } from "./patch.ts";
+import { formatReviewEntryCounts } from "../text/format.ts";
+import type { Hunk } from "../text/patch.ts";
 
 export interface HunkPickerOptions {
 	/** The file the hunks belong to. */

package/extensions/rewind/{path-picker.ts → view/path-picker.ts}

@@ -13,14 +13,14 @@
  */
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import { sanitizeLine } from "../../lib/format.ts";
-import { screenHint, type ViewportRowsSource } from "../../lib/tui/chrome.ts";
-import { clip } from "../../lib/tui/columns.ts";
-import { SEPARATORS } from "../../lib/tui/glyphs.ts";
-import { checkbox, listRow } from "../../lib/tui/rows.ts";
-import { paint } from "../../lib/tui/tokens.ts";
+import { sanitizeLine } from "../../../lib/format.ts";
+import { screenHint, type ViewportRowsSource } from "../../../lib/tui/chrome.ts";
+import { clip } from "../../../lib/tui/columns.ts";
+import { SEPARATORS } from "../../../lib/tui/glyphs.ts";
+import { checkbox, listRow } from "../../../lib/tui/rows.ts";
+import { paint } from "../../../lib/tui/tokens.ts";
 import { ChecklistScreen } from "./checklist.ts";
-import { baseName, expandGroup, groupPaths, SELECTION_MARKS, type ChangedPath, type PathGroup } from "./paths.ts";
+import { baseName, expandGroup, groupPaths, SELECTION_MARKS, type ChangedPath, type PathGroup } from "../text/paths.ts";
 
 export interface PathPickerOptions {
 	/** The changed paths the snapshot differs on. */

package/extensions/rewind/{review-tui.ts → view/review-tui.ts}

@@ -13,18 +13,18 @@
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import type { Component, TuiMouseEvent, TuiMouseEventResult } from "@earendil-works/pi-tui";
-import { clip } from "../../lib/tui/columns.ts";
-import { detailBlockRows, dockListFrame, screenHint, type ViewportRowsSource } from "../../lib/tui/chrome.ts";
-import { sanitizeLine } from "../../lib/format.ts";
-import { fitRows, formatRange, isCloseKey, wheelDelta } from "../../lib/tui/cursor.ts";
-import { SEPARATORS } from "../../lib/tui/glyphs.ts";
-import { LinePane } from "../../lib/tui/line-pane.ts";
-import { checkbox, emptyState, listRow } from "../../lib/tui/rows.ts";
-import { titleRule } from "../../lib/tui/rules.ts";
-import { paint, type TuiRole } from "../../lib/tui/tokens.ts";
+import { clip } from "../../../lib/tui/columns.ts";
+import { detailBlockRows, dockListFrame, screenHint, type ViewportRowsSource } from "../../../lib/tui/chrome.ts";
+import { sanitizeLine } from "../../../lib/format.ts";
+import { fitRows, formatRange, isCloseKey, wheelDelta } from "../../../lib/tui/cursor.ts";
+import { SEPARATORS } from "../../../lib/tui/glyphs.ts";
+import { LinePane } from "../../../lib/tui/line-pane.ts";
+import { checkbox, emptyState, listRow } from "../../../lib/tui/rows.ts";
+import { titleRule } from "../../../lib/tui/rules.ts";
+import { paint, type TuiRole } from "../../../lib/tui/tokens.ts";
 import { ChecklistScreen } from "./checklist.ts";
-import { formatReviewDetail, formatReviewEntryCounts, formatReviewSummary } from "./format.ts";
-import { SELECTION_MARKS, type PathChange, type ReviewEntry } from "./paths.ts";
+import { formatReviewDetail, formatReviewEntryCounts, formatReviewSummary } from "../text/format.ts";
+import { SELECTION_MARKS, type PathChange, type ReviewEntry } from "../text/paths.ts";
 
 /** Rows a diff screen shows when the terminal height is unknown. */
 const DIFF_DEFAULT_ITEMS = 20;

package/extensions/rewind/{rewind-tui.ts → view/rewind-tui.ts}

@@ -10,15 +10,15 @@
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, type Component, type TuiMouseEvent, type TuiMouseEventResult } from "@earendil-works/pi-tui";
-import { fitRows, formatRange, isCloseKey, ListCursor, navigateList, scrollList } from "../../lib/tui/cursor.ts";
-import { detailBlockRows, dockListFrame, screenHint, type ViewportRowsSource } from "../../lib/tui/chrome.ts";
-import { clip } from "../../lib/tui/columns.ts";
-import { SEPARATORS } from "../../lib/tui/glyphs.ts";
-import { emptyState, listRow } from "../../lib/tui/rows.ts";
-import { titleRule } from "../../lib/tui/rules.ts";
-import { paint } from "../../lib/tui/tokens.ts";
-import { formatRewindDetail, formatRewindParts } from "./format.ts";
-import type { RewindPoint } from "./timeline.ts";
+import { fitRows, formatRange, isCloseKey, ListCursor, navigateList, scrollList } from "../../../lib/tui/cursor.ts";
+import { detailBlockRows, dockListFrame, screenHint, type ViewportRowsSource } from "../../../lib/tui/chrome.ts";
+import { clip } from "../../../lib/tui/columns.ts";
+import { SEPARATORS } from "../../../lib/tui/glyphs.ts";
+import { emptyState, listRow } from "../../../lib/tui/rows.ts";
+import { titleRule } from "../../../lib/tui/rules.ts";
+import { paint } from "../../../lib/tui/tokens.ts";
+import { formatRewindDetail, formatRewindParts } from "../text/format.ts";
+import type { RewindPoint } from "../state/timeline.ts";
 
 export interface RewindListOptions {
 	points: RewindPoint[];
@@ -57,7 +57,7 @@ export class RewindListComponent implements Component {
 		}
 		const count = this.points.length;
 		if (navigateList(data, this.cursor, count)) return;
-		if (matchesKey(data, Key.enter) || data === "r") {
+		if (matchesKey(data, Key.enter)) {
 			const point = this.points[this.cursor.selected];
 			if (point) this.options.onClose(point);
 		}
@@ -139,6 +139,12 @@ export class RewindListComponent implements Component {
 
 	/** The key-hint row, with the primary action in the accent role. */
 	private hint(width: number): string {
-		return screenHint(this.theme, width, ["Esc close", { text: "Enter choose", color: "accent" }, "↑/↓ or k/j select"]);
+		return screenHint(this.theme, width, [
+			"Esc close",
+			{ text: "Enter choose", color: "accent" },
+			"↑/↓ or k/j select",
+			"PgUp/PgDn",
+			"g/G or Home/End",
+		]);
 	}
 }

package/extensions/rewind/{status.ts → view/status.ts}

@@ -8,10 +8,10 @@
  */
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { GLYPHS, STATUS_KEYS } from "../../lib/tui/glyphs.ts";
-import { paint } from "../../lib/tui/tokens.ts";
-import type { RewindConfig } from "./config.ts";
-import { userMessagesFromBranch } from "./timeline.ts";
+import { GLYPHS, STATUS_KEYS } from "../../../lib/tui/glyphs.ts";
+import { paint } from "../../../lib/tui/tokens.ts";
+import type { RewindConfig } from "../config/config.ts";
+import { userMessagesFromBranch } from "../state/timeline.ts";
 
 const STATUS_KEY = STATUS_KEYS.rewind;
 const STATUS_GLYPH = GLYPHS.rewind;

package/extensions/session-bus/commands.ts

@@ -1,25 +1,23 @@
 /**
- * The `/sessions` command.
+ * The `/sessions` command: one act, no arguments.
  *
- * In the TUI, bare `/sessions` opens the live board: `Tab` cycles Sessions,
- * Inbox, and Claims, and `w`/`x` act on this session's own watch and claims.
- * Every other mode prints the compact listing, because there is no dock to mount
- * the screen in. `name <label>` gives this session a stable target and `watch
- * [off|wake]` controls the inbox watch from either surface.
+ * In the TUI it opens the live board: `Tab` cycles Sessions, Inbox, and Claims,
+ * and `w`/`x` act on this session's own watch and claims. Every other mode prints
+ * the compact listing, because there is no dock to mount the screen in. Reading is
+ * not joining, so the board is empty until this session joins — and a command
+ * context cannot name a session, so the join is `session({action:"join"})`,
+ * `/team join [<label>]`, or the board's `w`.
  */
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { messageOf } from "../../lib/errors.ts";
 import { sanitizeLine } from "../../lib/format.ts";
 import { withPolledScreen } from "../../lib/screen-session.ts";
-import { formatStatus, formatWatch } from "./format.ts";
+import { formatJoin, formatStatus } from "./format.ts";
 import { COMMAND_NAME } from "./protocol.ts";
 import type { SessionBus } from "./runtime.ts";
 import { SessionListComponent } from "./tui.ts";
 
-const USAGE = "/sessions [name <label>|watch [off|wake]]";
-const WATCH_MODES = ["off", "wake"];
-
 /** How often the open board re-reads the bus. */
 const BOARD_POLL_MS = 1_000;
 
@@ -48,7 +46,7 @@ function createBoardReader(bus: SessionBus): (screen: SessionListComponent) => P
 }
 
 /** Open the TUI board, and resolve when it closes. */
-async function openBoard(pi: ExtensionAPI, ctx: ExtensionCommandContext, bus: SessionBus): Promise<void> {
+async function openSessionsScreen(pi: ExtensionAPI, ctx: ExtensionCommandContext, bus: SessionBus): Promise<void> {
 	await bus.start(ctx);
 	const [status, messages] = await Promise.all([bus.snapshot(), bus.peek()]);
 	const first = { status, messages };
@@ -67,9 +65,10 @@ async function openBoard(pi: ExtensionAPI, ctx: ExtensionCommandContext, bus: Se
 				theme: screen.theme,
 				callbacks: {
 					toggleWatch: async (armed) => {
-						const watching = await bus.watch({ stop: armed });
+						// The board's toggle is the same act as a join, so it says the same thing.
+						const joined = await bus.join({ listen: !armed });
 						if (holder.screen) await reader(holder.screen);
-						return formatWatch(watching);
+						return formatJoin(joined.label, joined.watching);
 					},
 					releaseClaim: async (path) => {
 						const released = await bus.releaseStored(path);
@@ -92,7 +91,7 @@ async function openBoard(pi: ExtensionAPI, ctx: ExtensionCommandContext, bus: Se
 async function open(ctx: ExtensionCommandContext, pi: ExtensionAPI, bus: SessionBus): Promise<void> {
 	try {
 		if (ctx.mode === "tui") {
-			await openBoard(pi, ctx, bus);
+			await openSessionsScreen(pi, ctx, bus);
 			return;
 		}
 		await bus.start(ctx);
@@ -104,61 +103,10 @@ async function open(ctx: ExtensionCommandContext, pi: ExtensionAPI, bus: Session
 
 export function registerCommands(pi: ExtensionAPI, bus: SessionBus): void {
 	pi.registerCommand(COMMAND_NAME, {
-		description: "List parallel Pi sessions, their unread counts and claims; name this session",
-		getArgumentCompletions: (prefix) => {
-			const text = prefix.trimStart();
-			if (text.includes(" ")) return null;
-			const options = ["name", "help", "watch"].filter((value) => value.startsWith(text));
-			return options.length > 0 ? options.map((value) => ({ value, label: value })) : null;
-		},
-		handler: async (args, ctx) => {
-			const [sub = "", ...rest] = args.trim().split(/\s+/).filter(Boolean);
-			if (sub === "help") {
-				ctx.ui.notify(
-					`/sessions — open the bus board\n/sessions name <label> — name this session\n` +
-						`/sessions watch [off|wake] — report new mail at the next turn, or raise one\n\n${USAGE}`,
-					"info",
-				);
-				return;
-			}
-			if (sub === "watch") {
-				const mode = rest[0] ?? "";
-				if (mode !== "" && !WATCH_MODES.includes(mode)) {
-					ctx.ui.notify(`Unknown watch mode "${mode}". Usage: /sessions watch [off|wake]`, "warning");
-					return;
-				}
-				try {
-					await bus.start(ctx);
-					const status = await bus.status();
-					const watching = await bus.watch({ stop: mode === "off", wake: mode === "wake" });
-					ctx.ui.notify(formatWatch(watching, status.me.label), "info");
-				} catch (error) {
-					ctx.ui.notify(`Session bus: ${messageOf(error)}`, "warning");
-				}
-				return;
-			}
-			if (sub === "name") {
-				const label = rest.join(" ").trim();
-				if (!label) {
-					ctx.ui.notify("Usage: /sessions name <label>", "warning");
-					return;
-				}
-				try {
-					await bus.start(ctx);
-					await bus.status();
-					const renamed = await bus.rename(label);
-					// The bus validates first, so a rejected label leaves both names alone.
-					pi.setSessionName(renamed);
-					ctx.ui.notify(`This session is now named "${renamed}".`, "info");
-				} catch (error) {
-					ctx.ui.notify(`Session bus: ${messageOf(error)}`, "warning");
-				}
-				return;
-			}
-			if (sub !== "") {
-				ctx.ui.notify(`Unknown sessions command "${sub}". Try ${USAGE}.`, "warning");
-				return;
-			}
+		description: "Open the bus board: sessions, unread mail, and path claims",
+		// One command, one act: an argument is not a sub-command, so it is ignored
+		// rather than warned about — the board is what the user asked for.
+		handler: async (_args, ctx) => {
 			await open(ctx, pi, bus);
 		},
 	});