@ai-sdk/harness-pi 1.0.11 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/harness-pi",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -28,7 +28,7 @@
   "dependencies": {
     "@earendil-works/pi-coding-agent": "^0.79.0",
     "typebox": "^1.1.38",
-    "@ai-sdk/harness": "1.0.11",
+    "@ai-sdk/harness": "1.0.12",
     "@ai-sdk/provider-utils": "5.0.2"
   },
   "peerDependencies": {

package/src/pi-harness.ts

@@ -112,6 +112,7 @@ export function createPi(
     harnessId: 'pi',
     builtinTools: PI_BUILTIN_TOOLS,
     supportsBuiltinToolApprovals: true,
+    supportsBuiltinToolFiltering: true,
     lifecycleStateSchema: piResumeStateSchema,
     doStart: async startOpts => {
       const lifecycleState = startOpts.continueFrom ?? startOpts.resumeFrom;
@@ -133,6 +134,7 @@ export function createPi(
         },
         isResume: lifecycleState != null,
         permissionMode: startOpts.permissionMode,
+        builtinToolFiltering: startOpts.builtinToolFiltering,
         ...(resumeData?.sessionFileName
           ? { resumeSessionFileName: resumeData.sessionFileName }
           : {}),

package/src/pi-remote-ops.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
+import { shellQuote } from '@ai-sdk/harness/utils';
 import type { Experimental_SandboxSession } from '@ai-sdk/provider-utils';
 import type { PiPathMapper } from './pi-paths';
-import { shellQuote } from './pi-utils';
 
 export type PiRemoteFileChangeKind = 'create' | 'modify';
 

package/src/pi-resume-state.ts

@@ -1,8 +1,8 @@
 import { readFile, writeFile, mkdir } from 'node:fs/promises';
 import path from 'node:path';
+import { shellQuote } from '@ai-sdk/harness/utils';
 import type { Experimental_SandboxSession } from '@ai-sdk/provider-utils';
 import { z } from 'zod/v4';
-import { shellQuote } from './pi-utils';
 
 const PI_SESSION_FILE_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*\.jsonl?$/;
 

package/src/pi-session.ts

@@ -15,20 +15,21 @@ import { mkdir, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { Type } from 'typebox';
-import type {
-  HarnessV1ContinueTurnOptions,
-  HarnessV1ContinueTurnState,
-  HarnessV1PromptControl,
-  HarnessV1PromptTurnOptions,
-  HarnessV1NetworkSandboxSession,
-  HarnessV1PermissionMode,
-  HarnessV1ResumeSessionState,
-  HarnessV1Session,
-  HarnessV1Skill,
-  HarnessV1StreamPart,
-  HarnessV1ToolSpec,
+import {
+  type HarnessV1BuiltinToolFiltering,
+  type HarnessV1ContinueTurnOptions,
+  type HarnessV1ContinueTurnState,
+  type HarnessV1PromptControl,
+  type HarnessV1PromptTurnOptions,
+  type HarnessV1NetworkSandboxSession,
+  type HarnessV1PermissionMode,
+  type HarnessV1ResumeSessionState,
+  type HarnessV1Session,
+  type HarnessV1Skill,
+  type HarnessV1StreamPart,
+  type HarnessV1ToolSpec,
 } from '@ai-sdk/harness';
-import type { Experimental_SandboxSession } from '@ai-sdk/provider-utils';
+import { resolveSandboxHomeDir } from '@ai-sdk/harness/utils';
 import { resolvePiEnv, type PiAuthOptions } from './pi-auth';
 import { getPiTerminalError, parseNativeEvent } from './pi-events';
 import { createPiModelResolver } from './pi-model-resolver';
@@ -118,26 +119,6 @@ function createHarnessPiSkills({
   });
 }
 
-async function resolveSandboxHomeDir({
-  sandbox,
-  abortSignal,
-}: {
-  sandbox: Experimental_SandboxSession;
-  abortSignal?: AbortSignal;
-}): Promise<string> {
-  const result = await sandbox.run({
-    command: 'printf "%s" "$HOME"',
-    ...(abortSignal ? { abortSignal } : {}),
-  });
-  const homeDir = result.stdout.trim();
-  if (result.exitCode !== 0 || !homeDir || !path.posix.isAbsolute(homeDir)) {
-    throw new Error(
-      `Unable to resolve sandbox HOME directory: ${result.stderr || result.stdout}`,
-    );
-  }
-  return homeDir;
-}
-
 const PI_NATIVE_BUILTIN_NAMES = [
   'read',
   'write',
@@ -152,6 +133,18 @@ const NATIVE_TO_COMMON: Readonly<Record<string, string>> = {
   find: 'glob',
 };
 
+const PUBLIC_TO_NATIVE: Readonly<
+  Record<string, (typeof PI_NATIVE_BUILTIN_NAMES)[number]>
+> = {
+  read: 'read',
+  write: 'write',
+  edit: 'edit',
+  bash: 'bash',
+  grep: 'grep',
+  glob: 'find',
+  ls: 'ls',
+};
+
 const PI_NATIVE_TOOL_KINDS: Readonly<
   Record<(typeof PI_NATIVE_BUILTIN_NAMES)[number], 'readonly' | 'edit' | 'bash'>
 > = {
@@ -164,6 +157,24 @@ const PI_NATIVE_TOOL_KINDS: Readonly<
   ls: 'readonly',
 };
 
+function resolveActivePiBuiltinNames(
+  toolFiltering: HarnessV1BuiltinToolFiltering | undefined,
+): ReadonlyArray<(typeof PI_NATIVE_BUILTIN_NAMES)[number]> {
+  if (toolFiltering == null) return PI_NATIVE_BUILTIN_NAMES;
+  if (toolFiltering.mode === 'allow') {
+    return toolFiltering.toolNames
+      .map(name => PUBLIC_TO_NATIVE[name])
+      .filter(
+        (name): name is (typeof PI_NATIVE_BUILTIN_NAMES)[number] =>
+          name != null,
+      );
+  }
+  return PI_NATIVE_BUILTIN_NAMES.filter(
+    native =>
+      !toolFiltering.toolNames.includes(NATIVE_TO_COMMON[native] ?? native),
+  );
+}
+
 export type PiThinkingLevel =
   | 'off'
   | 'minimal'
@@ -186,6 +197,7 @@ export interface CreatePiSessionInput {
   readonly settings: PiSessionSettings;
   readonly isResume: boolean;
   readonly permissionMode?: HarnessV1PermissionMode;
+  readonly builtinToolFiltering?: HarnessV1BuiltinToolFiltering;
   readonly resumeSessionFileName?: string;
   readonly abortSignal?: AbortSignal;
 }
@@ -502,8 +514,11 @@ export async function createPiSession(
     customTools: ToolDefinition[];
     builtinNames: string[];
   } {
+    const builtinNames = resolveActivePiBuiltinNames(
+      input.builtinToolFiltering,
+    );
     const customTools: ToolDefinition[] = [
-      ...PI_NATIVE_BUILTIN_NAMES.map(native =>
+      ...builtinNames.map(native =>
         buildBuiltinToolDefinition({
           native,
           remoteOps,
@@ -516,7 +531,7 @@ export async function createPiSession(
     ];
     return {
       customTools,
-      builtinNames: [...PI_NATIVE_BUILTIN_NAMES],
+      builtinNames: [...builtinNames],
     };
   }
 

package/src/pi-skills.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import type { HarnessV1Skill } from '@ai-sdk/harness';
+import { writeSkills } from '@ai-sdk/harness/utils';
 import type { Experimental_SandboxSession } from '@ai-sdk/provider-utils';
-import { renderPiSkillFile, safePiMetadataSegment } from './pi-utils';
 
 /**
  * Materialize Pi skills as files under
@@ -13,57 +13,13 @@ export async function writePiSkills(args: {
   readonly skills: ReadonlyArray<HarnessV1Skill>;
   readonly abortSignal?: AbortSignal;
 }): Promise<void> {
-  for (const skill of args.skills) {
-    safePiMetadataSegment(skill.name, 'skill');
-    for (const file of skill.files ?? []) {
-      safePiSkillFilePath({ skillName: skill.name, filePath: file.path });
-    }
-  }
-
-  for (const skill of args.skills) {
-    const name = safePiMetadataSegment(skill.name, 'skill');
-    const sandboxSkillDir = path.posix.join(
-      args.sandboxHomeDir,
-      '.agents',
-      'skills',
-      name,
-    );
-    const content = renderPiSkillFile(skill);
-
-    await args.sandbox.writeTextFile({
-      path: path.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: path.posix.join(sandboxSkillDir, filePath),
-        content: file.content,
-        ...(args.abortSignal ? { abortSignal: args.abortSignal } : {}),
-      });
-    }
-  }
-}
-
-function safePiSkillFilePath({
-  skillName,
-  filePath,
-}: {
-  skillName: string;
-  filePath: string;
-}): string {
-  const normalized = path.posix.normalize(filePath);
-  if (
-    normalized === '.' ||
-    normalized.startsWith('../') ||
-    path.posix.isAbsolute(normalized)
-  ) {
-    throw new Error(`Invalid Pi skill file path for ${skillName}: ${filePath}`);
-  }
-  return normalized;
+  await writeSkills({
+    sandbox: args.sandbox,
+    rootDir: path.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}`,
+  });
 }

package/src/pi-utils.ts

@@ -54,11 +54,6 @@ export function frameInstructions(
   );
 }
 
-/** POSIX shell single-quote escape. */
-export function shellQuote(value: string): string {
-  return `'${value.replace(/'/g, `'\\''`)}'`;
-}
-
 /** Serialize a tool output to the string Pi feeds back to the model. */
 export function serializeToolOutput(output: unknown): string {
   if (typeof output === 'string') {

package/src/pi-workspace-mirror.ts

@@ -7,8 +7,8 @@ import {
   writeFile,
 } from 'node:fs/promises';
 import path from 'node:path';
+import { shellQuote } from '@ai-sdk/harness/utils';
 import type { Experimental_SandboxSession } from '@ai-sdk/provider-utils';
-import { shellQuote } from './pi-utils';
 
 /*
  * Pi runs on the host with its working directory pointed at the local mirror,