@xopcai/xopc 0.0.314 → 0.0.316

package/dist/src/agent/agent-manager.js

@@ -7,17 +7,17 @@ import { getInteractionState } from "../storage/sqlite/interaction-state-reposit
 import { getSessionMetadata } from "../storage/sqlite/session-read-repository.js";
 import "../storage/sqlite/index.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
-import { applyConfigOverrides } from "../config/runtime-overrides.js";
 import { expandWorkspacePathString, init_workspace_path } from "../config/workspace-path.js";
 import { init_agent_scope, resolveAgentProfileDir } from "./agent-scope.js";
+import { init_paths, resolveBundledSkillsDir } from "../config/paths.js";
+import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { getConversationRouting } from "../storage/sqlite/conversation-repository.js";
 import { init_session_key } from "../routing/session-key.js";
-import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
-import { init_paths, resolveBundledSkillsDir } from "../config/paths.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../auth/sync-provider-auth.js";
-import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { getApiKeySync, getDefaultModelSync, init_providers, resolveModel } from "../providers/index.js";
 import { createExtensionAwareStreamFn } from "../providers/extension-stream-bridge.js";
+import { applyConfigOverrides } from "../config/runtime-overrides.js";
+import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { extractTextContent } from "./context/workspace.js";
 import { buildExecutionScopeContextForPrompt } from "./context/execution-scope.js";
 import { clearBootstrapSnapshot } from "./bootstrap/bootstrap-cache.js";
@@ -32,6 +32,7 @@ import { isValidSkillEnvVarName } from "./skills/required-env-vars.js";
 import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "./skills/workspace-skills-dir.js";
 import { loadSkillsLock } from "./skills/hub-lock.js";
 import { isUnderManagedSkillsDir } from "./skills/managed-store.js";
+import { replaceAgentSystemPrompt } from "./prompt/agent-system-prompt.js";
 import { evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner } from "./embedded/session-runner.js";
 import { createAgentTurnPolicy } from "./orchestration/agent-turn-policy.js";
 import { resolveUserContextSessionAccess } from "../user-context/access-policy.js";
@@ -424,13 +425,13 @@ var AgentManager = class {
 		const nextRegisteredToolNames = [...originalRegisteredToolNames, ...newTools.map((tool) => tool.name)];
 		inst.agent.state.tools = newTools.length > 0 ? sortToolsForPromptCache([...originalTools, ...newTools]) : originalTools;
 		inst.registeredToolNames = nextRegisteredToolNames;
-		inst.agent.state.systemPrompt = this.buildSystemPromptForInstance(inst, nextRegisteredToolNames, requested);
+		replaceAgentSystemPrompt(inst.agent, this.buildSystemPromptForInstance(inst, nextRegisteredToolNames, requested));
 		try {
 			return await run();
 		} finally {
 			inst.agent.state.tools = originalTools;
 			inst.registeredToolNames = originalRegisteredToolNames;
-			inst.agent.state.systemPrompt = originalSystemPrompt;
+			replaceAgentSystemPrompt(inst.agent, originalSystemPrompt);
 		}
 	}
 	buildSystemPromptForInstance(instance, registeredToolNames = instance.registeredToolNames, activeCapabilityNames = this.activeCapabilityNames(instance)) {
@@ -662,17 +663,17 @@ var AgentManager = class {
 				thinkingLevel: this.config.thinkingLevel ?? "medium",
 				activeProjectContext: instance.activeProjectContext
 			});
