@mrclrchtr/supi-context 1.9.1 → 1.11.0

package/README.md

@@ -1,8 +1,14 @@
-![SuPi](assets/logo.png)
+<div align="center">
+  <a href="https://github.com/mrclrchtr/supi/tree/main/packages/supi-context">
+    <picture>
+      <img src="https://raw.githubusercontent.com/mrclrchtr/supi/main/packages/supi-context/assets/logo.png" alt="SuPi" width="50%">
+    </picture>
+  </a>
+</div>
 
 # @mrclrchtr/supi-context
 
-Adds a `/supi-context` command to the [pi coding agent](https://github.com/earendil-works/pi) so you can see where your context window is going.
+Adds a `/supi-context` command to the [pi coding agent](https://github.com/earendil-works/pi) so you can inspect how the current session is spending its context window.
 
 ## Install
 
@@ -20,41 +26,64 @@ pi install ./packages/supi-context
 
 ## What you get
 
-After install, pi gets one command:
+After install, pi gets one user command:
 
 - `/supi-context` — render a detailed context-usage report for the current session
+- `/supi-context full` — render the same report with the full guideline and tool-definition lists instead of previews
 
-The report includes:
+The command sends a custom `supi-context` message, and this package registers a dedicated renderer so the report shows up as a structured TUI view instead of plain text.
 
-- model name and context-window size
-- estimated or scaled total token usage
-- a visual grid of used space, free space, and autocompact buffer
-- token usage by category: system prompt, user messages, assistant messages, tool calls, tool results, and other
-- system-prompt breakdown for context files, skills, guidelines, tool snippets, and append text
+## What the report shows
 
-  - **Guidelines attribution** — breaks down guideline bullets by source: PI built-in defaults, known built-in tools (`read`, `write`, `edit`), and other (extensions/custom tools). Each source shows its token count and bullet count.
-  - **Tool snippet breakdown** — shows per-tool one-line snippet tokens alongside definition tokens in the tool definitions section.
+The report is meant to answer questions like:
 
-- injected subdirectory context files from `supi-claude-md`, including turn number and token cost
-- active skills and their token cost
-- tool-definition count and token cost, with per-tool snippet token column
-- guideline source summary (e.g., "2 bullets from default · 1 bullet from read · 3 bullets from edit")
-- compaction summary when older turns were summarized
-- extra provider sections from extensions registered through the shared context-provider registry
+- what is taking up space in the current context window?
+- how much room is left before compaction pressure gets worse?
+- which instruction files, context files, skills, guidelines, or tools are expensive?
+- what extra context was injected by other SuPi extensions?
+
+It includes:
+
+- model name, context-window size, and total token usage
+- approximation or pending-usage notes when exact usage data is not available yet
+- a visual usage bar for system prompt, user messages, assistant messages, tool calls, tool results, other, autocompact buffer, and free space
+- a category breakdown table for the same usage buckets
+- a system-prompt composition breakdown for:
+  - base prompt content
+  - instruction files (`AGENTS.md`, `CLAUDE.md`, etc.)
+  - other context files loaded into the system prompt
+  - active skills
+  - guidelines
+  - tool snippets
+  - append text
+- instruction-file details with token cost, line count, and detected origin (`project` vs `global`)
+- injected subdirectory context files from `supi-claude-md`, including turn number, line count, and token cost
+- active skill names with per-skill token counts
+- guideline bullet previews, plus source attribution for PI defaults, known built-in tools (`read`, `write`, `edit`), and `other`
+- active tool definitions with per-tool definition token counts and snippet-token columns when available
+- a compaction note when older turns were summarized
+- extra provider sections from extensions registered through the shared context-provider registry in `@mrclrchtr/supi-core`
+
+## Configuration
+
+No settings are required.
+
+This package does not add a model-callable tool; it adds a user command only.
 
 ## Notes
 
-- The command uses the latest cached `systemPromptOptions` captured before an agent run.
-- When exact usage data is not available yet, the report falls back to estimated token counts and shows an approximation note.
-- The command does not add a model-callable tool; it is a user command only.
+- The command uses the latest cached `systemPromptOptions` captured during `before_agent_start`.
+- If those prompt options are missing or incomplete, the package backfills context files and skills by re-parsing the current system prompt.
+- Exact totals come from pi's current context-usage data when available. Otherwise the report falls back to rough estimates and/or scales estimated category totals to the latest measured total.
+- If no model is selected yet, the report can still render, but the context-window bar cannot show capacity.
 
 ## Source
 
-- `src/context.ts` — command registration and cached prompt-option handling
-- `src/analysis.ts` — token accounting and report data
-- `src/format.ts` — formatted report output
-- `src/prompt-inference.ts` — model-specific context window detection
-- `src/renderer.ts` — custom message renderer for the report
-- `src/utils.ts` — token formatting helpers
+- `src/context.ts` — command registration, cached prompt-option handling, and renderer wiring
+- `src/analysis.ts` — token accounting, attribution, and report data assembly
+- `src/format.ts` — formatted report output for the TUI view
+- `src/prompt-inference.ts` — fallback recovery of context files, skills, and guideline sections from the live system prompt
+- `src/renderer.ts` — custom renderer for `supi-context` messages
+- `src/utils.ts` — token and plural-format helpers
 
 Tests live under `__tests__/unit/`.

package/node_modules/@mrclrchtr/supi-core/README.md

@@ -1,4 +1,10 @@
-![SuPi](assets/logo.png)
+<div align="center">
+  <a href="https://github.com/mrclrchtr/supi/tree/main/packages/supi-core">
+    <picture>
+      <img src="https://raw.githubusercontent.com/mrclrchtr/supi/main/packages/supi-core/assets/logo.png" alt="SuPi" width="50%">
+    </picture>
+  </a>
+</div>
 
 # @mrclrchtr/supi-core
 

package/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "1.9.1",
+  "version": "1.11.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {
@@ -19,11 +19,15 @@
     "!__tests__"
   ],
   "peerDependencies": {
+    "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*",
     "typebox": "*"
   },
   "peerDependenciesMeta": {
+    "@earendil-works/pi-ai": {
+      "optional": true
+    },
     "@earendil-works/pi-coding-agent": {
       "optional": true
     },
@@ -40,8 +44,10 @@
     "./config": "./src/config.ts",
     "./context": "./src/context.ts",
     "./debug": "./src/debug-registry.ts",
+    "./llm": "./src/llm.ts",
     "./package.json": "./package.json",
     "./path": "./src/path.ts",
+    "./progress-widget": "./src/progress-widget.ts",
     "./project": "./src/project.ts",
     "./session": "./src/session.ts",
     "./settings": "./src/settings.ts",

package/node_modules/@mrclrchtr/supi-core/src/api.ts

@@ -13,6 +13,8 @@ export * from "./context.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./debug-registry.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./llm.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./path.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./project.ts";

package/node_modules/@mrclrchtr/supi-core/src/config/config-settings.ts

@@ -1,11 +1,42 @@
 // Config-aware settings helper for SuPi config-backed settings sections.
 // Wraps registerSettings() and centralizes selected-scope loading + scoped persistence.
+//
+// Setting items can declare a `configType` ("boolean" | "number" | "stringList")
+// to enable auto-generated persistChange. When all items have a configType,
+// the persistChange callback can be omitted.
 
 import type { SettingItem } from "@earendil-works/pi-tui";
 import type { SettingsScope } from "../settings/settings-registry.ts";
 import { registerSettings } from "../settings/settings-registry.ts";
 import { loadSupiConfigForScope, removeSupiConfigKey, writeSupiConfig } from "./config.ts";
 
+// ── Types ──────────────────────────────────────────────────────────────────
+
+/**
+ * Supported config value types for declarative persistChange.
+ *
+ * - `"boolean"`: maps "on" → true, "off" → false
+ * - `"number"`: parses integer via Number.parseInt, falls back to unset on invalid
+ * - `"stringList"`: splits on comma, trims whitespace, unsets on empty
+ */
+export type ConfigSettingType = "boolean" | "number" | "stringList";
+
+/**
+ * Extended setting item that can declare its config type for auto-generated
+ * persistence handling.
+ */
+export interface ConfigSettingItem extends SettingItem {
+  /**
+   * When set, persistChange for this item is auto-generated.
+   * All items must declare a configType for auto-generation to activate.
+   */
+  configType?: ConfigSettingType;
+}
+
+/**
+ * Helpers provided to the persistChange callback for writing or removing
+ * scoped config values.
+ */
 export interface ConfigSettingsHelpers {
   /** Write a key to the selected scope's config section. */
   set(key: string, value: unknown): void;
@@ -22,10 +53,21 @@ export interface ConfigSettingsOptions<T> {
   section: string;
   /** Default config values */
   defaults: T;
-  /** Build SettingItem[] from scoped config. Called by loadValues. */
-  buildItems: (settings: T, scope: SettingsScope, cwd: string) => SettingItem[];
-  /** Handle a settings change with scoped persistence helpers. */
-  persistChange: (
+  /**
+   * Build SettingItem[] from scoped config. Called by loadValues.
+   *
+   * Items can include a `configType` property for auto-generated
+   * persistChange handling. When ALL items declare a configType,
+   * the `persistChange` callback can be omitted.
+   */
+  buildItems: (settings: T, scope: SettingsScope, cwd: string) => ConfigSettingItem[];
+  /**
+   * Handle a settings change with scoped persistence helpers.
+   *
+   * Optional when all items returned by `buildItems` declare a `configType`.
+   * Required when any item lacks a `configType`.
+   */
+  persistChange?: (
     scope: SettingsScope,
     cwd: string,
     settingId: string,
@@ -36,6 +78,52 @@ export interface ConfigSettingsOptions<T> {
   homeDir?: string;
 }
 
+// ── Auto-generated persistChange ───────────────────────────────────────────
+
+function autoPersistChange(
+  settingId: string,
+  value: string,
+  helpers: ConfigSettingsHelpers,
+  items: ConfigSettingItem[],
+): void {
+  const item = items.find((i) => i.id === settingId);
+  if (!item?.configType) return;
+
+  switch (item.configType) {
+    case "boolean": {
+      helpers.set(settingId, value === "on");
+      break;
+    }
+    case "number": {
+      const num = Number.parseInt(value, 10);
+      if (Number.isFinite(num) && num > 0) {
+        helpers.set(settingId, num);
+      } else {
+        helpers.unset(settingId);
+      }
+      break;
+    }
+    case "stringList": {
+      const names = value
+        .split(",")
+        .map((s) => s.trim())
+        .filter((s) => s.length > 0);
+      if (names.length > 0) {
+        helpers.set(settingId, names);
+      } else {
+        helpers.unset(settingId);
+      }
+      break;
+    }
+  }
+}
+
+function areAllItemsDeclarative(items: ConfigSettingItem[]): boolean {
+  return items.length > 0 && items.every((i) => i.configType !== undefined);
+}
+
+// ── Registration ───────────────────────────────────────────────────────────
+
 /**
  * Register a config-backed settings section.
  *
@@ -43,8 +131,13 @@ export interface ConfigSettingsOptions<T> {
  * instead of merged effective runtime config. Provides scoped `set` / `unset`
  * persistence helpers so extensions don't need to wire `writeSupiConfig` /
  * `removeSupiConfigKey` by hand.
+ *
+ * When every item returned by `buildItems` declares a `configType`, the
+ * `persistChange` callback is optional and will be auto-generated.
  */
 export function registerConfigSettings<T>(options: ConfigSettingsOptions<T>): void {
+  let cachedItems: ConfigSettingItem[] | undefined;
+
   registerSettings({
     id: options.id,
     label: options.label,
@@ -53,7 +146,9 @@ export function registerConfigSettings<T>(options: ConfigSettingsOptions<T>): vo
         scope,
         homeDir: options.homeDir,
       });
-      return options.buildItems(settings, scope, cwd);
+      const items = options.buildItems(settings, scope, cwd);
+      cachedItems = items;
+      return items;
     },
     persistChange: (scope, cwd, settingId, value) => {
       const helpers: ConfigSettingsHelpers = {
@@ -70,7 +165,18 @@ export function registerConfigSettings<T>(options: ConfigSettingsOptions<T>): vo
           });
         },
       };
-      options.persistChange(scope, cwd, settingId, value, helpers);
+
+      // Use manual persistChange when provided
+      if (options.persistChange) {
+        options.persistChange(scope, cwd, settingId, value, helpers);
+        return;
+      }
+
+      // Auto-generate when all items are declarative
+      const items = cachedItems ?? options.buildItems(options.defaults, scope, cwd);
+      if (areAllItemsDeclarative(items)) {
+        autoPersistChange(settingId, value, helpers, items);
+      }
     },
   });
 }

