pi-jar 0.3.0 → 0.3.1

package/extensions/index.ts

@@ -168,10 +168,13 @@ export default function piJar(pi: ExtensionAPI): void {
     if (open.length) todosAcknowledged = false;
     const visible = enabled && items.length > 0 && (open.length > 0 || !todosAcknowledged);
     try {
-      // Rows are rebuilt only when the list changes (every change reinstalls the widget), the width or the theme.
       ctx.ui.setWidget("pi-jar.todos", !visible ? undefined : (tui, theme) =>
-        taskWidget(tui, theme, () => todos?.all() ?? [], taskWidgetState));
-    } catch { /* Optional widget; task data remains available via /jar tasks and jar_todo. */ }
+        taskWidget(tui, theme, () => todos?.all() ?? [], taskWidgetState, {
+          render: (width) => composer.enabled ? composer.renderMascot(width) : undefined,
+          poke: () => composer.pokeMascot()
+        }));
+      composer.setTasksVisible(visible);
+    } catch { composer.setTasksVisible(false); /* Optional widget; task data remains available via /jar tasks and jar_todo. */ }
   };
   registerTaskTool(pi, () => todos, (ctx) => updateTaskWidget(ctx));
   let changes: ChangeTracker | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-jar",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A warm, role-aware Pi terminal workspace with switchable profiles, animated UI, plan and goal workflows, tasks, change review, model roles, background shells and subagents.",
   "type": "module",
   "license": "MIT",

package/src/composer.ts

@@ -318,6 +318,7 @@ export class ComposerStyle {
   private phase: WorkingPhase = "idle";
   private animations = true;
   private mascotOn = true;
+  private tasksVisible = false;
   private session = "";
   private profile = "Default";
   private cwd = process.cwd();
@@ -338,16 +339,7 @@ export class ComposerStyle {
       const mood = this.animations ? this.mascot.mood() : "idle";
       return paintFace(mascotFace(mood), mood, this.colors ? (color, text) => this.colors!.fg(color, text) : undefined);
     },
-    perch: (width) => {
-      if (!this.mascotOn || width < 40) return undefined;
-      const mood = this.animations ? this.mascot.mood() : "idle";
-      const frame = this.animations ? Math.floor(Date.now() / COMPOSER_ACTIVE_INTERVAL_MS) : 0;
-      if (this.fullSprite(width)) {
-        return mascotPerch(mood, frame, this.colors ? (color, text) => this.colors!.fg(color, text) : undefined)
-          .map(row => "   " + row);
-      }
-      return ["   " + paintTip(mascotTip(mood, frame), mood, this.colors ? (color, text) => this.colors!.fg(color, text) : undefined)];
-    },
+    perch: (width) => this.tasksVisible ? undefined : this.renderMascot(width),
     session: () => this.session,
     profile: () => this.profile,
     ghost: () => this.suggestions?.text,
@@ -374,6 +366,20 @@ export class ComposerStyle {
     }
   };
 
