@ai-sdk/harness-pi 1.0.103 → 1.0.105

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @ai-sdk/harness-pi
 
+## 1.0.105
+
+### Patch Changes
+
+- a514695: fix(harness-pi): let extensions read host-backed session workspaces
+- c359fc0: fix(harness-pi): expose tools registered by inline extensions to models
+- Updated dependencies [9e1d1b2]
+- Updated dependencies [a495511]
+  - @ai-sdk/provider-utils@5.0.37
+  - @ai-sdk/harness@1.0.103
+
+## 1.0.104
+
+### Patch Changes
+
+- eeed977: feat(harness): allow passing arbitrary headers with inference requests via `headers` property in `HarnessAgentSettings`
+- a39c8bf: chore(harness): clarify `writeSkills` helper intent to require materializing skills in HOME directory
+- Updated dependencies [fe86f8f]
+- Updated dependencies [255cccf]
+- Updated dependencies [eeed977]
+- Updated dependencies [a39c8bf]
+  - @ai-sdk/harness@1.0.102
+
 ## 1.0.103
 
 ### Patch Changes

package/dist/index.js

@@ -111,16 +111,18 @@ import {
   SessionManager,
   SettingsManager
 } from "@earendil-works/pi-coding-agent";
-import { mkdir as mkdir3, rm as rm2 } from "fs/promises";
+import { randomUUID } from "crypto";
+import { mkdir as mkdir3, rm as rm2, writeFile as writeFile3 } from "fs/promises";
 import { tmpdir } from "os";
-import path7 from "path";
+import path6 from "path";
 import { Type as Type2 } from "typebox";
 import {
   HarnessCapabilityUnsupportedError as HarnessCapabilityUnsupportedError2
 } from "@ai-sdk/harness";
 import {
   getRestrictedSandboxSession,
-  resolveSandboxHomeDir
+  resolveSandboxHomeDir,
+  writeSkills
 } from "@ai-sdk/harness/utils";
 
 // src/pi-auth.ts
