@henryqw/pi-subagent 2.2.0 → 2.3.1

package/CONTEXT.md

@@ -18,7 +18,7 @@ Provide validated user Roles, shared task-model Pi launch policy, generic manage
 ## Invariants
 
 - One Delegated Task creates one ephemeral child process and no saved session.
-- Ambient child extensions and Skills stay disabled; Role explicitly selects extensions and Skills. Omitted Role tools use Pi's effective `defaultTools` for built-ins; an explicit list is strict.
+- Ambient child extensions and Skills stay disabled; Role explicitly selects extension sources and named Skills. Pi loads Skills supplied by those extension packages or their resource discovery. Omitted Role tools use Pi's effective `defaultTools`; an explicit list sets base tools while loaded extension tools activate automatically.
 - Role Skill names resolve through Main's effective Pi Skill registry; unavailable names warn and skip without blocking delegation.
 - Main selects Role and may override Model Class per task; omitted class uses shared `pi-subagent/delegateTask` assignment, initially `balanced`. Library callers select Role plus their own shared task ID.
 - The selected profile resolves primary then fallback only before launch when a route, model, or thinking level is unavailable. If neither route is usable, launch rejects with `Run /task-models`; a started child is never retried by this package.

package/README.md

@@ -25,7 +25,7 @@ pi install npm:@henryqw/pi-subagent
 
 `modelClass` is `fast`, `balanced`, or `frontier`. Omitted class uses the shared `pi-subagent/delegateTask` assignment, which defaults to `balanced`. Primary route is resolved against current scoped text models; fallback is tried only before launch. If no route is usable, delegation rejects with `Run /task-models`. A started child is never retried.
 
-Each call starts one isolated child (`pi --mode json -p --no-session`). Ambient extensions and skills are off; only role resources load. Child uses the delegated working directory and Main's project approval. Abort kills the child process group. Streaming output is capped at 50 KiB. Unused JSON event types are discarded before payload buffering; consumed or unclassifiable events above 1 MiB fail delegation.
+Each call starts one isolated child (`pi --mode json -p --no-session`). Ambient extensions and Skills are off. Role/caller extensions load; those packages' tools and Skills auto-load, plus any extra `skills` names. Child uses the delegated working directory and Main's project approval. Abort kills the child process group. Streaming output is capped at 50 KiB. Unused JSON event types are discarded before payload buffering; consumed or unclassifiable events above 1 MiB fail delegation.
 
 TUI shows one row per Subagent with role, route, task, tokens, and elapsed time. Terminal rows drop after one second.
 
@@ -53,9 +53,9 @@ Do not edit files.
 | --- | --- | --- |
 | `name` | yes | Role selected by Main |
 | `description` | yes | Tells Main when to use the role |
-| `tools` | no | Omit for Pi `defaultTools`; a non-empty list is an exact allowlist; `[]` means none |
-| `extensions` | no | Absolute/`~/` paths or package sources. Repository-relative paths are rejected. |
-| `skills` | no | Effective Pi skill names, resolved from Main's registry |
+| `tools` | no | Omit for Pi defaults; when present, base tools are listed and every loaded Role/caller extension tool is added automatically. `[]` leaves extension tools only. |
+| `extensions` | no | Absolute/`~/` paths or package sources. Package-declared Skills and Pi `resources_discover` Skill paths load automatically. Repository-relative paths are rejected. |
+| `skills` | no | Additional effective Pi Skill names, resolved from Main's registry |
 | Markdown body | yes | Role system instructions |
 
 Missing skills warn and skip; they do not block delegation. No repo-controlled `.pi/agents` roles. No package-local model picker.
