@mrclrchtr/supi-code-intelligence 6.4.0 → 7.0.1

package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-diagnostic-surface.ts

@@ -14,6 +14,8 @@ import type {
  */
 export interface ProcessCrashDiagnosticDemand {
   readonly scopes?: readonly string[];
+  /** Allow one bounded retry for failed routes during explicit health refresh. */
+  readonly explicit?: boolean;
 }
 
 /** Diagnostic and recovery operations owned by a workspace LSP runtime. */
@@ -45,7 +47,7 @@ export interface WorkspaceLspDiagnosticSurface {
     quietMs?: number;
     /** Evidence from a refresh the caller already completed; skips this pass's own refresh when no watched-file changes apply. */
     initialEvidence?: DiagnosticEvidenceSummary;
-    /** Explicit demand to recover crashed routes with tracked files in scope. */
+    /** Explicit demand to retry crashed and failed routes in scope. */
     processCrashDemand?: ProcessCrashDiagnosticDemand;
     control?: CodeRequestControl;
   }): Promise<RecoverDiagnosticsResult>;

package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-diagnostics.ts

@@ -52,8 +52,8 @@ export type ProcessCrashRecoveryOutcome =
   | "recovery-failed"
   | "recovery-exhausted";
 
-/** Typed next action for a non-recovered process-crash route. */
-export type ProcessCrashRecoveryNextAction = "use-exact-file" | "reload-workspace";
+/** Typed next action for a route that needs another explicit health refresh. */
+export type ProcessCrashRecoveryNextAction = "use-exact-file" | "refresh";
 
 /** One bounded route entry in a process-crash recovery report. */
 export interface ProcessCrashRecoveryEntry {
@@ -84,6 +84,29 @@ export interface ProcessCrashRecoveryReport {
   readonly omittedEntries: number;
 }
 
+/** Stable outcome for one initial-start route handled by explicit refresh. */
+export type StartupRetryOutcome = "recovered" | "retry-failed";
+
+/** Typed next action for a failed initial-start retry. */
+export type StartupRetryNextAction = "refresh";
+
+/** One bounded route entry in an initial-start retry report. */
+export interface StartupRetryEntry {
+  readonly name: string;
+  readonly root: string;
+  readonly outcome: StartupRetryOutcome;
+  readonly nextAction?: StartupRetryNextAction;
+  readonly failureMessage?: string;
+}
+
+/** Bounded result of explicit retries for initial-start routes. */
+export interface StartupRetryReport {
+  readonly recoveredRoutes: number;
+  readonly failedRoutes: number;
+  readonly entries: readonly StartupRetryEntry[];
+  readonly omittedEntries: number;
+}
+
 /** Create the empty outcome for a pass with no process-crash demand. */
 export function emptyProcessCrashRecoveryReport(): ProcessCrashRecoveryReport {
   return {
@@ -96,6 +119,11 @@ export function emptyProcessCrashRecoveryReport(): ProcessCrashRecoveryReport {
   };
 }
 
+/** Create the empty outcome for a pass with no initial-start retry. */
+export function emptyStartupRetryReport(): StartupRetryReport {
+  return { recoveredRoutes: 0, failedRoutes: 0, entries: [], omittedEntries: 0 };
+}
+
 /** Result from a workspace diagnostic recovery pass. */
 export interface RecoverDiagnosticsResult {
   /** Active clients targeted by the best-effort refresh, not confirmed successful refreshes. */
@@ -104,6 +132,8 @@ export interface RecoverDiagnosticsResult {
   restartedClients: number;
   /** Separate outcome for process-crash route recovery selected by this pass. */
   processCrashRecovery: ProcessCrashRecoveryReport;
+  /** Separate outcome for explicit retries of failed initial-start routes. */
+  startupRetry: StartupRetryReport;
   /** Evidence collected by the refresh and recovery operations. */
   diagnosticEvidence: DiagnosticEvidenceSummary;
   /** Final diagnostic report captured after all refresh and recovery work. */
@@ -128,7 +158,10 @@ export interface ScopeDecisionEntry {
   basis: string | null;
 }
 
-/** Aggregate tsconfig scope decisions for all tracked files, for debug telemetry. */
+/**
+ * Aggregate tsconfig scope decisions for automatic-scope TypeScript/JavaScript-family
+ * tracked files, for debug telemetry.
+ */
 export interface ScopeDecisionSummary {
   caseSensitiveFileNames: boolean;
   counts: {
@@ -141,6 +174,6 @@ export interface ScopeDecisionSummary {
   basisCounts: Record<string, number>;
   /** Bounded workspace-relative entries (oldest first), not the full set. */
   entries: ScopeDecisionEntry[];
-  /** Total number of tracked files the summary was computed over. */
+  /** Total number of automatic-scope TypeScript/JavaScript-family tracked files covered. */
   totalFiles: number;
 }

package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-registry.ts

@@ -41,6 +41,7 @@ import type {
   DiagnosticEvidenceSummary,
   ProcessCrashRecoveryReport,
   RecoverDiagnosticsResult,
+  StartupRetryReport,
 } from "./runtime-diagnostics.ts";
 import type {
   BulkTrackFilesResult,
@@ -59,6 +60,7 @@ export {
   type DiagnosticEvidenceStatus,
   type DiagnosticEvidenceSummary,
   emptyProcessCrashRecoveryReport,
+  emptyStartupRetryReport,
   MAX_PROCESS_CRASH_RECOVERY_ENTRIES,
   type OutstandingDiagnosticSummaryEntry,
   type ProcessCrashRecoveryEntry,
@@ -66,6 +68,10 @@ export {
   type ProcessCrashRecoveryOutcome,
   type ProcessCrashRecoveryReport,
   type RecoverDiagnosticsResult,
+  type StartupRetryEntry,
+  type StartupRetryNextAction,
+  type StartupRetryOutcome,
+  type StartupRetryReport,
   type WorkspaceDiagnosticReport,
   type WorkspaceDiagnosticSnapshot,
   type WorkspaceDiagnosticSummaryEntry,
@@ -270,11 +276,11 @@ class DefaultWorkspaceLspRuntime implements WorkspaceLspRuntime {
    */
   async waitUntilReadyForFile(
     filePath: string,
-    options: { timeoutMs?: number } = {},
+    options: { timeoutMs?: number; retryFailedRoute?: boolean } = {},
     control?: CodeRequestControl,
   ): Promise<SemanticReadinessResult> {
     const resolvedPath = this.resolveFilePath(filePath);
-    if (!this.manager.canServeFile(resolvedPath)) {
+    if (!options.retryFailedRoute && !this.manager.canServeFile(resolvedPath)) {
       const processCrashRecovery = this.manager.getProcessCrashRecoveryReportForFile(resolvedPath);
       return {
         kind: "unavailable",
@@ -284,31 +290,44 @@ class DefaultWorkspaceLspRuntime implements WorkspaceLspRuntime {
     }
 
     let eagerProcessCrashRecovery: ProcessCrashRecoveryReport | undefined;
+    let eagerStartupRetry: StartupRetryReport | undefined;
     const readiness = await raceReadinessValue(
-      this.manager.waitUntilFileReady(resolvedPath, control, (report) => {
-        eagerProcessCrashRecovery = report;
+      this.manager.waitUntilFileReady(resolvedPath, control, {
+        retryFailedRoute: options.retryFailedRoute === true,
+        onProcessCrashRecovery: (report) => {
+          eagerProcessCrashRecovery = report;
+        },
+        onStartupRetry: (report) => {
+          eagerStartupRetry = report;
+        },
       }),
       options.timeoutMs,
       control,
     );
     if (readiness.kind !== "resolved") {
-      // A timeout can happen before shared recovery settles. Do not create a
-      // route outcome for work that has no final result yet.
+      // A timeout can happen before shared recovery settles. Keep only route
+      // outcomes that completed before the timeout.
       const currentProcessCrashRecovery =
         this.manager.getProcessCrashRecoveryReportForFile(resolvedPath);
       const processCrashRecovery = currentProcessCrashRecovery ?? eagerProcessCrashRecovery;
-      return processCrashRecovery ? { ...readiness, processCrashRecovery } : readiness;
+      return {
+        ...readiness,
+        ...(eagerStartupRetry ? { startupRetry: eagerStartupRetry } : {}),
+        ...(processCrashRecovery ? { processCrashRecovery } : {}),
+      };
     }
-    const { client, processCrashRecovery } = readiness.value;
+    const { client, processCrashRecovery, startupRetry } = readiness.value;
     const recovery = hasProcessCrashRecovery(processCrashRecovery) ? { processCrashRecovery } : {};
+    const startup = startupRetry && startupRetry.entries.length > 0 ? { startupRetry } : {};
     if (!client) {
       return {
         kind: "unavailable",
         reason: "The routed LSP client could not be started for this file",
+        ...startup,
         ...recovery,
       };
     }
-    return { kind: "ready", ...recovery };
+    return { kind: "ready", ...startup, ...recovery };
   }
 
   /**
@@ -433,14 +452,14 @@ class DefaultWorkspaceLspRuntime implements WorkspaceLspRuntime {
     return this.manager.getOutstandingDiagnosticSummarySnapshot(maxSeverity);
   }
 
-  /** Trigger a workspace-wide diagnostics refresh and stale-state recovery pass. */
+  /** Retry failed routes and run a workspace-wide diagnostic recovery pass. */
   async recoverDiagnostics(options?: {
     restartIfStillStale?: boolean;
     maxWaitMs?: number;
     quietMs?: number;
     /** Evidence from a refresh the caller already completed; skips this pass's own refresh when no watched-file changes apply. */
     initialEvidence?: DiagnosticEvidenceSummary;
-    /** Explicit demand to recover crashed routes with tracked files in scope. */
+    /** Explicit demand to retry failed startup and crashed routes in scope. */
     processCrashDemand?: import("./runtime-diagnostic-surface.ts").ProcessCrashDiagnosticDemand;
     control?: CodeRequestControl;
   }): Promise<RecoverDiagnosticsResult> {
@@ -460,6 +479,7 @@ class DefaultWorkspaceLspRuntime implements WorkspaceLspRuntime {
           attemptedClients: result.attemptedClients,
           restartedClients: result.restartedClients,
           processCrashRecovery: result.processCrashRecovery,
+          startupRetry: result.startupRetry,
           attemptedServers: boundServerNames(result.attemptedServers ?? []),
           restartedServers: boundServerNames(result.restartedServers ?? []),
           ...(result.restartReason ? { reason: result.restartReason } : {}),

package/node_modules/@mrclrchtr/supi-lsp/src/session/workspace-lsp-runtime.ts

@@ -19,7 +19,7 @@ import type {
 } from "../diagnostics/workspace-sentinels.ts";
 import type { WorkspaceSourceInventory } from "../diagnostics/workspace-sources.ts";
 import type { WorkspaceLspDiagnosticSurface } from "./runtime-diagnostic-surface.ts";
-import type { ProcessCrashRecoveryReport } from "./runtime-diagnostics.ts";
+import type { ProcessCrashRecoveryReport, StartupRetryReport } from "./runtime-diagnostics.ts";
 
 /** Maximum number of files processed by one automatic bulk-tracking call. */
 export const MAX_BULK_TRACK_FILES = 256;
@@ -34,17 +34,23 @@ export type WorkspaceLspRuntimeState =
 export type SemanticReadinessResult =
   | {
       kind: "ready";
+      /** Initial-start retry observed while establishing file readiness. */
+      startupRetry?: StartupRetryReport;
       /** Process-crash route recovery observed while establishing file readiness. */
       processCrashRecovery?: ProcessCrashRecoveryReport;
     }
   | {
       kind: "timeout";
+      /** Initial-start retry observed before the readiness timeout. */
+      startupRetry?: StartupRetryReport;
       /** Process-crash route recovery observed before the readiness timeout. */
       processCrashRecovery?: ProcessCrashRecoveryReport;
     }
   | {
       kind: "unavailable";
       reason: string;
+      /** Initial-start retry observed before readiness became unavailable. */
+      startupRetry?: StartupRetryReport;
       /** Process-crash route recovery observed before readiness became unavailable. */
       processCrashRecovery?: ProcessCrashRecoveryReport;
     };
@@ -61,9 +67,15 @@ export interface RoutedMutationResponse<T> {
 export type BulkTrackFileOutcome =
   | { readonly file: string; readonly kind: "tracked" }
   | { readonly file: string; readonly kind: "already-tracked" }
+  /**
+   * Automatic tracking skipped this candidate. This includes policy-excluded
+   * paths, unsupported automatic routes, missing paths, and paths that are no
+   * longer regular. The coarse reason does not prove one cause or that an
+   * explicit request cannot be served.
+   */
   | {
       readonly file: string;
-      readonly kind: "unsupported";
+      readonly kind: "skipped";
       readonly reason: "missing" | "not-automatic-source";
     }
   | { readonly file: string; readonly kind: "unavailable"; readonly reason: string };
@@ -124,9 +136,13 @@ export interface WorkspaceLspRuntime extends WorkspaceLspDiagnosticSurface {
     control?: CodeRequestControl,
   ): Promise<RoutedMutationResponse<CodeAction[] | null> | null>;
   getOpenDocumentVersion(filePath: string): number | null;
+  /**
+   * Wait for file readiness; an explicit refresh may make one shared route
+   * retry for this call without changing ordinary request recovery limits.
+   */
   waitUntilReadyForFile(
     filePath: string,
-    options?: { timeoutMs?: number },
+    options?: { timeoutMs?: number; retryFailedRoute?: boolean },
     control?: CodeRequestControl,
   ): Promise<SemanticReadinessResult>;
   waitUntilReadyForWorkspace(

package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-code-runtime",
-  "version": "6.4.0",
+  "version": "7.0.1",
   "description": "Shared workspace context and capability contracts for code intelligence",
   "license": "MIT",
   "repository": {

package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/src/types.ts

@@ -234,7 +234,14 @@ export type CalleeDepth = "direct" | "deep";
  */
 export interface CalleesData {
   enclosingScope: { name: string; startLine: number; endLine: number };
-  callees: Array<{ name: string; startLine: number }>;
+  /** Distinct call sites with 1-based UTF-16 start coordinates. */
+  callees: Array<{
+    name: string;
+    /** Optional syntax-shortened label for presentation; does not replace `name`. */
+    displayName?: string;
+    startLine: number;
+    startCharacter: number;
+  }>;
   depth: CalleeDepth;
 }
 

package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/README.md

@@ -21,6 +21,7 @@ pnpm add @mrclrchtr/supi-core
 ## Package surfaces
 
 - `@mrclrchtr/supi-core/api` — reusable helpers for other packages and extensions
+- `@mrclrchtr/supi-core/llm` — PI-owned direct model requests and JSON helpers
 - `@mrclrchtr/supi-core/report` — shared text/report rendering helpers for TUI and plain-text summaries
 
 ## What you get from the API
@@ -48,6 +49,13 @@ Config file locations:
 
 - `wrapExtensionContext()` — wrap injected text in SuPi's `<extension-context>` tag
 
+### Model requests
+
+- `completeModelRequest(ctx, model, context, options)` — complete through PI's model registry with stable feature affinity. PI owns auth and endpoint resolution.
+- `callWithJsonResponse()` — retry a registry request, extract JSON, and validate it with TypeBox.
+
+`completeModelRequest()` requires a stable `affinityScope`. It keeps cache retention defaults, does not include prompt content in the affinity ID, and adds OpenCode headers only when the provider or exact model endpoint matches OpenCode. Pass `maxTokens: model.maxTokens` when a caller needs the model's declared output cap without using PI private modules.
+
 ### Shared registries
 
 - context-provider registry for `/supi-context`

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "6.4.0",
+  "version": "7.0.1",
   "description": "Shared settings, configuration, reporting, and session infrastructure",
   "license": "MIT",
   "repository": {

package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/footer-registry.ts

@@ -2,17 +2,24 @@
 //
 // Extensions register pre-styled text chunks with a placement hint
 // ("stats" for the metrics line, "status" for the extension status line).
-// The custom footer in supi-extras (or PI's built-in footer) reads these
-// contributions and renders them alongside the built-in metrics.
+// The custom footer in supi-extras reads these contributions and renders them
+// alongside the built-in metrics. Extensions can use PI's status API as a
+// fallback when the custom footer is not installed.
 
 import { createRegistry } from "./registry-utils.ts";
 
+/** Event emitted when a dynamic footer contribution needs a new render. */
+export const FOOTER_INVALIDATE_EVENT = "supi:footer:invalidate";
+
 /** Where the contribution should appear in the footer. */
 export type FooterPlacement = "stats" | "stats-end" | "status";
 
 /** A single footer contribution registered by an extension. */
 export interface FooterContribution {
-  /** Unique key for this contribution. Re-registering with the same key replaces it. */
+  /**
+   * Unique key for this contribution. Re-registering with the same key replaces it.
+   * A same-key Pi status is treated as this contribution's built-in-footer fallback.
+   */
   key: string;
   /** Which footer line this belongs on. */
   placement: FooterPlacement;

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

@@ -15,6 +15,8 @@ export * from "./debug.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./footer-registry.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./llm.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./model-selection.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./path.ts";

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

@@ -1,12 +1,131 @@
-import { complete } from "@earendil-works/pi-ai/compat";
+import { createHash } from "node:crypto";
+import type {
+  Api,
+  AssistantMessage,
+  Context,
+  Model,
+  ModelsApiStreamOptions,
+  ProviderHeaders,
+} from "@earendil-works/pi-ai";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { TSchema } from "typebox";
 import { Value } from "typebox/value";
 
 // Shared LLM utilities for SuPi extensions.
 //
-// Provides retry logic, structured LLM call helpers, and other
-// common patterns for extensions that interact with AI models.
+// Provides PI-owned model requests, retry logic, structured LLM call helpers,
+// and other common patterns for extensions that interact with AI models.
+
+const MODEL_REQUEST_NAMESPACE = "supi-direct-model-request-v1";
+
+/**
+ * Options for {@link completeModelRequest}.
+ *
+ * Authentication, provider environment, and session identity stay under PI
+ * control. The feature supplies a stable scope for its prompt stream.
+ */
+export type CompleteModelRequestOptions<TApi extends Api = Api> = Omit<
+  ModelsApiStreamOptions<TApi>,
+  "apiKey" | "env" | "sessionId"
+> & {
+  /** Stable feature scope. Do not include prompt, turn, or retry data. */
+  affinityScope: string;
+  /** PI owns these fields, including for APIs with open-ended option types. */
+  apiKey?: never;
+  env?: never;
+  sessionId?: never;
+};
+
+function createModelRequestAffinityId(
+  sessionId: string,
+  affinityScope: string,
+  model: Model<Api>,
+): string {
+  const material = JSON.stringify([
+    MODEL_REQUEST_NAMESPACE,
+    sessionId,
+    affinityScope,
+    model.provider,
+    model.id,
+  ]);
+  const digest = createHash("sha256").update(material, "utf8").digest("hex");
+  return `supi-${digest.slice(0, 56)}`;
+}
+
+function isOpenCodeModel(model: Model<Api>): boolean {
+  if (model.provider === "opencode" || model.provider === "opencode-go") return true;
+
+  try {
+    return new URL(model.baseUrl).hostname === "opencode.ai";
+  } catch {
+    return false;
+  }
+}
+
+function hasHeader(headers: ProviderHeaders, name: string): boolean {
+  const lowerName = name.toLowerCase();
+  return Object.keys(headers).some((headerName) => headerName.toLowerCase() === lowerName);
+}
+
+function addOpenCodeDefaultHeaders(
+  model: Model<Api>,
+  affinityId: string,
+  headers: ProviderHeaders,
+): ProviderHeaders {
+  if (!isOpenCodeModel(model)) return headers;
+
+  const result = { ...headers };
+  if (!hasHeader(result, "x-opencode-session")) {
+    result["x-opencode-session"] = affinityId;
+  }
+  if (!hasHeader(result, "x-opencode-client")) {
+    result["x-opencode-client"] = "pi";
+  }
+  return result;
+}
+
+/**
+ * Complete a direct request through PI's model registry.
+ *
+ * PI resolves authentication, provider headers, environment, and the
+ * effective endpoint. This helper adds one stable opaque session identity for
+ * the feature prompt stream and applies the OpenCode compatibility defaults.
+ * It does not retry, validate output, or present errors.
+ *
+ * When `maxTokens` is omitted, the underlying registry receives no explicit
+ * output cap. A caller that needs the selected model's declared cap can pass
+ * `maxTokens: model.maxTokens` without importing PI internals.
+ */
+export async function completeModelRequest<TApi extends Api>(
+  ctx: ExtensionContext,
+  model: Model<TApi>,
+  context: Context,
+  options: CompleteModelRequestOptions<TApi>,
+): Promise<AssistantMessage> {
+  const { affinityScope, transformHeaders: callerTransformHeaders, ...requestOptions } = options;
+  const safeRequestOptions = { ...requestOptions };
+  delete safeRequestOptions.apiKey;
+  delete safeRequestOptions.env;
+  delete safeRequestOptions.sessionId;
+
+  const affinityId = createModelRequestAffinityId(
+    ctx.sessionManager.getSessionId(),
+    affinityScope,
+    model,
+  );
+  const transformHeaders = async (headers: ProviderHeaders): Promise<ProviderHeaders> => {
+    const transformed = callerTransformHeaders ? await callerTransformHeaders(headers) : headers;
+    return addOpenCodeDefaultHeaders(model, affinityId, transformed);
+  };
+
+  // Restore PI's conditional provider-option type after removing owned fields.
+  return ctx.modelRegistry.complete(model, context, {
+    ...safeRequestOptions,
+    signal: safeRequestOptions.signal ?? ctx.signal,
+    sessionId: affinityId,
+    transformHeaders,
+  } as unknown as ModelsApiStreamOptions<TApi>);
+}
 
 /**
  * Options for {@link withRetry}.
@@ -122,6 +241,8 @@ export function extractJsonFromResponse<T extends TSchema>(
 export interface CallWithJsonResponseOptions {
   /** The prompt to send to the LLM. */
   prompt: string;
+  /** Stable feature scope for request affinity. Do not include prompt or retry data. */
+  affinityScope: string;
   /** Optional data context appended to the prompt. */
   dataContext?: string;
   /** Maximum tokens for the response. Default: 4096 */
@@ -135,8 +256,9 @@ export interface CallWithJsonResponseOptions {
 /**
  * Call the LLM with a prompt and validate the JSON response against a TypeBox schema.
  *
- * Handles model resolution, auth, retry via `withRetry`, text extraction,
- * JSON regex matching, and TypeBox validation.
+ * Handles model resolution, retry via `withRetry`, text extraction, JSON
+ * matching, and TypeBox validation. The request itself stays under PI
+ * registry authority through {@link completeModelRequest}.
  *
  * Returns `null` when:
  * - No model is available
@@ -145,7 +267,7 @@ export interface CallWithJsonResponseOptions {
  * - JSON doesn't match the schema
  * - The request is aborted
  *
- * @param ctx - The extension context for model resolution and auth.
+ * @param ctx - The extension context for model selection and PI registry access.
  * @param options - Call options including prompt, schema, and retry config.
  * @param schema - TypeBox schema to validate the JSON response against.
  * @returns The parsed and validated result, or `null`.
@@ -155,14 +277,18 @@ export async function callWithJsonResponse<T extends TSchema>(
   options: CallWithJsonResponseOptions,
   schema: T,
 ): Promise<{ parsed: import("typebox").Static<T> } | null> {
-  const { prompt, dataContext, maxTokens = 4096, systemPrompt = "", retries = 2 } = options;
+  const {
+    prompt,
+    affinityScope,
+    dataContext,
+    maxTokens = 4096,
+    systemPrompt = "",
+    retries = 2,
+  } = options;
 
   const model = ctx.model ?? ctx.modelRegistry.getAvailable()[0] ?? null;
   if (!model) return null;
 
-  const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
-  if (!auth.ok || !auth.apiKey) return null;
-
   const fullPrompt = dataContext
     ? `${prompt}
 
@@ -171,8 +297,9 @@ ${dataContext}`
     : prompt;
 
   const response = await withRetry(
-    async () => {
-      return complete(
+    async () =>
+      completeModelRequest(
+        ctx,
         model,
         {
           systemPrompt,
@@ -185,13 +312,11 @@ ${dataContext}`
           ],
         },
         {
-          apiKey: auth.apiKey,
-          headers: auth.headers,
+          affinityScope,
           signal: ctx.signal,
           maxTokens,
         },
-      );
-    },
+      ),
     { retries, baseDelayMs: 1000, signal: ctx.signal },
   );
 

package/node_modules/@mrclrchtr/supi-tree-sitter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-tree-sitter",
-  "version": "6.4.0",
+  "version": "7.0.1",
   "description": "Structural AST analysis for SuPi code intelligence",
   "license": "MIT",
   "repository": {
@@ -36,8 +36,8 @@
   "dependencies": {
     "jiti": "^2.7.0",
     "web-tree-sitter": "^0.27.0",
-    "@mrclrchtr/supi-code-runtime": "6.4.0",
-    "@mrclrchtr/supi-core": "6.4.0"
+    "@mrclrchtr/supi-code-runtime": "7.0.1",
+    "@mrclrchtr/supi-core": "7.0.1"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",

package/node_modules/@mrclrchtr/supi-tree-sitter/src/provider/tree-sitter-provider.ts

@@ -145,7 +145,9 @@ function mapCalleesAtResult(result: CalleesAtResult): CalleesData {
     },
     callees: result.callees.map((c) => ({
       name: c.name,
+      ...(c.displayName === undefined ? {} : { displayName: c.displayName }),
       startLine: c.range.startLine,
+      startCharacter: c.range.startCharacter,
     })),
     depth: result.depth,
   };