@gotgenes/pi-subagents 6.16.2 → 6.17.0

package/CHANGELOG.md

@@ -5,6 +5,28 @@ 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).
 
+## [6.17.0](https://github.com/gotgenes/pi-packages/compare/pi-subagents-v6.16.3...pi-subagents-v6.17.0) (2026-05-23)
+
+
+### Features
+
+* inject wrapText into ConversationViewer (Phase 9, Step O) ([#147](https://github.com/gotgenes/pi-packages/issues/147)) ([2522d5b](https://github.com/gotgenes/pi-packages/commit/2522d5b82f2a29b9011f31d49f82b5f914f12f99))
+
+
+### Documentation
+
+* mark Step O complete in architecture doc ([#147](https://github.com/gotgenes/pi-packages/issues/147)) ([c4a6ee5](https://github.com/gotgenes/pi-packages/commit/c4a6ee5217692fc67b9a9e5b6c8586376e9e7e02))
+* plan inject wrapText into ConversationViewer ([#147](https://github.com/gotgenes/pi-packages/issues/147)) ([fe4dceb](https://github.com/gotgenes/pi-packages/commit/fe4dcebda894b0d641820e55d41e48e4a0c67c3d))
+* **retro:** add planning stage notes for issue [#147](https://github.com/gotgenes/pi-packages/issues/147) ([dce5db2](https://github.com/gotgenes/pi-packages/commit/dce5db2fc2ce2fd530bbfacd61ec40e771005768))
+* **retro:** add TDD stage notes for issue [#147](https://github.com/gotgenes/pi-packages/issues/147) ([2db1238](https://github.com/gotgenes/pi-packages/commit/2db123874d1730ac8811d44731a8f7cb052ee043))
+
+## [6.16.3](https://github.com/gotgenes/pi-packages/compare/pi-subagents-v6.16.2...pi-subagents-v6.16.3) (2026-05-23)
+
+
+### Documentation
+
+* **retro:** add retro notes for issue [#146](https://github.com/gotgenes/pi-packages/issues/146) ([720fcb0](https://github.com/gotgenes/pi-packages/commit/720fcb07937fc62a1811e59448343d3dfbc1ab14))
+
 ## [6.16.2](https://github.com/gotgenes/pi-packages/compare/pi-subagents-v6.16.1...pi-subagents-v6.16.2) (2026-05-23)
 
 

package/docs/architecture/architecture.md

@@ -616,13 +616,13 @@ Phase 9 targets the next layer: observation model consolidation, `ExtensionConte
 
 ### Current smells
 
-| Smell                                            | Location                                                                  | Evidence                                                                                                                       | Severity |
-| ------------------------------------------------ | ------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | -------- |
-| `execute` does config resolution for its callees | `agent-tool.ts` (145-line `execute`)                                      | ~60 lines unpack config, resolve model, compute metadata, repack into 16-field bags for spawners; `ctx` threaded 4 layers deep | Medium   |
-| ~~Wide `ctx` in menu handlers~~                  | ~~`agent-menu.ts`, `agent-config-editor.ts`, `agent-creation-wizard.ts`~~ | Resolved by #146: `MenuUI` interface introduced; 42 `ctx as any` casts eliminated across 5 test files                          | Done     |
-| Direct SDK import in `conversation-viewer.ts`    | `conversation-viewer.test.ts`                                             | Hoisted `vi.mock("@earendil-works/pi-tui")` to intercept `wrapTextWithAnsi`                                                    | Low      |
-| ~~Widget mixes rendering, lifecycle, and state~~ | ~~`agent-widget.ts` (370 lines)~~                                         | Resolved by #148: rendering extracted to `widget-renderer.ts`; widget is now 198 lines                                         | Done     |
-| `deps.` prefix noise in function bodies          | remaining modules across tools, UI, service-adapter                       | Functions accept a `deps` bag and access every field as `deps.foo`; hides real dependencies and lengthens every call line      | Low      |
+| Smell                                             | Location                                                                  | Evidence                                                                                                                       | Severity |
+| ------------------------------------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | -------- |
+| `execute` does config resolution for its callees  | `agent-tool.ts` (145-line `execute`)                                      | ~60 lines unpack config, resolve model, compute metadata, repack into 16-field bags for spawners; `ctx` threaded 4 layers deep | Medium   |
+| ~~Wide `ctx` in menu handlers~~                   | ~~`agent-menu.ts`, `agent-config-editor.ts`, `agent-creation-wizard.ts`~~ | Resolved by #146: `MenuUI` interface introduced; 42 `ctx as any` casts eliminated across 5 test files                          | Done     |
+| ~~Direct SDK import in `conversation-viewer.ts`~~ | ~~`conversation-viewer.test.ts`~~                                         | Resolved by #147: `wrapText` injected via `ConversationViewerOptions`; `vi.mock("@earendil-works/pi-tui")` eliminated          | Done     |
+| ~~Widget mixes rendering, lifecycle, and state~~  | ~~`agent-widget.ts` (370 lines)~~                                         | Resolved by #148: rendering extracted to `widget-renderer.ts`; widget is now 198 lines                                         | Done     |
+| `deps.` prefix noise in function bodies           | remaining modules across tools, UI, service-adapter                       | Functions accept a `deps` bag and access every field as `deps.foo`; hides real dependencies and lengthens every call line      | Low      |
 
 ### Dependency bag convention
 
@@ -683,15 +683,15 @@ After Steps M and N, `ExtensionContext` appears only at true boundaries: `index.
 
 Impact: eliminated 42 `ctx as any` casts across 5 test files (`agent-menu.test.ts`: 8, `agent-config-editor.test.ts`: 20, `agent-creation-wizard.test.ts`: 14); tests construct plain `MenuUI`-shaped objects with no cast.
 
-### Step O: Inject text wrapping into ConversationViewer (#147)
+### Step O: Inject text wrapping into ConversationViewer (#147) ✓
 
-Accept a `wrapText` function via `ConversationViewerOptions`.
-`index.ts` passes the real `wrapTextWithAnsi` import.
-Tests inject a stub or the real function directly - no module-level mock needed.
+Accepted `wrapText: (text: string, width: number) => string[]` via `ConversationViewerOptions`.
+`agent-menu.ts` passes the real `wrapTextWithAnsi` import at the `ConversationViewer` construction site.
+Tests inject a stub or the real function directly via options — no module-level mock needed.
 
-Apply the dependency bag convention: `ConversationViewerOptions` is destructured in the constructor signature.
+Applied the dependency bag convention: `ConversationViewerOptions` is now destructured in the constructor signature.
 
-Impact: eliminates the hoisted `vi.mock("@earendil-works/pi-tui")` in `conversation-viewer.test.ts`.
+Impact: eliminated the hoisted `vi.mock("@earendil-works/pi-tui")` from `conversation-viewer.test.ts`; 1 test deleted (mock-mechanism sentinel); net −1 test.
 
 ### Step P: Split AgentWidget rendering (#148) ✓
 

package/docs/plans/0147-inject-wrap-text-into-conversation-viewer.md

@@ -0,0 +1,166 @@
+---
+issue: 147
+issue_title: "Inject text wrapping into ConversationViewer (Phase 9, Step O)"
+---
+
+# Inject text wrapping into ConversationViewer
+
+## Problem Statement
+
+`ConversationViewer` calls `wrapTextWithAnsi` directly from `@earendil-works/pi-tui` in four places inside `buildContentLines`.
+Because the function is a module-level binding, tests must intercept it via a hoisted `vi.mock("@earendil-works/pi-tui")` factory that replaces the entire TUI module.
+This is the last `vi.mock` on an SDK module in the test suite, added specifically to exercise the overwidth-clamping safety net.
+
+## Goals
+
+- Accept `wrapText: (text: string, width: number) => string[]` via `ConversationViewerOptions`.
+- Destructure `ConversationViewerOptions` in the constructor signature (dependency bag convention).
+- Replace all four `wrapTextWithAnsi` calls in `buildContentLines` with `this.wrapText`.
+- Remove `wrapTextWithAnsi` from `conversation-viewer.ts`'s `@earendil-works/pi-tui` import.
+- Pass `wrapTextWithAnsi` at the production call site in `agent-menu.ts`.
+- Eliminate the hoisted `vi.mock("@earendil-works/pi-tui")` from `conversation-viewer.test.ts`.
+
+## Non-Goals
+
+- Injecting `truncateToWidth` or any other TUI function (only `wrapTextWithAnsi` is relevant here).
+- Changing the overwidth-clamping behavior of `buildContentLines`.
+- Touching `agent-widget.ts` (tracked separately as Issue #148, Step P — already closed).
+
+## Background
+
+`ui/conversation-viewer.ts` is the live conversation overlay rendered when a user selects an agent in the `/agents` menu.
+Its `buildContentLines` method formats messages from the agent session into displayable lines, calling `wrapTextWithAnsi` to soft-wrap text to the available terminal width.
+
+The overwidth-clamping safety net (`truncateToWidth` applied after `wrapTextWithAnsi`) exists because a prior upstream bug returned lines wider than the requested width.
+The `vi.mock` in the test is the mechanism for simulating that bug by returning overwidth strings from `wrapTextWithAnsi`.
+
+The only production call site for `new ConversationViewer(...)` is in the `viewAgentConversation` closure inside `createAgentsMenuHandler` in `ui/agent-menu.ts`.
+
+Architecture reference: `docs/architecture/architecture.md` § Phase 9, Step O.
+
+## Design Overview
+
+### `ConversationViewerOptions` — add `wrapText`
+
+```typescript
+export interface ConversationViewerOptions {
+  tui: TUI;
+  session: AgentSession;
+  record: AgentRecord;
+  activity: AgentActivityTracker | undefined;
+  theme: Theme;
+  done: (result: undefined) => void;
+  registry: AgentConfigLookup;
+  wrapText: (text: string, width: number) => string[];
+}
+```
+
+The field is **required** — it must be supplied at every construction site.
+No default is provided; the default would be an invisible SDK dependency hidden inside the class.
+
+### Constructor destructuring
+
+The constructor adopts the dependency bag convention — destructure the options object rather than accessing via `options.*`:
+
+```typescript
+constructor({
+  tui, session, record, activity, theme, done, registry, wrapText,
+}: ConversationViewerOptions) {
+  this.tui = tui;
+  this.session = session;
+  // … etc.
+  this.wrapText = wrapText;
+  this.unsubscribe = session.subscribe(() => { … });
+}
+```
+
+### Production wiring — `agent-menu.ts`
+
+`agent-menu.ts` statically imports `wrapTextWithAnsi` from `@earendil-works/pi-tui` and passes it when constructing `ConversationViewer`:
+
+```typescript
+import { wrapTextWithAnsi } from "@earendil-works/pi-tui";
+// …
+return new ConversationViewer({
+  tui, session, record, activity, theme, done, registry,
+  wrapText: wrapTextWithAnsi,
+});
+```
+
+Adding `wrapText` to `AgentMenuDeps` and threading it through the closure would violate the Law of Demeter — `AgentMenuDeps` has no conceptual ownership of a text-wrapping function.
+The `viewAgentConversation` closure is the direct consumer; the import belongs there.
+
+### Test strategy
+
+After DI, tests pass `wrapText` directly in `ConversationViewerOptions`:
+
+- **"render width safety" tests**: pass `wrapText: wrapTextWithAnsi` (real function, statically imported — no mock).
+- **"safety net" tests**: pass a stub `wrapText: () => ["X".repeat(width + 50)]` inline in options — no `vi.mock` needed.
+- The "mock is intercepting wrapTextWithAnsi" test is removed (it verified the mock mechanism, not viewer behavior).
+- The module-level `wrapOverride` variable and the `vi.mock` block are removed entirely.
+- The `await import("@earendil-works/pi-tui")` and `await import("../src/ui/conversation-viewer.js")` dynamic imports are converted to ordinary top-level `import` statements.
+
+## Module-Level Changes
+
+| File                               | Change                                                                                                                                                                                                                                                       |
+| ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `src/ui/conversation-viewer.ts`    | Add `wrapText` field to `ConversationViewerOptions`; add `private wrapText` field; destructure options in constructor; replace 4× `wrapTextWithAnsi(...)` with `this.wrapText(...)`; remove `wrapTextWithAnsi` from the `@earendil-works/pi-tui` import line |
+| `src/ui/agent-menu.ts`             | Add `import { wrapTextWithAnsi } from "@earendil-works/pi-tui"`; pass `wrapText: wrapTextWithAnsi` in `viewAgentConversation`                                                                                                                                |
+| `test/conversation-viewer.test.ts` | Convert top-level dynamic `await import()` to static imports; remove `vi.mock`, `wrapOverride`, and "mock is intercepting" test; add `wrapText` to every `new ConversationViewer({…})` call; update safety-net tests to pass inline stub `wrapText`          |
+
+No symbols are removed from exported API (`ConversationViewerOptions`, `ConversationViewer`, `VIEWPORT_HEIGHT_PCT` all remain).
+The `wrapText` addition to `ConversationViewerOptions` is a breaking change for any external consumers that construct `ConversationViewer` — check for usages outside this package.
+
+Grep check: `ConversationViewer` appears only in `src/ui/conversation-viewer.ts`, `src/ui/agent-menu.ts`, and `test/conversation-viewer.test.ts` — no other files construct it.
+
+## Test Impact Analysis
+
+1. **New unit-test capability**: The safety-net tests can now inject exactly the stub they need without patching a module.
+   Each test is self-contained and immediately legible — the stub is declared inline at the call site.
+
+2. **Tests that become redundant**: The "mock is intercepting wrapTextWithAnsi" test verified the test mechanism, not production behavior.
+   It is deleted.
+   The `wrapOverride` reset in `beforeEach` is no longer needed.
+
+3. **Tests that stay**: All "render width safety" tests and all overwidth-clamping tests remain; they exercise real viewer behavior with real or controlled inputs.
+
+## TDD Order
+
+### Cycle 1 — Add `wrapText` field and update production wiring
+
+1. **Red**: Update one `new ConversationViewer({…})` in the test to include `wrapText: vi.fn()` — TypeScript rejects the unknown field.
+2. **Green**:
+   - Add `wrapText: (text: string, width: number) => string[]` to `ConversationViewerOptions`.
+   - Add `private wrapText: (text: string, width: number) => string[]` field to the class.
+   - Destructure options in the constructor; assign `this.wrapText = wrapText`.
+   - Replace all four `wrapTextWithAnsi(...)` calls with `this.wrapText(...)` in `buildContentLines`.
+   - Remove `wrapTextWithAnsi` from the `@earendil-works/pi-tui` import in `conversation-viewer.ts`.
+   - In `agent-menu.ts`: add static import of `wrapTextWithAnsi` from `@earendil-works/pi-tui`; pass `wrapText: wrapTextWithAnsi`.
+   - Update **all** `new ConversationViewer({…})` calls in `conversation-viewer.test.ts` to include `wrapText`.
+     "Render width safety" tests pass `wrapText: wrapTextWithAnsi` (real function, still imported via the existing `vi.mock` shim for now).
+     Safety-net tests pass a stub inline: `wrapText: () => ["X".repeat(w + 50)]`.
+   - Delete the "mock is intercepting wrapTextWithAnsi" test.
+3. **Verify**: `pnpm vitest run test/conversation-viewer.test.ts` passes.
+4. **Commit**: `feat: inject wrapText into ConversationViewer (Phase 9, Step O) (#147)`
+
+### Cycle 2 — Remove the module mock
+
+1. **Red**: Remove the `vi.mock("@earendil-works/pi-tui", …)` block, the `wrapOverride` variable, and the `beforeEach(() => { wrapOverride = null; })` reset.
+   Convert `const { visibleWidth } = await import("@earendil-works/pi-tui")` to `import { visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui"`.
+   Convert `const { ConversationViewer } = await import("../src/ui/conversation-viewer.js")` to `import { ConversationViewer } from "../src/ui/conversation-viewer.js"`.
+   Run tests — they should still pass (the mock was no longer needed after Cycle 1).
+2. **Green**: Tests pass without any module mock.
+3. **Verify**: `pnpm vitest run test/conversation-viewer.test.ts` and `pnpm run check` both pass.
+4. **Commit**: `refactor: remove vi.mock from conversation-viewer tests (#147)`
+
+## Risks and Mitigations
+
+| Risk                                                                              | Mitigation                                                                                             |
+| --------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ |
+| Missing a `new ConversationViewer({…})` call site in tests                        | Grep confirms only `test/conversation-viewer.test.ts` constructs the viewer; all instances are in-file |
+| TypeScript missing the `private wrapText` field type                              | Use `pnpm run check` after Cycle 1 to verify no type errors                                            |
+| The dynamic `await import()` pattern in tests was necessary for some other reason | The only purpose was to run after `vi.mock` hoisting; once the mock is gone, static imports work fine  |
+
+## Open Questions
+
+None — the issue's "Changes" section is unambiguous and the call-site inventory is small.

package/docs/retro/0146-narrow-ui-context.md

@@ -0,0 +1,70 @@
+---
+issue: 146
+issue_title: "Narrow UI context for menu handlers (Phase 9, Step N)"
+---
+
+# Retro: #146 — Narrow UI context for menu handlers
+
+## Final Retrospective (2026-05-23T10:00:00Z)
+
+### Session summary
+
+Introduced a `MenuUI` interface in `agent-menu.ts` capturing the 6 `ctx.ui` methods used by menu handlers.
+Replaced `ExtensionContext` with `MenuUI` (plus explicit `ModelRegistry` and `ParentSnapshot`) in all inner functions across `agent-menu.ts`, `agent-config-editor.ts`, and `agent-creation-wizard.ts`.
+Dissolved three ≤4-field dependency bags (`AgentConfigEditorDeps`, `GetResultDeps`, `SteerToolDeps`) into plain parameters; destructured `AgentMenuDeps` and `AgentCreationWizardDeps` in their factory signatures.
+Eliminated 42 `ctx as any` casts across 5 test files.
+Released as `pi-subagents-v6.16.2`.
+
+### Observations
+
+#### What went well
+
+- **User-initiated plan review caught three ordering bugs before implementation.**
+  The user asked the agent to "review the plan and judge its quality and clarity" after the initial commit.
+  The review identified three execution-blocking problems in the TDD order: `MenuUI` not defined before consumers, `ParentSnapshot` not threaded through the handler return type, and `index.ts` call sites not updated alongside their factories.
+  All three were fixed before TDD execution began, saving significant implementation friction.
+- The plan's TDD order (after fixes) worked well for a pure-refactoring change — all 806 tests stayed green throughout every step.
+- The type checker served as an effective safety net: every call-site mismatch was caught immediately by `pnpm run check`, preventing runtime surprises.
+
+#### What caused friction (agent side)
+
+##### Planning session
+
+- `missing-context` — The initial plan had three TDD ordering bugs: (1) `MenuUI` used before defined, (2) `ParentSnapshot` not threaded through handler return type, (3) `index.ts` call sites not updated alongside factory signature changes.
+  These were caught by a user-prompted plan review, not by the planning agent itself.
+  Impact: would have caused type-check failures during TDD execution; fixed before implementation started.
+
+- `wrong-abstraction` — After fixing the plan, the agent ran `git commit --amend --no-edit` to update the plan commit, but it landed on the wrong commit (a stacked prompt-changes commit from a different session).
+  This caused divergent history with origin.
+  Recovery required `git reset --hard origin/main` and re-applying the plan fixes as a new commit (`3d5b591`).
+  Impact: ~5 minutes of git recovery and re-application of edits.
+
+##### Implementation session
+
+- `missing-context` — In Step 3, the plan listed the `WizardManager.spawnAndWait` signature change (to accept `ParentSnapshot`) and the `AgentMenuManager.spawnAndWait` change as separate steps (3 and 4).
+  But `agent-menu.ts` passes `deps.manager` (typed as `AgentMenuManager`) to `createAgentCreationWizard`, which expects `WizardManager`.
+  Changing `WizardManager` without also changing `AgentMenuManager` broke the type checker.
+  I had to pull the `AgentMenuManager` change forward from Step 4 into Step 3.
+  Impact: minor — a few minutes of diagnosis and one extra edit, no rework.
+
+- `missing-context` — In Step 2, after dissolving `AgentConfigEditorDeps` and changing `showAgentDetail(ctx)` to `showAgentDetail(ui: MenuUI)`, I forgot to update the call site in `agent-menu.ts` from `editor.showAgentDetail(ctx, agentName)` to `editor.showAgentDetail(ctx.ui, agentName)`.
+  The type checker caught it immediately.
+  Impact: added friction but no rework — one extra `pnpm run check` cycle.
+
+- `missing-context` — In Step 4, the `makeUI()` test helper used `modelRegistry: {}` which didn't satisfy the `ModelRegistry` interface (requires `find` and `getAll`).
+  Impact: one extra `pnpm run check` cycle and a one-line fix.
+
+- `missing-context` — In Step 5, two tests called `createGetResultTool(makeDeps())` directly (not via the `execute()` helper).
+  After dissolving deps, the factory signature changed but I only updated `execute()`.
+  The type checker caught the two direct calls.
+  Impact: one extra `pnpm run check` cycle.
+
+#### What caused friction (user side)
+
+- None observed — the session ran autonomously with no user corrections needed.
+
+#### What caused friction (user side — planning)
+
+- The user had to explicitly ask for a plan review (“I'd like you to review the plan and judge its quality and clarity”) to surface three ordering bugs.
+  The planning agent should have caught these during plan authoring — the testing skill already contains rules about TDD step ordering and shared interface changes.
+  The user's intervention prevented significant implementation friction.

package/docs/retro/0147-inject-wrap-text-into-conversation-viewer.md

@@ -0,0 +1,50 @@
+---
+issue: 147
+issue_title: "Inject text wrapping into ConversationViewer (Phase 9, Step O)"
+---
+
+# Retro: #147 — Inject text wrapping into ConversationViewer (Phase 9, Step O)
+
+## Stage: Planning (2026-05-23T00:00:00Z)
+
+### Session summary
+
+Read the issue, loaded package-pi-subagents, code-design, testing, and markdown-conventions skills.
+Explored `src/ui/conversation-viewer.ts`, `src/ui/agent-menu.ts`, `test/conversation-viewer.test.ts`, and the Phase 9 architecture roadmap.
+Wrote and committed the plan at `packages/pi-subagents/docs/plans/0147-inject-wrap-text-into-conversation-viewer.md`.
+
+### Observations
+
+- The change is tightly scoped: two source files (`conversation-viewer.ts`, `agent-menu.ts`) and one test file.
+- `wrapTextWithAnsi` is called in exactly four places inside `buildContentLines` — all in the same private method, making the replacement straightforward.
+- The only production call site for `new ConversationViewer({…})` is `viewAgentConversation` in `agent-menu.ts`.
+  `wrapTextWithAnsi` is added as a static import there and passed as `wrapText` — no threading through `AgentMenuDeps` needed.
+- All `new ConversationViewer({…})` calls in the test file are inline (no shared factory helper), so every call site needs the new `wrapText` field added.
+  Grep confirms the count: 11+ calls, all in `test/conversation-viewer.test.ts`.
+- The plan uses 2 TDD cycles: Cycle 1 adds the field and updates all call sites (with the `vi.mock` still present for safety); Cycle 2 removes the mock and converts dynamic `await import()` to static imports.
+  This ordering avoids a large simultaneous change and gives the suite a stable intermediate state.
+- The "mock is intercepting wrapTextWithAnsi" test is deleted in Cycle 1 (it verified the mock mechanism, not production behavior).
+- No exported API symbols are removed; `wrapText` is a new required field on `ConversationViewerOptions`, which is a breaking change only for external constructors of `ConversationViewer` — confirmed none exist outside this package.
+
+## Stage: Implementation — TDD (2026-05-23T11:36:00Z)
+
+### Session summary
+
+Completed both TDD cycles from the plan.
+Cycle 1 added `wrapText` to `ConversationViewerOptions`, destructured options in the constructor, replaced all four `wrapTextWithAnsi` calls with `this.wrapText`, updated `agent-menu.ts` to import and pass `wrapTextWithAnsi`, and updated all 16 test constructor call sites (11 render-width-safety + 5 safety-net) while keeping the `vi.mock` shim in place.
+Cycle 2 removed the `vi.mock` block, `wrapOverride`, and `beforeEach` reset, then converted the dynamic `await import()` calls to ordinary static imports.
+Test count: 806 → 805 (deleted the mock-mechanism sentinel test).
+Full suite 50 files, 805 tests, all green.
+
+### Observations
+
+- The plan said the render-width-safety constructor calls numbered "11+" — the actual count was 16 total (11 render-width-safety + 5 safety-net), all in `test/conversation-viewer.test.ts`.
+  No external call sites existed.
+- `wrapTextWithAnsi` needed to be added to the dynamic import in Cycle 1 (`const { visibleWidth, wrapTextWithAnsi } = await import(...)`) because the render-width-safety tests reference it by name.
+  The plan didn't call this out explicitly — minor omission.
+- Used a Python script (inline via bash) to make the 17 constructor-call edits rather than 17 separate Edit-tool calls.
+  The safety-net tests each had a different stub character (`X`, `Y`, `Z`, `B`, `W`) which required a regex capture group to preserve.
+  The script worked on the first attempt.
+- Cycle 2 was a single Edit call replacing the entire mock block + the two dynamic imports + `beforeEach`.
+  The autoformatter then cleaned up import ordering automatically.
+- Architecture doc updated: smells table row struck-through and Step O marked ✓.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gotgenes/pi-subagents",
-  "version": "6.16.2",
+  "version": "6.17.0",
   "exports": {
     ".": "./src/service.ts"
   },

package/src/ui/agent-menu.ts

@@ -1,3 +1,4 @@
+import { wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { AgentTypeRegistry } from "../agent-types.js";
 import type { ModelRegistry } from "../model-resolver.js";
 import type { ParentSnapshot } from "../parent-snapshot.js";
@@ -260,6 +261,7 @@ export function createAgentsMenuHandler({
           theme,
           done,
           registry,
+          wrapText: wrapTextWithAnsi,
         });
       },
       {

package/src/ui/conversation-viewer.ts

@@ -6,7 +6,7 @@
  */
 
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
-import { type Component, matchesKey, type TUI, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import { type Component, matchesKey, type TUI, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type { AgentConfigLookup } from "../agent-types.js";
 import { extractText } from "../context.js";
 import type { AgentRecord } from "../types.js";
@@ -59,6 +59,7 @@ export interface ConversationViewerOptions {
   theme: Theme;
   done: (result: undefined) => void;
   registry: AgentConfigLookup;
+  wrapText: (text: string, width: number) => string[];
 }
 
 export class ConversationViewer implements Component {
@@ -75,16 +76,27 @@ export class ConversationViewer implements Component {
   private theme: Theme;
   private done: (result: undefined) => void;
   private registry: AgentConfigLookup;
-
-  constructor(options: ConversationViewerOptions) {
-    this.tui = options.tui;
-    this.session = options.session;
-    this.record = options.record;
-    this.activity = options.activity;
-    this.theme = options.theme;
-    this.done = options.done;
-    this.registry = options.registry;
-    this.unsubscribe = options.session.subscribe(() => {
+  private wrapText: (text: string, width: number) => string[];
+
+  constructor({
+    tui,
+    session,
+    record,
+    activity,
+    theme,
+    done,
+    registry,
+    wrapText,
+  }: ConversationViewerOptions) {
+    this.tui = tui;
+    this.session = session;
+    this.record = record;
+    this.activity = activity;
+    this.theme = theme;
+    this.done = done;
+    this.registry = registry;
+    this.wrapText = wrapText;
+    this.unsubscribe = session.subscribe(() => {
       if (this.closed) return;
       this.tui.requestRender();
     });
@@ -253,7 +265,7 @@ export class ConversationViewer implements Component {
         if (!text.trim()) continue;
         if (needsSeparator) lines.push(th.fg("dim", "───"));
         lines.push(th.fg("accent", "[User]"));
-        for (const line of wrapTextWithAnsi(text.trim(), width)) {
+        for (const line of this.wrapText(text.trim(), width)) {
           lines.push(line);
         }
       } else if (msg.role === "assistant") {
@@ -268,7 +280,7 @@ export class ConversationViewer implements Component {
         if (needsSeparator) lines.push(th.fg("dim", "───"));
         lines.push(th.bold("[Assistant]"));
         if (textParts.length > 0) {
-          for (const line of wrapTextWithAnsi(textParts.join("\n").trim(), width)) {
+          for (const line of this.wrapText(textParts.join("\n").trim(), width)) {
             lines.push(line);
           }
         }
@@ -281,7 +293,7 @@ export class ConversationViewer implements Component {
         if (!truncated.trim()) continue;
         if (needsSeparator) lines.push(th.fg("dim", "───"));
         lines.push(th.fg("dim", "[Result]"));
-        for (const line of wrapTextWithAnsi(truncated.trim(), width)) {
+        for (const line of this.wrapText(truncated.trim(), width)) {
           lines.push(th.fg("dim", line));
         }
       } else if (isBashExecution(msg)) {
@@ -291,7 +303,7 @@ export class ConversationViewer implements Component {
           const out = msg.output.length > 500
             ? msg.output.slice(0, 500) + "... (truncated)"
             : msg.output;
-          for (const line of wrapTextWithAnsi(out.trim(), width)) {
+          for (const line of this.wrapText(out.trim(), width)) {
             lines.push(th.fg("dim", line));
           }
         }