@pi-unipi/unipi 2.6.0 → 2.6.2

package/packages/footer/src/tui/settings-tui.ts

@@ -10,12 +10,12 @@
  */
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { matchesKey, SettingsList, type SettingItem, type SettingsListTheme } from "@earendil-works/pi-tui";
+import { Key, matchesKey, SettingsList, type SettingItem, type SettingsListTheme } from "@earendil-works/pi-tui";
 import { loadFooterSettings, saveFooterSettings } from "../config.js";
 import { PRESET_NAMES } from "../presets.js";
 import { setIconStyle } from "../rendering/icons.js";
 import type { FooterGroup, FooterSettings, SeparatorStyle, IconStyle } from "../types.js";
-import { boxInnerWidth } from "@pi-unipi/core";
+import { boxInnerWidth, OverlayTheme } from "@pi-unipi/core";
 
 // ─── Section types ─────────────────────────────────────────────────────
 
@@ -43,27 +43,10 @@ const THEME: SettingsListTheme = {
   hint: (text) => `\x1b[2m${text}\x1b[0m`,
 };
 
-// ─── Helper: frame a line inside box drawing ───────────────────────────
+// ─── Shared box-drawing helper ────────────────────────────────────────
 
-function frameLine(content: string, innerWidth: number): string {
-  const visLen = visibleWidth(content);
-  const pad = Math.max(0, innerWidth - visLen);
-  return `\x1b[90m│\x1b[0m${content}${" ".repeat(pad)}\x1b[90m│\x1b[0m`;
-}
-
-function ruleLine(innerWidth: number): string {
-  return `\x1b[90m├${"─".repeat(innerWidth)}┤\x1b[0m`;
-}
+const overlay = new OverlayTheme();
 
