@diegopetrucci/pi-oracle 0.1.6 → 0.1.8

package/README.md

@@ -2,7 +2,7 @@
 
 ![oracle preview](https://raw.githubusercontent.com/diegopetrucci/pi-extensions/main/assets/oracle-preview.svg)
 
-An Amp-style oracle for [pi](https://github.com/badlogic/pi-mono).
+An Amp-style oracle for [pi](https://github.com/earendil-works/pi-mono).
 
 It adds an `oracle` tool that spins up a separate read-only pi subprocess and sends it to the strongest reasoning model available on the **same provider/subscription** the user is currently using.
 
@@ -11,7 +11,7 @@ It adds an `oracle` tool that spins up a separate read-only pi subprocess and se
 - creates an isolated read-only subprocess
 - auto-picks the strongest reasoning model on the current provider
 - uses provider-specific hardcoded rankings first, then a heuristic fallback
-- sets reasoning/thinking to `xhigh` by default for reasoning models
+- requests `xhigh` by default for reasoning models, then clamps to the model-supported thinking level
 - defaults to `read,grep,find,ls`
 - can optionally allow non-mutating `bash` inspection
 - shows a live oracle status line and widget while the subprocess is running
@@ -27,7 +27,7 @@ By default, the extension:
 4. tries a provider-specific hardcoded priority list first
 5. falls back to a heuristic that favors stronger tiers like `opus`, `pro`, newer versions, and penalizes `mini`, `flash`, `haiku`, `spark`, etc.
 
-The hardcoded rankings now cover pi's built-in provider set, including OpenAI/Codex, Anthropic, Google variants, GitHub Copilot, Bedrock, Azure OpenAI Responses, Cloudflare, DeepSeek, Fireworks, Groq, Hugging Face, Kimi/Moonshot, MiniMax, Mistral, OpenCode, OpenRouter, Vercel AI Gateway, xAI, ZAI, and Cerebras.
+The hardcoded rankings now cover pi's built-in provider set, including Together; see the provider matrix for the current provider-by-provider top picks.
 
 If no reasoning model exists on the current provider, it falls back to the best available model on that provider.
 
@@ -35,9 +35,9 @@ If no reasoning model exists on the current provider, it falls back to the best
 
 Yes — the extension explicitly sets the oracle reasoning level.
 
-- reasoning models default to `xhigh`
+- reasoning models request `xhigh` by default, then use the Pi-compatible effective thinking level supported by the matched model
 - non-reasoning models default to `off`
-- you can override it with the tool's optional `thinkingLevel` parameter
+- you can override it with the tool's optional `thinkingLevel` parameter; matched models still clamp unsupported overrides and report the effective level
 
 Use `/oracle-model` inside pi to see what it would pick right now.
 

package/index.ts

@@ -1,12 +1,13 @@
 import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { basename } from "node:path";
-import { StringEnum } from "@mariozechner/pi-ai";
-import { getMarkdownTheme, type ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Container, Markdown, Spacer, Text } from "@mariozechner/pi-tui";
-import { Type } from "@sinclair/typebox";
+import { StringEnum } from "@earendil-works/pi-ai";
+import { getMarkdownTheme, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Container, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
+import { Type } from "typebox";
 
 type ThinkingLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh";
+type ThinkingLevelMap = Partial<Record<ThinkingLevel, unknown | null>>;
 
 type PiModel = {
 	provider: string;
@@ -15,6 +16,7 @@ type PiModel = {
 	reasoning?: boolean;
 	contextWindow?: number;
 	maxTokens?: number;
+	thinkingLevelMap?: ThinkingLevelMap;
 };
 
 interface UsageStats {
@@ -33,6 +35,8 @@ interface OracleSelection {
 	modelId: string;
 	modelName?: string;
 	thinkingLevel: ThinkingLevel;
+	requestedThinkingLevel?: ThinkingLevel;
+	thinkingLevelClamped?: boolean;
 	autoSelected: boolean;
 	selectionReason: string;
 }
@@ -171,14 +175,6 @@ const PROVIDER_MODEL_PREFERENCES: Record<string, string[]> = {
 		"gemini-2.5-flash-lite-preview",
 		"gemini-2.5-flash-lite",
 	],
-	"google-antigravity": [
-		"claude-opus-4-6-thinking",
-		"claude-sonnet-4-5-thinking",
-		"gemini-3.1-pro-low",
-		"gemini-3-flash",
-		"gemini-2.0-flash",
-	],
-	"google-gemini-cli": ["gemini-3-pro-preview", "gemini-2.5-pro", "gemini-1.5-flash"],
 	"google-vertex": [
 		"gemini-3.1-pro-preview-customtools",
 		"gemini-3.1-pro-preview",
@@ -302,6 +298,20 @@ const PROVIDER_MODEL_PREFERENCES: Record<string, string[]> = {
 		"minimax/minimax-m2.1",
 		"z-ai/glm-5.1",
 	],
+	together: [
+		"deepseek-ai/DeepSeek-V4-Pro",
+		"zai-org/GLM-5.1",
+		"moonshotai/Kimi-K2.6",
+		"Qwen/Qwen3.6-Plus",
+		"MiniMaxAI/MiniMax-M2.7",
+		"Qwen/Qwen3.5-397B-A17B",
+		"Qwen/Qwen3-Coder-Next-FP8",
+		"Qwen/Qwen3-235B-A22B-Instruct-2507-tput",
+		"openai/gpt-oss-120b",
+		"moonshotai/Kimi-K2.5",
+		"deepseek-ai/DeepSeek-V3-1",
+		"MiniMaxAI/MiniMax-M2.5",
+	],
 	"vercel-ai-gateway": [
 		"anthropic/claude-opus-4.7",
 		"anthropic/claude-opus-4.6",
@@ -335,6 +345,28 @@ const PROVIDER_MODEL_PREFERENCES: Record<string, string[]> = {
 		"grok-3-mini-fast",
 		"grok-3-latest",
 	],
+	xiaomi: ["mimo-v2.5-pro", "mimo-v2.5", "mimo-v2-pro", "mimo-v2-omni", "mimo-v2-flash"],
+	"xiaomi-token-plan-ams": [
+		"mimo-v2.5-pro",
+		"mimo-v2.5",
+		"mimo-v2-pro",
+		"mimo-v2-omni",
+		"mimo-v2-flash",
+	],
+	"xiaomi-token-plan-cn": [
+		"mimo-v2.5-pro",
+		"mimo-v2.5",
+		"mimo-v2-pro",
+		"mimo-v2-omni",
+		"mimo-v2-flash",
+	],
+	"xiaomi-token-plan-sgp": [
+		"mimo-v2.5-pro",
+		"mimo-v2.5",
+		"mimo-v2-pro",
+		"mimo-v2-omni",
+		"mimo-v2-flash",
+	],
 	zai: [
 		"glm-5.1",
 		"glm-5-turbo",
@@ -348,7 +380,6 @@ const PROVIDER_MODEL_PREFERENCES: Record<string, string[]> = {
 	],
 	moonshotai: ["kimi-k2.6", "kimi-k2-thinking-turbo", "kimi-k2-thinking", "kimi-k2.5"],
 	"moonshotai-cn": ["kimi-k2.6", "kimi-k2-thinking-turbo", "kimi-k2-thinking", "kimi-k2.5"],
-	"gemini-cli": ["gemini-3-pro-preview", "gemini-2.5-pro", "gemini-1.5-flash"],
 };
 
 const ORACLE_SYSTEM_PROMPT = [
@@ -380,7 +411,7 @@ const OracleParams = Type.Object({
 	thinkingLevel: Type.Optional(
 		StringEnum(THINKING_LEVELS, {
 			description:
-				"Optional reasoning level override for the oracle subprocess. Default: xhigh for reasoning models, off for non-reasoning models.",
+				"Optional reasoning level override for the oracle subprocess. Defaults request xhigh for reasoning models and off for non-reasoning models, then clamp to matched model capabilities.",
 		}),
 	),
 	cwd: Type.Optional(Type.String({ description: "Optional working directory for the oracle subprocess." })),
@@ -517,9 +548,48 @@ function withThinking(modelRef: string, thinkingLevel: ThinkingLevel): string {
 	return `${modelRef}:${thinkingLevel}`;
 }
 
-function resolveThinkingLevel(model: PiModel | undefined, override: ThinkingLevel | undefined): ThinkingLevel {
-	if (override) return override;
-	return model?.reasoning ? DEFAULT_THINKING_LEVEL : "off";
+// Keep these local so the extension stays compatible with older pi peer installs that do not export clamp helpers.
+function isThinkingLevelSupported(model: PiModel, level: ThinkingLevel): boolean {
+	if (!model.reasoning) return level === "off";
+
+	const map = model.thinkingLevelMap;
+	if (level === "xhigh") {
+		return !!map && Object.prototype.hasOwnProperty.call(map, "xhigh") && map.xhigh != null;
+	}
+	return map?.[level] !== null;
+}
+
+function clampThinkingLevel(model: PiModel, requested: ThinkingLevel): ThinkingLevel {
+	if (isThinkingLevelSupported(model, requested)) return requested;
+
+	const requestedIndex = THINKING_LEVELS.indexOf(requested);
+	for (let index = requestedIndex + 1; index < THINKING_LEVELS.length; index++) {
+		const level = THINKING_LEVELS[index];
+		if (isThinkingLevelSupported(model, level)) return level;
+	}
+	for (let index = requestedIndex - 1; index >= 0; index--) {
+		const level = THINKING_LEVELS[index];
+		if (isThinkingLevelSupported(model, level)) return level;
+	}
+
+	return "off";
+}
+
+function resolveThinkingLevel(
+	model: PiModel | undefined,
+	override: ThinkingLevel | undefined,
+): { requested: ThinkingLevel; effective: ThinkingLevel; clamped: boolean } {
+	const requested = override ?? (model?.reasoning ? DEFAULT_THINKING_LEVEL : "off");
+	const effective = model ? clampThinkingLevel(model, requested) : requested;
+	return { requested, effective, clamped: effective !== requested };
+}
+
+function appendThinkingLevelClampReason(
+	reason: string,
+	resolution: { requested: ThinkingLevel; effective: ThinkingLevel; clamped: boolean },
+): string {
+	if (!resolution.clamped) return reason;
+	return `${reason} Requested thinking level ${resolution.requested} was clamped to ${resolution.effective} based on the matched model's capabilities.`;
 }
 
 async function findAvailableModel(
@@ -586,9 +656,11 @@ async function selectOracleModel(
 
 	const preferred = selectPreferredModel(candidates, providerForPreferences);
 	const winner = preferred ?? [...candidates].sort((a, b) => rankModel(b) - rankModel(a))[0];
-	const selectionReason = preferred
-		? `Selected ${winner.id} via the hardcoded preference list for ${winner.provider}.`
-		: reason;
+	const thinking = resolveThinkingLevel(winner, thinkingLevelOverride);
+	const selectionReason = appendThinkingLevelClampReason(
+		preferred ? `Selected ${winner.id} via the hardcoded preference list for ${winner.provider}.` : reason,
+		thinking,
+	);
 
 	return {
 		ok: true,
@@ -597,7 +669,8 @@ async function selectOracleModel(
 			provider: winner.provider,
 			modelId: winner.id,
 			modelName: winner.name,
-			thinkingLevel: resolveThinkingLevel(winner, thinkingLevelOverride),
+			thinkingLevel: thinking.effective,
+			...(thinking.clamped ? { requestedThinkingLevel: thinking.requested, thinkingLevelClamped: true } : {}),
 			autoSelected: true,
 			selectionReason,
 		},
@@ -854,7 +927,7 @@ export default function oracleExtension(pi: ExtensionAPI) {
 			"Use this tool sparingly when you want a second opinion, deeper analysis, code review, debugging help, or a higher-reasoning pass.",
 			"Do not use it for routine low-value work; it is slower than the main agent.",
 			"The oracle is read-only by default. Set includeBash only when shell-based inspection is genuinely useful.",
-			"The oracle sets thinking to xhigh by default for reasoning models, unless the tool call explicitly overrides thinkingLevel.",
+			"The oracle requests xhigh by default for reasoning models; defaults and explicit thinkingLevel overrides are clamped to the effective model-supported level when the model is matched.",
 		],
 		parameters: OracleParams,
 
@@ -875,16 +948,21 @@ export default function oracleExtension(pi: ExtensionAPI) {
 					const provider =
 						matched?.provider ?? (modelRef.includes("/") ? modelRef.split("/")[0] : ctx.model?.provider ?? "unknown");
 					const modelId = matched?.id ?? (modelRef.includes("/") ? modelRef.split("/").slice(1).join("/") : modelRef);
+					const thinking = resolveThinkingLevel(matched, params.thinkingLevel);
+					const selectionReason = matched
+						? appendThinkingLevelClampReason("Used the explicit model override provided in the tool call.", thinking)
+						: "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.";
 					selection = {
 						modelRef: matched ? `${matched.provider}/${matched.id}` : modelRef,
 						provider,
 						modelId,
 						modelName: matched?.name,
-						thinkingLevel: resolveThinkingLevel(matched, params.thinkingLevel),
+						thinkingLevel: thinking.effective,
+						...(matched && thinking.clamped
+							? { requestedThinkingLevel: thinking.requested, thinkingLevelClamped: true }
+							: {}),
 						autoSelected: false,
-						selectionReason: matched
-							? "Used the explicit model override provided in the tool call."
-							: "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.",
+						selectionReason,
 					};
 				} else {
 					const selectionResult = await selectOracleModel(ctx, params.thinkingLevel);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-oracle",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "An Amp-style oracle extension for pi that consults the strongest reasoning model on your current provider.",
   "keywords": ["pi-package", "pi", "oracle", "reasoning", "subagent"],
   "license": "MIT",
@@ -23,7 +23,9 @@
     "image": "https://raw.githubusercontent.com/diegopetrucci/pi-extensions/main/assets/oracle-preview.svg"
   },
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": "*",
-    "@mariozechner/pi-tui": "*"
+    "@earendil-works/pi-ai": "*",
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
+    "typebox": "*"
   }
 }