jeopi-cli 16.4.2 → 16.4.4

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

@@ -24,23 +24,53 @@ import type { CustomToolAPI, CustomToolFactory, LoadedCustomTool, ToolLoadError
 /**
  * Load a single tool module using native Bun import.
  */
+interface LoadToolResult {
+	tools: LoadedCustomTool[];
+	errors: ToolLoadError[];
+}
+
+function isLoadableCustomTool(value: unknown): value is LoadedCustomTool["tool"] {
+	return (
+		typeof value === "object" &&
+		value !== null &&
+		"name" in value &&
+		typeof value.name === "string" &&
+		value.name.length > 0 &&
+		"description" in value &&
+		typeof value.description === "string" &&
+		"parameters" in value &&
+		"execute" in value &&
+		typeof value.execute === "function"
+	);
+}
+
+function invalidToolError(path: string, index: number, source: ToolLoadError["source"]): ToolLoadError {
+	return {
+		path,
+		error: `Tool factory returned invalid tool at index ${index}: expected object with string name, string description, parameters, and execute function`,
+		source,
+	};
+}
+
 async function loadTool(
 	toolPath: string,
 	cwd: string,
 	sharedApi: CustomToolAPI,
 	source?: { provider: string; providerName: string; level: "user" | "project" },
-): Promise<{ tools: LoadedCustomTool[] | null; error: ToolLoadError | null }> {
+): Promise<LoadToolResult> {
 	const resolvedPath = resolvePath(toolPath, cwd);
 
 	// Skip declarative tool files (.md, .json) - these are metadata only, not executable modules
 	if (resolvedPath.endsWith(".md") || resolvedPath.endsWith(".json")) {
 		return {
-			tools: null,
-			error: {
-				path: toolPath,
-				error: "Declarative tool files (.md, .json) cannot be loaded as executable modules",
-				source,
-			},
+			tools: [],
+			errors: [
+				{
+					path: toolPath,
+					error: "Declarative tool files (.md, .json) cannot be loaded as executable modules",
+					source,
+				},
+			],
 		};
 	}
 
@@ -49,23 +79,32 @@ async function loadTool(
 		const factory = (module.default ?? module) as CustomToolFactory;
 
 		if (typeof factory !== "function") {
-			return { tools: null, error: { path: toolPath, error: "Tool must export a default function", source } };
+			return { tools: [], errors: [{ path: toolPath, error: "Tool must export a default function", source }] };
 		}
 
-		const toolResult = await factory(sharedApi);
+		const toolResult: unknown = await factory(sharedApi);
 		const toolsArray = Array.isArray(toolResult) ? toolResult : [toolResult];
 
-		const loadedTools: LoadedCustomTool[] = toolsArray.map(tool => ({
-			path: toolPath,
-			resolvedPath,
-			tool,
-			source,
-		}));
+		const loadedTools: LoadedCustomTool[] = [];
+		const errors: ToolLoadError[] = [];
+		for (const [index, tool] of toolsArray.entries()) {
+			if (!isLoadableCustomTool(tool)) {
+				errors.push(invalidToolError(toolPath, index, source));
+				continue;
+			}
+
+			loadedTools.push({
+				path: toolPath,
+				resolvedPath,
+				tool,
+				source,
+			});
+		}
 
-		return { tools: loadedTools, error: null };
+		return { tools: loadedTools, errors };
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
-		return { tools: null, error: { path: toolPath, error: `Failed to load tool: ${message}`, source } };
+		return { tools: [], errors: [{ path: toolPath, error: `Failed to load tool: ${message}`, source }] };
 	}
 }
 
@@ -129,28 +168,22 @@ export class CustomToolLoader {
 
 	async load(pathsWithSources: ToolPathWithSource[]): Promise<void> {
 		for (const { path: toolPath, source } of pathsWithSources) {
-			const { tools: loadedTools, error } = await loadTool(toolPath, this.#sharedApi.cwd, this.#sharedApi, source);
+			const { tools: loadedTools, errors } = await loadTool(toolPath, this.#sharedApi.cwd, this.#sharedApi, source);
+			this.errors.push(...errors);
 
-			if (error) {
-				this.errors.push(error);
-				continue;
-			}
-
-			if (loadedTools) {
-				for (const loadedTool of loadedTools) {
-					// Check for name conflicts
-					if (this.#seenNames.has(loadedTool.tool.name)) {
-						this.errors.push({
-							path: toolPath,
-							error: `Tool name "${loadedTool.tool.name}" conflicts with existing tool`,
-							source,
-						});
-						continue;
-					}
-
-					this.#seenNames.add(loadedTool.tool.name);
-					this.tools.push(loadedTool);
+			for (const loadedTool of loadedTools) {
+				// Check for name conflicts
+				if (this.#seenNames.has(loadedTool.tool.name)) {
+					this.errors.push({
+						path: toolPath,
+						error: `Tool name "${loadedTool.tool.name}" conflicts with existing tool`,
+						source,
+					});
+					continue;
 				}
+
+				this.#seenNames.add(loadedTool.tool.name);
+				this.tools.push(loadedTool);
 			}
 		}
 	}

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

@@ -24,6 +24,7 @@ import type { Settings } from "../../config/settings";
 import type { ExecOptions, ExecResult } from "../../exec/exec";
 import type { HookUIContext } from "../../extensibility/hooks/types";
 import type * as PiCodingAgent from "../../index";
+import type { LocalProtocolOptions } from "../../internal-urls/local-protocol";
 import type { Theme } from "../../modes/theme/theme";
 import type { ReadonlySessionManager } from "../../session/session-manager";
 import type { TodoItem } from "../../tools/todo";
@@ -96,6 +97,8 @@ export interface CustomToolContext {
 	settings?: Settings;
 	/** Fetch implementation for outbound HTTP; defaults to global fetch when omitted. */
 	fetch?: FetchImpl;
+	/** Calling session's `local://` root mapping for tools that bridge out of the OMP process. */
+	localProtocolOptions?: LocalProtocolOptions;
 	/** Whether to auto-approve all destructive tool operations (--auto-approve CLI flag) */
 	autoApprove?: boolean;
 }

package/src/extensibility/extensions/runner.ts

@@ -7,6 +7,7 @@ import type { KeyId } from "jeopi-tui";
 import { logger } from "jeopi-utils";
 import type { ModelRegistry } from "../../config/model-registry";
 import type { Settings } from "../../config/settings";
+import type { LocalProtocolOptions } from "../../internal-urls/local-protocol";
 import type { MemoryRuntimeContext } from "../../memory-backend";
 import { type Theme, theme } from "../../modes/theme/theme";
 import type { SessionManager } from "../../session/session-manager";
@@ -255,6 +256,7 @@ export class ExtensionRunner {
 		private readonly modelRegistry: ModelRegistry,
 		getMemory?: () => MemoryRuntimeContext | undefined,
 		private readonly settings?: Settings,
+		private readonly localProtocolOptions?: LocalProtocolOptions,
 	) {
 		this.#uiContext = noOpUIContext;
 		this.#getMemoryFn = getMemory;
@@ -537,6 +539,7 @@ export class ExtensionRunner {
 			hasPendingMessages: () => this.#hasPendingMessagesFn(),
 			shutdown: () => this.#shutdownHandler(),
 			getSystemPrompt: () => this.#getSystemPromptFn(),
+			localProtocolOptions: this.localProtocolOptions,
 			memory: this.#getMemoryFn?.(),
 		};
 	}

package/src/extensibility/extensions/types.ts

@@ -42,6 +42,7 @@ import type { PythonResult } from "../../eval/py/executor";
 import type { BashResult } from "../../exec/bash-executor";
 import type { ExecOptions, ExecResult } from "../../exec/exec";
 import type * as PiCodingAgent from "../../index";
+import type { LocalProtocolOptions } from "../../internal-urls/local-protocol";
 import type { MemoryRuntimeContext } from "../../memory-backend";
 import type { CustomEditor } from "../../modes/components/custom-editor";
 import type { Theme } from "../../modes/theme/theme";
@@ -346,6 +347,8 @@ export interface ExtensionContext {
 	sessionManager: ReadonlySessionManager;
 	/** Model registry for API key resolution */
 	modelRegistry: ModelRegistry;
+	/** Calling session's `local://` root mapping for external tool bridges. */
+	localProtocolOptions?: LocalProtocolOptions;
 	/** Current model (may be undefined) */
 	model: Model | undefined;
 	/** Read-only model query facade: list / current / resolve / family. */

package/src/extensibility/plugins/legacy-pi-bundled-keys.ts

@@ -92,6 +92,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-ai/providers/openai-codex/request-transformer",
 	"@oh-my-pi/pi-ai/providers/openai-codex/response-handler",
 	"@oh-my-pi/pi-ai/usage/claude",
+	"@oh-my-pi/pi-ai/usage/cursor",
 	"@oh-my-pi/pi-ai/usage/gemini",
 	"@oh-my-pi/pi-ai/usage/github-copilot",
 	"@oh-my-pi/pi-ai/usage/google-antigravity",
@@ -278,6 +279,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/cli/ttsr-cli",
 	"@oh-my-pi/pi-coding-agent/cli/update-cli",
 	"@oh-my-pi/pi-coding-agent/cli/usage-cli",
+	"@oh-my-pi/pi-coding-agent/cli/usage-error",
 	"@oh-my-pi/pi-coding-agent/cli/web-search-cli",
 	"@oh-my-pi/pi-coding-agent/cli/worktree-cli",
 	"@oh-my-pi/pi-coding-agent/cli/gallery-fixtures/agentic",
@@ -471,6 +473,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/extensibility/plugins/marketplace-auto-update",
 	"@oh-my-pi/pi-coding-agent/extensibility/plugins/parser",
 	"@oh-my-pi/pi-coding-agent/extensibility/plugins/runtime-config",
+	"@oh-my-pi/pi-coding-agent/extensibility/plugins/trust",
 	"@oh-my-pi/pi-coding-agent/extensibility/plugins/types",
 	"@oh-my-pi/pi-coding-agent/extensibility/plugins/marketplace/cache",
 	"@oh-my-pi/pi-coding-agent/extensibility/plugins/marketplace/fetcher",
@@ -511,6 +514,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/eval/py/tool-bridge",
 	"@oh-my-pi/pi-coding-agent/lsp/client",
 	"@oh-my-pi/pi-coding-agent/lsp/config",
+	"@oh-my-pi/pi-coding-agent/lsp/deferred-diagnostics",
 	"@oh-my-pi/pi-coding-agent/lsp/diagnostics-ledger",
 	"@oh-my-pi/pi-coding-agent/lsp/edits",
 	"@oh-my-pi/pi-coding-agent/lsp/format-options",
@@ -566,6 +570,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/modes/interactive-mode",
 	"@oh-my-pi/pi-coding-agent/modes/internal-url-autocomplete",
 	"@oh-my-pi/pi-coding-agent/modes/loop-limit",
+	"@oh-my-pi/pi-coding-agent/modes/magic-keyword-boundary",
 	"@oh-my-pi/pi-coding-agent/modes/magic-keywords",
 	"@oh-my-pi/pi-coding-agent/modes/markdown-prose",
 	"@oh-my-pi/pi-coding-agent/modes/oauth-manual-input",
@@ -778,6 +783,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/task/discovery",
 	"@oh-my-pi/pi-coding-agent/task/executor",
 	"@oh-my-pi/pi-coding-agent/task/isolation-runner",
+	"@oh-my-pi/pi-coding-agent/task/model-tier-classifier",
 	"@oh-my-pi/pi-coding-agent/task/name-generator",
 	"@oh-my-pi/pi-coding-agent/task/omp-command",
 	"@oh-my-pi/pi-coding-agent/task/output-manager",
@@ -800,7 +806,6 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/tools/ast-edit",
 	"@oh-my-pi/pi-coding-agent/tools/ast-grep",
 	"@oh-my-pi/pi-coding-agent/tools/auto-generated-guard",
-	"@oh-my-pi/pi-coding-agent/tools/bash-command-fixup",
 	"@oh-my-pi/pi-coding-agent/tools/bash-interactive",
 	"@oh-my-pi/pi-coding-agent/tools/bash-interceptor",
 	"@oh-my-pi/pi-coding-agent/tools/bash-pty-selection",
@@ -847,6 +852,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/tools/output-meta",
 	"@oh-my-pi/pi-coding-agent/tools/output-schema-validator",
 	"@oh-my-pi/pi-coding-agent/tools/path-utils",
+	"@oh-my-pi/pi-coding-agent/tools/path-write-lock",
 	"@oh-my-pi/pi-coding-agent/tools/plan-mode-guard",
 	"@oh-my-pi/pi-coding-agent/tools/read",
 	"@oh-my-pi/pi-coding-agent/tools/render-utils",
@@ -857,11 +863,13 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/tools/search-tool-bm25",
 	"@oh-my-pi/pi-coding-agent/tools/sqlite-reader",
 	"@oh-my-pi/pi-coding-agent/tools/ssh",
+	"@oh-my-pi/pi-coding-agent/tools/subagent",
 	"@oh-my-pi/pi-coding-agent/tools/todo",
 	"@oh-my-pi/pi-coding-agent/tools/tool-errors",
 	"@oh-my-pi/pi-coding-agent/tools/tool-result",
 	"@oh-my-pi/pi-coding-agent/tools/tool-timeouts",
 	"@oh-my-pi/pi-coding-agent/tools/tts",
+	"@oh-my-pi/pi-coding-agent/tools/vision-verify",
 	"@oh-my-pi/pi-coding-agent/tools/write",
 	"@oh-my-pi/pi-coding-agent/tools/yield",
 	"@oh-my-pi/pi-coding-agent/tui/code-cell",

package/src/extensibility/plugins/legacy-pi-bundled-registry.ts

@@ -116,6 +116,7 @@ import * as bundledPiAiProvidersVisionGuard from "jeopi-ai/providers/vision-guar
 import * as bundledPiAiRegistry from "jeopi-ai/registry";
 import * as bundledPiAiRegistryOauth from "jeopi-ai/registry/oauth";
 import * as bundledPiAiUsageClaude from "jeopi-ai/usage/claude";
+import * as bundledPiAiUsageCursor from "jeopi-ai/usage/cursor";
 import * as bundledPiAiUsageGemini from "jeopi-ai/usage/gemini";
 import * as bundledPiAiUsageGithubCopilot from "jeopi-ai/usage/github-copilot";
 import * as bundledPiAiUsageGoogleAntigravity from "jeopi-ai/usage/google-antigravity";
@@ -252,6 +253,7 @@ import * as bundledPiCodingAgentCliTinyModelsCli from "jeopi-cli/cli/tiny-models
 import * as bundledPiCodingAgentCliTtsrCli from "jeopi-cli/cli/ttsr-cli";
 import * as bundledPiCodingAgentCliUpdateCli from "jeopi-cli/cli/update-cli";
 import * as bundledPiCodingAgentCliUsageCli from "jeopi-cli/cli/usage-cli";
+import * as bundledPiCodingAgentCliUsageError from "jeopi-cli/cli/usage-error";
 import * as bundledPiCodingAgentCliWebSearchCli from "jeopi-cli/cli/web-search-cli";
 import * as bundledPiCodingAgentCliWorktreeCli from "jeopi-cli/cli/worktree-cli";
 import * as bundledPiCodingAgentCommandsAcp from "jeopi-cli/commands/acp";
@@ -463,6 +465,7 @@ import * as bundledPiCodingAgentExtensibilityPluginsMarketplaceTypes from "jeopi
 import * as bundledPiCodingAgentExtensibilityPluginsMarketplaceAutoUpdate from "jeopi-cli/extensibility/plugins/marketplace-auto-update";
 import * as bundledPiCodingAgentExtensibilityPluginsParser from "jeopi-cli/extensibility/plugins/parser";
 import * as bundledPiCodingAgentExtensibilityPluginsRuntimeConfig from "jeopi-cli/extensibility/plugins/runtime-config";
+import * as bundledPiCodingAgentExtensibilityPluginsTrust from "jeopi-cli/extensibility/plugins/trust";
 import * as bundledPiCodingAgentExtensibilityPluginsTypes from "jeopi-cli/extensibility/plugins/types";
 import * as bundledPiCodingAgentExtensibilitySessionHandlerTypes from "jeopi-cli/extensibility/session-handler-types";
 import * as bundledPiCodingAgentExtensibilitySharedEvents from "jeopi-cli/extensibility/shared-events";
@@ -508,6 +511,7 @@ import * as bundledPiCodingAgentLspClientsBiomeClient from "jeopi-cli/lsp/client
 import * as bundledPiCodingAgentLspClientsLspLinterClient from "jeopi-cli/lsp/clients/lsp-linter-client";
 import * as bundledPiCodingAgentLspClientsSwiftlintClient from "jeopi-cli/lsp/clients/swiftlint-client";
 import * as bundledPiCodingAgentLspConfig from "jeopi-cli/lsp/config";
+import * as bundledPiCodingAgentLspDeferredDiagnostics from "jeopi-cli/lsp/deferred-diagnostics";
 import * as bundledPiCodingAgentLspDiagnosticsLedger from "jeopi-cli/lsp/diagnostics-ledger";
 import * as bundledPiCodingAgentLspEdits from "jeopi-cli/lsp/edits";
 import * as bundledPiCodingAgentLspFormatOptions from "jeopi-cli/lsp/format-options";
@@ -666,6 +670,7 @@ import * as bundledPiCodingAgentModesImageReferences from "jeopi-cli/modes/image
 import * as bundledPiCodingAgentModesInteractiveMode from "jeopi-cli/modes/interactive-mode";
 import * as bundledPiCodingAgentModesInternalUrlAutocomplete from "jeopi-cli/modes/internal-url-autocomplete";
 import * as bundledPiCodingAgentModesLoopLimit from "jeopi-cli/modes/loop-limit";
+import * as bundledPiCodingAgentModesMagicKeywordBoundary from "jeopi-cli/modes/magic-keyword-boundary";
 import * as bundledPiCodingAgentModesMagicKeywords from "jeopi-cli/modes/magic-keywords";
 import * as bundledPiCodingAgentModesMarkdownProse from "jeopi-cli/modes/markdown-prose";
 import * as bundledPiCodingAgentModesOauthManualInput from "jeopi-cli/modes/oauth-manual-input";
@@ -779,6 +784,7 @@ import * as bundledPiCodingAgentTaskCriticGate from "jeopi-cli/task/critic-gate"
 import * as bundledPiCodingAgentTaskDiscovery from "jeopi-cli/task/discovery";
 import * as bundledPiCodingAgentTaskExecutor from "jeopi-cli/task/executor";
 import * as bundledPiCodingAgentTaskIsolationRunner from "jeopi-cli/task/isolation-runner";
+import * as bundledPiCodingAgentTaskModelTierClassifier from "jeopi-cli/task/model-tier-classifier";
 import * as bundledPiCodingAgentTaskNameGenerator from "jeopi-cli/task/name-generator";
 import * as bundledPiCodingAgentTaskOmpCommand from "jeopi-cli/task/omp-command";
 import * as bundledPiCodingAgentTaskOutputManager from "jeopi-cli/task/output-manager";
@@ -803,7 +809,6 @@ import * as bundledPiCodingAgentToolsAstEdit from "jeopi-cli/tools/ast-edit";
 import * as bundledPiCodingAgentToolsAstGrep from "jeopi-cli/tools/ast-grep";
 import * as bundledPiCodingAgentToolsAutoGeneratedGuard from "jeopi-cli/tools/auto-generated-guard";
 import * as bundledPiCodingAgentToolsBash from "jeopi-cli/tools/bash";
-import * as bundledPiCodingAgentToolsBashCommandFixup from "jeopi-cli/tools/bash-command-fixup";
 import * as bundledPiCodingAgentToolsBashInteractive from "jeopi-cli/tools/bash-interactive";
 import * as bundledPiCodingAgentToolsBashInterceptor from "jeopi-cli/tools/bash-interceptor";
 import * as bundledPiCodingAgentToolsBashPtySelection from "jeopi-cli/tools/bash-pty-selection";
@@ -849,6 +854,7 @@ import * as bundledPiCodingAgentToolsMemoryRetain from "jeopi-cli/tools/memory-r
 import * as bundledPiCodingAgentToolsOutputMeta from "jeopi-cli/tools/output-meta";
 import * as bundledPiCodingAgentToolsOutputSchemaValidator from "jeopi-cli/tools/output-schema-validator";
 import * as bundledPiCodingAgentToolsPathUtils from "jeopi-cli/tools/path-utils";
+import * as bundledPiCodingAgentToolsPathWriteLock from "jeopi-cli/tools/path-write-lock";
 import * as bundledPiCodingAgentToolsPlanModeGuard from "jeopi-cli/tools/plan-mode-guard";
 import * as bundledPiCodingAgentToolsRead from "jeopi-cli/tools/read";
 import * as bundledPiCodingAgentToolsRenderUtils from "jeopi-cli/tools/render-utils";
@@ -859,11 +865,13 @@ import * as bundledPiCodingAgentToolsReview from "jeopi-cli/tools/review";
 import * as bundledPiCodingAgentToolsSearchToolBm25 from "jeopi-cli/tools/search-tool-bm25";
 import * as bundledPiCodingAgentToolsSqliteReader from "jeopi-cli/tools/sqlite-reader";
 import * as bundledPiCodingAgentToolsSsh from "jeopi-cli/tools/ssh";
+import * as bundledPiCodingAgentToolsSubagent from "jeopi-cli/tools/subagent";
 import * as bundledPiCodingAgentToolsTodo from "jeopi-cli/tools/todo";
 import * as bundledPiCodingAgentToolsToolErrors from "jeopi-cli/tools/tool-errors";
 import * as bundledPiCodingAgentToolsToolResult from "jeopi-cli/tools/tool-result";
 import * as bundledPiCodingAgentToolsToolTimeouts from "jeopi-cli/tools/tool-timeouts";
 import * as bundledPiCodingAgentToolsTts from "jeopi-cli/tools/tts";
+import * as bundledPiCodingAgentToolsVisionVerify from "jeopi-cli/tools/vision-verify";
 import * as bundledPiCodingAgentToolsWrite from "jeopi-cli/tools/write";
 import * as bundledPiCodingAgentToolsYield from "jeopi-cli/tools/yield";
 import * as bundledPiCodingAgentTui from "jeopi-cli/tui";
@@ -1224,6 +1232,7 @@ export const BUNDLED_PI_REGISTRY: Readonly<Record<string, Readonly<Record<string
 	"@oh-my-pi/pi-ai/providers/openai-codex/response-handler":
 		bundledPiAiProvidersOpenaiCodexResponseHandler as unknown as Readonly<Record<string, unknown>>,
 	"@oh-my-pi/pi-ai/usage/claude": bundledPiAiUsageClaude as unknown as Readonly<Record<string, unknown>>,
+	"@oh-my-pi/pi-ai/usage/cursor": bundledPiAiUsageCursor as unknown as Readonly<Record<string, unknown>>,
 	"@oh-my-pi/pi-ai/usage/gemini": bundledPiAiUsageGemini as unknown as Readonly<Record<string, unknown>>,
 	"@oh-my-pi/pi-ai/usage/github-copilot": bundledPiAiUsageGithubCopilot as unknown as Readonly<
 		Record<string, unknown>
@@ -1628,6 +1637,9 @@ export const BUNDLED_PI_REGISTRY: Readonly<Record<string, Readonly<Record<string
 	"@oh-my-pi/pi-coding-agent/cli/usage-cli": bundledPiCodingAgentCliUsageCli as unknown as Readonly<
 		Record<string, unknown>
 	>,
+	"@oh-my-pi/pi-coding-agent/cli/usage-error": bundledPiCodingAgentCliUsageError as unknown as Readonly<
+		Record<string, unknown>
+	>,
 	"@oh-my-pi/pi-coding-agent/cli/web-search-cli": bundledPiCodingAgentCliWebSearchCli as unknown as Readonly<
 		Record<string, unknown>
 	>,
@@ -2121,6 +2133,8 @@ export const BUNDLED_PI_REGISTRY: Readonly<Record<string, Readonly<Record<string
 		bundledPiCodingAgentExtensibilityPluginsParser as unknown as Readonly<Record<string, unknown>>,
 	"@oh-my-pi/pi-coding-agent/extensibility/plugins/runtime-config":
 		bundledPiCodingAgentExtensibilityPluginsRuntimeConfig as unknown as Readonly<Record<string, unknown>>,
+	"@oh-my-pi/pi-coding-agent/extensibility/plugins/trust":
+		bundledPiCodingAgentExtensibilityPluginsTrust as unknown as Readonly<Record<string, unknown>>,
 	"@oh-my-pi/pi-coding-agent/extensibility/plugins/types":
 		bundledPiCodingAgentExtensibilityPluginsTypes as unknown as Readonly<Record<string, unknown>>,
 	"@oh-my-pi/pi-coding-agent/extensibility/plugins/marketplace/cache":
@@ -2218,6 +2232,8 @@ export const BUNDLED_PI_REGISTRY: Readonly<Record<string, Readonly<Record<string
 	"@oh-my-pi/pi-coding-agent/lsp/config": bundledPiCodingAgentLspConfig as unknown as Readonly<
 		Record<string, unknown>
 	>,
+	"@oh-my-pi/pi-coding-agent/lsp/deferred-diagnostics":
+		bundledPiCodingAgentLspDeferredDiagnostics as unknown as Readonly<Record<string, unknown>>,
 	"@oh-my-pi/pi-coding-agent/lsp/diagnostics-ledger": bundledPiCodingAgentLspDiagnosticsLedger as unknown as Readonly<
 		Record<string, unknown>
 	>,
@@ -2366,6 +2382,8 @@ export const BUNDLED_PI_REGISTRY: Readonly<Record<string, Readonly<Record<string
 	"@oh-my-pi/pi-coding-agent/modes/loop-limit": bundledPiCodingAgentModesLoopLimit as unknown as Readonly<
 		Record<string, unknown>
 	>,
+	"@oh-my-pi/pi-coding-agent/modes/magic-keyword-boundary":
+		bundledPiCodingAgentModesMagicKeywordBoundary as unknown as Readonly<Record<string, unknown>>,
 	"@oh-my-pi/pi-coding-agent/modes/magic-keywords": bundledPiCodingAgentModesMagicKeywords as unknown as Readonly<
 		Record<string, unknown>
 	>,
@@ -2854,6 +2872,8 @@ export const BUNDLED_PI_REGISTRY: Readonly<Record<string, Readonly<Record<string
 	"@oh-my-pi/pi-coding-agent/task/isolation-runner": bundledPiCodingAgentTaskIsolationRunner as unknown as Readonly<
 		Record<string, unknown>
 	>,
+	"@oh-my-pi/pi-coding-agent/task/model-tier-classifier":
+		bundledPiCodingAgentTaskModelTierClassifier as unknown as Readonly<Record<string, unknown>>,
 	"@oh-my-pi/pi-coding-agent/task/name-generator": bundledPiCodingAgentTaskNameGenerator as unknown as Readonly<
 		Record<string, unknown>
 	>,
@@ -2914,8 +2934,6 @@ export const BUNDLED_PI_REGISTRY: Readonly<Record<string, Readonly<Record<string
 	>,
 	"@oh-my-pi/pi-coding-agent/tools/auto-generated-guard":
 		bundledPiCodingAgentToolsAutoGeneratedGuard as unknown as Readonly<Record<string, unknown>>,
-	"@oh-my-pi/pi-coding-agent/tools/bash-command-fixup":
-		bundledPiCodingAgentToolsBashCommandFixup as unknown as Readonly<Record<string, unknown>>,
 	"@oh-my-pi/pi-coding-agent/tools/bash-interactive": bundledPiCodingAgentToolsBashInteractive as unknown as Readonly<
 		Record<string, unknown>
 	>,
@@ -3041,6 +3059,9 @@ export const BUNDLED_PI_REGISTRY: Readonly<Record<string, Readonly<Record<string
 	"@oh-my-pi/pi-coding-agent/tools/path-utils": bundledPiCodingAgentToolsPathUtils as unknown as Readonly<
 		Record<string, unknown>
 	>,
+	"@oh-my-pi/pi-coding-agent/tools/path-write-lock": bundledPiCodingAgentToolsPathWriteLock as unknown as Readonly<
+		Record<string, unknown>
+	>,
 	"@oh-my-pi/pi-coding-agent/tools/plan-mode-guard": bundledPiCodingAgentToolsPlanModeGuard as unknown as Readonly<
 		Record<string, unknown>
 	>,
@@ -3069,6 +3090,9 @@ export const BUNDLED_PI_REGISTRY: Readonly<Record<string, Readonly<Record<string
 		Record<string, unknown>
 	>,
 	"@oh-my-pi/pi-coding-agent/tools/ssh": bundledPiCodingAgentToolsSsh as unknown as Readonly<Record<string, unknown>>,
+	"@oh-my-pi/pi-coding-agent/tools/subagent": bundledPiCodingAgentToolsSubagent as unknown as Readonly<
+		Record<string, unknown>
+	>,
 	"@oh-my-pi/pi-coding-agent/tools/todo": bundledPiCodingAgentToolsTodo as unknown as Readonly<
 		Record<string, unknown>
 	>,
@@ -3082,6 +3106,9 @@ export const BUNDLED_PI_REGISTRY: Readonly<Record<string, Readonly<Record<string
 		Record<string, unknown>
 	>,
 	"@oh-my-pi/pi-coding-agent/tools/tts": bundledPiCodingAgentToolsTts as unknown as Readonly<Record<string, unknown>>,
+	"@oh-my-pi/pi-coding-agent/tools/vision-verify": bundledPiCodingAgentToolsVisionVerify as unknown as Readonly<
+		Record<string, unknown>
+	>,
 	"@oh-my-pi/pi-coding-agent/tools/write": bundledPiCodingAgentToolsWrite as unknown as Readonly<
 		Record<string, unknown>
 	>,

package/src/extensibility/plugins/manager.ts

@@ -212,6 +212,16 @@ export class PluginManager {
 		}
 	}
 
+	async #removeDependencyEntry(pkgJsonPath: string, name: string): Promise<void> {
+		const pkgJson: { dependencies?: Record<string, string>; [key: string]: unknown } =
+			await Bun.file(pkgJsonPath).json();
+		if (!pkgJson.dependencies || !(name in pkgJson.dependencies)) {
+			return;
+		}
+		delete pkgJson.dependencies[name];
+		await Bun.write(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
+	}
+
 	#collectInstalledNames(deps: Record<string, string>, config: PluginRuntimeConfig): Set<string> {
 		const installedNames = new Set<string>();
 		for (const name of Object.keys(deps)) {
@@ -451,6 +461,17 @@ export class PluginManager {
 		// validation throws.
 		let actualName: string | undefined;
 		try {
+			// Bun treats a dependency replacement from `repo#old-ref` to the same
+			// package at `repo`/`repo#new-ref` as a self-edge and bails with
+			// DependencyLoop. Remove only the stale manifest edge; rollback restores
+			// the original package.json and node_modules snapshot on failure.
+			if (gitSource && existingActualName) {
+				const installedSource = parseGitUrl(depsBefore[existingActualName] ?? "");
+				if (installedSource && installedSource.ref !== gitSource.ref) {
+					await this.#removeDependencyEntry(pkgJsonPath, existingActualName);
+				}
+			}
+
 			// Step 1: write the spec into plugins/package.json + node_modules.
 			const installProc = Bun.spawn(["bun", "install", packageInstallSpec], {
 				cwd: getPluginsDir(),