@mrclrchtr/supi-prompt-suggestions 7.1.0 → 7.1.1

package/README.md

@@ -18,6 +18,8 @@ Advisory ghost-text prompt suggestions for the [pi coding agent](https://github.
 
 ## Install
 
+Requires Pi 0.86.0 or later.
+
 ```bash
 pi install npm:@mrclrchtr/supi-prompt-suggestions
 ```
@@ -53,8 +55,8 @@ The default is `disabled`. Pick a cheap, fast model if you want lightweight sugg
 
 Settings follow SuPi's normal scoped config behavior: set a global default, then override it per project when needed.
 
-Suggestion requests use PI's model registry. PI owns authentication and provider routing; the
-extension does not resolve or copy credentials.
+Suggestion requests use PI's registry simple-completion path. PI owns authentication, provider
+routing, and context-aware output limits; the extension does not resolve or copy credentials.
 
 ## Privacy
 

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

@@ -51,10 +51,11 @@ Config file locations:
 
 ### Model requests
 
-- `completeModelRequest(ctx, model, context, options)` — complete through PI's model registry with stable feature affinity. PI owns auth and endpoint resolution.
+- `completeModelRequest(ctx, model, context, options)` — send API-specific options through PI's model registry.
+- `completeSimpleModelRequest(ctx, model, context, options)` — send provider-neutral options through `streamSimple().result()` on PI 0.86.0 or later. PI supplies model-derived output limits and context guards.
 - `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.
+Both completion helpers require a stable `affinityScope`. PI owns auth and endpoint resolution. The helpers keep cache retention defaults, exclude prompt content from the affinity ID, and add OpenCode headers only when the provider or exact model endpoint matches OpenCode. Use the simple helper when PI should manage output limits; the API-specific helper forwards the caller's limit unchanged.
 
 ### Shared registries
 

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

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

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

@@ -5,6 +5,7 @@ import type {
   Context,
   Model,
   ModelsApiStreamOptions,
+  ModelsSimpleStreamOptions,
   ProviderHeaders,
 } from "@earendil-works/pi-ai";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
@@ -18,16 +19,7 @@ import { Value } from "typebox/value";
 
 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"
-> & {
+type ModelRequestOptions<T> = Omit<T, "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. */
@@ -36,6 +28,14 @@ export type CompleteModelRequestOptions<TApi extends Api = Api> = Omit<
   sessionId?: never;
 };
 
+/** API-specific completion options. PI owns auth, environment, and identity. */
+export type CompleteModelRequestOptions<TApi extends Api = Api> = ModelRequestOptions<
+  ModelsApiStreamOptions<TApi>
+>;
+
+/** Provider-neutral completion options. PI owns auth, environment, and identity. */
+export type CompleteSimpleModelRequestOptions = ModelRequestOptions<ModelsSimpleStreamOptions>;
+
 function createModelRequestAffinityId(
   sessionId: string,
   affinityScope: string,
@@ -84,24 +84,10 @@ function addOpenCodeDefaultHeaders(
   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> {
+/** Keep request identity and header policy identical for both completion paths. */
+function prepareModelRequestOptions<
+  T extends Pick<ModelsSimpleStreamOptions, "signal" | "transformHeaders">,
+>(ctx: ExtensionContext, model: Model<Api>, options: ModelRequestOptions<T>): T {
   const { affinityScope, transformHeaders: callerTransformHeaders, ...requestOptions } = options;
   const safeRequestOptions = { ...requestOptions };
   delete safeRequestOptions.apiKey;
@@ -118,13 +104,57 @@ export async function completeModelRequest<TApi extends Api>(
     return addOpenCodeDefaultHeaders(model, affinityId, transformed);
   };
 
-  // Restore PI's conditional provider-option type after removing owned fields.
-  return ctx.modelRegistry.complete(model, context, {
+  // Restore PI's option type after removing owned fields.
+  return {
     ...safeRequestOptions,
     signal: safeRequestOptions.signal ?? ctx.signal,
     sessionId: affinityId,
     transformHeaders,
-  } as unknown as ModelsApiStreamOptions<TApi>);
+  } as unknown as T;
+}
+
+/**
+ * Complete an API-specific request through PI's model registry.
+ *
+ * PI resolves auth, headers, environment, and the effective endpoint. SuPi adds
+ * a stable opaque feature identity and OpenCode header defaults. This helper
+ * does not retry, validate output, or present errors. It supplies no output cap
+ * when `maxTokens` is omitted; use {@link completeSimpleModelRequest} for PI's
+ * model-derived defaults and context-aware limits.
+ */
+export async function completeModelRequest<TApi extends Api>(
+  ctx: ExtensionContext,
+  model: Model<TApi>,
+  context: Context,
+  options: CompleteModelRequestOptions<TApi>,
+): Promise<AssistantMessage> {
+  return ctx.modelRegistry.complete(
+    model,
+    context,
+    prepareModelRequestOptions<ModelsApiStreamOptions<TApi>>(ctx, model, options),
+  );
+}
+
+/**
+ * Complete a provider-neutral request through PI's registry simple path.
+ *
+ * Requires PI 0.86.0 or later. PI's provider handles simple options, including
+ * model-derived output limits and context estimates. Request identity, header
+ * policy, and error behavior match {@link completeModelRequest}.
+ */
+export async function completeSimpleModelRequest(
+  ctx: ExtensionContext,
+  model: Model<Api>,
+  context: Context,
+  options: CompleteSimpleModelRequestOptions,
+): Promise<AssistantMessage> {
+  return ctx.modelRegistry
+    .streamSimple(
+      model,
+      context,
+      prepareModelRequestOptions<ModelsSimpleStreamOptions>(ctx, model, options),
+    )
+    .result();
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-prompt-suggestions",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "description": "Optional model-powered ghost-text prompt suggestions",
   "license": "MIT",
   "repository": {
@@ -48,7 +48,7 @@
     "video": "https://raw.githubusercontent.com/mrclrchtr/supi/main/packages/supi-prompt-suggestions/assets/demo.mp4"
   },
   "dependencies": {
-    "@mrclrchtr/supi-core": "7.1.0"
+    "@mrclrchtr/supi-core": "7.1.1"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/src/generation/client.ts

@@ -1,9 +1,8 @@
 /** Low-level suggestion model client. */
 
 import type { Api, Context, Model } from "@earendil-works/pi-ai";
-import { clampMaxTokensToContext } from "@earendil-works/pi-ai/api/simple-options";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { completeModelRequest } from "@mrclrchtr/supi-core/llm";
+import { completeSimpleModelRequest } from "@mrclrchtr/supi-core/llm";
 import {
   classifySuggestionFailure,
   createSuggestionFailure,
@@ -69,7 +68,7 @@ export interface SuggestionClientOptions {
  * Call the suggestion model through PI's model registry.
  *
  * The request keeps the fixed prompt and bounded assistant tail. PI resolves
- * authentication, endpoint, headers, and provider environment.
+ * authentication, endpoint, headers, provider environment, and simple output limits.
  */
 export async function callSuggestionModel(
   opts: SuggestionClientOptions,
@@ -86,10 +85,9 @@ export async function callSuggestionModel(
   };
 
   try {
-    const response = await completeModelRequest(opts.ctx, opts.model, context, {
+    const response = await completeSimpleModelRequest(opts.ctx, opts.model, context, {
       affinityScope: "prompt-suggestions",
       signal: opts.signal,
-      maxTokens: clampMaxTokensToContext(opts.model, context, opts.model.maxTokens),
     });
 
     if (response.stopReason === "aborted") {