@diegopetrucci/pi-extensions 0.1.52 → 0.1.54

package/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/README.md

@@ -2,32 +2,52 @@
 
 [![Total npm downloads](https://img.shields.io/npm/dt/%40diegopetrucci%2Fpi-extensions?label=total%20npm%20downloads)](https://www.npmjs.com/package/@diegopetrucci/pi-extensions)
 
-A collection of [pi](https://github.com/earendil-works/pi-mono) agent extensions and skills I made.
+A collection of [pi](https://pi.dev) agent extensions I made.
+
+### Subagents
+
+- [`contrarian`](./extensions/contrarian): Adds a read-only contrarian tool that spins up an isolated subprocess to stress-test plans, designs, assumptions, bug hypotheses, and conclusions by steelmanning the strongest opposing case.
+- [`librarian`](./extensions/librarian): Adds a GitHub research scout with a local repo checkout cache disabled by default under the OS user cache directory, toggleable with `/librarian-cache`, configurable subagent model/thinking defaults via `/librarian-config`, and cached repos expiring after 7 days of non-use.
+- [`oracle`](./extensions/oracle): Adds an Amp-style read-only oracle tool that auto-selects the strongest reasoning model on the current provider/subscription, supports persisted `/oracle` model/thinking defaults, requests xhigh reasoning by default and clamps to model capabilities, and shows live status while running.
+
+### Providers
+
+- [`claude-fast`](./extensions/claude-fast): Adds `/claude-fast` to enable Anthropic Claude Fast mode for supported Claude Opus models by injecting `speed: "fast"`.
+- [`openai-fast`](./extensions/openai-fast): Adds `/fast` to enable OpenAI Codex Fast mode for ChatGPT-auth GPT-5.4 and GPT-5.5 by injecting the priority service tier.
+
+### UI
+
+- [`git-footer`](./extensions/git-footer): Standalone extension that adds TLH-style git dirty counts, ahead/behind, and optional PR number to pi's built-in footer status area.
+- [`minimal-footer`](./extensions/minimal-footer): Replaces pi's built-in footer with a minimal configurable two-line layout: branch plus cached git dirty/ahead/PR status and repo on the first line, context/model on the second, optional `DUMB ZONE`, optional `xp` marker, plus OpenAI Codex 5-hour and 7-day usage when available.
+- [`quiet-tools`](./extensions/quiet-tools): Renders collapsed built-in tool rows as a one-line invocation plus an expand hint without changing model-visible tool results; toggle temporarily with `/quiet-tools`.
+
+### / Slash commands
 
 - [`agent-workflow-audit`](./extensions/agent-workflow-audit): Adds `/agent-workflow-audit`, which runs an isolated repo workflow audit subagent and returns only the final distilled report to the main session.
 - [`annotate-git-diff`](./extensions/annotate-git-diff): Adds `/annotate-git-diff`, a native Glimpse UI for annotating git diffs and appending structured feedback prompts to the editor.
 - [`annotate-last-message`](./extensions/annotate-last-message): Adds `/annotate-last-message`, a native Glimpse UI for annotating the latest assistant reply and sending planning-oriented feedback back through the editor.
-- [`brrr`](./extensions/brrr): Sends brrr push notifications when pi finishes an agent turn and is ready for input, with optional macOS idle gating.
-- [`claude-fast`](./extensions/claude-fast): Adds `/claude-fast` to enable Anthropic Claude Fast mode for supported Claude Opus models by injecting `speed: "fast"`.
-- [`confirm-destructive`](./extensions/confirm-destructive): Confirms before destructive session actions like clear, switch, and fork.
-- [`contrarian`](./extensions/contrarian): Adds a read-only contrarian tool that spins up an isolated subprocess to stress-test plans, designs, assumptions, bug hypotheses, and conclusions by steelmanning the strongest opposing case.
+- [`review`](./extensions/review): Adds `/review` and `/end-review` for interactive code reviews of local changes, commits, PRs, and selected paths.
+- [`triage-comments`](./extensions/triage-comments): Adds `/triage-comments` and a read-only `triage_comments` subagent tool that can auto-detect the current branch's PR, filter resolved/outdated inline comments, classify selected review comments with evidence, and suggest handling options without implementing changes
+
+### Context management
+
 - [`context-cap`](./extensions/context-cap): Caps effective model context windows at 200k tokens by default so pi avoids the `dumb zone`; toggle temporarily with `/context-cap`.
 - [`context-inspector`](./extensions/context-inspector): Adds `/context`, a local self-contained HTML dashboard that breaks down where the current session context is going, with category overview, top offenders, and drilldown search.
+
+### Safety
+
+- [`confirm-destructive`](./extensions/confirm-destructive): Confirms before destructive session actions like clear, switch, and fork.
 - [`dirty-repo-guard`](./extensions/dirty-repo-guard): Prompts before new sessions, session switches, or forks when the current git repo has uncommitted changes.
-- [`git-footer`](./extensions/git-footer): Standalone extension that adds TLH-style git dirty counts, ahead/behind, and optional PR number to pi's built-in footer status area.
+- [`permission-gate`](./extensions/permission-gate): Prompts for confirmation before dangerous bash commands like `rm -rf`, `sudo`, and `chmod 777`.
+
+### Quality of life
+
+- [`brrr`](./extensions/brrr): Sends brrr push notifications when pi finishes an agent turn and is ready for input, with optional macOS idle gating.
 - [`gnosis`](./extensions/gnosis): Exposes the `gn` repo-local knowledge base CLI as an agent tool for searching and recording durable project decisions, constraints, and intent.
 - [`illustrations-to-explain-things`](./extensions/illustrations-to-explain-things): Adds a skill for generating clean, absurd Xiaohei-style article illustrations, shot lists, image edits, and visual metaphors.
 - [`inline-bash`](./extensions/inline-bash): Expands `!{command}` snippets in user prompts by running them through bash before the prompt reaches the agent.
-- [`librarian`](./extensions/librarian): Adds a GitHub research scout with a local repo checkout cache disabled by default under the OS user cache directory, toggleable with `/librarian-cache`, configurable subagent model/thinking defaults via `/librarian-config`, and cached repos expiring after 7 days of non-use.
-- [`minimal-footer`](./extensions/minimal-footer): Replaces pi's built-in footer with a minimal configurable two-line layout: branch plus cached git dirty/ahead/PR status and repo on the first line, context/model on the second, optional `DUMB ZONE`, optional `xp` marker, plus OpenAI Codex 5-hour and 7-day usage when available.
 - [`notify`](./extensions/notify): Sends configurable terminal, desktop, bell, and sound notifications when pi finishes and is ready for input.
-- [`openai-fast`](./extensions/openai-fast): Adds `/fast` to enable OpenAI Codex Fast mode for ChatGPT-auth GPT-5.4 and GPT-5.5 by injecting the priority service tier.
-- [`oracle`](./extensions/oracle): Adds an Amp-style read-only oracle tool that auto-selects the strongest reasoning model on the current provider/subscription, supports persisted `/oracle` model/thinking defaults, requests xhigh reasoning by default and clamps to model capabilities, and shows live status while running.
-- [`permission-gate`](./extensions/permission-gate): Prompts for confirmation before dangerous bash commands like `rm -rf`, `sudo`, and `chmod 777`.
-- [`quiet-tools`](./extensions/quiet-tools): Renders collapsed built-in tool rows as a one-line invocation plus an expand hint without changing model-visible tool results; toggle temporarily with `/quiet-tools`.
-- [`review`](./extensions/review): Adds `/review` and `/end-review` for interactive code reviews of local changes, commits, PRs, and selected paths.
-- [`todo`](./extensions/todo): Adds a branch-aware `todo` tool for the agent and a `/todos` viewer for users.
-- [`triage-comments`](./extensions/triage-comments): Adds `/triage-comments` and a read-only `triage_comments` subagent tool that can auto-detect the current branch's PR, filter resolved/outdated inline comments, classify selected review comments with evidence, and suggest handling options without implementing changes.
+- [`todo`](./extensions/todo): Adds a branch-aware `todo` tool for the agent and a `/todos` viewer for users..
 
 (For the full list of pi extensions I use, [check out my dotfiles](https://github.com/diegopetrucci/dot/blob/main/.pi/agent/settings.json).)
 

package/extensions/agent-workflow-audit/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/extensions/agent-workflow-audit/index.ts

@@ -1103,6 +1103,18 @@ async function runAudit(
 	}
 }
 
+export const __test__ = {
+	appendRunBoundary,
+	assertToolPathInsideCwd,
+	buildSystemPrompt,
+	buildUserPrompt,
+	createAuditRuntimeGuardExtension,
+	formatToolCall,
+	getBlockedBashReason,
+	parseArgs,
+	renderCollapsedReport,
+};
+
 export default function agentWorkflowAuditExtension(pi: ExtensionAPI) {
 	pi.registerMessageRenderer(CUSTOM_TYPE, (message, { expanded }, theme) => {
 		const details = message.details as AuditDetails | undefined;

package/extensions/agent-workflow-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-agent-workflow-audit",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A pi extension that runs an isolated repo workflow audit and returns only the final report to the main session.",
   "keywords": [
     "pi-package",

package/extensions/annotate-git-diff/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/extensions/annotate-git-diff/git.ts

@@ -938,6 +938,7 @@ export async function loadReviewFileContents(
 }
 
 export const __testing = {
+	parseNameStatus,
 	parseStatusPorcelainZ,
 	shouldNormalizeBranchChanges,
 };

package/extensions/annotate-git-diff/index.ts

@@ -94,7 +94,7 @@ export default function (pi: ExtensionAPI) {
 	}
 
 	async function reviewRepository(ctx: ExtensionCommandContext): Promise<void> {
-		if (!ctx.hasUI) {
+		if (ctx.mode !== "tui") {
 			ctx.ui.notify("annotate-git-diff requires interactive mode.", "error");
 			return;
 		}

package/extensions/annotate-git-diff/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-annotate-git-diff",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A standalone pi extension that adds /annotate-git-diff, a native Glimpse UI for annotating git diffs and sending feedback to the editor.",
   "keywords": [
     "pi-package",

package/extensions/annotate-git-diff/prompt.ts

@@ -43,6 +43,7 @@ function formatLocation(comment: DiffReviewComment, file: ReviewFile | undefined
 
 export function composeReviewPrompt(files: ReviewFile[], payload: ReviewSubmitPayload): string {
 	const fileMap = new Map(files.map((file) => [file.id, file]));
+	const comments = payload.comments.filter((comment) => comment.body.trim().length > 0);
 	const lines: string[] = [];
 
 	lines.push("Please address the following feedback");
@@ -54,7 +55,7 @@ export function composeReviewPrompt(files: ReviewFile[], payload: ReviewSubmitPa
 		lines.push("");
 	}
 
-	payload.comments.forEach((comment, index) => {
+	comments.forEach((comment, index) => {
 		const file = fileMap.get(comment.fileId);
 		lines.push(`${index + 1}. ${formatLocation(comment, file)}`);
 		lines.push(`   ${comment.body.trim()}`);

package/extensions/annotate-last-message/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/extensions/annotate-last-message/index.ts

@@ -38,7 +38,7 @@ export function registerAnnotateLastMessageCommand(pi: ExtensionAPI): void {
 	}
 
 	async function openAnnotationWindow(ctx: ExtensionCommandContext): Promise<void> {
-		if (!ctx.hasUI) {
+		if (ctx.mode !== "tui") {
 			ctx.ui.notify("annotate-last-message requires interactive mode.", "error");
 			return;
 		}

package/extensions/annotate-last-message/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-annotate-last-message",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A standalone pi extension that adds /annotate-last-message, a native Glimpse UI for annotating the latest assistant reply.",
   "keywords": [
     "pi-package",

package/extensions/brrr/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/extensions/brrr/index.ts

@@ -159,8 +159,9 @@ function extractTextContent(content: unknown): string {
 		}
 		if (typeof part !== "object" || part === null) continue;
 
-		const maybeText = (part as { text?: unknown }).text;
-		if (typeof maybeText === "string") parts.push(maybeText);
+		const typedPart = part as { type?: unknown; text?: unknown };
+		if (typedPart.type !== undefined && typedPart.type !== "text") continue;
+		if (typeof typedPart.text === "string") parts.push(typedPart.text);
 	}
 
 	return parts.join("\n");
@@ -173,7 +174,7 @@ function lastAssistantMessage(messages: readonly unknown[]): string | undefined
 		if ((message as { role?: unknown }).role !== "assistant") continue;
 
 		const text = extractTextContent((message as { content?: unknown }).content).trim();
-		if (text) return text;
+		return text || undefined;
 	}
 
 	return undefined;

package/extensions/brrr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-brrr",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "A pi extension that sends brrr push notifications when pi is ready for input.",
   "keywords": [
     "pi-package",

package/extensions/claude-fast/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/extensions/claude-fast/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-claude-fast",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "A pi extension that enables Anthropic Claude Fast mode for supported Claude Opus models by injecting speed=fast.",
   "keywords": [
     "pi-package",

package/extensions/confirm-destructive/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/extensions/confirm-destructive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-confirm-destructive",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "A pi extension that confirms destructive session actions.",
   "keywords": [
     "pi-package",

package/extensions/context-cap/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/extensions/context-cap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-context-cap",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A pi extension that caps effective model context windows at 200k tokens for earlier auto-compaction.",
   "keywords": [
     "pi-package",

package/extensions/context-inspector/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/extensions/context-inspector/index.ts

@@ -1447,6 +1447,11 @@ pre { margin: 0; white-space: pre-wrap; word-break: break-word; color: #cbd5e1;
 </html>`;
 }
 
+export const __testing = {
+	analyzeEntries,
+	buildReportData,
+};
+
 export default function contextInspectorExtension(pi: ExtensionAPI) {
 	pi.registerCommand("context", {
 		description: "Open a local HTML breakdown of where this session's context is going",

package/extensions/context-inspector/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-context-inspector",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A pi extension that opens a local HTML dashboard explaining where the current session context is going.",
   "keywords": [
     "pi-package",

package/extensions/contrarian/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/extensions/contrarian/index.ts

@@ -72,7 +72,20 @@ const COLLAPSED_LINE_LIMIT = 8;
 const CONTRARIAN_STATUS_ID = "contrarian";
 const CONTRARIAN_WIDGET_ID = "contrarian";
 const CONTRARIAN_CONFIG_FILE = "contrarian.json";
-const CONTRARIAN_MODEL_PREFERENCES = ["gpt-5.5", "claude-opus-4-8", "claude-opus-4.8"];
+const CONTRARIAN_MODEL_PREFERENCES = [
+	"gpt-5.5",
+	"claude-opus-4-8",
+	"claude-opus-4.8",
+	"claude-sonnet-5-0",
+	"claude-sonnet-5.0",
+	"claude-sonnet-5",
+	"claude-sonnet-4-6",
+	"claude-sonnet-4.6",
+	"claude-sonnet-4-5",
+	"claude-sonnet-4.5",
+	"claude-sonnet-4-0",
+	"claude-sonnet-4",
+];
 
 const PROVIDER_MODEL_PREFERENCES: Record<string, string[]> = {
 	"amazon-bedrock": [
@@ -83,6 +96,7 @@ const PROVIDER_MODEL_PREFERENCES: Record<string, string[]> = {
 		"claude-opus-4-5",
 		"claude-opus-4-1",
 		"claude-opus-4",
+		"claude-sonnet-5",
 		"claude-sonnet-4-6",
 		"claude-sonnet-4-5",
 		"claude-sonnet-4",
@@ -107,6 +121,9 @@ const PROVIDER_MODEL_PREFERENCES: Record<string, string[]> = {
 		"claude-opus-4.1",
 		"claude-opus-4-0",
 		"claude-opus-4",
+		"claude-sonnet-5-0",
+		"claude-sonnet-5.0",
+		"claude-sonnet-5",
 		"claude-sonnet-4-6",
 		"claude-sonnet-4.6",
 		"claude-sonnet-4-5",
@@ -185,6 +202,8 @@ const PROVIDER_MODEL_PREFERENCES: Record<string, string[]> = {
 		"gpt-5",
 		"gemini-3.1-pro-preview",
 		"gemini-3-pro-preview",
+		"claude-sonnet-5.0",
+		"claude-sonnet-5",
 		"claude-sonnet-4.6",
 		"claude-sonnet-4.5",
 		"gemini-2.5-pro",
@@ -360,6 +379,8 @@ const PROVIDER_MODEL_PREFERENCES: Record<string, string[]> = {
 		"anthropic/claude-opus-4.6",
 		"anthropic/claude-opus-4.5",
 		"anthropic/claude-opus-4.1",
+		"anthropic/claude-sonnet-5.0",
+		"anthropic/claude-sonnet-5",
 		"anthropic/claude-sonnet-4.6",
 		"openai/gpt-5.5-pro",
 		"openai/gpt-5.5",
@@ -619,6 +640,19 @@ function isTransientErrorMessage(message: string): boolean {
 	return TRANSIENT_ERROR_PATTERN.test(message);
 }
 
+// A model the catalog advertises but the active provider/subscription cannot
+// serve surfaces as a not-found/404-style error (legacy snapshots or
+// access-gated tiers). These are NOT transient: the same model keeps failing,
+// so callers should fall back to a different model instead of retrying it.
+const MODEL_AVAILABILITY_ERROR_PATTERN =
+	/\b(?:404|403|not[_ ]?found(?:[_ ]?error)?|model[_ ]?not[_ ]?found(?:[_ ]?error)?|no such model|unknown model|does not exist|is not available|not available|model[_ ]?not[_ ]?available|unsupported model|invalid model|forbidden|access[ _-]?denied|permission[ _-]?denied|not[ _-]?entitled|do(?:es)? not have access)\b/i;
+
+function isModelAvailabilityError(message: string | undefined): boolean {
+	if (!message) return false;
+	if (isTransientErrorMessage(message)) return false;
+	return MODEL_AVAILABILITY_ERROR_PATTERN.test(message);
+}
+
 function formatContrarianModelError(stopReason: "error" | "aborted", errorMessage: string | undefined): string {
 	const trimmed = errorMessage?.trim();
 	if (stopReason === "aborted") {
@@ -810,10 +844,48 @@ async function findAvailableModel(
 	return undefined;
 }
 
+function toContrarianSelection(
+	model: PiModel,
+	thinkingLevelOverride: ThinkingLevel | undefined,
+	reason: string,
+): ContrarianSelection {
+	const thinking = resolveThinkingLevel(model, thinkingLevelOverride);
+	return {
+		modelRef: `${model.provider}/${model.id}`,
+		provider: model.provider,
+		modelId: model.id,
+		modelName: model.name,
+		thinkingLevel: thinking.effective,
+		...(thinking.clamped ? { requestedThinkingLevel: thinking.requested, thinkingLevelClamped: true } : {}),
+		autoSelected: true,
+		selectionReason: appendThinkingLevelClampReason(reason, thinking),
+	};
+}
+
+function buildSessionFallbackSelection(
+	ctx: { model?: PiModel },
+	thinkingLevelOverride: ThinkingLevel | undefined,
+): ContrarianSelection | undefined {
+	const model = ctx.model;
+	if (!model) return undefined;
+	return toContrarianSelection(
+		model,
+		thinkingLevelOverride,
+		`Used the current session model ${model.provider}/${model.id} as a final fallback.`,
+	);
+}
+
+function withFallbackReason(selection: ContrarianSelection, previous: ContrarianSelection): ContrarianSelection {
+	return {
+		...selection,
+		selectionReason: `${selection.selectionReason} (Fell back from ${previous.modelRef} after a model-availability error.)`,
+	};
+}
+
 async function selectContrarianModel(
 	ctx: { model?: PiModel; modelRegistry: { getAvailable(): PiModel[] | Promise<PiModel[]> } },
 	thinkingLevelOverride?: ThinkingLevel,
-): Promise<{ ok: true; selection: ContrarianSelection } | { ok: false; error: string }> {
+): Promise<{ ok: true; selection: ContrarianSelection; ordered: ContrarianSelection[] } | { ok: false; error: string }> {
 	const available = await ctx.modelRegistry.getAvailable();
 	if (available.length === 0) {
 		return {
@@ -884,29 +956,25 @@ async function selectContrarianModel(
 		reason = "No reasoning models were available, so the top-ranked model across all available providers was used.";
 	}
 
+	const sorted = [...candidates].sort((a, b) => rankModel(b) - rankModel(a));
 	const preferred = providerForPreferences
 		? selectPreferredModel(candidates, providerForPreferences)
 		: selectPreferredAcrossProviders(candidates);
-	const winner = preferred ?? [...candidates].sort((a, b) => rankModel(b) - rankModel(a))[0];
-	const thinking = resolveThinkingLevel(winner, thinkingLevelOverride);
-	const selectionReason = appendThinkingLevelClampReason(
-		preferred ? `Selected ${winner.id} via the hardcoded preference lists while preferring an opposite provider/model family.` : reason,
-		thinking,
+	const orderedModels = preferred ? [preferred, ...sorted.filter((model) => model !== preferred)] : sorted;
+
+	const ordered = orderedModels.map((model, index) =>
+		toContrarianSelection(
+			model,
+			thinkingLevelOverride,
+			index === 0
+				? preferred
+					? `Selected ${model.id} via the hardcoded preference lists while preferring an opposite provider/model family.`
+					: reason
+				: `Auto-selected ${model.provider}/${model.id} as a lower-ranked fallback.`,
+		),
 	);
 
-	return {
-		ok: true,
-		selection: {
-			modelRef: `${winner.provider}/${winner.id}`,
-			provider: winner.provider,
-			modelId: winner.id,
-			modelName: winner.name,
-			thinkingLevel: thinking.effective,
-			...(thinking.clamped ? { requestedThinkingLevel: thinking.requested, thinkingLevelClamped: true } : {}),
-			autoSelected: true,
-			selectionReason,
-		},
-	};
+	return { ok: true, selection: ordered[0], ordered };
 }
 
 function updateContrarianUi(ctx: ExtensionContext, activeRuns: Map<string, ContrarianUiRun>): void {
@@ -1137,6 +1205,13 @@ function renderCollapsedText(text: string, lineLimit = COLLAPSED_LINE_LIMIT): st
 	return [...lines.slice(0, lineLimit), `... (${lines.length - lineLimit} more lines)`].join("\n");
 }
 
+export const __test__ = {
+	findAvailableModel,
+	parseModelPreference,
+	resolveThinkingLevel,
+	selectContrarianModel,
+};
+
 export default function contrarianExtension(pi: ExtensionAPI) {
 	const activeRuns = new Map<string, ContrarianUiRun>();
 	let preferences: ContrarianPreferences = {};
@@ -1300,13 +1375,17 @@ export default function contrarianExtension(pi: ExtensionAPI) {
 		parameters: ContrarianParams,
 
 		async execute(toolCallId, params, signal, onUpdate, ctx) {
+			const rawTask = (params as { task?: unknown }).task;
+			const task = typeof rawTask === "string" ? rawTask.trim() : "";
+			if (!task) throw new Error("Invalid parameters: expected task to be a non-empty string.");
+
 			const explicitModel = parseModelPreference(params.model);
 			const defaultModel = parseModelPreference(preferences.model);
 			const configuredModel = explicitModel.model ?? defaultModel.model;
 			const configuredThinkingLevel =
 				params.thinkingLevel ?? explicitModel.thinkingLevel ?? preferences.thinkingLevel ?? defaultModel.thinkingLevel;
 			const uiRun: ContrarianUiRun = {
-				task: params.task,
+				task,
 				includeBash: params.includeBash ?? false,
 				startedAt: Date.now(),
 			};
@@ -1314,7 +1393,16 @@ export default function contrarianExtension(pi: ExtensionAPI) {
 			updateContrarianUi(ctx, activeRuns);
 
 			try {
-				let selection: ContrarianSelection;
+				const attempts: ContrarianSelection[] = [];
+				const seen = new Set<string>();
+				const pushAttempt = (candidate: ContrarianSelection | undefined) => {
+					if (!candidate) return;
+					const key = `${candidate.provider}/${candidate.modelId}`.toLowerCase();
+					if (seen.has(key)) return;
+					seen.add(key);
+					attempts.push(candidate);
+				};
+
 				if (configuredModel) {
 					const modelRef = configuredModel;
 					const matched = await findAvailableModel(ctx, modelRef);
@@ -1333,7 +1421,7 @@ export default function contrarianExtension(pi: ExtensionAPI) {
 						: usedToolOverride
 							? "Used the explicit model override provided in the tool call. The model was not matched against the authenticated model list, so the reasoning level fallback was applied."
 							: "Used the configured default contrarian model. The model was not matched against the authenticated model list, so the reasoning level fallback was applied.";
-					selection = {
+					pushAttempt({
 						modelRef: matched ? `${matched.provider}/${matched.id}` : modelRef,
 						provider,
 						modelId,
@@ -1344,7 +1432,7 @@ export default function contrarianExtension(pi: ExtensionAPI) {
 							: {}),
 						autoSelected: false,
 						selectionReason,
-					};
+					});
 				} else {
 					const selectionResult = await selectContrarianModel(ctx, configuredThinkingLevel);
 					if (!selectionResult.ok) {
@@ -1367,11 +1455,14 @@ export default function contrarianExtension(pi: ExtensionAPI) {
 							},
 						};
 					}
-					selection = selectionResult.selection;
+					for (const candidate of selectionResult.ordered) pushAttempt(candidate);
 				}
 
-				uiRun.selection = selection;
-				updateContrarianUi(ctx, activeRuns);
+				// Keep the known-good session model as a final fallback: the catalog can
+				// advertise models the active provider/subscription cannot actually serve
+				// (legacy snapshots, access-gated tiers), which fail with a not-found/404
+				// error. Falling back lets the run degrade gracefully instead of hard-failing.
+				pushAttempt(buildSessionFallbackSelection(ctx, configuredThinkingLevel));
 
 				const handleUpdate = (partial: { content: Array<{ type: "text"; text: string }>; details: ContrarianDetails }) => {
 					uiRun.preview = partial.content[0]?.text ?? uiRun.preview;
@@ -1379,17 +1470,51 @@ export default function contrarianExtension(pi: ExtensionAPI) {
 					onUpdate?.(partial);
 				};
 
-				const result = await runContrarian(selection, params, signal, handleUpdate, ctx.cwd);
-				if (!result.ok) {
-					return {
-						content: [{ type: "text", text: result.error }],
-						details: result.details,
-					};
+				let lastErrorResult: { ok: false; error: string; details: ContrarianDetails } | undefined;
+				for (let index = 0; index < attempts.length; index++) {
+					const previous = index > 0 ? attempts[index - 1] : undefined;
+					const attempt = previous ? withFallbackReason(attempts[index], previous) : attempts[index];
+					uiRun.selection = attempt;
+					updateContrarianUi(ctx, activeRuns);
+
+					const result = await runContrarian(attempt, { ...params, task }, signal, handleUpdate, ctx.cwd);
+					if (result.ok) {
+						return {
+							content: [{ type: "text", text: result.output }],
+							details: result.details,
+						};
+					}
+
+					lastErrorResult = result;
+					const canFallBack = index < attempts.length - 1 && isModelAvailabilityError(result.error);
+					if (!canFallBack) {
+						return {
+							content: [{ type: "text", text: result.error }],
+							details: result.details,
+						};
+					}
 				}
 
 				return {
-					content: [{ type: "text", text: result.output }],
-					details: result.details,
+					content: [
+						{ type: "text", text: lastErrorResult?.error ?? "Contrarian could not select an available model." },
+					],
+					details:
+						lastErrorResult?.details ?? {
+							modelRef: "",
+							provider: ctx.model?.provider ?? "unknown",
+							modelId: "",
+							modelName: undefined,
+							thinkingLevel: configuredThinkingLevel ?? DEFAULT_THINKING_LEVEL,
+							autoSelected: true,
+							selectionReason: "No authenticated models were available to run the contrarian.",
+							includeBash: params.includeBash ?? false,
+							usage: createEmptyUsage(),
+							stderr: "",
+							exitCode: 1,
+							durationMs: 0,
+							cwd: params.cwd ?? ctx.cwd,
+						},
 				};
 			} finally {
 				activeRuns.delete(toolCallId);

package/extensions/contrarian/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-contrarian",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A read-only contrarian subagent extension for pi that stress-tests plans, designs, assumptions, and conclusions.",
   "keywords": [
     "pi-package",

package/extensions/dirty-repo-guard/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3

package/extensions/dirty-repo-guard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-dirty-repo-guard",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A pi extension that prompts before session changes when the current git repo has uncommitted changes.",
   "keywords": [
     "pi-package",

package/extensions/git-footer/.pi-fleet-tested-version

@@ -1 +1 @@
-0.79.10
+0.80.3