@huseynsnmz/pi-board 0.16.0 → 0.17.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.17.0] - 2026-11-04
+
+### Features
+
+- **keys**: `/` opens Pi's commands, with the usual menu. Commands run in the Pi the board was opened from; templates and skills start a session
+- **keys**: `Ctrl+C` twice quits Pi from the board and from an attached session, and leaves background sessions running
+
+### Changes
+
+- **keys**: `Ctrl+F` is now the only way to filter
+
 ## [0.16.0] - 2026-11-04
 
 ### Features

package/README.md

@@ -14,7 +14,7 @@ It started as a fork of [`@zhuxixi/pi-agent-board`](https://github.com/zhuxixi/p
   ● update the changelog   my-app       Running git log                    12s
 ╭─ new session ──────────────────────────────────────────────────────────────╮
 │ › type a task to start a session                                           │
-╰─ enter resume   space peek   / filter   ctrl+x stop   ? keys ──────────────╯
+╰─ enter resume   space peek   ctrl+f filter   ctrl+x stop   ? keys ─────────╯
 ```
 
 ## Quick start
@@ -24,7 +24,7 @@ Requires Pi 1.5 or newer.
 1. Install it:
 
    ```bash
-   pi install npm:@huseynsnmz/pi-board@0.16.0
+   pi install npm:@huseynsnmz/pi-board@0.17.0
    ```
 
 2. Restart Pi, and press `Left` twice on an empty prompt, or run `/agent-board`.
@@ -43,12 +43,14 @@ Installing it runs `node-pty`'s install script, which sets up its terminal suppo
 | `Left` / `Right` | Attach to the selected session |
 | `Ctrl+\` | Back to the board from a session. `Left` also works on an empty prompt |
 | `Space` | Peek at a session, and type there to reply |
-| `/` | Filter |
+| `/` | Pi's commands, as at the prompt. Templates and skills start a session |
+| `Ctrl+F` | Filter |
 | `Ctrl+X` | Stop a session, and press again within 2 seconds to delete it |
 | `Ctrl+N` | While typing, choose the folder, model and thinking level |
 | `!` | `node-pty` diagnostics |
 | `?` | All the keys |
 | `Esc` | Clear the input, or leave the board |
+| `Ctrl+C` twice | Quit Pi, from the board or a session. Sessions keep running |
 
 The full list is in the [reference](docs/reference.md).
 

package/docs/reference.md

@@ -19,7 +19,8 @@ Typing goes straight into the input, as in Claude Code's agent view, so there's
 | `Alt+Up` / `Alt+Down` | Previous or next group. |
 | `Alt+1`..`Alt+9` | Attach to that row. |
 | `Space` | Open or close Peek. |
-| `/` / `Ctrl+F` | Filter the list. |
+| `/` | Pick one of Pi's commands. It closes the board and runs in the Pi you opened it from. A template or skill starts a session instead, like any task. |
+| `Ctrl+F` | Filter the list. |
 | `Ctrl+S` | Group by state or by directory. |
 | `Shift+Up` / `Shift+Down` | Move the row up or down its group. |
 | `Ctrl+G` | Write the task in `$VISUAL` or `$EDITOR`. |
@@ -35,7 +36,7 @@ Typing goes straight into the input, as in Claude Code's agent view, so there's
 | `!` | node-pty diagnostics and fix steps. |
 | `?` | Help. |
 | `Esc` | Clear a draft, or leave the board. |
-| `Ctrl+C` | Clear a draft; press twice to leave. |
+| `Ctrl+C` | Clear a draft; press twice within a second to quit Pi, from the board or an attached session. Background sessions keep running. |
 
 On macOS, the `Alt` keys need your terminal to send Option as Alt.
 
@@ -134,7 +135,7 @@ The board separates a session's semantic task state from whether a worker proces
 
 Rows are grouped by state. When a state contains sessions from multiple directories, rows are grouped by folder within that state. Pinned rows and folders come first, then creation order remains stable; activity does not reshuffle the list. New agent activity is marked unread with stronger row glyphs and header/footer counts. Replies sent while a session is busy enter a durable FIFO follow-up queue and are delivered when the session is ready; a `qN` badge shows queued follow-ups.
 
-Press `/` to enter filter mode. Filter tokens are case-insensitive and can be combined with free-text terms:
+Press `Ctrl+F` to enter filter mode. Filter tokens are case-insensitive and can be combined with free-text terms:
 
 ```text
 s:running

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huseynsnmz/pi-board",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "A board for Pi's background sessions: start, watch, reply to and attach to them. A fork of @zhuxixi/pi-agent-board.",
   "type": "module",
   "main": "./index.ts",

package/src/commands/agent-board.ts

@@ -11,6 +11,7 @@ import { Key, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
 import { requestDashboardRender } from "../core/dashboard-render.mjs";
 import { nextVisibleIdAfterRemoval } from "../core/rows.mjs";
 import { createService } from "../runtime/service.mjs";
+import { boardCommands } from "../core/slash-commands.mjs";
 import { planAttachPrelude, planAttachResolved } from "./attach-decision.mjs";
 import { screenLogPath } from "../core/paths.mjs";
 import { appendDiagnostic } from "../core/diagnostics.mjs";
@@ -31,7 +32,10 @@ export interface AgentBoardCommandOptions {
 
 const sleep = (ms: number) => new Promise<void>((r) => setTimeout(r, ms));
 
+let addedCommands: () => { name: string; description?: string; source: string }[] = () => [];
+
 export function registerAgentBoardCommand(pi: ExtensionAPI, opts: AgentBoardCommandOptions): void {
+	addedCommands = () => pi.getCommands();
 	pi.registerCommand("agent-board", {
 		description: "Open the background agent-board dashboard",
 		handler: async (args, ctx) => {
@@ -73,7 +77,7 @@ export function registerAgentBoardCommand(pi: ExtensionAPI, opts: AgentBoardComm
 }
 
 export async function openDashboard(
-	ctx: Pick<ExtensionCommandContext, "ui" | "cwd" | "modelRegistry" | "model" | "sessionManager">,
+	ctx: Pick<ExtensionCommandContext, "ui" | "cwd" | "modelRegistry" | "model" | "sessionManager" | "shutdown">,
 	service: ReturnType<typeof createService>,
 	options: {
 		initialSelectedId?: string | null;
@@ -85,6 +89,8 @@ export async function openDashboard(
 	ctx.ui.setHeader(() => ({ render: () => [], invalidate() {} }));
 	ctx.ui.setFooter(() => ({ render: () => [], invalidate() {} }));
 	ctx.ui.setTitle("agent-board");
+	let board: unknown = null;
+	let command: string | null = null;
 	let availableModels: any[] = [];
 	try {
 		availableModels = ctx.modelRegistry.getAvailable();
@@ -92,8 +98,9 @@ export async function openDashboard(
 		availableModels = [];
 	}
 	try {
-		return await ctx.ui.custom<DashboardResult>(
+		const result = await ctx.ui.custom<DashboardResult>(
 			(tui, theme, keybindings, done) => {
+				board = tui;
 				let interval: ReturnType<typeof setInterval> | null = null;
 				const wrappedDone = (result: DashboardResult) => {
 					if (interval) clearInterval(interval);
@@ -110,6 +117,7 @@ export async function openDashboard(
 					availableModels,
 					currentModel: ctx.model ?? null,
 					currentThinkingLevel: options.currentThinkingLevel ?? "off",
+					commands: boardCommands(addedCommands()),
 				});
 				interval = setInterval(() => {
 					void service.reconcile().catch(() => {});
@@ -132,8 +140,20 @@ export async function openDashboard(
 				overlayOptions: { anchor: "top-left", width: "100%", maxHeight: "100%", margin: 0 },
 			},
 		);
+		if (result.action === "quit") ctx.shutdown();
+		if (result.action === "command") command = result.text;
+		return result;
 	} finally {
 		restoreChrome(ctx);
+		// A command runs with more than an extension is given, so this goes the way a typed one does.
+		if (command) {
+			ctx.ui.setEditorText(command);
+			setTimeout(() => {
+				const focused = (board as { getFocusedComponent?: () => { handleInput?: (data: string) => void; getExpandedText?: () => string } | null } | null)?.getFocusedComponent?.();
+				// Only if it's the prompt holding the command. Otherwise it's left there to send by hand.
+				if (focused?.getExpandedText?.() === command) focused.handleInput?.("\r");
+			}, 0);
+		}
 	}
 }
 
@@ -203,6 +223,10 @@ async function attach(
 		void service.markVisited?.(viewId)?.catch(() => {});
 		const result = await openPtyAttach(ctx, root, row.meta.id, row.meta.name, plan.socketPath);
 		void service.markVisited?.(viewId)?.catch(() => {});
+		if (result.action === "quit") {
+			ctx.shutdown();
+			return { action: "switched" }; // Nothing to come back to.
+		}
 		if (result.action === "delete") {
 			// Issue #147: the component already tore down and exited — archive
 			// here so the host's death is never rendered inside the attach view.

package/src/commands/attach-flow.ts

@@ -145,6 +145,10 @@ export async function attach(
 		void service.markVisited?.(viewId)?.catch(() => {});
 		const result = await openPtyAttach(ctx, root, row.meta.id, row.meta.name, plan.socketPath);
 		void service.markVisited?.(viewId)?.catch(() => {});
+		if (result.action === "quit") {
+			ctx.shutdown();
+			return { action: "switched" }; // Nothing to come back to.
+		}
 		return { action: result.action === "closed" ? "closed" : "detached" };
 	}
 	if (plan.plan === "session-switch") {

package/src/core/double-press.mjs

@@ -1,17 +1,21 @@
 /** How close two presses must be to count as one double press. */
 export const DOUBLE_PRESS_MS = 400;
 
+/** Longer than Pi's own 500ms, or a session could take the second Ctrl+C and quit by itself. */
+export const QUIT_PRESS_MS = 1000;
+
 /**
  * Tells a second press apart from a first. Anything else in between starts over.
  * @param {() => number} [now]
+ * @param {number} [windowMs]
  * @returns {{ press(): boolean, reset(): void }} press() is true on the second press.
  */
-export function createDoublePress(now = Date.now) {
+export function createDoublePress(now = Date.now, windowMs = DOUBLE_PRESS_MS) {
 	let last = null;
 	return {
 		press() {
 			const at = now();
-			const second = last !== null && at - last <= DOUBLE_PRESS_MS;
+			const second = last !== null && at - last <= windowMs;
 			last = second ? null : at;
 			return second;
 		},

package/src/core/slash-commands.mjs

@@ -0,0 +1,52 @@
+/**
+ * Pi's own commands. It doesn't export this list, and pi.getCommands() leaves them out.
+ * From pi-coding-agent 1.5.0, dist/core/slash-commands.js.
+ */
+export const BUILTIN_COMMANDS = [
+	["settings", "Open settings menu"],
+	["model", "Select model (opens selector UI)"],
+	["tree", "Navigate session tree (switch branches)"],
+	["thinking", "Set thinking level"],
+	["scoped-models", "Enable/disable models for Ctrl+P cycling"],
+	["export", "Export session (HTML default, or specify path: .html/.jsonl)"],
+	["import", "Import a JSONL session, preserving its ID and working directory"],
+	["share", "Share session via a Radius artifact or a GitHub gist"],
+	["bug", "Report a bug to the Pi developers"],
+	["copy", "Copy last agent message to clipboard"],
+	["name", "Set session display name"],
+	["session", "Show session info and stats"],
+	["changelog", "Show changelog entries"],
+	["hotkeys", "Show all keyboard shortcuts"],
+	["fork", "Create a new fork from a previous user message"],
+	["clone", "Duplicate the current session at the current position"],
+	["trust", "Save project trust decision for future sessions"],
+	["login", "Configure provider authentication"],
+	["logout", "Remove provider authentication"],
+	["new", "Start a new session"],
+	["compact", "Manually compact the session context"],
+	["resume", "Resume another session"],
+	["reload", "Reload keybindings, extensions, skills, prompts, themes, and context files"],
+	["quit", "Quit Pi"],
+].map(([name, description]) => ({ name, description, source: "builtin" }));
+
+/**
+ * What the board offers after `/`: Pi's commands, then what extensions, templates and skills add.
+ * @param {{ name: string, description?: string, source: string }[]} added from pi.getCommands()
+ */
+export function boardCommands(added) {
+	const seen = new Set(BUILTIN_COMMANDS.map((command) => command.name));
+	return [...BUILTIN_COMMANDS, ...added.filter((command) => !seen.has(command.name))];
+}
+
+/**
+ * Commands act on the Pi the board is open in. Templates and skills are prompts, so they
+ * start a session like any task, and so does anything that isn't a command.
+ * @param {string} text
+ * @param {{ name: string, source: string }[]} commands
+ */
+export function runsInPi(text, commands) {
+	if (!text.startsWith("/")) return false;
+	const name = text.slice(1).split(/\s/, 1)[0];
+	const command = commands.find((candidate) => candidate.name === name);
+	return command !== undefined && command.source !== "prompt" && command.source !== "skill";
+}

package/src/ui/dashboard.ts

@@ -9,7 +9,9 @@
 import { readFileSync } from "node:fs";
 import { CustomEditor } from "@earendil-works/pi-coding-agent";
 import type { Component, EditorTheme, KeybindingsManager, TUI } from "@earendil-works/pi-tui";
-import { Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { CombinedAutocompleteProvider, Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { createDoublePress, QUIT_PRESS_MS } from "../core/double-press.mjs";
+import { runsInPi } from "../core/slash-commands.mjs";
 import { readConfig, writeConfig } from "../core/config.mjs";
 import { editExternally } from "./external-editor.ts";
 import { requestDashboardRender } from "../core/dashboard-render.mjs";
@@ -57,7 +59,11 @@ interface ThemeLike {
 	strikethrough(text: string): string;
 }
 
-export type DashboardResult = { action: "exit" } | { action: "attach"; viewId: string; stopFirst: boolean };
+export type DashboardResult =
+	| { action: "exit" }
+	| { action: "attach"; viewId: string; stopFirst: boolean }
+	| { action: "quit" }
+	| { action: "command"; text: string };
 
 type ThinkingLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max";
 type LaunchModel = {
@@ -125,6 +131,7 @@ export interface DashboardDeps {
 	currentThinkingLevel: ThinkingLevel;
 	initialSelectedId?: string | null;
 	initialNotice?: string;
+	commands?: { name: string; description?: string; source: string }[];
 }
 
 export class DashboardComponent implements Component {
@@ -137,7 +144,7 @@ export class DashboardComponent implements Component {
 	private filterQuery = "";
 	private pending: PendingConfirm | null = null;
 	private deleteArm: { id: string; at: number } | null = null;
-	private exitArmedAt: number | null = null;
+	private readonly quitPresses = createDoublePress(Date.now, QUIT_PRESS_MS);
 	private groupBy: "state" | "directory" = readConfig().groupBy === "directory" ? "directory" : "state";
 	private readonly groupOf = new Map<string, string>();
 	private readonly neighborsOf = new Map<string, string>();
@@ -182,6 +189,7 @@ export class DashboardComponent implements Component {
 			}
 		};
 		this.editor.onSubmit = (text) => this.submitEditor(text);
+		this.editor.setAutocompleteProvider(this.commandMenu());
 		this.selectedId = deps.initialSelectedId ?? null;
 		// Issue #147: the post-delete reopen carries the Deleted notice here —
 		// the component is new each open, so an inline notice cannot travel.
@@ -335,6 +343,8 @@ export class DashboardComponent implements Component {
 	// ---- input --------------------------------------------------------------
 
 	handleInput(data: string): void {
+		if (!matchesKey(data, Key.ctrl("c"))) this.quitPresses.reset();
+		else if (this.quitPresses.press()) return this.done({ action: "quit" });
 		switch (this.mode) {
 			case "list":
 				this.handleListKey(data);
@@ -381,11 +391,10 @@ export class DashboardComponent implements Component {
 
 	private handleListKey(data: string): void {
 		if (!matchesKey(data, Key.ctrl("x"))) this.deleteArm = null;
-		if (!matchesKey(data, Key.ctrl("c"))) this.exitArmedAt = null;
 		if (this.handleRowKey(data)) return;
 		if (matchesKey(data, Key.right) || matchesKey(data, Key.left) || matchesKey(data, Key.enter)) return this.attachSelected();
 		if (matchesKey(data, Key.space)) return this.openPeek();
-		if (data === "/" || matchesKey(data, Key.ctrl("f"))) return this.startFilter();
+		if (matchesKey(data, Key.ctrl("f"))) return this.startFilter();
 		if (data === "?") return this.openHelp("list");
 		if (data === "!") return this.openPtyHelp("list");
 		if (matchesKey(data, Key.ctrl("r"))) return this.startRename();
@@ -405,13 +414,7 @@ export class DashboardComponent implements Component {
 			if (matchesKey(data, Key.alt(String(n) as never))) return this.attachInFolder(n - 1);
 		}
 		if (matchesKey(data, Key.escape)) return this.done({ action: "exit" });
-		if (matchesKey(data, Key.ctrl("c"))) {
-			const now = Date.now();
-			if (this.exitArmedAt !== null && now - this.exitArmedAt <= DELETE_DOUBLE_PRESS_MS) return this.done({ action: "exit" });
-			this.exitArmedAt = now;
-			this.notifyInputState("Press ctrl+c again to exit", "accent");
-			return;
-		}
+		if (matchesKey(data, Key.ctrl("c"))) return this.notifyInputState("Press ctrl+c again to quit Pi", "accent");
 		if (isPrintable(data) || isBracketedPaste(data)) {
 			this.mode = "dispatch";
 			this.handleEditorInput(data);
@@ -509,6 +512,12 @@ export class DashboardComponent implements Component {
 	}
 
 	private handleDispatchKey(data: string): void {
+		// The menu has its own use for Enter, Tab, Esc and the arrows.
+		if (this.editor.isShowingAutocomplete() && !matchesKey(data, Key.ctrl("c"))) {
+			this.handleEditorInput(data);
+			if (!this.input && this.mode === "dispatch") this.mode = "list";
+			return;
+		}
 		if (matchesKey(data, Key.ctrl("n"))) return this.openLaunchDialog();
 		if (matchesKey(data, Key.ctrl("g"))) return void this.openExternalEditor();
 		if (matchesKey(data, Key.ctrl("enter"))) return this.startNow(true);
@@ -801,6 +810,11 @@ export class DashboardComponent implements Component {
 
 	/** In this folder, with this session's model. Ctrl+N is there for anything else. */
 	private startNow(attach = false): void {
+		const text = this.input.trim();
+		if (runsInPi(text, this.deps.commands ?? [])) {
+			this.setInput("");
+			return this.done({ action: "command", text });
+		}
 		const cwd = this.deps.defaultCwd;
 		const { model, thinking } = this.buildLaunchState(cwd, this.deps.currentModel, this.deps.currentThinkingLevel);
 		this.submitDispatch({ cwd, model: model ? canonicalModelRef(model) : null, thinkingLevel: thinking, attach });
@@ -936,6 +950,17 @@ export class DashboardComponent implements Component {
 		this.handleEditorInput(data);
 	}
 
+	/** Only for a task that starts with `/`: the same editor takes filters, names and replies. */
+	private commandMenu(): CombinedAutocompleteProvider {
+		const menu = new CombinedAutocompleteProvider(this.deps.commands ?? [], this.deps.defaultCwd);
+		const suggest = menu.getSuggestions.bind(menu);
+		menu.getSuggestions = async (lines, line, col, options) => {
+			if (this.mode !== "dispatch" || line !== 0 || !lines[0]?.startsWith("/")) return null;
+			return suggest(lines, line, col, options);
+		};
+		return menu;
+	}
+
 	private handleEditorInput(data: string): void {
 		this.editor.handleInput(data);
 		this.input = this.editor.getExpandedText();
@@ -1441,7 +1466,7 @@ export class DashboardComponent implements Component {
 		if (this.mode === "select") {
 			return [`${this.selectionCount()} selected`, ...dots, "space toggle", "a all", "u clear", "d done", "ctrl+x delete", "esc cancel"];
 		}
-		return [selected ? (live ? "enter attach live" : "enter resume") : "type to start", "space peek", "/ filter", "ctrl+x stop", "? keys", ...dots];
+		return [selected ? (live ? "enter attach live" : "enter resume") : "type to start", "space peek", "ctrl+f filter", "ctrl+x stop", "? keys", ...dots];
 	}
 
 	private hintLine(label: string, color: InputNoticeColor, hints: string[]): string {
@@ -1485,8 +1510,10 @@ export class DashboardComponent implements Component {
 			const contentWidth = Math.max(1, width - visibleWidth(opts.prompt));
 			return [clip(`${opts.prompt}${clip(this.theme.fg("muted", opts.placeholder ?? ""), contentWidth)}`, width)];
 		}
-		// Its first and last lines are its own rules, and the frame already draws those.
-		const rendered = this.editor.render(width).slice(1, -1);
+		// Its first line and the one above any command menu are its own rules, and the frame already draws those.
+		const all = this.editor.render(width);
+		const menu = (this.editor as unknown as { renderedAutocompleteHeight: number }).renderedAutocompleteHeight;
+		const rendered = [...all.slice(1, all.length - menu - 1), ...all.slice(all.length - menu)];
 		return opts.editing ? rendered : rendered.map((line) => stripInactiveEditorCursor(line));
 	}
 
@@ -1806,7 +1833,8 @@ export class DashboardComponent implements Component {
 			["alt+↑ / alt+↓", "Previous or next group"],
 			["alt+1..9", "Attach to that row in this folder"],
 			["space", "Open or close the peek panel"],
-			["/ or ctrl+f", "Filter the list"],
+			["/", "Pi's commands. They run here; a template or skill starts a session"],
+			["ctrl+f", "Filter the list"],
 			["ctrl+s", "Group by state or by directory"],
 			["shift+↑ / ↓", "Move the row up or down its group"],
 			["ctrl+g", "Write the task in $VISUAL or $EDITOR"],
@@ -1820,7 +1848,7 @@ export class DashboardComponent implements Component {
 			["ctrl+e", "Evidence and diagnostics"],
 			["ctrl+k", "Delete every inactive session in this state"],
 			["esc", "Close, clear the input, or leave the board"],
-			["ctrl+c", "Clear the input; press twice to leave"],
+			["ctrl+c", "Clear the input; press twice to quit Pi, here or in a session"],
 			["!", "node-pty diagnostics"],
 			["?", "This help"],
 			["In select", "↑↓ move · space toggle · a all · u clear · d done · ctrl+x delete · esc cancel"],

package/src/ui/pty-attach.ts

@@ -6,6 +6,7 @@ import { createConnection, type Socket } from "node:net";
 import type { Component, KeybindingsManager, RgbColor, TUI, TerminalColorScheme, TuiMouseEvent, TuiMouseEventResult } from "@earendil-works/pi-tui";
 import { CURSOR_MARKER, Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { resolveAttachDeleteKey } from "../core/attach-delete.mjs";
+import { createDoublePress, QUIT_PRESS_MS } from "../core/double-press.mjs";
 import { findHttpUrlAtCells, findWordRangeAtCells } from "../core/pty-links.mjs";
 import { canPublishAttachView, createAttachOutputRenderScheduler, decideAttachPresentation, detectCursorDesync, isPtyCursorHidden, nextAttachRender, projectPtyCursor, shouldScheduleAttachRenderForMessage } from "../core/pty-attach-render.mjs";
 import { evaluateAttachReconnect, shouldEscapeAttach } from "../core/pty-attach-reconnect.mjs";
@@ -18,7 +19,7 @@ import { backgroundRgbFromTerminalColors, buildSettleSchemePatch, colorSchemeFor
 import { REPLY_GUARD_WINDOW_MS, createReplyGuard, isReplyGuardEnabled } from "../core/terminal-reply-guard.mjs";
 import { clampInt, encodeWheelReport, fullscreenMouseEnableSequence, historyFloorAfterHydrate, isFullscreenSelectionEnd, resolveAttachMouseAction, resolveAttachWheelRoute, resolvePasteSelectionSource, resolveWheelLines, sameMousePoint, scrollableHistoryLines, scrollViewportTop, selectionDragScrollLines, selectionReleaseIsDrag, shouldOwnOuterMouseMode, splitAttachInput, wheelScrollLinesUp } from "../core/pty-scroll.mjs";
 
-export type PtyAttachResult = { action: "detached" } | { action: "closed"; exitCode?: number | null } | { action: "delete" };
+export type PtyAttachResult = { action: "detached" } | { action: "closed"; exitCode?: number | null } | { action: "delete" } | { action: "quit" };
 
 type ThemeLike = {
 	fg(color: string, text: string): string;
@@ -400,6 +401,7 @@ export class PtyAttachComponent implements Component {
 	private selectionAutoScrollLines = 0;
 	private selectionAutoScrollMouse: { row: number; col: number } | null = null;
 	private pendingClickTimer: ReturnType<typeof setTimeout> | null = null;
+	private readonly quitPresses = createDoublePress(Date.now, QUIT_PRESS_MS);
 	private lastClickPoint: MousePoint | null = null;
 	private lastClickAt = 0;
 	/** Authoritative editor emptiness pushed by the child Pi extension via the
@@ -577,6 +579,9 @@ export class PtyAttachComponent implements Component {
 			this.send({ type: "input", data });
 			return;
 		}
+		// The first goes to the session as usual. The second never does, so the session lives on.
+		if (!matchesKey(data, Key.ctrl("c"))) this.quitPresses.reset();
+		else if (this.quitPresses.press()) return this.detach({ action: "quit" });
 		if (matchesKey(data, "ctrl+\\")) {
 			// Unconditional, terminal-independent escape (issue #126): 0x1c is a
 			// single raw ASCII byte every terminal forwards unchanged in raw
@@ -761,7 +766,7 @@ export class PtyAttachComponent implements Component {
 		this.scheduleRender();
 	}
 
-	private detach(): void {
+	private detach(result: PtyAttachResult = { action: "detached" }): void {
 		// Restore a held PTY before ending the control socket. The runner closes
 		// the socket immediately after receiving detach, so sending detach first
 		// can drop the G3 restore resize (issue #42).
@@ -772,7 +777,7 @@ export class PtyAttachComponent implements Component {
 			this.send({ type: "detach" });
 		}
 		this.close(true);
-		this.done({ action: "detached" });
+		this.done(result);
 	}
 
 		/** Install the component's public ?2026 observers; false return keeps xterm defaults. */