@tintinweb/pi-subagents 0.5.2 → 0.6.0

package/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.0] - 2026-04-24
+
+> **⚠️ Breaking: drops support for `pi` < 0.68.** The upstream `pi-coding-agent` package shipped breaking API changes in v0.68 (and further ones in v0.70). This release migrates to `^0.70.2` and is **not** backward-compatible with hosts on `pi` 0.62–0.67. Users on those versions must upgrade their `pi` installation (`npm install -g @mariozechner/pi-coding-agent@latest`) before updating this extension.
+
+### Changed
+- **Bumped peer `@mariozechner/pi-coding-agent` to `^0.70.2`** ([#28](https://github.com/tintinweb/pi-subagents/pull/28)) — crosses the v0.68 breaking-change line upstream. Specifically: tools are now passed as `string[]` (was `Tool[]`); `cwd`/`agentDir` are mandatory on `SettingsManager.create()` and `DefaultResourceLoader`; `session_switch` event renamed to `session_before_switch`; `ToolDefinition.params` widens to `unknown` under contextual typing, requiring `defineTool(...)`.
+- **Tool registrations wrapped with `defineTool(...)`** — preserves `TParams` inference so `execute` handlers get properly-typed `params` instead of `unknown`. Applies to the `Agent`, `get_subagent_result`, and `steer_subagent` tools.
+
+### Removed
+- **Cwd-bound tool factory registry** — the internal `TOOL_FACTORIES` closure table and `create{Bash,Edit,Read,Write,Grep,Find,Ls}Tool` imports are gone. Exported helpers renamed: `getToolsForType(type, cwd)` → `getToolNamesForType(type)`, `getMemoryTools(cwd, set)` → `getMemoryToolNames(set)`, `getReadOnlyMemoryTools(cwd, set)` → `getReadOnlyMemoryToolNames(set)` — all returning `string[]` instead of `Tool[]`. The host binds cwd when resolving tool names, so the extension no longer instantiates tools directly.
+
+### Fixed
+- **Subagent `SettingsManager` read wrong project settings in worktree mode** ([#30](https://github.com/tintinweb/pi-subagents/pull/30)) — `SettingsManager.create()` was called without arguments, defaulting `cwd` to `process.cwd()`. When the subagent's effective cwd differed (worktree isolation or explicit `cwd` override), its settings manager read `.pi/settings.json` from the parent's cwd rather than its own, diverging from the loader and session manager. Now passes `effectiveCwd` and `agentDir` explicitly, keeping all three managers consistent.
+
 ## [0.5.2] - 2026-03-26
 
 ### Fixed

package/README.md

@@ -417,7 +417,7 @@ src/
   index.ts            # Extension entry: tool/command registration, rendering
   types.ts            # Type definitions (AgentConfig, AgentRecord, etc.)
   default-agents.ts   # Embedded default agent configs (general-purpose, Explore, Plan)
-  agent-types.ts      # Unified agent registry (defaults + user), tool factories
+  agent-types.ts      # Unified agent registry (defaults + user), tool name resolution
   agent-runner.ts     # Session creation, execution, graceful max_turns, steer/resume
   agent-manager.ts    # Agent lifecycle, concurrency queue, completion notifications
   cross-extension-rpc.ts # RPC handlers for cross-extension spawn/ping via pi.events

package/dist/agent-runner.js

@@ -1,8 +1,8 @@
 /**
  * agent-runner.ts — Core execution engine: creates sessions, runs agents, collects results.
  */
-import { createAgentSession, DefaultResourceLoader, SessionManager, SettingsManager, } from "@mariozechner/pi-coding-agent";
-import { getAgentConfig, getConfig, getMemoryTools, getReadOnlyMemoryTools, getToolsForType } from "./agent-types.js";
+import { createAgentSession, DefaultResourceLoader, getAgentDir, SessionManager, SettingsManager, } from "@mariozechner/pi-coding-agent";
+import { getAgentConfig, getConfig, getMemoryToolNames, getReadOnlyMemoryToolNames, getToolNamesForType } from "./agent-types.js";
 import { buildParentContext, extractText } from "./context.js";
 import { detectEnv } from "./env.js";
 import { buildMemoryBlock, buildReadOnlyMemoryBlock } from "./memory.js";
@@ -110,28 +110,26 @@ export async function runAgent(ctx, type, prompt, options) {
             extras.skillBlocks = loaded;
         }
     }
-    let tools = getToolsForType(type, effectiveCwd);
+    let toolNames = getToolNamesForType(type);
     // Persistent memory: detect write capability and branch accordingly.
     // Account for disallowedTools — a tool in the base set but on the denylist is not truly available.
     if (agentConfig?.memory) {
-        const existingNames = new Set(tools.map(t => t.name));
+        const existingNames = new Set(toolNames);
         const denied = agentConfig.disallowedTools ? new Set(agentConfig.disallowedTools) : undefined;
         const effectivelyHas = (name) => existingNames.has(name) && !denied?.has(name);
         const hasWriteTools = effectivelyHas("write") || effectivelyHas("edit");
         if (hasWriteTools) {
-            // Read-write memory: add any missing memory tools (read/write/edit)
-            const memTools = getMemoryTools(effectiveCwd, existingNames);
-            if (memTools.length > 0)
-                tools = [...tools, ...memTools];
+            // Read-write memory: add any missing memory tool names (read/write/edit)
+            const extraNames = getMemoryToolNames(existingNames);
+            if (extraNames.length > 0)
+                toolNames = [...toolNames, ...extraNames];
             extras.memoryBlock = buildMemoryBlock(agentConfig.name, agentConfig.memory, effectiveCwd);
         }
         else {
-            // Read-only memory: only add read tool, use read-only prompt
-            if (!existingNames.has("read")) {
-                const readTools = getReadOnlyMemoryTools(effectiveCwd, existingNames);
-                if (readTools.length > 0)
-                    tools = [...tools, ...readTools];
-            }
+            // Read-only memory: only add read tool name, use read-only prompt
+            const extraNames = getReadOnlyMemoryToolNames(existingNames);
+            if (extraNames.length > 0)
+                toolNames = [...toolNames, ...extraNames];
             extras.memoryBlock = buildReadOnlyMemoryBlock(agentConfig.name, agentConfig.memory, effectiveCwd);
         }
     }
@@ -158,9 +156,11 @@ export async function runAgent(ctx, type, prompt, options) {
     // When skills is string[], we've already preloaded them into the prompt.
     // Still pass noSkills: true since we don't need the skill loader to load them again.
     const noSkills = skills === false || Array.isArray(skills);
+    const agentDir = getAgentDir();
     // Load extensions/skills: true or string[] → load; false → don't
     const loader = new DefaultResourceLoader({
         cwd: effectiveCwd,
+        agentDir,
         noExtensions: extensions === false,
         noSkills,
         noPromptTemplates: true,
@@ -174,17 +174,17 @@ export async function runAgent(ctx, type, prompt, options) {
     const thinkingLevel = options.thinkingLevel ?? agentConfig?.thinking;
     const sessionOpts = {
         cwd: effectiveCwd,
+        agentDir,
         sessionManager: SessionManager.inMemory(effectiveCwd),
-        settingsManager: SettingsManager.create(),
+        settingsManager: SettingsManager.create(effectiveCwd, agentDir),
         modelRegistry: ctx.modelRegistry,
         model,
-        tools,
+        tools: toolNames,
         resourceLoader: loader,
     };
     if (thinkingLevel) {
         sessionOpts.thinkingLevel = thinkingLevel;
     }
-    // createAgentSession's type signature may not include thinkingLevel yet
     const { session } = await createAgentSession(sessionOpts);
     // Build disallowed tools set from agent config
     const disallowedSet = agentConfig?.disallowedTools
@@ -193,13 +193,13 @@ export async function runAgent(ctx, type, prompt, options) {
     // Filter active tools: remove our own tools to prevent nesting,
     // apply extension allowlist if specified, and apply disallowedTools denylist
     if (extensions !== false) {
-        const builtinToolNames = new Set(tools.map(t => t.name));
+        const builtinToolNameSet = new Set(toolNames);
         const activeTools = session.getActiveToolNames().filter((t) => {
             if (EXCLUDED_TOOL_NAMES.includes(t))
                 return false;
             if (disallowedSet?.has(t))
                 return false;
-            if (builtinToolNames.has(t))
+            if (builtinToolNameSet.has(t))
                 return true;
             if (Array.isArray(extensions)) {
                 return extensions.some(ext => t.startsWith(ext) || t.includes(ext));

package/dist/agent-types.d.ts

@@ -4,9 +4,8 @@
  * Merges embedded default agents with user-defined agents from .pi/agents/*.md.
  * User agents override defaults with the same name. Disabled agents are kept but excluded from spawning.
  */
-import type { AgentTool } from "@mariozechner/pi-agent-core";
 import type { AgentConfig } from "./types.js";
-/** All known built-in tool names, derived from the factory registry. */
+/** All known built-in tool names. */
 export declare const BUILTIN_TOOL_NAMES: string[];
 /**
  * Register agents into the unified registry.
@@ -29,17 +28,15 @@ export declare function getUserAgentNames(): string[];
 /** Check if a type is valid and enabled (case-insensitive). */
 export declare function isValidType(type: string): boolean;
 /**
- * Get the tools needed for memory management (read, write, edit).
- * Only returns tools that are NOT already in the provided set.
+ * Get memory tool names (read/write/edit) not already in the provided set.
  */
-export declare function getMemoryTools(cwd: string, existingToolNames: Set<string>): AgentTool<any>[];
+export declare function getMemoryToolNames(existingToolNames: Set<string>): string[];
 /**
- * Get only the read tool for read-only memory access.
- * Only returns tools that are NOT already in the provided set.
+ * Get read-only memory tool names not already in the provided set.
  */
-export declare function getReadOnlyMemoryTools(cwd: string, existingToolNames: Set<string>): AgentTool<any>[];
-/** Get built-in tools for a type (case-insensitive). */
-export declare function getToolsForType(type: string, cwd: string): AgentTool<any>[];
+export declare function getReadOnlyMemoryToolNames(existingToolNames: Set<string>): string[];
+/** Get built-in tool names for a type (case-insensitive). */
+export declare function getToolNamesForType(type: string): string[];
 /** Get config for a type (case-insensitive, returns a SubagentTypeConfig-compatible object). Falls back to general-purpose. */
 export declare function getConfig(type: string): {
     displayName: string;

package/dist/agent-types.js

@@ -4,19 +4,9 @@
  * Merges embedded default agents with user-defined agents from .pi/agents/*.md.
  * User agents override defaults with the same name. Disabled agents are kept but excluded from spawning.
  */
-import { createBashTool, createEditTool, createFindTool, createGrepTool, createLsTool, createReadTool, createWriteTool, } from "@mariozechner/pi-coding-agent";
 import { DEFAULT_AGENTS } from "./default-agents.js";
-const TOOL_FACTORIES = {
-    read: (cwd) => createReadTool(cwd),
-    bash: (cwd) => createBashTool(cwd),
-    edit: (cwd) => createEditTool(cwd),
-    write: (cwd) => createWriteTool(cwd),
-    grep: (cwd) => createGrepTool(cwd),
-    find: (cwd) => createFindTool(cwd),
-    ls: (cwd) => createLsTool(cwd),
-};
-/** All known built-in tool names, derived from the factory registry. */
-export const BUILTIN_TOOL_NAMES = Object.keys(TOOL_FACTORIES);
+/** All known built-in tool names. */
+export const BUILTIN_TOOL_NAMES = ["read", "bash", "edit", "write", "grep", "find", "ls"];
 /** Unified runtime registry of all agents (defaults + user-defined). */
 const agents = new Map();
 /**
@@ -87,32 +77,26 @@ export function isValidType(type) {
 /** Tool names required for memory management. */
 const MEMORY_TOOL_NAMES = ["read", "write", "edit"];
 /**
- * Get the tools needed for memory management (read, write, edit).
- * Only returns tools that are NOT already in the provided set.
+ * Get memory tool names (read/write/edit) not already in the provided set.
  */
-export function getMemoryTools(cwd, existingToolNames) {
-    return MEMORY_TOOL_NAMES
-        .filter(n => !existingToolNames.has(n) && n in TOOL_FACTORIES)
-        .map(n => TOOL_FACTORIES[n](cwd));
+export function getMemoryToolNames(existingToolNames) {
+    return MEMORY_TOOL_NAMES.filter(n => !existingToolNames.has(n));
 }
 /** Tool names needed for read-only memory access. */
 const READONLY_MEMORY_TOOL_NAMES = ["read"];
 /**
- * Get only the read tool for read-only memory access.
- * Only returns tools that are NOT already in the provided set.
+ * Get read-only memory tool names not already in the provided set.
  */
-export function getReadOnlyMemoryTools(cwd, existingToolNames) {
-    return READONLY_MEMORY_TOOL_NAMES
-        .filter(n => !existingToolNames.has(n) && n in TOOL_FACTORIES)
-        .map(n => TOOL_FACTORIES[n](cwd));
+export function getReadOnlyMemoryToolNames(existingToolNames) {
+    return READONLY_MEMORY_TOOL_NAMES.filter(n => !existingToolNames.has(n));
 }
-/** Get built-in tools for a type (case-insensitive). */
-export function getToolsForType(type, cwd) {
+/** Get built-in tool names for a type (case-insensitive). */
+export function getToolNamesForType(type) {
     const key = resolveKey(type);
     const raw = key ? agents.get(key) : undefined;
     const config = raw?.enabled !== false ? raw : undefined;
-    const toolNames = config?.builtinToolNames?.length ? config.builtinToolNames : BUILTIN_TOOL_NAMES;
-    return toolNames.filter((n) => n in TOOL_FACTORIES).map((n) => TOOL_FACTORIES[n](cwd));
+    const names = config?.builtinToolNames?.length ? config.builtinToolNames : [...BUILTIN_TOOL_NAMES];
+    return names;
 }
 /** Get config for a type (case-insensitive, returns a SubagentTypeConfig-compatible object). Falls back to general-purpose. */
 export function getConfig(type) {

package/dist/index.d.ts

@@ -9,5 +9,5 @@
  * Commands:
  *   /agents                 — Interactive agent management menu
  */
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI } from "@mariozechner/pi-coding-agent";
 export default function (pi: ExtensionAPI): void;

package/dist/index.js

@@ -12,6 +12,7 @@
 import { existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { defineTool } from "@mariozechner/pi-coding-agent";
 import { Text } from "@mariozechner/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { AgentManager } from "./agent-manager.js";
@@ -383,7 +384,7 @@ export default function (pi) {
         currentCtx = ctx;
         manager.clearCompleted(); // preserve existing behavior
     });
-    pi.on("session_switch", () => { manager.clearCompleted(); });
+    pi.on("session_before_switch", () => { manager.clearCompleted(); });
     const { unsubPing: unsubPingRpc, unsubSpawn: unsubSpawnRpc, unsubStop: unsubStopRpc } = registerRpcHandlers({
         events: pi.events,
         pi,
@@ -489,7 +490,7 @@ export default function (pi) {
     }
     const typeListText = buildTypeListText();
     // ---- Agent tool ----
-    pi.registerTool({
+    pi.registerTool(defineTool({
         name: "Agent",
         label: "Agent",
         description: `Launch a new agent to handle complex, multi-step tasks autonomously.
@@ -847,9 +848,9 @@ Guidelines:
             return textResult(`${fallbackNote}Agent completed in ${formatMs(durationMs)} (${statsParts.join(", ")})${getStatusNote(record.status)}.\n\n` +
                 (record.result?.trim() || "No output."), details);
         },
-    });
+    }));
     // ---- get_subagent_result tool ----
-    pi.registerTool({
+    pi.registerTool(defineTool({
         name: "get_subagent_result",
         label: "Get Agent Result",
         description: "Check status and retrieve results from a background agent. Use the agent ID returned by Agent with run_in_background.",
@@ -908,9 +909,9 @@ Guidelines:
             }
             return textResult(output);
         },
-    });
+    }));
     // ---- steer_subagent tool ----
-    pi.registerTool({
+    pi.registerTool(defineTool({
         name: "steer_subagent",
         label: "Steer Agent",
         description: "Send a steering message to a running agent. The message will interrupt the agent after its current tool execution " +
@@ -948,7 +949,7 @@ Guidelines:
                 return textResult(`Failed to steer agent: ${err instanceof Error ? err.message : String(err)}`);
             }
         },
-    });
+    }));
     // ---- /agents interactive menu ----
     const projectAgentsDir = () => join(process.cwd(), ".pi", "agents");
     const personalAgentsDir = () => join(homedir(), ".pi", "agent", "agents");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tintinweb/pi-subagents",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "A pi extension extension that brings smart Claude Code-style autonomous sub-agents to pi.",
   "author": "tintinweb",
   "license": "MIT",
@@ -21,9 +21,9 @@
     "autonomous"
   ],
   "dependencies": {
-    "@mariozechner/pi-ai": "^0.62.0",
-    "@mariozechner/pi-coding-agent": "^0.62.0",
-    "@mariozechner/pi-tui": "^0.62.0",
+    "@mariozechner/pi-ai": "^0.70.2",
+    "@mariozechner/pi-coding-agent": "^0.70.2",
+    "@mariozechner/pi-tui": "^0.70.2",
     "@sinclair/typebox": "latest"
   },
   "scripts": {

package/src/agent-runner.ts

@@ -10,10 +10,11 @@ import {
   createAgentSession,
   DefaultResourceLoader,
   type ExtensionAPI,
+  getAgentDir,
   SessionManager,
   SettingsManager,
 } from "@mariozechner/pi-coding-agent";
-import { getAgentConfig, getConfig, getMemoryTools, getReadOnlyMemoryTools, getToolsForType } from "./agent-types.js";
+import { getAgentConfig, getConfig, getMemoryToolNames, getReadOnlyMemoryToolNames, getToolNamesForType } from "./agent-types.js";
 import { buildParentContext, extractText } from "./context.js";
 import { detectEnv } from "./env.js";
 import { buildMemoryBlock, buildReadOnlyMemoryBlock } from "./memory.js";
@@ -183,27 +184,25 @@ export async function runAgent(
     }
   }
 
-  let tools = getToolsForType(type, effectiveCwd);
+  let toolNames = getToolNamesForType(type);
 
   // Persistent memory: detect write capability and branch accordingly.
   // Account for disallowedTools — a tool in the base set but on the denylist is not truly available.
   if (agentConfig?.memory) {
-    const existingNames = new Set(tools.map(t => t.name));
+    const existingNames = new Set(toolNames);
     const denied = agentConfig.disallowedTools ? new Set(agentConfig.disallowedTools) : undefined;
     const effectivelyHas = (name: string) => existingNames.has(name) && !denied?.has(name);
     const hasWriteTools = effectivelyHas("write") || effectivelyHas("edit");
 
     if (hasWriteTools) {
-      // Read-write memory: add any missing memory tools (read/write/edit)
-      const memTools = getMemoryTools(effectiveCwd, existingNames);
-      if (memTools.length > 0) tools = [...tools, ...memTools];
+      // Read-write memory: add any missing memory tool names (read/write/edit)
+      const extraNames = getMemoryToolNames(existingNames);
+      if (extraNames.length > 0) toolNames = [...toolNames, ...extraNames];
       extras.memoryBlock = buildMemoryBlock(agentConfig.name, agentConfig.memory, effectiveCwd);
     } else {
-      // Read-only memory: only add read tool, use read-only prompt
-      if (!existingNames.has("read")) {
-        const readTools = getReadOnlyMemoryTools(effectiveCwd, existingNames);
-        if (readTools.length > 0) tools = [...tools, ...readTools];
-      }
+      // Read-only memory: only add read tool name, use read-only prompt
+      const extraNames = getReadOnlyMemoryToolNames(existingNames);
+      if (extraNames.length > 0) toolNames = [...toolNames, ...extraNames];
       extras.memoryBlock = buildReadOnlyMemoryBlock(agentConfig.name, agentConfig.memory, effectiveCwd);
     }
   }
@@ -232,9 +231,12 @@ export async function runAgent(
   // Still pass noSkills: true since we don't need the skill loader to load them again.
   const noSkills = skills === false || Array.isArray(skills);
 
+  const agentDir = getAgentDir();
+
   // Load extensions/skills: true or string[] → load; false → don't
   const loader = new DefaultResourceLoader({
     cwd: effectiveCwd,
+    agentDir,
     noExtensions: extensions === false,
     noSkills,
     noPromptTemplates: true,
@@ -251,21 +253,21 @@ export async function runAgent(
   // Resolve thinking level: explicit option > agent config > undefined (inherit)
   const thinkingLevel = options.thinkingLevel ?? agentConfig?.thinking;
 
-  const sessionOpts: Record<string, unknown> = {
+  const sessionOpts: Parameters<typeof createAgentSession>[0] = {
     cwd: effectiveCwd,
+    agentDir,
     sessionManager: SessionManager.inMemory(effectiveCwd),
-    settingsManager: SettingsManager.create(),
+    settingsManager: SettingsManager.create(effectiveCwd, agentDir),
     modelRegistry: ctx.modelRegistry,
     model,
-    tools,
+    tools: toolNames,
     resourceLoader: loader,
   };
   if (thinkingLevel) {
     sessionOpts.thinkingLevel = thinkingLevel;
   }
 
-  // createAgentSession's type signature may not include thinkingLevel yet
-  const { session } = await createAgentSession(sessionOpts as Parameters<typeof createAgentSession>[0]);
+  const { session } = await createAgentSession(sessionOpts);
 
   // Build disallowed tools set from agent config
   const disallowedSet = agentConfig?.disallowedTools
@@ -275,11 +277,11 @@ export async function runAgent(
   // Filter active tools: remove our own tools to prevent nesting,
   // apply extension allowlist if specified, and apply disallowedTools denylist
   if (extensions !== false) {
-    const builtinToolNames = new Set(tools.map(t => t.name));
+    const builtinToolNameSet = new Set(toolNames);
     const activeTools = session.getActiveToolNames().filter((t) => {
       if (EXCLUDED_TOOL_NAMES.includes(t)) return false;
       if (disallowedSet?.has(t)) return false;
-      if (builtinToolNames.has(t)) return true;
+      if (builtinToolNameSet.has(t)) return true;
       if (Array.isArray(extensions)) {
         return extensions.some(ext => t.startsWith(ext) || t.includes(ext));
       }

package/src/agent-types.ts

@@ -5,33 +5,11 @@
  * User agents override defaults with the same name. Disabled agents are kept but excluded from spawning.
  */
 
-import type { AgentTool } from "@mariozechner/pi-agent-core";
-import {
-  createBashTool,
-  createEditTool,
-  createFindTool,
-  createGrepTool,
-  createLsTool,
-  createReadTool,
-  createWriteTool,
-} from "@mariozechner/pi-coding-agent";
 import { DEFAULT_AGENTS } from "./default-agents.js";
 import type { AgentConfig } from "./types.js";
 
-type ToolFactory = (cwd: string) => AgentTool<any>;
-
-const TOOL_FACTORIES: Record<string, ToolFactory> = {
-  read: (cwd) => createReadTool(cwd),
-  bash: (cwd) => createBashTool(cwd),
-  edit: (cwd) => createEditTool(cwd),
-  write: (cwd) => createWriteTool(cwd),
-  grep: (cwd) => createGrepTool(cwd),
-  find: (cwd) => createFindTool(cwd),
-  ls: (cwd) => createLsTool(cwd),
-};
-
-/** All known built-in tool names, derived from the factory registry. */
-export const BUILTIN_TOOL_NAMES = Object.keys(TOOL_FACTORIES);
+/** All known built-in tool names. */
+export const BUILTIN_TOOL_NAMES: string[] = ["read", "bash", "edit", "write", "grep", "find", "ls"];
 
 /** Unified runtime registry of all agents (defaults + user-defined). */
 const agents = new Map<string, AgentConfig>();
@@ -113,35 +91,29 @@ export function isValidType(type: string): boolean {
 const MEMORY_TOOL_NAMES = ["read", "write", "edit"];
 
 /**
- * Get the tools needed for memory management (read, write, edit).
- * Only returns tools that are NOT already in the provided set.
+ * Get memory tool names (read/write/edit) not already in the provided set.
  */
-export function getMemoryTools(cwd: string, existingToolNames: Set<string>): AgentTool<any>[] {
-  return MEMORY_TOOL_NAMES
-    .filter(n => !existingToolNames.has(n) && n in TOOL_FACTORIES)
-    .map(n => TOOL_FACTORIES[n](cwd));
+export function getMemoryToolNames(existingToolNames: Set<string>): string[] {
+  return MEMORY_TOOL_NAMES.filter(n => !existingToolNames.has(n));
 }
 
 /** Tool names needed for read-only memory access. */
 const READONLY_MEMORY_TOOL_NAMES = ["read"];
 
 /**
- * Get only the read tool for read-only memory access.
- * Only returns tools that are NOT already in the provided set.
+ * Get read-only memory tool names not already in the provided set.
  */
-export function getReadOnlyMemoryTools(cwd: string, existingToolNames: Set<string>): AgentTool<any>[] {
-  return READONLY_MEMORY_TOOL_NAMES
-    .filter(n => !existingToolNames.has(n) && n in TOOL_FACTORIES)
-    .map(n => TOOL_FACTORIES[n](cwd));
+export function getReadOnlyMemoryToolNames(existingToolNames: Set<string>): string[] {
+  return READONLY_MEMORY_TOOL_NAMES.filter(n => !existingToolNames.has(n));
 }
 
-/** Get built-in tools for a type (case-insensitive). */
-export function getToolsForType(type: string, cwd: string): AgentTool<any>[] {
+/** Get built-in tool names for a type (case-insensitive). */
+export function getToolNamesForType(type: string): string[] {
   const key = resolveKey(type);
   const raw = key ? agents.get(key) : undefined;
   const config = raw?.enabled !== false ? raw : undefined;
-  const toolNames = config?.builtinToolNames?.length ? config.builtinToolNames : BUILTIN_TOOL_NAMES;
-  return toolNames.filter((n) => n in TOOL_FACTORIES).map((n) => TOOL_FACTORIES[n](cwd));
+  const names = config?.builtinToolNames?.length ? config.builtinToolNames : [...BUILTIN_TOOL_NAMES];
+  return names;
 }
 
 /** Get config for a type (case-insensitive, returns a SubagentTypeConfig-compatible object). Falls back to general-purpose. */

package/src/index.ts

@@ -13,7 +13,7 @@
 import { existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import { defineTool, type ExtensionAPI, type ExtensionCommandContext, type ExtensionContext } from "@mariozechner/pi-coding-agent";
 import { Text } from "@mariozechner/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { AgentManager } from "./agent-manager.js";
@@ -430,7 +430,7 @@ export default function (pi: ExtensionAPI) {
     manager.clearCompleted();           // preserve existing behavior
   });
 
-  pi.on("session_switch", () => { manager.clearCompleted(); });
+  pi.on("session_before_switch", () => { manager.clearCompleted(); });
 
   const { unsubPing: unsubPingRpc, unsubSpawn: unsubSpawnRpc, unsubStop: unsubStopRpc } = registerRpcHandlers({
     events: pi.events,
@@ -550,7 +550,7 @@ export default function (pi: ExtensionAPI) {
 
   // ---- Agent tool ----
 
-  pi.registerTool<any, AgentDetails>({
+  pi.registerTool(defineTool({
     name: "Agent",
     label: "Agent",
     description: `Launch a new agent to handle complex, multi-step tasks autonomously.
@@ -964,11 +964,11 @@ Guidelines:
         details,
       );
     },
-  });
+  }));
 
   // ---- get_subagent_result tool ----
 
-  pi.registerTool({
+  pi.registerTool(defineTool({
     name: "get_subagent_result",
     label: "Get Agent Result",
     description:
@@ -1038,11 +1038,11 @@ Guidelines:
 
       return textResult(output);
     },
-  });
+  }));
 
   // ---- steer_subagent tool ----
 
-  pi.registerTool({
+  pi.registerTool(defineTool({
     name: "steer_subagent",
     label: "Steer Agent",
     description:
@@ -1080,7 +1080,7 @@ Guidelines:
         return textResult(`Failed to steer agent: ${err instanceof Error ? err.message : String(err)}`);
       }
     },
-  });
+  }));
 
   // ---- /agents interactive menu ----