@xopcai/xopc 0.0.306 → 0.0.307

package/dist/gateway/static/root/index.html

@@ -11,7 +11,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=20260910-1" />
     <link rel="manifest" href="/site.webmanifest?v=20260910-1" />
     <title>XOPC — Keep what matters moving.</title>
-    <script type="module" crossorigin src="/assets/index-Do9MltC4.js"></script>
+    <script type="module" crossorigin src="/assets/index-RBCkv8a_.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-aKtaBQYM.js">
     <link rel="modulepreload" crossorigin href="/assets/preload-helper-zJ_50EbN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-BOUWij0V.js">
@@ -25,14 +25,14 @@
     <link rel="modulepreload" crossorigin href="/assets/download-Dk-ZjtO6.js">
     <link rel="modulepreload" crossorigin href="/assets/plus-Q2yW6OE7.js">
     <link rel="modulepreload" crossorigin href="/assets/x-B_N4OPjy.js">
-    <link rel="modulepreload" crossorigin href="/assets/messages-C-9oo69N.js">
-    <link rel="modulepreload" crossorigin href="/assets/locale-store-D16nmbaN.js">
+    <link rel="modulepreload" crossorigin href="/assets/messages-F74LVAiU.js">
+    <link rel="modulepreload" crossorigin href="/assets/locale-store-msTfRK8P.js">
     <link rel="modulepreload" crossorigin href="/assets/cn-JdwAhgNB.js">
     <link rel="modulepreload" crossorigin href="/assets/schemas-BaskVM5g.js">
     <link rel="modulepreload" crossorigin href="/assets/product-delivery-CCC4FJ3Y.js">
     <link rel="modulepreload" crossorigin href="/assets/app-link-BiBXVEvp.js">
     <link rel="modulepreload" crossorigin href="/assets/copy-to-clipboard-HOJ79TWv.js">
-    <link rel="modulepreload" crossorigin href="/assets/markdown-view-DCp4BlZP.js">
+    <link rel="modulepreload" crossorigin href="/assets/markdown-view-BInabSKf.js">
     <link rel="modulepreload" crossorigin href="/assets/dist-Che_jiQF.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-swr-BIWyz7Rc.js">
     <link rel="modulepreload" crossorigin href="/assets/check-DUBLcKHA.js">
@@ -46,19 +46,19 @@
     <link rel="modulepreload" crossorigin href="/assets/globe-DSSGFWFn.js">
     <link rel="modulepreload" crossorigin href="/assets/loader-circle-CifKLtgG.js">
     <link rel="modulepreload" crossorigin href="/assets/middleware-Pd0e8Igk.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-realtime-store-BGmP1obI.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-realtime-BDCpS7U1.js">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-realtime-store-BLDgrJ30.js">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-realtime-B53R0CA4.js">
     <link rel="modulepreload" crossorigin href="/assets/files-Be5viEFY.js">
     <link rel="modulepreload" crossorigin href="/assets/tool-activity-BtJkgjFf.js">
     <link rel="modulepreload" crossorigin href="/assets/button-CS04eWY9.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-Caf8g3sC.js">
-    <link rel="modulepreload" crossorigin href="/assets/registry-api-DcQdwpPu.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-config-swr-BSvXXpKM.js">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-DRzGnEV-.js">
+    <link rel="modulepreload" crossorigin href="/assets/registry-api-BSWtko7U.js">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-config-swr-B6wHa6ZI.js">
     <link rel="modulepreload" crossorigin href="/assets/electron-env-Dit0bHgy.js">
-    <link rel="modulepreload" crossorigin href="/assets/activity-store-DLtim-_I.js">
-    <link rel="modulepreload" crossorigin href="/assets/theme-store-RUBQBsFP.js">
+    <link rel="modulepreload" crossorigin href="/assets/activity-store-wgSB2HYK.js">
+    <link rel="modulepreload" crossorigin href="/assets/theme-store-1SZ-HFHX.js">
     <link rel="stylesheet" crossorigin href="/assets/markdown-view-Y68dCxuc.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-CI37dTAn.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-cFU4S35z.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.0.306";
+var version = "0.0.307";
 //#endregion
 export { version };

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

