@xopcai/xopc 0.0.332 → 0.0.334

package/dist/src/config/index.js

@@ -1,15 +1,15 @@
 import { ENV_VARS, XOPC_DB_FILENAME, resolveHomeDir, resolveStateDir, resolveXopcCloudCatalogCachePath, resolveXopcDatabasePath } from "./paths-state.js";
-import { TelegramAccountConfigSchema, TelegramConfigSchema, TelegramGroupConfigSchema, TelegramTopicConfigSchema } from "../../extensions/telegram/src/config-schema.js";
-import { WeixinAccountConfigSchema, WeixinConfigSchema } from "../../extensions/weixin/src/config-schema.js";
-import { AgentImageGenerationModelSchema, AgentModelRefSchema, AgentModelsSchema, BrowserConfigSchema, ChannelsConfigSchema, CommandsConfigSchema, ConfigSchema, ConnectorsConfigSchema, ExperimentalConfigSchema, ExtensionSecurityConfigSchema, ExtensionSlotsConfigSchema, ExtensionsConfigSchema, GatewayAuthRateLimitSchema, GatewayAuthSchema, GatewayBindModeSchema, GatewayChannelConnectDeferModeSchema, GatewayConfigSchema, GatewayModeSchema, GatewayRemoteSchema, GatewayScenesConfigSchema, GatewaySecuritySchema, GatewayTailscaleConsentSchema, GatewayTailscaleSchema, GatewayTlsSchema, GatewayTrustedProxySchema, GatewayWebchatConfigSchema, HeartbeatConfigSchema, McpConfigSchema, McpOAuthConfigSchema, McpServerSchema, MediaUnderstandingCapabilitiesSchema, MediaUnderstandingModelSchema, MessagesConfigSchema, ModelCatalogConfigSchema, ModelsDevConfigSchema, ProviderAuthConfigSchema, ProviderAzureConfigSchema, ProviderRequestOverridesSchema, ProvidersConfigSchema, RuntimeToolsConfigSchema, STTConfigSchema, STTFallbackConfigSchema, STTProviderConfigSchema, SearchProviderEntrySchema, SessionConfigSchema, SessionDmScopeSchema, SessionResetByTypeSchema, SessionResetConfigSchema, SessionResetModeSchema, SessionScopeSchema, SessionStorageConfigSchema, TTSConfigSchema, TTSEdgeConfigSchema, TTSFallbackConfigSchema, TTSModelOverridesConfigSchema, TTSProviderConfigSchema, TTSSummarizationConfigSchema, ToolsConfigSchema, ToolsMediaAudioConfigSchema, ToolsMediaConfigSchema, TunnelConfigSchema, TunnelConsentSchema, UpdateAutoConfigSchema, UpdateConfigSchema, VoiceConfigSchema, VoiceRefinementConfigSchema, WebSearchConfigSchema, WebToolsConfigSchema, WebsiteBlocklistSchema, WorkspaceConfigSchema, WorkspaceImportConfigSchema, getAgentDefaultImageGenerationModelConfig, getAgentDefaultImageModelConfig, getAgentDefaultModelRef, init_schema, parseModelRef } from "./schema.js";
-import { applyConfigOverrides, getConfigOverrides, resetConfigOverrides, setConfigOverride, unsetConfigOverride } from "./runtime-overrides.js";
 import { expandWorkspacePathString, init_workspace_path, normalizeWorkspaceDir, resolveWorkspaceRoot } from "./workspace-path.js";
 import { resolveDefaultAgentWorkspaceDir } from "./workspace-defaults.js";
 import { resolveAgentWorkspaceDir } from "../agent/agent-scope.js";
