@ai-sdk/harness-pi 1.0.11 → 1.0.12

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @ai-sdk/harness-pi
 
+## 1.0.12
+
+### Patch Changes
+
+- 7859cea: feat(harness): add tool filtering via `activeTools` and `inactiveTools`
+- c857346: feat(harness): add utility functions for certain duplicated layers in harnesses
+- Updated dependencies [7859cea]
+- Updated dependencies [c857346]
+  - @ai-sdk/harness@1.0.12
+
 ## 1.0.11
 
 ### Patch Changes

package/dist/index.js

@@ -8,70 +8,8 @@ import { z as z3 } from "zod/v4";
 // src/pi-resume-state.ts
 import { readFile, writeFile, mkdir } from "fs/promises";
 import path from "path";
+import { shellQuote } from "@ai-sdk/harness/utils";
 import { z } from "zod/v4";
-
-// src/pi-utils.ts
-import {
-  HarnessCapabilityUnsupportedError
-} from "@ai-sdk/harness";
-var HARNESS_ID = "pi";
-function extractUserText(prompt) {
-  if (typeof prompt === "string") {
-    return prompt;
-  }
-  const { content } = prompt;
-  if (typeof content === "string") {
-    return content;
-  }
-  const parts = [];
-  for (const part of content) {
-    if (part.type !== "text") {
-      throw new HarnessCapabilityUnsupportedError({
-        message: `pi: only text user-message parts are supported; got '${part.type}'.`,
-        harnessId: HARNESS_ID
-      });
-    }
-    parts.push(part.text);
-  }
-  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 shellQuote(value) {
-  return `'${value.replace(/'/g, `'\\''`)}'`;
-}
-function serializeToolOutput(output) {
-  if (typeof output === "string") {
-    return output;
-  }
-  const serialized = JSON.stringify(output);
-  return serialized ?? "null";
-}
-function safePiMetadataSegment(name, label) {
-  if (!/^[A-Za-z0-9._-]+$/.test(name) || name === "." || name === "..") {
-    throw new Error(`Invalid Pi ${label} name: ${name}`);
-  }
-  return name;
-}
-function renderPiSkillFile(skill) {
-  return `---
-name: ${skill.name}
-description: ${skill.description}
----
-
-${skill.content}`;
-}
-
-// src/pi-resume-state.ts
 var PI_SESSION_FILE_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*\.jsonl?$/;
 function safePiSessionFileName(sessionFileName) {
   if (!PI_SESSION_FILE_NAME_PATTERN.test(sessionFileName)) {
@@ -164,6 +102,7 @@ import { mkdir as mkdir3, rm as rm2 } from "fs/promises";
 import { tmpdir } from "os";
 import path7 from "path";
 import { Type as Type2 } from "typebox";
+import { resolveSandboxHomeDir } from "@ai-sdk/harness/utils";
 
 // src/pi-auth.ts
 import { getAiGatewayAuthFromEnv } from "@ai-sdk/harness/utils";
@@ -460,6 +399,7 @@ function createPiPathMapper(options) {
 
 // src/pi-remote-ops.ts
 import path3 from "path";
+import { shellQuote as shellQuote2 } from "@ai-sdk/harness/utils";
 function createPiRemoteOps(options) {
   const runShell = async (command, input = {}) => {
     const result = await options.sandbox.run({
@@ -490,7 +430,7 @@ function createPiRemoteOps(options) {
   const writeFile3 = async (inputPath, content) => {
     const remotePath = options.paths.toSandboxPath(inputPath);
     const previous = await options.sandbox.readBinaryFile({ path: remotePath });
-    await runShell(`mkdir -p ${shellQuote(path3.posix.dirname(remotePath))}`);
+    await runShell(`mkdir -p ${shellQuote2(path3.posix.dirname(remotePath))}`);
     await options.sandbox.writeTextFile({ path: remotePath, content });
     options.onFileChange?.(
       previous ? "modify" : "create",
@@ -514,9 +454,9 @@ function createPiRemoteOps(options) {
     const remotePath = options.paths.toReadableSandboxPath(inputPath);
     const result = await runShell(
       [
-        `if [ ! -e ${shellQuote(remotePath)} ]; then echo "__PI_LS_NOT_FOUND__"; exit 2; fi`,
-        `if [ ! -d ${shellQuote(remotePath)} ]; then echo "__PI_LS_NOT_DIR__"; exit 3; fi`,
-        `cd ${shellQuote(remotePath)}`,
+        `if [ ! -e ${shellQuote2(remotePath)} ]; then echo "__PI_LS_NOT_FOUND__"; exit 2; fi`,
+        `if [ ! -d ${shellQuote2(remotePath)} ]; then echo "__PI_LS_NOT_DIR__"; exit 3; fi`,
+        `cd ${shellQuote2(remotePath)}`,
         "ls -1Ap"
       ].join("; ")
     );
@@ -535,8 +475,8 @@ function createPiRemoteOps(options) {
     const remotePath = options.paths.toReadableSandboxPath(inputPath);
     const result = await runShell(
       [
-        `if [ ! -e ${shellQuote(remotePath)} ]; then echo "__PI_FIND_NOT_FOUND__"; exit 2; fi`,
-        `if [ -d ${shellQuote(remotePath)} ]; then find ${shellQuote(remotePath)} -type f -print; else printf '%s\\n' ${shellQuote(remotePath)}; fi`
+        `if [ ! -e ${shellQuote2(remotePath)} ]; then echo "__PI_FIND_NOT_FOUND__"; exit 2; fi`,
+        `if [ -d ${shellQuote2(remotePath)} ]; then find ${shellQuote2(remotePath)} -type f -print; else printf '%s\\n' ${shellQuote2(remotePath)}; fi`
       ].join("; ")
     );
     const output = result.output.toString("utf8").trim();
@@ -571,9 +511,9 @@ function createPiRemoteOps(options) {
     const limit = Math.max(1, input.limit ?? 100);
     const result = await runShell(
       [
-        `if [ ! -e ${shellQuote(remotePath)} ]; then echo "__PI_GREP_NOT_FOUND__"; exit 2; fi`,
-        `cd ${shellQuote(options.paths.sandboxWorkDir)}`,
-        `grep ${flags.map(shellQuote).join(" ")} -- ${shellQuote(pattern)} ${shellQuote(targetPath)} 2>/dev/null | head -n ${limit}`
+        `if [ ! -e ${shellQuote2(remotePath)} ]; then echo "__PI_GREP_NOT_FOUND__"; exit 2; fi`,
+        `cd ${shellQuote2(options.paths.sandboxWorkDir)}`,
+        `grep ${flags.map(shellQuote2).join(" ")} -- ${shellQuote2(pattern)} ${shellQuote2(targetPath)} 2>/dev/null | head -n ${limit}`
       ].join("; ")
     );
     const output = result.output.toString("utf8").trim();
@@ -618,53 +558,72 @@ function createPiRemoteOps(options) {
 
 // src/pi-skills.ts
 import path4 from "path";
+import { writeSkills } from "@ai-sdk/harness/utils";
 async function writePiSkills(args) {
-  for (const skill of args.skills) {
-    safePiMetadataSegment(skill.name, "skill");
-    for (const file of skill.files ?? []) {
-      safePiSkillFilePath({ skillName: skill.name, filePath: file.path });
-    }
+  await 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";
+
+// src/pi-utils.ts
+import {
+  HarnessCapabilityUnsupportedError
+} from "@ai-sdk/harness";
+var HARNESS_ID = "pi";
+function extractUserText(prompt) {
+  if (typeof prompt === "string") {
+    return prompt;
   }
-  for (const skill of args.skills) {
-    const name = safePiMetadataSegment(skill.name, "skill");
-    const sandboxSkillDir = path4.posix.join(
-      args.sandboxHomeDir,
-      ".agents",
-      "skills",
-      name
-    );
-    const content = renderPiSkillFile(skill);
-    await args.sandbox.writeTextFile({
-      path: path4.posix.join(sandboxSkillDir, "SKILL.md"),
-      content,
-      ...args.abortSignal ? { abortSignal: args.abortSignal } : {}
-    });
-    for (const file of skill.files ?? []) {
-      const filePath = safePiSkillFilePath({
-        skillName: skill.name,
-        filePath: file.path
-      });
-      await args.sandbox.writeTextFile({
-        path: path4.posix.join(sandboxSkillDir, filePath),
-        content: file.content,
-        ...args.abortSignal ? { abortSignal: args.abortSignal } : {}
+  const { content } = prompt;
+  if (typeof content === "string") {
+    return content;
+  }
+  const parts = [];
+  for (const part of content) {
+    if (part.type !== "text") {
+      throw new HarnessCapabilityUnsupportedError({
+        message: `pi: only text user-message parts are supported; got '${part.type}'.`,
+        harnessId: HARNESS_ID
       });
     }
+    parts.push(part.text);
   }
+  return parts.join("\n\n");
 }
-function safePiSkillFilePath({
-  skillName,
-  filePath
-}) {
-  const normalized = path4.posix.normalize(filePath);
-  if (normalized === "." || normalized.startsWith("../") || path4.posix.isAbsolute(normalized)) {
-    throw new Error(`Invalid Pi skill file path for ${skillName}: ${filePath}`);
+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;
   }
-  return normalized;
+  const serialized = JSON.stringify(output);
+  return serialized ?? "null";
+}
+function safePiMetadataSegment(name, label) {
+  if (!/^[A-Za-z0-9._-]+$/.test(name) || name === "." || name === "..") {
+    throw new Error(`Invalid Pi ${label} name: ${name}`);
+  }
+  return name;
 }
 
 // src/pi-translate.ts
-import { randomBytes } from "crypto";
 function createPiTranslatorState(options = {}) {
   const map = options.nativeToCommon instanceof Map ? options.nativeToCommon : new Map(Object.entries(options.nativeToCommon ?? {}));
   return {
@@ -1158,6 +1117,7 @@ import {
   writeFile as writeFile2
 } from "fs/promises";
 import path6 from "path";
+import { shellQuote as shellQuote3 } from "@ai-sdk/harness/utils";
 var PI_CONFIG_DIRS = [".pi", ".agents"];
 var PI_CONTEXT_FILENAMES = ["AGENTS.md", "AGENTS.MD"];
 function normalizeRelativePath(inputPath) {
@@ -1182,7 +1142,7 @@ async function readCommandOutput(sandbox, command) {
 }
 async function listRemoteWorkspaceEntries(sandbox, sandboxWorkDir) {
   const contextPredicate = PI_CONTEXT_FILENAMES.map(
-    (name) => `-name ${shellQuote(name)}`
+    (name) => `-name ${shellQuote3(name)}`
   ).join(" -o ");
   const configFinds = PI_CONFIG_DIRS.map(
     (dir) => `  if [ -d ./${dir} ]; then find -L ./${dir} \\( -type d -o -type f \\) -print0; fi;`
@@ -1203,7 +1163,7 @@ async function listRemoteWorkspaceEntries(sandbox, sandboxWorkDir) {
   ].join("\n");
   const output = await readCommandOutput(
     sandbox,
-    [`cd ${shellQuote(sandboxWorkDir)}`, listCommand].join(" && ")
+    [`cd ${shellQuote3(sandboxWorkDir)}`, listCommand].join(" && ")
   );
   const directories = [];
   const files = [];
@@ -1361,22 +1321,6 @@ function createHarnessPiSkills({
     };
   });
 }
-async function resolveSandboxHomeDir({
-  sandbox,
-  abortSignal
-}) {
-  const result = await sandbox.run({
-    command: 'printf "%s" "$HOME"',
-    ...abortSignal ? { abortSignal } : {}
-  });
-  const homeDir = result.stdout.trim();
-  if (result.exitCode !== 0 || !homeDir || !path7.posix.isAbsolute(homeDir)) {
-    throw new Error(
-      `Unable to resolve sandbox HOME directory: ${result.stderr || result.stdout}`
-    );
-  }
-  return homeDir;
-}
 var PI_NATIVE_BUILTIN_NAMES = [
   "read",
   "write",
@@ -1389,6 +1333,15 @@ var PI_NATIVE_BUILTIN_NAMES = [
 var NATIVE_TO_COMMON = {
   find: "glob"
 };
+var PUBLIC_TO_NATIVE = {
+  read: "read",
+  write: "write",
+  edit: "edit",
+  bash: "bash",
+  grep: "grep",
+  glob: "find",
+  ls: "ls"
+};
 var PI_NATIVE_TOOL_KINDS = {
   read: "readonly",
   write: "edit",
@@ -1398,6 +1351,17 @@ var PI_NATIVE_TOOL_KINDS = {
   find: "readonly",
   ls: "readonly"
 };
+function resolveActivePiBuiltinNames(toolFiltering) {
+  if (toolFiltering == null) return PI_NATIVE_BUILTIN_NAMES;
+  if (toolFiltering.mode === "allow") {
+    return toolFiltering.toolNames.map((name) => PUBLIC_TO_NATIVE[name]).filter(
+      (name) => name != null
+    );
+  }
+  return PI_NATIVE_BUILTIN_NAMES.filter(
+    (native) => !toolFiltering.toolNames.includes(NATIVE_TO_COMMON[native] ?? native)
+  );
+}
 async function createPiSession(input) {
   if (input.isResume) {
     const parkedSession = parkedPiSessions.get(input.sessionId);
@@ -1606,8 +1570,11 @@ async function createPiSession(input) {
     });
   }
   function buildToolDefinitions(userTools) {
+    const builtinNames = resolveActivePiBuiltinNames(
+      input.builtinToolFiltering
+    );
     const customTools = [
-      ...PI_NATIVE_BUILTIN_NAMES.map(
+      ...builtinNames.map(
         (native) => buildBuiltinToolDefinition({
           native,
           remoteOps,
@@ -1620,7 +1587,7 @@ async function createPiSession(input) {
     ];
     return {
       customTools,
-      builtinNames: [...PI_NATIVE_BUILTIN_NAMES]
+      builtinNames: [...builtinNames]
     };
   }
   async function rebuildPiSession(userTools, isFirstBuild) {
@@ -2215,6 +2182,7 @@ function createPi(settings = {}) {
     harnessId: "pi",
     builtinTools: PI_BUILTIN_TOOLS,
     supportsBuiltinToolApprovals: true,
+    supportsBuiltinToolFiltering: true,
     lifecycleStateSchema: piResumeStateSchema,
     doStart: async (startOpts) => {
       const lifecycleState = startOpts.continueFrom ?? startOpts.resumeFrom;
@@ -2231,6 +2199,7 @@ function createPi(settings = {}) {
         },
         isResume: lifecycleState != null,
         permissionMode: startOpts.permissionMode,
+        builtinToolFiltering: startOpts.builtinToolFiltering,
         ...resumeData?.sessionFileName ? { resumeSessionFileName: resumeData.sessionFileName } : {},
         ...startOpts.abortSignal ? { abortSignal: startOpts.abortSignal } : {}
       });