@mrclrchtr/supi-prompt-suggestions 2.1.0 → 2.2.0

package/src/generation/generator.ts

@@ -19,8 +19,8 @@ import {
   GENERATION_TIMEOUT_MS,
   type SuggestionClientOutput,
 } from "./client.ts";
-import { resolveSuggestionAuth } from "./model-resolution.ts";
-import { normalizeSuggestion } from "./normalize.ts";
+import { type ResolvedAuth, resolveSuggestionAuth } from "./model-resolution.ts";
+import { normalizeSuggestionDetailed } from "./normalize.ts";
 
 // ── Types ──────────────────────────────────────────────────────────────────
 
@@ -141,7 +141,7 @@ export class SuggestionGenerator {
           message: authResult.message,
           cwd: ctx.cwd,
         });
-        callbacks.onStatus({ kind: "error", message: authResult.message });
+        callbacks.onStatus({ kind: "idle" });
         return;
       }
 
@@ -149,23 +149,10 @@ export class SuggestionGenerator {
 
       if (id !== this.generationId || abort.signal.aborted) return;
 
-      const { signal: combinedSignal, cleanup: cleanupTimeout } = combineAbortSignals(
-        abort,
-        GENERATION_TIMEOUT_MS,
-      );
-
-      try {
-        const response = await callSuggestionModel({
-          model: auth.model,
-          auth: { apiKey: auth.apiKey, headers: auth.headers },
-          tail,
-          signal: combinedSignal,
-        });
+      const response = await this.#callModelWithTimeout(opts, auth);
+      if (!response) return;
 
-        this.#handleResponse(response, id, ctx.cwd, callbacks, opts.modelId);
-      } finally {
-        cleanupTimeout();
-      }
+      this.#handleResponse(response, id, ctx.cwd, callbacks, opts.modelId);
     } catch (err) {
       if (id !== this.generationId) return;
       const message = err instanceof Error ? err.message : String(err);
@@ -185,6 +172,62 @@ export class SuggestionGenerator {
     }
   }
 
+  async #callModelWithTimeout(
+    opts: RunOptions,
+    auth: ResolvedAuth,
+  ): Promise<SuggestionClientOutput | null> {
+    const { signal: combinedSignal, cleanup: cleanupTimeout } = combineAbortSignals(
+      opts.abort,
+      GENERATION_TIMEOUT_MS,
+    );
+
+    try {
+      return await callSuggestionModel({
+        model: auth.model,
+        auth: { apiKey: auth.apiKey, headers: auth.headers, env: auth.env },
+        tail: opts.tail,
+        signal: combinedSignal,
+      });
+    } catch (err) {
+      if (opts.id !== this.generationId) return null;
+      if (opts.abort.signal.aborted) {
+        this.#recordGenerationAbort(opts);
+        opts.callbacks.onStatus({ kind: "idle" });
+        return null;
+      }
+      if (combinedSignal.aborted) {
+        this.#recordGenerationTimeout(opts);
+        opts.callbacks.onStatus({ kind: "idle" });
+        return null;
+      }
+      throw err;
+    } finally {
+      cleanupTimeout();
+    }
+  }
+
+  #recordGenerationAbort(opts: RunOptions): void {
+    recordDebugEvent({
+      source: "prompt-suggestions",
+      level: "debug",
+      category: "generation.aborted",
+      message: "Prompt suggestion generation aborted",
+      cwd: opts.ctx.cwd,
+      data: { modelId: opts.modelId },
+    });
+  }
+
+  #recordGenerationTimeout(opts: RunOptions): void {
+    recordDebugEvent({
+      source: "prompt-suggestions",
+      level: "debug",
+      category: "generation.timeout",
+      message: "Prompt suggestion generation timed out",
+      cwd: opts.ctx.cwd,
+      data: { modelId: opts.modelId, timeoutMs: GENERATION_TIMEOUT_MS },
+    });
+  }
+
   // biome-ignore lint/complexity/useMaxParams: private method, params are orthogonal
   #handleResponse(
     response: SuggestionClientOutput,