-			instance.agent.state.systemPrompt = newPrompt;
+			replaceAgentSystemPrompt(instance.agent, newPrompt);
 		}
 		log.info({ agents: this.agents.size }, "Skill toggles applied; system prompt updated");
 		this.scheduleSkillsUpdated("config");
 	}
 	refreshActionTrustPolicy() {
-		for (const instance of this.agents.values()) instance.agent.state.systemPrompt = this.buildSystemPromptForInstance(instance);
+		for (const instance of this.agents.values()) replaceAgentSystemPrompt(instance.agent, this.buildSystemPromptForInstance(instance));
 		log.info({ agents: this.agents.size }, "Action trust policy applied to active agents");
 	}
 	refreshUserProfileContext() {
-		for (const instance of this.agents.values()) instance.agent.state.systemPrompt = this.buildSystemPromptForInstance(instance);
+		for (const instance of this.agents.values()) replaceAgentSystemPrompt(instance.agent, this.buildSystemPromptForInstance(instance));
 		log.info({ agents: this.agents.size }, "User profile applied to active agents");
 	}
 	/**
@@ -737,7 +738,7 @@ var AgentManager = class {
 				thinkingLevel: this.config.thinkingLevel ?? "medium",
 				activeProjectContext: instance.activeProjectContext
 			});
-			instance.agent.state.systemPrompt = newPrompt;
+			replaceAgentSystemPrompt(instance.agent, newPrompt);
 		}
 		log.info({ agents: this.agents.size }, "Skills refreshed; system prompt updated");
 	}
@@ -861,7 +862,7 @@ var AgentManager = class {
 		const modelRef = instance.effectiveProfile.primaryModelRef?.trim() || this.defaultModel;
 		const thinkingLevel = this.config.thinkingLevel ?? "medium";
 		const activeProjectContext = this.buildExecutionScopeContext(conversationId);
-		instance.agent.state.systemPrompt = rt.systemPromptBuilder.build(contextFiles, {
+		replaceAgentSystemPrompt(instance.agent, rt.systemPromptBuilder.build(contextFiles, {
 			externalMemoryInstructions: this.buildExternalMemoryInstructions(conversationId, rt),
 			workspaceOverride: resolvedWorkspacePath,
 			profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
@@ -874,7 +875,7 @@ var AgentManager = class {
 			thinkingLevel,
 			extraSystemPrompt: trimmed,
 			activeProjectContext
-		});
+		}));
 		instance.activeProjectContext = activeProjectContext;
 	}
 	/**
@@ -1000,7 +1001,7 @@ var AgentManager = class {
 			toolExecution: "parallel",
 			streamFn: createExtensionAwareStreamFn(),
 			getApiKey: (provider) => this.resolveApiKeyWithCache(provider),
-			shouldStopAfterTurn: turnPolicy.shouldStopAfterTurn,
+			finishTurn: (context) => turnPolicy.shouldStopAfterTurn(context) ? { action: "end" } : void 0,
 			beforeToolCall: turnPolicy.beforeToolCall,
 			afterToolCall: turnPolicy.afterToolCall
 		});
@@ -1160,7 +1161,7 @@ var AgentManager = class {
 		const contextFiles = this.resolveContextFilesForSession(instance.conversationId, instance.effectiveProfile);
 		const modelRef = instance.effectiveProfile.primaryModelRef?.trim() || this.defaultModel;
 		const thinkingLevel = instance.agent.state.thinkingLevel ?? this.config.thinkingLevel ?? "medium";
-		instance.agent.state.systemPrompt = rt.systemPromptBuilder.build(contextFiles, {
+		replaceAgentSystemPrompt(instance.agent, rt.systemPromptBuilder.build(contextFiles, {
 			externalMemoryInstructions: this.buildExternalMemoryInstructions(instance.conversationId, rt),
 			workspaceOverride: resolvedWorkspacePath,
 			profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
@@ -1172,7 +1173,7 @@ var AgentManager = class {
 			agentId: instance.effectiveProfile.agentId,
 			thinkingLevel,
 			activeProjectContext: nextProjectContext
-		});
+		}));
 		instance.activeProjectContext = nextProjectContext;
 		instance.interactionStateVersion = interactionStateVersion;
 		instance.userContextAccessVersion = userContextAccessVersion;
@@ -1200,7 +1201,7 @@ var AgentManager = class {
 			const contextFiles = this.resolveContextFilesForSession(conversationId, instance.effectiveProfile);
 			const thinkingLevel = instance.agent.state.thinkingLevel ?? this.config.thinkingLevel ?? "medium";
 			const activeProjectContext = this.buildExecutionScopeContext(conversationId);
-			instance.agent.state.systemPrompt = rt.systemPromptBuilder.build(contextFiles, {
+			replaceAgentSystemPrompt(instance.agent, rt.systemPromptBuilder.build(contextFiles, {
 				externalMemoryInstructions: this.buildExternalMemoryInstructions(conversationId, rt),
 				workspaceOverride: resolvedWorkspacePath,
 				profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
@@ -1212,7 +1213,7 @@ var AgentManager = class {
 				agentId: instance.effectiveProfile.agentId,
 				thinkingLevel,
 				activeProjectContext
-			});
+			}));
 			instance.activeProjectContext = activeProjectContext;
 			log.info({
 				conversationId,

package/dist/src/agent/background-review/run-background-review.js

@@ -4,10 +4,10 @@ import { finishContextExtractionRun } from "../../storage/sqlite/context-extract
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { loadCompactionSourceSnapshot } from "../../storage/sqlite/transcript-repository.js";
 import "../../storage/sqlite/index.js";
-import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { getApiKeySync, init_providers, resolveModel } from "../../providers/index.js";
 import { createExtensionAwareStreamFn } from "../../providers/extension-stream-bridge.js";
+import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { extractTextContent } from "../context/workspace.js";
 import { listUserAssertions } from "../../user-model/repository.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";

package/dist/src/agent/embedded/model-runtime.js

@@ -1,6 +1,6 @@
 import { init_paths, resolveModelsJsonPath } from "../../config/paths.js";
-import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
+import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { XopcModelCredentialStore, init_model_credential_store } from "../../auth/model-credential-store.js";
 import { init_register_bundled_oauth_flows, registerBundledOAuthFlows } from "../../providers/register-bundled-oauth-flows.js";
 import { init_register_runtime_providers, registerRuntimeProviders } from "../../providers/register-runtime-providers.js";

package/dist/src/agent/embedded/run-for-session.js

@@ -2,9 +2,9 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { parseTurnOutcome } from "../../../packages/gateway-contract/src/turn-outcome.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
-import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { init_providers, resolveModel } from "../../providers/index.js";
 import { appendDynamicPromptSection } from "../prompt/cache-boundary.js";
+import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { runWithEmbeddedExecutionSession } from "./execution-context.js";
 import { resolveAgentTurnTimeoutMs } from "../orchestration/run-agent-turn-with-timeout.js";
 import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";

package/dist/src/agent/embedded/run-turn.js

@@ -24,6 +24,7 @@ import { markTurnToolResult } from "../memory/turn-provenance.js";
 import { RepositoryInstructions } from "../coding/repository-instructions.js";
 import { RunVerification } from "../coding/run-verification.js";
 import { withDelegationScope } from "../orchestration/delegation-scope.js";
+import { getCurrentSystemPrompt, getCurrentTools } from "@earendil-works/pi-ai";
 //#region src/agent/embedded/run-turn.ts
 init_connection_wait_repository();
 init_logger();
@@ -107,7 +108,7 @@ async function maybeRecoverContextOverflow(params) {
 		policy: params.policy,
 		budget: {
 			contextWindow: params.model.contextWindow ?? 128e3,
-			systemPrompt: params.agent.state.systemPrompt,
+			systemPrompt: params.systemPrompt,
 			tools: params.agent.state.tools,
 			reserveTokens: params.policy.reserveTokens,
 			triggerThreshold: params.policy.triggerThreshold,
@@ -202,11 +203,13 @@ async function runXopcEmbeddedTurn(params) {
 					timestamp: Date.now()
 				}]
 			};
+			let effectiveSystemPrompt = getCurrentSystemPrompt(effectiveContext.messages);
+			let effectiveTools = getCurrentTools(effectiveContext.messages);
 			const projection = projectContextForModel({
 				messages: effectiveContext.messages,
 				contextWindow: streamModel.contextWindow ?? 128e3,
-				systemPrompt: effectiveContext.systemPrompt,
-				tools: effectiveContext.tools,
+				systemPrompt: effectiveSystemPrompt,
+				tools: effectiveTools,
 				reserveTokens: compactionPolicy.reserveTokens,
 				minToolResultKeepChars: compactionPolicy.minToolResultKeepChars,
 				canCompact: false,
@@ -217,6 +220,8 @@ async function runXopcEmbeddedTurn(params) {
 					...effectiveContext,
 					messages: projection.messages
 				};
+				effectiveSystemPrompt = getCurrentSystemPrompt(effectiveContext.messages);
+				effectiveTools = getCurrentTools(effectiveContext.messages);
 				log.warn({
 					conversationId,
 					runId,
@@ -229,8 +234,8 @@ async function runXopcEmbeddedTurn(params) {
 			const assessed = assessContext({
 				messages: effectiveContext.messages,
 				contextWindow: streamModel.contextWindow ?? 128e3,
-				systemPrompt: effectiveContext.systemPrompt,
-				tools: effectiveContext.tools,
+				systemPrompt: effectiveSystemPrompt,
+				tools: effectiveTools,
 				reserveTokens: compactionPolicy.reserveTokens,
 				minToolResultKeepChars: compactionPolicy.minToolResultKeepChars
 			}, compactionPolicy.maxActiveTranscriptBytes);
@@ -239,10 +244,12 @@ async function runXopcEmbeddedTurn(params) {
 				...effectiveContext,
 				messages: assessed.messages
 			};
+			effectiveSystemPrompt = getCurrentSystemPrompt(effectiveContext.messages);
+			effectiveTools = getCurrentTools(effectiveContext.messages);
 			const promptCacheSnapshot = buildPromptCacheSnapshot({
 				model: streamModel,
-				systemPrompt: effectiveContext.systemPrompt,
-				tools: effectiveContext.tools,
+				systemPrompt: effectiveSystemPrompt,
+				tools: effectiveTools,
 				reasoning: options?.reasoning
 			});
 			const promptCacheChanges = observePromptCacheSnapshot(conversationId, promptCacheSnapshot);
@@ -251,18 +258,18 @@ async function runXopcEmbeddedTurn(params) {
 				runId,
 				reusedRunner: reused,
 				modelRef: `${streamModel.provider}/${streamModel.id}`,
-				systemPromptLength: effectiveContext.systemPrompt?.length ?? 0,
-				messageCount: effectiveContext.messages.length,
+				systemPromptLength: effectiveSystemPrompt.length,
+				messageCount: effectiveContext.messages.filter((message) => message.role !== "system").length,
 				transcriptRepaired: hygienicMessages !== sourceMessages,
-				toolCount: effectiveContext.tools?.length ?? 0,
+				toolCount: effectiveTools.length,
 				lastUserMessagePreview: getLastUserMessagePreview(effectiveContext.messages),
 				loopWarningInjected: !!loopGuard.injection,
 				promptCache: promptCacheSnapshot,
 				promptCacheChanges,
 				...process.env.XOPC_LOG_LLM_PAYLOAD === "true" ? { effectiveContext: {
-					systemPrompt: effectiveContext.systemPrompt,
-					messages: effectiveContext.messages,
-					tools: effectiveContext.tools
+					systemPrompt: effectiveSystemPrompt,
+					messages: effectiveContext.messages.filter((message) => message.role !== "system"),
+					tools: effectiveTools
 				} } : {}
 			}, "Sending messages to AI");
 			return streamFnWithXopcExtensions(streamModel, effectiveContext, { ...options });
@@ -339,9 +346,13 @@ async function runXopcEmbeddedTurn(params) {
 			});
 			return checked;
 		};
-		session.agent.shouldStopAfterTurn = (context) => {
+		const baseFinishTurn = session.agent.finishTurn;
+		session.agent.finishTurn = async (context, signal) => {
+			const baseDecision = await baseFinishTurn?.(context, signal);
+			if (baseDecision && baseDecision.action === "end") return { action: "end" };
 			policyStopped ||= params.turnPolicy?.shouldStopAfterTurn(context) ?? false;
-			return policyStopped || connectionStopped || clarificationStopped;
+			if (policyStopped || connectionStopped || clarificationStopped) return { action: "end" };
+			if (baseDecision && baseDecision.action === "continue") return { action: "continue" };
 		};
 		unsubscribe = subscribeEmbeddedSessionEvents(session, (event) => {
 			if (event.type === "message_end" && event.message.role === "assistant") recordPromptCacheTouch(conversationId, resolvedModel, event.message.usage);
@@ -392,6 +403,7 @@ async function runXopcEmbeddedTurn(params) {
 					conversationId,
 					transcriptRuntime,
 					policy: compactionPolicy,
+					systemPrompt: [systemPrompt, rootInstructions].filter(Boolean).join("\n\n"),
 					abortSignal: runAbortSignal,
 					onEvent
 				});
@@ -443,6 +455,7 @@ async function runXopcEmbeddedTurn(params) {
 				lastAssistantText: lastAssistantPlainText(session)
 			};
 		} finally {
+			session.agent.finishTurn = baseFinishTurn;
 			runAbortSignal.removeEventListener("abort", abortListener);
 		}
 	} catch (err) {

package/dist/src/agent/embedded/system-prompt-override.js

@@ -1,10 +1,21 @@
+import { replaceAgentSystemPrompt } from "../prompt/agent-system-prompt.js";
 //#region src/agent/embedded/system-prompt-override.ts
 function applySystemPromptOverrideToSession(session, override) {
 	const prompt = override.trim();
-	session.agent.state.systemPrompt = prompt;
 	const mutableSession = session;
-	mutableSession._baseSystemPrompt = prompt;
-	mutableSession._rebuildSystemPrompt = () => prompt;
+	const applyOverride = (options) => {
+		if (options) options.forceSystemPrompt = prompt;
+	};
+	applyOverride(mutableSession._baseSystemPromptOptions);
+	applyOverride(mutableSession._runSystemPromptOptions);
+	const originalRebuild = mutableSession._xopcOriginalRebuildSystemPrompt ?? mutableSession._rebuildSystemPrompt?.bind(session);
+	if (originalRebuild && !mutableSession._xopcOriginalRebuildSystemPrompt) mutableSession._xopcOriginalRebuildSystemPrompt = originalRebuild;
+	if (originalRebuild) mutableSession._rebuildSystemPrompt = (toolNames) => {
+		const result = originalRebuild(toolNames);
+		applyOverride(mutableSession._baseSystemPromptOptions);
+		return result;
+	};
+	replaceAgentSystemPrompt(session.agent, prompt);
 }
 //#endregion
 export { applySystemPromptOverrideToSession };

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

@@ -2,6 +2,7 @@ import "../../providers/constants.js";
 import { init_providers } from "../../providers/index.js";
 import { createExtensionAwareStreamFn } from "../../providers/extension-stream-bridge.js";
 import { preparePromptCacheContext, withPromptCachePayloadTransform } from "../../providers/prompt-cache-payload.js";
+import { getCurrentSystemPrompt, getCurrentTools, normalizeContext } from "@earendil-works/pi-ai";
 //#region src/agent/embedded/xopc-stream-bridge.ts
 init_providers();
 /**
@@ -16,8 +17,18 @@ init_providers();
 function wrapStreamFnForXopcExtensions(originalStreamFn, promptCachePolicy) {
 	const extensionStreamFn = createExtensionAwareStreamFn();
 	return ((model, context, options) => {
-		if (model.baseUrl === "extension://provider-plugin") return extensionStreamFn(model, preparePromptCacheContext(model, context), options);
-		return originalStreamFn(model, preparePromptCacheContext(model, context), withPromptCachePayloadTransform(model, context, options, promptCachePolicy));
+		const promptContext = {
+			systemPrompt: getCurrentSystemPrompt(context.messages),
+			tools: getCurrentTools(context.messages)
+		};
+		const preparedContext = preparePromptCacheContext(model, promptContext);
+		const providerContext = preparedContext.systemPrompt === promptContext.systemPrompt ? context : normalizeContext({
+			systemPrompt: preparedContext.systemPrompt,
+			tools: promptContext.tools,
+			messages: context.messages.filter((message) => message.role !== "system")
+		});
+		if (model.baseUrl === "extension://provider-plugin") return extensionStreamFn(model, providerContext, options);
+		return originalStreamFn(model, providerContext, withPromptCachePayloadTransform(model, promptContext, options, promptCachePolicy));
 	});
 }
 //#endregion

package/dist/src/agent/image/tool-model-config.js

@@ -1,7 +1,7 @@
 import { getAgentDefaultImageModelConfig, getAgentDefaultModelRef, init_schema, parseModelRef } from "../../config/schema.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
-import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
 import { getDefaultModelSync, getModelsByProvider, init_providers, isProviderConfiguredSync, resolveModel } from "../../providers/index.js";
+import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
 import { resolveAgentModelFallbackValues, resolveAgentModelPrimaryValue } from "../../config/model-input.js";
 import { buildCapabilityPlansForConfig } from "../../capabilities/readiness/from-config.js";
 import "../../capabilities/readiness/index.js";

package/dist/src/agent/mcp/bundle-mcp-gateway.d.ts

@@ -6,6 +6,9 @@ export type McpGatewayToolEntry = {
     readOnly: boolean;
 };
 export type McpGatewayResourceEntry = {
+    id: string;
+    version: string;
+    serverId: string;
     uri: string;
     name: string;
     title?: string;
@@ -27,6 +30,42 @@ export type McpGatewayCapabilitySummary = {
     resources: McpGatewayResourceEntry[];
     prompts: McpGatewayPromptEntry[];
 };
+export declare function listBundleMcpResourcesForGateway(params: {
+    workspaceDir: string;
+    cfg?: Config;
+}): Promise<McpGatewayResourceEntry[]>;
+export declare function readBundleMcpResourceForGateway(params: {
+    workspaceDir: string;
+    cfg?: Config;
+    sourceId: string;
+}): Promise<{
+    resource: McpGatewayResourceEntry;
+    contents: {
+        [x: string]: unknown;
+        contents: ({
+            uri: string;
+            text: string;
+            mimeType?: string;
+            _meta?: {
+                [x: string]: unknown;
+            };
+        } | {
+            uri: string;
+            blob: string;
+            mimeType?: string;
+            _meta?: {
+                [x: string]: unknown;
+            };
+        })[];
+        _meta?: {
+            [x: string]: unknown;
+            progressToken?: string | number;
+            "io.modelcontextprotocol/related-task"?: {
+                taskId: string;
+            };
+        };
+    };
+}>;
 export declare function listBundleMcpServerToolsForGateway(params: {
     workspaceDir: string;
     cfg?: Config;

package/dist/src/agent/mcp/bundle-mcp-gateway.js

@@ -1,5 +1,6 @@
 import { mcpToolPolicyId } from "./bundle-mcp-policy.js";
 import { createSessionMcpRuntime } from "./bundle-mcp-runtime.js";
+import { decodeMcpResourceId, encodeMcpResourceId } from "./mcp-resource-id.js";
 import crypto from "node:crypto";
 //#region src/agent/mcp/bundle-mcp-gateway.ts
 function mapTools(tools, serverId) {
@@ -12,6 +13,12 @@ function mapTools(tools, serverId) {
 }
 function mapResources(resources, serverId) {
 	return resources.filter((resource) => resource.serverName === serverId).map((resource) => ({
+		id: encodeMcpResourceId({
+			serverId: resource.serverName,
+			uri: resource.uri
+		}),
+		version: crypto.createHash("sha256").update(JSON.stringify(resource)).digest("hex"),
+		serverId: resource.serverName,
 		uri: resource.uri,
 		name: resource.name,
 		title: resource.title,
@@ -19,6 +26,30 @@ function mapResources(resources, serverId) {
 		mimeType: resource.mimeType
 	}));
 }
+async function listBundleMcpResourcesForGateway(params) {
+	const catalog = await loadCatalog(params);
+	return Object.keys(catalog.servers).sort().flatMap((serverId) => mapResources(catalog.resources, serverId));
+}
+async function readBundleMcpResourceForGateway(params) {
+	const identity = decodeMcpResourceId(params.sourceId);
+	if (!identity) throw new Error("Invalid MCP resource id");
+	const runtime = createSessionMcpRuntime({
+		sessionId: `mcp-resource:${crypto.randomUUID()}`,
+		workspaceDir: params.workspaceDir,
+		cfg: params.cfg
+	});
+	try {
+		const resource = (await runtime.getCatalog()).resources.find((item) => item.serverName === identity.serverId && item.uri === identity.uri);
+		if (!resource) throw new Error("MCP resource is unavailable");
+		const contents = await runtime.readResource(identity.serverId, identity.uri);
+		return {
+			resource: mapResources([resource], identity.serverId)[0],
+			contents
+		};
+	} finally {
+		await runtime.dispose();
+	}
+}
 function mapPrompts(prompts, serverId) {
 	return prompts.filter((prompt) => prompt.serverName === serverId).map((prompt) => ({
 		name: prompt.name,
@@ -58,4 +89,4 @@ async function listBundleMcpServerCapabilitiesForGateway(params) {
 	};
 }
 //#endregion
-export { listBundleMcpServerCapabilitiesForGateway, listBundleMcpServerToolsForGateway };
+export { listBundleMcpResourcesForGateway, listBundleMcpServerCapabilitiesForGateway, listBundleMcpServerToolsForGateway, readBundleMcpResourceForGateway };

package/dist/src/agent/mcp/bundle-mcp-runtime.js

@@ -329,6 +329,17 @@ function createSessionMcpRuntime(params) {
 				maxTotalTimeout: session.requestTimeoutMs
 			});
 		},
+		async readResource(serverName, uri, signal) {
+			failIfDisposed();
+			if (!(await getCatalog()).resources.some((resource) => resource.serverName === serverName && resource.uri === uri)) throw new Error(`bundle-mcp resource "${uri}" is not available from server "${serverName}"`);
+			const session = sessions.get(serverName);
+			if (!session) throw new Error(`bundle-mcp server "${serverName}" is not connected`);
+			return session.client.readResource({ uri }, {
+				signal,
+				timeout: session.requestTimeoutMs,
+				maxTotalTimeout: session.requestTimeoutMs
+			});
+		},
 		async dispose() {
 			if (disposed) return;
 			disposed = true;

package/dist/src/agent/mcp/bundle-mcp-types.d.ts

@@ -1,4 +1,4 @@
-import type { CallToolResult, ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult, ReadResourceResult, ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
 import type { JsonSchemaType } from "@modelcontextprotocol/sdk/validation/types.js";
 import type { Config } from "../../config/schema.js";
 export type McpServerCatalog = {
@@ -53,6 +53,7 @@ export type SessionMcpRuntime = {
     getCatalog: () => Promise<McpToolCatalog>;
     markUsed: () => void;
     callTool: (serverName: string, toolName: string, input: unknown, signal?: AbortSignal) => Promise<CallToolResult>;
+    readResource: (serverName: string, uri: string, signal?: AbortSignal) => Promise<ReadResourceResult>;
     dispose: () => Promise<void>;
 };
 export type SessionMcpRuntimeManager = {

package/dist/src/agent/mcp/mcp-resource-id.d.ts

@@ -0,0 +1,6 @@
+export interface McpResourceIdentity {
+    serverId: string;
+    uri: string;
+}
+export declare function encodeMcpResourceId(identity: McpResourceIdentity): string;
+export declare function decodeMcpResourceId(sourceId: string): McpResourceIdentity | null;

package/dist/src/agent/mcp/mcp-resource-id.js

@@ -0,0 +1,19 @@
+//#region src/agent/mcp/mcp-resource-id.ts
+function encodeMcpResourceId(identity) {
+	return Buffer.from(JSON.stringify(identity), "utf8").toString("base64url");
+}
+function decodeMcpResourceId(sourceId) {
+	try {
+		const value = JSON.parse(Buffer.from(sourceId, "base64url").toString("utf8"));
+		if (typeof value.serverId !== "string" || !value.serverId.trim()) return null;
+		if (typeof value.uri !== "string" || !value.uri.trim()) return null;
+		return {
+			serverId: value.serverId,
+			uri: value.uri
+		};
+	} catch {
+		return null;
+	}
+}
+//#endregion
+export { decodeMcpResourceId, encodeMcpResourceId };

package/dist/src/agent/mcp/oauth/mcp-oauth-store.js

@@ -1,5 +1,5 @@
-import { init_paths, resolveMcpOAuthPath } from "../../../config/paths.js";
 import { init_write_file_atomic, writeTextAtomic } from "../../../infra/write-file-atomic.js";
+import { init_paths, resolveMcpOAuthPath } from "../../../config/paths.js";
 import { createHash } from "node:crypto";
 import { readFile, rm } from "node:fs/promises";
 //#region src/agent/mcp/oauth/mcp-oauth-store.ts

package/dist/src/agent/memory/context-budget.js

@@ -45,7 +45,7 @@ function evaluateContextBudget(input) {
 	const hardLimitTokens = Math.max(1024, contextWindow - reserveTokens);
 	const triggerThreshold = Math.min(.98, Math.max(.1, input.triggerThreshold ?? .8));
 	const triggerTokens = Math.min(hardLimitTokens, Math.floor(contextWindow * triggerThreshold));
-	const transcriptTokens = estimateMessagesTokens(input.messages);
+	const transcriptTokens = estimateMessagesTokens(input.systemPrompt === void 0 ? input.messages : input.messages.filter((message) => message.role !== "system"));
 	const systemPromptTokens = estimateTextTokens(input.systemPrompt ?? "");
 	const currentUserTokens = input.currentUserMessage ? estimateMessageTokens(input.currentUserMessage) : 0;
 	const toolSchemaTokens = estimateToolSchemaTokens(input.tools ?? []);

package/dist/src/agent/orchestration/agent-turn-policy.d.ts

@@ -1,9 +1,9 @@
-import type { AfterToolCallContext, BeforeToolCallContext, BeforeToolCallResult, ShouldStopAfterTurnContext } from '@earendil-works/pi-agent-core';
+import type { AfterToolCallContext, AgentTurnContext, BeforeToolCallContext, BeforeToolCallResult } from '@earendil-works/pi-agent-core';
 export interface AgentTurnPolicy {
     reset(): void;
     beforeToolCall(context: BeforeToolCallContext, signal?: AbortSignal): Promise<BeforeToolCallResult | undefined>;
     afterToolCall(context: AfterToolCallContext): Promise<undefined>;
-    shouldStopAfterTurn(context: ShouldStopAfterTurnContext): boolean;
+    shouldStopAfterTurn(context: AgentTurnContext): boolean;
 }
 export interface AgentTurnPolicyOptions {
     maxTurns?: number;

package/dist/src/agent/prompt/agent-system-prompt.d.ts

@@ -0,0 +1,3 @@
+import type { Agent } from '@earendil-works/pi-agent-core';
+/** Replace the replayed prompt while preserving the transcript's current tool declarations. */
+export declare function replaceAgentSystemPrompt(agent: Agent, systemPrompt: string): void;

