@juicesharp/rpiv-advisor 1.17.0 → 1.18.0

package/README.md

@@ -14,7 +14,7 @@ Let the model ask a stronger model for a second opinion before it acts. `rpiv-ad
 
 ## Features
 
-- **Reviewer model selector** - `/advisor` opens a picker over any model in Pi's registry, plus a reasoning-effort picker for reasoning-capable models. Start typing to fuzzy-filter the list by model name or `provider:id`.
+- **Reviewer model selector** - `/advisor` opens a picker over any model in Pi's registry, plus a reasoning-effort picker for reasoning-capable models. Start typing to fuzzy-filter the list by model name or `provider/id`.
 - **Persisted across sessions** - selection saved at `~/.config/rpiv-advisor/advisor.json` (chmod 0600).
 - **Off by default** - the `advisor` tool is excluded until you pick a model; choose "No advisor" to disable.
 - **Per-executor blocklist** - list executor models in `disabledForModels` (in `advisor.json`) to strip the `advisor` tool when those models drive the session. Entries can be plain strings (block at any effort) or `{ "model": "<provider:id>", "minEffort": "<level>" }` to block only when the executor's effort meets or exceeds the threshold. Available levels, lowest to highest: `minimal`, `low`, `medium`, `high`, `xhigh`.

package/advisor/command.ts

@@ -9,8 +9,9 @@ import type { Api, Model } from "@earendil-works/pi-ai";
 import { getSupportedThinkingLevels, type ThinkingLevel } from "@earendil-works/pi-ai";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { SelectItem } from "@earendil-works/pi-tui";
+import { modelKey } from "@juicesharp/rpiv-config";
 import { showAdvisorPicker, showEffortPicker } from "../advisor-ui.js";
-import { modelKey, saveAdvisorConfig } from "./config.js";
+import { saveAdvisorConfig } from "./config.js";
 import { reconcileAdvisorTool } from "./handlers.js";
 import {
 	ADVISOR_TOOL_NAME,

package/advisor/config.ts

@@ -48,13 +48,3 @@ export function saveAdvisorConfig(key: string | undefined, effort: ThinkingLevel
 	else delete config.effort;
 	return saveJsonConfig(ADVISOR_CONFIG_PATH, config);
 }
-
-export function parseModelKey(key: string): { provider: string; modelId: string } | undefined {
-	const idx = key.indexOf(":");
-	if (idx < 1) return undefined;
-	return { provider: key.slice(0, idx), modelId: key.slice(idx + 1) };
-}
-
-export function modelKey(m: { provider: string; id: string }): string {
-	return `${m.provider}:${m.id}`;
-}

package/advisor/handlers.ts

@@ -6,7 +6,7 @@
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { modelKey } from "./config.js";
+import { modelKey } from "@juicesharp/rpiv-config";
 import { ADVISOR_TOOL_NAME, MSG_ADVISOR_DISABLED, msgAdvisorRestored } from "./messages.js";
 import { isExecutorBlocked, isModelBlocked } from "./policy.js";
 import { getAdvisorEffort, getAdvisorModel } from "./state.js";

package/advisor/policy.ts

@@ -5,7 +5,8 @@
 
 import type { Api, Model, ThinkingLevel } from "@earendil-works/pi-ai";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { type DisabledForModelsEntry, modelKey } from "./config.js";
+import { modelKey, parseModelKey } from "@juicesharp/rpiv-config";
+import type { DisabledForModelsEntry } from "./config.js";
 import { EFFORT_ORDINAL } from "./messages.js";
 
 let disabledForModelsCache: DisabledForModelsEntry[] = [];
@@ -14,14 +15,26 @@ export function setDisabledForModels(models: DisabledForModelsEntry[]): void {
 	disabledForModelsCache = models;
 }
 
+/**
+ * Normalise a stored blocklist entry's model key to the canonical slash form.
+ * Tolerates legacy colon-form persisted lists so `disabledForModels:
+ * ["anthropic:sonnet"]` keeps blocking post-slash-canonical-migration without
+ * requiring a re-save. Pass-through for already-canonical (slash) values and
+ * for malformed input.
+ */
+function canonicalKey(entry: string): string {
+	const parsed = parseModelKey(entry);
+	return parsed ? `${parsed.provider}/${parsed.modelId}` : entry;
+}
+
 export function isModelBlocked(model: Model<Api> | undefined, thinkingLevel?: string): boolean {
 	if (!model) return false;
 	const key = modelKey(model);
 	for (const entry of disabledForModelsCache) {
 		if (typeof entry === "string") {
-			if (entry === key) return true;
+			if (canonicalKey(entry) === key) return true;
 		} else {
-			if (entry.model !== key) continue;
+			if (canonicalKey(entry.model) !== key) continue;
 			if (entry.minEffort === undefined) return true;
 			const thresholdOrdinal = EFFORT_ORDINAL.indexOf(entry.minEffort);
 			const executorOrdinal = EFFORT_ORDINAL.indexOf(thinkingLevel as ThinkingLevel);

package/advisor/restore.ts

@@ -5,7 +5,8 @@
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { loadAdvisorConfig, parseModelKey, validateDisabledForModels } from "./config.js";
+import { modelKey, parseModelKey } from "@juicesharp/rpiv-config";
+import { loadAdvisorConfig, validateDisabledForModels } from "./config.js";
 import { ADVISOR_TOOL_NAME, errModelUnavailable, msgAdvisorRestored, msgAdvisorRestoredInactive } from "./messages.js";
 import { isExecutorBlocked, setDisabledForModels } from "./policy.js";
 import { setAdvisorEffort, setAdvisorModel } from "./state.js";
@@ -54,7 +55,7 @@ export function restoreAdvisorState(ctx: ExtensionContext, pi: ExtensionAPI): vo
 	}
 
 	if (isExecutorBlocked(ctx, pi.getThinkingLevel())) {
-		const advisorLabel = `${model.provider}:${model.id}`;
+		const advisorLabel = modelKey(model);
 		notifyOnce(msgAdvisorRestoredInactive(advisorLabel, config.effort), "info");
 		return;
 	}
@@ -64,7 +65,7 @@ export function restoreAdvisorState(ctx: ExtensionContext, pi: ExtensionAPI): vo
 		pi.setActiveTools([...active, ADVISOR_TOOL_NAME]);
 	}
 
-	notifyOnce(msgAdvisorRestored(`${model.provider}:${model.id}`, config.effort), "info");
+	notifyOnce(msgAdvisorRestored(modelKey(model), config.effort), "info");
 }
 
 export function registerAdvisorSessionStart(pi: ExtensionAPI): void {

package/package.json

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