@xopcai/xopc 0.0.383 → 0.0.385

package/dist/src/computer/runtime.js

@@ -1,12 +1,12 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { resolveEffectiveAgentConfigForSession } from "../config/agent-profile.js";
 import { COMPUTER_CONTROL_TOOL, ComputerAppSchema, ComputerObservationSchema, ComputerWindowSchema, init_src } from "../../packages/computer-control-contract/src/index.js";
 import { ComputerServiceLimitsSchema, computerModelProfile, init_model_policy } from "./model-policy.js";
 import { getApiKey, init_providers, resolveModel } from "../providers/index.js";
 import { rejectUnbudgetedCloudTransport } from "../providers/xopc-cloud-credit-budget.js";
-import { resolveEffectiveAgentConfigForSession } from "../config/agent-profile.js";
-import { ComputerDiagnosticSchema, ComputerOperationError, computerDiagnostic, computerRecovery } from "./errors.js";
 import { enterComputerControl, leaveComputerControl } from "./control-guard.js";
+import { ComputerDiagnosticSchema, ComputerOperationError, computerDiagnostic, computerRecovery } from "./errors.js";
 import { createComputerModelAdapter, predictComputerStep, readComputerJson } from "./model-adapter.js";
 import { ComputerExpectationSchema, ComputerTaskState, verifyComputerExpectation } from "./task-state.js";
 import { randomUUID } from "node:crypto";

package/dist/src/config/agent-model-intents.js

@@ -1,7 +1,7 @@
 import { ModelIntentSchema } from "../agent-config/schema.js";
 import { init_agent_config } from "../agent-config/index.js";
-import { init_schema, parseModelRef } from "./schema.js";
 import { resolveEffectiveAgentConfigForAgent } from "./agent-profile.js";
+import { init_schema, parseModelRef } from "./schema.js";
 //#region src/config/agent-model-intents.ts
 init_agent_config();
 init_schema();

package/dist/src/config/index.js

