pi-extended-teams 2.5.1 → 2.5.2

package/extensions/agents/read-agent.ts

@@ -1,4 +1,4 @@
-import type { AgentSession } from "@mariozechner/pi-coding-agent";
+import type { AgentSession, ExtensionFactory } from "@mariozechner/pi-coding-agent";
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
@@ -36,6 +36,7 @@ import {
   type SpawnResourcePlan,
 } from "../resources/spawn-resource-plan";
 import { loadPiRuntimeApi } from "../internal/pi-runtime-api";
+import { createNativeExtensionFactories, isNativeExtensionPath } from "../resources/native-extensions";
 import { preparePrivateAgentSessionDirectory } from "../internal/agent-session-files";
 import { isEligibleNestedReadParent, NESTED_DELEGATION_TOOL_NAMES } from "../runtime/nested-read-agents";
 import { CHILD_AGENT_LIFECYCLE_PROBE, type NestedReadAgentToolBinding } from "../tools/team-tools";
@@ -1019,6 +1020,7 @@ export async function runReadAgentInProcess(
       }, 5000);
     }
 
+    const piRuntimeApi = await loadPiRuntimeApi();
     const {
       createAgentSession,
       createEventBus,
@@ -1026,7 +1028,7 @@ export async function runReadAgentInProcess(
       getAgentDir,
       SessionManager,
       SettingsManager,
-    } = await loadPiRuntimeApi();
+    } = piRuntimeApi;
     const agentDir = getAgentDir();
     const projectTrusted = parentProjectTrustForSpawn(ctx, member.cwd);
     const resourcePlan = await (options.createResourcePlan ?? createSpawnResourcePlan)({
@@ -1054,6 +1056,11 @@ export async function runReadAgentInProcess(
       : [];
     const nestedReadDelegationEnabled = nestedReadAgentTools.length > 0;
     const childEventBus = createEventBus();
+    const nativeExtensions = createNativeExtensionFactories(piRuntimeApi, resourcePlan.extensionPaths);
+    const extensionFactories = [
+      (pi: Parameters<ExtensionFactory>[0]) => registerSpawnedAgentCommunicationGuard(pi, () => submittedFinalReport !== undefined),
+      ...nativeExtensions,
+    ];
     const loader = new DefaultResourceLoader({
       eventBus: childEventBus,
       cwd: member.cwd,
@@ -1061,7 +1068,8 @@ export async function runReadAgentInProcess(
       settingsManager: childSettingsManager,
       noExtensions: true,
       additionalExtensionPaths: [...resourcePlan.extensionPaths],
-      extensionFactories: [registerSpawnedAgentCommunicationGuard],
+      // Named builtin descriptors exist only on capable hosts; legacy SDK types accept functions only.
+      extensionFactories: extensionFactories as ExtensionFactory[],
       noSkills: false,
       appendSystemPrompt: [
         `You are ${roleLabel} agent '${member.name}' in Pi session '${readTeamName}', running in-process so the lead can follow and control you from Pi.`,
@@ -1143,9 +1151,14 @@ export async function runReadAgentInProcess(
     const communicationToolNames = communicationTools.map(tool => tool.name);
     const communicationToolNameSet = new Set(communicationToolNames);
     const delegationToolNameSet = new Set<string>(NESTED_DELEGATION_TOOL_NAMES);
-    const extensionToolNames = loader.getExtensions().extensions.flatMap(extension => {
+    const loadedExtensions = loader.getExtensions().extensions;
+    const nativeToolNames = new Set(loadedExtensions
+      .filter(extension => isNativeExtensionPath(extension.path))
+      .flatMap(extension => Array.from(extension.tools.keys())));
+    const extensionToolNames = loadedExtensions.flatMap(extension => {
       return Array.from(extension.tools.keys()).filter(name =>
-        !communicationToolNameSet.has(name) && !delegationToolNameSet.has(name) && !USER_INTERACTION_TOOLS.includes(name)
+        !communicationToolNameSet.has(name) && !delegationToolNameSet.has(name)
+        && !USER_INTERACTION_TOOLS.includes(name) && !nativeToolNames.has(name)
       );
     });
     const nestedReadAgentToolNames = nestedReadAgentTools.map(tool => tool.name);
@@ -1186,8 +1199,12 @@ export async function runReadAgentInProcess(
       // sessions retain custom providers and runtime-scoped credentials.
       modelRuntime: parentModelRuntime,
       modelRegistry: ctx.modelRegistry,
-      tools: activeToolNames,
-      excludeTools: USER_INTERACTION_TOOLS,
+      // An SDK allowlist would hide MCP tools registered later during session_start.
+      ...(nativeExtensions.length ? {} : { tools: activeToolNames }),
+      excludeTools: [
+        ...USER_INTERACTION_TOOLS,
+        ...(nativeExtensions.length ? NESTED_DELEGATION_TOOL_NAMES.filter(name => !nestedReadAgentToolNames.includes(name)) : []),
+      ],
       customTools: [...communicationTools, ...nestedReadAgentTools],
       resourceLoader: loader,
       settingsManager: childSettingsManager,
@@ -1195,9 +1212,21 @@ export async function runReadAgentInProcess(
     } as Parameters<typeof createAgentSession>[0] & { modelRuntime?: unknown });
 
     state.session = session;
-    // Current hosts capture this public hook when a prompt starts; legacy hosts
-    // retain their existing loop behavior. Never abort from the reporting tool.
-    if (session.agent && "shouldStopAfterTurn" in session.agent) {
+    if (nativeExtensions.length) {
+      const activeNativeTools = session.getActiveToolNames().filter(name => nativeToolNames.has(name));
+      session.setActiveToolsByName([...activeToolNames, ...activeNativeTools]);
+    }
+    // Hosts capture these public hooks when a prompt starts. Never abort from the reporting tool.
+    if (session.agent && "finishTurn" in session.agent) {
+      const agent = session.agent as typeof session.agent & {
+        finishTurn?: (...args: unknown[]) => unknown;
+      };
+      const previous = agent.finishTurn;
+      agent.finishTurn = async (...args) => {
+        const decision = await previous?.(...args);
+        return submittedFinalReport !== undefined ? { action: "end" } : decision;
+      };
+    } else if (session.agent && "shouldStopAfterTurn" in session.agent) {
       const agent = session.agent as typeof session.agent & {
         shouldStopAfterTurn?: (...args: unknown[]) => boolean | Promise<boolean>;
       };

package/extensions/internal/pi-command.ts

@@ -1,6 +1,7 @@
 import { spawnSync } from "node:child_process";
 import * as nodeFs from "node:fs";
 import * as path from "node:path";
+import { isNativeExtensionPath } from "../resources/native-extensions";
 
 /**
  * Build the command used to relaunch pi for teammate processes.
@@ -40,6 +41,7 @@ export function shellQuote(value: string): string {
 }
 
 function extensionPathIdentity(source: string): string {
+  if (isNativeExtensionPath(source)) return source;
   const absolute = path.resolve(source);
   try {
     return nodeFs.realpathSync(absolute);

package/extensions/resources/native-extensions.ts

@@ -0,0 +1,36 @@
+import type { ExtensionFactory } from "@mariozechner/pi-coding-agent";
+
+const NATIVE_FACTORIES = {
+  "builtin:mcp": "createMcpExtension",
+  "builtin:codemode": "createCodemodeExtension",
+  "builtin:tool-search": "createToolSearchExtension",
+} as const;
+
+type NativeExtensionPath = keyof typeof NATIVE_FACTORIES;
+
+export function isNativeExtensionPath(value: string): value is NativeExtensionPath {
+  return Object.hasOwn(NATIVE_FACTORIES, value);
+}
+
+export interface NativeExtensionFactory {
+  name: string;
+  factory: ExtensionFactory;
+  builtin: true;
+  replaceable: true;
+}
+
+/** Only selected builtins are instantiated, using exports from the running host. */
+export function createNativeExtensionFactories(api: object, paths: readonly string[]): NativeExtensionFactory[] {
+  return paths.filter(isNativeExtensionPath).map(identity => {
+    const createFactory: unknown = Reflect.get(api, NATIVE_FACTORIES[identity]);
+    if (typeof createFactory !== "function") {
+      throw new Error(`Selected extension ${identity} is not supported by this Pi host.`);
+    }
+    return {
+      name: identity.slice("builtin:".length),
+      factory: createFactory(),
+      builtin: true,
+      replaceable: true,
+    };
+  });
+}

package/extensions/resources/spawn-resource-plan.ts

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { loadSettings, type PiExtendedTeamsSettings } from "../../src/utils/settings";
+import { isNativeExtensionPath } from "./native-extensions";
 
 const SELF_COMMAND_NAME = "agents-extensions";
 export const EXTENSIONS_COMMAND_DESCRIPTION = "Select which observable loaded Pi extensions spawned agents receive.";
@@ -19,7 +20,7 @@ export interface ExtensionSourceInfo {
 export interface LeadExtensionSnapshot {
   /** Stable, human-readable selector when unique in the current lead snapshot. */
   name: string;
-  /** Canonical filesystem identity used for deterministic deduplication. */
+  /** Canonical filesystem path or native builtin identity used for deduplication. */
   identity: string;
   /** Pi's registered extension entrypoint path, passed to the child unchanged. */
   path: string;
@@ -81,6 +82,7 @@ export interface CreateSpawnResourcePlanOptions {
 }
 
 function canonicalPath(filePath: string): string {
+  if (isNativeExtensionPath(filePath)) return filePath;
   const absolute = path.resolve(filePath);
   try {
     return fs.realpathSync(absolute);
@@ -104,7 +106,8 @@ function usableSourceInfo(sourceInfo: ExtensionSourceInfo | undefined): sourceIn
   return !!sourceInfo
     && typeof sourceInfo.path === "string"
     && sourceInfo.path.length > 0
-    && !sourceInfo.path.startsWith("<");
+    && !sourceInfo.path.startsWith("<")
+    && (!sourceInfo.path.startsWith("builtin:") || isNativeExtensionPath(sourceInfo.path));
 }
 
 /**
@@ -130,7 +133,8 @@ export function snapshotLeadExtensions(pi: LeadRegistrationApi): readonly LeadEx
       .filter((command) => command.source === "extension")
       .map((command) => command.sourceInfo),
     ...tools
-      .filter((tool) => !GENERIC_TOOL_SOURCES.has(tool.sourceInfo?.source ?? ""))
+      .filter((tool) => !GENERIC_TOOL_SOURCES.has(tool.sourceInfo?.source ?? "")
+        || isNativeExtensionPath(tool.sourceInfo?.path ?? ""))
       .map((tool) => tool.sourceInfo),
   ].filter(usableSourceInfo);
 

package/extensions/tools/spawned-agent-policy.ts

@@ -13,8 +13,14 @@ export function requireLeadRecipient(recipient: string): void {
   }
 }
 
-export function registerSpawnedAgentCommunicationGuard(pi: Pick<ExtensionAPI, "on">): void {
+export function registerSpawnedAgentCommunicationGuard(
+  pi: Pick<ExtensionAPI, "on">,
+  reportAccepted: () => boolean = () => false,
+): void {
   pi.on("tool_call", event => {
+    if (reportAccepted()) {
+      return { block: true, reason: "This agent's final report has been accepted. No further tool calls are allowed." };
+    }
     if (USER_INTERACTION_TOOLS.includes(event.toolName)) {
       return { block: true, reason: "Spawned agents cannot contact the user. Send your question to team-lead using send_message." };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-extended-teams",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Control-first, session-connected subagents for Pi with live navigation and intent-tier routing",
   "repository": {
     "type": "git",