@xopcai/xopc 0.0.303 → 0.0.307

package/dist/src/cli/commands/extension-marketplace.js

@@ -2,14 +2,14 @@ import { init_paths, resolveExtensionsDir } from "../../config/paths.js";
 import { init_loader, loadConfig } from "../../config/loader.js";
 import { downloadExtensionStoreZipBuffer, resolveExtensionZipDownloadUrl, resolveExtensionsStoreBaseUrl, verifyStoreArtifactSha256 } from "../../agent/skills/marketplace/adapters/store/store-api-client.js";
 import { getContextWithOpts } from "../context.js";
-import { getExtensionLockfileManager } from "../../extensions/lockfile.js";
-import { installFromLocal, installFromNpm, peekExtensionManifestFromStoreZip } from "../../extensions/install.js";
-import { commitStagedExtensionInstall, finalizeStagedExtensionInstall, rollbackStagedExtensionInstall, stageExtensionStoreZip } from "../../extensions/install-transaction.js";
+import { computeExtensionDirectoryIntegrity, getExtensionLockfileManager } from "../../extensions/lockfile.js";
+import { peekExtensionManifestFromStoreZip } from "../../extensions/install.js";
+import { commitStagedExtensionInstall, finalizeStagedExtensionInstall, rollbackStagedExtensionInstall, stageExtensionLocal, stageExtensionNpm, stageExtensionStoreZip } from "../../extensions/install-transaction.js";
 import { fetchRegistry, findExtension, getExtensionMarketplaceStoreBaseUrl, listExtensions, searchExtensions } from "../../extensions/marketplace.js";
 import { colors } from "../utils/colors.js";
 import { validateExtensionPackageDirectory } from "./extension-pack.js";
 import { join, resolve } from "node:path";
-import { existsSync, readFileSync, rmSync, statSync } from "node:fs";
+import { existsSync, readFileSync, statSync } from "node:fs";
 import { execSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import semver from "semver";
@@ -111,9 +111,24 @@ async function upsertNpmExtensionLock(lock, targetDir, result, spec) {
 		version: ver,
 		resolved,
 		source: "npm",
+		installedIntegrity: computeExtensionDirectoryIntegrity(join(targetDir, result.extensionId)),
 		...readInstalledSnapshots(targetDir, result.extensionId)
 	});
 }
