@tintinweb/pi-subagents 0.2.6 → 0.3.0

package/src/prompts.ts

@@ -1,53 +1,16 @@
 /**
- * prompts.ts — System prompts per agent type.
+ * prompts.ts — System prompt builder for agents.
  */
 
-import type { EnvInfo } from "./types.js";
+import type { AgentConfig, EnvInfo } from "./types.js";
 
-// ---- Reusable prompt blocks ----
-
-const READ_ONLY_PROHIBITION = `You are STRICTLY PROHIBITED from:
-- Creating new files
-- Modifying existing files
-- Deleting files
-- Moving or copying files
-- Creating temporary files anywhere, including /tmp
-- Using redirect operators (>, >>, |) or heredocs to write to files
-- Running ANY commands that change system state`;
-
-const READ_ONLY_TOOLS = `# Tool Usage
-- Use the find tool for file pattern matching (NOT the bash find command)
-- Use the grep tool for content search (NOT bash grep/rg command)
-- Use the read tool for reading files (NOT bash cat/head/tail)
-- Use Bash ONLY for read-only operations`;
-
-const FULL_TOOL_USAGE = `# Tool Usage
-- Use the read tool instead of cat/head/tail
-- Use the edit tool instead of sed/awk
-- Use the write tool instead of echo/heredoc
-- Use the find tool instead of bash find/ls for file search
-- Use the grep tool instead of bash grep/rg for content search
-- Make independent tool calls in parallel`;
-
-const GIT_SAFETY = `# Git Safety
-- NEVER update git config
-- NEVER run destructive git commands (push --force, reset --hard, checkout ., restore ., clean -f, branch -D) without explicit request
-- NEVER skip hooks (--no-verify, --no-gpg-sign) unless explicitly asked
-- NEVER force push to main/master — warn the user if they request it
-- Always create NEW commits, never amend existing ones. When a pre-commit hook fails, the commit did NOT happen — so --amend would modify the PREVIOUS commit. Fix the issue, re-stage, and create a NEW commit
-- Stage specific files by name, not git add -A or git add .
-- NEVER commit changes unless the user explicitly asks
-- NEVER push unless the user explicitly asks
-- NEVER use git commands with the -i flag (like git rebase -i or git add -i) — they require interactive input
-- Do not use --no-edit with git rebase commands
-- Do not commit files that likely contain secrets (.env, credentials.json, etc); warn the user if they request it`;
-
-const OUTPUT_RULES = `# Output
-- Use absolute file paths
-- Do not use emojis
-- Be concise but complete`;
-
-export function buildSystemPrompt(type: string, cwd: string, env: EnvInfo): string {
+/**
+ * Build the system prompt for an agent from its config.
+ *
+ * - "replace" mode: common header + config.systemPrompt
+ * - "append" mode: common header + generic base + config.systemPrompt
+ */
+export function buildAgentPrompt(config: AgentConfig, cwd: string, env: EnvInfo): string {
   const commonHeader = `You are a pi coding agent sub-agent.
 You have been invoked to handle a specific task autonomously.
 
@@ -56,108 +19,30 @@ Working directory: ${cwd}
 ${env.isGitRepo ? `Git repository: yes\nBranch: ${env.branch}` : "Not a git repository"}
 Platform: ${env.platform}`;
 
-  switch (type) {
-    case "Explore":
-      return `${commonHeader}
-
-# CRITICAL: READ-ONLY MODE - NO FILE MODIFICATIONS
-You are a file search specialist. You excel at thoroughly navigating and exploring codebases.
-Your role is EXCLUSIVELY to search and analyze existing code. You do NOT have access to file editing tools.
-
-${READ_ONLY_PROHIBITION}
-
-Use Bash ONLY for read-only operations: ls, git status, git log, git diff, find, cat, head, tail.
-
-${READ_ONLY_TOOLS}
-- Make independent tool calls in parallel for efficiency
-- Adapt search approach based on thoroughness level specified
-
-# Output
-- Use absolute file paths in all references
-- Report findings as regular messages
-- Do not use emojis
-- Be thorough and precise`;
-
-    case "Plan":
-      return `${commonHeader}
-
-# 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.
-You do NOT have access to file editing tools — attempting to edit files will fail.
-
-${READ_ONLY_PROHIBITION}
-
-# Planning Process
-1. Understand requirements
-2. Explore thoroughly (read files, find patterns, understand architecture)
-3. Design solution based on your assigned perspective
-4. Detail the plan with step-by-step implementation strategy
-
-# Requirements
-- Consider trade-offs and architectural decisions
-- Identify dependencies and sequencing
-- Anticipate potential challenges
-- Follow existing patterns where appropriate
-
-${READ_ONLY_TOOLS}
-
-# Output Format
-- Use absolute file paths
-- Do not use emojis
-- End your response with:
-
-### Critical Files for Implementation
-List 3-5 files most critical for implementing this plan:
-- /absolute/path/to/file.ts - [Brief reason]`;
-
-    case "general-purpose":
-      return `${commonHeader}
+  if (config.promptMode === "append") {
+    const genericBase = `
 
 # Role
 You are a general-purpose coding agent for complex, multi-step tasks.
 You have full access to read, write, edit files, and execute commands.
 Do what has been asked; nothing more, nothing less.
 
-${FULL_TOOL_USAGE}
-
-# File Operations
-- NEVER create files unless absolutely necessary
-- Prefer editing existing files over creating new ones
-- NEVER create documentation files unless explicitly requested
-
-${GIT_SAFETY}
-
-${OUTPUT_RULES}`;
-
-    case "statusline-setup":
-      return `${commonHeader}
-
-# Role
-You configure settings. You can read and edit files only.
-Focus on the specific configuration task requested.
-Use absolute file paths.`;
-
-    case "claude-code-guide":
-      return `${commonHeader}
-
-# Role
-You help answer questions about the tool, its features, and capabilities.
-Search documentation, read config files, and provide accurate answers.
-You have read-only access to the codebase for reference.
-Use absolute file paths.`;
-
-    default:
-      // Custom agents or unknown: general-purpose base without git safety / file ops
-      return `${commonHeader}
-
-# Role
-You are a general-purpose coding agent for complex, multi-step tasks.
-You have full access to read, write, edit files, and execute commands.
-Do what has been asked; nothing more, nothing less.
+# Tool Usage
+- Use the read tool instead of cat/head/tail
+- Use the edit tool instead of sed/awk
+- Use the write tool instead of echo/heredoc
+- Use the find tool instead of bash find/ls for file search
+- Use the grep tool instead of bash grep/rg for content search
+- Make independent tool calls in parallel
 
-${FULL_TOOL_USAGE}
+# Output
+- Use absolute file paths
+- Do not use emojis
+- Be concise but complete`;
 
-${OUTPUT_RULES}`;
+    return commonHeader + genericBase + "\n\n" + config.systemPrompt;
   }
+
+  // "replace" mode — header + the config's full system prompt
+  return commonHeader + "\n\n" + config.systemPrompt;
 }

package/src/types.ts

@@ -7,44 +7,18 @@ import type { ThinkingLevel } from "@mariozechner/pi-agent-core";
 
 export type { ThinkingLevel };
 
-/** Built-in agent types. Custom agents use arbitrary string names. */
-export type BuiltinSubagentType = "general-purpose" | "Explore" | "Plan" | "statusline-setup" | "claude-code-guide";
+/** Agent type: any string name (built-in defaults or user-defined). */
+export type SubagentType = string;
 
-/** Agent type: built-in or custom (any string). */
-export type SubagentType = BuiltinSubagentType | (string & {});
+/** Names of the three embedded default agents. */
+export const DEFAULT_AGENT_NAMES = ["general-purpose", "Explore", "Plan"] as const;
 
-/** Display name mapping for built-in types. */
-export const DISPLAY_NAMES: Record<BuiltinSubagentType, string> = {
-  "general-purpose": "Agent",
-  "Explore": "Explore",
-  "Plan": "Plan",
-  "statusline-setup": "Config",
-  "claude-code-guide": "Guide",
-};
-
-export const SUBAGENT_TYPES: BuiltinSubagentType[] = [
-  "general-purpose",
-  "Explore",
-  "Plan",
-  "statusline-setup",
-  "claude-code-guide",
-];
-
-export interface SubagentTypeConfig {
-  displayName: string;
-  description: string;
-  builtinToolNames: string[];
-  /** true = inherit all, string[] = only listed, false = none */
-  extensions: true | string[] | false;
-  /** true = inherit all, string[] = only listed, false = none */
-  skills: true | string[] | false;
-}
-
-/** Configuration for a custom agent loaded from .pi/agents/<name>.md */
-export interface CustomAgentConfig {
+/** Unified agent configuration — used for both default and user-defined agents. */
+export interface AgentConfig {
   name: string;
+  displayName?: string;
   description: string;
-  builtinToolNames: string[];
+  builtinToolNames?: string[];
   /** true = inherit all, string[] = only listed, false = none */
   extensions: true | string[] | false;
   /** true = inherit all, string[] = only listed, false = none */
@@ -60,6 +34,12 @@ export interface CustomAgentConfig {
   runInBackground: boolean;
   /** Default for spawn: no extension tools */
   isolated: boolean;
+  /** true = this is an embedded default agent (informational) */
+  isDefault?: boolean;
+  /** false = agent is hidden from the registry */
+  enabled?: boolean;
+  /** Where this agent was loaded from */
+  source?: "default" | "project" | "global";
 }
 
 export type JoinMode = 'async' | 'group' | 'smart';

package/src/ui/agent-widget.ts

@@ -5,6 +5,7 @@
  * Uses the callback form of setWidget for themed rendering.
  */
 
+import { truncateToWidth } from "@mariozechner/pi-tui";
 import type { AgentManager } from "../agent-manager.js";
 import type { SubagentType } from "../types.js";
 import { getConfig } from "../agent-types.js";
@@ -262,17 +263,19 @@ export class AgentWidget {
     this.widgetFrame++;
     const frame = SPINNER[this.widgetFrame % SPINNER.length];
 
-    this.uiCtx.setWidget("agents", (_tui, theme) => {
+    this.uiCtx.setWidget("agents", (tui, theme) => {
+      const w = tui.terminal.columns;
+      const truncate = (line: string) => truncateToWidth(line, w);
       const headingColor = hasActive ? "accent" : "dim";
       const headingIcon = hasActive ? "●" : "○";
-      const lines: string[] = [theme.fg(headingColor, headingIcon) + " " + theme.fg(headingColor, "Agents")];
+      const lines: string[] = [truncate(theme.fg(headingColor, headingIcon) + " " + theme.fg(headingColor, "Agents"))];
 
       // --- Finished agents (shown first, dimmed) ---
       for (let i = 0; i < finished.length; i++) {
         const a = finished[i];
         const isLast = !hasActive && i === finished.length - 1;
         const connector = isLast ? "└─" : "├─";
-        lines.push(theme.fg("dim", connector) + " " + this.renderFinishedLine(a, theme));
+        lines.push(truncate(theme.fg("dim", connector) + " " + this.renderFinishedLine(a, theme)));
       }
 
       // --- Running agents ---
@@ -299,14 +302,14 @@ export class AgentWidget {
 
         const activity = bg ? describeActivity(bg.activeTools, bg.responseText) : "thinking…";
 
-        lines.push(theme.fg("dim", connector) + ` ${theme.fg("accent", frame)} ${theme.bold(name)}  ${theme.fg("muted", a.description)} ${theme.fg("dim", "·")} ${theme.fg("dim", statsText)}`);
+        lines.push(truncate(theme.fg("dim", connector) + ` ${theme.fg("accent", frame)} ${theme.bold(name)}  ${theme.fg("muted", a.description)} ${theme.fg("dim", "·")} ${theme.fg("dim", statsText)}`));
         const indent = isLast ? "   " : "│  ";
-        lines.push(theme.fg("dim", indent) + theme.fg("dim", `  ⎿  ${activity}`));
+        lines.push(truncate(theme.fg("dim", indent) + theme.fg("dim", `  ⎿  ${activity}`)));
       }
 
       // --- Queued agents (collapsed) ---
       if (queued.length > 0) {
-        lines.push(theme.fg("dim", "└─") + ` ${theme.fg("muted", "◦")} ${theme.fg("dim", `${queued.length} queued`)}`);
+        lines.push(truncate(theme.fg("dim", "└─") + ` ${theme.fg("muted", "◦")} ${theme.fg("dim", `${queued.length} queued`)}`));
       }
 
       return { render: () => lines, invalidate: () => {} };