@xopcai/xopc 0.0.321 → 0.0.324

package/dist/src/gateway/agents-admin.js

@@ -1,10 +1,11 @@
-import { init_agent_scope, listAgentEntries, normalizeAgentId, resolveAgentDir, resolveAgentProfileDir, resolveAgentWorkspaceDir, resolveDefaultAgentId, resolveUserPath, validateAgentIdForNewAgent } from "../agent/agent-scope.js";
-import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
+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 { 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 { AgentCatalogService } from "../agent-catalog/service.js";
+import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
 import { isPathUnderWorkspace, resolveWorkspaceSafePath } from "./workspace-editor-path.js";
-import { seedAgentProfileMarkdownFiles } from "../agent/context/workspace-seed.js";
-import { applyAgentConfig, findAgentEntryIndex, getAgentDeleteBlocker, pruneAgentConfig, removeAgentDirsFromDisk } from "../commands/agents.config.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";
@@ -13,11 +14,12 @@ import { mkdir, readFile, realpath, stat, unlink, writeFile } from "node:fs/prom
 * Gateway REST helpers for multi-agent management.
 */
 init_agent_scope();
+init_repository();
 init_paths();
 const EDITABLE_PROFILE_MARKDOWN_NAMES = new Set([...AGENT_PROFILE_MARKDOWN_SYSTEM_FILES]);
-function collectAgentIdsForList(cfg) {
-	const entries = listAgentEntries(cfg).filter((e) => e.enabled !== false);
-	const defaultId = resolveDefaultAgentId(cfg);
+function collectAgentIdsForList() {
+	const entries = listAgentEntries().filter((e) => e.enabled !== false);
+	const defaultId = resolveDefaultAgentId();
 	if (entries.length === 0) return [defaultId];
 	const ids = /* @__PURE__ */ new Set();
 	for (const e of entries) ids.add(normalizeAgentId(e.id));
@@ -44,16 +46,16 @@ function parseIdentityMarkdown(content) {
 	}
 	return out;
 }
-async function listGatewayAgents(cfg, _options = {}) {
-	const defaultId = resolveDefaultAgentId(cfg);
+async function listGatewayAgents(_options = {}) {
+	const defaultId = resolveDefaultAgentId();
 	const agents = [];
-	for (const id of collectAgentIdsForList(cfg)) {
-		const profile = resolveEffectiveAgentProfile(cfg, id);
-		const entry = listAgentEntries(cfg).find((e) => normalizeAgentId(e.id) === id);
+	for (const id of collectAgentIdsForList()) {
+		const profile = resolveEffectiveAgentProfile(id);
+		const entry = listAgentEntries().find((e) => normalizeAgentId(e.id) === id);
 		if (!entry) continue;
 		let identity = {};
 		try {
-			identity = parseIdentityMarkdown(await readFile(join(resolveAgentProfileDir(cfg, id), WORKSPACE_FILES.IDENTITY), "utf-8"));
+			identity = parseIdentityMarkdown(await readFile(join(resolveAgentProfileDir(id), WORKSPACE_FILES.IDENTITY), "utf-8"));
 		} catch {}
 		agents.push({
 			id,
@@ -62,7 +64,7 @@ async function listGatewayAgents(cfg, _options = {}) {
 			...identity.language ? { language: identity.language } : {},
 			...identity.avatar ? { avatar: identity.avatar } : {},
 			workspace: profile.resolvedWorkspacePath,
-			profileDir: resolveAgentProfileDir(cfg, id),
+			profileDir: resolveAgentProfileDir(id),
 			override: structuredClone(entry),
 			effective: structuredClone(profile.config),
 			sources: { ...profile.sources },
@@ -76,9 +78,9 @@ async function listGatewayAgents(cfg, _options = {}) {
 		builtinToolIds: [...GATEWAY_BUILTIN_TOOL_IDS]
 	};
 }
-function getGatewayAgentEffectiveConfig(cfg, agentIdRaw) {
+function getGatewayAgentEffectiveConfig(agentIdRaw) {
 	const agentId = normalizeAgentId(agentIdRaw);
-	if (!listAgentEntries(cfg).find((e) => normalizeAgentId(e.id) === agentId)) return {
+	if (!listAgentEntries().find((e) => normalizeAgentId(e.id) === agentId)) return {
 		ok: false,
 		error: `agent "${agentId}" not found`,
 		status: 404
@@ -87,7 +89,7 @@ function getGatewayAgentEffectiveConfig(cfg, agentIdRaw) {
 		return {
 			ok: true,
 			data: (() => {
-				const profile = resolveEffectiveAgentProfile(cfg, agentId);
+				const profile = resolveEffectiveAgentProfile(agentId);
 				return {
 					config: profile.config,
 					sources: profile.sources
@@ -102,7 +104,7 @@ function getGatewayAgentEffectiveConfig(cfg, agentIdRaw) {
 		};
 	}
 }
-function prepareCreateAgent(cfg, body) {
+async function createGatewayAgent(body) {
 	const idRes = validateAgentIdForNewAgent(body.id, body.profile.name);
 	if (idRes.ok === false) return {
 		ok: false,
@@ -110,113 +112,90 @@ function prepareCreateAgent(cfg, body) {
 		status: 400
 	};
 	const agentId = idRes.agentId;
-	if (findAgentEntryIndex(listAgentEntries(cfg), agentId) >= 0) return {
+	if (new AgentCatalogRepository().get(agentId, { includeDeleted: true })) return {
 		ok: false,
 		error: `agent "${agentId}" already exists`,
 		status: 409
 	};
-	const wsAbs = resolveUserPath(body.workspace?.trim() || `~/.xopc/workspace/${agentId}`);
-	return {
-		ok: true,
-		data: {
-			nextConfig: applyAgentConfig(cfg, {
+	const workspace = body.workspace?.trim() ? resolveUserPath(body.workspace) : void 0;
+	try {
+		await new AgentCatalogService().create({
+			id: agentId,
+			enabled: true,
+			...workspace ? { workspace } : {},
+			profile: structuredClone(body.profile)
+		});
+		return {
+			ok: true,
+			data: {
 				agentId,
-				...body.workspace?.trim() ? { workspace: wsAbs } : {},
-				profile: structuredClone(body.profile)
-			}),
-			agentId,
-			workspace: wsAbs
-		}
-	};
-}
-async function finalizeCreateAgentDirs(cfg, agentId) {
-	const wsPath = resolveAgentWorkspaceDir(cfg, agentId);
-	const profilePath = resolveAgentProfileDir(cfg, agentId);
-	const adPath = resolveAgentDir(cfg, agentId);
-	await mkdir(wsPath, { recursive: true });
-	await mkdir(profilePath, { recursive: true });
-	await mkdir(adPath, { recursive: true });
-	const id = normalizeAgentId(agentId);
-	seedAgentProfileMarkdownFiles(profilePath, wsPath, { displayName: listAgentEntries(cfg).find((candidate) => normalizeAgentId(candidate.id) === id)?.profile?.name ?? id });
-	return {
-		ok: true,
-		data: void 0
-	};
+				workspace: resolveAgentWorkspaceDir(agentId)
+			}
+		};
+	} catch (error) {
+		return {
+			ok: false,
+			error: error instanceof Error ? error.message : String(error),
+			status: 400
+		};
+	}
 }
-function prepareUpdateAgent(cfg, agentIdRaw, body) {
+async function updateGatewayAgent(agentIdRaw, body) {
 	const agentId = normalizeAgentId(agentIdRaw);
-	const list = [...listAgentEntries(cfg)];
-	const idx = findAgentEntryIndex(list, agentId);
-	if (idx < 0) return {
+	if (!new AgentCatalogRepository().get(agentId)) return {
 		ok: false,
 		error: `agent "${agentId}" not found`,
 		status: 404
 	};
-	const entry = { ...list[idx] };
-	if (body.workspace !== void 0) {
-		const workspace = body.workspace?.trim();
-		if (workspace) entry.workspace = resolveUserPath(workspace);
-		else delete entry.workspace;
+	const patch = {};
+	if (body.workspace !== void 0) patch.workspace = body.workspace?.trim() ? resolveUserPath(body.workspace) : void 0;
+	if (body.profile !== void 0) patch.profile = body.profile ?? void 0;
+	if (body.models !== void 0) patch.models = body.models ?? void 0;
+	if (body.skills !== void 0) patch.skills = body.skills ?? void 0;
+	if (body.tools !== void 0) patch.tools = body.tools ?? void 0;
+	if (body.workflows !== void 0) patch.workflows = body.workflows ?? void 0;
+	if (body.runtime !== void 0) patch.runtime = body.runtime ?? void 0;
+	try {
+		const service = new AgentCatalogService();
+		await service.update(agentId, patch);
+		if (body.setDefault === true) service.setDefault(agentId);
+		return {
+			ok: true,
+			data: void 0
+		};
+	} catch (error) {
+		return {
+			ok: false,
+			error: error instanceof Error ? error.message : String(error),
+			status: 400
+		};
 	}
-	if (body.profile !== void 0) if (body.profile === null) delete entry.profile;
-	else entry.profile = structuredClone(body.profile);
-	if (body.models !== void 0) if (body.models === null) delete entry.models;
-	else entry.models = structuredClone(body.models);
-	if (body.skills !== void 0) if (body.skills === null) delete entry.skills;
-	else entry.skills = structuredClone(body.skills);
-	if (body.tools !== void 0) if (body.tools === null) delete entry.tools;
-	else entry.tools = body.tools;
-	if (body.workflows !== void 0) if (body.workflows === null) delete entry.workflows;
-	else entry.workflows = structuredClone(body.workflows);
-	if (body.runtime !== void 0) if (body.runtime === null) delete entry.runtime;
-	else entry.runtime = structuredClone(body.runtime);
-	list[idx] = entry;
-	let next = {
-		...cfg,
-		agents: {
-			...cfg.agents,
-			list
-		}
-	};
-	if (body.setDefault === true) next = {
-		...next,
-		agents: {
-			...next.agents,
-			default: agentId
-		}
-	};
-	return {
-		ok: true,
-		data: { nextConfig: next }
-	};
 }
-function prepareDeleteAgent(cfg, agentIdRaw) {
+async function deleteGatewayAgent(agentIdRaw, options = {}) {
 	const agentId = normalizeAgentId(agentIdRaw);
-	const blocker = getAgentDeleteBlocker(cfg, agentId);
-	if (blocker) return {
-		ok: false,
-		error: blocker,
-		status: 400
-	};
-	if (findAgentEntryIndex(listAgentEntries(cfg), agentId) < 0) return {
+	if (!new AgentCatalogRepository().get(agentId)) return {
 		ok: false,
 		error: `agent "${agentId}" not found`,
 		status: 404
 	};
-	const { config: pruned } = pruneAgentConfig(cfg, agentId);
-	return {
-		ok: true,
-		data: {
-			nextConfig: pruned,
-			agentId
-		}
-	};
-}
-async function runAfterDeletePurge(cfg, agentId) {
-	await removeAgentDirsFromDisk(cfg, agentId);
+	try {
+		return {
+			ok: true,
+			data: {
+				agentId,
+				removedBindings: (await new AgentCatalogService().delete(agentId, options)).removedBindings
+			}
+		};
+	} catch (error) {
+		return {
+			ok: false,
+			error: error instanceof Error ? error.message : String(error),
+			status: 400
+		};
+	}
 }
-async function profileMarkdownRootReal(cfg, agentId) {
-	const dir = resolveAgentProfileDir(cfg, agentId);
+async function profileMarkdownRootReal(agentId) {
+	const dir = resolveAgentProfileDir(agentId);
 	await mkdir(dir, { recursive: true });
 	try {
 		return await realpath(dir);
@@ -232,14 +211,14 @@ function assertAllowedFile(name) {
 	};
 	return null;
 }
-async function listAgentProfileFiles(cfg, agentId) {
+async function listAgentProfileFiles(agentId) {
 	const id = normalizeAgentId(agentId);
-	if (collectAgentIdsForList(cfg).every((x) => x !== id)) return {
+	if (collectAgentIdsForList().every((x) => x !== id)) return {
 		ok: false,
 		error: `agent "${id}" not found`,
 		status: 404
 	};
-	const root = await profileMarkdownRootReal(cfg, id);
+	const root = await profileMarkdownRootReal(id);
 	const names = [...EDITABLE_PROFILE_MARKDOWN_NAMES];
 	const files = [];
 	for (const name of names.sort((a, b) => a.localeCompare(b))) {
@@ -272,16 +251,16 @@ async function listAgentProfileFiles(cfg, agentId) {
 		}
 	};
 }
-async function readAgentProfileFile(cfg, agentId, name) {
+async function readAgentProfileFile(agentId, name) {
 	const bad = assertAllowedFile(name);
 	if (bad) return bad;
 	const id = normalizeAgentId(agentId);
-	if (collectAgentIdsForList(cfg).every((x) => x !== id)) return {
+	if (collectAgentIdsForList().every((x) => x !== id)) return {
 		ok: false,
 		error: `agent "${id}" not found`,
 		status: 404
 	};
-	const abs = resolveWorkspaceSafePath(await profileMarkdownRootReal(cfg, id), name);
+	const abs = resolveWorkspaceSafePath(await profileMarkdownRootReal(id), name);
 	if (!abs) return {
 		ok: false,
 		error: "invalid path",
@@ -304,22 +283,22 @@ async function readAgentProfileFile(cfg, agentId, name) {
 		};
 	}
 }
-async function writeAgentProfileFile(cfg, agentId, name, content) {
+async function writeAgentProfileFile(agentId, name, content) {
 	const bad = assertAllowedFile(name);
 	if (bad) return bad;
 	const id = normalizeAgentId(agentId);
-	if (collectAgentIdsForList(cfg).every((x) => x !== id)) return {
+	if (collectAgentIdsForList().every((x) => x !== id)) return {
 		ok: false,
 		error: `agent "${id}" not found`,
 		status: 404
 	};
-	const abs = resolveWorkspaceSafePath(await profileMarkdownRootReal(cfg, id), name);
+	const abs = resolveWorkspaceSafePath(await profileMarkdownRootReal(id), name);
 	if (!abs) return {
 		ok: false,
 		error: "invalid path",
 		status: 400
 	};
-	if (!isPathUnderWorkspace(await profileMarkdownRootReal(cfg, id), abs)) return {
+	if (!isPathUnderWorkspace(await profileMarkdownRootReal(id), abs)) return {
 		ok: false,
 		error: "path escapes profile markdown root",
 		status: 400
@@ -357,19 +336,19 @@ function detectImageMimeFromBytes(buf) {
 	if (buf.length >= 12 && buf[0] === 82 && buf[1] === 73 && buf[2] === 70 && buf[3] === 70 && buf[8] === 87 && buf[9] === 69 && buf[10] === 66 && buf[11] === 80) return "image/webp";
 	return null;
 }
-function assertAgentExistsForAvatar(cfg, id) {
-	if (collectAgentIdsForList(cfg).every((x) => x !== id)) return {
+function assertAgentExistsForAvatar(id) {
+	if (collectAgentIdsForList().every((x) => x !== id)) return {
 		ok: false,
 		error: `agent "${id}" not found`,
 		status: 404
 	};
 	return null;
 }
-async function readAgentAvatarFile(cfg, agentId) {
-	const missingAgent = assertAgentExistsForAvatar(cfg, agentId);
+async function readAgentAvatarFile(agentId) {
+	const missingAgent = assertAgentExistsForAvatar(agentId);
 	if (missingAgent) return missingAgent;
 	const id = normalizeAgentId(agentId);
-	const root = await profileMarkdownRootReal(cfg, id);
+	const root = await profileMarkdownRootReal(id);
 	for (const name of agentAvatarFilenames()) {
 		const abs = resolveWorkspaceSafePath(root, name);
 		if (!abs) continue;
@@ -396,8 +375,8 @@ async function readAgentAvatarFile(cfg, agentId) {
 		status: 404
 	};
 }
-async function writeAgentAvatarFromBase64(cfg, agentId, base64, mimeType) {
-	const missingAgent = assertAgentExistsForAvatar(cfg, agentId);
+async function writeAgentAvatarFromBase64(agentId, base64, mimeType) {
+	const missingAgent = assertAgentExistsForAvatar(agentId);
 	if (missingAgent) return missingAgent;
 	const id = normalizeAgentId(agentId);
 	const ext = mimeToExt(mimeType);
@@ -427,8 +406,8 @@ async function writeAgentAvatarFromBase64(cfg, agentId, base64, mimeType) {
 		error: "file content does not match declared image type",
 		status: 400
 	};
-	const root = await profileMarkdownRootReal(cfg, id);
-	const rootReal = await profileMarkdownRootReal(cfg, id);
+	const root = await profileMarkdownRootReal(id);
+	const rootReal = await profileMarkdownRootReal(id);
 	const targetName = `${AGENT_AVATAR_BASENAME}${ext}`;
 	const abs = resolveWorkspaceSafePath(root, targetName);
 	if (!abs || !isPathUnderWorkspace(rootReal, abs)) return {
@@ -461,12 +440,12 @@ function extMatchesDetectedMime(ext, detected) {
 	return detected === mimeToExtToMime(ext);
 }
 /** Remove any `agent-avatar.*` in the agent profile markdown root. Idempotent: ok even when no file existed. */
-async function deleteAgentAvatarFile(cfg, agentId) {
-	const missingAgent = assertAgentExistsForAvatar(cfg, agentId);
+async function deleteAgentAvatarFile(agentId) {
+	const missingAgent = assertAgentExistsForAvatar(agentId);
 	if (missingAgent) return missingAgent;
 	const id = normalizeAgentId(agentId);
-	const root = await profileMarkdownRootReal(cfg, id);
-	const rootReal = await profileMarkdownRootReal(cfg, id);
+	const root = await profileMarkdownRootReal(id);
+	const rootReal = await profileMarkdownRootReal(id);
 	for (const name of agentAvatarFilenames()) {
 		const abs = resolveWorkspaceSafePath(root, name);
 		if (!abs || !isPathUnderWorkspace(rootReal, abs)) continue;
@@ -480,4 +459,4 @@ async function deleteAgentAvatarFile(cfg, agentId) {
 	};
 }
 //#endregion
-export { deleteAgentAvatarFile, extractAvatarFromIdentityMarkdown, finalizeCreateAgentDirs, getGatewayAgentEffectiveConfig, listAgentProfileFiles, listGatewayAgents, parseIdentityMarkdown, prepareCreateAgent, prepareDeleteAgent, prepareUpdateAgent, readAgentAvatarFile, readAgentProfileFile, runAfterDeletePurge, writeAgentAvatarFromBase64, writeAgentProfileFile };
+export { createGatewayAgent, deleteAgentAvatarFile, deleteGatewayAgent, extractAvatarFromIdentityMarkdown, getGatewayAgentEffectiveConfig, listAgentProfileFiles, listGatewayAgents, parseIdentityMarkdown, readAgentAvatarFile, readAgentProfileFile, updateGatewayAgent, writeAgentAvatarFromBase64, writeAgentProfileFile };

package/dist/src/gateway/chat-stream/mapper.js

@@ -1,5 +1,6 @@
 import { parseTurnOutcome } from "../../../packages/gateway-contract/src/turn-outcome.js";
 import { resolveToolActivity } from "../../../packages/gateway-contract/src/tool-activity.js";
+import { isUserTurnDocument } from "../../../packages/gateway-contract/src/user-turn-document.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { createPetFeedback } from "./pet-feedback.js";
 //#region src/gateway/chat-stream/mapper.ts
@@ -446,12 +447,15 @@ function userMessageFromEvent(event, turnId) {
 	};
 }
 function userMessageDisplayMetadata(value) {
-	const rows = asRecord(value)?.sourceContexts;
-	if (!Array.isArray(rows)) return void 0;
+	const metadata = asRecord(value);
+	const rows = metadata?.sourceContexts;
+	const userTurnDocument = isUserTurnDocument(metadata?.userTurnDocument) ? metadata.userTurnDocument : void 0;
+	if (!Array.isArray(rows)) return userTurnDocument ? { userTurnDocument } : void 0;
 	const sourceContexts = rows.flatMap((value) => {
 		const row = asRecord(value);
 		if (row?.kind !== "note" && row?.kind !== "task" && row?.kind !== "file" && row?.kind !== "session" && row?.kind !== "browser_tab" && row?.kind !== "mcp_resource" || typeof row.sourceId !== "string" || typeof row.version !== "string" || typeof row.title !== "string") return [];
 		return [{
+			...typeof row.refId === "string" ? { refId: row.refId } : {},
 			kind: row.kind,
 			sourceId: row.sourceId,
 			version: row.version,
@@ -461,7 +465,10 @@ function userMessageDisplayMetadata(value) {
 			...row.kind === "file" && (row.fileKind === "file" || row.fileKind === "directory") ? { fileKind: row.fileKind } : {}
 		}];
 	});
-	return sourceContexts.length > 0 ? { sourceContexts } : void 0;
+	return sourceContexts.length > 0 || userTurnDocument ? {
+		...sourceContexts.length > 0 ? { sourceContexts } : {},
+		...userTurnDocument ? { userTurnDocument } : {}
+	} : void 0;
 }
 function extractTextFromMessage(message) {
 	return extractText(message.content);

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";
@@ -11,11 +11,11 @@ init_agent_scope();
 init_paths();
 init_paths_state();
 function buildFilePathClassifierContext(cfg, conversationIdRaw, explicitAgentId) {
-	const agentId = explicitAgentId ?? extractProfileAgentId(conversationIdRaw, cfg);
+	const agentId = explicitAgentId ?? extractProfileAgentId(conversationIdRaw);
 	const stateDir = resolveStateDir();
 	return {
 		workspaceRoot: "",
-		profileMarkdownRoot: resolveAgentProfileDir(cfg, agentId),
+		profileMarkdownRoot: resolveAgentProfileDir(agentId),
 		stateDir,
 		skillsDir: resolveSkillsDir(),
 		configFilePath: resolveConfigPath(),

package/dist/src/gateway/file-space-service.js

@@ -1,8 +1,9 @@
-import { listSessionWorkspaceOverrides } from "../storage/sqlite/config-repository.js";
+import { init_config_repository, listSessionWorkspaceOverrides } from "../storage/sqlite/config-repository.js";
 import { effectiveWorkspacePathForSession } from "../session/session-workspace.js";
 import { getProjectForSession } from "../projects/workspace.js";
 import { FileSpaceService } from "../files/file-service.js";
 //#region src/gateway/file-space-service.ts
+init_config_repository();
 const services = /* @__PURE__ */ new WeakMap();
 /** Share the file registry, including session-specific spaces, across gateway routes. */
 function getGatewayFileSpaceService(service) {

package/dist/src/gateway/global-defaults-admin.d.ts

@@ -1,5 +1,4 @@
 import { type AgentDefaults } from '../agent-config/index.js';
-import type { Config } from '../config/schema.js';
 import { type GatewayBuiltinToolSummary } from './agent-builtin-tools.js';
 export type GlobalDefaultsPayload = {
     defaults: AgentDefaults;
@@ -16,8 +15,11 @@ export type GlobalDefaultsAdminResult<T> = {
     error: string;
     status?: 400 | 404 | 500;
 };
-export declare function listGlobalDefaults(cfg: Config): GlobalDefaultsPayload;
-export declare function prepareUpdateGlobalDefaults(cfg: Config, body: UpdateGlobalDefaultsBody): GlobalDefaultsAdminResult<{
-    nextConfig: Config;
+export declare function listGlobalDefaults(): GlobalDefaultsPayload;
+export declare function prepareUpdateGlobalDefaults(body: UpdateGlobalDefaultsBody): GlobalDefaultsAdminResult<{
+    defaults: AgentDefaults;
+    changed: boolean;
+}>;
+export declare function updateGlobalDefaults(body: UpdateGlobalDefaultsBody): GlobalDefaultsAdminResult<{
     changed: boolean;
 }>;

package/dist/src/gateway/global-defaults-admin.js

@@ -1,34 +1,32 @@
 import { AgentDefaultsSchema } from "../agent-config/schema.js";
 import { init_agent_config } from "../agent-config/index.js";
+import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
+import { AgentCatalogService } from "../agent-catalog/service.js";
 import { GATEWAY_BUILTIN_TOOLS } from "./agent-builtin-tools.js";
-import { validateComputerModelChanges } from "../computer/model-config.js";
+import { validateComputerModelChange } from "../computer/model-config.js";
 import { isDeepStrictEqual } from "node:util";
 //#region src/gateway/global-defaults-admin.ts
 init_agent_config();
-function listGlobalDefaults(cfg) {
+init_repository();
+function listGlobalDefaults() {
 	return {
-		defaults: structuredClone(cfg.agents.defaults),
+		defaults: structuredClone(new AgentCatalogRepository().getSettings().defaults),
 		builtinTools: GATEWAY_BUILTIN_TOOLS.map((tool) => ({
 			id: tool.id,
 			description: { ...tool.description }
 		}))
 	};
 }
-function prepareUpdateGlobalDefaults(cfg, body) {
+function prepareUpdateGlobalDefaults(body) {
 	const parsed = AgentDefaultsSchema.safeParse(body.defaults);
 	if (!parsed.success) return {
 		ok: false,
 		error: `defaults ${parsed.error.issues[0]?.message ?? "is invalid"}`,
 		status: 400
 	};
+	const current = new AgentCatalogRepository().getSettings().defaults;
 	try {
-		validateComputerModelChanges({
-			...cfg,
-			agents: {
-				...cfg.agents,
-				defaults: parsed.data
-			}
-		}, cfg);
+		validateComputerModelChange(parsed.data.models.computerUse, current.models.computerUse);
 	} catch (error) {
 		return {
 			ok: false,
@@ -39,16 +37,19 @@ function prepareUpdateGlobalDefaults(cfg, body) {
 	return {
 		ok: true,
 		data: {
-			changed: !isDeepStrictEqual(cfg.agents.defaults, parsed.data),
-			nextConfig: {
-				...cfg,
-				agents: {
-					...cfg.agents,
-					defaults: parsed.data
-				}
-			}
+			changed: !isDeepStrictEqual(current, parsed.data),
+			defaults: parsed.data
 		}
 	};
 }
+function updateGlobalDefaults(body) {
+	const prepared = prepareUpdateGlobalDefaults(body);
+	if (!prepared.ok) return prepared;
+	if (prepared.data.changed) new AgentCatalogService().updateDefaults(prepared.data.defaults);
+	return {
+		ok: true,
+		data: { changed: prepared.data.changed }
+	};
+}
 //#endregion
-export { listGlobalDefaults, prepareUpdateGlobalDefaults };
+export { listGlobalDefaults, prepareUpdateGlobalDefaults, updateGlobalDefaults };

package/dist/src/gateway/hono/app.js

@@ -1,6 +1,6 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { listDevices } from "../../storage/sqlite/device-access-repository.js";
+import { init_device_access_repository, listDevices } from "../../storage/sqlite/device-access-repository.js";
 import { ENDPOINT_MAX_FILE_BYTES, init_src } from "../../../packages/endpoint-tools-protocol/src/index.js";
 import { resolveAllowedBrowserOrigins, resolveGatewayServiceListenPort } from "../host.js";
 import { resolveGatewayEffectiveHost } from "../../config/gateway-bind.js";
@@ -34,6 +34,7 @@ import { getConnInfo } from "@hono/node-server/conninfo";
 //#region src/gateway/hono/app.ts
 init_src();
 init_logger();
+init_device_access_repository();
 const log = createLogger("Gateway:App");
 /**
 * Extension sandbox HTML under `/api/extensions/:id/assets/*` ships its own CSP

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

@@ -1,7 +1,8 @@
-import { ContextPlanningConfigSchema, KnowledgeMemoryConfigSchema, UserModelConfigSchema, init_config } from "../../../user-context/config.js";
-import { init_agent_scope, listAgentEntries, normalizeAgentId, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
+import { normalizeAgentId } from "../../../agent-catalog/id.js";
+import { AgentCatalogRepository, init_repository } from "../../../agent-catalog/repository.js";
+import { init_agent_scope, listAgentEntries, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
 import { resolveModelsJsonPath } from "../../../config/paths.js";
-import { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus, init_channel_catalog_service } from "../../../channels/catalog/channel-catalog-service.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";
@@ -9,6 +10,7 @@ import { getAllProviders, init_providers, isProviderConfigured } from "../../../
 import { normalizeConfiguredMcpServers } from "../../../config/mcp-config-normalize.js";
 import { resolveShareConfig } from "../../../share/share-config.js";
 import { maskTunnelSecretForWeb } from "../../../tunnel/env.js";
+import { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus } from "../../../channels/catalog/channel-catalog-service.js";
 import { resolveSessionConfigForWeb, resolveUpdateConfigForWeb } from "../../../config/web-patch.js";
 import { GENERIC_MASKED_SECRET, maskSecretLength } from "./mask-secret-length.js";
 import { safeToolsWebForGet } from "../../config-tools-web.js";
@@ -16,7 +18,7 @@ import { buildSafeProvidersConfigForWeb } from "./safe-providers-config.js";
 import { maskRealtimeVoiceConfigForWeb, maskSttConfigForWeb, maskTtsConfigForWeb } from "./safe-voice-config.js";
 //#region src/gateway/hono/lib/config-payload.ts
 init_agent_scope();
-init_channel_catalog_service();
+init_repository();
 init_credentials();
 init_models_json();
 init_providers();
@@ -63,6 +65,7 @@ function buildSafeBrowserConfigForWeb(browser) {
 /** Sanitized config snapshot for GET/PATCH `/api/config` (matches persisted `service.currentConfig`). */
 async function buildSafeWebConfigPayload(service, options = {}) {
 	const config = service.currentConfig;
+	const agentCatalog = new AgentCatalogRepository().snapshot();
 	const snapshot = (typeof service.getExtensionLoader === "function" ? service.getExtensionLoader() : void 0)?.getManifestSnapshot();
 	const catalog = snapshot ? buildChannelCatalogFromSnapshot(snapshot, { locale: options.locale }) : buildChannelCatalogForConfig(config, { locale: options.locale });
 	const channelsPayload = Object.fromEntries(catalog.entries.map((entry) => {
@@ -81,8 +84,8 @@ async function buildSafeWebConfigPayload(service, options = {}) {
 	}));
 	return {
 		agents: {
-			defaultId: resolveDefaultAgentId(config),
-			list: listAgentEntries(config).filter((e) => e.enabled !== false).map((e) => ({
+			defaultId: resolveDefaultAgentId(),
+			list: listAgentEntries().filter((e) => e.enabled !== false).map((e) => ({
 				id: normalizeAgentId(e.id),
 				workspace: e.workspace,
 				models: e.models,
@@ -90,7 +93,7 @@ async function buildSafeWebConfigPayload(service, options = {}) {
 				skills: e.skills,
 				workflows: e.workflows
 			})),
-			defaults: config.agents.defaults
+			defaults: agentCatalog.defaults
 		},
 		computer: config.computer,
 		channels: channelsPayload,
@@ -142,7 +145,7 @@ async function buildSafeWebConfigPayload(service, options = {}) {
 			knowledgeMemory: KnowledgeMemoryConfigSchema.parse(config.userContext?.knowledgeMemory),
 			contextPlanning: ContextPlanningConfigSchema.parse(config.userContext?.contextPlanning)
 		},
-		tui: { defaultAgent: config.tui?.defaultAgent ?? "coder" },
+		tui: { defaultAgent: agentCatalog.surfaceDefaults.tui ?? agentCatalog.defaultAgentId },
 		tunnel: {
 			enabled: config.tunnel?.enabled === true,
 			autoStart: config.tunnel?.autoStart === true,
@@ -159,7 +162,7 @@ async function buildSafeWebConfigPayload(service, options = {}) {
 		tts: maskTtsConfigForWeb(config.messages?.tts),
 		voice: maskRealtimeVoiceConfigForWeb(config.voice),
 		tools: safeToolsWebForGet(config),
-		bindings: Array.isArray(config.bindings) ? config.bindings : [],
+		bindings: agentCatalog.bindings,
 		mcp: buildSafeMcpConfigForWeb(config)
 	};
 }