+async function commitStagedWithLock(transaction, force, lock, writeLock) {
+	const lockSnapshot = await lock.load();
+	let lockWriteStarted = false;
+	try {
+		commitStagedExtensionInstall(transaction, force);
+		lockWriteStarted = true;
+		await writeLock();
+	} catch (error) {
+		rollbackStagedExtensionInstall(transaction);
+		if (lockWriteStarted) await lock.save(lockSnapshot);
+		throw error;
+	}
+	finalizeStagedExtensionInstall(transaction);
+}
 async function installExtensionFromStoreWithLock(params) {
 	try {
 		const { downloadUrl, version, sha256 } = await resolveExtensionZipDownloadUrl(params.storeBase, params.packageName, params.version);
@@ -134,6 +149,13 @@ async function installExtensionFromStoreWithLock(params) {
 			error: "Install cancelled"
 		};
 		const transaction = await stageExtensionStoreZip(buf, params.targetDir);
+		if (params.expectedExtensionId && transaction.extensionId !== params.expectedExtensionId) {
+			rollbackStagedExtensionInstall(transaction);
+			return {
+				ok: false,
+				error: `Expected extension ${params.expectedExtensionId}, received ${transaction.extensionId}`
+			};
+		}
 		const lockSnapshot = await params.lock.load();
 		let lockWriteStarted = false;
 		try {
@@ -146,6 +168,7 @@ async function installExtensionFromStoreWithLock(params) {
 				source: "store",
 				artifactUrl: downloadUrl,
 				integrity: actualIntegrity,
+				installedIntegrity: computeExtensionDirectoryIntegrity(transaction.targetDir),
 				...readInstalledSnapshots(params.targetDir, transaction.extensionId)
 			});
 		} catch (err) {
@@ -222,36 +245,41 @@ function createExtensionInstallCommand() {
 		if (npmExplicit) {
 			const spec = installTarget;
 			console.log(colors.cyan("📦"), `Installing from npm: ${spec}…`);
-			const result = await installFromNpm(spec, targetDir);
-			if (!result.ok) {
-				console.error(colors.red("error:"), result.error ?? "install failed");
+			try {
+				const transaction = await stageExtensionNpm(spec, targetDir);
+				await commitStagedWithLock(transaction, opts.force, lock, () => upsertNpmExtensionLock(lock, targetDir, {
+					ok: true,
+					extensionId: transaction.extensionId,
+					targetDir: transaction.targetDir
+				}, spec));
+				console.log(colors.green("✓"), transaction.extensionId, "(npm)");
+			} catch (error) {
+				console.error(colors.red("error:"), error instanceof Error ? error.message : String(error));
 				process.exit(1);
 			}
-			await upsertNpmExtensionLock(lock, targetDir, result, spec);
-			console.log(colors.green("✓"), result.extensionId ?? "ok", "(npm)");
 			return;
 		}
 		if (looksLikeLocalPath(installTarget)) {
 			const sourceDir = resolve(process.cwd(), installTarget);
-			if (opts.force) {
-				const manifestPath = join(sourceDir, MANIFEST);
-				if (existsSync(manifestPath)) try {
-					const raw = readFileSync(manifestPath, "utf-8");
-					const m = JSON.parse(raw);
-					const extId = typeof m.id === "string" && m.id && !m.id.includes("/") && !m.id.includes("\\") ? m.id : void 0;
-					if (extId && existsSync(join(targetDir, extId))) rmSync(join(targetDir, extId), {
-						recursive: true,
-						force: true
-					});
-				} catch {}
-			}
 			console.log(colors.cyan("📂"), "Installing from local directory…");
-			const result = await installFromLocal(sourceDir, targetDir);
-			if (!result.ok) {
-				console.error(colors.red("error:"), result.error ?? "install failed");
+			try {
+				const transaction = await stageExtensionLocal(sourceDir, targetDir);
+				const snapshots = readInstalledSnapshots(transaction.stagingRoot, transaction.extensionId);
+				const version = typeof snapshots.manifest?.version === "string" ? snapshots.manifest.version : "0.0.0";
+				await commitStagedWithLock(transaction, opts.force, lock, () => lock.upsert(transaction.extensionId, {
+					name: transaction.extensionId,
+					version,
+					resolved: sourceDir,
+					source: "local",
+					localPath: sourceDir,
+					installedIntegrity: computeExtensionDirectoryIntegrity(transaction.targetDir),
+					...readInstalledSnapshots(targetDir, transaction.extensionId)
+				}));
+				console.log(colors.green("✓"), transaction.extensionId);
+			} catch (error) {
+				console.error(colors.red("error:"), error instanceof Error ? error.message : String(error));
 				process.exit(1);
 			}
-			console.log(colors.green("✓"), result.extensionId ?? "ok");
 			return;
 		}
 		console.error(colors.red("error:"), "Extension installs require an explicit source: store:<id>, npm:<package>, or a local directory path.");
@@ -346,15 +374,13 @@ function createExtensionUpdateCommand() {
 			if (entry.source === "store") {
 				const pkgName = entry.resolved?.trim() || id;
 				console.log(colors.cyan("Updating"), id, "←", `store:${pkgName}`);
-				if (existsSync(join(targetDir, id))) rmSync(join(targetDir, id), {
-					recursive: true,
-					force: true
-				});
 				const r = await installExtensionFromStoreWithLock({
 					storeBase,
 					packageName: pkgName,
+					expectedExtensionId: id,
 					targetDir,
 					lock,
+					force: true,
 					yes: true
 				});
 				if (r.ok === false) {
@@ -374,23 +400,22 @@ function createExtensionUpdateCommand() {
 				continue;
 			}
 			console.log(colors.cyan("Updating"), id, "←", spec);
-			if (existsSync(join(targetDir, id))) rmSync(join(targetDir, id), {
-				recursive: true,
-				force: true
-			});
-			const result = await installFromNpm(spec, targetDir);
-			if (!result.ok) {
-				console.error(colors.red("error:"), result.error ?? id);
+			try {
+				const transaction = await stageExtensionNpm(spec, targetDir);
+				if (transaction.extensionId !== id) {
+					rollbackStagedExtensionInstall(transaction);
+					throw new Error(`Expected extension ${id}, received ${transaction.extensionId}`);
+				}
+				await commitStagedWithLock(transaction, true, lock, () => upsertNpmExtensionLock(lock, targetDir, {
+					ok: true,
+					extensionId: transaction.extensionId,
+					targetDir: transaction.targetDir
+				}, spec));
+				console.log(colors.green("✓"), id);
+			} catch (error) {
+				console.error(colors.red("error:"), error instanceof Error ? error.message : String(error));
 				process.exit(1);
 			}
-			await lock.upsert(id, {
-				name: id,
-				version: entry.version,
-				resolved: spec,
-				source: "npm",
-				...readInstalledSnapshots(targetDir, id)
-			});
-			console.log(colors.green("✓"), id);
 		}
 	});
 }

package/dist/src/cli/commands/extension-pack.js

@@ -57,11 +57,9 @@ function collectContributionPaths(manifest, extRoot) {
 	if (ui?.icon) out.push(join(extRoot, ui.icon));
 	const c = ui?.contributions;
 	if (!c) return out;
-	for (const p of c.sidebarPanels ?? []) if (p.entrypoint) out.push(join(extRoot, p.entrypoint));
 	for (const p of c.settingsPanels ?? []) if (p.entrypoint) out.push(join(extRoot, p.entrypoint));
 	for (const p of c.chatWidgets ?? []) if (p.entrypoint) out.push(join(extRoot, p.entrypoint));
 	for (const p of c.pages ?? []) if (p.entrypoint) out.push(join(extRoot, p.entrypoint));
-	for (const p of c.statusBarItems ?? []) if (p.entrypoint) out.push(join(extRoot, p.entrypoint));
 	return out;
 }
 function resolveMainFile(root, main) {

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

@@ -6,7 +6,7 @@ import { init_loader, loadConfig, saveConfig } from "../../config/loader.js";
 import { checkEngineCompatibility } from "../../extensions/engine-check.js";
 import { ExtensionLoader } from "../../extensions/loader.js";
 import { getContextWithOpts } from "../context.js";
-import { getExtensionLockfileManager } from "../../extensions/lockfile.js";
+import { computeExtensionDirectoryIntegrity, getExtensionLockfileManager } from "../../extensions/lockfile.js";
 import { checkAllExtensionsHealth, getExtensionHealthChecker } from "../../extensions/health.js";
 import { collectExtensionPackageDependencyIssues } from "../../extensions/package-contract.js";
 import { colors } from "../utils/colors.js";
@@ -15,8 +15,7 @@ import { createExtensionDevCommand } from "./extension-dev.js";
 import { createExtensionPackCommand } from "./extension-pack.js";
 import { createExtensionInstallCommand, createExtensionPublishCommand, createExtensionSearchCommand, createExtensionUpdateCommand } from "./extension-marketplace.js";
 import { join } from "node:path";
-import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
-import { createHash } from "node:crypto";
+import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { Command } from "commander";
 //#region src/cli/commands/extension.ts
 init_loader();
@@ -52,26 +51,6 @@ function createExtensionListCommand() {
 		}
 	});
 }
-function hashInstalledExtensionDir(extensionDir) {
-	if (!existsSync(extensionDir)) return void 0;
-	const hash = createHash("sha256");
-	const walk = (dir, prefix = "") => {
-		const entries = readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.name !== "node_modules").sort((a, b) => a.name.localeCompare(b.name));
-		for (const entry of entries) {
-			const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
-			const full = join(dir, entry.name);
-			if (entry.isDirectory()) walk(full, rel);
-			else if (entry.isFile()) {
-				const st = statSync(full);
-				hash.update(`file\0${rel}\0${st.size}\0`);
-				hash.update(readFileSync(full));
-				hash.update("\0");
-			}
-		}
-	};
-	walk(extensionDir);
-	return `dir-sha256-${hash.digest("base64")}`;
-}
 function readJson(path) {
 	try {
 		const raw = JSON.parse(readFileSync(path, "utf-8"));
@@ -397,7 +376,7 @@ function createExtensionDoctorCommand() {
 					...entry,
 					manifest: readJson(join(extensionDir, "xopc.extension.json")),
 					packageJson: readJson(join(extensionDir, "package.json")),
-					installedIntegrity: hashInstalledExtensionDir(extensionDir)
+					installedIntegrity: computeExtensionDirectoryIntegrity(extensionDir)
 				});
 			}
 			for (const enabledId of enabledIds) if (!lockedIds.has(enabledId) && !existsSync(join(lockDir, enabledId))) if (options.fix && extensionsConfig) {
@@ -441,7 +420,7 @@ function createExtensionDoctorCommand() {
 						source: "local",
 						manifest,
 						packageJson,
-						installedIntegrity: hashInstalledExtensionDir(extensionDir)
+						installedIntegrity: computeExtensionDirectoryIntegrity(extensionDir)
 					});
 				}
 			}

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

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

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

