@gotgenes/pi-subagents 6.18.1 → 6.18.2

package/CHANGELOG.md

@@ -5,6 +5,17 @@ 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.18.2](https://github.com/gotgenes/pi-packages/compare/pi-subagents-v6.18.1...pi-subagents-v6.18.2) (2026-05-24)
+
+
+### Documentation
+
+* plan extract ParentSessionInfo from AgentSpawnConfig ([#166](https://github.com/gotgenes/pi-packages/issues/166)) ([aff7b35](https://github.com/gotgenes/pi-packages/commit/aff7b35c98503fbb3da6a287631a2aa5c4d498fd))
+* **retro:** add planning stage notes for issue [#166](https://github.com/gotgenes/pi-packages/issues/166) ([6138473](https://github.com/gotgenes/pi-packages/commit/613847313d56a9df8b479726d831679391bd0c1a))
+* **retro:** add retro notes for issue [#165](https://github.com/gotgenes/pi-packages/issues/165) ([2a3e70d](https://github.com/gotgenes/pi-packages/commit/2a3e70dc6b903b4c053e7f6ebc09169bc3e34bf6))
+* **retro:** add TDD stage notes for issue [#166](https://github.com/gotgenes/pi-packages/issues/166) ([2696da5](https://github.com/gotgenes/pi-packages/commit/2696da599de72f1a881577a4de8fedc57472a695))
+* update architecture doc — AgentSpawnConfig step 3 complete ([125450b](https://github.com/gotgenes/pi-packages/commit/125450ba9ea5753b4cad07ed4d1675dcdbc7e319))
+
 ## [6.18.1](https://github.com/gotgenes/pi-packages/compare/pi-subagents-v6.18.0...pi-subagents-v6.18.1) (2026-05-24)
 
 

package/docs/architecture/architecture.md

@@ -500,20 +500,20 @@ These are fire-and-forget broadcast events — no request IDs, no reply channels
 These interfaces carry hidden dependencies that obscure true coupling.
 Bags with 10+ fields are the highest priority for decomposition.
 
-| Interface                   | Fields    | Consumers                                         | Severity |
-| --------------------------- | --------- | ------------------------------------------------- | -------- |
-| `ResolvedSpawnConfig`       | 15        | foreground-runner, background-spawner, agent-tool | Critical |
-| `AgentSpawnConfig`          | 13        | agent-manager (internal)                          | Critical |
-| `RunOptions`                | 12        | agent-runner                                      | High     |
-| `SessionConfig`             | 11        | agent-runner (output of assembler)                | High     |
-| `NotificationDetails`       | 10        | notification                                      | Medium   |
-| `ResourceLoaderOptions`     | 10        | agent-runner (SDK bridge)                         | Medium   |
-| `RunnerIO`                  | 9 methods | agent-runner                                      | Medium   |
-| `CreateSessionOptions`      | 9         | agent-runner (SDK bridge)                         | Medium   |
-| `AgentToolDeps`             | 8         | agent-tool                                        | Low      |
-| `AgentMenuDeps`             | 8         | agent-menu                                        | Low      |
-| `ConversationViewerOptions` | 8         | conversation-viewer                               | Low      |
-| `AgentRecordInit`           | 8         | agent-record                                      | Low      |
+| Interface                   | Fields                             | Consumers                                         | Severity |
+| --------------------------- | ---------------------------------- | ------------------------------------------------- | -------- |
+| `ResolvedSpawnConfig`       | 3 nested                           | foreground-runner, background-spawner, agent-tool | ✓ done   |
+| `AgentSpawnConfig`          | 13 → 13 (ParentSessionInfo nested) | agent-manager (internal)                          | ✓ done   |
+| `RunOptions`                | 12                                 | agent-runner                                      | High     |
+| `SessionConfig`             | 11                                 | agent-runner (output of assembler)                | High     |
+| `NotificationDetails`       | 10                                 | notification                                      | Medium   |
+| `ResourceLoaderOptions`     | 10                                 | agent-runner (SDK bridge)                         | Medium   |
+| `RunnerIO`                  | 9 methods                          | agent-runner                                      | Medium   |
+| `CreateSessionOptions`      | 9                                  | agent-runner (SDK bridge)                         | Medium   |
+| `AgentToolDeps`             | 8                                  | agent-tool                                        | Low      |
+| `AgentMenuDeps`             | 8                                  | agent-menu                                        | Low      |
+| `ConversationViewerOptions` | 8                                  | conversation-viewer                               | Low      |
+| `AgentRecordInit`           | 8                                  | agent-record                                      | Low      |
 
 ### Complexity hotspots
 
@@ -586,20 +586,20 @@ interface SpawnPresentation {
 `agent-tool` uses all three to build the `AgentSpawnConfig` and the result text.
 After decomposition, each consumer declares its real dependencies explicitly.
 
-#### AgentSpawnConfig (13 fields → extract ParentSessionInfo)
+#### AgentSpawnConfig — ParentSessionInfo extracted (done, [#166][166])
 
-Several fields form a natural cluster around parent session identity:
+The `parentSessionFile`, `parentSessionId`, and `toolCallId` fields were grouped into `ParentSessionInfo`:
 
 ```typescript
-/** Parent session identity — always travel together. */
-interface ParentSessionInfo {
+/** Parent session identity — always travel together from the tool boundary. */
+export interface ParentSessionInfo {
   parentSessionFile?: string;
   parentSessionId?: string;
   toolCallId?: string;
 }
 ```
 
-Extracting this from `AgentSpawnConfig` reduces it from 13 to 10 fields and introduces a named concept that currently exists only as scattered optional fields.
+`AgentSpawnConfig` now carries `parentSession?: ParentSessionInfo` instead of three flat optional fields.
 
 #### RunOptions (12 fields → extract RunContext)
 
@@ -676,10 +676,10 @@ Split the 15-field bag into `SpawnIdentity`, `SpawnExecution`, and `SpawnPresent
 Each consumer declares its real dependencies.
 Enables Step 3 (narrowing AgentSpawnConfig, [#166][166]).
 
-### Step 3: Extract ParentSessionInfo from AgentSpawnConfig ([#166][166])
+### Step 3: Extract ParentSessionInfo from AgentSpawnConfig ([#166][166]) — Complete
 
-Extract `parentSessionFile`, `parentSessionId`, `toolCallId` into a `ParentSessionInfo` value object.
-Reduces AgentSpawnConfig from 13 to 10 fields.
+Extracted `parentSessionFile`, `parentSessionId`, `toolCallId` into `ParentSessionInfo`.
+`AgentSpawnConfig`, `BackgroundParams`, `ForegroundParams`, and `RunOptions` all carry the nested group.
 
 ### Step 4: Narrow RunnerIO ([#167][167])
 

package/docs/plans/0166-extract-parent-session-info.md

@@ -0,0 +1,231 @@
+---
+issue: 166
+issue_title: "refactor(pi-subagents): extract ParentSessionInfo from AgentSpawnConfig (13 fields)"
+---
+
+# Extract ParentSessionInfo from AgentSpawnConfig
+
+## Problem Statement
+
+`AgentSpawnConfig` in `agent-manager.ts` has 13 fields.
+Three of those fields — `parentSessionFile`, `parentSessionId`, and `toolCallId` — form a natural cluster around parent session identity.
+They always travel together through `agent-tool.ts` → `foreground-runner.ts` / `background-spawner.ts` → `AgentManager.spawn()`.
+Extracting them into a named value object reduces `AgentSpawnConfig` from 13 to 11 fields (10 + 1 nested) and introduces the `ParentSessionInfo` domain concept.
+
+## Goals
+
+- Extract `ParentSessionInfo` interface with `parentSessionFile`, `parentSessionId`, and `toolCallId`.
+- Replace the three flat optional fields on `AgentSpawnConfig` with a single optional `parentSession?: ParentSessionInfo` field.
+- Replace the flat fields on `BackgroundParams`, `ForegroundParams`, and `RunOptions` with the same grouped type.
+- Update all callers (agent-tool, foreground-runner, background-spawner, agent-manager, agent-runner) and their tests.
+- Non-breaking refactor — no public API changes (the `SubagentsService` boundary does not expose these fields).
+
+## Non-Goals
+
+- Changing the `NotificationState` or `notification` module — they remain as-is; `toolCallId` is just extracted from the group at the `AgentManager.spawn` boundary.
+- Further decomposition of `AgentSpawnConfig` (e.g., extracting execution or callback clusters) — tracked separately.
+- Modifying `session-dir.ts` or `deriveSubagentSessionDir` — the function signature stays the same; callers just unwrap `parentSession.parentSessionFile` before calling it.
+
+## Background
+
+Issue #165 (closed) decomposed `ResolvedSpawnConfig` into `SpawnIdentity`, `SpawnExecution`, and `SpawnPresentation`.
+This issue continues that structural improvement by grouping the parent-session fields that flow from `agent-tool.ts` through to `agent-runner.ts`.
+
+The three fields are:
+
+- `parentSessionFile` — path to the parent session's JSONL file, used by `deriveSubagentSessionDir` to place child sessions next to the parent.
+- `parentSessionId` — session ID of the parent agent, stored in the child session's `parentSession` header via `sessionManager.newSession()`.
+- `toolCallId` — tool call ID for background notification wiring; when set, `AgentManager.spawn` creates a `NotificationState`.
+
+All three originate in `agent-tool.ts`'s `execute` function and are threaded unchanged through intermediate modules.
+
+### Current flow
+
+```text
+agent-tool execute → getSessionInfo() + toolCallId param
+  → BackgroundParams { parentSessionFile, parentSessionId, toolCallId }
+  → spawnBackground → manager.spawn(opts: AgentSpawnConfig { ...flat fields })
+    → AgentManager.spawn → options.toolCallId → NotificationState
+    → startAgent → runner.run(RunOptions { parentSessionFile, parentSessionId })
+      → deriveSessionDir(parentSessionFile, ...)
+      → sessionManager.newSession({ parentSession: parentSessionId })
+
+  → ForegroundParams { parentSessionFile, parentSessionId }
+  → runForeground → manager.spawnAndWait(opts: AgentSpawnConfig { ...flat fields })
+    → (same AgentManager path)
+```
+
+### After extraction
+
+```text
+agent-tool execute → getSessionInfo() + toolCallId param
+  → parentSession: ParentSessionInfo { parentSessionFile, parentSessionId, toolCallId }
+  → BackgroundParams { parentSession }
+  → spawnBackground → manager.spawn(opts: AgentSpawnConfig { parentSession })
+    → AgentManager.spawn → parentSession.toolCallId → NotificationState
+    → startAgent → runner.run(RunOptions { parentSession })
+      → deriveSessionDir(parentSession?.parentSessionFile, ...)
+      → sessionManager.newSession({ parentSession: parentSession?.parentSessionId })
+
+  → ForegroundParams { parentSession }
+  → runForeground → manager.spawnAndWait(opts: AgentSpawnConfig { parentSession })
+    → (same AgentManager path)
+```
+
+## Design Overview
+
+### `ParentSessionInfo` interface
+
+```typescript
+export interface ParentSessionInfo {
+  /** Path to the parent session's JSONL file (for deriving the subagent session directory). */
+  parentSessionFile?: string;
+  /** Session ID of the parent agent (stored in the child session's parentSession header). */
+  parentSessionId?: string;
+  /** Tool call ID for background notification wiring. When set, spawn attaches NotificationState. */
+  toolCallId?: string;
+}
+```
+
+All three fields remain optional — they are only available when spawning from an active session (the `SubagentsService` boundary omits them entirely).
+
+The interface lives in `lifecycle/agent-manager.ts` alongside `AgentSpawnConfig` since that is the primary consumer.
+If a future refactoring moves `AgentSpawnConfig` to its own file, `ParentSessionInfo` should move with it.
+
+### Consumer call-site sketch
+
+```typescript
+// agent-tool.ts execute():
+const parentSession: ParentSessionInfo = {
+  parentSessionFile: sessionInfo.parentSessionFile,
+  parentSessionId: sessionInfo.parentSessionId,
+  toolCallId,
+};
+// ...
+spawnBackground(manager, widget, agentActivity, { config, snapshot, parentSession });
+```
+
+The grouped object eliminates the three-field spread that was repeated in both `spawnBackground` and `runForeground` call sites.
+
+### `AgentSpawnConfig` change
+
+```typescript
+export interface AgentSpawnConfig {
+  // ... existing fields (description, model, maxTurns, etc.)
+  /** Parent session identity — grouped fields that travel together from the tool boundary. */
+  parentSession?: ParentSessionInfo;
+  // Remove: parentSessionFile, parentSessionId, toolCallId
+}
+```
+
+### `RunOptions` change
+
+```typescript
+export interface RunOptions {
+  // ... existing fields
+  /** Parent session identity (file path + session ID). */
+  parentSession?: ParentSessionInfo;
+  // Remove: parentSessionFile, parentSessionId
+}
+```
+
+Note: `RunOptions` does not use `toolCallId` — it was never threaded to the runner.
+The runner only reads `parentSessionFile` and `parentSessionId` from the group.
+
+### `getSessionInfo` return type update
+
+The `getSessionInfo` callback in `AgentToolDeps` currently returns `{ parentSessionFile: string; parentSessionId: string }`.
+It should remain unchanged — it does not include `toolCallId` (which comes from the `execute` callback's first argument).
+The `agent-tool.ts` execute function constructs a `ParentSessionInfo` by merging `getSessionInfo()` output with `toolCallId`.
+
+## Module-Level Changes
+
+### New types
+
+1. `src/lifecycle/agent-manager.ts` — add `ParentSessionInfo` interface (exported).
+
+### Modified interfaces
+
+1. `src/lifecycle/agent-manager.ts` — `AgentSpawnConfig`: replace `parentSessionFile?`, `parentSessionId?`, `toolCallId?` with `parentSession?: ParentSessionInfo`.
+2. `src/lifecycle/agent-runner.ts` — `RunOptions`: replace `parentSessionFile?`, `parentSessionId?` with `parentSession?: ParentSessionInfo`.
+3. `src/tools/background-spawner.ts` — `BackgroundParams`: replace `parentSessionFile`, `parentSessionId`, `toolCallId` with `parentSession: ParentSessionInfo`.
+4. `src/tools/foreground-runner.ts` — `ForegroundParams`: replace `parentSessionFile`, `parentSessionId` with `parentSession: ParentSessionInfo`.
+
+### Modified implementations
+
+1. `src/lifecycle/agent-manager.ts` — `AgentManager.spawn()`: read `options.parentSession?.toolCallId` instead of `options.toolCallId`; pass `parentSession` to `RunOptions`.
+2. `src/lifecycle/agent-runner.ts` — `runAgent()`: read `options.parentSession?.parentSessionFile` and `options.parentSession?.parentSessionId`.
+3. `src/tools/agent-tool.ts` — `createAgentTool` execute: construct `ParentSessionInfo` from `getSessionInfo()` + `toolCallId`, pass as `parentSession` to both spawners.
+4. `src/tools/background-spawner.ts` — `spawnBackground()`: read `params.parentSession` and pass fields to `AgentSpawnConfig`.
+5. `src/tools/foreground-runner.ts` — `runForeground()`: read `params.parentSession` and pass fields to `AgentSpawnConfig`.
+
+### No changes needed
+
+- `src/tools/agent-tool.ts` — `AgentToolDeps.getSessionInfo` return type stays the same.
+- `src/session/session-dir.ts` — `deriveSubagentSessionDir` signature unchanged.
+- `src/observation/notification-state.ts` — constructor signature unchanged.
+- `src/service/service-adapter.ts` — does not pass parent session fields.
+- `src/index.ts` — `getSessionInfo` callback unchanged.
+
+## Test Impact Analysis
+
+### New tests enabled
+
+No new unit tests are enabled — this is a structural grouping, not new behavior.
+
+### Existing tests that need updates
+
+1. `test/lifecycle/agent-manager.test.ts` — update spawn calls from flat `parentSessionFile`/`parentSessionId`/`toolCallId` to nested `parentSession: { ... }` form; update assertions to read from `parentSession`.
+2. `test/lifecycle/agent-runner.test.ts` — update `RunOptions` construction from flat to nested `parentSession`.
+3. `test/tools/agent-tool.test.ts` — update assertion checking `toolCallId` on spawn opts to check `parentSession.toolCallId`.
+4. `test/tools/background-spawner.test.ts` — update `makeParams` factory from flat fields to `parentSession: { ... }`.
+5. `test/tools/foreground-runner.test.ts` — update params construction from flat fields to `parentSession: { ... }`.
+6. `test/helpers/make-deps.ts` — `getSessionInfo` mock stays unchanged (returns flat `{ parentSessionFile, parentSessionId }`).
+
+### Tests that stay as-is
+
+- `test/session/session-dir.test.ts` — tests `deriveSubagentSessionDir` directly, no interface change.
+- `test/observation/notification-state.test.ts` — tests `NotificationState` constructor directly.
+- `test/observation/notification.test.ts` — tests notification formatting with `record.notification`, not spawn config.
+
+## TDD Order
+
+1. **Define `ParentSessionInfo` and update `AgentSpawnConfig`** — add interface, replace three flat fields with `parentSession?`.
+   Update `AgentManager.spawn` and `startAgent` to read from the nested group.
+   Update `agent-manager.test.ts` to use nested form.
+   Run `pnpm run check` to verify no downstream type errors remain.
+   Commit: `refactor: define ParentSessionInfo and nest in AgentSpawnConfig`
+
+2. **Update `RunOptions` in `agent-runner.ts`** — replace flat `parentSessionFile?`/`parentSessionId?` with `parentSession?`.
+   Update `runAgent` to read `options.parentSession?.parentSessionFile` and `options.parentSession?.parentSessionId`.
+   Update `agent-runner.test.ts`.
+   Commit: `refactor: nest ParentSessionInfo in RunOptions`
+
+3. **Update `BackgroundParams` and `spawnBackground`** — replace three flat fields with `parentSession: ParentSessionInfo`.
+   Update `spawnBackground` to pass `parentSession` to spawn opts.
+   Update `background-spawner.test.ts`.
+   Commit: `refactor: nest ParentSessionInfo in BackgroundParams`
+
+4. **Update `ForegroundParams` and `runForeground`** — replace two flat fields with `parentSession: ParentSessionInfo`.
+   Update `runForeground` to pass `parentSession` to spawn opts.
+   Update `foreground-runner.test.ts`.
+   Commit: `refactor: nest ParentSessionInfo in ForegroundParams`
+
+5. **Update `agent-tool.ts` execute** — construct `ParentSessionInfo` from `getSessionInfo()` + `toolCallId`, pass as `parentSession` to both spawner call sites.
+   Update `agent-tool.test.ts`.
+   Commit: `refactor: construct ParentSessionInfo in agent-tool execute`
+
+6. **Final verification** — run full test suite (`pnpm vitest run`) and type check (`pnpm run check`).
+   No separate commit unless adjustments are needed.
+
+## Risks and Mitigations
+
+| Risk                                                                                                          | Mitigation                                                                                                                           |
+| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
+| Deep-merge trap: test factories using `Partial<BackgroundParams>` spread may silently ignore nested overrides | Audit `makeParams` in `background-spawner.test.ts` — convert from flat-field spread to nested `parentSession` construction           |
+| `toolCallId` conditionally absent for foreground calls                                                        | `ParentSessionInfo.toolCallId` is optional; `ForegroundParams.parentSession` includes it but won't set it — matches current behavior |
+| Type check passes but runtime breaks due to nested access on undefined                                        | `parentSession?` is optional on `AgentSpawnConfig`; all reads use optional chaining (`options.parentSession?.toolCallId`)            |
+
+## Open Questions
+
+None — the extraction is mechanical and the issue description is unambiguous.

package/docs/retro/0165-decompose-resolved-spawn-config.md

@@ -38,3 +38,41 @@ The decomposition touched 7 files (4 source, 3 test) and kept the test count fla
 - Step 1 breaking all consumers simultaneously was handled smoothly by completing all steps before pushing, as planned.
   No transitional alias was needed.
 - The `background-spawner.test.ts` description-override test was the only unexpected friction point — the flat spread issue wasn't caught by the plan.
+
+## Stage: Final Retrospective (2026-05-24T15:00:14Z)
+
+### Session summary
+
+Shipped issue #165 (CI green, released as `pi-subagents-v6.18.1`) and ran the final retrospective.
+The most impactful outcome across all three sessions was the skill description improvements (commit `51f52ef`), which addressed a recurring `instruction-violation` pattern.
+
+### Observations
+
+#### What went well
+
+- The user's probing question ("This is consistent, though.
+  Why?") turned a simple skill-loading skip into a generalizable improvement to three skill descriptions and two prompt instructions.
+  This is a good example of the user investing a redirecting question instead of a correction.
+- TDD execution was clean — 4 cycles, no rework, no type errors at the end.
+  The plan's risk mitigation ("land steps 1–4 on the same branch") worked as intended.
+- Ship stage had zero friction: push, CI, close, release-please merge, tag — all first-try.
+
+#### What caused friction (agent side)
+
+- `instruction-violation` — Skipped loading the `colgrep` skill during planning despite explicit instructions.
+  Root cause: skill descriptions that read like tool reference manuals get deprioritized because the agent perceives them as redundant with the tool schema already in context.
+  Impact: no rework on the plan itself, but triggered a productive detour to improve skill descriptions.
+  User-caught.
+- `missing-context` — The plan didn't anticipate that `Partial<ResolvedSpawnConfig>` spread in test factories would silently break after nesting.
+  The `testing` skill already warns about spread-related pitfalls, but not this specific variant (flat keys ignored by top-level spread on a nested structure).
+  Impact: one test failure during step 4 that required a verbose inline fix (writing out the full `execution` sub-object).
+  Self-identified during implementation.
+
+#### What caused friction (user side)
+
+- None observed.
+  The user's intervention on the `colgrep` skill was well-timed and produced a higher-value outcome than skipping it would have.
+
+### Changes made
+
+1. Added a TDD planning rule to `.pi/skills/testing/SKILL.md` warning about `Partial<T>` spread not deep-merging into nested interfaces after a flat-to-nested refactor.

package/docs/retro/0166-extract-parent-session-info.md

@@ -0,0 +1,39 @@
+---
+issue: 166
+issue_title: "refactor(pi-subagents): extract ParentSessionInfo from AgentSpawnConfig (13 fields)"
+---
+
+# Retro: #166 — Extract ParentSessionInfo from AgentSpawnConfig
+
+## Stage: Planning (2026-05-24T16:00:00Z)
+
+### Session summary
+
+Produced a 6-step TDD plan to extract `ParentSessionInfo` from `AgentSpawnConfig`.
+The refactoring groups three co-traveling fields (`parentSessionFile`, `parentSessionId`, `toolCallId`) into a named value object, reducing `AgentSpawnConfig` from 13 to 11 fields.
+
+### Observations
+
+- The `SubagentsService` boundary (`service-adapter.ts`) does not pass any of the three fields, so this is a purely internal refactoring with no public API impact.
+- `getSessionInfo` in `AgentToolDeps` returns only `parentSessionFile` and `parentSessionId`; `toolCallId` comes from the `execute` callback's first argument — the plan keeps this separation and merges them at the `agent-tool.ts` boundary.
+- `RunOptions` in `agent-runner.ts` never carried `toolCallId` (it was consumed in `AgentManager.spawn` before reaching the runner), so the nested `parentSession` on `RunOptions` only holds the two session fields.
+- The deep-merge trap from the testing skill is relevant: `background-spawner.test.ts` has a `makeParams` factory that spreads flat fields — must be converted to nested `parentSession` construction.
+- Issue #165 (decompose `ResolvedSpawnConfig`) is closed, so this plan builds on stable ground.
+
+## Stage: Implementation — TDD (2026-05-24T17:00:00Z)
+
+### Session summary
+
+All 5 TDD cycles completed across `agent-manager.ts`, `agent-runner.ts`, `background-spawner.ts`, `foreground-runner.ts`, and `agent-tool.ts`.
+Test count held steady at 805 (no net new tests — refactor only).
+Type check and lint both clean after all steps.
+
+### Observations
+
+- The `AgentSpawnConfig` field count went from 15 to 13 (not 13 → 10 as originally estimated) — the architecture doc quoted the issue's stale count; the actual pre-refactor interface had 15 fields (`bypassQueue` and others were already present).
+  The architecture doc was updated to reflect "done" with a note about the nested group rather than a specific before/after number.
+- The deep-merge trap (noted in planning) did materialise: `background-spawner.test.ts`'s `makeParams` spread `Partial<BackgroundParams>` with flat fields.
+  Fixed by replacing the three flat fields with a single `parentSession` object at the factory level — top-level spread still works correctly since `parentSession` is one field.
+- `RunOptions` in `agent-runner.ts` needed a new import of `ParentSessionInfo` from `agent-manager.ts`; no circular dependency since `agent-runner.ts` already imports from `agent-manager.ts`.
+- `agent-tool.ts` still imports `AgentSpawnConfig` (needed by `AgentToolManager` interface) — the new `ParentSessionInfo` import was added alongside it.
+- All 5 commits are clean `refactor:` messages; architecture doc update is a separate `docs:` commit.

package/package.json

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

package/src/lifecycle/agent-manager.ts

@@ -53,6 +53,15 @@ interface SpawnArgs {
   options: AgentSpawnConfig;
 }
 
+export interface ParentSessionInfo {
+  /** Path to the parent session's JSONL file (for deriving the subagent session directory). */
+  parentSessionFile?: string;
+  /** Session ID of the parent agent (stored in the child session's parentSession header). */
+  parentSessionId?: string;
+  /** Tool call ID for background notification wiring. When set, spawn attaches NotificationState. */
+  toolCallId?: string;
+}
+
 export interface AgentSpawnConfig {
   description: string;
   model?: Model<any>;
@@ -75,12 +84,8 @@ export interface AgentSpawnConfig {
   signal?: AbortSignal;
   /** Called when the agent session is created — receives the session and the agent's record. */
   onSessionCreated?: (session: AgentSession, record: AgentRecord) => void;
-  /** Path to the parent session's JSONL file (for deriving the subagent session directory). */
-  parentSessionFile?: string;
-  /** Session ID of the parent agent (stored in the child session's parentSession header). */
-  parentSessionId?: string;
-  /** Tool call ID for background notification wiring. When set, spawn attaches NotificationState. */
-  toolCallId?: string;
+  /** Parent session identity — grouped fields that travel together from the tool boundary. */
+  parentSession?: ParentSessionInfo;
 }
 
 export class AgentManager {
@@ -158,8 +163,8 @@ export class AgentManager {
     });
     this.agents.set(id, record);
 
-    if (options.toolCallId) {
-      record.notification = new NotificationState(options.toolCallId);
+    if (options.parentSession?.toolCallId) {
+      record.notification = new NotificationState(options.parentSession.toolCallId);
     }
 
     if (options.isBackground) {
@@ -228,8 +233,7 @@ export class AgentManager {
       isolated: options.isolated,
       thinkingLevel: options.thinkingLevel,
       cwd: worktreeCwd,
-      parentSessionFile: options.parentSessionFile,
-      parentSessionId: options.parentSessionId,
+      parentSession: options.parentSession,
       signal: record.abortController!.signal,
       registry: this.registry,
       onSessionCreated: (session) => {

package/src/lifecycle/agent-runner.ts

@@ -9,6 +9,7 @@ import {
   type SettingsManager,
 } from "@earendil-works/pi-coding-agent";
 import type { AgentConfigLookup } from "#src/config/agent-types";
+import type { ParentSessionInfo } from "#src/lifecycle/agent-manager";
 import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
 import { extractText } from "#src/session/context";
 import type { EnvInfo } from "#src/session/env";
@@ -146,10 +147,8 @@ export interface RunOptions {
   thinkingLevel?: ThinkingLevel;
   /** Override working directory (e.g. for worktree isolation). */
   cwd?: string;
-  /** Path to the parent session's JSONL file (for deriving the subagent session directory). */
-  parentSessionFile?: string;
-  /** Session ID of the parent agent (stored in the child session's parentSession header). */
-  parentSessionId?: string;
+  /** Parent session identity (file path + session ID). */
+  parentSession?: ParentSessionInfo;
   /** Called once after session creation — session delivery mechanism. */
   onSessionCreated?: (session: AgentSession) => void;
   /**
@@ -308,9 +307,9 @@ export async function runAgent(
   // Create a persisted SessionManager so transcripts are written in Pi's
   // official JSONL format. Falls back to a temp directory when the parent
   // session is not persisted (e.g. headless/API mode).
-  const sessionDir = io.deriveSessionDir(options.parentSessionFile, cfg.effectiveCwd);
+  const sessionDir = io.deriveSessionDir(options.parentSession?.parentSessionFile, cfg.effectiveCwd);
   const sessionManager = io.createSessionManager(cfg.effectiveCwd, sessionDir);
-  sessionManager.newSession({ parentSession: options.parentSessionId });
+  sessionManager.newSession({ parentSession: options.parentSession?.parentSessionId });
 
   const { session } = await io.createSession({
     cwd: cfg.effectiveCwd,

package/src/tools/agent-tool.ts

@@ -3,7 +3,7 @@ import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { AgentTypeRegistry } from "#src/config/agent-types";
-import type { AgentSpawnConfig } from "#src/lifecycle/agent-manager";
+import type { AgentSpawnConfig, ParentSessionInfo } from "#src/lifecycle/agent-manager";
 import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
 import { spawnBackground } from "#src/tools/background-spawner";
 import { runForeground } from "#src/tools/foreground-runner";
@@ -303,6 +303,7 @@ Guidelines:
       // ---- Boundary extraction (after config so inheritContext is resolved) ----
       const snapshot = buildSnapshot(config.execution.inheritContext);
       const { parentSessionFile, parentSessionId } = getSessionInfo();
+      const parentSession: ParentSessionInfo = { parentSessionFile, parentSessionId, toolCallId };
 
       // ---- Resume existing agent ----
       if (params.resume) {
@@ -337,7 +338,7 @@ Guidelines:
           manager,
           widget,
           agentActivity,
-          { config, snapshot, parentSessionFile, parentSessionId, toolCallId },
+          { config, snapshot, parentSession },
         );
       }
 
@@ -346,7 +347,7 @@ Guidelines:
         manager,
         widget,
         agentActivity,
-        { config, snapshot, parentSessionFile, parentSessionId },
+        { config, snapshot, parentSession },
         signal,
         onUpdate,
       );

package/src/tools/background-spawner.ts

@@ -1,4 +1,4 @@
-import type { AgentSpawnConfig } from "#src/lifecycle/agent-manager";
+import type { AgentSpawnConfig, ParentSessionInfo } from "#src/lifecycle/agent-manager";
 import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
 import type { AgentActivityAccess } from "#src/tools/agent-tool";
 import { textResult } from "#src/tools/helpers";
@@ -24,9 +24,7 @@ export interface BackgroundWidgetDeps {
 export interface BackgroundParams {
   config: ResolvedSpawnConfig;
   snapshot: ParentSnapshot;
-  parentSessionFile: string;
-  parentSessionId: string;
-  toolCallId: string;
+  parentSession: ParentSessionInfo;
 }
 
 /**
@@ -46,8 +44,7 @@ export function spawnBackground(
   let id: string;
   try {
     id = manager.spawn(params.snapshot, identity.subagentType, execution.prompt, {
-      parentSessionFile: params.parentSessionFile,
-      parentSessionId: params.parentSessionId,
+      parentSession: params.parentSession,
       description: execution.description,
       model: execution.model,
       maxTurns: execution.effectiveMaxTurns,
@@ -57,7 +54,6 @@ export function spawnBackground(
       isBackground: true,
       isolation: execution.isolation,
       invocation: execution.agentInvocation,
-      toolCallId: params.toolCallId,
       onSessionCreated: (session) => {
         bgState.setSession(session);
         subscribeUIObserver(session, bgState);

package/src/tools/foreground-runner.ts

@@ -1,5 +1,5 @@
 import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
-import type { AgentSpawnConfig } from "#src/lifecycle/agent-manager";
+import type { AgentSpawnConfig, ParentSessionInfo } from "#src/lifecycle/agent-manager";
 import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
 import type { AgentActivityAccess } from "#src/tools/agent-tool";
 import {
@@ -39,8 +39,7 @@ export interface ForegroundWidgetDeps {
 export interface ForegroundParams {
   config: ResolvedSpawnConfig;
   snapshot: ParentSnapshot;
-  parentSessionFile: string;
-  parentSessionId: string;
+  parentSession: ParentSessionInfo;
 }
 
 /**
@@ -109,8 +108,7 @@ export async function runForeground(
         isolation: execution.isolation,
         invocation: execution.agentInvocation,
         signal,
-        parentSessionFile: params.parentSessionFile,
-        parentSessionId: params.parentSessionId,
+        parentSession: params.parentSession,
         onSessionCreated: (session, record) => {
           fgState.setSession(session);
           recordRef = record;