@xopcai/xopc 0.0.333 → 0.0.334

package/dist/src/cli/commands/onboard/model.js

@@ -1,12 +1,12 @@
 import { AgentCatalogRepository, init_repository } from "../../../agent-catalog/repository.js";
-import { getAgentDefaultModelRef, init_schema } from "../../../config/schema.js";
 import { resolveModelsJsonPath } from "../../../config/paths.js";
+import { AgentCatalogService } from "../../../agent-catalog/service.js";
+import { getAgentDefaultModelRef, init_schema } from "../../../config/schema.js";
 import { init_models_json, loadModelsJson, saveModelsJson } from "../../../config/models-json.js";
 import { getApiKeyFromEnv } from "../../../providers/env-keys.js";
 import { getModelRegistry } from "../../../providers/model-registry.js";
 import { CredentialResolver, init_credentials } from "../../../auth/credentials.js";
 import { getAllProviders, getModelsByProvider, getProviderDisplayName, init_providers, providerSupportsApiKey, providerSupportsOAuth } from "../../../providers/index.js";
-import { AgentCatalogService } from "../../../agent-catalog/service.js";
 import { prepareUpdateGlobalDefaults } from "../../../gateway/global-defaults-admin.js";
 import { discoverProviderModels, isProviderApiDiscoverable } from "../../../providers/model-discovery.js";
 import { getXopcCloudCatalogCoordinator } from "../../../providers/xopc-cloud-catalog-coordinator.js";

package/dist/src/cli/utils/init-workspace-core.js

@@ -1,6 +1,6 @@
 import { AgentCatalogRepository, init_repository } from "../../agent-catalog/repository.js";
-import { ConfigSchema, init_schema } from "../../config/schema.js";
 import { AgentCatalogService } from "../../agent-catalog/service.js";
+import { ConfigSchema, init_schema } from "../../config/schema.js";
 import { assertConfigRewriteSafeForRunningGateway, saveConfig } from "../../config/loader.js";
 import { ensureStarterAgentsInitialized } from "../../agent/starter-agents.js";
 import { bootstrapApplicationStateSync } from "../../bootstrap/application-state.js";

package/dist/src/computer/runtime.js

@@ -1,9 +1,9 @@
 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 { resolveEffectiveAgentConfigForSession } from "../config/agent-profile.js";
 import { enterComputerControl, leaveComputerControl } from "./control-guard.js";
 import { ComputerDiagnosticSchema, ComputerOperationError, computerDiagnostic, computerRecovery } from "./errors.js";
 import { createComputerModelAdapter, predictComputerStep, readComputerJson } from "./model-adapter.js";

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/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/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/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/gateway/agents-admin.js

@@ -1,11 +1,11 @@
 import { normalizeAgentId, validateAgentIdForNewAgent } from "../agent-catalog/id.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
 import { init_agent_scope, listAgentEntries, resolveAgentProfileDir, resolveAgentWorkspaceDir, resolveDefaultAgentId, resolveUserPath } from "../agent/agent-scope.js";
-import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
 import { WORKSPACE_FILES, init_paths } from "../config/paths.js";
 import { AGENT_PROFILE_MARKDOWN_SYSTEM_FILES, REQUIRED_AGENT_PROFILE_MARKDOWN_FILE_SET } from "../agent/context/workspace.js";
-import { isPathUnderWorkspace, resolveWorkspaceSafePath } from "./workspace-editor-path.js";
 import { AgentCatalogService } from "../agent-catalog/service.js";
+import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
+import { isPathUnderWorkspace, resolveWorkspaceSafePath } from "./workspace-editor-path.js";
 import { GATEWAY_BUILTIN_TOOL_IDS } from "./agent-builtin-tools.js";
 import { join, resolve } from "node:path";
 import { mkdir, readFile, realpath, stat, unlink, writeFile } from "node:fs/promises";

package/dist/src/gateway/file-path-classifier.js

