pi-goal-list-loop-audit 0.25.5 → 0.25.6

package/extensions/goal-loop-subagents.ts

@@ -82,19 +82,81 @@ export const EXPLORE_DEFAULT_TOOLS = "read, bash, grep, find, ls";
 interface EmbeddedAgentDefault {
   description: string;
   systemPrompt: string;
+  /** "" means "all tools" (upstream omits builtinToolNames). */
   tools: string;
 }
 
-/** Embedded copies keyed by agent name. Only agents in
- * KNOWN_PINNED_DEFAULT_AGENTS need entries. */
+export const PLAN_DEFAULT_DESCRIPTION = "Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a task. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs.";
+
+export const PLAN_DEFAULT_SYSTEM_PROMPT = `# 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.
+
+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
+
+# 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
+
+# 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
+
+# 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]`;
+
+export const GENERAL_PURPOSE_DEFAULT_DESCRIPTION = "General-purpose agent for researching complex questions, searching for code, and executing multi-step tasks. When you are searching for a keyword or file and are not confident that you will find the right match in the first few tries use this agent to perform the search for you.";
+
+/** Embedded copies keyed by agent name. Explore needs an entry for the
+ * strategy-driven sync (KNOWN_PINNED_DEFAULT_AGENTS); Plan and
+ * general-purpose entries exist so users can pin them per-type via
+ * subagentModelOverrides (v0.25.6). */
 const EMBEDDED_DEFAULTS: Record<string, EmbeddedAgentDefault> = {
   Explore: {
     description: EXPLORE_DEFAULT_DESCRIPTION,
     systemPrompt: EXPLORE_DEFAULT_SYSTEM_PROMPT,
     tools: EXPLORE_DEFAULT_TOOLS,
   },
+  Plan: {
+    description: PLAN_DEFAULT_DESCRIPTION,
+    systemPrompt: PLAN_DEFAULT_SYSTEM_PROMPT,
+    tools: EXPLORE_DEFAULT_TOOLS, // same read-only set upstream
+  },
+  "general-purpose": {
+    description: GENERAL_PURPOSE_DEFAULT_DESCRIPTION,
+    systemPrompt: "", // upstream: empty prompt, promptMode append
+    tools: "", // upstream: all tools (builtinToolNames omitted)
+  },
 };
 