@@ -134,7 +136,7 @@ import {
 import { access } from "fs/promises";
 
 // src/version.ts
-var VERSION = true ? "1.0.103" : "0.0.0-test";
+var VERSION = true ? "1.0.105" : "0.0.0-test";
 
 // src/pi-auth.ts
 var DEFAULT_GATEWAY_BASE_URL = "https://ai-gateway.vercel.sh";
@@ -242,13 +244,15 @@ async function createPiModelRuntime({
 function createGatewayProviderConfig({
   apiKey,
   baseUrl,
-  clientApp
+  clientApp,
+  headers
 }) {
   return {
     apiKey,
     baseUrl,
     authHeader: true,
     headers: {
+      ...headers,
       "User-Agent": clientApp,
       "x-client-app": clientApp
     }
@@ -335,7 +339,8 @@ async function registerPiProviders({
   options,
   resolvedEnv,
   registries,
-  clientApp = HARNESS_CLIENT_APP
+  clientApp = HARNESS_CLIENT_APP,
+  headers
 }) {
   const suppliedEnvironment = isHarnessAuthenticationEnvironment(options);
   const authenticationEnvironment = suppliedEnvironment ? options : process.env;
@@ -346,7 +351,8 @@ async function registerPiProviders({
       await registerCustomProviders({
         customEnv: { ...pickOpenAIEnv(authenticationEnvironment), ...env },
         registries,
-        clientApp
+        clientApp,
+        headers
       });
       return;
     }
@@ -355,7 +361,8 @@ async function registerPiProviders({
       await registerCustomProviders({
         customEnv: { ...pickAnthropicEnv(authenticationEnvironment), ...env },
         registries,
-        clientApp
+        clientApp,
+        headers
       });
       return;
     }
@@ -364,7 +371,8 @@ async function registerPiProviders({
       await registerCustomProviders({
         customEnv: { ...pickProviderEnv(authenticationEnvironment), ...env },
         registries,
-        clientApp
+        clientApp,
+        headers
       });
       return;
     }
@@ -382,7 +390,8 @@ async function registerPiProviders({
         config: createGatewayProviderConfig({
           apiKey: gatewayApiKey,
           baseUrl: gatewayBaseUrl,
-          clientApp
+          clientApp,
+          headers
         })
       });
       return;
@@ -402,7 +411,8 @@ async function registerPiProviders({
           config: createGatewayProviderConfig({
             apiKey: gatewayApiKey,
             baseUrl: gatewayBaseUrl,
-            clientApp
+            clientApp,
+            headers
           })
         });
         return;
@@ -411,7 +421,8 @@ async function registerPiProviders({
       await registerCustomProviders({
         customEnv: { ...pickProviderEnv(authenticationEnvironment), ...env },
         registries,
-        clientApp
+        clientApp,
+        headers
       });
       return;
     }
@@ -444,7 +455,8 @@ function pickProviderEnv(env) {
 async function registerCustomProviders({
   customEnv,
   registries,
-  clientApp
+  clientApp,
+  headers
 }) {
   const gatewayKey = customEnv.AI_GATEWAY_API_KEY;
   if (gatewayKey) {
@@ -456,7 +468,8 @@ async function registerCustomProviders({
       config: createGatewayProviderConfig({
         apiKey: gatewayKey,
         baseUrl,
-        clientApp
+        clientApp,
+        headers
       })
     });
   }
@@ -469,7 +482,8 @@ async function registerCustomProviders({
       config: {
         apiKey: customEnv.OPENAI_API_KEY,
         baseUrl,
-        authHeader: true
+        authHeader: true,
+        ...headers ? { headers } : {}
       }
     });
   }
@@ -482,9 +496,12 @@ async function registerCustomProviders({
       config: {
         apiKey: customEnv.ANTHROPIC_API_KEY,
         baseUrl,
-        ...customEnv.ANTHROPIC_AUTH_TOKEN ? {
+        ...headers || customEnv.ANTHROPIC_AUTH_TOKEN ? {
           headers: {
-            authorization: `Bearer ${customEnv.ANTHROPIC_AUTH_TOKEN}`
+            ...headers,
+            ...customEnv.ANTHROPIC_AUTH_TOKEN ? {
+              authorization: `Bearer ${customEnv.ANTHROPIC_AUTH_TOKEN}`
+            } : {}
           }
         } : {}
       }
@@ -510,7 +527,8 @@ async function registerCustomProviders({
       config: {
         apiKey,
         baseUrl,
-        authHeader: true
+        authHeader: true,
+        ...headers ? { headers } : {}
       }
     });
   }
@@ -839,7 +857,7 @@ function createPiRemoteOps(options) {
     }
     return Buffer.from(bytes);
   };
-  const writeFile3 = async (inputPath, content) => {
+  const writeFile4 = async (inputPath, content) => {
     const remotePath = options.paths.toSandboxPath(inputPath);
     const resolvedPath = await resolveWritableSandboxPath(
       remotePath,
@@ -865,7 +883,7 @@ function createPiRemoteOps(options) {
     const updated = `${current.slice(0, index)}${newText}${current.slice(
       index + oldText.length
     )}`;
-    await writeFile3(inputPath, updated);
+    await writeFile4(inputPath, updated);
     return updated;
   };
   const listDirectory = async (inputPath = ".", limit = 500) => {
@@ -955,7 +973,7 @@ function createPiRemoteOps(options) {
   return {
     paths: options.paths,
     readBuffer,
-    writeFile: writeFile3,
+    writeFile: writeFile4,
     editFile,
     listDirectory,
     findFiles,
@@ -986,20 +1004,6 @@ function createPiRemoteOps(options) {
   };
 }
 
-// src/pi-skills.ts
-import path4 from "path";
-import { writeSkills } from "@ai-sdk/harness/utils";
-async function writePiSkills(args) {
-  return writeSkills({
-    sandbox: args.sandbox,
-    rootDir: path4.posix.join(args.sandboxHomeDir, ".agents", "skills"),
-    skills: args.skills,
-    abortSignal: args.abortSignal,
-    invalidSkillNameMessage: ({ name }) => `Invalid Pi skill name: ${name}`,
-    invalidSkillFilePathMessage: ({ skillName, filePath }) => `Invalid Pi skill file path for ${skillName}: ${filePath}`
-  });
-}
-
 // src/pi-translate.ts
 import { randomBytes } from "crypto";
 import { secureJsonParse } from "@ai-sdk/provider-utils";
@@ -1362,7 +1366,7 @@ function toolSpecToTypeBoxParameters(jsonSchema) {
 // src/pi-workspace-vfs.ts
 import fs from "fs";
 import { syncBuiltinESMExports } from "module";
-import path5 from "path";
+import path4 from "path";
 var mountedRoots = /* @__PURE__ */ new Map();
 var mutableFs = fs;
 var mutableFsPromises = fs.promises;
@@ -1392,11 +1396,11 @@ var originalFsPromises = {
   writeFile: fs.promises.writeFile.bind(fs.promises)
 };
 function isInsidePath2(parent, candidate) {
-  const relative = path5.relative(parent, candidate);
-  return relative === "" || !relative.startsWith("..") && !path5.isAbsolute(relative);
+  const relative = path4.relative(parent, candidate);
+  return relative === "" || !relative.startsWith("..") && !path4.isAbsolute(relative);
 }
 function resolveAbsolutePath(inputPath) {
-  return path5.isAbsolute(inputPath) ? path5.normalize(inputPath) : path5.resolve(inputPath);
+  return path4.isAbsolute(inputPath) ? path4.normalize(inputPath) : path4.resolve(inputPath);
 }
 function findMountedRoot(inputPath) {
   const resolvedPath = resolveAbsolutePath(inputPath);
@@ -1417,26 +1421,26 @@ function mapToBackingPath(inputPath) {
     return null;
   }
   const resolvedPath = resolveAbsolutePath(inputPath);
-  const relativePath = path5.relative(mountedRoot.mountPoint, resolvedPath);
-  return relativePath ? path5.join(mountedRoot.backingRoot, relativePath) : mountedRoot.backingRoot;
+  const relativePath = path4.relative(mountedRoot.mountPoint, resolvedPath);
+  return relativePath ? path4.join(mountedRoot.backingRoot, relativePath) : mountedRoot.backingRoot;
 }
 function mapRealpathResult(inputPath, result) {
   const mountedRoot = findMountedRoot(inputPath);
   if (!mountedRoot) {
     return result;
   }
-  let normalizedBackingRoot = path5.resolve(mountedRoot.backingRoot);
+  let normalizedBackingRoot = path4.resolve(mountedRoot.backingRoot);
   try {
     const realpath = originalFsSyncMethods.realpathSync.native ?? originalFsSyncMethods.realpathSync;
-    normalizedBackingRoot = path5.resolve(realpath(mountedRoot.backingRoot));
+    normalizedBackingRoot = path4.resolve(realpath(mountedRoot.backingRoot));
   } catch {
   }
-  const normalizedResult = path5.resolve(result);
+  const normalizedResult = path4.resolve(result);
   if (!isInsidePath2(normalizedBackingRoot, normalizedResult)) {
     return result;
   }
-  const relativePath = path5.relative(normalizedBackingRoot, normalizedResult);
-  return relativePath ? path5.join(mountedRoot.mountPoint, relativePath) : mountedRoot.mountPoint;
+  const relativePath = path4.relative(normalizedBackingRoot, normalizedResult);
+  return relativePath ? path4.join(mountedRoot.mountPoint, relativePath) : mountedRoot.mountPoint;
 }
 function mapRenamePaths(sourcePath, destinationPath) {
   const sourceRoot = findMountedRoot(sourcePath);
@@ -1631,8 +1635,8 @@ var PiWorkspaceVfs = class {
     if (this.backingRoot === backingRoot && this.mountPoint === mountPoint) {
       return;
     }
-    const resolvedBackingRoot = path5.resolve(backingRoot);
-    const resolvedMountPoint = path5.resolve(mountPoint);
+    const resolvedBackingRoot = path4.resolve(backingRoot);
+    const resolvedMountPoint = path4.resolve(mountPoint);
     if (this.mountPoint) {
       this.disposeMount();
     }
@@ -1661,7 +1665,7 @@ import {
   stat,
   writeFile as writeFile2
 } from "fs/promises";
-import path6 from "path";
+import path5 from "path";
 import { gunzipSync } from "zlib";
 import { shellQuote as shellQuote2 } from "@ai-sdk/harness/utils";
 var PI_CONFIG_DIRS = [".pi", ".agents"];
@@ -1669,9 +1673,9 @@ var PI_CONTEXT_FILENAMES = ["AGENTS.md", "AGENTS.MD"];
 var ARCHIVE_BATCH_SIZE = 300;
 var TAR_BLOCK_SIZE = 512;
 function normalizeRelativePath(inputPath) {
-  const normalized = inputPath.split(path6.posix.sep).join(path6.sep);
-  const relative = path6.normalize(normalized);
-  if (relative === "" || relative === "." || path6.isAbsolute(relative) || relative === ".." || relative.startsWith(`..${path6.sep}`)) {
+  const normalized = inputPath.split(path5.posix.sep).join(path5.sep);
+  const relative = path5.normalize(normalized);
+  if (relative === "" || relative === "." || path5.isAbsolute(relative) || relative === ".." || relative.startsWith(`..${path5.sep}`)) {
     throw new Error(
       `Sandbox workspace mirror received an invalid relative path: ${inputPath}`
     );
@@ -1694,7 +1698,7 @@ async function listRemoteWorkspaceEntries(sandbox, sandboxWorkDir) {
   ];
   const listCommand = [
     `pi_config_sources=(${scopedPaths.map(
-      (scopedPath) => shellQuote2(path6.posix.join(sandboxWorkDir, scopedPath.slice(2)))
+      (scopedPath) => shellQuote2(path5.posix.join(sandboxWorkDir, scopedPath.slice(2)))
     ).join(" ")})`,
     `pi_config_relatives=(${scopedPaths.map((scopedPath) => shellQuote2(scopedPath.slice(2))).join(" ")})`,
     `pi_config_ancestors=(${scopedPaths.map(() => "''").join(" ")})`,
@@ -1887,8 +1891,8 @@ async function collectHostSubtree(rootDir, currentDir, directories, files) {
   const entries = await readdir(currentDir, { withFileTypes: true });
   for (const entry of entries) {
     if (entry.isSymbolicLink()) continue;
-    const absolutePath = path6.join(currentDir, entry.name);
-    const relativePath = path6.relative(rootDir, absolutePath);
+    const absolutePath = path5.join(currentDir, entry.name);
+    const relativePath = path5.relative(rootDir, absolutePath);
     if (entry.isDirectory()) {
       directories.push(relativePath);
       await collectHostSubtree(rootDir, absolutePath, directories, files);
@@ -1901,14 +1905,14 @@ async function collectHostScopedEntries(rootDir) {
   const directories = [];
   const files = [];
   for (const dir of PI_CONFIG_DIRS) {
-    const configDir = path6.join(rootDir, dir);
+    const configDir = path5.join(rootDir, dir);
     if (await pathKind(configDir) === "directory") {
       directories.push(dir);
       await collectHostSubtree(rootDir, configDir, directories, files);
     }
   }
   for (const name of PI_CONTEXT_FILENAMES) {
-    if (await pathKind(path6.join(rootDir, name)) === "file") {
+    if (await pathKind(path5.join(rootDir, name)) === "file") {
       files.push(name);
     }
   }
@@ -1920,10 +1924,10 @@ function buildRequiredDirectories(remoteDirectories, remoteFiles) {
     directories.add(normalizeRelativePath(directory));
   }
   for (const file of remoteFiles) {
-    let current = path6.dirname(normalizeRelativePath(file.relativePath));
-    while (current !== "." && current !== path6.sep && current.length > 0) {
+    let current = path5.dirname(normalizeRelativePath(file.relativePath));
+    while (current !== "." && current !== path5.sep && current.length > 0) {
       directories.add(current);
-      current = path6.dirname(current);
+      current = path5.dirname(current);
     }
   }
   return directories;
@@ -1944,12 +1948,12 @@ async function syncHostWorkspaceFromSandbox(args) {
   );
   for (const relativePath of hostEntries.files) {
     if (!remoteFiles.has(relativePath)) {
-      await rm(path6.join(hostWorkDir, relativePath), { force: true });
+      await rm(path5.join(hostWorkDir, relativePath), { force: true });
     }
   }
   const removableDirectories = [...hostEntries.directories].filter((p) => !requiredDirectories.has(p)).sort((a, b) => b.length - a.length);
   for (const relativePath of removableDirectories) {
-    await rm(path6.join(hostWorkDir, relativePath), {
+    await rm(path5.join(hostWorkDir, relativePath), {
       recursive: true,
       force: true
     });
@@ -1957,7 +1961,7 @@ async function syncHostWorkspaceFromSandbox(args) {
   for (const relativePath of [...requiredDirectories].sort(
     (a, b) => a.length - b.length
   )) {
-    await mkdir2(path6.join(hostWorkDir, relativePath), { recursive: true });
+    await mkdir2(path5.join(hostWorkDir, relativePath), { recursive: true });
   }
   for (let offset = 0; offset < remoteEntries.files.length; offset += ARCHIVE_BATCH_SIZE) {
     const batch = remoteEntries.files.slice(
@@ -1979,7 +1983,7 @@ async function syncHostWorkspaceFromSandbox(args) {
         }
         content = Buffer.from(bytes);
       }
-      const hostPath = path6.join(hostWorkDir, relativePath);
+      const hostPath = path5.join(hostWorkDir, relativePath);
       let shouldWrite = true;
       try {
         const existing = await readFile2(hostPath);
@@ -1988,7 +1992,7 @@ async function syncHostWorkspaceFromSandbox(args) {
         shouldWrite = true;
       }
       if (shouldWrite) {
-        await mkdir2(path6.dirname(hostPath), { recursive: true });
+        await mkdir2(path5.dirname(hostPath), { recursive: true });
         await writeFile2(hostPath, content);
       }
     }
@@ -2000,8 +2004,8 @@ var HARNESS_ID2 = "pi";
 var PI_MCP_ADAPTER_PACKAGE = "pi-mcp-adapter";
 var parkedPiSessions = /* @__PURE__ */ new Map();
 function isWithinDirectory(parent, child) {
-  const rel = path7.relative(parent, child);
-  return rel === "" || !rel.startsWith("..") && !path7.isAbsolute(rel);
+  const rel = path6.relative(parent, child);
+  return rel === "" || !rel.startsWith("..") && !path6.isAbsolute(rel);
 }
 function isWithinWorkspace(candidate, sessionWorkDir, hostWorkDir) {
   return isWithinDirectory(sessionWorkDir, candidate) || isWithinDirectory(hostWorkDir, candidate);
@@ -2012,8 +2016,8 @@ function createHarnessPiSkills({
 }) {
   return skills.map((skill) => {
     const name = safePiMetadataSegment(skill.name, "skill");
-    const baseDir = path7.posix.join(sandboxSkillRootDir, name);
-    const filePath = path7.posix.join(baseDir, "SKILL.md");
+    const baseDir = path6.posix.join(sandboxSkillRootDir, name);
+    const filePath = path6.posix.join(baseDir, "SKILL.md");
     return {
       name: skill.name,
       description: skill.description,
@@ -2071,6 +2075,26 @@ function resolveActivePiBuiltinNames(toolFiltering) {
     (native) => !toolFiltering.toolNames.includes(NATIVE_TO_COMMON[native] ?? native)
   );
 }
+async function isWorkspaceAvailableOnHost({
+  sandbox,
+  sessionWorkDir
+}) {
+  const probePath = path6.join(
+    sessionWorkDir,
+    `.ai-sdk-harness-pi-${randomUUID()}`
+  );
+  const probeContent = randomUUID();
+  try {
+    await writeFile3(probePath, probeContent, { flag: "wx" });
+    const sandboxContent = await sandbox.readBinaryFile({ path: probePath });
+    return sandboxContent != null && Buffer.from(sandboxContent).equals(Buffer.from(probeContent));
+  } catch {
+    return false;
+  } finally {
+    await rm2(probePath, { force: true }).catch(() => {
+    });
+  }
+}
 async function createPiSession(input) {
   if (input.isResume) {
     const parkedSession = parkedPiSessions.get(input.sessionId);
@@ -2083,17 +2107,21 @@ async function createPiSession(input) {
     }
   }
   const safeSessionId = input.sessionId.replace(/[\\/: ]/g, "-");
-  const hostRoot = path7.join(tmpdir(), "ai-sdk-harness", "pi", safeSessionId);
-  const hostWorkDir = path7.join(hostRoot, "workspace");
-  const hostAgentDir = path7.join(hostRoot, "agent");
-  const hostSessionDir = path7.join(hostRoot, "sessions");
+  const hostRoot = path6.join(tmpdir(), "ai-sdk-harness", "pi", safeSessionId);
+  const hostAgentDir = path6.join(hostRoot, "agent");
+  const hostSessionDir = path6.join(hostRoot, "sessions");
+  const toolSafeSandboxSession = getRestrictedSandboxSession(
+    input.sandboxSession
+  );
   const sessionWorkDir = input.sessionWorkDir;
+  const workspaceAvailableOnHost = await isWorkspaceAvailableOnHost({
+    sandbox: toolSafeSandboxSession,
+    sessionWorkDir
+  });
+  const hostWorkDir = workspaceAvailableOnHost ? path6.resolve(sessionWorkDir) : path6.join(hostRoot, "workspace");
   await mkdir3(hostWorkDir, { recursive: true });
   await mkdir3(hostAgentDir, { recursive: true });
   await mkdir3(hostSessionDir, { recursive: true });
-  const toolSafeSandboxSession = getRestrictedSandboxSession(
-    input.sandboxSession
-  );
   const sandboxHomeDir = await resolveSandboxHomeDir({
     sandbox: toolSafeSandboxSession,
     ...input.abortSignal ? { abortSignal: input.abortSignal } : {}
@@ -2104,7 +2132,7 @@ async function createPiSession(input) {
     sessionId: input.sessionId
   });
   const permissionMode = input.permissionMode ?? "allow-all";
-  const sandboxSkillRootDir = path7.posix.join(
+  const sandboxSkillRootDir = path6.posix.join(
     sandboxHomeDir,
     ".agents",
     "skills"
@@ -2123,13 +2151,17 @@ async function createPiSession(input) {
       ...input.abortSignal ? { abortSignal: input.abortSignal } : {}
     });
   }
-  await syncHostWorkspaceFromSandbox({
-    sandbox: toolSafeSandboxSession,
-    sandboxWorkDir: input.sessionWorkDir,
-    hostWorkDir
-  });
+  if (!workspaceAvailableOnHost) {
+    await syncHostWorkspaceFromSandbox({
+      sandbox: toolSafeSandboxSession,
+      sandboxWorkDir: input.sessionWorkDir,
+      hostWorkDir
+    });
+  }
   const workspaceVfs = new PiWorkspaceVfs();
-  workspaceVfs.mount(hostWorkDir, sessionWorkDir);
+  if (!workspaceAvailableOnHost) {
+    workspaceVfs.mount(hostWorkDir, sessionWorkDir);
+  }
   const paths = createPiPathMapper({
     hostWorkDir,
     sandboxWorkDir: sessionWorkDir,
@@ -2138,8 +2170,8 @@ async function createPiSession(input) {
   const agentDir = input.agentDir ?? hostAgentDir;
   const modelRuntime = await createPiModelRuntime({
     auth: input.settings.auth,
-    authPath: path7.join(agentDir, "auth.json"),
-    modelsPath: path7.join(agentDir, "models.json")
+    authPath: path6.join(agentDir, "auth.json"),
+    modelsPath: path6.join(agentDir, "models.json")
   });
   const modelRegistry = new ModelRegistry(modelRuntime);
   const settingsManager = input.agentDir != null ? SettingsManager.create(hostWorkDir, agentDir) : SettingsManager.inMemory();
@@ -2154,7 +2186,8 @@ async function createPiSession(input) {
       modelRegistry,
       modelRuntime
     },
-    clientApp: input.clientApp
+    clientApp: input.clientApp,
+    headers: input.settings.headers
   });
   const resolveModel = createPiModelResolver({
     modelRegistry,
@@ -2363,7 +2396,7 @@ async function createPiSession(input) {
     deliveredDanglingResults.clear();
     if (!sessionFileName) {
       sessionFileName = safePiSessionFileName(
-        path7.basename(resumeSessionFilePath)
+        path6.basename(resumeSessionFilePath)
       );
     }
     return true;
@@ -2563,7 +2596,7 @@ async function createPiSession(input) {
       settingsManager,
       resourceLoader,
       customTools,
-      ...hasMcpServers ? { noTools: "builtin" } : { tools: toolNames },
+      ...hasExtensionFactories ? { noTools: "builtin" } : { tools: toolNames },
       ...input.settings.thinkingLevel ? { thinkingLevel: input.settings.thinkingLevel } : {},
       ...activeResolvedModel ? { model: activeResolvedModel } : {}
     });
@@ -2573,7 +2606,7 @@ async function createPiSession(input) {
     }
     const candidatePath = sessionManager.getSessionFile();
     if (candidatePath) {
-      sessionFileName = safePiSessionFileName(path7.basename(candidatePath));
+      sessionFileName = safePiSessionFileName(path6.basename(candidatePath));
     }
     translatorState = createPiTranslatorState({
       builtinToolNames: builtinNames,
@@ -2598,11 +2631,14 @@ async function createPiSession(input) {
     if (stopped) {
       throw new Error("Pi session has been stopped.");
     }
-    const skillWriteResult = await writePiSkills({
+    const skillWriteResult = await writeSkills({
       sandbox: toolSafeSandboxSession,
-      sandboxHomeDir,
+      homePath: sandboxHomeDir,
+      skillsDir: ".agents/skills",
       skills: turnOpts.skills,
-      abortSignal: turnOpts.abortSignal
+      abortSignal: turnOpts.abortSignal,
+      invalidSkillNameMessage: ({ name }) => `Invalid Pi skill name: ${name}`,
+      invalidSkillFilePathMessage: ({ skillName, filePath }) => `Invalid Pi skill file path for ${skillName}: ${filePath}`
     });
     harnessSkills = createHarnessPiSkills({
       skills: turnOpts.skills,
@@ -2649,11 +2685,13 @@ async function createPiSession(input) {
           await reloadResourcesOnly();
           turnAbortController.signal.throwIfAborted();
         }
-        await syncHostWorkspaceFromSandbox({
-          sandbox: toolSafeSandboxSession,
-          sandboxWorkDir: input.sessionWorkDir,
-          hostWorkDir
-        });
+        if (!workspaceAvailableOnHost) {
+          await syncHostWorkspaceFromSandbox({
+            sandbox: toolSafeSandboxSession,
+            sandboxWorkDir: input.sessionWorkDir,
+            hostWorkDir
+          });
+        }
         turnAbortController.signal.throwIfAborted();
         translatorState = createPiTranslatorState({
           builtinToolNames: [...PI_NATIVE_BUILTIN_NAMES],
@@ -3272,7 +3310,8 @@ function createPi(settings = {}) {
           ...settings.model == null ? {} : { model: settings.model },
           ...settings.thinkingLevel ? { thinkingLevel: settings.thinkingLevel } : {},
           ...settings.mcpServers ? { mcpServers: settings.mcpServers } : {},
-          ...settings.extensionFactories ? { extensionFactories: settings.extensionFactories } : {}
+          ...settings.extensionFactories ? { extensionFactories: settings.extensionFactories } : {},
+          ...startOpts.headers ? { headers: startOpts.headers } : {}
         },
         clientApp: PI_CLIENT_APP,
         isResume: lifecycleState != null,