@xopcai/xopc 0.0.321 → 0.0.324

package/dist/src/channels/catalog/channel-catalog-service.js

@@ -1,9 +1,13 @@
-import { __esmMin } from "../../../_virtual/_rolldown/runtime.js";
 import { init_paths_state, resolveStateDir } from "../../config/paths-state.js";
-import { buildExtensionMetadataSnapshot, init_extension_metadata_snapshot, resolveExtensionLoaderOptionsFromConfig } from "../../extensions/extension-metadata-snapshot.js";
+import { buildExtensionMetadataSnapshot, resolveExtensionLoaderOptionsFromConfig } from "../../extensions/extension-metadata-snapshot.js";
 import { join } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 //#region src/channels/catalog/channel-catalog-service.ts
+init_paths_state();
+const DEFAULT_CONFIG_SCHEMA = {
+	type: "object",
+	additionalProperties: true
+};
 function normalizeChannelId(raw) {
 	return raw.trim().toLowerCase();
 }
@@ -282,15 +286,5 @@ function isChannelConfigured(config, channelId) {
 function getConfiguredChannelIds(config) {
 	return Object.keys(config.channels ?? {}).map(normalizeChannelId).filter((id) => id && isChannelConfigured(config, id));
 }
-var DEFAULT_CONFIG_SCHEMA;
-var init_channel_catalog_service = __esmMin((() => {
-	init_paths_state();
-	init_extension_metadata_snapshot();
-	DEFAULT_CONFIG_SCHEMA = {
-		type: "object",
-		additionalProperties: true
-	};
-}));
 //#endregion
-init_channel_catalog_service();
-export { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus, getConfiguredChannelIds, init_channel_catalog_service, isChannelConfigured };
+export { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus, getConfiguredChannelIds, isChannelConfigured };

package/dist/src/chat-commands/agent-edit.js

@@ -1,6 +1,7 @@
-import { init_agent_scope, normalizeAgentId, resolveAgentProfileDir } from "../agent/agent-scope.js";
-import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
+import { normalizeAgentId } from "../agent-catalog/id.js";
+import { init_agent_scope, resolveAgentProfileDir } from "../agent/agent-scope.js";
 import { WORKSPACE_FILES, init_paths } from "../config/paths.js";
+import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
 import { commandRegistry } from "./registry.js";
 import { join } from "node:path";
 import { readFile } from "node:fs/promises";
@@ -102,7 +103,7 @@ const agentEditCommand = {
 			success: false
 		};
 		const agentId = normalizeAgentId(resolveAgentIdFromConversationId(ctx.conversationId));
-		const profileDir = resolveAgentProfileDir(ctx.config, agentId);
+		const profileDir = resolveAgentProfileDir(agentId);
 		const namesToShow = fileName ? [fileName] : [WORKSPACE_FILES.SOUL, WORKSPACE_FILES.IDENTITY];
 		const sections = [];
 		for (const name of namesToShow) {

package/dist/src/chat-commands/builtins/config.js

@@ -1,15 +1,14 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { ConfigSchema, init_schema } from "../../config/schema.js";
 import { init_paths, resolveConfigPath } from "../../config/paths.js";
-import { init_loader, loadConfig, saveConfig } from "../../config/loader.js";
+import { ConfigSchema, init_schema } from "../../config/schema.js";
 import { commandRegistry } from "../registry.js";
 import { parseConfigValue } from "../config-value.js";
 import { getConfigValueAtPath, parseConfigPath, setConfigValueAtPath, unsetConfigValueAtPath } from "../config-paths.js";
+import { loadConfig, saveConfig } from "../../config/loader.js";
 import { resolveAllowlistMatchSimple } from "../../channels/security.js";
 //#region src/chat-commands/builtins/config.ts
 init_schema();
-init_loader();
 init_paths();
 init_logger();
 const log = createLogger("ConfigCommand");
@@ -75,10 +74,9 @@ const configCommand = {
 	acceptsArgs: true,
 	examples: [
 		"/config show",
-		"/config show agents.list",
-		"/config set agents.default=main",
-		"/config show agents.defaults",
-		"/config unset tts"
+		"/config show gateway.port",
+		"/config set commands.restart=false",
+		"/config unset tunnel"
 	],
 	handler: async (ctx, args) => {
 		const parts = args.trim().split(/\s+/);
@@ -180,7 +178,7 @@ const configCommand = {
 			log.info({ path: rest }, "Config key removed via /config unset");
 			return { content: `⚙️ Config updated: \`${rest}\` removed.` };
 		}
-		return { content: "⚙️ *Config Command*\n\n`/config show [path]` — view config (or a specific path)\n`/config set path=value` — update a config value\n`/config unset path` — remove a config key\n\nExamples:\n`/config show agents.list`\n`/config set agents.default=main`\n`/config show agents.defaults`\n`/config unset tts`" };
+		return { content: "⚙️ *Config Command*\n\n`/config show [path]` — view config (or a specific path)\n`/config set path=value` — update a config value\n`/config unset path` — remove a config key\n\nExamples:\n`/config show gateway.port`\n`/config set commands.restart=false`\n`/config unset tunnel`" };
 	}
 };
 function registerConfigCommand() {

package/dist/src/chat-commands/builtins/review.js

@@ -135,7 +135,7 @@ async function reviewModelRef(ctx) {
 	const sessionOverride = await ctx.getSessionConfigStore?.()?.get(ctx.conversationId).then((config) => config?.modelOverride?.trim()).catch(() => void 0);
 	if (sessionOverride) return sessionOverride;
 	try {
-		const profile = resolveEffectiveAgentProfileForSession(ctx.config, ctx.conversationId);
+		const profile = resolveEffectiveAgentProfileForSession(ctx.conversationId);
 		return profile.config.models.intents.review?.primary || profile.primaryModelRef;
 	} catch {
 		return;

package/dist/src/chat-commands/builtins/workflow.js

@@ -139,7 +139,7 @@ async function runWorkflowFromCommand(ctx, args) {
 			success: false
 		};
 	}
-	const agentId = extractProfileAgentId(ctx.conversationId, ctx.config);
+	const agentId = extractProfileAgentId(ctx.conversationId);
 	const source = ctx.source === "webui" || ctx.channelId === "webchat" ? {
 		kind: "webui",
 		conversationId: ctx.conversationId

package/dist/src/chat-commands/config-paths.js

@@ -3,7 +3,7 @@ function parseConfigPath(raw) {
 	const parts = raw.trim().split(".").map((p) => p.trim());
 	if (parts.some((p) => !p)) return {
 		ok: false,
-		error: "Invalid path. Use dot notation (e.g. agents.defaults.models.chat.primary)."
+		error: "Invalid path. Use dot notation (e.g. gateway.port)."
 	};
 	return {
 		ok: true,

package/dist/src/chat-commands/context.js

@@ -1,17 +1,16 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
-import { init_loader, saveConfig } from "../config/loader.js";
 import { effectiveWorkspacePathForSession } from "../session/session-workspace.js";
 import { getProjectForSession } from "../projects/workspace.js";
 import { getSessionDisplayName } from "./session-key.js";
+import { saveConfig } from "../config/loader.js";
 import { wrapMarkdownExportAsHtml } from "../session/chat-export.js";
 import { join } from "path";
 import { mkdir, writeFile } from "fs/promises";
 //#region src/chat-commands/context.ts
 init_schema();
 init_logger();
-init_loader();
 const log = createLogger("CommandContext");
 var CommandContextImpl = class {
 	conversationId;
@@ -141,7 +140,7 @@ var CommandContextImpl = class {
 	}
 	getCurrentModel() {
 		if (this.deps.getCurrentModel) return this.deps.getCurrentModel();
-		return getAgentDefaultModelRef(this.config);
+		return getAgentDefaultModelRef();
 	}
 	async listModels() {
 		if (this.deps.listModels) return this.deps.listModels();

package/dist/src/chat-previews/index.d.ts

@@ -0,0 +1,2 @@
+export * from './service.js';
+export * from './store.js';

package/dist/src/chat-previews/index.js

@@ -0,0 +1,3 @@
+import { ChatPreviewStore } from "./store.js";
+import { ChatPreviewNotFoundError, ChatPreviewRevisionConflictError, ChatPreviewService } from "./service.js";
+export { ChatPreviewNotFoundError, ChatPreviewRevisionConflictError, ChatPreviewService, ChatPreviewStore };

package/dist/src/chat-previews/service.d.ts

@@ -0,0 +1,27 @@
+import { type ChatPreviewCreateInput, type ChatPreviewRecord, type ChatPreviewRevision, type ChatPreviewReviseInput, type ChatPreviewDiagnostic, type ChatPreviewFixGuidance, type LocalAppDetail } from '@xopcai/gateway-contract';
+import type { LocalAppService } from '../local-apps/index.js';
+import { ChatPreviewStore } from './store.js';
+export declare class ChatPreviewNotFoundError extends Error {
+}
+export declare class ChatPreviewRevisionConflictError extends Error {
+}
+export declare class ChatPreviewService {
+    private readonly store;
+    private readonly localApps?;
+    constructor(options?: {
+        store?: ChatPreviewStore;
+        localApps?: LocalAppService;
+    });
+    create(conversationId: string, rawInput: ChatPreviewCreateInput): {
+        preview: ChatPreviewRecord;
+        revision: ChatPreviewRevision;
+    };
+    get(id: string): ChatPreviewRecord;
+    getRevision(id: string, revision: string): ChatPreviewRevision;
+    revise(id: string, rawInput: ChatPreviewReviseInput): {
+        preview: ChatPreviewRecord;
+        revision: ChatPreviewRevision;
+    };
+    getFixGuidance(id: string, sourceHashValue: string, diagnostics: ChatPreviewDiagnostic[], locale: 'en' | 'zh'): ChatPreviewFixGuidance;
+    promote(id: string, sourceHashValue: string): LocalAppDetail;
+}

package/dist/src/chat-previews/service.js

@@ -0,0 +1,106 @@
+import { ChatPreviewCreateInputSchema, ChatPreviewReviseInputSchema } from "../../packages/gateway-contract/src/chat-previews.js";
+import { init_src } from "../../packages/gateway-contract/src/index.js";
+import { ChatPreviewStore } from "./store.js";
+import { createHash } from "node:crypto";
+//#region src/chat-previews/service.ts
+init_src();
+var ChatPreviewNotFoundError = class extends Error {};
+var ChatPreviewRevisionConflictError = class extends Error {};
+function sourceHash(source) {
+	const hash = createHash("sha256");
+	for (const value of [
+		source.markup,
+		source.styles,
+		source.script
+	]) {
+		hash.update(String(Buffer.byteLength(value)));
+		hash.update(":");
+		hash.update(value);
+	}
+	return hash.digest("hex");
+}
+var ChatPreviewService = class {
+	store;
+	localApps;
+	constructor(options = {}) {
+		this.store = options.store ?? new ChatPreviewStore();
+		this.localApps = options.localApps;
+	}
+	create(conversationId, rawInput) {
+		const input = ChatPreviewCreateInputSchema.parse(rawInput);
+		const source = {
+			markup: input.markup,
+			styles: input.styles,
+			script: input.script
+		};
+		return this.store.create({
+			conversationId,
+			title: input.title,
+			preferredHeight: input.preferredHeight,
+			sourceHash: sourceHash(source),
+			source
+		});
+	}
+	get(id) {
+		const preview = this.store.get(id);
+		if (!preview) throw new ChatPreviewNotFoundError("Chat preview not found");
+		return preview;
+	}
+	getRevision(id, revision) {
+		const result = this.store.getRevision(id, revision);
+		if (!result) throw new ChatPreviewNotFoundError("Chat preview revision not found");
+		return result;
+	}
+	revise(id, rawInput) {
+		this.get(id);
+		const input = ChatPreviewReviseInputSchema.parse(rawInput);
+		const source = {
+			markup: input.markup,
+			styles: input.styles,
+			script: input.script
+		};
+		const result = this.store.revise({
+			id,
+			expectedRevision: input.baseRevision,
+			sourceHash: sourceHash(source),
+			source,
+			title: input.title,
+			preferredHeight: input.preferredHeight
+		});
+		if (!result) throw new ChatPreviewRevisionConflictError("Chat preview changed; revise the latest revision");
+		return result;
+	}
+	getFixGuidance(id, sourceHashValue, diagnostics, locale) {
+		const preview = this.get(id);
+		this.getRevision(id, sourceHashValue);
+		const issues = JSON.stringify(diagnostics, null, 2);
+		return {
+			previewId: id,
+			sourceHash: sourceHashValue,
+			prompt: locale === "zh" ? `请修复对话预览“${preview.title}”的运行错误。先读取 previewId=${id}、sourceHash=${sourceHashValue} 的不可变版本，分析以下诊断，然后用 xopc_use 的 chat_preview/revise 提交完整 markup、styles、script，并将 baseRevision 设为 ${sourceHashValue}。不要创建 Local App。\n\n诊断：\n${issues}` : `Fix the runtime errors in chat preview "${preview.title}". Read immutable previewId=${id}, sourceHash=${sourceHashValue}, analyze the diagnostics below, then use xopc_use chat_preview/revise with complete markup, styles, and script and baseRevision=${sourceHashValue}. Do not create a Local App.\n\nDiagnostics:\n${issues}`
+		};
+	}
+	promote(id, sourceHashValue) {
+		if (!this.localApps) throw new Error("Local app service is unavailable");
+		const preview = this.get(id);
+		const revision = this.getRevision(id, sourceHashValue);
+		const promotedAppId = this.store.getPromotedAppId(id, sourceHashValue);
+		if (promotedAppId) {
+			const existing = this.localApps.get(promotedAppId);
+			if (!existing) throw new Error("Promoted Local App is unavailable");
+			return existing;
+		}
+		const app = this.localApps.createFromPreview({
+			name: preview.title,
+			idea: `Promoted from chat preview ${preview.id} at revision ${revision.sourceHash}`,
+			description: "Created from an immutable chat preview.",
+			markup: revision.markup,
+			styles: revision.styles,
+			script: revision.script
+		});
+		this.store.setPromotedAppId(id, sourceHashValue, app.id);
+		return app;
+	}
+};
+//#endregion
+export { ChatPreviewNotFoundError, ChatPreviewRevisionConflictError, ChatPreviewService };

package/dist/src/chat-previews/store.d.ts

@@ -0,0 +1,28 @@
+import type { ChatPreviewRecord, ChatPreviewRevision, ChatPreviewSource } from '@xopcai/gateway-contract';
+export declare class ChatPreviewStore {
+    create(input: {
+        conversationId: string;
+        title: string;
+        preferredHeight: number;
+        sourceHash: string;
+        source: ChatPreviewSource;
+    }): {
+        preview: ChatPreviewRecord;
+        revision: ChatPreviewRevision;
+    };
+    get(id: string): ChatPreviewRecord | null;
+    getRevision(id: string, sourceHash: string): ChatPreviewRevision | null;
+    getPromotedAppId(id: string, sourceHash: string): string | null;
+    setPromotedAppId(id: string, sourceHash: string, appId: string): void;
+    revise(input: {
+        id: string;
+        expectedRevision: string;
+        sourceHash: string;
+        source: ChatPreviewSource;
+        title?: string;
+        preferredHeight?: number;
+    }): {
+        preview: ChatPreviewRecord;
+        revision: ChatPreviewRevision;
+    } | null;
+}

package/dist/src/chat-previews/store.js

@@ -0,0 +1,78 @@
+import { getSqliteDatabase, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
+import { init_sqlite } from "../storage/sqlite/index.js";
+import { randomUUID } from "node:crypto";
+//#region src/chat-previews/store.ts
+init_sqlite();
+function previewFromRow(row) {
+	return {
+		id: row.preview_id,
+		conversationId: row.conversation_id,
+		title: row.title,
+		preferredHeight: row.preferred_height,
+		latestRevision: row.latest_revision,
+		createdAt: row.created_at,
+		updatedAt: row.updated_at
+	};
+}
+function revisionFromRow(row) {
+	return {
+		previewId: row.preview_id,
+		sourceHash: row.source_hash,
+		markup: row.markup,
+		styles: row.styles,
+		script: row.script,
+		createdAt: row.created_at
+	};
+}
+var ChatPreviewStore = class {
+	create(input) {
+		const id = randomUUID();
+		const now = Date.now();
+		runSqliteWriteTransaction((db) => {
+			db.prepare(`INSERT INTO chat_previews (
+        preview_id, conversation_id, title, preferred_height, latest_revision, created_at, updated_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?)`).run(id, input.conversationId, input.title, input.preferredHeight, input.sourceHash, now, now);
+			db.prepare(`INSERT INTO chat_preview_revisions (
+        preview_id, source_hash, markup, styles, script, created_at
+      ) VALUES (?, ?, ?, ?, ?, ?)`).run(id, input.sourceHash, input.source.markup, input.source.styles, input.source.script, now);
+		});
+		return {
+			preview: this.get(id),
+			revision: this.getRevision(id, input.sourceHash)
+		};
+	}
+	get(id) {
+		const row = getSqliteDatabase().prepare("SELECT * FROM chat_previews WHERE preview_id = ?").get(id);
+		return row ? previewFromRow(row) : null;
+	}
+	getRevision(id, sourceHash) {
+		const row = getSqliteDatabase().prepare("SELECT * FROM chat_preview_revisions WHERE preview_id = ? AND source_hash = ?").get(id, sourceHash);
+		return row ? revisionFromRow(row) : null;
+	}
+	getPromotedAppId(id, sourceHash) {
+		return getSqliteDatabase().prepare("SELECT promoted_app_id FROM chat_preview_revisions WHERE preview_id = ? AND source_hash = ?").get(id, sourceHash)?.promoted_app_id ?? null;
+	}
+	setPromotedAppId(id, sourceHash, appId) {
+		if (getSqliteDatabase().prepare(`UPDATE chat_preview_revisions SET promoted_app_id = ?
+       WHERE preview_id = ? AND source_hash = ? AND promoted_app_id IS NULL`).run(appId, id, sourceHash).changes !== 1) throw new Error("Chat preview revision was already promoted or no longer exists");
+	}
+	revise(input) {
+		const now = Date.now();
+		return runSqliteWriteTransaction((db) => {
+			const current = db.prepare("SELECT * FROM chat_previews WHERE preview_id = ?").get(input.id);
+			if (!current || current.latest_revision !== input.expectedRevision) return null;
+			db.prepare(`INSERT OR IGNORE INTO chat_preview_revisions (
+        preview_id, source_hash, markup, styles, script, created_at
+      ) VALUES (?, ?, ?, ?, ?, ?)`).run(input.id, input.sourceHash, input.source.markup, input.source.styles, input.source.script, now);
+			db.prepare(`UPDATE chat_previews SET
+        title = ?, preferred_height = ?, latest_revision = ?, updated_at = ?
+        WHERE preview_id = ?`).run(input.title ?? current.title, input.preferredHeight ?? current.preferred_height, input.sourceHash, now, input.id);
+			return {
+				preview: this.get(input.id),
+				revision: this.getRevision(input.id, input.sourceHash)
+			};
+		});
+	}
+};
+//#endregion
+export { ChatPreviewStore };

package/dist/src/cli/command-manifest.js

@@ -153,7 +153,7 @@ const ROOT_HELP_COMMANDS = [
 	},
 	{
 		name: "agents",
-		description: "Manage agents (config + workspace)"
+		description: "Manage agents"
 	},
 	{
 		name: "extensions",

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

@@ -1,11 +1,11 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope.js";
+import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { init_agent_session_key, resolveAgentMainConversationId } from "../../routing/agent-session-key.js";
-import { loadConfig } from "../../config/loader.js";
 import { ExtensionLoader } from "../../extensions/loader.js";
 import "../../extensions/index.js";
+import { loadConfig } from "../../config/loader.js";
 import { MessageBus, MessageBusShutdownError } from "../../infra/bus/queue.js";
 import "../../infra/bus/index.js";
 import { AgentService } from "../../agent/service.js";
@@ -41,7 +41,7 @@ function createAgentCommand(_ctx) {
 			await listSessions();
 			return;
 		}
-		const modelFromConfig = getAgentDefaultModelRef(config);
+		const modelFromConfig = getAgentDefaultModelRef();
 		const modelId = options.model?.trim() || modelFromConfig;
 		if (modelId?.startsWith("xopc-cloud/")) {
 			const readiness = await getXopcCloudCatalogCoordinator().ensure({
@@ -57,7 +57,7 @@ function createAgentCommand(_ctx) {
 			workspace,
 			session: options.session
 		}, "Starting agent");
-		let conversationId = options.session || resolveAgentMainConversationId({ agentId: resolveDefaultAgentId(config) });
+		let conversationId = options.session || resolveAgentMainConversationId({ agentId: resolveDefaultAgentId() });
 		if (options.session) {
 			const { getSessionIndex } = await import("../utils/session.js");
 			const session = await (await getSessionIndex()).getSessionMetadata(options.session);

package/dist/src/cli/commands/agents.d.ts

@@ -1,5 +1,5 @@
 /**
- * `agents` CLI: config is the source of truth for multi-agent paths.
+ * `agents` CLI: SQLite is the source of truth for Agent definitions and defaults.
  */
 import { Command } from 'commander';
 export declare function registerAgentsCli(program: Command): void;

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

@@ -1,28 +1,22 @@
-import { init_agent_scope, listAgentEntries, normalizeAgentId, resolveAgentDir, resolveAgentProfileDir, resolveAgentWorkspaceDir, resolveDefaultAgentId, validateAgentIdForNewAgent } from "../../agent/agent-scope.js";
-import { init_paths, resolveConfigPath } from "../../config/paths.js";
-import { init_loader, loadConfig, saveConfig } from "../../config/loader.js";
-import { seedAgentProfileMarkdownFiles } from "../../agent/context/workspace-seed.js";
-import { applyAgentConfig, findAgentEntryIndex, getAgentDeleteBlocker, pruneAgentConfig, removeAgentDirsFromDisk } from "../../commands/agents.config.js";
+import { normalizeAgentId, validateAgentIdForNewAgent } from "../../agent-catalog/id.js";
+import { AgentCatalogRepository, init_repository } from "../../agent-catalog/repository.js";
+import { init_agent_scope, resolveAgentDir, resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../../agent/agent-scope.js";
+import { AgentCatalogService } from "../../agent-catalog/service.js";
+import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
 import { colors } from "../utils/colors.js";
-import { mkdir } from "node:fs/promises";
 //#region src/cli/commands/agents.ts
-/**
-* `agents` CLI: config is the source of truth for multi-agent paths.
-*/
-init_loader();
-init_paths();
+init_repository();
 init_agent_scope();
 function registerAgentsCli(program) {
-	const agents = program.command("agents").description("Manage agents (config + workspace)");
+	const agents = program.command("agents").description("Manage agents");
 	agents.command("list").description("List configured agents").option("--json", "Output JSON").action(async (opts) => {
-		const cfg = loadConfig();
-		const rows = listAgentEntries(cfg).map((a) => ({
+		const rows = new AgentCatalogRepository().snapshot().agents.map((a) => ({
 			id: normalizeAgentId(a.id),
 			enabled: a.enabled !== false,
 			workspace: a.workspace,
-			model: a.models?.chat?.primary ?? cfg.agents.defaults.models.chat.primary
+			model: resolveEffectiveAgentConfigForAgent(a.id).config.models.chat.primary
 		}));
-		const def = resolveDefaultAgentId(cfg);
+		const def = resolveDefaultAgentId();
 		if (opts.json) {
 			console.log(JSON.stringify({
 				defaultAgentId: def,
@@ -32,7 +26,7 @@ function registerAgentsCli(program) {
 		}
 		console.log(colors.cyan(`Default agent id: ${def}`));
 		if (rows.length === 0) {
-			console.log("No entries in agents.list (using defaults only).");
+			console.log("No configured Agents.");
 			return;
 		}
 		for (const r of rows) {
@@ -40,28 +34,26 @@ function registerAgentsCli(program) {
 			console.log(`- ${r.id}${mark}`);
 		}
 	});
-	agents.command("add").description("Add or update an agent in config and create workspace / state dirs").argument("<name>", "Agent display name / id seed").requiredOption("--workspace <dir>", "Workspace directory for this agent").option("--model <id>", "Model id (e.g. anthropic/claude-sonnet-4-5)").option("--json", "Output JSON summary").action(async (name, opts) => {
-		const cfg = loadConfig();
+	agents.command("add").description("Create an Agent and its workspace / state directories").argument("<name>", "Agent display name / id seed").option("--workspace <dir>", "Workspace directory for this agent").option("--model <id>", "Model id (e.g. anthropic/claude-sonnet-4-5)").option("--json", "Output JSON summary").action(async (name, opts) => {
 		const idRes = validateAgentIdForNewAgent(void 0, name);
 		if (idRes.ok === false) {
 			console.error(colors.red("Error:"), idRes.error);
 			process.exit(1);
 		}
 		const agentId = idRes.agentId;
-		const next = applyAgentConfig(cfg, {
-			agentId,
-			workspace: opts.workspace.trim(),
+		const workspace = opts.workspace?.trim();
+		await new AgentCatalogService().create({
+			id: agentId,
+			enabled: true,
+			...workspace ? { workspace } : {},
 			profile: { name: name.trim() },
-			...opts.model?.trim() ? { model: opts.model.trim() } : {}
+			...opts.model?.trim() ? { models: { chat: {
+				primary: opts.model.trim(),
+				fallbacks: []
+			} } } : {}
 		});
-		await saveConfig(next, resolveConfigPath());
-		const wsPath = resolveAgentWorkspaceDir(next, agentId);
-		const adPath = resolveAgentDir(next, agentId);
-		const profilePath = resolveAgentProfileDir(next, agentId);
-		await mkdir(wsPath, { recursive: true });
-		await mkdir(adPath, { recursive: true });
-		await mkdir(profilePath, { recursive: true });
-		seedAgentProfileMarkdownFiles(profilePath, wsPath, { displayName: name.trim() });
+		const wsPath = resolveAgentWorkspaceDir(agentId);
+		const adPath = resolveAgentDir(agentId);
 		const payload = {
 			agentId,
 			workspace: wsPath,
@@ -75,24 +67,20 @@ function registerAgentsCli(program) {
 			console.log(`  Agent dir:  ${adPath}`);
 		}
 	});
-	agents.command("delete").description("Remove an agent from config (optional on-disk cleanup)").argument("<id>", "Agent id").option("--purge", "Also delete workspace and ~/.xopc/agents/<id> data", false).option("--json", "Output JSON summary").action(async (id, opts) => {
-		const cfg = loadConfig();
-		const blocker = getAgentDeleteBlocker(cfg, id);
-		if (blocker) {
-			console.error(colors.red("Error:"), blocker);
-			process.exit(1);
-		}
-		if (findAgentEntryIndex(listAgentEntries(cfg), id) < 0) {
-			console.error(colors.red("Error:"), `Agent "${id}" not found in agents.list`);
+	agents.command("default").description("Show or set the default Agent for new Sessions").argument("[id]", "Agent id").option("--json", "Output JSON").action((id, opts) => {
+		const defaultAgentId = id ? new AgentCatalogService().setDefault(id).defaultAgentId : resolveDefaultAgentId();
+		if (opts.json) console.log(JSON.stringify({ defaultAgentId }, null, 2));
+		else console.log(colors.green("✓"), `Default Agent: ${defaultAgentId}`);
+	});
+	agents.command("delete").description("Remove an Agent from the catalog (optional on-disk cleanup)").argument("<id>", "Agent id").option("--purge", "Also delete workspace and ~/.xopc/agents/<id> data", false).option("--json", "Output JSON summary").action(async (id, opts) => {
+		let removedBindings;
+		try {
+			({removedBindings} = await new AgentCatalogService().delete(id, { purge: opts.purge }));
+		} catch (error) {
+			console.error(colors.red("Error:"), error instanceof Error ? error.message : String(error));
 			process.exit(1);
 		}
-		const { config: pruned, removedBindings } = pruneAgentConfig(cfg, id);
-		await saveConfig(pruned, resolveConfigPath());
-		let purged = false;
-		if (opts.purge) {
-			await removeAgentDirsFromDisk(pruned, id);
-			purged = true;
-		}
+		const purged = opts.purge === true;
 		const payload = {
 			deleted: id,
 			removedBindings,
@@ -100,7 +88,7 @@ function registerAgentsCli(program) {
 		};
 		if (opts.json) console.log(JSON.stringify(payload, null, 2));
 		else {
-			console.log(colors.green("✓"), `Removed agent "${id}" from config`);
+			console.log(colors.green("✓"), `Removed Agent "${id}"`);
 			if (removedBindings > 0) console.log(`  Stripped ${removedBindings} routing binding(s).`);
 			if (purged) console.log("  On-disk workspace/state removed.");
 		}

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

@@ -6,6 +6,7 @@ import { formatExamples, register } from "../registry.js";
 import { disconnectProvider } from "../../providers/provider-disconnect.js";
 import { colorizeStatus, colors } from "../utils/colors.js";
 import { listAllProfiles, listProfilesForProvider, removeAuthProfile, upsertAuthProfile } from "../../auth/profiles/profiles.js";
+import "../../auth/profiles/index.js";
 import { getOAuthProvider, getSupportedOAuthProviders } from "../utils/oauth-providers.js";
 import { runCliOAuthLogin } from "../utils/oauth-login.js";
 import { Command } from "commander";

package/dist/src/cli/commands/browser-cli-helpers.js

@@ -1,7 +1,6 @@
-import { init_loader, loadConfig } from "../../config/loader.js";
 import { checkBrowserReadiness } from "../../browser/readiness.js";
+import { loadConfig } from "../../config/loader.js";
 //#region src/cli/commands/browser-cli-helpers.ts
-init_loader();
 async function doctorCli() {
 	const config = await loadConfig();
 	const readiness = await checkBrowserReadiness(config);

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

@@ -1,13 +1,11 @@
-import { buildChannelCatalogForConfig, init_channel_catalog_service } from "../../channels/catalog/channel-catalog-service.js";
-import { init_loader, loadConfig, saveConfig } from "../../config/loader.js";
+import { buildChannelCatalogForConfig } from "../../channels/catalog/channel-catalog-service.js";
+import { loadConfig, saveConfig } from "../../config/loader.js";
 import { listChannelPairingState } from "../../channels/pairing/pairing-service.js";
 import { approveChannelPairingFromCli } from "../../channels/pairing/approve-cli.js";
 import { formatExamples, register } from "../registry.js";
 import { colors } from "../utils/colors.js";
 import { Command } from "commander";
 //#region src/cli/commands/channels.ts
-init_channel_catalog_service();
-init_loader();
 function normalizeChannelId(raw) {
 	return raw.trim().toLowerCase();
 }