+/** v0.25.6: agent types the user can pin per-type via
+ * subagentModelOverrides (embedded defaults exist for each). */
+export const OVERRIDABLE_AGENT_TYPES = Object.keys(EMBEDDED_DEFAULTS);
+
 /** Default global agent dir (pi-subagents reads $PI_CODING_AGENT_DIR/agents,
  * default ~/.pi/agent/agents). Parameterized in sync for tests. */
 export function defaultAgentDir(): string {
@@ -107,12 +169,9 @@ export function buildAgentOverrideMd(name: string, model?: string): string {
   const def = EMBEDDED_DEFAULTS[name];
   if (!def) throw new Error(`no embedded default config for agent "${name}"`);
   const yamlDesc = "'" + def.description.replace(/'/g, "''") + "'";
-  const lines = [
-    "---",
-    `description: ${yamlDesc}`,
-    `tools: ${def.tools}`,
-    "prompt_mode: replace",
-  ];
+  const lines = ["---", `description: ${yamlDesc}`];
+  if (def.tools) lines.push(`tools: ${def.tools}`);
+  lines.push(def.systemPrompt ? "prompt_mode: replace" : "prompt_mode: append");
   if (model) lines.push(`model: ${model}`);
   lines.push(
     `x-managed-by: ${SUBAGENT_MANAGED_MARKER}`,
@@ -121,7 +180,7 @@ export function buildAgentOverrideMd(name: string, model?: string): string {
       : "x-glla-note: model pin removed (upstream default pins a fixed model) so this agent inherits the parent session model and its quota pool. Managed by glla — flip /glla subagent strategy to agent-default to restore upstream behavior.",
     "---",
     "",
-    def.systemPrompt,
+    def.systemPrompt || "(no system-prompt override — upstream default is an empty append-mode prompt)",
     "",
   );
   return lines.join("\n");
@@ -135,7 +194,16 @@ export interface SubagentSyncResult {
   written: string[];
   removed: string[];
   /** Files left untouched because the user owns them (no marker). */
-  skipped: Array<{ name: string; reason: string }>;
+  skipped: Array<{ name: string } & { reason: string }>;
+  /** v0.25.6: managed files that were expected (previously written) but
+   * found missing or altered, and got re-written — surface these to the
+   * user (external edit, pi update, or dracon-sync churn). */
+  repaired: string[];
+}
+
+/** State file tracking what the last sync wrote (repair detection). */
+export function subagentSyncStatePath(agentDir: string): string {
+  return path.join(agentDir, "agents", ".glla-subagent-sync.json");
 }
 
 /** Sync <agentDir>/agents/<Name>.md with the desired state. Idempotent:
@@ -145,8 +213,18 @@ export function syncSubagentModelOverrides(opts: {
   strategy: SubagentModelStrategy;
   overrides?: Record<string, string>;
 }): SubagentSyncResult {
-  const result: SubagentSyncResult = { written: [], removed: [], skipped: [] };
+  const result: SubagentSyncResult = { written: [], removed: [], skipped: [], repaired: [] };
   const overrides = opts.overrides ?? {};
+  // v0.25.6: load the previous sync state for repair detection — a file
+  // we wrote before that is now MISSING or CONTENT-CHANGED was touched
+  // externally; re-writing it is a repair the user should hear about.
+  let prevWritten: string[] = [];
+  try {
+    const prev = JSON.parse(fs.readFileSync(subagentSyncStatePath(opts.agentDir), "utf-8"));
+    if (Array.isArray(prev?.written)) prevWritten = prev.written.map(String);
+  } catch {
+    /* first sync or unreadable state */
+  }
   const names = new Set<string>([...KNOWN_PINNED_DEFAULT_AGENTS, ...Object.keys(overrides)]);
 
   for (const name of names) {
@@ -159,11 +237,15 @@ export function syncSubagentModelOverrides(opts: {
       continue;
     }
     const file = path.join(opts.agentDir, "agents", `${name}.md`);
+    // v0.25.6: the strategy-driven (model-less) write applies ONLY to
+    // agents that pin a model upstream (Explore) — Plan/general-purpose
+    // don't pin, so inherit-parent needs no file for them; they get
+    // managed files only via an explicit per-type override.
     const desired = overrideModel
       ? buildAgentOverrideMd(name, overrideModel)
-      : opts.strategy === "inherit-parent"
+      : opts.strategy === "inherit-parent" && (KNOWN_PINNED_DEFAULT_AGENTS as readonly string[]).includes(name)
         ? buildAgentOverrideMd(name)
-        : undefined; // agent-default + no per-type override → file should be absent
+        : undefined; // agent-default / no pin upstream + no override → file should be absent
 
     const exists = fs.existsSync(file);
     const current = exists ? fs.readFileSync(file, "utf-8") : undefined;
@@ -186,6 +268,31 @@ export function syncSubagentModelOverrides(opts: {
     fs.mkdirSync(path.dirname(file), { recursive: true });
     fs.writeFileSync(file, desired);
     result.written.push(name);
+    if (prevWritten.includes(name)) result.repaired.push(name);
+  }
+  // Persist what we manage now (best-effort).
+  try {
+    fs.mkdirSync(path.join(opts.agentDir, "agents"), { recursive: true });
+    fs.writeFileSync(subagentSyncStatePath(opts.agentDir), JSON.stringify({ written: result.written, at: new Date().toISOString() }));
+  } catch {
+    /* repair detection is best-effort */
   }
   return result;
 }
+
+/** v0.25.6: effective model for an agent type, for the headless settings
+ * display. Per-type override wins; inherit-parent falls to the session
+ * model; agent-default means upstream's own resolution (Explore's haiku
+ * pin for Explore, session model for the others). */
+export function resolveEffectiveSubagentModel(
+  name: string,
+  settings: { subagentModelStrategy?: string; subagentModelOverrides?: Record<string, string> },
+  sessionModel?: string,
+): string {
+  const pin = settings.subagentModelOverrides?.[name];
+  if (pin) return `${pin} (per-type pin)`;
+  if ((settings.subagentModelStrategy ?? "inherit-parent") === "inherit-parent") {
+    return sessionModel ? `${sessionModel} (inherits session)` : "(session model)";
+  }
+  return name === "Explore" ? "anthropic/claude-haiku-4-5 (upstream pin)" : "(agent default)";
+}

package/extensions/loops/goal.ts

@@ -87,6 +87,7 @@ import {
 } from "../goal-loop-core.js";
 import {
   isQuotaError,
+  isSubagentQuotaResult,
   parseQuotaError,
   scheduleQuotaRetry,
   cancelQuotaRetry,
@@ -122,6 +123,7 @@ import {
 import { buildStatusText, buildWidgetLines, type AuditDisplayProgress } from "../goal-loop-display.js";
 import {
   defaultAgentDir,
+  resolveEffectiveSubagentModel,
   syncSubagentModelOverrides,
   type SubagentModelStrategy,
 } from "../goal-loop-subagents.js";
@@ -2666,6 +2668,8 @@ async function openSettingsUI(ctx: ExtensionContext): Promise<void> {
           `Stuck max interventions — ${show("stuckMaxInterventions", "(5 default)")}`,
           `Subagent model strategy — ${show("subagentModelStrategy", "(inherit-parent)")}`,
           `Subagent Explore model pin — ${loadSettings(ctx.cwd).subagentModelOverrides?.Explore ?? "(follows strategy)"}`,
+          `Subagent Plan model pin — ${loadSettings(ctx.cwd).subagentModelOverrides?.Plan ?? "(follows strategy)"}`,
+          `Subagent general-purpose model pin — ${loadSettings(ctx.cwd).subagentModelOverrides?.["general-purpose"] ?? "(follows strategy)"}`,
           `Audit feedback characters — ${show("auditFeedbackChars", "(full report)")}`,
           "Done",
         ],
@@ -2735,15 +2739,16 @@ async function openSettingsUI(ctx: ExtensionContext): Promise<void> {
           saveSettings("global", ctx.cwd, { subagentModelStrategy: strategy });
           ctx.ui.notify("Subagent model strategy saved — applies to NEW pi sessions (pi-subagents registers agents at session start).", "info");
         }
-      } else if (choice.startsWith("Subagent Explore model pin")) {
-        const v = await ctx.ui.input("Model pin for Explore subagents", "provider/model-id e.g. minimax/MiniMax-M3 — always wins over strategy; empty = follow strategy");
+      } else if (/^Subagent (Explore|Plan|general-purpose) model pin/.test(choice)) {
+        const agentType = choice.match(/^Subagent (Explore|Plan|general-purpose) model pin/)![1]!;
+        const v = await ctx.ui.input(`Model pin for ${agentType} subagents`, "provider/model-id e.g. minimax/MiniMax-M3 — always wins over strategy; empty = follow strategy");
         if (v !== undefined) {
           const current = loadSettings(ctx.cwd).subagentModelOverrides ?? {};
           const next = { ...current };
-          if (v.trim()) next.Explore = v.trim();
-          else delete next.Explore;
+          if (v.trim()) next[agentType] = v.trim();
+          else delete next[agentType];
           saveSettings("global", ctx.cwd, { subagentModelOverrides: Object.keys(next).length > 0 ? next : undefined });
-          ctx.ui.notify("Explore model pin saved — applies to NEW pi sessions.", "info");
+          ctx.ui.notify(`${agentType} model pin saved — applies to NEW pi sessions.`, "info");
         }
       } else if (choice.startsWith("Audit feedback")) {
         const v = await ctx.ui.input("Auditor feedback returned to the executor (characters)", "non-negative integer cap; 0 or empty = full report (default)");
@@ -2878,6 +2883,10 @@ async function cmdSettings(args: string, ctx: ExtensionContext): Promise<void> {
         fmt("aggressiveMode", "aggressiveMode"),
         fmt("quotaRetryMinutes", "quotaRetryMinutes"),
         fmt("stuckMaxInterventions", "stuckMaxInterventions"),
+        // v0.25.6: effective per-type subagent model resolution.
+        ...["Explore", "Plan", "general-purpose"].map(
+          (t) => `subagent ${t}: ${resolveEffectiveSubagentModel(t, loadSettings(ctx.cwd), (ctx.model as any)?.id ? `${(ctx.model as any).provider}/${(ctx.model as any).id}` : undefined)}`,
+        ),
         `\nglobal:  ${globalSettingsPath()}`,
         `project: ${projectSettingsPath(ctx.cwd)}`,
         `Set with: /glla key=value (global) · /glla project key=value (project override)`,
@@ -3252,6 +3261,18 @@ export default function (pi: ExtensionAPI): void {
         state.goal.telemetry = t;
       }
     }
+    // v0.25.6: subagent quota errors (the pi-subagents#175 shape —
+    // Explore's upstream haiku pin 403s on shared keys). Surface the
+    // repair path immediately; the continuation prompt's WHEN SUBAGENTS
+    // HIT QUOTA ERRORS section carries the full guidance.
+    if (isSubagentQuotaResult(String(event?.toolName ?? ""), Boolean(event?.isError ?? event?.error), event?.output ?? event?.result ?? event?.details ?? "")) {
+      const errText = typeof (event?.output ?? event?.result) === "string" ? (event?.output ?? event?.result) : JSON.stringify(event?.output ?? event?.result ?? event?.details ?? "");
+      appendLedger(registeredCtx?.cwd ?? process.cwd(), "subagent_quota_error", { error: String(errText).slice(0, 200) });
+      registeredCtx?.ui.notify(
+        "Subagent hit a quota error (403/limit). Repair: re-spawn with an explicit model= on your quota pool, or do the work inline — see the continuation prompt's WHEN SUBAGENTS HIT QUOTA ERRORS. Explore's upstream haiku pin is the usual cause (pi-subagents#175); glla's inherit-parent strategy removes it for NEW sessions.",
+        "warning",
+      );
+    }
     if (draftingTarget === null) return;
     if (askUserQuestionAnswered(String(event?.toolName ?? ""), event?.details)) {
       draftingUserReplies++;
@@ -3285,6 +3306,15 @@ export default function (pi: ExtensionAPI): void {
       for (const skip of sync.skipped) {
         ctx.ui.notify(`glla subagent override skipped [${skip.name}]: ${skip.reason}`, "warning");
       }
+      // v0.25.6: notify-with-repair — a managed override that went missing
+      // or was altered externally (pi update, manual edit, sync churn) is
+      // re-written AND surfaced, not silently restored.
+      if (sync.repaired.length > 0) {
+        ctx.ui.notify(
+          `glla repaired managed subagent override(s): ${sync.repaired.join(", ")} — the file(s) were missing or altered externally; re-written per your subagent settings.`,
+          "warning",
+        );
+      }
     } catch (err) {
       ctx.ui.notify(`glla subagent override sync failed: ${err instanceof Error ? err.message : String(err)}`, "warning");
     }

package/extensions/quota-retry.ts

@@ -88,3 +88,13 @@ export function scheduleQuotaRetry(
     "info",
   );
 }
+
+/** v0.25.6: detect a SUBAGENT quota failure in a tool_result — the
+ * pi-subagents#175 shape (Explore's upstream haiku pin 403s on shared
+ * keys). Tool must be an Agent spawn and the payload a quota error. */
+export function isSubagentQuotaResult(toolName: string, isError: boolean, payload: unknown): boolean {
+  if (!isError) return false;
+  if (toolName !== "Agent" && toolName !== "agent") return false;
+  const text = typeof payload === "string" ? payload : JSON.stringify(payload ?? "");
+  return isQuotaError(text);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goal-list-loop-audit",
-  "version": "0.25.5",
+  "version": "0.25.6",
   "description": "Goal. Loop. Audit. Done. — a pi-coding-agent extension that supervises long-running work, with isolated auditor on each completion. Beat bamboozling by design: the auditor runs in a fresh session with no extensions, no skills, no editor — only the read tools needed to verify your goal.",
   "license": "MIT",
   "author": "dracon",