@gotgenes/pi-subagents 7.2.6 → 7.2.8

package/CHANGELOG.md

@@ -5,6 +5,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.2.8](https://github.com/gotgenes/pi-packages/compare/pi-subagents-v7.2.7...pi-subagents-v7.2.8) (2026-05-25)
+
+
+### Performance Improvements
+
+* remove <inherited_system_prompt> wrapper to maximise KV cache reuse ([#180](https://github.com/gotgenes/pi-packages/issues/180)) ([f35e7b1](https://github.com/gotgenes/pi-packages/commit/f35e7b1b4309f91656677932c201d762c4be5cf3))
+
+
+### Documentation
+
+* **retro:** add retro notes for issue [#206](https://github.com/gotgenes/pi-packages/issues/206) ([f439057](https://github.com/gotgenes/pi-packages/commit/f439057bd42edc018df8ddd94783f8a9c89968e0))
+
+## [7.2.7](https://github.com/gotgenes/pi-packages/compare/pi-subagents-v7.2.6...pi-subagents-v7.2.7) (2026-05-25)
+
+
+### Documentation
+
+* plan decompose showAgentDetail ([#206](https://github.com/gotgenes/pi-packages/issues/206)) ([fe575a0](https://github.com/gotgenes/pi-packages/commit/fe575a0f2727bdcdaa4dd977f7b2db4d6cb6e9f3))
+* **retro:** add planning stage notes for issue [#206](https://github.com/gotgenes/pi-packages/issues/206) ([057bbb6](https://github.com/gotgenes/pi-packages/commit/057bbb666b8d1c89d70936a837fc028512368fcc))
+* **retro:** add retro notes for issue [#205](https://github.com/gotgenes/pi-packages/issues/205) ([b9abe3b](https://github.com/gotgenes/pi-packages/commit/b9abe3ba050468d71015eb77262afb4093c8289f))
+* **retro:** add TDD stage notes for issue [#206](https://github.com/gotgenes/pi-packages/issues/206) ([88fdfc2](https://github.com/gotgenes/pi-packages/commit/88fdfc222950ce63e0a8f9273d3bff234ffa0538))
+* update complexity table after showAgentDetail decomposition ([8d8a396](https://github.com/gotgenes/pi-packages/commit/8d8a396bbfbe0e4d86dc37aceb53df613868bd26))
+
 ## [7.2.6](https://github.com/gotgenes/pi-packages/compare/pi-subagents-v7.2.5...pi-subagents-v7.2.6) (2026-05-25)
 
 

package/docs/architecture/architecture.md

@@ -466,12 +466,10 @@ Bags with 10+ fields are the highest priority for decomposition.
 
 Functions with cyclomatic complexity ≥ 21 (critical threshold):
 
-| Function            | Cyclomatic | Cognitive | File                        | Concern                            |
-| ------------------- | ---------- | --------- | --------------------------- | ---------------------------------- |
-| `showAgentDetail`   | 25         | 33        | `ui/agent-config-editor.ts` | Agent detail/edit view             |
-| `renderWidgetLines` | 25         | 44        | `ui/widget-renderer.ts`     | Renders widget status lines        |
-| `ejectAgent`        | 21         | 20        | `ui/agent-config-editor.ts` | Eject agent to filesystem          |
-| `update`            | 21         | 31        | `ui/agent-widget.ts`        | Widget lifecycle + polling         |
+| Function            | Cyclomatic | Cognitive | File                        | Concern                         |
+| ------------------- | ---------- | --------- | --------------------------- | ------------------------------- |
+| `renderWidgetLines` | 25         | 44        | `ui/widget-renderer.ts`     | Renders widget status lines     |
+| `update`            | 21         | 31        | `ui/agent-widget.ts`        | Widget lifecycle + polling      |
 
 ### Churn hotspots
 

package/docs/plans/0206-decompose-show-agent-detail.md

@@ -0,0 +1,211 @@
+---
+issue: 206
+issue_title: "Decompose showAgentDetail (cognitive 33)"
+---
+
+# Decompose `showAgentDetail`
+
+## Problem Statement
+
+`showAgentDetail` in `ui/agent-config-editor.ts` has cognitive complexity 33 (CRITICAL per fallow health).
+It interleaves menu-option computation, user-choice dispatch, and three inline action handlers (edit, delete, reset) in a single 67-line function.
+`ejectAgent` in the same file has cognitive complexity 20 from its 14-branch frontmatter builder.
+Phase 12, Step 2 targets cognitive complexity < 10 per function.
+
+## Goals
+
+- Extract menu-option computation and inline action handlers into separate functions, each with cognitive complexity < 10.
+- Extract frontmatter building from `ejectAgent` into a pure function.
+- Preserve all existing behavior — no user-visible or API changes.
+- Add unit tests for the two new exported pure functions.
+
+## Non-Goals
+
+- Decomposing `renderWidgetLines` (#205), `update` (#207), or shared test fixtures (#208) — sibling Phase 12 steps.
+- Changing the menu structure, option labels, or action semantics.
+- Decomposing `disableAgent` or `enableAgent` — their cognitive complexity is already manageable (< 15).
+
+## Background
+
+`agent-config-editor.ts` was extracted from `agent-menu.ts` in Phase 8 (#136).
+The file exposes a single factory `createAgentConfigEditor` that returns `{ showAgentDetail }`.
+Internally the factory closes over `fileOps`, `registry`, `personalAgentsDir`, and `projectAgentsDir`.
+
+Three action handlers already exist as closure-level functions: `ejectAgent`, `disableAgent`, `enableAgent`.
+The remaining three actions — Edit, Delete, and Reset to default — are inlined in `showAgentDetail`'s if/else dispatch chain.
+
+The existing test suite (`test/ui/agent-config-editor.test.ts`, 18 tests) covers all menu-option combinations and action branches through the public `showAgentDetail` entry point.
+
+### Complexity sources
+
+`showAgentDetail` (cognitive 33):
+
+1. Menu-option building — 4-branch if/else chain with 3 boolean conditions (`disabled`, `isDefault`, `file`).
+2. Action dispatch — 6-branch if/else chain based on `choice`.
+3. Inline Edit handler — 3 nested `if` guards (`file`, `content`, `edited !== content`).
+4. Inline Delete handler — nested `if (file)` + `if (confirmed)`.
+5. Inline Reset handler — nested `if (file)` + `if (confirmed)`.
+
+`ejectAgent` (cognitive 20):
+
+1. Location selection + overwrite check — 2 early returns with nested ifs.
+2. Frontmatter field building — 14 conditional `if`/`else if` branches.
+
+## Design Overview
+
+### Extracted from `showAgentDetail`
+
+#### `buildMenuOptions` (exported, pure)
+
+```typescript
+export function buildMenuOptions(
+  cfg: { isDefault?: boolean; enabled?: boolean },
+  file: string | undefined,
+): string[]
+```
+
+Accepts the minimal config shape and file path.
+Returns the menu option array.
+Pure computation — no IO, no side effects.
+Exported for direct unit testing.
+
+#### `handleEdit` (closure-internal)
+
+Handles the Edit action: reads the file, opens the editor, writes if changed.
+Signature: `(ui: MenuUI, name: string, file: string) => Promise<void>`.
+Called only when `file` is defined (guaranteed by menu-option construction).
+
+#### `handleDelete` (closure-internal)
+
+Handles the Delete action: confirms with user, removes file, reloads registry.
+Signature: `(ui: MenuUI, name: string, file: string) => Promise<void>`.
+
+#### `handleReset` (closure-internal)
+
+Handles the Reset to default action: confirms, removes override file, reloads registry.
+Signature: `(ui: MenuUI, name: string, file: string) => Promise<void>`.
+
+### Extracted from `ejectAgent`
+
+#### `buildEjectContent` (exported, pure)
+
+```typescript
+export function buildEjectContent(cfg: AgentConfig): string
+```
+
+Builds the full `.md` file content (frontmatter + system prompt) for an ejected agent.
+Pure function — no IO.
+Exported for direct unit testing.
+
+### After refactoring
+
+`showAgentDetail` becomes a thin orchestrator (~15 lines):
+
+```typescript
+async function showAgentDetail(ui: MenuUI, name: string) {
+  if (registry.resolveType(name) == null) {
+    ui.notify(`Agent config not found for "${name}".`, "warning");
+    return;
+  }
+  const cfg = registry.resolveAgentConfig(name);
+  const file = fileOps.findAgentFile(name, agentDirs());
+
+  const choice = await ui.select(name, buildMenuOptions(cfg, file));
+  if (!choice || choice === "Back") return;
+
+  if (choice === "Edit" && file) await handleEdit(ui, name, file);
+  else if (choice === "Delete" && file) await handleDelete(ui, name, file);
+  else if (choice === "Reset to default" && file) await handleReset(ui, name, file);
+  else if (choice.startsWith("Eject")) await ejectAgent(ui, name, cfg);
+  else if (choice === "Disable") await disableAgent(ui, name);
+  else if (choice === "Enable") await enableAgent(ui, name);
+}
+```
+
+Cognitive complexity: ~5 (one null-check early return + flat dispatch chain with no nesting).
+
+`ejectAgent` becomes:
+
+```typescript
+async function ejectAgent(ui: MenuUI, name: string, cfg: AgentConfig) {
+  const location = await ui.select("Choose location", [...]);
+  if (!location) return;
+  const targetDir = location.startsWith("Project") ? projectAgentsDir : personalAgentsDir;
+  const targetPath = join(targetDir, `${name}.md`);
+  if (fileOps.exists(targetPath)) {
+    const overwrite = await ui.confirm("Overwrite", `${targetPath} already exists. Overwrite?`);
+    if (!overwrite) return;
+  }
+  fileOps.write(targetPath, buildEjectContent(cfg));
+  registry.reload();
+  ui.notify(`Ejected ${name} to ${targetPath}`, "info");
+}
+```
+
+Cognitive complexity: ~6 (two early returns, one ternary, one nested if).
+
+## Module-Level Changes
+
+### Changed: `src/ui/agent-config-editor.ts`
+
+- Add exported `buildMenuOptions(cfg, file)` — pure function extracted from `showAgentDetail`.
+- Add exported `buildEjectContent(cfg)` — pure function extracted from `ejectAgent`.
+- Add closure-internal `handleEdit(ui, name, file)` — extracted from `showAgentDetail` inline logic.
+- Add closure-internal `handleDelete(ui, name, file)` — extracted from `showAgentDetail` inline logic.
+- Add closure-internal `handleReset(ui, name, file)` — extracted from `showAgentDetail` inline logic.
+- Simplify `showAgentDetail` to orchestrate: resolve → build menu → select → dispatch.
+- Simplify `ejectAgent` to delegate frontmatter building to `buildEjectContent`.
+
+No exports are removed or renamed.
+The public API (`createAgentConfigEditor` returning `{ showAgentDetail }`) is unchanged.
+
+### Changed: `test/ui/agent-config-editor.test.ts`
+
+- Add `describe("buildMenuOptions")` with tests for each menu-option combination (5 cases from existing tests, restructured as direct function calls).
+- Add `describe("buildEjectContent")` with tests for minimal config and config with all optional fields.
+- Existing `showAgentDetail` tests remain unchanged as integration coverage.
+
+### Changed: `docs/architecture/architecture.md`
+
+- Update the complexity hotspots table: `showAgentDetail` drops from 25/33 to ~5/5; `ejectAgent` drops from 21/20 to ~6/6.
+
+## Test Impact Analysis
+
+1. **New tests enabled:** Direct unit tests for `buildMenuOptions` (pure function with 5 state combinations) and `buildEjectContent` (pure function with many optional fields).
+   These were previously impossible to test in isolation because the logic was embedded in async UI flows.
+2. **Existing tests that stay:** All 18 `showAgentDetail` tests remain as integration coverage — they exercise the full resolve → menu → dispatch → action pipeline.
+3. **No tests become redundant:** The existing menu-option-structure tests (5 tests) overlap with `buildMenuOptions` unit tests, but they remain valuable as integration tests verifying the full flow produces the correct menu.
+
+## TDD Order
+
+1. **Red → Green:** Add `buildMenuOptions` unit tests (5 cases: default no-file, default with-file, custom with-file, disabled-default with-file, disabled-custom with-file).
+   Export `buildMenuOptions` as a pure function.
+   Extract the menu-option computation from `showAgentDetail` into it.
+   Verify all existing tests pass.
+   Commit: `refactor: extract buildMenuOptions from showAgentDetail`
+
+2. **Red → Green:** Extract `handleEdit`, `handleDelete`, `handleReset` as closure-internal functions.
+   Simplify `showAgentDetail` dispatch to a flat if/else chain calling named handlers.
+   Verify all existing tests pass.
+   Commit: `refactor: extract inline handlers from showAgentDetail`
+
+3. **Red → Green:** Add `buildEjectContent` unit tests (minimal config, config with all optional fields, config with array extensions/skills).
+   Export `buildEjectContent` as a pure function.
+   Extract the frontmatter-building logic from `ejectAgent` into it.
+   Verify all existing tests pass.
+   Commit: `refactor: extract buildEjectContent from ejectAgent`
+
+4. **Docs:** Update the complexity hotspots table in `docs/architecture/architecture.md`.
+   Commit: `docs: update complexity table after showAgentDetail decomposition`
+
+## Risks and Mitigations
+
+| Risk                                                                           | Mitigation                                                                                                     |
+| ------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------- |
+| `buildMenuOptions` return order must match existing select mock expectations   | Unit tests verify exact array equality; integration tests remain as safety net.                                |
+| `buildEjectContent` frontmatter field ordering is load-bearing for eject tests | Unit tests verify the full content string; existing eject integration test uses `stringContaining` (flexible). |
+| Closure-internal handlers share mutable `fileOps`/`registry` references        | No change from current behavior — they already close over these references.                                    |
+
+## Open Questions
+
+None — the decomposition is mechanical extraction of existing code into named functions.

package/docs/retro/0205-decompose-render-widget-lines.md

@@ -34,3 +34,31 @@ Full suite (856 tests, 54 files) is green; type check and lint are clean.
 - The `renderWidgetLines` `else` block removal also required Python because the Edit tool's `oldText` matching is unreliable when the target contains nested template literals with backticks.
 - Aside from the template-literal matching friction, all extractions were purely mechanical; no logic changes were needed.
 - The final `renderWidgetLines` is a clean 12-line orchestrator; each helper is well under complexity 10.
+
+## Stage: Final Retrospective (2026-05-25T15:41:48Z)
+
+### Session summary
+
+All three stages (planning, TDD implementation, shipping) completed in a single session.
+Four refactor commits extracted `categorizeAgents`, `buildSections`, `assembleWithinBudget`, and `assembleOverflow` from `renderWidgetLines`, reducing cognitive complexity from 44 to <10 per function.
+Released as `pi-subagents-v7.2.6`.
+
+### Observations
+
+#### What went well
+
+- The planning-through-shipping pipeline was efficient: plan → 4 TDD steps → ship → release in one session with no rework.
+- The plan correctly identified all four extraction targets and ordered TDD steps to avoid intermediate breakage.
+- All 23 existing `widget-renderer.test.ts` tests passed throughout with zero modifications — the existing test coverage was at the right abstraction level for this refactoring.
+- The `architecture.md` Phase 12 update (issue links, refactoring table row) was a clean opportunistic addition.
+
+#### What caused friction (agent side)
+
+- `other` (Edit tool limitation) — The Edit tool introduced a stray double-backtick when inserting `assembleOverflow`'s body, caused by JSON escaping colliding with nested template literal backticks.
+  The same limitation then prevented matching `oldText` containing nested template literals in the `renderWidgetLines` overflow block.
+  Required two Python-based line-level fixes via bash.
+  Impact: ~3 extra tool calls; self-identified and self-corrected.
+
+#### What caused friction (user side)
+
+- No friction observed.

package/docs/retro/0206-decompose-show-agent-detail.md

@@ -0,0 +1,67 @@
+---
+issue: 206
+issue_title: "Decompose showAgentDetail (cognitive 33)"
+---
+
+# Retro: #206 — Decompose showAgentDetail (cognitive 33)
+
+## Stage: Planning (2026-05-25T12:00:00Z)
+
+### Session summary
+
+Produced a 4-step plan to decompose `showAgentDetail` (cognitive 33) and `ejectAgent` (cognitive 20) in `ui/agent-config-editor.ts`.
+The plan extracts two exported pure functions (`buildMenuOptions`, `buildEjectContent`) with dedicated unit tests, plus three closure-internal handlers (`handleEdit`, `handleDelete`, `handleReset`).
+
+### Observations
+
+- Three of the six action handlers (`ejectAgent`, `disableAgent`, `enableAgent`) were already extracted as closure functions — only Edit, Delete, and Reset were inlined in the dispatch chain.
+- `buildMenuOptions` and `buildEjectContent` are ideal pure-function extractions: complex branching logic with no IO dependencies, previously untestable in isolation.
+- The existing 18 integration tests through `showAgentDetail` provide a strong safety net — no risk of behavior regression during extraction.
+- Chose to scope `ejectAgent` decomposition into this issue since the issue's outcome says "< 10 per function" and `ejectAgent` is at cognitive 20 in the same file.
+- `disableAgent` and `enableAgent` were explicitly deferred — their cognitive complexity is manageable and decomposing them would add scope without meaningful benefit.
+
+## Stage: Implementation — TDD (2026-05-25T11:55:00Z)
+
+### Session summary
+
+Completed all 4 TDD steps. 3 `refactor:` commits extract `buildMenuOptions`, the three inline handlers, and `buildEjectContent`; 1 `docs:` commit updates the architecture table.
+Test count grew from 21 to 33 (+12 new unit tests for the two exported pure functions).
+
+### Observations
+
+- A `newText: null` bug in the Edit tool corrupted `agent-config-editor.ts` during step 1; recovered immediately by rewriting the file with `Write`.
+- The test used `thinking: "auto"` which is not a valid `ThinkingLevel` — fixed by changing to `"low"` before the final commit; the type error was caught by `pnpm run check` after the TDD step.
+- `buildMenuOptions` extracted cleanly with early-return style (no `let menuOptions` intermediate); the refactored function passes all 5 new unit tests and all 21 existing integration tests.
+- `handleEdit`, `handleDelete`, and `handleReset` are closure-internal; they drop the outer `if (file)` guard since the menu only shows those options when `file` is defined.
+- `buildEjectContent` extracted from `ejectAgent` reduces `ejectAgent` to a thin IO function (~10 lines); no behavior change verified by the existing eject integration tests.
+
+## Stage: Final Retrospective (2026-05-25T12:10:00Z)
+
+### Session summary
+
+Completed full lifecycle — Planning, TDD (3 `refactor:` + 1 `docs:` commits, +12 tests), Ship, and Release (`pi-subagents-v7.2.7`) — in a single session with no user corrections.
+
+### Observations
+
+#### What went well
+
+- The three-stage workflow (plan → TDD → ship) executed without any user intervention between stages.
+  Each stage's retro notes provided clean context for the next.
+- Pure-function extraction pattern worked cleanly: `buildMenuOptions` and `buildEjectContent` exported for unit testing; `handleEdit`, `handleDelete`, `handleReset` kept as closure-internal, tested via existing integration tests.
+- The existing 21 integration tests caught no regressions across all 3 refactor commits — strong safety net for mechanical extraction.
+
+#### What caused friction (agent side)
+
+- `other` — Passed `newText: null` to the `Edit` tool during TDD step 1, injecting a literal `null` into `agent-config-editor.ts` and corrupting the file.
+  Self-identified immediately via Biome autoformat failure.
+  Impact: one wasted tool round-trip; recovered by rewriting the file with `Write`.
+- `missing-context` — Used `thinking: "auto"` in a `buildEjectContent` test fixture without checking `ThinkingLevel` is `"minimal" | "low" | "medium" | "high" | "xhigh"`.
+  Self-identified by `pnpm run check` post-TDD gate.
+  Impact: one `--amend` fix, no extra commit.
+- `missing-context` — Plan stated "18 tests" as the baseline count; actual baseline was 21.
+  Impact: none — just an inaccurate number in the plan text.
+
+#### What caused friction (user side)
+
+- No user-side friction observed.
+  The user triggered each stage sequentially without needing to redirect or correct.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gotgenes/pi-subagents",
-  "version": "7.2.6",
+  "version": "7.2.8",
   "type": "module",
   "exports": {
     ".": "./src/service.ts"

package/src/session/prompts.ts

@@ -74,12 +74,13 @@ You are operating as a sub-agent invoked to handle a specific task.
       : "";
 
     // Place shared/stable content first so the LLM's KV cache can reuse the
-    // inherited prefix across all subagent invocations. The <active_agent> tag
-    // and env block vary per call and are placed after the cacheable prefix.
+    // inherited prefix across all subagent invocations. The parent prompt is
+    // placed verbatim (no wrapper tag) so it forms an identical byte prefix
+    // with the parent session, maximising KV cache hits. The <active_agent>
+    // tag and env block vary per call and are placed after the cached prefix.
     return (
-      "<inherited_system_prompt>\n" +
       identity +
-      "\n</inherited_system_prompt>\n\n" +
+      "\n\n" +
       bridge +
       "\n\n" +
       activeAgentTag +

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

@@ -12,6 +12,55 @@ import type { AgentConfig } from "#src/types";
 import type { AgentFileOps } from "#src/ui/agent-file-ops";
 import type { MenuUI } from "#src/ui/agent-menu";
 
+// ---- Pure helpers ----
+
+/** Compute the menu option list for the agent detail view. */
+export function buildMenuOptions(
+  cfg: { isDefault?: boolean; enabled?: boolean },
+  file: string | undefined,
+): string[] {
+  const isDefault = cfg.isDefault === true;
+  const disabled = cfg.enabled === false;
+
+  if (disabled && file) {
+    return isDefault
+      ? ["Enable", "Edit", "Reset to default", "Delete", "Back"]
+      : ["Enable", "Edit", "Delete", "Back"];
+  }
+  if (isDefault && !file) {
+    return ["Eject (export as .md)", "Disable", "Back"];
+  }
+  if (isDefault && file) {
+    return ["Edit", "Disable", "Reset to default", "Delete", "Back"];
+  }
+  return ["Edit", "Disable", "Delete", "Back"];
+}
+
+/** Build the `.md` file content (frontmatter + system prompt) for an ejected agent. */
+export function buildEjectContent(cfg: AgentConfig): string {
+  const fmFields: string[] = [];
+  fmFields.push(`description: ${cfg.description}`);
+  if (cfg.displayName) fmFields.push(`display_name: ${cfg.displayName}`);
+  fmFields.push(`tools: ${cfg.builtinToolNames?.join(", ") ?? "all"}`);
+  if (cfg.model) fmFields.push(`model: ${cfg.model}`);
+  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 === false) fmFields.push("extensions: false");
+  else if (Array.isArray(cfg.extensions))
+    fmFields.push(`extensions: ${cfg.extensions.join(", ")}`);
+  if (cfg.skills === false) fmFields.push("skills: false");
+  else if (Array.isArray(cfg.skills))
+    fmFields.push(`skills: ${cfg.skills.join(", ")}`);
+  if (cfg.disallowedTools?.length)
+    fmFields.push(`disallowed_tools: ${cfg.disallowedTools.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");
+  if (cfg.isolation) fmFields.push(`isolation: ${cfg.isolation}`);
+  return `---\n${fmFields.join("\n")}\n---\n\n${cfg.systemPrompt}\n`;
+}
+
 // ---- Factory ----
 
 export function createAgentConfigEditor(
@@ -30,65 +79,52 @@ export function createAgentConfigEditor(
       return;
     }
     const cfg = registry.resolveAgentConfig(name);
-
     const file = fileOps.findAgentFile(name, agentDirs());
-    const isDefault = cfg.isDefault === true;
-    const disabled = cfg.enabled === false;
-
-    let menuOptions: string[];
-    if (disabled && file) {
-      menuOptions = isDefault
-        ? ["Enable", "Edit", "Reset to default", "Delete", "Back"]
-        : ["Enable", "Edit", "Delete", "Back"];
-    } else if (isDefault && !file) {
-      menuOptions = ["Eject (export as .md)", "Disable", "Back"];
-    } else if (isDefault && file) {
-      menuOptions = ["Edit", "Disable", "Reset to default", "Delete", "Back"];
-    } else {
-      menuOptions = ["Edit", "Disable", "Delete", "Back"];
-    }
 
-    const choice = await ui.select(name, menuOptions);
+    const choice = await ui.select(name, buildMenuOptions(cfg, file));
     if (!choice || choice === "Back") return;
 
-    if (choice === "Edit" && file) {
-      const content = fileOps.read(file);
-      if (content !== undefined) {
-        const edited = await ui.editor(`Edit ${name}`, content);
-        if (edited !== undefined && edited !== content) {
-          fileOps.write(file, edited);
-          registry.reload();
-          ui.notify(`Updated ${file}`, "info");
-        }
-      }
-    } else if (choice === "Delete") {
-      if (file) {
-        const confirmed = await ui.confirm(
-          "Delete agent",
-          `Delete ${name} (${file})?`,
-        );
-        if (confirmed) {
-          fileOps.remove(file);
-          registry.reload();
-          ui.notify(`Deleted ${file}`, "info");
-        }
-      }
-    } else if (choice === "Reset to default" && file) {
-      const confirmed = await ui.confirm(
-        "Reset to default",
-        `Delete override ${file} and restore embedded default?`,
-      );
-      if (confirmed) {
-        fileOps.remove(file);
-        registry.reload();
-        ui.notify(`Restored default ${name}`, "info");
-      }
-    } else if (choice.startsWith("Eject")) {
-      await ejectAgent(ui, name, cfg);
-    } else if (choice === "Disable") {
-      await disableAgent(ui, name);
-    } else if (choice === "Enable") {
-      await enableAgent(ui, name);
+    if (choice === "Edit" && file) await handleEdit(ui, name, file);
+    else if (choice === "Delete" && file) await handleDelete(ui, name, file);
+    else if (choice === "Reset to default" && file)
+      await handleReset(ui, name, file);
+    else if (choice.startsWith("Eject")) await ejectAgent(ui, name, cfg);
+    else if (choice === "Disable") await disableAgent(ui, name);
+    else if (choice === "Enable") await enableAgent(ui, name);
+  }
+
+  async function handleEdit(ui: MenuUI, name: string, file: string) {
+    const content = fileOps.read(file);
+    if (content === undefined) return;
+    const edited = await ui.editor(`Edit ${name}`, content);
+    if (edited !== undefined && edited !== content) {
+      fileOps.write(file, edited);
+      registry.reload();
+      ui.notify(`Updated ${file}`, "info");
+    }
+  }
+
+  async function handleDelete(ui: MenuUI, name: string, file: string) {
+    const confirmed = await ui.confirm(
+      "Delete agent",
+      `Delete ${name} (${file})?`,
+    );
+    if (confirmed) {
+      fileOps.remove(file);
+      registry.reload();
+      ui.notify(`Deleted ${file}`, "info");
+    }
+  }
+
+  async function handleReset(ui: MenuUI, name: string, file: string) {
+    const confirmed = await ui.confirm(
+      "Reset to default",
+      `Delete override ${file} and restore embedded default?`,
+    );
+    if (confirmed) {
+      fileOps.remove(file);
+      registry.reload();
+      ui.notify(`Restored default ${name}`, "info");
     }
   }
 
@@ -112,30 +148,7 @@ export function createAgentConfigEditor(
       if (!overwrite) return;
     }
 
-    const fmFields: string[] = [];
-    fmFields.push(`description: ${cfg.description}`);
-    if (cfg.displayName) fmFields.push(`display_name: ${cfg.displayName}`);
-    fmFields.push(`tools: ${cfg.builtinToolNames?.join(", ") ?? "all"}`);
-    if (cfg.model) fmFields.push(`model: ${cfg.model}`);
-    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 === false) fmFields.push("extensions: false");
-    else if (Array.isArray(cfg.extensions))
-      fmFields.push(`extensions: ${cfg.extensions.join(", ")}`);
-    if (cfg.skills === false) fmFields.push("skills: false");
-    else if (Array.isArray(cfg.skills))
-      fmFields.push(`skills: ${cfg.skills.join(", ")}`);
-    if (cfg.disallowedTools?.length)
-      fmFields.push(`disallowed_tools: ${cfg.disallowedTools.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");
-    if (cfg.isolation) fmFields.push(`isolation: ${cfg.isolation}`);
-
-    const content = `---\n${fmFields.join("\n")}\n---\n\n${cfg.systemPrompt}\n`;
-
-    fileOps.write(targetPath, content);
+    fileOps.write(targetPath, buildEjectContent(cfg));
     registry.reload();
     ui.notify(`Ejected ${name} to ${targetPath}`, "info");
   }