oira666_pi-watcher 0.0.3 → 0.0.4

package/README.md

@@ -2,7 +2,7 @@
 
 A persistent side-agent conversation for your running [Pi](https://pi.dev) agent.
 
-**Package:** `oira666_pi-watcher` · **Version:** `0.0.3` · **License:** MIT
+**Package:** `oira666_pi-watcher` · **Version:** `0.0.4` · **License:** MIT
 
 ## Install
 
@@ -23,18 +23,21 @@ pi -e ./src/index.ts
 
 | Command | Action |
 | --- | --- |
+| **Ctrl+W** | Toggle the Watcher panel without sending a prompt or stopping either agent. |
 | `/watcher` | Create/resume the side agent and show its conversation. **Sends no prompt.** |
 | `/watcher Why is it retrying?` | Open and send exactly that question. |
 | `/watcher model` | Open the side agent's model picker. Does not prompt either agent. |
 
-These are human-facing TUI commands, not tools exposed to the main agent. They work while the main agent is running, including during compaction.
+Ctrl+W replaces Pi's usual delete-word-left shortcut while Watcher is loaded.
+
+These are human-facing TUI controls, not tools exposed to the main agent. They work while the main agent is running, including during compaction.
 
 The panel opens immediately while the side process initializes its inherited extensions and MCPs in the background. You can type straight away; a submitted question waits for initialization and is sent once ready. `/stop` cancels a question waiting for startup. Opening without a question still sends no prompt. Saved history and the selected model appear when initialization finishes; reopening an already initialized side agent reuses it.
 
 Inside the overlay:
 
 - Type a question and press **Enter**. Use **Shift+Enter** for a newline.
-- **Esc** returns to the main view without stopping either agent. Run `/watcher` again to return; conversation, draft, and scroll position are retained.
+- **Ctrl+W** closes the panel from any Watcher view. Press it again to reopen. **Esc** also returns from chat to the main view without stopping either agent. Conversation, draft, and scroll position are retained.
 - `/model` opens a searchable provider/model picker. Its selection affects **only the side agent** and is persisted in that side conversation. You can change models while the side agent is running, just like in Pi; switching does not abort the current reply.
 - `/stop` cancels only the side agent and clears its queued messages.
 - `/copy` copies to the system clipboard, because terminal mouse selection spans the full terminal width. Messages are numbered in the transcript (`You #n`, `Watcher #n`):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oira666_pi-watcher",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "A persistent side-agent conversation for observing and steering your running Pi agent.",
   "type": "module",
   "license": "MIT",

package/src/index.ts

@@ -269,6 +269,20 @@ export default function watcher(pi: ExtensionAPI): void {
   pi.on("session_compact", () => { compacting = false; mainStatus(); });
   pi.on("session_compact_failed", () => { compacting = false; mainStatus(); });
 
+  pi.registerShortcut("ctrl+w", {
+    description: "Toggle the Watcher panel",
+    handler: async (ctx) => {
+      if (ctx.mode !== "tui" || !ctx.hasUI) return;
+      try {
+        if (side && isCurrent(side) && side.store.state.open) {
+          side.overlay?.abort();
+          return;
+        }
+        await show(await ensure(ctx));
+      } catch (error) { ctx.ui.notify(`Watcher: ${errorText(error)}`, "error"); }
+    },
+  });
+
   pi.registerCommand("watcher", {
     description: "Open the side agent; /watcher <question> to ask; /watcher model to choose its model",
     handler: async (args, ctx) => {

package/src/ui-copy.ts

@@ -5,7 +5,7 @@
  */
 import { stripTerminalSequences } from "@earendil-works/pi-tui";
 import { messageNumbers } from "./ui-render.ts";
-import type { WatcherMessage } from "./ui-types.ts";
+import type { WatcherLiveState, WatcherMessage } from "./ui-types.ts";
 
 export const COPY_USAGE = "/copy [me] [n|all] — e.g. /copy (last Watcher reply), /copy 3 (Watcher #3), /copy me (your last), /copy me 2, /copy all";
 
@@ -19,7 +19,12 @@ function clean(text: string): string {
 }
 
 /** Resolve `/copy` arguments against the stored conversation. */
-export function selectForCopy(messages: ReadonlyArray<WatcherMessage>, args: string): CopySelection {
+export function selectForCopy(messages: ReadonlyArray<WatcherMessage>, args: string, live?: WatcherLiveState): CopySelection {
+	// Copy a snapshot of the visible reply without committing it to history.
+	if (live?.text) {
+		const prefix = live.truncated ? "… (earlier output not retained)\n" : "";
+		messages = [...messages, { role: "assistant", text: prefix + live.text }];
+	}
 	const words = args.trim().toLowerCase().split(/\s+/).filter(Boolean);
 	let role: "user" | "assistant" = "assistant";
 	let which: "last" | "all" | number = "last";

package/src/ui.ts

@@ -113,6 +113,7 @@ export class WatcherOverlay implements Component, Focusable {
 	private mode: Mode = "chat";
 	private editor: Editor;
 	private approvalEditor?: Editor;
+	private commandEditor?: Editor;
 	private approvalId?: string;
 	private approvalSel = 1; // 0 send, 1 edit (default, no accidental send), 2 cancel
 
@@ -181,9 +182,10 @@ export class WatcherOverlay implements Component, Focusable {
 	}
 
 	private syncEditorFocus(): void {
-		const chat = this.mode === "chat" && !this.currentApproval();
+		const chat = !this.commandEditor && this.mode === "chat" && !this.currentApproval();
 		this.editor.focused = this._focused && chat;
-		if (this.approvalEditor) this.approvalEditor.focused = this._focused && this.mode === "approval-edit";
+		if (this.approvalEditor) this.approvalEditor.focused = this._focused && !this.commandEditor && this.mode === "approval-edit";
+		if (this.commandEditor) this.commandEditor.focused = this._focused;
 	}
 
 	// ---- lifecycle -------------------------------------------------------------------------
@@ -195,6 +197,7 @@ export class WatcherOverlay implements Component, Focusable {
 		this.renderer.invalidate();
 		this.editor.invalidate();
 		this.approvalEditor?.invalidate();
+		this.commandEditor?.invalidate();
 		this.pickerList?.invalidate();
 	}
 
@@ -310,11 +313,19 @@ export class WatcherOverlay implements Component, Focusable {
 
 	handleInput(data: string): void {
 		if (this.closed) return;
+		// Focused overlays own input, so the main editor's shortcut cannot close us.
+		if (matchesKey(data, "ctrl+w")) {
+			this.close("closed");
+			return;
+		}
 		if (this.notice) {
 			this.notice = undefined;
 			this.requestRender();
 		}
-		if (this.mode === "model") {
+		if (this.commandEditor) {
+			if (this.isClose(data)) this.commandEditor = undefined;
+			else this.commandEditor.handleInput(data);
+		} else if (this.mode === "model") {
 			this.handlePickerInput(data);
 		} else if (this.mode === "approval-edit") {
 			this.handleApprovalEditInput(data);
@@ -349,10 +360,7 @@ export class WatcherOverlay implements Component, Focusable {
 		const cmd = /^\/(model|stop|help|copy)(?:\s+([\s\S]*))?$/.exec(text);
 		if (cmd) {
 			this.clearEditor();
-			if (cmd[1] === "model") this.openPicker((cmd[2] ?? "").trim());
-			else if (cmd[1] === "stop") this.doStop();
-			else if (cmd[1] === "copy") this.doCopy(cmd[2] ?? "");
-			else this.setNotice(`Enter send · Shift+Enter newline · PgUp/PgDn scroll · /model [filter] · /stop · ${COPY_USAGE} · Esc close (main agent untouched)`);
+			this.runLocalCommand(cmd[1], cmd[2] ?? "");
 			return;
 		}
 		if (this.sideBusy()) {
@@ -385,8 +393,29 @@ export class WatcherOverlay implements Component, Focusable {
 		this.store.setDraft("");
 	}
 
+	private runLocalCommand(command: string, args: string): void {
+		if (command === "model") this.openPicker(args.trim());
+		else if (command === "stop") this.doStop();
+		else if (command === "copy") this.doCopy(args);
+		else this.setNotice(`Enter send · Shift+Enter newline · PgUp/PgDn scroll · /model [filter] · /stop · ${COPY_USAGE} · Ctrl+W / Esc close (main agent untouched)`);
+	}
+
+	/** Allow local commands while an approval owns the normal input controls. */
+	private openCommandEditor(): void {
+		const editor = new Editor(this.tui, this.editorTheme(), { paddingX: 0 });
+		editor.setText("/");
+		editor.onSubmit = (raw) => {
+			const cmd = /^\/(model|stop|help|copy)(?:\s+([\s\S]*))?$/.exec(raw.trim());
+			if (cmd) {
+				this.commandEditor = undefined;
+				this.runLocalCommand(cmd[1], cmd[2] ?? "");
+			} else editor.setText(raw);
+		};
+		this.commandEditor = editor;
+	}
+
 	private doCopy(args: string): void {
-		const sel = selectForCopy(this.store.state.messages, args);
+		const sel = selectForCopy(this.store.state.messages, args, this.store.state.live);
 		if (!sel.ok) {
 			this.setNotice(sel.error, "warn");
 			return;
@@ -549,6 +578,10 @@ export class WatcherOverlay implements Component, Focusable {
 	}
 
 	private handleApprovalInput(data: string): void {
+		if (data === "/" || decodeKittyPrintable(data) === "/") {
+			this.openCommandEditor();
+			return;
+		}
 		const a = this.currentApproval();
 		if (!a) return;
 		if (this.isClose(data)) {
@@ -712,6 +745,7 @@ export class WatcherOverlay implements Component, Focusable {
 		else if (inner >= 76) txt = "Enter send · ⇧Enter newline · PgUp/PgDn scroll · /model · /copy · /stop · Esc close";
 		else if (inner >= 50) txt = "Enter send · PgUp/PgDn · /model · /copy · /stop · Esc";
 		else txt = "Enter send · Esc close";
+		txt = `Ctrl+W close · ${txt}`;
 		return th.fg("dim", ` ${txt}`);
 	}
 
@@ -729,7 +763,9 @@ export class WatcherOverlay implements Component, Focusable {
 		const approval = this.currentApproval();
 		const editorCap = Math.max(3, Math.min(8, Math.floor(H * 0.35)));
 
-		if (this.mode === "model") {
+		if (this.commandEditor) {
+			for (const l of this.capEditorLines(this.commandEditor.render(inner), editorCap)) lines.push(frame(l));
+		} else if (this.mode === "model") {
 			lines.push(frame(` ${th.fg("accent", th.bold("Select side model"))} ${th.fg("dim", "(independent of main)")}`));
 			lines.push(frame(` ${th.fg("muted", "filter:")} ${this.pickerFilter}${th.fg("dim", "▏")}`));
 			if (this.pickerLoading) lines.push(frame(th.fg("dim", "  loading models…")));