@ai-sdk/harness-pi 1.0.65 → 1.0.67

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ai-sdk/harness-pi
 
+## 1.0.67
+
+### Patch Changes
+
+- 9ee30bf: fix(harness): pass instructions appended to system / developer prompt instead of using the workaround of first user prompt
+- Updated dependencies [9ee30bf]
+  - @ai-sdk/harness@1.0.66
+
+## 1.0.66
+
+### Patch Changes
+
+- b6642fa: fix(harness-pi): resolve compound provider/id model ids under their scoped provider
+
 ## 1.0.65
 
 ### Patch Changes

package/dist/index.js

@@ -108,7 +108,7 @@ import { resolveSandboxHomeDir } from "@ai-sdk/harness/utils";
 import { getAiGatewayAuthFromEnv } from "@ai-sdk/harness/utils";
 
 // src/version.ts
-var VERSION = true ? "1.0.65" : "0.0.0-test";
+var VERSION = true ? "1.0.67" : "0.0.0-test";
 
 // src/pi-auth.ts
 var DEFAULT_GATEWAY_BASE_URL = "https://ai-gateway.vercel.sh";
@@ -368,6 +368,15 @@ function extractAssistantText(message) {
 // src/pi-model-resolver.ts
 import { getAiGatewayAuthFromEnv as getAiGatewayAuthFromEnv2 } from "@ai-sdk/harness/utils";
 var DEFAULT_PI_GATEWAY_MODEL_ID = "anthropic/claude-sonnet-4.6";
+var findScopedMatch = (effectiveId, models) => {
+  const slashIndex = effectiveId.indexOf("/");
+  if (slashIndex === -1) return void 0;
+  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)
+  );
+};
 function createPiModelResolver({
   modelRegistry,
   env = process.env
@@ -390,7 +399,18 @@ function createPiModelResolver({
     if (!effectiveId) return void 0;
     const models = loadModels();
     const matches = (m) => m.id === effectiveId || m.name === effectiveId;
-    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)) : void 0;
+    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);
   };
 }
 
@@ -767,17 +787,6 @@ function extractUserText(prompt) {
   }
   return parts.join("\n\n");
 }
-function frameInstructions(instructions, userText) {
-  return `<session-instructions>
-The block below is operating guidance from the system, not a message from the user \u2014 follow it, but do not mention it or attribute it to the user.
-
-${instructions}
-</session-instructions>
-
-<user-message>
-${userText}
-</user-message>`;
-}
 function serializeToolOutput(output) {
   if (typeof output === "string") {
     return output;
@@ -1691,6 +1700,7 @@ async function createPiSession(input) {
     mcpServers: input.settings.mcpServers
   });
   const hasMcpServers = Object.keys(mcpServers).length > 0;
+  let sessionInstructions;
   const extensionFactories = [
     ...input.settings.extensionFactories ?? []
   ];
@@ -1716,7 +1726,7 @@ async function createPiSession(input) {
     cwd: sessionWorkDir,
     agentDir: hostAgentDir,
     settingsManager,
-    appendSystemPromptOverride: () => [],
+    appendSystemPromptOverride: () => sessionInstructions ? [sessionInstructions] : [],
     extensionFactories,
     ...hasExtensionFactories ? {
       // DefaultResourceLoader invokes inline factories on every reload.
@@ -1772,13 +1782,18 @@ async function createPiSession(input) {
   let sessionFileName;
   let stopped = false;
   let suspending = false;
-  let instructionsApplied = input.isResume;
   const pendingToolResults = /* @__PURE__ */ new Map();
   const pendingToolApprovals = /* @__PURE__ */ new Map();
   let currentEmit;
   let translatorState;
   let activeTurn;
   const pendingCompactionParts = [];
+  async function applySessionInstructions(instructions) {
+    if (instructions === sessionInstructions) return;
+    sessionInstructions = instructions;
+    await reloadResourcesOnly();
+    piSession?.setActiveToolsByName(piSession.getActiveToolNames());
+  }
   const remoteOps = createPiRemoteOps({
     sandbox,
     paths,
@@ -2086,13 +2101,9 @@ async function createPiSession(input) {
     // only resume path is restoring the session file on a fresh/snapshotted
     // sandbox, i.e. `rerun`.
     doPromptTurn: async (promptOpts) => {
-      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
@@ -2106,6 +2117,7 @@ async function createPiSession(input) {
           abortSignal: continueOpts.abortSignal
         });
       }
+      await applySessionInstructions(continueOpts.instructions);
       return runTurn({
         text: "",
         tools: continueOpts.tools ?? [],