@henryqw/pi-herdr-btw 1.1.1 → 1.1.3

package/extensions/btw.ts

@@ -2,10 +2,9 @@ import { randomUUID } from "node:crypto";
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { createHerdrClient, hasHerdrErrorCode } from "@henryqw/pi-herdr";
 import {
-	orderedProfileRoutes,
-	readTaskModelsConfig,
-	resolveTaskModelRoute,
+	resolveConfiguredTaskRoutes,
 	type ResolvedTaskRoute,
+	type TaskRouteError,
 } from "@henryqw/pi-task-models";
 import {
 	buildSessionContext,
@@ -51,7 +50,6 @@ import {
 import { HELP_TEXT, parseBtwCommand } from "../internal/router.ts";
 
 const BTW_TASK = "pi-herdr-btw/btw";
-const DEFAULT_BTW_PROFILE = "fast" as const;
 const CHILD_HEARTBEAT_INTERVAL_MS = 5 * 60 * 1_000;
 const LITERAL_DRAFT_PREFIX = "\u200b";
 const MERGE_POLL_INTERVAL_MS = 3_000;
@@ -78,7 +76,7 @@ export type ContextStorePort = Pick<
 	| "readMergeRequest"
 	| "removeIfNoPendingMerge"
 >;
-export type ConfigStorePort = Pick<ConfigStore, "load" | "save" | "update" | "reset">;
+export type ConfigStorePort = Pick<ConfigStore, "load" | "update" | "reset">;
 
 const SIDE_PANE_INSTRUCTIONS = `You are running in a focused /btw side pane spawned from another Pi session.
 
@@ -96,20 +94,18 @@ function sameStringArray(a: string[], b: string[]): boolean {
 }
 
 function configuredBtwRoutes(ctx: ExtensionContext): ResolvedTaskRoute[] {
-	let config;
 	try {
-		config = readTaskModelsConfig();
-	} catch {
-		throw new Error("Couldn't read task model config. Run /task-models.");
+		return resolveConfiguredTaskRoutes(ctx, BTW_TASK);
+	} catch (error) {
+		const { taskRouteCode, profileName } = error as TaskRouteError;
+		throw new Error(
+			taskRouteCode === "profile-missing"
+				? `BTW task profile ${profileName} is not configured. Run /task-models.`
+				: taskRouteCode === "no-route"
+					? `BTW task profile ${profileName} has no available route. Run /task-models.`
+					: "Couldn't read task model config. Run /task-models.",
+		);
 	}
-	const profileName = config.tasks[BTW_TASK] ?? DEFAULT_BTW_PROFILE;
-	const profile = config.profiles[profileName];
-	if (!profile) throw new Error(`BTW task profile ${profileName} is not configured. Run /task-models.`);
-	const routes = orderedProfileRoutes(profile)
-		.map((route) => resolveTaskModelRoute(ctx, route))
-		.filter((route): route is ResolvedTaskRoute => route !== undefined);
-	if (!routes.length) throw new Error(`BTW task profile ${profileName} has no available route. Run /task-models.`);
-	return routes;
 }
 
 /**
@@ -140,8 +136,7 @@ async function configureChild(
 	store: ContextStorePort,
 	payloadPath: string,
 ): Promise<void> {
-	const herdr = createHerdrClient<HerdrOptions>((command, args, options) =>
-		pi.exec(command, [...args], options));
+	const herdr = createHerdrClient<HerdrOptions>(pi.exec.bind(pi));
 	let payload: BtwPayload | undefined;
 	let payloadError: string | undefined;
 
@@ -410,8 +405,7 @@ export async function registerBtwExtension(
 	}
 
 	const configStore = options.configStore ?? new ConfigStore();
-	const herdr = createHerdrClient<HerdrOptions>((command, args, options) =>
-		pi.exec(command, [...args], options));
+	const herdr = createHerdrClient<HerdrOptions>(pi.exec.bind(pi));
 
 	// --- Parent-side merge coordination ---------------------------------
 	let sessionCtx:
@@ -688,15 +682,7 @@ export async function registerBtwExtension(
 					return;
 				}
 				const splitOutcome = classifyLaunchResult(splitResult);
-				if (splitOutcome === "failed") {
-					await store.remove(payloadPath);
-					ctx.ui.notify(
-						`/btw failed: ${safeErrorText(splitResult.stdout, splitResult.stderr)}`,
-						"error",
-					);
-					return;
-				}
-				if (splitOutcome === "ambiguous") {
+				if (splitOutcome !== "success") {
 					await store.remove(payloadPath);
 					ctx.ui.notify(
 						`/btw failed: ${safeErrorText(splitResult.stdout, splitResult.stderr)}`,

package/internal/config.ts

@@ -1,7 +1,7 @@
-import { randomUUID } from "node:crypto";
-import { chmod, lstat, mkdir, readFile, readdir, rename, rm, rmdir, writeFile } from "node:fs/promises";
+import { chmod, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { lock } from "proper-lockfile";
 
 export const TOOL_MODES = ["inherit", "all", "read-only", "none"] as const;
 export type BtwToolMode = (typeof TOOL_MODES)[number];
@@ -16,6 +16,7 @@ export type BtwConfig = {
 const CONFIG_LOCK_STALE_MS = 30_000;
 const CONFIG_LOCK_WAIT_MS = 10_000;
 const CONFIG_LOCK_RETRY_MS = 25;
+const CONFIG_LOCK_UPDATE_MS = 5_000;
 
 export const DEFAULT_CONFIG: Readonly<BtwConfig> = Object.freeze({
 	autoSubmit: false,
@@ -121,11 +122,6 @@ export class ConfigStore {
 		}
 	}
 
-	async save(config: BtwConfig): Promise<void> {
-		const validated = parseConfig(config);
-		await this.withLock(() => this.saveUnlocked(validated));
-	}
-
 	async update(mutator: (config: BtwConfig) => BtwConfig): Promise<BtwConfig> {
 		return this.withLock(async () => {
 			const next = parseConfig(mutator(await this.load()));
@@ -160,94 +156,27 @@ export class ConfigStore {
 	}
 
 	private async withLock<T>(operation: () => Promise<T>): Promise<T> {
-		const release = await this.acquireLock();
-		try {
-			return await operation();
-		} finally {
-			await release();
-		}
-	}
-
-	private async acquireLock(): Promise<() => Promise<void>> {
-		const lockPath = `${this.path}.lock`;
 		await mkdir(dirname(this.path), { recursive: true, mode: 0o700 });
-		const token = randomUUID();
-		const ownerPath = join(lockPath, `owner-${token}`);
 		const deadline = Date.now() + CONFIG_LOCK_WAIT_MS;
-
 		while (true) {
 			try {
-				await mkdir(lockPath, { mode: 0o700 });
+				const release = await lock(this.path, {
+					lockfilePath: `${this.path}.lock`,
+					realpath: false,
+					stale: CONFIG_LOCK_STALE_MS,
+					update: CONFIG_LOCK_UPDATE_MS,
+				});
 				try {
-					await writeFile(ownerPath, token, { encoding: "utf8", flag: "wx", mode: 0o600 });
-				} catch (error) {
-					await rm(ownerPath, { force: true }).catch(() => undefined);
-					await rmdir(lockPath).catch(() => undefined);
-					throw error;
+					return await operation();
+				} finally {
+					await release();
 				}
-				return async () => {
-					if ((await readFile(ownerPath, "utf8").catch(() => undefined)) !== token) return;
-					try {
-						await rm(ownerPath);
-					} catch (error) {
-						const code = error && typeof error === "object" ? (error as NodeJS.ErrnoException).code : undefined;
-						if (code === "ENOENT") return;
-						throw error;
-					}
-					await rmdir(lockPath).catch((error) => {
-						const code = error && typeof error === "object" ? (error as NodeJS.ErrnoException).code : undefined;
-						if (code !== "ENOENT" && code !== "ENOTEMPTY") throw error;
-					});
-				};
 			} catch (error) {
-				if (!error || typeof error !== "object" || (error as NodeJS.ErrnoException).code !== "EEXIST") {
-					throw error;
-				}
-				const info = await lstat(lockPath).catch(() => undefined);
-				if (!info || Date.now() - info.mtimeMs > CONFIG_LOCK_STALE_MS) {
-					if (!info) continue;
-					const ownerName = await this.readOwnerName(lockPath);
-					const currentInfo = await lstat(lockPath).catch(() => undefined);
-					const currentOwnerName = await this.readOwnerName(lockPath);
-					if (
-						!currentInfo ||
-						currentInfo.dev !== info.dev ||
-						currentInfo.ino !== info.ino ||
-						currentInfo.ctimeMs !== info.ctimeMs ||
-						currentOwnerName !== ownerName
-					) {
-						continue;
-					}
-					// Remove only observed owner's unique entry. Only the process that
-					// removes that entry may remove lockPath; this prevents a stale
-					// reclaimer from deleting a replacement created in between.
-					if (!ownerName) {
-						if (Date.now() >= deadline) throw new Error(`Timed out waiting for config lock: ${this.path}`);
-						await new Promise((resolve) => setTimeout(resolve, CONFIG_LOCK_RETRY_MS));
-						continue;
-					}
-					try {
-						await rm(join(lockPath, ownerName));
-					} catch (error) {
-						const code = error && typeof error === "object" ? (error as NodeJS.ErrnoException).code : undefined;
-						if (code === "ENOENT") continue;
-						throw error;
-					}
-					await rmdir(lockPath).catch((error) => {
-						const code = error && typeof error === "object" ? (error as NodeJS.ErrnoException).code : undefined;
-						if (code !== "ENOENT" && code !== "ENOTEMPTY") throw error;
-					});
-					continue;
-				}
+				const code = error && typeof error === "object" ? (error as NodeJS.ErrnoException).code : undefined;
+				if (code !== "ELOCKED") throw error;
 				if (Date.now() >= deadline) throw new Error(`Timed out waiting for config lock: ${this.path}`);
 				await new Promise((resolve) => setTimeout(resolve, CONFIG_LOCK_RETRY_MS));
 			}
 		}
 	}
-
-	private async readOwnerName(lockPath: string): Promise<string | undefined> {
-		const entries = await readdir(lockPath, { withFileTypes: true }).catch(() => []);
-		const owners = entries.filter((entry) => entry.isFile() && entry.name.startsWith("owner-"));
-		return owners.length === 1 ? owners[0]?.name : undefined;
-	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-herdr-btw",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Open and merge tool-enabled Pi side threads in Herdr panes.",
   "keywords": [
     "pi-package",
@@ -46,7 +46,11 @@
     ]
   },
   "dependencies": {
-    "@henryqw/pi-herdr": "^0.1.1",
-    "@henryqw/pi-task-models": "^0.5.0"
+    "@henryqw/pi-herdr": "^0.3.0",
+    "@henryqw/pi-task-models": "^0.7.0",
+    "proper-lockfile": "^4.1.2"
+  },
+  "devDependencies": {
+    "@types/proper-lockfile": "^4.1.4"
   }
 }