oira666_pi-watcher 0.0.8 → 0.0.9

package/EVERGREEN.md

@@ -1,6 +1,6 @@
 ## Summary
 - Watcher is a persistent, independent conversation for observing and steering a running main agent.
-- Opening, toggling, copying, and picking a model must not prompt or stop either agent.
+- Opening, closing, copying, and picking a model must not prompt or stop either agent.
 - Public touchpoints: extension commands/events/UI, session metadata, tool registration, and Pi RPC.
 - The child wraps exported package-manager implementation methods before extensions load.
 - Main history is read-only input; steering requires human approval and is refused during compaction.
@@ -14,7 +14,7 @@ unless explicitly requested. This is a prompt policy, not a sandbox. Never chang
 or its status bar. Closing the panel leaves the side conversation running.
 
 ## Pi integration (public APIs)
-`src/index.ts` registers `/watcher`, Alt+W, session/agent/tool/compaction handlers, and approved
+`src/index.ts` registers `/watcher`, session/agent/tool/compaction handlers, and approved
 `sendUserMessage(..., { deliverAs })`. It reads session ID/file/leaf, idle state, and project trust.
 The overlay uses `ctx.ui.custom`, native dialogs, clipboard helpers, themes, and pi-tui components.
 The child registers `live_main_tools`/`steer_main`, adds prompt sections in `before_agent_start`,
@@ -46,6 +46,8 @@ Unit tests cover bounded live state, prompt identity/policy, CLI filtering, JSON
 startup, inheritance/exclusions, nested Pi launches, isolated models, resume, approval refusal,
 session guards, locks, shutdown, and recovery. `extension.test.cjs` exercises command → overlay →
 RPC → approval → main delivery, including compaction refusal and shutdown cancellation.
+It also verifies that Watcher registers no keyboard shortcuts and that `/watcher` opens and reopens
+the panel without prompting or losing the side conversation.
 E2E launches `$EVERGREEN_PI_BIN` (or `pi` on PATH) with stdin ignored and uses
 `$EVERGREEN_E2E_MODEL` (required) for real main/side model calls. It verifies reading actual main
 history, live-tool access, unchanged main history, and exact side-history restoration after restart.

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.6` · **License:** MIT
+**Package:** `oira666_pi-watcher` · **Version:** `0.0.9` · **License:** MIT
 
 ## Install
 
@@ -25,7 +25,6 @@ pi -e ./src/index.ts
 
 | Command | Action |
 | --- | --- |
-| **Alt+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. |
@@ -38,7 +37,7 @@ The panel opens immediately while the side process initializes its inherited ext
 Inside the overlay:
 
 - Type a question and press **Enter**. Use **Shift+Enter** for a newline.
-- **Alt+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.
+- **Esc** closes the conversation view without stopping either agent. In the model picker or an editor, it returns to the previous view. Use `/watcher` to reopen. 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.8",
+  "version": "0.0.9",
   "description": "A persistent side-agent conversation for observing and steering your running Pi agent.",
   "type": "module",
   "license": "MIT",

package/src/index.ts

@@ -270,20 +270,6 @@ export default function watcher(pi: ExtensionAPI): void {
   pi.on("session_compact", () => { compacting = false; mainStatus(); });
   pi.on("session_compact_failed", () => { compacting = false; mainStatus(); });
 
-  pi.registerShortcut("alt+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"); }
-    },
-  });
-
   /** Copy `pi --session <side session file>` (opens it from any directory) and echo it dimmed. */
   async function copySessionCommand(ctx: ExtensionContext): Promise<void> {
     try {

package/src/ui.ts

@@ -313,11 +313,6 @@ 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, "alt+w")) {
-			this.close("closed");
-			return;
-		}
 		if (this.notice) {
 			this.notice = undefined;
 			this.requestRender();
@@ -397,7 +392,7 @@ export class WatcherOverlay implements Component, Focusable {
 		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} · Alt+W / Esc close (main agent untouched)`);
+		else this.setNotice(`Enter send · Shift+Enter newline · PgUp/PgDn scroll · /model [filter] · /stop · ${COPY_USAGE} · Esc close (main agent untouched)`);
 	}
 
 	/** Allow local commands while an approval owns the normal input controls. */
@@ -745,7 +740,6 @@ 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 = `Alt+W close · ${txt}`;
 		return th.fg("dim", ` ${txt}`);
 	}