@@ -86,7 +86,7 @@ const tab = await reconcileManagedSubagentTab(host, { cwd: worktree, launch, lab
 await startManagedSubagent(host, agentName, tab.paneId, launch, { execute });
 ```
 
-`resolveRoleLaunch` uses shared task assignment and effective Pi registries. Caller tools extend explicit Role allowlists; omitted Role `tools` preserves Pi defaults. Generic host APIs contain no workflow prompts or durable state.
+`resolveRoleLaunch` uses shared task assignment and effective Pi registries. Caller tools extend Role base tools; Role and caller extension tools activate automatically. Omitted Role `tools` preserves Pi defaults. Generic host APIs contain no workflow prompts or durable state.
 
 ## Remove
 

package/dist/index.js

@@ -7,6 +7,8 @@ import { createHerdrClient, herdrCommandFailure, hasHerdrErrorCode } from "@henr
 import { modelReference, orderedProfileRoutes, PROFILE_NAMES, readTaskModelsConfig, resolveConfiguredTaskRoute, resolveTaskModelRoute, } from "@henryqw/pi-task-models";
 const CODEX_ALIAS = /^openai-codex-(?:[2-9]|[1-9]\d+)$/;
 const MULTI_CODEX_EXTENSION = fileURLToPath(import.meta.resolve("@henryqw/pi-multi-codex/extensions/multi-codex.ts"));
+const ROLE_TOOLS_EXTENSION = fileURLToPath(new URL("../extensions/role-tools.ts", import.meta.url));
+const ROLE_TOOL_POLICY_FLAG = "pi-subagent-role-tools";
 export const isProfileName = (value) => typeof value === "string" && PROFILE_NAMES.includes(value);
 const cleanText = (value, field, source) => {
     if (typeof value !== "string" || !value.trim() || value.includes("\0")) {
@@ -117,14 +119,15 @@ export function resolveRoleSkills(pi, role) {
 export function createRoleLaunch(pi, ctx, input) {
     const role = input.role;
     const skills = resolveRoleSkills(pi, role);
+    const tools = role.tools === undefined
+        ? undefined
+        : [...new Set([...role.tools, ...(input.tools ?? [])].map((tool) => cleanText(tool, "tool", `Role ${role.name}`)))];
     const extensions = [
         ...role.extensions,
         ...(input.extensions ?? []),
         ...(CODEX_ALIAS.test(input.route.model.provider) ? [MULTI_CODEX_EXTENSION] : []),
+        ...(tools === undefined ? [] : [ROLE_TOOLS_EXTENSION]),
     ].map((extension) => validateExtension(extension, `Role ${role.name}`));
-    const tools = role.tools === undefined
-        ? undefined
-        : [...new Set([...role.tools, ...(input.tools ?? [])].map((tool) => cleanText(tool, "tool", `Role ${role.name}`)))];
     const env = Object.fromEntries(Object.entries(input.env ?? {}).map(([key, value]) => {
         if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key))
             throw new Error(`Invalid launch environment name: ${key}`);
@@ -137,12 +140,8 @@ export function createRoleLaunch(pi, ctx, input) {
         args.push("--extension", extension);
     for (const skill of skills.paths)
         args.push("--skill", skill);
-    if (tools !== undefined) {
-        if (tools.length)
-            args.push("--tools", tools.join(","));
-        else
-            args.push("--no-tools");
-    }
+    if (tools !== undefined)
+        args.push(`--${ROLE_TOOL_POLICY_FLAG}`, JSON.stringify(tools));
     args.push("--model", modelReference(input.route.model));
     if (input.route.thinkingLevel)
         args.push("--thinking", input.route.thinkingLevel);

package/extensions/role-tools.ts

@@ -0,0 +1,33 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
+export const ROLE_TOOL_POLICY_FLAG = "pi-subagent-role-tools";
+
+function configuredTools(value: unknown): string[] | undefined {
+	if (value === undefined) return;
+	if (typeof value !== "string") throw new Error(`${ROLE_TOOL_POLICY_FLAG} must be JSON tool names.`);
+	let parsed: unknown;
+	try {
+		parsed = JSON.parse(value);
+	} catch {
+		throw new Error(`${ROLE_TOOL_POLICY_FLAG} must be JSON tool names.`);
+	}
+	if (!Array.isArray(parsed) || parsed.some((name) => typeof name !== "string" || !name.trim() || name.includes("\0"))) {
+		throw new Error(`${ROLE_TOOL_POLICY_FLAG} must be JSON tool names.`);
+	}
+	return [...new Set(parsed.map((name) => name.trim()))];
+}
+
+export default function roleTools(pi: ExtensionAPI): void {
+	pi.registerFlag(ROLE_TOOL_POLICY_FLAG, {
+		description: "Internal Pi Subagent Role tool policy",
+		type: "string",
+	});
+	pi.on("session_start", () => {
+		const selected = configuredTools(pi.getFlag(ROLE_TOOL_POLICY_FLAG));
+		if (!selected) return;
+		const extensionTools = pi.getAllTools()
+			.filter((tool) => !["builtin", "sdk", "inline"].includes(tool.sourceInfo.source))
+			.map((tool) => tool.name);
+		pi.setActiveTools([...new Set([...selected, ...extensionTools])]);
+	});
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-subagent",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "Delegate one task to an isolated Pi role with explicit extensions and skills.",
   "keywords": [
     "pi-package",