@@ -1,20 +1,26 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { connectionBinding, connectionBindings, init_connection_wait_repository, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
-import { consumeConnectorApproval, createConnectorApproval, getConnectorApproval, getConnectorInstallation, listConnectorActionMetadata, listConnectorConnections, listConnectorInstallations, upsertConnectorActionMetadata, upsertConnectorInstallation } from "../../storage/sqlite/connector-repository.js";
+import { getSessionInputState, init_session_input_repository } from "../../storage/sqlite/session-input-repository.js";
+import { getConnectorAccount } from "../../storage/sqlite/connector-account-repository.js";
+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 { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
+import { connectorIdentitySummary } from "../../connectors/connector-identity.js";
+import { canAccessConnectorAccount, currentAccountConnections } from "../../connectors/account-access.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 { isToolInputSchema } from "../../connectors/connection-capabilities.js";
 import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { ExternalToolSearchError } from "./search-error.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
 //#region src/agent/external-tools/composio-provider.ts
+init_session_input_repository();
 init_connection_wait_repository();
 init_logger();
-const CONNECTION_ARGUMENT = "xopcConnectionId";
+const CONNECTION_ARGUMENT = "xopcAccountId";
 const log = createLogger("ComposioToolProvider");
 function textResult(value) {
 	return {
@@ -62,7 +68,7 @@ function syncLocalOwnerInstallations(config) {
 			allowedAgentIds: existing?.allowedAgentIds ?? [],
 			maxScope: existing?.maxScope ?? getComposioToolkitScope(config, toolkit),
 			confirmationPolicy: existing?.confirmationPolicy ?? "writes",
-			selectedConnectionIds: existing?.selectedConnectionIds ?? [],
+			selectedAccountIds: existing?.selectedAccountIds ?? null,
 			createdAt: existing?.createdAt
 		});
 	}
@@ -98,6 +104,7 @@ function actionInputSchema(action) {
 	if (!isToolInputSchema(action.inputSchema)) throw new Error(`Exact input contract is unavailable for ${action.actionId}`);
 	const schema = action.inputSchema;
 	const properties = schema.properties && typeof schema.properties === "object" && !Array.isArray(schema.properties) ? schema.properties : {};
+	if (Object.hasOwn(properties, CONNECTION_ARGUMENT)) throw new Error("The provider contract conflicts with the reserved account selector.");
 	return {
 		...schema,
 		type: "object",
@@ -105,7 +112,7 @@ function actionInputSchema(action) {
 			...properties,
 			[CONNECTION_ARGUMENT]: {
 				type: "string",
-				description: "Optional local connection id when more than one account is connected."
+				description: "Stable local account ID. Required when this objective uses multiple accounts. Never guess an account."
 			}
 		}
 	};
@@ -190,13 +197,22 @@ var ComposioToolProvider = class {
 		const action = listConnectorActionMetadata(resolved.installation.connectorId).find((candidate) => candidate.actionId === resolved.actionId);
 		if (!action || !isToolInputSchema(action.inputSchema) || !isComposioActionAllowedByCatalog(action.actionId)) return void 0;
 		const summary = `Run ${action.actionId} in ${toolkit}.`;
+		const available = this.availableInstallations();
+		const accounts = currentAccountConnections(listConnectorConnections({
+			principalId: available.principalId,
+			connectorId: resolved.installation.connectorId
+		}).filter((connection) => canAccessConnectorAccount(connection, resolved.installation, available.agentId))).map((connection) => ({
+			accountId: connection.accountId,
+			label: getConnectorAccount(connection.accountId)?.label,
+			identity: connectorIdentitySummary(connection.identity)
+		}));
 		return {
 			toolRef,
 			source: this.source,
 			namespace: toolkit,
 			title: action.actionId,
 			summary,
-			description: summary,
+			description: `${summary} Available accounts: ${JSON.stringify(accounts)}. Use xopcAccountId to select one; never guess when the user's intent is ambiguous.`,
 			inputSchema: actionInputSchema(action)
 		};
 	}
@@ -220,19 +236,20 @@ var ComposioToolProvider = class {
 			const refreshed = await this.adapter.refreshConnection(expired);
 			fresh = fresh.map((item) => item.id === refreshed.id ? refreshed : item);
 		}
-		const connections = listConnectorConnections({
+		const connections = currentAccountConnections(listConnectorConnections({
 			principalId: available.principalId,
 			connectorId: resolved.installation.connectorId
-		}).filter((connection) => connection.status === "active" && fresh.some((item) => item.id === connection.id) && (!resolved.installation.selectedConnectionIds.length || resolved.installation.selectedConnectionIds.includes(connection.id)));
-		const requestedConnection = typeof executionArgs[CONNECTION_ARGUMENT] === "string" ? executionArgs[CONNECTION_ARGUMENT] : available.context ? connectionBinding(available.context.conversationId, resolved.installation.connectorId) : void 0;
+		}).filter((connection) => connection.status === "active" && fresh.some((item) => item.id === connection.id) && canAccessConnectorAccount(connection, resolved.installation, available.agentId)));
+		const boundConnection = available.context ? connectionBinding(available.context.conversationId, resolved.installation.connectorId) : void 0;
+		const requestedAccount = typeof executionArgs[CONNECTION_ARGUMENT] === "string" ? executionArgs[CONNECTION_ARGUMENT] : boundConnection ? getConnectorConnection(boundConnection)?.accountId : void 0;
 		const bindings = available.context ? connectionBindings(available.context.conversationId).filter((need) => need.connectorId === resolved.installation.connectorId) : [];
-		if (bindings.length > 1 && !requestedConnection) return textResult({
+		if (bindings.length > 1 && !requestedAccount) return textResult({
 			status: "account_selection_required",
 			accounts: bindings,
-			instruction: "Choose the account for this operation using xopcConnectionId."
+			instruction: "Choose the account for this operation using xopcAccountId."
 		});
-		if (bindings.length && requestedConnection && !bindings.some((need) => need.connectionId === requestedConnection)) return textResult("This account was not selected for the current objective.");
-		const connection = requestedConnection ? connections.find((candidate) => candidate.id === requestedConnection) : connections.length === 1 ? connections[0] : void 0;
+		if (bindings.length && requestedAccount && !bindings.some((need) => need.accountId === requestedAccount)) return textResult("This account was not selected for the current objective.");
+		const connection = requestedAccount ? connections.find((candidate) => candidate.accountId === requestedAccount) : connections.length === 1 ? connections[0] : void 0;
 		const requestConnection = () => {
 			if (!available.context) return textResult({ status: "connection_required" });
 			const result = requireSessionConnection({
@@ -243,7 +260,7 @@ var ComposioToolProvider = class {
 				needs: [{
 					key: `${resolved.installation.connectorId}:default`,
 					connectorId: resolved.installation.connectorId,
-					connectionId: requestedConnection,
+					accountId: requestedAccount,
 					label: getConnectorDefinition(resolved.installation.connectorId)?.displayName ?? toolkit,
 					capabilities: [action.actionId]
 				}]
@@ -252,13 +269,18 @@ var ComposioToolProvider = class {
 			return textResult(result);
 		};
 		if (!connection) return requestConnection();
+		if (available.context && connection.accountId) bindObjectiveAccount(available.context.conversationId, resolved.installation.connectorId, connection.accountId);
 		const actionArgs = { ...executionArgs };
 		delete actionArgs[CONNECTION_ARGUMENT];
-		const argsHash = connectorArgumentsHash(actionArgs);
+		const argsHash = connectorArgumentsHash({
+			args: actionArgs,
+			accountId: connection.accountId,
+			objective: available.context ? connectorObjectiveScope(available.context.conversationId) : void 0
+		});
 		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) return textResult("The connector approval is invalid for this session or action.");
+			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.");
 		}
@@ -286,7 +308,22 @@ var ComposioToolProvider = class {
 			throw error;
 		}
 		if (result.decision === "confirmation_required") {
+			const wait = available.context && getSessionInputState(available.context.conversationId).activeInputId ? requireSessionConnection({
+				conversationId: available.context.conversationId,
+				principalId: available.principalId,
+				agentId: available.agentId ?? "main",
+				summary: `Confirm ${action.actionId}`,
+				needs: [{
+					key: `${resolved.installation.connectorId}:${connection.accountId}`,
+					connectorId: resolved.installation.connectorId,
+					accountId: connection.accountId,
+					connectionId: connection.id,
+					label: toolkit,
+					capabilities: [action.actionId]
+				}]
+			}) : void 0;
 			const approval = createConnectorApproval({
+				waitId: wait?.waitId,
 				principalId: available.principalId,
 				connectorId: resolved.installation.connectorId,
 				connectionId: connection?.id,
@@ -294,10 +331,22 @@ var ComposioToolProvider = class {
 				conversationId: available.context?.conversationId,
 				actionId: action.actionId,
 				scope: action.scope,
-				argumentsHash: argsHash,
-				argumentsPreview: connectorArgumentsPreview(actionArgs),
+				argumentsHash: connectorArgumentsHash({
+					args: actionArgs,
+					accountId: connection.accountId,
+					objective: available.context ? connectorObjectiveScope(available.context.conversationId) : void 0
+				}),
+				argumentsPreview: {
+					account: {
+						id: connection.accountId,
+						label: getConnectorAccount(connection.accountId)?.label,
+						identity: connectorIdentitySummary(connection.identity)
+					},
+					arguments: connectorArgumentsPreview(actionArgs)
+				},
 				expiresAt: new Date(Date.now() + 10 * 6e4).toISOString()
 			});
+			if (available.context && wait?.waitId) publishConnectionWait(available.context.conversationId);
 			return textResult({
 				status: "confirmation_required",
 				approvalId: approval.id,
@@ -305,17 +354,31 @@ var ComposioToolProvider = class {
 				scope: approval.scope,
 				argumentsPreview: approval.argumentsPreview,
 				expiresAt: approval.expiresAt,
+				account: {
+					id: connection.accountId,
+					label: getConnectorAccount(connection.accountId)?.label,
+					identity: connectorIdentitySummary(connection.identity)
+				},
 				instruction: "Ask the user to approve this exact action in xopc, then retry with the approvalId and unchanged arguments."
 			});
 		}
-		return textResult(result.decision === "allowed" ? result.result : result.reason);
+		return textResult(result.decision === "allowed" ? {
+			account: {
+				id: connection.accountId,
+				label: getConnectorAccount(connection.accountId)?.label,
+				identity: connectorIdentitySummary(connection.identity)
+			},
+			result: result.result
+		} : result.reason);
 	}
 	availableInstallations() {
 		const context = this.deps.getCurrentContext();
 		const principal = connectorPrincipalForSession(context?.conversationId);
 		if (principal.isLocalOwner) syncLocalOwnerInstallations(this.deps.getConfig());
 		const agentId = this.deps.agentId ?? principal.agentId;
-		const installations = listConnectorInstallations(principal.principalId).filter((installation) => installation.enabled && composioToolkitFromConnectorId(installation.connectorId) !== void 0 && (installation.allowedAgentIds.length === 0 || Boolean(agentId && installation.allowedAgentIds.includes(agentId))));
+		const config = this.deps.getConfig();
+		const disabled = new Set(config ? listConnectorInstances(config).filter((instance) => !instance.enabled).map((instance) => instance.connectorId) : []);
+		const installations = listConnectorInstallations(principal.principalId).filter((installation) => installation.enabled && !disabled.has(installation.connectorId) && composioToolkitFromConnectorId(installation.connectorId) !== void 0 && (installation.allowedAgentIds.length === 0 || Boolean(agentId && installation.allowedAgentIds.includes(agentId))));
 		return {
 			principalId: principal.principalId,
 			agentId,

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

@@ -1,11 +1,12 @@
+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 { listConnectorConnections } from "../../storage/sqlite/connector-repository.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";
 //#region src/agent/external-tools/gateway-tools.ts
+init_connector_repository();
 init_connection_wait_repository();
 const EXTERNAL_TOOL_NAMES = {
 	search: "xopc_tool_search",

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

@@ -2,9 +2,9 @@ import { init_global_singleton, resolveGlobalSingleton } from "../../utils/globa
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
+import { resolveConnectorSecretReferences } from "../../connectors/secret-store.js";
 import { redactSensitiveUrlLikeString } from "../../utils/redact-sensitive-url.js";
 import { loadEmbeddedMcpConfig } from "./embedded-mcp.js";
-import { resolveConnectorSecretReferences } from "../../connectors/secret-store.js";
 import { isMcpConfigRecord } from "./mcp-config-shared.js";
 import { resolveMcpTransport } from "./mcp-transport.js";
 import { sanitizeServerName } from "./bundle-mcp-names.js";

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

@@ -1,8 +1,8 @@
 import { init_global_singleton, resolveGlobalSingleton } from "../../../utils/global-singleton.js";
 import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
-import { redactSensitiveUrlLikeString } from "../../../utils/redact-sensitive-url.js";
 import { resolveConnectorSecretReferences } from "../../../connectors/secret-store.js";
+import { redactSensitiveUrlLikeString } from "../../../utils/redact-sensitive-url.js";
 import { resolveMcpTransportConfig } from "../mcp-transport-config.js";
 import { isMcpAuthorizationError } from "./mcp-oauth-errors.js";
 import { McpOAuthStore, canonicalMcpServerUrl } from "./mcp-oauth-store.js";

package/dist/src/cli/commands/doctor/checks/database-schema.js

@@ -53,7 +53,7 @@ async function checkDatabaseSchema(ctx) {
 		id: "database-schema",
 		label: "Database schema",
 		status: "pass",
-		message: `SQLite schema v${status.dbVersion} (current release v181).`,
+		message: `SQLite schema v${status.dbVersion} (current release v183).`,
 		hints: []
 	};
 }

package/dist/src/cli/commands/gateway/lifecycle.js

@@ -1,10 +1,10 @@
 import { init_paths, resolveConfigPath } from "../../../config/paths.js";
 import { loadConfig } from "../../../config/loader.js";
 import "../../../config/index.js";
-import { isRestartEnabled } from "../../../config/commands.flags.js";
 import { resolveGatewayService } from "../../../daemon/service.js";
-import { findVerifiedGatewayListenerPidsOnPortSync, formatGatewayPidList, signalVerifiedGatewayPidSync } from "../../../infra/gateway-processes.js";
+import { isRestartEnabled } from "../../../config/commands.flags.js";
 import { authorizeGatewaySigusr1Restart, writeGatewayRestartIntentSync } from "../../../infra/restart.js";
+import { findVerifiedGatewayListenerPidsOnPortSync, formatGatewayPidList, signalVerifiedGatewayPidSync } from "../../../infra/gateway-processes.js";
 import { runServiceRestart, runServiceStop } from "./lifecycle-core.js";
 import { DEFAULT_RESTART_HEALTH_ATTEMPTS, renderGatewayPortHealthDiagnostics, waitForGatewayHealthyListener } from "./restart-health.js";
 import { parsePortFromArgs, renderGatewayServiceStartHints, resolveGatewayPortFromConfig } from "./shared.js";

package/dist/src/cli/commands/update.js

@@ -2,9 +2,9 @@ import { PACKAGE_VERSION, init_package_version } from "../../package-version.js"
 import { loadConfig } from "../../config/loader.js";
 import { formatExamples, register } from "../registry.js";
 import "../../config/index.js";
+import { acquireUpdateLock } from "../../infra/update-lock.js";
 import { normalizeUpdateChannel } from "../../infra/update-channels.js";
 import { compareSemver, resolveNpmChannelTag } from "../../infra/update-check.js";
-import { acquireUpdateLock } from "../../infra/update-lock.js";
 import { formatUpdateApiResult, resolveUpdateInstallSurface, runGatewayUpdateWithPostSteps } from "../../infra/update-runner.js";
 import { Command } from "commander";
 //#region src/cli/commands/update.ts

package/dist/src/config/schema.d.ts

@@ -1378,6 +1378,8 @@ export declare const McpServerSchema: z.ZodObject<{
         xopcSecretRef: z.ZodObject<{
             provider: z.ZodString;
             fieldKey: z.ZodString;
+            prefix: z.ZodOptional<z.ZodString>;
+            suffix: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>;
     }, z.core.$strip>]>>>;
     cwd: z.ZodOptional<z.ZodString>;
@@ -1391,6 +1393,8 @@ export declare const McpServerSchema: z.ZodObject<{
         xopcSecretRef: z.ZodObject<{
             provider: z.ZodString;
             fieldKey: z.ZodString;
+            prefix: z.ZodOptional<z.ZodString>;
+            suffix: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>;
     }, z.core.$strip>]>>>;
     auth: z.ZodOptional<z.ZodObject<{
@@ -1408,6 +1412,8 @@ export declare const McpConfigSchema: z.ZodOptional<z.ZodObject<{
             xopcSecretRef: z.ZodObject<{
                 provider: z.ZodString;
                 fieldKey: z.ZodString;
+                prefix: z.ZodOptional<z.ZodString>;
+                suffix: z.ZodOptional<z.ZodString>;
             }, z.core.$strip>;
         }, z.core.$strip>]>>>;
         cwd: z.ZodOptional<z.ZodString>;
@@ -1421,6 +1427,8 @@ export declare const McpConfigSchema: z.ZodOptional<z.ZodObject<{
             xopcSecretRef: z.ZodObject<{
                 provider: z.ZodString;
                 fieldKey: z.ZodString;
+                prefix: z.ZodOptional<z.ZodString>;
+                suffix: z.ZodOptional<z.ZodString>;
             }, z.core.$strip>;
         }, z.core.$strip>]>>>;
         auth: z.ZodOptional<z.ZodObject<{
@@ -2174,6 +2182,8 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
                 xopcSecretRef: z.ZodObject<{
                     provider: z.ZodString;
                     fieldKey: z.ZodString;
+                    prefix: z.ZodOptional<z.ZodString>;
+                    suffix: z.ZodOptional<z.ZodString>;
                 }, z.core.$strip>;
             }, z.core.$strip>]>>>;
             cwd: z.ZodOptional<z.ZodString>;
@@ -2187,6 +2197,8 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
                 xopcSecretRef: z.ZodObject<{
                     provider: z.ZodString;
                     fieldKey: z.ZodString;
+                    prefix: z.ZodOptional<z.ZodString>;
+                    suffix: z.ZodOptional<z.ZodString>;
                 }, z.core.$strip>;
             }, z.core.$strip>]>>>;
             auth: z.ZodOptional<z.ZodObject<{

package/dist/src/config/schema.js

@@ -1,7 +1,7 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
-import { ComputerConfigSchema, init_config } from "../computer/config.js";
 import { AgentModelsOverrideSchema, AgentsConfigSchema as AgentsConfigSchema$1, DEFAULT_AGENT_MODEL_REF, ImageGenerationRouteSchema, ModelRouteSchema } from "../agent-config/schema.js";
 import { init_agent_config } from "../agent-config/index.js";
+import { ComputerConfigSchema, init_config } from "../computer/config.js";
 import { DEFAULT_CONTEXT_COMPACTION_POLICY, UserContextConfigSchema, init_config as init_config$1 } from "../user-context/config.js";
 import { init_default_model } from "./default-model.js";
 import { init_public_url, validatePublicUrl } from "./public-url.js";
@@ -958,7 +958,9 @@ defaultAgent: z.string().min(1).optional() }).strict().default({});
 	}, "MCP server URL must use http or https");
 	ConnectorSecretReferenceSchema = z.object({ xopcSecretRef: z.object({
 		provider: z.string().min(1),
-		fieldKey: z.string().min(1)
+		fieldKey: z.string().min(1),
+		prefix: z.string().optional(),
+		suffix: z.string().optional()
 	}) });
 	McpConfigScalarSchema = z.union([
 		z.string(),

package/dist/src/connectors/account-access.d.ts

@@ -0,0 +1,4 @@
+import type { ConnectorConnection, ConnectorInstallationPolicy } from './types.js';
+/** Account policy can only narrow the installation's permissions. */
+export declare function canAccessConnectorAccount(connection: ConnectorConnection, installation: ConnectorInstallationPolicy, agentId?: string): boolean;
+export declare function currentAccountConnections(connections: ConnectorConnection[]): ConnectorConnection[];

package/dist/src/connectors/account-access.js

@@ -0,0 +1,23 @@
+import { getConnectorAccount, init_connector_account_repository } from "../storage/sqlite/connector-account-repository.js";
+//#region src/connectors/account-access.ts
+init_connector_account_repository();
+/** Account policy can only narrow the installation's permissions. */
+function canAccessConnectorAccount(connection, installation, agentId) {
+	if (!installation.enabled || connection.principalId !== installation.principalId || connection.connectorId !== installation.connectorId || !connection.accountId) return false;
+	if (installation.allowedAgentIds.length && (!agentId || !installation.allowedAgentIds.includes(agentId))) return false;
+	if (installation.selectedAccountIds !== null && !installation.selectedAccountIds.includes(connection.accountId)) return false;
+	const account = getConnectorAccount(connection.accountId);
+	return Boolean(account?.enabled && (account.allowedAgentIds === null || agentId && account.allowedAgentIds.includes(agentId)));
+}
+function currentAccountConnections(connections) {
+	const byAccount = /* @__PURE__ */ new Map();
+	for (const connection of connections) {
+		if (!connection.accountId || connection.status !== "active") continue;
+		const existing = byAccount.get(connection.accountId);
+		const currentId = getConnectorAccount(connection.accountId)?.currentConnectionId;
+		if (!existing || connection.id === currentId || existing.id !== currentId && connection.updatedAt > existing.updatedAt) byAccount.set(connection.accountId, connection);
+	}
+	return [...byAccount.values()];
+}
+//#endregion
+export { canAccessConnectorAccount, currentAccountConnections };

package/dist/src/connectors/approval-resume.d.ts

@@ -0,0 +1,4 @@
+import type { ConnectorApprovalRecord } from './types.js';
+import type { ConnectionRecoveryService } from './connection-recovery-service.js';
+/** Approval resumes only the exact suspended objective that requested it. */
+export declare function resumeApprovedConnectorAction(approval: ConnectorApprovalRecord, recovery: ConnectionRecoveryService): Promise<boolean>;

package/dist/src/connectors/approval-resume.js

@@ -0,0 +1,23 @@
+import { getActiveConnectionWait, init_connection_wait_repository } from "../storage/sqlite/connection-wait-repository.js";
+import { randomUUID } from "node:crypto";
+//#region src/connectors/approval-resume.ts
+init_connection_wait_repository();
+/** Approval resumes only the exact suspended objective that requested it. */
+async function resumeApprovedConnectorAction(approval, recovery) {
+	if (approval.status !== "approved" || !approval.waitId || !approval.conversationId) return false;
+	const wait = getActiveConnectionWait(approval.conversationId);
+	if (!wait || wait.id !== approval.waitId || wait.principalId !== approval.principalId || wait.agentId !== approval.agentId || wait.status !== "open") return false;
+	try {
+		return (await recovery.act(wait.conversationId, {
+			action: "continue",
+			waitId: wait.id,
+			expectedTranscriptId: wait.transcriptId,
+			expectedVersion: wait.version,
+			idempotencyKey: randomUUID()
+		})).snapshot.wait?.phase === "queued";
+	} catch {
+		return false;
+	}
+}
+//#endregion
+export { resumeApprovedConnectorAction };

package/dist/src/connectors/auth-provider-registry.d.ts

@@ -6,5 +6,6 @@ export type ConnectorAuthStartResult = {
     status: string;
     authorizationUrl?: string;
     connectionId?: string;
+    attemptId?: string;
 };
 export declare function startConnectorAuthorization(definition: ConnectorDefinition, config?: Config, instanceId?: string): Promise<ConnectorAuthStartResult>;

package/dist/src/connectors/auth-provider-registry.js

@@ -32,7 +32,8 @@ async function startConnectorAuthorization(definition, config, instanceId) {
 		provider: "composio",
 		status: "pending",
 		authorizationUrl: authorization.connectUrl,
-		connectionId: authorization.connectionId
+		connectionId: authorization.connectionId,
+		attemptId: authorization.attemptId
 	};
 }
 //#endregion

package/dist/src/connectors/authorization-attempts.d.ts

@@ -0,0 +1,21 @@
+export type AuthorizationAttempt = {
+    id: string;
+    principal_id: string;
+    connector_id: string;
+    backend_id: string | null;
+    connection_id: string;
+    expected_account_id: string | null;
+    authorization_url: string | null;
+    status: 'awaiting_user' | 'succeeded' | 'failed' | 'expired';
+    expires_at: number;
+    created_at: number;
+};
+export declare function saveAuthorizationAttempt(input: {
+    connectionId: string;
+    principalId: string;
+    connectorId: string;
+    backendId?: string;
+    expectedAccountId?: string;
+    url?: string;
+}): string;
+export declare function getAuthorizationAttempt(id: string, principalId: string): AuthorizationAttempt | undefined;

package/dist/src/connectors/authorization-attempts.js

@@ -0,0 +1,33 @@
+import { getSqliteDatabase, init_transaction } from "../storage/sqlite/transaction.js";
+import { getConnectorConnection, init_connector_repository } from "../storage/sqlite/connector-repository.js";
+//#region src/connectors/authorization-attempts.ts
+init_connector_repository();
+init_transaction();
+function saveAuthorizationAttempt(input) {
+	const now = Date.now();
+	getSqliteDatabase().prepare(`INSERT INTO connector_authorization_attempts
+    (id, principal_id, connector_id, backend_id, connection_id, expected_account_id, authorization_url, status, expires_at, created_at)
+    VALUES(?,?,?,?,?,?,?,'awaiting_user',?,?)
+    ON CONFLICT(id) DO UPDATE SET expected_account_id = excluded.expected_account_id,
+      authorization_url = excluded.authorization_url, status = 'awaiting_user',
+      expires_at = excluded.expires_at, created_at = excluded.created_at`).run(input.connectionId, input.principalId, input.connectorId, input.backendId ?? null, input.connectionId, input.expectedAccountId ?? null, input.url ?? null, now + 10 * 6e4, now);
+	return input.connectionId;
+}
+function getAuthorizationAttempt(id, principalId) {
+	const db = getSqliteDatabase();
+	const row = db.prepare("SELECT * FROM connector_authorization_attempts WHERE id = ? AND principal_id = ?").get(id, principalId);
+	if (!row || row.status !== "awaiting_user") return row;
+	const connection = getConnectorConnection(row.connection_id);
+	const status = row.expires_at <= Date.now() ? "expired" : connection?.status === "active" ? row.expected_account_id && row.expected_account_id !== connection.accountId ? "failed" : "succeeded" : connection && ["failed", "revoked"].includes(connection.status) ? "failed" : "awaiting_user";
+	if (status !== row.status) {
+		db.prepare("UPDATE connector_authorization_attempts SET status = ?, authorization_url = NULL WHERE id = ?").run(status, id);
+		return {
+			...row,
+			status,
+			authorization_url: null
+		};
+	}
+	return row;
+}
+//#endregion
+export { getAuthorizationAttempt, saveAuthorizationAttempt };

package/dist/src/connectors/builtin-catalog.js

@@ -1,10 +1,8 @@
 //#region src/connectors/builtin-catalog.ts
-const BUILTIN_CONNECTOR_BACKGROUNDS = { filesystem: "#FFF7E6" };
 function builtinBranding(id) {
 	return {
 		logoUrl: `/connector-icons/${id}.svg`,
-		source: "builtin",
-		backgroundColor: BUILTIN_CONNECTOR_BACKGROUNDS[id] ?? "#FFFFFF"
+		source: "builtin"
 	};
 }
 const BUILTIN_CONNECTORS = [{

package/dist/src/connectors/catalog.js

@@ -1,7 +1,8 @@
 import { init_connection, isXopcDatabaseOpen } from "../storage/sqlite/connection.js";
-import { getCachedConnectorCatalogEntry } from "../storage/sqlite/connector-repository.js";
+import { getCachedConnectorCatalogEntry, init_connector_repository } from "../storage/sqlite/connector-repository.js";
 import { listConnectorProviderDefinitions, listConnectorProviders } from "./providers.js";
 //#region src/connectors/catalog.ts
+init_connector_repository();
 init_connection();
 const CONNECTOR_BY_ID = new Map(listConnectorProviderDefinitions().map((connector) => [connector.id, connector]));
 function listConnectorCatalog() {

package/dist/src/connectors/china-catalog.d.ts

@@ -0,0 +1,2 @@
+import type { ConnectorDefinition } from './types.js';
+export declare const CHINA_CONNECTORS: readonly ConnectorDefinition[];