@pi-unipi/image 2.2.3 → 2.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/image",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "Image generation and image recognition tools for the Pi coding agent",
   "type": "module",
   "main": "src/index.ts",

package/src/generate.ts

@@ -103,6 +103,26 @@ export function saveImage(
   }
 }
 
+/** Providers pi-ai's images collection can actually generate with. */
+function supportedProviders(imagesApi: ImagesModelsLike): string[] {
+  try {
+    return [...new Set(imagesApi.getModels().map((m) => m.provider))];
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * Whether generation can route to a provider. Unknown/empty catalogs are
+ * treated as capable so a stubbed or future pi-ai is never blocked by this
+ * check — the real call still reports its own error.
+ */
+function providerCanGenerate(imagesApi: ImagesModelsLike, provider: string): boolean {
+  const providers = supportedProviders(imagesApi);
+  if (providers.length === 0) return true;
+  return providers.includes(provider);
+}
+
 export interface GenerateOptions {
   prompt: string;
   model: ImageGenModel;
@@ -134,6 +154,22 @@ export async function generateImage(options: GenerateOptions): Promise<GenerateR
     );
   }
 
+  // pi-ai's images collection carries its own provider set (currently only
+  // `openrouter`) and is entirely separate from pi's chat model registry.
+  // A chat provider registered by another extension can therefore list image
+  // models that generation cannot actually drive — pi-ai answers with a bare
+  // "Unknown provider: x". Detect that here and say something useful.
+  if (!providerCanGenerate(imagesApi, model.provider)) {
+    const supported = supportedProviders(imagesApi);
+    throw new Error(
+      `Provider "${model.provider}" cannot generate images.\n` +
+        `→ Image generation is served by: ${supported.join(", ") || "openrouter"}.\n` +
+        `→ "${model.provider}" is a chat provider; its image models are listed for ` +
+        `recognition and reference, but generation must go through a supported provider.\n` +
+        "→ Pick one with /unipi:image-settings.",
+    );
+  }
+
   // Prefer pi-ai's own credential store, then the caller-supplied fallback so
   // a bare OPENROUTER_API_KEY still works.
   let apiKey: string | undefined;

package/src/models.ts

@@ -105,6 +105,23 @@ export async function getImagesModels(): Promise<ImagesModelsLike | null> {
   return cachedImagesModels;
 }
 
+/**
+ * Providers pi-ai's images collection can actually generate with.
+ *
+ * This is NOT the same set as pi's chat model registry: a chat provider
+ * registered by another extension may list image models that image generation
+ * cannot drive. Empty means "unknown", which callers treat as permissive.
+ */
+export async function getGeneratingProviders(): Promise<string[]> {
+  const images = await getImagesModels();
+  if (!images) return [];
+  try {
+    return [...new Set(images.getModels().map((m) => m.provider))];
+  } catch {
+    return [];
+  }
+}
+
 /** List available image-generation models. Empty when unavailable. */
 export async function listImageGenModels(): Promise<ImageGenModel[]> {
   const images = await getImagesModels();

package/src/tui/model-selector.ts

@@ -6,7 +6,7 @@
  */
 
 import type { Component } from "@earendil-works/pi-tui";
-import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { boxInnerWidth, safeRepeat } from "@pi-unipi/core";
 
@@ -14,6 +14,8 @@ export interface SelectableModel {
   provider: string;
   id: string;
   name?: string;
+  /** Set when the model is listed but not usable, with the reason. */
+  unavailable?: string;
 }
 
 export type ModelSelectorKind = "generate" | "recognize";
@@ -61,7 +63,7 @@ export class ImageModelSelectorOverlay implements Component {
   handleInput(data: string): void {
     // Ctrl+C must always escape, even mid-filter. Without this the overlay traps
     // the user with no way out.
-    if (data === "\x03") {
+    if (matchesKey(data, "ctrl+c")) {
       this.onClose?.();
       return;
     }
@@ -76,49 +78,61 @@ export class ImageModelSelectorOverlay implements Component {
       return;
     }
 
-    switch (data) {
-      case "\x1b[A":
-      case "k":
-        this.selectedIndex = Math.max(0, this.selectedIndex - 1);
-        break;
-      case "\x1b[B":
-      case "j":
-        this.selectedIndex = Math.min(this.filtered.length - 1, this.selectedIndex + 1);
-        break;
-      case "/":
-        this.filterMode = true;
-        this.filter = "";
-        break;
-      case "c":
-      case "C":
-        // Escape hatch: generator detection is heuristic, so a provider may
-        // expose a model the catalog cannot recognise. Let the user name it.
-        this.customMode = true;
-        this.custom = "";
-        this.error = null;
-        break;
-      case "\r":
-        this.commit();
-        break;
-      case "\x1b":
-        this.onClose?.();
-        break;
+    // Escape is checked via matchesKey, not `data === "\x1b"`: under the kitty
+    // keyboard protocol it arrives as "\x1b[27u" (and as "\x1b[27;1;27~" with
+    // modifyOtherKeys), so a bare comparison silently fails to close.
+    if (matchesKey(data, "escape")) {
+      this.onClose?.();
+      return;
+    }
+    if (matchesKey(data, "up") || data === "k") {
+      this.selectedIndex = Math.max(0, this.selectedIndex - 1);
+      return;
+    }
+    if (matchesKey(data, "down") || data === "j") {
+      this.selectedIndex = Math.min(this.filtered.length - 1, this.selectedIndex + 1);
+      return;
+    }
+    if (matchesKey(data, "enter")) {
+      this.commit();
+      return;
+    }
+    if (data === "/") {
+      this.filterMode = true;
+      this.filter = "";
+      return;
+    }
+    if (data === "c" || data === "C") {
+      // Escape hatch: generator detection is heuristic, so a provider may
+      // expose a model the catalog cannot recognise. Let the user name it.
+      this.customMode = true;
+      this.custom = "";
+      this.error = null;
     }
   }
 
   private handleFilterInput(data: string): void {
-    if (data === "\r") {
+    if (matchesKey(data, "enter")) {
       this.filterMode = false;
       return;
     }
-    if (data === "\x1b") {
+    if (matchesKey(data, "escape")) {
       this.filter = "";
       this.filterMode = false;
       this.applyFilter();
       this.selectedIndex = 0;
       return;
     }
-    if (data === "\x7f" || data === "\b") {
+    // Let the list be navigated without leaving the filter.
+    if (matchesKey(data, "up")) {
+      this.selectedIndex = Math.max(0, this.selectedIndex - 1);
+      return;
+    }
+    if (matchesKey(data, "down")) {
+      this.selectedIndex = Math.min(this.filtered.length - 1, this.selectedIndex + 1);
+      return;
+    }
+    if (matchesKey(data, "backspace") || data === "\x7f" || data === "\b") {
       this.filter = this.filter.slice(0, -1);
       this.applyFilter();
       this.clampSelection();
@@ -133,17 +147,17 @@ export class ImageModelSelectorOverlay implements Component {
 
   /** Free-text "provider/model-id" entry. */
   private handleCustomInput(data: string): void {
-    if (data === "\r") {
+    if (matchesKey(data, "enter")) {
       this.commitCustom();
       return;
     }
-    if (data === "\x1b") {
+    if (matchesKey(data, "escape")) {
       this.customMode = false;
       this.custom = "";
       this.error = null;
       return;
     }
-    if (data === "\x7f" || data === "\b") {
+    if (matchesKey(data, "backspace") || data === "\x7f" || data === "\b") {
       this.custom = this.custom.slice(0, -1);
       this.error = null;
       return;
@@ -200,6 +214,12 @@ export class ImageModelSelectorOverlay implements Component {
       this.error = "No model selected";
       return;
     }
+    // Require a deliberate second Enter on a model that cannot be used, rather
+    // than silently saving a choice that will fail at call time.
+    if (model.unavailable && this.error === null) {
+      this.error = `${model.id} ${model.unavailable} — press Enter again to select anyway`;
+      return;
+    }
 
     this.onSelect?.(`${model.provider}/${model.id}`);
     this.saved = true;
@@ -323,9 +343,12 @@ export class ImageModelSelectorOverlay implements Component {
         const marker = isSelected ? this.fg("accent", "▸") : " ";
         const label = model.name || model.id;
         const providerTag = this.fg("dim", `[${model.provider}]`);
-        const display = isSelected
+        const base = isSelected
           ? `${providerTag} ${this.bold(label)}`
           : `${providerTag} ${this.fg("dim", label)}`;
+        const display = model.unavailable
+          ? `${base} ${this.fg("warning", `(${model.unavailable})`)}`
+          : base;
         lines.push(this.frameLine(`  ${marker} ${display}`, innerWidth));
       }
     }

package/src/tui/settings-dialog.ts

@@ -17,6 +17,7 @@ import {
 } from "../settings.js";
 import {
   formatModelRef,
+  getGeneratingProviders,
   listAllImageGenModels,
   listVisionModels,
   type ChatModelRegistry,
@@ -241,7 +242,20 @@ async function collectModels(
     // Include models from providers registered by other extensions, not just
     // pi-ai's built-in OpenRouter catalog.
     const models = await listAllImageGenModels(registry);
-    return models.map((m) => ({ provider: m.provider, id: m.id, name: m.name }));
+    const generating = await getGeneratingProviders();
+
+    return models.map((m) => ({
+      provider: m.provider,
+      id: m.id,
+      name: m.name,
+      // pi-ai's images collection has its own provider set. A chat provider's
+      // image models are listed for reference but cannot actually generate,
+      // so flag them rather than letting the user pick a dead option.
+      unavailable:
+        generating.length > 0 && !generating.includes(m.provider)
+          ? "cannot generate"
+          : undefined,
+    }));
   }
 
   if (!registry) return [];