@xopcai/xopc 0.0.313 → 0.0.315

package/dist/src/agent/external-tools/composio-provider.js

@@ -5,16 +5,19 @@ import { getConnectorAccount } from "../../storage/sqlite/connector-account-repo
 import { consumeConnectorApproval, createConnectorApproval, getConnectorApproval, getConnectorConnection, getConnectorInstallation, listConnectorActionMetadata, listConnectorConnections, listConnectorInstallations, upsertConnectorActionMetadata, upsertConnectorInstallation } from "../../storage/sqlite/connector-repository.js";
 import { bindObjectiveAccount, connectionBinding, connectionBindings, connectorObjectiveScope, init_connection_wait_repository, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
 import "../../storage/sqlite/index.js";
-import { connectorIdentitySummary } from "../../connectors/connector-identity.js";
+import { CapabilityError } from "../../capabilities/runtime/errors.js";
+import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
+import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
 import { canAccessConnectorAccount, currentAccountConnections } from "../../connectors/account-access.js";
+import { connectorIdentitySummary } from "../../connectors/connector-identity.js";
+import { evaluateConnectorExecutionPolicy } from "../../connectors/policy.js";
 import { ComposioSessionsAdapter } from "../../connectors/composio-sessions.js";
 import { getComposioToolkitScope, getConfiguredComposioAuthConfigs, isComposioActionAllowedByCatalog, scopeForComposioAction } from "../../connectors/composio.js";
 import { getConnectorDefinition } from "../../connectors/catalog.js";
 import { listConnectorInstances } from "../../connectors/instances.js";
-import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
-import { isToolInputSchema } from "../../connectors/connection-capabilities.js";
 import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
+import { isToolInputSchema } from "../../connectors/connection-capabilities.js";
 import { ExternalToolSearchError } from "./search-error.js";
 //#region src/agent/external-tools/composio-provider.ts
 init_session_input_repository();
@@ -41,6 +44,10 @@ function textResult(value) {
 		details: {}
 	};
 }
