@ai-sdk/harness-pi 1.0.65 → 1.0.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/harness-pi",
-  "version": "1.0.65",
+  "version": "1.0.67",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -30,8 +30,8 @@
     "@earendil-works/pi-coding-agent": "^0.80.10",
     "pi-mcp-adapter": "2.12.1",
     "typebox": "^1.1.38",
-    "@ai-sdk/provider-utils": "5.0.26",
-    "@ai-sdk/harness": "1.0.65"
+    "@ai-sdk/harness": "1.0.66",
+    "@ai-sdk/provider-utils": "5.0.26"
   },
   "peerDependencies": {
     "zod": "^3.25.76 || ^4.1.8"

package/src/pi-model-resolver.ts

@@ -11,6 +11,30 @@ type PiModel = ReturnType<ModelRegistry['getAll']>[number];
  */
 export const DEFAULT_PI_GATEWAY_MODEL_ID = 'anthropic/claude-sonnet-4.6';
 
+/*
+ * A `"<provider>/<id>"` reference normally resolves under that provider, not
+ * any entry whose flat `id` happens to equal the whole string. Routing proxies
+ * (`vercel-ai-gateway`, `openrouter`) can carry another provider's id verbatim
+ * as their own flat `id` (e.g. `id: "xai/grok-4.3"`), so this tier normally
+ * wins over flat matching. An authenticated literal-id match remains usable
+ * when the scoped provider is unauthenticated, matching Pi's own resolver.
+ * Gateway preference stays first because gateway credentials explicitly opt
+ * the harness into routing matching models through the gateway.
+ */
+const findScopedMatch = (
+  effectiveId: string,
+  models: PiModel[],
+): PiModel | undefined => {
+  const slashIndex = effectiveId.indexOf('/');
+  if (slashIndex === -1) return undefined;
+
+  const prefix = effectiveId.slice(0, slashIndex);
+  const bareId = effectiveId.slice(slashIndex + 1);
+  return models.find(
+    m => m.provider === prefix && (m.id === bareId || m.name === bareId),
+  );
+};
+
 export function createPiModelResolver({
   modelRegistry,
   env = process.env,
@@ -47,10 +71,21 @@ export function createPiModelResolver({
     // (e.g. `anthropic/claude-sonnet-4.6` exists under both `openrouter` and
     // `vercel-ai-gateway`); without this preference Pi would dispatch through
     // a provider we didn't register, which fails with "No API key found".
-    return (
-      (useGateway &&
-        models.find(m => m.provider === 'vercel-ai-gateway' && matches(m))) ||
-      models.find(matches)
-    );
+    const gatewayMatch = useGateway
+      ? models.find(m => m.provider === 'vercel-ai-gateway' && matches(m))
+      : undefined;
+    if (gatewayMatch) return gatewayMatch;
+
+    const scopedMatch = findScopedMatch(effectiveId, models);
+    if (scopedMatch && !modelRegistry.hasConfiguredAuth(scopedMatch)) {
+      const authenticatedFlatMatches = models.filter(
+        m => m.id === effectiveId && modelRegistry.hasConfiguredAuth(m),
+      );
+      if (authenticatedFlatMatches.length === 1) {
+        return authenticatedFlatMatches[0];
+      }
+    }
+
+    return scopedMatch ?? models.find(matches);
   };
 }

package/src/pi-session.ts

@@ -55,7 +55,6 @@ import {
 import { toolSpecToTypeBoxParameters } from './pi-typebox-adapter';
 import {
   extractUserText,
-  frameInstructions,
   safePiMetadataSegment,
   serializeToolOutput,
 } from './pi-utils';
@@ -395,6 +394,8 @@ export async function createPiSession(
   });
   const hasMcpServers = Object.keys(mcpServers).length > 0;
 
+  let sessionInstructions: string | undefined;
+
   /*
    * Configured MCP servers are served by an inline Pi extension, so they share
    * the extension runtime with the caller-supplied factories: both are loaded
@@ -426,11 +427,13 @@ export async function createPiSession(
   let currentExtensionsResult:
     | ReturnType<DefaultResourceLoader['getExtensions']>
     | undefined;
+
   const resourceLoader = new DefaultResourceLoader({
     cwd: sessionWorkDir,
     agentDir: hostAgentDir,
     settingsManager,
-    appendSystemPromptOverride: () => [],
+    appendSystemPromptOverride: () =>
+      sessionInstructions ? [sessionInstructions] : [],
     extensionFactories,
     ...(hasExtensionFactories
       ? {
@@ -498,12 +501,6 @@ export async function createPiSession(
    * from the persisted journal.
    */
   let suspending = false;
-  /*
-   * Instructions are prepended to the first user message of a fresh session
-   * only. A resumed session already carried them in its original first
-   * message (preserved in the persisted session file), so it starts "applied".
-   */
-  let instructionsApplied = input.isResume;
   const pendingToolResults = new Map<string, PendingToolResult>();
   const pendingToolApprovals = new Map<string, PendingToolApproval>();
 
@@ -521,6 +518,15 @@ export async function createPiSession(
    */
   const pendingCompactionParts: HarnessV1StreamPart[] = [];
 
+  async function applySessionInstructions(
+    instructions: string | undefined,
+  ): Promise<void> {
+    if (instructions === sessionInstructions) return;
+    sessionInstructions = instructions;
+    await reloadResourcesOnly();
+    piSession?.setActiveToolsByName(piSession.getActiveToolNames());
+  }
+
   const remoteOps = createPiRemoteOps({
     sandbox,
     paths,
@@ -939,14 +945,10 @@ export async function createPiSession(
     doPromptTurn: async (
       promptOpts: HarnessV1PromptTurnOptions,
     ): Promise<HarnessV1PromptControl> => {
-      let text = extractUserText(promptOpts.prompt);
-      if (!instructionsApplied && promptOpts.instructions) {
-        text = frameInstructions(promptOpts.instructions, text);
-      }
-      instructionsApplied = true;
+      await applySessionInstructions(promptOpts.instructions);
 
       return runTurn({
-        text,
+        text: extractUserText(promptOpts.prompt),
         tools: promptOpts.tools ?? [],
         emit: promptOpts.emit,
         abortSignal: promptOpts.abortSignal,
@@ -972,6 +974,7 @@ export async function createPiSession(
        * flight at the slice boundary is recomputed because a host-resident
        * runtime cannot do a lossless attach.
        */
+      await applySessionInstructions(continueOpts.instructions);
       return runTurn({
         text: '',
         tools: continueOpts.tools ?? [],