@oh-my-pi/pi-coding-agent 8.1.0 → 8.2.0

package/src/task/worker.ts

@@ -12,29 +12,23 @@
  * 4. Worker sends { type: "done", exitCode, ... } on completion
  * 5. Parent can send { type: "abort" } to request cancellation
  */
-
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import { parseModelPattern, parseModelString } from "@oh-my-pi/pi-coding-agent/config/model-resolver";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import type { CustomTool } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { type LspToolDetails, lspSchema } from "@oh-my-pi/pi-coding-agent/lsp/types";
-import lspDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/lsp.md" with { type: "text" };
-import { createAgentSession, discoverAuthStorage, discoverModels } from "@oh-my-pi/pi-coding-agent/sdk";
-import type { AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
-import { AuthStorage } from "@oh-my-pi/pi-coding-agent/session/auth-storage";
-import { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
-import {
-	getPythonToolDescription,
-	type PythonToolDetails,
-	type PythonToolParams,
-	pythonSchema,
-} from "@oh-my-pi/pi-coding-agent/tools/python";
-import { ToolAbortError } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
 import { logger, postmortem, untilAborted } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
+import { ModelRegistry } from "../config/model-registry";
+import { parseModelPattern, parseModelString } from "../config/model-resolver";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import { SettingsManager } from "../config/settings-manager";
+import type { CustomTool } from "../extensibility/custom-tools/types";
+import { type LspToolDetails, lspSchema } from "../lsp/types";
+import lspDescription from "../prompts/tools/lsp.md" with { type: "text" };
+import { createAgentSession, discoverAuthStorage, discoverModels } from "../sdk";
+import type { AgentSessionEvent } from "../session/agent-session";
+import { AuthStorage } from "../session/auth-storage";
+import { SessionManager } from "../session/session-manager";
+import { getPythonToolDescription, type PythonToolDetails, type PythonToolParams, pythonSchema } from "../tools/python";
+import { ToolAbortError } from "../tools/tool-errors";
 import type {
 	LspToolCallResponse,
 	MCPToolCallResponse,
@@ -47,7 +41,7 @@ import type {
 
 type PostMessageFn = (message: SubagentWorkerResponse) => void;
 
-const postMessageSafe: PostMessageFn = (message) => {
+const postMessageSafe: PostMessageFn = message => {
 	try {
 		(globalThis as typeof globalThis & { postMessage: PostMessageFn }).postMessage(message);
 	} catch {
@@ -132,11 +126,11 @@ function callMCPToolViaParent(
 	}
 
 	pendingMCPCalls.set(callId, {
-		resolve: (result) => {
+		resolve: result => {
 			cleanup();
 			resolve(result ?? { content: [] });
 		},
-		reject: (error) => {
+		reject: error => {
 			cleanup();
 			reject(error);
 		},
@@ -200,11 +194,11 @@ function callPythonToolViaParent(
 	}
 
 	pendingPythonCalls.set(callId, {
-		resolve: (result) => {
+		resolve: result => {
 			cleanup();
 			resolve(result ?? { content: [] });
 		},
-		reject: (error) => {
+		reject: error => {
 			cleanup();
 			reject(error);
 		},
@@ -260,11 +254,11 @@ function callLspToolViaParent(
 	}
 
 	pendingLspCalls.set(callId, {
-		resolve: (result) => {
+		resolve: result => {
 			cleanup();
 			resolve(result ?? { content: [] });
 		},
-		reject: (error) => {
+		reject: error => {
 			cleanup();
 			reject(error);
 		},
@@ -349,7 +343,7 @@ function createMCPProxyTool(metadata: MCPToolMetadata): CustomTool<TSchema> {
 					metadata.timeoutMs,
 				);
 				return {
-					content: result.content.map((c) =>
+					content: result.content.map(c =>
 						c.type === "text"
 							? { type: "text" as const, text: c.text ?? "" }
 							: { type: "text" as const, text: JSON.stringify(c) },
@@ -391,7 +385,7 @@ function createPythonProxyTool(): CustomTool<typeof pythonSchema> {
 				const result = await callPythonToolViaParent(params as PythonToolParams, signal, timeoutMs);
 				return {
 					content:
-						result?.content?.map((c) =>
+						result?.content?.map(c =>
 							c.type === "text"
 								? { type: "text" as const, text: c.text ?? "" }
 								: { type: "text" as const, text: JSON.stringify(c) },
@@ -424,7 +418,7 @@ function createLspProxyTool(): CustomTool<typeof lspSchema> {
 				const result = await callLspToolViaParent(params as Record<string, unknown>, signal);
 				return {
 					content:
-						result?.content?.map((c) =>
+						result?.content?.map(c =>
 							c.type === "text"
 								? { type: "text" as const, text: c.text ?? "" }
 								: { type: "text" as const, text: JSON.stringify(c) },
@@ -606,7 +600,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 			outputSchema: payload.outputSchema,
 			requireCompleteTool: true,
 			// Append system prompt (equivalent to CLI's --append-system-prompt)
-			systemPrompt: (defaultPrompt) =>
+			systemPrompt: defaultPrompt =>
 				`${defaultPrompt}\n\n${payload.systemPrompt}\n\n${worktreeNotice}\n\n${completionInstruction}`,
 			sessionManager,
 			hasUI: false,
@@ -638,14 +632,14 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 				// ExtensionActions
 				{
 					sendMessage: (message, options) => {
-						session.sendCustomMessage(message, options).catch((e) => {
+						session.sendCustomMessage(message, options).catch(e => {
 							logger.error("Extension sendMessage failed", {
 								error: e instanceof Error ? e.message : String(e),
 							});
 						});
 					},
 					sendUserMessage: (content, options) => {
-						session.sendUserMessage(content, options).catch((e) => {
+						session.sendUserMessage(content, options).catch(e => {
 							logger.error("Extension sendUserMessage failed", {
 								error: e instanceof Error ? e.message : String(e),
 							});
@@ -660,14 +654,14 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 					getActiveTools: () => session.getActiveToolNames(),
 					getAllTools: () => session.getAllToolNames(),
 					setActiveTools: (toolNames: string[]) => session.setActiveToolsByName(toolNames),
-					setModel: async (model) => {
+					setModel: async model => {
 						const key = await session.modelRegistry.getApiKey(model);
 						if (!key) return false;
 						await session.setModel(model);
 						return true;
 					},
 					getThinkingLevel: () => session.thinkingLevel,
-					setThinkingLevel: (level) => session.setThinkingLevel(level),
+					setThinkingLevel: level => session.setThinkingLevel(level),
 				},
 				// ExtensionContextActions
 				{
@@ -677,7 +671,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 					hasPendingMessages: () => session.queuedMessageCount > 0,
 					shutdown: () => {},
 					getContextUsage: () => session.getContextUsage(),
-					compact: async (instructionsOrOptions) => {
+					compact: async instructionsOrOptions => {
 						const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
 						const options =
 							instructionsOrOptions && typeof instructionsOrOptions === "object"
@@ -687,7 +681,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 					},
 				},
 			);
-			extensionRunner.onError((err) => {
+			extensionRunner.onError(err => {
 				logger.error("Extension error", { path: err.extensionPath, error: err.error });
 			});
 			await extensionRunner.emit({ type: "session_start" });
@@ -844,11 +838,11 @@ declare const self: {
 	addEventListener(type: "messageerror", listener: (event: MessageEvent) => void): void;
 };
 
-self.addEventListener("error", (event) => {
+self.addEventListener("error", event => {
 	reportFatal(`Uncaught error: ${event.message || "Unknown error"}`);
 });
 
-self.addEventListener("unhandledrejection", (event) => {
+self.addEventListener("unhandledrejection", event => {
 	const reason = event.reason;
 	const message = reason instanceof Error ? reason.stack || reason.message : String(reason);
 

package/src/task/worktree.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
-import { cp, mkdir, rm } from "node:fs/promises";
-import { homedir, tmpdir } from "node:os";
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
 import path from "node:path";
 import { $ } from "bun";
 
@@ -30,10 +30,10 @@ export async function getRepoRoot(cwd: string): Promise<string> {
 export async function ensureWorktree(baseCwd: string, id: string): Promise<string> {
 	const repoRoot = await getRepoRoot(baseCwd);
 	const encodedProject = getEncodedProjectName(repoRoot);
-	const worktreeDir = path.join(homedir(), ".omp", "wt", encodedProject, id);
-	await mkdir(path.dirname(worktreeDir), { recursive: true });
+	const worktreeDir = path.join(os.homedir(), ".omp", "wt", encodedProject, id);
+	await fs.mkdir(path.dirname(worktreeDir), { recursive: true });
 	await $`git worktree remove -f ${worktreeDir}`.cwd(repoRoot).quiet().nothrow();
-	await rm(worktreeDir, { recursive: true, force: true });
+	await fs.rm(worktreeDir, { recursive: true, force: true });
 	await $`git worktree add --detach ${worktreeDir} HEAD`.cwd(repoRoot).quiet();
 	return worktreeDir;
 }
@@ -44,8 +44,8 @@ export async function captureBaseline(repoRoot: string): Promise<WorktreeBaselin
 	const untrackedRaw = await $`git ls-files --others --exclude-standard`.cwd(repoRoot).quiet().text();
 	const untracked = untrackedRaw
 		.split("\n")
-		.map((line) => line.trim())
-		.filter((line) => line.length > 0);
+		.map(line => line.trim())
+		.filter(line => line.length > 0);
 
 	return {
 		repoRoot,
@@ -56,7 +56,7 @@ export async function captureBaseline(repoRoot: string): Promise<WorktreeBaselin
 }
 
 async function writeTempPatchFile(patch: string): Promise<string> {
-	const tempPath = path.join(tmpdir(), `omp-task-patch-${randomUUID()}.patch`);
+	const tempPath = path.join(os.tmpdir(), `omp-task-patch-${randomUUID()}.patch`);
 	await Bun.write(tempPath, patch);
 	return tempPath;
 }
@@ -76,7 +76,7 @@ async function applyPatch(
 		}
 		await runner;
 	} finally {
-		await rm(tempPath, { force: true });
+		await fs.rm(tempPath, { force: true });
 	}
 }
 
@@ -90,8 +90,8 @@ export async function applyBaseline(worktreeDir: string, baseline: WorktreeBasel
 		const destination = path.join(worktreeDir, entry);
 		const exists = await Bun.file(source).exists();
 		if (!exists) continue;
-		await mkdir(path.dirname(destination), { recursive: true });
-		await cp(source, destination, { recursive: true });
+		await fs.mkdir(path.dirname(destination), { recursive: true });
+		await fs.cp(source, destination, { recursive: true });
 	}
 }
 
@@ -106,7 +106,7 @@ async function applyPatchToIndex(cwd: string, patch: string, indexFile: string):
 			})
 			.quiet();
 	} finally {
-		await rm(tempPath, { force: true });
+		await fs.rm(tempPath, { force: true });
 	}
 }
 
@@ -114,12 +114,12 @@ async function listUntracked(cwd: string): Promise<string[]> {
 	const raw = await $`git ls-files --others --exclude-standard`.cwd(cwd).quiet().text();
 	return raw
 		.split("\n")
-		.map((line) => line.trim())
-		.filter((line) => line.length > 0);
+		.map(line => line.trim())
+		.filter(line => line.length > 0);
 }
 
 export async function captureDeltaPatch(worktreeDir: string, baseline: WorktreeBaseline): Promise<string> {
-	const tempIndex = path.join(tmpdir(), `omp-task-index-${randomUUID()}`);
+	const tempIndex = path.join(os.tmpdir(), `omp-task-index-${randomUUID()}`);
 	try {
 		await $`git read-tree HEAD`.cwd(worktreeDir).env({
 			GIT_INDEX_FILE: tempIndex,
@@ -136,18 +136,18 @@ export async function captureDeltaPatch(worktreeDir: string, baseline: WorktreeB
 
 		const currentUntracked = await listUntracked(worktreeDir);
 		const baselineUntracked = new Set(baseline.untracked);
-		const newUntracked = currentUntracked.filter((entry) => !baselineUntracked.has(entry));
+		const newUntracked = currentUntracked.filter(entry => !baselineUntracked.has(entry));
 
 		if (newUntracked.length === 0) return diff;
 
 		const untrackedDiffs = await Promise.all(
-			newUntracked.map((entry) =>
+			newUntracked.map(entry =>
 				$`git diff --binary --no-index /dev/null ${entry}`.cwd(worktreeDir).quiet().nothrow().text(),
 			),
 		);
 		return `${diff}${diff && !diff.endsWith("\n") ? "\n" : ""}${untrackedDiffs.join("\n")}`;
 	} finally {
-		await rm(tempIndex, { force: true });
+		await fs.rm(tempIndex, { force: true });
 	}
 }
 
@@ -161,6 +161,6 @@ export async function cleanupWorktree(dir: string): Promise<void> {
 			await $`git worktree remove -f ${dir}`.cwd(repoRoot).quiet().nothrow();
 		}
 	} finally {
-		await rm(dir, { recursive: true, force: true });
+		await fs.rm(dir, { recursive: true, force: true });
 	}
 }

package/src/tools/ask.ts

@@ -14,16 +14,15 @@
  *   - If you recommend a specific option, make that the first option in the list
  *     and add "(Recommended)" at the end of the label
  */
-
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { type Theme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import askDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/ask.md" with { type: "text" };
-import { renderStatusLine } from "@oh-my-pi/pi-coding-agent/tui";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { type Theme, theme } from "../modes/theme/theme";
+import askDescription from "../prompts/tools/ask.md" with { type: "text" };
+import { renderStatusLine } from "../tui";
 import type { ToolSession } from ".";
 import { ToolUIKit } from "./render-utils";
 
@@ -238,7 +237,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 			const results: QuestionResult[] = [];
 
 			for (const q of params.questions) {
-				const optionLabels = q.options.map((o) => o.label);
+				const optionLabels = q.options.map(o => o.label);
 				const { selectedOptions, customInput } = await askSingleQuestion(
 					ui,
 					q.question,
@@ -267,7 +266,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 		const question = params.question ?? "";
 		const options = params.options ?? [];
 		const multi = params.multi ?? false;
-		const optionLabels = options.map((o) => o.label);
+		const optionLabels = options.map(o => o.label);
 
 		if (!question || optionLabels.length === 0) {
 			return {
@@ -391,7 +390,7 @@ export const askToolRenderer = {
 		if (details.results && details.results.length > 0) {
 			const lines: string[] = [];
 			const hasAnySelection = details.results.some(
-				(r) => r.customInput || (r.selectedOptions && r.selectedOptions.length > 0),
+				r => r.customInput || (r.selectedOptions && r.selectedOptions.length > 0),
 			);
 			const header = renderStatusLine(
 				{

package/src/tools/bash-interceptor.ts

@@ -5,11 +5,7 @@
  * this interceptor provides helpful error messages directing them to use
  * the specialized tools instead.
  */
-
-import {
-	type BashInterceptorRule,
-	DEFAULT_BASH_INTERCEPTOR_RULES,
-} from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import { type BashInterceptorRule, DEFAULT_BASH_INTERCEPTOR_RULES } from "../config/settings-manager";
 
 export interface InterceptionResult {
 	/** If true, the bash command should be blocked */

package/src/tools/bash.ts

@@ -1,22 +1,22 @@
-import { relative, resolve, sep } from "node:path";
+import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import { type BashExecutorOptions, executeBash } from "@oh-my-pi/pi-coding-agent/exec/bash-executor";
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { truncateToVisualLines } from "@oh-my-pi/pi-coding-agent/modes/components/visual-truncate";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import bashDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/bash.md" with { type: "text" };
-import type { OutputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
-import { ToolError } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
-import { renderOutputBlock, renderStatusLine } from "@oh-my-pi/pi-coding-agent/tui";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import { type BashExecutorOptions, executeBash } from "../exec/bash-executor";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { truncateToVisualLines } from "../modes/components/visual-truncate";
+import type { Theme } from "../modes/theme/theme";
+import bashDescription from "../prompts/tools/bash.md" with { type: "text" };
+import { renderOutputBlock, renderStatusLine } from "../tui";
 import type { ToolSession } from ".";
 import { checkBashInterception, checkSimpleLsInterception } from "./bash-interceptor";
+import type { OutputMeta } from "./output-meta";
 import { allocateOutputArtifact, createTailBuffer } from "./output-utils";
 import { resolveToCwd } from "./path-utils";
 import { formatBytes, wrapBrackets } from "./render-utils";
+import { ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { DEFAULT_MAX_BYTES } from "./truncate";
 
@@ -106,7 +106,7 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails> {
 			env: extraEnv,
 			artifactPath,
 			artifactId,
-			onChunk: (chunk) => {
+			onChunk: chunk => {
 				tailBuffer.append(chunk);
 				if (onUpdate) {
 					onUpdate({
@@ -165,13 +165,14 @@ function formatBashCommand(args: BashRenderArgs, uiTheme: Theme): string {
 	let displayWorkdir = args.cwd;
 
 	if (displayWorkdir) {
-		const resolvedCwd = resolve(cwd);
-		const resolvedWorkdir = resolve(displayWorkdir);
+		const resolvedCwd = path.resolve(cwd);
+		const resolvedWorkdir = path.resolve(displayWorkdir);
 		if (resolvedWorkdir === resolvedCwd) {
 			displayWorkdir = undefined;
 		} else {
-			const relativePath = relative(resolvedCwd, resolvedWorkdir);
-			const isWithinCwd = relativePath && !relativePath.startsWith("..") && !relativePath.startsWith(`..${sep}`);
+			const relativePath = path.relative(resolvedCwd, resolvedWorkdir);
+			const isWithinCwd =
+				relativePath && !relativePath.startsWith("..") && !relativePath.startsWith(`..${path.sep}`);
 			if (isWithinCwd) {
 				displayWorkdir = relativePath;
 			}
@@ -210,7 +211,7 @@ export const bashToolRenderer = {
 		const previewLines = renderContext?.previewLines ?? BASH_DEFAULT_PREVIEW_LINES;
 
 		// Get output from context (preferred) or fall back to result content
-		const output = renderContext?.output ?? result.content?.find((c) => c.type === "text")?.text ?? "";
+		const output = renderContext?.output ?? result.content?.find(c => c.type === "text")?.text ?? "";
 		const displayOutput = output.trimEnd();
 		const showingFullOutput = expanded && renderContext?.isFullOutput === true;
 
@@ -248,11 +249,11 @@ export const bashToolRenderer = {
 				const hasOutput = displayOutput.trim().length > 0;
 				if (hasOutput) {
 					if (expanded) {
-						outputLines.push(...displayOutput.split("\n").map((line) => uiTheme.fg("toolOutput", line)));
+						outputLines.push(...displayOutput.split("\n").map(line => uiTheme.fg("toolOutput", line)));
 					} else {
 						const styledOutput = displayOutput
 							.split("\n")
-							.map((line) => uiTheme.fg("toolOutput", line))
+							.map(line => uiTheme.fg("toolOutput", line))
 							.join("\n");
 						const textContent = styledOutput;
 						const result = truncateToVisualLines(textContent, previewLines, width);

package/src/tools/calculator.ts

@@ -1,13 +1,13 @@
 import type { AgentTool, AgentToolResult } from "@oh-my-pi/pi-agent-core";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import calculatorDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/calculator.md" with { type: "text" };
-import { renderStatusLine, renderTreeList } from "@oh-my-pi/pi-coding-agent/tui";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { untilAborted } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import type { Theme } from "../modes/theme/theme";
+import calculatorDescription from "../prompts/tools/calculator.md" with { type: "text" };
+import { renderStatusLine, renderTreeList } from "../tui";
 import type { ToolSession } from ".";
 import {
 	formatCount,
@@ -417,13 +417,13 @@ export class CalculatorTool implements AgentTool<typeof calculatorSchema, Calcul
 		signal?: AbortSignal,
 	): Promise<AgentToolResult<CalculatorToolDetails>> {
 		return untilAborted(signal, async () => {
-			const results = calculations.map((calc) => {
+			const results = calculations.map(calc => {
 				const value = evaluateExpression(calc.expression);
 				const output = `${calc.prefix}${formatResult(value)}${calc.suffix}`;
 				return { expression: calc.expression, value, output };
 			});
 
-			const outputText = results.map((result) => result.output).join("\n");
+			const outputText = results.map(result => result.output).join("\n");
 			return {
 				content: [{ type: "text", text: outputText }],
 				details: { results },
@@ -471,17 +471,17 @@ export const calculatorToolRenderer = {
 		args?: CalculatorRenderArgs,
 	): Component {
 		const details = result.details;
-		const textContent = result.content?.find((c) => c.type === "text")?.text ?? "";
+		const textContent = result.content?.find(c => c.type === "text")?.text ?? "";
 		if (result.isError) {
 			const header = renderStatusLine({ icon: "error", title: "Calc" }, uiTheme);
 			return new Text([header, formatErrorMessage(textContent, uiTheme)].join("\n"), 0, 0);
 		}
 
 		// Prefer structured details; fall back to parsing text content
-		let outputs = details?.results?.map((entry) => `${entry.expression} = ${entry.output}`) ?? [];
+		let outputs = details?.results?.map(entry => `${entry.expression} = ${entry.output}`) ?? [];
 		if (outputs.length === 0 && textContent.trim()) {
-			const rawOutputs = textContent.split("\n").filter((line) => line.trim().length > 0);
-			const expressions = args?.calculations?.map((calc) => calc.expression) ?? [];
+			const rawOutputs = textContent.split("\n").filter(line => line.trim().length > 0);
+			const expressions = args?.calculations?.map(calc => calc.expression) ?? [];
 			if (expressions.length === rawOutputs.length && expressions.length > 0) {
 				outputs = rawOutputs.map((output, index) => `${expressions[index]} = ${output}`);
 			} else {
@@ -507,7 +507,7 @@ export const calculatorToolRenderer = {
 				expanded,
 				maxCollapsed: COLLAPSED_LIST_LIMIT,
 				itemType: "result",
-				renderItem: (output) => uiTheme.fg("toolOutput", output),
+				renderItem: output => uiTheme.fg("toolOutput", output),
 			},
 			uiTheme,
 		);

package/src/tools/complete.ts

@@ -3,13 +3,12 @@
  *
  * Subagents must call this tool to finish and return structured JSON output.
  */
-
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
-import { subprocessToolRegistry } from "@oh-my-pi/pi-coding-agent/task/subprocess-tool-registry";
 import type { Static, TObject } from "@sinclair/typebox";
 import { Type } from "@sinclair/typebox";
 import Ajv, { type ErrorObject, type ValidateFunction } from "ajv";
+import { subprocessToolRegistry } from "../task/subprocess-tool-registry";
 import type { ToolSession } from ".";
 import { jtdToJsonSchema } from "./jtd-to-json-schema";
 
@@ -46,7 +45,7 @@ function formatSchema(schema: unknown): string {
 function formatAjvErrors(errors: ErrorObject[] | null | undefined): string {
 	if (!errors || errors.length === 0) return "Unknown schema validation error.";
 	return errors
-		.map((err) => {
+		.map(err => {
 			const path = err.instancePath ? `${err.instancePath}: ` : "";
 			return `${path}${err.message ?? "invalid"}`;
 		})
@@ -137,6 +136,6 @@ export class CompleteTool implements AgentTool<TObject, CompleteDetails> {
 
 // Register subprocess tool handler for extraction + termination.
 subprocessToolRegistry.register<CompleteDetails>("complete", {
-	extractData: (event) => event.result?.details as CompleteDetails | undefined,
+	extractData: event => event.result?.details as CompleteDetails | undefined,
 	shouldTerminate: () => true,
 });

package/src/tools/context.ts

@@ -1,6 +1,6 @@
 import type { AgentToolContext, ToolCallContext } from "@oh-my-pi/pi-agent-core";
-import type { CustomToolContext } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import type { ExtensionUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
+import type { CustomToolContext } from "../extensibility/custom-tools/types";
+import type { ExtensionUIContext } from "../extensibility/extensions/types";
 
 declare module "@oh-my-pi/pi-agent-core" {
 	interface AgentToolContext extends CustomToolContext {