+  /** Tasks share the mascot's perch instead of reserving a separate vertical widget. */
+  setTasksVisible(visible: boolean): void { this.tasksVisible = visible; }
+  pokeMascot(): void { this.decor.poke(); }
+  renderMascot(width: number): string[] | undefined {
+    if (!this.mascotOn || width < 40) return undefined;
+    const mood = this.animations ? this.mascot.mood() : "idle";
+    const frame = this.animations ? Math.floor(Date.now() / COMPOSER_ACTIVE_INTERVAL_MS) : 0;
+    if (this.fullSprite(width)) {
+      return mascotPerch(mood, frame, this.colors ? (color, text) => this.colors!.fg(color, text) : undefined)
+        .map(row => "   " + row);
+    }
+    return ["   " + paintTip(mascotTip(mood, frame), mood, this.colors ? (color, text) => this.colors!.fg(color, text) : undefined)];
+  }
+
   /** Keep short/narrow terminals usable; the pet and mood spark reserve six rows. */
   private fullSprite(width: number): boolean {
     return width >= 60 && (this.tui?.terminal?.rows ?? process.stdout.rows ?? 24) >= 24;

package/src/task-widget.ts

@@ -1,12 +1,16 @@
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import { Key, matchesKey, truncateToWidth, type TUI, type TuiMouseEvent } from "@earendil-works/pi-tui";
+import { Key, matchesKey, truncateToWidth, visibleWidth, type TUI, type TuiMouseEvent } from "@earendil-works/pi-tui";
 import { todoProgress, todoTotals, type Todo } from "./tasks.ts";
 import { todoRow } from "./task-tool.ts";
 
 /** Retained across widget refreshes. Compact by default so tasks never bury the composer. */
 export interface TaskWidgetState { expanded: boolean; scroll: number | undefined }
-export function taskWidget(tui: TUI, theme: Theme, items: () => Todo[], state: TaskWidgetState) {
+export function taskWidget(tui: TUI, theme: Theme, items: () => Todo[], state: TaskWidgetState,
+  mascot?: { render(width: number): string[] | undefined; poke(): void }) {
   let page = 4;
+  let taskX = 0;
+  let taskY = 0;
+  let mascotRows: string[] = [];
   const toggle = () => { state.expanded = !state.expanded; tui.requestRender(); };
   const move = (delta: number) => {
     state.scroll = Math.max(0, Math.min(Math.max(0, items().length - page), (state.scroll ?? 0) + delta));
@@ -22,10 +26,21 @@ export function taskWidget(tui: TUI, theme: Theme, items: () => Todo[], state: T
       else if (matchesKey(data, Key.pageUp)) move(-page);
     },
     handleMouse(event: TuiMouseEvent) {
+      if (event.y < mascotRows.length && event.x >= 3 && event.x < visibleWidth(mascotRows[event.y] ?? "")) {
+        if (event.type === "click" && event.button === "left") { mascot?.poke(); return { handled: true }; }
+        return;
+      }
+      if (event.x < taskX || event.y < taskY) return;
+      event = { ...event, x: event.x - taskX, y: event.y - taskY };
       if (event.type === "click" && event.button === "left" && event.y === 0) { toggle(); return { handled: true }; }
       if (event.type === "wheel" && event.wheelDelta && state.expanded) { move(Math.sign(event.wheelDelta) * 3); return { handled: true }; }
     },
     render(width: number) {
+      mascotRows = mascot?.render(width) ?? [];
+      const mascotWidth = Math.max(0, ...mascotRows.map(visibleWidth));
+      taskX = mascotRows.length && width >= 60 && width - mascotWidth - 2 >= 24 ? mascotWidth + 2 : 0;
+      taskY = taskX ? 0 : mascotRows.length;
+      const taskWidth = Math.max(0, width - taskX);
       const all = items();
       const { done, total } = todoTotals(all);
       const parents = new Set(all.flatMap((item) => item.parentId ? [item.parentId] : []));
@@ -45,7 +60,12 @@ export function taskWidget(tui: TUI, theme: Theme, items: () => Todo[], state: T
         rows.push(...all.slice(start, start + page).map((item) => todoRow(item, (color, text) => theme.fg(color, text), (text) => theme.bold(text), parents.has(item.id) ? todoProgress(all, item.id) : undefined)));
       }
       rows.push(" ");
-      return rows.slice(0, Math.max(1, budget)).map((line) => truncateToWidth(line, Math.max(0, width)));
+      const tasks = rows.slice(0, Math.max(1, budget)).map((line) => truncateToWidth(line, taskWidth));
+      if (!taskX) return [...mascotRows, ...tasks];
+      return Array.from({ length: Math.max(mascotRows.length, tasks.length) }, (_, index) => {
+        const pet = mascotRows[index] ?? "";
+        return pet + " ".repeat(taskX - visibleWidth(pet)) + (tasks[index] ?? "");
+      });
     }
   };
 }