@oh-my-pi/pi-coding-agent 15.0.1 → 15.1.0

package/src/extensibility/custom-tools/loader.ts

@@ -1,19 +1,20 @@
 /**
  * Custom tool loader - loads TypeScript tool modules using native Bun import.
  *
- * Dependencies (@sinclair/typebox and pi-coding-agent) are injected via the CustomToolAPI
- * to avoid import resolution issues with custom tools loaded from user directories.
+ * Dependencies (the zod-backed typebox shim and pi-coding-agent) are injected via the
+ * CustomToolAPI to avoid import resolution issues with custom tools loaded from user directories.
  */
 import * as path from "node:path";
 import type { AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import { logger } from "@oh-my-pi/pi-utils";
-import * as typebox from "@sinclair/typebox";
+import * as z from "zod/v4";
 import { toolCapability } from "../../capability/tool";
 import { type CustomTool, loadCapability } from "../../discovery";
 import type { ExecOptions } from "../../exec/exec";
 import { execCommand } from "../../exec/exec";
 import type { HookUIContext } from "../../extensibility/hooks/types";
 import { getAllPluginToolPaths } from "../../extensibility/plugins/loader";
+import * as typebox from "../typebox";
 import { createNoOpUIContext, resolvePath } from "../utils";
 import type { CustomToolAPI, CustomToolFactory, LoadedCustomTool, ToolLoadError } from "./types";
 
@@ -103,6 +104,7 @@ export class CustomToolLoader {
 			hasUI: false,
 			logger,
 			typebox,
+			zod: z,
 			pi,
 			pushPendingAction: action => {
 				if (!pushPendingAction) {

package/src/extensibility/custom-tools/types.ts

@@ -5,16 +5,15 @@
  * They can provide custom rendering for tool calls and results in the TUI.
  */
 import type { AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import type { Model } from "@oh-my-pi/pi-ai";
+import type { CompactionResult } from "@oh-my-pi/pi-agent-core/compaction";
+import type { Model, Static, TSchema } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
-import type { Static, TSchema } from "@sinclair/typebox";
 import type { Rule } from "../../capability/rule";
 import type { ModelRegistry } from "../../config/model-registry";
 import type { Settings } from "../../config/settings";
 import type { ExecOptions, ExecResult } from "../../exec/exec";
 import type { HookUIContext } from "../../extensibility/hooks/types";
 import type { Theme } from "../../modes/theme/theme";
-import type { CompactionResult } from "../../session/compaction";
 import type { ReadonlySessionManager } from "../../session/session-manager";
 import type { TodoItem } from "../../tools/todo-write";
 
@@ -52,8 +51,10 @@ export interface CustomToolAPI {
 	hasUI: boolean;
 	/** File logger for error/warning/debug messages */
 	logger: typeof import("@oh-my-pi/pi-utils").logger;
-	/** Injected @sinclair/typebox module */
-	typebox: typeof import("@sinclair/typebox");
+	/** Injected zod-backed typebox shim (legacy/compat — Zod-authored tools are preferred). */
+	typebox: typeof import("../typebox");
+	/** Injected zod module for Zod-authored custom tools. */
+	zod: typeof import("zod/v4");
 	/** Injected pi-coding-agent exports */
 	pi: typeof import("../..");
 	/** Push a preview action that can later be resolved with the hidden resolve tool */
@@ -180,7 +181,7 @@ export interface CustomTool<TParams extends TSchema = TSchema, TDetails = any> {
 	strict?: boolean;
 	/** Description for LLM */
 	description: string;
-	/** Parameter schema (TypeBox) */
+	/** Parameter schema (Zod or TypeBox; TypeBox is auto-lifted to Zod at registration). */
 	parameters: TParams;
 	/** If true, tool is excluded unless explicitly listed in --tools or agent's tools field */
 	hidden?: boolean;

package/src/extensibility/custom-tools/wrapper.ts

@@ -2,7 +2,7 @@
  * CustomToolAdapter wraps CustomTool instances into AgentTool for use with the agent.
  */
 import type { AgentTool, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import type { Static, TSchema } from "@sinclair/typebox";
+import type { Static, TSchema } from "@oh-my-pi/pi-ai";
 import type { Theme } from "../../modes/theme/theme";
 import { applyToolProxy } from "../tool-proxy";
 import type { CustomTool, CustomToolContext } from "./types";

package/src/extensibility/extensions/get-commands-handler.ts

@@ -0,0 +1,77 @@
+/**
+ * Helper for wiring the `getCommands` action of {@link ExtensionAPI}.
+ *
+ * Centralizes the union over the three slash-command sources the runtime
+ * exposes so the five wiring sites (interactive UI, ACP, RPC, print, child
+ * task executor) cannot drift:
+ *   - extension-registered hook commands (`source: "extension"`)
+ *   - prompt commands loaded as `LoadedCustomCommand` — user/project/bundled
+ *     custom commands and MCP prompts (`source: "prompt"`)
+ *   - skill commands derived from `session.skills`, gated on
+ *     `skillsSettings.enableSkillCommands` (`source: "skill"`)
+ *
+ * Built-in slash commands are intentionally excluded; `getCommands()` is the
+ * surface extensions use to discover dynamic commands they did not register
+ * themselves. Each frontend (interactive-mode, ACP) prepends its own builtins.
+ */
+import type { SkillsSettings } from "../../config/settings";
+import type { CustomCommandSource, LoadedCustomCommand } from "../custom-commands";
+import { getSkillSlashCommandName, type Skill } from "../skills";
+import type { SlashCommandInfo, SlashCommandLocation } from "../slash-commands";
+import type { ExtensionRunner } from "./runner";
+
+interface CommandsCapableSession {
+	readonly extensionRunner?: ExtensionRunner;
+	readonly customCommands: ReadonlyArray<LoadedCustomCommand>;
+	readonly skills: ReadonlyArray<Skill>;
+	readonly skillsSettings?: SkillsSettings;
+}
+
+export function getSessionSlashCommands(session: CommandsCapableSession): SlashCommandInfo[] {
+	const out: SlashCommandInfo[] = [];
+
+	const runner = session.extensionRunner;
+	if (runner) {
+		for (const cmd of runner.getRegisteredCommands()) {
+			out.push({
+				name: cmd.name,
+				description: cmd.description,
+				source: "extension",
+			});
+		}
+	}
+
+	for (const cmd of session.customCommands) {
+		out.push({
+			name: cmd.command.name,
+			description: cmd.command.description,
+			source: "prompt",
+			location: customCommandLocation(cmd.source),
+			path: cmd.resolvedPath,
+		});
+	}
+
+	if (session.skillsSettings?.enableSkillCommands) {
+		for (const skill of session.skills) {
+			out.push({
+				name: getSkillSlashCommandName(skill),
+				description: skill.description || undefined,
+				source: "skill",
+				path: skill.filePath,
+			});
+		}
+	}
+
+	return out;
+}
+
+function customCommandLocation(source: CustomCommandSource): SlashCommandLocation | undefined {
+	switch (source) {
+		case "user":
+			return "user";
+		case "project":
+			return "project";
+		case "bundled":
+			return undefined;
+	}
+}

package/src/extensibility/extensions/loader.ts

@@ -8,8 +8,7 @@ import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Model, TextContent } from "@oh-my-pi/pi-ai";
 import type { KeyId } from "@oh-my-pi/pi-tui";
 import { hasFsCode, isEacces, isEnoent, logger } from "@oh-my-pi/pi-utils";
-import type { TSchema } from "@sinclair/typebox";
-import * as TypeBox from "@sinclair/typebox";
+import * as Zod from "zod/v4";
 import { type ExtensionModule, extensionModuleCapability } from "../../capability/extension-module";
 import { loadCapability } from "../../discovery";
 import { getExtensionNameFromPath } from "../../discovery/helpers";
@@ -19,6 +18,7 @@ import type { CustomMessage } from "../../session/messages";
 import { EventBus } from "../../utils/event-bus";
 import { installLegacyPiSpecifierShim, loadLegacyPiModule } from "../plugins/legacy-pi-compat";
 import { getAllPluginExtensionPaths } from "../plugins/loader";
+import * as TypeBox from "../typebox";
 
 import { resolvePath } from "../utils";
 import type {
@@ -119,6 +119,7 @@ export class ExtensionRuntime implements IExtensionRuntime {
 class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 	readonly logger = logger;
 	readonly typebox = TypeBox;
+	readonly zod = Zod;
 	readonly flagValues = new Map<string, boolean | string>();
 	readonly pendingProviderRegistrations: Array<{
 		name: string;
@@ -140,7 +141,10 @@ class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 		this.extension.handlers.set(event, list);
 	}
 
-	registerTool<TParams extends TSchema = TSchema, TDetails = unknown>(tool: ToolDefinition<TParams, TDetails>): void {
+	registerTool<
+		TParams extends import("@oh-my-pi/pi-ai").TSchema = import("@oh-my-pi/pi-ai").TSchema,
+		TDetails = unknown,
+	>(tool: ToolDefinition<TParams, TDetails>): void {
 		this.extension.tools.set(tool.name, {
 			definition: tool,
 			extensionPath: this.extension.path,

package/src/extensibility/extensions/types.ts

@@ -8,6 +8,7 @@
  * - Interact with the user via UI primitives
  */
 import type { AgentMessage, AgentToolResult, AgentToolUpdateCallback, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
+import type { CompactionResult } from "@oh-my-pi/pi-agent-core/compaction";
 import type {
 	Api,
 	AssistantMessageEvent,
@@ -17,12 +18,13 @@ import type {
 	Model,
 	ProviderResponseMetadata,
 	SimpleStreamOptions,
+	Static,
 	TextContent,
+	TSchema,
 } from "@oh-my-pi/pi-ai";
 import type { OAuthCredentials, OAuthLoginCallbacks } from "@oh-my-pi/pi-ai/utils/oauth/types";
 import type * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 import type { AutocompleteItem, Component, EditorTheme, KeyId, TUI } from "@oh-my-pi/pi-tui";
-import type { Static, TSchema } from "@sinclair/typebox";
 import type { KeybindingsManager } from "../../config/keybindings";
 import type { ModelRegistry } from "../../config/model-registry";
 import type { EditToolDetails } from "../../edit";
@@ -31,7 +33,6 @@ import type { BashResult } from "../../exec/bash-executor";
 import type { ExecOptions, ExecResult } from "../../exec/exec";
 import type { CustomEditor } from "../../modes/components/custom-editor";
 import type { Theme } from "../../modes/theme/theme";
-import type { CompactionResult } from "../../session/compaction";
 import type { CustomMessage } from "../../session/messages";
 import type { ReadonlySessionManager, SessionManager } from "../../session/session-manager";
 import type {
@@ -355,7 +356,7 @@ export interface ToolDefinition<TParams extends TSchema = TSchema, TDetails = un
 	label: string;
 	/** Description for LLM */
 	description: string;
-	/** Parameter schema (TypeBox) */
+	/** Parameter schema (Zod, or TypeBox for legacy/extension compat). */
 	parameters: TParams;
 	/** If true, tool is excluded unless explicitly listed in --tools or agent's tools field */
 	hidden?: boolean;
@@ -833,8 +834,11 @@ export interface ExtensionAPI {
 	/** File logger for error/warning/debug messages */
 	logger: typeof import("@oh-my-pi/pi-utils").logger;
 
-	/** Injected @sinclair/typebox module for defining tool parameters */
-	typebox: typeof import("@sinclair/typebox");
+	/** Injected zod-backed typebox shim for legacy `Type.Object(...)` parameter authoring. */
+	typebox: typeof import("../typebox");
+
+	/** Injected zod module for Zod-authored extension tools (canonical going forward). */
+	zod: typeof import("zod/v4");
 
 	/** Injected pi-coding-agent exports for accessing SDK utilities */
 	pi: typeof piCodingAgent;

package/src/extensibility/extensions/wrapper.ts

@@ -2,8 +2,7 @@
  * Tool wrappers for extensions.
  */
 import type { AgentTool, AgentToolContext, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
-import type { Static, TSchema } from "@sinclair/typebox";
+import type { ImageContent, Static, TextContent, TSchema } from "@oh-my-pi/pi-ai";
 import type { Theme } from "../../modes/theme/theme";
 import { applyToolProxy } from "../tool-proxy";
 import type { ExtensionRunner } from "./runner";

package/src/extensibility/hooks/loader.ts

@@ -3,12 +3,13 @@
  */
 import * as path from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
-import * as typebox from "@sinclair/typebox";
+import * as zod from "zod/v4";
 import { hookCapability } from "../../capability/hook";
 import type { Hook } from "../../discovery";
 import { loadCapability } from "../../discovery";
 import type { HookMessage } from "../../session/messages";
 import type { SessionManager } from "../../session/session-manager";
+import * as typebox from "../typebox";
 import { resolvePath } from "../utils";
 import { execCommand } from "./runner";
 import type { ExecOptions, HookAPI, HookFactory, HookMessageRenderer, RegisteredCommand } from "./types";
@@ -136,6 +137,7 @@ async function createHookAPI(
 		},
 		logger,
 		typebox,
+		zod,
 		pi: await import("@oh-my-pi/pi-coding-agent"),
 	} as HookAPI;
 

package/src/extensibility/hooks/tool-wrapper.ts

@@ -2,7 +2,7 @@
  * Tool wrapper - wraps tools with hook callbacks for interception.
  */
 import type { AgentTool, AgentToolContext, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import type { Static, TSchema } from "@sinclair/typebox";
+import type { Static, TSchema } from "@oh-my-pi/pi-ai";
 import { applyToolProxy } from "../tool-proxy";
 import type { HookRunner } from "./runner";
 import type { ToolCallEventResult, ToolResultEventResult } from "./types";

package/src/extensibility/hooks/types.ts

@@ -571,8 +571,10 @@ export interface HookAPI {
 
 	/** File logger for error/warning/debug messages */
 	logger: typeof import("@oh-my-pi/pi-utils").logger;
-	/** Injected @sinclair/typebox module */
-	typebox: typeof import("@sinclair/typebox");
+	/** Injected zod-backed typebox shim (legacy/compat — prefer `zod`). */
+	typebox: typeof import("../typebox");
+	/** Injected zod module for Zod-authored hooks. */
+	zod: typeof import("zod/v4");
 	/** Injected pi-coding-agent exports */
 	pi: typeof import("../..");
 }

package/src/extensibility/plugins/legacy-pi-compat.ts

@@ -3,47 +3,75 @@ import * as os from "node:os";
 import * as path from "node:path";
 import * as url from "node:url";
 
-const LEGACY_PI_PACKAGE_MAP = {
-	"@mariozechner/pi-agent-core": "@oh-my-pi/pi-agent-core",
-	"@mariozechner/pi-ai": "@oh-my-pi/pi-ai",
-	"@mariozechner/pi-coding-agent": "@oh-my-pi/pi-coding-agent",
-	"@mariozechner/pi-tui": "@oh-my-pi/pi-tui",
-} as const;
-
-const LEGACY_PI_CODING_AGENT_SUBPATH_MAP = {
-	"extensibility/extensions": "@oh-my-pi/pi-coding-agent/extensibility/extensions",
-	"extensibility/hooks": "@oh-my-pi/pi-coding-agent/extensibility/hooks",
-} as const;
-
-const LEGACY_PI_SPECIFIER_FILTER = /^@mariozechner\/pi-(agent-core|ai|coding-agent|tui)(\/.*)?$/;
-const LEGACY_PI_IMPORT_SPECIFIER_REGEX =
-	/((?:from\s+|import\s*\(\s*)["'])(@mariozechner\/pi-(?:agent-core|ai|coding-agent|tui)(?:\/[^"'()\s]+)?)(["'])/g;
+// Canonical scope for in-process pi packages. Plugins published against any of
+// the aliased scopes below (mariozechner's original publish, earendil-works'
+// fork, or the canonical @oh-my-pi scope itself) are remapped to this scope and
+// resolved against the bundled copy that ships inside the omp binary. This
+// keeps plugins running against the exact runtime state of the host (single
+// module registry, single tool registry, etc.) regardless of which historical
+// scope name they happened to declare in their peerDependencies.
+const CANONICAL_PI_SCOPE = "@oh-my-pi";
+
+// Scopes that have historically been used to publish (or alias) the same set
+// of internal pi-* packages. `@oh-my-pi` is intentionally included so that
+// direct imports of the canonical name still flow through `Bun.resolveSync`
+// against the host binary, avoiding a duplicate copy being pulled in from a
+// plugin's own node_modules tree at install time.
+const PI_SCOPE_ALIASES = ["oh-my-pi", "mariozechner", "earendil-works"] as const;
+
+// Internal pi-* package basenames bundled inside the omp binary.
+const PI_PACKAGE_NAMES = ["pi-agent-core", "pi-ai", "pi-coding-agent", "pi-natives", "pi-tui", "pi-utils"] as const;
+
+const PI_SCOPE_ALTERNATION = PI_SCOPE_ALIASES.join("|");
+const PI_PACKAGE_ALTERNATION = PI_PACKAGE_NAMES.join("|");
+
+// Upstream `@mariozechner/*` packages exposed a few subpaths at the package
+// root that we relocated under a different folder. Each entry rewrites
+// `<pkg>/<from>` → `<pkg>/<to>` after the scope has been canonicalised, so
+// plugins importing the upstream layout still resolve to a real file in our
+// bundled copy. Add new entries as `pkg/from -> pkg/to` whenever a plugin
+// surfaces another upstream-only subpath that breaks resolution.
+const PI_SUBPATH_REMAPS: ReadonlyMap<string, string> = new Map<string, string>([
+	// `@mariozechner/pi-ai/oauth` re-exported `./utils/oauth/index.js`.
+	// Our pi-ai keeps the implementation under `utils/oauth` but never added a
+	// root-level re-export, so map the upstream subpath onto it directly.
+	["pi-ai/oauth", "pi-ai/utils/oauth"],
+]);
+
+const LEGACY_PI_SPECIFIER_FILTER = new RegExp(`^@(?:${PI_SCOPE_ALTERNATION})/(?:${PI_PACKAGE_ALTERNATION})(?:/.*)?$`);
+const LEGACY_PI_IMPORT_SPECIFIER_REGEX = new RegExp(
+	`((?:from\\s+|import\\s*\\(\\s*)["'])(@(?:${PI_SCOPE_ALTERNATION})/(?:${PI_PACKAGE_ALTERNATION})(?:/[^"'()\\s]+)?)(["'])`,
+	"g",
+);
 const LEGACY_PI_FILE_PREFIX = "omp-legacy-pi-file:";
 const LEGACY_PI_FILE_NAMESPACE = "omp-legacy-pi-file";
 const resolvedSpecifierFallbacks = new Map<string, string>();
 
+// Extensions that imported `@sinclair/typebox` directly used to resolve against a
+// real `@sinclair/typebox` install. The runtime dep was replaced with the Zod-backed
+// shim under `extensibility/typebox.ts`; plugins still importing the public name
+// are redirected to that shim so existing extensions keep working without code
+// changes. Submodules like `@sinclair/typebox/compiler` are intentionally not
+// remapped — those expose TypeBox-only APIs the shim does not provide and plugins
+// relying on them must vendor `@sinclair/typebox` directly.
+const TYPEBOX_SPECIFIER = "@sinclair/typebox";
+const TYPEBOX_SPECIFIER_FILTER = /^@sinclair\/typebox$/;
+const TYPEBOX_SHIM_PATH = path.resolve(import.meta.dir, "../typebox.ts");
+
 let isLegacyPiSpecifierShimInstalled = false;
 
 function remapLegacyPiSpecifier(specifier: string): string | null {
-	const [legacyScope, packageName, ...subpathParts] = specifier.split("/");
-	const legacyPackageName = `${legacyScope}/${packageName}`;
-	const mappedPackageName = LEGACY_PI_PACKAGE_MAP[legacyPackageName as keyof typeof LEGACY_PI_PACKAGE_MAP];
-	if (!mappedPackageName) {
+	if (!LEGACY_PI_SPECIFIER_FILTER.test(specifier)) {
 		return null;
 	}
-	if (subpathParts.length === 0) {
-		return mappedPackageName;
-	}
-
-	const subpath = subpathParts.join("/");
-	if (legacyPackageName === "@mariozechner/pi-coding-agent") {
-		return (
-			LEGACY_PI_CODING_AGENT_SUBPATH_MAP[subpath as keyof typeof LEGACY_PI_CODING_AGENT_SUBPATH_MAP] ??
-			`${mappedPackageName}/${subpath}`
-		);
+	const slashIdx = specifier.indexOf("/", 1);
+	// Filter guarantees a slash exists, but guard anyway to keep the type narrow.
+	if (slashIdx === -1) {
+		return null;
 	}
-
-	return `${mappedPackageName}/${subpath}`;
+	const rest = specifier.slice(slashIdx + 1);
+	const remappedSubpath = PI_SUBPATH_REMAPS.get(rest) ?? rest;
+	return `${CANONICAL_PI_SCOPE}/${remappedSubpath}`;
 }
 
 function getResolvedSpecifier(specifier: string): string {
@@ -82,6 +110,12 @@ const ANY_IMPORT_SPECIFIER_REGEX = /((?:from\s+|import\s*\(\s*)["'])([^"']+)(["'
 
 /** Resolve bare imports against the extension directory before loading mirrored legacy Pi files. */
 function isUrlLikeSpecifier(specifier: string): boolean {
+	// Windows drive-letter paths (e.g. `C:\foo` or `C:/foo`) also match the URL
+	// scheme shape `[A-Za-z][A-Za-z\d+.-]*:`. Treat them as filesystem paths so
+	// `toRewrittenImportSpecifier` converts them to `file://` URLs instead of
+	// emitting raw paths whose `\n`, `\U`, ... get eaten by TS string-literal
+	// escapes inside the mirrored extension file.
+	if (/^[a-zA-Z]:[\\/]/.test(specifier)) return false;
 	return /^[a-zA-Z][a-zA-Z\d+.-]*:/.test(specifier);
 }
 
@@ -100,6 +134,9 @@ function rewriteBareImportsForLegacyExtension(source: string, importerPath: stri
 		if (shouldPreserveImportSpecifier(specifier)) {
 			return match;
 		}
+		if (specifier === TYPEBOX_SPECIFIER) {
+			return `${prefix}${toRewrittenImportSpecifier(TYPEBOX_SHIM_PATH)}${suffix}`;
+		}
 		try {
 			const resolved = Bun.resolveSync(specifier, importerDir);
 			return `${prefix}${toRewrittenImportSpecifier(resolved)}${suffix}`;
@@ -206,6 +243,10 @@ function resolveLegacyPiSpecifier(args: { path: string }): { path: string } | un
 	};
 }
 
+function resolveTypeBoxSpecifier(): { path: string } {
+	return { path: TYPEBOX_SHIM_PATH };
+}
+
 export function installLegacyPiSpecifierShim(): void {
 	if (isLegacyPiSpecifierShimInstalled) {
 		return;
@@ -221,6 +262,12 @@ export function installLegacyPiSpecifierShim(): void {
 				resolveLegacyPiSpecifier,
 			);
 
+			build.onResolve({ filter: TYPEBOX_SPECIFIER_FILTER, namespace: "file" }, resolveTypeBoxSpecifier);
+			build.onResolve(
+				{ filter: TYPEBOX_SPECIFIER_FILTER, namespace: LEGACY_PI_FILE_NAMESPACE },
+				resolveTypeBoxSpecifier,
+			);
+
 			build.onResolve({ filter: /^omp-legacy-pi-file:/, namespace: "file" }, args => ({
 				path: args.path.slice(LEGACY_PI_FILE_PREFIX.length),
 				namespace: LEGACY_PI_FILE_NAMESPACE,

package/src/extensibility/shared-events.ts

@@ -13,10 +13,10 @@
  * `types.ts` files and is documented there.
  */
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { CompactionPreparation, CompactionResult } from "@oh-my-pi/pi-agent-core/compaction";
 import type { ImageContent, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
 import type { Rule } from "../capability/rule";
 import type { Goal, GoalModeState } from "../goals/state";
-import type { CompactionPreparation, CompactionResult } from "../session/compaction";
 import type { BranchSummaryEntry, CompactionEntry, SessionEntry } from "../session/session-manager";
 import type { TodoItem } from "../tools/todo-write";