pi-famulus 0.2.1 → 0.2.2-beta.0

package/src/intercom/widgets.ts

@@ -0,0 +1,130 @@
+/**
+ * TUI widgets for intercom message cards.
+ *
+ * Upstream baseline: agent-intercom @ 98183fb, plugin/pi — verbatim port of
+ * the plugin's ChatText/ChatCard renderers and text-measurement helpers.
+ */
+
+/** Rough display width: CJK ideographs and wide chars count as 2. */
+export function stringWidth(s: string): number {
+  let w = 0;
+  for (const ch of s) {
+    const cp = ch.codePointAt(0) ?? 0;
+    w += cp >= 0x2e80 ? 2 : 1;
+  }
+  return w;
+}
+
+/** Word-wrap one line, treating ANSI SGR sequences as zero-width. */
+export function wrapAnsiLine(line: string, width: number): string[] {
+  if (stringWidth(line.replace(/\x1b\[[0-9;]*m/g, "")) <= width) return [line];
+  const tokens = line.match(/(\x1b\[[0-9;]*m|\s+|[^\s\x1b]+)/g) ?? [line];
+  const lines: string[] = [];
+  let cur = "";
+  let curWidth = 0;
+  const push = () => {
+    lines.push(cur.trimEnd());
+    cur = "";
+    curWidth = 0;
+  };
+  for (const token of tokens) {
+    if (token.startsWith("\x1b")) {
+      cur += token;
+      continue;
+    }
+    if (/^\s+$/.test(token)) {
+      if (cur && curWidth + 1 <= width) {
+        cur += " ";
+        curWidth += 1;
+      }
+      continue;
+    }
+    let piece = token;
+    let pieceWidth = stringWidth(piece);
+    if (curWidth > 0 && curWidth + pieceWidth > width) push();
+    while (pieceWidth > width) {
+      let cut = 0;
+      let cutWidth = 0;
+      for (const ch of piece) {
+        const w = stringWidth(ch);
+        if (cutWidth + w > width) break;
+        cutWidth += w;
+        cut += ch.length;
+      }
+      cur += piece.slice(0, cut);
+      push();
+      piece = piece.slice(cut);
+      pieceWidth = stringWidth(piece);
+    }
+    cur += piece;
+    curWidth += pieceWidth;
+  }
+  if (cur.trimEnd()) push();
+  return lines.length ? lines : [""];
+}
+
+/** Local wall-clock `YYYY-mm-dd HH:ss`. */
+export function formatTimestamp(d: Date): string {
+  const p = (n: number) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
+}
+
+/** Minimal Text component satisfying pi's Component contract; no pi-tui dependency. */
+export class ChatText {
+  private text: string;
+  private paddingX: number;
+
+  constructor(text: string, paddingX = 1) {
+    this.text = text;
+    this.paddingX = paddingX;
+  }
+
+  invalidate(): void {}
+
+  render(width: number): string[] {
+    const padding = Math.min(this.paddingX, Math.max(0, Math.floor((width - 1) / 2)));
+    const pad = " ".repeat(padding);
+    const contentWidth = Math.max(1, width - padding * 2);
+    const out: string[] = [];
+    for (const line of this.text.split("\n")) {
+      for (const wrapped of wrapAnsiLine(line, contentWidth)) {
+        out.push(pad + wrapped);
+      }
+    }
+    return out;
+  }
+}
+
+/** Boxed card with a full-width background, matching pi's custom message look. */
+export class ChatCard {
+  private header: string;
+  private body: string;
+  private bg: (text: string) => string;
+
+  constructor(header: string, body: string, bg: (text: string) => string) {
+    this.header = header;
+    this.body = body;
+    this.bg = bg;
+  }
+
+  invalidate(): void {}
+
+  render(width: number): string[] {
+    const px = 1;
+    const contentWidth = Math.max(1, width - px * 2);
+    const out: string[] = [this.bg(" ".repeat(width))];
+    const padLine = (s: string) => {
+      const visible = stringWidth(s.replace(/\x1b\[[0-9;]*m/g, ""));
+      return this.bg(" ".repeat(px) + s + " ".repeat(Math.max(0, width - px - visible)));
+    };
+    for (const line of `${this.header}\n${this.body}`.split("\n")) {
+      for (const wrapped of wrapAnsiLine(line, contentWidth)) {
+        out.push(padLine(wrapped));
+      }
+    }
+    out.push(this.bg(" ".repeat(width)));
+    // One transparent line below the card as extra bottom margin.
+    out.push("");
+    return out;
+  }
+}

package/src/manager-client.ts

@@ -18,10 +18,11 @@ import { famulusPaths } from "./config";
 import { realClock, type Clock, type ClockTimer } from "./clock";
 
 const MAX_FRAME_BYTES = 4 * 1024 * 1024; // 4 MiB (§3.3)
-const EXTENSION_VERSION = "0.2.1";
+const EXTENSION_VERSION = "0.2.2-beta.0";
 export { EXTENSION_VERSION };
-// 5: speaks per-kind agent admission and queued acquire.
-const PROTOCOL = 6;
+// 6: hosted subagents. 7: the extension's messaging bridge (`intercom`
+// request plus `intercom`/`intercom_reset` events).
+const PROTOCOL = 7;
 const HELLO_TIMEOUT_MS = 5000;
 const RECONNECT_HELLO_TIMEOUT_MS = 25_000;
 const DEFAULT_REQUEST_TIMEOUT_MS = 30000;
@@ -108,7 +109,14 @@ export interface MonitorOutputRecord {
 
 /** Server-pushed event (§3.3). Fields beyond `event` depend on the event kind. */
 export interface ManagerEvent {
-  event: "task_started" | "output" | "task_exited" | "session_rebound" | string;
+  event:
+    | "task_started"
+    | "output"
+    | "task_exited"
+    | "session_rebound"
+    | "intercom"
+    | "intercom_reset"
+    | string;
   task_id?: string;
   kind?: string;
   command?: string;
@@ -126,6 +134,8 @@ export interface ManagerEvent {
   ts?: number;
   /** Set on task_started when the daemon recorded who asked for the task. */
   origin?: { via: string; child_id?: string; run_id?: string };
+  /** An intercom bridge frame (deliver/receipt/idle_notice) for this session. */
+  frame?: Record<string, unknown>;
 }
 
 export class ManagerError extends Error {
@@ -608,6 +618,19 @@ export class ManagerClient {
     });
   }
 
+  /** The extension's messaging bridge: one intercom client-protocol op
+   * (register/send/list/receipt/…). Protocol 7+; rejected by older managers. */
+  async intercom(op: Record<string, unknown>): Promise<Record<string, unknown>> {
+    if (this.protocolLevel_ < 7) {
+      throw new ManagerError(
+        "E_VERSION",
+        "this pi-famulus daemon does not serve cross-session messaging (protocol " +
+          `${this.protocolLevel_}; need 7). Restart pi so it starts the current daemon.`,
+      );
+    }
+    return this.request({ type: "intercom", op });
+  }
+
   /** Daemon status, including optional in-place upgrade metadata. */
   async status(): Promise<ManagerStatusResponse> {
     const res = await this.request({ type: "status" });

package/src/reload-handoff.ts

@@ -29,6 +29,7 @@ const REGISTRATIONS = new Set<PropertyKey>([
   "registerShortcut",
   "registerFlag",
   "registerMessageRenderer",
+  "registerEntryRenderer",
   "registerProvider",
 ]);
 
@@ -51,8 +52,13 @@ export function createPiBinding(): PiBinding {
   let current: ExtensionAPI | null = null;
   let live = false;
 
-  const call = (pi: ExtensionAPI, method: PropertyKey, args: unknown[]): unknown =>
-    (Reflect.get(pi, method) as (...a: unknown[]) => unknown).apply(pi, args);
+  const call = (pi: ExtensionAPI, method: PropertyKey, args: unknown[]): unknown => {
+    const fn = Reflect.get(pi, method) as unknown;
+    // A host surface may not implement every registration kind (hosted
+    // child fakes, older pi); skipping beats crashing the replay.
+    if (typeof fn !== "function") return undefined;
+    return (fn as (...a: unknown[]) => unknown).apply(pi, args);
+  };
 
   const api = new Proxy({} as ExtensionAPI, {
     get(_target, key) {