@oh-my-pi/pi-ai 15.8.0 → 15.8.3

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [15.8.2] - 2026-06-03
+
+### Fixed
+
+- Fixed `opencode-zen/minimax-m3-free` (and forward-compat `opencode-zen/minimax-m3`) and `opencode-go/minimax-m3` being routed to `anthropic-messages` despite the OpenCode Zen/Go gateways only serving these ids at `/v1/chat/completions`, which surfaced raw MiniMax/tool-call markup (`<invoke name="bash">`, `<tool_call>`, `<description>`, `<cwd>`, `<|minimax|>`) in the UI. Resolver overrides now pin these ids to `openai-completions` and the bundled `models.json` entries are flipped to match. ([#1617](https://github.com/can1357/oh-my-pi/issues/1617))
+- Fixed MiniMax Coding Plan China login opening the international `platform.minimax.io` subscription page instead of the China `platform.minimaxi.com` page.
+
 ## [15.8.0] - 2026-06-02
 ### Added
 
@@ -2911,4 +2918,4 @@ _Dedicated to Peter's shoulder ([@steipete](https://twitter.com/steipete))_
 
 ## [0.9.4] - 2025-11-26
 
-Initial release with multi-provider LLM support.
+Initial release with multi-provider LLM support.

package/dist/types/utils/oauth/minimax-code.d.ts

@@ -5,7 +5,7 @@
  * MiniMax models (M2, M2.1) through an OpenAI-compatible API.
  *
  * This is not OAuth - it's a simple API key flow:
- * 1. Open browser to https://platform.minimax.io/subscribe/coding-plan
+ * 1. Open browser to the matching regional MiniMax subscription page
  * 2. User subscribes and copies their API key
  * 3. User pastes the API key back into the CLI
  *

package/dist/types/utils/schema/wire.d.ts

@@ -47,8 +47,7 @@ export declare function zodToWireSchema(schema: ZodType): Record<string, unknown
  * over the wire. Zod schemas are converted (and cached); legacy TypeBox / raw
  * JSON Schema parameters are upgraded to draft 2020-12 (and cached).
  *
- * Both branches finish with `normalizeEmptySchemas` so every provider —
- * OpenAI, Anthropic, Google, Ollama, Bedrock, Cursor — sees `{}` normalized
- * to `true` in schema-valued positions (issue #1179).
+ * Zod schemas also receive Zod-artifact cleanup; both branches normalize
+ * schema-valued positions and nullable scalar unions.
  */
 export declare function toolWireSchema(tool: Tool): Record<string, unknown>;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-ai",
-	"version": "15.8.0",
+	"version": "15.8.3",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -39,7 +39,7 @@
 	},
 	"dependencies": {
 		"@bufbuild/protobuf": "^2.12.0",
-		"@oh-my-pi/pi-utils": "15.8.0",
+		"@oh-my-pi/pi-utils": "15.8.3",
 		"openai": "^6.39.0",
 		"partial-json": "^0.1.7",
 		"zod": "4.4.3"

package/src/models.json

@@ -61520,9 +61520,9 @@
 		"minimax-m3": {
 			"id": "minimax-m3",
 			"name": "MiniMax M3",
-			"api": "anthropic-messages",
+			"api": "openai-completions",
 			"provider": "opencode-go",
-			"baseUrl": "https://opencode.ai/zen/go",
+			"baseUrl": "https://opencode.ai/zen/go/v1",
 			"reasoning": true,
 			"input": [
 				"text",
@@ -62924,9 +62924,9 @@
 		"minimax-m3-free": {
 			"id": "minimax-m3-free",
 			"name": "MiniMax M3 Free",
-			"api": "anthropic-messages",
+			"api": "openai-completions",
 			"provider": "opencode-zen",
-			"baseUrl": "https://opencode.ai/zen",
+			"baseUrl": "https://opencode.ai/zen/v1",
 			"reasoning": true,
 			"input": [
 				"text",

package/src/provider-models/openai-compat.ts

@@ -2471,19 +2471,32 @@ function createOpenCodeApiResolution(
 	};
 }
 
-const OPENCODE_ZEN_API_RESOLUTION = createOpenCodeApiResolution("https://opencode.ai/zen");
+// OpenCode Zen: models.dev declares minimax-m3-free (and forward-compat
+// minimax-m3) with `provider.npm = "@ai-sdk/anthropic"`, but the Zen gateway
+// only serves them at https://opencode.ai/zen/v1/chat/completions (verified
+// against the live /v1/models response — minimax-m3-free is listed there, and
+// the gateway has no /v1/messages route for it). Without this override the
+// resolver POSTs anthropic-shaped requests to /v1/messages and the UI surfaces
+// raw <invoke>/<|minimax|>/<tool_call> markup (#1617).
+const OPENCODE_ZEN_API_RESOLUTION = createOpenCodeApiResolution("https://opencode.ai/zen", {
+	"minimax-m3": "openai-completions",
+	"minimax-m3-free": "openai-completions",
+});
 // OpenCode Go: models.dev declares minimax-m2.7 / qwen3.5-plus / qwen3.6-plus
-// with `provider.npm = "@ai-sdk/anthropic"`, but the OpenCode Go gateway only
-// serves them at `https://opencode.ai/zen/go/v1/chat/completions` (verified
-// against https://opencode.ai/zen/go/v1/models and the upstream endpoint
-// table at https://opencode.ai/docs/go/#endpoints — minimax-m2.5 works the
-// same way and lacks an `npm` field on models.dev so it already falls through
-// to the openai-completions default). Without this override the resolver
-// would POST anthropic-style requests to /v1/messages and the gateway would
-// return its `Page Not Found` HTML (issue #887). Override the resolver so
-// regenerating models.json keeps the correct routing.
+// (and now also minimax-m3) with `provider.npm = "@ai-sdk/anthropic"`, but
+// the OpenCode Go gateway only serves them at
+// `https://opencode.ai/zen/go/v1/chat/completions` (verified against
+// https://opencode.ai/zen/go/v1/models and the upstream endpoint table at
+// https://opencode.ai/docs/go/#endpoints — minimax-m2.5 works the same way
+// and lacks an `npm` field on models.dev so it already falls through to the
+// openai-completions default). Without this override the resolver would POST
+// anthropic-style requests to /v1/messages and the gateway would return its
+// `Page Not Found` HTML (issue #887 for the qwen/m2.7 entries; minimax-m3
+// and minimax-m3-free added under #1617 for the same root cause).
 const OPENCODE_GO_API_RESOLUTION = createOpenCodeApiResolution("https://opencode.ai/zen/go", {
 	"minimax-m2.7": "openai-completions",
+	"minimax-m3": "openai-completions",
+	"minimax-m3-free": "openai-completions",
 	"qwen3.5-plus": "openai-completions",
 	"qwen3.6-plus": "openai-completions",
 });

package/src/providers/anthropic.ts

@@ -1933,9 +1933,26 @@ export function buildAnthropicClientOptions(args: AnthropicClientOptionsArgs): A
 		};
 	}
 
-	// OpenCode's Anthropic-compatible gateway accepts bearer auth only; leaving
-	// apiKey set lets the SDK add X-Api-Key, which upstream Alibaba rejects.
-	if (model.provider === "opencode-go" || model.provider === "opencode-zen") {
+	// OpenCode Go's Anthropic-compatible gateway validates API-key auth through
+	// `X-Api-Key`; bearer-only requests reach the endpoint but return
+	// `Missing API key` before token validation.
+	if (model.provider === "opencode-go") {
+		delete defaultHeaders.Authorization;
+		return {
+			isOAuthToken: false,
+			apiKey,
+			authToken: null,
+			baseURL: baseUrl,
+			maxRetries: 5,
+			defaultHeaders,
+			...(debugFetch ? { fetch: debugFetch } : {}),
+			...(tlsFetchOptions ? { fetchOptions: tlsFetchOptions } : {}),
+		};
+	}
+
+	// OpenCode Zen's Anthropic-compatible gateway accepts bearer auth only;
+	// leaving apiKey set lets the client add X-Api-Key, which upstream Alibaba rejects.
+	if (model.provider === "opencode-zen") {
 		return {
 			isOAuthToken: false,
 			apiKey: null,

package/src/utils/oauth/minimax-code.ts

@@ -5,7 +5,7 @@
  * MiniMax models (M2, M2.1) through an OpenAI-compatible API.
  *
  * This is not OAuth - it's a simple API key flow:
- * 1. Open browser to https://platform.minimax.io/subscribe/coding-plan
+ * 1. Open browser to the matching regional MiniMax subscription page
  * 2. User subscribes and copies their API key
  * 3. User pastes the API key back into the CLI
  *
@@ -16,7 +16,8 @@
 import { validateOpenAICompatibleApiKey } from "./api-key-validation";
 import type { OAuthController } from "./types";
 
-const AUTH_URL = "https://platform.minimax.io/subscribe/coding-plan";
+const AUTH_URL_INTL = "https://platform.minimax.io/subscribe/coding-plan";
+const AUTH_URL_CN = "https://platform.minimaxi.com/subscribe/coding-plan";
 const API_BASE_URL_INTL = "https://api.minimax.io/v1";
 const API_BASE_URL_CN = "https://api.minimaxi.com/v1";
 const VALIDATION_MODEL = "MiniMax-M2";
@@ -28,11 +29,12 @@ const VALIDATION_MODEL = "MiniMax-M2";
  * Returns the API key directly (not OAuthCredentials - this isn't OAuth).
  */
 export async function loginMiniMaxCode(options: OAuthController): Promise<string> {
-	return loginMiniMaxCodeWithBaseUrl(options, API_BASE_URL_INTL, "MiniMax Coding Plan");
+	return loginMiniMaxCodeWithBaseUrl(options, AUTH_URL_INTL, API_BASE_URL_INTL, "MiniMax Coding Plan");
 }
 
 async function loginMiniMaxCodeWithBaseUrl(
 	options: OAuthController,
+	authUrl: string,
 	baseUrl: string,
 	providerName: string,
 ): Promise<string> {
@@ -41,7 +43,7 @@ async function loginMiniMaxCodeWithBaseUrl(
 	}
 	// Open browser to subscription page
 	options.onAuth?.({
-		url: AUTH_URL,
+		url: authUrl,
 		instructions: "Subscribe to Coding Plan and copy your API key",
 	});
 	// Prompt user to paste their API key
@@ -74,5 +76,5 @@ async function loginMiniMaxCodeWithBaseUrl(
  * Same flow as international but uses China endpoint.
  */
 export async function loginMiniMaxCodeCn(options: OAuthController): Promise<string> {
-	return loginMiniMaxCodeWithBaseUrl(options, API_BASE_URL_CN, "MiniMax Coding Plan (China)");
+	return loginMiniMaxCodeWithBaseUrl(options, AUTH_URL_CN, API_BASE_URL_CN, "MiniMax Coding Plan (China)");
 }

package/src/utils/schema/wire.ts

@@ -68,13 +68,93 @@ const kJsonWireSchema = Symbol("pi.schema.json.wire");
  */
 function postProcess(schema: Record<string, unknown>): Record<string, unknown> {
 	delete schema.$schema;
-	walk(schema);
+	walk(schema, true);
+	normalizeEmptySchemas(schema);
+	return schema;
+}
+
+function postProcessJsonSchema(schema: Record<string, unknown>): Record<string, unknown> {
+	walk(schema, false);
 	normalizeEmptySchemas(schema);
 	return schema;
 }
 
 const SAFE_INTEGER_MAX = Number.MAX_SAFE_INTEGER;
 const SAFE_INTEGER_MIN = Number.MIN_SAFE_INTEGER;
+const NULLABLE_SCALAR_TYPES = new Set(["string", "number", "integer", "boolean"]);
+
+const SCHEMA_DEFINING_SIBLING_KEYS = new Set([
+	"$ref",
+	"additionalProperties",
+	"allOf",
+	"anyOf",
+	"const",
+	"contains",
+	"enum",
+	"if",
+	"items",
+	"not",
+	"oneOf",
+	"patternProperties",
+	"prefixItems",
+	"properties",
+	"propertyNames",
+	"then",
+	"else",
+	"unevaluatedItems",
+	"unevaluatedProperties",
+]);
+
+function isSchemaRecord(value: unknown): value is Record<string, unknown> {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
+function hasSchemaDefiningSibling(schema: Record<string, unknown>): boolean {
+	for (const key in schema) {
+		if (key !== "anyOf" && SCHEMA_DEFINING_SIBLING_KEYS.has(key)) return true;
+	}
+	return false;
+}
+
+function isNullVariant(schema: Record<string, unknown>): boolean {
+	return schema.type === "null" && Object.keys(schema).length === 1;
+}
+
+function isScalarVariant(schema: Record<string, unknown>): schema is Record<string, unknown> & { type: string } {
+	return typeof schema.type === "string" && NULLABLE_SCALAR_TYPES.has(schema.type);
+}
+
+function hasIntegerType(type: unknown): boolean {
+	return type === "integer" || (Array.isArray(type) && type.includes("integer"));
+}
+
+function rewriteNullableScalarAnyOf(schema: Record<string, unknown>): void {
+	if (hasSchemaDefiningSibling(schema)) return;
+	const variants = schema.anyOf;
+	if (!Array.isArray(variants) || variants.length !== 2) return;
+
+	let scalarVariant: Record<string, unknown> | undefined;
+	let scalarType: string | undefined;
+	let sawNull = false;
+	for (const variant of variants) {
+		if (!isSchemaRecord(variant)) return;
+		if (isNullVariant(variant)) {
+			if (sawNull) return;
+			sawNull = true;
+			continue;
+		}
+		if (!isScalarVariant(variant) || scalarVariant) return;
+		scalarVariant = variant;
+		scalarType = variant.type;
+	}
+	if (!sawNull || !scalarVariant || !scalarType) return;
+
+	delete schema.anyOf;
+	for (const key in scalarVariant) {
+		if (key !== "type" && !Object.hasOwn(schema, key)) schema[key] = scalarVariant[key];
+	}
+	schema.type = [scalarType, "null"];
+}
 
 /** Keys whose values are a single JSON Schema (not an array or map). */
 const SCHEMA_VALUE_KEYS = [
@@ -102,39 +182,42 @@ function isEmptyObject(val: unknown): val is Record<string, never> {
 	return Object.keys(val).length === 0;
 }
 
-function walk(node: unknown): void {
+function walk(node: unknown, zodCleanup: boolean): void {
 	if (Array.isArray(node)) {
-		for (const child of node) walk(child);
+		for (const child of node) walk(child, zodCleanup);
 		return;
 	}
 	if (!node || typeof node !== "object") return;
 	const obj = node as Record<string, unknown>;
+	rewriteNullableScalarAnyOf(obj);
 
-	// Drop noise injected for `z.number().int()`.
-	if (obj.type === "integer") {
-		if (obj.minimum === SAFE_INTEGER_MIN) delete obj.minimum;
-		if (obj.maximum === SAFE_INTEGER_MAX) delete obj.maximum;
-	}
+	if (zodCleanup) {
+		// Drop noise injected for `z.number().int()`.
+		if (hasIntegerType(obj.type)) {
+			if (obj.minimum === SAFE_INTEGER_MIN) delete obj.minimum;
+			if (obj.maximum === SAFE_INTEGER_MAX) delete obj.maximum;
+		}
 
-	// Make defaulted properties non-required.
-	if (Array.isArray(obj.required) && obj.properties && typeof obj.properties === "object") {
-		const properties = obj.properties as Record<string, unknown>;
-		const required = obj.required as string[];
-		const filtered = required.filter(name => {
-			const propertySchema = properties[name];
-			if (!propertySchema || typeof propertySchema !== "object") return true;
-			return !("default" in (propertySchema as Record<string, unknown>));
-		});
-		if (filtered.length !== required.length) {
-			if (filtered.length === 0) {
-				delete obj.required;
-			} else {
-				obj.required = filtered;
+		// Make defaulted properties non-required.
+		if (Array.isArray(obj.required) && obj.properties && typeof obj.properties === "object") {
+			const properties = obj.properties as Record<string, unknown>;
+			const required = obj.required as string[];
+			const filtered = required.filter(name => {
+				const propertySchema = properties[name];
+				if (!propertySchema || typeof propertySchema !== "object") return true;
+				return !("default" in (propertySchema as Record<string, unknown>));
+			});
+			if (filtered.length !== required.length) {
+				if (filtered.length === 0) {
+					delete obj.required;
+				} else {
+					obj.required = filtered;
+				}
 			}
 		}
 	}
 
-	for (const k in obj) walk(obj[k]);
+	for (const k in obj) walk(obj[k], zodCleanup);
 }
 
 /**
@@ -197,16 +280,14 @@ export function zodToWireSchema(schema: ZodType): Record<string, unknown> {
  * over the wire. Zod schemas are converted (and cached); legacy TypeBox / raw
  * JSON Schema parameters are upgraded to draft 2020-12 (and cached).
  *
- * Both branches finish with `normalizeEmptySchemas` so every provider —
- * OpenAI, Anthropic, Google, Ollama, Bedrock, Cursor — sees `{}` normalized
- * to `true` in schema-valued positions (issue #1179).
+ * Zod schemas also receive Zod-artifact cleanup; both branches normalize
+ * schema-valued positions and nullable scalar unions.
  */
 export function toolWireSchema(tool: Tool): Record<string, unknown> {
 	const params: TSchema = tool.parameters;
 	if (isZodSchema(params)) return zodToWireSchema(params);
 	return stamp(params as Record<string, unknown>, kJsonWireSchema, p => {
 		const upgraded = upgradeJsonSchemaTo202012(p) as Record<string, unknown>;
-		normalizeEmptySchemas(upgraded);
-		return upgraded;
+		return postProcessJsonSchema(upgraded);
 	});
 }