@henryqw/pi-deps 0.1.2 → 0.2.0

package/README.md

@@ -32,7 +32,7 @@ Run `/deps` once from any worktree to enable preparation through repository's sh
 
 Only Git-root lockfiles are inspected. npm, pnpm, Yarn, and Bun use frozen installs; uv uses `uv sync --locked`. Node and uv both run when both lockfile types exist. Root npm and uv workspaces remain package-manager concerns; nested independent projects are not scanned.
 
-Creation waits for installs. Missing executables, conflicting Node lockfiles, `packageManager` mismatches, and install failures make worktree command fail while leaving created worktree available for inspection. Unsupported repositories and already-present `node_modules`, `.pnp.cjs`, or `.venv` are skipped. Worktrees created with `git worktree add --no-checkout` never run `post-checkout`, so they are not prepared.
+Creation returns immediately. The hook validates lockfiles synchronously — conflicting Node lockfiles, `packageManager` mismatches, and unsupported declarations still fail the worktree command fast — then a detached installer runs the frozen installs in the background. Its outcome lands in `<worktree gitdir>/pi-deps/status.json` with command output in the adjacent `install.log`; the file is removed once a Pi session reports it. A Pi session opened in the worktree shows an editor widget while installing, auto-dismisses success after five seconds, and keeps install failures visible (including missing executables). Other tools creating worktrees get the same background install but must consume the status file themselves. Already-present `node_modules`, `.pnp.cjs`, or `.venv` are skipped. Worktrees created with `git worktree add --no-checkout` never run `post-checkout`, so they are not prepared. Because installs finish after creation returns, a consumer may start using a worktree before dependencies are ready.
 
 Dependency installation may execute repository-controlled build and install scripts. Enable only repositories you trust.
 

package/extensions/deps.ts

@@ -63,7 +63,71 @@ export async function toggleDependencyHook(commonGitDir: string): Promise<{ enab
 	return { enabled: true, path };
 }
 
