@mrclrchtr/supi-lsp 2.0.5 → 2.1.0

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

@@ -0,0 +1,357 @@
+// Configurable tool prompt-surface overrides.
+//
+// Resolution order: package defaults ← global SuPi config ← trusted project SuPi config.
+// Project overrides are trust-gated; they require PI project trust and a PI-recognized
+// trust-requiring resource (e.g. .pi/settings.json).
+
+import {
+  type ExtensionContext,
+  hasTrustRequiringProjectResources,
+} from "@earendil-works/pi-coding-agent";
+import type { SuiPiToolPromptSurface } from "../tool-framework.ts";
+import { loadSupiConfigSectionForScope, type SupiConfigOptions } from "./config.ts";
+
+// ── Public types ───────────────────────────────────────────────────────────
+
+export type ToolPromptSurfaceDiagnosticCode =
+  | "invalidPromptSurfaceConfig"
+  | "invalidPromptSurfaceField"
+  | "projectPromptSurfaceIgnored";
+
+export interface ToolPromptSurfaceDiagnostic {
+  code: ToolPromptSurfaceDiagnosticCode;
+  scope: "global" | "project";
+  section: string;
+  toolName: string;
+  message: string;
+}
+
+export interface ResolveToolPromptSurfaceOptions extends SupiConfigOptions {
+  section: string;
+  toolName: string;
+  defaults: SuiPiToolPromptSurface;
+  ctx: Pick<ExtensionContext, "cwd" | "isProjectTrusted">;
+}
+
+export interface ResolveToolPromptSurfaceResult {
+  surface: SuiPiToolPromptSurface;
+  diagnostics: ToolPromptSurfaceDiagnostic[];
+}
+
+// ── Private types ──────────────────────────────────────────────────────────
+
+type PromptSurfaceField = keyof SuiPiToolPromptSurface;
+type PromptSurfaceScope = ToolPromptSurfaceDiagnostic["scope"];
+
+const PROMPT_SURFACE_FIELDS = new Set<string>(["description", "promptSnippet", "promptGuidelines"]);
+
+const PROMPT_SURFACE_DIAGNOSTICS_KEY = Symbol.for(
+  "@mrclrchtr/supi-core/tool-prompt-surface/notified-diagnostics",
+);
+
+// ── Resolution ─────────────────────────────────────────────────────────────
+
+/** Resolve a tool's model-facing prompt surface from defaults + SuPi config overrides. */
+export function resolveToolPromptSurface(
+  options: ResolveToolPromptSurfaceOptions,
+): ResolveToolPromptSurfaceResult {
+  const diagnostics: ToolPromptSurfaceDiagnostic[] = [];
+  let surface = clonePromptSurface(options.defaults);
+
+  const globalSection = loadSupiConfigSectionForScope(options.section, options.ctx.cwd, {
+    scope: "global",
+    homeDir: options.homeDir,
+  });
+  surface = applyPromptSurfaceScope(surface, options, "global", globalSection, diagnostics);
+
+  const projectSection = loadSupiConfigSectionForScope(options.section, options.ctx.cwd, {
+    scope: "project",
+    homeDir: options.homeDir,
+  });
+  const projectPromptSurface = getPromptSurfaceConfig(projectSection, options.toolName, {
+    diagnostics,
+    options,
+    scope: "project",
+  });
+
+  if (projectPromptSurface) {
+    const hasTrustMarker = hasTrustRequiringProjectResources(options.ctx.cwd);
+    const projectTrusted = options.ctx.isProjectTrusted();
+    if (hasTrustMarker && projectTrusted) {
+      surface = applyPromptSurfaceConfig(
+        surface,
+        options.defaults,
+        projectPromptSurface,
+        options,
+        "project",
+        diagnostics,
+      );
+    } else {
+      diagnostics.push({
+        code: "projectPromptSurfaceIgnored",
+        scope: "project",
+        section: options.section,
+        toolName: options.toolName,
+        message: hasTrustMarker
+          ? `Project prompt-surface overrides for ${options.toolName} were ignored because the project is not trusted in PI.`
+          : `Project prompt-surface overrides for ${options.toolName} were ignored because ${options.ctx.cwd}/.pi/supi/config.json is not PI trust-gated. Add .pi/settings.json and trust the project to enable them.`,
+      });
+    }
+  }
+
+  return { surface, diagnostics };
+}
+
+/** Notify prompt-surface diagnostics once per session/tool/diagnostic code. */
+export function notifyToolPromptSurfaceDiagnostics(
+  ctx: Pick<ExtensionContext, "sessionManager" | "ui">,
+  diagnostics: readonly ToolPromptSurfaceDiagnostic[],
+): void {
+  const globalRecord = globalThis as Record<symbol, Set<string> | undefined>;
+  const notified = globalRecord[PROMPT_SURFACE_DIAGNOSTICS_KEY] ?? new Set<string>();
+  globalRecord[PROMPT_SURFACE_DIAGNOSTICS_KEY] = notified;
+  const sessionId = ctx.sessionManager.getSessionId();
+
+  for (const diagnostic of diagnostics) {
+    const key = `${sessionId}:${diagnostic.section}:${diagnostic.toolName}:${diagnostic.code}`;
+    if (notified.has(key)) continue;
+    notified.add(key);
+    ctx.ui.notify(diagnostic.message, "warning");
+  }
+}
+
+// ── Scope helpers ──────────────────────────────────────────────────────────
+
+// biome-ignore lint/complexity/useMaxParams: resolver dispatch with diagnostics
+function applyPromptSurfaceScope(
+  current: SuiPiToolPromptSurface,
+  options: ResolveToolPromptSurfaceOptions,
+  scope: PromptSurfaceScope,
+  sectionConfig: Record<string, unknown> | null,
+  diagnostics: ToolPromptSurfaceDiagnostic[],
+): SuiPiToolPromptSurface {
+  const promptSurface = getPromptSurfaceConfig(sectionConfig, options.toolName, {
+    diagnostics,
+    options,
+    scope,
+  });
+  if (!promptSurface) return current;
+  return applyPromptSurfaceConfig(
+    current,
+    options.defaults,
+    promptSurface,
+    options,
+    scope,
+    diagnostics,
+  );
+}
+
+// biome-ignore lint/complexity/useMaxParams: per-scope config merger with diagnostics
+function applyPromptSurfaceConfig(
+  current: SuiPiToolPromptSurface,
+  defaults: SuiPiToolPromptSurface,
+  config: Record<string, unknown>,
+  options: ResolveToolPromptSurfaceOptions,
+  scope: PromptSurfaceScope,
+  diagnostics: ToolPromptSurfaceDiagnostic[],
+): SuiPiToolPromptSurface {
+  let next = clonePromptSurface(current);
+
+  for (const field of getResetFields(config.$reset, options, scope, diagnostics)) {
+    next = { ...next, [field]: clonePromptSurfaceField(defaults[field]) };
+  }
+
+  const description = getOptionalNonEmptyString(
+    config.description,
+    "description",
+    options,
+    scope,
+    diagnostics,
+  );
+  if (description !== undefined) next.description = description;
+
+  const promptSnippet = getOptionalNonEmptyString(
+    config.promptSnippet,
+    "promptSnippet",
+    options,
+    scope,
+    diagnostics,
+  );
+  if (promptSnippet !== undefined) next.promptSnippet = promptSnippet;
+
+  const promptGuidelines = getOptionalStringArray(
+    config.promptGuidelines,
+    "promptGuidelines",
+    options,
+    scope,
+    diagnostics,
+  );
+  if (promptGuidelines !== undefined) next.promptGuidelines = promptGuidelines;
+
+  const prepend = getOptionalStringArray(
+    config.prependPromptGuidelines,
+    "prependPromptGuidelines",
+    options,
+    scope,
+    diagnostics,
+  );
+  if (prepend !== undefined) next.promptGuidelines = [...prepend, ...next.promptGuidelines];
+
+  const append = getOptionalStringArray(
+    config.appendPromptGuidelines,
+    "appendPromptGuidelines",
+    options,
+    scope,
+    diagnostics,
+  );
+  if (append !== undefined) next.promptGuidelines = [...next.promptGuidelines, ...append];
+
+  return next;
+}
+
+// ── Config extraction ──────────────────────────────────────────────────────
+
+function getPromptSurfaceConfig(
+  sectionConfig: Record<string, unknown> | null,
+  toolName: string,
+  deps: {
+    diagnostics: ToolPromptSurfaceDiagnostic[];
+    options: ResolveToolPromptSurfaceOptions;
+    scope: PromptSurfaceScope;
+  },
+): Record<string, unknown> | null {
+  if (!sectionConfig) return null;
+  if (sectionConfig.tools === undefined) return null;
+  if (!isRecord(sectionConfig.tools)) {
+    pushInvalidConfig(deps, "tools must be an object.");
+    return null;
+  }
+  const toolConfig = sectionConfig.tools[toolName];
+  if (toolConfig === undefined) return null;
+  if (!isRecord(toolConfig)) {
+    pushInvalidConfig(deps, `tools.${toolName} must be an object.`);
+    return null;
+  }
+  if (toolConfig.promptSurface === undefined) return null;
+  if (!isRecord(toolConfig.promptSurface)) {
+    pushInvalidConfig(deps, `tools.${toolName}.promptSurface must be an object.`);
+    return null;
+  }
+  return toolConfig.promptSurface;
+}
+
+// ── Field validation ───────────────────────────────────────────────────────
+
+function getResetFields(
+  value: unknown,
+  options: ResolveToolPromptSurfaceOptions,
+  scope: PromptSurfaceScope,
+  diagnostics: ToolPromptSurfaceDiagnostic[],
+): PromptSurfaceField[] {
+  if (value === undefined) return [];
+  if (!Array.isArray(value)) {
+    pushInvalidField(options, scope, diagnostics, "$reset", "must be an array.");
+    return [];
+  }
+  const fields: PromptSurfaceField[] = [];
+  for (const item of value) {
+    if (typeof item === "string" && PROMPT_SURFACE_FIELDS.has(item)) {
+      fields.push(item as PromptSurfaceField);
+    } else {
+      pushInvalidField(
+        options,
+        scope,
+        diagnostics,
+        "$reset",
+        `contains unsupported field ${JSON.stringify(item)}.`,
+      );
+    }
+  }
+  return fields;
+}
+
+// biome-ignore lint/complexity/useMaxParams: validation helper with diagnostics
+function getOptionalNonEmptyString(
+  value: unknown,
+  field: string,
+  options: ResolveToolPromptSurfaceOptions,
+  scope: PromptSurfaceScope,
+  diagnostics: ToolPromptSurfaceDiagnostic[],
+): string | undefined {
+  if (value === undefined) return undefined;
+  if (typeof value === "string" && value.length > 0) return value;
+  pushInvalidField(options, scope, diagnostics, field, "must be a non-empty string.");
+  return undefined;
+}
+
+// biome-ignore lint/complexity/useMaxParams: validation helper with diagnostics
+function getOptionalStringArray(
+  value: unknown,
+  field: string,
+  options: ResolveToolPromptSurfaceOptions,
+  scope: PromptSurfaceScope,
+  diagnostics: ToolPromptSurfaceDiagnostic[],
+): string[] | undefined {
+  if (value === undefined) return undefined;
+  if (Array.isArray(value) && value.every((item) => typeof item === "string")) {
+    return [...value];
+  }
+  pushInvalidField(options, scope, diagnostics, field, "must be an array of strings.");
+  return undefined;
+}
+
+// ── Diagnostics ────────────────────────────────────────────────────────────
+
+function pushInvalidConfig(
+  deps: {
+    diagnostics: ToolPromptSurfaceDiagnostic[];
+    options: ResolveToolPromptSurfaceOptions;
+    scope: PromptSurfaceScope;
+  },
+  detail: string,
+): void {
+  deps.diagnostics.push({
+    // biome-ignore lint/security/noSecrets: false positive on string constant
+    code: "invalidPromptSurfaceConfig",
+    scope: deps.scope,
+    section: deps.options.section,
+    toolName: deps.options.toolName,
+    message: `Invalid prompt-surface config for ${deps.options.section}.${deps.options.toolName}: ${detail}`,
+  });
+}
+
+// biome-ignore lint/complexity/useMaxParams: diagnostics utility with many fields
+function pushInvalidField(
+  options: ResolveToolPromptSurfaceOptions,
+  scope: PromptSurfaceScope,
+  diagnostics: ToolPromptSurfaceDiagnostic[],
+  field: string,
+  detail: string,
+): void {
+  diagnostics.push({
+    // biome-ignore lint/security/noSecrets: false positive on string constant
+    code: "invalidPromptSurfaceField",
+    scope,
+    section: options.section,
+    toolName: options.toolName,
+    message: `Invalid prompt-surface field ${field} for ${options.section}.${options.toolName}: ${detail}`,
+  });
+}
+
+// ── Cloning ────────────────────────────────────────────────────────────────
+
+function clonePromptSurface(surface: SuiPiToolPromptSurface): SuiPiToolPromptSurface {
+  return {
+    description: surface.description,
+    promptSnippet: surface.promptSnippet,
+    promptGuidelines: [...surface.promptGuidelines],
+  };
+}
+
+function clonePromptSurfaceField<T extends string | string[]>(value: T): T {
+  return (Array.isArray(value) ? [...value] : value) as T;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}

