@xopcai/xopc 0.0.369 → 0.0.370

package/dist/src/agent/embedded/session-runner.js

@@ -1,15 +1,28 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { isCodemodeCoreRead } from "../tools/codemode-permissions.js";
+import { deferredToolContract, getXopcToolMetadata } from "./tool-metadata.js";
+import { abortEmbeddedRun } from "./runs.js";
 import { guardSessionManager } from "./session-tool-result-guard.js";
 import { transformUserMessageForPersistence } from "../inbound/attachment-pipeline.js";
 import { createEmbeddedModelRuntime, resolveEmbeddedProviderApiKeySync } from "./model-runtime.js";
 import { wrapStreamFnForXopcExtensions } from "./xopc-stream-bridge.js";
 import { xopcToolsToDefinitions } from "./xopc-tools-bridge.js";
-import { applySystemPromptOverrideToSession } from "./system-prompt-override.js";
+import { createXopcCodemodeExtension } from "./codemode-extension.js";
+import { TOOL_DISCOVERY_STATE, createXopcToolSearchExtension } from "./tool-search-extension.js";
+import { getNativePiAgentDir } from "../mcp/native-mcp.js";
+import { join } from "node:path";
 import { createHash } from "node:crypto";
-import { DefaultResourceLoader, SettingsManager, createAgentSession, getAgentDir } from "@earendil-works/pi-coding-agent";
+import { DefaultResourceLoader, SettingsManager, createAgentSession, createMcpExtension } from "@earendil-works/pi-coding-agent";
 //#region src/agent/embedded/session-runner.ts
 init_logger();