+const widgetKey = "pi-deps";
+const pollMs = 500;
+const successTtlMs = 5000;
+const waitTimeoutMs = 10 * 60_000;
+
+interface InstallStatus {
+	state?: string;
+	message?: string;
+}
+
+export interface InstallWatchContext {
+	cwd: string;
+	mode?: string;
+	ui: { setWidget(key: string, content: string[] | undefined): void };
+}
+
+// Watches the status file written by the background installer spawned by the post-checkout hook.
+// First consumer wins: the status file is removed once reported.
+export async function watchDependencyInstallation(
+	exec: ExtensionAPI["exec"],
+	ctx: InstallWatchContext,
+	timing: { pollMs?: number; successTtlMs?: number } = {},
+): Promise<void> {
+	if (ctx.mode && ctx.mode !== "tui") return;
+	const git = await exec("git", ["rev-parse", "--path-format=absolute", "--git-dir"], { cwd: ctx.cwd });
+	if (git.code !== 0 || git.killed) return;
+	const stateDir = join(git.stdout.trim(), "pi-deps");
+	const statusPath = join(stateDir, "status.json");
+	const readStatus = async (): Promise<InstallStatus | undefined> => {
+		try {
+			return JSON.parse(await readFile(statusPath, "utf8")) as InstallStatus;
+		} catch (error) {
+			if ((error as NodeJS.ErrnoException).code === "ENOENT") return undefined;
+			return { state: "running" }; // partial write from installer or test; retry next poll
+		}
+	};
+
+	let status = await readStatus();
+	if (!status) return;
+	if (status.state === "running") ctx.ui.setWidget(widgetKey, ["pi-deps: installing dependencies…"]);
+	const deadline = Date.now() + waitTimeoutMs;
+	while (status.state === "running" && Date.now() < deadline) {
+		await new Promise((resolveSleep) => setTimeout(resolveSleep, timing.pollMs ?? pollMs));
+		status = await readStatus();
+		if (!status) {
+			ctx.ui.setWidget(widgetKey, undefined);
+			return;
+		}
+	}
+	await rm(statusPath, { force: true }); // consume so later sessions do not replay a stale outcome
+	if (status.state === "ok") {
+		ctx.ui.setWidget(widgetKey, ["pi-deps: dependencies installed"]);
+		setTimeout(() => ctx.ui.setWidget(widgetKey, undefined), timing.successTtlMs ?? successTtlMs);
+	} else if (status.state === "error") {
+		ctx.ui.setWidget(widgetKey, [
+			`pi-deps: install failed: ${status.message ?? "unknown error"}`,
+			`pi-deps: log: ${join(stateDir, "install.log")}`,
+		]);
+	}
+}
+
 export default function depsExtension(pi: ExtensionAPI): void {
+	pi.on("session_start", async (_event, ctx) => {
+		await watchDependencyInstallation(pi.exec.bind(pi), ctx).catch(() => {});
+	});
 	pi.registerCommand("deps", {
 		description: "Toggle dependency preparation for future Git worktrees",
 		handler: async (args, ctx) => {

package/hooks/post-checkout.mjs

@@ -1,9 +1,40 @@
 #!/usr/bin/env node
 // pi-deps-managed-hook
 
-import { spawnSync } from "node:child_process";
-import { readFileSync, statSync } from "node:fs";
+import { spawn, spawnSync } from "node:child_process";
+import { mkdirSync, openSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const installMode = "--pi-deps-install";
+
+function errorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+
+function writeStatus(stateDir, status) {
+	writeFileSync(join(stateDir, "status.json"), `${JSON.stringify(status)}\n`);
+}
+
+// Installer child: runs the frozen installs detached and records the outcome for watchers.
+if (process.argv[2] === installMode) {
+	const [, , , root, stateDir, commandsJson] = process.argv;
+	try {
+		process.chdir(root);
+		for (const [command, args] of JSON.parse(commandsJson)) {
+			console.error(`pi-deps: ${command} ${args.join(" ")}`);
+			const result = spawnSync(command, args, { stdio: "inherit" });
+			if (result.error) throw new Error(`failed to start ${command}: ${result.error.message}`);
+			if (result.status !== 0) throw new Error(`${command} failed with exit code ${result.status ?? "signal"}`);
+		}
+		writeStatus(stateDir, { state: "ok" });
+	} catch (error) {
+		console.error(`pi-deps: ${errorMessage(error)}`);
+		writeStatus(stateDir, { state: "error", message: errorMessage(error) });
+		process.exit(1);
+	}
+	process.exit(0);
+}
 
 const [, , oldHead, , checkoutKind] = process.argv;
 if (!/^0+$/.test(oldHead ?? "") || checkoutKind !== "1") process.exit(0);
@@ -17,24 +48,15 @@ const isDirectory = (name) => {
 	try { return statSync(path(name)).isDirectory(); } catch { return false; }
 };
 
-function run(command, args) {
-	console.error(`pi-deps: ${command} ${args.join(" ")}`);
-	const result = spawnSync(command, args, { cwd: root, stdio: "inherit" });
-	if (result.error) {
-		console.error(`pi-deps: failed to start ${command}: ${result.error.message}`);
-		process.exit(result.error.code === "ENOENT" ? 127 : 1);
-	}
-	if (result.status !== 0) process.exit(result.status ?? 1);
-}
-
-function nodeInstall() {
+// Validation throws synchronously so configuration mistakes still fail worktree creation fast.
+function nodeCommands() {
 	const locks = [];
 	if (isFile("package-lock.json") || isFile("npm-shrinkwrap.json")) locks.push("npm");
 	if (isFile("pnpm-lock.yaml")) locks.push("pnpm");
 	if (isFile("yarn.lock")) locks.push("yarn");
 	if (isFile("bun.lock") || isFile("bun.lockb")) locks.push("bun");
 	if (isFile("bun.lock") && isFile("bun.lockb")) throw new Error("Conflicting Bun lockfiles: bun.lock and bun.lockb");
-	if (locks.length === 0) return;
+	if (locks.length === 0) return [];
 	if (locks.length > 1) throw new Error(`Conflicting Node lockfiles: ${locks.join(", ")}`);
 	if (!isFile("package.json")) throw new Error("Node lockfile found without package.json");
 
@@ -42,7 +64,7 @@ function nodeInstall() {
 	try {
 		packageJson = JSON.parse(readFileSync(path("package.json"), "utf8"));
 	} catch (error) {
-		throw new Error(`Cannot read package.json: ${error instanceof Error ? error.message : String(error)}`);
+		throw new Error(`Cannot read package.json: ${errorMessage(error)}`);
 	}
 	const declared = packageJson?.packageManager;
 	let manager = locks[0];
@@ -56,17 +78,40 @@ function nodeInstall() {
 		}
 	}
 
-	if (isDirectory("node_modules") || (manager === "yarn" && isFile(".pnp.cjs"))) return;
-	if (manager === "npm") run("npm", ["ci"]);
-	else if (manager === "pnpm") run("pnpm", ["install", "--frozen-lockfile"]);
-	else if (manager === "bun") run("bun", ["install", "--frozen-lockfile"]);
-	else run("yarn", ["install", "--immutable"]);
+	if (isDirectory("node_modules") || (manager === "yarn" && isFile(".pnp.cjs"))) return [];
+	if (manager === "npm") return [["npm", ["ci"]]];
+	if (manager === "pnpm") return [["pnpm", ["install", "--frozen-lockfile"]]];
+	if (manager === "bun") return [["bun", ["install", "--frozen-lockfile"]]];
+	return [["yarn", ["install", "--immutable"]]];
+}
+
+function installCommands() {
+	const commands = nodeCommands();
+	if (isFile("uv.lock") && !isDirectory(".venv")) commands.push(["uv", ["sync", "--locked"]]);
+	return commands;
 }
 
 try {
-	nodeInstall();
-	if (isFile("uv.lock") && !isDirectory(".venv")) run("uv", ["sync", "--locked"]);
+	const commands = installCommands();
+	const git = spawnSync("git", ["rev-parse", "--path-format=absolute", "--git-dir"], { cwd: root, encoding: "utf8" });
+	if (git.error) throw new Error(`Cannot locate Git directory: ${git.error.message}`);
+	if (git.status !== 0) {
+		throw new Error(`Cannot locate Git directory: ${(git.stderr || "").trim() || `exit code ${git.status}`}`);
+	}
+	const stateDir = join(git.stdout.trim(), "pi-deps");
+	const statusPath = join(stateDir, "status.json");
+	if (commands.length === 0) {
+		rmSync(statusPath, { force: true }); // stale outcome from an earlier run
+		process.exit(0);
+	}
+	mkdirSync(stateDir, { recursive: true });
+	writeStatus(stateDir, { state: "running" });
+	const log = openSync(join(stateDir, "install.log"), "a");
+	spawn(process.execPath, [fileURLToPath(import.meta.url), installMode, root, stateDir, JSON.stringify(commands)], {
+		detached: true,
+		stdio: ["ignore", log, log],
+	}).unref();
 } catch (error) {
-	console.error(`pi-deps: ${error instanceof Error ? error.message : String(error)}`);
+	console.error(`pi-deps: ${errorMessage(error)}`);
 	process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-deps",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Prepare Node and uv dependencies when opted-in Git worktrees are created.",
   "keywords": [
     "pi-package",