pi-subagents-lite 0.4.1 → 1.0.1

package/src/index.ts

@@ -15,7 +15,7 @@
  *   - Config mutations update cache + atomic write to disk
  *
  * Commands:
- *   - /agents: Management menu with 5 sub-menus
+ *   - /agents: Management menu (model settings, concurrency, running agents, debug)
  *
  * Events:
  *   - tool_call: Inject model into Agent tool calls
@@ -33,10 +33,10 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 import type { SessionModelOverrides, SubagentsConfig } from "./model-precedence.js";
 import { DEFAULT_AGENTS } from "./default-agents.js";
-import { registerAgents, getAvailableTypes } from "./agent-types.js";
+import { registerAgents, getAvailableTypes, setAgentScanDirs } from "./agent-types.js";
 import { scanAgentFilesInDir, mergeAgents } from "./agent-discovery.js";
 import { AgentManager } from "./agent-manager.js";
-import { AgentWidget, buildStatsParts, formatMs, getDisplayName, type AgentActivity, type UICtx } from "./ui/agent-widget.js";
+import { AgentWidget, buildStatsParts, formatMs, getDisplayName, type AgentActivity, type Theme, type UICtx } from "./ui/agent-widget.js";
 import { showAgentsMainMenu } from "./menus.js";
 import { loadConfig, DEFAULT_CONFIG } from "./config-io.js";
 import { executeAgentTool, toolCallListener, backgroundAgentIds, scheduleNudge } from "./tool-execution.js";