@@ -1,7 +1,7 @@
 import { init_paths_state, resolveStateDir } from "../config/paths-state.js";
 import { init_agent_scope, resolveAgentProfileDir } from "../agent/agent-scope.js";
-import { extractProfileAgentId } from "../config/agent-profile.js";
 import { init_paths, resolveConfigPath, resolveSkillsDir } from "../config/paths.js";
+import { extractProfileAgentId } from "../config/agent-profile.js";
 import { isBareProfileMarkdownFileName, resolveProfileMarkdownPathIfBareName } from "../agent/tools/tool-paths.js";
 import { isPathUnderWorkspace, resolveWorkspaceSafePath } from "./workspace-editor-path.js";
 import { basename, isAbsolute, resolve } from "node:path";

package/dist/src/gateway/hono/lib/config-payload.js

@@ -1,8 +1,8 @@
 import { normalizeAgentId } from "../../../agent-catalog/id.js";
 import { AgentCatalogRepository, init_repository } from "../../../agent-catalog/repository.js";
-import { ContextPlanningConfigSchema, KnowledgeMemoryConfigSchema, UserModelConfigSchema, init_config } from "../../../user-context/config.js";
 import { init_agent_scope, listAgentEntries, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
 import { resolveModelsJsonPath } from "../../../config/paths.js";
+import { ContextPlanningConfigSchema, KnowledgeMemoryConfigSchema, UserModelConfigSchema, init_config } from "../../../user-context/config.js";
 import { init_models_json, loadModelsJson } from "../../../config/models-json.js";
 import { CredentialResolver, init_credentials } from "../../../auth/credentials.js";
 import { getProviderRegistry, init_plugin_registry } from "../../../providers/plugin-registry.js";

package/dist/src/gateway/hono/routes/agent-stream.js

@@ -2,7 +2,8 @@ import { parseUserTurnDocument, userTurnDocumentRefIds } from "../../../../packa
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
 import { validateWebchatAttachments, validateWebchatContent } from "../../chat-limits.js";
 import { parseTurnContextRefs } from "../../../agent/source-context/types.js";
-import { replaceLatestSessionTurn, submitSessionInput } from "./session-input-handler.js";
+import { replaceLatestSessionTurn } from "./session-input-handler.js";
+import { handleSessionCommand, handleSessionInputReceipt, handleSessionPreparationRetry } from "./session-command-handler.js";
 //#region src/gateway/hono/routes/agent-stream.ts
 init_src();
 function registerAgentStreamRoutes(authenticated, deps) {
@@ -38,8 +39,11 @@ function registerAgentStreamRoutes(authenticated, deps) {
 		});
 	});
 	authenticated.post("/api/sessions/:conversationId/inputs", chatRateLimitMiddleware, async (c) => {
-		return submitSessionInput(c, deps, (c.req.param("conversationId") ?? "").trim());
+		return handleSessionCommand(c, deps);
 	});
+	authenticated.post("/api/sessions/:conversationId/materialize", chatRateLimitMiddleware, (c) => handleSessionCommand(c, deps, true));
+	authenticated.get("/api/sessions/:conversationId/input-receipts/:clientMessageId", (c) => handleSessionInputReceipt(c, deps));
+	authenticated.post("/api/sessions/:conversationId/preparation/retry", chatRateLimitMiddleware, (c) => handleSessionPreparationRetry(c, deps));
 	authenticated.post("/api/sessions/:conversationId/turns/:turnId/replace", chatRateLimitMiddleware, async (c) => {
 		return replaceLatestSessionTurn(c, deps, (c.req.param("conversationId") ?? "").trim(), (c.req.param("turnId") ?? "").trim());
 	});

package/dist/src/gateway/hono/routes/browser-session.js