package/node_modules/@mrclrchtr/supi-core/src/prompt-surface.ts

@@ -0,0 +1,4 @@
+// supi-core prompt-surface — configurable tool prompt-surface resolver (package boundary for @mrclrchtr/supi-core/prompt-surface).
+
+// biome-ignore lint/performance/noReExportAll: intentional barrel
+export * from "./config/prompt-surface.ts";

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

@@ -9,7 +9,7 @@ export function registerSettingsCommand(pi: ExtensionAPI): void {
   pi.registerCommand("supi-settings", {
     description: "Manage SuPi extension settings",
     handler: async (_args, ctx) => {
-      openSettingsOverlay(ctx);
+      openSettingsOverlay(pi, ctx);
     },
   });
 }

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

@@ -1,48 +1,70 @@
-// Settings registry for SuPi extensions.
+// Event-backed settings contribution types for SuPi extensions.
 //
-// Extensions declare their settings via `registerSettings()` during their
-// factory function. The generic settings UI reads them via `getRegisteredSettings()`.
+// Extensions contribute config-backed settings sections through PI's shared
+// event bus. The public helper is registerConfigSettings(pi, ...); this module
+// owns the internal collector protocol used by /supi-settings.
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { SettingItem } from "@earendil-works/pi-tui";
-import { createRegistry } from "../registry-utils.ts";
+
+export const SUPI_SETTINGS_COLLECT_EVENT = "supi:settings:collect";
 
 export type SettingsScope = "project" | "global";
 
 export interface SettingsSection {
-  /** Extension identifier — e.g. "lsp", "claude-md" */
+  /** Stable contribution identifier — e.g. "lsp", "claude-md". */
   id: string;
-  /** Human-readable label shown in the UI */
+  /** Human-readable label shown in the UI. */
   label: string;
-  /** Load current SettingItem[] for the given scope */
+  /** Load current SettingItem[] for the given scope. */
   loadValues: (scope: SettingsScope, cwd: string, ctx?: ExtensionContext) => SettingItem[];
-  /** Persist a change back to config */
-  persistChange: (
-    scope: SettingsScope,
-    cwd: string,
-    settingId: string,
-    value: string,
-    ctx?: ExtensionContext,
-  ) => void;
+  /** Persist a UI value back to SuPi config. */
+  persistChange: (scope: SettingsScope, cwd: string, settingId: string, value: string) => void;
 }
 