@@ -208,13 +251,13 @@ export class SuggestionGenerator {
       return;
     }
 
-    const normalized = normalizeSuggestion(response.text);
+    const normalized = normalizeSuggestionDetailed(response.text);
     if (!normalized) {
       recordDebugEvent({
         source: "prompt-suggestions",
         level: "debug",
         category: "generation.rejected",
-        message: `Prompt suggestion rejected: empty after normalization (${response.text.length} raw chars)`,
+        message: "Prompt suggestion rejected after normalization",
         cwd,
         data: { rawLength: response.text.length },
       });
@@ -226,10 +269,17 @@ export class SuggestionGenerator {
       source: "prompt-suggestions",
       level: "debug",
       category: "generation.done",
-      message: `Prompt suggestion ready: "${normalized}"`,
+      message: "Prompt suggestion ready",
       cwd,
-      data: { suggestion: normalized, length: normalized.length },
+      data: {
+        modelId,
+        rawLength: response.text.length,
+        length: normalized.text.length,
+        graphemeCount: normalized.graphemeCount,
+        originalGraphemeCount: normalized.originalGraphemeCount,
+        wasSafetyCapped: normalized.wasSafetyCapped,
+      },
     });
-    callbacks.onStatus({ kind: "ready", suggestion: normalized });
+    callbacks.onStatus({ kind: "ready", suggestion: normalized.text });
   }
 }

package/src/generation/model-resolution.ts

