@underactive/pi-topping-moa-fusion 0.4.4 → 0.4.5

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [0.4.5]
+
+### Changed
+
+- Verified compatibility with pi 1.3.0: no pi export this extension imports was removed or changed, and typecheck and the full test suite pass against 1.3.0.
+- Updated all four pi development dependencies from 1.1.0 to 1.3.0.
+
+### Fixed
+
+- On pi 1.3.0 and later, a bare model id in `moa-explore` or `mf-plan` frontmatter (e.g. `gpt-6-luna`) no longer makes the `mf_plan_subagent` child exit with `Model "…" is ambiguous across providers` when several authenticated providers offer that id. Earlier pi picked the first in catalog order. The tool now qualifies a bare id as `provider/id` before spawning: it prefers a provider with working credentials, then catalog order. Qualified refs and ids the registry does not know are passed through unchanged.
+- On pi 1.2.0 and later, `before_agent_start` also fires for runs another extension starts with `pi.sendMessage(…, { triggerTurn: true })`. Those runs no longer receive plan-mode instructions or consume the one-shot plan-exit reminder meant for the user's next prompt. Hosts that do not report the run's message type are treated as user runs, as before.
+
 ## [0.4.4]
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@underactive/pi-topping-moa-fusion",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Pi extension implementing /mf-plan — Claude Code-style 5-phase plan mode with a Mixture-of-Agents proposer/synthesizer pipeline.",
   "keywords": [
     "pi-package",
@@ -50,10 +50,10 @@
     "typebox": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-agent-core": "1.1.0",
-    "@earendil-works/pi-ai": "1.1.0",
-    "@earendil-works/pi-coding-agent": "1.1.0",
-    "@earendil-works/pi-tui": "1.1.0",
+    "@earendil-works/pi-agent-core": "1.3.0",
+    "@earendil-works/pi-ai": "1.3.0",
+    "@earendil-works/pi-coding-agent": "1.3.0",
+    "@earendil-works/pi-tui": "1.3.0",
     "@types/node": "^24.0.0",
     "typebox": "^1.3.3",
     "typescript": "^5.8.0"

package/src/moa/modelRuntime.ts

@@ -1,4 +1,4 @@
-import { calculateCost } from "@earendil-works/pi-ai";
+import { calculateCost, type Api, type Model } from "@earendil-works/pi-ai";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import * as fs from "node:fs";
@@ -59,6 +59,34 @@ export function modelExtensionOptions(ctx: ExtensionContext, ref: ModelRef): { l
 	return modelUsesExtensionRegisteredProvider(ctx, ref) ? { loadExtensions: true } : {};
 }
 
+/** The slice of pi's `ModelRegistry` that qualifying a bare model id reads. */
+export interface BareModelRegistry {
+	getAll(): Model<Api>[];
+	getAvailable(): Model<Api>[];
+}
+
+/**
+ * Qualify a bare frontmatter model id (`claude-haiku-4-5`) as `provider/id` before it
+ * reaches a child's `--model`. Since pi 1.3.0 a bare id that several authenticated
+ * providers offer is a hard "ambiguous across providers" error, where earlier pi
+ * picked the first in catalog order. Prefers a provider with working credentials,
+ * then catalog order, which restores the earlier behavior. Values that already
+ * contain a `/`, and ids the registry does not know, are returned unchanged for
+ * the child to resolve.
+ */
+export function qualifyBareModelId(registry: BareModelRegistry, model: string): string {
+	if (model.includes("/")) return model;
+	const lower = model.toLowerCase();
+	const matches = (candidate: Model<Api>) => candidate.id.toLowerCase() === lower;
+	try {
+		const chosen = registry.getAvailable().find(matches) ?? registry.getAll().find(matches);
+		return chosen ? `${chosen.provider}/${chosen.id}` : model;
+	} catch {
+		// A stale registry must not block the spawn; the child resolves the bare id.
+		return model;
+	}
+}
+
 export function resolveContextWindow(ctx: ExtensionContext, ref: ModelRef): number | undefined {
 	return ctx.modelRegistry.find(ref.provider, ref.id)?.contextWindow;
 }

package/src/planning/planMode.ts

@@ -5,6 +5,7 @@ import type {
 	AgentBeforeSettleEvent,
 	AgentSettledEvent,
 	AgentStartEvent,
+	BeforeAgentStartEvent,
 	ExtensionAPI,
 	ExtensionContext,
 	MessageEndEvent,
@@ -739,7 +740,15 @@ export function createPlanModeController(pi: ExtensionAPI) {
 				return !isPlanModeInstructionText(msg.content);
 			}) };
 		},
-		onBeforeAgentStart: async () => {
+		onBeforeAgentStart: async (event?: Partial<Pick<BeforeAgentStartEvent, "messageType">>) => {
+			// pi >= 1.2 also fires this for runs another extension starts with
+			// sendMessage(..., { triggerTurn: true }). Those must neither receive plan
+			// instructions nor consume the one-shot exit reminder meant for the user's
+			// next prompt. Older hosts omit messageType and only fire for user runs.
+			if (event?.messageType === "custom") {
+				if (!planModeEnabled) deactivatePlanOnlyTools();
+				return;
+			}
 			if (needsExitReminder) {
 				needsExitReminder = false;
 				// The reminder turn is also the first normal-mode turn: repair a

package/src/planning/tools/mfPlanSubagent.ts

@@ -8,7 +8,7 @@ import * as path from "node:path";
 import { installShippedAgents, shippedAgentsDir, withAuthoritativeMoaAgents } from "../../agents/authoritative.ts";
 import { loadMoaConfig } from "../../config/settings.ts";
 import { discoverAgents, parseAgentFile } from "../../agents/discovery.ts";
-import { modelExtensionOptions } from "../../moa/modelRuntime.ts";
+import { modelExtensionOptions, qualifyBareModelId } from "../../moa/modelRuntime.ts";
 import { CancelRun, type CancelRowExtras, type CancelSession } from "../../runtime/cancelRun.ts";
 import { MutationTripwire, formatMutationWarning } from "../../runtime/mutationTripwire.ts";
 import { getFinalOutput, getResultOutput, isFailedResult, truncateOutput } from "../../runtime/results.ts";
@@ -141,7 +141,16 @@ export function registerMfPlanSubagentTool(pi: ExtensionAPI, host: MfPlanSubagen
 			const planOverride = sessionModel
 				? { model: `${sessionModel.provider}/${sessionModel.id}`, thinking: host.currentThinkingLevel() }
 				: undefined;
-			const overrideFor = (agentName: string) => (agentName === "mf-plan" ? planOverride : undefined);
+			// Shipped and hand-edited frontmatter can carry a bare id, which pi >= 1.3.0
+			// rejects as ambiguous when several authenticated providers offer it. Qualify
+			// it here; thinking stays undefined so the frontmatter level still applies.
+			const frontmatterOverrideFor = (agentName: string): { model: string; thinking?: ThinkingLevel } | undefined => {
+				const model = agents.find((agent) => agent.name === agentName)?.model;
+				if (!model) return undefined;
+				const qualified = qualifyBareModelId(ctx.modelRegistry, model);
+				return qualified === model ? undefined : { model: qualified };
+			};
+			const overrideFor = (agentName: string) => (agentName === "mf-plan" && planOverride ? planOverride : frontmatterOverrideFor(agentName));
 
 			// An agent whose effective model belongs to an extension-registered
 			// provider (claude-bridge, cursor-bridge) or is an extension-registered virtual model