@interactive-inc/claude-funnel 0.59.1 → 0.60.0

package/dist/index.js

@@ -1,27 +1,23 @@
-import { t as FunnelConnectorAdapter } from "./connector-adapter-qwXLjQId.js";
-import { a as FunnelHttpClient, i as NodeFunnelHttpClient, r as FunnelDiscordAdapter, t as FunnelDiscordListener } from "./discord-listener-CKsZGTnH.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-ClPLSYD9.js";
-import { n as FunnelGhAdapter, t as FunnelGhListener } from "./gh-listener-B2I4s8qh.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-C4wlZaOq.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-DxVjjDoW.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-cZu6CxkE.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-B9Us7X05.js";
+import { t as gatewayLoopbackUrl } from "./gateway-base-url-Dy4Ykuoh.js";
+import { t as FunnelFileSystem } from "./file-system-Wvzc2ePY.js";
+import { t as NodeFunnelFileSystem } from "./node-file-system-Blr8pAir.js";
+import { t as FunnelLogger } from "./logger-B6iyNbxM.js";
+import { n as FunnelProcessRunner, t as NodeFunnelProcessRunner } from "./node-process-runner-DxTvycoK.js";
+import { n as FunnelIdGenerator, t as FunnelSettingsReader } from "./settings-reader-CtQ-Ix8_.js";
+import { a as resolveFunnelDir, c as channelConfigSchema, d as settingsSchema, f as baseConnectorConfigSchema, i as SETTINGS_PATH, l as channelDeliveryModeSchema, n as FUNNEL_DIR, o as resolveFunnelPort, p as NodeFunnelIdGenerator, r as FunnelSettingsStore, s as SETTINGS_VERSION, t as DEFAULT_GATEWAY_PORT, u as profileConfigSchema } from "./settings-store-CUKSeTXC.js";
+import { a as FunnelMcp, o as FileProcessGuard, s as FunnelClaude, t as renderYaml } from "./yaml-render-qW34NlYz.js";
+import { a as toDiagnosticEvent, i as toDiagnosticConnectionError, n as previewOf, r as queryRows, t as FunnelDiagnostics } from "./funnel-diagnostics-CSiJmPlZ.js";
+import { t as ConnectorDiagnosticSqlReader } from "./diagnostic-sql-reader-C9zR-Csp.js";
+import { t as FunnelDoctor } from "./funnel-doctor-DiJCjHsg.js";
+import { t as FunnelDocs } from "./funnel-docs-BxXZ9Ksx.js";
+import { a as FunnelLocalConfig, n as NodeFunnelTokenPrompter, r as FunnelLocalConfigSync, t as funnelJsonSchema } from "./local-config-json-schema-JyLqOQNX.js";
+import { t as FunnelProfiles } from "./profiles-DSzTeKQw.js";
+import { t as FunnelRecovery } from "./funnel-recovery-BFdPjL6Z.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-CI60kNfB.js";
+import { n as FunnelHttpClient, t as NodeFunnelHttpClient } from "./node-http-client-lowp60Oa.js";
+import { t as FunnelConnectorAdapter } from "./connector-adapter-DU9Rvyec.js";
+import { t as FunnelConnectorListener } from "./connector-listener-DR3aKOuK.js";
+import { r as scheduleEntrySchema, t as scheduleCatchupPolicySchema } from "./schedule-connector-schema-CfyuMCMh.js";
 import { dirname, join, resolve } from "node:path";
 import { hc } from "hono/client";
 import { appendFileSync, existsSync, mkdirSync } from "node:fs";
@@ -29,80 +25,68 @@ import { z } from "zod";
 import { fileURLToPath } from "node:url";
 import { createFactory } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
-import { zValidator as zValidator$1 } from "@hono/zod-validator";
+import { zValidator } from "@hono/zod-validator";
 import { Hono } from "hono";
-//#region lib/engine/connectors/connector-factory.ts
+//#region lib/engine/connectors/connector-registry.ts
 const defaultFs$1 = new NodeFunnelFileSystem();
 const defaultProcess$1 = new NodeFunnelProcessRunner();
 /**
-* Pure factory for per-type listeners and adapters. The factory has no CRUD
-* responsibility — connector configs live inside settings.json under their
-* channel, and FunnelChannels passes them in by value.
+* Dispatches connector work to injected descriptors by `type`. Replaces the old
+* hard-coded factory: core never imports a concrete connector, so listener and
+* adapter code (and their SDKs) is bundled only when the host passes that type's
+* descriptor to `new Funnel({ connectors: [...] })`.
 *
-* `dir` is the funnel home (defaults to ~/.funnel); per-connector state files
-* land at `<dir>/channels/<channel-id>/connectors/<connector-id>/state.json`.
-*
-* Host integrations can supply per-type listener hooks via
-* `slackListenerOptions` / `scheduleListenerOptions` — e.g. to attach a
-* Bolt `app.action` handler or to drop one-shot schedule entries on fire.
+* `dir` is the funnel home; per-connector state files land at
+* `<dir>/channels/<channel-id>/connectors/<connector-id>/`.
 */