@@ -2,23 +2,23 @@ import { ENV_VARS, XOPC_DB_FILENAME, resolveHomeDir, resolveStateDir, resolveXop
 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 { 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, 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, TunnelBrokerUrlSchema, 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 { 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, resolveModelsJsonPath, resolveNodeBinDir, resolveNodeBinPath, resolveNodeToolsDir, resolveNpmBinPath, resolveOAuthPath, resolvePidPath, resolveSkillPath, resolveSkillsCachePath, resolveSkillsDir, resolveSkillsLockPath, resolveSocketPath, resolveStatusPath, resolveToolsDir, resolveWorkspaceExtensionsDir, resolveWorkspaceFile, resolveWorkspaceStateDir, resolveWorkspaceStatePath, resolveXopcBinPath } from "./paths.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 { assertConfigRewriteSafeForRunningGateway, loadConfig, saveConfig } from "./loader.js";
-import { extractProfileAgentId, resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession, resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "./agent-profile.js";
-import { formatThinkingLevels, listThinkingLevels, normalizeElevatedMode, normalizeReasoningLevel, normalizeThinkLevel, normalizeVerboseLevel, thinkLevelToNumber } from "../agent/transcript/thinking-types.js";
 import { getWorkspacePath } from "./workspace-path-helpers.js";
+import { applyConfigOverrides, getConfigOverrides, resetConfigOverrides, setConfigOverride, unsetConfigOverride } from "./runtime-overrides.js";
+import { canonicalizeConfiguredMcpServer, normalizeConfiguredMcpServers } 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";
 import { listAgentProfileMarkdownDirs, listAgentWorkspaceDirs } from "./workspace-dirs.js";
 import { ProfileManager, createProfile, deleteProfile, getCurrentProfile, getProfileManager, getProfileNameFromDir, getSwitchCommand, listProfiles, resolveProfileStateDir } from "./profile.js";
 import { diffConfigPaths } from "./diff.js";
 import { BASE_RELOAD_RULES, buildReloadPlan, matchReloadRule } from "./rules.js";
 import { ConfigHotReloader } from "./reload.js";
-import { applyConfigOverrides, getConfigOverrides, resetConfigOverrides, setConfigOverride, unsetConfigOverride } from "./runtime-overrides.js";
-import { canonicalizeConfiguredMcpServer, normalizeConfiguredMcpServers } from "./mcp-config-normalize.js";
 //#region src/config/index.ts
 init_schema();
 init_paths();

package/dist/src/config/loader.js

@@ -4,8 +4,8 @@ import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-ato
 import { ConfigSchema, init_schema } from "./schema.js";
 import { init_paths, resolveConfigPath } from "./paths.js";
 import { init_resolution, setActivePlatformDiscovery } from "../platform/resolution.js";
-import { isGatewayConfigLockedByAnotherProcessSync } from "../gateway/lock.js";
 import { assertChannelPluginConfigs } from "./validate-channel-configs.js";
+import { isGatewayConfigLockedByAnotherProcessSync } from "../gateway/lock.js";
 import { dirname } from "path";
 import { existsSync, mkdirSync, promises, readFileSync } from "fs";
 import { config } from "dotenv";

package/dist/src/config/schema.js

@@ -3,9 +3,9 @@ import { AgentModelsOverrideSchema, ImageGenerationRouteSchema, ModelRouteSchema
 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 { TracingConfigSchema, init_config } from "../observability/config.js";
-import { ComputerConfigSchema, init_config as init_config$1 } from "../computer/config.js";
-import { DEFAULT_CONTEXT_COMPACTION_POLICY, UserContextConfigSchema, init_config as init_config$2 } from "../user-context/config.js";
+import { DEFAULT_CONTEXT_COMPACTION_POLICY, UserContextConfigSchema, init_config } from "../user-context/config.js";
+import { TracingConfigSchema, init_config as init_config$1 } from "../observability/config.js";
+import { ComputerConfigSchema, init_config as init_config$2 } from "../computer/config.js";
 import { init_public_url, validatePublicUrl } from "./public-url.js";
 import { PlatformConfigSchema, init_contracts } from "../platform/contracts.js";
 import { TelegramAccountConfigSchema, TelegramConfigSchema, TelegramGroupConfigSchema, TelegramTopicConfigSchema, init_config_schema } from "../../extensions/telegram/src/config-schema.js";
@@ -44,11 +44,11 @@ function parseModelRef(ref) {
 }
 var AgentModelRefSchema, AgentImageGenerationModelSchema, AgentModelsSchema, BrowserDriverSchema, BrowserHostnameSchema, BrowserConfigSchema, SessionDmScopeSchema, SessionStorageConfigSchema, SessionResetModeSchema, SessionResetConfigSchema, SessionResetByTypeSchema, SessionScopeSchema, SessionConfigSchema, ChannelsConfigSchema, SearchProviderEntrySchema, WebSearchConfigSchema, WebsiteBlocklistSchema, WebToolsConfigSchema, ToolsConfigSchema, RuntimePreferenceSchema, RuntimeProvisionSchema, RuntimeVersionRequestSchema, LanguageRuntimeSchema, DEFAULT_RUNTIME_TOOLS_CONFIG, RuntimeToolsConfigSchema, GatewayAuthRateLimitSchema, GatewaySecuritySchema, GatewayTrustedProxySchema, GatewayAuthSchema, GatewayTailscaleConsentSchema, GatewayTailscaleSchema, GatewayRemoteSchema, GatewayTlsSchema, GatewayModeSchema, GatewayChannelConnectDeferModeSchema, TunnelConsentSchema, TunnelBrokerUrlSchema, TunnelConfigSchema, WorkspaceImportConfigSchema, WorkspaceConfigSchema, GatewayBindModeSchema, GatewayWebchatConfigSchema, GatewayScenesConfigSchema, GatewayConfigSchema, ModelsDevConfigSchema, ModelCatalogConfigSchema, SttProviderConfigCatchallSchema, STTProviderConfigSchema, STTFallbackConfigSchema, MediaUnderstandingCapabilitiesSchema, MediaUnderstandingModelSchema, STTConfigSchema, TtsProviderConfigCatchallSchema, TTSProviderConfigSchema, TTSFallbackConfigSchema, TTSModelOverridesConfigSchema, TTSEdgeConfigSchema, TTSSummarizationConfigSchema, TTSConfigSchema, VoiceRefinementConfigSchema, VoiceConfigSchema, MessagesConfigSchema, ToolsMediaAudioConfigSchema, ToolsMediaConfigSchema, ProviderAzureConfigSchema, ProviderRequestOverridesSchema, ProviderAuthConfigSchema, ProvidersConfigSchema, ExtensionSecurityConfigSchema, ExtensionSlotsConfigSchema, ExtensionsConfigSchema, UpdateAutoConfigSchema, UpdateConfigSchema, CommandsConfigSchema, McpHttpUrlSchema, ConnectorSecretReferenceSchema, McpConfigScalarSchema, McpExposureSchema, McpOAuthConfigSchema, McpServerSchema, McpConfigSchema, ConnectorsConfigSchema, ExperimentalConfigSchema, ConfigSchema;
 var init_schema = __esmMin((() => {
-	init_config();
 	init_config$1();
+	init_config$2();
 	init_agent_config();
 	init_repository();
-	init_config$2();
+	init_config();
 	init_public_url();
 	init_contracts();
 	init_config_schema();

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

@@ -2,9 +2,9 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { getConnectorAccount, init_connector_account_repository } from "../../storage/sqlite/connector-account-repository.js";
 import { getConnectorConnection, getConnectorInstallation, init_connector_repository, upsertConnectorInstallation } from "../../storage/sqlite/connector-repository.js";
+import { cliContextPath, startCliProcess } from "./process.js";
 import { getCliAdapter } from "./adapterRegistry.js";
 import { getConnectorInstance, getInstalledConnectorDefinition } from "../instances.js";
-import { cliContextPath, startCliProcess } from "./process.js";
 import { installCli } from "./installer.js";
 import { cliAuthorizationView, commitCliIdentity, createCliAuthorization, readCliAuthorization, updateCliAuthorization } from "./store.js";
 import { join, relative } from "node:path";

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

@@ -1,6 +1,6 @@
 import { getConnectorAccount, init_connector_account_repository } from "../../storage/sqlite/connector-account-repository.js";
-import { normalizeCliResult, parseJson, validateActionInput } from "./protocol.js";
 import { startCliProcess } from "./process.js";
+import { normalizeCliResult, parseJson, validateActionInput } from "./protocol.js";
 import { verifyInstalledCli } from "./installer.js";
 import { requireCliInstance } from "./authorization.js";
 //#region src/connectors/cli/runtime.ts

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

@@ -4,11 +4,11 @@ import { getSqliteDatabase, init_transaction } from "../storage/sqlite/transacti
 import { getConnectorAccount, init_connector_account_repository, reconcileConnectorAccount } from "../storage/sqlite/connector-account-repository.js";
 import { appendConnectorExecutionAudit, getConnectorConnection, getConnectorInstallation, init_connector_repository, listConnectorConnections, upsertConnectorConnection } from "../storage/sqlite/connector-repository.js";
 import { CredentialResolver, init_credentials } from "../auth/credentials.js";
+import { canAccessConnectorAccount } from "./account-access.js";
 import { ensureComposioBackend, getComposioBackend, listComposioBackends, resolveBackendKey } from "./composio-backends.js";
 import { saveAuthorizationAttempt } from "./authorization-attempts.js";
 import { connectorIdentityKey, mergeConnectorIdentity } from "./connector-identity.js";
 import { evaluateConnectorExecutionPolicy } from "./policy.js";
-import { canAccessConnectorAccount } from "./account-access.js";
 import { createHash } from "node:crypto";
 //#region src/connectors/composio-sessions.ts
 init_credentials();

package/dist/src/connectors/composio.js

@@ -1,9 +1,9 @@
 import { getConnectorAccount, init_connector_account_repository, refreshConnectorAccountCurrent, updateConnectorAccount } from "../storage/sqlite/connector-account-repository.js";
 import { getConnectorConnection, getConnectorInstallation, init_connector_repository, listConnectorConnections, upsertConnectorActionMetadata, upsertConnectorConnection, upsertConnectorInstallation } from "../storage/sqlite/connector-repository.js";
 import { CredentialResolver, init_credentials } from "../auth/credentials.js";
+import { canAccessConnectorAccount, currentAccountConnections } from "./account-access.js";
 import { activateComposioBackend, addComposioBackend, ensureComposioBackend, getComposioBackend, listComposioBackends, markComposioBackendVerified, resolveBackendKey } from "./composio-backends.js";
 import { connectorIdentityKey } from "./connector-identity.js";
-import { canAccessConnectorAccount, currentAccountConnections } from "./account-access.js";
 import { ComposioSessionsAdapter, assertComposioAccessConfigured } from "./composio-sessions.js";
 import { getConnectorLearningPlan } from "./learning-recipes.js";
 import { COMPOSIO_AGENT_READY_TOOLKITS, COMPOSIO_TOOLKIT_DISPLAY_NAMES, connectorDefinitionFromComposioToolkit } from "./composio-catalog.js";

package/dist/src/connectors/connected-source-ingestion.js

@@ -2,17 +2,17 @@ import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { getConnectorInstallation, listConnectorConnections } from "../storage/sqlite/connector-repository.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
+import { getActiveUnderstandingConsent, grantUnderstandingConsent } from "../user-context/sources/consent-repository.js";
+import { listUnderstandingSourceGrants, upsertUnderstandingSourceGrant } from "../user-context/sources/repository.js";
+import { ConnectedKnowledgePipeline } from "../knowledge/connected-knowledge-pipeline.js";
+import { getWorkspacePath } from "../config/workspace-path-helpers.js";
 import { canAccessConnectorAccount, currentAccountConnections } from "./account-access.js";
 import { ComposioSessionsAdapter } from "./composio-sessions.js";
 import { decodeConnectedSourceCursor, encodeConnectedSourceCursor } from "./connected-source-cursor.js";
 import { scopeForComposioAction } from "./composio.js";
 import { getConnectorDefinition } from "./catalog.js";
 import { getConnectorInstance } from "./instances.js";
-import { getActiveUnderstandingConsent, grantUnderstandingConsent } from "../user-context/sources/consent-repository.js";
-import { getWorkspacePath } from "../config/workspace-path-helpers.js";
-import { listUnderstandingSourceGrants, upsertUnderstandingSourceGrant } from "../user-context/sources/repository.js";
 import { KnowledgeIngestionService } from "../knowledge/ingestion-service.js";
-import { ConnectedKnowledgePipeline } from "../knowledge/connected-knowledge-pipeline.js";
 import { LocalFolderKnowledgeSourceAdapter } from "../knowledge/local-folder-adapter.js";
 import "../knowledge/index.js";
 import { normalizeConnectedSourceResult } from "./connected-source-normalizers.js";

package/dist/src/connectors/connected-source-understanding.js

@@ -4,15 +4,15 @@ import { finishContextExtractionRun } from "../storage/sqlite/context-extraction
 import { createContextEvidence, init_context_evidence_repository } from "../storage/sqlite/context-evidence-repository.js";
 import { getKnowledgeSourceItem } from "../storage/sqlite/knowledge-repository.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
-import { reconcileAssertion } from "../user-model/repository.js";
 import { getActiveUnderstandingConsent } from "../user-context/sources/consent-repository.js";
-import "../user-model/index.js";
 import { getUnderstandingSourceRun } from "../user-context/sources/repository.js";
-import { consentFilteredText } from "../user-context/sources/consent-fields.js";
 import { writeKnowledgeItem } from "../knowledge-memory/repository.js";
 import "../knowledge-memory/index.js";
-import { recordConnectedSourceObservations } from "./connected-source-observations.js";
+import { consentFilteredText } from "../user-context/sources/consent-fields.js";
 import { claimRegisteredExtraction } from "../user-context/extraction/registry.js";
+import { reconcileAssertion } from "../user-model/repository.js";
+import "../user-model/index.js";
+import { recordConnectedSourceObservations } from "./connected-source-observations.js";
 import { allowsRemoteSourceProcessing } from "../user-context/sources/processing-policy.js";
 import { analyzeUnderstandingSources } from "../work-discovery/analyzer.js";
 import { createHash } from "node:crypto";

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

@@ -7,6 +7,7 @@ export type ConnectionAction = {
     expectedTranscriptId: string;
     expectedVersion: number;
     idempotencyKey: string;
+    expectedObjectiveRevision?: number;
     action: 'install_complete' | 'connect' | 'check' | 'skip' | 'cancel' | 'select_account' | 'confirm_scope' | 'replace_source';
     needKey?: string;
     accountId?: string;
@@ -17,6 +18,7 @@ export type ConnectionAction = {
 export declare class ConnectionRecoveryService {
     private readonly deps;
     private readonly busy;
+    private readonly checks;
     private timer?;
     private deliveryTimer?;
     private polling;
@@ -32,8 +34,12 @@ export declare class ConnectionRecoveryService {
         drain: (conversationId: string) => void;
         onPersonalRequestDelivered?: (conversationId: string, requestId: string) => void;
         adapter?: ComposioSessionsAdapter;
+        checkTimeoutMs?: number;
     });
     private get adapter();
+    private markChecking;
+    /** Readiness checks never execute the objective; late results cannot advance a newer wait. */
+    private boundedCheck;
     snapshot(conversationId: string): ConnectionWaitSnapshot;
     private view;
     private ensureInstallation;

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

@@ -1,27 +1,27 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { getSqliteDatabase, init_transaction } from "../storage/sqlite/transaction.js";
+import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
 import { readCurrentTranscriptId } from "../storage/sqlite/session-instance-repository.js";
 import { getSessionInputState, init_session_input_repository } from "../storage/sqlite/session-input-repository.js";
 import { init_request_repository, personalRequestForWait } from "../personal-agent/request-repository.js";
 import { getConnectorAccount, init_connector_account_repository } from "../storage/sqlite/connector-account-repository.js";
 import { getConnectorConnection, getConnectorInstallation, init_connector_repository, listConnectorConnections, upsertConnectorInstallation } from "../storage/sqlite/connector-repository.js";
-import { cancelConnectionObjective, getActiveConnectionWait, getConnectionWait, init_connection_wait_repository, listConnectionWaitsToCheck, publishConnectionWait, queueConnectionResolution, updateConnectionWait } from "../storage/sqlite/connection-wait-repository.js";
+import { cancelConnectionObjective, getActiveConnectionWait, getConnectionWait, init_connection_wait_repository, listConnectionWaitsToCheck, publishConnectionWait, queueConnectionResolution, reconcileConnectionWaits, updateConnectionWait } from "../storage/sqlite/connection-wait-repository.js";
 import { init_session_repository } from "../storage/sqlite/session-repository.js";
-import { getCliAdapter } from "./cli/adapterRegistry.js";
 import { canAccessConnectorAccount, currentAccountConnections } from "./account-access.js";
+import { getCliAdapter } from "./cli/adapterRegistry.js";
 import { ComposioSessionsAdapter } from "./composio-sessions.js";
 import { getConfiguredComposioAuthConfigs, isComposioActionAllowedByCatalog, scopeForComposioAction } from "./composio.js";
 import { getConnectorDefinition } from "./catalog.js";
 import { getInstalledConnectorDefinition, listConnectorInstances } from "./instances.js";
-import { installConnector } from "./install.js";
-import { persistConfigMutation } from "../config/config-mutation.js";
-import { resolveConnectionCandidate } from "./connection-candidates.js";
-import { capabilityActions, isToolInputSchema, missingConnectionCapabilities } from "./connection-capabilities.js";
 import { describeCliAction, verifyCliConnection } from "./cli/runtime.js";
-import { drainPersonalRequestContinuations, drainPersonalRequestResults } from "../personal-agent/request-delivery.js";
 import { connectorPrincipalForSession } from "./principal.js";
+import { capabilityActions, isToolInputSchema, missingConnectionCapabilities } from "./connection-capabilities.js";
+import { installConnector } from "./install.js";
+import { resolveConnectionCandidate } from "./connection-candidates.js";
 import { cancelPersonalRequest, resolvePersonalRequestConnection } from "../personal-agent/request-service.js";
+import { persistConfigMutation } from "../config/config-mutation.js";
+import { drainPersonalRequestContinuations, drainPersonalRequestResults } from "../personal-agent/request-delivery.js";
 import { randomUUID } from "node:crypto";
 //#region src/connectors/connection-recovery-service.ts
 init_transaction();
@@ -46,6 +46,7 @@ function isConnectorNeed(need) {
 /** Authorization lives at click time. Chat history contains only immutable explanations. */
 var ConnectionRecoveryService = class {
 	busy = /* @__PURE__ */ new Set();
+	checks = /* @__PURE__ */ new Map();
 	timer;
 	deliveryTimer;
 	polling = false;
@@ -67,6 +68,7 @@ var ConnectionRecoveryService = class {
 		this.timer = void 0;
 		clearInterval(this.deliveryTimer);
 		this.deliveryTimer = void 0;
+		for (const controller of this.checks.values()) controller.abort(/* @__PURE__ */ new Error("Connection check stopped"));
 	}
 	async poll() {
 		if (this.polling) return;
@@ -74,6 +76,7 @@ var ConnectionRecoveryService = class {
 		try {
 			drainPersonalRequestContinuations(this.deps.onPersonalRequestDelivered);
 			drainPersonalRequestResults(this.deps.onPersonalRequestDelivered);
+			for (const conversationId of reconcileConnectionWaits()) this.deps.drain(conversationId);
 			for (const wait of listConnectionWaitsToCheck()) {
 				if (this.busy.has(wait.conversationId)) continue;
 				await this.act(wait.conversationId, {
@@ -94,6 +97,37 @@ var ConnectionRecoveryService = class {
 	get adapter() {
 		return this.deps.adapter ?? new ComposioSessionsAdapter();
 	}
+	markChecking(wait, phase) {
+		const next = updateConnectionWait({
+			...wait,
+			checking: {
+				phase,
+				startedAt: Date.now()
+			},
+			recoveryError: void 0
+		}, wait.version);
+		publishConnectionWait(wait.conversationId);
+		return next;
+	}
+	/** Readiness checks never execute the objective; late results cannot advance a newer wait. */
+	async boundedCheck(waitId, operation) {
+		const controller = new AbortController();
+		this.checks.set(waitId, controller);
+		const timeout = setTimeout(() => controller.abort(/* @__PURE__ */ new Error("Connection check timed out. The objective is preserved.")), this.deps.checkTimeoutMs ?? 3e4);
+		timeout.unref();
+		let onAbort = () => {};
+		try {
+			return await Promise.race([operation(), new Promise((_resolve, reject) => {
+				onAbort = () => reject(controller.signal.reason);
+				controller.signal.addEventListener("abort", onAbort, { once: true });
+				if (controller.signal.aborted) onAbort();
+			})]);
+		} finally {
+			clearTimeout(timeout);
+			controller.signal.removeEventListener("abort", onAbort);
+			if (this.checks.get(waitId) === controller) this.checks.delete(waitId);
+		}
+	}
 	snapshot(conversationId) {
 		if (!connectorPrincipalForSession(conversationId).isLocalOwner) throw new Error("This connection belongs to another principal.");
 		const transcriptId = readCurrentTranscriptId(getSqliteDatabase(), conversationId);
@@ -175,7 +209,11 @@ var ConnectionRecoveryService = class {
 				phase,
 				accounts: active.map((connection) => ({
 					id: connection.accountId,
-					label: [getConnectorAccount(connection.accountId)?.label, connection.identity.email ?? connection.identity.name ?? connection.accountId].filter(Boolean).join(" · ")
+					label: [...new Set([
+						getConnectorAccount(connection.accountId)?.label,
+						connection.identity.workspace,
+						connection.identity.email ?? connection.identity.username ?? connection.identity.displayName ?? connection.identity.name ?? connection.accountId
+					].filter(Boolean))].join(" · ")
 				})),
 				...need.capabilityError && selected ? { reason: need.capabilityError } : {},
 				...blocked ? { reason: scopeBlocked ? "This action needs broader permissions. Review connector permissions in settings." : "This app is disabled or unavailable to the current agent. Review connector settings." } : {}
@@ -184,11 +222,14 @@ var ConnectionRecoveryService = class {
 		const ready = needs.every((need) => need.phase === "ready");
 		const review = wait.reviewRequired || Date.now() - wait.createdAt > INTENT_TTL && !wait.scopeConfirmedAt;
 		const { intent: _intent, checkpoint: _checkpoint, ...visible } = wait;
+		const runtime = getSessionInputState(wait.conversationId);
 		return {
 			...visible,
 			needs,
 			timeRange: wait.checkpoint.timeRange,
-			phase: wait.status === "queued" ? "queued" : ready ? review ? "review_scope" : "ready" : "needs_connection"
+			phase: wait.status === "queued" ? "queued" : wait.checking || wait.recoveryError ? "needs_connection" : ready ? review ? "review_scope" : "ready" : "needs_connection",
+			recoveryStage: wait.checking ? wait.checking.phase === "connection" ? "checking_connection" : "checking_tools" : wait.status === "queued" ? "queued" : void 0,
+			queueBlocked: wait.status === "queued" && Boolean(runtime.activeInputId && runtime.activeInputId !== wait.queuedInputId)
 		};
 	}
 	async ensureInstallation(wait, connectorId) {
@@ -300,27 +341,52 @@ var ConnectionRecoveryService = class {
 	}
 	async preflight(input) {
 		if (input.kind !== "connection_resume") return true;
-		const wait = input.payload ? getConnectionWait(input.payload.waitId) : void 0;
-		if (!wait || wait.status !== "queued" || wait.queuedInputId !== input.id || wait.transcriptId !== readCurrentTranscriptId(getSqliteDatabase(), input.conversationId)) return false;
+		let wait = input.payload ? getConnectionWait(input.payload.waitId) : void 0;
+		if (!wait || wait.status !== "queued" || wait.queuedInputId !== input.id || wait.objectiveRevision !== input.payload?.objectiveRevision || wait.transcriptId !== readCurrentTranscriptId(getSqliteDatabase(), input.conversationId)) return false;
 		if (wait.resolution === "skipped") return true;
+		let checkFailed = false;
+		let reviewRequired = false;
 		try {
-			const fresh = await this.syncConnections(wait);
+			wait = this.markChecking(wait, "connection");
+			const fresh = await this.boundedCheck(wait.id, () => this.syncConnections(wait));
+			if (getConnectionWait(wait.id)?.version !== wait.version) return false;
+			wait = this.markChecking(wait, "tools");
 			const verified = new Set(fresh.filter((item) => item.status === "active").map((item) => item.id));
 			wait.needs = wait.needs.map((need) => ({
 				...need,
 				unavailable: !fresh.some((item) => item.id === need.connectionId && item.status === "active")
 			}));
-			wait.needs = await this.checkCapabilities(wait, verified);
+			wait.needs = await this.boundedCheck(wait.id, () => this.checkCapabilities(wait, verified));
 			const ready = this.view(wait, verified).needs.every((need) => need.phase === "ready");
 			if (getConnectionWait(wait.id)?.version !== wait.version) return false;
-			if (ready && wait.intent && wait.intent.validUntil > Date.now() && wait.intent.objectiveRevision === wait.objectiveRevision) return true;
-		} catch {}
+			if (ready && wait.intent && wait.intent.validUntil > Date.now() && wait.intent.objectiveRevision === wait.objectiveRevision) {
+				updateConnectionWait({
+					...wait,
+					checking: void 0,
+					lastCheckedAt: Date.now()
+				}, wait.version);
+				return true;
+			}
+			reviewRequired = ready;
+		} catch (err) {
+			checkFailed = true;
+			if (getConnectionWait(wait.id)?.version === wait.version) log.warn({
+				err,
+				conversationId: input.conversationId,
+				waitId: wait.id,
+				phase: "resume_preflight"
+			}, "Connection recovery check failed; objective preserved");
+		}
 		if (getConnectionWait(wait.id)?.version === wait.version) {
 			updateConnectionWait({
 				...wait,
 				status: "open",
 				intent: void 0,
 				queuedInputId: void 0,
+				checking: void 0,
+				lastCheckedAt: Date.now(),
+				recoveryError: checkFailed ? "check_failed" : void 0,
+				reviewRequired: reviewRequired || wait.reviewRequired,
 				objectiveRevision: wait.objectiveRevision + 1
 			}, wait.version);
 			publishConnectionWait(input.conversationId);
@@ -339,8 +405,9 @@ var ConnectionRecoveryService = class {
 			const snapshot = this.snapshot(conversationId);
 			let wait = getConnectionWait(action.waitId);
 			if (!wait || wait.conversationId !== conversationId || wait.principalId !== "local-owner" || wait.transcriptId !== action.expectedTranscriptId || snapshot.transcriptId !== action.expectedTranscriptId) throw new Error("SESSION_CHANGED");
-			if (wait.lastAction?.key === action.idempotencyKey && wait.lastAction.action === action.action) return { snapshot };
-			if (wait.status !== "open" || wait.version !== action.expectedVersion) throw new Error("WAIT_CHANGED");
+			if ((wait.status !== "open" || !wait.checking) && wait.lastAction?.key === action.idempotencyKey && wait.lastAction.action === action.action) return { snapshot };
+			const matchesTarget = action.action === "cancel" && action.expectedObjectiveRevision !== void 0 ? wait.objectiveRevision === action.expectedObjectiveRevision : wait.version === action.expectedVersion;
+			if (wait.status !== "open" && !(action.action === "cancel" && wait.status === "queued") || !matchesTarget) throw new Error("WAIT_CHANGED");
 			wait = {
 				...wait,
 				lastAction: {
@@ -349,9 +416,14 @@ var ConnectionRecoveryService = class {
 				}
 			};
 			if (action.action === "cancel") {
-				const request = personalRequestForWait(wait.id);
-				if (request) cancelPersonalRequest(request);
-				else cancelConnectionObjective(conversationId);
+				const cancelled = wait;
+				runSqliteWriteTransaction(() => {
+					updateConnectionWait(cancelled, cancelled.version);
+					const request = personalRequestForWait(cancelled.id);
+					if (request) cancelPersonalRequest(request);
+					else cancelConnectionObjective(conversationId);
+				});
+				this.checks.get(wait.id)?.abort(/* @__PURE__ */ new Error("Connection objective cancelled"));
 			} else if (action.action === "replace_source") {
 				const need = wait.needs.find((need) => need.key === action.needKey);
 				if (!need || !this.view(wait).needs.find((item) => item.key === need.key)?.alternatives?.some((item) => item.candidateRef === action.candidateRef)) throw new Error("Unsupported replacement.");
@@ -394,6 +466,8 @@ var ConnectionRecoveryService = class {
 						unavailable: false,
 						capabilityError: void 0
 					} : item),
+					checking: void 0,
+					recoveryError: void 0,
 					intent: {
 						objectiveRevision: wait.objectiveRevision,
 						validUntil: Date.now() + INTENT_TTL
@@ -487,16 +561,36 @@ var ConnectionRecoveryService = class {
 					authorizationUrl: auth.connectUrl
 				};
 			} else {
-				const fresh = await this.syncConnections(wait);
+				if (action.action === "select_account") {
+					const need = this.view(wait).needs.find((item) => item.key === action.needKey);
+					const connection = need?.target.type === "connector" ? currentAccountConnections(listConnectorConnections({
+						principalId: wait.principalId,
+						connectorId: need.target.connectorId
+					})).find((item) => item.accountId === action.accountId) : void 0;
+					if (!connection || !need?.accounts.some((item) => item.id === connection.accountId)) throw new Error("Account is unavailable.");
+					wait = {
+						...wait,
+						needs: wait.needs.map((item) => item.key === need.key ? {
+							...item,
+							accountId: connection.accountId,
+							connectionId: connection.id,
+							attempt: void 0
+						} : item),
+						intent: {
+							objectiveRevision: wait.objectiveRevision,
+							validUntil: Date.now() + INTENT_TTL
+						}
+					};
+				}
+				wait = this.markChecking(wait, "connection");
+				const fresh = await this.boundedCheck(wait.id, () => this.syncConnections(wait));
 				const verified = new Set(fresh.filter((item) => item.status === "active").map((item) => item.id));
 				const latest = getConnectionWait(wait.id);
 				if (!latest || latest.version !== wait.version || latest.status !== "open") throw new Error("WAIT_CHANGED");
+				const currentNeeds = this.view(wait).needs;
 				let needs = wait.needs.map((need) => {
 					if (need.target.type === "store-connector") {
-						const selected = this.view({
-							...wait,
-							needs
-						}).needs.find((item) => item.key === need.key);
+						const selected = currentNeeds.find((item) => item.key === need.key);
 						return selected?.phase === "ready" ? {
 							...need,
 							connectionId: selected.connectionId,
@@ -537,23 +631,33 @@ var ConnectionRecoveryService = class {
 					...wait,
 					needs
 				}, verified).needs) if (selected.target.type === "connector" && (selected.phase === "ready" || selected.capabilityError && selected.connectionId)) await this.ensureInstallation(wait, selected.target.connectorId);
-				needs = await this.checkCapabilities({
+				wait = this.markChecking({
 					...wait,
 					needs
-				}, verified);
-				if (getConnectionWait(wait.id)?.version !== wait.version) throw new Error("WAIT_CHANGED");
-				const readyWithoutReview = this.view({
+				}, "tools");
+				needs = await this.boundedCheck(wait.id, () => this.checkCapabilities({
 					...wait,
 					needs
-				}, verified).phase === "ready";
+				}, verified));
+				if (getConnectionWait(wait.id)?.version !== wait.version) throw new Error("WAIT_CHANGED");
+				const readinessPhase = this.view({
+					...wait,
+					needs,
+					checking: void 0,
+					recoveryError: void 0
+				}, verified).phase;
+				const readyWithoutReview = readinessPhase === "ready";
 				wait = updateConnectionWait({
 					...wait,
 					needs,
+					checking: void 0,
+					lastCheckedAt: Date.now(),
+					recoveryError: void 0,
 					...action.action === "confirm_scope" ? {
 						scopeConfirmedAt: Date.now(),
 						reviewRequired: false
 					} : {},
-					...needs.some((need) => need.capabilityError) ? { intent: void 0 } : readyWithoutReview || action.action === "confirm_scope" ? { intent: {
+					...needs.some((need) => need.capabilityError) || readinessPhase === "review_scope" && action.action !== "confirm_scope" ? { intent: void 0 } : readyWithoutReview || action.action === "confirm_scope" ? { intent: {
 						objectiveRevision: wait.objectiveRevision,
 						validUntil: Date.now() + INTENT_TTL
 					} } : {}
@@ -578,14 +682,29 @@ var ConnectionRecoveryService = class {
 			return { snapshot: this.snapshot(conversationId) };
 		} catch (error) {
 			const wait = getActiveConnectionWait(conversationId);
-			if (action.action === "connect" && wait?.status === "open" && wait.lastAction?.key === action.idempotencyKey) {
+			if (ownsLock && wait?.status === "open" && wait.lastAction?.key === action.idempotencyKey) {
+				if (wait.checking) log.warn({
+					err: error,
+					conversationId,
+					waitId: wait.id,
+					phase: wait.checking.phase
+				}, "Connection check failed; objective preserved");
 				updateConnectionWait({
 					...wait,
-					intent: void 0,
-					needs: wait.needs.map((need) => need.key === action.needKey ? {
-						...need,
-						attempt: void 0
-					} : need)
+					lastAction: void 0,
+					...wait.checking ? {
+						checking: void 0,
+						lastCheckedAt: Date.now(),
+						recoveryError: "check_failed",
+						intent: void 0
+					} : {},
+					...action.action === "connect" ? {
+						intent: void 0,
+						needs: wait.needs.map((need) => need.key === action.needKey ? {
+							...need,
+							attempt: void 0
+						} : need)
+					} : {}
 				}, wait.version);
 				publishConnectionWait(conversationId);
 			}

package/dist/src/connectors/content-enrichment.js

@@ -1,8 +1,8 @@
 import { getConnectorConnection, getConnectorInstallation } from "../storage/sqlite/connector-repository.js";
 import { getKnowledgeSourceItem, listKnowledgeSourceItems, upsertKnowledgeSourceItems } from "../storage/sqlite/knowledge-repository.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
-import { ComposioSessionsAdapter } from "./composio-sessions.js";
 import { ConnectedKnowledgePipeline } from "../knowledge/connected-knowledge-pipeline.js";
+import { ComposioSessionsAdapter } from "./composio-sessions.js";
 import { sanitizeConnectedSourceValue } from "./connected-source-sanitization.js";
 import { tmpdir } from "node:os";
 import { isAbsolute, join, relative, sep } from "node:path";

package/dist/src/connectors/health.js

@@ -1,7 +1,7 @@
 import { init_connector_repository, listConnectorConnections } from "../storage/sqlite/connector-repository.js";
+import { getWorkspacePath } from "../config/workspace-path-helpers.js";
 import { currentAccountConnections } from "./account-access.js";
 import { getConnectorInstance } from "./instances.js";
-import { getWorkspacePath } from "../config/workspace-path-helpers.js";
 import { describeCliAction, verifyCliConnection } from "./cli/runtime.js";
 //#region src/connectors/health.ts
 init_connector_repository();

package/dist/src/connectors/learning-coordinator.js

@@ -6,12 +6,12 @@ import { getConnectorInstallation, listConnectorConnections, upsertConnectorConn
 import { pruneBoundedKnowledgeSourceItems } from "../storage/sqlite/knowledge-repository.js";
 import { getConnectorSyncPolicyForConnection } from "../storage/sqlite/connector-sync-policy-repository.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
+import { getActiveUnderstandingConsent, grantUnderstandingConsent } from "../user-context/sources/consent-repository.js";
+import { getConnectorUnderstandingSourceRun, getOrCreateConnectorUnderstandingSourceRun, getUnderstandingSourceGrant, listUnderstandingSourceGrants, updateUnderstandingSourceGrantCheckpoint, updateUnderstandingSourceRun, upsertUnderstandingSourceGrant } from "../user-context/sources/repository.js";
 import { connectorIdentityKey, normalizeConnectorIdentity } from "./connector-identity.js";
 import { ComposioSessionsAdapter } from "./composio-sessions.js";
 import { buildConnectorLearningArguments, getConnectorLearningPlan } from "./learning-recipes.js";
 import { getConnectorDefinition } from "./catalog.js";
-import { getActiveUnderstandingConsent, grantUnderstandingConsent } from "../user-context/sources/consent-repository.js";
-import { getConnectorUnderstandingSourceRun, getOrCreateConnectorUnderstandingSourceRun, getUnderstandingSourceGrant, listUnderstandingSourceGrants, updateUnderstandingSourceGrantCheckpoint, updateUnderstandingSourceRun, upsertUnderstandingSourceGrant } from "../user-context/sources/repository.js";
 import { ingestComposioConnectedSource } from "./connected-source-ingestion.js";
 import { deriveConnectedSourceUnderstanding } from "./connected-source-understanding.js";
 import { listConnectedContentCandidates, readConnectedContent } from "./content-enrichment.js";

package/dist/src/discussions/live-worker.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { ObjectLinkService } from "../activity/service.js";
-import { isSTTAvailable } from "../voice/stt/availability.js";
 import { transcribe } from "../voice/stt/transcribe-core.js";
+import { isSTTAvailable } from "../voice/stt/availability.js";
 import { mergeSttConfigFromAppConfig } from "../voice/stt/config.js";
 import "../voice/stt/index.js";
 import { claimNextDiscussionTranscriptSegment, completeDiscussionTranscriptSegment, getDiscussionCapture, listDiscussionTranscriptSegments, retryOrFailDiscussionTranscriptSegment, updateDiscussionCapture } from "./repository.js";