pi-soly 1.11.2 → 1.12.0

package/util.ts

@@ -0,0 +1,250 @@
+// =============================================================================
+// util.ts — shared leaf utilities (frontmatter parsers, fs/glob/format helpers)
+// =============================================================================
+//
+// Extracted from core.ts to keep it focused. These are dependency-light helpers
+// used across the extension; core.ts re-exports them so existing
+// `import { ... } from "./core.ts"` call sites keep working. Only type-only
+// imports point back at core.ts (erased at runtime — no import cycle).
+// =============================================================================
+
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { ProgressInfo, RuleFrontmatter } from "./core.ts";
+
+// ============================================================================
+// Frontmatter parsers
+// ============================================================================
+
+// Simple parser for .soly/rules/ frontmatter.
+export function parseRuleFrontmatter(raw: string): {
+  meta: RuleFrontmatter;
+  body: string;
+} {
+  const match = raw.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/);
+  if (!match) return { meta: {}, body: raw };
+
+  const yamlText = match[1];
+  const body = match[2];
+  const meta: RuleFrontmatter = {};
+
+  for (const line of yamlText.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+
+    const colonIdx = trimmed.indexOf(":");
+    if (colonIdx === -1) continue;
+
+    const key = trimmed.slice(0, colonIdx).trim();
+    let value: string | string[] | boolean = trimmed.slice(colonIdx + 1).trim();
+
+    if (
+      typeof value === "string" &&
+      ((value.startsWith('"') && value.endsWith('"')) ||
+        (value.startsWith("'") && value.endsWith("'")))
+    ) {
+      value = value.slice(1, -1);
+    }
+
+    if (
+      typeof value === "string" &&
+      value.startsWith("[") &&
+      value.endsWith("]")
+    ) {
+      const inner = value.slice(1, -1).trim();
+      value =
+        inner.length === 0
+          ? []
+          : inner.split(",").map((v) => v.trim().replace(/^["']|["']$/g, ""));
+    } else if (value === "true") {
+      value = true;
+    } else if (value === "false") {
+      value = false;
+    }
+
+    (meta as Record<string, unknown>)[key] = value;
+  }
+
+  return { meta, body };
+}
+
+// YAML-ish parser for .soly/STATE.md. Handles 2-level nested objects (for `progress:`).
+export function parseStateFrontmatter(yaml: string): {
+  meta: Record<string, unknown>;
+  progress: ProgressInfo;
+} {
+  const root: Record<string, unknown> = {};
+  const stack: { indent: number; obj: Record<string, unknown> }[] = [
+    { indent: -1, obj: root },
+  ];
+
+  for (const rawLine of yaml.split(/\r?\n/)) {
+    const line = rawLine.replace(/\s+$/, "");
+    if (!line.trim() || line.trim().startsWith("#")) continue;
+
+    const indent = line.match(/^(\s*)/)?.[1].length ?? 0;
+    const content = line.trim();
+
+    while (stack.length > 1 && stack[stack.length - 1].indent >= indent) {
+      stack.pop();
+    }
+    const parent = stack[stack.length - 1].obj as Record<string, unknown>;
+
+    const colonIdx = content.indexOf(":");
+    if (colonIdx === -1) continue;
+    const key = content.slice(0, colonIdx).trim();
+    let value: unknown = content.slice(colonIdx + 1).trim();
+
+    if (value === "") {
+      const newObj: Record<string, unknown> = {};
+      parent[key] = newObj;
+      stack.push({ indent, obj: newObj });
+      continue;
+    }
+
+    if (typeof value === "string") {
+      if (
+        (value.startsWith('"') && value.endsWith('"')) ||
+        (value.startsWith("'") && value.endsWith("'"))
+      ) {
+        value = value.slice(1, -1);
+      } else if (value === "true") {
+        value = true;
+      } else if (value === "false") {
+        value = false;
+      } else if (/^-?\d+(\.\d+)?$/.test(value)) {
+        const n = Number(value);
+        if (!Number.isNaN(n)) value = n;
+      }
+    }
+    parent[key] = value;
+  }
+
+  const progressObj =
+    (root.progress as Record<string, unknown> | undefined) ?? {};
+  return {
+    meta: root,
+    progress: {
+      totalPhases: Number(progressObj.total_phases ?? 0),
+      completedPhases: Number(progressObj.completed_phases ?? 0),
+      totalPlans: Number(progressObj.total_plans ?? 0),
+      completedPlans: Number(progressObj.completed_plans ?? 0),
+      percent: Number(progressObj.percent ?? 0),
+    },
+  };
+}
+
+export function splitFrontmatter(
+  raw: string,
+): { yaml: string; body: string } | null {
+  const m = raw.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/);
+  return m ? { yaml: m[1], body: m[2] } : null;
+}
+
+// ============================================================================
+// File helpers
+// ============================================================================
+
+export function readIfExists(p: string): string | null {
+  try {
+    return fs.readFileSync(p, "utf-8");
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Atomic file write: write to a tmp file in the same directory, then rename
+ * to the target. Avoids partial writes when concurrent readers/processes
+ * (hot reload, another tool, git status) would otherwise see a half-written
+ * file. Best-effort: if rename fails, falls back to a direct write.
+ */
+export function atomicWriteFileSync(
+  target: string,
+  content: string,
+  encoding: BufferEncoding = "utf-8",
+): void {
+  const dir = path.dirname(target);
+  const base = path.basename(target);
+  const tmp = path.join(dir, `.${base}.${process.pid}.${Date.now()}.tmp`);
+  try {
+    fs.writeFileSync(tmp, content, encoding);
+    fs.renameSync(tmp, target);
+  } catch {
+    // Fallback: direct write (e.g. cross-device rename on some systems)
+    try {
+      fs.writeFileSync(target, content, encoding);
+    } catch {
+      // best effort — caller handles errors
+    }
+  }
+}
+
+export function findMarkdownFiles(dir: string, basePath = ""): string[] {
+  const results: string[] = [];
+  if (!fs.existsSync(dir)) return results;
+
+  const entries = fs.readdirSync(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    if (entry.name.startsWith(".")) continue;
+    if (entry.name === "node_modules") continue;
+    const relPath = basePath ? `${basePath}/${entry.name}` : entry.name;
+    const fullPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      results.push(...findMarkdownFiles(fullPath, relPath));
+    } else if (entry.isFile() && entry.name.endsWith(".md")) {
+      results.push(relPath);
+    }
+  }
+  return results;
+}
+
+export function globToRegExp(glob: string): RegExp {
+  let re = "";
+  for (let i = 0; i < glob.length; i++) {
+    const c = glob[i];
+    if (c === "*") {
+      if (glob[i + 1] === "*") {
+        re += ".*";
+        i++;
+        if (glob[i + 1] === "/") i++;
+      } else {
+        re += "[^/]*";
+      }
+    } else if (c === "?") {
+      re += "[^/]";
+    } else if (".()+|^${}\\".includes(c)) {
+      re += "\\" + c;
+    } else {
+      re += c;
+    }
+  }
+  return new RegExp("^" + re + "$");
+}
+
+export function matchesGlob(pathStr: string, glob: string): boolean {
+  return globToRegExp(glob).test(pathStr);
+}
+
+export function extractFilePathsFromPrompt(prompt: string): string[] {
+  // Only match paths that look like real file references: must contain a slash
+  // or start with ./ and end with a short extension. Avoids catching "1.5",
+  // "i.e.", etc.
+  const matches =
+    prompt.match(
+      /(?:\.{0,2}\/)?(?:[A-Za-z0-9_\-]+\/)+[A-Za-z0-9_\-.]+\.[A-Za-z0-9]{1,5}/g,
+    ) ||
+    prompt.match(/[A-Za-z0-9_\-.]+\.[a-z]{1,5}/g) ||
+    [];
+  return matches;
+}
+
+export function estimateTokens(text: string): number {
+  return Math.ceil(text.length / 4);
+}
+
+export function formatTok(n: number): string {
+  if (n <= 0) return "0";
+  if (n >= 1000) return `${(n / 1000).toFixed(1)}k`;
+  return String(n);
+}

package/visual/chrome.ts

@@ -0,0 +1,166 @@
+// =============================================================================
+// visual/chrome.ts — controller that wires the soly chrome into pi's UI
+// =============================================================================
+//
+// Owns one ChromeData and installs three pieces through documented APIs only:
+//   - ctx.ui.setFooter         → SolyFooter (bottom polosa, replaces native)
+//   - ctx.ui.setWidget(above)  → SolyTopBar (top polosa, soly workflow state)
+//   - ctx.ui.setWorkingIndicator + setWorkingMessage → native snowflake spinner
+//     with a live telemetry message (elapsed · ↑↓ tokens · tok/s)
+//
+// No terminal monkey-patching, no runtime deps. The telemetry message is
+// driven by a 1s timer (elapsed) plus message_update pokes (output tokens),
+// and is torn down on agent_end / shutdown. install() is idempotent.
+// =============================================================================
+
+import type { ExtensionUIContext } from "@earendil-works/pi-coding-agent";
+import type { TUI } from "@earendil-works/pi-tui";
+import { type ChromeData, emptyChromeData } from "./data.ts";
+import { SolyFooter } from "./footer.ts";
+import { SolyTopBar } from "./topbar.ts";
+import { SolyHeader, type WelcomeInput } from "./welcome.ts";
+import { buildWorkingMessage } from "./working.ts";
+
+/** Subset of soly config that controls the chrome (see config.ts `chrome`). */
+export type ChromeConfig = {
+	enabled: boolean;
+	ascii: boolean;
+	spinnerFrames: string[];
+	spinnerIntervalMs: number;
+	telemetry: boolean;
+	/** Hex gradient stops for the welcome banner (empty → accent color). */
+	bannerColors: string[];
+};
+
+const TOPBAR_KEY = "soly-chrome-top";
+const WORKING_LABEL = "Working";
+/** Columns reserved for the spinner glyph and pi's own "(esc to interrupt)" hint. */
+const WORKING_MARGIN = 18;
+
+type WorkingState = {
+	ui: ExtensionUIContext;
+	startMs: number;
+	inputTokens: number;
+	outputTokens: number;
+	timer: ReturnType<typeof setInterval> | null;
+};
+
+/** The chrome controller. One per extension instance. */
+export type Chrome = {
+	/** Mutable snapshot the components render from; index.ts updates it in place. */
+	readonly data: ChromeData;
+	/** Install footer/top-bar/spinner/header. Safe to call repeatedly (session_start). */
+	install(ui: ExtensionUIContext): void;
+	/** Provide the startup-header snapshot (version, state, recent changes). */
+	setWelcome(input: WelcomeInput): void;
+	/** Force a re-render of footer + top bar after data changes. */
+	poke(): void;
+	/** Begin the working telemetry line (agent_start). */
+	startWorking(ui: ExtensionUIContext): void;
+	/** Update generated-token count during streaming (message_update). */
+	updateWorking(ui: ExtensionUIContext, outputTokens: number): void;
+	/** Stop the telemetry line and restore the default message (agent_end). */
+	stopWorking(ui: ExtensionUIContext): void;
+	/** Restore pi's native footer/widgets/indicator (session_shutdown / disable). */
+	dispose(ui?: ExtensionUIContext): void;
+};
+
+/** Create a chrome controller. `getConfig` is read live so /reload picks up changes. */
+export function createChrome(getConfig: () => ChromeConfig): Chrome {
+	const data = emptyChromeData();
+	let welcome: WelcomeInput | null = null;
+	let tui: TUI | null = null;
+	let working: WorkingState | null = null;
+	const ascii = () => getConfig().ascii;
+
+	const workingWidth = (): number => {
+		const cols = typeof process !== "undefined" ? process.stdout?.columns : undefined;
+		return Math.max(20, (cols ?? 80) - WORKING_MARGIN);
+	};
+
+	const renderWorking = (): void => {
+		if (!working || !getConfig().telemetry) return;
+		const message = buildWorkingMessage(
+			{
+				label: WORKING_LABEL,
+				elapsedMs: Date.now() - working.startMs,
+				inputTokens: working.inputTokens,
+				outputTokens: working.outputTokens,
+			},
+			workingWidth(),
+		);
+		try { working.ui.setWorkingMessage(message); } catch { /* session may have ended */ }
+	};
+
+	const clearWorking = (): void => {
+		if (working?.timer) clearInterval(working.timer);
+		working = null;
+	};
+
+	return {
+		data,
+
+		install(ui): void {
+			if (!getConfig().enabled) return;
+			ui.setWorkingIndicator({ frames: getConfig().spinnerFrames, intervalMs: getConfig().spinnerIntervalMs });
+			ui.setFooter((t, theme, footerData) => {
+				tui = t;
+				return new SolyFooter(data, footerData, theme, ascii);
+			});
+			ui.setWidget(
+				TOPBAR_KEY,
+				(t, theme) => {
+					tui = t;
+					return new SolyTopBar(data, theme, ascii);
+				},
+				{ placement: "aboveEditor" },
+			);
+			ui.setHeader((t, theme) => {
+				tui = t;
+				return new SolyHeader(() => welcome, theme, ascii, () => getConfig().bannerColors);
+			});
+		},
+
+		setWelcome(input): void {
+			welcome = input;
+			try { tui?.requestRender(); } catch { /* not mounted yet */ }
+		},
+
+		poke(): void {
+			try { tui?.requestRender(); } catch { /* not mounted yet */ }
+		},
+
+		startWorking(ui): void {
+			if (!getConfig().enabled || !getConfig().telemetry) return;
+			clearWorking();
+			working = { ui, startMs: Date.now(), inputTokens: data.ctxTokens ?? 0, outputTokens: 0, timer: null };
+			renderWorking();
+			working.timer = setInterval(renderWorking, 1000);
+		},
+
+		updateWorking(ui, outputTokens): void {
+			if (!working) return;
+			working.ui = ui;
+			working.outputTokens = Math.max(working.outputTokens, outputTokens);
+			renderWorking();
+		},
+
+		stopWorking(ui): void {
+			clearWorking();
+			try { ui.setWorkingMessage(); } catch { /* ignore */ }
+		},
+
+		dispose(ui): void {
+			clearWorking();
+			tui = null;
+			if (!ui) return;
+			try {
+				ui.setFooter(undefined);
+				ui.setWidget(TOPBAR_KEY, undefined);
+				ui.setHeader(undefined);
+				ui.setWorkingIndicator();
+				ui.setWorkingMessage();
+			} catch { /* session already torn down */ }
+		},
+	};
+}

package/visual/colors.ts

@@ -0,0 +1,24 @@
+// =============================================================================
+// visual/colors.ts — theme color-role helpers for the soly chrome
+// =============================================================================
+//
+// We only use a small subset of pi's ThemeColor union. Declaring it locally
+// (a) avoids importing pi's internal type and (b) keeps the literals narrow
+// so `theme.fg(role, text)` type-checks (the subset is assignable to
+// ThemeColor). Pure: maps data → color-role name, no ANSI here.
+// =============================================================================
+
+/** Subset of pi's ThemeColor used by the chrome. Assignable to ThemeColor. */
+export type ChromeColor = "text" | "muted" | "dim" | "accent" | "warning" | "error" | "success";
+
+/**
+ * Context-usage color by percentage, matching pi's native footer thresholds:
+ * `> 90%` error, `> 70%` warning, otherwise muted. `null` (unknown, e.g. just
+ * after compaction) is muted.
+ */
+export function ctxColor(percent: number | null): ChromeColor {
+	if (percent === null || !Number.isFinite(percent)) return "muted";
+	if (percent > 90) return "error";
+	if (percent > 70) return "warning";
+	return "muted";
+}

package/visual/data.ts

@@ -0,0 +1,62 @@
+// =============================================================================
+// visual/data.ts — shared mutable snapshot read by the chrome components
+// =============================================================================
+//
+// index.ts owns one ChromeData object and mutates its fields on lifecycle
+// events (session_start, before_agent_start, turn_end, message_update,
+// model_select). The footer/top-bar components read it live at render time
+// (the same "read fresh each render" pattern pi's own FooterComponent uses),
+// so there is no per-render allocation and no stale closure over `ctx`.
+// =============================================================================
+
+/** Live values the chrome renders from. All optional/nullable → segment hidden. */
+export type ChromeData = {
+	/** Current working directory. */
+	cwd: string;
+	/** Home dir for `~` substitution (os.homedir()). */
+	home: string | undefined;
+	/** Active model id (e.g. "claude-opus-4-8"), null if none. */
+	modelId: string | null;
+	/** Active model provider (e.g. "anthropic"). */
+	modelProvider: string | null;
+	/** Whether the model supports extended thinking. */
+	reasoning: boolean;
+	/** Current thinking level, e.g. "high"; null/"off" hides it. */
+	thinkingLevel: string | null;
+	/** Context usage percent (0–100), or null when unknown (post-compaction). */
+	ctxPercent: number | null;
+	/** Estimated context tokens, or null when unknown. */
+	ctxTokens: number | null;
+	/** Cumulative context window size in tokens. */
+	contextWindow: number | null;
+	/** Dirty file count from soly's git context (footerData only exposes branch). */
+	gitDirty: number;
+	/** Number of active soly rules (always-on + glob), 0 = no segment. */
+	rulesActive: number;
+	/** Compact phase label, e.g. "plan 2/5"; null when no active project. */
+	phaseLabel: string | null;
+	/** Active workflow verb, e.g. "execute"; null when idle. */
+	verbLabel: string | null;
+	/** html_artifacts created this session (0 = no segment). */
+	artifactCount: number;
+};
+
+/** A fresh ChromeData with everything empty/idle. */
+export function emptyChromeData(): ChromeData {
+	return {
+		cwd: "",
+		home: undefined,
+		modelId: null,
+		modelProvider: null,
+		reasoning: false,
+		thinkingLevel: null,
+		ctxPercent: null,
+		ctxTokens: null,
+		contextWindow: null,
+		gitDirty: 0,
+		rulesActive: 0,
+		phaseLabel: null,
+		verbLabel: null,
+		artifactCount: 0,
+	};
+}

package/visual/footer.ts

@@ -0,0 +1,129 @@
+// =============================================================================
+// visual/footer.ts — soly's custom footer (the bottom "polosa")
+// =============================================================================
+//
+// Installed via ctx.ui.setFooter, this replaces pi's built-in footer. It is a
+// single width-aware bar:
+//
+//   ◐ 34% · ⎇ master *3 ───────────  ~/…/pi-soly · ↑12.4k · ↵ send
+//   └─ left: context% · git · foreign ext statuses
+//                              right: [model] · pwd · tokens · keys ─┘
+//
+// `model` appears here only when the top bar is hidden (no active phase/verb),
+// so it is always visible somewhere but never duplicated. Foreign extension
+// statuses (e.g. the MCP icons) are folded in; our own legacy "soly" status
+// key is excluded to avoid echoing it. Layout/drop logic lives in segments.ts.
+// =============================================================================
+
+import type { Component } from "@earendil-works/pi-tui";
+import type { Theme } from "@earendil-works/pi-coding-agent";
+import { composeBar, type Segment } from "./segments.ts";
+import { ctxColor } from "./colors.ts";
+import { fitPath, formatTokens } from "./format.ts";
+import { withGlyph } from "./glyphs.ts";
+import type { ChromeData } from "./data.ts";
+import { themeStyler, type ChromeStyler } from "./style.ts";
+
+/** Structural subset of pi's ReadonlyFooterDataProvider we consume. */
+export type FooterData = {
+	getGitBranch(): string | null;
+	getExtensionStatuses(): ReadonlyMap<string, string>;
+	getAvailableProviderCount(): number;
+};
+
+export type FooterOpts = {
+	ascii: boolean;
+	styler: ChromeStyler;
+	/** Override the keys hint segment; defaults to "↵ send". */
+	keysHint?: string;
+};
+
+/** Max columns a pwd segment may occupy before it elides (see fitPath tiers). */
+const PWD_MAX = 28;
+
+/** Glyph for the active-rules count (Unicode form; ASCII falls back to "N rules"). */
+const RULES_GLYPH = "≡";
+
+/** Model id (+ thinking level when supported), prefixed with the model glyph. */
+export function modelText(data: ChromeData, ascii: boolean): string {
+	const id = data.modelId ?? "no-model";
+	const showThink = data.reasoning && data.thinkingLevel !== null && data.thinkingLevel !== "off";
+	const label = showThink ? `${id} · ${data.thinkingLevel}` : id;
+	return withGlyph("model", label, ascii);
+}
+
+/** Build the full-width footer line. Pure given a styler (identity in tests). */
+export function buildFooterLine(data: ChromeData, fd: FooterData, width: number, opts: FooterOpts): string {
+	const { ascii, styler } = opts;
+	const left: Segment[] = [];
+	const right: Segment[] = [];
+
+	// Phase leads the footer (monochrome — ctx% keeps the only functional color).
+	if (data.phaseLabel) left.push({ id: "phase", text: styler.fg("muted", data.phaseLabel), priority: 8 });
+
+	const pct = data.ctxPercent;
+	const ctxText = withGlyph("ctx", pct === null ? "?" : `${Math.round(pct)}%`, ascii);
+	left.push({ id: "ctx", text: styler.fg(ctxColor(pct), ctxText), priority: 9 });
+
+	const branch = fd.getGitBranch();
+	if (branch) {
+		const dirty = data.gitDirty > 0 ? ` *${data.gitDirty}` : "";
+		left.push({ id: "git", text: styler.fg("muted", withGlyph("git", `${branch}${dirty}`, ascii)), priority: 7 });
+	}
+
+	if (data.rulesActive > 0) {
+		const word = data.rulesActive === 1 ? "rule" : "rules";
+		const rulesText = ascii ? `${data.rulesActive} ${word}` : `${RULES_GLYPH} ${data.rulesActive}`;
+		left.push({ id: "rules", text: styler.dim(rulesText), priority: 5 });
+	}
+
+	if (data.artifactCount > 0) {
+		// BMP glyph only — an astral emoji (🖼) is measured as 1 col here but drawn
+		// as 2 by terminals, overflowing the width-fitted bar and wrapping it.
+		const artText = ascii ? `${data.artifactCount} art` : `▦ ${data.artifactCount}`;
+		left.push({ id: "artifacts", text: styler.dim(artText), priority: 4 });
+	}
+
+	const exts = [...fd.getExtensionStatuses().entries()]
+		.filter(([key]) => key !== "soly")
+		.sort(([a], [b]) => a.localeCompare(b))
+		.map(([, value]) => value.replace(/[\r\n\t]+/g, " ").trim())
+		.filter((value) => value.length > 0);
+	if (exts.length > 0) left.push({ id: "ext", text: styler.dim(exts.join(" · ")), priority: 3 });
+
+	// The top bar now carries only the active verb; phase lives here. So the
+	// model belongs in the footer whenever no verb is active (top bar hidden).
+	const topbarHidden = data.verbLabel === null;
+	if (topbarHidden && data.modelId) {
+		right.push({ id: "model", text: styler.fg("muted", modelText(data, ascii)), priority: 6 });
+	}
+
+	const pwd = fitPath(data.cwd, data.home, PWD_MAX);
+	if (pwd) right.push({ id: "pwd", text: styler.dim(pwd), priority: 4 });
+
+	if (data.ctxTokens !== null && data.ctxTokens > 0) {
+		right.push({ id: "tokens", text: styler.dim(`↑${formatTokens(data.ctxTokens)}`), priority: 5 });
+	}
+
+	right.push({ id: "keys", text: styler.dim(opts.keysHint ?? withGlyph("enter", "send", ascii)), priority: 2 });
+
+	return composeBar({ left, right, width, styleFill: styler.dim });
+}
+
+/** pi Component wrapping the footer line; reads live ChromeData each render. */
+export class SolyFooter implements Component {
+	constructor(
+		private readonly data: ChromeData,
+		private readonly fd: FooterData,
+		private readonly theme: Theme,
+		private readonly getAscii: () => boolean,
+	) {}
+
+	invalidate(): void {
+		/* stateless — render() always reads fresh data */
+	}
+
+	render(width: number): string[] {
+		return [buildFooterLine(this.data, this.fd, width, { ascii: this.getAscii(), styler: themeStyler(this.theme) })];
+	}
+}