@mrclrchtr/supi-context 4.6.0 → 4.8.0

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

@@ -1,33 +1,36 @@
-// supi-core settings domain — event-backed declarative settings contributions and command wiring.
-
-export { registerSettingsCommand } from "./settings/settings-command.ts";
+// supi-core settings domain — settings modules and fixed-config adapters.
 export type {
+  SettingsActionRequest,
+  SettingsApplyResult,
   SettingsCollectionDiagnostic,
   SettingsCollectionResult,
+  SettingsContext,
   SettingsContributionCollector,
+  SettingsModule,
   SettingsScope,
-  SettingsSection,
+  SettingsSnapshot,
 } from "./settings/settings-registry.ts";
 export {
   createSettingsContributionCollector,
   isSettingsContributionCollector,
+  registerSettings,
   SUPI_SETTINGS_COLLECT_EVENT,
 } from "./settings/settings-registry.ts";
 export type {
   BoolField,
   ConfigHelpers,
+  ConfigSettingsOptions,
   CustomField,
-  DeclarativeSettingsOptions,
   EnumField,
   ModelPickerField,
   ModelPickerStaticOption,
   NumberField,
   ScopedFieldValue,
+  SettingsAction,
   SettingsField,
-  SettingsFieldAction,
   SettingsPersistedChange,
   StringField,
   StringListField,
   ValueSource,
 } from "./settings/settings-schema.ts";
-export { registerDeclarativeSettings } from "./settings/settings-schema.ts";
+export { defineConfigSettings } from "./settings/settings-schema.ts";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-context",
-  "version": "4.6.0",
+  "version": "4.8.0",
   "description": "Live context pressure and token-use reports",
   "license": "MIT",
   "repository": {
@@ -32,7 +32,7 @@
   ],
   "dependencies": {
     "typebox": "*",
-    "@mrclrchtr/supi-core": "4.6.0"
+    "@mrclrchtr/supi-core": "4.8.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"
@@ -59,9 +59,7 @@
     ],
     "image": "https://raw.githubusercontent.com/mrclrchtr/supi/main/packages/supi-context/assets/social-preview.png"
   },
-  "main": "src/api.ts",
   "exports": {
-    "./api": "./src/api.ts",
     "./extension": "./src/extension.ts",
     "./package.json": "./package.json"
   }

package/src/settings-registration.ts

@@ -1,24 +1,27 @@
 // supi-context settings registration for the supi settings registry.
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { registerDeclarativeSettings } from "@mrclrchtr/supi-core/settings";
+import { defineConfigSettings, registerSettings } from "@mrclrchtr/supi-core/settings";
 import { CONTEXT_DEFAULTS } from "./config.ts";
 
 /** Register supi-context settings with the supi settings registry. */
 export function registerContextSettings(pi: ExtensionAPI, homeDir?: string): void {
-  registerDeclarativeSettings(pi, {
-    id: "context",
-    label: "Context",
-    section: "context",
-    defaults: CONTEXT_DEFAULTS,
-    fields: [
-      {
-        kind: "boolean" as const,
-        key: "agentToolEnabled",
-        label: "Agent Tool",
-        description: "Enable supi_context agent tool for context usage queries",
-      },
-    ],
-    ...(homeDir ? { homeDir } : {}),
-  });
+  registerSettings(
+    pi,
+    defineConfigSettings({
+      id: "context",
+      label: "Context",
+      section: "context",
+      defaults: CONTEXT_DEFAULTS,
+      fields: [
+        {
+          kind: "boolean" as const,
+          key: "agentToolEnabled",
+          label: "Agent Tool",
+          description: "Enable supi_context agent tool for context usage queries",
+        },
+      ],
+      ...(homeDir ? { homeDir } : {}),
+    }),
+  );
 }

package/node_modules/@mrclrchtr/supi-core/src/context/context-messages.ts