@@ -1,9 +1,10 @@
-import { GatewayLockError, acquireGatewayLock } from "../../../gateway/lock.js";
+import { GatewayLockError, acquireGatewayLock, init_lock } from "../../../gateway/lock.js";
 import { confirm } from "@inquirer/prompts";
 //#region src/cli/commands/onboard/gateway.ts
 /**
 * Gateway Configuration and Startup for Onboarding
 */
+init_lock();
 function isInteractive() {
 	return process.stdin.isTTY && process.stdout.isTTY;
 }

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

@@ -1,5 +1,5 @@
 import { ConfigSchema, init_schema } from "../../config/schema.js";
-import { init_loader, saveConfig } from "../../config/loader.js";
+import { assertConfigRewriteSafeForRunningGateway, init_loader, saveConfig } from "../../config/loader.js";
 import { ensureStarterAgentsInitialized } from "../../agent/starter-agents.js";
 import { runBootstrapMigrationsSync } from "../../migrations/runner.js";
 import { dirname } from "node:path";
@@ -73,7 +73,10 @@ async function initWorkspaceCore(options) {
 	let needsWrite = configCreated || starterResult.changed;
 	if (!needsWrite) needsWrite = await serializeConfig(await readDiskConfig(configPath, assertChannelPlugins), assertChannelPlugins) !== await serializeConfig(nextFinal, assertChannelPlugins);
 	if (needsWrite) if (assertChannelPlugins) await saveConfig(nextFinal, configPath);
-	else writeFileSync(configPath, `${JSON.stringify(nextFinal, null, 2)}\n`, "utf8");
+	else {
+		assertConfigRewriteSafeForRunningGateway(configPath);
+		writeFileSync(configPath, `${JSON.stringify(nextFinal, null, 2)}\n`, "utf8");
+	}
 	return {
 		config: nextFinal,
 		token,

package/dist/src/config/index.js

@@ -8,7 +8,7 @@ import { resolveDefaultAgentWorkspaceDir } from "./workspace-defaults.js";
 import { resolveAgentDir as resolveAgentDir$1, resolveAgentHomeDir as resolveAgentHomeDir$1, 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 { init_loader, loadConfig, saveConfig } from "./loader.js";
+import { assertConfigRewriteSafeForRunningGateway, init_loader, loadConfig, saveConfig } from "./loader.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 { canonicalizeConfiguredMcpServer, isKnownCliMcpTypeAlias, normalizeConfiguredMcpServers, resolveXopcMcpTransportAlias } from "./mcp-config-normalize.js";
@@ -27,4 +27,4 @@ init_workspace_path();
 init_models_json();
 init_resolve_config_value();
 //#endregion
-export { AgentImageGenerationModelSchema, AgentModelRefSchema, AgentModelsSchema, AgentsConfigSchema, BASE_RELOAD_RULES, BindingMatchSchema, BindingRuleSchema, BindingsConfigSchema, BrowserConfigSchema, ChannelsConfigSchema, CommandsConfigSchema, ConfigHotReloader, ConfigSchema, ConnectorsConfigSchema, CustomModelSchema, ENV_VARS, ExperimentalConfigSchema, ExtensionSecurityConfigSchema, ExtensionSlotsConfigSchema, ExtensionsConfigSchema, FILENAMES, GatewayAuthRateLimitSchema, GatewayAuthSchema, GatewayBindModeSchema, GatewayChannelConnectDeferModeSchema, GatewayConfigSchema, GatewayModeSchema, GatewayRemoteSchema, GatewaySecuritySchema, GatewayTailscaleConsentSchema, GatewayTailscaleSchema, GatewayTlsSchema, GatewayTrustedProxySchema, GatewayWebchatConfigSchema, HeartbeatConfigSchema, ImageGenerationCapabilitiesSchema, ImageGenerationModelSchema, ImageGenerationProviderSchema, McpConfigSchema, McpOAuthConfigSchema, McpServerSchema, MediaUnderstandingCapabilitiesSchema, MediaUnderstandingModelSchema, MessagesConfigSchema, ModelCatalogConfigSchema, ModelOverrideSchema, ModelsDevConfigSchema, ModelsJsonSchema, OpenAICompatSchema, OpenAICompletionsCompatSchema, OpenAIResponsesCompatSchema, OpenRouterRoutingSchema, ProfileManager, ProviderAuthConfigSchema, ProviderAzureConfigSchema, ProviderConfigSchema, ProviderRequestOverridesSchema, ProvidersConfigSchema, RuntimeToolsConfigSchema, STTConfigSchema, STTFallbackConfigSchema, STTProviderConfigSchema, SearchProviderEntrySchema, SessionConfigSchema, SessionDmScopeSchema, SessionResetByTypeSchema, SessionResetConfigSchema, SessionResetModeSchema, SessionScopeSchema, SessionStorageConfigSchema, TTSConfigSchema, TTSEdgeConfigSchema, TTSFallbackConfigSchema, TTSModelOverridesConfigSchema, TTSProviderConfigSchema, TTSSummarizationConfigSchema, TelegramAccountConfigSchema, TelegramConfigSchema, TelegramGroupConfigSchema, TelegramTopicConfigSchema, ToolsConfigSchema, ToolsMediaAudioConfigSchema, ToolsMediaConfigSchema, TuiConfigSchema, TunnelConfigSchema, TunnelConsentSchema, UpdateAutoConfigSchema, UpdateConfigSchema, VercelGatewayRoutingSchema, VoiceConfigSchema, VoiceRefinementConfigSchema, WORKSPACE_FILES, WebSearchConfigSchema, WebToolsConfigSchema, WebsiteBlocklistSchema, WeixinAccountConfigSchema, WeixinConfigSchema, WorkspaceConfigSchema, WorkspaceImportConfigSchema, XOPC_DB_FILENAME, applyConfigOverrides, buildReloadPlan, canonicalizeConfiguredMcpServer, clearConfigValueCache, createProfile, deleteProfile, diffConfigPaths, existsSync, expandWorkspacePathString, extractProfileAgentId, formatThinkingLevels, getAgentDefaultImageGenerationModelConfig, getAgentDefaultImageModelConfig, getAgentDefaultModelRef, getAllowedCommands, getCacheStats, getConfigOverrides, getCurrentProfile, getDefaultModelValues, resolveModelsJsonPath as getModelsJsonPath, getProfileManager, getProfileNameFromDir, getSwitchCommand, getWorkspacePath, hasBundledExtensionManifest, isKnownCliMcpTypeAlias, listAgentProfileMarkdownDirs, listAgentWorkspaceDirs, listProfiles, listThinkingLevels, loadConfig, loadModelsJson, matchReloadRule, modelsJsonExists, normalizeConfiguredMcpServers, normalizeElevatedMode, normalizeReasoningLevel, normalizeThinkLevel, normalizeVerboseLevel, normalizeWorkspaceDir, parseModelRef, resetConfigOverrides, resolveAgentAuthProfilesPath, resolveAgentDir, resolveAgentDir$1 as resolveAgentDirFromConfig, resolveAgentHomeDir, resolveAgentHomeDir$1 as resolveAgentHomeDirFromConfig, resolveAgentProfileDir, resolveAgentProfileMarkdownPath, resolveAgentWorkspaceDir, resolveAuthProfilesPath, resolveBinDir, resolveBundledExtensionsDir, resolveBundledSkillsDir, resolveConfigPath, resolveConfigValue, resolveCredentialsDir, resolveDefaultAgentWorkspaceDir, resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession, resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession, resolveExtensionSdkPath, resolveExtensionsDir, resolveExtensionsLockPath, resolveHeaders, resolveHomeDir, resolveInboxDir, resolveInboxMessagePath, resolveInboxPendingDir, resolveInboxProcessedDir, resolveLogPath, resolveLogsDir, resolveMcpOAuthPath, resolveModelsJsonPath, resolveNodeBinDir, resolveNodeBinPath, resolveNodeToolsDir, resolveNpmBinPath, resolveOAuthPath, resolvePidPath, resolveProfileStateDir, resolveSkillPath, resolveSkillsCachePath, resolveSkillsDir, resolveSkillsLockPath, resolveSocketPath, resolveStateDir, resolveStatusPath, resolveToolsDir, resolveWorkspaceExtensionsDir, resolveWorkspaceFile, resolveWorkspaceRoot, resolveWorkspaceStateDir, resolveWorkspaceStatePath, resolveXopcBinPath, resolveXopcCloudCatalogCachePath, resolveXopcDatabasePath, resolveXopcMcpTransportAlias, saveConfig, saveModelsJson, setConfigOverride, testApiKeyResolution, thinkLevelToNumber, unsetConfigOverride, validateModelsConfig };
+export { AgentImageGenerationModelSchema, AgentModelRefSchema, AgentModelsSchema, AgentsConfigSchema, BASE_RELOAD_RULES, BindingMatchSchema, BindingRuleSchema, BindingsConfigSchema, BrowserConfigSchema, ChannelsConfigSchema, CommandsConfigSchema, ConfigHotReloader, ConfigSchema, ConnectorsConfigSchema, CustomModelSchema, ENV_VARS, ExperimentalConfigSchema, ExtensionSecurityConfigSchema, ExtensionSlotsConfigSchema, ExtensionsConfigSchema, FILENAMES, GatewayAuthRateLimitSchema, GatewayAuthSchema, GatewayBindModeSchema, GatewayChannelConnectDeferModeSchema, GatewayConfigSchema, GatewayModeSchema, GatewayRemoteSchema, GatewaySecuritySchema, GatewayTailscaleConsentSchema, GatewayTailscaleSchema, GatewayTlsSchema, GatewayTrustedProxySchema, GatewayWebchatConfigSchema, HeartbeatConfigSchema, ImageGenerationCapabilitiesSchema, ImageGenerationModelSchema, ImageGenerationProviderSchema, McpConfigSchema, McpOAuthConfigSchema, McpServerSchema, MediaUnderstandingCapabilitiesSchema, MediaUnderstandingModelSchema, MessagesConfigSchema, ModelCatalogConfigSchema, ModelOverrideSchema, ModelsDevConfigSchema, ModelsJsonSchema, OpenAICompatSchema, OpenAICompletionsCompatSchema, OpenAIResponsesCompatSchema, OpenRouterRoutingSchema, ProfileManager, ProviderAuthConfigSchema, ProviderAzureConfigSchema, ProviderConfigSchema, ProviderRequestOverridesSchema, ProvidersConfigSchema, RuntimeToolsConfigSchema, STTConfigSchema, STTFallbackConfigSchema, STTProviderConfigSchema, SearchProviderEntrySchema, SessionConfigSchema, SessionDmScopeSchema, SessionResetByTypeSchema, SessionResetConfigSchema, SessionResetModeSchema, SessionScopeSchema, SessionStorageConfigSchema, TTSConfigSchema, TTSEdgeConfigSchema, TTSFallbackConfigSchema, TTSModelOverridesConfigSchema, TTSProviderConfigSchema, TTSSummarizationConfigSchema, TelegramAccountConfigSchema, TelegramConfigSchema, TelegramGroupConfigSchema, TelegramTopicConfigSchema, ToolsConfigSchema, ToolsMediaAudioConfigSchema, ToolsMediaConfigSchema, TuiConfigSchema, TunnelConfigSchema, TunnelConsentSchema, UpdateAutoConfigSchema, UpdateConfigSchema, VercelGatewayRoutingSchema, VoiceConfigSchema, VoiceRefinementConfigSchema, WORKSPACE_FILES, WebSearchConfigSchema, WebToolsConfigSchema, WebsiteBlocklistSchema, WeixinAccountConfigSchema, WeixinConfigSchema, WorkspaceConfigSchema, WorkspaceImportConfigSchema, XOPC_DB_FILENAME, applyConfigOverrides, assertConfigRewriteSafeForRunningGateway, buildReloadPlan, canonicalizeConfiguredMcpServer, clearConfigValueCache, createProfile, deleteProfile, diffConfigPaths, existsSync, expandWorkspacePathString, extractProfileAgentId, formatThinkingLevels, getAgentDefaultImageGenerationModelConfig, getAgentDefaultImageModelConfig, getAgentDefaultModelRef, getAllowedCommands, getCacheStats, getConfigOverrides, getCurrentProfile, getDefaultModelValues, resolveModelsJsonPath as getModelsJsonPath, getProfileManager, getProfileNameFromDir, getSwitchCommand, getWorkspacePath, hasBundledExtensionManifest, isKnownCliMcpTypeAlias, listAgentProfileMarkdownDirs, listAgentWorkspaceDirs, listProfiles, listThinkingLevels, loadConfig, loadModelsJson, matchReloadRule, modelsJsonExists, normalizeConfiguredMcpServers, normalizeElevatedMode, normalizeReasoningLevel, normalizeThinkLevel, normalizeVerboseLevel, normalizeWorkspaceDir, parseModelRef, resetConfigOverrides, resolveAgentAuthProfilesPath, resolveAgentDir, resolveAgentDir$1 as resolveAgentDirFromConfig, resolveAgentHomeDir, resolveAgentHomeDir$1 as resolveAgentHomeDirFromConfig, resolveAgentProfileDir, resolveAgentProfileMarkdownPath, resolveAgentWorkspaceDir, resolveAuthProfilesPath, resolveBinDir, resolveBundledExtensionsDir, resolveBundledSkillsDir, resolveConfigPath, resolveConfigValue, resolveCredentialsDir, resolveDefaultAgentWorkspaceDir, resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession, resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession, resolveExtensionSdkPath, resolveExtensionsDir, resolveExtensionsLockPath, resolveHeaders, resolveHomeDir, resolveInboxDir, resolveInboxMessagePath, resolveInboxPendingDir, resolveInboxProcessedDir, resolveLogPath, resolveLogsDir, resolveMcpOAuthPath, resolveModelsJsonPath, resolveNodeBinDir, resolveNodeBinPath, resolveNodeToolsDir, resolveNpmBinPath, resolveOAuthPath, resolvePidPath, resolveProfileStateDir, resolveSkillPath, resolveSkillsCachePath, resolveSkillsDir, resolveSkillsLockPath, resolveSocketPath, resolveStateDir, resolveStatusPath, resolveToolsDir, resolveWorkspaceExtensionsDir, resolveWorkspaceFile, resolveWorkspaceRoot, resolveWorkspaceStateDir, resolveWorkspaceStatePath, resolveXopcBinPath, resolveXopcCloudCatalogCachePath, resolveXopcDatabasePath, resolveXopcMcpTransportAlias, saveConfig, saveModelsJson, setConfigOverride, testApiKeyResolution, thinkLevelToNumber, unsetConfigOverride, validateModelsConfig };

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

@@ -1,4 +1,5 @@
 import { type Config } from './schema.js';
+export declare function assertConfigRewriteSafeForRunningGateway(path: string): void;
 /**
  * Load configuration from file
  * @param configPath Optional custom config path, defaults to XOPC_CONFIG_PATH or ~/.xopc/xopc.json

package/dist/src/config/loader.js

@@ -6,10 +6,21 @@ import { init_paths, resolveConfigPath } from "./paths.js";
 import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
 import { assertChannelPluginConfigs, init_validate_channel_configs } from "./validate-channel-configs.js";
 import { init_resolution, setActivePlatformDiscovery } from "../platform/resolution.js";
+import { init_lock, isGatewayConfigLockedByAnotherProcessSync } from "../gateway/lock.js";
 import { dirname } from "path";
 import { existsSync, mkdirSync, promises, readFileSync } from "fs";
 import { config } from "dotenv";
 //#region src/config/loader.ts
+function assertConfigRewriteSafeForRunningGateway(path) {
+	if (!existsSync(path) || !isGatewayConfigLockedByAnotherProcessSync(path)) return;
+	try {
+		const raw = JSON.parse(readFileSync(path, "utf8"));
+		if (!Array.isArray(raw.userContext?.knowledgeMemory?.sources)) return;
+	} catch {
+		return;
+	}
+	throw new Error("Configuration update deferred: restart the running gateway before rewriting the legacy memory policy.");
+}
 function activateConfig(configValue) {
 	setActivePlatformDiscovery(configValue.platform.mode === "connected" ? configValue.platform.discovery : void 0);
 	return configValue;
@@ -63,6 +74,7 @@ function loadConfig(configPath) {
 */
 async function saveConfig(config, configPath) {
 	const path = configPath || process.env.XOPC_CONFIG_PATH || resolveConfigPath();
+	assertConfigRewriteSafeForRunningGateway(path);
 	const dir = dirname(path);
 	if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
 	const validated = ConfigSchema.parse(config);
@@ -84,9 +96,10 @@ var init_loader = __esmMin((() => {
 	init_logger();
 	init_validate_channel_configs();
 	init_resolution();
+	init_lock();
 	log = createLogger("ConfigLoader");
 	CONFIG_BACKUP_COUNT = 10;
 }));
 //#endregion
 init_loader();
-export { init_loader, loadConfig, resolveConfigPath, saveConfig };
+export { assertConfigRewriteSafeForRunningGateway, init_loader, loadConfig, resolveConfigPath, saveConfig };

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

@@ -1378,6 +1378,8 @@ export declare const McpServerSchema: z.ZodObject<{
         xopcSecretRef: z.ZodObject<{
             provider: z.ZodString;
             fieldKey: z.ZodString;
+            prefix: z.ZodOptional<z.ZodString>;
+            suffix: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>;
     }, z.core.$strip>]>>>;
     cwd: z.ZodOptional<z.ZodString>;
@@ -1391,6 +1393,8 @@ export declare const McpServerSchema: z.ZodObject<{
         xopcSecretRef: z.ZodObject<{
             provider: z.ZodString;
             fieldKey: z.ZodString;
+            prefix: z.ZodOptional<z.ZodString>;
+            suffix: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>;
     }, z.core.$strip>]>>>;
     auth: z.ZodOptional<z.ZodObject<{
@@ -1408,6 +1412,8 @@ export declare const McpConfigSchema: z.ZodOptional<z.ZodObject<{
             xopcSecretRef: z.ZodObject<{
                 provider: z.ZodString;
                 fieldKey: z.ZodString;
+                prefix: z.ZodOptional<z.ZodString>;
+                suffix: z.ZodOptional<z.ZodString>;
             }, z.core.$strip>;
         }, z.core.$strip>]>>>;
         cwd: z.ZodOptional<z.ZodString>;
@@ -1421,6 +1427,8 @@ export declare const McpConfigSchema: z.ZodOptional<z.ZodObject<{
             xopcSecretRef: z.ZodObject<{
                 provider: z.ZodString;
                 fieldKey: z.ZodString;
+                prefix: z.ZodOptional<z.ZodString>;
+                suffix: z.ZodOptional<z.ZodString>;
             }, z.core.$strip>;
         }, z.core.$strip>]>>>;
         auth: z.ZodOptional<z.ZodObject<{
@@ -1494,18 +1502,24 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
                 staleRetentionDays: z.ZodDefault<z.ZodNumber>;
             }, z.core.$strict>>;
         }, z.core.$strict>>;
-        knowledgeMemory: z.ZodDefault<z.ZodObject<{
+        knowledgeMemory: z.ZodDefault<z.ZodPreprocess<z.ZodObject<{
             enabled: z.ZodDefault<z.ZodBoolean>;
             writePolicy: z.ZodDefault<z.ZodEnum<{
                 allow: "allow";
                 confirm: "confirm";
                 deny: "deny";
             }>>;
-            sources: z.ZodDefault<z.ZodArray<z.ZodEnum<{
+            readScopes: z.ZodDefault<z.ZodArray<z.ZodEnum<{
                 project: "project";
                 session: "session";
+                agent: "agent";
                 workspace: "workspace";
+                global: "global";
+            }>>>;
+            contentSources: z.ZodDefault<z.ZodArray<z.ZodEnum<{
+                memory: "memory";
                 connector: "connector";
+                local_import: "local_import";
             }>>>;
             searchStrategy: z.ZodDefault<z.ZodEnum<{
                 "local-first": "local-first";
@@ -1514,6 +1528,7 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
                 "local-only": "local-only";
                 "external-only": "external-only";
             }>>;
+            searchTimeoutMs: z.ZodDefault<z.ZodNumber>;
             writeStrategy: z.ZodDefault<z.ZodEnum<{
                 "local-first": "local-first";
                 "external-first": "external-first";
@@ -1524,7 +1539,7 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
             allowExternalWrites: z.ZodDefault<z.ZodBoolean>;
             allowedProviderIds: z.ZodOptional<z.ZodArray<z.ZodString>>;
             autoWriteKinds: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        }, z.core.$strict>>;
+        }, z.core.$strict>>>;
         contextPlanning: z.ZodDefault<z.ZodObject<{
             enabled: z.ZodDefault<z.ZodBoolean>;
             maxAssertions: z.ZodDefault<z.ZodNumber>;
@@ -2167,6 +2182,8 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
                 xopcSecretRef: z.ZodObject<{
                     provider: z.ZodString;
                     fieldKey: z.ZodString;
+                    prefix: z.ZodOptional<z.ZodString>;
+                    suffix: z.ZodOptional<z.ZodString>;
                 }, z.core.$strip>;
             }, z.core.$strip>]>>>;
             cwd: z.ZodOptional<z.ZodString>;
@@ -2180,6 +2197,8 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
                 xopcSecretRef: z.ZodObject<{
                     provider: z.ZodString;
                     fieldKey: z.ZodString;
+                    prefix: z.ZodOptional<z.ZodString>;
+                    suffix: z.ZodOptional<z.ZodString>;
                 }, z.core.$strip>;
             }, z.core.$strip>]>>>;
             auth: z.ZodOptional<z.ZodObject<{

package/dist/src/config/schema.js

@@ -1,7 +1,7 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
-import { ComputerConfigSchema, init_config } from "../computer/config.js";
 import { AgentModelsOverrideSchema, AgentsConfigSchema as AgentsConfigSchema$1, DEFAULT_AGENT_MODEL_REF, ImageGenerationRouteSchema, ModelRouteSchema } from "../agent-config/schema.js";
 import { init_agent_config } from "../agent-config/index.js";
+import { ComputerConfigSchema, init_config } from "../computer/config.js";
 import { DEFAULT_CONTEXT_COMPACTION_POLICY, UserContextConfigSchema, init_config as init_config$1 } from "../user-context/config.js";
 import { init_default_model } from "./default-model.js";
 import { init_public_url, validatePublicUrl } from "./public-url.js";
@@ -958,7 +958,9 @@ defaultAgent: z.string().min(1).optional() }).strict().default({});
 	}, "MCP server URL must use http or https");
 	ConnectorSecretReferenceSchema = z.object({ xopcSecretRef: z.object({
 		provider: z.string().min(1),
-		fieldKey: z.string().min(1)
+		fieldKey: z.string().min(1),
+		prefix: z.string().optional(),
+		suffix: z.string().optional()
 	}) });
 	McpConfigScalarSchema = z.union([
 		z.string(),
@@ -1074,8 +1076,16 @@ workDiscoveryOnboarding: z.boolean().default(true) }).strict().default({ workDis
 			knowledgeMemory: {
 				enabled: true,
 				writePolicy: "confirm",
-				sources: ["session", "workspace"],
+				readScopes: [
+					"global",
+					"agent",
+					"workspace",
+					"project",
+					"session"
+				],
+				contentSources: ["memory", "local_import"],
 				searchStrategy: "fanout",
+				searchTimeoutMs: 2e3,
 				writeStrategy: "local-first",
 				allowExternalWrites: false
 			},

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

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

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

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

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

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

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

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

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

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

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

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

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

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