@pi-unipi/subagents 2.6.1 → 2.6.2

package/src/agent-overrides.ts

@@ -0,0 +1,183 @@
+/**
+ * @pi-unipi/subagents — Builtin agent overrides + defaults
+ *
+ * Ported from pi-subagents applyBuiltinOverrides/applySubagentDefaults
+ * (src/agents/agents.ts). Semantics identical; the source of settings is OUR
+ * subagents.json `subagents` object (user: ~/.unipi/config/subagents.json;
+ * project: <ws>/.unipi/config/subagents.json) instead of pi settings files.
+ *
+ * Our existing enablement rule is preserved: merged JSON types[name].enabled
+ * !== false AND resolved agent frontmatter enabled !== false. disableBuiltins
+ * (reference parity) disables ALL builtin agents (code + file) while custom
+ * user/project agents keep working.
+ */
+
+import type { AgentConfig } from "./types.js";
+
+export interface BuiltinAgentOverrideConfig {
+  description?: string;
+  outputMode?: "inline" | "file-only";
+  model?: string | false;
+  fallbackModels?: string[] | false;
+  thinking?: string | false;
+  systemPromptMode?: "replace" | "append";
+  inheritProjectContext?: boolean;
+  inheritSkills?: boolean;
+  defaultContext?: "fresh" | "fork" | false;
+  disabled?: boolean;
+  systemPrompt?: string;
+  skills?: string[] | false;
+  tools?: string[] | false | "inherit";
+  extensions?: string[] | false;
+  toolBudget?: { soft?: number; hard: number; block?: string[] | "*" } | false;
+  maxSubagentDepth?: number;
+}
+
+/** Settings block inside our subagents.json: { "subagents": { ... } }. */
+export interface SubagentSettings {
+  overrides: Record<string, BuiltinAgentOverrideConfig>;
+  defaultModel?: string;
+  defaultThinking?: string | false;
+  defaultExtensions?: string[];
+  disableBuiltins?: boolean;
+  disableThinking?: boolean;
+}
+
+export const EMPTY_SUBAGENT_SETTINGS: SubagentSettings = { overrides: {} };
+
+/** Parse the settings block from a parsed subagents.json (missing → empty). */
+export function parseSubagentSettings(raw: unknown): SubagentSettings {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return EMPTY_SUBAGENT_SETTINGS;
+  const obj = raw as Record<string, unknown>;
+  const overrides: Record<string, BuiltinAgentOverrideConfig> = {};
+  if (obj.overrides && typeof obj.overrides === "object" && !Array.isArray(obj.overrides)) {
+    for (const [name, value] of Object.entries(obj.overrides as Record<string, unknown>)) {
+      if (value && typeof value === "object" && !Array.isArray(value)) {
+        overrides[name] = value as BuiltinAgentOverrideConfig;
+      }
+    }
+  }
+  const settings: SubagentSettings = { overrides };
+  if (typeof obj.defaultModel === "string" && obj.defaultModel.trim()) {
+    settings.defaultModel = obj.defaultModel.trim();
+  }
+  if (obj.defaultThinking === false || typeof obj.defaultThinking === "string") {
+    settings.defaultThinking = obj.defaultThinking;
+  }
+  if (Array.isArray(obj.defaultExtensions)) {
+    settings.defaultExtensions = obj.defaultExtensions.filter(
+      (entry): entry is string => typeof entry === "string" && entry.trim().length > 0,
+    );
+  }
+  if (obj.disableBuiltins === true) settings.disableBuiltins = true;
+  if (obj.disableThinking === true) settings.disableThinking = true;
+  return settings;
+}
+
+function applyToolsOverride(target: AgentConfig, toolsOverride: string[] | false | "inherit"): void {
+  if (toolsOverride === "inherit") {
+    delete target.builtinToolNames;
+    return;
+  }
+  target.builtinToolNames = toolsOverride === false ? [] : [...toolsOverride];
+}
+
+/** Apply a single override to a builtin agent (reference applyBuiltinOverride). */
+export function applyBuiltinOverride(
+  agent: AgentConfig,
+  override: BuiltinAgentOverrideConfig,
+): AgentConfig {
+  const next: AgentConfig = { ...agent };
+  if (override.description !== undefined) next.description = override.description;
+  if (override.outputMode !== undefined) next.outputMode = override.outputMode;
+  if (override.model !== undefined) next.model = override.model === false ? undefined : override.model;
+  if (override.fallbackModels !== undefined) {
+    next.fallbackModels = override.fallbackModels === false ? undefined : [...override.fallbackModels];
+  }
+  if (override.thinking !== undefined) next.thinking = override.thinking;
+  if (override.systemPromptMode !== undefined) {
+    next.promptMode = override.systemPromptMode;
+    next.systemPromptMode = override.systemPromptMode;
+  }
+  if (override.inheritProjectContext !== undefined) next.inheritProjectContext = override.inheritProjectContext;
+  if (override.inheritSkills !== undefined) next.inheritSkills = override.inheritSkills;
+  if (override.defaultContext !== undefined) {
+    next.defaultContext = override.defaultContext === false ? undefined : override.defaultContext;
+  }
+  if (override.systemPrompt !== undefined && override.systemPrompt.trim()) {
+    next.systemPrompt = override.systemPrompt;
+  }
+  if (override.skills !== undefined) {
+    next.skills = override.skills === false ? false : [...override.skills];
+  }
+  if (override.tools !== undefined) applyToolsOverride(next, override.tools);
+  if (override.extensions !== undefined) {
+    next.extensions = override.extensions === false ? false : [...override.extensions];
+  }
+  if (override.toolBudget !== undefined) {
+    // Stored for Phase 2 budget resolution.
+    (next as AgentConfig & { toolBudget?: unknown }).toolBudget =
+      override.toolBudget === false ? undefined : override.toolBudget;
+  }
+  if (override.maxSubagentDepth !== undefined) next.maxSubagentDepth = override.maxSubagentDepth;
+  if (override.disabled === true) next.enabled = false;
+  else if (override.disabled === false) next.enabled = true;
+  return next;
+}
+
+/** Apply defaultModel/defaultThinking/defaultExtensions to a loaded agent list. */
+export function applySubagentDefaults(
+  agents: AgentConfig[],
+  settings: SubagentSettings,
+): AgentConfig[] {
+  return agents.map((agent) => {
+    let next = agent;
+    if (settings.defaultModel && !agent.model) {
+      next = { ...next, model: settings.defaultModel };
+    }
+    if (settings.defaultThinking !== undefined && agent.thinking === undefined) {
+      next = { ...next, thinking: settings.defaultThinking };
+    }
+    if (settings.defaultExtensions?.length && agent.extensions === true) {
+      next = { ...next, extensions: [...settings.defaultExtensions] };
+    }
+    return next;
+  });
+}
+
+/**
+ * Apply builtin overrides to a builtin agent list. Project settings win over
+ * user settings per-field; disableBuiltins disables every builtin agent when
+ * active; disableThinking clears thinking from builtins without an explicit
+ * override (reference semantics).
+ */
+export function applyBuiltinOverrides(
+  builtinAgents: AgentConfig[],
+  userSettings: SubagentSettings,
+  projectSettings: SubagentSettings,
+): AgentConfig[] {
+  const projectBulkDisabled = projectSettings.disableBuiltins === true;
+  const userBulkDisabled = !projectBulkDisabled && userSettings.disableBuiltins === true;
+  const disableThinking = projectSettings.disableThinking ?? userSettings.disableThinking ?? false;
+
+  return builtinAgents.map((agent) => {
+    const projectOverride = projectSettings.overrides[agent.name];
+    if (projectOverride) {
+      return withThinkingPolicy(applyBuiltinOverride(agent, projectOverride), projectOverride.thinking !== undefined);
+    }
+    const userOverride = userSettings.overrides[agent.name];
+    if (userOverride) {
+      return withThinkingPolicy(applyBuiltinOverride(agent, userOverride), userOverride.thinking !== undefined);
+    }
+    if (projectBulkDisabled || userBulkDisabled) {
+      return withThinkingPolicy({ ...agent, enabled: false }, false);
+    }
+    return withThinkingPolicy(agent, false);
+  });
+
+  function withThinkingPolicy(agent: AgentConfig, hasExplicitThinkingOverride: boolean): AgentConfig {
+    if (!disableThinking || hasExplicitThinkingOverride) return agent;
+    if (agent.thinking === undefined) return agent;
+    return { ...agent, thinking: undefined };
+  }
+}

