@gotgenes/pi-subagents 12.1.0 → 13.1.0

package/src/session/session-config.ts

@@ -1,10 +1,10 @@
 /**
  * session-config.ts — Pure configuration assembler for agent sessions.
  *
- * `assembleSessionConfig()` is the pure core extracted from `runAgent()`.
- * It accepts resolved inputs (agent type, narrow context, run options, env info)
- * and returns everything `runAgent()` needs to create the SDK session — without
- * importing or constructing any Pi SDK types.
+ * `assembleSessionConfig()` is the pure assembly core called by
+ * `createSubagentSession()`. It accepts resolved inputs (agent type, narrow
+ * context, run options, env info) and returns everything the factory needs to
+ * create the SDK session — without importing or constructing any Pi SDK types.
  *
  * The only async IO in the assembly phase (`detectEnv`) is handled by the caller
  * before invoking this function, keeping the assembler synchronous.
@@ -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.
+ * at the edge (`create-subagent-session.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;
 }
 
@@ -61,14 +57,12 @@ export interface AssemblerContext {
 }
 
 /**
- * Narrow slice of RunOptions execution fields consumed by the assembler.
+ * Narrow slice of per-spawn execution fields consumed by the assembler.
  * All fields are optional — callers pass only what they have.
  */
 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. */
@@ -76,7 +70,7 @@ export interface AssemblerOptions {
 }
 
 /**
- * Assembled configuration returned to `runAgent()`.
+ * Assembled configuration returned to `createSubagentSession()`.
  * Contains everything needed to create the SDK session and filter tools —
  * with no SDK object references.
  */
@@ -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 ??
@@ -205,18 +173,15 @@ export function assembleSessionConfig(
   // Thinking level: explicit option > agent config > undefined (inherit)
   const thinkingLevel = options.thinkingLevel ?? agentConfig.thinking;
 
-  // Per-agent max turns (combined with options.maxTurns and defaultMaxTurns by runAgent)
+  // Per-agent max turns (combined with per-call maxTurns and defaultMaxTurns by SubagentSession.runTurnLoop)
   const agentMaxTurns = agentConfig.maxTurns;
 
   return {
     effectiveCwd,
     systemPrompt,
     toolNames,
-    extensions,
     model,
     thinkingLevel,
-    noSkills,
-    extras,
     agentMaxTurns,
   };
 }

package/src/settings.ts

@@ -8,7 +8,7 @@ export interface SubagentsSettings {
   maxConcurrent?: number;
   /**
    * 0 = unlimited — the extension's single source of truth for that convention:
-   * `normalizeMaxTurns()` in agent-runner.ts treats 0 → `undefined`, and the
+   * `normalizeMaxTurns()` in turn-limits.ts treats 0 → `undefined`, and the
    * `/agents` → Settings input prompt explicitly says "0 = unlimited".
    */
   defaultMaxTurns?: number;

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/get-result-tool.ts

@@ -1,8 +1,8 @@
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
 import type { AgentConfigLookup } from "#src/config/agent-types";
-import { getAgentConversation } from "#src/lifecycle/agent-runner";
 import { getSessionContextPercent } from "#src/lifecycle/usage";
+import { getAgentConversation } from "#src/session/conversation";
 import { formatLifetimeTokens, textResult } from "#src/tools/helpers";
 import type { Agent } from "#src/types";
 import { formatDuration, getDisplayName } from "#src/ui/display";

package/src/tools/spawn-config.ts

@@ -10,7 +10,7 @@
 import type { Model } from "@earendil-works/pi-ai";
 import type { AgentTypeRegistry } from "#src/config/agent-types";
 import { resolveAgentInvocationConfig } from "#src/config/invocation-config";
-import { normalizeMaxTurns } from "#src/lifecycle/agent-runner";
+import { normalizeMaxTurns } from "#src/lifecycle/turn-limits";
 import { resolveInvocationModel } from "#src/session/model-resolver";
 import type { AgentInvocation, SubagentType, ThinkingLevel } from "#src/types";
 import {
@@ -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;
 }

package/src/ui/agent-config-editor.ts

@@ -47,13 +47,8 @@ export function buildEjectContent(cfg: AgentConfig): string {
   if (cfg.thinking) fmFields.push(`thinking: ${cfg.thinking}`);
   if (cfg.maxTurns) fmFields.push(`max_turns: ${cfg.maxTurns}`);
   fmFields.push(`prompt_mode: ${cfg.promptMode}`);
-  if (!cfg.extensions) fmFields.push("extensions: false");
-  if (cfg.skills === false) fmFields.push("skills: false");
-  else if (Array.isArray(cfg.skills))
-    fmFields.push(`skills: ${cfg.skills.join(", ")}`);
   if (cfg.inheritContext) fmFields.push("inherit_context: true");
   if (cfg.runInBackground) fmFields.push("run_in_background: true");
-  if (cfg.isolated) fmFields.push("isolated: true");
   return `---\n${fmFields.join("\n")}\n---\n\n${cfg.systemPrompt}\n`;
 }
 

package/src/ui/agent-creation-wizard.ts

@@ -104,11 +104,8 @@ model: <optional model as "provider/modelId", e.g. "anthropic/claude-haiku-4-5-2
 thinking: <optional thinking level: off, minimal, low, medium, high, xhigh. Omit to inherit>
 max_turns: <optional max agentic turns. 0 or omit for unlimited (default)>
 prompt_mode: <"replace" (body IS the full system prompt) or "append" (body is appended to default prompt). Default: replace>
-extensions: <true (inherit all MCP/extension tools) or false (none). Default: true>
-skills: <true (inherit all), false (none), or comma-separated skill names to preload into prompt. Default: true>
 inherit_context: <true to fork parent conversation into agent so it sees chat history. Default: false>
 run_in_background: <true to run in background by default. Default: false>
-isolated: <true for no extension/MCP tools, only built-in tools. Default: false>
 ---
 
 <system prompt body — instructions for the agent>
@@ -120,7 +117,6 @@ Guidelines for choosing settings:
 - Use prompt_mode: append if the agent should keep the default system prompt and add specialization on top
 - Use prompt_mode: replace for fully custom agents with their own personality/instructions
 - Set inherit_context: true if the agent needs to know what was discussed in the parent conversation
-- Set isolated: true if the agent should NOT have access to MCP servers or other extensions
 - Only include frontmatter fields that differ from defaults — omit fields where the default is fine
 
 Write the file using the write tool. Only write the file, nothing else.`;

package/src/ui/display.ts

@@ -30,7 +30,7 @@ export interface AgentDetails {
   spinnerFrame?: number;
   /** Short model name if different from parent (e.g. "haiku", "sonnet"). */
   modelName?: string;
-  /** Notable config tags (e.g. ["thinking: high", "isolated"]). */
+  /** Notable config tags (e.g. ["thinking: high", "inherit context"]). */
   tags?: string[];
   /** Current turn count. */
   turnCount?: number;
@@ -135,7 +135,6 @@ export function buildInvocationTags(
   const tags: string[] = [];
   if (!invocation) return { tags };
   if (invocation.thinking) tags.push(`thinking: ${invocation.thinking}`);
-  if (invocation.isolated) tags.push("isolated");
   if (invocation.inheritContext) tags.push("inherit context");
   if (invocation.runInBackground) tags.push("background");
   if (invocation.maxTurns != null) tags.push(`max turns: ${invocation.maxTurns}`);