-import { extractProfileAgentId, resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession, resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "./agent-profile.js";
 import { FILENAMES, WORKSPACE_FILES, existsSync, hasBundledExtensionManifest, init_paths, resolveAgentAuthProfilesPath, resolveAgentDir, resolveAgentHomeDir, resolveAgentProfileDir, resolveAgentProfileMarkdownPath, resolveAuthProfilesPath, resolveBinDir, resolveBundledExtensionsDir, resolveBundledSkillsDir, resolveConfigPath, resolveCredentialsDir, resolveExtensionSdkPath, resolveExtensionsDir, resolveExtensionsLockPath, resolveInboxDir, resolveInboxMessagePath, resolveInboxPendingDir, resolveInboxProcessedDir, resolveLogPath, resolveLogsDir, resolveMcpOAuthPath, resolveModelsJsonPath, resolveNodeBinDir, resolveNodeBinPath, resolveNodeToolsDir, resolveNpmBinPath, resolveOAuthPath, resolvePidPath, resolveSkillPath, resolveSkillsCachePath, resolveSkillsDir, resolveSkillsLockPath, resolveSocketPath, resolveStatusPath, resolveToolsDir, resolveWorkspaceExtensionsDir, resolveWorkspaceFile, resolveWorkspaceStateDir, resolveWorkspaceStatePath, resolveXopcBinPath } from "./paths.js";
+import { TelegramAccountConfigSchema, TelegramConfigSchema, TelegramGroupConfigSchema, TelegramTopicConfigSchema } from "../../extensions/telegram/src/config-schema.js";
+import { WeixinAccountConfigSchema, WeixinConfigSchema } from "../../extensions/weixin/src/config-schema.js";
+import { AgentImageGenerationModelSchema, AgentModelRefSchema, AgentModelsSchema, BrowserConfigSchema, ChannelsConfigSchema, CommandsConfigSchema, ConfigSchema, ConnectorsConfigSchema, ExperimentalConfigSchema, ExtensionSecurityConfigSchema, ExtensionSlotsConfigSchema, ExtensionsConfigSchema, GatewayAuthRateLimitSchema, GatewayAuthSchema, GatewayBindModeSchema, GatewayChannelConnectDeferModeSchema, GatewayConfigSchema, GatewayModeSchema, GatewayRemoteSchema, GatewayScenesConfigSchema, GatewaySecuritySchema, GatewayTailscaleConsentSchema, GatewayTailscaleSchema, GatewayTlsSchema, GatewayTrustedProxySchema, GatewayWebchatConfigSchema, HeartbeatConfigSchema, McpConfigSchema, McpOAuthConfigSchema, McpServerSchema, MediaUnderstandingCapabilitiesSchema, MediaUnderstandingModelSchema, MessagesConfigSchema, ModelCatalogConfigSchema, ModelsDevConfigSchema, ProviderAuthConfigSchema, ProviderAzureConfigSchema, ProviderRequestOverridesSchema, ProvidersConfigSchema, RuntimeToolsConfigSchema, STTConfigSchema, STTFallbackConfigSchema, STTProviderConfigSchema, SearchProviderEntrySchema, SessionConfigSchema, SessionDmScopeSchema, SessionResetByTypeSchema, SessionResetConfigSchema, SessionResetModeSchema, SessionScopeSchema, SessionStorageConfigSchema, TTSConfigSchema, TTSEdgeConfigSchema, TTSFallbackConfigSchema, TTSModelOverridesConfigSchema, TTSProviderConfigSchema, TTSSummarizationConfigSchema, ToolsConfigSchema, ToolsMediaAudioConfigSchema, ToolsMediaConfigSchema, TunnelConfigSchema, TunnelConsentSchema, UpdateAutoConfigSchema, UpdateConfigSchema, VoiceConfigSchema, VoiceRefinementConfigSchema, WebSearchConfigSchema, WebToolsConfigSchema, WebsiteBlocklistSchema, WorkspaceConfigSchema, WorkspaceImportConfigSchema, getAgentDefaultImageGenerationModelConfig, getAgentDefaultImageModelConfig, getAgentDefaultModelRef, init_schema, parseModelRef } from "./schema.js";
 import { clearConfigValueCache, getAllowedCommands, getCacheStats, init_resolve_config_value, resolveConfigValue, resolveHeaders, testApiKeyResolution } from "./resolve-config-value.js";
 import { CustomModelSchema, ImageGenerationCapabilitiesSchema, ImageGenerationModelSchema, ImageGenerationProviderSchema, ModelOverrideSchema, ModelsJsonSchema, OpenAICompatSchema, OpenAICompletionsCompatSchema, OpenAIResponsesCompatSchema, OpenRouterRoutingSchema, ProviderConfigSchema, VercelGatewayRoutingSchema, getDefaultModelValues, init_models_json, loadModelsJson, modelsJsonExists, saveModelsJson, validateModelsConfig } from "./models-json.js";
+import { applyConfigOverrides, getConfigOverrides, resetConfigOverrides, setConfigOverride, unsetConfigOverride } from "./runtime-overrides.js";
+import { extractProfileAgentId, resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession, resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "./agent-profile.js";
 import { canonicalizeConfiguredMcpServer, isKnownCliMcpTypeAlias, normalizeConfiguredMcpServers, resolveXopcMcpTransportAlias } from "./mcp-config-normalize.js";
 import { formatThinkingLevels, listThinkingLevels, normalizeElevatedMode, normalizeReasoningLevel, normalizeThinkLevel, normalizeVerboseLevel, thinkLevelToNumber } from "../agent/transcript/thinking-types.js";
 import { assertConfigRewriteSafeForRunningGateway, loadConfig, saveConfig } from "./loader.js";

package/dist/src/config/loader.js

@@ -1,9 +1,9 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { ConfigSchema, init_schema } from "./schema.js";
 import { init_paths, resolveConfigPath } from "./paths.js";
-import { init_resolution, setActivePlatformDiscovery } from "../platform/resolution.js";
 import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
+import { ConfigSchema, init_schema } from "./schema.js";
+import { init_resolution, setActivePlatformDiscovery } from "../platform/resolution.js";
 import { assertChannelPluginConfigs } from "./validate-channel-configs.js";
 import { isGatewayConfigLockedByAnotherProcessSync } from "../gateway/lock.js";
 import { dirname } from "path";

package/dist/src/config/models-json.js

@@ -1,7 +1,7 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
 import { init_paths, resolveModelsJsonPath } from "./paths.js";
-import { ComputerProfileSchema, init_src } from "../../packages/computer-control-contract/src/index.js";
 import { init_write_file_atomic, writeTextAtomicSync } from "../infra/write-file-atomic.js";
+import { ComputerProfileSchema, init_src } from "../../packages/computer-control-contract/src/index.js";
 import { init_model_policy, isComputerModel } from "../computer/model-policy.js";
 import { existsSync, readFileSync } from "fs";
 import { z } from "zod";

package/dist/src/config/schema.js

@@ -1,9 +1,9 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
-import { ComputerConfigSchema, init_config } from "../computer/config.js";
 import { AgentModelsOverrideSchema, ImageGenerationRouteSchema, ModelRouteSchema } from "../agent-config/schema.js";
 import { resolveEffectiveAgentConfig } from "../agent-config/resolver.js";
 import { init_agent_config } from "../agent-config/index.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.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_public_url, validatePublicUrl } from "./public-url.js";
 import { PlatformConfigSchema, init_contracts } from "../platform/contracts.js";

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

@@ -9,7 +9,7 @@ async function resumeApprovedConnectorAction(approval, recovery) {
 	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",
+			action: "check",
 			waitId: wait.id,
 			expectedTranscriptId: wait.transcriptId,
 			expectedVersion: wait.version,

package/dist/src/connectors/cli/authorization.d.ts

@@ -6,7 +6,7 @@ export declare function requireCliInstance(config: Config, instanceId: string, o
 export declare function extractAuthorizationUrl(text: string, allowedHosts: readonly string[], field?: string): string | undefined;
 export declare function startCliAuthorization(config: Config, instanceId: string, expectedAccountId?: string): {
     id: string;
-    status: "failed" | "succeeded" | "expired" | "cancelled" | "verifying" | "awaiting_user" | "preparing";
+    status: "failed" | "succeeded" | "expired" | "cancelled" | "verifying" | "preparing" | "awaiting_user";
     challenge: import("./types.js").CliChallenge;
     error: string;
     accountId: string;

package/dist/src/connectors/cli/store.d.ts

@@ -26,7 +26,7 @@ export declare function updateCliAuthorization(id: string, input: {
 export declare function commitCliIdentity(attempt: CliAuthorization, identity: CliIdentity): string;
 export declare function cliAuthorizationView(row: CliAuthorization): {
     id: string;
-    status: "failed" | "succeeded" | "expired" | "cancelled" | "verifying" | "awaiting_user" | "preparing";
+    status: "failed" | "succeeded" | "expired" | "cancelled" | "verifying" | "preparing" | "awaiting_user";
     challenge: CliChallenge;
     error: string;
     accountId: string;

package/dist/src/connectors/cli/store.js

@@ -93,7 +93,7 @@ function commitCliIdentity(attempt, identity) {
 			}
 		});
 		db.prepare(`UPDATE connector_accounts SET runtime_instance_id = ?, identity_key = ?, identity_json = ?,
-      enabled = 1, label = COALESCE(label, ?), current_connection_id = ?, updated_at = ? WHERE id = ?`).run(attempt.instance_id, identity.key, JSON.stringify(identity.identity), identity.label, connectionId, (/* @__PURE__ */ new Date()).toISOString(), accountId);
+      enabled = 1, label = COALESCE(label, ?), current_connection_id = ?, updated_at = ? WHERE id = ?`).run(attempt.instance_id, identity.key, JSON.stringify(identity.identity), identity.label, connectionId, Date.now(), accountId);
 		db.prepare("UPDATE connector_connections SET status = 'disabled' WHERE account_id = ? AND id <> ? AND provider = 'cli'").run(accountId, connectionId);
 		updateCliAuthorization(attempt.id, {
 			phase: "succeeded",

package/dist/src/connectors/composio-backends.js

@@ -1,19 +1,29 @@
 import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
+import { init_timestamps, optionalTimestampToIso, timestampToIso } from "../storage/sqlite/timestamps.js";
 import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { randomUUID } from "node:crypto";
 //#region src/connectors/composio-backends.ts
 init_credentials();
+init_timestamps();
 init_transaction();
+function fromRow(row) {
+	return {
+		...row,
+		verified_at: optionalTimestampToIso(row.verified_at) ?? null,
+		created_at: timestampToIso(row.created_at)
+	};
+}
 function listComposioBackends() {
-	return getSqliteDatabase().prepare("SELECT * FROM connector_backends ORDER BY created_at").all();
+	return getSqliteDatabase().prepare("SELECT * FROM connector_backends ORDER BY created_at").all().map(fromRow);
 }
 function getComposioBackend(id) {
-	return id ? getSqliteDatabase().prepare("SELECT * FROM connector_backends WHERE id = ?").get(id) : getSqliteDatabase().prepare("SELECT * FROM connector_backends WHERE active = 1").get();
+	const row = id ? getSqliteDatabase().prepare("SELECT * FROM connector_backends WHERE id = ?").get(id) : getSqliteDatabase().prepare("SELECT * FROM connector_backends WHERE active = 1").get();
+	return row ? fromRow(row) : void 0;
 }
 function addComposioBackend(input) {
 	const id = input.id ?? randomUUID();
 	getSqliteDatabase().prepare(`INSERT INTO connector_backends(id, mode, label, credential_ref, credential_source, created_at)
-    VALUES (?, ?, ?, ?, ?, ?)`).run(id, input.mode, input.label, input.credentialRef ?? null, input.credentialSource ?? "stored", (/* @__PURE__ */ new Date()).toISOString());
+    VALUES (?, ?, ?, ?, ?, ?)`).run(id, input.mode, input.label, input.credentialRef ?? null, input.credentialSource ?? "stored", Date.now());
 	return getComposioBackend(id);
 }
 function activateComposioBackend(id) {
@@ -59,7 +69,7 @@ async function resolveBackendKey(backend, resolver = new CredentialResolver()) {
 	return null;
 }
 function markComposioBackendVerified(id) {
-	getSqliteDatabase().prepare("UPDATE connector_backends SET verified_at = ? WHERE id = ?").run((/* @__PURE__ */ new Date()).toISOString(), id);
+	getSqliteDatabase().prepare("UPDATE connector_backends SET verified_at = ? WHERE id = ?").run(Date.now(), id);
 }
 //#endregion
 export { activateComposioBackend, addComposioBackend, ensureComposioBackend, getComposioBackend, listComposioBackends, markComposioBackendVerified, removeComposioBackend, resolveBackendKey };

package/dist/src/connectors/composio-managed-events.d.ts

@@ -21,11 +21,14 @@ export declare class ManagedComposioEventPoller {
     private syncing?;
     constructor(input: {
         getConfig: () => Config;
-        triggerAutomation: (event: {
+        ingestEvent: (event: {
+            id: string;
             type: string;
             source: string;
             payload: Record<string, unknown>;
-        }) => Promise<unknown>;
+            dedupeKey: string;
+            trust: 'connector';
+        }) => unknown;
         requestLearning: (toolkit: string) => void;
         setLearningPaused: (connectionId: string, paused: boolean) => void;
         client?: ManagedEventClient;

package/dist/src/connectors/composio-managed-events.js

@@ -89,9 +89,12 @@ var ManagedComposioEventPoller = class {
 			await appendComposioTriggerEvent(config, payload);
 			const toolkit = normalized.toolkit ?? event.toolkit;
 			if (toolkit) this.input.requestLearning(toolkit);
-			await this.input.triggerAutomation({
+			this.input.ingestEvent({
+				id: `connector:composio:${event.id}`,
 				type: `connector.${normalized.trigger ?? normalized.type}`,
 				source: toolkit ? `composio:${toolkit}` : "composio",
+				dedupeKey: event.id,
+				trust: "connector",
 				payload: {
 					...normalized.data,
 					connectorId: toolkit ? `composio-${toolkit}` : "composio",

package/dist/src/connectors/connection-candidates.js

@@ -1,7 +1,7 @@
 import { getCliAdapter } from "./cli/adapterRegistry.js";
 import { getConnectorDefinition, listConnectorCatalog } from "./catalog.js";
 //#region src/connectors/connection-candidates.ts
-const CANDIDATES = [
+const CAPABILITY_PROFILES = [
 	{
 		toolkit: "outlook",
 		pattern: /outlook/i,
@@ -33,19 +33,53 @@ const CANDIDATES = [
 		capabilities: ["pages.search", "pages.read"]
 	}
 ];
-function connectionCandidates(query) {
-	return [...listConnectorCatalog().filter((definition) => definition.runtime.type === "cli" && [
+function normalizedIdentity(value) {
+	return value.toLocaleLowerCase().replace(/[^\p{L}\p{N}]+/gu, "");
+}
+function matchesConnectorIdentity(query, definition) {
+	const normalizedQuery = normalizedIdentity(query);
+	if (!normalizedQuery) return false;
+	const runtimeIdentity = definition.runtime.type === "composio" ? definition.runtime.toolkit : void 0;
+	return [
 		definition.id,
 		definition.displayName,
+		runtimeIdentity,
 		...definition.tags ?? []
-	].some((term) => term.toLowerCase().includes(query.toLowerCase().trim()) || query.toLowerCase().includes(term.toLowerCase()))).map((definition) => {
+	].filter((value) => typeof value === "string" && ![
+		"composio",
+		"verified",
+		"beta",
+		"experimental"
+	].includes(value)).some((value) => {
+		const identity = normalizedIdentity(value);
+		return identity.length > 1 && normalizedQuery.includes(identity);
+	});
+}
+function composioCandidate(definition) {
+	if (definition.runtime.type !== "composio" || definition.runtime.role !== "toolkit") return void 0;
+	const toolkit = definition.runtime.toolkit;
+	const profile = CAPABILITY_PROFILES.find((item) => item.toolkit === toolkit);
+	return {
+		candidateRef: definition.id,
+		label: definition.displayName,
+		capabilities: profile?.capabilities ?? ["tools"]
+	};
+}
+function connectionCandidates(query) {
+	const catalog = listConnectorCatalog();
+	const managed = catalog.filter((definition) => definition.runtime.type === "cli" && matchesConnectorIdentity(query, definition)).map((definition) => {
 		const candidate = resolveConnectionCandidate(definition.id);
 		return {
 			candidateRef: definition.id,
 			label: candidate.label,
 			capabilities: candidate.capabilities
 		};
-	}), ...CANDIDATES.filter((item) => item.pattern.test(query)).flatMap((item) => {
+	});
+	const composio = catalog.filter((definition) => matchesConnectorIdentity(query, definition)).flatMap((definition) => {
+		const candidate = composioCandidate(definition);
+		return candidate ? [candidate] : [];
+	});
+	const aliases = CAPABILITY_PROFILES.filter((item) => item.pattern.test(query)).flatMap((item) => {
 		const connectorId = `composio-${item.toolkit}`;
 		const definition = getConnectorDefinition(connectorId);
 		return definition ? [{
@@ -53,30 +87,34 @@ function connectionCandidates(query) {
 			label: definition.displayName,
 			capabilities: item.capabilities
 		}] : [];
-	})];
+	});
+	return [
+		...managed,
+		...composio,
+		...aliases
+	].filter((candidate, index, all) => all.findIndex((item) => item.candidateRef === candidate.candidateRef) === index);
 }
 function resolveConnectionCandidate(ref) {
-	const cli = getConnectorDefinition(ref);
-	if (cli?.runtime.type === "cli") return {
+	const definition = getConnectorDefinition(ref);
+	if (definition?.runtime.type === "cli") return {
 		key: `${ref}:default`,
 		target: {
 			type: "connector",
 			connectorId: ref
 		},
-		label: cli.displayName,
-		capabilities: Object.entries(getCliAdapter(cli.runtime.adapterId).curatedActions).filter(([, scope]) => scope === "read").map(([id]) => id)
+		label: definition.displayName,
+		capabilities: Object.entries(getCliAdapter(definition.runtime.adapterId).curatedActions).filter(([, scope]) => scope === "read").map(([id]) => id)
 	};
-	const item = CANDIDATES.find((item) => `composio-${item.toolkit}` === ref);
-	const definition = item ? getConnectorDefinition(ref) : void 0;
-	if (!item || !definition) throw new Error("Unknown connection candidate. Search for a supported app first.");
+	const candidate = definition ? composioCandidate(definition) : void 0;
+	if (!candidate) throw new Error("Unknown connection candidate. Search for a supported app first.");
 	return {
 		key: `${ref}:default`,
 		target: {
 			type: "connector",
 			connectorId: ref
 		},
-		label: definition.displayName,
-		capabilities: item.capabilities
+		label: candidate.label,
+		capabilities: candidate.capabilities
 	};
 }
 //#endregion

package/dist/src/connectors/connection-capabilities.js

@@ -33,7 +33,11 @@ function capabilityActions(need) {
 	return need.capabilities.map((capability) => /^[A-Z]+_/.test(capability) ? [capability] : CAPABILITY_ACTIONS[connectorId]?.[capability] ?? []);
 }
 function missingConnectionCapabilities(need, actions) {
-	return capabilityActions(need).flatMap((alternatives, index) => alternatives.some((action) => actions.has(action)) ? [] : [need.capabilities[index]]);
+	return capabilityActions(need).flatMap((alternatives, index) => {
+		const capability = need.capabilities[index];
+		if (capability === "tools") return actions.size > 0 ? [] : [capability];
+		return alternatives.some((action) => actions.has(action)) ? [] : [capability];
+	});
 }
 //#endregion
 export { capabilityActions, isToolInputSchema, missingConnectionCapabilities };

package/dist/src/connectors/connection-recovery-service.d.ts

@@ -8,11 +8,12 @@ export type ConnectionAction = {
     expectedTranscriptId: string;
     expectedVersion: number;
     idempotencyKey: string;
-    action: 'connect' | 'check' | 'continue' | 'skip' | 'cancel' | 'select_account' | 'confirm_scope' | 'replace_source' | 'submit_callback';
+    action: 'install_complete' | 'connect' | 'check' | 'skip' | 'cancel' | 'select_account' | 'confirm_scope' | 'replace_source' | 'submit_callback';
     needKey?: string;
     accountId?: string;
     candidateRef?: string;
     callbackUrl?: string;
+    instanceId?: string;
 };
 /** Authorization lives at click time. Chat history contains only immutable explanations. */
 export declare class ConnectionRecoveryService {

package/dist/src/connectors/connection-recovery-service.js

@@ -16,8 +16,8 @@ import { getInstalledConnectorDefinition, listConnectorInstances } from "./insta
 import { describeCliAction, verifyCliConnection } from "./cli/runtime.js";
 import { connectorPrincipalForSession } from "./principal.js";
 import { capabilityActions, isToolInputSchema, missingConnectionCapabilities } from "./connection-capabilities.js";
-import { resolveConnectionCandidate } from "./connection-candidates.js";
 import { installConnector } from "./install.js";
+import { resolveConnectionCandidate } from "./connection-candidates.js";
 import { persistConfigMutation } from "../config/config-mutation.js";
 import { HostPluginMcpRecovery } from "./plugin-mcp-recovery.js";
 import { randomUUID } from "node:crypto";
@@ -108,6 +108,32 @@ var ConnectionRecoveryService = class {
 					...availability.reason || need.capabilityError ? { reason: availability.reason ?? need.capabilityError } : {}
 				};
 			}
+			if (need.target.type === "store-connector") {
+				const target = need.target;
+				const instance = listConnectorInstances(this.deps.getConfig()).find((item) => item.connectorId === target.connectorId);
+				const definition = instance ? getInstalledConnectorDefinition(this.deps.getConfig(), instance.instanceId) : void 0;
+				const digestMatches = definition?.provenance?.packageName === target.packageName && definition.provenance.sha256 === target.sha256 && definition.version === target.version;
+				const unhealthy = instance && (!instance.enabled || [
+					"failed",
+					"disabled",
+					"not_configured",
+					"unauthorized",
+					"degraded"
+				].includes(instance.status) || [
+					"missing",
+					"expired",
+					"unauthorized"
+				].includes(instance.authStatus ?? ""));
+				const phase = !instance ? "install" : !digestMatches || unhealthy ? "blocked" : "ready";
+				return {
+					...need,
+					...instance ? { connectionId: instance.instanceId } : {},
+					phase,
+					accounts: [],
+					alternatives: [],
+					...phase === "blocked" ? { reason: !digestMatches ? "The installed Connector does not match the reviewed Store package." : "Connector setup is incomplete. Review its settings and try again." } : {}
+				};
+			}
 			const id = need.target.connectorId;
 			const instance = listConnectorInstances(this.deps.getConfig()).find((instance) => instance.connectorId === id);
 			const installation = getConnectorInstallation(`${id}-${wait.principalId}`);
@@ -193,7 +219,7 @@ var ConnectionRecoveryService = class {
 			}))
 		}, verified).needs;
 		return Promise.all(wait.needs.map(async (need) => {
-			if (need.target.type === "plugin-mcp") return need;
+			if (need.target.type === "plugin-mcp" || need.target.type === "store-connector") return need;
 			if (views.find((view) => view.key === need.key)?.phase !== "ready") return {
 				...need,
 				capabilityError: void 0
@@ -370,6 +396,50 @@ var ConnectionRecoveryService = class {
 					intent: void 0
 				}, "skipped");
 				this.deps.drain(conversationId);
+			} else if (action.action === "install_complete") {
+				const need = wait.needs.find((need) => need.key === action.needKey);
+				if (!need || need.target.type !== "store-connector" || !action.instanceId) throw new Error("Unknown Store Connector installation.");
+				const instance = listConnectorInstances(this.deps.getConfig()).find((item) => item.instanceId === action.instanceId);
+				const definition = instance ? getInstalledConnectorDefinition(this.deps.getConfig(), instance.instanceId) : void 0;
+				if (!instance || instance.connectorId !== need.target.connectorId || !instance.enabled || definition?.provenance?.packageName !== need.target.packageName || definition.provenance.sha256 !== need.target.sha256 || definition.version !== need.target.version) throw new Error("The installed Connector does not match the reviewed package.");
+				if ([
+					"failed",
+					"disabled",
+					"not_configured",
+					"unauthorized",
+					"degraded"
+				].includes(instance.status) || [
+					"missing",
+					"expired",
+					"unauthorized"
+				].includes(instance.authStatus ?? "")) throw new Error("Connector setup is incomplete. Finish setup before continuing.");
+				wait = updateConnectionWait({
+					...wait,
+					needs: wait.needs.map((item) => item.key === need.key ? {
+						...item,
+						connectionId: instance.instanceId,
+						unavailable: false,
+						capabilityError: void 0
+					} : item),
+					intent: {
+						objectiveRevision: wait.objectiveRevision,
+						validUntil: Date.now() + INTENT_TTL
+					}
+				}, wait.version);
+				const view = this.view(wait);
+				if (view.phase === "ready") {
+					queueConnectionResolution({
+						...wait,
+						needs: view.needs.map(({ phase: _phase, accounts: _accounts, reason: _reason, alternatives: _alternatives, ...item }) => item)
+					}, "continued");
+					log.info({
+						conversationId,
+						waitId: wait.id,
+						objectiveRevision: wait.objectiveRevision,
+						phase: "resume_queued"
+					}, "Connector installation continuation queued");
+					this.deps.drain(conversationId);
+				}
 			} else if (action.action === "connect") {
 				const need = wait.needs.find((need) => need.key === action.needKey);
 				if (!need) throw new Error("Unknown connection requirement.");
@@ -498,6 +568,18 @@ var ConnectionRecoveryService = class {
 				if (!latest || latest.version !== wait.version || latest.status !== "open") throw new Error("WAIT_CHANGED");
 				let needs = wait.needs.map((need) => {
 					if (need.target.type === "plugin-mcp") return need;
+					if (need.target.type === "store-connector") {
+						const selected = this.view({
+							...wait,
+							needs
+						}).needs.find((item) => item.key === need.key);
+						return selected?.phase === "ready" ? {
+							...need,
+							connectionId: selected.connectionId,
+							unavailable: false,
+							capabilityError: void 0
+						} : need;
+					}
 					const id = need.target.connectorId;
 					const authorized = fresh.find((item) => item.providerConnectionId === need.attempt?.connectionId && item.status === "active" && item.connectorId === id && (!need.accountId || item.accountId === need.accountId));
 					return authorized ? {
@@ -540,7 +622,10 @@ var ConnectionRecoveryService = class {
 					needs
 				}, verified);
 				if (getConnectionWait(wait.id)?.version !== wait.version) throw new Error("WAIT_CHANGED");
-				const explicitContinue = action.action === "continue" || action.action === "confirm_scope";
+				const readyWithoutReview = this.view({
+					...wait,
+					needs
+				}, verified).phase === "ready";
 				wait = updateConnectionWait({
 					...wait,
 					needs,
@@ -548,7 +633,7 @@ var ConnectionRecoveryService = class {
 						scopeConfirmedAt: Date.now(),
 						reviewRequired: false
 					} : {},
-					...needs.some((need) => need.capabilityError) ? { intent: void 0 } : explicitContinue ? { intent: {
+					...needs.some((need) => need.capabilityError) ? { intent: void 0 } : readyWithoutReview || action.action === "confirm_scope" ? { intent: {
 						objectiveRevision: wait.objectiveRevision,
 						validUntil: Date.now() + INTENT_TTL
 					} } : {}

package/dist/src/discussions/analyzer.js

@@ -188,7 +188,7 @@ async function analyzeDiscussion(input) {
 			maxTokens: 8e3,
 			temperature: .1,
 			signal: input.signal
-		})).content)));
+		}, void 0, { operation: "discussion.analyze" })).content)));
 		validateDiscussionEvidence(organization, new Set(batch.map((segment) => segment.sequence)));
 		organization.chapters = [{
 			title: organization.title,
@@ -234,7 +234,7 @@ async function analyzeDiscussion(input) {
 			maxTokens: 2e3,
 			temperature: 0,
 			signal: input.signal
-		});
+		}, void 0, { operation: "discussion.analyze" });
 		const parsed = MeetingChangesSchema.parse(parseJsonObject(extractText(response.content)));
 		if (parsed.changes.some((change) => change.fromId === change.toId || !earlier.some((item) => item.id === change.fromId) || !later.some((item) => item.id === change.toId))) throw new Error("Invalid meeting change evidence");
 		getSqliteDatabase().prepare("INSERT OR REPLACE INTO discussion_analysis_chunks (discussion_id,input_hash,result_json) VALUES (?,?,?)").run(input.discussionId, cacheKey, JSON.stringify(parsed));
@@ -260,7 +260,7 @@ async function analyzeDiscussion(input) {
 				maxTokens: 2e3,
 				temperature: .1,
 				signal: input.signal
-			});
+			}, void 0, { operation: "discussion.analyze" });
 			return z.object({
 				title: z.string().min(1).max(200),
 				summary: z.string().min(1).max(2e3)
@@ -295,7 +295,7 @@ async function enrichLiveDiscussion(input) {
 		maxTokens: 400,
 		temperature: .1,
 		signal: input.signal
-	});
+	}, void 0, { operation: "discussion.analyze" });
 	return {
 		modelRef,
 		...LiveEnrichmentSchema.parse(parseJsonObject(extractText(response.content)))

package/dist/src/execution-environments/local-worktree-manager.js

@@ -94,7 +94,9 @@ var LocalWorktreeManager = class {
 		const rootPath = resolveManagedWorktreePath(input.projectId, environmentId, this.stateDir);
 		assertManagedWorktreePath(rootPath, this.stateDir, repository.repositoryRoot);
 		if (existsSync(rootPath)) throw new ExecutionEnvironmentConflictError(`Worktree path already exists: ${rootPath}`);
-		const environment = this.store.create({
+		const reserved = this.store.get(environmentId);
+		if (reserved && (reserved.status !== "error" || reserved.projectId !== input.projectId || reserved.rootPath !== rootPath || reserved.baseSha !== baseSha || reserved.kind !== "managed_worktree")) throw new ExecutionEnvironmentConflictError("Reserved worktree cannot be provisioned with these parameters");
+		const environment = reserved ?? this.store.create({
 			id: environmentId,
 			projectId: input.projectId,
 			kind: "managed_worktree",
@@ -210,6 +212,13 @@ var LocalWorktreeManager = class {
 				reason: "managed worktree reconciliation succeeded"
 			});
 		}
+		if (environment.status === "provisioning" && !inspection.rootExists && !inspection.registered) return this.store.transition({
+			environmentId,
+			expectedVersion: environment.version,
+			toStatus: "error",
+			reason: "interrupted provisioning has no filesystem or Git side effects",
+			error: "Provisioning was interrupted"
+		});
 		if (environment.status === "degraded" || environment.status === "error") return environment;
 		if (environment.status !== "ready" && environment.status !== "provisioning") throw new ExecutionEnvironmentConflictError(`Cannot reconcile managed worktree ${environmentId} while ${environment.status}`);
 		return this.store.transition({

package/dist/src/execution-environments/session-environment-service.d.ts

@@ -16,7 +16,10 @@ export declare class SessionEnvironmentService {
         project: Project;
         mode?: ProjectExecutionMode;
         baseRef?: string;
+        environmentId?: string;
+        assertCurrent?: () => void;
     }): Promise<ExecutionEnvironment>;
     release(conversationId: string, removeManaged?: boolean): Promise<ExecutionEnvironment | undefined>;
+    removeUnboundReservation(environmentId: string): Promise<boolean>;
     private resolveLocalCheckout;
 }

package/dist/src/execution-environments/session-environment-service.js

@@ -25,19 +25,35 @@ var SessionEnvironmentService = class {
 		}
 		const workspaceRoot = input.project.workspaceRoot?.trim();
 		if (!workspaceRoot) throw new ExecutionEnvironmentConflictError(`Project ${input.project.id} needs a fixed workspace before an execution environment can be created`);
-		const environment = (input.mode ?? input.project.executionMode) === "managed_worktree" ? await this.worktrees.provisionManagedWorktree({
+		const mode = input.mode ?? input.project.executionMode;
+		const reserved = input.environmentId ? this.store.get(input.environmentId) : void 0;
+		if (reserved && (reserved.projectId !== input.project.id || reserved.kind !== mode)) throw new ExecutionEnvironmentConflictError("Reserved execution environment does not match the project and mode");
+		let recovered = reserved?.kind === "managed_worktree" ? await this.worktrees.reconcile(reserved.id).catch((error) => {
+			if (reserved.status === "error") return reserved;
+			throw error;
+		}) : reserved;
+		if (recovered?.kind === "managed_worktree" && recovered.status === "error") recovered = await this.worktrees.provisionManagedWorktree({
+			projectId: input.project.id,
+			repositoryPath: workspaceRoot,
+			baseRef: input.baseRef,
+			environmentId: recovered.id
+		});
+		if (recovered && recovered.status !== "ready") throw new ExecutionEnvironmentConflictError(`Execution environment ${recovered.id} is ${recovered.status}`);
+		const environment = recovered ?? (mode === "managed_worktree" ? await this.worktrees.provisionManagedWorktree({
 			projectId: input.project.id,
 			repositoryPath: workspaceRoot,
-			baseRef: input.baseRef
-		}) : await this.resolveLocalCheckout(input.project.id, workspaceRoot);
+			baseRef: input.baseRef,
+			environmentId: input.environmentId
+		}) : await this.resolveLocalCheckout(input.project.id, workspaceRoot));
 		try {
+			input.assertCurrent?.();
 			this.store.bind({
 				conversationId: input.conversationId,
 				environmentId: environment.id
 			});
 			return environment;
 		} catch (error) {
-			if (environment.kind === "managed_worktree") await this.worktrees.remove(environment.id).catch(() => void 0);
+			if (environment.kind === "managed_worktree" && !input.assertCurrent) await this.worktrees.remove(environment.id).catch(() => void 0);
 			throw error;
 		}
 	}
@@ -49,6 +65,14 @@ var SessionEnvironmentService = class {
 		else this.store.releaseBinding(conversationId, binding.environmentId);
 		return environment;
 	}
+	async removeUnboundReservation(environmentId) {
+		const environment = this.store.get(environmentId);
+		if (!environment) return false;
+		if (environment.status === "deleted") return true;
+		if (environment.kind !== "managed_worktree" || this.store.listBindings(environmentId).length) throw new ExecutionEnvironmentConflictError("Reserved environment is not an unbound managed worktree");
+		await this.worktrees.remove(environmentId);
+		return true;
+	}
 	async resolveLocalCheckout(projectId, workspaceRoot) {
 		const rootPath = resolve(workspaceRoot);
 		const existing = this.store.list({

package/dist/src/extensions/agent-plugins/validation.js

@@ -1,8 +1,8 @@
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { existsSync, lstatSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import { z } from "zod";
-import { validateHeaderName, validateHeaderValue } from "node:http";
 import yaml from "js-yaml";
+import { validateHeaderName, validateHeaderValue } from "node:http";
 //#region src/extensions/agent-plugins/validation.ts
 const PLUGIN_SCHEMA = "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json";
 const MCP_SCHEMA = "https://agent-plugins.org/schemas/1.0.0/mcp.schema.json";

package/dist/src/extensions/update.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { init_paths, resolveBundledExtensionsDir, resolveExtensionsDir } from "../config/paths.js";
-import { computeExtensionDirectoryIntegrity, getExtensionLockfileManager } from "./lockfile.js";
 import { downloadExtensionStoreZipBuffer, resolveExtensionZipDownloadUrl, resolveExtensionsStoreBaseUrl, verifyStoreArtifactSha256 } from "../agent/skills/marketplace/adapters/store/store-api-client.js";
+import { computeExtensionDirectoryIntegrity, getExtensionLockfileManager } from "./lockfile.js";
 import { loadConfig } from "../config/loader.js";
 import { commitStagedExtensionInstall, finalizeStagedExtensionInstall, rollbackStagedExtensionInstall, stageExtensionNpm, stageExtensionStoreZip } from "./install-transaction.js";
 import { findExtension } from "./marketplace.js";

package/dist/src/gateway/agent-builtin-tools.d.ts

@@ -277,4 +277,4 @@ export declare const GATEWAY_BUILTIN_TOOLS: readonly [{
         readonly zh: "使用已验证的参数执行选定的外部工具。";
     };
 }];
-export declare const GATEWAY_BUILTIN_TOOL_IDS: ("automation" | "workflow" | "find" | "image" | "knowledge_search" | "knowledge_get" | "knowledge_write" | "user_context_search" | "user_context_get" | "user_context_update" | "web_search" | "web_fetch" | "browser_use" | "grep" | "session_search" | "read_file" | "list_dir" | "write_file" | "apply_patch" | "exec_command" | "update_plan" | "todo" | "clarify" | "xopc_tool_execute" | "computer_use" | "tool_manual" | "web_extract" | "image_generate" | "skills_list" | "skill_view" | "skill_manage" | "skills_marketplace_search" | "session_status" | "send_message" | "send_media" | "delegate_task" | "skill_install" | "text_to_speech" | "create_share" | "xopc_tool_search" | "xopc_tool_describe" | "read_media" | "memory_maintenance" | "execute_code" | "create_desktop_pet")[];
+export declare const GATEWAY_BUILTIN_TOOL_IDS: ("automation" | "workflow" | "find" | "image" | "knowledge_search" | "knowledge_get" | "knowledge_write" | "user_context_search" | "user_context_get" | "user_context_update" | "web_search" | "web_fetch" | "browser_use" | "grep" | "session_search" | "read_file" | "list_dir" | "write_file" | "apply_patch" | "exec_command" | "update_plan" | "todo" | "clarify" | "xopc_tool_execute" | "web_extract" | "image_generate" | "skills_list" | "skill_view" | "skill_manage" | "skills_marketplace_search" | "xopc_tool_search" | "xopc_tool_describe" | "send_message" | "send_media" | "read_media" | "create_share" | "session_status" | "memory_maintenance" | "computer_use" | "tool_manual" | "delegate_task" | "skill_install" | "text_to_speech" | "execute_code" | "create_desktop_pet")[];