package/src/agent-runner.ts

@@ -0,0 +1,265 @@
+/**
+ * @pi-unipi/subagents — Agent runner
+ *
+ * Creates sessions, runs agents, collects results.
+ * Forwards abort signals for ESC propagation.
+ */
+
+import type { Model } from "@earendil-works/pi-ai";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import {
+  type AgentSession,
+  type AgentSessionEvent,
+  createAgentSession,
+  DefaultResourceLoader,
+  type ExtensionAPI,
+  getAgentDir,
+  SessionManager,
+  SettingsManager,
+} from "@earendil-works/pi-coding-agent";
+import { BUILTIN_CONFIGS, type AgentConfig, type AgentType, type ThinkingLevel } from "./types.js";
+
+/** Coerce frontmatter thinking (string | false | ThinkingLevel) to ThinkingLevel. */
+export function coerceThinkingLevel(raw: AgentConfig["thinking"]): ThinkingLevel | undefined {
+  if (raw === false || raw === undefined || raw === null) return undefined;
+  if (typeof raw === "string") {
+    const valid: ThinkingLevel[] = ["off", "minimal", "low", "medium", "high", "xhigh"];
+    return valid.includes(raw as ThinkingLevel) ? (raw as ThinkingLevel) : undefined;
+  }
+  return raw;
+}
+
+/** Tools excluded from subagents to prevent nesting. Legacy names remain for older hosts. */
+const EXCLUDED_TOOL_NAMES = ["spawn_helper", "get_helper_result", "Agent", "get_result"];
+
+/** All known built-in tool names. */
+const BUILTIN_TOOL_NAMES = ["read", "bash", "edit", "write", "grep", "find", "ls"];
+
+/** Grace turns after the soft turn limit before aborting. */
+const GRACE_TURNS = 5;
+
+/** Tool activity info. */
+export interface ToolActivity {
+  type: "start" | "end";
+  toolName: string;
+}
+
+/** Options for running an agent. */
+export interface RunOptions {
+  pi: ExtensionAPI;
+  model?: Model<any>;
+  agentConfig?: AgentConfig;
+  maxTurns?: number;
+  signal?: AbortSignal;
+  isolated?: boolean;
+  thinkingLevel?: ThinkingLevel;
+  cwd?: string;
+  onToolActivity?: (activity: ToolActivity) => void;
+  onTextDelta?: (delta: string, fullText: string) => void;
+  onSessionCreated?: (session: AgentSession) => void;
+  onTurnEnd?: (turnCount: number) => void;
+}
+
+/** Result from running an agent. */
+export interface RunResult {
+  responseText: string;
+  session: AgentSession;
+  aborted: boolean;
+  steered: boolean;
+}
+
+/** Collect last assistant message text. */
+function collectResponseText(session: AgentSession) {
+  let text = "";
+  const unsubscribe = session.subscribe((event: AgentSessionEvent) => {
+    if (event.type === "message_start") {
+      text = "";
+    }
+    if (event.type === "message_update" && event.assistantMessageEvent.type === "text_delta") {
+      text += event.assistantMessageEvent.delta;
+    }
+  });
+  return { getText: () => text, unsubscribe };
+}
+
+/** Get last assistant text from session history. */
+function getLastAssistantText(session: AgentSession): string {
+  for (let i = session.messages.length - 1; i >= 0; i--) {
+    const msg = session.messages[i];
+    if (msg.role !== "assistant") continue;
+    const text = msg.content
+      .filter((c): c is { type: "text"; text: string } => c.type === "text")
+      .map((c) => c.text)
+      .join("")
+      .trim();
+    if (text) return text;
+  }
+  return "";
+}
+
+/** Wire abort signal to session. */
+function forwardAbortSignal(session: AgentSession, signal?: AbortSignal): () => void {
+  if (!signal) return () => {};
+  const onAbort = () => session.abort();
+  signal.addEventListener("abort", onAbort, { once: true });
+  return () => signal.removeEventListener("abort", onAbort);
+}
+
+/** Get tool names for agent type. */
+function getToolNamesForType(type: AgentType, config?: AgentConfig): string[] {
+  if (config?.builtinToolNames?.length) {
+    return [...config.builtinToolNames];
+  }
+  return [...BUILTIN_TOOL_NAMES];
+}
+
+/** Resolve agent config for a type.
+ * Priority: explicit config > builtin config > default
+ */
+function resolveAgentConfig(type: AgentType, explicitConfig?: AgentConfig): AgentConfig | undefined {
+  if (explicitConfig) return explicitConfig;
+  return BUILTIN_CONFIGS[type];
+}
+
+/**
+ * Run an agent session.
+ */
+export async function runAgent(
+  ctx: ExtensionContext,
+  type: AgentType,
+  prompt: string,
+  options: RunOptions,
+): Promise<RunResult> {
+  const effectiveCwd = options.cwd ?? ctx.cwd;
+
+  // Resolve agent config
+  const agentConfig = resolveAgentConfig(type, options.agentConfig);
+  const parentSystemPrompt = ctx.getSystemPrompt();
+
+  // Build system prompt using config or defaults
+  let systemPrompt: string;
+  if (agentConfig?.systemPrompt && agentConfig.promptMode === "replace") {
+    systemPrompt = agentConfig.systemPrompt;
+  } else if (options.isolated) {
+    const base = agentConfig?.systemPrompt ?? `You are a ${type} agent.`;
+    systemPrompt = `${base} Follow the task instructions precisely. Do not ask questions.`;
+  } else {
+    const agentPrompt = agentConfig?.systemPrompt ?? `You are a ${type} agent.`;
+    systemPrompt = parentSystemPrompt + `\n\n${agentPrompt}`;
+  }
+
+  // Get tool names from config
+  let toolNames = getToolNamesForType(type, agentConfig);
+
+  // Create resource loader
+  // Respect agentConfig.extensions/skills flags: if explicitly false, skip loading.
+  // This prevents explore/work agents from loading all parent extensions.
+  const agentDir = getAgentDir();
+  const skipExtensions = options.isolated || agentConfig?.extensions === false;
+  const skipSkills = options.isolated || agentConfig?.skills === false;
+  const loader = new DefaultResourceLoader({
+    cwd: effectiveCwd,
+    agentDir,
+    noExtensions: skipExtensions,
+    noSkills: skipSkills,
+    noPromptTemplates: true,
+    noThemes: true,
+    noContextFiles: true,
+    systemPromptOverride: () => systemPrompt,
+    appendSystemPromptOverride: () => [],
+  });
+  await loader.reload();
+
+  // Resolve model
+  const model = options.model ?? ctx.model;
+
+  // Create session
+  const sessionOpts: Parameters<typeof createAgentSession>[0] = {
+    cwd: effectiveCwd,
+    agentDir,
+    sessionManager: SessionManager.inMemory(effectiveCwd),
+    settingsManager: SettingsManager.create(effectiveCwd, agentDir),
+    modelRegistry: ctx.modelRegistry,
+    model,
+    tools: toolNames,
+    resourceLoader: loader,
+  };
+  if (options.thinkingLevel) {
+    sessionOpts.thinkingLevel = options.thinkingLevel;
+  }
+
+  const { session } = await createAgentSession(sessionOpts);
+
+  // Filter out our tools to prevent nesting
+  const activeTools = session.getActiveToolNames().filter((t) => {
+    if (EXCLUDED_TOOL_NAMES.includes(t)) return false;
+    return true;
+  });
+  session.setActiveToolsByName(activeTools);
+
+  // Bind extensions — only if extensions were loaded.
+  // Skipping for agents with extensions: false avoids firing session_start
+  // on an empty extension set, preventing unnecessary MODULE_READY cascade.
+  if (!skipExtensions) {
+    await session.bindExtensions({
+      onError: (err) => {
+        options.onToolActivity?.({
+          type: "end",
+          toolName: `extension-error:${err.extensionPath}`,
+        });
+      },
+    });
+  }
+
+  options.onSessionCreated?.(session);
+
+  // Track turns
+  let turnCount = 0;
+  const maxTurns = options.maxTurns;
+  let softLimitReached = false;
+  let aborted = false;
+
+  let currentMessageText = "";
+  const unsubTurns = session.subscribe((event: AgentSessionEvent) => {
+    if (event.type === "turn_end") {
+      turnCount++;
+      options.onTurnEnd?.(turnCount);
+      if (maxTurns != null) {
+        if (!softLimitReached && turnCount >= maxTurns) {
+          softLimitReached = true;
+          session.steer("You have reached your turn limit. Wrap up immediately — provide your final answer now.");
+        } else if (softLimitReached && turnCount >= maxTurns + GRACE_TURNS) {
+          aborted = true;
+          session.abort();
+        }
+      }
+    }
+    if (event.type === "message_start") {
+      currentMessageText = "";
+    }
+    if (event.type === "message_update" && event.assistantMessageEvent.type === "text_delta") {
+      currentMessageText += event.assistantMessageEvent.delta;
+      options.onTextDelta?.(event.assistantMessageEvent.delta, currentMessageText);
+    }
+    if (event.type === "tool_execution_start") {
+      options.onToolActivity?.({ type: "start", toolName: event.toolName });
+    }
+    if (event.type === "tool_execution_end") {
+      options.onToolActivity?.({ type: "end", toolName: event.toolName });
+    }
+  });
+
+  const collector = collectResponseText(session);
+  const cleanupAbort = forwardAbortSignal(session, options.signal);
+
+  try {
+    await session.prompt(prompt);
+  } finally {
+    unsubTurns();
+    collector.unsubscribe();
+    cleanupAbort();
+  }
+
+  const responseText = collector.getText().trim() || getLastAssistantText(session);
+  return { responseText, session, aborted, steered: softLimitReached };
+}