oira666_pi-watcher 0.0.4 → 0.0.6

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.4` · **License:** MIT
+**Package:** `oira666_pi-watcher` · **Version:** `0.0.6` · **License:** MIT
 
 ## Install
 
@@ -23,13 +23,11 @@ pi -e ./src/index.ts
 
 | Command | Action |
 | --- | --- |
-| **Ctrl+W** | Toggle the Watcher panel without sending a prompt or stopping either agent. |
+| **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. |
 
-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.
@@ -37,7 +35,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.
-- **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.
+- **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.
 - `/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.4",
+  "version": "0.0.6",
   "description": "A persistent side-agent conversation for observing and steering your running Pi agent.",
   "type": "module",
   "license": "MIT",

package/src/index.ts

@@ -269,7 +269,7 @@ 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", {
+  pi.registerShortcut("alt+w", {
     description: "Toggle the Watcher panel",
     handler: async (ctx) => {
       if (ctx.mode !== "tui" || !ctx.hasUI) return;

package/src/runtime-args.ts

@@ -103,6 +103,8 @@ export interface PiLocation {
 	packageDir: string;
 	/** Module exporting `main` and `DefaultPackageManager` (bundle index, else unbundled index). */
 	entry: string;
+	/** Executable Pi CLI for extensions that spawn process.argv[1]. */
+	cliEntry: string;
 	docsDir?: string;
 }
 
@@ -138,8 +140,16 @@ export function locatePi(options: { piPackageDir?: string; argv?: readonly strin
 			existsSync(f),
 		);
 		if (!entry) continue;
+		const bin = readJson(join(packageDir, "package.json"))?.bin;
+		const piBin = typeof bin === "string" ? bin : (bin as Record<string, unknown> | undefined)?.pi;
+		const cliEntry = [
+			...(typeof piBin === "string" ? [resolve(packageDir, piBin)] : []),
+			join(packageDir, "dist", "bundle", "cli.js"),
+			join(packageDir, "dist", "cli.js"),
+		].find((f) => existsSync(f));
+		if (!cliEntry) continue;
 		const docsDir = join(packageDir, "docs");
-		return { packageDir, entry, docsDir: existsSync(docsDir) ? docsDir : undefined };
+		return { packageDir, entry, cliEntry, docsDir: existsSync(docsDir) ? docsDir : undefined };
 	}
 	throw new Error(
 		`Cannot locate the ${PI_PACKAGE_NAME} package (tried: ${candidates.join(", ") || "none"}). Pass piPackageDir or set PI_PACKAGE_DIR.`,

package/src/runtime-child.mjs

@@ -42,6 +42,10 @@ async function run() {
 		setTimeout(() => process.exit(0), 3000).unref();
 	});
 
+	// Inherited extensions launch subagents using execPath + argv[1]. Expose the real
+	// CLI before importing Pi or loading extensions, not this IPC-only bootstrap.
+	process.argv[1] = config.piCliEntry;
+
 	const pi = await import(pathToFileURL(config.piEntry).href);
 	const { DefaultPackageManager, main } = pi;
 	if (typeof main !== "function") throw new Error(`pi entry ${config.piEntry} does not export main()`);

package/src/runtime-protocol.ts

@@ -26,6 +26,8 @@ export interface ChildConfig {
 	version: 1;
 	/** Absolute path of the pi module exporting `main` and `DefaultPackageManager` (bundle/index.js). */
 	piEntry: string;
+	/** Executable Pi CLI exposed as process.argv[1] in the child. */
+	piCliEntry: string;
 	cwd: string;
 	mainSessionId: string;
 	mainSessionFile: string;

package/src/runtime.ts

@@ -403,6 +403,7 @@ interface Resolved {
 	childEntry: string;
 	piPackageDir: string;
 	piEntry: string;
+	piCliEntry: string;
 	piDocsDir?: string;
 	nodePath: string;
 	baseArgs: string[];
@@ -787,6 +788,7 @@ export class WatcherRuntime {
 			childEntry,
 			piPackageDir: pi.packageDir,
 			piEntry: pi.entry,
+			piCliEntry: pi.cliEntry,
 			piDocsDir: pi.docsDir,
 			nodePath,
 			baseArgs: ["--session-dir", sessionDir, "--session-id", sideSessionId, "--extension", bridgePath],
@@ -804,6 +806,7 @@ export class WatcherRuntime {
 		const config: ChildConfig = {
 			version: 1,
 			piEntry: resolved.piEntry,
+			piCliEntry: resolved.piCliEntry,
 			cwd: resolved.cwd,
 			mainSessionId: options.mainSessionId,
 			mainSessionFile: resolved.mainSessionFile,

package/src/ui.ts

@@ -314,7 +314,7 @@ 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")) {
+		if (matchesKey(data, "alt+w")) {
 			this.close("closed");
 			return;
 		}
@@ -397,7 +397,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} · Ctrl+W / Esc close (main agent untouched)`);
+		else this.setNotice(`Enter send · Shift+Enter newline · PgUp/PgDn scroll · /model [filter] · /stop · ${COPY_USAGE} · Alt+W / Esc close (main agent untouched)`);
 	}
 
 	/** Allow local commands while an approval owns the normal input controls. */
@@ -745,7 +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}`;
+		txt = `Alt+W close · ${txt}`;
 		return th.fg("dim", ` ${txt}`);
 	}