@mrclrchtr/supi-prompt-suggestions 3.2.0 → 4.1.0

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "3.2.0",
+  "version": "4.1.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {
@@ -50,7 +50,6 @@
   },
   "main": "src/api.ts",
   "exports": {
-    "./abort-utils": "./src/abort-utils.ts",
     "./api": "./src/api.ts",
     "./config": "./src/config.ts",
     "./context": "./src/context.ts",
@@ -71,7 +70,6 @@
     "./status-spinner": "./src/status-spinner.ts",
     "./terminal": "./src/terminal.ts",
     "./tool-framework": "./src/tool-framework.ts",
-    "./prompt-surface": "./src/prompt-surface.ts",
-    "./types": "./src/types.ts"
+    "./prompt-surface": "./src/prompt-surface.ts"
   }
 }

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

@@ -6,8 +6,6 @@
 // For lighter imports, use one of the domain subpaths directly
 // (e.g. @mrclrchtr/supi-core/config, @mrclrchtr/supi-core/context).
 
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./abort-utils.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./config.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
@@ -42,5 +40,3 @@ export * from "./status-spinner.ts";
 export * from "./terminal.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./tool-framework.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./types.ts";

package/node_modules/@mrclrchtr/supi-core/src/evidence-badge.ts

@@ -22,14 +22,15 @@ export interface EvidenceBadgeInput {
  * |------------------------------------------------------|---------------------------------------|
  * | shown=12, total=12, omitted=0, label="references"   | `12 references`                       |
  * | shown=8,  total=20, omitted=12, label="symbols"     | `8 of 20 symbols (12 omitted)`        |
- * | shown=5,  total=null, reason="timeout", label="matches" | `5 matches — timeout`              |
+ * | shown=5, total=null, omitted=2, reason="timeout" | `5 matches (2 collected omitted; more may exist — timeout)` |
  */
 export function formatEvidenceBadge(input: EvidenceBadgeInput): string {
   const { shownCount, totalCount, omittedCount, partialReason, label } = input;
 
   if (totalCount === null) {
     const reasonSuffix = partialReason ? ` — ${partialReason}` : "";
-    return `${shownCount} ${label}${reasonSuffix}`;
+    const omittedPrefix = (omittedCount ?? 0) > 0 ? `${omittedCount} collected omitted; ` : "";
+    return `${shownCount} ${label} (${omittedPrefix}more may exist${reasonSuffix})`;
   }
 
   if (omittedCount !== null && omittedCount > 0) {

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

@@ -6,8 +6,6 @@
 // For lighter imports, use one of the domain subpaths directly
 // (e.g. @mrclrchtr/supi-core/config, @mrclrchtr/supi-core/context).
 
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./abort-utils.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./config.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
@@ -36,5 +34,3 @@ export * from "./status-spinner.ts";
 export * from "./terminal.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./tool-framework.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./types.ts";

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

@@ -24,16 +24,6 @@ export interface WithRetryOptions {
   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.

package/node_modules/@mrclrchtr/supi-core/src/path-utils.ts

@@ -1,4 +1,5 @@
 import * as path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 
 /** Strip pi's optional leading `@` file-path prefix from a tool input. */
 export function stripToolPathPrefix(target: string): string {
@@ -16,25 +17,28 @@ export function resolveToolPath(cwd: string, target: string): string {
   return path.resolve(cwd, stripToolPathPrefix(target));
 }
 
-/** Convert a file path to a file:// URI. */
+/**
+ * Convert a file path to a file:// URI.
+ *
+ * Uses Node's `pathToFileURL` to produce a standards-compliant URI with
+ * proper percent-encoding of spaces, hashes, and other special characters.
+ */
 export function fileToUri(filePath: string): string {
-  const resolved = path.resolve(filePath);
-  if (process.platform === "win32") {
-    return `file:///${resolved.replace(/\\/g, "/")}`;
-  }
-  return `file://${resolved}`;
+  return pathToFileURL(filePath).href;
 }
 
-/** Convert a file:// URI to a file path. */
+/**
+ * Convert a file:// URI to a file path.
+ *
+ * Uses Node's `fileURLToPath` for standards-compliant decoding. Non-file
+ * URIs are passed through unchanged so consumers (such as LSP diagnostic
+ * handling) remain compatible with non-file URI schemes.
+ */
 export function uriToFile(uri: string): string {
   if (!uri.startsWith("file://")) return uri;
-  let filePath = decodeURIComponent(uri.slice(7));
-  if (
-    process.platform === "win32" &&
-    filePath.startsWith("/") &&
-    /^[A-Za-z]:/.test(filePath.slice(1))
-  ) {
-    filePath = filePath.slice(1);
+  try {
+    return fileURLToPath(uri);
+  } catch {
+    return uri;
   }
-  return filePath;
 }

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

@@ -34,6 +34,7 @@ export function buildActionMenu(field: ScopedFieldValue, scope: SettingsScope):
     if (choices.length > 0) {
       for (const choice of choices) menu.push({ value: `set:${choice}`, label: choice });
     } else if (field.field.kind === "number") menu.push({ value: "edit", label: "Edit value…" });
+    else if (field.field.kind === "string") menu.push({ value: "edit", label: "Edit value…" });
     else if (field.field.kind === "stringList") menu.push({ value: "edit", label: "Edit values…" });
     else if (field.field.kind === "modelPicker")
       menu.push({ value: "edit", label: "Choose model…" });

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

@@ -86,6 +86,11 @@ export interface NumberField extends BaseField {
   values?: string[];
 }
 
+/** One free-form string. */
+export interface StringField extends BaseField {
+  kind: "string";
+}
+
 /** Comma-separated string list. */
 export interface StringListField extends BaseField {
   kind: "stringList";
@@ -164,6 +169,7 @@ export type SettingsField =
   | BoolField
   | EnumField
   | NumberField
+  | StringField
   | StringListField
   | ModelPickerField
   | CustomField;
@@ -248,6 +254,8 @@ export function formatValue(value: unknown, field: SettingsField): string {
       return value ? "on" : "off";
     case "number":
       return String(value ?? "");
+    case "string":
+      return typeof value === "string" && value ? value : "none";
     case "stringList": {
       const arr = Array.isArray(value) ? value : [];
       return arr.length > 0 ? arr.map(String).join(", ") : "none";
@@ -271,6 +279,7 @@ export function sourceBadge(displayValue: string, source: ValueSource): string {
 
 /** Format the value used to prefill editors and compare concrete choices. */
 export function formatEditValue(value: unknown, field: SettingsField): string {
+  if (field.kind === "string") return typeof value === "string" ? value : "";
   if (field.kind === "stringList") {
     const arr = Array.isArray(value) ? value : [];
     return arr.map(String).join(", ");

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

@@ -26,6 +26,7 @@ export type {
   SettingsField,
   SettingsFieldAction,
   SettingsPersistedChange,
+  StringField,
   StringListField,
   ValueSource,
 } from "./settings/settings-schema.ts";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-prompt-suggestions",
-  "version": "3.2.0",
+  "version": "4.1.0",
   "description": "Advisory ghost-text prompt suggestions for the pi coding agent",
   "license": "MIT",
   "repository": {
@@ -49,7 +49,7 @@
     "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*",
-    "@mrclrchtr/supi-core": "3.2.0"
+    "@mrclrchtr/supi-core": "4.1.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/src/generation/generator.ts

@@ -10,7 +10,6 @@
  */
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { combineAbortSignals } from "@mrclrchtr/supi-core/abort-utils";
 import { loadSectionConfig } from "@mrclrchtr/supi-core/config";
 import { recordDebugEvent } from "@mrclrchtr/supi-core/debug";
 import { CONFIG_SECTION, DEFAULTS } from "../config/config.ts";
@@ -176,10 +175,10 @@ export class SuggestionGenerator {
     opts: RunOptions,
     auth: ResolvedAuth,
   ): Promise<SuggestionClientOutput | null> {
-    const { signal: combinedSignal, cleanup: cleanupTimeout } = combineAbortSignals(
-      opts.abort,
-      GENERATION_TIMEOUT_MS,
-    );
+    const combinedSignal = AbortSignal.any([
+      opts.abort.signal,
+      AbortSignal.timeout(GENERATION_TIMEOUT_MS),
+    ]);
 
     try {
       return await callSuggestionModel({
@@ -201,8 +200,6 @@ export class SuggestionGenerator {
         return null;
       }
       throw err;
-    } finally {
-      cleanupTimeout();
     }
   }
 

package/node_modules/@mrclrchtr/supi-core/src/abort-utils.ts

@@ -1,31 +0,0 @@
-/**
- * Abort controller/signal utility helpers.
- *
- * @module
- */
-
-/**
- * Combine a caller-provided abort controller with a generation timeout signal.
- *
- * Returns the combined signal and a cleanup function that removes both
- * event listeners. Callers must invoke cleanup in a `finally` block
- * to avoid listener leaks.
- */
-export function combineAbortSignals(
-  abort: AbortController,
-  timeoutMs: number,
-): { signal: AbortSignal; cleanup: () => void } {
-  const timeoutSignal = AbortSignal.timeout(timeoutMs);
-  const combinedController = new AbortController();
-  const onAbort = () => combinedController.abort();
-  abort.signal.addEventListener("abort", onAbort, { once: true });
-  timeoutSignal.addEventListener("abort", onAbort, { once: true });
-
-  return {
-    signal: combinedController.signal,
-    cleanup: () => {
-      abort.signal.removeEventListener("abort", onAbort);
-      timeoutSignal.removeEventListener("abort", onAbort);
-    },
-  };
-}

package/node_modules/@mrclrchtr/supi-core/src/substrate-types.ts

@@ -1,11 +0,0 @@
-/** 0-based position used by LSP and code-intelligence internally. */
-export interface CodePosition {
-  line: number;
-  character: number;
-}
-
-/** Normalized location — flat replacement for LSP's nested Location/range shape. */
-export interface CodeLocation {
-  uri: string;
-  range: { start: CodePosition; end: CodePosition };
-}

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

@@ -1,2 +0,0 @@
-// supi-core types domain — shared substrate types (zero dependencies, pure types).
-export type { CodeLocation, CodePosition } from "./substrate-types.ts";