package/dist/src/agent/prompt/agent-system-prompt.js

@@ -0,0 +1,16 @@
+import { getCurrentSystemMessage } from "@earendil-works/pi-ai";
+//#region src/agent/prompt/agent-system-prompt.ts
+/** Replace the replayed prompt while preserving the transcript's current tool declarations. */
+function replaceAgentSystemPrompt(agent, systemPrompt) {
+	const messages = agent.state.messages;
+	const current = getCurrentSystemMessage(messages);
+	const systemMessage = {
+		role: "system",
+		content: systemPrompt,
+		...current?.toolsAdded ? { toolsAdded: current.toolsAdded } : {},
+		timestamp: current?.timestamp ?? Date.now()
+	};
+	agent.state.messages = [systemMessage, ...messages.filter((message) => message.role !== "system")];
+}
+//#endregion
+export { replaceAgentSystemPrompt };

package/dist/src/agent/service.js

@@ -2,11 +2,11 @@ import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { parseNoteAttachmentTarget } from "../notes/attachment-ref.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
-import { applyConfigOverrides } from "../config/runtime-overrides.js";
 import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "./agent-scope.js";
 import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
-import { extractProfileAgentId } from "../config/agent-profile.js";
 import { init_providers, resolveModel } from "../providers/index.js";
