@juicesharp/rpiv-advisor 1.20.0 → 2.0.0

package/advisor/config.ts

@@ -6,7 +6,7 @@
 
 import type { ThinkingLevel } from "@earendil-works/pi-ai";
 import type { GuidanceFields } from "@juicesharp/rpiv-config";
-import { configPath, loadJsonConfig, saveJsonConfig } from "@juicesharp/rpiv-config";
+import { configPath, loadJsonConfigWithLegacyFallback, saveJsonConfig } from "@juicesharp/rpiv-config";
 import { EFFORT_ORDINAL } from "./messages.js";
 
 const ADVISOR_CONFIG_PATH = configPath("rpiv-advisor", "advisor.json");
@@ -21,7 +21,7 @@ interface AdvisorConfig {
 }
 
 export function loadAdvisorConfig(): AdvisorConfig {
-	return loadJsonConfig<AdvisorConfig>(ADVISOR_CONFIG_PATH);
+	return loadJsonConfigWithLegacyFallback<AdvisorConfig>("rpiv-advisor", "advisor.json");
 }
 
 export function validateDisabledForModels(value: unknown): DisabledForModelsEntry[] {

package/advisor/execute.ts

@@ -6,8 +6,7 @@
  * buildAdvisorResult so the envelope is built in exactly one place.
  */
 
-import type { StopReason, Usage } from "@earendil-works/pi-ai";
-import { completeSimple, type Message, type ThinkingLevel } from "@earendil-works/pi-ai";
+import type { Message, StopReason, ThinkingLevel, Usage } from "@earendil-works/pi-ai";
 import {
 	type AgentToolResult,
 	type AgentToolUpdateCallback,
@@ -32,6 +31,7 @@ import {
 	errNoApiKeyDetail,
 	msgConsulting,
 } from "./messages.js";
+import { loadCompleteSimple } from "./pi-compat.js";
 import { ADVISOR_SYSTEM_PROMPT } from "./prompt.js";
 import { getAdvisorEffort, getAdvisorModel } from "./state.js";
 
@@ -117,6 +117,7 @@ export async function executeAdvisor(
 	});
 
 	try {
+		const completeSimple = await loadCompleteSimple();
 		const response = await completeSimple(
 			advisor,
 			// `tools: []` reaffirms the "never calls tools" contract even when

package/advisor/pi-compat.test.ts

@@ -0,0 +1,64 @@
+/**
+ * pi-compat tests — the host-version-tolerant `completeSimple` loader.
+ *
+ * The consumer test files mock `@earendil-works/pi-ai/compat` to SUCCEED, so
+ * the version-tolerance arms the shim exists for are exercised here instead:
+ * /compat resolves (host >= 0.80.1), /compat unresolvable → root fallback
+ * (host <= 0.79.x), a REAL /compat failure rethrows instead of masking, and a
+ * host with neither export fails with a clear error.
+ */
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+describe("loadCompleteSimple", () => {
+	afterEach(() => {
+		vi.doUnmock("@earendil-works/pi-ai/compat");
+		vi.doUnmock("@earendil-works/pi-ai");
+		vi.resetModules();
+	});
+
+	/** Import the shim AFTER the per-test doMocks so its dynamic imports resolve
+	 *  against them (vi.resetModules first drops any previously-cached copies). */
+	async function load(): Promise<unknown> {
+		const mod = await import("./pi-compat.js");
+		return mod.loadCompleteSimple();
+	}
+
+	it("resolves completeSimple from /compat when the host exposes it (pi >= 0.80.1)", async () => {
+		vi.resetModules();
+		const compatFn = vi.fn();
+		vi.doMock("@earendil-works/pi-ai/compat", () => ({ completeSimple: compatFn }));
+		await expect(load()).resolves.toBe(compatFn);
+	});
+
+	it("falls back to the package root when /compat is not exported (host <= 0.79.x)", async () => {
+		vi.resetModules();
+		vi.doMock("@earendil-works/pi-ai/compat", () => {
+			// The code an installed-but-old pi-ai actually produces: the package
+			// resolves, but "./compat" is missing from its exports map.
+			throw Object.assign(new Error("Package subpath './compat' is not defined"), {
+				code: "ERR_PACKAGE_PATH_NOT_EXPORTED",
+			});
+		});
+		const rootFn = vi.fn();
+		vi.doMock("@earendil-works/pi-ai", () => ({ completeSimple: rootFn }));
+		await expect(load()).resolves.toBe(rootFn);
+	});
+
+	it("rethrows a non-resolution /compat failure instead of masking it with the root fallback", async () => {
+		vi.resetModules();
+		vi.doMock("@earendil-works/pi-ai/compat", () => {
+			throw new Error("compat entrypoint exploded at module init");
+		});
+		// A WORKING root export proves the rejection comes from the rethrow: the
+		// old catch-all `.catch` fallback would have resolved here.
+		vi.doMock("@earendil-works/pi-ai", () => ({ completeSimple: vi.fn() }));
+		await expect(load()).rejects.toThrow();
+	});
+
+	it("fails with a clear error when neither entrypoint exposes completeSimple", async () => {
+		vi.resetModules();
+		vi.doMock("@earendil-works/pi-ai/compat", () => ({}));
+		await expect(load()).rejects.toThrow(/completeSimple/);
+	});
+});

package/advisor/pi-compat.ts

@@ -0,0 +1,64 @@
+/**
+ * Host-version-tolerant loader for pi-ai's `completeSimple`.
+ *
+ * Pi >= 0.80.1 moved the global dispatch API (`completeSimple` et al.) to the
+ * "@earendil-works/pi-ai/compat" entrypoint; hosts <= 0.79.x export it from
+ * the package root and have no /compat entrypoint at all. pi-ai resolves at
+ * runtime against the HOST's copy (peerDependency "*"), so neither path can
+ * be a static import — try /compat first, fall back to the root entrypoint.
+ *
+ * The fallback is reserved for RESOLUTION failures (the /compat subpath does
+ * not exist on this host); any other /compat error — the entrypoint exists but
+ * throws at module init — rethrows so the real failure surfaces at the call
+ * site instead of being masked by a root import that may lack the export.
+ *
+ * /compat is documented as temporary (deleted with pi's ModelManager
+ * migration); when that lands, this module is the single place to migrate.
+ */
+
+type CompleteSimpleFn = typeof import("@earendil-works/pi-ai/compat").completeSimple;
+
+/**
+ * Error codes meaning "the /compat entrypoint is not resolvable on this host":
+ *   - `ERR_PACKAGE_PATH_NOT_EXPORTED` — Node's ESM resolver when the installed
+ *     pi-ai (<= 0.79.x) resolves but has no "./compat" in its `exports` map —
+ *     the code an old host actually produces.
+ *   - `ERR_MODULE_NOT_FOUND` / `MODULE_NOT_FOUND` — Node's / jiti's resolver
+ *     for an unresolvable module (jiti is what Pi loads `.ts` extensions with).
+ * Mirrors rpiv-core's `isModuleNotFound` (plus the subpath-export code) —
+ * duplicated because siblings never import each other at runtime.
+ */
+const MODULE_NOT_FOUND_CODES = new Set(["ERR_PACKAGE_PATH_NOT_EXPORTED", "ERR_MODULE_NOT_FOUND", "MODULE_NOT_FOUND"]);
+
+/** True for a module-resolution failure. Walks the `cause` chain — ESM loaders
+ *  and tooling (vitest's mock layer, some bundlers) nest the real code under
+ *  `.cause`. Bounded against pathological self-referential chains. */
+function isModuleNotFound(err: unknown): boolean {
+	for (
+		let cur: unknown = err, depth = 0;
+		cur != null && depth < 16;
+		cur = (cur as { cause?: unknown }).cause, depth++
+	) {
+		if (typeof cur === "object" && MODULE_NOT_FOUND_CODES.has((cur as { code?: unknown }).code as string)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+export async function loadCompleteSimple(): Promise<CompleteSimpleFn> {
+	let mod: { completeSimple?: CompleteSimpleFn };
+	try {
+		mod = (await import("@earendil-works/pi-ai/compat")) as { completeSimple?: CompleteSimpleFn };
+	} catch (err) {
+		if (!isModuleNotFound(err)) throw err; // a real /compat failure must surface, not mask as a fallback
+		mod = (await import("@earendil-works/pi-ai")) as { completeSimple?: CompleteSimpleFn };
+	}
+	const completeSimple = mod.completeSimple;
+	if (typeof completeSimple !== "function") {
+		throw new Error(
+			"pi-ai does not expose completeSimple on /compat or the package root — unsupported host pi-ai version",
+		);
+	}
+	return completeSimple;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@juicesharp/rpiv-advisor",
-	"version": "1.20.0",
+	"version": "2.0.0",
 	"description": "Pi extension. A second opinion the model can request from a stronger reviewer model before it acts.",
 	"keywords": [
 		"pi-package",
@@ -41,12 +41,12 @@
 		]
 	},
 	"dependencies": {
-		"@juicesharp/rpiv-config": "^1.20.0"
+		"@juicesharp/rpiv-config": "^2.0.0",
+		"typebox": "^1.1.24"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-ai": "*",
 		"@earendil-works/pi-coding-agent": "*",
-		"@earendil-works/pi-tui": "*",
-		"typebox": "*"
+		"@earendil-works/pi-tui": "*"
 	}
 }