-var FunnelConnectorFactory = class {
+var FunnelConnectorRegistry = class {
+	descriptors;
 	fs;
 	process;
 	logger;
 	diagnosticLog;
 	dir;
-	slackListenerOptions;
-	scheduleListenerOptions;
-	constructor(deps = {}) {
+	constructor(deps) {
+		this.descriptors = new Map(deps.descriptors.map((descriptor) => [descriptor.type, descriptor]));
 		this.fs = deps.fs ?? defaultFs$1;
 		this.process = deps.process ?? defaultProcess$1;
 		this.logger = deps.logger;
 		this.diagnosticLog = deps.diagnosticLog;
 		this.dir = deps.dir ?? FUNNEL_DIR;
-		this.slackListenerOptions = deps.slackListenerOptions ?? {};
-		this.scheduleListenerOptions = deps.scheduleListenerOptions ?? {};
 		Object.freeze(this);
 	}
+	has(type) {
+		return this.descriptors.has(type);
+	}
+	types() {
+		return [...this.descriptors.keys()];
+	}
 	createListener(channelId, config) {
-		if (config.type === "slack") return new FunnelSlackListener({
-			config,
-			channelId,
-			logger: this.logger,
-			diagnosticLog: this.diagnosticLog,
-			onAppCreated: this.slackListenerOptions.onAppCreated,
-			preprocessEvent: this.slackListenerOptions.preprocessEvent
-		});
-		if (config.type === "gh") return new FunnelGhListener({
-			config,
-			channelId,
-			process: this.process,
-			logger: this.logger,
-			diagnosticLog: this.diagnosticLog
-		});
-		if (config.type === "discord") return new FunnelDiscordListener({
-			config,
-			channelId,
-			logger: this.logger,
-			diagnosticLog: this.diagnosticLog
-		});
-		return new FunnelScheduleListener({
-			config,
-			lastFiredStore: new ScheduleStateStore({
-				path: join(this.connectorDir(channelId, config.id), "state.json"),
-				fs: this.fs
-			}),
-			channelId,
-			logger: this.logger,
-			diagnosticLog: this.diagnosticLog,
-			onFired: this.scheduleListenerOptions.onFired
-		});
+		return this.require(config.type).createListener(config, this.listenerDeps(channelId));
 	}
 	createAdapter(config) {
-		if (config.type === "slack") return new FunnelSlackAdapter({ config });
-		if (config.type === "gh") return new FunnelGhAdapter({ process: this.process });
-		if (config.type === "discord") return new FunnelDiscordAdapter({ config });
-		return null;
+		const descriptor = this.require(config.type);
+		if (!descriptor.createAdapter) return null;
+		return descriptor.createAdapter(config, this.adapterDeps());
+	}
+	secretTokens(config) {
+		return this.require(config.type).secretTokens(config);
+	}
+	buildConfig(input, context) {
+		const type = typeof input.type === "string" ? input.type : "";
+		return this.require(type).buildConfig(input, context);
+	}
+	applyUpdate(config, fields, context) {
+		return this.require(config.type).applyUpdate(config, fields, context);
+	}
+	runOperation(config, name, args, context) {
+		const operation = this.require(config.type).operations[name];
+		if (!operation) throw new Error(`connector type "${config.type}" has no operation "${name}"`);
+		return operation({
+			config,
+			args,
+			context
+		});
 	}
 	connectorDir(channelId, connectorId) {
 		return join(this.dir, "channels", channelId, "connectors", connectorId);
@@ -110,43 +94,29 @@ var FunnelConnectorFactory = class {
 	channelDir(channelId) {
 		return join(this.dir, "channels", channelId);
 	}
-};
-//#endregion
-//#region lib/engine/channels/connector-tokens.ts
-/**
-* Return every literal secret token contained in a connector config. Used by
-* token collision detection at add/update time so the same Slack bot or
-* Discord bot cannot be registered under two connectors. Connectors that hold
-* an env *reference* instead of a literal contribute nothing here — two
-* connectors naming the same env var is not a secret collision, and the secret
-* is not in settings.json to compare anyway.
-*/
-function connectorTokens(connector) {
-	switch (connector.type) {
-		case "slack": return [connector.botToken, connector.appToken].filter((token) => token !== void 0);
-		case "discord": return [connector.botToken].filter((token) => token !== void 0);
-		case "gh":
-		case "schedule": return [];
+	require(type) {
+		const descriptor = this.descriptors.get(type);
+		if (!descriptor) throw new Error(`unknown connector type "${type}". Pass its descriptor to new Funnel({ connectors: [...] }).`);
+		return descriptor;
 	}
-}
-//#endregion
-//#region lib/engine/channels/require-connector.ts
-function isConnectorOfType(connector, type) {
-	return connector.type === type;
-}
-/**
-* Look up a connector by name and narrow its discriminated union to a single
-* variant via a type predicate. Throws if the connector is missing or has the
-* wrong `type`. Replaces per-type `requireXxxConnector` privates — adding a
-* new connector type only touches the `ConnectorConfig` union, not this
-* helper.
-*/
-function requireConnectorOfType(channel, connectorName, type) {
-	const connector = channel.connectors.find((c) => c.name === connectorName);
-	if (!connector) throw new Error(`connector "${connectorName}" not found in channel "${channel.name}"`);
-	if (!isConnectorOfType(connector, type)) throw new Error(`connector "${connectorName}" is type "${connector.type}", not "${type}"`);
-	return connector;
-}
+	listenerDeps(channelId) {
+		return {
+			channelId,
+			fs: this.fs,
+			process: this.process,
+			logger: this.logger,
+			diagnosticLog: this.diagnosticLog,
+			connectorDir: (channel, connector) => this.connectorDir(channel, connector)
+		};
+	}
+	adapterDeps() {
+		return {
+			fs: this.fs,
+			process: this.process,
+			logger: this.logger
+		};
+	}
+};
 //#endregion
 //#region lib/engine/time/clock.ts
 /**
@@ -170,26 +140,6 @@ var NodeFunnelClock = class extends FunnelClock {
 };
 //#endregion
 //#region lib/engine/channels/channels.ts
-/**
-* Resolves one token slot (e.g. botToken/botTokenEnv) for an update. The
-* literal and the env-ref form are mutually exclusive: if `fields` supplies
-* either, that form wins and the other key is omitted entirely; if it supplies
-* neither, the connector's current slot is carried over unchanged. Returns a
-* partial object spread into the rebuilt connector, so an omitted key is truly
-* absent rather than set to undefined.
-*/
-const slotFields = (literalKey, envKey, fields, current) => {
-	const literal = fields[literalKey];
-	if (literal !== void 0) return { [literalKey]: literal };
-	const envVar = fields[envKey];
-	if (envVar !== void 0) return { [envKey]: envVar };
-	const result = {};
-	const currentLiteral = current[literalKey];
-	const currentEnv = current[envKey];
-	if (typeof currentLiteral === "string") result[literalKey] = currentLiteral;
-	if (typeof currentEnv === "string") result[envKey] = currentEnv;
-	return result;
-};
 const defaultClock$1 = new NodeFunnelClock();
 const defaultIdGenerator = new NodeFunnelIdGenerator();
 /**
@@ -199,16 +149,20 @@ const defaultIdGenerator = new NodeFunnelIdGenerator();
 * global connector namespace exists. Token uniqueness is enforced across all
 * channels at add/update time so the same Slack/Discord credentials cannot
 * be registered twice.
+*
+* Connector type knowledge lives entirely in the injected registry (descriptors):
+* this class builds, updates, and runs operations on connectors generically and
+* never imports a concrete connector type.
 */
 var FunnelChannels = class {
 	store;
-	factory;
+	registry;
 	profileChecker;
 	clock;
 	idGenerator;
 	constructor(deps) {
 		this.store = deps.store;
-		this.factory = deps.factory;
+		this.registry = deps.registry;
 		this.profileChecker = deps.profileChecker ?? null;
 		this.clock = deps.clock ?? defaultClock$1;
 		this.idGenerator = deps.idGenerator ?? defaultIdGenerator;
@@ -280,57 +234,15 @@ var FunnelChannels = class {
 		const settings = this.store.read();
 		const channel = this.requireChannel(settings, channelName);
 		if (channel.connectors.some((c) => c.name === input.name)) throw new Error(`connector "${input.name}" already exists in channel "${channelName}"`);
-		const candidate = this.fromInput(input);
+		const candidate = this.registry.buildConfig(input, {
+			id: this.idGenerator.generate(),
+			now: this.clock.iso()
+		});
 		this.assertNoTokenCollision(settings, candidate);
 		channel.connectors.push(candidate);
 		this.store.write(settings);
 		return candidate;
 	}
-	fromInput(input) {
-		const id = this.idGenerator.generate();
-		const now = this.clock.iso();
-		const createdAt = now;
-		const updatedAt = now;
-		switch (input.type) {
-			case "slack": return {
-				id,
-				type: "slack",
-				name: input.name,
-				...input.botToken !== void 0 ? { botToken: input.botToken } : {},
-				...input.appToken !== void 0 ? { appToken: input.appToken } : {},
-				...input.botTokenEnv !== void 0 ? { botTokenEnv: input.botTokenEnv } : {},
-				...input.appTokenEnv !== void 0 ? { appTokenEnv: input.appTokenEnv } : {},
-				minify: input.minify ?? true,
-				createdAt,
-				updatedAt
-			};
-			case "gh": return {
-				id,
-				type: "gh",
-				name: input.name,
-				...input.pollInterval !== void 0 ? { pollInterval: input.pollInterval } : {},
-				createdAt,
-				updatedAt
-			};
-			case "discord": return {
-				id,
-				type: "discord",
-				name: input.name,
-				...input.botToken !== void 0 ? { botToken: input.botToken } : {},
-				...input.botTokenEnv !== void 0 ? { botTokenEnv: input.botTokenEnv } : {},
-				createdAt,
-				updatedAt
-			};
-			case "schedule": return {
-				id,
-				type: "schedule",
-				name: input.name,
-				entries: input.entries ?? [],
-				createdAt,
-				updatedAt
-			};
-		}
-	}
 	removeConnector(channelName, connectorName) {
 		const settings = this.store.read();
 		const channel = this.requireChannel(settings, channelName);
@@ -349,78 +261,57 @@ var FunnelChannels = class {
 		connector.updatedAt = this.clock.iso();
 		this.store.write(settings);
 	}
-	updateSlackConnector(channelName, connectorName, fields) {
+	/**
+	* Update a connector's mutable fields generically. The connector's descriptor
+	* rebuilds the config from `fields` (e.g. Slack/Discord token slots are rebuilt
+	* so a slot can move between a literal and an env reference cleanly).
+	*/
+	updateConnector(channelName, connectorName, fields) {
 		const settings = this.store.read();
 		const channel = this.requireChannel(settings, channelName);
-		const connector = requireConnectorOfType(channel, connectorName, "slack");
-		const updated = {
-			id: connector.id,
-			name: connector.name,
-			type: "slack",
-			minify: connector.minify,
-			createdAt: connector.createdAt,
-			updatedAt: this.clock.iso(),
-			...slotFields("botToken", "botTokenEnv", fields, connector),
-			...slotFields("appToken", "appTokenEnv", fields, connector)
-		};
+		const connector = channel.connectors.find((c) => c.name === connectorName);
+		if (!connector) throw new Error(`connector "${connectorName}" not found in channel "${channelName}"`);
+		const updated = this.registry.applyUpdate(connector, fields, { now: this.clock.iso() });
 		this.assertNoTokenCollision(settings, updated);
 		this.replaceConnector(channel, connector.name, updated);
 		this.store.write(settings);
 	}
+	/** Back-compat wrapper for `updateConnector` on a slack connector. */
+	updateSlackConnector(channelName, connectorName, fields) {
+		this.updateConnector(channelName, connectorName, fields);
+	}
+	/** Back-compat wrapper for `updateConnector` on a gh connector. */
 	updateGhConnector(channelName, connectorName, fields) {
-		const settings = this.store.read();
-		const connector = requireConnectorOfType(this.requireChannel(settings, channelName), connectorName, "gh");
-		if (fields.pollInterval !== void 0) connector.pollInterval = fields.pollInterval;
-		connector.updatedAt = this.clock.iso();
-		this.store.write(settings);
+		this.updateConnector(channelName, connectorName, fields);
 	}
+	/** Back-compat wrapper for `updateConnector` on a discord connector. */
 	updateDiscordConnector(channelName, connectorName, fields) {
-		const settings = this.store.read();
-		const channel = this.requireChannel(settings, channelName);
-		const connector = requireConnectorOfType(channel, connectorName, "discord");
-		const updated = {
-			id: connector.id,
-			name: connector.name,
-			type: "discord",
-			createdAt: connector.createdAt,
-			updatedAt: this.clock.iso(),
-			...slotFields("botToken", "botTokenEnv", fields, connector)
-		};
-		this.assertNoTokenCollision(settings, updated);
-		this.replaceConnector(channel, connector.name, updated);
-		this.store.write(settings);
-	}
-	listScheduleEntries(channelName, connectorName) {
-		return requireConnectorOfType(this.requireChannel(this.store.read(), channelName), connectorName, "schedule").entries;
+		this.updateConnector(channelName, connectorName, fields);
 	}
-	addScheduleEntry(channelName, connectorName, entry) {
-		const settings = this.store.read();
-		const connector = requireConnectorOfType(this.requireChannel(settings, channelName), connectorName, "schedule");
-		const persisted = {
-			id: entry.id ?? this.idGenerator.generate(),
-			cron: entry.cron,
-			prompt: entry.prompt,
-			enabled: entry.enabled ?? true,
-			catchupPolicy: entry.catchupPolicy ?? "latest"
-		};
-		connector.entries.push(persisted);
-		connector.updatedAt = this.clock.iso();
-		this.store.write(settings);
-		return persisted;
-	}
-	removeScheduleEntry(channelName, connectorName, id) {
+	/**
+	* Run a connector-type-specific operation (e.g. schedule `addEntry` /
+	* `removeEntry` / `listEntries`). The descriptor returns the next config and a
+	* result; the config is persisted only when the operation actually mutated it.
+	*/
+	connectorOp(channelName, connectorName, operation, args) {
 		const settings = this.store.read();
-		const connector = requireConnectorOfType(this.requireChannel(settings, channelName), connectorName, "schedule");
-		const index = connector.entries.findIndex((e) => e.id === id);
-		if (index < 0) throw new Error(`schedule entry "${id}" not found`);
-		connector.entries.splice(index, 1);
-		connector.updatedAt = this.clock.iso();
-		this.store.write(settings);
+		const channel = this.requireChannel(settings, channelName);
+		const connector = channel.connectors.find((c) => c.name === connectorName);
+		if (!connector) throw new Error(`connector "${connectorName}" not found in channel "${channelName}"`);
+		const outcome = this.registry.runOperation(connector, operation, args, {
+			generateId: () => this.idGenerator.generate(),
+			now: this.clock.iso()
+		});
+		if (outcome.config !== connector) {
+			this.replaceConnector(channel, connector.name, outcome.config);
+			this.store.write(settings);
+		}
+		return outcome.result;
 	}
 	async call(channelName, connectorName, input) {
 		const connector = this.getConnector(channelName, connectorName);
 		if (!connector) throw new Error(`connector "${connectorName}" not found in channel "${channelName}"`);
-		const adapter = this.factory.createAdapter(connector);
+		const adapter = this.registry.createAdapter(connector);
 		if (!adapter) throw new Error(`connector type "${connector.type}" does not support outbound calls`);
 		return await adapter.call(input);
 	}
@@ -432,7 +323,7 @@ var FunnelChannels = class {
 		return {
 			config: connector,
 			channelId: channel.id,
-			listener: this.factory.createListener(channel.id, connector)
+			listener: this.registry.createListener(channel.id, connector)
 		};
 	}
 	createAllListeners() {
@@ -441,7 +332,7 @@ var FunnelChannels = class {
 			config: connector,
 			channelId: channel.id,
 			channelName: channel.name,
-			listener: this.factory.createListener(channel.id, connector)
+			listener: this.registry.createListener(channel.id, connector)
 		});
 		return out;
 	}
@@ -456,11 +347,11 @@ var FunnelChannels = class {
 		channel.connectors[index] = next;
 	}
 	assertNoTokenCollision(settings, candidate) {
-		const tokens = connectorTokens(candidate);
+		const tokens = this.registry.secretTokens(candidate);
 		if (tokens.length === 0) return;
 		for (const channel of settings.channels) for (const other of channel.connectors) {
 			if (other.id === candidate.id) continue;
-			for (const token of connectorTokens(other)) if (tokens.includes(token)) throw new Error(`token already in use by connector "${other.name}" in channel "${channel.name}"`);
+			for (const token of this.registry.secretTokens(other)) if (tokens.includes(token)) throw new Error(`token already in use by connector "${other.name}" in channel "${channel.name}"`);
 		}
 	}
 };
@@ -1026,7 +917,9 @@ const noopOnError = () => {};
 *
 * @example
 * ```ts
-* const funnel = new Funnel({})
+* import { slackConnector } from "@interactive-inc/claude-funnel/connectors/slack"
+*
+* const funnel = new Funnel({ connectors: [slackConnector()] })
 * const channel = funnel.channels.add({ name: "inbox" })
 * funnel.channels.addConnector("inbox", { type: "slack", name: "ops", botToken, appToken })
 * await funnel.gatewayServer({ port: 9742 }).start()
@@ -1074,20 +967,25 @@ var Funnel = class Funnel {
 			fs,
 			idGenerator
 		});
-		const factory = new FunnelConnectorFactory({
+		const registry = new FunnelConnectorRegistry({
+			descriptors: props.connectors ?? [],
 			fs,
 			process,
 			logger: this.logger,
 			diagnosticLog: props.diagnosticLog,
-			dir,
-			slackListenerOptions: props.slackListenerOptions,
-			scheduleListenerOptions: props.scheduleListenerOptions
+			dir
+		});
+		this.profiles = new FunnelProfiles({
+			store,
+			idGenerator,
+			fs
 		});
 		this.channels = new FunnelChannels({
 			store,
-			factory,
+			registry,
 			clock,
-			idGenerator
+			idGenerator,
+			profileChecker: this.profiles
 		});
 		this.gateway = new FunnelGateway({
 			fs,
@@ -1112,11 +1010,6 @@ var Funnel = class Funnel {
 			getToken: () => this.gatewayToken.read()
 		});
 		const mcp = new FunnelMcp({ fs });
-		this.profiles = new FunnelProfiles({
-			store,
-			idGenerator,
-			fs
-		});
 		this.localConfig = new FunnelLocalConfig({ fs });
 		this.localConfigSync = new FunnelLocalConfigSync({
 			channels: this.channels,
@@ -1222,10 +1115,32 @@ var Funnel = class Funnel {
 	}
 	gatewayClient() {
 		const { port } = this.gateway.getStatus();
-		return hc(`http://127.0.0.1:${port}`);
+		return hc(gatewayLoopbackUrl(port));
 	}
 };
 //#endregion
+//#region lib/engine/logger/redact-secrets.ts
+/**
+* Mask credential-shaped substrings before a log line is persisted. Matching
+* is prefix-anchored (Slack xoxb-/xapp-, GitHub ghp_/github_pat_, Discord
+* Bot tokens, HTTP bearer values) so ordinary identifiers never trip it —
+* a false negative only weakens defense in depth, a false positive destroys
+* a legitimate log line.
+*/
+const SECRET_PATTERNS = [
+	/xox[abprs]-[A-Za-z0-9-]{10,}/g,
+	/xapp-[A-Za-z0-9-]{10,}/g,
+	/gh[pousr]_[A-Za-z0-9]{20,}/g,
+	/github_pat_[A-Za-z0-9_]{20,}/g,
+	/Bot [A-Za-z0-9_-]{20,}\.[A-Za-z0-9_-]{4,}\.[A-Za-z0-9_-]{20,}/g,
+	/Bearer [A-Za-z0-9._~+/-]{16,}/g
+];
+const redactSecrets = (text) => {
+	let redacted = text;
+	for (const pattern of SECRET_PATTERNS) redacted = redacted.replace(pattern, "[redacted]");
+	return redacted;
+};
+//#endregion
 //#region lib/engine/logger/node-logger.ts
 const defaultLogFile = () => join(funnelTmpDir(), "funnel.log");
 var NodeFunnelLogger = class extends FunnelLogger {
@@ -1254,7 +1169,7 @@ var NodeFunnelLogger = class extends FunnelLogger {
 			message,
 			...meta ? { meta } : {}
 		};
-		appendFileSync(this.file, `${JSON.stringify(entry)}\n`);
+		appendFileSync(this.file, `${redactSecrets(JSON.stringify(entry))}\n`);
 	}
 };
 //#endregion
@@ -1399,13 +1314,19 @@ const toRequest = (args) => {
 	while (i < args.length) {
 		const arg = args[i];
 		if (arg.startsWith("--")) {
-			const key = arg.slice(2);
+			const body = arg.slice(2);
+			const equalsAt = body.indexOf("=");
+			if (equalsAt >= 0) {
+				params.set(body.slice(0, equalsAt), body.slice(equalsAt + 1));
+				i++;
+				continue;
+			}
 			const next = args[i + 1];
 			if (isValue(next)) {
-				params.set(key, next);
+				params.set(body, next);
 				i += 2;
 			} else {
-				params.set(key, "true");
+				params.set(body, "true");
 				i++;
 			}
 			continue;
@@ -1471,7 +1392,7 @@ const queryToCliArgs = (url, reservedKeys = []) => {
 };
 //#endregion
 //#region lib/cli/routes/channels.add.ts
-const help$17 = `funnel channels add — add a channel
+const help$15 = `funnel channels add — add a channel
 
 usage: funnel channels add <name> [--delivery fanout|exclusive]
 
@@ -1489,7 +1410,29 @@ examples:
   funnel channels add ci-events --delivery exclusive
 
 see also: funnel channels, funnel channels <name> connectors add`;
-const channelsAddHelpHandler = factory.createHandlers((c) => c.text(help$17));
+const channelsAddHelpHandler = factory.createHandlers((c) => c.text(help$15));
+//#endregion
+//#region lib/cli/router/validator.ts
+const labelFor = (target, key) => {
+	if (target === "query") return `--${key}`;
+	return `<${key}>`;
+};
+const formatIssues = (target, issues) => {
+	return `invalid arguments — ${issues.map((issue) => {
+		const key = issue.path.map(String).join(".");
+		if (!key) return issue.message;
+		return `${labelFor(target, key)}: ${issue.message}`;
+	}).join("; ")} (run with --help for usage)`;
+};
+/**
+* CLI-flavored zValidator: every route imports this instead of the raw
+* @hono/zod-validator so a validation failure renders as one readable line
+* naming the offending flag, not a raw ZodError JSON dump.
+*/
+const zValidator$1 = (target, schema) => zValidator(target, schema, (result) => {
+	if (result.success) return;
+	throw new HTTPException(400, { message: formatIssues(target, result.error.issues) });
+});
 //#endregion
 //#region lib/cli/routes/channels.add.$channel.ts
 const channelsAddHandler = factory.createHandlers(zValidator$1("param", z.object({ channel: z.string() })), zValidator$1("query", z.object({ delivery: channelDeliveryModeSchema.optional() })), (c) => {
@@ -1502,6 +1445,17 @@ const channelsAddHandler = factory.createHandlers(zValidator$1("param", z.object
 	return c.text(`added channel "${created.name}" (id: ${created.id})`);
 });
 //#endregion
+//#region lib/cli/routes/not-found-message.ts
+/**
+* One error shape for every name-resolution miss: what was asked, what exists,
+* and the command that creates it — so a Claude (or human) can self-correct
+* without a follow-up listing call.
+*/
+const notFoundMessage = (props) => {
+	const listed = props.available.length > 0 ? props.available.join(", ") : "none";
+	return `${props.kind} "${props.name}" not found (available: ${listed}); to create one: ${props.nextAction}`;
+};
+//#endregion
 //#region lib/cli/router/help-guard.ts
 function helpGuard(help) {
 	return async (c, next) => {
@@ -1526,14 +1480,20 @@ subcommands:
   <c> schedules add <id> --cron=... --prompt=... / add a schedule entry
   <c> schedules remove <id> / remove a schedule entry`), (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 funnel = c.env.funnel;
+	const channel = funnel.channels.get(param.channel);
+	if (!channel) throw new HTTPException(404, { message: notFoundMessage({
+		kind: "channel",
+		name: param.channel,
+		available: funnel.channels.list().map((ch) => ch.name),
+		nextAction: "fnl channels add <name>"
+	}) });
 	if (channel.connectors.length === 0) return c.text(`no connectors in channel "${channel.name}"`);
 	return c.text(channel.connectors.map((c) => `${c.name} (${c.type}, id: ${c.id})`).join("\n"));
 });
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.add.ts
-const help$16 = `funnel channels <channel> connectors add <name> — add a connector to a channel
+const help$14 = `funnel channels <channel> connectors add <name> — add a connector to a channel
 
 usage:
   funnel channels <channel> connectors add <name> --type=slack --bot-token=xoxb-... --app-token=xapp-...
@@ -1556,7 +1516,7 @@ examples:
   funnel channels alerts connectors add daily --type=schedule
 
 see also: funnel channels <channel> connectors, funnel channels <channel> connectors remove`;
-const channelsConnectorsAddHelpHandler = factory.createHandlers((c) => c.text(help$16));
+const channelsConnectorsAddHelpHandler = factory.createHandlers((c) => c.text(help$14));
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.add.$connector.ts
 const slackBody = z.object({
@@ -1624,7 +1584,7 @@ const channelsConnectorsAddHandler = factory.createHandlers(zValidator$1("param"
 });
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.remove.ts
-const help$15 = `funnel channels <channel> connectors remove <connector> — remove a connector
+const help$13 = `funnel channels <channel> connectors remove <connector> — remove a connector
 
 usage: funnel channels <channel> connectors remove <connector>
 
@@ -1636,7 +1596,7 @@ examples:
   funnel channels production connectors remove slack-main
 
 see also: funnel channels <channel> connectors, funnel channels <channel> connectors add`;
-const channelsConnectorsRemoveHelpHandler = factory.createHandlers((c) => c.text(help$15));
+const channelsConnectorsRemoveHelpHandler = factory.createHandlers((c) => c.text(help$13));
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.remove.$connector.ts
 const channelsConnectorsRemoveHandler = factory.createHandlers(zValidator$1("param", z.object({
@@ -1651,13 +1611,13 @@ const channelsConnectorsRemoveHandler = factory.createHandlers(zValidator$1("par
 });
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.set.ts
-const help$14 = `funnel channels <channel> connectors set <connector> — update connector fields
+const help$12 = `funnel channels <channel> connectors set <connector> — update connector fields
 
 usage:
   funnel channels <ch> connectors set <conn> [--bot-token=...] [--app-token=...]   # slack
   funnel channels <ch> connectors set <conn> [--bot-token=...]                    # discord
   funnel channels <ch> connectors set <conn> [--poll-interval=N]                  # gh`;
-const channelsConnectorsSetHelpHandler = factory.createHandlers((c) => c.text(help$14));
+const channelsConnectorsSetHelpHandler = factory.createHandlers((c) => c.text(help$12));
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.set.$connector.ts
 const channelsConnectorsSetHandler = factory.createHandlers(zValidator$1("param", z.object({
@@ -1672,7 +1632,12 @@ const channelsConnectorsSetHandler = factory.createHandlers(zValidator$1("param"
 	const query = c.req.valid("query");
 	const funnel = c.env.funnel;
 	const existing = funnel.channels.getConnector(param.channel, param.connector);
-	if (!existing) throw new HTTPException(404, { message: `connector "${param.connector}" not found in channel "${param.channel}"` });
+	if (!existing) throw new HTTPException(404, { message: notFoundMessage({
+		kind: "connector",
+		name: param.connector,
+		available: (funnel.channels.get(param.channel)?.connectors ?? []).map((conn) => conn.name),
+		nextAction: `fnl channels ${param.channel} connectors add <name> --type=slack|gh|discord|schedule ...`
+	}) });
 	if (existing.type === "slack") funnel.channels.updateSlackConnector(param.channel, param.connector, {
 		...query["bot-token"] !== void 0 ? { botToken: query["bot-token"] } : {},
 		...query["app-token"] !== void 0 ? { appToken: query["app-token"] } : {}
@@ -1695,15 +1660,21 @@ subcommands:
 
 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}"` });
+	const funnel = c.env.funnel;
+	const connector = funnel.channels.getConnector(param.channel, param.connector);
+	if (!connector) throw new HTTPException(404, { message: notFoundMessage({
+		kind: "connector",
+		name: param.connector,
+		available: (funnel.channels.get(param.channel)?.connectors ?? []).map((conn) => conn.name),
+		nextAction: `fnl channels ${param.channel} connectors add <name> --type=slack|gh|discord|schedule ...`
+	}) });
 	return c.text(renderYaml(connector));
 });
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.rename.ts
-const help$13 = `funnel channels <channel> connectors rename <old> <new> — rename a connector
+const help$11 = `funnel channels <channel> connectors rename <old-connector-name> <new-connector-name> — rename a connector
 
-usage: funnel channels <channel> connectors rename <old> <new>
+usage: funnel channels <channel> connectors rename <old-connector-name> <new-connector-name>
 
 Renames the connector in the configuration file. Tokens, type, and
 schedules are preserved. The gateway picks up the new name on the
@@ -1713,7 +1684,7 @@ examples:
   funnel channels production connectors rename slack-1 slack-main
 
 see also: funnel channels <channel> connectors`;
-const channelsConnectorsRenameHelpHandler = factory.createHandlers((c) => c.text(help$13));
+const channelsConnectorsRenameHelpHandler = factory.createHandlers((c) => c.text(help$11));
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.$connector.rename.$newName.ts
 const channelsConnectorsRenameHandler = factory.createHandlers(zValidator$1("param", z.object({
@@ -1730,10 +1701,10 @@ const channelsConnectorsRenameHandler = factory.createHandlers(zValidator$1("par
 });
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.$connector.rename.ts
-const help$12 = `funnel channels <channel> connectors rename <connector> <new-name>
+const help$10 = `funnel channels <channel> connectors rename <connector> <new-name>
 
 usage: funnel channels <channel> connectors rename <connector> <new-name>`;
-const channelsConnectorRenameHelpHandler = factory.createHandlers((c) => c.text(help$12));
+const channelsConnectorRenameHelpHandler = factory.createHandlers((c) => c.text(help$10));
 const channelsConnectorsRequestHandler = factory.createHandlers(zValidator$1("param", z.object({
 	channel: z.string(),
 	connector: z.string()
@@ -1776,16 +1747,39 @@ subcommands:
   add <id> --cron=... --prompt=... [--enabled=true] [--catchup-policy=latest|all|skip] / add entry
   remove <id> / remove entry`), (c) => {
 	const param = c.req.valid("param");
-	const entries = c.env.funnel.channels.listScheduleEntries(param.channel, param.connector);
+	const funnel = c.env.funnel;
+	const entries = z.array(scheduleEntrySchema).parse(funnel.channels.connectorOp(param.channel, param.connector, "listEntries", void 0));
 	if (entries.length === 0) return c.text("no schedule entries");
 	return c.text(entries.map((e) => `${e.id}\t${e.cron}\t${e.enabled ? "on" : "off"}\t${e.prompt}`).join("\n"));
 });
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.$connector.schedules.add.ts
-const help$11 = `funnel channels <ch> connectors <conn> schedules add <id> — add a schedule entry
+const help$9 = `funnel channels <ch> connectors <conn> schedules add <id> — add a schedule entry
 
-usage: funnel channels <ch> connectors <conn> schedules add <id> --cron="*/5 * * * *" --prompt="..." [--enabled=true] [--catchup-policy=latest|all|skip]`;
-const channelsConnectorSchedulesAddHelpHandler = factory.createHandlers((c) => c.text(help$11));
+usage: funnel channels <ch> connectors <conn> schedules add <id> --cron="*/5 * * * *" --prompt="..." [--enabled|--enabled=false] [--catchup-policy=latest|all|skip]
+
+options:
+  --cron <expr> / 5-field cron expression (required)
+  --prompt <text> / prompt delivered on each fire (required)
+  --enabled / fire on schedule (default: true; --enabled=false stores it disabled)
+  --catchup-policy latest|all|skip / how missed fires are replayed after downtime (default: latest)`;
+const channelsConnectorSchedulesAddHelpHandler = factory.createHandlers((c) => c.text(help$9));
+//#endregion
+//#region lib/cli/router/boolean-flag.ts
+/**
+* One parser for every CLI boolean flag: bare `--flag` (and `--flag=true`)
+* mean true, `--flag=false` means false, absent stays undefined so routes can
+* distinguish "not given" from "explicitly off". `""` survives for callers
+* that hit the HTTP surface directly with `?flag=`.
+*/
+const booleanFlag = z.enum([
+	"true",
+	"false",
+	""
+]).optional().transform((value) => {
+	if (value === void 0) return void 0;
+	return value !== "false";
+});
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.$connector.schedules.add.$id.ts
 const channelsConnectorsSchedulesAddHandler = factory.createHandlers(zValidator$1("param", z.object({
@@ -1795,28 +1789,28 @@ const channelsConnectorsSchedulesAddHandler = factory.createHandlers(zValidator$
 })), zValidator$1("query", z.object({
 	cron: z.string(),
 	prompt: z.string(),
-	enabled: z.enum(["true", "false"]).optional(),
+	enabled: booleanFlag,
 	"catchup-policy": scheduleCatchupPolicySchema.optional()
 })), async (c) => {
 	const param = c.req.valid("param");
 	const query = c.req.valid("query");
 	const funnel = c.env.funnel;
-	const entry = funnel.channels.addScheduleEntry(param.channel, param.connector, {
+	const entry = scheduleEntrySchema.parse(funnel.channels.connectorOp(param.channel, param.connector, "addEntry", {
 		id: param.id,
 		cron: query.cron,
 		prompt: query.prompt,
-		...query.enabled !== void 0 ? { enabled: query.enabled === "true" } : {},
+		...query.enabled !== void 0 ? { enabled: query.enabled } : {},
 		...query["catchup-policy"] !== void 0 ? { catchupPolicy: query["catchup-policy"] } : {}
-	});
+	}));
 	await funnel.listeners.restart(param.channel, param.connector);
 	return c.text(`added schedule entry "${entry.id}"`);
 });
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.$connector.schedules.remove.ts
-const help$10 = `funnel channels <ch> connectors <conn> schedules remove <id>
+const help$8 = `funnel channels <ch> connectors <conn> schedules remove <id>
 
 usage: funnel channels <ch> connectors <conn> schedules remove <id>`;
-const channelsConnectorSchedulesRemoveHelpHandler = factory.createHandlers((c) => c.text(help$10));
+const channelsConnectorSchedulesRemoveHelpHandler = factory.createHandlers((c) => c.text(help$8));
 //#endregion
 //#region lib/cli/routes/channels.$channel.connectors.$connector.schedules.remove.$id.ts
 const channelsConnectorsSchedulesRemoveHandler = factory.createHandlers(zValidator$1("param", z.object({
@@ -1826,13 +1820,13 @@ const channelsConnectorsSchedulesRemoveHandler = factory.createHandlers(zValidat
 })), zValidator$1("query", z.object({})), async (c) => {
 	const param = c.req.valid("param");
 	const funnel = c.env.funnel;
-	funnel.channels.removeScheduleEntry(param.channel, param.connector, param.id);
+	funnel.channels.connectorOp(param.channel, param.connector, "removeEntry", { id: param.id });
 	await funnel.listeners.restart(param.channel, param.connector);
 	return c.text(`removed schedule entry "${param.id}"`);
 });
 //#endregion
 //#region lib/cli/routes/channels.publish.ts
-const help$9 = `funnel channels <channel> publish — push arbitrary content into a channel
+const help$7 = `funnel channels <channel> publish — push arbitrary content into a channel
 
 usage: funnel channels <channel> publish --content="<text>" [--connector=<name>] [--meta-<key>=<value> ...]
 
@@ -1840,7 +1834,7 @@ options:
   --content       Required. The event body delivered to subscribers.
   --connector     Optional. Stamp the event with a connector name (resolved to id when found).
   --meta-<key>    Optional. Repeatable. Added to meta. Example: --meta-source=cron`;
-const channelsPublishHelpHandler = factory.createHandlers((c) => c.text(help$9));
+const channelsPublishHelpHandler = factory.createHandlers((c) => c.text(help$7));
 //#endregion
 //#region lib/cli/routes/channels.$channel.publish.ts
 const querySchema = z.object({
@@ -1864,7 +1858,7 @@ const channelsPublishHandler = factory.createHandlers(zValidator$1("param", z.ob
 });
 //#endregion
 //#region lib/cli/routes/channels.remove.ts
-const help$8 = `funnel channels remove — remove a channel and all its connectors
+const help$6 = `funnel channels remove — remove a channel and all its connectors
 
 usage: funnel channels remove <name>
 
@@ -1876,21 +1870,28 @@ examples:
   funnel channels remove staging
 
 see also: funnel channels, funnel channels add`;
-const channelsRemoveHelpHandler = factory.createHandlers((c) => c.text(help$8));
+const channelsRemoveHelpHandler = factory.createHandlers((c) => c.text(help$6));
 //#endregion
 //#region lib/cli/routes/channels.remove.$channel.ts
 const channelsRemoveHandler = factory.createHandlers(zValidator$1("param", z.object({ channel: z.string() })), zValidator$1("query", z.object({})), (c) => {
 	const param = c.req.valid("param");
-	c.env.funnel.channels.remove(param.channel);
+	const funnel = c.env.funnel;
+	if (!funnel.channels.get(param.channel)) throw new HTTPException(404, { message: notFoundMessage({
+		kind: "channel",
+		name: param.channel,
+		available: funnel.channels.list().map((ch) => ch.name),
+		nextAction: "fnl channels add <name>"
+	}) });
+	funnel.channels.remove(param.channel);
 	return c.text(`removed channel "${param.channel}"`);
 });
 //#endregion
 //#region lib/cli/routes/channels.rename.ts
-const help$7 = `funnel channels rename — rename a channel
+const channelsRenameHelp = `funnel channels rename — rename a channel
 
 usage:
-  funnel channels rename <old> <new>
-  funnel channels <old> rename <new>
+  funnel channels rename <old-channel-name> <new-channel-name>
+  funnel channels <old-channel-name> rename <new-channel-name>
 
 Renames the channel in the configuration file. Connectors, schedules,
 and delivery mode are preserved. The gateway picks up the new name on
@@ -1901,15 +1902,10 @@ examples:
   funnel channels staging rename production
 
 see also: funnel channels, funnel channels <name>`;
-const channelsRenameHelpHandler = factory.createHandlers((c) => c.text(help$7));
+const channelsRenameHelpHandler = factory.createHandlers((c) => c.text(channelsRenameHelp));
 //#endregion
 //#region lib/cli/routes/channels.$channel.rename.ts
-const help$6 = `funnel channels rename — rename a channel
-
-usage:
-  funnel channels rename <old> <new>
-  funnel channels <old> rename <new>`;
-const channelsChannelRenameHelpHandler = factory.createHandlers((c) => c.text(help$6));
+const channelsChannelRenameHelpHandler = factory.createHandlers((c) => c.text(channelsRenameHelp));
 //#endregion
 //#region lib/cli/routes/channels.$channel.rename.$newName.ts
 const channelsRenameHandler = factory.createHandlers(zValidator$1("param", z.object({
@@ -1917,7 +1913,14 @@ const channelsRenameHandler = factory.createHandlers(zValidator$1("param", z.obj
 	newName: z.string()
 })), zValidator$1("query", z.object({})), (c) => {
 	const param = c.req.valid("param");
-	c.env.funnel.channels.rename(param.channel, param.newName);
+	const funnel = c.env.funnel;
+	if (!funnel.channels.get(param.channel)) throw new HTTPException(404, { message: notFoundMessage({
+		kind: "channel",
+		name: param.channel,
+		available: funnel.channels.list().map((ch) => ch.name),
+		nextAction: "fnl channels add <name>"
+	}) });
+	funnel.channels.rename(param.channel, param.newName);
 	return c.text(`renamed channel "${param.channel}" to "${param.newName}"`);
 });
 const channelsSetDeliveryHandler = factory.createHandlers(helpGuard(`funnel channels <name> set delivery <mode> — change a channel's routing mode
@@ -1947,8 +1950,14 @@ subcommands:
 
 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 funnel = c.env.funnel;
+	const channel = funnel.channels.get(param.channel);
+	if (!channel) throw new HTTPException(404, { message: notFoundMessage({
+		kind: "channel",
+		name: param.channel,
+		available: funnel.channels.list().map((ch) => ch.name),
+		nextAction: "fnl channels add <name>"
+	}) });
 	return c.text(renderYaml({
 		id: channel.id,
 		name: channel.name,
@@ -2069,8 +2078,14 @@ const validateConnector = (connector) => {
 };
 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 channel = c.env.funnel.channels.get(param.channel);
-	if (!channel) throw new HTTPException(404, { message: `channel "${param.channel}" not found` });
+	const funnel = c.env.funnel;
+	const channel = funnel.channels.get(param.channel);
+	if (!channel) throw new HTTPException(404, { message: notFoundMessage({
+		kind: "channel",
+		name: param.channel,
+		available: funnel.channels.list().map((ch) => ch.name),
+		nextAction: "fnl channels add <name>"
+	}) });
 	if (channel.connectors.length === 0) return c.text(renderYaml({
 		channel: channel.name,
 		valid: false,
@@ -2141,7 +2156,12 @@ const claudeHandler = factory.createHandlers(helpGuard(claudeHelp), zValidator$1
 	}
 	if (query.profile) {
 		const profile = profiles.get(query.profile);
-		if (!profile) throw new HTTPException(404, { message: `profile "${query.profile}" not found` });
+		if (!profile) throw new HTTPException(404, { message: notFoundMessage({
+			kind: "profile",
+			name: query.profile,
+			available: profiles.list().map((p) => p.name),
+			nextAction: "fnl profiles add <name> --path=<repo> --channel=<channel>"
+		}) });
 		const exitCode = await claude.launch({
 			channel: profile.channelId,
 			cwd: profile.path,
@@ -2274,16 +2294,12 @@ const resolveTargetChannel = (c, channelArg) => {
 };
 const debugHandler = factory.createHandlers(helpGuard(debugHelp), zValidator$1("query", z.object({
 	channel: z.string().optional(),
-	all: z.enum([
-		"true",
-		"false",
-		""
-	]).optional(),
+	all: booleanFlag,
 	limit: z.string().optional()
 })), async (c) => {
 	const query = c.req.valid("query");
 	const funnel = c.env.funnel;
-	if (query.all === "true" || query.all === "") {
+	if (query.all === true) {
 		const report = await funnel.diagnostics.diagnoseAll();
 		return c.text(renderYaml(report));
 	}
@@ -2394,20 +2410,12 @@ examples:
   funnel doctor
   funnel doctor --fix
   funnel doctor --fix --aggressive`), zValidator$1("query", z.object({
-	fix: z.enum([
-		"true",
-		"false",
-		""
-	]).optional(),
-	aggressive: z.enum([
-		"true",
-		"false",
-		""
-	]).optional()
+	fix: booleanFlag,
+	aggressive: booleanFlag
 })), async (c) => {
 	const query = c.req.valid("query");
-	const wantsFix = query.fix === "true" || query.fix === "";
-	const wantsAggressive = query.aggressive === "true" || query.aggressive === "";
+	const wantsFix = query.fix === true;
+	const wantsAggressive = query.aggressive === true;
 	const mode = wantsFix ? wantsAggressive ? "aggressive" : "safe" : "off";
 	const report = await c.env.funnel.doctor.run(mode);
 	return c.text(renderYaml(report));
@@ -2446,7 +2454,7 @@ examples:
 const renderGatewayStatus = async (c) => {
 	const status = c.env.funnel.gateway.getStatus();
 	if (!status.running) return c.text(renderYaml({ running: false }), 503);
-	const res = await fetch(`http://127.0.0.1:${status.port}/status`).catch(() => null);
+	const res = await fetch(`${gatewayLoopbackUrl(status.port)}/status`).catch(() => null);
 	if (!res) return c.text(renderYaml({
 		running: true,
 		pid: status.pid,
@@ -2756,6 +2764,16 @@ examples:
   funnel gateway start --no-caffeine
 
 programmable: funnel.gateway.start({ caffeinate })`;
+const HEALTH_TIMEOUT_MS = 5e3;
+const HEALTH_POLL_INTERVAL_MS = 100;
+const waitForHealth = async (port) => {
+	const deadline = Date.now() + HEALTH_TIMEOUT_MS;
+	while (Date.now() < deadline) {
+		if ((await fetch(`${gatewayLoopbackUrl(port)}/health`).catch(() => null))?.ok) return true;
+		await new Promise((resolve) => setTimeout(resolve, HEALTH_POLL_INTERVAL_MS));
+	}
+	return false;
+};
 const gatewayStartHandler = factory.createHandlers(helpGuard(startHelp), zValidator$1("query", z.object({ "no-caffeine": z.string().optional() })), async (c) => {
 	const query = c.req.valid("query");
 	const funnel = c.env.funnel;
@@ -2763,8 +2781,10 @@ const gatewayStartHandler = factory.createHandlers(helpGuard(startHelp), zValida
 		const status = funnel.gateway.getStatus();
 		return c.text(`funnel gateway: already running (pid ${status.pid})`);
 	}
-	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");
+	if (!await funnel.gateway.start({ caffeinate: query["no-caffeine"] !== "true" })) throw new HTTPException(500, { message: "funnel gateway: failed to start — inspect the daemon log with `fnl gateway logs`" });
+	const status = funnel.gateway.getStatus();
+	if (!await waitForHealth(status.port)) return c.text(`funnel gateway: started (pid ${status.pid}, port ${status.port}) but /health did not respond within ${HEALTH_TIMEOUT_MS / 1e3}s — check \`fnl gateway logs\``);
+	return c.text(`funnel gateway: started (pid ${status.pid}, port ${status.port})`);
 });
 const gatewayStatusHandler = factory.createHandlers(helpGuard(`funnel gateway status / show gateway running status
 
@@ -2854,7 +2874,12 @@ const profilesAddHandler = factory.createHandlers(zValidator$1("param", z.object
 	const funnel = c.env.funnel;
 	const { profiles, claude } = c.env;
 	const channel = funnel.channels.get(query.channel);
-	if (!channel) throw new HTTPException(400, { message: `channel "${query.channel}" not found` });
+	if (!channel) throw new HTTPException(400, { message: notFoundMessage({
+		kind: "channel",
+		name: query.channel,
+		available: funnel.channels.list().map((ch) => ch.name),
+		nextAction: "fnl channels add <name>"
+	}) });
 	const recipe = parseProfileRecipe(query);
 	profiles.add({
 		name: param.profile,
@@ -2917,7 +2942,12 @@ const profilesLaunchHandler = factory.createHandlers(zValidator$1("param", z.obj
 	c.env.funnel;
 	const { profiles, claude } = c.env;
 	const profile = profiles.get(param.profile);
-	if (!profile) throw new HTTPException(404, { message: `profile "${param.profile}" not found` });
+	if (!profile) throw new HTTPException(404, { message: notFoundMessage({
+		kind: "profile",
+		name: param.profile,
+		available: profiles.list().map((p) => p.name),
+		nextAction: "fnl profiles add <name> --path=<repo> --channel=<channel>"
+	}) });
 	const exitCode = await claude.launch({
 		channel: profile.channelId,
 		cwd: profile.path,
@@ -2977,7 +3007,12 @@ const profilesSetHandler = factory.createHandlers(zValidator$1("param", z.object
 	const funnel = c.env.funnel;
 	const { profiles, claude } = c.env;
 	const channel = query.channel !== void 0 ? funnel.channels.get(query.channel) : null;
-	if (query.channel !== void 0 && !channel) throw new HTTPException(400, { message: `channel "${query.channel}" not found` });
+	if (query.channel !== void 0 && !channel) throw new HTTPException(400, { message: notFoundMessage({
+		kind: "channel",
+		name: query.channel,
+		available: funnel.channels.list().map((ch) => ch.name),
+		nextAction: "fnl channels add <name>"
+	}) });
 	const recipe = parseProfileRecipe(query);
 	profiles.update(param.profile, {
 		path: query.path,
@@ -3053,7 +3088,7 @@ const statusHelp = `funnel status / overall health snapshot
 usage / funnel status [--watch] [--interval <N>]
 
 options:
-  --watch / continuously refresh (Ctrl+C to stop)
+  --watch / continuously refresh (default: off; Ctrl+C to stop)
   --interval <N> / polling interval in seconds (default 3)
 
 output / valid YAML
@@ -3078,7 +3113,7 @@ const buildStatusReport = async (funnel, profiles) => {
 	const gatewayStatus = funnel.gateway.getStatus();
 	let gatewayData = null;
 	if (gatewayStatus.running) {
-		const res = await fetch(`http://127.0.0.1:${gatewayStatus.port}/status`).catch(() => null);
+		const res = await fetch(`${gatewayLoopbackUrl(gatewayStatus.port)}/status`).catch(() => null);
 		if (res && res.ok) {
 			const body = await res.json();
 			if (isGatewayStatus(body)) gatewayData = body;
@@ -3099,6 +3134,7 @@ const buildStatusReport = async (funnel, profiles) => {
 	return {
 		gateway: gatewayStatus.running ? {
 			running: true,
+			responsive: gatewayData !== null,
 			pid: gatewayStatus.pid,
 			port: gatewayStatus.port,
 			uptimeMs: gatewayData?.uptimeMs ?? null
@@ -3125,16 +3161,12 @@ const buildStatusReport = async (funnel, profiles) => {
 	};
 };
 const statusHandler = factory.createHandlers(helpGuard(statusHelp), zValidator$1("query", z.object({
-	watch: z.enum([
-		"true",
-		"false",
-		""
-	]).optional(),
+	watch: booleanFlag,
 	interval: z.string().optional()
 })), async (c) => {
 	const query = c.req.valid("query");
 	const funnel = c.env.funnel;
-	const isWatch = query.watch === "true" || query.watch === "";
+	const isWatch = query.watch === true;
 	const intervalSec = Math.min(60, Math.max(1, query.interval ? Number(query.interval) : 3));
 	if (!isWatch) {
 		const report = await buildStatusReport(funnel, c.env.profiles);
@@ -3185,4 +3217,4 @@ const routes = factory.createApp().onError((error, c) => {
 	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("/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, FunnelConnectorAdapter, FunnelConnectorFactory, FunnelConnectorListener, FunnelDiagnostics, FunnelDocs, FunnelDoctor, FunnelEventLog, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelHttpClient, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLogger, FunnelProcessRunner, FunnelRecovery, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, MemoryConnectorDiagnosticLog, MemoryFunnelClock, MemoryFunnelEventLog, MemoryFunnelFileSystem, MemoryFunnelHttpClient, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelHttpClient, 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 };
+export { CONNECTOR_CONNECTION_STATUSES, ConnectorDiagnosticLog, ConnectorDiagnosticSqlReader, DEFAULT_GATEWAY_PORT, DEFAULT_GATEWAY_TOKEN_PATH, FUNNEL_DIR, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClock, FunnelConnectorAdapter, FunnelConnectorListener, FunnelConnectorRegistry, FunnelDiagnostics, FunnelDocs, FunnelDoctor, FunnelEventLog, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelHttpClient, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLogger, FunnelProcessRunner, FunnelRecovery, FunnelSettingsReader, FunnelSettingsStore, MemoryConnectorDiagnosticLog, MemoryFunnelClock, MemoryFunnelEventLog, MemoryFunnelFileSystem, MemoryFunnelHttpClient, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelHttpClient, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, SqliteConnectorDiagnosticLog, SqliteFunnelEventLog, baseConnectorConfigSchema, buildServiceRoutes, channelConfigSchema, channelDeliveryModeSchema, channelWsProtocols, channelWsUrl, routes as cliRoutes, connectorConnectionEventSchema, connectorProcessedEventSchema, connectorRawEventSchema, createSettings, factory, funnelEventSchema, gatewayLoopbackUrl, previewOf, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryRows, queryToCliArgs, resolveFunnelDir, resolveFunnelPort, settingsSchema, toDiagnosticConnectionError, toDiagnosticEvent, toRequest };