@pi-archimedes/core 0.3.2 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-archimedes/core",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "type": "module",
   "keywords": [
     "pi-package"

package/src/bus.ts

@@ -17,7 +17,13 @@ interface CostUpdatePayload {
   cost?: number;
 }
 
-const g = globalThis as unknown as Record<symbol, unknown>;
+// Type-safe globalThis access — avoids `as unknown as` casts
+function getGlobal<T>(key: symbol): T | undefined {
+  return (globalThis as Record<symbol, unknown>)[key] as T | undefined;
+}
+function setGlobal<T>(key: symbol, value: T): void {
+  (globalThis as Record<symbol, unknown>)[key] = value;
+}
 
 function createBus(): Bus {
   const listeners = new Map<string, Array<(payload: unknown) => void>>();
@@ -29,8 +35,9 @@ function createBus(): Bus {
         for (const fn of subs) {
           try {
             fn(payload);
-          } catch {
-            /* ignore listener errors */
+          } catch (err) {
+            // Listener errors should not crash other listeners
+            console.error(`[archimedes:bus] Error in listener for "${event}":`, err);
           }
         }
       }
@@ -50,10 +57,10 @@ function createBus(): Bus {
 }
 
 export function getBus(): Bus {
-  let bus = g[BUS_KEY] as Bus | undefined;
+  let bus = getGlobal<Bus>(BUS_KEY);
   if (!bus) {
     bus = createBus();
-    g[BUS_KEY] = bus;
+    setGlobal(BUS_KEY, bus);
   }
   return bus;
 }
@@ -61,12 +68,12 @@ export function getBus(): Bus {
 export function initBus(): void {
   const bus = getBus();
   // Flush queued events (if any were emitted before init)
-  const queue = g[QUEUE_KEY] as Array<{ event: string; payload: unknown }> | undefined;
+  const queue = getGlobal<Array<{ event: string; payload: unknown }>>(QUEUE_KEY);
   if (queue && queue.length > 0) {
     for (const { event, payload } of queue) {
       bus.emit(event, payload);
     }
-    g[QUEUE_KEY] = [];
+    setGlobal(QUEUE_KEY, []);
   }
 }
 

package/src/color.ts

@@ -45,7 +45,7 @@ export function hexToRgb(hex: string): RGB {
 	let s = hex.trim();
 	if (s.startsWith("#")) s = s.slice(1);
 	if (s.length === 3) {
-		s = s[0] + s[0] + s[1] + s[1] + s[2] + s[2];
+		s = s[0]! + s[0]! + s[1]! + s[1]! + s[2]! + s[2]!;
 	}
 	if (s.length !== 6 || !/^[0-9a-fA-F]{6}$/.test(s)) {
 		throw new Error(`Invalid hex color: ${hex}`);
@@ -121,13 +121,13 @@ export function ansi256ToRgb(code: number): RGB {
 		throw new Error(`ANSI 256 code out of range: ${code}`);
 	}
 	if (c < 16) {
-		return { ...XTERM_16[c] };
+		return { ...XTERM_16[c]! };
 	}
 	if (c < 232) {
 		const idx = c - 16;
-		const r = CUBE_LEVELS[Math.floor(idx / 36) % 6];
-		const g = CUBE_LEVELS[Math.floor(idx / 6) % 6];
-		const b = CUBE_LEVELS[idx % 6];
+		const r = CUBE_LEVELS[Math.floor(idx / 36) % 6]!;
+		const g = CUBE_LEVELS[Math.floor(idx / 6) % 6]!;
+		const b = CUBE_LEVELS[idx % 6]!;
 		return { r, g, b };
 	}
 	const v = 8 + (c - 232) * 10;
@@ -140,14 +140,14 @@ export function parseAnsiFgToRgb(ansi: string): RGB | null {
 	const tc = /^\x1b\[38;2;(\d{1,3});(\d{1,3});(\d{1,3})m/.exec(ansi);
 	if (tc) {
 		return {
-			r: clamp(parseInt(tc[1], 10), 0, 255),
-			g: clamp(parseInt(tc[2], 10), 0, 255),
-			b: clamp(parseInt(tc[3], 10), 0, 255),
+			r: clamp(parseInt(tc[1]!, 10), 0, 255),
+			g: clamp(parseInt(tc[2]!, 10), 0, 255),
+			b: clamp(parseInt(tc[3]!, 10), 0, 255),
 		};
 	}
 	const palette = /^\x1b\[38;5;(\d{1,3})m/.exec(ansi);
 	if (palette) {
-		const code = parseInt(palette[1], 10);
+		const code = parseInt(palette[1]!, 10);
 		if (code < 0 || code > 255) return null;
 		return ansi256ToRgb(code);
 	}
@@ -187,7 +187,7 @@ export function rgb(r: number, g: number, b: number, text: string): string {
 
 export function extractRgb(themed: string): [number, number, number] {
   const m = themed.match(/\x1b\[38;2;(\d+);(\d+);(\d+)m/);
-  return m ? [+m[1], +m[2], +m[3]] : [100, 100, 100];
+  return m ? [+m[1]!, +m[2]!, +m[3]!] : [100, 100, 100];
 }
 
 export function lerp(a: number, b: number, t: number): number {

package/src/index.ts

@@ -1,6 +1,6 @@
 import type { ExtensionAPI, ExtensionContext, ExtensionCommandContext, KeybindingsManager } from "@earendil-works/pi-coding-agent";
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import { TUI, EditorTheme, Component, type SettingItem } from "@earendil-works/pi-tui";
+import { TUI, type EditorTheme, type Component, type SettingItem } from "@earendil-works/pi-tui";
 
 import { HephaestusEditor } from "./editor/index.js";
 import { patchUserMessage, resetInstanceCount } from "./message/index.js";

package/src/message/index.ts

@@ -1,11 +1,13 @@
 import type { Theme, UserMessageComponent } from "@earendil-works/pi-coding-agent";
+import { VERSION } from "@earendil-works/pi-coding-agent";
 import { RESET, resolvePalette, setThemeBg } from "../chrome.js";
 
-type UserMsgCtor = typeof UserMessageComponent & { [PATCHED]?: boolean };
+type UserMsgCtor = typeof UserMessageComponent & { [PATCHED]?: boolean; [PATCH_VERSION]?: string };
 
 // ── Constants ──────────────────────────────────────────────
 
 const PATCHED = Symbol.for("splashscreen:userMsgPatched");
+const PATCH_VERSION = Symbol.for("splashscreen:userMsgPatchVersion");
 // Match OSC133 B (zone end) or C (zone final). v0.67 moved these from line
 // tail to line head — we strip from wherever they sit and re-emit at the end.
 const OSC133_RE = /\x1b\]133;[BC]\x07/g;
@@ -44,7 +46,13 @@ export function patchUserMessage(
 
     import("@earendil-works/pi-coding-agent").then(
       ({ UserMessageComponent }: { UserMessageComponent: UserMsgCtor }) => {
-        if (UserMessageComponent[PATCHED]) return;
+        const currentVersion = VERSION ?? "unknown";
+        const patchVersion = UserMessageComponent[PATCH_VERSION];
+        // Skip if already patched for this version
+        if (UserMessageComponent[PATCHED] && patchVersion === currentVersion) return;
+        if (UserMessageComponent[PATCHED] && patchVersion && patchVersion !== currentVersion) {
+          console.warn(`[archimedes] Re-patching user message: pi version changed ${patchVersion} → ${currentVersion}`);
+        }
 
         if (
           typeof UserMessageComponent.prototype.addChild !== "function" ||
@@ -55,6 +63,7 @@ export function patchUserMessage(
         }
 
         UserMessageComponent[PATCHED] = true;
+        UserMessageComponent[PATCH_VERSION] = currentVersion;
 
         const origAddChild = UserMessageComponent.prototype.addChild;
         UserMessageComponent.prototype.addChild = function (child: any) {
@@ -79,7 +88,7 @@ export function patchUserMessage(
             if (bg !== lastBg) { setThemeBg(currentTheme, "userMessageBg", bg); lastBg = bg; }
 
             const idx = instanceIndex.get(this);
-            const elapsed = idx !== undefined ? responseTimes[idx] : 0;
+            const elapsed = idx !== undefined ? (responseTimes[idx] ?? 0) : 0;
             const hasTime = idx !== undefined;
 
             const contentWidth = width - TIME_COL;

package/src/startup/capture.ts

@@ -14,11 +14,14 @@ export function patchConsoleLog(): void {
         const plain = (args[0] as string).replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "");
         const m = MODEL_SCOPE_RE.exec(plain);
         if (m) {
-          const raw = m[1].replace(/\s*\(Ctrl\+\w[\w\s]*\)/gi, "");
+          const raw = m[1]!.replace(/\s*\(Ctrl\+\w[\w\s]*\)/gi, "");
           g[CAPTURED_MODELS] = raw
             .split(",")
             .map((s: string) => s.trim())
             .filter(Boolean);
+          // Unpatch once captured — no need to keep intercepting
+          console.log = origLog;
+          g[PATCHED_LOG] = false;
           return;
         }
       }

package/src/startup/index.ts

@@ -104,10 +104,11 @@ export function renderHeader(theme: Theme, ref: ListingRef, width: number, heigh
     contentLines.push(" ".repeat(LOGO_PAD) + " ".repeat(listingLeftPad) + listRow);
   }
 
-  // Pad top and bottom to fill height (bias top by 2 for visual centering)
+  // Pad top and bottom to fill height (+5 top bias for visual centering)
+  const VERTICAL_CENTER_BIAS = 5; // Shift content slightly upward for visual balance
   const contentHeight = contentLines.length;
   const remaining = Math.max(0, height - contentHeight);
-  const topPad = Math.floor(remaining / 2) + 5;
+  const topPad = Math.floor(remaining / 2) + VERTICAL_CENTER_BIAS;
   const bottomPad = remaining - topPad;
 
   const result: string[] = [];
@@ -123,15 +124,38 @@ export function renderHeader(theme: Theme, ref: ListingRef, width: number, heigh
 // Fragile: relies on TUI child ordering (header, chat, footer) which is an
 // internal layout detail of pi's InteractiveMode. If upstream changes the
 // child structure, this will need updating.
+//
+// Strategy (most specific → least specific):
+// 1. Container with "Scrollable" in constructor name
+// 2. Container with most children (chat usually has the most)
+// 3. Middle child if exactly 3 children (header, chat, footer)
+// 4. First Container found
 function findChatContainer(tui: TUI): Container | undefined {
+  // Strategy 1: Look for Scrollable container
   for (const child of tui.children) {
     if (child instanceof Container && child.constructor.name.includes("Scrollable")) {
       return child;
     }
   }
+
+  // Strategy 2: Find the Container with the most children (chat area)
+  const containers = tui.children.filter((c): c is Container => c instanceof Container);
+  if (containers.length > 1) {
+    const largest = containers.reduce((best, c) =>
+      c.children.length > best.children.length ? c : best,
+    );
+    if (largest.children.length > 0) return largest;
+  }
+
+  // Strategy 3: Middle child if exactly 3 children
   if (tui.children.length >= 3) {
-    return tui.children[1] as Container;
+    const middle = tui.children[1];
+    if (middle instanceof Container) return middle;
   }
+
+  // Strategy 4: First Container
+  if (containers.length > 0) return containers[0];
+
   return undefined;
 }
 
@@ -153,9 +177,9 @@ export function patchStartupListing(
   ref.revealedAt = 0;
   ref.scaffoldAt = 0;
   ref.settled = false;
-  ref.cachedLines = undefined;
-  ref.cachedWidth = undefined;
-  ref.maxHeaderHeight = undefined;
+  delete ref.cachedLines;
+  delete ref.cachedWidth;
+  delete ref.maxHeaderHeight;
 
   if (cc[ANIM_INTERVAL]) clearInterval(cc[ANIM_INTERVAL]);
   if (cc[DEBOUNCE_TIMER]) clearTimeout(cc[DEBOUNCE_TIMER]);
@@ -187,7 +211,7 @@ export function patchStartupListing(
       const current: ListingRef = cc[LISTING_REF];
       current.latestVersion = v;
       // Invalidate cache so version updates on next render
-      current.cachedLines = undefined;
+      delete current.cachedLines;
       current.settled = false;
     }
   });
@@ -236,7 +260,7 @@ export function patchStartupListing(
 
         // Invalidate cache so late-arriving sections show up
         currentRef.settled = false;
-        currentRef.cachedLines = undefined;
+        delete currentRef.cachedLines;
 
         if (currentRef.revealed) {
           // Already revealed — show new section immediately
@@ -269,9 +293,11 @@ export function patchStartupListing(
     if (component instanceof Spacer && !currentRef.revealed) return;
     try {
       origAddChild(component);
-    } catch (e) {
+    } catch (err) {
+      console.error("[archimedes] Error in chat.addChild:", err);
     }
-  } catch (e) {
+  } catch (err) {
+    console.error("[archimedes] Error in startup listing addChild handler:", err);
   }
   };
 }

package/src/startup/logo.ts

@@ -67,7 +67,7 @@ export function getShinedLogo(frame: number, style: AnimationStyle = "wave"): st
   return LOGO.map((line, y) => {
     let result = "";
     for (let x = 0; x < line.length; x++) {
-      const char = line[x];
+      const char = line[x]!;
       if (char === " ") { result += " "; continue; }
 
       const revealAt = computeRevealAt(x, y, style);

package/src/startup/sections.ts

@@ -97,7 +97,7 @@ export function parseSectionText(plain: string): ParsedSection | undefined {
 export function parseModelScope(plain: string): ParsedSection | undefined {
   const m = plain.match(/Model scope:\s*(.+)/i);
   if (!m) return undefined;
-  const raw = m[1].replace(/\s*\(Ctrl\+\w[\w\s]*\)/gi, "");
+  const raw = m[1]!.replace(/\s*\(Ctrl\+\w[\w\s]*\)/gi, "");
   const items = raw.split(",").map(s => s.trim()).filter(Boolean);
   return items.length > 0 ? { name: "Models", items } : undefined;
 }
@@ -186,7 +186,7 @@ export function formatColumns(sections: RenderSection[], theme: Theme, maxW: num
   const lines: string[] = [];
 
   for (let si = 0; si < sections.length; si++) {
-    const sec = sections[si];
+    const sec = sections[si]!;
     if (sec.items.length === 0) continue;
 
     const availableW = maxW - headerW - 1;
@@ -207,7 +207,7 @@ export function formatColumns(sections: RenderSection[], theme: Theme, maxW: num
     const styleItem = (raw: string): string => {
       const prefixMatch = raw.match(/^(npm:|git:)/);
       if (prefixMatch) {
-        const pfx = prefixMatch[1];
+        const pfx = prefixMatch[1]!;
         const name = raw.slice(pfx.length);
         return wrapLabel(pfx) + wrapItems(name);
       }

package/src/thinking/patch.ts

@@ -1,15 +1,21 @@
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import { AssistantMessageComponent } from "@earendil-works/pi-coding-agent";
+import { AssistantMessageComponent, VERSION } from "@earendil-works/pi-coding-agent";
 import { Markdown, type MarkdownTheme, Spacer, Text } from "@earendil-works/pi-tui";
 import { buildMutedMarkdownTheme } from "./theme.js";
 
 // The label we prepend to visible thinking content.
 const THINKING_LABEL = "\x1b[1m\x1b[38;2;255;215;0mThinking...\x1b[39m\x1b[22m";
 
+// Track which pi version we patched against to detect incompatibility
+const PATCHED_KEY = Symbol.for("archimedes:thinkingPatched");
+const PATCH_VERSION_KEY = Symbol.for("archimedes:thinkingPatchVersion");
+
 /**
  * Patches `AssistantMessageComponent.prototype.updateContent` so thinking
  * blocks render with a muted `MarkdownTheme`. Called on every session_start
  * to capture a fresh `getTheme` closure (required for /resume).
+ *
+ * Re-patches when pi version changes to catch breaking upstream changes.
  */
 export function patchThinkingRenderer(getTheme: () => Theme): void {
   if (!AssistantMessageComponent) return;
@@ -31,6 +37,19 @@ export function patchThinkingRenderer(getTheme: () => Theme): void {
     return;
   }
 
+  // Check if already patched against the current pi version
+  const currentVersion = VERSION ?? "unknown";
+  const patchVersion = (proto as any)[PATCH_VERSION_KEY] as string | undefined;
+  if ((proto as any)[PATCHED_KEY] && patchVersion === currentVersion) {
+    // Already patched for this version — just update the closure by re-patching
+    // (needed for /resume to get fresh getTheme)
+  } else {
+    // First patch or version changed — warn if version mismatch
+    if ((proto as any)[PATCHED_KEY] && patchVersion && patchVersion !== currentVersion) {
+      console.warn(`[archimedes] Re-patching thinking renderer: pi version changed ${patchVersion} → ${currentVersion}`);
+    }
+  }
+
   // Re-patch every time — /resume needs a fresh getTheme closure
   (proto as any).updateContent = function (this: any, message: any): void {
     this.lastMessage = message;
@@ -147,4 +166,8 @@ export function patchThinkingRenderer(getTheme: () => Theme): void {
     // Bottom padding so next message has breathing room
     this.contentContainer.addChild(new Spacer(1));
   };
+
+  // Mark as patched with version for incompatibility detection
+  (proto as any)[PATCHED_KEY] = true;
+  (proto as any)[PATCH_VERSION_KEY] = currentVersion;
 }