@interactive-inc/claude-funnel 0.53.0 → 0.56.0

package/dist/index.js

@@ -1,21 +1,26 @@
-import { r as FunnelDiscordAdapter, t as FunnelDiscordListener } from "./discord-listener-_jSE3HsQ.js";
-import { t as FunnelConnectorListener } from "./connector-listener-DU54DN-f.js";
+import { r as FunnelDiscordAdapter, t as FunnelDiscordListener } from "./discord-listener-C0MoKdQO.js";
+import { t as FunnelConnectorListener } from "./connector-listener-CpHBecCj.js";
 import { t as FunnelLogger } from "./logger-BP6SisKt.js";
-import { n as NodeFunnelProcessRunner, r as FunnelProcessRunner, t as ghConnectorSchema } from "./gh-connector-schema-o3Q1-ojL.js";
-import { n as FunnelGhAdapter, t as FunnelGhListener } from "./gh-listener-DH-fClQm.js";
-import { n as ScheduleStateStore, t as FunnelScheduleListener } from "./schedule-listener-ePAjians.js";
+import { n as NodeFunnelProcessRunner, r as FunnelProcessRunner, t as ghConnectorSchema } from "./gh-connector-schema-DUcZgN2Q.js";
+import { n as FunnelGhAdapter, t as FunnelGhListener } from "./gh-listener-Dsx6AmhH.js";
+import { n as ScheduleStateStore, t as FunnelScheduleListener } from "./schedule-listener-DP9Jhc6U.js";
 import { t as FunnelFileSystem } from "./file-system-PWKKU7lA.js";
 import { t as NodeFunnelFileSystem } from "./node-file-system-BcrmWN9I.js";
-import { n as FunnelSlackEventProcessor, r as FunnelSlackAdapter, t as FunnelSlackListener } from "./slack-listener-ClQuHhEF.js";
+import { n as FunnelSlackEventProcessor, r as FunnelSlackAdapter, t as FunnelSlackListener } from "./slack-listener-DUKPcpJH.js";
 import { n as FunnelIdGenerator, t as FunnelSettingsReader } from "./settings-reader-DPqrpV7s.js";
-import { a as SETTINGS_PATH, c as SETTINGS_VERSION, d as profileConfigSchema, f as settingsSchema, i as FunnelSettingsStore, l as channelConfigSchema, m as NodeFunnelIdGenerator, n as DEFAULT_GATEWAY_PORT, o as resolveFunnelDir, p as connectorConfigSchema, r as FUNNEL_DIR, s as resolveFunnelPort, t as gatewayLoopbackUrl, u as channelDeliveryModeSchema } from "./gateway-base-url-ssk_He5G.js";
-import { t as discordConnectorSchema } from "./discord-connector-schema-CBDyGdOI.js";
-import { n as scheduleConnectorSchema, r as scheduleEntrySchema, t as scheduleCatchupPolicySchema } from "./schedule-connector-schema-iCI61gzU.js";
-import { t as slackConnectorSchema } from "./slack-connector-schema-BCNWluHM.js";
-import { a as FileProcessGuard, i as FunnelMcp, o as FunnelClaude } from "./mcp-QeNCBhOD.js";
-import { a as FunnelLocalConfig, n as NodeFunnelTokenPrompter, r as FunnelLocalConfigSync, t as funnelJsonSchema } from "./local-config-json-schema-D8i-BogY.js";
-import { t as FunnelProfiles } from "./profiles-wMRnjSid.js";
-import { C as funnelTmpDir, S as publishResponseSchema, _ as FunnelEventLog, a as connectorConnectionEventSchema, b as FunnelChannelPublisher, c as MemoryFunnelEventLog, d as DEFAULT_GATEWAY_TOKEN_PATH, f as FunnelGatewayToken, g as SqliteFunnelEventLog, h as FunnelListenerSupervisor, i as ConnectorDiagnosticLog, l as channelWsProtocols, m as ConnectorDiagnosticSqlReader, n as SqliteConnectorDiagnosticLog, o as connectorProcessedEventSchema, p as FunnelGatewayServer, r as CONNECTOR_CONNECTION_STATUSES, s as connectorRawEventSchema, t as MemoryConnectorDiagnosticLog, u as channelWsUrl, v as funnelEventSchema, x as publishRequestSchema, y as FunnelBroadcaster } from "./memory-connector-diagnostic-log-COUWCsT_.js";
+import { a as SETTINGS_PATH, c as SETTINGS_VERSION, d as profileConfigSchema, f as settingsSchema, i as FunnelSettingsStore, l as channelConfigSchema, m as NodeFunnelIdGenerator, n as DEFAULT_GATEWAY_PORT, o as resolveFunnelDir, p as connectorConfigSchema, r as FUNNEL_DIR, s as resolveFunnelPort, t as gatewayLoopbackUrl, u as channelDeliveryModeSchema } from "./gateway-base-url-6foMXfFf.js";
+import { t as discordConnectorSchema } from "./discord-connector-schema-B_N6IXLz.js";
+import { n as scheduleConnectorSchema, r as scheduleEntrySchema, t as scheduleCatchupPolicySchema } from "./schedule-connector-schema-B_xO5z5B.js";
+import { t as slackConnectorSchema } from "./slack-connector-schema-C1zEf4TG.js";
+import { a as FunnelMcp, o as FileProcessGuard, s as FunnelClaude, t as renderYaml } from "./yaml-render-OhUN-qkS.js";
+import { a as toDiagnosticEvent, i as toDiagnosticConnectionError, n as previewOf, r as queryRows, t as FunnelDiagnostics } from "./funnel-diagnostics-BpKYrMSu.js";
+import { t as ConnectorDiagnosticSqlReader } from "./diagnostic-sql-reader-CzYgZpq2.js";
+import { t as FunnelDoctor } from "./funnel-doctor-CApCezTq.js";
+import { t as FunnelDocs } from "./funnel-docs-ng5K8w4j.js";
+import { a as FunnelLocalConfig, n as NodeFunnelTokenPrompter, r as FunnelLocalConfigSync, t as funnelJsonSchema } from "./local-config-json-schema-DE1zkMcb.js";
+import { t as FunnelProfiles } from "./profiles-MnXvYfZF.js";
+import { t as FunnelRecovery } from "./funnel-recovery-D9CxD5Zs.js";
+import { C as funnelTmpDir, S as publishResponseSchema, _ as funnelEventSchema, a as connectorConnectionEventSchema, b as FunnelChannelPublisher, c as MemoryFunnelEventLog, d as DEFAULT_GATEWAY_TOKEN_PATH, f as FunnelGatewayToken, g as FunnelEventLog, h as SqliteFunnelEventLog, i as ConnectorDiagnosticLog, l as channelWsProtocols, m as FunnelListenerSupervisor, n as SqliteConnectorDiagnosticLog, o as connectorProcessedEventSchema, p as FunnelGatewayServer, r as CONNECTOR_CONNECTION_STATUSES, s as connectorRawEventSchema, t as MemoryConnectorDiagnosticLog, u as channelWsUrl, v as FunnelBroadcaster, x as publishRequestSchema, y as requireBearerToken } from "./memory-diagnostic-log-BbFVqDzz.js";
 import { dirname, join, resolve } from "node:path";
 import { hc } from "hono/client";
 import { appendFileSync, existsSync, mkdirSync } from "node:fs";
@@ -24,7 +29,8 @@ import { fileURLToPath } from "node:url";
 import { createFactory } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
 import { zValidator } from "@hono/zod-validator";
-//#region lib/connectors/connector-factory.ts
+import { Hono } from "hono";
+//#region lib/engine/connectors/connector-factory.ts
 const defaultFs$1 = new NodeFunnelFileSystem();
 const defaultProcess$1 = new NodeFunnelProcessRunner();
 /**
@@ -994,84 +1000,6 @@ var FunnelListenersClient = class {
 	}
 };
 //#endregion
-//#region lib/gateway/funnel-debug.ts
-const isGatewayStatusResponse$1 = (value) => {
-	if (value === null || typeof value !== "object") return false;
-	if (!("clients" in value) || !Array.isArray(value.clients)) return false;
-	if (!("listeners" in value) || !Array.isArray(value.listeners)) return false;
-	return true;
-};
-const buildFunnelDebugReport = async (deps, channelFilter) => {
-	const gatewayStatus = deps.gateway.getStatus();
-	const report = {
-		gateway: {
-			running: gatewayStatus.running,
-			pid: gatewayStatus.pid,
-			port: gatewayStatus.running ? gatewayStatus.port : null,
-			uptimeMs: null
-		},
-		channels: [],
-		recentEvents: null
-	};
-	const allChannels = deps.channels.list();
-	const filteredChannels = channelFilter ? allChannels.filter((ch) => ch.name === channelFilter) : allChannels;
-	let gatewayData = null;
-	if (gatewayStatus.running) {
-		const res = await fetch(`http://127.0.0.1:${gatewayStatus.port}/status`).catch(() => null);
-		if (res && res.ok) {
-			const body = await res.json();
-			if (isGatewayStatusResponse$1(body)) {
-				gatewayData = body;
-				report.gateway.uptimeMs = body.uptimeMs;
-			}
-		}
-	}
-	for (const ch of filteredChannels) {
-		const listenerEntry = gatewayData?.listeners.find((l) => l.channelName === ch.name) ?? null;
-		const listener = listenerEntry ? {
-			alive: listenerEntry.alive,
-			events: listenerEntry.events,
-			errors: listenerEntry.errors,
-			lastEventAt: listenerEntry.lastEventAt
-		} : null;
-		const claudeClients = (gatewayData?.clients ?? []).filter((cl) => cl.channelName === ch.name || cl.channel === ch.name);
-		report.channels.push({
-			name: ch.name,
-			connectors: ch.connectors.map((conn) => conn.name),
-			listener,
-			claudeConnected: claudeClients.length > 0,
-			claudeClientCount: claudeClients.length
-		});
-	}
-	const rawPath = join(deps.tmpDir, "connector-raw.db");
-	const processedPath = join(deps.tmpDir, "connector-processed.db");
-	const connectionPath = join(deps.tmpDir, "connector-connection.db");
-	if (existsSync(rawPath) && existsSync(processedPath) && existsSync(connectionPath)) {
-		const reader = new ConnectorDiagnosticSqlReader({
-			rawPath,
-			processedPath,
-			connectionPath
-		});
-		const filteredChannelId = channelFilter ? allChannels.find((ch) => ch.name === channelFilter)?.id ?? null : null;
-		const sql = filteredChannelId ? "SELECT ts, outcome, payload FROM processed WHERE channel_id = ? ORDER BY seq DESC LIMIT 20" : "SELECT ts, outcome, payload FROM processed ORDER BY seq DESC LIMIT 20";
-		const params = filteredChannelId ? [filteredChannelId] : [];
-		const rows = reader.query(sql, params);
-		reader.close();
-		if (!(rows instanceof Error)) report.recentEvents = rows.map((row) => {
-			const ts = typeof row.ts === "number" ? row.ts : 0;
-			const outcome = typeof row.outcome === "string" ? row.outcome : "";
-			const payload = typeof row.payload === "string" ? row.payload : null;
-			return {
-				ts,
-				outcome,
-				payload,
-				preview: payload ? payload.slice(0, 120) : null
-			};
-		});
-	}
-	return report;
-};
-//#endregion
 //#region lib/funnel.ts
 const SANDBOX_DIR = "/sandbox/.funnel";
 const SANDBOX_TMP_DIR = "/sandbox/tmp";
@@ -1105,6 +1033,10 @@ var Funnel = class Funnel {
 	profiles;
 	localConfig;
 	localConfigSync;
+	diagnostics;
+	recovery;
+	doctor;
+	docs;
 	fs;
 	process;
 	logger;
@@ -1193,6 +1125,23 @@ var Funnel = class Funnel {
 			process,
 			logger: this.logger
 		});
+		this.diagnostics = new FunnelDiagnostics({
+			gateway: this.gateway,
+			gatewayToken: this.gatewayToken,
+			channels: this.channels,
+			publisher: this.publisher,
+			tmpDir
+		});
+		this.recovery = new FunnelRecovery({
+			gateway: this.gateway,
+			listeners: this.listeners,
+			channels: this.channels
+		});
+		this.doctor = new FunnelDoctor({
+			diagnostics: this.diagnostics,
+			recovery: this.recovery
+		});
+		this.docs = new FunnelDocs();
 		Object.freeze(this);
 	}
 	/**
@@ -1261,13 +1210,6 @@ var Funnel = class Funnel {
 		] : ["bun", gatewayScript];
 		return this.process.attach(command);
 	}
-	async debug(channelName) {
-		return buildFunnelDebugReport({
-			gateway: this.gateway,
-			channels: this.channels,
-			tmpDir: this.paths.tmpDir
-		}, channelName ?? null);
-	}
 	gatewayClient() {
 		const { port } = this.gateway.getStatus();
 		return hc(`http://127.0.0.1:${port}`);
@@ -1314,6 +1256,67 @@ var NoopFunnelLogger = class extends FunnelLogger {
 	error() {}
 };
 //#endregion
+//#region lib/gateway/service-routes.ts
+/**
+* Mountable Hono app that exposes the service layer (`FunnelDiagnostics` +
+* `FunnelDoctor`) over loopback HTTP. The MCP server, which lives in a
+* different process, calls these endpoints to drive the autonomous
+* troubleshooting loop. The CLI bypasses HTTP and calls the same services
+* directly through the in-process funnel facade, so CLI and MCP share one
+* code path.
+*/
+const buildServiceRoutes = (deps) => {
+	const app = new Hono();
+	if (deps.token) {
+		app.use("/diagnostics", requireBearerToken({ expected: deps.token }));
+		app.use("/diagnostics/*", requireBearerToken({ expected: deps.token }));
+		app.use("/doctor", requireBearerToken({ expected: deps.token }));
+	}
+	app.get("/diagnostics", async (c) => {
+		const channel = c.req.query("channel");
+		if (c.req.query("all") !== void 0) {
+			const report = await deps.diagnostics.diagnoseAll();
+			return c.json(report);
+		}
+		const report = await deps.diagnostics.diagnose(channel ?? void 0);
+		if (!report) return c.json({ error: "channel not found" }, 404);
+		return c.json(report);
+	});
+	app.get("/diagnostics/events", async (c) => {
+		const channel = c.req.query("channel") ?? null;
+		const limit = Number(c.req.query("limit") ?? "20");
+		const events = await deps.diagnostics.recentEvents(channel, limit);
+		return c.json(events);
+	});
+	app.get("/diagnostics/dropped", async (c) => {
+		const channel = c.req.query("channel") ?? null;
+		const limit = Number(c.req.query("limit") ?? "20");
+		const events = await deps.diagnostics.droppedEvents(channel, limit);
+		return c.json(events);
+	});
+	app.get("/diagnostics/errors", async (c) => {
+		const channel = c.req.query("channel") ?? null;
+		const limit = Number(c.req.query("limit") ?? "20");
+		const errors = await deps.diagnostics.connectionErrors(channel, limit);
+		return c.json(errors);
+	});
+	app.post("/diagnostics/replay", async (c) => {
+		const body = await c.req.json().catch(() => ({}));
+		const channel = typeof body.channel === "string" ? body.channel : null;
+		const seq = typeof body.seq === "number" ? body.seq : void 0;
+		if (!channel) return c.json({ error: "channel is required" }, 400);
+		const result = await deps.diagnostics.replay(channel, seq);
+		return c.json(result);
+	});
+	app.post("/doctor", async (c) => {
+		const body = await c.req.json().catch(() => ({}));
+		const mode = body.mode === "safe" || body.mode === "aggressive" || body.mode === "off" ? body.mode : "off";
+		const report = await deps.doctor.run(mode);
+		return c.json(report);
+	});
+	return app;
+};
+//#endregion
 //#region lib/cli/factory.ts
 const factory = createFactory();
 //#endregion