@@ -111,6 +111,9 @@ async function scanAndRegisterAgents(ctx: ExtensionContext): Promise<void> {
   const userAgentDir = path.join(homeDir, ".pi", "agent", "agents");
   const projectAgentDir = path.join(ctx.cwd, ".pi", "agents");
 
+  // Store scan dirs for on-demand discovery (agents added during the session)
+  setAgentScanDirs(userAgentDir, projectAgentDir);
+
   const [userAgents, projectAgents] = await Promise.all([
     scanAgentFilesInDir(userAgentDir, "user"),
     scanAgentFilesInDir(projectAgentDir, "project"),
@@ -134,7 +137,7 @@ async function loadConfigAndRegisterAgents(ctx: ExtensionContext): Promise<void>
 // ============================================================================
 
 /** Build the stats line for an agent result card. Used by both renderers. */
-function buildStatsLine(d: Record<string, unknown>, theme: any): string {
+function buildStatsLine(d: Record<string, unknown>, theme: Theme): string {
   const parts = buildStatsParts({
     toolUses: (d.toolUses as number) ?? 0,
     turnCount: d.turnCount as number | undefined,

package/src/menus.ts

@@ -301,6 +301,26 @@ export async function showModelSettingsMenu(
       );
     });
 
+    // Grace turns setting
+    const graceTurns = __config.agent.graceTurns ?? 6;
+    items.push(`Grace turns · ${graceTurns}`);
+    actions.push(async () => {
+      const input = await ctx.ui.input("Grace turns (≥ 0)", String(graceTurns));
+      if (input === undefined) return;
+      const parsed = parseInt(input.trim(), 10);
+      if (isNaN(parsed)) {
+        ctx.ui.notify("Invalid value — must be a number", "error");
+        return;
+      }
+      if (parsed < 0) {
+        ctx.ui.notify("Invalid value — must be ≥ 0", "error");
+        return;
+      }
+      __config.agent.graceTurns = parsed;
+      saveConfigAtomic(__config);
+      ctx.ui.notify(`Grace turns set to ${parsed}`, "info");
+    });
+
     items.push("");
     actions.push(async () => {});
     items.push("─── per-type overrides ───");
@@ -375,13 +395,20 @@ export async function showModelSettingsMenu(
     items.push("Clear all overrides");
     actions.push(async () => {
       const hasOverrides = Object.entries(__config.agent).some(
-        ([k, v]) => k !== "default" && k !== "forceBackground" && v != null,
+        ([k, v]) => k !== "default" && k !== "forceBackground" && k !== "graceTurns" && v != null,
       );
       if (!hasOverrides && __config.agent.default === null) {
         ctx.ui.notify("No overrides to clear", "info");
         return;
       }
-      __config.agent = { default: __config.agent.default, forceBackground: __config.agent.forceBackground };
+      const preserved: Record<string, unknown> = {
+        default: __config.agent.default,
+        forceBackground: __config.agent.forceBackground,
+      };
+      if (__config.agent.graceTurns != null) {
+        preserved.graceTurns = __config.agent.graceTurns;
+      }
+      __config.agent = preserved as typeof __config.agent;
       saveConfigAtomic(__config);
       ctx.ui.notify("All model overrides cleared", "info");
     });
@@ -453,8 +480,8 @@ async function handleAgentBriefing(ctx: ExtensionCommandContext): Promise<void>
     lines.push(config.description);
     lines.push("");
 
-    if (config.builtinToolNames) {
-      lines.push(`**Tools:** ${config.builtinToolNames.join(", ")}`);
+    if (config.registeredTools) {
+      lines.push(`**Tools:** ${config.registeredTools.join(", ")}`);
     }
     if (config.model) {
       lines.push(`**Default model:** ${config.model}`);
@@ -533,7 +560,7 @@ export async function showConcurrencySettingsMenu(
     items.push(`Default concurrency limit · ${__config.concurrency.default}`);
     actions.push(async () => {
       await promptConcurrencyInput(
-        ctx, "Default concurrency limit", __config.concurrency.default,
+        ctx, "Default limit", __config.concurrency.default,
         (value) => { __config.concurrency.default = value; },
       );
     });
@@ -839,13 +866,13 @@ async function showAgentTypes(ctx: ExtensionCommandContext): Promise<void> {
   for (const name of types) {
     const cfg = getAgentConfig(name);
     if (!cfg) continue;
-    const disabled = cfg.enabled === false ? " [DISABLED]" : "";
+    const hidden = cfg.hidden === true ? " [HIDDEN]" : "";
     const model = cfg.model ? `  Model: ${cfg.model}` : "";
-    const tools = cfg.builtinToolNames
-      ? `  Tools: ${cfg.builtinToolNames.join(", ")}`
+    const tools = cfg.registeredTools
+      ? `  Tools: ${cfg.registeredTools.join(", ")}`
       : "  Tools: all built-in tools";
     const source = cfg.source ? `  Source: ${cfg.source}` : "";
-    lines.push(`  ${name}${disabled}`);
+    lines.push(`  ${name}${hidden}`);
     lines.push(`    ${cfg.description}`);
     if (model) lines.push(model);
     lines.push(tools);

package/src/model-precedence.ts

@@ -17,7 +17,8 @@ export interface SubagentsConfig {
   agent: {
     default: string | null;
     forceBackground: boolean;
-    [agentType: string]: string | null | undefined | boolean;
+    graceTurns?: number;
+    [agentType: string]: string | null | undefined | boolean | number;
   };
   concurrency: {
     default: number;
@@ -60,10 +61,11 @@ export function resolveModel(options: ResolveModelOptions): string {
   const { subagentType, agentConfig, config, parentModelId, sessionOverrides } = options;
 
   // Precedence chain: session > config > frontmatter > parent
+  // Cast agent values: index signature includes number (graceTurns), but models are always strings
   const candidates: Array<string | boolean | null | undefined> = [
     sessionOverrides?.[subagentType],
     sessionOverrides?.["default"],
-    config.agent[subagentType],
+    config.agent[subagentType] as string | null | undefined,
     config.agent["default"],
     agentConfig?.model,
     parentModelId, // final fallback (always a valid string)

package/src/model-selector.ts

@@ -1,9 +1,6 @@
 /**
  * model-selector.ts — TUI model selection dialog.
  *
- * Ported from subagent-lazy/model-selector.ts verbatim.
- * Used by the /agents menu for model selection.
- *
  * Reuses the same building blocks as pi's ModelSelectorComponent but without
  * the SettingsManager dependency — no side effects, just callbacks.
  */
@@ -18,10 +15,7 @@ import {
   Text,
 } from "@earendil-works/pi-tui";
 import { DynamicBorder } from "@earendil-works/pi-coding-agent";
-
-// Theme type from ctx.ui.custom() callback — avoid deep import that may not resolve
-// in jiti extension loader. The constructor receives the theme instance directly.
-type Theme = any;
+import type { Theme } from "./ui/agent-widget.js";
 
 /* ------------------------------------------------------------------ */
 /*  Types                                                              */

package/src/output-file.ts

@@ -1,12 +1,9 @@
 /**
  * output-file.ts — Human-readable output logging for agent transcripts.
  *
- * Forked from upstream pi-subagents. Key modifications:
- *   - Rewrote from JSONL to human-readable format
- *   - Path changed to /tmp/pi-agent-outputs/<agentId>.log (no CID-encoded nesting)
- *   - Directory created with 0o700 permissions
- *   - Append-only, human-readable, supports `tail -f`
- *   - Lines: [USER], [TOOL], [ASSISTANT], [DONE] with ISO timestamps
+ * Path: /tmp/pi-agent-outputs/<agentId>.log
+ * Append-only, human-readable, supports `tail -f`.
+ * Lines: [USER], [TOOL], [ASSISTANT], [DONE] with ISO timestamps.
  */
 
 import { appendFileSync, mkdirSync, writeFileSync } from "node:fs";

package/src/prompts.ts

@@ -7,9 +7,8 @@
 
 import type { AgentConfig, EnvInfo } from "./types.js";
 import type { SkillMeta } from "./skill-loader.js";
-export type { SkillMeta };
 
-/** Extra sections to inject into the system prompt (skills only — no memoryBlock). */
+/** Extra sections to inject into the system prompt (skills). */
 export interface PromptExtras {
   /** Preloaded skill contents to inject (full content). */
   skillBlocks?: { name: string; content: string }[];
@@ -45,7 +44,7 @@ export function buildAgentPrompt(
   envLines.push(`Platform: ${env.platform}`);
   const envBlock = envLines.join("\n");
 
-  // Build optional extras suffix (skills only — no memoryBlock)
+  // Build optional extras suffix (skills)
   const extraSections: string[] = [];
 
   // Skill metadata whitelist (like Pi's available_skills format)

package/src/result-viewer.ts

@@ -17,10 +17,7 @@ import {
 } from "@earendil-works/pi-tui";
 import { DynamicBorder } from "@earendil-works/pi-coding-agent";
 import { type LifetimeUsage, formatTokens } from "./usage.js";
-import { formatMs } from "./ui/agent-widget.js";
-
-// Theme type from ctx.ui.custom() callback
-type Theme = any;
+import { formatMs, type Theme } from "./ui/agent-widget.js";
 
 /* ------------------------------------------------------------------ */
 /*  Types                                                              */

package/src/skill-loader.ts

@@ -16,8 +16,6 @@
  * SKILL.md is a skill — we don't descend into it (Pi: skills don't nest).
  *
  * Symlinks are rejected for security (deviation from Pi, which follows them).
- *
- * Changed from upstream: imports from ./utils.js instead of ./memory.js.
  */
 
 import type { Dirent } from "node:fs";

package/src/tool-execution.ts

@@ -10,7 +10,7 @@ import type { ExtensionContext, ToolCallEvent } from "@earendil-works/pi-coding-
 import type { AgentRecord } from "./types.js";
 import type { SpawnOptions as AgentManagerSpawnOptions } from "./agent-manager.js";
 import type { AgentActivity } from "./ui/agent-widget.js";
-import { resolveType, getAgentConfig } from "./agent-types.js";
+import { resolveType, getAgentConfig, discoverNewAgents } from "./agent-types.js";
 import { resolveModel } from "./model-precedence.js";
 import { addUsage, getLifetimeTotal, getSessionContextPercent, type LifetimeUsage } from "./usage.js";
 
@@ -173,7 +173,12 @@ export async function executeAgentTool(
   ctx: ExtensionContext,
 ): Promise<any> {
   const type = (params.agent as string) || "general-purpose";
-  const resolvedType = resolveType(type);
+  let resolvedType = resolveType(type);
+  if (!resolvedType) {
+    // Not found in registry — try scanning filesystem for agents added during the session
+    await discoverNewAgents();
+    resolvedType = resolveType(type);
+  }
   if (!resolvedType) {
     return errorResult(`Unknown agent type: ${type}`);
   }
@@ -181,7 +186,6 @@ export async function executeAgentTool(
   const prompt = params.prompt as string;
   const description = params.description as string;
   const runInBackground = params.run_in_background as boolean | undefined;
-  const isolated = params.isolated as boolean | undefined;
   const maxTurns = params.max_turns as number | undefined ?? getAgentConfig(resolvedType)?.maxTurns;
   const modelStr = params.model as string | undefined;
   const model = findModelInRegistry(modelStr, ctx.modelRegistry, ctx.model);
@@ -201,10 +205,10 @@ export async function executeAgentTool(
     description,
     model,
     maxTurns,
-    isolated,
     thinkingLevel,
     modelKey,
     invocation: modelName ? { modelName } : undefined,
+    graceTurns: __config.agent.graceTurns,
   };
 
   if (runInBackground || __config.agent.forceBackground) {
@@ -234,12 +238,9 @@ async function executeSpawnBackground(
   widget?.ensureTimer();
   widget?.update();
 
-  const record = manager.getRecord(agentId);
-  if (!record) {
-    return errorResult("Failed to create agent");
-  }
+  const record = manager.getRecord(agentId)!;
   const details: Record<string, unknown> = { type: resolvedType, description: spawnOptions.description };
-  const suffix = `A notification will arrive when done - User asks you not to poll or duplicate the delegated work.\n\nAgent ID: ${agentId}`;
+  const suffix = `A notification will arrive when done - User asks you not to poll, check status or duplicate the delegated work.\n\nAgent ID: ${agentId}`;
   const label = record.status === "queued" ? "Agent queued" : "Agent running";
 
   return successResult(`[${label}] ${suffix}`, details);
@@ -327,11 +328,6 @@ export async function toolCallListener(
     }
   }
 
-  // Inject isolated from agent config if not explicitly passed
-  if (input.isolated === undefined && agentConfig?.isolated !== undefined) {
-    input.isolated = agentConfig.isolated;
-  }
-
   // Inject thinking from agent config if not explicitly passed
   if (input.thinking === undefined && agentConfig?.thinking !== undefined) {
     input.thinking = agentConfig.thinking;

package/src/types.ts

@@ -1,11 +1,5 @@
 /**
- * types.ts — Type definitions for the subagent system.
- *
- * Trimmed from upstream: removed ScheduledSubagent, ScheduleStoreData,
- * IsolationMode, MemoryScope, JoinMode.
- * From AgentConfig: removed memory, isolation, inheritContext, runInBackground.
- * From AgentRecord: removed groupId, joinMode, worktree, worktreeResult.
- * From AgentInvocation: removed inheritContext, isolation.
+ * Type definitions for the subagent system.
  */
 
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
@@ -22,11 +16,21 @@ export interface AgentConfig {
   name: string;
   displayName?: string;
   description: string;
-  builtinToolNames?: string[];
-  /** Tool denylist — these tools are removed even if `builtinToolNames` or extensions include them. */
-  disallowedTools?: string[];
-  /** true = inherit all, string[] = only listed, false = none */
+  /** Tools to register with the session (controls availability, not LLM visibility). */
+  registeredTools?: string[];
+  /**
+   * Controls which tool schemas the LLM sees. Can reference built-in tools
+   * and extension tools. true = all, string[] = listed, false = none.
+   * Supports ext/* syntax to include all tools from an extension.
+   * Mutually exclusive with excludeTools.
+   */
+  tools?: true | string[] | false;
+  /** Tool blacklist — all tools except these are visible. Mutually exclusive with tools (when tools is string[]). */
+  excludeTools?: string[];
+  /** true = inherit all, string[] = only listed, false = none. Mutually exclusive with excludeExtensions. */
   extensions: true | string[] | false;
+  /** Extension blacklist — all extensions except these load. Mutually exclusive with extensions (when extensions is string[]). */
+  excludeExtensions?: string[];
   /** Whitelist of allowed skills (metadata only in system prompt). true = all, string[] = listed, false = none */
   skills: true | string[] | false;
   /** Skills to preload with full content into system prompt. string[] = listed, false/undefined = none */
@@ -35,14 +39,13 @@ export interface AgentConfig {
   thinking?: ThinkingLevel;
   maxTurns?: number;
   systemPrompt: string;
-  /** 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 */
-  enabled?: boolean;
+  /** true = agent is hidden from the schema enum but can still be called by name. */
+  hidden?: boolean;
   /** Where this agent was loaded from */
-  source?: "default" | "project" | "global";
+  source?: "project" | "global";
 }
 
 export interface AgentRecord {
@@ -87,7 +90,6 @@ export interface AgentInvocation {
   modelName?: string;
   thinking?: ThinkingLevel;
   maxTurns?: number;
-  isolated?: boolean;
   runInBackground?: boolean;
 }
 
@@ -109,8 +111,4 @@ export interface CompactionInfo {
   tokensBefore: number;
 }
 
-/** Parsed "provider/model-id" key. */
-export interface ModelKey {
-  provider: string;
-  modelId: string;
-}
+

package/src/ui/agent-widget.ts

@@ -1,9 +1,5 @@
 /**
  * agent-widget.ts — Persistent widget showing running/completed agents above the editor.
- *
- * Ported from upstream pi-subagents.
- * Import paths use relative imports within our extension.
- * addUsage/getLifetimeTotal/getSessionContextPercent imported from ../usage.js.
  */
 
 import { truncateToWidth } from "@earendil-works/pi-tui";
@@ -62,9 +58,10 @@ const TOOL_DISPLAY: Record<string, string> = {
 
 // ---- Types ----
 
-type Theme = {
+export type Theme = {
   fg(color: string, text: string): string;
   bold(text: string): string;
+  italic?: (text: string) => string;
 };
 
 export type UICtx = {

package/src/utils.ts

@@ -1,9 +1,8 @@
 /**
- * utils.ts — Security helpers: safe file access, name validation + general utilities.
+ * utils.ts — Security helpers and general utilities.
  *
- * Security helpers extracted from upstream memory.ts — pure implementations copied verbatim.
- * General utilities (parseModelKey, findModelInRegistry) moved here so both agent-runner
- * and tool-execution can use them without circular dependencies.
+ * Security helpers (isUnsafeName, isSymlink, safeReadFile) protect against
+ * path traversal and symlink attacks in agent/skill name resolution.
  */
 
 import { lstatSync, readFileSync } from "node:fs";
@@ -35,7 +34,7 @@ export function isSymlink(filePath: string): boolean {
  */
 export function safeReadFile(filePath: string): string | undefined {
   try {
-    if (lstatSync(filePath).isSymbolicLink()) return undefined;
+    if (isSymlink(filePath)) return undefined;
     return readFileSync(filePath, "utf-8");
   } catch {
     return undefined;