@gotgenes/pi-subagents 6.17.0 → 6.17.2

package/src/index.ts

@@ -20,35 +20,35 @@ import {
   SettingsManager as SdkSettingsManager,
   SessionManager,
 } from "@earendil-works/pi-coding-agent";
-import { AgentManager, type AgentManagerObserver } from "./agent-manager.js";
-import { createAgentRunner, getAgentConversation, type RunnerIO, steerAgent } from "./agent-runner.js";
-import { AgentTypeRegistry } from "./agent-types.js";
-import { loadCustomAgents } from "./custom-agents.js";
-import { detectEnv } from "./env.js";
-import { SessionLifecycleHandler, ToolStartHandler } from "./handlers/index.js";
-import { buildMemoryBlock, buildReadOnlyMemoryBlock } from "./memory.js";
-import { type ModelRegistry, resolveModel } from "./model-resolver.js";
-import { buildEventData, type NotificationDetails, NotificationManager } from "./notification.js";
-import { buildParentSnapshot } from "./parent-snapshot.js";
-import { buildAgentPrompt } from "./prompts.js";
-import { createNotificationRenderer } from "./renderer.js";
-import { createSubagentRuntime } from "./runtime.js";
-import { publishSubagentsService, unpublishSubagentsService } from "./service.js";
-import { createSubagentsService } from "./service-adapter.js";
-import { deriveSubagentSessionDir } from "./session-dir.js";
-import { SettingsManager } from "./settings.js";
-import { preloadSkills } from "./skill-loader.js";
-import { createAgentTool } from "./tools/agent-tool.js";
-import { createGetResultTool } from "./tools/get-result-tool.js";
-import { getModelLabelFromConfig } from "./tools/helpers.js";
-import { createSteerTool } from "./tools/steer-tool.js";
-import { FsAgentFileOps } from "./ui/agent-file-ops.js";
-import { createAgentsMenuHandler } from "./ui/agent-menu.js";
+import { AgentTypeRegistry } from "#src/config/agent-types";
+import { loadCustomAgents } from "#src/config/custom-agents";
+import { SessionLifecycleHandler, ToolStartHandler } from "#src/handlers/index";
+import { AgentManager, type AgentManagerObserver } from "#src/lifecycle/agent-manager";
+import { createAgentRunner, getAgentConversation, type RunnerIO, steerAgent } from "#src/lifecycle/agent-runner";
+import { buildParentSnapshot } from "#src/lifecycle/parent-snapshot";
+import { GitWorktreeManager } from "#src/lifecycle/worktree";
+import { buildEventData, type NotificationDetails, NotificationManager } from "#src/observation/notification";
+import { createNotificationRenderer } from "#src/observation/renderer";
+import { createSubagentRuntime } from "#src/runtime";
+import { publishSubagentsService, unpublishSubagentsService } from "#src/service/service";
+import { createSubagentsService } from "#src/service/service-adapter";
+import { detectEnv } from "#src/session/env";
+import { buildMemoryBlock, buildReadOnlyMemoryBlock } from "#src/session/memory";
+import { type ModelRegistry, resolveModel } from "#src/session/model-resolver";
+import { buildAgentPrompt } from "#src/session/prompts";
+import { deriveSubagentSessionDir } from "#src/session/session-dir";
+import { preloadSkills } from "#src/session/skill-loader";
+import { SettingsManager } from "#src/settings";
+import { createAgentTool } from "#src/tools/agent-tool";
+import { createGetResultTool } from "#src/tools/get-result-tool";
+import { getModelLabelFromConfig } from "#src/tools/helpers";
+import { createSteerTool } from "#src/tools/steer-tool";
+import { FsAgentFileOps } from "#src/ui/agent-file-ops";
+import { createAgentsMenuHandler } from "#src/ui/agent-menu";
 import {
   AgentWidget,
   type UICtx,
-} from "./ui/agent-widget.js";
-import { GitWorktreeManager } from "./worktree.js";
+} from "#src/ui/agent-widget";
 
 export default function (pi: ExtensionAPI) {
   // ---- Register custom notification renderer ----

package/src/{agent-manager.ts → lifecycle/agent-manager.ts}

@@ -9,17 +9,17 @@
 import { randomUUID } from "node:crypto";
 import type { Model } from "@earendil-works/pi-ai";
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
-import { AgentRecord } from "./agent-record.js";
-import type { AgentRunner } from "./agent-runner.js";
-import { AgentTypeRegistry } from "./agent-types.js";
-import { debugLog } from "./debug.js";
-import { NotificationState } from "./notification-state.js";
-import type { ParentSnapshot } from "./parent-snapshot.js";
-import { subscribeRecordObserver } from "./record-observer.js";
-import type { RunConfig } from "./runtime.js";
-import type { AgentInvocation, IsolationMode, ShellExec, SubagentType, ThinkingLevel } from "./types.js";
-import type { WorktreeManager } from "./worktree.js";
-import { WorktreeState } from "./worktree-state.js";
+import { AgentTypeRegistry } from "#src/config/agent-types";
+import { debugLog } from "#src/debug";
+import { AgentRecord } from "#src/lifecycle/agent-record";
+import type { AgentRunner } from "#src/lifecycle/agent-runner";
+import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
+import type { WorktreeManager } from "#src/lifecycle/worktree";
+import { WorktreeState } from "#src/lifecycle/worktree-state";
+import { NotificationState } from "#src/observation/notification-state";
+import { subscribeRecordObserver } from "#src/observation/record-observer";
+import type { RunConfig } from "#src/runtime";
+import type { AgentInvocation, IsolationMode, ShellExec, SubagentType, ThinkingLevel } from "#src/types";
 
 export type CompactionInfo = { reason: "manual" | "threshold" | "overflow"; tokensBefore: number };
 

package/src/{agent-record.ts → lifecycle/agent-record.ts}

@@ -13,12 +13,12 @@
  */
 
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
-import type { ExecutionState } from "./execution-state.js";
-import type { NotificationState } from "./notification-state.js";
-import type { AgentInvocation, SubagentType } from "./types.js";
-import type { LifetimeUsage } from "./usage.js";
-import { addUsage } from "./usage.js";
-import type { WorktreeState } from "./worktree-state.js";
+import type { ExecutionState } from "#src/lifecycle/execution-state";
+import type { LifetimeUsage } from "#src/lifecycle/usage";
+import { addUsage } from "#src/lifecycle/usage";
+import type { WorktreeState } from "#src/lifecycle/worktree-state";
+import type { NotificationState } from "#src/observation/notification-state";
+import type { AgentInvocation, SubagentType } from "#src/types";
 
 export type AgentRecordStatus =
 	| "queued"

package/src/{agent-runner.ts → lifecycle/agent-runner.ts}

@@ -8,12 +8,12 @@ import {
   type AgentSessionEvent,
   type SettingsManager,
 } from "@earendil-works/pi-coding-agent";
-import type { AgentConfigLookup } from "./agent-types.js";
-import { extractText } from "./context.js";
-import type { EnvInfo } from "./env.js";
-import type { ParentSnapshot } from "./parent-snapshot.js";
-import { type AssemblerIO, assembleSessionConfig } from "./session-config.js";
-import type { ShellExec, SubagentType, ThinkingLevel } from "./types.js";
+import type { AgentConfigLookup } from "#src/config/agent-types";
+import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
+import { extractText } from "#src/session/context";
+import type { EnvInfo } from "#src/session/env";
+import { type AssemblerIO, assembleSessionConfig } from "#src/session/session-config";
+import type { ShellExec, SubagentType, ThinkingLevel } from "#src/types";
 
 /** Names of tools registered by this extension that subagents must NOT inherit. */
 const EXCLUDED_TOOL_NAMES = ["Agent", "get_subagent_result", "steer_subagent"];

package/src/{parent-snapshot.ts → lifecycle/parent-snapshot.ts}

@@ -3,7 +3,7 @@
  */
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { buildParentContext } from "./context.js";
+import { buildParentContext } from "#src/session/context";
 
 /**
  * Plain data snapshot of the parent session state captured at spawn time.

package/src/{worktree-state.ts → lifecycle/worktree-state.ts}

@@ -6,7 +6,7 @@
  * cleanupResult is recorded once at completion or error — it is not set at construction.
  */
 
-import type { WorktreeCleanupResult, WorktreeInfo } from "./worktree.js";
+import type { WorktreeCleanupResult, WorktreeInfo } from "#src/lifecycle/worktree";
 
 export type { WorktreeCleanupResult, WorktreeInfo };
 

package/src/{worktree.ts → lifecycle/worktree.ts}

@@ -11,7 +11,7 @@ import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { debugLog } from "./debug.js";
+import { debugLog } from "#src/debug";
 
 export interface WorktreeInfo {
   /** Absolute path to the worktree directory. */

package/src/{notification.ts → observation/notification.ts}

@@ -1,7 +1,7 @@
-import { debugLog } from "./debug.js";
-import type { AgentRecord } from "./types.js";
-import type { AgentActivityTracker } from "./ui/agent-activity-tracker.js";
-import { getLifetimeTotal, getSessionContextPercent } from "./usage.js";
+import { debugLog } from "#src/debug";
+import { getLifetimeTotal, getSessionContextPercent } from "#src/lifecycle/usage";
+import type { AgentRecord } from "#src/types";
+import type { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
 
 /** Details attached to custom notification messages for visual rendering. */
 export interface NotificationDetails {

package/src/{record-observer.ts → observation/record-observer.ts}

@@ -5,8 +5,8 @@
  * and resume() with a single direct subscription.
  */
 
-import type { CompactionInfo } from "./agent-manager.js";
-import type { AgentRecord } from "./agent-record.js";
+import type { CompactionInfo } from "#src/lifecycle/agent-manager";
+import type { AgentRecord } from "#src/lifecycle/agent-record";
 
 /** Narrow session interface — only the subscribe method needed by the observer. */
 interface SubscribableSession {

package/src/{renderer.ts → observation/renderer.ts}

@@ -1,6 +1,6 @@
 import { Text } from "@earendil-works/pi-tui";
-import type { NotificationDetails } from "./notification.js";
-import { formatMs, formatTokens, formatTurns } from "./ui/display.js";
+import type { NotificationDetails } from "#src/observation/notification";
+import { formatMs, formatTokens, formatTurns } from "#src/ui/display";
 
 /** Narrow theme interface — only the methods the renderer actually calls. */
 interface RendererTheme {

package/src/runtime.ts

@@ -6,8 +6,8 @@
  * Follows the same pattern as pi-permission-system's ExtensionRuntime.
  */
 
-import type { AgentActivityTracker } from "./ui/agent-activity-tracker.js";
-import type { UICtx } from "./ui/agent-widget.js";
+import type { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
+import type { UICtx } from "#src/ui/agent-widget";
 
 /**
  * Narrow widget interface consumed by SubagentRuntime delegation methods.

package/src/{service-adapter.ts → service/service-adapter.ts}

@@ -6,11 +6,11 @@
  */
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { ModelRegistry } from "./model-resolver.js";
-import type { ParentSnapshot } from "./parent-snapshot.js";
-import { buildParentSnapshot } from "./parent-snapshot.js";
-import type { SubagentRecord, SubagentsService } from "./service.js";
-import type { AgentRecord } from "./types.js";
+import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
+import { buildParentSnapshot } from "#src/lifecycle/parent-snapshot";
+import type { SubagentRecord, SubagentsService } from "#src/service/service";
+import type { ModelRegistry } from "#src/session/model-resolver";
+import type { AgentRecord } from "#src/types";
 
 /** Narrow interface for the AgentManager — avoids coupling to the concrete class. */
 export interface AgentManagerLike {

package/src/{service.ts → service/service.ts}

@@ -9,7 +9,7 @@
  *   svc?.spawn("Explore", "Check for stale TODOs");
  */
 
-import type { LifetimeUsage } from "./usage.js";
+import type { LifetimeUsage } from "#src/lifecycle/usage";
 
 export type { LifetimeUsage };
 

package/src/{env.ts → session/env.ts}

@@ -2,8 +2,8 @@
  * env.ts — Detect environment info (git, platform) for subagent system prompts.
  */
 
-import { debugLog } from "./debug.js";
-import type { ShellExec } from "./types.js";
+import { debugLog } from "#src/debug";
+import type { ShellExec } from "#src/types";
 
 export interface EnvInfo {
   isGitRepo: boolean;

package/src/{memory.ts → session/memory.ts}

@@ -10,8 +10,8 @@
 import { existsSync, lstatSync, mkdirSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, } from "node:path";
-import { debugLog } from "./debug.js";
-import type { MemoryScope } from "./types.js";
+import { debugLog } from "#src/debug";
+import type { MemoryScope } from "#src/types";
 
 /** Maximum lines to read from MEMORY.md */
 const MAX_MEMORY_LINES = 200;

package/src/{prompts.ts → session/prompts.ts}

@@ -2,8 +2,8 @@
  * prompts.ts — System prompt builder for agents.
  */
 
-import type { EnvInfo } from "./env.js";
-import type { AgentPromptConfig } from "./types.js";
+import type { EnvInfo } from "#src/session/env";
+import type { AgentPromptConfig } from "#src/types";
 
 /** Extra sections to inject into the system prompt (memory, skills, etc.). */
 export interface PromptExtras {

package/src/{session-config.ts → session/session-config.ts}

@@ -14,16 +14,16 @@ import {
   type AgentConfigLookup,
   getMemoryToolNames,
   getReadOnlyMemoryToolNames,
-} from "./agent-types.js";
-import type { EnvInfo } from "./env.js";
-import type { PromptExtras } from "./prompts.js";
-import type { PreloadedSkill } from "./skill-loader.js";
+} from "#src/config/agent-types";
+import type { EnvInfo } from "#src/session/env";
+import type { PromptExtras } from "#src/session/prompts";
+import type { PreloadedSkill } from "#src/session/skill-loader";
 import type {
   AgentPromptConfig,
   MemoryScope,
   SubagentType,
   ThinkingLevel,
-} from "./types.js";
+} from "#src/types";
 
 // ── Public interfaces ────────────────────────────────────────────────────────
 

package/src/{skill-loader.ts → session/skill-loader.ts}

@@ -23,8 +23,8 @@ import { existsSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
-import { debugLog } from "./debug.js";
-import { isSymlink, isUnsafeName, safeReadFile } from "./memory.js";
+import { debugLog } from "#src/debug";
+import { isSymlink, isUnsafeName, safeReadFile } from "#src/session/memory";
 
 export interface PreloadedSkill {
   name: string;

package/src/tools/agent-tool.ts

@@ -1,24 +1,23 @@
 import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
-import type { AgentSpawnConfig } from "../agent-manager.js";
-import { AgentTypeRegistry } from "../agent-types.js";
-import type { ParentSnapshot } from "../parent-snapshot.js";
-
-import type { AgentRecord } from "../types.js";
-import { AgentActivityTracker } from "../ui/agent-activity-tracker.js";
-import { type UICtx } from "../ui/agent-widget.js";
+import { AgentTypeRegistry } from "#src/config/agent-types";
+import type { AgentSpawnConfig } 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";
+import { buildDetails, buildTypeListText, textResult } from "#src/tools/helpers";
+import { type ModelInfo, resolveSpawnConfig } from "#src/tools/spawn-config";
+import type { AgentRecord } from "#src/types";
+import { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
+import { type UICtx } from "#src/ui/agent-widget";
 import {
   type AgentDetails,
   formatMs,
   formatTurns,
   getDisplayName,
   SPINNER,
-} from "../ui/display.js";
-import { spawnBackground } from "./background-spawner.js";
-import { runForeground } from "./foreground-runner.js";
-import { buildDetails, buildTypeListText, textResult } from "./helpers.js";
-import { type ModelInfo, resolveSpawnConfig } from "./spawn-config.js";
+} from "#src/ui/display";
 
 // ---- Deps interface ----
 

package/src/tools/background-spawner.ts

@@ -1,11 +1,11 @@
-import type { AgentSpawnConfig } from "../agent-manager.js";
-import type { ParentSnapshot } from "../parent-snapshot.js";
-import type { AgentRecord } from "../types.js";
-import { AgentActivityTracker } from "../ui/agent-activity-tracker.js";
-import { subscribeUIObserver } from "../ui/ui-observer.js";
-import type { AgentActivityAccess } from "./agent-tool.js";
-import { textResult } from "./helpers.js";
-import type { ResolvedSpawnConfig } from "./spawn-config.js";
+import type { AgentSpawnConfig } 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";
+import type { ResolvedSpawnConfig } from "#src/tools/spawn-config";
+import type { AgentRecord } from "#src/types";
+import { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
+import { subscribeUIObserver } from "#src/ui/ui-observer";
 
 /** Narrow manager interface for the background spawner. */
 export interface BackgroundManagerDeps {

package/src/tools/foreground-runner.ts

@@ -1,23 +1,23 @@
 import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
-import type { AgentSpawnConfig } from "../agent-manager.js";
-import type { ParentSnapshot } from "../parent-snapshot.js";
-import type { AgentRecord } from "../types.js";
-import { AgentActivityTracker } from "../ui/agent-activity-tracker.js";
-import {
-  type AgentDetails,
-  describeActivity,
-  formatMs,
-  SPINNER,
-} from "../ui/display.js";
-import { subscribeUIObserver } from "../ui/ui-observer.js";
-import type { AgentActivityAccess } from "./agent-tool.js";
+import type { AgentSpawnConfig } from "#src/lifecycle/agent-manager";
+import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
+import type { AgentActivityAccess } from "#src/tools/agent-tool";
 import {
   buildDetails,
   formatLifetimeTokens,
   getStatusNote,
   textResult,
-} from "./helpers.js";
-import type { ResolvedSpawnConfig } from "./spawn-config.js";
+} from "#src/tools/helpers";
+import type { ResolvedSpawnConfig } from "#src/tools/spawn-config";
+import type { AgentRecord } from "#src/types";
+import { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
+import {
+  type AgentDetails,
+  describeActivity,
+  formatMs,
+  SPINNER,
+} from "#src/ui/display";
+import { subscribeUIObserver } from "#src/ui/ui-observer";
 
 /** Narrow manager interface for the foreground runner. */
 export interface ForegroundManagerDeps {

package/src/tools/get-result-tool.ts

@@ -1,10 +1,10 @@
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
-import type { AgentConfigLookup } from "../agent-types.js";
-import type { AgentRecord } from "../types.js";
-import { formatDuration, getDisplayName } from "../ui/display.js";
-import { getSessionContextPercent } from "../usage.js";
-import { formatLifetimeTokens, textResult } from "./helpers.js";
+import type { AgentConfigLookup } from "#src/config/agent-types";
+import { getSessionContextPercent } from "#src/lifecycle/usage";
+import { formatLifetimeTokens, textResult } from "#src/tools/helpers";
+import type { AgentRecord } from "#src/types";
+import { formatDuration, getDisplayName } from "#src/ui/display";
 
 /** Create the get_subagent_result tool definition (without Pi SDK wrapper). */
 export function createGetResultTool(

package/src/tools/helpers.ts

@@ -1,7 +1,7 @@
-import type { AgentConfigLookup } from "../agent-types.js";
-import { AgentActivityTracker } from "../ui/agent-activity-tracker.js";
-import { type AgentDetails, formatTokens } from "../ui/display.js";
-import { getLifetimeTotal, type LifetimeUsage } from "../usage.js";
+import type { AgentConfigLookup } from "#src/config/agent-types";
+import { getLifetimeTotal, type LifetimeUsage } from "#src/lifecycle/usage";
+import { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
+import { type AgentDetails, formatTokens } from "#src/ui/display";
 
 /** Parenthetical status note for completed agent result text. */
 export function getStatusNote(status: string): string {

package/src/tools/spawn-config.ts

@@ -7,17 +7,17 @@
  */
 
 import type { Model } from "@earendil-works/pi-ai";
-import { normalizeMaxTurns } from "../agent-runner.js";
-import type { AgentTypeRegistry } from "../agent-types.js";
-import { resolveAgentInvocationConfig } from "../invocation-config.js";
-import { resolveInvocationModel } from "../model-resolver.js";
-import type { AgentInvocation, IsolationMode, SubagentType, ThinkingLevel } from "../types.js";
+import type { AgentTypeRegistry } from "#src/config/agent-types";
+import { resolveAgentInvocationConfig } from "#src/config/invocation-config";
+import { normalizeMaxTurns } from "#src/lifecycle/agent-runner";
+import { resolveInvocationModel } from "#src/session/model-resolver";
+import type { AgentInvocation, IsolationMode, SubagentType, ThinkingLevel } from "#src/types";
 import {
   type AgentDetails,
   buildInvocationTags,
   getDisplayName,
   getPromptModeLabel,
-} from "../ui/display.js";
+} from "#src/ui/display";
 
 /** Model info extracted from the parent session context. */
 export interface ModelInfo {

package/src/tools/steer-tool.ts

@@ -1,8 +1,8 @@
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
-import type { AgentRecord } from "../types.js";
-import { getSessionContextPercent } from "../usage.js";
-import { formatLifetimeTokens, textResult } from "./helpers.js";
+import { getSessionContextPercent } from "#src/lifecycle/usage";
+import { formatLifetimeTokens, textResult } from "#src/tools/helpers";
+import type { AgentRecord } from "#src/types";
 
 /** Create the steer_subagent tool definition (without Pi SDK wrapper). */
 export function createSteerTool(

package/src/types.ts

@@ -5,7 +5,7 @@
 import type { ThinkingLevel } from "@earendil-works/pi-ai";
 
 
-export { AgentRecord } from "./agent-record.js";
+export { AgentRecord } from "#src/lifecycle/agent-record";
 export type { ThinkingLevel };
 
 /** Agent type: any string name (built-in defaults or user-defined). */

package/src/ui/agent-activity-tracker.ts

@@ -5,7 +5,7 @@
  * in `ui-observer.ts`. Callers use named transition methods; readers use read-only accessors.
  */
 
-import type { SessionLike } from "../usage.js";
+import type { SessionLike } from "#src/lifecycle/usage";
 
 /** Per-agent live activity state with explicit transition methods and read-only accessors. */
 export class AgentActivityTracker {

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

@@ -7,10 +7,10 @@
 
 import { join } from "node:path";
 
-import type { AgentTypeRegistry } from "../agent-types.js";
-import type { AgentConfig } from "../types.js";
-import type { AgentFileOps } from "./agent-file-ops.js";
-import type { MenuUI } from "./agent-menu.js";
+import type { AgentTypeRegistry } from "#src/config/agent-types";
+import type { AgentConfig } from "#src/types";
+import type { AgentFileOps } from "#src/ui/agent-file-ops";
+import type { MenuUI } from "#src/ui/agent-menu";
 
 // ---- Factory ----
 

package/src/ui/agent-creation-wizard.ts

@@ -7,11 +7,11 @@
 
 import { join } from "node:path";
 
-import { BUILTIN_TOOL_NAMES } from "../agent-types.js";
-import type { ParentSnapshot } from "../parent-snapshot.js";
-import type { AgentRecord } from "../types.js";
-import type { AgentFileOps } from "./agent-file-ops.js";
-import type { MenuUI } from "./agent-menu.js";
+import { BUILTIN_TOOL_NAMES } from "#src/config/agent-types";
+import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
+import type { AgentRecord } from "#src/types";
+import type { AgentFileOps } from "#src/ui/agent-file-ops";
+import type { MenuUI } from "#src/ui/agent-menu";
 
 // ---- Deps interface ----
 

package/src/ui/agent-menu.ts

@@ -1,13 +1,13 @@
 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";
-import type { AgentConfig, AgentRecord } from "../types.js";
-import type { AgentActivityTracker } from "./agent-activity-tracker.js";
-import { createAgentConfigEditor } from "./agent-config-editor.js";
-import { createAgentCreationWizard } from "./agent-creation-wizard.js";
-import type { AgentFileOps } from "./agent-file-ops.js";
-import { formatDuration, getDisplayName } from "./display.js";
+import { AgentTypeRegistry } from "#src/config/agent-types";
+import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
+import type { ModelRegistry } from "#src/session/model-resolver";
+import type { AgentConfig, AgentRecord } from "#src/types";
+import type { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
+import { createAgentConfigEditor } from "#src/ui/agent-config-editor";
+import { createAgentCreationWizard } from "#src/ui/agent-creation-wizard";
+import type { AgentFileOps } from "#src/ui/agent-file-ops";
+import { formatDuration, getDisplayName } from "#src/ui/display";
 
 // ---- Deps interface ----
 
@@ -247,7 +247,7 @@ export function createAgentsMenuHandler({
     }
 
     const { ConversationViewer, VIEWPORT_HEIGHT_PCT } = await import(
-      "./conversation-viewer.js"
+      "./conversation-viewer"
     );
     const activity = agentActivity.get(record.id);
 

package/src/ui/agent-widget.ts

@@ -5,11 +5,11 @@
  * Uses the callback form of setWidget for themed rendering.
  */
 
-import type { AgentManager } from "../agent-manager.js";
-import { AgentTypeRegistry } from "../agent-types.js";
-import type { AgentActivityTracker } from "./agent-activity-tracker.js";
-import { ERROR_STATUSES, type Theme } from "./display.js";
-import { renderWidgetLines } from "./widget-renderer.js";
+import { AgentTypeRegistry } from "#src/config/agent-types";
+import type { AgentManager } from "#src/lifecycle/agent-manager";
+import type { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
+import { ERROR_STATUSES, type Theme } from "#src/ui/display";
+import { renderWidgetLines } from "#src/ui/widget-renderer";
 
 // ---- Types ----
 

package/src/ui/conversation-viewer.ts

@@ -7,12 +7,12 @@
 
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
 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";
-import { getLifetimeTotal, getSessionContextPercent } from "../usage.js";
-import type { AgentActivityTracker } from "./agent-activity-tracker.js";
-import { buildInvocationTags, describeActivity, formatDuration, formatSessionTokens, getDisplayName, getPromptModeLabel, type Theme } from "./display.js";
+import type { AgentConfigLookup } from "#src/config/agent-types";
+import { getLifetimeTotal, getSessionContextPercent } from "#src/lifecycle/usage";
+import { extractText } from "#src/session/context";
+import type { AgentRecord } from "#src/types";
+import type { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
+import { buildInvocationTags, describeActivity, formatDuration, formatSessionTokens, getDisplayName, getPromptModeLabel, type Theme } from "#src/ui/display";
 
 // ── Local message-shape types ───────────────────────────────────────────────
 // The Pi SDK does not export narrow types for all message content variants.