-function borderLine(innerWidth: number, edge: "top" | "bottom"): string {
-  const left = edge === "top" ? "┌" : "└";
-  const right = edge === "top" ? "┐" : "┘";
-  return `\x1b[90m${left}${"─".repeat(innerWidth)}${right}\x1b[0m`;
-}
-
-function visibleWidth(text: string): number {
-  return text.replace(/\x1b\[[0-9;]*m/g, "").length;
-}
 
 // ─── Show the footer settings overlay ──────────────────────────────────
 
@@ -129,7 +112,7 @@ class FooterSettingsOverlay {
 
   handleInput(data: string): void {
     // Tab cycles sections
-    if (data === "\t" || data === "\x1b[Z") {
+    if (data === "\t" || matchesKey(data, Key.shift("tab"))) {
       const idx = SECTIONS.indexOf(this.section);
       if (data === "\t") {
         this.section = SECTIONS[(idx + 1) % SECTIONS.length];
@@ -209,7 +192,7 @@ class FooterSettingsOverlay {
     }
 
     // Left arrow / backspace in segment drill-down — back to groups
-    if (this.section === "segments" && this.selectedGroupId && (data === "\x1b[D" || data === "\x7f")) {
+    if (this.section === "segments" && this.selectedGroupId && (matchesKey(data, Key.left) || data === "\x7f")) {
       this.backToGroups();
       return;
     }
@@ -462,8 +445,8 @@ class FooterSettingsOverlay {
     const lines: string[] = [];
 
     // Header
-    lines.push(borderLine(innerWidth, "top"));
-    lines.push(frameLine(`\x1b[1m\x1b[36m⚙  Footer Settings\x1b[0m`, innerWidth));
+    lines.push(overlay.borderLine(innerWidth, "top"));
+    lines.push(overlay.frameLine(`\x1b[1m\x1b[36m⚙  Footer Settings\x1b[0m`, innerWidth));
 
     // Section tabs
     const tabParts = SECTIONS.map((s) => {
@@ -473,20 +456,20 @@ class FooterSettingsOverlay {
       }
       return `\x1b[2m${label}\x1b[0m`;
     });
-    lines.push(frameLine(`  ${tabParts.join("  ")}`, innerWidth));
-    lines.push(ruleLine(innerWidth));
+    lines.push(overlay.frameLine(`  ${tabParts.join("  ")}`, innerWidth));
+    lines.push(overlay.ruleLine(innerWidth));
 
     // Section content
     const activeList = this.currentList;
     if (activeList) {
       const contentLines = activeList.render(innerWidth - 2);
       for (const line of contentLines) {
-        lines.push(frameLine(` ${line}`, innerWidth));
+        lines.push(overlay.frameLine(` ${line}`, innerWidth));
       }
     }
 
     // Footer hints
-    lines.push(ruleLine(innerWidth));
+    lines.push(overlay.ruleLine(innerWidth));
 
     let hints: string;
     if (this.section === "segments" && this.selectedGroupId) {
@@ -496,8 +479,8 @@ class FooterSettingsOverlay {
     } else {
       hints = "j/k navigate · Space/Enter change · Tab section · q close";
     }
-    lines.push(frameLine(`\x1b[2m${hints}\x1b[0m`, innerWidth));
-    lines.push(borderLine(innerWidth, "bottom"));
+    lines.push(overlay.frameLine(`\x1b[2m${hints}\x1b[0m`, innerWidth));
+    lines.push(overlay.borderLine(innerWidth, "bottom"));
 
     return lines;
   }

package/packages/footer/src/types.ts

@@ -145,8 +145,6 @@ export interface FooterSegment {
   description: string;
   /** Layout zone assignment */
   zone: SegmentZone;
-  /** Icon glyph (Nerd Font or ASCII) */
-  icon: string;
   /** Render function */
   render: SegmentRenderFn;
   /** Whether this segment is shown by default */
@@ -161,8 +159,6 @@ export interface FooterGroup {
   id: string;
   /** Display name */
   name: string;
-  /** Group icon */
-  icon: string;
   /** Segments within this group */
   segments: FooterSegment[];
   /** Whether this group is shown by default */
@@ -199,13 +195,6 @@ export interface FooterSettings {
   groups: Record<string, FooterGroupSettings>;
 }
 
-/** Full footer config (settings + runtime state) */
-export interface FooterConfig {
-  settings: FooterSettings;
-  /** Runtime: whether footer is currently active */
-  active: boolean;
-}
-
 // ─── Presets ────────────────────────────────────────────────────────────────
 
 /** Preset definition */
@@ -218,10 +207,6 @@ export interface PresetDef {
   secondarySegments: string[];
   /** Color scheme for this preset */
   colors?: ColorScheme;
-  /** Per-segment options */
-  segmentOptions?: Record<string, Record<string, unknown>>;
-  /** Zone order (default: left, center, right) */
-  zoneOrder?: ("left" | "center" | "right")[];
   /** Zone separator string (between zones) */
   zoneSeparator?: string;
 }

package/packages/image/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/image",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Image generation and image recognition tools for the Pi coding agent",
   "type": "module",
   "main": "src/index.ts",
@@ -34,7 +34,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.6.0"
+    "@pi-unipi/core": "2.6.1"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "^0.80.0",

package/packages/image/src/register-providers.ts

@@ -207,14 +207,3 @@ async function resolveProviderKey(
   const envName = `${provider.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_API_KEY`;
   return process.env[envName] || undefined;
 }
-
-/** Provider ids pi-ai can currently generate with, after registration. */
-export function registeredProviderIds(images: {
-  getProviders?: () => ReadonlyArray<{ id: string }>;
-}): string[] {
-  try {
-    return (images.getProviders?.() ?? []).map((p) => p.id);
-  } catch {
-    return [];
-  }
-}

package/packages/image/src/tools.ts

@@ -19,7 +19,6 @@ import {
   listAllImageGenModels,
   resolveImageGenModel,
   resolveVisionModel,
-  splitModelRef,
   type ChatModelRegistry,
   type VisionModel,
 } from "./models.js";
@@ -325,5 +324,3 @@ function currentSessionModel(ctx: ExtensionContext): string {
   }
   return "";
 }
-
-export { splitModelRef };

package/packages/image/src/tui/model-selector.ts

@@ -6,9 +6,9 @@
  */
 
 import type { Component } from "@earendil-works/pi-tui";
-import { matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { matchesKey } from "@earendil-works/pi-tui";
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import { boxInnerWidth, safeRepeat } from "@pi-unipi/core";
+import { boxInnerWidth, OverlayTheme } from "@pi-unipi/core";
 
 export interface SelectableModel {
   provider: string;
@@ -29,7 +29,7 @@ export class ImageModelSelectorOverlay implements Component {
   private filterMode = false;
   private saved = false;
   private error: string | null = null;
-  private theme: Theme | null = null;
+  private overlay = new OverlayTheme();
   /** Free-text entry, for models the catalog does not know about. */
   private customMode = false;
   private custom = "";
@@ -55,7 +55,7 @@ export class ImageModelSelectorOverlay implements Component {
   }
 
   setTheme(theme: Theme): void {
-    this.theme = theme;
+    this.overlay.setTheme(theme);
   }
 
   invalidate(): void {}
@@ -229,41 +229,6 @@ export class ImageModelSelectorOverlay implements Component {
     this.onClose?.();
   }
 
-  // ─── Theme helpers ───────────────────────────────────────────────────
-
-  private fg(color: string, text: string): string {
-    if (this.theme) return this.theme.fg(color as never, text);
-    const codes: Record<string, string> = {
-      accent: "\x1b[36m",
-      success: "\x1b[32m",
-      warning: "\x1b[33m",
-      error: "\x1b[31m",
-      dim: "\x1b[2m",
-      borderMuted: "\x1b[90m",
-    };
-    return `${codes[color] ?? ""}${text}\x1b[0m`;
-  }
-
-  private bold(text: string): string {
-    return this.theme ? this.theme.bold(text) : `\x1b[1m${text}\x1b[0m`;
-  }
-
-  private frameLine(content: string, innerWidth: number): string {
-    const truncated = truncateToWidth(content, innerWidth, "");
-    const padding = safeRepeat(" ", innerWidth - visibleWidth(truncated));
-    return `${this.fg("borderMuted", "│")}${truncated}${padding}${this.fg("borderMuted", "│")}`;
-  }
-
-  private ruleLine(innerWidth: number): string {
-    return this.fg("borderMuted", `├${safeRepeat("─", innerWidth)}┤`);
-  }
-
-  private borderLine(innerWidth: number, edge: "top" | "bottom"): string {
-    const left = edge === "top" ? "┌" : "└";
-    const right = edge === "top" ? "┐" : "┘";
-    return this.fg("borderMuted", `${left}${safeRepeat("─", innerWidth)}${right}`);
-  }
-
   render(width: number): string[] {
     const innerWidth = boxInnerWidth(width);
     const lines: string[] = [];
@@ -277,48 +242,48 @@ export class ImageModelSelectorOverlay implements Component {
         ? "Model used by image_generate"
         : "Vision model used by image_recognize";
 
-    lines.push(this.borderLine(innerWidth, "top"));
-    lines.push(this.frameLine(this.fg("accent", this.bold(title)), innerWidth));
-    lines.push(this.frameLine(this.fg("dim", subtitle), innerWidth));
-    lines.push(this.ruleLine(innerWidth));
+    lines.push(this.overlay.borderLine(innerWidth, "top"));
+    lines.push(this.overlay.frameLine(this.overlay.fg("accent", this.overlay.bold(title)), innerWidth));
+    lines.push(this.overlay.frameLine(this.overlay.fg("dim", subtitle), innerWidth));
+    lines.push(this.overlay.ruleLine(innerWidth));
 
     // Filter bar
     if (this.customMode) {
       lines.push(
-        this.frameLine(
-          `  ${this.fg("accent", "Model:")} ${this.custom}${this.fg("accent", "█")}`,
+        this.overlay.frameLine(
+          `  ${this.overlay.fg("accent", "Model:")} ${this.custom}${this.overlay.fg("accent", "█")}`,
           innerWidth,
         ),
       );
       lines.push(
-        this.frameLine(
-          `  ${this.fg("dim", "e.g. omniroute/fal/fal-ai/flux-2-pro")}`,
+        this.overlay.frameLine(
+          `  ${this.overlay.fg("dim", "e.g. omniroute/fal/fal-ai/flux-2-pro")}`,
           innerWidth,
         ),
       );
     } else if (this.filterMode) {
       lines.push(
-        this.frameLine(
-          `  ${this.fg("accent", "Filter:")} ${this.filter}${this.fg("accent", "█")}`,
+        this.overlay.frameLine(
+          `  ${this.overlay.fg("accent", "Filter:")} ${this.filter}${this.overlay.fg("accent", "█")}`,
           innerWidth,
         ),
       );
     } else if (this.filter) {
       lines.push(
-        this.frameLine(
-          `  ${this.fg("dim", "Filter:")} ${this.filter} ${this.fg("dim", "(press / to edit)")}`,
+        this.overlay.frameLine(
+          `  ${this.overlay.fg("dim", "Filter:")} ${this.filter} ${this.overlay.fg("dim", "(press / to edit)")}`,
           innerWidth,
         ),
       );
     } else {
       lines.push(
-        this.frameLine(
-          `  ${this.fg("dim", `${this.models.length} models · / filter · c custom`)}`,
+        this.overlay.frameLine(
+          `  ${this.overlay.fg("dim", `${this.models.length} models · / filter · c custom`)}`,
           innerWidth,
         ),
       );
     }
-    lines.push(this.ruleLine(innerWidth));
+    lines.push(this.overlay.ruleLine(innerWidth));
 
     // Model list
     const terminalRows = process.stdout.rows ?? 30;
@@ -335,47 +300,47 @@ export class ImageModelSelectorOverlay implements Component {
             ? "No image models available (needs OpenRouter)"
             : "No vision-capable models configured"
           : "No models match the filter";
-      lines.push(this.frameLine(`  ${this.fg("dim", empty)}`, innerWidth));
+      lines.push(this.overlay.frameLine(`  ${this.overlay.fg("dim", empty)}`, innerWidth));
     } else {
       for (let i = start; i < end; i++) {
         const model = this.filtered[i];
         const isSelected = i === this.selectedIndex;
-        const marker = isSelected ? this.fg("accent", "▸") : " ";
+        const marker = isSelected ? this.overlay.fg("accent", "▸") : " ";
         const label = model.name || model.id;
-        const providerTag = this.fg("dim", `[${model.provider}]`);
+        const providerTag = this.overlay.fg("dim", `[${model.provider}]`);
         const base = isSelected
-          ? `${providerTag} ${this.bold(label)}`
-          : `${providerTag} ${this.fg("dim", label)}`;
+          ? `${providerTag} ${this.overlay.bold(label)}`
+          : `${providerTag} ${this.overlay.fg("dim", label)}`;
         const display = model.unavailable
-          ? `${base} ${this.fg("warning", `(${model.unavailable})`)}`
+          ? `${base} ${this.overlay.fg("warning", `(${model.unavailable})`)}`
           : base;
-        lines.push(this.frameLine(`  ${marker} ${display}`, innerWidth));
+        lines.push(this.overlay.frameLine(`  ${marker} ${display}`, innerWidth));
       }
     }
 
     if (!this.customMode && this.filtered.length > maxVisible) {
       const pct = Math.round(((this.selectedIndex + 1) / this.filtered.length) * 100);
       lines.push(
-        this.frameLine(
-          this.fg("dim", `  ${pct}% (${this.selectedIndex + 1}/${this.filtered.length})`),
+        this.overlay.frameLine(
+          this.overlay.fg("dim", `  ${pct}% (${this.selectedIndex + 1}/${this.filtered.length})`),
           innerWidth,
         ),
       );
     }
 
     if (this.error) {
-      lines.push(this.ruleLine(innerWidth));
-      lines.push(this.frameLine(`  ${this.fg("error", `⚠ ${this.error}`)}`, innerWidth));
+      lines.push(this.overlay.ruleLine(innerWidth));
+      lines.push(this.overlay.frameLine(`  ${this.overlay.fg("error", `⚠ ${this.error}`)}`, innerWidth));
     }
     if (this.saved) {
-      lines.push(this.ruleLine(innerWidth));
-      lines.push(this.frameLine(`  ${this.fg("success", "✓ Model saved")}`, innerWidth));
+      lines.push(this.overlay.ruleLine(innerWidth));
+      lines.push(this.overlay.frameLine(`  ${this.overlay.fg("success", "✓ Model saved")}`, innerWidth));
     }
 
-    lines.push(this.ruleLine(innerWidth));
+    lines.push(this.overlay.ruleLine(innerWidth));
     lines.push(
-      this.frameLine(
-        this.fg(
+      this.overlay.frameLine(
+        this.overlay.fg(
           "dim",
           this.customMode
             ? "Enter save · Esc back to list"
@@ -384,7 +349,7 @@ export class ImageModelSelectorOverlay implements Component {
         innerWidth,
       ),
     );
-    lines.push(this.borderLine(innerWidth, "bottom"));
+    lines.push(this.overlay.borderLine(innerWidth, "bottom"));
 
     return lines;
   }

package/packages/info-screen/config.ts

@@ -164,15 +164,6 @@ export function setGroupSettings(groupId: string, groupSettings: GroupSettings):
   saveInfoSettings(settings);
 }
 
-/**
- * Check if a group is enabled.
- */
-export function isGroupEnabled(groupId: string): boolean {
-  const settings = getInfoSettings();
-  if (!(groupId in settings.groups)) return true; // Default to enabled
-  return settings.groups[groupId].show;
-}
-
 /**
  * Check if a stat within a group is enabled.
  */
@@ -182,10 +173,3 @@ export function isStatEnabled(groupId: string, statId: string): boolean {
   if (!(statId in groupSettings.stats)) return true;
   return groupSettings.stats[statId];
 }
-
-/**
- * Clear cached settings (for testing or reload).
- */
-export function clearSettingsCache(): void {
-  cachedSettings = null;
-}

package/packages/info-screen/core-groups.ts

@@ -141,11 +141,6 @@ export function startLoadTracking(): void {
   }
 }
 
-/** Record when a module starts loading */
-export function recordModuleStart(name: string): void {
-  moduleStartTimes.set(name, Date.now());
-}
-
 /** Record a load time */
 export function recordLoadTime(name: string, type: string, ms?: number): void {
   // If no ms provided, calculate from start time
@@ -172,11 +167,6 @@ export function finishLoadTracking(): void {
   }
 }
 
-/** Get load times */
-export function getLoadTimes(): Array<{ name: string; type: string; ms: number }> {
-  return [...loadTimes];
-}
-
 /** Get total load time */
 export function getTotalLoadTime(): number {
   return totalLoadTimeMs > 0 ? totalLoadTimeMs : (loadTrackingStarted ? Date.now() - loadTrackingStartMs : 0);

package/packages/info-screen/index.ts

@@ -12,12 +12,12 @@
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { UNIPI_EVENTS, MODULES, UNIPI_PREFIX, emitEvent, getPackageVersion, type UnipiModuleEvent, type UnipiInfoGroupEvent } from "@pi-unipi/core";
+import { UNIPI_EVENTS, MODULES, UNIPI_PREFIX, emitEvent, getPackageVersion, type UnipiModuleEvent } from "@pi-unipi/core";
 import { infoRegistry } from "./registry.js";
-import { registerCoreGroups, trackModule, trackTool, setPiApi, registerSkillDir, startLoadTracking, recordLoadTime, finishLoadTracking, recordModuleStart } from "./core-groups.js";
+import { registerCoreGroups, trackModule, trackTool, setPiApi, registerSkillDir, startLoadTracking, recordLoadTime, finishLoadTracking } from "./core-groups.js";
 
 /** Re-export for external use */
-export { infoRegistry, registerSkillDir, startLoadTracking, recordLoadTime, finishLoadTracking, recordModuleStart };
+export { infoRegistry, registerSkillDir, startLoadTracking, recordLoadTime, finishLoadTracking };
 import { getInfoSettings } from "./config.js";
 import { InfoOverlay } from "./tui/info-overlay.js";
 import { SettingsOverlay } from "./settings/settings-tui.js";
@@ -95,10 +95,6 @@ export default function (pi: ExtensionAPI) {
     }
   });
 
-  pi.events.on(UNIPI_EVENTS.INFO_GROUP_REGISTERED, (_data) => {
-    // Group already registered via globalThis in registerGroup()
-  });
-
   // Track built-in tools
   const trackedBuiltinTools = new Set<string>();
   pi.on("tool_call", async (event, _ctx) => {
@@ -116,9 +112,10 @@ export default function (pi: ExtensionAPI) {
    * Background: each group fetches independently, overlay re-renders reactively.
    */
   function showOverlay(ctx: ExtensionContext, autoCloseMs?: number): void {
+    let overlay: InfoOverlay;
     ctx.ui.custom<void>(
       (tui, theme, _keybindings, done) => {
-        const overlay = new InfoOverlay();
+        overlay = new InfoOverlay();
         overlay.setTheme(theme);
         overlayVisible = true;
         overlay.onClose = () => {
@@ -127,11 +124,7 @@ export default function (pi: ExtensionAPI) {
           done();
         };
         overlay.requestRender = () => tui.requestRender();
-        // Boot dashboard dismisses itself; any keypress cancels the timer.
-        if (autoCloseMs && autoCloseMs > 0) {
-          overlay.startBootTimer(autoCloseMs);
-        }
-        return {
+        const component = {
           render: (w: number) => overlay.render(w),
           invalidate: () => overlay.invalidate(),
           handleInput: (data: string) => {
@@ -139,6 +132,11 @@ export default function (pi: ExtensionAPI) {
             tui.requestRender();
           },
         };
+        // Boot dashboard dismisses itself; any keypress cancels the timer.
+        if (autoCloseMs && autoCloseMs > 0) {
+          overlay.startBootTimer(autoCloseMs);
+        }
+        return component;
       },
       {
         overlay: true,
@@ -148,6 +146,17 @@ export default function (pi: ExtensionAPI) {
           anchor: "center" as const,
           margin: 2,
         },
+        // `done()` (the extension UI's close callback) pops the *topmost* overlay
+        // in the TUI stack, not this one specifically. When another overlay (e.g.
+        // the updater's "Update Available" prompt) is stacked on top, the boot
+        // auto-close timer must not fire `done()` — that would pop the covering
+        // overlay and strand this dashboard with a spent one-shot close the user
+        // can no longer dismiss. `isTopmostOverlay` lets the boot timer defer
+        // until we are the focused (topmost) entry; the user can still press
+        // q/Esc to close once the covering overlay is gone.
+        onHandle: (handle) => {
+          overlay.isTopmostOverlay = () => handle.isFocused();
+        },
       }
     );
   }

package/packages/info-screen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/info-screen",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Dashboard and module registry for Unipi — configurable info overlay with tabbed groups",
   "type": "module",
   "main": "index.ts",
@@ -33,7 +33,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.6.0"
+    "@pi-unipi/core": "2.6.1"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.80.0",