@clinebot/core 0.0.10 → 0.0.12

package/dist/runtime/sandbox/subprocess-sandbox.d.ts

@@ -1,6 +1,13 @@
 export interface SubprocessSandboxOptions {
-    bootstrapScript: string;
+    /** Inline script to execute via `node -e`. Mutually exclusive with {@link bootstrapFile}. */
+    bootstrapScript?: string;
+    /** Path to a JavaScript file to execute via `node <file>`. Mutually exclusive with {@link bootstrapScript}. */
+    bootstrapFile?: string;
     name?: string;
+    onEvent?: (event: {
+        name: string;
+        payload?: unknown;
+    }) => void;
 }
 export interface SandboxCallOptions {
     timeoutMs?: number;

package/dist/session/default-session-manager.d.ts

@@ -60,7 +60,12 @@ export declare class DefaultSessionManager implements SessionManager {
     private failSession;
     private shutdownSession;
     private updateStatus;
+    private handlePluginEvent;
+    private enqueuePendingPrompt;
+    private drainPendingPrompts;
     private onAgentEvent;
+    private emitPendingPrompts;
+    private emitPendingPromptSubmitted;
     private createSpawnTool;
     private handleTeamEvent;
     private runWithAuthRetry;

package/dist/session/session-config-builder.d.ts

@@ -5,7 +5,10 @@ import type { CoreSessionConfig } from "../types/config";
 import { type ProviderSettings } from "../types/provider-settings";
 import type { StartSessionInput } from "./session-manager";
 export declare function resolveWorkspacePath(config: CoreSessionConfig): string;
-export declare function buildEffectiveConfig(input: StartSessionInput, hookPath: string, sessionId: string, defaultTelemetry: ITelemetryService | undefined): Promise<{
+export declare function buildEffectiveConfig(input: StartSessionInput, hookPath: string, sessionId: string, defaultTelemetry: ITelemetryService | undefined, onPluginEvent?: (event: {
+    name: string;
+    payload?: unknown;
+}) => void): Promise<{
     config: CoreSessionConfig;
     pluginSandboxShutdown?: () => Promise<void>;
 }>;

package/dist/session/session-manager.d.ts

@@ -33,6 +33,7 @@ export interface SendSessionInput {
     prompt: string;
     userImages?: string[];
     userFiles?: string[];
+    delivery?: "queue" | "steer";
 }
 export interface SessionAccumulatedUsage {
     inputTokens: number;

package/dist/session/unified-session-persistence-service.d.ts

@@ -44,9 +44,12 @@ export interface SessionPersistenceAdapter {
 export declare class UnifiedSessionPersistenceService {
     private readonly adapter;
     private readonly teamTaskSessionsByAgent;
+    private readonly teamTaskLastHeartbeatBySession;
+    private readonly teamTaskLastProgressLineBySession;
     protected readonly artifacts: SessionArtifacts;
     private static readonly STALE_REASON;
     private static readonly STALE_SOURCE;
+    private static readonly TEAM_HEARTBEAT_LOG_INTERVAL_MS;
     constructor(adapter: SessionPersistenceAdapter);
     ensureSessionsDir(): string;
     private writeManifestFile;
@@ -81,6 +84,9 @@ export declare class UnifiedSessionPersistenceService {
     applyStatusToRunningChildSessions(parentSessionId: string, status: Exclude<SessionStatus, "running">): Promise<void>;
     onTeamTaskStart(rootSessionId: string, agentId: string, message: string): Promise<void>;
     onTeamTaskEnd(rootSessionId: string, agentId: string, status: SessionStatus, summary?: string, messages?: LlmsProviders.Message[]): Promise<void>;
+    onTeamTaskProgress(rootSessionId: string, agentId: string, progress: string, options?: {
+        kind?: "heartbeat" | "progress" | "text";
+    }): Promise<void>;
     handleSubAgentStart(rootSessionId: string, context: SubAgentStartContext): Promise<void>;
     handleSubAgentEnd(rootSessionId: string, context: SubAgentEndContext): Promise<void>;
     private isPidAlive;

package/dist/session/utils/helpers.d.ts

@@ -7,5 +7,5 @@ export declare function extractWorkspaceMetadataFromSystemPrompt(systemPrompt: s
 export declare function hasRuntimeHooks(hooks: AgentConfig["hooks"]): boolean;
 export declare function mergeAgentExtensions(explicitExtensions: AgentConfig["extensions"] | undefined, loadedExtensions: AgentConfig["extensions"] | undefined): AgentConfig["extensions"];
 export declare function serializeAgentEvent(event: AgentEvent): string;
-export declare function withLatestAssistantTurnMetadata(messages: LlmsProviders.Message[], result: AgentResult): StoredMessageWithMetadata[];
+export declare function withLatestAssistantTurnMetadata(messages: LlmsProviders.Message[], result: AgentResult, previousMessages?: LlmsProviders.MessageWithMetadata[]): StoredMessageWithMetadata[];
 export declare function toSessionRecord(row: SessionRowShape): SessionRecord;

package/dist/session/utils/types.d.ts

@@ -17,12 +17,22 @@ export type ActiveSession = {
     started: boolean;
     aborting: boolean;
     interactive: boolean;
+    persistedMessages?: LlmsProviders.MessageWithMetadata[];
     activeTeamRunIds: Set<string>;
     pendingTeamRunUpdates: TeamRunUpdate[];
     teamRunWaiters: Array<() => void>;
+    pendingPrompts: PendingPrompt[];
+    drainingPendingPrompts: boolean;
     pluginSandboxShutdown?: () => Promise<void>;
     turnUsageBaseline?: SessionAccumulatedUsage;
 };
+export type PendingPrompt = {
+    id: string;
+    prompt: string;
+    delivery: "queue" | "steer";
+    userImages?: string[];
+    userFiles?: string[];
+};
 export type TeamRunUpdate = {
     runId: string;
     agentId: string;

package/dist/tools/definitions.d.ts

@@ -5,7 +5,7 @@
  */
 import { type Tool } from "@clinebot/agents";
 import { type ApplyPatchInput, type AskQuestionInput, type EditFileInput, type FetchWebContentInput, type ReadFilesInput, type RunCommandsInput, type SearchCodebaseInput, type SkillsInput } from "./schemas.js";
-import type { ApplyPatchExecutor, AskQuestionExecutor, BashExecutor, CreateDefaultToolsOptions, DefaultToolsConfig, EditorExecutor, FileReadExecutor, SearchExecutor, SkillsExecutor, ToolOperationResult, WebFetchExecutor } from "./types.js";
+import type { ApplyPatchExecutor, AskQuestionExecutor, BashExecutor, CreateDefaultToolsOptions, DefaultToolsConfig, EditorExecutor, FileReadExecutor, SearchExecutor, SkillsExecutorWithMetadata, ToolOperationResult, WebFetchExecutor } from "./types.js";
 /**
  * Create the read_files tool
  *
@@ -47,7 +47,7 @@ export declare function createEditorTool(executor: EditorExecutor, config?: Pick
  *
  * Invokes a configured skill by name and optional arguments.
  */
-export declare function createSkillsTool(executor: SkillsExecutor, config?: Pick<DefaultToolsConfig, "skillsTimeoutMs">): Tool<SkillsInput, string>;
+export declare function createSkillsTool(executor: SkillsExecutorWithMetadata, config?: Pick<DefaultToolsConfig, "skillsTimeoutMs">): Tool<SkillsInput, string>;
 /**
  * Create the ask_question tool
  *

package/dist/tools/presets.d.ts

@@ -79,7 +79,7 @@ export declare const ToolPresets: {
         readonly enableAskQuestion: true;
     };
     /**
-     * YOLO mode (everything enabled + no approval required)
+     * YOLO mode (automation-focused tools + no approval required)
      * Good for trusted local automation workflows.
      */
     readonly yolo: {
@@ -90,7 +90,7 @@ export declare const ToolPresets: {
         readonly enableApplyPatch: false;
         readonly enableEditor: true;
         readonly enableSkills: true;
-        readonly enableAskQuestion: true;
+        readonly enableAskQuestion: false;
     };
 };
 /**
@@ -103,7 +103,7 @@ export type ToolPresetName = keyof typeof ToolPresets;
 export type ToolPolicyPresetName = "default" | "yolo";
 /**
  * Build tool policies for a preset.
- * `yolo` guarantees all tools are enabled and auto-approved.
+ * `yolo` guarantees tool policies are enabled and auto-approved.
  */
 export declare function createToolPoliciesWithPreset(presetName: ToolPolicyPresetName): Record<string, ToolPolicy>;
 /**

package/dist/tools/schemas.d.ts

@@ -6,13 +6,13 @@
  */
 import { z } from "zod";
 export declare const ReadFileLineRangeSchema: z.ZodObject<{
-    start_line: z.ZodOptional<z.ZodNumber>;
-    end_line: z.ZodOptional<z.ZodNumber>;
+    start_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    end_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 }, z.core.$strip>;
 export declare const ReadFileRequestSchema: z.ZodObject<{
     path: z.ZodString;
-    start_line: z.ZodOptional<z.ZodNumber>;
-    end_line: z.ZodOptional<z.ZodNumber>;
+    start_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    end_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 }, z.core.$strip>;
 /**
  * Schema for read_files tool input
@@ -20,8 +20,8 @@ export declare const ReadFileRequestSchema: z.ZodObject<{
 export declare const ReadFilesInputSchema: z.ZodObject<{
     files: z.ZodArray<z.ZodObject<{
         path: z.ZodString;
-        start_line: z.ZodOptional<z.ZodNumber>;
-        end_line: z.ZodOptional<z.ZodNumber>;
+        start_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        end_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 /**
@@ -30,22 +30,22 @@ export declare const ReadFilesInputSchema: z.ZodObject<{
 export declare const ReadFilesInputUnionSchema: z.ZodUnion<readonly [z.ZodObject<{
     files: z.ZodArray<z.ZodObject<{
         path: z.ZodString;
-        start_line: z.ZodOptional<z.ZodNumber>;
-        end_line: z.ZodOptional<z.ZodNumber>;
+        start_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        end_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     path: z.ZodString;
-    start_line: z.ZodOptional<z.ZodNumber>;
-    end_line: z.ZodOptional<z.ZodNumber>;
+    start_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    end_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 }, z.core.$strip>, z.ZodArray<z.ZodObject<{
     path: z.ZodString;
-    start_line: z.ZodOptional<z.ZodNumber>;
-    end_line: z.ZodOptional<z.ZodNumber>;
+    start_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    end_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 }, z.core.$strip>>, z.ZodArray<z.ZodString>, z.ZodString, z.ZodObject<{
     files: z.ZodObject<{
         path: z.ZodString;
-        start_line: z.ZodOptional<z.ZodNumber>;
-        end_line: z.ZodOptional<z.ZodNumber>;
+        start_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        end_line: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     }, z.core.$strip>;
 }, z.core.$strip>, z.ZodObject<{
     file_paths: z.ZodArray<z.ZodString>;

package/dist/types/config.d.ts

@@ -42,4 +42,9 @@ export interface CoreSessionConfig extends CoreModelConfig, CoreRuntimeFeatures,
     onTeamEvent?: (event: TeamEvent) => void;
     onConsecutiveMistakeLimitReached?: (context: ConsecutiveMistakeLimitContext) => Promise<ConsecutiveMistakeLimitDecision> | ConsecutiveMistakeLimitDecision;
     toolRoutingRules?: ToolRoutingRule[];
+    /**
+     * Optional skill allowlist for the `skills` tool. When provided, only these
+     * skills are surfaced in tool metadata and invocable by name.
+     */
+    skills?: string[];
 }

package/dist/types/events.d.ts

@@ -27,6 +27,22 @@ export interface SessionTeamProgressEvent {
     lifecycle: import("@clinebot/shared").TeamProgressLifecycleEvent;
     summary: import("@clinebot/shared").TeamProgressSummary;
 }
+export interface SessionPendingPromptsEvent {
+    sessionId: string;
+    prompts: Array<{
+        id: string;
+        prompt: string;
+        delivery: "queue" | "steer";
+        attachmentCount: number;
+    }>;
+}
+export interface SessionPendingPromptSubmittedEvent {
+    sessionId: string;
+    id: string;
+    prompt: string;
+    delivery: "queue" | "steer";
+    attachmentCount: number;
+}
 export type CoreSessionEvent = {
     type: "chunk";
     payload: SessionChunkEvent;
@@ -39,6 +55,12 @@ export type CoreSessionEvent = {
 } | {
     type: "team_progress";
     payload: SessionTeamProgressEvent;
+} | {
+    type: "pending_prompts";
+    payload: SessionPendingPromptsEvent;
+} | {
+    type: "pending_prompt_submitted";
+    payload: SessionPendingPromptSubmittedEvent;
 } | {
     type: "ended";
     payload: SessionEndedEvent;

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "@clinebot/core",
-	"version": "0.0.10",
+	"version": "0.0.12",
 	"main": "./dist/index.node.js",
 	"dependencies": {
-		"@clinebot/agents": "0.0.10",
-		"@clinebot/llms": "0.0.10",
-		"@clinebot/shared": "0.0.10",
+		"@clinebot/agents": "0.0.12",
+		"@clinebot/llms": "0.0.12",
+		"@clinebot/shared": "0.0.12",
 		"@opentelemetry/api": "^1.9.0",
 		"@opentelemetry/api-logs": "^0.56.0",
 		"@opentelemetry/exporter-logs-otlp-http": "^0.56.0",
@@ -15,6 +15,7 @@
 		"@opentelemetry/sdk-metrics": "^1.30.1",
 		"@opentelemetry/semantic-conventions": "^1.37.0",
 		"better-sqlite3": "^11.10.0",
+		"jiti": "^1.21.7",
 		"nanoid": "^5.1.7",
 		"simple-git": "^3.32.3",
 		"yaml": "^2.8.2",

package/src/agents/agent-config-loader.test.ts

@@ -139,6 +139,7 @@ name: Reader
 description: Reads files
 modelId: claude-sonnet-4-6
 tools: read_files
+skills: commit, review
 ---
 Be precise.`);
 
@@ -149,6 +150,7 @@ Be precise.`);
 		expect(partial.modelId).toBe("claude-sonnet-4-6");
 		expect(partial.systemPrompt).toBe("Be precise.");
 		expect(partial.tools).toEqual([readFiles]);
+		expect(partial.skills).toEqual(["commit", "review"]);
 	});
 
 	it("throws when tool overrides are configured without available tools", () => {

package/src/agents/agent-config-loader.ts

@@ -20,6 +20,7 @@ export type {
 	AgentYamlConfig,
 	BuildAgentConfigOverridesOptions,
 	ParseYamlFrontmatterResult,
+	PartialAgentConfigOverrides,
 } from "./agent-config-parser";
 export {
 	parseAgentConfigFromYaml,

package/src/agents/agent-config-parser.ts

@@ -33,6 +33,11 @@ export interface BuildAgentConfigOverridesOptions {
 	availableTools?: ReadonlyArray<Tool>;
 }
 
+export interface PartialAgentConfigOverrides
+	extends Partial<Pick<AgentConfig, "modelId" | "systemPrompt" | "tools">> {
+	skills?: string[];
+}
+
 export function isAgentConfigYamlFile(fileName: string): boolean {
 	return /\.(yaml|yml)$/i.test(fileName);
 }
@@ -159,10 +164,8 @@ export function resolveAgentTools(
 export function toPartialAgentConfig(
 	config: AgentYamlConfig,
 	options?: BuildAgentConfigOverridesOptions,
-): Partial<Pick<AgentConfig, "modelId" | "systemPrompt" | "tools">> {
-	const partial: Partial<
-		Pick<AgentConfig, "modelId" | "systemPrompt" | "tools">
-	> = {
+): PartialAgentConfigOverrides {
+	const partial: PartialAgentConfigOverrides = {
 		systemPrompt: config.systemPrompt,
 	};
 
@@ -179,13 +182,17 @@ export function toPartialAgentConfig(
 		partial.tools = resolveAgentTools(config.tools, options.availableTools);
 	}
 
+	if (config.skills !== undefined) {
+		partial.skills = [...config.skills];
+	}
+
 	return partial;
 }
 
 export function parsePartialAgentConfigFromYaml(
 	content: string,
 	options?: BuildAgentConfigOverridesOptions,
-): Partial<Pick<AgentConfig, "modelId" | "systemPrompt" | "tools">> {
+): PartialAgentConfigOverrides {
 	const parsed = parseAgentConfigFromYaml(content);
 	return toPartialAgentConfig(parsed, options);
 }

package/src/agents/index.ts

@@ -5,6 +5,7 @@ export type {
 	BuildAgentConfigOverridesOptions,
 	CreateAgentConfigWatcherOptions,
 	ParseYamlFrontmatterResult,
+	PartialAgentConfigOverrides,
 } from "./agent-config-loader";
 export {
 	AGENT_CONFIG_DIRECTORY_NAME,

package/src/agents/plugin-config-loader.test.ts

@@ -26,6 +26,11 @@ describe("plugin-config-loader", () => {
 			await mkdir(nested, { recursive: true });
 			await writeFile(join(root, "a.mjs"), "export default {}", "utf8");
 			await writeFile(join(nested, "b.ts"), "export default {}", "utf8");
+			await writeFile(
+				join(root, ".a.mjs.cline-plugin.mjs"),
+				"export default {}",
+				"utf8",
+			);
 			await writeFile(join(root, "ignore.txt"), "noop", "utf8");
 
 			const discovered = discoverPluginModulePaths(root);
@@ -38,6 +43,8 @@ describe("plugin-config-loader", () => {
 	it("resolves plugin paths from explicit files/directories", async () => {
 		const root = await mkdtemp(join(tmpdir(), "core-plugin-config-loader-"));
 		try {
+			process.env.HOME = root;
+			setHomeDir(root);
 			const pluginsDir = join(root, "plugins");
 			await mkdir(pluginsDir, { recursive: true });
 			const filePath = join(root, "direct.mjs");
@@ -57,6 +64,41 @@ describe("plugin-config-loader", () => {
 		}
 	});
 
+	it("prefers package manifest plugin entries for configured directories", async () => {
+		const root = await mkdtemp(join(tmpdir(), "core-plugin-config-loader-"));
+		try {
+			const pluginDir = join(root, "plugin-package");
+			const srcDir = join(pluginDir, "src");
+			await mkdir(srcDir, { recursive: true });
+			const declaredEntry = join(srcDir, "index.ts");
+			const ignoredEntry = join(pluginDir, "ignored.mjs");
+			await writeFile(
+				join(pluginDir, "package.json"),
+				JSON.stringify({
+					name: "plugin-package",
+					private: true,
+					cline: {
+						plugins: ["./src/index.ts"],
+					},
+				}),
+				"utf8",
+			);
+			await writeFile(declaredEntry, "export default {}", "utf8");
+			await writeFile(ignoredEntry, "export default {}", "utf8");
+
+			const resolved = resolveAgentPluginPaths({
+				pluginPaths: ["./plugin-package"],
+				cwd: root,
+				workspacePath: join(root, "workspace"),
+			});
+
+			expect(resolved).toContain(declaredEntry);
+			expect(resolved).not.toContain(ignoredEntry);
+		} finally {
+			await rm(root, { recursive: true, force: true });
+		}
+	});
+
 	it("includes shared search-path plugins", async () => {
 		const home = await mkdtemp(
 			join(tmpdir(), "core-plugin-config-loader-home-"),
@@ -69,20 +111,27 @@ describe("plugin-config-loader", () => {
 			setHomeDir(home);
 			const workspacePlugins = join(workspace, ".clinerules", "plugins");
 			const userPlugins = join(home, ".cline", "plugins");
+			const documentsPlugins = join(home, "Documents", "Plugins");
 			await mkdir(workspacePlugins, { recursive: true });
 			await mkdir(userPlugins, { recursive: true });
+			await mkdir(documentsPlugins, { recursive: true });
 			const workspacePlugin = join(workspacePlugins, "workspace.mjs");
 			const userPlugin = join(userPlugins, "user.mjs");
+			const documentsPlugin = join(documentsPlugins, "documents.mjs");
 			await writeFile(workspacePlugin, "export default {}", "utf8");
 			await writeFile(userPlugin, "export default {}", "utf8");
+			await writeFile(documentsPlugin, "export default {}", "utf8");
 
 			const searchPaths = resolvePluginConfigSearchPaths(workspace);
+			expect(searchPaths).toHaveLength(3);
 			expect(searchPaths).toContain(workspacePlugins);
 			expect(searchPaths).toContain(userPlugins);
+			expect(searchPaths).toContain(documentsPlugins);
 
 			const resolved = resolveAgentPluginPaths({ workspacePath: workspace });
 			expect(resolved).toContain(workspacePlugin);
 			expect(resolved).toContain(userPlugin);
+			expect(resolved).toContain(documentsPlugin);
 		} finally {
 			await rm(home, { recursive: true, force: true });
 			await rm(workspace, { recursive: true, force: true });

package/src/agents/plugin-config-loader.ts

@@ -1,19 +1,13 @@
-import { existsSync, readdirSync, statSync } from "node:fs";
-import { join, resolve } from "node:path";
+import { existsSync } from "node:fs";
 import type { AgentConfig } from "@clinebot/agents";
-import { resolvePluginConfigSearchPaths as resolvePluginConfigSearchPathsFromShared } from "@clinebot/shared/storage";
+import {
+	discoverPluginModulePaths as discoverPluginModulePathsFromShared,
+	resolveConfiguredPluginModulePaths,
+	resolvePluginConfigSearchPaths as resolvePluginConfigSearchPathsFromShared,
+} from "@clinebot/shared/storage";
 import { loadAgentPluginsFromPaths } from "./plugin-loader";
 import { loadSandboxedPlugins } from "./plugin-sandbox";
 
-const PLUGIN_MODULE_EXTENSIONS = new Set([
-	".js",
-	".mjs",
-	".cjs",
-	".ts",
-	".mts",
-	".cts",
-]);
-
 type AgentPlugin = NonNullable<AgentConfig["extensions"]>[number];
 
 export function resolvePluginConfigSearchPaths(
@@ -22,67 +16,8 @@ export function resolvePluginConfigSearchPaths(
 	return resolvePluginConfigSearchPathsFromShared(workspacePath);
 }
 
-function hasPluginModuleExtension(path: string): boolean {
-	const dot = path.lastIndexOf(".");
-	if (dot === -1) {
-		return false;
-	}
-	return PLUGIN_MODULE_EXTENSIONS.has(path.slice(dot));
-}
-
 export function discoverPluginModulePaths(directoryPath: string): string[] {
-	const root = resolve(directoryPath);
-	if (!existsSync(root)) {
-		return [];
-	}
-	const discovered: string[] = [];
-	const stack = [root];
-	while (stack.length > 0) {
-		const current = stack.pop();
-		if (!current) {
-			continue;
-		}
-		for (const entry of readdirSync(current, { withFileTypes: true })) {
-			const candidate = join(current, entry.name);
-			if (entry.isDirectory()) {
-				stack.push(candidate);
-				continue;
-			}
-			if (entry.isFile() && hasPluginModuleExtension(candidate)) {
-				discovered.push(candidate);
-			}
-		}
-	}
-	return discovered.sort((a, b) => a.localeCompare(b));
-}
-
-function resolveConfiguredPluginPaths(
-	pluginPaths: ReadonlyArray<string>,
-	cwd: string,
-): string[] {
-	const resolvedPaths: string[] = [];
-	for (const pluginPath of pluginPaths) {
-		const trimmed = pluginPath.trim();
-		if (!trimmed) {
-			continue;
-		}
-		const absolutePath = resolve(cwd, trimmed);
-		if (!existsSync(absolutePath)) {
-			throw new Error(`Plugin path does not exist: ${absolutePath}`);
-		}
-		const stats = statSync(absolutePath);
-		if (stats.isDirectory()) {
-			resolvedPaths.push(...discoverPluginModulePaths(absolutePath));
-			continue;
-		}
-		if (!hasPluginModuleExtension(absolutePath)) {
-			throw new Error(
-				`Plugin file must use a supported extension (${[...PLUGIN_MODULE_EXTENSIONS].join(", ")}): ${absolutePath}`,
-			);
-		}
-		resolvedPaths.push(absolutePath);
-	}
-	return resolvedPaths;
+	return discoverPluginModulePathsFromShared(directoryPath);
 }
 
 export interface ResolveAgentPluginPathsOptions {
@@ -100,7 +35,7 @@ export function resolveAgentPluginPaths(
 	)
 		.flatMap((directoryPath) => discoverPluginModulePaths(directoryPath))
 		.filter((path) => existsSync(path));
-	const configuredPaths = resolveConfiguredPluginPaths(
+	const configuredPaths = resolveConfiguredPluginModulePaths(
 		options.pluginPaths ?? [],
 		cwd,
 	);
@@ -124,6 +59,7 @@ export interface ResolveAndLoadAgentPluginsOptions
 	importTimeoutMs?: number;
 	hookTimeoutMs?: number;
 	contributionTimeoutMs?: number;
+	onEvent?: (event: { name: string; payload?: unknown }) => void;
 }
 
 export async function resolveAndLoadAgentPlugins(
@@ -152,6 +88,7 @@ export async function resolveAndLoadAgentPlugins(
 		importTimeoutMs: options.importTimeoutMs,
 		hookTimeoutMs: options.hookTimeoutMs,
 		contributionTimeoutMs: options.contributionTimeoutMs,
+		onEvent: options.onEvent,
 	});
 	return {
 		extensions: sandboxed.extensions ?? [],