package/node_modules/@mrclrchtr/supi-core/src/config/config.ts

@@ -184,3 +184,23 @@ function extractSection(
   }
   return null;
 }
+
+/**
+ * Shorthand for {@link loadSupiConfig} that infers the return type from defaults.
+ *
+ * Reduces boilerplate when a package only needs the merged runtime config.
+ *
+ * @example
+ * ```ts
+ * const config = loadSectionConfig("my-ext", cwd, { enabled: true, timeout: 30 });
+ * // config is typed as { enabled: boolean; timeout: number }
+ * ```
+ */
+export function loadSectionConfig<T extends Record<string, unknown>>(
+  section: string,
+  cwd: string,
+  defaults: T,
+  options?: SupiConfigOptions,
+): T {
+  return loadSupiConfig(section, cwd, defaults, options);
+}

package/node_modules/@mrclrchtr/supi-core/src/llm.ts

@@ -0,0 +1,211 @@
+import { complete } from "@earendil-works/pi-ai";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { TSchema } from "typebox";
+import { Value } from "typebox/value";
+
+// Shared LLM utilities for SuPi extensions.
+//
+// Provides retry logic, structured LLM call helpers, and other
+// common patterns for extensions that interact with AI models.
+
+/**
+ * Options for {@link withRetry}.
+ */
+export interface WithRetryOptions {
+  /** Maximum number of retry attempts after the initial call. Default: 2 */
+  retries?: number;
+  /** Base delay in milliseconds for exponential backoff. Default: 1000 */
+  baseDelayMs?: number;
+  /** AbortSignal to cancel retry loops. */
+  signal?: AbortSignal;
+  /** Called with each failed attempt's attempt index and error. */
+  logger?: (attempt: number, error: unknown) => void;
+  /** Called before each retry delay with attempt index and computed delay. */
+  onRetry?: (attempt: number, delayMs: number) => void;
+}
+
+/**
+ * Attempt an async operation with retries and exponential backoff.
+ *
+ * If the signal is already aborted on entry, the operation is skipped entirely.
+ * If the signal aborts during a delay, the delay is cancelled immediately.
+ *
+ * @param fn - The async operation to retry.
+ * @param options - Optional configuration for retries, backoff, signal, and callbacks.
+ * @returns The result on success, or `null` if all attempts fail or the signal aborts.
+ */
+/**
+ * Create a promise that resolves after `ms` milliseconds, or rejects if
+ * the signal fires before the timeout elapses.
+ */
+function delay(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise<void>((resolve, reject) => {
+    const timer = setTimeout(resolve, ms);
+    if (signal) {
+      const onAbort = () => {
+        clearTimeout(timer);
+        reject(new DOMException("Aborted", "AbortError"));
+      };
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
+  });
+}
+
+/**
+ * Attempt an async operation with retries and exponential backoff.
+ *
+ * If the signal is already aborted on entry, the operation is skipped entirely.
+ * If the signal aborts during a delay, the delay is cancelled immediately.
+ *
+ * @param fn - The async operation to retry.
+ * @param options - Optional configuration for retries, backoff, signal, and callbacks.
+ * @returns The result on success, or `null` if all attempts fail or the signal aborts.
+ */
+export async function withRetry<T>(
+  fn: () => Promise<T>,
+  options?: WithRetryOptions,
+): Promise<T | null> {
+  const { retries = 2, baseDelayMs = 1000, signal, logger, onRetry } = options ?? {};
+
+  if (signal?.aborted) return null;
+
+  for (let attempt = 0; attempt <= retries; attempt++) {
+    try {
+      return await fn();
+    } catch (err) {
+      logger?.(attempt, err);
+      if (attempt >= retries || signal?.aborted) continue;
+
+      const delayMs = baseDelayMs * 2 ** attempt;
+      onRetry?.(attempt, delayMs);
+
+      try {
+        await delay(delayMs, signal);
+      } catch {
+        // delay() only rejects on abort
+        return null;
+      }
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Extract and validate JSON from LLM response content blocks.
+ *
+ * Finds the first JSON object `{...}` in the combined text content,
+ * parses it, and validates against a TypeBox schema.
+ *
+ * @param content - The LLM response content blocks.
+ * @param schema - TypeBox schema to validate against.
+ * @returns The parsed and validated result, or `null` if extraction or validation fails.
+ */
+export function extractJsonFromResponse<T extends TSchema>(
+  content: ReadonlyArray<{ type: string; text?: string }>,
+  schema: T,
+): { parsed: import("typebox").Static<T> } | null {
+  const text = content
+    .filter((c): c is { type: "text"; text: string } => c.type === "text")
+    .map((c) => c.text)
+    .join("");
+
+  const jsonMatch = text.match(/\{[\s\S]*\}/);
+  if (!jsonMatch) return null;
+
+  try {
+    const parsed = JSON.parse(jsonMatch[0]);
+    if (Value.Check(schema, parsed)) {
+      return { parsed } as { parsed: import("typebox").Static<T> };
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+// ── callWithJsonResponse ───────────────────────────────────────────────────
+
+/**
+ * Options for {@link callWithJsonResponse}.
+ */
+export interface CallWithJsonResponseOptions {
+  /** The prompt to send to the LLM. */
+  prompt: string;
+  /** Optional data context appended to the prompt. */
+  dataContext?: string;
+  /** Maximum tokens for the response. Default: 4096 */
+  maxTokens?: number;
+  /** System prompt for the LLM call. Default: "" */
+  systemPrompt?: string;
+  /** Number of retries for the LLM call. Default: 2 */
+  retries?: number;
+}
+
+/**
+ * Call the LLM with a prompt and validate the JSON response against a TypeBox schema.
+ *
+ * Handles model resolution, auth, retry via `withRetry`, text extraction,
+ * JSON regex matching, and TypeBox validation.
+ *
+ * Returns `null` when:
+ * - No model is available
+ * - All retries fail
+ * - Response contains no valid JSON
+ * - JSON doesn't match the schema
+ * - The request is aborted
+ *
+ * @param ctx - The extension context for model resolution and auth.
+ * @param options - Call options including prompt, schema, and retry config.
+ * @param schema - TypeBox schema to validate the JSON response against.
+ * @returns The parsed and validated result, or `null`.
+ */
+export async function callWithJsonResponse<T extends TSchema>(
+  ctx: ExtensionContext,
+  options: CallWithJsonResponseOptions,
+  schema: T,
+): Promise<{ parsed: import("typebox").Static<T> } | null> {
+  const { prompt, dataContext, maxTokens = 4096, systemPrompt = "", retries = 2 } = options;
+
+  const model = ctx.model ?? ctx.modelRegistry.getAvailable()[0] ?? null;
+  if (!model) return null;
+
+  const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
+  if (!auth.ok || !auth.apiKey) return null;
+
+  const fullPrompt = dataContext
+    ? `${prompt}
+
+DATA:
+${dataContext}`
+    : prompt;
+
+  const response = await withRetry(
+    async () => {
+      return complete(
+        model,
+        {
+          systemPrompt,
+          messages: [
+            {
+              role: "user",
+              content: [{ type: "text", text: fullPrompt }],
+              timestamp: Date.now(),
+            },
+          ],
+        },
+        {
+          apiKey: auth.apiKey,
+          headers: auth.headers,
+          signal: ctx.signal,
+          maxTokens,
+        },
+      );
+    },
+    { retries, baseDelayMs: 1000, signal: ctx.signal },
+  );
+
+  if (!response) return null;
+
+  return extractJsonFromResponse(response.content, schema);
+}

package/node_modules/@mrclrchtr/supi-core/src/progress-widget.ts

@@ -0,0 +1,108 @@
+// Generic progress widget for SuPi long-running operations.
+//
+// Provides a TUI-based progress display with animated loader, turn counts,
+// tool usage, and activity descriptions.
+
+import type { Theme } from "@earendil-works/pi-coding-agent";
+import { CancellableLoader, Container, Text } from "@earendil-works/pi-tui";
+
+// ── Types ──────────────────────────────────────────────────────────────────
+
+/** Progress state for widget display, compatible with child-session updates. */
+export interface WidgetProgress {
+  /** Number of agent turns completed. */
+  turns: number;
+  /** Number of tool executions started. */
+  toolUses: number;
+  /** Human-readable active tool descriptions. */
+  activities: string[];
+  /** Token usage stats, if available. */
+  tokens?: { input: number; output: number; total: number };
+}
+
+// ── Widget ─────────────────────────────────────────────────────────────────
+
+/**
+ * TUI progress widget for long-running operations.
+ *
+ * Shows an animated loader, turn count, tool uses, token count, and any active
+ * tool descriptions while the child session or operation is running.
+ */
+export class ProgressWidget extends Container {
+  private message: string;
+  private progress: WidgetProgress = { turns: 0, toolUses: 0, activities: [] };
+  private loader: CancellableLoader;
+  private tui: { requestRender(): void };
+  private theme: Theme;
+
+  constructor(tui: { requestRender(): void }, theme: Theme, message: string) {
+    super();
+    this.tui = tui;
+    this.theme = theme;
+    this.message = message;
+    this.loader = new CancellableLoader(
+      tui as ConstructorParameters<typeof CancellableLoader>[0],
+      (text: string) => theme.fg("accent", text),
+      (text: string) => theme.fg("muted", text),
+      message,
+    );
+
+    this.renderContent();
+  }
+
+  /** AbortSignal that fires when the user presses Escape. */
+  get signal(): AbortSignal {
+    return this.loader.signal;
+  }
+
+  /** Callback invoked when the user presses Escape. */
+  set onAbort(fn: (() => void) | undefined) {
+    this.loader.onAbort = fn;
+  }
+
+  /** Delegate keyboard input to the loader. */
+  handleInput(data: string): void {
+    this.loader.handleInput(data);
+  }
+
+  /** Update progress state and request a re-render. */
+  updateProgress(progress: WidgetProgress): void {
+    this.progress = progress;
+    this.renderContent();
+    this.tui.requestRender();
+  }
+
+  /** Clean up the widget. */
+  dispose(): void {
+    this.loader.dispose();
+  }
+
+  private renderContent(): void {
+    this.clear();
+
+    const stats: string[] = [];
+    if (this.progress.turns > 0) stats.push(`⟳${this.progress.turns}`);
+    if (this.progress.toolUses > 0) stats.push(`${this.progress.toolUses} tool uses`);
+    if (this.progress.tokens) stats.push(`${formatTokens(this.progress.tokens.total)} tokens`);
+
+    const loaderMessage =
+      stats.length > 0 ? `${this.message} · ${stats.join(" · ")}` : this.message;
+
+    this.loader.setMessage(loaderMessage);
+    this.addChild(this.loader);
+
+    if (this.progress.activities.length > 0) {
+      this.addChild(
+        new Text(this.theme.fg("dim", `  ⎿  ${this.progress.activities.join(", ")}…`), 1, 0),
+      );
+    }
+  }
+}
+
+// ── Helpers ────────────────────────────────────────────────────────────────
+
+function formatTokens(count: number): string {
+  if (count >= 1_000_000) return `${(count / 1_000_000).toFixed(1)}M`;
+  if (count >= 1_000) return `${(count / 1_000).toFixed(1)}k`;
+  return String(count);
+}

package/node_modules/@mrclrchtr/supi-core/src/tool-framework.ts

@@ -8,9 +8,11 @@ import type {
   AgentToolResult,
   AgentToolUpdateCallback,
   ExtensionAPI,
+  ExtensionCommandContext,
   ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 import { type TSchema, Type } from "typebox";
+import { ProgressWidget, type WidgetProgress } from "./progress-widget.ts";
 
 // ---------------------------------------------------------------------------
 // Types
@@ -114,3 +116,67 @@ export const SymbolParam = Type.String({
 
 /** Maximum results to return. */
 export const MaxResultsParam = Type.Number({ description: "Maximum results to return" });
+
+// ---------------------------------------------------------------------------
+// Progress widget runner
+// ---------------------------------------------------------------------------
+
+/**
+ * Run an async operation with a live TUI progress widget.
+ *
+ * Automatically manages:
+ * - The {@link ProgressWidget} lifecycle
+ * - `supi:working:start` / `supi:working:end` events for tab-spinner integration
+ * - Abort signal handling
+ * - Error catching (returns `null` on failure)
+ *
+ * Falls back to running without a widget when `ctx.hasUI` is false.
+ *
+ * @param pi - The extension API (for event emission).
+ * @param ctx - The command context (for UI access and hasUI check).
+ * @param title - The progress widget title.
+ * @param runner - Async function that receives (signal, onProgress).
+ * @returns The runner result, or `null` on cancel/error.
+ */
+export async function runWithProgressWidget<T>(
+  pi: ExtensionAPI,
+  ctx: ExtensionCommandContext,
+  title: string,
+  runner: (signal: AbortSignal, onProgress: (p: WidgetProgress) => void) => Promise<T>,
+): Promise<T | null> {
+  if (!ctx.hasUI) {
+    // No UI — run without progress widget but still emit working events
+    pi.events.emit("supi:working:start", { source: "supi-core" });
+    try {
+      return await runner(new AbortController().signal, () => {});
+    } catch {
+      return null;
+    } finally {
+      pi.events.emit("supi:working:end", { source: "supi-core" });
+    }
+  }
+
+  return ctx.ui.custom<T | null>((tui, theme, _kb, done) => {
+    const widget = new ProgressWidget(tui, theme, title);
+    let finished = false;
+
+    const finish = (result: T | null) => {
+      if (finished) return;
+      finished = true;
+      pi.events.emit("supi:working:end", { source: "supi-core" });
+      widget.dispose();
+      done(result);
+    };
+
+    widget.onAbort = () => {
+      // Widget handles abort signal; runner resolves with cancel/error.
+    };
+
+    pi.events.emit("supi:working:start", { source: "supi-core" });
+    runner(widget.signal, (progress) => widget.updateProgress(progress))
+      .then((result) => finish(result))
+      .catch(() => finish(null));
+
+    return widget;
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-context",
-  "version": "1.9.1",
+  "version": "1.11.0",
   "description": "SuPi Context extension — detailed context usage report via /supi-context command",
   "license": "MIT",
   "repository": {
@@ -20,7 +20,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@mrclrchtr/supi-core": "1.9.1"
+    "@mrclrchtr/supi-core": "1.11.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"