pi-hide-providers 0.1.20 → 0.1.22

package/README.md

@@ -179,3 +179,16 @@ npm run lint:dead # Dead code detection (knip)
 ## License
 
 MIT
+
+## Pi 1.0 compatibility (0.1.22)
+
+Tested against Pi **1.0.0** with exact SDK development pins and wildcard host peers.
+Native ModelRuntime filtering, scoped fallbacks and selector restoration are verified in both host layouts.
+
+Run `bun run test:host` for the offline real-host regression. Set `PI1_HOST_PACKAGE` to an installed Pi package directory and `PI1_HOST_ENTRY=bundle` to test its bundled CLI runtime.
+
+## Pi 0.99 compatibility (0.1.21)
+
+Filters the actual 0.99 ModelRuntime and scoped-selector fallback entries. Auth/cancellation arguments are forwarded; filtering composes with model sorting and restores on shutdown. Custom screens propagate IME focus.
+
+Tested with Pi 0.99.0. Host-provided Pi packages are wildcard peers, not bundled dependencies; development uses exact 0.99.0 versions.

package/hide-providers.ts

@@ -1,5 +1,5 @@
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { getAgentDir, CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent";
+import { getAgentDir, CONFIG_DIR_NAME, ModelSelectorComponent } from "@earendil-works/pi-coding-agent";
 import {
   HIDE_COMMAND_DESCRIPTION,
   CONFIG_FILENAME,
@@ -76,16 +76,39 @@ function writeConfig(cwd: string, config: HideProvidersConfig): string {
   return path;
 }
 
+import { installMethodPatch } from "./src/method-patch.js";
+
 // Extension
 
 export default function (pi: ExtensionAPI) {
   let currentRules: HideRule[] = [];
+  let activeRegistry: PatchedRegistry | undefined;
+  let restoreSelector: (() => void) | undefined;
+  pi.on("session_shutdown", () => {
+    if (activeRegistry) unpatchRegistry(activeRegistry);
+    activeRegistry = undefined;
+    restoreSelector?.();
+    restoreSelector = undefined;
+  });
 
   pi.on("session_start", async (_event, ctx) => {
     const config = readConfig(ctx.cwd);
     currentRules = config.hide;
 
     const registry = ctx.modelRegistry as unknown as PatchedRegistry;
+    if (activeRegistry && activeRegistry !== registry) unpatchRegistry(activeRegistry);
+    activeRegistry = registry;
+    if (ctx.mode === "tui" && !restoreSelector) {
+      restoreSelector = installMethodPatch(ModelSelectorComponent.prototype, "loadModelsFromSnapshot", function (original, ...args) {
+        // Pi keeps unavailable scoped models as fallback items. Filter that
+        // input as well as the runtime snapshot, without destroying the scope.
+        const scoped = this.scopedModels;
+        this.scopedModels = scoped.filter((item: { model: { provider: string; id: string } }) =>
+          !isHidden(currentRules, item.model.provider, item.model.id));
+        try { return original.apply(this, args); }
+        finally { this.scopedModels = scoped; }
+      });
+    }
     if (currentRules.length > 0) {
       patchRegistry(registry, () => currentRules);
     } else {
@@ -353,6 +376,8 @@ async function showHideSelector(
       );
 
       return {
+        get focused() { return selector.focused; },
+        set focused(value: boolean) { selector.focused = value; },
         render(width: number) {
           return selector.render(width);
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hide-providers",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "Hide providers and models from pi's model selector — filter the /model list and Ctrl+P cycling via a configurable blocklist",
   "type": "module",
   "author": "Tom X Nguyen",
@@ -31,6 +31,7 @@
     "README.md"
   ],
   "scripts": {
+    "test:host": "node scripts/pi1-host.mjs",
     "test": "vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
@@ -38,8 +39,8 @@
     "lint:dead": "knip --no-gitignore"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "0.87.0",
-    "@earendil-works/pi-tui": "0.87.0",
+    "@earendil-works/pi-coding-agent": "1.0.0",
+    "@earendil-works/pi-tui": "1.0.0",
     "@types/node": "25.9.1",
     "@vitest/coverage-v8": "4.1.7",
     "knip": "6.14.1",
@@ -50,5 +51,9 @@
     "extensions": [
       "./hide-providers.ts"
     ]
+  },
+  "peerDependencies": {
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*"
   }
 }

package/src/method-patch.ts

@@ -0,0 +1,22 @@
+// Cooperating model extensions may unload in either order.
+const PATCH = Symbol.for("pi.model-accessor.patch.v1");
+type Method = (this: any, ...args: any[]) => any;
+type Wrapped = Method & { [PATCH]?: { active: boolean; original: Method } };
+function unwrap(method: Wrapped): Method {
+  while (method[PATCH] && !method[PATCH]!.active) method = method[PATCH]!.original;
+  return method;
+}
+export function installMethodPatch(target: any, name: string, handler: (this: any, original: Method, ...args: any[]) => any): () => void {
+  const original = target[name] as Method;
+  if (typeof original !== "function") throw new Error(`Pi model contract missing: ${name}`);
+  const state = { active: true, original };
+  const wrapped: Wrapped = function (...args) {
+    return state.active ? handler.call(this, original, ...args) : original.apply(this, args);
+  };
+  wrapped[PATCH] = state;
+  target[name] = wrapped;
+  return () => {
+    state.active = false;
+    if (target[name] === wrapped) target[name] = unwrap(original);
+  };
+}

package/src/model-filter.ts

@@ -1,178 +1,68 @@
 import { isHidden, type HideRule } from "./index.js";
-
-interface ModelLike {
-  provider: string;
-  id: string;
-}
+import { installMethodPatch } from "./method-patch.js";
 
 interface ModelRuntimeLike {
   getModels(providerId?: string): readonly unknown[];
   getAvailableSnapshot(): readonly unknown[];
-  getAvailable?(providerId?: string): Promise<readonly unknown[]>;
+  getAvailable?(providerId?: string, options?: any): Promise<readonly unknown[]>;
   getModel(provider: string, modelId: string): unknown | undefined;
-  __hide_providers_runtime_patched?: boolean;
-  __hide_providers_get_rules?: () => HideRule[];
-  __hide_providers_orig_getModels?: (providerId?: string) => readonly unknown[];
-  __hide_providers_orig_getAvailableSnapshot?: () => readonly unknown[];
-  __hide_providers_orig_getAvailable?: (providerId?: string) => Promise<readonly unknown[]>;
-  __hide_providers_orig_getModel?: (provider: string, modelId: string) => unknown | undefined;
 }
-
 export interface PatchedRegistry {
-  __hide_providers_patched?: boolean;
   runtime?: ModelRuntimeLike;
   getAvailable(): unknown[];
   getAll(): unknown[];
   find(provider: string, modelId: string): unknown | undefined;
-  __hide_providers_get_rules?: () => HideRule[];
-  __hide_providers_orig_getAvailable?: () => unknown[];
-  __hide_providers_orig_getAll?: () => unknown[];
-  __hide_providers_orig_find?: (provider: string, modelId: string) => unknown | undefined;
 }
-
-function filterModels(models: readonly unknown[], rules: ReadonlyArray<HideRule>): unknown[] {
+interface PatchState {
+  getRules: () => HideRule[];
+  all: () => readonly unknown[];
+  restores: Array<() => void>;
+}
+const patches = new WeakMap<object, PatchState>();
+function target(registry: PatchedRegistry) { return registry.runtime ?? registry; }
+function filter(models: readonly unknown[], rules: HideRule[]): unknown[] {
   return models.filter((model) => {
-    const candidate = model as ModelLike;
-    return !isHidden(rules, candidate.provider, candidate.id);
+    const { provider, id } = model as { provider: string; id: string };
+    return !isHidden(rules, provider, id);
   });
 }
-
-function getRuntime(registry: PatchedRegistry): ModelRuntimeLike | undefined {
+export function patchRegistry(registry: PatchedRegistry, getRules: () => HideRule[]): void {
+  const object = target(registry);
+  const existing = patches.get(object);
+  if (existing) { existing.getRules = getRules; return; }
   const runtime = registry.runtime;
-  return runtime &&
-    typeof runtime.getModels === "function" &&
-    typeof runtime.getAvailableSnapshot === "function" &&
-    typeof runtime.getModel === "function"
-    ? runtime
-    : undefined;
-}
-
-function patchRuntime(runtime: ModelRuntimeLike, getRules: () => HideRule[]): void {
-  if (runtime.__hide_providers_runtime_patched) {
-    runtime.__hide_providers_get_rules = getRules;
-    return;
-  }
-
-  runtime.__hide_providers_runtime_patched = true;
-  runtime.__hide_providers_get_rules = getRules;
-  runtime.__hide_providers_orig_getModels = runtime.getModels.bind(runtime);
-  runtime.__hide_providers_orig_getAvailableSnapshot = runtime.getAvailableSnapshot.bind(runtime);
-  runtime.__hide_providers_orig_getModel = runtime.getModel.bind(runtime);
-  if (runtime.getAvailable) {
-    runtime.__hide_providers_orig_getAvailable = runtime.getAvailable.bind(runtime);
-  }
-
-  runtime.getModels = function (this: ModelRuntimeLike, providerId?: string) {
-    return filterModels(
-      this.__hide_providers_orig_getModels!(providerId),
-      this.__hide_providers_get_rules!(),
-    );
-  };
-  runtime.getAvailableSnapshot = function (this: ModelRuntimeLike) {
-    return filterModels(
-      this.__hide_providers_orig_getAvailableSnapshot!(),
-      this.__hide_providers_get_rules!(),
-    );
-  };
-  if (runtime.__hide_providers_orig_getAvailable) {
-    runtime.getAvailable = async function (this: ModelRuntimeLike, providerId?: string) {
-      return filterModels(
-        await this.__hide_providers_orig_getAvailable!(providerId),
-        this.__hide_providers_get_rules!(),
-      );
-    };
-  }
-  runtime.getModel = function (this: ModelRuntimeLike, provider: string, modelId: string) {
-    if (isHidden(this.__hide_providers_get_rules!(), provider, modelId)) return undefined;
-    return this.__hide_providers_orig_getModel!(provider, modelId);
+  const state: PatchState = {
+    getRules,
+    all: runtime ? runtime.getModels.bind(runtime) : registry.getAll.bind(registry),
+    restores: [],
   };
-}
-
-function unpatchRuntime(runtime: ModelRuntimeLike): void {
-  if (!runtime.__hide_providers_runtime_patched) return;
-
-  runtime.getModels = runtime.__hide_providers_orig_getModels!;
-  runtime.getAvailableSnapshot = runtime.__hide_providers_orig_getAvailableSnapshot!;
-  runtime.getModel = runtime.__hide_providers_orig_getModel!;
-  if (runtime.__hide_providers_orig_getAvailable) {
-    runtime.getAvailable = runtime.__hide_providers_orig_getAvailable;
+  try {
+    for (const name of runtime ? ["getModels", "getAvailableSnapshot"] : ["getAll", "getAvailable"]) {
+      state.restores.push(installMethodPatch(object, name, function (original, ...args) {
+        return filter(original.apply(this, args), state.getRules());
+      }));
+    }
+    if (runtime?.getAvailable) state.restores.push(installMethodPatch(object, "getAvailable", async function (original, ...args) {
+      // Forward provider and AuthOperationOptions (including cancellation).
+      return filter(await original.apply(this, args), state.getRules());
+    }));
+    state.restores.push(installMethodPatch(object, runtime ? "getModel" : "find", function (original, provider, id, ...rest) {
+      return isHidden(state.getRules(), provider, id) ? undefined : original.call(this, provider, id, ...rest);
+    }));
+    patches.set(object, state);
+  } catch (error) {
+    for (const restore of state.restores.reverse()) restore();
+    throw error;
   }
-
-  delete runtime.__hide_providers_runtime_patched;
-  delete runtime.__hide_providers_get_rules;
-  delete runtime.__hide_providers_orig_getModels;
-  delete runtime.__hide_providers_orig_getAvailableSnapshot;
-  delete runtime.__hide_providers_orig_getAvailable;
-  delete runtime.__hide_providers_orig_getModel;
 }
-
-export function patchRegistry(registry: PatchedRegistry, getRules: () => HideRule[]): void {
-  const runtime = getRuntime(registry);
-  if (runtime) patchRuntime(runtime, getRules);
-
-  if (registry.__hide_providers_patched) {
-    registry.__hide_providers_get_rules = getRules;
-    return;
-  }
-
-  // Current pi internals read ModelRuntime directly. Patching its compatibility
-  // ModelRegistry facade too would only double-filter results. Older pi versions
-  // do not expose the runtime, so retain the original registry patch as fallback.
-  if (runtime) return;
-
-  registry.__hide_providers_patched = true;
-  registry.__hide_providers_get_rules = getRules;
-  registry.__hide_providers_orig_getAvailable = registry.getAvailable.bind(registry);
-  registry.__hide_providers_orig_getAll = registry.getAll.bind(registry);
-  registry.__hide_providers_orig_find = registry.find.bind(registry);
-
-  registry.getAvailable = function (this: PatchedRegistry) {
-    return filterModels(
-      this.__hide_providers_orig_getAvailable!(),
-      this.__hide_providers_get_rules!(),
-    );
-  };
-  registry.getAll = function (this: PatchedRegistry) {
-    return filterModels(
-      this.__hide_providers_orig_getAll!(),
-      this.__hide_providers_get_rules!(),
-    );
-  };
-  registry.find = function (this: PatchedRegistry, provider: string, modelId: string) {
-    if (isHidden(this.__hide_providers_get_rules!(), provider, modelId)) return undefined;
-    return this.__hide_providers_orig_find!(provider, modelId);
-  };
-}
-
 export function unpatchRegistry(registry: PatchedRegistry): void {
-  const runtime = getRuntime(registry);
-  if (runtime) unpatchRuntime(runtime);
-
-  if (!registry.__hide_providers_patched) return;
-  registry.getAvailable = registry.__hide_providers_orig_getAvailable!;
-  registry.getAll = registry.__hide_providers_orig_getAll!;
-  registry.find = registry.__hide_providers_orig_find!;
-
-  delete registry.__hide_providers_patched;
-  delete registry.__hide_providers_get_rules;
-  delete registry.__hide_providers_orig_getAvailable;
-  delete registry.__hide_providers_orig_getAll;
-  delete registry.__hide_providers_orig_find;
+  const object = target(registry);
+  const state = patches.get(object);
+  if (!state) return;
+  for (const restore of state.restores.reverse()) restore();
+  patches.delete(object);
 }
-
-export function isRegistryPatched(registry: PatchedRegistry): boolean {
-  return Boolean(
-    registry.__hide_providers_patched || getRuntime(registry)?.__hide_providers_runtime_patched,
-  );
-}
-
+export function isRegistryPatched(registry: PatchedRegistry): boolean { return patches.has(target(registry)); }
 export function getUnfilteredModels(registry: PatchedRegistry): unknown[] {
-  const runtime = getRuntime(registry);
-  if (runtime?.__hide_providers_orig_getModels) {
-    return [...runtime.__hide_providers_orig_getModels()];
-  }
-  if (registry.__hide_providers_orig_getAll) {
-    return registry.__hide_providers_orig_getAll();
-  }
-  return registry.getAll();
+  return [...(patches.get(target(registry))?.all() ?? registry.getAll())];
 }