@@ -18,6 +18,7 @@ export interface ResolvedAuth {
   model: any;
   apiKey: string;
   headers?: Record<string, string>;
+  env?: Record<string, string>;
 }
 
 export interface AuthResolutionError {
@@ -51,7 +52,7 @@ export async function resolveSuggestionAuth(
   }
 
   const auth = await ctx.modelRegistry.getApiKeyAndHeaders(match.model);
-  if (!auth.ok) {
+  if (!auth.ok || !hasConfiguredAuth(ctx, match.model, auth.apiKey)) {
     return {
       kind: "error",
       message: `No API key configured for ${match.canonicalId}`,
@@ -60,7 +61,7 @@ export async function resolveSuggestionAuth(
 
   return {
     kind: "ok",
-    auth: { model: match.model, apiKey: auth.apiKey ?? "", headers: auth.headers },
+    auth: { model: match.model, apiKey: auth.apiKey ?? "", headers: auth.headers, env: auth.env },
   };
 }
 
@@ -70,3 +71,13 @@ function findSuggestionModel(ctx: ExtensionContext, modelId: string) {
   const models = getSelectableModels(ctx);
   return models.find((m) => m.canonicalId === modelId);
 }
+
+function hasConfiguredAuth(
+  ctx: ExtensionContext,
+  // biome-ignore lint/suspicious/noExplicitAny: Model<any> is pi's canonical type
+  model: any,
+  apiKey?: string,
+): boolean {
+  if (apiKey) return true;
+  return ctx.modelRegistry.hasConfiguredAuth(model);
+}

package/src/generation/normalize.ts

@@ -2,23 +2,33 @@
  * Prompt suggestion normalization.
  *
  * Trims, strips matching outer quotes, detects the NO_SUGGESTION sentinel,
- * collapses whitespace, rejects empty results, truncates at 240 chars.
+ * collapses whitespace, rejects empty results, and applies a high grapheme-safe
+ * safety cap to guard against runaway model output.
  *
  * @module
  */
 
-const MAX_SUGGESTION_LENGTH = 240;
+const MAX_SUGGESTION_GRAPHEMES = 2_000;
 
 /** Sentinels that indicate the model found no useful suggestion. */
 const NO_SUGGESTION_SENTINELS = ["NO_SUGGESTION", "NO SUGGESTION"];
 
+export interface NormalizedSuggestion {
+  /** Full normalized suggestion text, possibly safety-capped. */
+  text: string;
+  /** Whether the high safety cap was applied. */
+  wasSafetyCapped: boolean;
+  /** Grapheme count after normalization and before safety capping. */
+  originalGraphemeCount: number;
+  /** Grapheme count of the returned text. */
+  graphemeCount: number;
+}
+
 /**
- * Normalize a raw suggestion string: trim, strip outer quotes,
- * detect NO_SUGGESTION sentinel, collapse whitespace, reject empty,
- * truncate at 240 chars.
- * Exported for testing.
+ * Normalize a raw suggestion string and return metadata about safety capping.
+ * Exported for orchestration and testing.
  */
-export function normalizeSuggestion(text: string): string | null {
+export function normalizeSuggestionDetailed(text: string): NormalizedSuggestion | null {
   let normalized = text.trim();
 
   // Strip matching outer quotes
@@ -35,16 +45,42 @@ export function normalizeSuggestion(text: string): string | null {
     return null;
   }
 
-  // Collapse internal newlines to spaces
+  // Collapse all whitespace to spaces.
   normalized = normalized.replace(/\s+/g, " ").trim();
 
-  // Reject empty (also catches pure-sentinel after whitespace collapse)
   if (!normalized) return null;
 
-  // Truncate overlong suggestions
-  if (normalized.length > MAX_SUGGESTION_LENGTH) {
-    normalized = normalized.slice(0, MAX_SUGGESTION_LENGTH);
+  const graphemes = splitGraphemes(normalized);
+  const wasSafetyCapped = graphemes.length > MAX_SUGGESTION_GRAPHEMES;
+  if (!wasSafetyCapped) {
+    return {
+      text: normalized,
+      wasSafetyCapped: false,
+      originalGraphemeCount: graphemes.length,
+      graphemeCount: graphemes.length,
+    };
   }
 
-  return normalized;
+  const cappedText = graphemes.slice(0, MAX_SUGGESTION_GRAPHEMES).join("").trimEnd();
+  const cappedGraphemeCount = splitGraphemes(cappedText).length;
+  return {
+    text: cappedText,
+    wasSafetyCapped: true,
+    originalGraphemeCount: graphemes.length,
+    graphemeCount: cappedGraphemeCount,
+  };
+}
+
+/**
+ * Normalize a raw suggestion string: trim, strip outer quotes, detect
+ * NO_SUGGESTION, collapse whitespace, reject empty, and apply the high safety
+ * cap. Exported for existing callers and tests that only need the text.
+ */
+export function normalizeSuggestion(text: string): string | null {
+  return normalizeSuggestionDetailed(text)?.text ?? null;
+}
+
+function splitGraphemes(text: string): string[] {
+  const segmenter = new Intl.Segmenter(undefined, { granularity: "grapheme" });
+  return Array.from(segmenter.segment(text), (segment) => segment.segment);
 }

package/src/session.ts

@@ -14,10 +14,16 @@ import type { GenerationStatus, SuggestionGenerator } from "./generation/generat
 
 // ── Types ──────────────────────────────────────────────────────────────────
 
+type SessionTextContent = string | { type: string; text?: string }[] | undefined;
+
 /** Narrow shape for session message entries used in history seeding. */
 interface SessionMessageEntry {
   type: "message";
-  message?: { role?: string; content?: { type: string; text?: string }[] };
+  message?: {
+    role?: string;
+    stopReason?: string;
+    content?: SessionTextContent;
+  };
 }
 
 // ── SessionLifecycle ───────────────────────────────────────────────────────
@@ -41,12 +47,18 @@ export class SessionLifecycle {
   /** Install the ghost editor wrapper, seed UP-arrow history, and recreate the spinner. */
   onStart(ctx: ExtensionContext): void {
     this.statusSpinner?.stop();
+    this.statusSpinner = null;
+    this.ghostEditor = null;
+    if (ctx.mode !== "tui") return;
+
     this.statusSpinner = new StatusSpinner(ctx, "supi-prompt-suggestions");
     this.installEditor(ctx);
   }
 
   /** Extract the last assistant message and fire suggestion generation. */
   onAgentEnd(event: AgentEndEvent, ctx: ExtensionContext): void {
+    if (ctx.mode !== "tui") return;
+
     const lastAssistant = extractLastAssistantText(event);
     if (!lastAssistant) {
       this.statusSpinner?.stop();
@@ -98,7 +110,6 @@ export class SessionLifecycle {
       case "error":
         this.generationInFlight = false;
         this.statusSpinner?.stop();
-        ctx.ui.setStatus("supi-prompt-suggestions", `suggestion error: ${status.message}`);
         break;
       case "idle":
         this.generationInFlight = false;
@@ -136,8 +147,9 @@ export class SessionLifecycle {
    * The Editor base class stores history in-memory via `addToHistory()` when
    * messages are submitted.  Since `setEditorComponent` replaces the editor
    * with a fresh instance on every `session_start` (including `/reload`), the
-   * in-memory history is lost.  Reading from `sessionManager.getEntries()`
-   * repopulates it from the persistent session file so history survives reloads.
+   * in-memory history is lost.  Reading from `sessionManager.getBranch()`
+   * repopulates it from the current conversation path so history survives
+   * reloads without pulling prompts from abandoned branches.
    *
    * Cross-module save/restore (capturing the old editor's history in
    * `session_shutdown` and restoring in `session_start`) does not work here
@@ -145,16 +157,12 @@ export class SessionLifecycle {
    * closure variables are destroyed before the new module can read them.
    */
   private seedHistoryFromSession(editor: GhostTextEditor, ctx: ExtensionContext): void {
-    const entries = ctx.sessionManager.getEntries();
+    const entries = ctx.sessionManager.getBranch();
     for (const entry of entries) {
       if (entry.type !== "message") continue;
       const msg = (entry as SessionMessageEntry).message;
       if (msg?.role !== "user") continue;
-      const text = msg.content
-        ?.filter((c) => c.type === "text")
-        .map((c) => c.text ?? "")
-        .join("")
-        .trim();
+      const text = extractTextContent(msg.content).trim();
       if (text) editor.addToHistory(text);
     }
   }
@@ -178,13 +186,20 @@ function extractLastAssistantText(event: AgentEndEvent): string | null {
   for (let i = messages.length - 1; i >= 0; i--) {
     const msg = messages[i];
     if (msg?.role === "assistant") {
-      const textContent = msg.content
-        ?.filter((c: { type: string; text?: string }) => c.type === "text")
-        .map((c: { type: string; text?: string }) => c.text)
-        .join("")
-        .trim();
+      if (msg.stopReason !== "stop") return null;
+      const textContent = extractTextContent(msg.content).trim();
       return textContent || null;
     }
   }
   return null;
 }
+
+function extractTextContent(content: SessionTextContent): string {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+
+  return content
+    .filter((c) => c.type === "text")
+    .map((c) => c.text ?? "")
+    .join("\n");
+}

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

@@ -1,207 +0,0 @@
-// Config-aware settings contribution helper for SuPi packages.
-//
-// Registers config-backed settings sections through PI's shared event bus so
-// /supi-settings can collect contributions from all loaded extensions without
-// relying on a shared supi-core module instance.
-
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { SettingItem } from "@earendil-works/pi-tui";
-import {
-  isSettingsContributionCollector,
-  type SettingsScope,
-  type SettingsSection,
-  SUPI_SETTINGS_COLLECT_EVENT,
-} 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 persistence. */
-export interface ConfigSettingItem extends SettingItem {
-  /** Config value type used for auto-generated persistence. */
-  configType?: ConfigSettingType;
-}
-
-/** Helpers provided to persistChange for scoped SuPi config writes. */
-export interface ConfigSettingsHelpers {
-  /** Write a key to the selected scope's config section. */
-  set(key: string, value: unknown): void;
-  /** Remove a key from the selected scope's config section. */
-  unset(key: string): void;
-}
-
-export interface ConfigSettingsPersistedChange {
-  scope: SettingsScope;
-  cwd: string;
-  settingId: string;
-  value: string;
-}
-
-export interface ConfigSettingsOptions<T> {
-  /** Settings contribution identifier — e.g. "lsp", "claude-md". */
-  id: string;
-  /** Human-readable label shown in the UI. */
-  label: string;
-  /** SuPi config section name — e.g. "lsp", "claude-md". */
-  section: string;
-  /** Default config values. */
-  defaults: T;
-  /** Build SettingItem[] from scoped config. */
-  buildItems: (
-    settings: T,
-    scope: SettingsScope,
-    cwd: string,
-    ctx?: ExtensionContext,
-  ) => ConfigSettingItem[];
-  /**
-   * Convert a UI value into scoped SuPi config writes.
-   *
-   * Optional when every item returned by `buildItems` declares `configType`.
-   * Required when any item lacks `configType`.
-   */
-  persistChange?: (
-    scope: SettingsScope,
-    cwd: string,
-    settingId: string,
-    value: string,
-    helpers: ConfigSettingsHelpers,
-  ) => void;
-  /** Optional live runtime sync after successful persistence. */
-  afterPersist?: (change: ConfigSettingsPersistedChange) => void;
-  /** Optional home directory for config resolution (testing). */
-  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);
-}
-
-function createHelpers<T>(options: ConfigSettingsOptions<T>, scope: SettingsScope, cwd: string) {
-  return {
-    set: (key: string, val: unknown) => {
-      writeSupiConfig(
-        { section: options.section, scope, cwd },
-        { [key]: val },
-        { homeDir: options.homeDir },
-      );
-    },
-    unset: (key: string) => {
-      removeSupiConfigKey({ section: options.section, scope, cwd }, key, {
-        homeDir: options.homeDir,
-      });
-    },
-  } satisfies ConfigSettingsHelpers;
-}
-
-function toSettingsSection<T>(options: ConfigSettingsOptions<T>): SettingsSection {
-  let cachedItems: ConfigSettingItem[] | undefined;
-
-  return {
-    id: options.id,
-    label: options.label,
-    loadValues: (scope, cwd, ctx) => {
-      const settings = loadSupiConfigForScope(options.section, cwd, options.defaults, {
-        scope,
-        homeDir: options.homeDir,
-      });
-      const items = options.buildItems(settings, scope, cwd, ctx);
-      cachedItems = items;
-      return items;
-    },
-    persistChange: (scope, cwd, settingId, value) => {
-      const helpers = createHelpers(options, scope, cwd);
-
-      if (options.persistChange) {
-        options.persistChange(scope, cwd, settingId, value, helpers);
-      } else {
-        const items = cachedItems ?? options.buildItems(options.defaults, scope, cwd, undefined);
-        if (!areAllItemsDeclarative(items)) {
-          throw new Error(
-            `Settings contribution "${options.id}" needs persistChange or configType on every item.`,
-          );
-        }
-        autoPersistChange(settingId, value, helpers, items);
-      }
-
-      try {
-        options.afterPersist?.({ scope, cwd, settingId, value });
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        throw new Error(`Saved setting, but live sync failed: ${message}`, { cause: error });
-      }
-    },
-  };
-}
-
-// ── Registration ───────────────────────────────────────────────────────────
-
-/**
- * Register a config-backed settings contribution for `/supi-settings`.
- *
- * Contributions are collected through PI's process-local event bus. Call this
- * during the extension factory function, not in async session handlers.
- */
-export function registerConfigSettings<T>(
-  pi: ExtensionAPI,
-  options: ConfigSettingsOptions<T>,
-): void {
-  const section = toSettingsSection(options);
-  const dispose = pi.events.on(SUPI_SETTINGS_COLLECT_EVENT, (collector) => {
-    if (isSettingsContributionCollector(collector)) {
-      collector.add(section);
-    }
-  });
-
-  pi.on("session_shutdown", () => {
-    dispose();
-  });
-}