@@ -1,119 +0,0 @@
-// Shared context-message utilities for SuPi extensions.
-//
-// Provides a generic prune-and-reorder pattern for extensions that inject
-// managed context messages (via `before_agent_start` with a `customType` and
-// `contextToken`) and maintain them via the `context` event.
-
-/**
- * Minimal message shape needed for context-message operations.
- * Extensions cast their event.messages entries to this type.
- */
-export type ContextMessageLike = {
-  role?: string;
-  customType?: string;
-  content?: unknown;
-  details?: unknown;
-};
-
-/**
- * Extract the `contextToken` string from a message's `details` object.
- * Returns `null` when the token is absent or not a string.
- */
-export function getContextToken(details: unknown): string | null {
-  if (!details || typeof details !== "object") return null;
-  const token = (details as { contextToken?: unknown }).contextToken;
-  return typeof token === "string" ? token : null;
-}
-
-/**
- * Find the index of the last message with `role: "user"`.
- * Returns `-1` when no user message exists.
- */
-export function findLastUserMessageIndex<T extends ContextMessageLike>(messages: T[]): number {
-  for (let index = messages.length - 1; index >= 0; index--) {
-    if (messages[index]?.role === "user") return index;
-  }
-  return -1;
-}
-
-/**
- * Filter stale context messages and reorder the active one before the last user message.
- *
- * - Removes all messages matching `customType` whose token differs from `activeToken`.
- * - When `activeToken` is `null`, removes **all** messages of that `customType`.
- * - If the active context message is after the last user message, moves it before.
- *
- * Returns the modified array, or the original reference when no changes were needed.
- */
-export function pruneAndReorderContextMessages<T extends ContextMessageLike>(
-  messages: T[],
-  customType: string,
-  activeToken: string | null,
-): T[] {
-  // Remove stale messages of the target customType
-  const filtered = messages.filter((message) => {
-    if (message.customType !== customType) return true;
-    if (!activeToken) return false;
-    return getContextToken(message.details) === activeToken;
-  });
-
-  if (!activeToken) return filtered;
-
-  // Find the active context message
-  const contextIndex = filtered.findIndex(
-    (message) =>
-      message.customType === customType && getContextToken(message.details) === activeToken,
-  );
-  if (contextIndex === -1) return filtered;
-
-  // Find the last user message
-  const userIndex = findLastUserMessageIndex(filtered);
-  if (userIndex === -1 || contextIndex < userIndex) return filtered;
-
-  // Move context message before last user message
-  const next = [...filtered];
-  const [contextMessage] = next.splice(contextIndex, 1);
-  if (!contextMessage) return filtered;
-  next.splice(userIndex, 0, contextMessage);
-  return next;
-}
-
-/**
- * Restore the raw prompt content on a context message that was swapped for display text.
- *
- * Extensions using `registerMessageRenderer` store their LLM-facing content in
- * `details.promptContent` and put a human-readable summary in `content`. This function
- * reverses the swap so the model sees the original prompt content.
- *
- * Returns the original array reference when no change is needed.
- */
-export function restorePromptContent<T extends ContextMessageLike>(
-  messages: T[],
-  customType: string,
-  activeToken: string | null,
-): T[] {
-  if (!activeToken) return messages;
-
-  const index = messages.findIndex(
-    (message) =>
-      message.customType === customType && getContextToken(message.details) === activeToken,
-  );
-  if (index === -1) return messages;
-
-  const promptContent = getPromptContent(messages[index]?.details);
-  if (!promptContent || messages[index]?.content === promptContent) return messages;
-
-  const next = [...messages];
-  next[index] = { ...next[index], content: promptContent };
-  return next;
-}
-
-/**
- * Extract the `promptContent` string from a message's `details` object.
- * Returns `null` when absent or not a string.
- */
-export function getPromptContent(details: unknown): string | null {
-  if (!details || typeof details !== "object") return null;
-  const promptContent = (details as { promptContent?: unknown }).promptContent;
-  return typeof promptContent === "string" ? promptContent : null;
-}

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

