@gotgenes/pi-subagents 12.0.0 → 13.0.0

package/docs/retro/0264-remove-extension-lifecycle-control.md

@@ -0,0 +1,48 @@
+---
+issue: 264
+issue_title: "Remove isolated / extensions:false / noSkills from core"
+---
+
+# Retro: #264 — Remove isolated / extensions:false / noSkills from core
+
+## Stage: Planning (2026-05-30T00:09:21Z)
+
+### Session summary
+
+Planned Phase 16, Step 4: removing the extension-lifecycle-control axis (`isolated`, `extensions: false`, `noSkills`) from the pi-subagents core per ADR 0002.
+Confirmed all three prerequisite Phase 16 steps (#261, #262, #263) are closed, so the explicit "deny-at-use" dependency is satisfied.
+Produced a four-cycle TDD plan (`isolated` → `extensions` → `skills`/`noSkills`/preload → docs) and committed it.
+
+### Observations
+
+- Scope expansion decided with the user: the issue names only `isolated` / `extensions: false` / `noSkills`, but `noSkills` is the single mechanism behind **both** skill-restriction modes (`skills: false` and `skills: string[]` preload).
+  Removing `noSkills` without also removing `AgentConfig.skills` would leave a field that silently stops restricting.
+  Chose the **collapse-skills-fully** option (symmetric with `extensions`): retire `AgentConfig.skills`, `skill-loader.ts`, `safe-fs.ts` (sole consumer was the skill loader), `preloadSkills`, `PromptExtras`, and `extras.skillBlocks`.
+  Children always inherit Pi's full skill system — the `skills: true` path.
+- The recursion guard's `if (cfg.extensions)` gate is removed in the `extensions` cycle (cycle 2), since `SessionConfig.extensions` disappears there.
+  A guard-always-runs assertion replaces the deleted "extensions: false skips the filter entirely" test.
+- This is a **breaking** change (`feat!:`): public `SpawnOptions.isolated` and the `isolated:` / `extensions:` / `skills:` custom-agent frontmatter keys are removed.
+  Custom agents with legacy frontmatter will silently ignore those keys (matches the Phase 14 precedent for `disallowed_tools`).
+- Sequencing note surfaced to the user: some `isolated`-threading removed here (`RunOptions.isolated`, `Agent.run()` plumbing) is structure that Step 5 (#265, dissolve the runner) will delete anyway — small, unavoidable, and #265 depends on this step, so no reordering benefit.
+- Helper-file churn accepted: `test/helpers/runner-io.ts` is touched in all three removal cycles (one field per cycle); ordering is fixed (`isolated` → `extensions` → `skills`) so no cycle leaves a dangling reference.
+- Doc updates identified: `docs/architecture/architecture.md` (Mermaid session subgraph, directory tree, `SpawnOptions`/`RunOptions` field lists, roadmap status) and the `package-pi-subagents` SKILL.md session-domain row (8 → 6 modules).
+
+## Stage: Implementation — TDD (2026-05-30T00:38:00Z)
+
+### Session summary
+
+Executed all four plan cycles (`isolated` → `extensions` + unconditional guard → `skills`/`noSkills`/preload → docs) as three `feat!:` commits plus one `docs:` commit.
+The extension-lifecycle-control axis and the `skills` curation axis are gone; children always inherit the parent's extensions and full skill system, and the recursion guard is unconditional.
+Test count went 1016 → 951 (−65): deleted `skill-loader.test.ts` and `safe-fs.test.ts`, plus removed isolated/extensions/skills/preload-specific cases; `check`, `lint`, `fallow dead-code`, and `verify:public-types` all green.
+
+### Observations
+
+- The plan's cycle split held up cleanly.
+  The only interleaving friction was `test/config/custom-agents.test.ts`, where `extensions` and `skills` assertions shared the same `it` blocks.
+  Handled it by retitling the shared tests to skills-only in cycle 2 (keeping skills compiling/passing), then deleting them in cycle 3 — no dangling references between commits.
+- BSD `sed` (macOS) does not support `\|` alternation in basic regex; the standalone-fixture-line deletions needed `sed -E`.
+  Worth remembering for future bulk fixture removals.
+- Two in-scope judgment calls beyond the literal plan: (1) kept the generic tag-rendering test in `result-renderer.test.ts` by swapping the example tag `"isolated"` → `"inherit context"` rather than deleting coverage; (2) removed the now-unused `vi` import from `custom-agents.test.ts` after dropping the extensions-deprecation-warning test.
+- The `spawn-config.test.ts` `agentInvocation` snapshot carried a stale `isolation: undefined` leftover (from the #263 worktree eviction) that `toEqual` had been silently ignoring; removed it alongside `isolated: false` for a clean exact-match assertion.
+- `verify:public-types` confirmed the breaking `SpawnOptions.isolated` removal type-checks against an external consumer; no lockfile changes; `dist/` correctly gitignored after the type-bundle build.
+- Pre-completion reviewer: **PASS** — both acceptance criteria code-verified, all deterministic checks green, 6 Mermaid diagrams render, docs accurate, zero dead code.

package/docs/retro/0272-export-workspace-collaborator-types.md

@@ -0,0 +1,38 @@
+---
+issue: 272
+issue_title: "Export WorkspaceProvider collaborator types by name from the public surface"
+---
+
+# Retro: #272 — Export `WorkspaceProvider` collaborator types by name from the public surface
+
+## Stage: Planning (2026-05-29T23:23:37Z)
+
+### Session summary
+
+Planned a purely additive, type-only change to `@gotgenes/pi-subagents`'s public surface: re-export `Workspace`, `WorkspacePrepareContext`, `WorkspaceDisposeOutcome`, and `WorkspaceDisposeResult` by name from `src/service/service.ts`, alongside the already-exported `WorkspaceProvider`.
+The plan bundles the source change with extending the `verify:public-types` harness (symbol guard + probe consumer) into a single `feat:` commit, since a packaged-tarball probe cannot import names the entry does not yet export.
+
+### Observations
+
+- The issue's "Proposed change" was unambiguous, so the `ask-user` design gate was skipped.
+
+## Stage: Implementation — Build (2026-05-29T23:30:13Z)
+
+### Session summary
+
+Implemented the single plan step: widened the `#src/lifecycle/workspace` import in `src/service/service.ts` to include all four collaborator types and added them to the `export type { … }` block, updating the standing comment from a future-tracking reference to a present-tense description.
+Extended `scripts/verify-public-types.sh` — the symbol guard loop and inline `probe.ts` — to assert all four new names, confirmed the harness fails (red) before the source change and passes (green) after.
+Also updated two stale forward-references to #272 in `docs/architecture/architecture.md` (flagged by the pre-completion reviewer).
+
+### Observations
+
+- Red→green cycle through the type-level harness (`verify:public-types`) rather than vitest, exactly as planned.
+- No rollup config change was needed — `rollup-plugin-dts` carries through whatever the entry exports; the symbol guard and `#src` self-containment guard both stayed green.
+- The symbol guard already found the names present in the bundle (declared but not exported); the probe's type-check was the real red signal.
+- Pre-completion reviewer: WARN — two stale forward-references to #272 in `docs/architecture/architecture.md`; both fixed in a follow-up `docs:` commit before shipping.
+- No new vitest cycle: the re-exports are type-only and erase at runtime.
+  The red→green loop lives in the type-level `verify:public-types` harness, not the runtime suite — this is closer to a `/build-plan` shape than a code TDD cycle, but it still has a clean red→green via the probe consumer.
+- The four interfaces already exist in `src/lifecycle/workspace.ts` with correct shapes; only re-exporting is in scope.
+- `rollup.dts.config.mjs` needs no change — `WorkspaceProvider` already pulls the four collaborator declarations into the bundle by reference, so adding named exports keeps the `grep '#src'` self-containment guard green.
+- A standing comment in `service.ts` ("Named re-exports … tracked in #272") goes stale on landing — the plan updates it in the same step.
+- The downstream simplification in `@gotgenes/pi-subagents-worktrees` (swap indexed-access aliases for named imports, bump the dependency) is deferred until a `pi-subagents` release carries these exports — consistent with the registry-consumption model settled in #270.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gotgenes/pi-subagents",
-  "version": "12.0.0",
+  "version": "13.0.0",
   "type": "module",
   "exports": {
     ".": {

package/src/config/agent-types.ts

@@ -114,8 +114,6 @@ export class AgentTypeRegistry implements AgentConfigLookup {
       displayName: "Agent",
       description: "General-purpose agent for complex, multi-step tasks",
       builtinToolNames: BUILTIN_TOOL_NAMES,
-      extensions: true,
-      skills: true,
       systemPrompt: "",
       promptMode: "append",
     };

package/src/config/custom-agents.ts

@@ -58,8 +58,6 @@ function loadFromDir(dir: string, agents: Map<string, AgentConfig>, source: "pro
       displayName: str(fm.display_name),
       description: str(fm.description) ?? name,
       builtinToolNames: csvList(fm.tools, BUILTIN_TOOL_NAMES),
-      extensions: resolveBoolExtensions(fm.extensions ?? fm.inherit_extensions),
-      skills: inheritField(fm.skills ?? fm.inherit_skills),
       model: str(fm.model),
       thinking: str(fm.thinking) as ThinkingLevel | undefined,
       maxTurns: nonNegativeInt(fm.max_turns),
@@ -67,7 +65,6 @@ function loadFromDir(dir: string, agents: Map<string, AgentConfig>, source: "pro
       promptMode: fm.prompt_mode === "append" ? "append" : "replace",
       inheritContext: fm.inherit_context != null ? fm.inherit_context === true : undefined,
       runInBackground: fm.run_in_background != null ? fm.run_in_background === true : undefined,
-      isolated: fm.isolated != null ? fm.isolated === true : undefined,
       enabled: fm.enabled !== false,  // default true; explicitly false disables
       source,
     });
@@ -107,30 +104,3 @@ function csvList(val: unknown, defaults: string[]): string[] {
   if (val === undefined || val === null) return defaults;
   return parseCsvField(val) ?? [];
 }
-
-/**
- * Resolve the `extensions` field to a boolean.
- * CSV/array values (legacy allowlist syntax) are coerced to `true` with a warning.
- */
-function resolveBoolExtensions(val: unknown): boolean {
-  const result = inheritField(val);
-  if (Array.isArray(result)) {
-    console.warn(
-      "[pi-subagents] extensions allowlist syntax is deprecated — treating as \"true\" (inherit all).\n" +
-        "Use \"permission:\" frontmatter in pi-permission-system for per-tool access control.",
-    );
-    return true;
-  }
-  return result;
-}
-
-/**
- * Parse an inherit field (extensions, skills).
- * omitted/true → true (inherit all); false/"none"/empty → false; csv → listed names.
- */
-function inheritField(val: unknown): true | string[] | false {
-  if (val === undefined || val === null || val === true) return true;
-  if (val === false || val === "none") return false;
-  const items = csvList(val, []);
-  return items.length > 0 ? items : false;
-}

package/src/config/default-agents.ts

@@ -16,10 +16,8 @@ export const DEFAULT_AGENTS: Map<string, AgentConfig> = new Map([
       displayName: "Agent",
       description: "General-purpose agent for complex, multi-step tasks",
       // builtinToolNames omitted — means "all available tools" (resolved at lookup time)
-      // inheritContext / runInBackground / isolated omitted — strategy fields, callers decide per-call.
+      // inheritContext / runInBackground omitted — strategy fields, callers decide per-call.
       // Setting them to false would lock callsite intent (see resolveAgentInvocationConfig in invocation-config.ts).
-      extensions: true,
-      skills: true,
       systemPrompt: "",
       promptMode: "append",
       isDefault: true,
@@ -32,8 +30,6 @@ export const DEFAULT_AGENTS: Map<string, AgentConfig> = new Map([
       displayName: "Explore",
       description: "Fast codebase exploration agent (read-only)",
       builtinToolNames: READ_ONLY_TOOLS,
-      extensions: true,
-      skills: true,
       model: "anthropic/claude-haiku-4-5-20251001",
       systemPrompt: `# CRITICAL: READ-ONLY MODE - NO FILE MODIFICATIONS
 You are a file search specialist. You excel at thoroughly navigating and exploring codebases.
@@ -74,8 +70,6 @@ Use Bash ONLY for read-only operations: ls, git status, git log, git diff, find,
       displayName: "Plan",
       description: "Software architect for implementation planning (read-only)",
       builtinToolNames: READ_ONLY_TOOLS,
-      extensions: true,
-      skills: true,
       systemPrompt: `# CRITICAL: READ-ONLY MODE - NO FILE MODIFICATIONS
 You are a software architect and planning specialist.
 Your role is EXCLUSIVELY to explore the codebase and design implementation plans.

package/src/config/invocation-config.ts

@@ -6,7 +6,6 @@ interface AgentInvocationParams {
   max_turns?: number;
   run_in_background?: boolean;
   inherit_context?: boolean;
-  isolated?: boolean;
 }
 
 export function resolveAgentInvocationConfig(
@@ -19,7 +18,6 @@ export function resolveAgentInvocationConfig(
   maxTurns?: number;
   inheritContext: boolean;
   runInBackground: boolean;
-  isolated: boolean;
 } {
   return {
     modelInput: agentConfig?.model ?? params.model,
@@ -28,6 +26,5 @@ export function resolveAgentInvocationConfig(
     maxTurns: agentConfig?.maxTurns ?? params.max_turns,
     inheritContext: agentConfig?.inheritContext ?? params.inherit_context ?? false,
     runInBackground: agentConfig?.runInBackground ?? params.run_in_background ?? false,
-    isolated: agentConfig?.isolated ?? params.isolated ?? false,
   };
 }

package/src/index.ts

@@ -38,7 +38,6 @@ import { detectEnv } from "#src/session/env";
 import { resolveModel } from "#src/session/model-resolver";
 import { buildAgentPrompt } from "#src/session/prompts";
 import { deriveSubagentSessionDir } from "#src/session/session-dir";
-import { preloadSkills } from "#src/session/skill-loader";
 import { SettingsManager } from "#src/settings";
 import { AgentTool } from "#src/tools/agent-tool";
 import { GetResultTool } from "#src/tools/get-result-tool";
@@ -143,7 +142,6 @@ export default function (pi: ExtensionAPI) {
       createSettingsManager: (cwd, dir) => SdkSettingsManager.create(cwd, dir),
       createSession: (opts) => createAgentSession(opts as any),
       assemblerIO: {
-        preloadSkills,
         buildAgentPrompt,
       },
     },

package/src/lifecycle/agent-manager.ts

@@ -41,7 +41,6 @@ export interface AgentSpawnConfig {
   description: string;
   model?: Model<any>;
   maxTurns?: number;
-  isolated?: boolean;
   inheritContext?: boolean;
   thinkingLevel?: ThinkingLevel;
   isBackground?: boolean;
@@ -149,7 +148,6 @@ export class AgentManager {
       prompt,
       model: options.model,
       maxTurns: options.maxTurns,
-      isolated: options.isolated,
       thinkingLevel: options.thinkingLevel,
       parentSession: options.parentSession,
       signal: options.signal,

package/src/lifecycle/agent-runner.ts

@@ -55,8 +55,6 @@ export interface SessionManagerLike {
 export interface ResourceLoaderOptions {
   cwd: string;
   agentDir: string;
-  noExtensions?: boolean;
-  noSkills?: boolean;
   noPromptTemplates?: boolean;
   noThemes?: boolean;
   noContextFiles?: boolean;
@@ -148,7 +146,6 @@ export interface RunOptions {
   model?: Model<any>;
   maxTurns?: number;
   signal?: AbortSignal;
-  isolated?: boolean;
   thinkingLevel?: ThinkingLevel;
   /** Called once after session creation - session delivery mechanism. */
   onSessionCreated?: (session: AgentSession) => void;
@@ -283,7 +280,6 @@ export async function runAgent(
     },
     {
       cwd: options.context.cwd,
-      isolated: options.isolated,
       model: options.model,
       thinkingLevel: options.thinkingLevel,
     },
@@ -294,17 +290,15 @@ export async function runAgent(
 
   const agentDir = deps.io.getAgentDir();
 
-  // Load extensions/skills: true → load; false → don't.
+  // Children always load the parent's extensions and skills.
   // Suppress AGENTS.md/CLAUDE.md and APPEND_SYSTEM.md - upstream's
   // buildSystemPrompt() re-appends both AFTER systemPromptOverride, which
-  // would defeat prompt_mode: replace and isolated: true. Parent context, if
+  // would defeat prompt_mode: replace. Parent context, if
   // wanted, reaches the subagent via prompt_mode: append (parentSystemPrompt
   // is embedded in systemPromptOverride) or inherit_context (conversation).
   const loader = deps.io.createResourceLoader({
     cwd: cfg.effectiveCwd,
     agentDir,
-    noExtensions: !cfg.extensions,
-    noSkills: cfg.noSkills,
     noPromptTemplates: true,
     noThemes: true,
     noContextFiles: true,
@@ -348,12 +342,10 @@ export async function runAgent(
 
   // Apply recursion guard: remove our own tools from the child's active set.
   // Runs after bindExtensions so extension-registered tools are included in the
-  // post-bind active set. Only needed when extensions are loaded (extensions: false
-  // means no extension tools were registered, so the guard is a no-op).
-  if (cfg.extensions) {
-    const filtered = filterActiveTools(session.getActiveToolNames());
-    session.setActiveToolsByName(filtered);
-  }
+  // post-bind active set. Unconditional: children always load the parent's
+  // extensions, so the guard must always strip our dispatch tools.
+  const filtered = filterActiveTools(session.getActiveToolNames());
+  session.setActiveToolsByName(filtered);
 
   options.onSessionCreated?.(session);
 

package/src/lifecycle/agent.ts

@@ -81,7 +81,6 @@ export interface AgentInit {
 	prompt?: string;
 	model?: Model<any>;
 	maxTurns?: number;
-	isolated?: boolean;
 	thinkingLevel?: ThinkingLevel;
 	parentSession?: ParentSessionInfo;
 	isBackground?: boolean;
@@ -140,7 +139,6 @@ export class Agent {
 	private readonly _prompt?: string;
 	private readonly _model?: Model<any>;
 	private readonly _maxTurns?: number;
-	private readonly _isolated?: boolean;
 	private readonly _thinkingLevel?: ThinkingLevel;
 	private readonly _parentSession?: ParentSessionInfo;
 	private readonly _signal?: AbortSignal;
@@ -198,7 +196,6 @@ export class Agent {
 		this._prompt = init.prompt;
 		this._model = init.model;
 		this._maxTurns = init.maxTurns;
-		this._isolated = init.isolated;
 		this._thinkingLevel = init.thinkingLevel;
 		this._parentSession = init.parentSession;
 		this._signal = init.signal;
@@ -261,7 +258,6 @@ export class Agent {
 				maxTurns: this._maxTurns,
 				defaultMaxTurns: runConfig?.defaultMaxTurns,
 				graceTurns: runConfig?.graceTurns,
-				isolated: this._isolated,
 				thinkingLevel: this._thinkingLevel,
 				signal: this.abortController.signal,
 				onSessionCreated: (session) => {

package/src/service/service-adapter.ts

@@ -66,7 +66,6 @@ export class SubagentsServiceAdapter implements SubagentsService {
       model,
       maxTurns: options?.maxTurns,
       thinkingLevel: options?.thinkingLevel,
-      isolated: options?.isolated,
       inheritContext: options?.inheritContext,
       bypassQueue: options?.bypassQueue,
       isBackground,

package/src/service/service.ts

@@ -10,14 +10,26 @@
  */
 
 import type { LifetimeUsage } from "#src/lifecycle/usage";
-import type { WorkspaceProvider } from "#src/lifecycle/workspace";
-
-// Generative extension seam (ADR 0002, Phase 16 Step 2). Only the provider
-// entry-point type is re-exported here; a consumer assigning to
-// `WorkspaceProvider` recovers `Workspace` and the context types via inference
-// (e.g. `Parameters<WorkspaceProvider["prepare"]>[0]`). Named re-exports of
-// those collaborator types are tracked in #272.
-export type { LifetimeUsage, WorkspaceProvider };
+import type {
+  Workspace,
+  WorkspaceDisposeOutcome,
+  WorkspaceDisposeResult,
+  WorkspacePrepareContext,
+  WorkspaceProvider,
+} from "#src/lifecycle/workspace";
+
+// Generative extension seam (ADR 0002, Phase 16 Step 2). The provider type
+// and all four collaborator types it references are re-exported by name so
+// consumers can import them directly rather than recovering them via
+// indexed-access inference (e.g. `Parameters<WorkspaceProvider["prepare"]>[0]`).
+export type {
+  LifetimeUsage,
+  Workspace,
+  WorkspaceDisposeOutcome,
+  WorkspaceDisposeResult,
+  WorkspacePrepareContext,
+  WorkspaceProvider,
+};
 
 export type SubagentStatus =
   | "queued"
@@ -49,7 +61,6 @@ export interface SpawnOptions {
   model?: string;
   maxTurns?: number;
   thinkingLevel?: string;
-  isolated?: boolean;
   inheritContext?: boolean;
   foreground?: boolean;
   bypassQueue?: boolean;

package/src/session/prompts.ts

@@ -5,12 +5,6 @@
 import type { EnvInfo } from "#src/session/env";
 import type { AgentPromptConfig } from "#src/types";
 
-/** Extra sections to inject into the system prompt (skills, etc.). */
-export interface PromptExtras {
-  /** Preloaded skill contents to inject. */
-  skillBlocks?: { name: string; content: string }[];
-}
-
 /**
  * Build the system prompt for an agent from its config.
  *
@@ -25,14 +19,12 @@ export interface PromptExtras {
  * inherited content so the stable prefix is cacheable by the LLM's KV cache.
  *
  * @param parentSystemPrompt  The parent agent's effective system prompt (for append mode).
- * @param extras  Optional extra sections to inject (memory, preloaded skills).
  */
 export function buildAgentPrompt(
   config: AgentPromptConfig,
   cwd: string,
   env: EnvInfo,
   parentSystemPrompt?: string,
-  extras?: PromptExtras,
 ): string {
   const activeAgentTag = `<active_agent name="${config.name}"/>\n\n`;
 
@@ -41,18 +33,6 @@ Working directory: ${cwd}
 ${env.isGitRepo ? `Git repository: yes\nBranch: ${env.branch}` : "Not a git repository"}
 Platform: ${env.platform}`;
 
-  // Build optional extras suffix
-  const extraSections: string[] = [];
-  if (extras?.skillBlocks?.length) {
-    for (const skill of extras.skillBlocks) {
-      extraSections.push(
-        `\n# Preloaded Skill: ${skill.name}\n${skill.content}`,
-      );
-    }
-  }
-  const extrasSuffix =
-    extraSections.length > 0 ? "\n\n" + extraSections.join("\n") : "";
-
   if (config.promptMode === "append") {
     const identity = parentSystemPrompt ?? genericBase;
 
@@ -85,8 +65,7 @@ You are operating as a sub-agent invoked to handle a specific task.
       "\n\n" +
       activeAgentTag +
       envBlock +
-      customSection +
-      extrasSuffix
+      customSection
     );
   }
 
@@ -97,7 +76,7 @@ You have been invoked to handle a specific task autonomously.
 ${envBlock}`;
 
   return (
-    activeAgentTag + replaceHeader + "\n\n" + config.systemPrompt + extrasSuffix
+    activeAgentTag + replaceHeader + "\n\n" + config.systemPrompt
   );
 }
 

package/src/session/session-config.ts

@@ -12,8 +12,6 @@
 
 import type { AgentConfigLookup } from "#src/config/agent-types";
 import type { EnvInfo } from "#src/session/env";
-import type { PromptExtras } from "#src/session/prompts";
-import type { PreloadedSkill } from "#src/session/skill-loader";
 import type { AgentPromptConfig, SubagentType, ThinkingLevel } from "#src/types";
 
 // ── Public interfaces ────────────────────────────────────────────────────────
@@ -21,19 +19,17 @@ import type { AgentPromptConfig, SubagentType, ThinkingLevel } from "#src/types"
 /**
  * IO collaborators injected into `assembleSessionConfig`.
  *
- * Bundling the four IO-touching (or promptly testable) functions into a single
+ * Bundling the IO-touching (or promptly testable) function into a single
  * interface keeps the assembler free of direct module imports and makes it
  * trivially testable without `vi.mock()` — callers inject real implementations
  * at the edge (`agent-runner.ts`) or stubs in tests.
  */
 export interface AssemblerIO {
-  preloadSkills: (skills: string[], cwd: string) => PreloadedSkill[];
   buildAgentPrompt: (
     config: AgentPromptConfig,
     cwd: string,
     env: EnvInfo,
     parentPrompt?: string,
-    extras?: PromptExtras,
   ) => string;
 }
 
@@ -67,8 +63,6 @@ export interface AssemblerContext {
 export interface AssemblerOptions {
   /** Override working directory (e.g. for worktree isolation). */
   cwd?: string;
-  /** When true, forces extensions and skills to false. */
-  isolated?: boolean;
   /** Explicit model override — wins over agentConfig.model and parent model. */
   model?: unknown;
   /** Explicit thinking level — wins over agentConfig.thinking. */
@@ -87,8 +81,6 @@ export interface SessionConfig {
   systemPrompt: string;
   /** Built-in tool name allowlist for this agent type. */
   toolNames: string[];
-  /** Resolved extensions setting: true = inherit all, false = none. */
-  extensions: boolean;
   /**
    * Resolved model instance (undefined → use parent model as passed to SDK).
    * Opaque handle — the assembler passes it through without inspection.
@@ -97,10 +89,6 @@ export interface SessionConfig {
   model: unknown;
   /** Resolved thinking level (undefined → inherit from session). */
   thinkingLevel: ThinkingLevel | undefined;
-  /** Whether to skip skill loading in the resource loader (`noSkills` flag). */
-  noSkills: boolean;
-  /** Prompt extras (memory block, preloaded skill blocks) — for transparency. */
-  extras: PromptExtras;
   /** Per-agent configured max turns (from agentConfig.maxTurns). */
   agentMaxTurns: number | undefined;
 }
@@ -150,7 +138,7 @@ function resolveDefaultModel(
  *
  * @param type       The subagent type name (case-insensitive registry lookup).
  * @param ctx        Narrow context from the parent session.
- * @param options    Per-call overrides (cwd, isolated, model, thinkingLevel).
+ * @param options    Per-call overrides (cwd, model, thinkingLevel).
  * @param env        Pre-resolved environment info from `detectEnv()`.
  * @param registry   Agent config lookup — provides resolveAgentConfig and getToolNamesForType.
  * @param io         IO collaborators (skill loader, memory builder, prompt builder).
@@ -167,21 +155,6 @@ export function assembleSessionConfig(
 
   const effectiveCwd = options.cwd ?? ctx.cwd;
 
-  // Resolve extensions/skills: isolated overrides to false
-  const extensions = options.isolated ? false : agentConfig.extensions;
-  const skills = options.isolated ? false : agentConfig.skills;
-
-  // Build prompt extras (memory, preloaded skills)
-  const extras: PromptExtras = {};
-
-  // Skill preloading: when skills is string[], preload their content into the prompt
-  if (Array.isArray(skills)) {
-    const loaded = io.preloadSkills(skills, effectiveCwd);
-    if (loaded.length > 0) {
-      extras.skillBlocks = loaded;
-    }
-  }
-
   const toolNames = registry.getToolNamesForType(type);
 
   // Build system prompt from the resolved agent config
@@ -190,13 +163,8 @@ export function assembleSessionConfig(
     effectiveCwd,
     env,
     ctx.parentSystemPrompt,
-    extras,
   );
 
-  // noSkills: when we've already preloaded skills into the prompt, or skills = false,
-  // tell the resource loader not to load them again.
-  const noSkills = skills === false || Array.isArray(skills);
-
   // Model resolution: explicit option > config model string > parent model
   const model =
     options.model ??
@@ -212,11 +180,8 @@ export function assembleSessionConfig(
     effectiveCwd,
     systemPrompt,
     toolNames,
-    extensions,
     model,
     thinkingLevel,
-    noSkills,
-    extras,
     agentMaxTurns,
   };
 }

package/src/tools/agent-tool.ts

@@ -220,11 +220,6 @@ Guidelines:
 						description: "Optional agent ID to resume from. Continues from previous context.",
 					}),
 				),
-				isolated: Type.Optional(
-					Type.Boolean({
-						description: "If true, agent gets no extension/MCP tools — only built-in tools.",
-					}),
-				),
 				inherit_context: Type.Optional(
 					Type.Boolean({
 						description:

package/src/tools/background-spawner.ts

@@ -48,7 +48,6 @@ export function spawnBackground(
       description: execution.description,
       model: execution.model,
       maxTurns: execution.effectiveMaxTurns,
-      isolated: execution.isolated,
       inheritContext: execution.inheritContext,
       thinkingLevel: execution.thinking,
       isBackground: true,

package/src/tools/foreground-runner.ts

@@ -102,7 +102,6 @@ export async function runForeground(
         description: execution.description,
         model: execution.model,
         maxTurns: execution.effectiveMaxTurns,
-        isolated: execution.isolated,
         inheritContext: execution.inheritContext,
         thinkingLevel: execution.thinking,
         invocation: execution.agentInvocation,

package/src/tools/spawn-config.ts

@@ -43,7 +43,6 @@ export interface SpawnExecution {
   thinking: ThinkingLevel | undefined;
   inheritContext: boolean;
   runInBackground: boolean;
-  isolated: boolean;
   agentInvocation: AgentInvocation;
 }
 
@@ -102,7 +101,6 @@ export function resolveSpawnConfig(
   const thinking = resolvedConfig.thinking;
   const inheritContext = resolvedConfig.inheritContext;
   const runInBackground = resolvedConfig.runInBackground;
-  const isolated = resolvedConfig.isolated;
 
   // Compute display model name (only shown when different from parent)
   const parentModelId = modelInfo.parentModel?.id;
@@ -120,7 +118,6 @@ export function resolveSpawnConfig(
     modelName,
     thinking,
     maxTurns: normalizeMaxTurns(resolvedConfig.maxTurns),
-    isolated,
     inheritContext,
     runInBackground,
   };
@@ -147,7 +144,6 @@ export function resolveSpawnConfig(
       thinking,
       inheritContext,
       runInBackground,
-      isolated,
       agentInvocation,
     },
     presentation: { modelName, agentTags, detailBase },

package/src/types.ts

@@ -39,10 +39,6 @@ export interface AgentPromptConfig {
 /** Unified agent configuration — used for both default and user-defined agents. */
 export interface AgentConfig extends AgentIdentity, AgentPromptConfig {
   builtinToolNames?: string[];
-  /** true = inherit all extensions, false = none */
-  extensions: boolean;
-  /** true = inherit all, string[] = only listed, false = none */
-  skills: true | string[] | false;
   model?: string;
   thinking?: ThinkingLevel;
   maxTurns?: number;
@@ -50,8 +46,6 @@ export interface AgentConfig extends AgentIdentity, AgentPromptConfig {
   inheritContext?: boolean;
   /** Default for spawn: run in background. undefined = caller decides. */
   runInBackground?: boolean;
-  /** Default for spawn: no extension tools. undefined = caller decides. */
-  isolated?: boolean;
   /** true = this is an embedded default agent (informational) */
   isDefault?: boolean;
   /** false = agent is hidden from the registry */
@@ -65,7 +59,6 @@ export interface AgentInvocation {
   modelName?: string;
   thinking?: ThinkingLevel;
   maxTurns?: number;
-  isolated?: boolean;
   inheritContext?: boolean;
   runInBackground?: boolean;
 }