@oh-my-pi/pi-coding-agent 16.3.5 → 16.3.7

package/src/edit/renderer.ts

@@ -108,8 +108,8 @@ export interface EditToolDetails {
 // ═══════════════════════════════════════════════════════════════════════════
 
 interface EditRenderArgs {
-	path?: string;
-	file_path?: string;
+	path?: unknown;
+	file_path?: unknown;
 	oldText?: string;
 	newText?: string;
 	patch?: string;
@@ -118,7 +118,7 @@ interface EditRenderArgs {
 	all?: boolean;
 	// Patch mode fields
 	op?: Operation;
-	rename?: string;
+	rename?: unknown;
 	diff?: string;
 	/**
 	 * Computed preview diff (used when tool args don't include a diff, e.g. hashline mode).
@@ -130,9 +130,9 @@ interface EditRenderArgs {
 }
 
 type EditRenderEntry = {
-	path?: string;
-	rename?: string;
-	move?: string;
+	path?: unknown;
+	rename?: unknown;
+	move?: unknown;
 	op?: Operation;
 };
 
@@ -192,8 +192,11 @@ const CALL_TEXT_PREVIEW_LINES = 6;
 const CALL_TEXT_PREVIEW_WIDTH = 80;
 
 /** Extract file path from an edit entry. */
-function filePathFromEditEntry(p: string | undefined): string | undefined {
-	return p ?? undefined;
+function filePathFromEditEntry(p: unknown): string | undefined {
+	if (typeof p !== "string") {
+		return undefined;
+	}
+	return p;
 }
 
 function decodePartialJsonStringFragment(fragment: string): string {
@@ -696,11 +699,6 @@ function wrapEditRendererLine(line: string, width: number): string[] {
 
 export const editToolRenderer = {
 	mergeCallAndResult: true,
-	// Pending preview is a TAIL window of the streamed diff ("… N more lines
-	// above" + last rows); the result render re-anchors the block top-first, so
-	// committing the preview's settled head would strand a stale call-box
-	// fragment in native scrollback.
-	provisionalPendingPreview: true,
 
 	renderCall(
 		args: EditRenderArgs,
@@ -716,18 +714,20 @@ export const editToolRenderer = {
 		// Extract path from first edit entry when top-level path is absent (new schema)
 		const firstEdit = Array.isArray(editArgs.edits) && editArgs.edits.length > 0 ? editArgs.edits[0] : undefined;
 		const rawPath =
-			editArgs.file_path ||
-			editArgs.path ||
-			filePathFromEditEntry(firstEdit?.path) ||
-			getPartialJsonEditPath(editArgs) ||
-			firstHashlineInputEntry?.path ||
-			firstApplyPatchEntry?.path ||
-			"";
+			typeof editArgs.file_path === "string"
+				? editArgs.file_path
+				: typeof editArgs.path === "string"
+					? editArgs.path
+					: (filePathFromEditEntry(firstEdit?.path) ??
+						getPartialJsonEditPath(editArgs) ??
+						firstHashlineInputEntry?.path ??
+						firstApplyPatchEntry?.path ??
+						"");
 		const rename =
-			editArgs.rename ||
-			firstEdit?.rename ||
-			firstEdit?.move ||
-			firstApplyPatchEntry?.rename ||
+			(typeof editArgs.rename === "string" ? editArgs.rename : undefined) ??
+			filePathFromEditEntry(firstEdit?.rename) ??
+			filePathFromEditEntry(firstEdit?.move) ??
+			firstApplyPatchEntry?.rename ??
 			firstHashlineInputEntry?.rename;
 		const op = editArgs.op || firstEdit?.op || firstApplyPatchEntry?.op || firstHashlineInputEntry?.op;
 		let fileCount = hashlineInputSummary?.entries.length ?? applyPatchSummary?.entries.length ?? 0;
@@ -786,8 +786,9 @@ export const editToolRenderer = {
 		uiTheme: Theme,
 		args?: EditRenderArgs,
 	): Component {
+		const edits = Array.isArray(args?.edits) ? args.edits : undefined;
 		const perFileResults = result.details?.perFileResults;
-		const totalFiles = args?.edits ? countEditFiles(args.edits) : 0;
+		const totalFiles = edits ? countEditFiles(edits) : 0;
 		if (perFileResults && (perFileResults.length > 1 || totalFiles > 1)) {
 			return renderMultiFileResult(perFileResults, totalFiles, options, uiTheme);
 		}
@@ -807,20 +808,26 @@ function renderSingleFileResult(
 ): Component {
 	const details = result.details;
 	const isError = result.isError ?? (details && "isError" in details ? details.isError : false);
-	const firstEdit = args?.edits?.[0];
+	const edits = Array.isArray(args?.edits) ? args.edits : undefined;
+	const firstEdit = edits?.[0];
 	const hashlineInputSummary = getHashlineInputRenderSummary(args ?? {}, options.renderContext?.editMode);
 	const firstHashlineInputEntry = hashlineInputSummary?.entries[0];
-	const moveSource = details && "sourcePath" in details ? details.sourcePath : undefined;
+	const moveSource =
+		details && "sourcePath" in details && typeof details.sourcePath === "string" ? details.sourcePath : undefined;
+	const detailPath = details && "path" in details && typeof details.path === "string" ? details.path : undefined;
 	const rawPath =
-		moveSource ||
-		args?.file_path ||
-		args?.path ||
-		filePathFromEditEntry(firstEdit?.path) ||
-		(details && "path" in details ? details.path : "") ||
-		firstHashlineInputEntry?.path ||
-		"";
+		moveSource ??
+		(typeof args?.file_path === "string"
+			? args.file_path
+			: typeof args?.path === "string"
+				? args.path
+				: (filePathFromEditEntry(firstEdit?.path) ?? detailPath ?? firstHashlineInputEntry?.path ?? ""));
 	const op = args?.op || firstEdit?.op || details?.op;
-	const rename = args?.rename || firstEdit?.rename || firstEdit?.move || details?.move;
+	const rename =
+		(typeof args?.rename === "string" ? args.rename : undefined) ??
+		filePathFromEditEntry(firstEdit?.rename) ??
+		filePathFromEditEntry(firstEdit?.move) ??
+		(details && "move" in details && typeof details.move === "string" ? details.move : undefined);
 
 	const displayErrorText = isError && details && "displayErrorText" in details ? details.displayErrorText : undefined;
 	const errorText = isError

package/src/eval/__tests__/agent-bridge.test.ts

@@ -1172,6 +1172,25 @@ describe("runEvalAgent isolation", () => {
 		).rejects.toThrow(/isolated apply failed.*Patch apply failed.*Captured patch preserved at \/artifacts\//s);
 	});
 
+	it("surfaces the preserved patch path when branch-mode transfer fails before merge runs", async () => {
+		mockAgents();
+		mockIsolationContext();
+		vi.spyOn(isolationRunner, "runIsolatedSubprocess").mockImplementation(async opts =>
+			singleResult(opts.baseOptions, {
+				output: "ran",
+				patchPath: `/artifacts/${opts.agentId}.patch`,
+				error: "Merge failed: remote: garbage at end of loose object '4de7bad'",
+			}),
+		);
+		const mergeSpy = vi.spyOn(isolationRunner, "mergeIsolatedChanges");
+
+		const session = isolatedSession({ "task.isolation.merge": "branch" });
+		await expect(runEvalAgent({ prompt: "scout", isolated: true }, { session })).rejects.toThrow(
+			/Merge failed.*garbage at end of loose object.*Captured patch preserved at \/artifacts\//s,
+		);
+		expect(mergeSpy).not.toHaveBeenCalled();
+	});
+
 	it("throws on apply failure for non-schema callers too instead of burying the warning in text", async () => {
 		mockAgents();
 		mockIsolationContext();

package/src/eval/__tests__/budget-bridge.test.ts

@@ -23,7 +23,18 @@ function goalState(extra: Partial<GoalModeState["goal"]>): GoalModeState {
 }
 
 function usage(output: number): UsageStatistics {
-	return { input: 0, output, cacheRead: 0, cacheWrite: 0, premiumRequests: 0, cost: 0 };
+	return {
+		input: 0,
+		output,
+		cacheRead: 0,
+		cacheWrite: 0,
+		totalTokens: output,
+		orchestrationInput: 0,
+		orchestrationOutput: 0,
+		orchestrationCacheRead: 0,
+		premiumRequests: 0,
+		cost: 0,
+	};
 }
 
 describe("runEvalBudget", () => {

package/src/eval/agent-bridge.ts

@@ -240,6 +240,25 @@ async function persistNestedPatches(
 	return written;
 }
 
+/**
+ * Assemble the "captured X preserved at Y" recovery hint appended to
+ * isolated-run failure messages. Persists nested-repo patches to
+ * `artifactsDir` when present so their paths can be surfaced. Returns an
+ * empty string when the result carries no salvageable artifacts.
+ */
+async function buildIsolationRecoveryHint(result: SingleResult, artifactsDir: string): Promise<string> {
+	const parts: string[] = [];
+	if (result.patchPath) parts.push(`Captured patch preserved at ${result.patchPath}.`);
+	if (result.branchName) parts.push(`Captured branch preserved as ${result.branchName}.`);
+	if (result.nestedPatches?.length) {
+		const nestedPaths = await persistNestedPatches(artifactsDir, result.id, result.nestedPatches);
+		parts.push(
+			`Captured nested repository patches (${result.nestedPatches.length}) preserved at: ${nestedPaths.join(", ")}.`,
+		);
+	}
+	return parts.length > 0 ? ` ${parts.join(" ")}` : "";
+}
+
 function plainIsolationSummary(summary: string): string {
 	return summary.replace(/<\/?system-notification>/g, "").trim();
 }
@@ -481,7 +500,9 @@ export async function runEvalAgent(args: unknown, options: EvalAgentBridgeOption
 		})();
 
 		if (result.exitCode !== 0 || result.error || result.aborted) {
-			throw new ToolError(buildSubagentFailureMessage(agentName, result));
+			const failureMessage = buildSubagentFailureMessage(agentName, result);
+			const recoveryHint = isIsolated ? await buildIsolationRecoveryHint(result, artifactsDir) : "";
+			throw new ToolError(`${failureMessage}${recoveryHint}`);
 		}
 
 		let mergeSummary = "";
@@ -497,16 +518,7 @@ export async function runEvalAgent(args: unknown, options: EvalAgentBridgeOption
 				changesApplied = outcome.changesApplied;
 				if (outcome.changesApplied === false) {
 					const summaryText = outcome.summary.trim();
-					const recoveryParts: string[] = [];
-					if (result.patchPath) recoveryParts.push(`Captured patch preserved at ${result.patchPath}.`);
-					if (result.branchName) recoveryParts.push(`Captured branch preserved as ${result.branchName}.`);
-					if (result.nestedPatches?.length) {
-						const nestedPaths = await persistNestedPatches(artifactsDir, result.id, result.nestedPatches);
-						recoveryParts.push(
-							`Captured nested repository patches (${result.nestedPatches.length}) preserved at: ${nestedPaths.join(", ")}.`,
-						);
-					}
-					const recoveryHint = recoveryParts.length > 0 ? ` ${recoveryParts.join(" ")}` : "";
+					const recoveryHint = await buildIsolationRecoveryHint(result, artifactsDir);
 					throw new ToolError(
 						`agent() isolated apply failed for ${result.id}${summaryText ? `: ${summaryText}` : ""}${recoveryHint}`,
 					);
@@ -522,14 +534,10 @@ export async function runEvalAgent(args: unknown, options: EvalAgentBridgeOption
 				});
 				mergeSummary += nestedSummary;
 				if (structured && nestedSummary.trim()) {
-					const recoveryParts: string[] = [];
-					if (result.nestedPatches?.length) {
-						const nestedPaths = await persistNestedPatches(artifactsDir, result.id, result.nestedPatches);
-						recoveryParts.push(
-							`Captured nested repository patches (${result.nestedPatches.length}) preserved at: ${nestedPaths.join(", ")}.`,
-						);
-					}
-					const recoveryHint = recoveryParts.length > 0 ? ` ${recoveryParts.join(" ")}` : "";
+					const recoveryHint = await buildIsolationRecoveryHint(
+						{ ...result, patchPath: undefined, branchName: undefined },
+						artifactsDir,
+					);
 					throw new ToolError(
 						`agent() isolated nested patch apply failed for ${result.id}: ${plainIsolationSummary(nestedSummary)}${recoveryHint}`,
 					);

package/src/eval/js/context-manager.ts

@@ -509,11 +509,14 @@ function wrapBunWorker(worker: Worker): WorkerHandle {
 			const onError = (event: ErrorEvent): void => handler(errorFromWorkerEvent(event));
 			const onMessageError = (event: MessageEvent): void =>
 				handler(new ToolError(`JS eval worker message error: ${String(event.data)}`));
+			const onClose = (): void => handler(new Error("JS eval worker exited"));
 			worker.addEventListener("error", onError);
 			worker.addEventListener("messageerror", onMessageError);
+			worker.addEventListener("close", onClose);
 			return () => {
 				worker.removeEventListener("error", onError);
 				worker.removeEventListener("messageerror", onMessageError);
+				worker.removeEventListener("close", onClose);
 			};
 		},
 		async close() {

package/src/export/ttsr.ts

@@ -77,6 +77,8 @@ export class TtsrManager {
 	/** Last snapshot evaluated for AST conditions, keyed by stream key, to dedupe matcher runs. */
 	readonly #lastAstSnapshots = new Map<string, string>();
 	#messageCount = 0;
+	#canMatchText = false;
+	#canMatchThinking = false;
 
 	constructor(settings?: TtsrSettings) {
 		this.#settings = { ...DEFAULT_SETTINGS, ...settings };
@@ -329,6 +331,8 @@ export class TtsrManager {
 			scope,
 			globalPathGlobs,
 		});
+		if (scope.allowText) this.#canMatchText = true;
+		if (scope.allowThinking) this.#canMatchThinking = true;
 
 		logger.debug("TTSR rule registered", {
 			ruleName: rule.name,
@@ -348,6 +352,12 @@ export class TtsrManager {
 	 * assistant prose, thinking text, and unrelated tool argument streams.
 	 */
 	checkDelta(delta: string, context: TtsrMatchContext): Rule[] {
+		if (context.source === "text" && !this.#canMatchText) {
+			return [];
+		}
+		if (context.source === "thinking" && !this.#canMatchThinking) {
+			return [];
+		}
 		const bufferKey = this.#bufferKey(context);
 		const nextBuffer = `${this.#buffers.get(bufferKey) ?? ""}${delta}`;
 		this.#buffers.set(bufferKey, nextBuffer);

package/src/extensibility/custom-tools/types.ts

@@ -26,6 +26,7 @@ import type * as PiCodingAgent from "../../index";
 import type { Theme } from "../../modes/theme/theme";
 import type { ReadonlySessionManager } from "../../session/session-manager";
 import type { TodoItem } from "../../tools/todo";
+import type { RecoveredRetryError } from "../shared-events";
 import type * as TypeBox from "../typebox";
 
 /** Alias for clarity */
@@ -133,6 +134,7 @@ export type CustomToolSessionEvent =
 			success: boolean;
 			attempt: number;
 			finalError?: string;
+			recoveredErrors?: RecoveredRetryError[];
 	  }
 	| {
 			reason: "ttsr_triggered";

package/src/extensibility/extensions/loader.ts

@@ -18,7 +18,7 @@ import type { ExecOptions } from "../../exec/exec";
 import { execCommand } from "../../exec/exec";
 // Runtime self-reference: dereference this namespace only inside loader functions to keep the index.ts cycle safe.
 import * as PiCodingAgent from "../../index";
-import type { CustomMessage } from "../../session/messages";
+import type { CustomMessagePayload } from "../../session/messages";
 import { EventBus } from "../../utils/event-bus";
 import { installLegacyPiSpecifierShim, loadLegacyPiModule } from "../plugins/legacy-pi-compat";
 import { getAllPluginExtensionPaths } from "../plugins/loader";
@@ -203,7 +203,7 @@ class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 	}
 
 	sendMessage<T = unknown>(
-		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
+		message: CustomMessagePayload<T>,
 		options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" | "nextTurn" },
 	): void {
 		this.runtime.sendMessage(message, options);

package/src/extensibility/extensions/types.ts

@@ -45,7 +45,7 @@ import type { MemoryRuntimeContext } from "../../memory-backend";
 import type { CustomEditor } from "../../modes/components/custom-editor";
 import type { Theme } from "../../modes/theme/theme";
 import type { CompactMode } from "../../session/compact-modes";
-import type { CustomMessage } from "../../session/messages";
+import type { CustomMessage, CustomMessagePayload } from "../../session/messages";
 import type { ReadonlySessionManager, SessionManager } from "../../session/session-manager";
 import type {
 	BashToolDetails,
@@ -294,6 +294,18 @@ export interface CompactOptions {
 	 * subcommands: `soft` | `remote` | `snapcompact`). Omitted = configured behavior.
 	 */
 	mode?: CompactMode;
+	/**
+	 * Internal summarizer guidance — piped only to native summarization, never
+	 * exposed as `customInstructions` on the `session_before_compact` extension
+	 * hook. Used by plan-mode "Approve and compact context" so extensions that
+	 * treat `customInstructions` as user focus don't mistake plan-mode
+	 * boilerplate for the operator's intent (issue #4359).
+	 *
+	 * When both `customInstructions` and `internalGuidance` are set, the
+	 * summarizer uses `internalGuidance`; the hook still sees only the public
+	 * `customInstructions`.
+	 */
+	internalGuidance?: string;
 }
 
 /**
@@ -881,7 +893,7 @@ export interface UserPythonEventResult {
 export type { ToolResultEventResult } from "../shared-events";
 
 export interface BeforeAgentStartEventResult {
-	message?: Pick<CustomMessage, "customType" | "content" | "display" | "details" | "attribution">;
+	message?: CustomMessagePayload;
 	/** Replace the system prompt for this turn. If multiple extensions return this, they are chained. */
 	systemPrompt?: string[];
 }
@@ -1091,7 +1103,7 @@ export interface ExtensionAPI {
 	 * an internal continuation that consumes the message on the next turn.
 	 */
 	sendMessage<T = unknown>(
-		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
+		message: CustomMessagePayload<T>,
 		options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" | "nextTurn" },
 	): void;
 
@@ -1277,7 +1289,7 @@ export interface ExtensionShortcut {
 type HandlerFn = (...args: unknown[]) => Promise<unknown>;
 
 export type SendMessageHandler = <T = unknown>(
-	message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
+	message: CustomMessagePayload<T>,
 	/**
 	 * `deliverAs: "nextTurn"` queues hidden custom context for the next turn.
 	 * When paired with `triggerTurn: true` during prompt teardown, the session schedules

package/src/extensibility/hooks/loader.ts

@@ -10,7 +10,7 @@ import type { Hook } from "../../discovery";
 import { loadCapability } from "../../discovery";
 // Runtime self-reference: dereference this namespace only inside loader functions to keep the index.ts cycle safe.
 import * as PiCodingAgent from "../../index";
-import type { HookMessage } from "../../session/messages";
+import type { CustomMessagePayload } from "../../session/messages";
 import * as typebox from "../typebox";
 import { resolvePath, withExitGuard } from "../utils";
 import { execCommand } from "./runner";
@@ -25,7 +25,7 @@ type HandlerFn = (...args: unknown[]) => Promise<unknown>;
  * Send message handler type for pi.sendMessage().
  */
 export type SendMessageHandler = <T = unknown>(
-	message: Pick<HookMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
+	message: CustomMessagePayload<T>,
 	options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" },
 ) => void;
 
@@ -97,7 +97,7 @@ async function createHookAPI(
 			handlers.get(event)!.push(handler);
 		},
 		sendMessage<T = unknown>(
-			message: HookMessage<T>,
+			message: CustomMessagePayload<T>,
 			options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" },
 		): void {
 			if (!sendMessageHandler) {

package/src/extensibility/hooks/types.ts

@@ -8,7 +8,7 @@ import type { EditToolDetails } from "../../edit";
 import type { ExecOptions, ExecResult } from "../../exec/exec";
 import type * as PiCodingAgent from "../../index";
 import type { Theme } from "../../modes/theme/theme";
-import type { HookMessage } from "../../session/messages";
+import type { CustomMessagePayload, HookMessage } from "../../session/messages";
 import type { ReadonlySessionManager, SessionManager } from "../../session/session-manager";
 import type { BashToolDetails, GlobToolDetails, GrepToolDetails, ReadToolDetails } from "../../tools";
 import type {
@@ -425,7 +425,7 @@ export type { ToolCallEventResult, ToolResultEventResult } from "../shared-event
  */
 export interface BeforeAgentStartEventResult {
 	/** Message to inject into context (persisted to session, visible in TUI) */
-	message?: Pick<HookMessage, "customType" | "content" | "display" | "details" | "attribution">;
+	message?: CustomMessagePayload;
 }
 
 export type {
@@ -519,7 +519,7 @@ export interface HookAPI {
 	 * Use this when you want the LLM to see the message content.
 	 * For hook state that should NOT be sent to the LLM, use appendEntry() instead.
 	 *
-	 * @param message - The message to send
+	 * @param message - The message object to send, or a string shorthand for visible message content
 	 * @param message.customType - Identifier for your hook (used for filtering on reload)
 	 * @param message.content - Message content (string or TextContent/ImageContent array)
 	 * @param message.display - Whether to show in TUI (true = styled display, false = hidden)
@@ -530,7 +530,7 @@ export interface HookAPI {
 	 * @param options.deliverAs - How to deliver the message: "steer" or "followUp".
 	 */
 	sendMessage<T = unknown>(
-		message: Pick<HookMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
+		message: CustomMessagePayload<T>,
 		options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" },
 	): void;
 

package/src/extensibility/legacy-pi-ai-shim.ts

@@ -19,7 +19,13 @@
  * `types.ts` via the `export *` below — pi-ai still exports both as types,
  * only the runtime `Type` builder and `StringEnum()` helper were removed.
  */
-import { getBundledModel, getBundledModels } from "@oh-my-pi/pi-catalog/models";
+import {
+	calculateCost,
+	getBundledModel,
+	getBundledModels,
+	getBundledProviders,
+	modelsAreEqual,
+} from "@oh-my-pi/pi-catalog/models";
 import { type TSchema, Type } from "./typebox";
 
 export interface StringEnumOptions<T extends string> {
@@ -66,8 +72,15 @@ export function StringEnum<T extends string | number>(
 }
 
 export * from "@oh-my-pi/pi-ai";
-export { Type };
-
-/** Compatibility aliases for renamed catalog functions */
+/**
+ * Compatibility re-exports for catalog symbols that pi-ai historically exposed
+ * from its own barrel prior to the `refactor(catalog)!: split model catalog
+ * from pi-ai` change. Legacy extensions still import these from the pi-ai
+ * root, so the shim bridges them through to their new home in
+ * `@oh-my-pi/pi-catalog/models`. `getModel`/`getModels` are the historical
+ * pi-ai names for `getBundledModel`/`getBundledModels`; the remaining symbols
+ * kept their names across the move.
+ */
+export { calculateCost, getBundledModel, getBundledModels, getBundledProviders, modelsAreEqual, Type };
 export const getModel = getBundledModel;
 export const getModels = getBundledModels;