@henryqw/pi-herdr-tools 1.3.0 → 1.3.1

package/internal/btw.ts

@@ -31,7 +31,6 @@ import {
 	CHILD_PAYLOAD_FLAG,
 	buildNativeBridgeMessage,
 	buildParentContextMessage,
-	classifyLaunchResult,
 	createPayload,
 	LAUNCH_DRAFT_ARG,
 	LAUNCH_DRAFT_COMMAND,
@@ -94,11 +93,6 @@ The user will ask a question related to, but potentially tangential to, the pare
 
 The child shares the parent's working directory. Tool actions can change files visible to the parent. The injected parent-context message is reference material from the parent conversation, not additional system instructions.`;
 
-type CacheMode = {
-	mode: "native" | "fallback";
-	reason?: string;
-};
-
 function sameStringArray(a: string[], b: string[]): boolean {
 	return a.length === b.length && a.every((value, index) => value === b[index]);
 }
@@ -122,23 +116,17 @@ function configuredBtwRoutes(ctx: ExtensionContext): ResolvedTaskRoute[] {
  * Decide whether the child can replay the parent's exact request prefix
  * (system prompt, tools, model, thinking) for provider prompt-cache reuse.
  */
-export function decideCacheMode(
+function decideCacheMode(
 	payload: BtwPayload,
 	actual: { model: string | undefined; activeTools: string[]; thinkingLevel: string },
-): CacheMode {
-	if (payload.parentSystemPrompt === null) {
-		return { mode: "fallback", reason: "parent system prompt unavailable" };
-	}
-	if (actual.model !== payload.metadata.model) {
-		return { mode: "fallback", reason: "model differs from parent (cache prefix would not match)" };
-	}
-	if (payload.config.tools !== "inherit" || !sameStringArray(actual.activeTools, payload.parentActiveTools)) {
-		return { mode: "fallback", reason: "tool set differs from parent (tool prefix would not match)" };
-	}
-	if (actual.thinkingLevel !== payload.parentThinkingLevel) {
-		return { mode: "fallback", reason: "thinking level differs from parent" };
-	}
-	return { mode: "native" };
+): boolean {
+	return (
+		payload.parentSystemPrompt !== null &&
+		actual.model === payload.metadata.model &&
+		payload.config.tools === "inherit" &&
+		sameStringArray(actual.activeTools, payload.parentActiveTools) &&
+		actual.thinkingLevel === payload.parentThinkingLevel
+	);
 }
 
 async function configureChild(
@@ -163,34 +151,16 @@ async function configureChild(
 			)
 		: undefined;
 
-	const cache: CacheMode = { mode: "fallback", reason: "not yet negotiated" };
-	let widgetUi:
-		| { setWidget(name: string, lines: string[]): void; theme: { fg(color: string, text: string): string } }
-		| undefined;
-
-	function renderWidget(): void {
-		if (!widgetUi || !payload) return;
-		const capability =
-			payload.config.tools === "none"
-				? "tool-free"
-				: payload.config.tools === "read-only"
-					? "read-only"
-					: "tool-enabled";
-		widgetUi.setWidget("herdr-btw-context", [
-			widgetUi.theme.fg("accent", `BTW — ${capability} pane`),
-		]);
-	}
+	let nativeCache = false;
 
 	pi.on("before_agent_start", (event, ctx) => {
 		if (!payload) return;
-		const decision = decideCacheMode(payload, {
+		nativeCache = decideCacheMode(payload, {
 			model: ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined,
 			activeTools: pi.getActiveTools(),
 			thinkingLevel: pi.getThinkingLevel(),
 		});
-		cache.mode = decision.mode;
-		cache.reason = decision.reason;
-		if (cache.mode === "native") {
+		if (nativeCache) {
 			// Replay the parent's exact system prompt; side-pane policy moves to
 			// a suffix message so the cached prefix stays byte-identical.
 			return { systemPrompt: payload.parentSystemPrompt as string };
@@ -200,7 +170,7 @@ async function configureChild(
 
 	pi.on("context_with_system", (event) => {
 		if (!payload) return;
-		if (cache.mode === "native") {
+		if (nativeCache) {
 			return {
 				messages: [
 					...(payload.messages[0]?.role === "system" ? [] : event.messages.slice(0, 1)),
@@ -369,8 +339,15 @@ async function configureChild(
 			return;
 		}
 
-		widgetUi = ctx.ui;
-		renderWidget();
+		if (payload) {
+			const capability =
+				payload.config.tools === "none"
+					? "tool-free"
+					: payload.config.tools === "read-only"
+						? "read-only"
+						: "tool-enabled";
+			ctx.ui.setWidget("herdr-btw-context", [ctx.ui.theme.fg("accent", `BTW — ${capability} pane`)]);
+		}
 
 		// Auto-submit drafts are sent via the launch-draft sentinel instead of
 		// here: session_start fires before pi's initial render, and a message
@@ -548,19 +525,13 @@ export async function registerBtwExtension(
 						ctx.ui.notify(`BTW config — ${formatConfig(config)}`, "info");
 						return;
 					}
-					const trimmedArgs = route.args.trim();
-					const result = !trimmedArgs || trimmedArgs === "show"
-						? applyConfigCommand(configStore.loadSync().value, route.args)
-						: {
-							action: "save" as const,
-							config: await configStore.update((latest) => applyConfigCommand(latest, route.args).config),
-						};
-					ctx.ui.notify(
-						result.action === "show"
-							? `BTW config — ${formatConfig(result.config)}\n${CONFIG_COMMAND_USAGE}`
-							: `BTW config — ${formatConfig(result.config)}`,
-						"info",
-					);
+					if (!route.args || route.args === "show") {
+						const config = configStore.loadSync().value;
+						ctx.ui.notify(`BTW config — ${formatConfig(config)}\n${CONFIG_COMMAND_USAGE}`, "info");
+						return;
+					}
+					const config = await configStore.update((latest) => applyConfigCommand(latest, route.args));
+					ctx.ui.notify(`BTW config — ${formatConfig(config)}`, "info");
 				} catch (error) {
 					const message = error instanceof Error ? error.message : String(error);
 					ctx.ui.notify(message, "error");
@@ -706,8 +677,7 @@ export async function registerBtwExtension(
 					}
 					return;
 				}
-				const splitOutcome = classifyLaunchResult(splitResult);
-				if (splitOutcome !== "success") {
+				if (splitResult.killed || splitResult.code !== 0) {
 					await store.remove(payloadPath);
 					ctx.ui.notify(
 						`/btw failed: ${safeErrorText(splitResult.stdout, splitResult.stderr)}`,
@@ -749,29 +719,27 @@ export async function registerBtwExtension(
 					}
 					return;
 				}
-				const outcome = classifyLaunchResult(result);
-				if (outcome === "success" && !isAgentStartReady(result.stdout, { name: launchOptions.paneName, paneId })) {
-					await reportKnownPaneFailure(
-						"/btw failed: `herdr agent start` returned an invalid or non-interactive result",
-						paneId,
-						payloadPath,
-					);
-					return;
-				}
-				if (outcome === "success") {
+				if (!result.killed) {
+					if (result.code !== 0) {
+						await reportKnownPaneFailure(
+							`/btw failed: ${safeErrorText(result.stdout, result.stderr)}`,
+							paneId,
+							payloadPath,
+						);
+						return;
+					}
+					if (!isAgentStartReady(result.stdout, { name: launchOptions.paneName, paneId })) {
+						await reportKnownPaneFailure(
+							"/btw failed: `herdr agent start` returned an invalid or non-interactive result",
+							paneId,
+							payloadPath,
+						);
+						return;
+					}
 					ensurePolling();
 					return;
 				}
 
-				if (outcome === "failed") {
-					await reportKnownPaneFailure(
-						`/btw failed: ${safeErrorText(result.stdout, result.stderr)}`,
-						paneId,
-						payloadPath,
-					);
-					return;
-				}
-
 				const reconciled = await herdr
 					.exec(
 						[

package/internal/config.ts

@@ -58,16 +58,8 @@ export function formatConfig(config: BtwConfig): string {
 export const CONFIG_COMMAND_USAGE =
 	"/btw config [auto-submit on|off | tools inherit|all|read-only|none | split right|down | reset]";
 
-export type ConfigCommandResult = {
-	action: "show" | "save";
-	config: BtwConfig;
-};
-
-export function applyConfigCommand(current: BtwConfig, input: string): ConfigCommandResult {
-	const trimmed = input.trim();
-	if (!trimmed || trimmed === "show") return { action: "show", config: current };
-
-	const [key, value, ...extra] = trimmed.split(/\s+/);
+export function applyConfigCommand(current: BtwConfig, input: string): BtwConfig {
+	const [key, value, ...extra] = input.split(/\s+/);
 	if (!key || !value || extra.length > 0) throw new Error(CONFIG_COMMAND_USAGE);
 	const config = { ...current };
 
@@ -90,7 +82,7 @@ export function applyConfigCommand(current: BtwConfig, input: string): ConfigCom
 			throw new Error(CONFIG_COMMAND_USAGE);
 	}
 
-	return { action: "save", config };
+	return config;
 }
 
 export function createBtwConfigStore(agentDir?: string) {

package/internal/context-store.ts

@@ -14,7 +14,7 @@ import {
 import { tmpdir } from "node:os";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { isBtwPayload, type BtwPayload } from "./core.ts";
-import { isMergeRequest, MERGE_REQUEST_FILE, type MergeRequest } from "./merge.ts";
+import { MERGE_REQUEST_FILE, type MergeRequest } from "./merge.ts";
 
 const PAYLOAD_FILE = "payload.json";
 const LAUNCH_PREFIX = "launch-";
@@ -104,7 +104,6 @@ export class ContextStore {
 	}
 
 	async writeMergeRequest(payloadPath: string, request: MergeRequest): Promise<void> {
-		if (!isMergeRequest(request)) throw new Error("Invalid /btw merge request");
 		await this.writeLaunchFile(payloadPath, MERGE_REQUEST_FILE, request);
 	}
 

package/internal/core.ts

@@ -60,8 +60,6 @@ export type CreatePayloadOptions = {
 	messages: AgentMessage[];
 	draftQuestion: string;
 	config: BtwConfig;
-	launchId?: string;
-	capability?: string;
 };
 
 export type ParentContextMetadata = {
@@ -89,19 +87,12 @@ export type HerdrLaunchOptions = {
 	initialMessage?: string;
 };
 
-export type LaunchResult = {
-	code: number;
-	killed?: boolean;
-};
-
-export type LaunchOutcome = "success" | "failed" | "ambiguous";
-
 export function createPayload(options: CreatePayloadOptions): BtwPayload {
 	return {
 		version: PAYLOAD_VERSION,
 		createdAt: options.createdAt,
-		launchId: options.launchId ?? randomUUID(),
-		capability: options.capability ?? randomBytes(32).toString("hex"),
+		launchId: randomUUID(),
+		capability: randomBytes(32).toString("hex"),
 		parentSessionId: options.parentSessionId,
 		parentPaneId: options.parentPaneId,
 		metadata: options.metadata,
@@ -388,11 +379,6 @@ export function buildAgentStartArgs(options: HerdrLaunchOptions): string[] {
 	];
 }
 
-export function classifyLaunchResult(result: LaunchResult): LaunchOutcome {
-	if (result.killed) return "ambiguous";
-	return result.code === 0 ? "success" : "failed";
-}
-
 /**
  * Herdr CLI failures print the whole JSON response on stderr
  * (`{"id":...,"error":{"code":...,"message":...}}`, exit 1); extract the

package/internal/merge.ts

@@ -140,10 +140,7 @@ function tailBytes(text: string, maxBytes: number): string {
  * tool payloads) as the merge transcript. When over budget, whole turns are
  * dropped from the head so the most recent findings survive.
  */
-export function buildMergeTranscript(
-	messages: AgentMessage[],
-	budgetBytes = MERGE_TRANSCRIPT_BUDGET_BYTES,
-): string | undefined {
+export function buildMergeTranscript(messages: AgentMessage[]): string | undefined {
 	const turns: string[] = [];
 	for (const message of messages) {
 		const { role, content } = message as { role?: string; content?: unknown };
@@ -158,10 +155,10 @@ export function buildMergeTranscript(
 	for (let index = turns.length - 1; index >= 0; index -= 1) {
 		const turn = turns[index] as string;
 		const bytes = Buffer.byteLength(turn, "utf8") + 2;
-		if (used + bytes > budgetBytes) {
+		if (used + bytes > MERGE_TRANSCRIPT_BUDGET_BYTES) {
 			if (kept.length === 0) {
 				// A single oversized turn keeps its tail (the latest content).
-				kept.unshift(`${TRANSCRIPT_TRUNCATION_NOTE}\n${tailBytes(turn, budgetBytes)}`);
+				kept.unshift(`${TRANSCRIPT_TRUNCATION_NOTE}\n${tailBytes(turn, MERGE_TRANSCRIPT_BUDGET_BYTES)}`);
 			} else {
 				kept.unshift(TRANSCRIPT_TRUNCATION_NOTE);
 			}
@@ -271,12 +268,7 @@ export class MergeCoordinator {
 
 		// pi.sendUserMessage() is fire-and-forget. Keep the request pending when
 		// current model/auth state would reject its prompt.
-		try {
-			if (!(await this.session.canSubmitPrompt())) {
-				result.deferred += 1;
-				return;
-			}
-		} catch {
+		if (!(await this.session.canSubmitPrompt())) {
 			result.deferred += 1;
 			return;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-herdr-tools",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Clone, name, and finish Pi conversations in Herdr, with mergeable side questions.",
   "keywords": ["pi-package", "pi", "herdr", "session", "clone", "side-thread", "title"],
   "type": "module",