@xopcai/xopc 0.0.103 → 0.0.104

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

@@ -21,12 +21,11 @@ function registerAgentsCli(program) {
 		const cfg = loadConfig();
 		const rows = listAgentEntries(cfg).map((a) => ({
 			id: normalizeAgentId(a.id),
-			name: a.name,
 			default: a.default === true,
 			enabled: a.enabled !== false,
 			workspace: a.workspace,
 			agentDir: a.agentDir,
-			model: a.model
+			model: a.models?.chat
 		}));
 		const def = resolveDefaultAgentId(cfg);
 		if (opts.json) {
@@ -43,7 +42,7 @@ function registerAgentsCli(program) {
 		}
 		for (const r of rows) {
 			const mark = r.id === def ? " (default routing)" : "";
-			console.log(`- ${r.id}${mark}${r.name ? ` — ${r.name}` : ""}`);
+			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("--agent-dir <dir>", "Override internal agent state directory").option("--json", "Output JSON summary").action(async (name, opts) => {
@@ -56,7 +55,6 @@ function registerAgentsCli(program) {
 		const agentId = idRes.agentId;
 		const next = applyAgentConfig(cfg, {
 			agentId,
-			name,
 			workspace: opts.workspace.trim(),
 			...opts.model?.trim() ? { model: opts.model.trim() } : {},
 			...opts.agentDir?.trim() ? { agentDir: opts.agentDir.trim() } : {}

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

@@ -1 +1 @@
-{"version":3,"file":"agents.js","names":[],"sources":["../../../../src/cli/commands/agents.ts"],"sourcesContent":["/**\n * `agents` CLI: config is the source of truth for multi-agent paths.\n */\n\nimport { mkdir } from 'node:fs/promises';\nimport { Command } from 'commander';\nimport { loadConfig, saveConfig } from '../../config/loader.js';\nimport { resolveConfigPath } from '../../config/paths.js';\nimport {\n  normalizeAgentId,\n  resolveAgentDir,\n  resolveAgentProfileDir,\n  resolveAgentWorkspaceDir,\n  resolveDefaultAgentId,\n  DEFAULT_AGENT_ID,\n  validateAgentIdForNewAgent,\n} from '../../agent/agent-scope.js';\nimport {\n  applyAgentConfig,\n  findAgentEntryIndex,\n  listAgentEntries,\n  pruneAgentConfig,\n  removeAgentDirsFromDisk,\n} from '../../commands/agents.config.js';\nimport { seedAgentProfileMarkdownFiles } from '../../agent/context/workspace-seed.js';\nimport { colors } from '../utils/colors.js';\n\nfunction requireNonMain(id: string): void {\n  if (normalizeAgentId(id) === DEFAULT_AGENT_ID) {\n    throw new Error(`Agent id \"${DEFAULT_AGENT_ID}\" is reserved for the primary agent.`);\n  }\n}\n\nexport function registerAgentsCli(program: Command): void {\n  const agents = program\n    .command('agents')\n    .description('Manage agents (config + workspace)');\n\n  agents\n    .command('list')\n    .description('List configured agents')\n    .option('--json', 'Output JSON')\n    .action(async (opts: { json?: boolean }) => {\n      const cfg = loadConfig();\n      const rows = listAgentEntries(cfg).map((a) => ({\n        id: normalizeAgentId(a.id),\n        name: a.name,\n        default: a.default === true,\n        enabled: a.enabled !== false,\n        workspace: a.workspace,\n        agentDir: a.agentDir,\n        model: a.model,\n      }));\n      const def = resolveDefaultAgentId(cfg);\n      if (opts.json) {\n        console.log(JSON.stringify({ defaultAgentId: def, agents: rows }, null, 2));\n        return;\n      }\n      console.log(colors.cyan(`Default agent id: ${def}`));\n      if (rows.length === 0) {\n        console.log('No entries in agents.list (using defaults only).');\n        return;\n      }\n      for (const r of rows) {\n        const mark = r.id === def ? ' (default routing)' : '';\n        console.log(`- ${r.id}${mark}${r.name ? ` — ${r.name}` : ''}`);\n      }\n    });\n\n  agents\n    .command('add')\n    .description('Add or update an agent in config and create workspace / state dirs')\n    .argument('<name>', 'Agent display name / id seed')\n    .requiredOption('--workspace <dir>', 'Workspace directory for this agent')\n    .option('--model <id>', 'Model id (e.g. anthropic/claude-sonnet-4-5)')\n    .option('--agent-dir <dir>', 'Override internal agent state directory')\n    .option('--json', 'Output JSON summary')\n    .action(\n      async (\n        name: string,\n        opts: { workspace?: string; model?: string; agentDir?: string; json?: boolean },\n      ) => {\n        const cfg = loadConfig();\n        const idRes = validateAgentIdForNewAgent(undefined, name);\n        if (idRes.ok === false) {\n          console.error(colors.red('Error:'), idRes.error);\n          process.exit(1);\n        }\n        const agentId = idRes.agentId;\n\n        const workspace = opts.workspace!.trim();\n        const next = applyAgentConfig(cfg, {\n          agentId,\n          name,\n          workspace,\n          ...(opts.model?.trim() ? { model: opts.model.trim() } : {}),\n          ...(opts.agentDir?.trim() ? { agentDir: opts.agentDir.trim() } : {}),\n        });\n\n        const configPath = resolveConfigPath();\n        await saveConfig(next, configPath);\n\n        const wsPath = resolveAgentWorkspaceDir(next, agentId);\n        const adPath = resolveAgentDir(next, agentId);\n        const profilePath = resolveAgentProfileDir(next, agentId);\n        await mkdir(wsPath, { recursive: true });\n        await mkdir(adPath, { recursive: true });\n        await mkdir(profilePath, { recursive: true });\n        seedAgentProfileMarkdownFiles(profilePath, wsPath, { displayName: name.trim() });\n\n        const payload = { agentId, workspace: wsPath, agentDir: adPath, model: opts.model };\n        if (opts.json) {\n          console.log(JSON.stringify(payload, null, 2));\n        } else {\n          console.log(colors.green('✓'), `Configured agent \"${agentId}\"`);\n          console.log(`  Workspace:  ${wsPath}`);\n          console.log(`  Agent dir:  ${adPath}`);\n        }\n      },\n    );\n\n  agents\n    .command('delete')\n    .description('Remove an agent from config (optional on-disk cleanup)')\n    .argument('<id>', 'Agent id')\n    .option('--purge', 'Also delete workspace and ~/.xopc/agents/<id> data', false)\n    .option('--json', 'Output JSON summary')\n    .action(async (id: string, opts: { purge?: boolean; json?: boolean }) => {\n      const cfg = loadConfig();\n      requireNonMain(id);\n      const idx = findAgentEntryIndex(listAgentEntries(cfg), id);\n      if (idx < 0) {\n        console.error(colors.red('Error:'), `Agent \"${id}\" not found in agents.list`);\n        process.exit(1);\n      }\n      const { config: pruned, removedBindings } = pruneAgentConfig(cfg, id);\n      await saveConfig(pruned, resolveConfigPath());\n      let purged = false;\n      if (opts.purge) {\n        await removeAgentDirsFromDisk(pruned, id);\n        purged = true;\n      }\n      const payload = { deleted: id, removedBindings, purged };\n      if (opts.json) {\n        console.log(JSON.stringify(payload, null, 2));\n      } else {\n        console.log(colors.green('✓'), `Removed agent \"${id}\" from config`);\n        if (removedBindings > 0) {\n          console.log(`  Stripped ${removedBindings} routing binding(s).`);\n        }\n        if (purged) {\n          console.log('  On-disk workspace/state removed.');\n        }\n      }\n    });\n}\n"],"mappings":"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"}
+{"version":3,"file":"agents.js","names":[],"sources":["../../../../src/cli/commands/agents.ts"],"sourcesContent":["/**\n * `agents` CLI: config is the source of truth for multi-agent paths.\n */\n\nimport { mkdir } from 'node:fs/promises';\nimport { Command } from 'commander';\nimport { loadConfig, saveConfig } from '../../config/loader.js';\nimport { resolveConfigPath } from '../../config/paths.js';\nimport {\n  normalizeAgentId,\n  resolveAgentDir,\n  resolveAgentProfileDir,\n  resolveAgentWorkspaceDir,\n  resolveDefaultAgentId,\n  DEFAULT_AGENT_ID,\n  validateAgentIdForNewAgent,\n} from '../../agent/agent-scope.js';\nimport {\n  applyAgentConfig,\n  findAgentEntryIndex,\n  listAgentEntries,\n  pruneAgentConfig,\n  removeAgentDirsFromDisk,\n} from '../../commands/agents.config.js';\nimport { seedAgentProfileMarkdownFiles } from '../../agent/context/workspace-seed.js';\nimport { colors } from '../utils/colors.js';\n\nfunction requireNonMain(id: string): void {\n  if (normalizeAgentId(id) === DEFAULT_AGENT_ID) {\n    throw new Error(`Agent id \"${DEFAULT_AGENT_ID}\" is reserved for the primary agent.`);\n  }\n}\n\nexport function registerAgentsCli(program: Command): void {\n  const agents = program\n    .command('agents')\n    .description('Manage agents (config + workspace)');\n\n  agents\n    .command('list')\n    .description('List configured agents')\n    .option('--json', 'Output JSON')\n    .action(async (opts: { json?: boolean }) => {\n      const cfg = loadConfig();\n      const rows = listAgentEntries(cfg).map((a) => ({\n        id: normalizeAgentId(a.id),\n        default: a.default === true,\n        enabled: a.enabled !== false,\n        workspace: a.workspace,\n        agentDir: a.agentDir,\n        model: a.models?.chat,\n      }));\n      const def = resolveDefaultAgentId(cfg);\n      if (opts.json) {\n        console.log(JSON.stringify({ defaultAgentId: def, agents: rows }, null, 2));\n        return;\n      }\n      console.log(colors.cyan(`Default agent id: ${def}`));\n      if (rows.length === 0) {\n        console.log('No entries in agents.list (using defaults only).');\n        return;\n      }\n      for (const r of rows) {\n        const mark = r.id === def ? ' (default routing)' : '';\n        console.log(`- ${r.id}${mark}`);\n      }\n    });\n\n  agents\n    .command('add')\n    .description('Add or update an agent in config and create workspace / state dirs')\n    .argument('<name>', 'Agent display name / id seed')\n    .requiredOption('--workspace <dir>', 'Workspace directory for this agent')\n    .option('--model <id>', 'Model id (e.g. anthropic/claude-sonnet-4-5)')\n    .option('--agent-dir <dir>', 'Override internal agent state directory')\n    .option('--json', 'Output JSON summary')\n    .action(\n      async (\n        name: string,\n        opts: { workspace?: string; model?: string; agentDir?: string; json?: boolean },\n      ) => {\n        const cfg = loadConfig();\n        const idRes = validateAgentIdForNewAgent(undefined, name);\n        if (idRes.ok === false) {\n          console.error(colors.red('Error:'), idRes.error);\n          process.exit(1);\n        }\n        const agentId = idRes.agentId;\n\n        const workspace = opts.workspace!.trim();\n        const next = applyAgentConfig(cfg, {\n          agentId,\n          workspace,\n          ...(opts.model?.trim() ? { model: opts.model.trim() } : {}),\n          ...(opts.agentDir?.trim() ? { agentDir: opts.agentDir.trim() } : {}),\n        });\n\n        const configPath = resolveConfigPath();\n        await saveConfig(next, configPath);\n\n        const wsPath = resolveAgentWorkspaceDir(next, agentId);\n        const adPath = resolveAgentDir(next, agentId);\n        const profilePath = resolveAgentProfileDir(next, agentId);\n        await mkdir(wsPath, { recursive: true });\n        await mkdir(adPath, { recursive: true });\n        await mkdir(profilePath, { recursive: true });\n        seedAgentProfileMarkdownFiles(profilePath, wsPath, { displayName: name.trim() });\n\n        const payload = { agentId, workspace: wsPath, agentDir: adPath, model: opts.model };\n        if (opts.json) {\n          console.log(JSON.stringify(payload, null, 2));\n        } else {\n          console.log(colors.green('✓'), `Configured agent \"${agentId}\"`);\n          console.log(`  Workspace:  ${wsPath}`);\n          console.log(`  Agent dir:  ${adPath}`);\n        }\n      },\n    );\n\n  agents\n    .command('delete')\n    .description('Remove an agent from config (optional on-disk cleanup)')\n    .argument('<id>', 'Agent id')\n    .option('--purge', 'Also delete workspace and ~/.xopc/agents/<id> data', false)\n    .option('--json', 'Output JSON summary')\n    .action(async (id: string, opts: { purge?: boolean; json?: boolean }) => {\n      const cfg = loadConfig();\n      requireNonMain(id);\n      const idx = findAgentEntryIndex(listAgentEntries(cfg), id);\n      if (idx < 0) {\n        console.error(colors.red('Error:'), `Agent \"${id}\" not found in agents.list`);\n        process.exit(1);\n      }\n      const { config: pruned, removedBindings } = pruneAgentConfig(cfg, id);\n      await saveConfig(pruned, resolveConfigPath());\n      let purged = false;\n      if (opts.purge) {\n        await removeAgentDirsFromDisk(pruned, id);\n        purged = true;\n      }\n      const payload = { deleted: id, removedBindings, purged };\n      if (opts.json) {\n        console.log(JSON.stringify(payload, null, 2));\n      } else {\n        console.log(colors.green('✓'), `Removed agent \"${id}\" from config`);\n        if (removedBindings > 0) {\n          console.log(`  Stripped ${removedBindings} routing binding(s).`);\n        }\n        if (purged) {\n          console.log('  On-disk workspace/state removed.');\n        }\n      }\n    });\n}\n"],"mappings":"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"}

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

@@ -4,8 +4,8 @@ import { CredentialResolver, init_credentials } from "../../auth/credentials.js"
 import { getAllProviders, init_providers } from "../../providers/index.js";
 import { formatExamples, register } from "../registry.js";
 import { listAllProfiles, listProfilesForProvider, removeAuthProfile, upsertAuthProfile } from "../../auth/profiles/profiles.js";
-import { colorizeStatus, colors } from "../utils/colors.js";
 import { getOAuthProvider, getSupportedOAuthProviders } from "../utils/oauth-providers.js";
+import { colorizeStatus, colors } from "../utils/colors.js";
 import { runCliOAuthLogin } from "../utils/oauth-login.js";
 import { Command } from "commander";
 //#region src/cli/commands/auth.ts

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

@@ -1,7 +1,7 @@
 import { init_loader, loadConfig } from "../../config/loader.js";
+import { resolveBrowserBackendFromConfig } from "../../browser/backend-from-config.js";
 import { loadPlaywrightCoreModule } from "../../browser/providers/playwright-doctor.js";
 import { BrowserManager } from "../../browser/manager.js";
-import { resolveBrowserBackendFromConfig } from "../../browser/backend-from-config.js";
 import { createBrowserActionRegistry } from "../../browser/actions/registry.js";
 import { runBrowserPipeline, validateBrowserPipeline } from "../../browser/pipeline/runner.js";
 import { loadBrowserPipelineSource } from "../../browser/pipeline/source.js";

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

@@ -1,5 +1 @@
-import type { Config } from '../../config/schema.js';
-export declare function validateTelegramToken(token: string): boolean;
-export declare function maskToken(token: string): string;
-export declare function applyTelegramAccount(cfg: Config, accountId: string, botToken: string, enable: boolean): Config;
-export declare function removeChannelAccount(cfg: Config, channelId: string, accountId: string): Config;
+export {};

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

@@ -1,332 +1,166 @@
-import { init_paths, resolveConfigPath } from "../../config/paths.js";
-import { init_loader, loadConfig } from "../../config/loader.js";
-import { getChannelPlugin, listChannelPlugins, syncChannelPluginsFromManager } from "../../channels/plugins/registry.js";
+import { buildChannelCatalogForConfig, init_channel_catalog_service } from "../../channels/catalog/channel-catalog-service.js";
+import { init_loader, loadConfig, saveConfig } from "../../config/loader.js";
+import { listChannelPairingState } from "../../channels/pairing/pairing-service.js";
 import { approveChannelPairingFromCli } from "../../channels/pairing/approve-cli.js";
-import { bundledChannelPlugins } from "../../generated/bundled-channel-plugins.js";
 import { formatExamples, register } from "../registry.js";
 import { colors } from "../utils/colors.js";
-import { SETUP_EXIT } from "./setup-shared/types.js";
-import { emitOutcome } from "./setup-shared/output.js";
-import { isPromptCancelled, promptSecret } from "./setup-shared/prompts.js";
-import { SetupValidationError, runSetup } from "./setup-shared/runner.js";
-import "./setup-shared/index.js";
 import { Command } from "commander";
 //#region src/cli/commands/channels.ts
-init_paths();
+init_channel_catalog_service();
 init_loader();
-function ensureChannelRegistryForCli() {
-	if (listChannelPlugins().length === 0) syncChannelPluginsFromManager(bundledChannelPlugins);
+function normalizeChannelId(raw) {
+	return raw.trim().toLowerCase();
 }
-function resolveConfigPathFromCommand(command) {
-	const root = command.parent?.parent && command.parent.parent instanceof Command ? command.parent.parent : command.parent && command.parent instanceof Command ? command.parent : null;
-	return (root && typeof root.opts === "function" ? root.opts() : {}).config?.trim() || process.env.XOPC_CONFIG_PATH?.trim() || process.env.XOPC_CONFIG?.trim() || resolveConfigPath();
+function loadCliConfig(ctx) {
+	return loadConfig(ctx.configPath);
+}
+async function writeCliConfig(ctx, cfg) {
+	await saveConfig(cfg, ctx.configPath);
+}
+function ensureChannelObject(cfg, channelId) {
+	if (!cfg.channels) cfg.channels = {};
+	const channels = cfg.channels;
+	const existing = channels[channelId];
+	if (existing && typeof existing === "object" && !Array.isArray(existing)) return existing;
+	const next = {};
+	channels[channelId] = next;
+	return next;
+}
+function assertCatalogChannel(cfg, channelId) {
+	if (!buildChannelCatalogForConfig(cfg).byId.has(channelId)) throw new Error(`Unknown channel "${channelId}". Install or declare a channel extension contribution first.`);
 }
 function createChannelsCommand(ctx) {
-	const cmd = new Command("channels").description("Messaging channel login and credentials").addHelpText("after", formatExamples([
-		"xopc channels login",
-		"xopc channels login --channel weixin",
-		"xopc channels login --channel feishu",
-		"xopc channels login --account my-bot-id",
-		"xopc channels pairing approve --channel telegram ABC12XYZ"
+	const cmd = new Command("channels").description("Messaging channel configuration").addHelpText("after", formatExamples([
+		"xopc channels list",
+		"xopc channels show telegram",
+		"xopc channels enable telegram",
+		"xopc channels config set-json telegram '{\"enabled\":true}'",
+		"xopc channels pairing approve telegram ABC12XYZ"
 	]));
-	const PAIRING_CHANNELS = new Set([
-		"telegram",
-		"feishu",
-		"weixin"
-	]);
-	cmd.command("login").description("Log in with QR code or channel-specific credentials flow").option("--channel <id>", "Channel id (auto-detected when only one login-capable channel is registered)").option("--account <id>", "Optional account id when re-logging an existing bot").option("--timeout <ms>", "Max wait for scan (default 480000)", "480000").option("--credentials-only", "Only save token files; do not update xopc.json").action(async (options, command) => {
-		ensureChannelRegistryForCli();
-		const explicitChannel = options.channel?.trim?.();
-		let channelId;
-		if (explicitChannel) channelId = explicitChannel;
-		else {
-			const loginCapable = listChannelPlugins().filter((p) => p.cliLogin);
-			if (loginCapable.length === 1) {
-				channelId = loginCapable[0].id;
-				console.log(`Auto-detected channel: ${channelId}`);
-			} else if (loginCapable.length === 0) {
-				console.error("No channels with login support found.");
-				process.exitCode = 1;
-				return;
-			} else {
-				console.error(`Multiple channels support login: ${loginCapable.map((p) => p.id).join(", ")}. Use --channel <id> to specify.`);
-				process.exitCode = 1;
-				return;
-			}
-		}
-		const plugin = getChannelPlugin(channelId);
-		if (!plugin?.cliLogin) {
-			console.error(`Channel "${channelId}" does not support CLI login.`);
-			const capable = listChannelPlugins().filter((p) => p.cliLogin).map((p) => p.id);
-			if (capable.length > 0) console.error(`Channels with login support: ${capable.join(", ")}`);
-			process.exitCode = 1;
-			return;
-		}
-		const configPath = resolveConfigPathFromCommand(command);
-		const timeoutMs = Math.max(6e4, Number.parseInt(String(options.timeout), 10) || 48e4);
-		const verbose = ctx.isVerbose;
-		const result = await plugin.cliLogin.runLogin({
-			configPath,
-			verbose,
-			timeoutMs,
-			accountId: options.account?.trim() || void 0,
-			writeConfig: !options.credentialsOnly
-		});
-		if (!result.ok) {
-			if (result.cancelled) {
-				process.exitCode = 130;
-				return;
-			}
-			console.error(result.message || "Login failed");
-			process.exitCode = 1;
-		}
-	});
-	cmd.command("list").description("List configured channels and their account status").option("--json", "Output as JSON for agents/UIs", false).action((opts) => {
-		ensureChannelRegistryForCli();
-		const channelsCfg = loadConfig(resolveConfigPathFromCommand(cmd)).channels ?? {};
-		const entries = listChannelPlugins().map((plugin) => {
-			const raw = channelsCfg[plugin.id] ?? {};
-			const enabled = raw.enabled === true;
-			const accounts = raw.accounts ?? {};
-			const accountSummaries = Object.entries(accounts).map(([id, acct]) => ({
-				accountId: id,
-				enabled: acct.enabled !== false,
-				configured: typeof acct.botToken === "string" ? Boolean(acct.botToken.trim()) : false
-			}));
-			return {
-				id: plugin.id,
-				name: plugin.meta?.label ?? plugin.id,
-				enabled,
-				hasLogin: Boolean(plugin.cliLogin),
-				accountCount: accountSummaries.length,
-				accounts: accountSummaries
-			};
-		});
+	cmd.command("list").description("List channel extension contributions").option("--json", "Output as JSON", false).action((opts) => {
+		const cfg = loadCliConfig(ctx);
+		const catalog = buildChannelCatalogForConfig(cfg);
+		const channels = cfg.channels;
+		const rows = catalog.entries.map((entry) => ({
+			id: entry.id,
+			label: entry.label,
+			extensionId: entry.extensionId,
+			source: entry.source,
+			enabled: channels?.[entry.id]?.enabled === true,
+			configured: Boolean(channels?.[entry.id])
+		}));
 		if (opts.json) {
-			process.stdout.write(JSON.stringify({
+			process.stdout.write(`${JSON.stringify({
 				ok: true,
-				channels: entries
-			}) + "\n");
+				channels: rows
+			})}\n`);
 			return;
 		}
 		console.log("");
 		console.log(colors.bold("CHANNELS"));
-		const idWidth = Math.max(...entries.map((e) => e.id.length));
-		for (const e of entries) {
-			const status = e.enabled ? colors.green("● enabled") : colors.gray("○ disabled");
-			const accts = e.accountCount > 0 ? colors.gray(` (${e.accountCount} accounts)`) : "";
-			console.log(`  ${e.id.padEnd(idWidth)}  ${status}  ${colors.gray(e.name)}${accts}`);
+		const idWidth = Math.max(2, ...rows.map((r) => r.id.length));
+		for (const row of rows) {
+			const status = row.enabled ? colors.green("enabled") : colors.gray("disabled");
+			console.log(`  ${row.id.padEnd(idWidth)}  ${status}  ${colors.gray(row.label)}  ${colors.gray(row.extensionId)}`);
 		}
 		console.log("");
-		console.log(colors.gray("Use: xopc channels add <id> [--token <token>]"));
 	});
-	cmd.command("add <channel>").description("Add or update a channel account (currently: telegram)").option("--token <value>", "Bot token (Telegram). Prompts securely if omitted.").option("--account <id>", "Account id (default: \"default\")").option("--enable", "Enable the channel after writing (default: true)", true).option("--dry-run", "Show the change without writing", false).option("--json", "Emit a single JSON outcome line", false).action(async (channel, opts) => {
-		const channelId = channel.trim().toLowerCase();
-		const accountId = opts.account?.trim() || "default";
-		const dryRun = Boolean(opts.dryRun);
-		const json = Boolean(opts.json);
-		if (channelId === "feishu" || channelId === "weixin") {
-			emitOutcome({
-				ok: false,
-				action: "add",
-				domain: `channels.${channelId}`,
-				target: accountId,
-				changedPaths: [],
-				dryRun,
-				errors: [{ message: channelId === "weixin" ? "Weixin uses interactive QR login. Run: xopc channels login --channel weixin" : "Feishu add via CLI is not yet implemented. Edit `~/.xopc/xopc.json` (channels.feishu) or run: xopc onboard --channels" }]
-			}, json);
-			process.exitCode = SETUP_EXIT.ERROR;
-			return;
-		}
-		if (channelId !== "telegram") {
-			emitOutcome({
-				ok: false,
-				action: "add",
-				domain: `channels.${channelId}`,
-				target: accountId,
-				changedPaths: [],
-				dryRun,
-				errors: [{ message: `Unknown channel "${channelId}". Try: xopc channels list` }]
-			}, json);
-			process.exitCode = SETUP_EXIT.ERROR;
+	cmd.command("show <channel>").description("Show one channel catalog entry and config").option("--json", "Output as JSON", false).action((channel, opts) => {
+		const cfg = loadCliConfig(ctx);
+		const channelId = normalizeChannelId(channel);
+		const entry = buildChannelCatalogForConfig(cfg).byId.get(channelId);
+		if (!entry) {
+			console.error(`Unknown channel "${channelId}".`);
+			process.exitCode = 1;
 			return;
 		}
-		let token = opts.token?.trim();
-		if (!token) token = process.env.TELEGRAM_BOT_TOKEN?.trim();
-		if (!token) try {
-			token = await promptSecret("Telegram bot token (from @BotFather):");
-		} catch (error) {
-			if (isPromptCancelled(error)) {
-				emitOutcome({
-					ok: false,
-					action: "add",
-					domain: "channels.telegram",
-					target: accountId,
-					changedPaths: [],
-					dryRun,
-					errors: [{ message: "Cancelled by user" }]
-				}, json);
-				process.exitCode = SETUP_EXIT.CANCELLED;
-				return;
-			}
-			throw error;
-		}
-		if (!validateTelegramToken(token)) {
-			emitOutcome({
-				ok: false,
-				action: "add",
-				domain: "channels.telegram",
-				target: accountId,
-				changedPaths: [],
-				dryRun,
-				errors: [{
-					path: "token",
-					message: "Token does not look like a Telegram bot token (expected `<digits>:<35+ chars>`)."
-				}]
-			}, json);
-			process.exitCode = SETUP_EXIT.ERROR;
+		const payload = {
+			entry,
+			config: cfg.channels?.[channelId] ?? {}
+		};
+		if (opts.json) {
+			process.stdout.write(`${JSON.stringify({
+				ok: true,
+				...payload
+			})}\n`);
 			return;
 		}
-		await runSetup({
-			configPath: resolveConfigPathFromCommand(cmd),
-			options: {
-				dryRun,
-				json
-			},
-			mutator: {
-				domain: "channels.telegram",
-				target: accountId,
-				action: "add",
-				mutate(config) {
-					return applyTelegramAccount(config, accountId, token, opts.enable !== false);
-				},
-				resultValue: () => ({
-					channel: "telegram",
-					accountId,
-					tokenMask: maskToken(token)
-				}),
-				notes: () => [opts.enable !== false ? "Telegram channel enabled. Restart the gateway for the new bot to come online." : "Telegram credentials saved (channel disabled). Use `--enable` to start it."]
-			}
-		});
+		console.log(JSON.stringify(payload, null, 2));
 	});
-	cmd.command("remove <channel>").description("Remove a channel account").option("--account <id>", "Account id (default: \"default\")").option("--dry-run", "Show the change without writing", false).option("--json", "Emit a single JSON outcome line", false).action(async (channel, opts) => {
-		const channelId = channel.trim().toLowerCase();
-		const accountId = opts.account?.trim() || "default";
-		const dryRun = Boolean(opts.dryRun);
-		const json = Boolean(opts.json);
-		await runSetup({
-			configPath: resolveConfigPathFromCommand(cmd),
-			options: {
-				dryRun,
-				json
-			},
-			mutator: {
-				domain: `channels.${channelId}`,
-				target: accountId,
-				action: "remove",
-				mutate(config) {
-					return removeChannelAccount(config, channelId, accountId);
-				}
-			}
-		});
+	cmd.command("enable <channel>").description("Enable a channel config block").action(async (channel) => {
+		const cfg = loadCliConfig(ctx);
+		const channelId = normalizeChannelId(channel);
+		assertCatalogChannel(cfg, channelId);
+		ensureChannelObject(cfg, channelId).enabled = true;
+		await writeCliConfig(ctx, cfg);
+		console.log(`Enabled channel ${channelId}`);
 	});
-	cmd.command("schema [channel]").description("Print credential schemas for channels (for agents / UIs)").option("--json", "JSON output (default human-readable JSON)", false).action((channel, opts) => {
-		ensureChannelRegistryForCli();
-		const all = listChannelPlugins().map((p) => ({
-			id: p.id,
-			name: p.meta?.label ?? p.id,
-			hasLogin: Boolean(p.cliLogin),
-			configSchema: p.configSchema?.schema
-		}));
-		const payload = {
-			ok: true,
-			channels: channel ? all.filter((c) => c.id === channel) : all
-		};
-		if (opts.json) process.stdout.write(JSON.stringify(payload) + "\n");
-		else console.log(JSON.stringify(payload, null, 2));
+	cmd.command("disable <channel>").description("Disable a channel config block").action(async (channel) => {
+		const cfg = loadCliConfig(ctx);
+		const channelId = normalizeChannelId(channel);
+		assertCatalogChannel(cfg, channelId);
+		ensureChannelObject(cfg, channelId).enabled = false;
+		await writeCliConfig(ctx, cfg);
+		console.log(`Disabled channel ${channelId}`);
 	});
-	cmd.command("pairing").description("Approve DM pairing requests (updates channel allowFrom credential files)").addCommand(new Command("approve").description("Approve a pairing code shown to the user in Telegram / Feishu / Weixin DMs").requiredOption("--channel <id>", "telegram | feishu | weixin").option("--account <id>", "Bot account id from config", "default").argument("<code>", "Pairing code from the user message").action((code, options) => {
-		const ch = (options.channel ?? "").trim().toLowerCase();
-		if (!PAIRING_CHANNELS.has(ch)) {
-			console.error("Invalid --channel. Use: telegram, feishu, or weixin.");
-			process.exitCode = 1;
+	cmd.command("config").description("Edit channel config").command("set-json <channel> <json>").description("Merge a JSON object into channels.<id>").action(async (channel, json) => {
+		const cfg = loadCliConfig(ctx);
+		const channelId = normalizeChannelId(channel);
+		assertCatalogChannel(cfg, channelId);
+		const patch = JSON.parse(json);
+		if (!patch || typeof patch !== "object" || Array.isArray(patch)) throw new Error("JSON value must be an object");
+		Object.assign(ensureChannelObject(cfg, channelId), patch);
+		await writeCliConfig(ctx, cfg);
+		console.log(`Updated channels.${channelId}`);
+	});
+	const pairing = cmd.command("pairing").description("Manage channel pairing state");
+	pairing.command("list <channel>").option("--account <id>", "Account id", "default").option("--json", "Output as JSON", false).action((channel, opts) => {
+		const cfg = loadCliConfig(ctx);
+		const state = listChannelPairingState({
+			channel: normalizeChannelId(channel),
+			accountId: opts.account,
+			config: cfg
+		});
+		if (opts.json) {
+			process.stdout.write(`${JSON.stringify({
+				ok: true,
+				state
+			})}\n`);
 			return;
 		}
+		console.log(JSON.stringify(state, null, 2));
+	});
+	pairing.command("approve <channel> <code>").option("--account <id>", "Account id", "default").action((channel, code, opts) => {
 		const result = approveChannelPairingFromCli({
-			channel: ch,
-			accountId: (options.account ?? "default").trim() || "default",
-			code: String(code ?? "").trim()
+			channel: normalizeChannelId(channel),
+			accountId: opts.account ?? "default",
+			code
 		});
 		if (result.ok === false) {
 			console.error(result.error);
 			process.exitCode = 1;
 			return;
 		}
-		console.log(`Approved. Sender id added to allowFrom store: ${result.senderId}`);
-	}));
+		console.log(`Approved sender ${result.senderId}`);
+	});
 	return cmd;
 }
-const TELEGRAM_TOKEN_PATTERN = /^\d{5,}:[A-Za-z0-9_-]{30,}$/;
-function validateTelegramToken(token) {
-	return TELEGRAM_TOKEN_PATTERN.test(token.trim());
-}
-function maskToken(token) {
-	const t = token.trim();
-	if (t.length <= 8) return "*".repeat(t.length);
-	return `${t.slice(0, 4)}…${t.slice(-4)}`;
-}
-function applyTelegramAccount(cfg, accountId, botToken, enable) {
-	const channels = { ...cfg.channels ?? {} };
-	const tg = { ...channels.telegram ?? {} };
-	if (enable) tg.enabled = true;
-	const accounts = { ...tg.accounts ?? {} };
-	accounts[accountId] = {
-		...accounts[accountId] ?? {},
-		accountId,
-		enabled: true,
-		botToken
-	};
-	tg.accounts = accounts;
-	channels.telegram = tg;
-	return {
-		...cfg,
-		channels
-	};
-}
-function removeChannelAccount(cfg, channelId, accountId) {
-	if (channelId === "feishu" || channelId === "weixin" || channelId === "telegram") {
-		const channels = { ...cfg.channels ?? {} };
-		const ch = { ...channels[channelId] ?? {} };
-		const accounts = { ...ch.accounts ?? {} };
-		if (!(accountId in accounts)) throw new SetupValidationError([{ message: `No account "${accountId}" on channel "${channelId}".` }]);
-		delete accounts[accountId];
-		ch.accounts = accounts;
-		if (Object.keys(accounts).length === 0) ch.enabled = false;
-		channels[channelId] = ch;
-		return {
-			...cfg,
-			channels
-		};
-	}
-	throw new SetupValidationError([{ message: `Unknown channel "${channelId}". Try: xopc channels list` }]);
-}
 register({
 	id: "channels",
 	name: "channels",
-	description: "Messaging channel login",
+	description: "Messaging channel configuration",
 	factory: createChannelsCommand,
 	metadata: {
 		category: "setup",
 		examples: [
 			"xopc channels list",
-			"xopc channels add telegram --token 123456:ABC...",
-			"xopc channels remove telegram",
-			"xopc channels login",
-			"xopc channels pairing approve --channel feishu --account default ABC12XYZ"
+			"xopc channels show telegram",
+			"xopc channels enable telegram",
+			"xopc channels config set-json telegram '{\"enabled\":true}'"
 		]
 	}
 });
 //#endregion
-export { applyTelegramAccount, maskToken, removeChannelAccount, validateTelegramToken };
+export {};
 
 //# sourceMappingURL=channels.js.map