@pi-unipi/notify 2.5.0 → 2.6.1

package/README.md

@@ -13,6 +13,7 @@ Configure once, get alerts everywhere. Per-event platform routing lets you send
 | `/unipi:notify-set-tg` | Interactive Telegram bot setup |
 | `/unipi:notify-set-ntfy` | Configure ntfy topic and server |
 | `/unipi:notify-recap-model` | Set model for notification recaps |
+| `/unipi:notify-event` | Toggle a single event without the TUI (`<event> <on\|off>`) — reports the new value; run `/reload` to re-register listeners |
 | `/unipi:notify-test` | Send test notification to all enabled platforms |
 
 ## Special Triggers

package/commands.ts

@@ -12,13 +12,32 @@ import { GotifySetupOverlay } from "./tui/gotify-setup.js";
 import { TelegramSetupOverlay } from "./tui/telegram-setup.js";
 import { NtfySetupOverlay } from "./tui/ntfy-setup.js";
 import { RecapModelSelectorOverlay } from "./tui/recap-model-selector.js";
-import { loadConfig } from "./settings.js";
+import type { CachedModel } from "@pi-unipi/core";
+import { loadConfig, saveConfig } from "./settings.js";
 import { loadNtfyConfig } from "./ntfy-config.js";
 import { sendNativeNotification, SuppressedError } from "./platforms/native.js";
 import { sendGotifyNotification } from "./platforms/gotify.js";
 import { sendTelegramNotification } from "./platforms/telegram.js";
 import { sendNtfyNotification } from "./platforms/ntfy.js";
 
+/**
+ * Collect models for the recap selector from Pi's live model registry.
+ * Returns undefined when the registry is unavailable so the overlay can fall
+ * back to the project-wide model cache (issue #27: selector was empty because
+ * it only read ~/.unipi/config/models-cache.json, which may not exist even
+ * when models are configured in ~/.pi/agent/models.json).
+ */
+function registryModels(ctx: ExtensionContext): CachedModel[] | undefined {
+  const registry = ctx.modelRegistry;
+  if (!registry) return undefined;
+  try {
+    const models = registry.getAvailable?.() ?? registry.getAll() ?? [];
+    return models.map((m) => ({ provider: m.provider, id: m.id, name: m.name }));
+  } catch {
+    return undefined;
+  }
+}
+
 /**
  * Register notify commands.
  */