-const registry = createRegistry<SettingsSection>("settings-registry");
+export interface SettingsContributionCollector {
+  add(section: SettingsSection): void;
+}
 
-/**
- * Register a settings section for an extension.
- * Call during the extension factory function (not async handlers).
- * Duplicate ids replace the previous registration.
- */
-export function registerSettings(section: SettingsSection): void {
-  registry.register(section.id, section);
+export interface SettingsCollectionDiagnostic {
+  kind: "warning";
+  message: string;
 }
 
-/** Get all registered settings sections in registration order. */
-export function getRegisteredSettings(): SettingsSection[] {
-  return registry.getAll();
+export interface SettingsCollectionResult {
+  sections: SettingsSection[];
+  diagnostics: SettingsCollectionDiagnostic[];
 }
 
-/** Clear the registry — used by tests. */
-export function clearRegisteredSettings(): void {
-  registry.clear();
+export function isSettingsContributionCollector(
+  value: unknown,
+): value is SettingsContributionCollector {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    typeof (value as { add?: unknown }).add === "function"
+  );
+}
+
+/** Create a collector with last-wins duplicate handling and warning diagnostics. */
+export function createSettingsContributionCollector(): SettingsContributionCollector & {
+  result(): SettingsCollectionResult;
+} {
+  const sections = new Map<string, SettingsSection>();
+  const diagnostics: SettingsCollectionDiagnostic[] = [];
+
+  return {
+    add(section: SettingsSection): void {
+      if (sections.has(section.id)) {
+        diagnostics.push({
+          kind: "warning",
+          message: `Duplicate SuPi settings contribution "${section.id}"; using the last contribution.`,
+        });
+      }
+      sections.set(section.id, section);
+    },
+    result(): SettingsCollectionResult {
+      return { sections: Array.from(sections.values()), diagnostics: [...diagnostics] };
+    },
+  };
 }

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

@@ -3,7 +3,7 @@
 // Uses pi-tui's SettingsList with scope toggle (Tab), extension grouping,
 // and search. Each extension declares its settings via registerSettings().
 
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import {
   Container,
@@ -19,9 +19,11 @@ import {
 } from "@earendil-works/pi-tui";
 import { getSelectableModels } from "../model-selection.ts";
 import {
-  getRegisteredSettings,
+  createSettingsContributionCollector,
+  type SettingsCollectionDiagnostic,
   type SettingsScope,
   type SettingsSection,
+  SUPI_SETTINGS_COLLECT_EVENT,
 } from "./settings-registry.ts";
 
 // ── Input submenu component ──────────────────────────────────
@@ -73,9 +75,15 @@ export function createInputSubmenu(
 
 // ── Types ────────────────────────────────────────────────────
 
+interface OverlayStatus {
+  kind: "warning" | "error";
+  message: string;
+}
+
 interface OverlayState {
   scope: SettingsScope;
   cwd: string;
+  status?: OverlayStatus;
 }
 
 // ── Pure helpers ─────────────────────────────────────────────
@@ -117,10 +125,27 @@ function findSectionAndId(
   return { section, itemId };
 }
 
+function collectSettingsSections(pi: ExtensionAPI) {
+  const collector = createSettingsContributionCollector();
+  pi.events.emit(SUPI_SETTINGS_COLLECT_EVENT, collector);
+  return collector.result();
+}
+
+function latestStatus(diagnostics: SettingsCollectionDiagnostic[]): OverlayStatus | undefined {
+  const latest = diagnostics.at(-1);
+  return latest ? { kind: latest.kind, message: latest.message } : undefined;
+}
+
+function formatSettingsError(settingId: string, error: unknown): string {
+  const message = error instanceof Error ? error.message : String(error);
+  return `Could not save SuPi setting "${settingId}": ${message}`;
+}
+
 // ── Component ────────────────────────────────────────────────
 
 interface SettingsOverlayDeps {
   ctx: ExtensionContext;
+  sections: SettingsSection[];
   state: OverlayState;
   container: Container;
   settingsList: SettingsList | null;
@@ -130,22 +155,23 @@ interface SettingsOverlayDeps {
 }
 
 function createSettingsList(deps: SettingsOverlayDeps): SettingsList {
-  const sections = getRegisteredSettings();
-  const items = buildFlatItems(sections, deps.state.scope, deps.state.cwd, deps.ctx);
+  const items = buildFlatItems(deps.sections, deps.state.scope, deps.state.cwd, deps.ctx);
   const onChange = (flatId: string, newValue: string) => {
-    const found = findSectionAndId(sections, flatId);
-    if (found) {
-      found.section.persistChange(
-        deps.state.scope,
-        deps.state.cwd,
-        found.itemId,
-        newValue,
-        deps.ctx,
-      );
+    const found = findSectionAndId(deps.sections, flatId);
+    try {
+      if (found) {
+        found.section.persistChange(deps.state.scope, deps.state.cwd, found.itemId, newValue);
+        deps.state.status = undefined;
+      }
+    } catch (error) {
+      deps.state.status = {
+        kind: "error",
+        message: formatSettingsError(found?.itemId ?? flatId, error),
+      };
     }
     // Re-read all values to reflect persisted changes, but keep the list
     // instance (and its selectedIndex) intact.
-    const updatedItems = buildFlatItems(sections, deps.state.scope, deps.state.cwd, deps.ctx);
+    const updatedItems = buildFlatItems(deps.sections, deps.state.scope, deps.state.cwd, deps.ctx);
     for (const updated of updatedItems) {
       const existing = items.find((i) => i.id === updated.id);
       if (existing && existing.currentValue !== updated.currentValue) {
@@ -171,6 +197,7 @@ function rebuildSettingsList(deps: SettingsOverlayDeps): SettingsList {
 
   deps.container.clear();
   deps.container.addChild(createHeaderComponent(deps));
+  deps.container.addChild(createStatusComponent(deps));
   deps.container.addChild(settingsList);
 
   return settingsList;
@@ -188,6 +215,20 @@ function createHeaderComponent(deps: SettingsOverlayDeps): Text {
   return headerText;
 }
 
+function createStatusComponent(deps: SettingsOverlayDeps): {
+  render: () => string[];
+  invalidate: () => void;
+} {
+  return {
+    render: () => {
+      const status = deps.state.status;
+      if (!status) return [];
+      return [deps.theme.fg(status.kind, status.message)];
+    },
+    invalidate: () => {},
+  };
+}
+
 function handleScopeToggle(deps: SettingsOverlayDeps): void {
   deps.state.scope = deps.state.scope === "project" ? "global" : "project";
   rebuildSettingsList(deps);
@@ -288,19 +329,24 @@ function buildModelItems(ctx?: ExtensionContext): SelectItem[] {
 
 // ── Entry point ──────────────────────────────────────────────
 
-export function openSettingsOverlay(ctx: ExtensionContext): void {
-  const sections = getRegisteredSettings();
-  if (sections.length === 0) {
+export function openSettingsOverlay(pi: ExtensionAPI, ctx: ExtensionContext): void {
+  const collection = collectSettingsSections(pi);
+  if (collection.sections.length === 0) {
     ctx.ui.notify("No settings registered by SuPi extensions", "info");
     return;
   }
 
   void ctx.ui.custom<void>((tui, theme, _kb, done) => {
-    const state: OverlayState = { scope: "project", cwd: ctx.cwd };
+    const state: OverlayState = {
+      scope: "project",
+      cwd: ctx.cwd,
+      status: latestStatus(collection.diagnostics),
+    };
     const container = new Container();
 
     const deps: SettingsOverlayDeps = {
       ctx,
+      sections: collection.sections,
       state,
       container,
       settingsList: null,

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

@@ -1,9 +1,15 @@
-// supi-core settings domain — settings registry (lightweight, type-only pi-tui import).
+// supi-core settings domain — event-backed settings contribution types and command wiring.
 
 export { registerSettingsCommand } from "./settings/settings-command.ts";
-export type { SettingsScope, SettingsSection } from "./settings/settings-registry.ts";
+export type {
+  SettingsCollectionDiagnostic,
+  SettingsCollectionResult,
+  SettingsContributionCollector,
+  SettingsScope,
+  SettingsSection,
+} from "./settings/settings-registry.ts";
 export {
-  clearRegisteredSettings,
-  getRegisteredSettings,
-  registerSettings,
+  createSettingsContributionCollector,
+  isSettingsContributionCollector,
+  SUPI_SETTINGS_COLLECT_EVENT,
 } from "./settings/settings-registry.ts";

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

@@ -53,6 +53,16 @@ export function derivePromptSurface(spec: SuiPiToolSpec): SuiPiToolPromptSurface
   };
 }
 
+// Re-export prompt-surface types (implemented in config/prompt-surface.ts)
+export {
+  notifyToolPromptSurfaceDiagnostics,
+  type ResolveToolPromptSurfaceOptions,
+  type ResolveToolPromptSurfaceResult,
+  resolveToolPromptSurface,
+  type ToolPromptSurfaceDiagnostic,
+  type ToolPromptSurfaceDiagnosticCode,
+} from "./config/prompt-surface.ts";
+
 // ---------------------------------------------------------------------------
 // Registration
 // ---------------------------------------------------------------------------