@xopcai/xopc 0.0.302 → 0.0.306

package/dist/src/channels/attachments/voice-stt-webchat.js

@@ -12,28 +12,39 @@ function isVoiceLikeAttachment(att) {
 	if (att.type === "voice") return true;
 	return (att.mimeType?.toLowerCase() ?? "").startsWith("audio/");
 }
+/** True when the user explicitly asks the agent to inspect the original recording. */
+function requestsOriginalVoiceInspection(text) {
+	const normalized = text.trim();
+	if (!normalized) return false;
+	return /(?:分析|检查|听|辨别|识别|判断|检测|对比|提取).{0,12}(?:原始|原声)?(?:语音|音频|录音|声音)/u.test(normalized) || /(?:原始|原声)?(?:语音|音频|录音|声音).{0,12}(?:分析|检查|听|辨别|识别|判断|检测|对比|音质|音色|语气|情绪|口音|噪声|杂音|背景声|说话人|声纹)/u.test(normalized) || /\b(?:analy[sz]e|inspect|listen\s+to|check|identify|compare|detect)\b.{0,40}\b(?:(?:original|raw)\s+)?(?:audio|recording|voice(?:\s+(?:clip|message))?)\b/iu.test(normalized) || /\b(?:(?:original|raw)\s+)?(?:audio|recording|voice(?:\s+(?:clip|message))?)\b.{0,40}\b(?:analy[sz]e|inspect|listen|quality|tone|emotion|accent|noise|background|speaker|voiceprint)\b/iu.test(normalized);
+}
 async function mergeVoiceTranscriptsIntoUserText(prepared, userText, sttConfig, opts) {
 	if (!prepared?.length) return {
 		text: userText,
 		inboundVoice: false,
-		voiceTranscripts: []
+		voiceTranscripts: [],
+		transcribedMediaUris: []
 	};
 	if (!prepared.some(isVoiceLikeAttachment)) return {
 		text: userText,
 		inboundVoice: false,
-		voiceTranscripts: []
+		voiceTranscripts: [],
+		transcribedMediaUris: []
 	};
 	if (opts?.skipVoiceTranscription === true) return {
 		text: userText,
 		inboundVoice: true,
-		voiceTranscripts: []
+		voiceTranscripts: [],
+		transcribedMediaUris: []
 	};
 	if (!isSTTAvailable(sttConfig)) return {
 		text: userText,
 		inboundVoice: true,
-		voiceTranscripts: []
+		voiceTranscripts: [],
+		transcribedMediaUris: []
 	};
 	const transcripts = [];
+	const transcribedMediaUris = [];
 	for (const att of prepared) {
 		if (!isVoiceLikeAttachment(att)) continue;
 		let buf = null;
@@ -56,12 +67,13 @@ async function mergeVoiceTranscriptsIntoUserText(prepared, userText, sttConfig,
 			continue;
 		}
 		try {
-			const r = await transcribe(buf, sttConfig, {
+			const transcript = (await transcribe(buf, sttConfig, {
 				language: sttConfig.provider === "alibaba" ? "zh" : void 0,
 				mime: att.mimeType,
 				fileName: att.name
-			});
-			transcripts.push(r.text.trim() || "[Voice: no speech detected]");
+			})).text.trim();
+			transcripts.push(transcript || "[Voice: no speech detected]");
+			if (transcript && "uri" in att && att.uri?.trim()) transcribedMediaUris.push(att.uri.trim());
 		} catch (error) {
 			const errorMessage = error instanceof Error ? error.message : String(error);
 			log.error({
@@ -78,8 +90,9 @@ async function mergeVoiceTranscriptsIntoUserText(prepared, userText, sttConfig,
 	return {
 		text: [transcripts.filter(Boolean).join("\n"), userText.trim()].filter(Boolean).join("\n\n") || userText,
 		inboundVoice: true,
-		voiceTranscripts: transcripts
+		voiceTranscripts: transcripts,
+		transcribedMediaUris
 	};
 }
 //#endregion
-export { isVoiceLikeAttachment, mergeVoiceTranscriptsIntoUserText };
+export { isVoiceLikeAttachment, mergeVoiceTranscriptsIntoUserText, requestsOriginalVoiceInspection };

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

@@ -77,6 +77,7 @@ function createAgentCommand(_ctx) {
 			extensionLoader.setConfig(config);
 			extensionLoader.setRuntimeContext({ bus });
 			await extensionLoader.loadByActivationPlan();
+			await extensionLoader.startServices();
 			const n = extensionLoader.getRegistry().extensions.size;
 			if (n > 0) log.info({ count: n }, "Extensions loaded");
 		} catch (error) {
@@ -120,6 +121,7 @@ function createAgentCommand(_ctx) {
 			running = false;
 			bus.shutdown();
 			await agent.stop();
+			await extensionLoader?.shutdown();
 		};
 		process.on("SIGINT", shutdown);
 		process.on("SIGTERM", shutdown);

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

@@ -1,17 +1,16 @@
 import { ConfigSchema, init_schema } from "../../config/schema.js";
-import { init_write_file_atomic, writeTextAtomic } from "../../infra/write-file-atomic.js";
 import { resolveGatewayLocalClientHost } from "../../config/gateway-bind.js";
 import { formatExamples, register } from "../registry.js";
 import { existsSync, readFileSync } from "fs";
 import { Command } from "commander";
 //#region src/cli/commands/config.ts
-init_write_file_atomic();
 init_schema();
 const MISSING_CONFIG_HINT = "Run: xopc setup, xopc onboard, or xopc init";
 async function loadConfigDeps() {
-	const [{ loadConfig }, { createLogger }] = await Promise.all([import("../../config/index.js"), import("../../utils/logger.js")]);
+	const [{ loadConfig, saveConfig }, { createLogger }] = await Promise.all([import("../../config/index.js"), import("../../utils/logger.js")]);
 	return {
 		loadConfig,
+		saveConfig,
 		log: createLogger("ConfigCommand")
 	};
 }
@@ -108,7 +107,7 @@ function createConfigCommand(ctx) {
 		console.log(typeof value === "object" ? JSON.stringify(value, null, 2) : value);
 	});
 	cmd.command("set <path> <value>").description("Set a config value by dot path").action(async (path, value) => {
-		const { loadConfig, log } = await loadConfigDeps();
+		const { loadConfig, saveConfig, log } = await loadConfigDeps();
 		if (!existsSync(ctx.configPath)) {
 			log.error(`Config file not found. ${MISSING_CONFIG_HINT}`);
 			process.exit(1);
@@ -121,11 +120,11 @@ function createConfigCommand(ctx) {
 		}
 		const config = loadConfig(ctx.configPath);
 		setNestedValue(config, path, parsedValue);
-		await writeTextAtomic(ctx.configPath, JSON.stringify(config, null, 2));
+		await saveConfig(config, ctx.configPath);
 		log.info({ path }, `Config updated`);
 	});
 	cmd.command("unset <path>").description("Remove a config value by dot path").action(async (path) => {
-		const { loadConfig, log } = await loadConfigDeps();
+		const { loadConfig, saveConfig, log } = await loadConfigDeps();
 		if (!existsSync(ctx.configPath)) {
 			log.error(`Config file not found. ${MISSING_CONFIG_HINT}`);
 			process.exit(1);
@@ -138,7 +137,7 @@ function createConfigCommand(ctx) {
 		}, config);
 		if (target && typeof target === "object" && lastKey in target) {
 			delete target[lastKey];
-			await writeTextAtomic(ctx.configPath, JSON.stringify(config, null, 2));
+			await saveConfig(config, ctx.configPath);
 			log.info({ path }, `Config removed`);
 		} else {
 			log.error({ path }, `Config path not found`);
@@ -152,7 +151,7 @@ function createConfigCommand(ctx) {
 		if (!await runConfigValidate(ctx.configPath)) process.exit(1);
 	});
 	cmd.command("token").description("Generate or view the gateway auth token").option("--generate", "Generate a new token").option("--show", "Show the current token (unmasked)").action(async (options) => {
-		const { loadConfig, log } = await loadConfigDeps();
+		const { loadConfig, saveConfig, log } = await loadConfigDeps();
 		if (!existsSync(ctx.configPath)) {
 			log.error(`Config file not found. ${MISSING_CONFIG_HINT}`);
 			process.exit(1);
@@ -171,7 +170,7 @@ function createConfigCommand(ctx) {
 				mode: "token",
 				token: newToken
 			};
-			await writeTextAtomic(ctx.configPath, JSON.stringify(config, null, 2));
+			await saveConfig(config, ctx.configPath);
 			log.info("New gateway token generated");
 			console.log(`Token: ${newToken.slice(0, 8)}...${newToken.slice(-8)}`);
 			console.log("\nUse \"xopc config token --show\" to view the full token");

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

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

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

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

package/dist/src/cli/commands/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/commands/update.js

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

package/dist/src/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

@@ -1494,18 +1494,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 +1520,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 +1531,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>;

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";
@@ -1074,8 +1074,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
 			},