@@ -1,189 +0,0 @@
-// 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 ──────────────────────────────────────────────────────────────────
-
-/** What the reviewer is currently doing and on what. */
-export interface CurrentFocus {
-  /** Display label for the active tool (e.g. "Reading", "Searching", "Finding"). */
-  label: string;
-  /** Context detail (e.g. file path, search pattern, directory). */
-  detail: string;
-}
-
-/** 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;
-  /** Token usage stats, if available. */
-  tokens?: {
-    input: number;
-    output: number;
-    total: number;
-    cacheRead?: number;
-    cacheWrite?: number;
-  };
-  /** Per-tool execution counts keyed by short display label (e.g. "diffs", "reads", "greps"). */
-  toolCounts?: Record<string, number>;
-  /** Number of distinct files inspected so far (via read_snapshot_diff / read_snapshot_file). */
-  filesInspected?: number;
-  /** Total files in the review snapshot. */
-  filesTotal?: number;
-  /** Current tool + context for the progress narrative line. */
-  currentFocus?: CurrentFocus;
-  /** Elapsed time in milliseconds since the operation started. */
-  elapsedMs?: number;
-}
-
-// ── Widget ─────────────────────────────────────────────────────────────────
-
-/**
- * TUI progress widget for long-running operations.
- *
- * Two-line layout: top line shows the narrative (current focus + file progress),
- * bottom line shows stats (tokens, elapsed time, turns, tool counts).
- */
-export class ProgressWidget extends Container {
-  private message: string;
-  private progress: WidgetProgress = { turns: 0, toolUses: 0 };
-  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();
-    this.renderTopLine();
-    this.renderBottomLine();
-  }
-
-  private renderTopLine(): void {
-    const topParts: string[] = [];
-
-    if (this.progress.currentFocus) {
-      const { label, detail } = this.progress.currentFocus;
-      topParts.push(detail ? `${label}: ${detail}` : label);
-    }
-
-    if (this.progress.filesTotal && this.progress.filesTotal > 0) {
-      const inspected = this.progress.filesInspected ?? 0;
-      topParts.push(`${inspected}/${this.progress.filesTotal} files`);
-    }
-
-    const loaderMessage =
-      topParts.length > 0 ? `${this.message} · ${topParts.join(" · ")}` : this.message;
-    this.loader.setMessage(loaderMessage);
-    this.addChild(this.loader);
-  }
-
-  private renderBottomLine(): void {
-    const stats: string[] = [];
-
-    this.appendTokenStats(stats);
-
-    if (this.progress.elapsedMs !== undefined && this.progress.elapsedMs >= 1000) {
-      stats.push(formatElapsed(this.progress.elapsedMs));
-    }
-
-    if (this.progress.turns > 0) {
-      stats.push(`⟳ ${this.progress.turns}`);
-    }
-
-    if (this.progress.toolCounts) {
-      const parts = Object.entries(this.progress.toolCounts)
-        .filter(([, count]) => count > 0)
-        .sort(([, a], [, b]) => b - a)
-        .map(([label, count]) => `${count} ${label}`);
-      if (parts.length > 0) stats.push(parts.join(" · "));
-    }
-
-    if (stats.length > 0) {
-      this.addChild(new Text(this.theme.fg("dim", `  ${stats.join(" · ")}`), 1, 0));
-    }
-  }
-
-  private appendTokenStats(stats: string[]): void {
-    const tokens = this.progress.tokens;
-    if (!tokens) return;
-
-    stats.push(`↑ ${formatTokens(tokens.input)}`);
-    if (tokens.cacheRead !== undefined && tokens.cacheRead > 0) {
-      stats.push(`↲ ${formatTokens(tokens.cacheRead)}`);
-    }
-    if (tokens.cacheWrite !== undefined && tokens.cacheWrite > 0) {
-      stats.push(`↱ ${formatTokens(tokens.cacheWrite)}`);
-    }
-    stats.push(`↓ ${formatTokens(tokens.output)}`);
-  }
-}
-
-// ── Helpers ────────────────────────────────────────────────────────────────
-
-export 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);
-}
-
-export function formatElapsed(ms: number): string {
-  const totalSec = Math.floor(ms / 1000);
-  const hours = Math.floor(totalSec / 3600);
-  const minutes = Math.floor((totalSec % 3600) / 60);
-  const seconds = totalSec % 60;
-
-  if (hours > 0) {
-    return `${hours}h ${minutes}m ${seconds}s`;
-  }
-  if (minutes > 0) {
-    return `${minutes}m ${seconds}s`;
-  }
-  return `${seconds}s`;
-}