@@ -1604,13 +1607,15 @@ const channelsConnectorsSetHandler = factory.createHandlers(zValidator$1("param"
 const channelsConnectorsShowHandler = factory.createHandlers(zValidator$1("param", z.object({
 	channel: z.string(),
 	connector: z.string()
-})), zValidator$1("query", z.object({}), `funnel channels <channel> connectors show <connector> — show connector config
+})), zValidator$1("query", z.object({}), `funnel channels <channel> connectors show <connector> / show connector config
+
+usage / funnel channels <channel> connectors show <connector>
 
-usage: funnel channels <channel> connectors show <connector>`), (c) => {
+output / valid YAML`), (c) => {
 	const param = c.req.valid("param");
 	const connector = c.env.funnel.channels.getConnector(param.channel, param.connector);
 	if (!connector) throw new HTTPException(404, { message: `connector "${param.connector}" not found in channel "${param.channel}"` });
-	return c.text(JSON.stringify(connector, null, 2));
+	return c.text(renderYaml(connector));
 });
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.rename.ts
@@ -1641,23 +1646,32 @@ const channelsConnectorRenameHelpHandler = factory.createHandlers((c) => c.text(
 const channelsConnectorsRequestHandler = factory.createHandlers(zValidator$1("param", z.object({
 	channel: z.string(),
 	connector: z.string()
-})), zValidator$1("query", z.object({ method: z.string() }).passthrough(), `funnel channels <channel> connectors <connector> request — call a connector's outbound API
+})), zValidator$1("query", z.object({
+	method: z.string(),
+	path: z.string().optional()
+}).passthrough(), `funnel channels <channel> connectors <connector> request / call a connector's outbound API
 
-usage: funnel channels <channel> connectors <connector> request --method=<api.method> [--key=value ...]`), async (c) => {
+usage / funnel channels <channel> connectors <connector> request --method=<m> [--path=<p>] [--key=value ...]
+
+options:
+  --method / slack: API method (e.g. chat.postMessage). gh/discord: HTTP verb (GET/POST/...).
+  --path / gh/discord: endpoint (e.g. repos/o/r/issues). Omit for slack (defaults to --method).
+
+output / valid YAML (or raw text when the adapter returns text)`), async (c) => {
 	const param = c.req.valid("param");
 	const query = c.req.valid("query");
 	const funnel = c.env.funnel;
 	const passthrough = {};
 	for (const [k, v] of new URL(c.req.url).searchParams) {
-		if (k === "method") continue;
+		if (k === "method" || k === "path") continue;
 		passthrough[k] = v;
 	}
 	const response = await funnel.channels.call(param.channel, param.connector, {
 		method: query.method,
-		path: query.method,
+		path: query.path ?? query.method,
 		body: passthrough
 	});
-	return c.text(typeof response === "string" ? response : JSON.stringify(response, null, 2));
+	return c.text(typeof response === "string" ? response : renderYaml(response));
 });
 const channelsConnectorsSchedulesGroupHandler = factory.createHandlers(zValidator$1("param", z.object({
 	channel: z.string(),
@@ -1685,7 +1699,7 @@ const channelsConnectorsSchedulesAddHandler = factory.createHandlers(zValidator$
 })), zValidator$1("query", z.object({
 	cron: z.string(),
 	prompt: z.string(),
-	enabled: z.coerce.boolean().optional(),
+	enabled: z.enum(["true", "false"]).optional(),
 	"catchup-policy": scheduleCatchupPolicySchema.optional()
 })), async (c) => {
 	const param = c.req.valid("param");
@@ -1695,7 +1709,7 @@ const channelsConnectorsSchedulesAddHandler = factory.createHandlers(zValidator$
 		id: param.id,
 		cron: query.cron,
 		prompt: query.prompt,
-		...query.enabled !== void 0 ? { enabled: query.enabled } : {},
+		...query.enabled !== void 0 ? { enabled: query.enabled === "true" } : {},
 		...query["catchup-policy"] !== void 0 ? { catchupPolicy: query["catchup-policy"] } : {}
 	});
 	await funnel.listeners.restart(param.channel, param.connector);
@@ -1807,48 +1821,46 @@ modes:
 	c.env.funnel.channels.setDelivery(param.channel, param.mode);
 	return c.text(`channel "${param.channel}" delivery set to ${param.mode}`);
 });
-const channelsShowHandler = factory.createHandlers(zValidator$1("param", z.object({ channel: z.string() })), zValidator$1("query", z.object({}), `funnel channels <name> — show channel details`), (c) => {
+const channelsShowHandler = factory.createHandlers(zValidator$1("param", z.object({ channel: z.string() })), zValidator$1("query", z.object({}), `funnel channels <name> / show channel details
+
+output / valid YAML`), (c) => {
 	const param = c.req.valid("param");
 	const channel = c.env.funnel.channels.get(param.channel);
 	if (!channel) throw new HTTPException(404, { message: `channel "${param.channel}" not found` });
-	const connectorLines = channel.connectors.length ? channel.connectors.map((c) => `  - ${c.name} (${c.type}, id: ${c.id})`) : ["  (none)"];
-	const lines = [
-		`id: ${channel.id}`,
-		`name: ${channel.name}`,
-		`delivery: ${channel.delivery}`,
-		`connectors:`,
-		...connectorLines
-	];
-	return c.text(lines.join("\n"));
+	return c.text(renderYaml({
+		id: channel.id,
+		name: channel.name,
+		delivery: channel.delivery,
+		connectors: channel.connectors.map((conn) => ({
+			id: conn.id,
+			name: conn.name,
+			type: conn.type
+		}))
+	}));
 });
-const channelsGroupHandler = factory.createHandlers(zValidator$1("query", z.object({ json: z.enum([
-	"true",
-	"false",
-	""
-]).optional() }), `funnel channels — manage subscription boxes
-
-usage: funnel channels [--json]
+const channelsGroupHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel channels / manage subscription boxes
 
-options:
-  --json                output as JSON array (machine-readable, useful for Claude)
+usage / funnel channels [subcommand]
 
 subcommands:
-  (none)                          list
-  add <name>                      add
-  remove <name>                   remove
-  <name>                          show details
-  <name> connectors                       list connectors
-  <name> connectors add <c> --type=...    add a connector
+  (none) / list every channel with its connectors
+  add <name> / create a channel
+  remove <name> / delete a channel
+  <name> / show one channel
+  <name> connectors / list connectors
+  <name> connectors add <c> --type=... / add a connector
+
+output / valid YAML
+
+programmable / funnel.channels.list() / .add() / .remove() / .addConnector() / .removeConnector()
 
 examples:
   funnel channels
-  funnel channels --json
   funnel channels add prod-inbox
   funnel channels prod-inbox connectors add prod-slack --type=slack --bot-token=xoxb-... --app-token=xapp-...
   funnel channels prod-inbox`), (c) => {
-	const query = c.req.valid("query");
 	const channels = c.env.funnel.channels.list();
-	if (query.json === "true" || query.json === "") return c.json(channels.map((ch) => ({
+	return c.text(renderYaml({ channels: channels.map((ch) => ({
 		id: ch.id,
 		name: ch.name,
 		delivery: ch.delivery,
@@ -1857,14 +1869,7 @@ examples:
 			name: conn.name,
 			type: conn.type
 		}))
-	})));
-	if (channels.length === 0) return c.text("no channels");
-	const lines = channels.map((ch) => {
-		const names = ch.connectors.map((conn) => conn.name);
-		const connectors = names.length > 0 ? names.join(", ") : "(none)";
-		return `${ch.name} [${connectors}]`;
-	});
-	return c.text(lines.join("\n"));
+	})) }));
 });
 //#endregion
 //#region lib/cli/routes/channels.validate.ts
@@ -1929,42 +1934,29 @@ const validateConnector = (connector) => {
 	}
 	return issues;
 };
-const channelsValidateHandler = factory.createHandlers(zValidator$1("param", z.object({ channel: z.string() })), zValidator$1("query", z.object({ json: z.enum([
-	"true",
-	"false",
-	""
-]).optional() })), (c) => {
+const channelsValidateHandler = factory.createHandlers(zValidator$1("param", z.object({ channel: z.string() })), zValidator$1("query", z.object({})), (c) => {
 	const param = c.req.valid("param");
-	const query = c.req.valid("query");
-	const funnel = c.env.funnel;
-	const isJson = query.json === "true" || query.json === "";
-	const channel = funnel.channels.get(param.channel);
+	const channel = c.env.funnel.channels.get(param.channel);
 	if (!channel) throw new HTTPException(404, { message: `channel "${param.channel}" not found` });
-	if (channel.connectors.length === 0) {
-		if (isJson) return c.json({
-			channel: channel.name,
-			valid: false,
-			issues: [{
-				connector: "(none)",
-				field: "connectors",
-				message: "no connectors configured"
-			}]
-		});
-		return c.text(`⚠ ${channel.name}: no connectors configured`);
-	}
+	if (channel.connectors.length === 0) return c.text(renderYaml({
+		channel: channel.name,
+		valid: false,
+		issues: [{
+			connector: null,
+			field: "connectors",
+			message: "no connectors configured"
+		}]
+	}));
 	const allIssues = [];
 	for (const connector of channel.connectors) {
 		const issues = validateConnector(connector);
 		allIssues.push(...issues);
 	}
-	if (isJson) return c.json({
+	return c.text(renderYaml({
 		channel: channel.name,
 		valid: allIssues.length === 0,
 		issues: allIssues
-	});
-	if (allIssues.length === 0) return c.text(`✓ ${channel.name}: all connectors valid`);
-	const lines = allIssues.map((issue) => `✗ ${channel.name}/${issue.connector}: ${issue.message}`);
-	return c.text(lines.join("\n"));
+	}));
 });
 //#endregion
 //#region lib/cli/routes/claude.ts
@@ -1991,7 +1983,14 @@ funnel-specific options (everything else passes through to claude verbatim):
 
 Positional args, unknown short flags (e.g. -c, -r), and claude's own flags
 (--agent, --resume, --model, --print, --output-format ...) are all forwarded.
-On launch the FUNNEL_CHANNEL_ID env var is set and MCP connects to the gateway.`;
+On launch the FUNNEL_CHANNEL_ID env var is set and MCP connects to the gateway.
+
+see also:
+  fnl docs claude              full resolution order, side effects, double-launch guard
+  fnl docs mcp                 what the MCP server exposes once Claude is up
+  fnl docs debugging           the diagnose → recover → verify loop
+
+programmable: funnel.claude.launch({ profileId | channelId, options, env, resume })`;
 const RESERVED_KEYS$1 = ["profile", "channel"];
 const claudeHandler = factory.createHandlers(zValidator$1("query", z.object({
 	profile: z.string().optional(),
@@ -2051,768 +2050,310 @@ const claudeHandler = factory.createHandlers(zValidator$1("query", z.object({
 	process.exit(exitCode);
 });
 //#endregion
-//#region lib/cli/routes/debug-row.ts
-const stringOrNull = (value) => typeof value === "string" && value.length > 0 ? value : null;
-const numberOrNull = (value) => typeof value === "number" ? value : null;
-const stringOr = (value, fallback) => typeof value === "string" ? value : fallback;
-/**
-* Parse a payload string as a JSON object. Returns null for non-strings,
-* malformed JSON, or any non-object JSON (arrays, primitives) — the callers
-* only ever want the object form.
-*/
-const parsePayloadObject = (payload) => {
-	if (payload === null) return null;
-	try {
-		const parsed = JSON.parse(payload);
-		if (isStringKeyedObject(parsed)) return parsed;
-	} catch {
-		return null;
-	}
-	return null;
-};
-const isStringKeyedObject = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
-const truncate = (text, max) => text.length <= max ? text : `${text.slice(0, max)}…`;
-/**
-* A short human preview of a payload: the `text` field when the payload is a
-* JSON object that has one, otherwise the raw payload, both truncated.
-*/
-const previewOf = (payload) => {
-	if (typeof payload !== "string" || payload.length === 0) return null;
-	const parsed = parsePayloadObject(payload);
-	if (parsed !== null && "text" in parsed) return truncate(String(parsed.text), 60);
-	return truncate(payload, 60);
-};
-/** Narrow one processed-table row into a `DebugEvent`. */
-const toDebugEvent = (row) => {
-	const payload = stringOrNull(row.payload);
-	return {
-		seq: numberOrNull(row.seq),
-		ts: numberOrNull(row.ts),
-		type: stringOr(row.type, "?"),
-		outcome: stringOr(row.outcome, "?"),
-		eventId: stringOrNull(row.event_id),
-		payload,
-		payloadParsed: parsePayloadObject(payload),
-		preview: previewOf(row.payload)
-	};
-};
-/** Narrow one connection-table row into a `DebugConnectionError`. */
-const toDebugConnectionError = (row) => ({
-	seq: numberOrNull(row.seq),
-	ts: numberOrNull(row.ts),
-	type: stringOr(row.type, "?"),
-	status: stringOr(row.status, "?"),
-	detail: stringOrNull(row.detail)
-});
-/**
-* Open a reader, run one query, and always close — the shared shape behind
-* every diagnostic lookup. Returns the rows or the reader's `Error`.
-*/
-const queryRows = (reader, sql, params) => {
-	try {
-		return reader.query(sql, params);
-	} finally {
-		reader.close();
-	}
-};
-//#endregion
 //#region lib/cli/routes/debug.ts
-const debugHelp = `funnel debug — diagnose why Claude is not receiving events
+const debugHelp = `funnel debug / per-channel inspection (events, drops, connection errors, replay)
 
-usage: funnel debug [subcommand] [--channel <name>] [--all] [--json]
+usage / funnel debug [subcommand] [--channel <name>] [--all] [--limit <N>]
 
 subcommands:
-  (none)                full diagnosis (gateway + listener + Claude + last 5 events)
-  events                last N processed events with outcome and preview
-  dropped               events filtered out (skip:*) with payload detail
-  errors                listener connection errors (auth-failed, error)
+  (none) / full diagnosis for one channel (or --all for every channel)
+  events / last N processed events with outcome
+  dropped / events filtered out (skip:*) with payload
+  errors / listener auth-failed and error events
+  replay / re-send a past event into a channel
 
 options:
-  --channel <name>      channel to inspect (auto-selected when only one exists)
-  --all                 diagnose all channels at once (JSON output)
-  --limit <N>           number of recent events to include (default: 5; events/dropped/errors default: 20)
-  --json                output as JSON (machine-readable, useful for Claude)
+  --channel <name> / channel to inspect (auto-selected when only one exists)
+  --all / diagnose every channel
+  --limit <N> / number of rows (default 5 for diagnosis, 20 for subcommands)
 
-when a listener is dead the diagnosis includes rootCause — the most recent
-connection error detail pulled from the connection log automatically.
+For the common case, prefer fnl doctor — it runs a full diagnosis and can apply
+safe fixes in one shot. fnl debug is the lower-level view.
 
-use --json when asking Claude to analyse the output — it returns structured
-data that Claude can parse without guessing at text formatting.
+output / valid YAML
+
+programmable / funnel.diagnostics.diagnose() / .diagnoseAll() / .recentEvents() / .droppedEvents() / .connectionErrors() / .replay()
 
 examples:
   funnel debug
-  funnel debug --all --json
-  funnel debug --channel open-karte
-  funnel debug --channel open-karte --json
-  funnel debug events --channel open-karte --limit 50
-  funnel debug dropped --channel open-karte --json
-  funnel debug errors`;
-const debugEventsHelp = `funnel debug events — last N processed events with outcome and preview
+  funnel debug --all
+  funnel debug --channel ops
+  funnel debug events --channel ops --limit 50
+  funnel debug dropped --channel ops`;
+const debugEventsHelp = `funnel debug events / last N processed events
 
-usage: funnel debug events [--channel <name>] [--limit <N>] [--json]
+usage / funnel debug events [--channel <name>] [--limit <N>]
 
-options:
-  --channel <name>      channel to inspect (auto-selected when only one exists)
-  --limit <N>           number of rows (default: 20)
-  --json                output as JSON
+programmable / funnel.diagnostics.recentEvents(channel, limit)`;
+const debugDroppedHelp = `funnel debug dropped / events filtered out (skip:*)
 
-examples:
-  funnel debug events
-  funnel debug events --channel open-karte --limit 50
-  funnel debug events --json`;
-const debugDroppedHelp = `funnel debug dropped — events filtered out (skip:*)
-
-usage: funnel debug dropped [--channel <name>] [--limit <N>] [--json]
+usage / funnel debug dropped [--channel <name>] [--limit <N>]
 
-options:
-  --channel <name>      channel to inspect (auto-selected when only one exists)
-  --limit <N>           number of rows (default: 20)
-  --json                output as JSON
+shows skip reasons: skip:type / skip:subtype / skip:dedup / skip:self-user /
+skip:self-bot / skip:preprocess
 
-shows why events were skipped: skip:type, skip:subtype, skip:dedup,
-skip:self-user, skip:self-bot, skip:preprocess
-
-examples:
-  funnel debug dropped
-  funnel debug dropped --channel open-karte --json`;
-const debugErrorsHelp = `funnel debug errors — listener connection errors
+programmable / funnel.diagnostics.droppedEvents(channel, limit)`;
+const debugErrorsHelp = `funnel debug errors / listener auth-failed and error events
 
-usage: funnel debug errors [--channel <name>] [--limit <N>] [--json]
+usage / funnel debug errors [--channel <name>] [--limit <N>]
 
-options:
-  --channel <name>      channel to inspect (auto-selected when only one exists)
-  --limit <N>           number of rows (default: 20)
-  --json                output as JSON
+programmable / funnel.diagnostics.connectionErrors(channel, limit)`;
+const debugReplayHelp = `funnel debug replay / re-publish a past event into a channel
 
-shows auth-failed and error events from the connection lifecycle log.
-use this when a listener never connects or keeps disconnecting.
+usage / funnel debug replay --channel <name> [--seq <N>]
 
-examples:
-  funnel debug errors
-  funnel debug errors --channel open-karte`;
-const isGatewayStatusResponse = (value) => {
-	if (value === null || typeof value !== "object") return false;
-	if (!("clients" in value) || !Array.isArray(value.clients)) return false;
-	if (!("listeners" in value) || !Array.isArray(value.listeners)) return false;
-	return true;
-};
-const formatUptime = (ms) => {
-	const sec = Math.floor(ms / 1e3);
-	const min = Math.floor(sec / 60);
-	if (min >= 60) return `${Math.floor(min / 60)}h ${min % 60}m`;
-	if (sec >= 60) return `${min}m ${sec % 60}s`;
-	return `${sec}s`;
-};
-const formatTs = (epochMs) => {
-	if (typeof epochMs !== "number") return "?";
-	return new Date(epochMs).toISOString().slice(11, 19);
-};
-const buildDiagnosis = (report) => {
-	const rootCause = (report.connectionErrors[report.connectionErrors.length - 1] ?? null)?.detail ?? null;
-	if (!report.gateway.running) return {
-		status: "error",
-		message: "gateway is not running",
-		nextActions: ["fnl gateway start"],
-		rootCause: null
-	};
-	const channel = report.channel;
-	if (!(report.listeners.length > 0)) return {
-		status: "warn",
-		message: "no connectors configured on this channel",
-		nextActions: [`fnl channels ${channel} connectors add <name> --type=slack ...`],
-		rootCause: null
-	};
-	const allDead = report.listeners.every((l) => !l.alive);
-	const someDead = report.listeners.some((l) => !l.alive);
-	if (allDead) return {
-		status: "error",
-		message: "all listeners are dead",
-		nextActions: ["fnl gateway logs", "fnl gateway restart"],
-		rootCause
-	};
-	if (someDead) return {
-		status: "warn",
-		message: "some listeners are dead",
-		nextActions: ["fnl gateway logs"],
-		rootCause
-	};
-	const hasErrors = report.listeners.some((l) => l.errors > 0);
-	if (report.claudeClients === 0) return {
-		status: "warn",
-		message: "no Claude connected to this channel",
-		nextActions: [`fnl claude --channel ${channel}`],
-		rootCause: null
-	};
-	if (hasErrors) return {
-		status: "warn",
-		message: "listeners have errors",
-		nextActions: ["fnl gateway logs"],
-		rootCause
-	};
-	return {
-		status: "ok",
-		message: "everything looks healthy",
-		nextActions: [],
-		rootCause: null
-	};
-};
-const renderText = (report) => {
-	const lines = [];
-	lines.push(`= funnel debug: ${report.channel} =`);
-	lines.push("");
-	const gw = report.gateway;
-	if (!gw.running) lines.push("[gateway]    ○ not running");
-	else {
-		const uptime = gw.uptimeMs !== null ? ` · up ${formatUptime(gw.uptimeMs)}` : "";
-		lines.push(`[gateway]    ● running  pid ${gw.pid} · port ${gw.port}${uptime}`);
-	}
-	if (report.listeners.length === 0) lines.push("[listener]   - no listener");
-	else for (const listener of report.listeners) {
-		const indicator = listener.alive ? "●" : "○";
-		const state = listener.alive ? "alive " : "dead  ";
-		const eventsStr = `${listener.events} events`;
-		const lastStr = listener.lastEventAt ? ` · last ${listener.lastEventAt.slice(11, 19)}` : "";
-		const errStr = listener.errors > 0 ? ` · ⚠ ${listener.errors} errors` : "";
-		lines.push(`[listener]   ${indicator} ${state} ${eventsStr}${lastStr}${errStr}`);
-	}
-	const claudeCount = report.claudeClients;
-	if (claudeCount === 0) lines.push("[claude]     ○ not connected");
-	else lines.push(`[claude]     ● connected (${claudeCount} WS client${claudeCount > 1 ? "s" : ""})`);
-	if (report.recentEvents.length === 0) lines.push("[events]     no events recorded");
-	else {
-		lines.push(`[events]     last ${report.recentEvents.length} event${report.recentEvents.length > 1 ? "s" : ""}:`);
-		for (const event of report.recentEvents) {
-			const time = formatTs(event.ts);
-			const type = event.type.padEnd(8);
-			const outcome = event.outcome.padEnd(20);
-			const preview = event.preview ? ` "${event.preview}"` : "";
-			const seq = event.seq !== null ? ` (seq=${event.seq})` : "";
-			lines.push(`               ${time}  ${type} ${outcome}${preview}${seq}`);
-		}
-	}
-	if (report.connectionErrors.length > 0) {
-		lines.push("[conn errs]  recent connection errors:");
-		for (const err of report.connectionErrors) {
-			const time = formatTs(err.ts);
-			const status = err.status.padEnd(14);
-			const detail = err.detail ? ` "${err.detail}"` : "";
-			lines.push(`               ${time}  ${err.type.padEnd(8)}  ${status}${detail}`);
-		}
-	}
-	lines.push("");
-	const diag = report.diagnosis;
-	const icon = diag.status === "ok" ? "✓" : diag.status === "warn" ? "⚠" : "✗";
-	lines.push(`diagnosis: ${icon} ${diag.message}`);
-	if (diag.rootCause) lines.push(`  root cause: ${diag.rootCause}`);
-	for (const action of diag.nextActions) lines.push(`  → ${action}`);
-	return lines.join("\n");
-};
-const resolveStoreOrNull = () => {
-	const tmpDir = funnelTmpDir();
-	const rawPath = join(tmpDir, "connector-raw.db");
-	const processedPath = join(tmpDir, "connector-processed.db");
-	const connectionPath = join(tmpDir, "connector-connection.db");
-	if (!existsSync(rawPath) || !existsSync(processedPath) || !existsSync(connectionPath)) return null;
-	return {
-		rawPath,
-		processedPath,
-		connectionPath
-	};
-};
-/**
-* Resolve the connector name for a connector id on a channel, used to attribute
-* a replayed event back to its source connector. Returns undefined when the id
-* is null or no longer present (connectors can be removed after an event was
-* logged).
-*/
-const connectorOf = (channel, connectorId) => {
-	if (connectorId === null) return void 0;
-	return channel.connectors?.find((connector) => connector.id === connectorId)?.name;
-};
-const resolveChannelId = (channels, channelName) => {
-	if (channelName) {
-		const match = channels.find((ch) => ch.name === channelName);
-		if (match) return {
-			found: true,
-			channel: match
+programmable / funnel.diagnostics.replay(channel, seq?)`;
+const channelLimitQuery = z.object({
+	channel: z.string().optional(),
+	limit: z.string().optional()
+});
+const resolveTargetChannel = (c, channelArg) => {
+	const channels = c.env.funnel.channels.list();
+	if (channelArg) {
+		const match = channels.find((ch) => ch.name === channelArg);
+		if (!match) return {
+			kind: "error",
+			payload: {
+				error: `channel not found: ${channelArg}`,
+				availableChannels: channels.map((ch) => ch.name)
+			}
 		};
 		return {
-			found: false,
-			reason: "not-found",
-			name: channelName
+			kind: "ok",
+			name: match.name
 		};
 	}
-	if (channels.length === 1 && channels[0]) return {
-		found: true,
-		channel: channels[0]
-	};
 	if (channels.length === 0) return {
-		found: false,
-		reason: "none"
+		kind: "ok",
+		name: null
+	};
+	if (channels.length === 1) return {
+		kind: "ok",
+		name: channels[0]?.name ?? null
 	};
 	return {
-		found: false,
-		reason: "ambiguous",
-		names: channels.map((ch) => ch.name)
+		kind: "error",
+		payload: {
+			error: "multiple channels — specify one with --channel",
+			channels: channels.map((ch) => ch.name)
+		}
 	};
 };
-const debugEventsHandler = factory.createHandlers(zValidator$1("query", z.object({
+const debugHandler = factory.createHandlers(zValidator$1("query", z.object({
 	channel: z.string().optional(),
-	limit: z.string().optional(),
-	json: z.enum([
+	all: z.enum([
 		"true",
 		"false",
 		""
-	]).optional()
-}), debugEventsHelp), async (c) => {
+	]).optional(),
+	limit: z.string().optional()
+}), debugHelp), async (c) => {
 	const query = c.req.valid("query");
-	const channels = c.env.funnel.channels.list();
-	const isJson = query.json === "true" || query.json === "";
+	const funnel = c.env.funnel;
+	if (query.all === "true" || query.all === "") {
+		const report = await funnel.diagnostics.diagnoseAll();
+		return c.text(renderYaml(report));
+	}
+	const allChannels = funnel.channels.list();
+	if (allChannels.length === 0) return c.text(renderYaml({
+		error: "no channels configured",
+		nextAction: "fnl channels add <name>"
+	}));
+	let targetName = null;
+	if (query.channel) {
+		const match = allChannels.find((ch) => ch.name === query.channel);
+		if (!match) return c.text(renderYaml({
+			error: `channel not found: ${query.channel}`,
+			availableChannels: allChannels.map((ch) => ch.name)
+		}));
+		targetName = match.name;
+	} else if (allChannels.length === 1) targetName = allChannels[0]?.name ?? null;
+	else return c.text(renderYaml({
+		error: "multiple channels — specify one with --channel or use --all",
+		channels: allChannels.map((ch) => ch.name),
+		hint: "use --all for all channels at once"
+	}));
+	const report = await funnel.diagnostics.diagnose(targetName ?? void 0);
+	if (!report) return c.text(renderYaml({ error: "channel not resolvable" }));
+	return c.text(renderYaml(report));
+});
+const debugEventsHandler = factory.createHandlers(zValidator$1("query", channelLimitQuery, debugEventsHelp), async (c) => {
+	const query = c.req.valid("query");
+	const funnel = c.env.funnel;
 	const limit = query.limit ? Math.max(1, Number(query.limit)) : 20;
-	const store = resolveStoreOrNull();
-	if (!store) {
-		if (isJson) return c.json([]);
-		return c.text("no diagnostic store yet (start the gateway first)");
-	}
-	const resolved = resolveChannelId(channels, query.channel);
-	if (!resolved.found) {
-		if (resolved.reason === "not-found") {
-			if (isJson) return c.json({
-				error: `channel not found: ${resolved.name}`,
-				availableChannels: channels.map((ch) => ch.name)
-			});
-			return c.text(`channel not found: ${resolved.name}`);
-		}
-		if (resolved.reason === "ambiguous") {
-			if (isJson) return c.json({
-				error: "multiple channels — specify one with --channel",
-				channels: resolved.names
-			});
-			return c.text(`multiple channels — specify one with --channel:\n${resolved.names.map((n) => `  - ${n}`).join("\n")}`);
-		}
-		if (isJson) return c.json([]);
-		return c.text("no channels configured");
-	}
-	const channel = resolved.channel;
-	const reader = new ConnectorDiagnosticSqlReader(store);
-	const rows = channel ? queryRows(reader, "SELECT seq, ts, type, outcome, payload FROM processed WHERE channel_id = ? ORDER BY seq DESC LIMIT ?", [channel.id, limit]) : queryRows(reader, "SELECT seq, ts, type, outcome, payload FROM processed ORDER BY seq DESC LIMIT ?", [limit]);
-	if (rows instanceof Error) return c.text(`error: ${rows.message}`);
-	const events = rows.reverse().map(toDebugEvent);
-	if (isJson) return c.json(events);
-	if (events.length === 0) return c.text("no events recorded");
-	const lines = events.map((ev) => {
-		const time = formatTs(ev.ts);
-		const type = ev.type.padEnd(8);
-		const outcome = ev.outcome.padEnd(20);
-		const preview = ev.preview ? `  "${ev.preview}"` : "";
-		return `${time}  ${type}  ${outcome}${ev.seq !== null ? `  seq=${ev.seq}` : ""}${preview}`;
-	});
-	return c.text(lines.join("\n"));
+	const resolved = resolveTargetChannel(c, query.channel);
+	if (resolved.kind === "error") return c.text(renderYaml(resolved.payload));
+	const events = await funnel.diagnostics.recentEvents(resolved.name, limit);
+	return c.text(renderYaml({ events }));
 });
-const debugDroppedHandler = factory.createHandlers(zValidator$1("query", z.object({
-	channel: z.string().optional(),
-	limit: z.string().optional(),
-	json: z.enum([
-		"true",
-		"false",
-		""
-	]).optional()
-}), debugDroppedHelp), async (c) => {
+const debugDroppedHandler = factory.createHandlers(zValidator$1("query", channelLimitQuery, debugDroppedHelp), async (c) => {
 	const query = c.req.valid("query");
-	const channels = c.env.funnel.channels.list();
-	const isJson = query.json === "true" || query.json === "";
+	const funnel = c.env.funnel;
 	const limit = query.limit ? Math.max(1, Number(query.limit)) : 20;
-	const store = resolveStoreOrNull();
-	if (!store) {
-		if (isJson) return c.json([]);
-		return c.text("no diagnostic store yet (start the gateway first)");
-	}
-	const resolvedDropped = resolveChannelId(channels, query.channel);
-	if (!resolvedDropped.found) {
-		if (resolvedDropped.reason === "not-found") {
-			if (isJson) return c.json({
-				error: `channel not found: ${resolvedDropped.name}`,
-				availableChannels: channels.map((ch) => ch.name)
-			});
-			return c.text(`channel not found: ${resolvedDropped.name}`);
-		}
-		if (resolvedDropped.reason === "ambiguous") {
-			if (isJson) return c.json({
-				error: "multiple channels — specify one with --channel",
-				channels: resolvedDropped.names
-			});
-			return c.text(`multiple channels — specify one with --channel:\n${resolvedDropped.names.map((n) => `  - ${n}`).join("\n")}`);
-		}
-		if (isJson) return c.json([]);
-		return c.text("no channels configured");
-	}
-	const channel = resolvedDropped.channel;
-	const reader = new ConnectorDiagnosticSqlReader(store);
-	const rows = channel ? queryRows(reader, "SELECT p.seq, p.ts, p.type, p.outcome, p.payload, p.event_id FROM processed p WHERE p.channel_id = ? AND p.outcome LIKE 'skip:%' ORDER BY p.seq DESC LIMIT ?", [channel.id, limit]) : queryRows(reader, "SELECT seq, ts, type, outcome, payload, event_id FROM processed WHERE outcome LIKE 'skip:%' ORDER BY seq DESC LIMIT ?", [limit]);
-	if (rows instanceof Error) return c.text(`error: ${rows.message}`);
-	const events = rows.reverse().map(toDebugEvent);
-	if (isJson) return c.json(events);
-	if (events.length === 0) return c.text("no dropped events recorded");
-	const lines = events.map((ev) => {
-		return `${formatTs(ev.ts)}  ${ev.type.padEnd(8)}  ${ev.outcome.padEnd(20)}${ev.seq !== null ? `  seq=${ev.seq}` : ""}${ev.eventId ? `  event_id=${ev.eventId.slice(0, 8)}` : ""}${ev.preview ? `  "${ev.preview}"` : ""}`;
-	});
-	return c.text(lines.join("\n"));
+	const resolved = resolveTargetChannel(c, query.channel);
+	if (resolved.kind === "error") return c.text(renderYaml(resolved.payload));
+	const events = await funnel.diagnostics.droppedEvents(resolved.name, limit);
+	return c.text(renderYaml({ dropped: events }));
 });
-const debugErrorsHandler = factory.createHandlers(zValidator$1("query", z.object({
-	channel: z.string().optional(),
-	limit: z.string().optional(),
-	json: z.enum([
-		"true",
-		"false",
-		""
-	]).optional()
-}), debugErrorsHelp), async (c) => {
+const debugErrorsHandler = factory.createHandlers(zValidator$1("query", channelLimitQuery, debugErrorsHelp), async (c) => {
 	const query = c.req.valid("query");
-	const channels = c.env.funnel.channels.list();
-	const isJson = query.json === "true" || query.json === "";
+	const funnel = c.env.funnel;
 	const limit = query.limit ? Math.max(1, Number(query.limit)) : 20;
-	const store = resolveStoreOrNull();
-	if (!store) {
-		if (isJson) return c.json([]);
-		return c.text("no diagnostic store yet (start the gateway first)");
-	}
-	const resolvedErrors = resolveChannelId(channels, query.channel);
-	if (!resolvedErrors.found) {
-		if (resolvedErrors.reason === "not-found") {
-			if (isJson) return c.json({
-				error: `channel not found: ${resolvedErrors.name}`,
-				availableChannels: channels.map((ch) => ch.name)
-			});
-			return c.text(`channel not found: ${resolvedErrors.name}`);
-		}
-		if (resolvedErrors.reason === "ambiguous") {
-			if (isJson) return c.json({
-				error: "multiple channels — specify one with --channel",
-				channels: resolvedErrors.names
-			});
-			return c.text(`multiple channels — specify one with --channel:\n${resolvedErrors.names.map((n) => `  - ${n}`).join("\n")}`);
-		}
-		if (isJson) return c.json([]);
-		return c.text("no channels configured");
-	}
-	const channel = resolvedErrors.channel;
-	const reader = new ConnectorDiagnosticSqlReader(store);
-	const rows = channel ? queryRows(reader, "SELECT seq, ts, type, status, detail FROM connection WHERE channel_id = ? AND status IN ('auth-failed','error') ORDER BY seq DESC LIMIT ?", [channel.id, limit]) : queryRows(reader, "SELECT seq, ts, type, status, detail FROM connection WHERE status IN ('auth-failed','error') ORDER BY seq DESC LIMIT ?", [limit]);
-	if (rows instanceof Error) return c.text(`error: ${rows.message}`);
-	const errors = rows.reverse().map(toDebugConnectionError);
-	if (isJson) return c.json(errors);
-	if (errors.length === 0) return c.text("no connection errors recorded");
-	const lines = errors.map((ev) => {
-		return `${formatTs(ev.ts)}  ${ev.type.padEnd(8)}  ${ev.status.padEnd(16)}${ev.detail ? `  "${ev.detail}"` : ""}`;
-	});
-	return c.text(lines.join("\n"));
+	const resolved = resolveTargetChannel(c, query.channel);
+	if (resolved.kind === "error") return c.text(renderYaml(resolved.payload));
+	const errors = await funnel.diagnostics.connectionErrors(resolved.name, limit);
+	return c.text(renderYaml({ errors }));
 });
-const buildChannelReport = async (targetChannel, gatewayStatus, gatewayBodyOrNull, store, limit = 5) => {
-	const targetChannelName = targetChannel.name;
-	const baseReport = {
-		channel: targetChannelName,
-		channelId: targetChannel.id,
-		gateway: {
-			running: gatewayStatus.running,
-			pid: gatewayStatus.pid,
-			port: gatewayStatus.running ? gatewayStatus.port : null,
-			uptimeMs: gatewayBodyOrNull?.uptimeMs ?? null
-		},
-		listeners: [],
-		claudeClients: 0,
-		recentEvents: [],
-		connectionErrors: []
-	};
-	if (gatewayBodyOrNull) {
-		baseReport.listeners = gatewayBodyOrNull.listeners.filter((l) => l.channelName === targetChannelName).map((l) => ({
-			name: l.name,
-			type: l.type,
-			alive: l.alive,
-			events: l.events,
-			errors: l.errors,
-			lastEventAt: l.lastEventAt
-		}));
-		baseReport.claudeClients = gatewayBodyOrNull.clients.filter((cl) => cl.channelName === targetChannelName).length;
-	}
-	if (store) {
-		const evRows = queryRows(new ConnectorDiagnosticSqlReader(store), "SELECT seq, ts, type, outcome, payload FROM processed WHERE channel_id = ? ORDER BY seq DESC LIMIT ?", [targetChannel.id, limit]);
-		if (!(evRows instanceof Error)) baseReport.recentEvents = evRows.reverse().map(toDebugEvent);
-		const hasDeadListeners = baseReport.listeners.some((l) => !l.alive);
-		const hasListenerErrors = baseReport.listeners.some((l) => l.errors > 0);
-		if (hasDeadListeners || hasListenerErrors) {
-			const errRows = queryRows(new ConnectorDiagnosticSqlReader(store), "SELECT ts, type, status, detail FROM connection WHERE channel_id = ? AND status IN ('auth-failed','error') ORDER BY seq DESC LIMIT 3", [targetChannel.id]);
-			if (!(errRows instanceof Error)) baseReport.connectionErrors = errRows.reverse().map(toDebugConnectionError);
-		}
-	}
-	return {
-		...baseReport,
-		diagnosis: buildDiagnosis(baseReport)
-	};
-};
-const debugHandler = factory.createHandlers(zValidator$1("query", z.object({
+const debugReplayHandler = factory.createHandlers(zValidator$1("query", z.object({
 	channel: z.string().optional(),
-	all: z.enum([
-		"true",
-		"false",
-		""
-	]).optional(),
-	json: z.enum([
+	seq: z.string().optional()
+}), debugReplayHelp), async (c) => {
+	const query = c.req.valid("query");
+	const funnel = c.env.funnel;
+	const resolved = resolveTargetChannel(c, query.channel);
+	if (resolved.kind === "error") return c.text(renderYaml(resolved.payload));
+	if (!resolved.name) return c.text(renderYaml({ error: "no channels configured" }));
+	const seq = query.seq ? Number(query.seq) : void 0;
+	const result = await funnel.diagnostics.replay(resolved.name, seq);
+	return c.text(renderYaml(result));
+});
+const docsIndexHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel docs / embedded documentation
+
+usage / funnel docs [topic]
+
+with no topic, lists topics as YAML. with a topic, prints the doc text.
+
+output / valid YAML (topic listing) or plain text (topic body)
+
+programmable / funnel.docs.list() / funnel.docs.get(topic)
+
+examples:
+  funnel docs
+  funnel docs architecture
+  funnel docs debugging`), async (c) => {
+	const docs = c.env.funnel.docs;
+	return c.text(renderYaml({ topics: docs.list() }));
+});
+const docsTopicHandler = factory.createHandlers(zValidator$1("param", z.object({ topic: z.string() })), async (c) => {
+	const param = c.req.valid("param");
+	const docs = c.env.funnel.docs;
+	const text = docs.get(param.topic);
+	if (text === null) return c.text(renderYaml({
+		error: `unknown topic: ${param.topic}`,
+		availableTopics: docs.topics()
+	}));
+	return c.text(text);
+});
+const doctorHandler = factory.createHandlers(zValidator$1("query", z.object({
+	fix: z.enum([
 		"true",
 		"false",
 		""
 	]).optional(),
-	limit: z.string().optional()
-}), debugHelp), async (c) => {
-	const query = c.req.valid("query");
-	const funnel = c.env.funnel;
-	const channels = funnel.channels.list();
-	const gatewayStatus = funnel.gateway.getStatus();
-	const isJson = query.json === "true" || query.json === "";
-	const isAll = query.all === "true" || query.all === "";
-	const eventLimit = query.limit ? Math.max(1, Number(query.limit)) : 5;
-	if (channels.length === 0) {
-		if (isJson) return c.json({
-			error: "no channels configured",
-			nextAction: "fnl channels add <name>"
-		});
-		return c.text("no channels configured — run: fnl channels add <name>");
-	}
-	const token = funnel.gatewayToken.read();
-	const headers = token ? { Authorization: `Bearer ${token}` } : {};
-	let gatewayBodyOrNull = null;
-	if (gatewayStatus.running) {
-		const res = await fetch(`http://127.0.0.1:${gatewayStatus.port}/status`, { headers }).catch(() => null);
-		if (res && res.ok) {
-			const body = await res.json();
-			if (isGatewayStatusResponse(body)) gatewayBodyOrNull = body;
-		}
-	}
-	const store = resolveStoreOrNull();
-	if (isAll) {
-		const reports = await Promise.all(channels.map((ch) => buildChannelReport(ch, gatewayStatus, gatewayBodyOrNull, store, eventLimit)));
-		const errorChannels = reports.filter((r) => r.diagnosis.status === "error").map((r) => r.channel);
-		const warnChannels = reports.filter((r) => r.diagnosis.status === "warn").map((r) => r.channel);
-		const okChannels = reports.filter((r) => r.diagnosis.status === "ok").map((r) => r.channel);
-		const uniqueActions = [...new Set(reports.flatMap((r) => r.diagnosis.nextActions))];
-		return c.json({
-			summary: {
-				total: reports.length,
-				ok: okChannels.length,
-				warn: warnChannels.length,
-				error: errorChannels.length,
-				criticalChannels: errorChannels,
-				warnChannels,
-				suggestedActions: uniqueActions
-			},
-			channels: reports
-		});
-	}
-	let targetChannel = null;
-	if (query.channel) {
-		targetChannel = channels.find((ch) => ch.name === query.channel) ?? null;
-		if (!targetChannel) {
-			if (isJson) return c.json({
-				error: `channel not found: ${query.channel}`,
-				availableChannels: channels.map((ch) => ch.name)
-			});
-			return c.text(`channel not found: ${query.channel}`);
-		}
-	} else if (channels.length === 1 && channels[0]) targetChannel = channels[0];
-	else {
-		const names = channels.map((ch) => ch.name);
-		if (isJson) return c.json({
-			error: "multiple channels — specify one with --channel or use --all",
-			channels: names,
-			hint: "use --all for all channels at once"
-		});
-		return c.text(`multiple channels — specify one with --channel or use --all:\n${names.map((n) => `  - ${n}`).join("\n")}`);
-	}
-	const report = await buildChannelReport(targetChannel, gatewayStatus, gatewayBodyOrNull, store, eventLimit);
-	if (isJson) return c.json(report);
-	return c.text(renderText(report));
-});
-const debugReplayHandler = factory.createHandlers(zValidator$1("query", z.object({
-	channel: z.string().optional(),
-	seq: z.string().optional(),
-	json: z.enum([
+	aggressive: z.enum([
 		"true",
 		"false",
 		""
 	]).optional()
-}), `funnel debug replay — re-publish a past event into a channel
+}), `funnel doctor / diagnose every channel; --fix applies safe self-healing
 
-usage: funnel debug replay --channel <name> [--seq <N>] [--json]
+usage / funnel doctor [--fix] [--aggressive]
 
-options:
-  --channel <name>   channel to replay into (required when multiple channels exist)
-  --seq <N>          replay the event at this processed-table seq (default: most recent emitted)
-  --json             output result as JSON
+modes:
+  (default) / read-only diagnosis, safe to run anytime
+  --fix / start the gateway if down, restart dead listeners (idempotent)
+  --fix --aggressive / also restart the gateway when safe fixes do not return things to ok
 
-Re-sends a past event from the diagnostic store through the publisher path,
-so subscribers receive it again. Useful to verify that Claude handles an event
-correctly without waiting for a real external trigger.
+output / valid YAML, parseable by yq
 
-Gateway must be running. The event is injected via POST /channels/<name>/publish.
+programmable / await funnel.doctor.run() / await funnel.doctor.run("safe") / await funnel.doctor.run("aggressive")
 
 examples:
-  fnl debug replay --channel open-karte
-  fnl debug replay --channel open-karte --seq 412
-  fnl debug replay --channel open-karte --json`), async (c) => {
+  funnel doctor
+  funnel doctor --fix
+  funnel doctor --fix --aggressive`), async (c) => {
 	const query = c.req.valid("query");
-	const funnel = c.env.funnel;
-	const channels = funnel.channels.list();
-	const isJson = query.json === "true" || query.json === "";
-	const resolved = resolveChannelId(channels, query.channel);
-	if (!resolved.found) {
-		if (resolved.reason === "not-found") {
-			if (isJson) return c.json({
-				error: `channel not found: ${resolved.name}`,
-				availableChannels: channels.map((ch) => ch.name)
-			});
-			return c.text(`channel not found: ${resolved.name}`);
-		}
-		if (resolved.reason === "ambiguous") {
-			if (isJson) return c.json({
-				error: "multiple channels — specify one with --channel",
-				channels: resolved.names
-			});
-			return c.text(`multiple channels — specify one with --channel:\n${resolved.names.map((n) => `  - ${n}`).join("\n")}`);
-		}
-		if (isJson) return c.json({ error: "no channels configured" });
-		return c.text("no channels configured");
-	}
-	const targetChannel = resolved.channel;
-	const store = resolveStoreOrNull();
-	if (!store) {
-		if (isJson) return c.json({ error: "no diagnostic store yet (start the gateway first)" });
-		return c.text("no diagnostic store yet (start the gateway first)");
-	}
-	const rows = query.seq ? queryRows(new ConnectorDiagnosticSqlReader(store), "SELECT seq, event_id, type, payload, connector_id, channel_id FROM processed WHERE channel_id = ? AND seq = ? LIMIT 1", [targetChannel.id, Number(query.seq)]) : queryRows(new ConnectorDiagnosticSqlReader(store), "SELECT seq, event_id, type, payload, connector_id, channel_id FROM processed WHERE channel_id = ? AND outcome LIKE 'emitted%' ORDER BY seq DESC LIMIT 1", [targetChannel.id]);
-	if (rows instanceof Error) {
-		if (isJson) return c.json({ error: rows.message });
-		return c.text(`error: ${rows.message}`);
-	}
-	const firstRow = rows[0];
-	if (!firstRow) {
-		if (isJson) return c.json({ error: "no matching event found" });
-		return c.text("no matching event found");
-	}
-	const seq = typeof firstRow.seq === "number" ? firstRow.seq : null;
-	const eventId = typeof firstRow.event_id === "string" ? firstRow.event_id : null;
-	const connectorId = typeof firstRow.connector_id === "string" ? firstRow.connector_id : null;
-	let content = typeof firstRow.payload === "string" ? firstRow.payload : null;
-	if ((!content || content.length === 0) && eventId) {
-		const rawRows = queryRows(new ConnectorDiagnosticSqlReader(store), "SELECT payload FROM raw WHERE event_id = ? LIMIT 1", [eventId]);
-		const rawRow = rawRows instanceof Error ? null : rawRows[0];
-		if (rawRow) content = typeof rawRow.payload === "string" ? rawRow.payload : null;
-	}
-	if (!content) {
-		if (isJson) return c.json({ error: "event has no payload to replay" });
-		return c.text("event has no payload to replay");
-	}
-	const connectorName = connectorOf(targetChannel, connectorId);
-	const result = await funnel.publisher.publish(targetChannel.name, {
-		content,
-		connector: connectorName
-	});
-	if (result.state === "offline") {
-		if (isJson) return c.json({
-			error: "gateway daemon is not running",
-			nextAction: "fnl gateway start"
-		});
-		return c.text("error: gateway daemon is not running — run: fnl gateway start");
-	}
-	if (result.state === "error") {
-		if (isJson) return c.json({ error: result.reason });
-		return c.text(`error: ${result.reason}`);
-	}
-	const preview = previewOf(content);
-	if (isJson) return c.json({
-		replayed: true,
-		seq,
-		offset: result.offset,
-		preview
-	});
-	return c.text(`replayed seq=${seq ?? "?"} → offset=${result.offset}${preview ? `  "${preview}"` : ""}`);
+	const wantsFix = query.fix === "true" || query.fix === "";
+	const wantsAggressive = query.aggressive === "true" || query.aggressive === "";
+	const mode = wantsFix ? wantsAggressive ? "aggressive" : "safe" : "off";
+	const report = await c.env.funnel.doctor.run(mode);
+	return c.text(renderYaml(report));
 });
 //#endregion
 //#region lib/cli/routes/gateway.ts
-const groupHelp$1 = `funnel gateway — manage the funnel daemon
+const groupHelp$1 = `funnel gateway / manage the funnel daemon
 
 The gateway daemon hosts the WebSocket /ws (used by Claude MCP) and the
 listener supervisor that runs every connector. One daemon, one port (9743
 for the CLI, 9742 for programmatic use), one PID file.
 
-usage: funnel gateway [subcommand]
+usage / funnel gateway [subcommand]
 
 subcommands:
-  status              show running status (default)
-  start               start in background
-  stop                stop
-  restart             stop then start
-  run                 start in foreground (for developers)
-  logs [-n <N>]       tail the daemon diagnostic log (lifecycle, listener boot)
-  sql                 query inbound connector traffic (raw + processed verdict)
-  listeners           list running connector listeners (alive / dead)
+  status / show running status (default)
+  start / start in background
+  stop / stop
+  restart / stop then start
+  run / start in foreground (for developers)
+  logs [-n <N>] / tail the daemon diagnostic log
+  sql / query inbound connector traffic
+  listeners / list running connector listeners
 
-examples:
-  funnel gateway                    check status
-  funnel gateway restart            restart after config changes
-  funnel gateway logs               stream the daemon log
-  funnel gateway sql --preset recent  inspect last 20 inbound events
+output / valid YAML
+
+see also / fnl doctor --fix (one command does diagnose + restart) / fnl debug --channel <name> (per-channel inspection)
 
-see also: fnl debug --channel <name>  (higher-level diagnosis with next-action hints)`;
+programmable / funnel.gateway.start() / .stop() / .restart() / .getStatus() / funnel.doctor.run("safe")
+
+examples:
+  funnel gateway
+  funnel gateway restart
+  funnel gateway logs
+  funnel gateway sql --preset recent`;
 const renderGatewayStatus = async (c) => {
 	const status = c.env.funnel.gateway.getStatus();
-	if (!status.running) throw new HTTPException(503, { message: "funnel gateway: not running" });
+	if (!status.running) return c.text(renderYaml({ running: false }), 503);
 	const res = await fetch(`http://127.0.0.1:${status.port}/status`).catch(() => null);
-	if (!res) return c.text(`funnel gateway: running (pid ${status.pid}) — health check failed`);
+	if (!res) return c.text(renderYaml({
+		running: true,
+		pid: status.pid,
+		port: status.port,
+		error: "health check failed"
+	}));
 	const data = await res.json();
-	const lines = [];
-	lines.push(`funnel gateway: running (pid ${data.pid})`);
-	lines.push(`  port:   ${status.port}`);
-	const uptimeSec = Math.floor(data.uptimeMs / 1e3);
-	const uptimeMin = Math.floor(uptimeSec / 60);
-	const uptimeStr = uptimeMin >= 60 ? `${Math.floor(uptimeMin / 60)}h ${uptimeMin % 60}m` : uptimeSec >= 60 ? `${uptimeMin}m ${uptimeSec % 60}s` : `${uptimeSec}s`;
-	lines.push(`  uptime: ${uptimeStr}`);
-	lines.push(`  events: ${data.broadcaster.eventsBroadcast} broadcast`);
-	if (data.listeners.length === 0) lines.push(`  listeners: none`);
-	else {
-		lines.push(`  listeners:`);
-		for (const l of data.listeners) {
-			const indicator = l.alive ? "●" : "○";
-			const eventsStr = l.events > 0 ? ` (${l.events} events)` : "";
-			const errStr = l.errors > 0 ? ` ⚠ ${l.errors} errors` : "";
-			lines.push(`    ${indicator} ${l.channelName}/${l.name} [${l.type}]${eventsStr}${errStr}`);
-		}
-	}
-	if (data.clients.length === 0) lines.push(`  clients: none`);
-	else {
-		lines.push(`  clients: ${data.clients.length}`);
-		for (const cl of data.clients) {
-			const connectors = cl.connectors.length > 0 ? ` → ${cl.connectors.join(", ")}` : "";
-			lines.push(`    · ${cl.channel}${connectors}`);
-		}
-	}
-	return c.text(lines.join("\n"));
+	return c.text(renderYaml({
+		running: true,
+		pid: data.pid,
+		port: status.port,
+		uptimeMs: data.uptimeMs,
+		events: data.broadcaster.eventsBroadcast,
+		listeners: data.listeners.map((l) => ({
+			channel: l.channelName,
+			name: l.name,
+			type: l.type,
+			alive: l.alive,
+			events: l.events,
+			errors: l.errors,
+			lastEventAt: l.lastEventAt
+		})),
+		clients: data.clients.map((cl) => ({
+			channel: cl.channel,
+			connectors: cl.connectors
+		}))
+	}));
 };
 const gatewayGroupHandler = factory.createHandlers(zValidator$1("query", z.object({}), groupHelp$1), renderGatewayStatus);
-const gatewayListenersHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel gateway listeners — show running connector listeners
+const gatewayListenersHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel gateway listeners / show running connector listeners
 
-usage: funnel gateway listeners
+usage / funnel gateway listeners
 
-Reads /listeners from the running gateway daemon and prints the live registry.
+output / valid YAML
 
-examples:
-  funnel gateway listeners`), async (c) => {
+programmable / funnel.listeners.list() / funnel.recovery.restartAllDeadListeners()`), async (c) => {
 	const result = await c.env.funnel.listeners.list();
 	if (result.state === "offline") throw new HTTPException(503, { message: "funnel gateway: not running" });
 	if (result.state === "error") throw new HTTPException(503, { message: `funnel gateway: ${result.reason}` });
-	if (result.listeners.length === 0) return c.text("funnel gateway: no running listeners");
-	const lines = result.listeners.map((entry) => {
-		return `  [${(entry.alive ? "alive" : "dead").padEnd(5)}] ${entry.type.padEnd(8)} ${entry.name}`;
-	});
-	return c.text(`funnel gateway: running listeners\n${lines.join("\n")}`);
+	return c.text(renderYaml({ listeners: result.listeners }));
 });
 //#endregion
 //#region lib/cli/routes/gateway.logs.ts
@@ -2840,7 +2381,10 @@ examples:
   funnel gateway logs -n 100
   funnel gateway logs --format json | jq 'select(.level == "error")'
 
-see also: fnl debug, fnl gateway sql`;
+see also: fnl debug, fnl gateway sql
+
+programmable: this command tails a file directly. For structured introspection,
+              prefer funnel.diagnostics.diagnoseAll() / .recentEvents() in code.`;
 const logger = new NodeFunnelLogger();
 const tryParseJson = (line) => {
 	try {
@@ -2924,6 +2468,13 @@ const PRESETS = {
 	summary: "SELECT outcome, COUNT(*) AS count FROM processed GROUP BY outcome ORDER BY count DESC",
 	"trace-dedup": "SELECT r.seq, r.ts, r.event_id, r.payload FROM raw r JOIN processed p USING(event_id) WHERE p.outcome='skip:dedup' ORDER BY r.seq DESC LIMIT 20"
 };
+const PRESETS_BY_CHANNEL = {
+	recent: "SELECT seq, ts, type, outcome FROM processed WHERE channel_id = ? ORDER BY seq DESC LIMIT 20",
+	skipped: "SELECT seq, ts, type, outcome, payload FROM processed WHERE channel_id = ? AND outcome LIKE 'skip:%' ORDER BY seq DESC LIMIT 20",
+	errors: "SELECT ts, status, detail FROM connection WHERE channel_id = ? AND status IN ('auth-failed','error') ORDER BY seq DESC LIMIT 20",
+	summary: "SELECT outcome, COUNT(*) AS count FROM processed WHERE channel_id = ? GROUP BY outcome ORDER BY count DESC",
+	"trace-dedup": "SELECT r.seq, r.ts, r.event_id, r.payload FROM raw r JOIN processed p USING(event_id) WHERE r.channel_id = ? AND p.outcome='skip:dedup' ORDER BY r.seq DESC LIMIT 20"
+};
 const sqlHelp = `funnel gateway sql — query inbound connector traffic with SQL
 
 usage: funnel gateway sql --preset <name> [--channel <name|id>] [--limit <N>]
@@ -2963,7 +2514,12 @@ examples:
 
 tip: for a higher-level view without writing SQL, use: fnl debug --channel <name> --json
 
-see also: fnl debug, fnl gateway logs`;
+see also: fnl debug, fnl gateway logs
+
+programmable: const reader = new ConnectorDiagnosticSqlReader({ rawPath, processedPath, connectionPath })
+              reader.query("SELECT …")
+              — but for most cases, funnel.diagnostics.recentEvents() / .droppedEvents()
+              / .connectionErrors() are higher level and don't need SQL.`;
 const gatewaySqlHandler = factory.createHandlers(zValidator$1("query", z.object({
 	query: z.string().optional(),
 	preset: z.enum(Object.keys(PRESETS)).optional(),
@@ -2977,17 +2533,15 @@ const gatewaySqlHandler = factory.createHandlers(zValidator$1("query", z.object(
 	let resolvedChannelId = null;
 	if (query.channel) resolvedChannelId = funnel.channels.list().find((ch) => ch.id === query.channel || ch.name === query.channel)?.id ?? query.channel;
 	if (query.preset) {
-		const base = PRESETS[query.preset] ?? null;
+		const base = resolvedChannelId ? PRESETS_BY_CHANNEL[query.preset] ?? null : PRESETS[query.preset] ?? null;
 		if (!base) return c.text(sqlHelp);
 		let applied = base;
 		if (query.limit) {
 			const n = Math.max(1, Number(query.limit));
 			applied = applied.replace(/LIMIT \d+/, `LIMIT ${n}`);
 		}
-		if (resolvedChannelId) {
-			sql = applied.replace(/FROM (raw|processed|connection)\b/, "FROM $1 WHERE channel_id = ?");
-			params = [resolvedChannelId];
-		} else sql = applied;
+		sql = applied;
+		params = resolvedChannelId ? [resolvedChannelId] : [];
 	} else if (query.query) sql = query.query;
 	if (!sql) return c.text(sqlHelp);
 	const tmpDir = funnelTmpDir();
@@ -3007,8 +2561,8 @@ const gatewaySqlHandler = factory.createHandlers(zValidator$1("query", z.object(
 			reader.close();
 		}
 	})();
-	if (rows instanceof Error) return c.text(`error: ${rows.message}`);
-	return c.text(JSON.stringify(rows, null, 2));
+	if (rows instanceof Error) return c.text(renderYaml({ error: rows.message }));
+	return c.text(renderYaml({ rows }));
 });
 const gatewayRestartHandler = factory.createHandlers(zValidator$1("query", z.object({ "no-caffeine": z.string().optional() }), `funnel gateway restart — restart the gateway
 
@@ -3019,7 +2573,10 @@ On macOS wraps with caffeinate -is by default. Use --no-caffeine to disable.
 
 examples:
   funnel gateway restart
-  funnel gateway restart --no-caffeine`), async (c) => {
+  funnel gateway restart --no-caffeine
+
+programmable: funnel.gateway.restart({ caffeinate })
+              funnel.recovery.restartGateway()`), async (c) => {
 	const query = c.req.valid("query");
 	const result = await c.env.funnel.gateway.restart({ caffeinate: query["no-caffeine"] !== "true" });
 	const lines = [];
@@ -3040,7 +2597,9 @@ For normal usage prefer funnel gateway start.
 
 examples:
   funnel gateway run
-  funnel gateway run --no-caffeine`), async (c) => {
+  funnel gateway run --no-caffeine
+
+programmable: funnel.runGatewayForeground({ caffeinate })`), async (c) => {
 	const query = c.req.valid("query");
 	const exitCode = await c.env.funnel.runGatewayForeground({ caffeinate: query["no-caffeine"] !== "true" });
 	process.exit(exitCode);
@@ -3061,7 +2620,9 @@ log:  ${join(funnelTmpDir(), "gateway.log")}
 
 examples:
   funnel gateway start
-  funnel gateway start --no-caffeine`;
+  funnel gateway start --no-caffeine
+
+programmable: funnel.gateway.start({ caffeinate })`;
 const gatewayStartHandler = factory.createHandlers(zValidator$1("query", z.object({ "no-caffeine": z.string().optional() }), startHelp), async (c) => {
 	const query = c.req.valid("query");
 	const funnel = c.env.funnel;
@@ -3072,41 +2633,13 @@ const gatewayStartHandler = factory.createHandlers(zValidator$1("query", z.objec
 	if (!await funnel.gateway.start({ caffeinate: query["no-caffeine"] !== "true" })) throw new HTTPException(500, { message: "funnel gateway: failed to start" });
 	return c.text("funnel gateway: started");
 });
-const gatewayStatusHandler = factory.createHandlers(zValidator$1("query", z.object({ json: z.enum([
-	"true",
-	"false",
-	""
-]).optional() }), `funnel gateway status — show gateway running status
+const gatewayStatusHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel gateway status / show gateway running status
 
-usage: funnel gateway status [--json]
-
-options:
-  --json   output as JSON
+usage / funnel gateway status
 
-When running, prints PID, port, uptime, listeners (alive/dead), and WS clients.
-When not running, exits with 503.
+output / valid YAML
 
-examples:
-  funnel gateway status
-  funnel gateway status --json`), async (c) => {
-	const query = c.req.valid("query");
-	if (!(query.json === "true" || query.json === "")) return renderGatewayStatus(c);
-	const status = c.env.funnel.gateway.getStatus();
-	if (!status.running) throw new HTTPException(503, { message: "funnel gateway: not running" });
-	const res = await fetch(`http://127.0.0.1:${status.port}/status`).catch(() => null);
-	if (!res) return c.json({
-		running: true,
-		pid: status.pid,
-		port: status.port,
-		error: "health check failed"
-	});
-	const data = await res.json();
-	return c.json({
-		running: true,
-		port: status.port,
-		...data
-	});
-});
+programmable / funnel.gateway.getStatus()`), async (c) => renderGatewayStatus(c));
 const gatewayStopHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel gateway stop — stop the gateway
 
 usage: funnel gateway stop
@@ -3322,39 +2855,42 @@ const profilesSetHandler = factory.createHandlers(zValidator$1("param", z.object
 	});
 	return c.text(`updated profile "${param.profile}"`);
 });
-const profilesGroupHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel profiles — manage launch profiles
+const profilesGroupHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel profiles / manage launch profiles
 
-usage: funnel profiles [subcommand]
+usage / funnel profiles [subcommand]
 
 subcommands:
-  (none)                          list (first entry is the default)
+  (none) / list (first entry is the default)
   add <name> --path <path> --channel <channel> [--agent ...] [--options ...] [--env ...] [--no-resume]
   <name> set [--path ...] [--channel ...] [--agent ...] [--options ...] [--env ...] [--resume|--no-resume]
-  <name> as-default               move profile to the front (becomes default)
-  rename <old> <new>              rename
-  remove <name>                   remove
-  <name> run                      launch (sugar for fnl claude -p <name>)
-  <name>                          launch (alias for run)
+  <name> as-default / move profile to the front
+  rename <old> <new> / rename
+  remove <name> / remove
+  <name> run / launch (sugar for fnl claude -p <name>)
+  <name> / launch (alias for run)
 
-A profile carries the launch recipe — \`--agent\` / \`--options\` prepended to
-the claude argv, \`--env\` layered under the process, \`--resume\` toggling
-session reuse. The channel it points at only declares transport (connectors).
+A profile carries the launch recipe — --agent / --options prepended to the
+claude argv, --env layered under the process, --resume toggling session
+reuse. The channel it points at only declares transport (connectors).
+
+output / valid YAML
+
+programmable / funnel.profiles.list() / .add() / .remove() / .rename() / .setDefault()
 
 examples:
   funnel profiles add cto --path /repo/myapp --channel prod-inbox --agent pm --options "--brief"
   funnel profiles cto as-default
   funnel profiles cto run`), (c) => {
-	c.env.funnel;
 	const { profiles } = c.env;
 	const profileList = profiles.list();
-	if (profileList.length === 0) return c.text("no profiles");
-	const lines = profileList.map((profile, index) => {
-		const tag = index === 0 ? " (default)" : "";
-		const recipe = profile.options.length > 0 ? `, options=${profile.options.join(" ")}` : "";
-		const session = profile.resume ? "" : ", resume=false";
-		return `${profile.name}${tag}  [path=${profile.path}, channel=${profile.channelId}${recipe}${session}]`;
-	});
-	return c.text(lines.join("\n"));
+	return c.text(renderYaml({ profiles: profileList.map((profile, index) => ({
+		name: profile.name,
+		default: index === 0,
+		path: profile.path,
+		channelId: profile.channelId,
+		options: profile.options,
+		resume: profile.resume
+	})) }));
 });
 const schemaHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel schema — print the JSON Schema for funnel.json
 
@@ -3370,60 +2906,51 @@ can validate and autocomplete the config:
   {
     "$schema": "./funnel.schema.json",
     "channel": "ops"
-  }`), async (c) => {
+  }
+
+programmable: import { funnelJsonSchema } from "@interactive-inc/claude-funnel/local-config"
+              funnelJsonSchema()  // returns the same object as the CLI prints`), async (c) => {
 	const schema = funnelJsonSchema();
 	return c.text(`${JSON.stringify(schema, null, 2)}\n`);
 });
 //#endregion
 //#region lib/cli/routes/status.ts
-const statusHelp = `funnel status — overall health at a glance
+const statusHelp = `funnel status / overall health snapshot
 
-usage: funnel status [--watch] [--interval <N>]
+usage / funnel status [--watch] [--interval <N>]
 
 options:
-  --watch               continuously refresh (Ctrl+C to stop)
-  --interval <N>        polling interval in seconds (used with --watch, default: 3)
+  --watch / continuously refresh (Ctrl+C to stop)
+  --interval <N> / polling interval in seconds (default 3)
+
+output / valid YAML
 
-Shows gateway running state (pid, port, uptime), per-channel listener health
-(● alive / ○ dead), and whether Claude is connected to each channel as a
-WebSocket client. Use this as the first step when debugging missing events.
+For a richer diagnosis with rootCause + nextActions, prefer fnl doctor.
+
+programmable / funnel.gateway.getStatus() / funnel.doctor.run()
 
 examples:
   funnel status
   funnel status --watch
-  funnel status --watch --interval 5
-
-see also: fnl debug --channel <name>  (per-channel diagnosis with next steps)`;
+  funnel status --watch --interval 5`;
 const isGatewayStatus = (value) => {
 	if (value === null || typeof value !== "object") return false;
 	if (!("clients" in value) || !Array.isArray(value.clients)) return false;
 	if (!("listeners" in value) || !Array.isArray(value.listeners)) return false;
 	return true;
 };
-const buildStatusLines = async (funnel, profiles) => {
+const buildStatusReport = async (funnel, profiles) => {
 	const channels = funnel.channels.list();
 	const profileList = profiles.list();
 	const gatewayStatus = funnel.gateway.getStatus();
-	const lines = [];
-	lines.push("= funnel status =");
-	lines.push("");
 	let gatewayData = null;
-	if (!gatewayStatus.running) lines.push("gateway: not running");
-	else {
+	if (gatewayStatus.running) {
 		const res = await fetch(`http://127.0.0.1:${gatewayStatus.port}/status`).catch(() => null);
-		let uptimeStr = "";
 		if (res && res.ok) {
 			const body = await res.json();
-			if (isGatewayStatus(body)) {
-				gatewayData = body;
-				const uptimeSec = Math.floor(body.uptimeMs / 1e3);
-				const uptimeMin = Math.floor(uptimeSec / 60);
-				uptimeStr = uptimeMin >= 60 ? ` · ${Math.floor(uptimeMin / 60)}h ${uptimeMin % 60}m` : uptimeSec >= 60 ? ` · ${uptimeMin}m ${uptimeSec % 60}s` : ` · ${uptimeSec}s`;
-			}
+			if (isGatewayStatus(body)) gatewayData = body;
 		}
-		lines.push(`gateway: running (pid ${gatewayStatus.pid}, port ${gatewayStatus.port})${uptimeStr}`);
 	}
-	lines.push("");
 	const clientsByChannel = /* @__PURE__ */ new Map();
 	const listenerAliveByChannel = /* @__PURE__ */ new Map();
 	if (gatewayData) {
@@ -3436,26 +2963,33 @@ const buildStatusLines = async (funnel, profiles) => {
 			listenerAliveByChannel.set(listener.channelName, current === void 0 ? listener.alive : current && listener.alive);
 		}
 	}
-	const maxNameLen = Math.max(...channels.map((ch) => ch.name.length), 0);
-	lines.push(`channels: ${channels.length}`);
-	for (const ch of channels) {
-		const connectorLabel = ch.connectors.length > 0 ? ch.connectors.map((conn) => conn.type).join(", ") : "no connectors";
-		const isAlive = listenerAliveByChannel.get(ch.name);
-		const indicator = gatewayData === null ? "-" : isAlive === true ? "●" : isAlive === false ? "○" : "-";
-		const claudeCount = clientsByChannel.get(ch.name) ?? 0;
-		const claudeLabel = gatewayData === null ? "" : claudeCount === 0 ? "  no Claude" : claudeCount === 1 ? "  Claude connected (1 client)" : `  Claude connected (${claudeCount} clients)`;
-		const paddedName = ch.name.padEnd(maxNameLen);
-		lines.push(`  ${indicator} ${paddedName}  [${connectorLabel}]${claudeLabel}`);
-	}
-	lines.push("");
-	lines.push(`profiles: ${profileList.length}`);
-	for (const [index, profile] of profileList.entries()) {
-		const tag = index === 0 ? " (default)" : "";
-		const channel = funnel.channels.getById(profile.channelId);
-		const channelLabel = channel ? channel.name : `id:${profile.channelId}`;
-		lines.push(`  - ${profile.name}${tag} [path=${profile.path}, channel=${channelLabel}]`);
-	}
-	return lines;
+	return {
+		gateway: gatewayStatus.running ? {
+			running: true,
+			pid: gatewayStatus.pid,
+			port: gatewayStatus.port,
+			uptimeMs: gatewayData?.uptimeMs ?? null
+		} : { running: false },
+		channels: channels.map((ch) => ({
+			name: ch.name,
+			connectors: ch.connectors.map((conn) => ({
+				name: conn.name,
+				type: conn.type
+			})),
+			listenerAlive: gatewayData === null ? null : listenerAliveByChannel.get(ch.name) ?? null,
+			claudeClients: clientsByChannel.get(ch.name) ?? 0
+		})),
+		profiles: profileList.map((profile, index) => {
+			const channel = funnel.channels.getById(profile.channelId);
+			return {
+				name: profile.name,
+				default: index === 0,
+				path: profile.path,
+				channel: channel ? channel.name : null,
+				channelId: channel ? void 0 : profile.channelId
+			};
+		})
+	};
 };
 const statusHandler = factory.createHandlers(zValidator$1("query", z.object({
 	watch: z.enum([
@@ -3470,15 +3004,14 @@ const statusHandler = factory.createHandlers(zValidator$1("query", z.object({
 	const isWatch = query.watch === "true" || query.watch === "";
 	const intervalSec = Math.min(60, Math.max(1, query.interval ? Number(query.interval) : 3));
 	if (!isWatch) {
-		const lines = await buildStatusLines(funnel, c.env.profiles);
-		return c.text(lines.join("\n"));
+		const report = await buildStatusReport(funnel, c.env.profiles);
+		return c.text(renderYaml(report));
 	}
 	const render = async () => {
-		const lines = await buildStatusLines(funnel, c.env.profiles);
-		const ts = (/* @__PURE__ */ new Date()).toISOString().slice(11, 19);
+		const report = await buildStatusReport(funnel, c.env.profiles);
 		process.stdout.write("\x1B[2J\x1B[H");
-		process.stdout.write(lines.join("\n"));
-		process.stdout.write(`\n\n  refreshing every ${intervalSec}s · ${ts} · Ctrl+C to stop\n`);
+		process.stdout.write(renderYaml(report));
+		process.stdout.write(`\n# refreshing every ${intervalSec}s; Ctrl+C to stop\n`);
 	};
 	process.on("SIGINT", () => {
 		process.stdout.write("\n");
@@ -3497,7 +3030,10 @@ const updateHelp = `funnel update — update funnel to the latest version
 
 usage: funnel update
 
-Runs "bun i -g @interactive-inc/claude-funnel".`;
+Runs "bun i -g @interactive-inc/claude-funnel".
+
+This command has no programmable equivalent — package management belongs to
+the host (npm / bun / yarn install in the host's own way).`;
 const PACKAGE = "@interactive-inc/claude-funnel";
 const updateHandler = factory.createHandlers(zValidator$1("query", z.object({}), updateHelp), async (c) => {
 	const exitCode = await new NodeFunnelProcessRunner().attach([
@@ -3512,8 +3048,8 @@ const updateHandler = factory.createHandlers(zValidator$1("query", z.object({}),
 //#endregion
 //#region lib/cli/routes/index.ts
 const routes = factory.createApp().onError((error, c) => {
-	if (error instanceof HTTPException) return c.text(`error: ${error.message}`, error.status);
+	if (error instanceof HTTPException) return c.text(error.message, error.status);
 	return c.text(`error: ${error instanceof Error ? error.message : String(error)}`, 400);
-}).get("/claude", ...claudeHandler).get("/channels", ...channelsGroupHandler).post("/channels/add", ...channelsAddHelpHandler).post("/channels/add/:channel", ...channelsAddHandler).post("/channels/remove", ...channelsRemoveHelpHandler).post("/channels/remove/:channel", ...channelsRemoveHandler).post("/channels/rename/:channel/:newName", ...channelsRenameHandler).post("/channels/:channel/rename/:newName", ...channelsRenameHandler).post("/channels/rename", ...channelsRenameHelpHandler).post("/channels/:channel/rename", ...channelsChannelRenameHelpHandler).post("/channels/:channel/set/delivery/:mode", ...channelsSetDeliveryHandler).post("/channels/publish", ...channelsPublishHelpHandler).post("/channels/:channel/publish", ...channelsPublishHandler).get("/channels/:channel/validate", ...channelsValidateHandler).get("/channels/validate", ...channelsValidateHelpHandler).get("/channels/:channel", ...channelsShowHandler).get("/channels/:channel/connectors", ...channelsConnectorsGroupHandler).post("/channels/:channel/connectors/add", ...channelsConnectorsAddHelpHandler).post("/channels/:channel/connectors/add/:connector", ...channelsConnectorsAddHandler).post("/channels/:channel/connectors/remove", ...channelsConnectorsRemoveHelpHandler).post("/channels/:channel/connectors/remove/:connector", ...channelsConnectorsRemoveHandler).post("/channels/:channel/connectors/set", ...channelsConnectorsSetHelpHandler).post("/channels/:channel/connectors/set/:connector", ...channelsConnectorsSetHandler).post("/channels/:channel/connectors/rename/:connector/:newName", ...channelsConnectorsRenameHandler).post("/channels/:channel/connectors/:connector/rename/:newName", ...channelsConnectorsRenameHandler).post("/channels/:channel/connectors/rename", ...channelsConnectorsRenameHelpHandler).post("/channels/:channel/connectors/:connector/rename", ...channelsConnectorRenameHelpHandler).post("/channels/:channel/connectors/:connector/request", ...channelsConnectorsRequestHandler).get("/channels/:channel/connectors/:connector", ...channelsConnectorsShowHandler).get("/channels/:channel/connectors/:connector/schedules", ...channelsConnectorsSchedulesGroupHandler).post("/channels/:channel/connectors/:connector/schedules/add", ...channelsConnectorSchedulesAddHelpHandler).post("/channels/:channel/connectors/:connector/schedules/add/:id", ...channelsConnectorsSchedulesAddHandler).post("/channels/:channel/connectors/:connector/schedules/remove", ...channelsConnectorSchedulesRemoveHelpHandler).post("/channels/:channel/connectors/:connector/schedules/remove/:id", ...channelsConnectorsSchedulesRemoveHandler).get("/profiles", ...profilesGroupHandler).post("/profiles/add", ...profilesAddHelpHandler).post("/profiles/add/:profile", ...profilesAddHandler).post("/profiles/set", ...profilesSetHelpHandler).post("/profiles/set/:profile", ...profilesSetHandler).post("/profiles/remove", ...profilesRemoveHelpHandler).post("/profiles/remove/:profile", ...profilesRemoveHandler).post("/profiles/rename/:profile/:newName", ...profilesRenameHandler).post("/profiles/:profile/rename/:newName", ...profilesRenameHandler).post("/profiles/rename", ...profilesRenameHelpHandler).post("/profiles/:profile/rename", ...profilesProfileRenameHelpHandler).post("/profiles/:profile/as-default", ...profilesAsDefaultHandler).get("/profiles/:profile/run", ...profilesLaunchHandler).get("/profiles/:profile", ...profilesLaunchHandler).get("/gateway", ...gatewayGroupHandler).get("/gateway/status", ...gatewayStatusHandler).get("/gateway/start", ...gatewayStartHandler).get("/gateway/stop", ...gatewayStopHandler).get("/gateway/restart", ...gatewayRestartHandler).get("/gateway/run", ...gatewayRunHandler).get("/gateway/logs", ...gatewayLogsHandler).get("/gateway/sql", ...gatewaySqlHandler).get("/gateway/listeners", ...gatewayListenersHandler).get("/debug", ...debugHandler).get("/debug/events", ...debugEventsHandler).get("/debug/dropped", ...debugDroppedHandler).get("/debug/errors", ...debugErrorsHandler).get("/debug/replay", ...debugReplayHandler).get("/schema", ...schemaHandler).get("/status", ...statusHandler).get("/update", ...updateHandler);
+}).get("/claude", ...claudeHandler).get("/channels", ...channelsGroupHandler).post("/channels/add", ...channelsAddHelpHandler).post("/channels/add/:channel", ...channelsAddHandler).post("/channels/remove", ...channelsRemoveHelpHandler).post("/channels/remove/:channel", ...channelsRemoveHandler).post("/channels/rename/:channel/:newName", ...channelsRenameHandler).post("/channels/:channel/rename/:newName", ...channelsRenameHandler).post("/channels/rename", ...channelsRenameHelpHandler).post("/channels/:channel/rename", ...channelsChannelRenameHelpHandler).post("/channels/:channel/set/delivery/:mode", ...channelsSetDeliveryHandler).post("/channels/publish", ...channelsPublishHelpHandler).post("/channels/:channel/publish", ...channelsPublishHandler).get("/channels/:channel/validate", ...channelsValidateHandler).get("/channels/validate", ...channelsValidateHelpHandler).get("/channels/:channel", ...channelsShowHandler).get("/channels/:channel/connectors", ...channelsConnectorsGroupHandler).post("/channels/:channel/connectors/add", ...channelsConnectorsAddHelpHandler).post("/channels/:channel/connectors/add/:connector", ...channelsConnectorsAddHandler).post("/channels/:channel/connectors/remove", ...channelsConnectorsRemoveHelpHandler).post("/channels/:channel/connectors/remove/:connector", ...channelsConnectorsRemoveHandler).post("/channels/:channel/connectors/set", ...channelsConnectorsSetHelpHandler).post("/channels/:channel/connectors/set/:connector", ...channelsConnectorsSetHandler).post("/channels/:channel/connectors/rename/:connector/:newName", ...channelsConnectorsRenameHandler).post("/channels/:channel/connectors/:connector/rename/:newName", ...channelsConnectorsRenameHandler).post("/channels/:channel/connectors/rename", ...channelsConnectorsRenameHelpHandler).post("/channels/:channel/connectors/:connector/rename", ...channelsConnectorRenameHelpHandler).post("/channels/:channel/connectors/:connector/request", ...channelsConnectorsRequestHandler).get("/channels/:channel/connectors/:connector", ...channelsConnectorsShowHandler).get("/channels/:channel/connectors/:connector/schedules", ...channelsConnectorsSchedulesGroupHandler).post("/channels/:channel/connectors/:connector/schedules/add", ...channelsConnectorSchedulesAddHelpHandler).post("/channels/:channel/connectors/:connector/schedules/add/:id", ...channelsConnectorsSchedulesAddHandler).post("/channels/:channel/connectors/:connector/schedules/remove", ...channelsConnectorSchedulesRemoveHelpHandler).post("/channels/:channel/connectors/:connector/schedules/remove/:id", ...channelsConnectorsSchedulesRemoveHandler).get("/profiles", ...profilesGroupHandler).post("/profiles/add", ...profilesAddHelpHandler).post("/profiles/add/:profile", ...profilesAddHandler).post("/profiles/set", ...profilesSetHelpHandler).post("/profiles/set/:profile", ...profilesSetHandler).post("/profiles/remove", ...profilesRemoveHelpHandler).post("/profiles/remove/:profile", ...profilesRemoveHandler).post("/profiles/rename/:profile/:newName", ...profilesRenameHandler).post("/profiles/:profile/rename/:newName", ...profilesRenameHandler).post("/profiles/rename", ...profilesRenameHelpHandler).post("/profiles/:profile/rename", ...profilesProfileRenameHelpHandler).post("/profiles/:profile/as-default", ...profilesAsDefaultHandler).get("/profiles/:profile/run", ...profilesLaunchHandler).get("/profiles/:profile", ...profilesLaunchHandler).get("/gateway", ...gatewayGroupHandler).get("/gateway/status", ...gatewayStatusHandler).get("/gateway/start", ...gatewayStartHandler).get("/gateway/stop", ...gatewayStopHandler).get("/gateway/restart", ...gatewayRestartHandler).get("/gateway/run", ...gatewayRunHandler).get("/gateway/logs", ...gatewayLogsHandler).get("/gateway/sql", ...gatewaySqlHandler).get("/gateway/listeners", ...gatewayListenersHandler).get("/debug", ...debugHandler).get("/debug/events", ...debugEventsHandler).get("/debug/dropped", ...debugDroppedHandler).get("/debug/errors", ...debugErrorsHandler).get("/debug/replay", ...debugReplayHandler).get("/docs", ...docsIndexHandler).get("/docs/:topic", ...docsTopicHandler).get("/doctor", ...doctorHandler).get("/schema", ...schemaHandler).get("/status", ...statusHandler).get("/update", ...updateHandler);
 //#endregion
-export { CONNECTOR_CONNECTION_STATUSES, ConnectorDiagnosticLog, ConnectorDiagnosticSqlReader, DEFAULT_GATEWAY_PORT, DEFAULT_GATEWAY_TOKEN_PATH, FUNNEL_DIR, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelEventLog, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLogger, FunnelProcessRunner, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, MemoryConnectorDiagnosticLog, MemoryFunnelClock, MemoryFunnelEventLog, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, SqliteConnectorDiagnosticLog, SqliteFunnelEventLog, channelConfigSchema, channelDeliveryModeSchema, channelWsProtocols, channelWsUrl, routes as cliRoutes, connectorConfigSchema, connectorConnectionEventSchema, connectorProcessedEventSchema, connectorRawEventSchema, createSettings, discordConnectorSchema, factory, funnelEventSchema, gatewayLoopbackUrl, ghConnectorSchema, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, resolveFunnelDir, resolveFunnelPort, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, toRequest };
+export { CONNECTOR_CONNECTION_STATUSES, ConnectorDiagnosticLog, ConnectorDiagnosticSqlReader, DEFAULT_GATEWAY_PORT, DEFAULT_GATEWAY_TOKEN_PATH, FUNNEL_DIR, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelDiagnostics, FunnelDocs, FunnelDoctor, FunnelEventLog, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLogger, FunnelProcessRunner, FunnelRecovery, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, MemoryConnectorDiagnosticLog, MemoryFunnelClock, MemoryFunnelEventLog, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, SqliteConnectorDiagnosticLog, SqliteFunnelEventLog, buildServiceRoutes, channelConfigSchema, channelDeliveryModeSchema, channelWsProtocols, channelWsUrl, routes as cliRoutes, connectorConfigSchema, connectorConnectionEventSchema, connectorProcessedEventSchema, connectorRawEventSchema, createSettings, discordConnectorSchema, factory, funnelEventSchema, gatewayLoopbackUrl, ghConnectorSchema, previewOf, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryRows, queryToCliArgs, resolveFunnelDir, resolveFunnelPort, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, toDiagnosticConnectionError, toDiagnosticEvent, toRequest };