@gotgenes/pi-subagents 6.17.1 → 6.18.0

package/src/{custom-agents.ts → config/custom-agents.ts}

@@ -5,9 +5,9 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { basename, join } from "node:path";
 import { getAgentDir, parseFrontmatter } from "@earendil-works/pi-coding-agent";
-import { BUILTIN_TOOL_NAMES } from "./agent-types";
-import { debugLog } from "./debug";
-import type { AgentConfig, MemoryScope, ThinkingLevel } from "./types";
+import { BUILTIN_TOOL_NAMES } from "#src/config/agent-types";
+import { debugLog } from "#src/debug";
+import type { AgentConfig, MemoryScope, ThinkingLevel } from "#src/types";
 
 /**
  * Scan for custom agent .md files from multiple locations.
@@ -51,7 +51,7 @@ function loadFromDir(dir: string, agents: Map<string, AgentConfig>, source: "pro
       continue;
     }
 
-    const { frontmatter: fm, body } = parseFrontmatter<Record<string, unknown>>(content);
+    const { frontmatter: fm, body } = parseFrontmatter(content);
 
     agents.set(name, {
       name,
@@ -95,6 +95,7 @@ function nonNegativeInt(val: unknown): number | undefined {
  */
 function parseCsvField(val: unknown): string[] | undefined {
   if (val === undefined || val === null) return undefined;
+  // eslint-disable-next-line @typescript-eslint/no-base-to-string -- val is already narrowed past null/undefined; String() is the intended coercion here
   const s = String(val).trim();
   if (!s || s === "none") return undefined;
   const items = s.split(",").map(t => t.trim()).filter(Boolean);

package/src/{default-agents.ts → config/default-agents.ts}

@@ -4,7 +4,7 @@
  * These are always available but can be overridden by user .md files with the same name.
  */
 
-import type { AgentConfig } from "./types";
+import type { AgentConfig } from "#src/types";
 
 const READ_ONLY_TOOLS = ["read", "bash", "grep", "find", "ls"];
 

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

@@ -1,4 +1,4 @@
-import type { AgentConfig, IsolationMode, ThinkingLevel } from "./types";
+import type { AgentConfig, IsolationMode, ThinkingLevel } from "#src/types";
 
 interface AgentInvocationParams {
   model?: string;

package/src/handlers/index.ts

@@ -1,2 +1,2 @@
-export { SessionLifecycleHandler } from "./lifecycle";
-export { ToolStartHandler } from "./tool-start";
+export { SessionLifecycleHandler } from "#src/handlers/lifecycle";
+export { ToolStartHandler } from "#src/handlers/tool-start";

package/src/handlers/lifecycle.ts

@@ -52,11 +52,12 @@ export class SessionLifecycleHandler {
   // 3. Abort all agents — stop running work
   // 4. Dispose notifications — cancel pending nudges/timers
   // 5. Dispose manager — final cleanup
-  async handleSessionShutdown(): Promise<void> {
+  handleSessionShutdown(): Promise<void> {
     this.unpublishService();
     this.runtime.clearSessionContext();
     this.manager.abortAll();
     this.disposeNotifications();
     this.manager.dispose();
+    return Promise.resolve();
   }
 }

package/src/index.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-argument -- Pi SDK types are not fully exported; see upstream Pi SDK for type improvements */
 /**
  * pi-agents — A pi extension providing Claude Code-style autonomous sub-agents.
  *
@@ -20,35 +21,35 @@ import {
   SettingsManager as SdkSettingsManager,
   SessionManager,
 } from "@earendil-works/pi-coding-agent";
-import { AgentManager, type AgentManagerObserver } from "./agent-manager";
-import { createAgentRunner, getAgentConversation, type RunnerIO, steerAgent } from "./agent-runner";
-import { AgentTypeRegistry } from "./agent-types";
-import { loadCustomAgents } from "./custom-agents";
-import { detectEnv } from "./env";
-import { SessionLifecycleHandler, ToolStartHandler } from "./handlers/index";
-import { buildMemoryBlock, buildReadOnlyMemoryBlock } from "./memory";
-import { type ModelRegistry, resolveModel } from "./model-resolver";
-import { buildEventData, type NotificationDetails, NotificationManager } from "./notification";
-import { buildParentSnapshot } from "./parent-snapshot";
-import { buildAgentPrompt } from "./prompts";
-import { createNotificationRenderer } from "./renderer";
-import { createSubagentRuntime } from "./runtime";
-import { publishSubagentsService, unpublishSubagentsService } from "./service";
-import { createSubagentsService } from "./service-adapter";
-import { deriveSubagentSessionDir } from "./session-dir";
-import { SettingsManager } from "./settings";
-import { preloadSkills } from "./skill-loader";
-import { createAgentTool } from "./tools/agent-tool";
-import { createGetResultTool } from "./tools/get-result-tool";
-import { getModelLabelFromConfig } from "./tools/helpers";
-import { createSteerTool } from "./tools/steer-tool";
-import { FsAgentFileOps } from "./ui/agent-file-ops";
-import { createAgentsMenuHandler } from "./ui/agent-menu";
+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";
-import { GitWorktreeManager } from "./worktree";
+} 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";
-import type { AgentRunner } from "./agent-runner";
-import { AgentTypeRegistry } from "./agent-types";
-import { debugLog } from "./debug";
-import { NotificationState } from "./notification-state";
-import type { ParentSnapshot } from "./parent-snapshot";
-import { subscribeRecordObserver } from "./record-observer";
-import type { RunConfig } from "./runtime";
-import type { AgentInvocation, IsolationMode, ShellExec, SubagentType, ThinkingLevel } from "./types";
-import type { WorktreeManager } from "./worktree";
-import { WorktreeState } from "./worktree-state";
+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 };
 
@@ -235,6 +235,7 @@ export class AgentManager {
       onSessionCreated: (session) => {
         // Capture the session file path early so it's available for display
         // before the run completes (e.g. in background agent status messages).
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- sessionManager is typed as always present but Pi SDK may not provide it
         const outputFile = session.sessionManager?.getSessionFile?.() ?? undefined;
         // Set the execution-state collaborator — born complete at session creation.
         record.execution = { session, outputFile };
@@ -282,7 +283,7 @@ export class AgentManager {
         }
         return responseText;
       })
-      .catch((err) => {
+      .catch((err: unknown) => {
         record.markError(err);
 
         unsubRecordObserver?.();
@@ -313,7 +314,7 @@ export class AgentManager {
     while (this.queue.length > 0 && this.runningBackground < this._getMaxConcurrent()) {
       const next = this.queue.shift()!;
       const record = this.agents.get(next.id);
-      if (!record || record.status !== "queued") continue;
+      if (record?.status !== "queued") continue;
       try {
         this.startAgent(next.id, record, next.args);
       } catch (err) {
@@ -402,6 +403,7 @@ export class AgentManager {
 
   /** Dispose a record's session and remove it from the map. */
   private removeRecord(id: string, record: AgentRecord): void {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- dispose may not exist on all session implementations
     record.session?.dispose?.();
     this.agents.delete(id);
     this.pendingSteers.delete(id);
@@ -464,12 +466,13 @@ export class AgentManager {
   async waitForAll(): Promise<void> {
     // Loop because drainQueue respects the concurrency limit — as running
     // agents finish they start queued ones, which need awaiting too.
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- intentional infinite loop with explicit break
     while (true) {
       this.drainQueue();
       const pending = [...this.agents.values()]
         .filter(r => r.status === "running" || r.status === "queued")
         .map(r => r.promise)
-        .filter(Boolean);
+        .filter((p): p is Promise<string> => p != null);
       if (pending.length === 0) break;
       await Promise.allSettled(pending);
     }

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";
-import type { NotificationState } from "./notification-state";
-import type { AgentInvocation, SubagentType } from "./types";
-import type { LifetimeUsage } from "./usage";
-import { addUsage } from "./usage";
-import type { WorktreeState } from "./worktree-state";
+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";
-import { extractText } from "./context";
-import type { EnvInfo } from "./env";
-import type { ParentSnapshot } from "./parent-snapshot";
-import { type AssemblerIO, assembleSessionConfig } from "./session-config";
-import type { ShellExec, SubagentType, ThinkingLevel } from "./types";
+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"];
@@ -246,7 +246,7 @@ function forwardAbortSignal(
   signal?: AbortSignal,
 ): () => void {
   if (!signal) return () => {};
-  const onAbort = () => session.abort();
+  const onAbort = (): void => { void session.abort(); };
   signal.addEventListener("abort", onAbort, { once: true });
   return () => signal.removeEventListener("abort", onAbort);
 }
@@ -375,12 +375,12 @@ export async function runAgent(
       if (maxTurns != null) {
         if (!softLimitReached && turnCount >= maxTurns) {
           softLimitReached = true;
-          session.steer(
+          void session.steer(
             "You have reached your turn limit. Wrap up immediately — provide your final answer now.",
           );
         } else if (softLimitReached && turnCount >= maxTurns + (options.graceTurns ?? 5)) {
           aborted = true;
-          session.abort();
+          void session.abort();
         }
       }
     }

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";
+import { buildParentContext } from "#src/session/context";
 
 /**
  * Plain data snapshot of the parent session state captured at spawn time.
@@ -41,6 +41,7 @@ export function buildParentSnapshot(
     systemPrompt: ctx.getSystemPrompt(),
     model: ctx.model,
     modelRegistry: ctx.modelRegistry,
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- || intentional: converts empty string to undefined as well as null/undefined
     parentContext: parentContext || undefined,
   };
 }

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";
+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";
+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";
-import type { AgentRecord } from "./types";
-import type { AgentActivityTracker } from "./ui/agent-activity-tracker";
-import { getLifetimeTotal, getSessionContextPercent } from "./usage";
+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}

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment -- Pi SDK types are not fully exported; see upstream Pi SDK for type improvements */
 /**
  * record-observer.ts — Subscribes to session events and updates AgentRecord stats.
  *
@@ -5,8 +6,8 @@
  * and resume() with a single direct subscription.
  */
 
-import type { CompactionInfo } from "./agent-manager";
-import type { AgentRecord } from "./agent-record";
+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";
-import { formatMs, formatTokens, formatTurns } from "./ui/display";
+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";
-import type { UICtx } from "./ui/agent-widget";
+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";
-import type { ParentSnapshot } from "./parent-snapshot";
-import { buildParentSnapshot } from "./parent-snapshot";
-import type { SubagentRecord, SubagentsService } from "./service";
-import type { AgentRecord } from "./types";
+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 {
@@ -26,7 +26,7 @@ export interface AgentManagerLike {
 /** Create a SubagentsService backed by the given dependencies. */
 export function createSubagentsService(
   manager: AgentManagerLike,
-  resolveModel: (input: string, registry: ModelRegistry) => unknown | string,
+  resolveModel: (input: string, registry: ModelRegistry) => unknown,
   getCtx: () => { pi: unknown; ctx: unknown } | undefined,
   getModelRegistry: () => ModelRegistry | undefined,
 ): SubagentsService {
@@ -85,7 +85,7 @@ export function createSubagentsService(
 
     async steer(id: string, message: string): Promise<boolean> {
       const record = manager.getRecord(id);
-      if (!record || record.status !== "running") {
+      if (record?.status !== "running") {
         return false;
       }
       const session = record.session;

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

@@ -9,7 +9,7 @@
  *   svc?.spawn("Explore", "Check for stale TODOs");
  */
 
-import type { LifetimeUsage } from "./usage";
+import type { LifetimeUsage } from "#src/lifecycle/usage";
 
 export type { LifetimeUsage };
 
@@ -100,5 +100,6 @@ export function getSubagentsService(): SubagentsService | undefined {
 
 /** Remove the SubagentsService from globalThis (call on shutdown/reload). */
 export function unpublishSubagentsService(): void {
+  // eslint-disable-next-line @typescript-eslint/no-dynamic-delete -- Symbol-keyed global property; Map.delete() is not applicable
   delete (globalThis as Record<symbol, unknown>)[SERVICE_KEY];
 }

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return -- Pi SDK types are not fully exported; see upstream Pi SDK for type improvements */
 /**
  * context.ts — Extract parent conversation context for subagent inheritance.
  */
@@ -19,6 +20,7 @@ export function extractText(content: unknown[]): string {
  */
 export function buildParentContext(ctx: ExtensionContext): string {
   const entries = ctx.sessionManager.getBranch();
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- getBranch() may return undefined at runtime despite its type
   if (!entries || entries.length === 0) return "";
 
   const parts: string[] = [];

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";
-import type { ShellExec } from "./types";
+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";
-import type { MemoryScope } from "./types";
+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/{model-resolver.ts → session/model-resolver.ts}

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-redundant-type-constituents -- Pi SDK types are not fully exported; see upstream Pi SDK for type improvements */
 /**
  * Model resolution: exact match ("provider/modelId") with fuzzy fallback.
  */
@@ -16,7 +17,7 @@ export interface ModelRegistry {
 
 /** Successful model resolution — `model` is the resolved or inherited model instance. */
 export interface ModelResolutionResult {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
   model: any;
   error?: undefined;
 }

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

@@ -2,8 +2,8 @@
  * prompts.ts — System prompt builder for agents.
  */
 
-import type { EnvInfo } from "./env";
-import type { AgentPromptConfig } from "./types";
+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 {
@@ -57,7 +57,7 @@ Platform: ${env.platform}`;
     extraSections.length > 0 ? "\n\n" + extraSections.join("\n") : "";
 
   if (config.promptMode === "append") {
-    const identity = parentSystemPrompt || genericBase;
+    const identity = parentSystemPrompt ?? genericBase;
 
     const bridge = `<sub_agent_context>
 You are operating as a sub-agent invoked to handle a specific task.
@@ -72,7 +72,7 @@ You are operating as a sub-agent invoked to handle a specific task.
 - Be concise but complete
 </sub_agent_context>`;
 
-    const customSection = config.systemPrompt?.trim()
+    const customSection = config.systemPrompt.trim()
       ? `\n\n<agent_instructions>\n${config.systemPrompt}\n</agent_instructions>`
       : "";
 

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

@@ -14,16 +14,16 @@ import {
   type AgentConfigLookup,
   getMemoryToolNames,
   getReadOnlyMemoryToolNames,
-} from "./agent-types";
-import type { EnvInfo } from "./env";
-import type { PromptExtras } from "./prompts";
-import type { PreloadedSkill } from "./skill-loader";
+} 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";
+} 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";
-import { isSymlink, isUnsafeName, safeReadFile } from "./memory";
+import { debugLog } from "#src/debug";
+import { isSymlink, isUnsafeName, safeReadFile } from "#src/session/memory";
 
 export interface PreloadedSkill {
   name: string;
@@ -69,7 +69,7 @@ function findSkillDirectory(root: string, name: string): string | undefined {
     const current = queue.shift();
     if (current === undefined) continue;
 
-    let entries: Dirent<string>[];
+    let entries: Dirent[];
     try {
       entries = readdirSync(current, { withFileTypes: true });
     } catch (err) {

package/src/tools/agent-tool.ts

@@ -1,24 +1,24 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-base-to-string, @typescript-eslint/restrict-template-expressions -- Pi SDK types are not fully exported; see upstream Pi SDK for type improvements */
 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";
-import { AgentTypeRegistry } from "../agent-types";
-import type { ParentSnapshot } from "../parent-snapshot";
-
-import type { AgentRecord } from "../types";
-import { AgentActivityTracker } from "../ui/agent-activity-tracker";
-import { type UICtx } from "../ui/agent-widget";
+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";
-import { spawnBackground } from "./background-spawner";
-import { runForeground } from "./foreground-runner";
-import { buildDetails, buildTypeListText, textResult } from "./helpers";
-import { type ModelInfo, resolveSpawnConfig } from "./spawn-config";
+} from "#src/ui/display";
 
 // ---- Deps interface ----
 
@@ -171,7 +171,7 @@ Guidelines:
       const displayName = args.subagent_type
         ? getDisplayName(args.subagent_type as string, registry)
         : "Agent";
-      const desc = (args.description as string) ?? "";
+      const desc = (args.description as string | undefined) ?? "";
       return new Text(
         "▸ " +
           theme.fg("toolTitle", theme.bold(displayName)) +
@@ -326,7 +326,7 @@ Guidelines:
           return textResult(`Failed to resume agent "${params.resume}".`);
         }
         return textResult(
-          record.result?.trim() || record.error?.trim() || "No output.",
+          record.result?.trim() ?? record.error?.trim() ?? "No output.",
           buildDetails(config.detailBase, record),
         );
       }

package/src/tools/background-spawner.ts

@@ -1,11 +1,11 @@
-import type { AgentSpawnConfig } from "../agent-manager";
-import type { ParentSnapshot } from "../parent-snapshot";
-import type { AgentRecord } from "../types";
-import { AgentActivityTracker } from "../ui/agent-activity-tracker";
-import { subscribeUIObserver } from "../ui/ui-observer";
-import type { AgentActivityAccess } from "./agent-tool";
-import { textResult } from "./helpers";
-import type { ResolvedSpawnConfig } from "./spawn-config";
+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 {