@@ -44,7 +63,7 @@ export function registerNotifyCommands(pi: ExtensionAPI): void {
               // Open model selector as nested overlay
               ctx.ui.custom(
                 (innerTui: any, innerTheme: any, _innerKb: any, innerDone: any) => {
-                  const selector = new RecapModelSelectorOverlay();
+                  const selector = new RecapModelSelectorOverlay(registryModels(ctx));
                   selector.setTheme(innerTheme);
                   selector.onClose = () => innerDone(undefined);
                   selector.requestRender = () => innerTui.requestRender();
@@ -102,9 +121,10 @@ export function registerNotifyCommands(pi: ExtensionAPI): void {
           return;
         }
 
+        const models = registryModels(ctx);
         ctx.ui.custom(
           (tui, theme, _keybindings, done) => {
-            const overlay = new RecapModelSelectorOverlay();
+            const overlay = new RecapModelSelectorOverlay(models);
             overlay.setTheme(theme);
             overlay.onClose = () => done(undefined);
             overlay.requestRender = () => tui.requestRender();
@@ -251,6 +271,44 @@ export function registerNotifyCommands(pi: ExtensionAPI): void {
     }
   );
 
+  // /unipi:notify-event <event> <on|off> — Non-TUI event toggle (issue #27 escape
+  // hatch for terminals where overlay input is unusable)
+  pi.registerCommand(
+    `${UNIPI_PREFIX}${NOTIFY_COMMANDS.NOTIFY_EVENT}`,
+    {
+      description: "Toggle a notify event without the TUI: <event> <on|off>",
+      handler: async (args: string, ctx: ExtensionContext) => {
+        const parts = args.trim().split(/\s+/).filter(Boolean);
+        const [event, value] = parts;
+
+        if (parts.length !== 2 || (value !== "on" && value !== "off")) {
+          ctx.ui.notify(
+            "Usage: /unipi:notify-event <event> <on|off>",
+            "warning"
+          );
+          return;
+        }
+
+        const config = loadConfig();
+        if (!(event in config.events)) {
+          const known = Object.keys(config.events).join(", ");
+          ctx.ui.notify(
+            `Unknown event "${event}". Known events: ${known}`,
+            "error"
+          );
+          return;
+        }
+
+        config.events[event].enabled = value === "on";
+        saveConfig(config);
+        ctx.ui.notify(
+          `notify: ${event} is now ${value}. Run /reload to re-register listeners.`,
+          "info"
+        );
+      },
+    }
+  );
+
   // /unipi:notify-test — Send test notification to all enabled platforms
   pi.registerCommand(
     `${UNIPI_PREFIX}${NOTIFY_COMMANDS.TEST}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/notify",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "description": "Cross-platform notification extension for Pi — native OS, Gotify, and Telegram notifications for agent lifecycle events",
   "type": "module",
   "main": "index.ts",
@@ -34,7 +34,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.5.0",
+    "@pi-unipi/core": "2.6.1",
     "node-notifier": "^10.0.1"
   },
   "peerDependencies": {

package/tui/recap-model-selector.ts

@@ -2,7 +2,8 @@
  * @pi-unipi/notify — Recap Model Selector TUI
  *
  * Interactive overlay for selecting the recap summarization model.
- * Uses the project-wide cached model list from ~/.unipi/config/models-cache.json.
+ * Uses models injected from Pi's live model registry (preferred), falling back
+ * to the project-wide cached model list from ~/.unipi/config/models-cache.json.
  */
 
 import type { Component } from "@earendil-works/pi-tui";
@@ -28,9 +29,16 @@ export class RecapModelSelectorOverlay implements Component {
   requestRender?: () => void;
   private theme: Theme | null = null;
 
-  constructor() {
-    // Load all cached models from project-wide cache
-    this.models = readModelCache();
+  /**
+   * @param models Optional model list, preferably collected from Pi's live
+   *   model registry by the command handler. Falls back to the project-wide
+   *   cache file (`~/.unipi/config/models-cache.json`), which may not exist
+   *   (issue #27: selector showed "No models found" while Pi itself had
+   *   models configured in `~/.pi/agent/models.json`).
+   */
+  constructor(models?: CachedModel[]) {
+    // Prefer models injected from Pi's live model registry; fall back to cache.
+    this.models = models ?? readModelCache();
     this.applyFilter();
 
     // Pre-select current config model
@@ -49,23 +57,42 @@ export class RecapModelSelectorOverlay implements Component {
   invalidate(): void {}
 
   handleInput(data: string): void {
+    // Ctrl+C must always close, even mid-filter — without this the overlay
+    // could trap the user on terminals with unexpected key encodings.
+    if (matchesKey(data, "ctrl+c")) {
+      this.onClose?.();
+      return;
+    }
+
     // Filter mode: type to search
     if (this.filterMode) {
-      if (data === "\r") {
+      if (matchesKey(data, "enter")) {
         // Enter — exit filter mode
         this.filterMode = false;
         return;
       }
       if (matchesKey(data, "escape")) {
-        // Escape — clear filter and exit filter mode
+        // Escape — clear filter and exit filter mode (does NOT close overlay)
         this.filter = "";
         this.filterMode = false;
         this.applyFilter();
         this.selectedIndex = 0;
         return;
       }
-      if (data === "\x7f" || data === "\b") {
-        // Backspace
+      // Let the list be navigated without leaving filter mode.
+      if (matchesKey(data, "up")) {
+        this.selectedIndex = Math.max(0, this.selectedIndex - 1);
+        return;
+      }
+      if (matchesKey(data, "down")) {
+        this.selectedIndex = Math.min(
+          Math.max(0, this.filteredModels.length - 1),
+          this.selectedIndex + 1
+        );
+        return;
+      }
+      if (matchesKey(data, "backspace") || data === "\x7f" || data === "\b") {
+        // Backspace (legacy or kitty "\x1b[127u")
         this.filter = this.filter.slice(0, -1);
         this.applyFilter();
         this.selectedIndex = Math.min(this.selectedIndex, Math.max(0, this.filteredModels.length - 1));
@@ -80,28 +107,36 @@ export class RecapModelSelectorOverlay implements Component {
       return;
     }
 
-    switch (data) {
-      case "\x1b[A": // Up
-      case "k":
-        this.selectedIndex = Math.max(0, this.selectedIndex - 1);
-        break;
-      case "\x1b[B": // Down
-      case "j":
-        this.selectedIndex = Math.min(
-          this.filteredModels.length - 1,
-          this.selectedIndex + 1
-        );
-        break;
-      case "/": // Start filter
-        this.filterMode = true;
-        this.filter = "";
-        break;
-      case "\r": // Enter — select and save
-        this.selectModel();
-        break;
-      case "\x1b": // Escape — close
-        this.onClose?.();
-        break;
+    // Keys are matched via matchesKey, never raw byte comparison: under the
+    // kitty keyboard protocol / enhanced encodings (Ghostty, Herdr) Escape
+    // arrives as "\x1b[27u" and arrows as "\x1b[57419u"/"\x1b[57420u", so
+    // exact legacy comparisons silently fail there (issue #27).
+    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(
+        Math.max(0, this.filteredModels.length - 1),
+        this.selectedIndex + 1
+      );
+      return;
+    }
+    if (data === "/") {
+      // Start filter
+      this.filterMode = true;
+      this.filter = "";
+      return;
+    }
+    if (matchesKey(data, "enter")) {
+      // Enter — select and save
+      this.selectModel();
+      return;
+    }
+    if (matchesKey(data, "escape")) {
+      // Escape — close
+      this.onClose?.();
+      return;
     }
   }
 
@@ -226,9 +261,15 @@ export class RecapModelSelectorOverlay implements Component {
     );
 
     if (this.filteredModels.length === 0) {
+      const emptyMsg =
+        this.filter.length > 0
+          ? `No models match "${this.filter}"`
+          : this.models.length === 0
+            ? "No models — check ~/.pi/agent/models.json or API keys, then reopen"
+            : "No models found";
       lines.push(
         this.frameLine(
-          `  ${this.fg("dim", "No models found")}`,
+          `  ${this.fg("dim", emptyMsg)}`,
           innerWidth
         )
       );

package/tui/settings-overlay.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 {
   loadConfig,
@@ -51,37 +51,50 @@ export class NotifySettingsOverlay implements Component {
   invalidate(): void {}
 
   handleInput(data: string): void {
-    switch (data) {
-      case "\x1b[A": // Up
-      case "k":
-        this.selectedIndex = Math.max(0, this.selectedIndex - 1);
-        break;
-      case "\x1b[B": // Down
-      case "j":
-        this.selectedIndex = Math.min(this.maxItems - 1, this.selectedIndex + 1);
-        break;
-      case " ": // Space - toggle
-        this.toggleCurrent();
-        break;
-      case "\t": // Tab - switch section
-        {
-          const sections: Section[] = ["platforms", "events", "recap"];
-          const idx = sections.indexOf(this.section);
-          this.section = sections[(idx + 1) % sections.length];
-          this.selectedIndex = 0;
-        }
-        break;
-      case "m": // M - open model selector (only in recap section)
-        if (this.section === "recap") {
-          this.onOpenModelSelector?.();
-        }
-        break;
-      case "\r": // Enter - save
-        this.save();
-        break;
-      case "\x1b": // Escape - close
-        this.onClose?.();
-        break;
+    // Ctrl+C always closes — escape hatch for terminals with key encodings
+    // this overlay does not understand (issue #27).
+    if (matchesKey(data, "ctrl+c")) {
+      this.onClose?.();
+      return;
+    }
+    // Navigation keys are matched via matchesKey, never raw byte comparison:
+    // under the kitty keyboard protocol / enhanced encodings (Ghostty, Herdr)
+    // Escape arrives as "\x1b[27u" (or "\x1b[27;1;27~" with modifyOtherKeys)
+    // and arrows as "\x1b[57419u"/"\x1b[57420u" — exact legacy comparisons
+    // like data === "\x1b[A" silently fail there.
+    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.maxItems - 1, this.selectedIndex + 1);
+      return;
+    }
+    if (matchesKey(data, "space")) {
+      this.toggleCurrent();
+      return;
+    }
+    if (matchesKey(data, "tab")) {
+      const sections: Section[] = ["platforms", "events", "recap"];
+      const idx = sections.indexOf(this.section);
+      this.section = sections[(idx + 1) % sections.length];
+      this.selectedIndex = 0;
+      return;
+    }
+    if (data === "m" || data === "M") {
+      // Open model selector (only in recap section)
+      if (this.section === "recap") {
+        this.onOpenModelSelector?.();
+      }
+      return;
+    }
+    if (matchesKey(data, "enter")) {
+      this.save();
+      return;
+    }
+    if (matchesKey(data, "escape")) {
+      this.onClose?.();
+      return;
     }
   }