@@ -1,12 +1,14 @@
+import { getOrCreateGatewayIdentity, init_gateway_identity_repository } from "../../../storage/sqlite/gateway-identity-repository.js";
 import { BrowserSessionLimitError, createBrowserSession, deleteBrowserSession } from "../../../storage/sqlite/browser-session-repository.js";
 import { browserCookieRequestAllowed, clearBrowserSessionCookie, writeBrowserSessionCookie } from "../../security/browser-session.js";
 import { getGatewayPrincipal } from "../../security/gateway-principal.js";
 //#region src/gateway/hono/routes/browser-session.ts
+init_gateway_identity_repository();
 function registerBrowserSessionRoutes(app, deps) {
 	app.get("/api/browser-session", (c) => {
 		c.header("Cache-Control", "no-store");
 		const principal = getGatewayPrincipal(c);
-		return c.json({ conversationId: principal.principalId });
+		return c.json({ conversationId: `${getOrCreateGatewayIdentity().id}:${principal.principalId}` });
 	});
 	app.post("/api/browser-session", deps.strictRateLimitMiddleware, (c) => {
 		const principal = getGatewayPrincipal(c);
@@ -24,7 +26,7 @@ function registerBrowserSessionRoutes(app, deps) {
 		}
 		writeBrowserSessionCookie(c, session.token, session.expiresAt);
 		c.header("Cache-Control", "no-store");
-		return c.json({ conversationId: `browser:${session.sessionId}` });
+		return c.json({ conversationId: `${getOrCreateGatewayIdentity().id}:browser:${session.sessionId}` });
 	});
 	app.delete("/api/browser-session", (c) => {
 		if (!browserCookieRequestAllowed(c)) return c.json({ error: "Forbidden" }, 403);

package/dist/src/gateway/hono/routes/commands-skills.js

@@ -1,8 +1,11 @@
 import { init_agent_scope, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
-import { effectiveWorkspacePathForSession } from "../../../session/session-workspace.js";
+import { resolveEffectiveAgentProfile } from "../../../config/agent-profile.js";
+import { effectiveWorkspacePathForSession, projectWorkspacePath } from "../../../session/session-workspace.js";
 import { getProjectForSession } from "../../../projects/workspace.js";
+import { ProjectService } from "../../../projects/project-service.js";
 import { isRegisteredProvider } from "../../../agent/skills/marketplace/registry.js";
 import "../../../agent/skills/skills-marketplace.js";
+import "../../../projects/index.js";
 import { isSkillInstallTarget } from "../../../agent/skills/install-target.js";
 import { commandRegistry } from "../../../chat-commands/registry.js";
 import { buildReviewContext, resolveGitRoot } from "../../../review/review-git.js";
@@ -62,7 +65,11 @@ function registerCommandsSkillsRoutes(authenticated, deps) {
 	authenticated.get("/api/review/context", async (c) => {
 		const conversationId = c.req.query("conversationId")?.trim();
 		try {
-			const payload = await buildReviewContext(await resolveGitRoot(effectiveWorkspacePathForSession(service.getConfig(), conversationId, null, getProjectForSession(conversationId))));
+			const agentId = c.req.query("agentId")?.trim();
+			const projectId = c.req.query("projectId")?.trim();
+			const project = !conversationId && projectId ? new ProjectService().get(projectId) : null;
+			if (!conversationId && projectId && !project) throw new Error("Project not found");
+			const payload = await buildReviewContext(await resolveGitRoot(!conversationId && agentId ? projectWorkspacePath(project) ?? resolveEffectiveAgentProfile(agentId).resolvedWorkspacePath : effectiveWorkspacePathForSession(service.getConfig(), conversationId, null, getProjectForSession(conversationId))));
 			return c.json({
 				ok: true,
 				payload

package/dist/src/gateway/hono/routes/config-patch/misc.js

@@ -1,10 +1,10 @@
-import { ComputerConfigSchema, init_config } from "../../../../computer/config.js";
 import { BindingsSchema, init_binding_schema } from "../../../../routing/binding-schema.js";
+import { AgentCatalogService } from "../../../../agent-catalog/service.js";
+import { ComputerConfigSchema, init_config } from "../../../../computer/config.js";
 import { ContextPlanningConfigSchema, HomeIntelligenceConfigSchema, KnowledgeMemoryConfigSchema, UserContextConfigSchema, UserModelConfigSchema, init_config as init_config$1 } from "../../../../user-context/config.js";
 import { BrowserConfigSchema, McpConfigSchema, VoiceConfigSchema, init_schema } from "../../../../config/schema.js";
 import { CredentialResolver, init_credentials } from "../../../../auth/credentials.js";
 import { canonicalizeConfiguredMcpServer } from "../../../../config/mcp-config-normalize.js";
-import { AgentCatalogService } from "../../../../agent-catalog/service.js";
 import { mergeGatewaySkillsMarketplacePatch, mergeSessionConfigPatch, mergeUpdateConfigPatch } from "../../../../config/web-patch.js";
 import { assertGatewayAuthConfigured, resolveGatewayAuth } from "../../../auth.js";
 import { isMaskedSecretPatchValue } from "../../lib/mask-secret-length.js";

package/dist/src/gateway/hono/routes/files.js

@@ -1,5 +1,6 @@
 import { FileServiceError, fileResourceFromPath, parseFileResourceId, resolveFilePath } from "../../../files/file-service.js";
 import { getGatewayFileSpaceService } from "../../file-space-service.js";
+import { getSessionPreparation } from "../../../storage/sqlite/session-creation-repository.js";
 import { fuzzySearchWorkspaceFiles, fuzzySubsequenceScore } from "../../workspace-file-search.js";
 import { registerFileReferenceRoutes } from "./file-references.js";
 import { basename, join } from "node:path";
@@ -55,6 +56,8 @@ function registerFilesRoutes(authenticated, deps) {
 		try {
 			const kind = c.req.param("kind");
 			if (kind !== "agent" && kind !== "project" && kind !== "session") throw new FileServiceError(400, "Invalid context kind");
+			const preparation = kind === "session" ? getSessionPreparation(c.req.param("id")) : void 0;
+			if (preparation && preparation.state !== "ready") throw new FileServiceError(409, "Session environment is not ready");
 			return c.json({ space: publicSpace(await files.forContext(kind, c.req.param("id"))) });
 		} catch (error) {
 			return errorResponse(c, error);

package/dist/src/gateway/hono/routes/models.js

@@ -8,6 +8,7 @@ import { CredentialResolver, init_credentials } from "../../../auth/credentials.
 import "../../../providers/constants.js";
 import { getProviderRegistry, init_plugin_registry } from "../../../providers/plugin-registry.js";
 import { PROVIDER_META, getAllModels, getAllProviders, getAvailableModels, getProviderAuthState, init_providers, isProviderConfigured, isProviderConfiguredSync } from "../../../providers/index.js";
+import { resolveEffectiveAgentConfigForAgent } from "../../../config/agent-profile.js";
 import { buildCapabilityPlansForConfig } from "../../../capabilities/readiness/from-config.js";
 import "../../../capabilities/readiness/index.js";
 import { getImageGenerationProvider, reloadImageGenerationProviders, resolveImageGenerationCredentialMode } from "../../../agent/image/generation/provider-registry.js";
@@ -325,9 +326,24 @@ function registerModelsRoutes(authenticated, deps) {
 			if (a.provider !== b.provider) return a.provider.localeCompare(b.provider);
 			return a.name.localeCompare(b.name, void 0, { sensitivity: "base" });
 		});
+		const agentId = c.req.query("agentId")?.trim();
+		let defaultId;
+		if (agentId) try {
+			const configured = resolveEffectiveAgentConfigForAgent(agentId).config.models.chat.primary;
+			const matches = models.filter((model) => model.id === configured || model.id.endsWith(`/${configured}`));
+			defaultId = models.find((model) => model.id === configured)?.id ?? (matches.length === 1 ? matches[0].id : configured);
+		} catch (error) {
+			return c.json({
+				ok: false,
+				error: { message: error instanceof Error ? error.message : "Invalid agent" }
+			}, 400);
+		}
 		return c.json({
 			ok: true,
-			payload: { models }
+			payload: {
+				models,
+				...defaultId ? { defaultId } : {}
+			}
 		});
 	});
 	authenticated.get("/api/image-generation/catalog", (c) => {

package/dist/src/gateway/hono/routes/notes.js

@@ -1,9 +1,9 @@
 import { NoteDeleteOutputSchema, NoteGetOutputSchema, ProductReadContracts } from "../../../../packages/gateway-contract/src/capabilities.js";
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
-import { init_session_key, resolveConversationId } from "../../../routing/session-key.js";
-import { agentExists, getDefaultAgentId, init_resolve_route } from "../../../routing/resolve-route.js";
 import { CapabilityError } from "../../../capabilities/runtime/errors.js";
 import "../../../capabilities/runtime/dispatcher.js";
+import { init_session_key, resolveConversationId } from "../../../routing/session-key.js";
+import { agentExists, getDefaultAgentId, init_resolve_route } from "../../../routing/resolve-route.js";
 import { resolveGatewayEffectiveHost } from "../../../config/gateway-bind.js";
 import { getShareStore } from "../../../share/share-store.js";
 import { resolveShareUrl } from "../../../share/share-url.js";
@@ -269,7 +269,6 @@ function registerNotesRoutes(authenticated, deps) {
 					...projectId ? { projectId } : {},
 					customData: {
 						...meta?.customData ?? {},
-						genericNewChatShell: false,
 						sourceBinding
 					}
 				});
@@ -310,7 +309,6 @@ function registerNotesRoutes(authenticated, deps) {
 			tags: Array.from(new Set([...meta?.tags ?? [], "note"])),
 			customData: {
 				...meta?.customData ?? {},
-				genericNewChatShell: false,
 				sourceBinding
 			}
 		});

package/dist/src/gateway/hono/routes/projects.js

@@ -7,12 +7,12 @@ import { loadTranscriptRowsForSession } from "../../../storage/sqlite/transcript
 import { init_sqlite } from "../../../storage/sqlite/index.js";
 import { ActivityService } from "../../../activity/service.js";
 import "../../../activity/index.js";
+import { CapabilityError } from "../../../capabilities/runtime/errors.js";
+import "../../../capabilities/runtime/dispatcher.js";
 import { resolveEffectiveAgentProfile } from "../../../config/agent-profile.js";
 import { TaskReadModelProjector } from "../../../tasks/task-read-model-projector.js";
 import { listKnowledgeItems, writeKnowledgeItem } from "../../../knowledge-memory/repository.js";
 import "../../../knowledge-memory/index.js";
-import { CapabilityError } from "../../../capabilities/runtime/errors.js";
-import "../../../capabilities/runtime/dispatcher.js";
 import { ProjectWorkspaceConflictError, ProjectWorkspaceMissingError } from "../../../projects/workspace-project.js";
 import { inferProjectExecutionMode, inferProjectKind } from "../../../projects/project-kind.js";
 import { ProjectDeletionBlockedError, ProjectWorkspaceInUseError } from "../../../projects/project-service.js";

package/dist/src/gateway/hono/routes/session-command-handler.d.ts

@@ -0,0 +1,5 @@
+import type { Context } from 'hono';
+import type { AuthenticatedRouteDeps } from './deps.js';
+export declare function handleSessionCommand(c: Context, deps: AuthenticatedRouteDeps, materialize?: boolean): Promise<Response>;
+export declare function handleSessionInputReceipt(c: Context, deps: AuthenticatedRouteDeps): Promise<Response>;
+export declare function handleSessionPreparationRetry(c: Context, deps: AuthenticatedRouteDeps): Promise<Response>;