+const toolContract = (tool) => JSON.stringify([
+	tool.name,
+	tool.parameters,
+	tool.description,
+	isCodemodeCoreRead(tool),
+	getXopcToolMetadata(tool)
+]);
 const log = createLogger("EmbeddedSessionRunner");
 const DEFAULT_IDLE_TTL_MS = 5 * 6e4;
 function providerCredentialRevision(providerId) {
@@ -26,7 +39,9 @@ function buildEmbeddedRunnerFingerprint(input) {
 		[...input.toolContracts].sort().join("\0"),
 		input.systemPrompt,
 		input.thinkingLevel,
-		input.credentialRevision
+		input.credentialRevision,
+		JSON.stringify(input.codemode ?? null),
+		JSON.stringify(input.mcp ?? null)
 	].join("\0")).digest("base64url");
 }
 function isEmbeddedSessionRunnerEnabled() {
@@ -41,7 +56,10 @@ function getEmbeddedSessionRunnerIdleTtlMs() {
 	return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_IDLE_TTL_MS;
 }
 function createEmbeddedSettingsManager(cwd) {
-	const sm = SettingsManager.inMemory({ compaction: { enabled: false } });
+	const sm = SettingsManager.inMemory({
+		compaction: { enabled: false },
+		retry: { enabled: false }
+	});
 	sm.setCompactionEnabled(false);
 	return sm;
 }
@@ -49,6 +67,10 @@ function createEmbeddedSettingsManager(cwd) {
 * Owns the per-runtime pool of pi `AgentSession` runners.
 */
 var EmbeddedSessionRunnerPool = class {
+	shutdowns = /* @__PURE__ */ new Set();
+	async drainShutdowns() {
+		await Promise.allSettled([...this.shutdowns]);
+	}
 	pool = /* @__PURE__ */ new Map();
 	isEnabledFn;
 	getIdleTtlMsFn;
@@ -69,8 +91,7 @@ var EmbeddedSessionRunnerPool = class {
 		};
 	}
 	resetForTest() {
-		for (const entry of this.pool.values()) this.clearIdleTimer(entry);
-		this.pool.clear();
+		this.evictAll("test_reset");
 		this.stats = {
 			acquires: 0,
 			reuses: 0,
@@ -93,10 +114,12 @@ var EmbeddedSessionRunnerPool = class {
 			workspaceDir: params.workspaceDir,
 			modelRef: params.modelRef,
 			toolNames: params.tools.map((t) => t.name),
-			toolContracts: params.tools.map((tool) => JSON.stringify([tool.name, tool.parameters])),
+			toolContracts: params.tools.map(toolContract),
 			systemPrompt: params.systemPrompt,
 			thinkingLevel: params.thinkingLevel ?? "medium",
-			credentialRevision: providerCredentialRevision(params.model.provider)
+			credentialRevision: providerCredentialRevision(params.model.provider),
+			codemode: params.codemode,
+			mcp: params.mcp
 		});
 		const reuseEnabled = this.isEnabledFn();
 		const existing = this.pool.get(params.runtimeId);
@@ -108,7 +131,6 @@ var EmbeddedSessionRunnerPool = class {
 			entry.lastUsedAt = Date.now();
 			reused = true;
 			this.stats.reuses += 1;
-			applySystemPromptOverrideToSession(entry.session, params.systemPrompt);
 			entry.session.agent.streamFunction = entry.baseStreamFn;
 			log.debug({ runtimeId: params.runtimeId }, "Reusing pooled embedded session runner");
 		} else {
@@ -148,11 +170,33 @@ var EmbeddedSessionRunnerPool = class {
 	}
 	disposePooledRunner(runtimeId, entry, reason) {
 		this.clearIdleTimer(entry);
+		for (const release of entry.releaseInvalidations) release();
 		this.pool.delete(runtimeId);
 		this.stats.evictions += 1;
-		try {
-			entry.piSm.flushPendingToolResults?.();
-		} catch {}
+		const shutdown = Promise.resolve(entry.session.abort?.()).catch((err) => {
+			log.warn({
+				err,
+				runtimeId
+			}, "Embedded runner abort failed");
+		}).then(async () => {
+			try {
+				await entry.session.extensionRunner?.emit({
+					type: "session_shutdown",
+					reason: "quit"
+				});
+			} finally {
+				try {
+					entry.piSm.flushPendingToolResults?.();
+				} finally {
+					entry.session.dispose?.();
+				}
+			}
+		}).catch((err) => log.warn({
+			err,
+			runtimeId
+		}, "Embedded runner disposal failed"));
+		this.shutdowns.add(shutdown);
+		shutdown.finally(() => this.shutdowns.delete(shutdown));
 		log.debug({
 			runtimeId,
 			reason
@@ -163,17 +207,46 @@ var EmbeddedSessionRunnerPool = class {
 		const settingsManager = createEmbeddedSettingsManager(workspaceDir);
 		const piSm = guardSessionManager(params.transcriptRuntime.openSessionManager(workspaceDir), {
 			conversationId: params.transcriptRuntime.persistent ? runtimeId : void 0,
+			persistCustomTypes: ["codemode-store", TOOL_DISCOVERY_STATE],
 			contextWindowTokens: model.contextWindow ?? 128e3,
 			transformMessageForPersistence: params.transcriptRuntime.persistent ? (message) => transformUserMessageForPersistence(runtimeId, message) : void 0
 		});
 		const toolDefs = xopcToolsToDefinitions(tools);
-		const toolNames = tools.map((t) => t.name);
+		const toolNames = tools.filter((tool) => getXopcToolMetadata(tool)?.exposure !== "deferred").map((tool) => tool.name);
+		const discoveryState = piSm.getBranch().findLast((entry) => entry.type === "custom" && entry.customType === "xopc-tool-discovery");
+		const saved = discoveryState?.type === "custom" ? discoveryState.data : void 0;
+		const restored = new Map((saved?.loaded ?? []).map((tool) => [tool.name, tool.contract]));
+		toolNames.push(...tools.filter((tool) => getXopcToolMetadata(tool)?.exposure === "deferred" && restored.get(tool.name) === deferredToolContract(tool)).map((tool) => tool.name));
+		let boundSession;
+		const mcp = params.mcp;
+		const hasMcp = Boolean(mcp?.servers.length);
+		const usesMcpCodemode = mcp?.servers.some((server) => server.config.enabled !== false && [server.config.exposure ?? "codemode", ...Object.values(server.config.toolExposure ?? {})].includes("codemode"));
+		const codemode = params.codemode?.enabled ? params.codemode : usesMcpCodemode ? {
+			enabled: true,
+			timeoutMs: 6e4,
+			maxConcurrentCalls: 4,
+			maxCalls: 32,
+			maxOutputTokens: 4e3
+		} : void 0;
+		if (codemode) toolNames.push("codemode");
+		const discovery = hasMcp || tools.some((tool) => getXopcToolMetadata(tool)?.exposure === "deferred");
+		if (discovery) toolNames.push("tool_search");
 		const modelRuntime = await createEmbeddedModelRuntime(model.provider);
 		const resourceLoader = new DefaultResourceLoader({
 			cwd: workspaceDir,
-			agentDir: getAgentDir(),
+			agentDir: getNativePiAgentDir(),
 			settingsManager,
-			noContextFiles: true
+			systemPrompt,
+			noContextFiles: true,
+			noExtensions: true,
+			extensionFactories: [
+				...codemode ? [createXopcCodemodeExtension(codemode, tools, () => boundSession)] : [],
+				...discovery ? [createXopcToolSearchExtension(tools)] : [],
+				...mcp ? [createMcpExtension({
+					loadConfig: () => mcp,
+					logPath: join(getNativePiAgentDir(), "mcp.log")
+				})] : []
+			]
 		});
 		await resourceLoader.reload();
 		const { session } = await createAgentSession({
@@ -185,10 +258,11 @@ var EmbeddedSessionRunnerPool = class {
 			modelRuntime,
 			resourceLoader,
 			noTools: "builtin",
-			customTools: toolDefs,
-			tools: toolNames
+			customTools: toolDefs
 		});
-		applySystemPromptOverrideToSession(session, systemPrompt);
+		boundSession = session;
+		session.setActiveToolsByName(toolNames);
+		if (codemode || discovery || mcp) await session.bindExtensions({});
 		const baseStreamFn = wrapStreamFnForXopcExtensions(session.agent.streamFunction);
 		session.agent.streamFunction = baseStreamFn;
 		return {
@@ -197,18 +271,29 @@ var EmbeddedSessionRunnerPool = class {
 				transcriptId,
 				workspaceDir,
 				modelRef: params.modelRef,
-				toolNames,
-				toolContracts: tools.map((tool) => JSON.stringify([tool.name, tool.parameters])),
+				toolNames: tools.map((tool) => tool.name),
+				toolContracts: tools.map(toolContract),
 				systemPrompt,
 				thinkingLevel: thinkingLevel ?? "medium",
-				credentialRevision: providerCredentialRevision(model.provider)
+				credentialRevision: providerCredentialRevision(model.provider),
+				codemode: params.codemode,
+				mcp: params.mcp
 			}),
 			session,
 			piSm,
 			settingsManager,
 			baseStreamFn,
 			lastUsedAt: Date.now(),
-			idleTimer: null
+			idleTimer: null,
+			releaseInvalidations: tools.flatMap((tool) => {
+				const subscribe = getXopcToolMetadata(tool)?.subscribeInvalidation;
+				if (!subscribe) return [];
+				return [subscribe(() => {
+					if (this.pool.get(runtimeId)?.session !== session) return;
+					abortEmbeddedRun(runtimeId);
+					this.evict(runtimeId, "external_tool_catalog_changed");
+				})];
+			})
 		};
 	}
 };
@@ -228,5 +313,8 @@ function evictAllEmbeddedSessionRunners(reason = "dispose_all") {
 function acquireEmbeddedSessionRunner(params) {
 	return defaultEmbeddedSessionRunnerPool.acquire(params);
 }
+function drainEmbeddedSessionRunnerShutdowns() {
+	return defaultEmbeddedSessionRunnerPool.drainShutdowns();
+}
 //#endregion
-export { EmbeddedSessionRunnerPool, acquireEmbeddedSessionRunner, buildEmbeddedRunnerFingerprint, defaultEmbeddedSessionRunnerPool, evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner, getEmbeddedSessionRunnerIdleTtlMs, getEmbeddedSessionRunnerStats, isEmbeddedSessionRunnerEnabled, resetEmbeddedSessionRunnerForTest };
+export { EmbeddedSessionRunnerPool, acquireEmbeddedSessionRunner, buildEmbeddedRunnerFingerprint, defaultEmbeddedSessionRunnerPool, drainEmbeddedSessionRunnerShutdowns, evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner, getEmbeddedSessionRunnerIdleTtlMs, getEmbeddedSessionRunnerStats, isEmbeddedSessionRunnerEnabled, resetEmbeddedSessionRunnerForTest };

package/dist/src/agent/embedded/session-tool-result-guard.d.ts

@@ -28,6 +28,7 @@ export type BeforeMessageWriteHookResult = {
     message?: AgentMessage;
 } | undefined;
 export interface ToolResultGuardOptions {
+    persistCustomTypes?: readonly string[];
     /** Optional session key for transcript update broadcasts. */
     conversationId?: string;
     /** Optional transform applied to any message before persistence. */
@@ -93,6 +94,7 @@ export declare function guardSessionManager(sessionManager: SessionManager, opts
     missingToolResultText?: string;
     allowedToolNames?: Iterable<string>;
     transformMessageForPersistence?: (message: AgentMessage) => AgentMessage;
+    persistCustomTypes?: readonly string[];
 }): GuardedPiTranscriptManager;
 /**
  * Recover the original (un-guarded) appendMessage for a session manager.

package/dist/src/agent/embedded/session-tool-result-guard.js

@@ -32,6 +32,7 @@ function guardSessionManager(sessionManager, opts) {
 	if (typeof sessionManager.flushPendingToolResults === "function") return sessionManager;
 	const result = installSessionToolResultGuard(sessionManager, {
 		conversationId: opts?.conversationId,
+		persistCustomTypes: opts?.persistCustomTypes,
 		transformMessageForPersistence: opts?.transformMessageForPersistence,
 		allowSyntheticToolResults: opts?.allowSyntheticToolResults,
 		missingToolResultText: opts?.missingToolResultText,
@@ -287,6 +288,22 @@ var ToolResultGuard = class {
 	attach() {
 		const bound = this.guardedAppend.bind(this);
 		this.sessionManager.appendMessage = bound;
+		if (this.opts.conversationId && this.opts.persistCustomTypes?.length) {
+			const appendCustom = this.sessionManager.appendCustomEntry.bind(this.sessionManager);
+			this.sessionManager.appendCustomEntry = (customType, data) => {
+				const id = appendCustom(customType, data);
+				if (this.opts.persistCustomTypes?.includes(customType)) emitSessionTranscriptUpdate({
+					conversationId: this.opts.conversationId,
+					customEntry: {
+						customType,
+						data,
+						timestamp: (/* @__PURE__ */ new Date()).toISOString()
+					},
+					messageId: id
+				});
+				return id;
+			};
+		}
 	}
 	setActiveTurnId(turnId) {
 		this.activeTurnId = normalizeOptionalString(turnId) ?? null;

package/dist/src/agent/embedded/subscribe-session.js

@@ -2,15 +2,21 @@ import { extractTextContent } from "../context/workspace.js";
 //#region src/agent/embedded/subscribe-session.ts
 function subscribeEmbeddedSessionEvents(session, onEvent, onAgentEvent) {
 	return session.subscribe((event) => {
+		if (event.type === "agent_settled") {
+			onEvent({
+				type: "agent_end",
+				aborted: event.aborted
+			});
+			return;
+		}
 		const base = event;
+		const parent = "parentToolCallId" in event && event.parentToolCallId ? { parentToolCallId: event.parentToolCallId } : {};
 		onAgentEvent?.(base);
 		switch (base.type) {
 			case "agent_start":
 				onEvent({ type: "agent_start" });
 				break;
-			case "agent_end":
-				onEvent({ type: "agent_end" });
-				break;
+			case "agent_end": break;
 			case "message_start": {
 				const m = base.message;
 				onEvent({
@@ -40,6 +46,7 @@ function subscribeEmbeddedSessionEvents(session, onEvent, onAgentEvent) {
 				const t = base;
 				onEvent({
 					type: "tool_execution_start",
+					...parent,
 					toolName: t.toolName,
 					toolCallId: t.toolCallId,
 					args: t.args
@@ -50,10 +57,12 @@ function subscribeEmbeddedSessionEvents(session, onEvent, onAgentEvent) {
 				const t = base;
 				onEvent({
 					type: "tool_execution_end",
+					...parent,
 					toolName: t.toolName,
 					toolCallId: t.toolCallId,
 					isError: t.isError,
-					result: t.result
+					result: t.result,
+					durationMs: t.durationMs
 				});
 				break;
 			}
@@ -61,6 +70,7 @@ function subscribeEmbeddedSessionEvents(session, onEvent, onAgentEvent) {
 				const t = base;
 				onEvent({
 					type: "tool_execution_update",
+					...parent,
 					toolName: t.toolName,
 					toolCallId: t.toolCallId,
 					args: t.args,

package/dist/src/agent/embedded/tool-metadata.d.ts

@@ -0,0 +1,15 @@
+import type { AgentTool, BeforeToolCallContext } from '@earendil-works/pi-agent-core';
+import type { ToolDefinition } from '@earendil-works/pi-coding-agent';
+export type XopcToolMetadata = Pick<ToolDefinition, 'exposure' | 'namespace' | 'annotations' | 'outputSchema'> & {
+    external?: {
+        toolRef: string;
+        revision: string;
+        readOnly: boolean;
+    };
+    subscribeInvalidation?: (listener: () => void) => () => void;
+};
+export declare function setXopcToolMetadata(tool: AgentTool, metadata: XopcToolMetadata): AgentTool;
+export declare function getXopcToolMetadata(tool: AgentTool): XopcToolMetadata | undefined;
+export declare function deferredToolContract(tool: AgentTool): string;
+/** Deferred declarations retain the policy identity of the existing external gateway. */
+export declare function externalPolicyContext(context: BeforeToolCallContext, tools: readonly AgentTool[]): BeforeToolCallContext;

package/dist/src/agent/embedded/tool-metadata.js

@@ -0,0 +1,38 @@
+import { createHash } from "node:crypto";
+//#region src/agent/embedded/tool-metadata.ts
+const metadataKey = Symbol("xopc.sdkToolMetadata");
+function setXopcToolMetadata(tool, metadata) {
+	return Object.assign(tool, { [metadataKey]: metadata });
+}
+function getXopcToolMetadata(tool) {
+	return Reflect.get(tool, metadataKey);
+}
+function deferredToolContract(tool) {
+	return createHash("sha256").update(JSON.stringify([
+		tool.name,
+		tool.description,
+		tool.parameters,
+		getXopcToolMetadata(tool)
+	])).digest("base64url");
+}
+/** Deferred declarations retain the policy identity of the existing external gateway. */
+function externalPolicyContext(context, tools) {
+	const tool = tools.find((candidate) => candidate.name === context.toolCall.name);
+	const external = tool && getXopcToolMetadata(tool)?.external;
+	if (!external) return context;
+	const args = {
+		...external,
+		arguments: context.args
+	};
+	return {
+		...context,
+		args,
+		toolCall: {
+			...context.toolCall,
+			name: "xopc_tool_execute",
+			arguments: args
+		}
+	};
+}
+//#endregion
+export { deferredToolContract, externalPolicyContext, getXopcToolMetadata, setXopcToolMetadata };

package/dist/src/agent/embedded/tool-search-extension.d.ts

@@ -0,0 +1,5 @@
+import type { AgentTool } from '@earendil-works/pi-agent-core';
+import { type ExtensionFactory } from '@earendil-works/pi-coding-agent';
+export declare const TOOL_DISCOVERY_STATE = "xopc-tool-discovery";
+/** xopc deliberately excludes pi system declarations from SQLite; retain only discovery state. */
+export declare function createXopcToolSearchExtension(tools: readonly AgentTool[]): ExtensionFactory;

package/dist/src/agent/embedded/tool-search-extension.js

@@ -0,0 +1,31 @@
+import { deferredToolContract, getXopcToolMetadata } from "./tool-metadata.js";
+import { createToolSearchExtension } from "@earendil-works/pi-coding-agent";
+//#region src/agent/embedded/tool-search-extension.ts
+const TOOL_DISCOVERY_STATE = "xopc-tool-discovery";
+/** xopc deliberately excludes pi system declarations from SQLite; retain only discovery state. */
+function createXopcToolSearchExtension(tools) {
+	const deferred = tools.filter((tool) => getXopcToolMetadata(tool)?.exposure === "deferred");
+	return (pi) => createToolSearchExtension()({
+		...pi,
+		registerTool(definition) {
+			pi.registerTool({
+				...definition,
+				async execute(id, params, signal, update, context) {
+					const input = params;
+					if ((input.limit ?? 8) > 20 || (input.query?.length ?? 0) > 2e3) throw new Error("Tool search permits at most 20 matches and 2000 query characters");
+					return definition.execute(id, params, signal, update, context);
+				}
+			});
+		},
+		setActiveTools(names) {
+			pi.setActiveTools(names);
+			const active = new Set(pi.getActiveTools());
+			pi.appendEntry(TOOL_DISCOVERY_STATE, { loaded: deferred.filter((tool) => active.has(tool.name)).map((tool) => ({
+				name: tool.name,
+				contract: deferredToolContract(tool)
+			})) });
+		}
+	});
+}
+//#endregion
+export { TOOL_DISCOVERY_STATE, createXopcToolSearchExtension };

package/dist/src/agent/embedded/types.d.ts

@@ -10,6 +10,7 @@ export type EmbeddedStreamEvent = {
 } | {
     type: 'agent_end';
     runId?: string;
+    aborted?: boolean;
 } | {
     type: 'message_start';
     runId?: string;
@@ -27,10 +28,12 @@ export type EmbeddedStreamEvent = {
     type: 'tool_execution_start';
     runId?: string;
     toolCallId: string;
+    parentToolCallId?: string;
     toolName: string;
     args: unknown;
 } | {
     type: 'tool_execution_update';
+    parentToolCallId?: string;
     runId?: string;
     toolCallId: string;
     toolName: string;
@@ -38,11 +41,13 @@ export type EmbeddedStreamEvent = {
     partialResult: AgentToolResult<any>;
 } | {
     type: 'tool_execution_end';
+    parentToolCallId?: string;
     runId?: string;
     toolCallId: string;
     toolName: string;
     result: AgentToolResult<any>;
     isError: boolean;
+    durationMs?: number;
 } | {
     type: 'progress';
     runId?: string;
@@ -75,6 +80,8 @@ export type RunXopcEmbeddedTurnParams = {
     thinkingLevel?: ThinkingLevel;
     compactionPolicy?: import('../memory/compaction-policy.js').ResolvedCompactionPolicy;
     promptCachePolicy?: import('../../providers/prompt-cache-plan.js').PromptCachePolicy;
+    codemode?: import('./codemode-extension.js').CodemodePolicy;
+    mcp?: import('@earendil-works/pi-coding-agent').LoadedMcpConfig;
     workspaceDir: string;
     sessionStore?: SessionStore;
     transcriptRuntime?: EmbeddedTranscriptRuntime;

package/dist/src/agent/embedded/xopc-tools-bridge.js

@@ -1,3 +1,4 @@
+import { getXopcToolMetadata } from "./tool-metadata.js";
 import { withDataToolPermissions } from "../tools/dataBatch.js";
 //#region src/agent/embedded/xopc-tools-bridge.ts
 const APPLY_PATCH_BEGIN_MARKER = "*** Begin Patch";
@@ -95,7 +96,12 @@ function invalidApplyPatchEnvelopeResult(error) {
 function xopcToolsToDefinitions(tools) {
 	return tools.map((tool) => {
 		const promptHints = TOOL_PROMPT_HINTS[tool.name];
+		const metadata = getXopcToolMetadata(tool);
 		return {
+			exposure: metadata?.exposure,
+			namespace: metadata?.namespace,
+			annotations: metadata?.annotations,
+			outputSchema: metadata?.outputSchema,
 			name: tool.name,
 			label: tool.label ?? tool.name,
 			description: tool.description ?? tool.name,

package/dist/src/agent/external-tools/endpoint-provider.d.ts

@@ -12,6 +12,6 @@ export declare class EndpointToolProvider implements ExternalToolProvider {
     search(_query: string): Promise<ExternalToolSearchHit[]>;
     describe(toolRef: string): Promise<ExternalToolDescriptor | undefined>;
     execute(toolRef: string, args: Record<string, unknown>, _approvalId: string | undefined, context: ExternalToolExecutionContext): Promise<AgentToolResult<Record<string, unknown>>>;
-    private currentEndpoint;
+    private targetResolver;
     private resolve;
 }