@mrclrchtr/supi-lsp 1.9.1 → 1.11.0

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-lsp",
-  "version": "1.9.1",
+  "version": "1.11.0",
   "description": "SuPi LSP extension — Language Server Protocol integration for pi",
   "license": "MIT",
   "repository": {
@@ -26,8 +26,8 @@
     "vscode-jsonrpc": "^8.2.1",
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-languageserver-types": "^3.17.5",
-    "@mrclrchtr/supi-code-runtime": "1.9.1",
-    "@mrclrchtr/supi-core": "1.9.1"
+    "@mrclrchtr/supi-code-runtime": "1.11.0",
+    "@mrclrchtr/supi-core": "1.11.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",

package/src/provider/lsp-semantic-provider.ts

@@ -5,9 +5,18 @@ import type {
   CodeLocation,
   CodePosition,
   CodeSymbol,
+  RefactorResult,
   SemanticProvider,
 } from "@mrclrchtr/supi-code-runtime/api";
-import type { DocumentSymbol, Location, LocationLink, SymbolInformation } from "../config/types.ts";
+import type {
+  DocumentSymbol,
+  Location,
+  LocationLink,
+  SymbolInformation,
+  TextDocumentEdit,
+  TextEdit,
+  WorkspaceEdit,
+} from "../config/types.ts";
 import type { SessionLspService } from "../session/service-registry.ts";
 
 /**
@@ -50,9 +59,138 @@ export function createLspSemanticProvider(lsp: SessionLspService): SemanticProvi
       if (!results) return null;
       return results.map((sym) => toCodeSymbol(sym as SymbolInformation));
     },
+
+    async rename(file: string, position: CodePosition, newName: string): Promise<RefactorResult> {
+      const edit = await lsp.rename(file, position, newName);
+      return convertLspWorkspaceEdit(edit);
+    },
+
+    async codeActions(file: string, position: CodePosition): Promise<RefactorResult[]> {
+      const actions = await lsp.codeActions(file, position);
+      if (!actions) return [];
+
+      const results: RefactorResult[] = [];
+      for (const action of actions) {
+        const edit = action.edit;
+        if (!edit) {
+          results.push({
+            kind: "unavailable",
+            reason: `Code action "${action.title}" has no edit`,
+          });
+          continue;
+        }
+        const converted = convertLspWorkspaceEdit(edit);
+        if (converted.kind === "precise") {
+          results.push(converted);
+        } else {
+          results.push({
+            kind: "unavailable",
+            reason: `Code action "${action.title}" could not produce precise edits`,
+          });
+        }
+      }
+      return results;
+    },
   };
 }
 
+// ── LSP WorkspaceEdit converter ─────────────────────────────────────
+
+/**
+ * Convert an LSP WorkspaceEdit to the shared RefactorResult type.
+ *
+ * LSP WorkspaceEdit can use:
+ * - `documentChanges` (preferred, with TextDocumentEdit)
+ * - `changes` (legacy, URI → TextEdit[] map)
+ *
+ * Returns `unavailable` when both are missing or both produce zero edits.
+ */
+function resolveFileFromUri(uri: string): string {
+  if (!uri.startsWith("file://")) return uri;
+  try {
+    return decodeURIComponent(uri.slice(7));
+  } catch {
+    return uri;
+  }
+}
+
+function collectDocumentChangeEdits(
+  docChanges: NonNullable<WorkspaceEdit["documentChanges"]>,
+): Array<{
+  file: string;
+  range: { start: { line: number; character: number }; end: { line: number; character: number } };
+  newText: string;
+}> {
+  const out: Array<{
+    file: string;
+    range: { start: { line: number; character: number }; end: { line: number; character: number } };
+    newText: string;
+  }> = [];
+  for (const change of docChanges) {
+    const tdEdit = change as TextDocumentEdit;
+    if (!tdEdit.textDocument || !tdEdit.edits) continue;
+    const file = resolveFileFromUri(tdEdit.textDocument.uri);
+    for (const singleEdit of tdEdit.edits) {
+      const te = singleEdit as TextEdit;
+      out.push({
+        file,
+        range: {
+          start: { line: te.range.start.line, character: te.range.start.character },
+          end: { line: te.range.end.line, character: te.range.end.character },
+        },
+        newText: te.newText,
+      });
+    }
+  }
+  return out;
+}
+
+function collectChangesEdits(changes: NonNullable<WorkspaceEdit["changes"]>): Array<{
+  file: string;
+  range: { start: { line: number; character: number }; end: { line: number; character: number } };
+  newText: string;
+}> {
+  const out: Array<{
+    file: string;
+    range: { start: { line: number; character: number }; end: { line: number; character: number } };
+    newText: string;
+  }> = [];
+  for (const [uri, textEdits] of Object.entries(changes)) {
+    if (!textEdits || textEdits.length === 0) continue;
+    const file = resolveFileFromUri(uri);
+    for (const te of textEdits) {
+      out.push({
+        file,
+        range: {
+          start: { line: te.range.start.line, character: te.range.start.character },
+          end: { line: te.range.end.line, character: te.range.end.character },
+        },
+        newText: te.newText,
+      });
+    }
+  }
+  return out;
+}
+
+function convertLspWorkspaceEdit(edit: WorkspaceEdit | null): RefactorResult {
+  if (!edit) {
+    return { kind: "unavailable", reason: "LSP server returned no edit" };
+  }
+
+  let fileEdits = edit.documentChanges?.length
+    ? collectDocumentChangeEdits(edit.documentChanges)
+    : [];
+  if (fileEdits.length === 0 && edit.changes) {
+    fileEdits = collectChangesEdits(edit.changes);
+  }
+
+  if (fileEdits.length === 0) {
+    return { kind: "unavailable", reason: "Workspace edit contains no file edits" };
+  }
+
+  return { kind: "precise", edits: { edits: fileEdits } };
+}
+
 // ── Type conversion helpers ───────────────────────────────────────────
 
 function toCodeLocation(item: Location | LocationLink): CodeLocation | null {