+function actionDigest(action) {
+	const { cachedAt: _cachedAt, ...contract } = action;
+	return connectorArgumentsHash(contract);
+}
 function installedConfigToolkits(config) {
 	return Object.values(config?.connectors?.instances ?? {}).flatMap((record) => {
 		if (!record || typeof record !== "object" || Array.isArray(record)) return [];
@@ -227,7 +234,7 @@ var ComposioToolProvider = class {
 			batchRead: accounts.length > 0 && action.scope === "read" && action.curated && BATCH_READ_ACTIONS.has(action.actionId)
 		};
 	}
-	async execute(toolRef, args, approvalId, _context) {
+	async execute(toolRef, args, approvalId, context) {
 		const available = this.availableInstallations();
 		const resolved = this.resolve(toolRef, available.installations);
 		if (!resolved) return textResult("This connected app tool is not allowed for this user and agent.");
@@ -283,21 +290,47 @@ var ComposioToolProvider = class {
 		if (available.context && connection.accountId) bindObjectiveAccount(available.context.conversationId, resolved.installation.connectorId, connection.accountId);
 		const actionArgs = { ...executionArgs };
 		delete actionArgs[CONNECTION_ARGUMENT];
-		const argsHash = connectorArgumentsHash({
+		const descriptorDigest = actionDigest(action);
+		const argumentIdentity = () => connectorArgumentsHash({
 			args: actionArgs,
 			accountId: connection.accountId,
+			connectionId: connection.id,
+			descriptorDigest,
+			principalId: available.principalId,
+			agentId: available.agentId,
+			conversationId: available.context?.conversationId,
 			objective: available.context ? connectorObjectiveScope(available.context.conversationId) : void 0
 		});
+		const argsHash = argumentIdentity();
 		let confirmed = false;
 		if (approvalId) {
 			const pending = getConnectorApproval(approvalId);
-			if (!pending || pending.principalId !== available.principalId || pending.connectorId !== resolved.installation.connectorId || pending.actionId !== action.actionId || pending.conversationId !== available.context?.conversationId || pending.agentId !== available.agentId || !pending.connectionId || getConnectorConnection(pending.connectionId)?.accountId !== connection.accountId) return textResult("The connector approval is invalid for this session or action.");
-			confirmed = Boolean(consumeConnectorApproval(approvalId, argsHash));
-			if (!confirmed) return textResult("The connector approval is not approved, has expired, or was already used.");
+			if (!pending || pending.principalId !== available.principalId || pending.connectorId !== resolved.installation.connectorId || pending.actionId !== action.actionId || pending.conversationId !== available.context?.conversationId || pending.agentId !== available.agentId || pending.connectionId !== connection.id || pending.argumentsHash !== argsHash || !["approved", "consumed"].includes(pending.status) || pending.status === "approved" && Date.parse(pending.expiresAt) <= Date.now()) return textResult("The connector approval is invalid for this session or action.");
+			confirmed = true;
 		}
+		const authorizeCurrent = () => {
+			context.signal?.throwIfAborted();
+			const current = this.availableInstallations();
+			const installation = this.resolve(toolRef, current.installations)?.installation;
+			const active = getConnectorConnection(connection.id);
+			const contract = listConnectorActionMetadata(resolved.installation.connectorId).find((item) => item.actionId === action.actionId);
+			if (!installation || current.principalId !== available.principalId || current.agentId !== available.agentId || current.context?.conversationId !== available.context?.conversationId || !active || active.status !== "active" || active.accountId !== connection.accountId || active.providerConnectionId !== connection.providerConnectionId || getConnectorAccount(active.accountId)?.currentConnectionId !== active.id || !canAccessConnectorAccount(active, installation, current.agentId)) throw new CapabilityError("FORBIDDEN", "Connected account authorization changed");
+			if (!contract || actionDigest(contract) !== descriptorDigest || argumentIdentity() !== argsHash) throw new CapabilityError("REVISION_CONFLICT", "Action contract or objective changed");
+			const evaluation = evaluateConnectorExecutionPolicy({
+				installation,
+				action: contract,
+				agentId: current.agentId,
+				accountId: active.accountId,
+				confirmed
+			});
+			if (evaluation.decision === "denied") throw new CapabilityError("FORBIDDEN", evaluation.reason);
+			return evaluation;
+		};
+		const evaluation = authorizeCurrent();
 		let result;
 		try {
-			result = await this.adapter.executeWithPolicy({
+			const execute = async () => this.adapter.executeWithPolicy({
+				signal: context.signal,
 				context: {
 					principalId: available.principalId,
 					toolkits: [toolkit],
@@ -309,7 +342,36 @@ var ComposioToolProvider = class {
 				args: actionArgs,
 				agentId: available.agentId,
 				conversationId: available.context?.conversationId,
-				confirmed
+				confirmed,
+				beforeExecute: () => {
+					const current = authorizeCurrent();
+					if (current.decision !== "allowed") throw new ExternalEffectNotAppliedError(current.reason);
+					if (approvalId && !consumeConnectorApproval(approvalId, argsHash)) throw new ExternalEffectNotAppliedError("Approval is no longer available");
+				}
+			});
+			if (evaluation.decision === "confirmation_required") result = {
+				decision: "confirmation_required",
+				reason: evaluation.reason
+			};
+			else if (action.scope === "read") result = await execute();
+			else result = await executeExternalOperation({
+				principalId: available.principalId,
+				capabilityId: toolRef,
+				idempotencyKey: connectorArgumentsHash(approvalId ? { approvalId } : {
+					conversationId: available.context?.conversationId,
+					toolCallId: context.toolCallId
+				}),
+				requestDigest: argsHash,
+				descriptorDigest,
+				surface: "agent",
+				recovery: "manual"
+			}, async () => {
+				const outcome = await execute();
+				if (outcome.decision !== "allowed") throw new ExternalEffectNotAppliedError(outcome.reason);
+				return outcome;
+			}, (outcome) => {
+				if (outcome.result && typeof outcome.result === "object" && "successful" in outcome.result && outcome.result.successful === false) throw new Error("Provider reported an unsuccessful action without proving that no effect was applied");
+				return outcome;
 			});
 		} catch (error) {
 			if (action.scope === "read") {
@@ -342,11 +404,7 @@ var ComposioToolProvider = class {
 				conversationId: available.context?.conversationId,
 				actionId: action.actionId,
 				scope: action.scope,
-				argumentsHash: connectorArgumentsHash({
-					args: actionArgs,
-					accountId: connection.accountId,
-					objective: available.context ? connectorObjectiveScope(available.context.conversationId) : void 0
-				}),
+				argumentsHash: argumentIdentity(),
 				argumentsPreview: {
 					account: {
 						id: connection.accountId,

package/dist/src/agent/external-tools/endpoint-provider.js

@@ -1,6 +1,9 @@
 import { COMPUTER_CONTROL_TOOL, init_src } from "../../../packages/computer-control-contract/src/index.js";
 import { BROWSER_CONTROL_ENDPOINT_TOOL_NAME } from "../../../packages/browser-control-contract/src/index.js";
+import { executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
+import { canonicalCapabilityJson } from "../../capabilities/runtime/dispatcher.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
+import { createHash } from "node:crypto";
 //#region src/agent/external-tools/endpoint-provider.ts
 init_src();
 function contentText(content) {
@@ -40,7 +43,7 @@ var EndpointToolProvider = class {
 	async execute(toolRef, args, _approvalId, context) {
 		const resolved = this.resolve(toolRef);
 		if (!resolved) throw new Error(`Endpoint tool is unavailable for this turn: ${toolRef}`);
-		const result = await this.deps.runtime.invocations.invoke({
+		const invoke = () => this.deps.runtime.invocations.invoke({
 			endpointId: resolved.endpointId,
 			toolCallId: context.toolCallId,
 			toolName: resolved.tool.descriptor.name,
@@ -60,6 +63,15 @@ var EndpointToolProvider = class {
 				});
 			}
 		});
+		const result = resolved.tool.descriptor.effect === "read" ? await invoke() : await executeExternalOperation({
+			principalId: resolved.principalId,
+			capabilityId: toolRef,
+			idempotencyKey: createHash("sha256").update(`${this.deps.getCurrentContext()?.conversationId}:${context.toolCallId}`).digest("hex"),
+			requestDigest: createHash("sha256").update(canonicalCapabilityJson(args)).digest("hex"),
+			descriptorDigest: resolved.tool.revision,
+			surface: "agent",
+			recovery: "manual"
+		}, invoke);
 		const files = result.content.filter((item) => item.type === "file");
 		return {
 			content: result.content.map((item) => ({
@@ -92,6 +104,7 @@ var EndpointToolProvider = class {
 		if (tool && ["browser.control", "desktop.computer.control"].includes(tool.descriptor.name)) return void 0;
 		return tool ? {
 			endpointId: endpoint.endpointId,
+			principalId: endpoint.principalId,
 			displayName: endpoint.displayName,
 			tool
 		} : void 0;

package/dist/src/agent/external-tools/gateway-tools.js

@@ -1,7 +1,7 @@
 import { init_connector_repository, listConnectorConnections } from "../../storage/sqlite/connector-repository.js";
 import { connectionBindings, getActiveConnectionWait, init_connection_wait_repository, publishConnectionWait, requireSessionConnection, reviseCurrentConnectionObjective } from "../../storage/sqlite/connection-wait-repository.js";
-import { connectionCandidates, resolveConnectionCandidate } from "../../connectors/connection-candidates.js";
 import { connectorPrincipalForSession } from "../../connectors/principal.js";
+import { connectionCandidates, resolveConnectionCandidate } from "../../connectors/connection-candidates.js";
 import { ExternalToolService } from "./service.js";
 import { EXTERNAL_TOOL_SOURCES } from "./types.js";
 import { Type } from "@sinclair/typebox";

package/dist/src/agent/external-tools/mcp-provider.js

@@ -1,7 +1,7 @@
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
-import { getOrCreateSessionMcpRuntime } from "../mcp/bundle-mcp-runtime.js";
-import { mcpToolPolicyId } from "../mcp/bundle-mcp-policy.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
+import { mcpToolPolicyId } from "../mcp/bundle-mcp-policy.js";
+import { getOrCreateSessionMcpRuntime } from "../mcp/bundle-mcp-runtime.js";
 //#region src/agent/external-tools/mcp-provider.ts
 function policyToolId(tool) {
 	return mcpToolPolicyId(tool.safeServerName, tool.toolName);

package/dist/src/agent/image/generation/openai-images-provider.js

@@ -1,11 +1,11 @@
 import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
+import { imageAssetFromBase64, imageFileExtensionForMimeType } from "./image-assets.js";
 import { pickTimeoutMsOrFallback } from "../../../media-shared/http/deadline.js";
 import { privateNetworkPolicyToSsrfGuardOptions } from "../../../media-shared/http/private-network.js";
 import { resolveProviderHttpRequestConfig } from "../../../media-shared/http/resolve-provider-http-request-config.js";
 import { postJsonRequest, postMultipartRequest, readJsonResponseLimited } from "../../../media-shared/http/provider-http.js";
 import "../../../media-shared/http/index.js";
-import { imageAssetFromBase64, imageFileExtensionForMimeType } from "./image-assets.js";
 //#region src/agent/image/generation/openai-images-provider.ts
 init_logger();
 const log = createLogger("ImageGen:OpenAIImages");

package/dist/src/agent/image/generation/providers/dashscope.js

@@ -1,5 +1,6 @@
 import { createLogger } from "../../../../utils/logger/index.js";
 import { init_logger } from "../../../../utils/logger.js";
+import { imageFileExtensionForMimeType } from "../image-assets.js";
 import { pickTimeoutMsOrFallback } from "../../../../media-shared/http/deadline.js";
 import { privateNetworkPolicyToSsrfGuardOptions } from "../../../../media-shared/http/private-network.js";
 import { resolveProviderHttpRequestConfig } from "../../../../media-shared/http/resolve-provider-http-request-config.js";
@@ -8,7 +9,6 @@ import "../../../../media-shared/http/index.js";
 import { resolveApiKeyForProvider } from "../../../../providers/auth-runtime/resolve-api-key.js";
 import { isProviderApiKeyConfigured } from "../../../../providers/auth-runtime/is-configured.js";
 import "../../../../providers/auth-runtime/index.js";
-import { imageFileExtensionForMimeType } from "../image-assets.js";
 //#region src/agent/image/generation/providers/dashscope.ts
 /**
 * Built-in DashScope (Alibaba Model Studio) image-generation provider.

package/dist/src/agent/image/generation/providers/fal.js

@@ -1,5 +1,6 @@
 import { createLogger } from "../../../../utils/logger/index.js";
 import { init_logger } from "../../../../utils/logger.js";
+import { imageFileExtensionForMimeType } from "../image-assets.js";
 import { pickTimeoutMsOrFallback } from "../../../../media-shared/http/deadline.js";
 import { privateNetworkPolicyToSsrfGuardOptions } from "../../../../media-shared/http/private-network.js";
 import { resolveProviderHttpRequestConfig } from "../../../../media-shared/http/resolve-provider-http-request-config.js";
@@ -8,7 +9,6 @@ import "../../../../media-shared/http/index.js";
 import { resolveApiKeyForProvider } from "../../../../providers/auth-runtime/resolve-api-key.js";
 import { isProviderApiKeyConfigured } from "../../../../providers/auth-runtime/is-configured.js";
 import "../../../../providers/auth-runtime/index.js";
-import { imageFileExtensionForMimeType } from "../image-assets.js";
 //#region src/agent/image/generation/providers/fal.ts
 /**
 * Built-in Fal.ai image-generation provider.

package/dist/src/agent/image/generation/providers/google.js

@@ -1,5 +1,6 @@
 import { createLogger } from "../../../../utils/logger/index.js";
 import { init_logger } from "../../../../utils/logger.js";
+import { imageFileExtensionForMimeType } from "../image-assets.js";
 import { pickTimeoutMsOrFallback } from "../../../../media-shared/http/deadline.js";
 import { privateNetworkPolicyToSsrfGuardOptions } from "../../../../media-shared/http/private-network.js";
 import { resolveProviderHttpRequestConfig } from "../../../../media-shared/http/resolve-provider-http-request-config.js";
@@ -8,7 +9,6 @@ import "../../../../media-shared/http/index.js";
 import { resolveApiKeyForProvider } from "../../../../providers/auth-runtime/resolve-api-key.js";
 import { isProviderApiKeyConfigured } from "../../../../providers/auth-runtime/is-configured.js";
 import "../../../../providers/auth-runtime/index.js";
-import { imageFileExtensionForMimeType } from "../image-assets.js";
 //#region src/agent/image/generation/providers/google.ts
 /**
 * Built-in Google Gemini image-generation provider.

package/dist/src/agent/image/generation/runtime.js

@@ -1,12 +1,12 @@
 import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
 import { PROVIDER_ENV_MAP, init_env_keys } from "../../../providers/env-keys.js";
-import { getImageGenerationProvider, listImageGenerationProviders, listImageGenerationProvidersSummary as listImageGenerationProvidersSummary$1 } from "./provider-registry.js";
 import { describeFailoverError, isFailoverError } from "../../failover-error.js";
 import { buildMediaGenerationNormalizationMetadata, buildNoCapabilityModelConfiguredMessage, recordCapabilityCandidateFailure, resolveCapabilityModelCandidates, throwCapabilityGenerationFailure } from "../../media-generation/runtime-shared.js";
 import "../../media-generation/index.js";
 import { parseImageGenerationModelRef } from "./model-ref.js";
 import { resolveImageGenerationOverrides } from "./normalization.js";
+import { getImageGenerationProvider, listImageGenerationProviders, listImageGenerationProvidersSummary as listImageGenerationProvidersSummary$1 } from "./provider-registry.js";
 //#region src/agent/image/generation/runtime.ts
 init_env_keys();
 init_logger();

package/dist/src/agent/image/index.js

@@ -1,9 +1,9 @@
-import { getImageGenerationProvider, listImageGenerationProviders } from "./generation/provider-registry.js";
 import { getImageUnderstandingProvider, listImageUnderstandingProviders, registerImageUnderstandingProvider } from "./understanding/provider-registry.js";
 import { resolveImageModelConfigForTool } from "./tool-model-config.js";
 import { describeImages, describeImagesWithFallback } from "./understanding/runtime.js";
 import { modelSupportsVision, resolveImageHandlingStrategy } from "./vision-detection.js";
 import { runWithImageModelFallback } from "./image-model-fallback.js";
 import { loadImageForToolInput } from "./load-image-media.js";
+import { getImageGenerationProvider, listImageGenerationProviders } from "./generation/provider-registry.js";
 import { generateImage, listImageGenerationProvidersSummary } from "./generation/runtime.js";
 export { describeImages, describeImagesWithFallback, generateImage, getImageGenerationProvider, getImageUnderstandingProvider, listImageGenerationProviders, listImageGenerationProvidersSummary, listImageUnderstandingProviders, loadImageForToolInput, modelSupportsVision, registerImageUnderstandingProvider, resolveImageHandlingStrategy, resolveImageModelConfigForTool, runWithImageModelFallback };

package/dist/src/agent/image/load-image-media.js

@@ -1,5 +1,5 @@
-import { decodeDataUrl } from "./image-helpers.js";
 import { checkFileSafety } from "../prompt/safety.js";
+import { decodeDataUrl } from "./image-helpers.js";
 import { homedir } from "node:os";
 import path from "node:path";
 import { promises } from "node:fs";

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 { getDefaultModelSync, getModelsByProvider, init_providers, isProviderConfiguredSync, resolveModel } from "../../providers/index.js";
 import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
+import { getDefaultModelSync, getModelsByProvider, init_providers, isProviderConfiguredSync, resolveModel } from "../../providers/index.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/inbound/attachment-pipeline.js

@@ -1,8 +1,8 @@
 import { stripRuntimeUserMessageEnvelope } from "../../../packages/gateway-contract/src/user-message-display.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { extractProfileAgentId } from "../../config/agent-profile.js";
-import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { mimeTypeFromMediaPath } from "../../media/store.js";
+import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { readMediaReference } from "../../media/media-reference.js";
 import { isImageInboundAttachment } from "../../channels/attachments/attachment-classifiers.js";
 import "../../channels/attachments/inbound-persist.js";

package/dist/src/agent/inbound/inbound-loop.js

@@ -1,9 +1,9 @@
 import { runWithLogContext, updateAsyncLogContext } from "../../utils/logger/context.js";
 import { init_logger } from "../../utils/logger.js";
-import { MessageBusShutdownError } from "../../infra/bus/queue.js";
-import "../../infra/bus/index.js";
 import { shouldSkipResetOverlapCommand } from "../../session/reset-triggers.js";
 import { initSessionTurn } from "../../session/init-session-turn.js";
+import { MessageBusShutdownError } from "../../infra/bus/queue.js";
+import "../../infra/bus/index.js";
 import { runEmbeddedTurnForSession } from "../embedded/run-for-session.js";
 import { inboundMessageLogRequestId } from "../service-inbound-utils.js";
 //#region src/agent/inbound/inbound-loop.ts

package/dist/src/agent/inbound/turn-dispatcher.d.ts

@@ -25,6 +25,7 @@ import type { SessionStore } from '../../session/store.js';
 import type { SessionContext, SessionHydrator, SessionStateBag } from '../session/index.js';
 import type { InboundAttachmentInput, MediaRef } from '../../channels/attachments/inbound-persist.js';
 import { type ProcessDirectStreamEvent } from '../service/process-direct-streaming.js';
+import { type WebchatTtsResult } from '../service/webchat-tts.js';
 import type { AgentSourceContext, AgentSourceContextResolver } from '../source-context/types.js';
 export interface TurnDispatcherConfig {
     log: ContextualLogger;
@@ -76,6 +77,7 @@ export declare class TurnDispatcher {
         runId?: string;
         sourceContexts?: AgentSourceContext[];
         presentation?: 'voice';
+        onDeferredAudio?: (audio: WebchatTtsResult) => void;
     }): AsyncGenerator<ProcessDirectStreamEvent, void, unknown>;
     /** Push an out-of-band event into the live webchat stream for a session. */
     enqueueWebchatStreamEvent(conversationId: string, event: {

package/dist/src/agent/inbound/turn-dispatcher.js

@@ -35,7 +35,8 @@ var TurnDispatcher = class {
 			signal: options?.signal,
 			runId: options?.runId,
 			sourceContexts: options?.sourceContexts,
-			presentation: options?.presentation
+			presentation: options?.presentation,
+			onDeferredAudio: options?.onDeferredAudio
 		});
 	}
 	/** Push an out-of-band event into the live webchat stream for a session. */

package/dist/src/agent/index.js

@@ -3,12 +3,12 @@ import { dropThinkingBlocks } from "./transcript/thinking.js";
 import { extractToolCallsFromAssistant, extractToolResultId, sanitizeToolCallId, sanitizeToolCallIdsForCloudCodeAssist } from "./transcript/tool-call-id.js";
 import { makeMissingToolResult, repairToolUseResultPairing, sanitizeToolCallInputs, sanitizeToolUseResultPairing, stripToolResultDetails } from "./transcript/session-transcript-repair.js";
 import { applySessionTranscriptHygiene, applySessionTranscriptHygieneForPersistence, applySessionTranscriptHygieneWithPolicy, resolvePolicyForModel, tryApplySessionTranscriptHygiene, tryApplySessionTranscriptHygieneForPersistence } from "./transcript/transcript-hygiene.js";
-import { AgentService } from "./service.js";
 import { createResponseMessage, createSignalMessage, createTaskMessage, isValidIPCMessage } from "./ipc/types.js";
 import { AgentInbox } from "./ipc/inbox.js";
 import { AgentBus } from "./ipc/bus.js";
 import { AgentSocketClient, AgentSocketServer, isSocketAvailable } from "./ipc/socket.js";
 import "./ipc/index.js";
+import { AgentService } from "./service.js";
 import { stripToolMessages } from "./transcript/strip-tool-messages.js";
 import "./transcript/index.js";
 export { AgentBus, AgentInbox, AgentService, AgentSocketClient, AgentSocketServer, applySessionTranscriptHygiene, applySessionTranscriptHygieneForPersistence, applySessionTranscriptHygieneWithPolicy, createResponseMessage, createSignalMessage, createTaskMessage, dropThinkingBlocks, extractToolCallsFromAssistant, extractToolResultId, isSocketAvailable, isValidIPCMessage, makeMissingToolResult, repairToolUseResultPairing, resolvePolicyForModel, resolveTranscriptPolicy, sanitizeToolCallId, sanitizeToolCallIdsForCloudCodeAssist, sanitizeToolCallInputs, sanitizeToolUseResultPairing, stripToolMessages, stripToolResultDetails, tryApplySessionTranscriptHygiene, tryApplySessionTranscriptHygieneForPersistence };

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 { createSessionMcpRuntime } from "./bundle-mcp-runtime.js";
 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

@@ -9,8 +9,8 @@ import { isMcpConfigRecord } from "./mcp-config-shared.js";
 import { resolveMcpTransport } from "./mcp-transport.js";
 import { sanitizeServerName } from "./bundle-mcp-names.js";
 import crypto from "node:crypto";
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import Ajv2020 from "ajv/dist/2020.js";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { AjvJsonSchemaValidator } from "@modelcontextprotocol/sdk/validation/ajv-provider.js";
 //#region src/agent/mcp/bundle-mcp-runtime.ts
 init_logger();
@@ -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/index.js

@@ -1,12 +1,12 @@
+import { mcpToolPolicyId } from "./bundle-mcp-policy.js";
 import { loadMergedBundleMcpConfig } from "./bundle-mcp-config.js";
 import { loadEmbeddedMcpConfig } from "./embedded-mcp.js";
 import { McpAuthorizationRequiredError, isMcpAuthorizationError } from "./oauth/mcp-oauth-errors.js";
 import { McpOAuthStore, canonicalMcpServerUrl, mcpOAuthServerKey } from "./oauth/mcp-oauth-store.js";
 import { XopcMcpOAuthClientProvider } from "./oauth/mcp-oauth-provider.js";
 import { __testing, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, retireSessionMcpRuntime, retireSessionMcpRuntimeForConversationId } from "./bundle-mcp-runtime.js";
+import "./bundle-mcp-tools.js";
 import { McpOAuthSession } from "./oauth/mcp-oauth-session.js";
 import { McpOAuthManager, getMcpOAuthManager } from "./oauth/mcp-oauth-manager.js";
-import { mcpToolPolicyId } from "./bundle-mcp-policy.js";
-import "./bundle-mcp-tools.js";
 import "./oauth/index.js";
 export { McpAuthorizationRequiredError, McpOAuthManager, McpOAuthSession, McpOAuthStore, XopcMcpOAuthClientProvider, __testing, canonicalMcpServerUrl, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getMcpOAuthManager, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, isMcpAuthorizationError, loadEmbeddedMcpConfig, loadMergedBundleMcpConfig, mcpOAuthServerKey, mcpToolPolicyId, retireSessionMcpRuntime, retireSessionMcpRuntimeForConversationId };

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/mcp-transport.js

@@ -7,10 +7,10 @@ import { XopcStdioClientTransport } from "./mcp-stdio-transport.js";
 import { resolveMcpTransportConfig } from "./mcp-transport-config.js";
 import { McpOAuthStore } from "./oauth/mcp-oauth-store.js";
 import { XopcMcpOAuthClientProvider } from "./oauth/mcp-oauth-provider.js";
-import { fetch } from "undici";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { getDefaultEnvironment } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { fetch } from "undici";
 //#region src/agent/mcp/mcp-transport.ts
 init_paths_state();
 init_logger();

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

@@ -1,5 +1,5 @@
-import { init_write_file_atomic, writeTextAtomic } from "../../../infra/write-file-atomic.js";
 import { init_paths, resolveMcpOAuthPath } from "../../../config/paths.js";
+import { init_write_file_atomic, writeTextAtomic } from "../../../infra/write-file-atomic.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/compaction-chunks.d.ts

@@ -7,12 +7,17 @@ export interface HandoverChunk {
     text: string;
     sourceThroughSeq: number;
 }
+export interface CompactionChunkCursorState {
+    index: number;
+    offset: number;
+}
 /** Consume source text in order, fitting each chunk against the current ledger. */
 export declare class CompactionChunkCursor {
     private readonly sources;
     private index;
     private offset;
-    constructor(sources: readonly CompactionSourceText[]);
+    constructor(sources: readonly CompactionSourceText[], state?: CompactionChunkCursorState);
     get done(): boolean;
+    checkpoint(): CompactionChunkCursorState;
     next(maxTokens: number, fits: (text: string) => boolean): HandoverChunk;
 }