oira666_pi-watcher 0.0.5 → 0.0.7

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.5` · **License:** MIT
+**Package:** `oira666_pi-watcher` · **Version:** `0.0.6` · **License:** MIT
 
 ## Install
 
@@ -27,6 +27,7 @@ pi -e ./src/index.ts
 | `/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. |
+| `/watcher command` | Copy `pi --session <side session file>` to the clipboard so you can open the watcher conversation in another terminal (works from any directory). |
 
 These are human-facing TUI controls, not tools exposed to the main agent. They work while the main agent is running, including during compaction.
 

package/package.json

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

package/src/index.ts

@@ -1,10 +1,11 @@
-import { getAgentDir, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { copyToClipboard, getAgentDir, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { loadSettings } from "./config.ts";
 import { LiveTools } from "./live-tools.ts";
 import {
   isWatcherChildProcess, messagesToTranscript, WatcherRuntime,
   type UiDialogRequest, type UiDialogResponse, type WatcherRuntimeEvent,
 } from "./runtime.ts";
+import { deriveSideSessionId, findSideSessionFile, formatSideSessionCommand } from "./runtime-args.ts";
 import { openWatcherUI, WatcherStore, type WatcherController } from "./ui.ts";
 
 interface Side {
@@ -283,10 +284,24 @@ export default function watcher(pi: ExtensionAPI): void {
     },
   });
 
+  /** Copy `pi --session <side session file>` (opens it from any directory) and echo it dimmed. */
+  async function copySessionCommand(ctx: ExtensionContext): Promise<void> {
+    try {
+      const id = ctx.sessionManager.getSessionId();
+      const running = side && side.id === id ? side.runtime.info?.sideSessionFile : undefined;
+      const file = running ?? findSideSessionFile(loadSettings(getAgentDir()).sessionDir, deriveSideSessionId(id));
+      if (!file) { ctx.ui.notify("Watcher: no side session yet for this session. Open /watcher first.", "warning"); return; }
+      const command = formatSideSessionCommand(file);
+      await copyToClipboard(command);
+      ctx.ui.notify(`command copied: ${command}`, "info");
+    } catch (error) { ctx.ui.notify(`Watcher: could not copy command: ${errorText(error)}`, "error"); }
+  }
+
   pi.registerCommand("watcher", {
-    description: "Open the side agent; /watcher <question> to ask; /watcher model to choose its model",
+    description: "Open the side agent; /watcher <question> to ask; /watcher model to choose its model; /watcher command to copy a `pi --session` command for another terminal",
     handler: async (args, ctx) => {
       if (ctx.mode !== "tui") { ctx.ui.notify("/watcher is a human-only interactive terminal command.", "warning"); return; }
+      if (args.trim() === "command") { await copySessionCommand(ctx); return; }
       try {
         const s = await ensure(ctx);
         const question = args.trim();

package/src/runtime-args.ts

@@ -3,7 +3,8 @@
  * main-session header verification, pi package discovery.
  */
 
-import { closeSync, existsSync, openSync, readFileSync, readSync, realpathSync } from "node:fs";
+import { closeSync, existsSync, openSync, readdirSync, readFileSync, readSync, realpathSync } from "node:fs";
+import { homedir } from "node:os";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { BRIDGE_TOOL_NAMES } from "./runtime-protocol.ts";
 
@@ -21,6 +22,30 @@ export function deriveSideSessionId(mainSessionId: string): string {
 	return `watcher-${cleaned}`.slice(0, 200).replace(/[^A-Za-z0-9]+$/, "");
 }
 
+/**
+ * One-line shell command that opens the side session in another terminal: `pi --session <file>`.
+ * A file path (not an id) opens that exact session from any directory; pi switches to the
+ * session's cwd. The home directory is shown as `~` when that stays shell-safe, else single-quoted.
+ */
+export function formatSideSessionCommand(sessionFile: string, home = homedir()): string {
+	const safe = /^[A-Za-z0-9_@%+=:,./-]+$/;
+	let path = sessionFile;
+	if (home && path.startsWith(`${home}/`) && safe.test(path.slice(home.length))) path = `~${path.slice(home.length)}`;
+	else if (!safe.test(path)) path = `'${path.replace(/'/g, `'\\''`)}'`;
+	return `pi --session ${path}`;
+}
+
+/** Existing side session file `<timestamp>_<id>.jsonl` in a flat session dir, newest first. */
+export function findSideSessionFile(sessionDir: string, sideSessionId: string): string | undefined {
+	try {
+		const suffix = `_${sideSessionId}.jsonl`;
+		const hit = readdirSync(sessionDir).filter((f) => f.endsWith(suffix)).sort().pop();
+		return hit ? join(sessionDir, hit) : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
 export function isValidSessionId(id: string): boolean {
 	return /^[A-Za-z0-9](?:[A-Za-z0-9._-]*[A-Za-z0-9])?$/.test(id);
 }
@@ -103,6 +128,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 +165,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,