+import { applyConfigOverrides } from "../config/runtime-overrides.js";
+import { extractProfileAgentId } from "../config/agent-profile.js";
 import { extractTextContent } from "./context/workspace.js";
 import { effectiveWorkspacePathForSession } from "../session/session-workspace.js";
 import { getProjectForSession } from "../projects/workspace.js";

package/dist/src/agent/session/session-inspector.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_workspace_defaults, resolveDefaultAgentWorkspaceDir } from "../../config/workspace-defaults.js";
-import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { init_providers, resolveModel } from "../../providers/index.js";
+import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { getExecutionEnvironmentForSession } from "../../execution-environments/subject.js";
 import { effectiveWorkspacePathForSession, projectWorkspacePath } from "../../session/session-workspace.js";
 import { getProjectForSession } from "../../projects/workspace.js";

package/dist/src/agent/skills/hub-lock.js

@@ -1,5 +1,5 @@
-import { init_paths, resolveSkillsLockPath } from "../../config/paths.js";
 import { init_write_file_atomic, writeTextAtomicSync } from "../../infra/write-file-atomic.js";
+import { init_paths, resolveSkillsLockPath } from "../../config/paths.js";
 import { existsSync, readFileSync } from "node:fs";
 //#region src/agent/skills/hub-lock.ts
 /**

package/dist/src/agent/source-context/browser-tab.d.ts

@@ -0,0 +1,3 @@
+import type { BrowserObservation } from '@xopcai/browser-control-contract';
+import type { AgentSourceContext } from './types.js';
+export declare function buildBrowserTabAgentContext(sourceId: string, observation: BrowserObservation, expectedVersion?: string): AgentSourceContext | null;