@interactive-inc/claude-funnel 0.52.0 → 0.55.0

package/dist/{local-config-json-schema-8IHjS4Q7.js → local-config-json-schema-DE1zkMcb.js}

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { z } from "zod";
 import { stderr, stdin } from "node:process";
-//#region lib/engine/local-config/local-config-schema.ts
+//#region lib/services/local-config/local-config-schema.ts
 /**
 * Per-repo launch config (`funnel.json`).
 *
@@ -79,7 +79,7 @@ const localConfigSchema = z.object({
 });
 const LOCAL_CONFIG_FILENAME = "funnel.json";
 //#endregion
-//#region lib/engine/local-config/local-config.ts
+//#region lib/services/local-config/local-config.ts
 /**
 * Reads `funnel.json` from a directory. Returns `null` when the file is
 * absent so callers can fall through to other resolution paths (default
@@ -122,6 +122,18 @@ var FunnelLocalConfig = class {
 	}
 };
 //#endregion
+//#region lib/engine/connectors/either-token.ts
+function botTokenSlot(slot) {
+	if (slot.env !== void 0) return { botTokenEnv: slot.env };
+	if (slot.literal !== void 0) return { botToken: slot.literal };
+	return {};
+}
+function appTokenSlot(slot) {
+	if (slot.env !== void 0) return { appTokenEnv: slot.env };
+	if (slot.literal !== void 0) return { appToken: slot.literal };
+	return {};
+}
+//#endregion
 //#region lib/engine/token-prompter/token-prompter.ts
 /**
 * Asks the user for a secret value on stdin. Used as a last resort when a
@@ -131,18 +143,22 @@ var FunnelLocalConfig = class {
 */
 var FunnelTokenPrompter = class {};
 //#endregion
-//#region lib/engine/local-config/local-config-sync.ts
+//#region lib/services/local-config/local-config-sync.ts
 /**
 * Reconciles a single funnel.json channel spec with `~/.funnel/settings.json`.
 * The spec is the source of truth for the channel it declares:
 *
 *   - missing channel → created
 *   - declared connector matched by name → tokens reconciled
-*   - declared connector matched by token in the same channel under a
-*     different name → renamed in place (then tokens reconciled)
-*   - declared connector with no match → added
+*   - declared connector with no name match → added (prompting for its tokens)
 *   - any connector left in the channel that the spec did not touch → removed
 *
+* Connectors are matched by NAME only — there is no rename-by-token path. A spec
+* that renames a connector (same token, new name) is reconciled as "add the new
+* name, remove the old one". Because the collision check runs at add time while
+* the old connector is still present, re-using its token at the new name throws
+* a token-collision error; remove the old connector via the CLI first.
+*
 * Removal only fires when the channel spec has a `connectors` field. An
 * absent field means "do not manage connectors from here" and leaves
 * everything in `~/.funnel` alone. Other channels in funnel.json (not
@@ -223,7 +239,14 @@ var FunnelLocalConfigSync = class {
 			id: this.channels.addConnector(channelName, {
 				type: "slack",
 				name: spec.name,
-				...update,
+				...botTokenSlot({
+					literal: bot.token,
+					env: bot.tokenEnv
+				}),
+				...appTokenSlot({
+					literal: app.token,
+					env: app.tokenEnv
+				}),
 				...spec.minify !== void 0 ? { minify: spec.minify } : {}
 			}).id,
 			name: spec.name,
@@ -260,7 +283,10 @@ var FunnelLocalConfigSync = class {
 			id: this.channels.addConnector(channelName, {
 				type: "discord",
 				name: spec.name,
-				...update
+				...botTokenSlot({
+					literal: bot.token,
+					env: bot.tokenEnv
+				})
 			}).id,
 			name: spec.name,
 			changed: true
@@ -421,7 +447,7 @@ var NodeFunnelTokenPrompter = class extends FunnelTokenPrompter {
 	}
 };
 //#endregion
-//#region lib/engine/local-config/local-config-json-schema.ts
+//#region lib/services/local-config/local-config-json-schema.ts
 /**
 * Generates the JSON Schema (draft 2020-12) for `funnel.json`. Useful for
 * `$schema` references in committed `funnel.json` files so editors can give

package/dist/{local-config-sync-BdsrDZOu.d.ts → local-config-sync-B8b04LrZ.d.ts}

@@ -1,13 +1,14 @@
-import { i as ChannelDeliveryMode, n as FunnelIdGenerator, r as ChannelConfig, t as FunnelSettingsReader } from "./settings-reader-BSU6JyvM.js";
-import { S as FunnelLogger, b as FunnelConnectorListener, o as ConnectorDiagnosticLog } from "./connector-diagnostic-log-yTOojKUR.js";
-import { r as FunnelProcessRunner } from "./process-runner-DfniuWVU.js";
-import { n as FunnelFileSystem } from "./file-system-BeOKXjlV.js";
-import { n as FunnelConnectorAdapter, t as CallInput } from "./connector-adapter-DKgsVuMH.js";
-import { a as ScheduleEntry, n as ScheduleOnFired } from "./schedule-listener-CUyUFFR1.js";
-import { n as SlackOnAppCreated, r as SlackPreprocessEvent } from "./slack-listener-Bv5xI9gC.js";
+import { n as ChannelDeliveryMode, t as ChannelConfig } from "./settings-schema-zhnMIa8I.js";
+import { n as FunnelIdGenerator, t as FunnelSettingsReader } from "./settings-reader-CBrgz01o.js";
+import { S as FunnelLogger, b as FunnelConnectorListener, o as ConnectorDiagnosticLog } from "./diagnostic-log-Bxe7Bbvw.js";
+import { r as FunnelProcessRunner } from "./process-runner-D5I_jhYQ.js";
+import { n as FunnelFileSystem } from "./file-system-Wub9Nto4.js";
+import { n as FunnelConnectorAdapter, t as CallInput } from "./connector-adapter-1PxjN-Uk.js";
+import { a as ScheduleEntry, n as ScheduleOnFired } from "./schedule-listener-DKh0hnkK.js";
+import { n as SlackOnAppCreated, r as SlackPreprocessEvent } from "./slack-listener-COQA8wAZ.js";
 import { z } from "zod";
 
-//#region lib/engine/local-config/local-config-schema.d.ts
+//#region lib/services/local-config/local-config-schema.d.ts
 declare const connectorSpecSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   type: z.ZodLiteral<"slack">;
   name: z.ZodString;
@@ -83,7 +84,7 @@ declare const localConfigSchema: z.ZodObject<{
 type LocalConfig = z.infer<typeof localConfigSchema>;
 declare const LOCAL_CONFIG_FILENAME = "funnel.json";
 //#endregion
-//#region lib/engine/local-config/local-config.d.ts
+//#region lib/services/local-config/local-config.d.ts
 type Deps$3 = {
   fs: FunnelFileSystem;
 };
@@ -100,7 +101,7 @@ declare class FunnelLocalConfig {
   private assertProfilesValid;
 }
 //#endregion
-//#region lib/connectors/connector-config-schema.d.ts
+//#region lib/engine/connectors/connector-config-schema.d.ts
 declare const connectorConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   id: z.ZodString;
   name: z.ZodString;
@@ -148,7 +149,28 @@ declare const connectorConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
 type ConnectorConfig = z.infer<typeof connectorConfigSchema>;
 type ConnectorType = ConnectorConfig["type"];
 //#endregion
-//#region lib/connectors/connector-factory.d.ts
+//#region lib/engine/connectors/either-token.d.ts
+/**
+ * A single connector token slot is supplied one of two non-empty ways, which
+ * are mutually exclusive, or left empty:
+ *
+ *   - the literal secret (`botToken: "xoxb-…"`)
+ *   - the *name* of an env var holding it (`botTokenEnv: "SLACK_BOT_TOKEN"`)
+ *   - neither — left for the CLI / TTY prompt to fill in at launch
+ *
+ * `EitherToken<"botToken", "botTokenEnv">` makes "both set at once" a compile
+ * error while still allowing "neither". Compose multiple slots with `&` (a slack
+ * connector intersects a bot slot and an app slot); the intersection keeps each
+ * slot independently exclusive without enumerating the cross-product.
+ *
+ * To build a value, use the slot helpers below (`botTokenSlot` etc.). They take
+ * a resolved `{ literal, env }` and return the exclusive shape. A generic
+ * builder can't: TS can't prove a `Record<Env, …>` omits the `Literal` key when
+ * both are free type params, so each helper fixes concrete key names instead.
+ */
+type EitherToken<Literal extends string, Env extends string> = (Partial<Record<Literal, string>> & Partial<Record<Env, never>>) | (Partial<Record<Literal, never>> & Partial<Record<Env, string>>);
+//#endregion
+//#region lib/engine/connectors/connector-factory.d.ts
 type SlackListenerOptions = {
   onAppCreated?: SlackOnAppCreated;
   preprocessEvent?: SlackPreprocessEvent;
@@ -224,24 +246,18 @@ type ChannelConnectorView = ConnectorConfig & {
   channelId: string;
   channelName: string;
 };
-type AddConnectorInput = {
+type AddConnectorInput = ({
   type: "slack";
   name: string;
-  botToken?: string;
-  appToken?: string;
-  botTokenEnv?: string;
-  appTokenEnv?: string;
   minify?: boolean;
-} | {
+} & EitherToken<"botToken", "botTokenEnv"> & EitherToken<"appToken", "appTokenEnv">) | {
   type: "gh";
   name: string;
   pollInterval?: number;
-} | {
+} | ({
   type: "discord";
   name: string;
-  botToken?: string;
-  botTokenEnv?: string;
-} | {
+} & EitherToken<"botToken", "botTokenEnv">) | {
   type: "schedule";
   name: string;
   entries?: ScheduleEntry[];
@@ -322,7 +338,7 @@ declare abstract class FunnelTokenPrompter {
   abstract promptSecret(label: string): Promise<string>;
 }
 //#endregion
-//#region lib/engine/local-config/local-config-sync.d.ts
+//#region lib/services/local-config/local-config-sync.d.ts
 type Deps = {
   channels: FunnelChannels;
   prompter: FunnelTokenPrompter;
@@ -341,11 +357,15 @@ type LocalConfigSyncResult = {
  *
  *   - missing channel → created
  *   - declared connector matched by name → tokens reconciled
- *   - declared connector matched by token in the same channel under a
- *     different name → renamed in place (then tokens reconciled)
- *   - declared connector with no match → added
+ *   - declared connector with no name match → added (prompting for its tokens)
  *   - any connector left in the channel that the spec did not touch → removed
  *
+ * Connectors are matched by NAME only — there is no rename-by-token path. A spec
+ * that renames a connector (same token, new name) is reconciled as "add the new
+ * name, remove the old one". Because the collision check runs at add time while
+ * the old connector is still present, re-using its token at the new name throws
+ * a token-collision error; remove the old connector via the CLI first.
+ *
  * Removal only fires when the channel spec has a `connectors` field. An
  * absent field means "do not manage connectors from here" and leaves
  * everything in `~/.funnel` alone. Other channels in funnel.json (not

package/dist/local-config.d.ts

@@ -1,3 +1,3 @@
-import { C as profileSpecSchema, S as localConfigSchema, _ as LOCAL_CONFIG_FILENAME, b as channelSpecSchema, g as ConnectorSpec, h as ChannelSpec, i as FunnelTokenPrompter, m as FunnelLocalConfig, n as FunnelLocalConfigSync, r as LocalConfigSyncResult, t as ConnectorSyncOutcome, v as LocalConfig, x as connectorSpecSchema, y as ProfileSpec } from "./local-config-sync-BdsrDZOu.js";
-import { i as funnelJsonSchema, n as NodeFunnelTokenPrompter, r as FunnelLocalConfigWriter, t as MemoryFunnelTokenPrompter } from "./memory-token-prompter-B5FFCsGP.js";
+import { C as profileSpecSchema, S as localConfigSchema, _ as LOCAL_CONFIG_FILENAME, b as channelSpecSchema, g as ConnectorSpec, h as ChannelSpec, i as FunnelTokenPrompter, m as FunnelLocalConfig, n as FunnelLocalConfigSync, r as LocalConfigSyncResult, t as ConnectorSyncOutcome, v as LocalConfig, x as connectorSpecSchema, y as ProfileSpec } from "./local-config-sync-B8b04LrZ.js";
+import { i as funnelJsonSchema, n as NodeFunnelTokenPrompter, r as FunnelLocalConfigWriter, t as MemoryFunnelTokenPrompter } from "./memory-token-prompter-Lo3YRDzq.js";
 export { ChannelSpec, ConnectorSpec, ConnectorSyncOutcome, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLocalConfigWriter, FunnelTokenPrompter, LOCAL_CONFIG_FILENAME, LocalConfig, LocalConfigSyncResult, MemoryFunnelTokenPrompter, NodeFunnelTokenPrompter, ProfileSpec, channelSpecSchema, connectorSpecSchema, funnelJsonSchema, localConfigSchema, profileSpecSchema };

package/dist/local-config.js

@@ -1,3 +1,3 @@
-import { a as FunnelLocalConfig, c as connectorSpecSchema, i as FunnelTokenPrompter, l as localConfigSchema, n as NodeFunnelTokenPrompter, o as LOCAL_CONFIG_FILENAME, r as FunnelLocalConfigSync, s as channelSpecSchema, t as funnelJsonSchema, u as profileSpecSchema } from "./local-config-json-schema-8IHjS4Q7.js";
-import { n as FunnelLocalConfigWriter, t as MemoryFunnelTokenPrompter } from "./memory-token-prompter-CLerGsgM.js";
+import { a as FunnelLocalConfig, c as connectorSpecSchema, i as FunnelTokenPrompter, l as localConfigSchema, n as NodeFunnelTokenPrompter, o as LOCAL_CONFIG_FILENAME, r as FunnelLocalConfigSync, s as channelSpecSchema, t as funnelJsonSchema, u as profileSpecSchema } from "./local-config-json-schema-DE1zkMcb.js";
+import { n as FunnelLocalConfigWriter, t as MemoryFunnelTokenPrompter } from "./memory-token-prompter-vBXxY20-.js";
 export { FunnelLocalConfig, FunnelLocalConfigSync, FunnelLocalConfigWriter, FunnelTokenPrompter, LOCAL_CONFIG_FILENAME, MemoryFunnelTokenPrompter, NodeFunnelTokenPrompter, channelSpecSchema, connectorSpecSchema, funnelJsonSchema, localConfigSchema, profileSpecSchema };

package/dist/{memory-connector-diagnostic-log-CrW1ltLM.js → memory-diagnostic-log-BZ1VD80X.js}

@@ -1,13 +1,14 @@
-import { n as NodeFunnelProcessRunner } from "./gh-connector-schema-o3Q1-ojL.js";
+import { n as NodeFunnelProcessRunner } from "./gh-connector-schema-DUcZgN2Q.js";
 import { t as NodeFunnelFileSystem } from "./node-file-system-BcrmWN9I.js";
-import { n as FUNNEL_DIR, o as resolveFunnelPort } from "./settings-store-D2XSXTyt.js";
+import { r as FUNNEL_DIR, s as resolveFunnelPort, t as gatewayLoopbackUrl } from "./gateway-base-url-6foMXfFf.js";
+import { t as ConnectorDiagnosticSqlReader } from "./diagnostic-sql-reader-CzYgZpq2.js";
 import { dirname, join } from "node:path";
 import { chmodSync, existsSync, mkdirSync } from "node:fs";
 import { z } from "zod";
 import { homedir, tmpdir } from "node:os";
+import { Database } from "bun:sqlite";
 import { timingSafeEqual } from "node:crypto";
 import { createFactory } from "hono/factory";
-import { Database } from "bun:sqlite";
 import { HTTPException } from "hono/http-exception";
 import { zValidator } from "@hono/zod-validator";
 //#region lib/engine/settings/tmp-dir.ts
@@ -65,7 +66,7 @@ var FunnelChannelPublisher = class {
 	async publish(channelName, request) {
 		if (!this.isDaemonRunning()) return OFFLINE;
 		try {
-			const url = `http://127.0.0.1:${this.port}/channels/${encodeURIComponent(channelName)}/publish`;
+			const url = `${gatewayLoopbackUrl(this.port)}/channels/${encodeURIComponent(channelName)}/publish`;
 			const res = await fetch(url, {
 				method: "POST",
 				headers: {
@@ -328,7 +329,7 @@ var FunnelBroadcaster = class {
 	}
 };
 //#endregion
-//#region lib/gateway/funnel-event-log.ts
+//#region lib/gateway/event-log/event-log.ts
 /**
 * Replayable event payload persisted by the gateway. Domain events the
 * broadcaster emits to WS clients land here so reconnects across daemon
@@ -647,7 +648,7 @@ function toRecord(row) {
 	};
 }
 //#endregion
-//#region lib/gateway/sqlite-funnel-event-log.ts
+//#region lib/gateway/event-log/sqlite-event-log.ts
 const MAX_CONTENT_CHARS = 2e3;
 /**
 * SQLite-backed `FunnelEventLog`. One indexed table holds every broadcaster
@@ -669,9 +670,11 @@ const MAX_CONTENT_CHARS = 2e3;
 var SqliteFunnelEventLog = class extends FunnelEventLog {
 	sink;
 	now;
+	logger;
 	constructor(props) {
 		super();
 		this.now = props.now ?? (() => Date.now());
+		this.logger = props.logger;
 		this.sink = new LeucoLoggerSqliteSink({
 			path: props.path,
 			indexes: ["channel_id", "connector_id"],
@@ -699,11 +702,15 @@ var SqliteFunnelEventLog = class extends FunnelEventLog {
 			connector_id: record.connectorId,
 			meta: record.meta
 		};
-		this.sink.write({
+		const result = this.sink.write({
 			seq: record.offset,
 			ts: this.now(),
 			event
 		});
+		if (result instanceof Error) this.logger?.error("event log write failed", {
+			offset: record.offset,
+			error: result.message
+		});
 	}
 	/**
 	* Returns events with offset > since. Filtering by channel/connector is
@@ -1040,10 +1047,18 @@ const zParam = (schema) => zValidator("param", schema, (result, c) => {
 });
 //#endregion
 //#region lib/gateway/routes/channels.connectors.call.ts
+const jsonValueSchema = z.lazy(() => z.union([
+	z.string(),
+	z.number(),
+	z.boolean(),
+	z.null(),
+	z.array(jsonValueSchema),
+	z.record(z.string(), jsonValueSchema)
+]));
 const bodySchema = z.object({
 	method: z.string().min(1),
 	path: z.string().min(1),
-	body: z.unknown().optional()
+	body: jsonValueSchema.optional()
 });
 /**
 * POST /channels/:channel/connectors/:connector/call
@@ -1064,7 +1079,7 @@ const channelsConnectorsCallHandler = factory.createHandlers(zParam(z.object({
 	const result = await c.var.deps.channels.call(param.channel, param.connector, {
 		method: parsed.data.method,
 		path: parsed.data.path,
-		body: parsed.data.body ?? {}
+		body: parsed.data.body
 	});
 	return c.json({
 		ok: true,
@@ -1111,87 +1126,6 @@ const channelsPublishHandler = factory.createHandlers(zParam(z.object({ channel:
 	return c.json(response);
 });
 //#endregion
-//#region lib/gateway/connector-diagnostic-sql-reader.ts
-/**
-* Read-only SQL surface over the three diagnostic tables, for Claude to query
-* the log with arbitrary `SELECT`s. It opens all files read-only and exposes
-* three views — `raw`, `processed`, `connection` — that hide the storage
-* details (the physical table is `leuco_log` and each row's columns live
-* inside a JSON `event` blob): the views surface the columns as plain fields,
-* with `payload` already pulled out of the nested JSON.
-*
-* The tables are separate files. `raw` and `processed` share an `event_id`,
-* so a `JOIN` answers "the event arrived, but what verdict did it get?";
-* `connection` answers the other half — "did the listener ever connect at
-* all?". Writes are impossible: the connection is read-only and `query`
-* rejects anything but a single `SELECT`.
-*/
-var ConnectorDiagnosticSqlReader = class {
-	db;
-	constructor(props) {
-		const db = new Database(props.rawPath, { readonly: true });
-		try {
-			db.run("PRAGMA busy_timeout = 500");
-			db.prepare("ATTACH DATABASE ? AS processeddb").run(props.processedPath);
-			db.prepare("ATTACH DATABASE ? AS connectiondb").run(props.connectionPath);
-			db.run(rawViewSql);
-			db.run(processedViewSql);
-			db.run(connectionViewSql);
-		} catch (error) {
-			db.close();
-			throw error;
-		}
-		this.db = db;
-		Object.freeze(this);
-	}
-	/**
-	* Run one read-only `SELECT` and return the rows. Returns an `Error` (rather
-	* than throwing) for a non-SELECT statement or a SQL error, so the caller
-	* can surface the message without a stack trace.
-	*/
-	query(sql, params = []) {
-		const trimmed = sql.trim().replace(/;$/, "").trim();
-		if (!/^select\b/i.test(trimmed)) return /* @__PURE__ */ new Error("only a single SELECT statement is allowed");
-		if (trimmed.includes(";")) return /* @__PURE__ */ new Error("only a single statement is allowed (remove the ';')");
-		try {
-			return this.db.prepare(trimmed).all(...params);
-		} catch (error) {
-			return error instanceof Error ? error : new Error(String(error));
-		}
-	}
-	close() {
-		this.db.close();
-	}
-};
-const rawViewSql = `CREATE TEMP VIEW raw AS SELECT
-  seq,
-  ts,
-  json_extract(event, '$.event_id')     AS event_id,
-  json_extract(event, '$.type')         AS type,
-  json_extract(event, '$.connector_id') AS connector_id,
-  json_extract(event, '$.channel_id')   AS channel_id,
-  json_extract(event, '$.payload')      AS payload
-FROM main.leuco_log`;
-const processedViewSql = `CREATE TEMP VIEW processed AS SELECT
-  seq,
-  ts,
-  json_extract(event, '$.event_id')     AS event_id,
-  json_extract(event, '$.type')         AS type,
-  json_extract(event, '$.connector_id') AS connector_id,
-  json_extract(event, '$.channel_id')   AS channel_id,
-  json_extract(event, '$.outcome')      AS outcome,
-  json_extract(event, '$.payload')      AS payload
-FROM processeddb.leuco_log`;
-const connectionViewSql = `CREATE TEMP VIEW connection AS SELECT
-  seq,
-  ts,
-  json_extract(event, '$.type')         AS type,
-  json_extract(event, '$.connector_id') AS connector_id,
-  json_extract(event, '$.channel_id')   AS channel_id,
-  json_extract(event, '$.status')       AS status,
-  json_extract(event, '$.detail')       AS detail
-FROM connectiondb.leuco_log`;
-//#endregion
 //#region lib/gateway/routes/debug.ts
 const extractPreview = (payload) => {
 	if (typeof payload !== "string" || payload.length === 0) return null;
@@ -1412,7 +1346,11 @@ const statusHandler = factory.createHandlers((c) => {
 //#endregion
 //#region lib/gateway/routes/index.ts
 function buildGatewayRoutes() {
-	return factory.createApp().get("/health", ...healthHandler).get("/status", ...statusHandler).get("/debug", ...debugHandler).get("/listeners", ...listenersListHandler).post("/listeners/:channel/:connector/start", ...listenersStartHandler).delete("/listeners/:channel/:connector", ...listenersStopHandler).post("/listeners/:channel/:connector/restart", ...listenersRestartHandler).post("/channels/:channel/connectors/:connector/call", ...channelsConnectorsCallHandler).post("/channels/:channel/publish", ...channelsPublishHandler);
+	return factory.createApp().onError((error, c) => {
+		if (error instanceof HTTPException) return error.getResponse();
+		const message = error instanceof Error ? error.message : String(error);
+		return c.json({ error: message }, 500);
+	}).get("/health", ...healthHandler).get("/status", ...statusHandler).get("/debug", ...debugHandler).get("/listeners", ...listenersListHandler).post("/listeners/:channel/:connector/start", ...listenersStartHandler).delete("/listeners/:channel/:connector", ...listenersStopHandler).post("/listeners/:channel/:connector/restart", ...listenersRestartHandler).post("/channels/:channel/connectors/:connector/call", ...channelsConnectorsCallHandler).post("/channels/:channel/publish", ...channelsPublishHandler);
 }
 const gatewayRoutes = buildGatewayRoutes();
 //#endregion
@@ -1448,6 +1386,7 @@ var FunnelGatewayServer = class {
 	dir;
 	killCompetingSlack;
 	token;
+	allowInsecureHost;
 	broadcaster;
 	eventLog;
 	supervisor;
@@ -1467,6 +1406,7 @@ var FunnelGatewayServer = class {
 		this.dir = deps.dir ?? FUNNEL_DIR;
 		this.killCompetingSlack = deps.killCompetingSlack ?? true;
 		this.token = deps.token ?? "";
+		this.allowInsecureHost = deps.allowInsecureHost ?? false;
 		this.extraRoutes = deps.extraRoutes ?? null;
 		const clock = deps.clock;
 		this.nowMs = clock ? () => clock.millis() : () => Date.now();
@@ -1476,7 +1416,8 @@ var FunnelGatewayServer = class {
 			if (!existsSync(dbDir)) mkdirSync(dbDir, { recursive: true });
 			this.eventLog = new SqliteFunnelEventLog({
 				path: this.dbPath,
-				now: this.nowMs
+				now: this.nowMs,
+				logger: this.logger
 			});
 		}
 		this.broadcaster = new FunnelBroadcaster({
@@ -1503,7 +1444,7 @@ var FunnelGatewayServer = class {
 	}
 	async start() {
 		if (this.server) return this.server;
-		if (!this.token && !LOOPBACK_HOSTS.has(this.hostname)) this.logger?.warn("gateway auth is disabled on a non-loopback bind — every endpoint is reachable without a token", { hostname: this.hostname });
+		if (!this.token && !LOOPBACK_HOSTS.has(this.hostname) && !this.allowInsecureHost) throw new Error(`refusing to start gateway: hostname "${this.hostname}" is reachable off-box but no token is set. Set a token, bind to loopback (127.0.0.1), or pass allowInsecureHost: true.`);
 		const app = this.buildApp();
 		this.startedAt = this.nowMs();
 		this.server = Bun.serve({
@@ -1714,7 +1655,7 @@ var FunnelGatewayServer = class {
 		return { offset: event.offset };
 	}
 	lookupChannelId(channelName) {
-		return this.channels.get(channelName)?.id ?? null;
+		return this.channels.get(channelName)?.id ?? this.channels.getById(channelName)?.id ?? null;
 	}
 	lookupConnectorId(channelId, connectorName) {
 		return this.channels.getById(channelId)?.connectors.find((c) => c.name === connectorName)?.id ?? null;
@@ -1775,7 +1716,28 @@ var FunnelGatewayToken = class {
 };
 const DEFAULT_GATEWAY_TOKEN_PATH = join(homedir(), ".funnel", TOKEN_FILE_NAME);
 //#endregion
-//#region lib/gateway/memory-funnel-event-log.ts
+//#region lib/gateway/channel-ws-url.ts
+function channelWsUrl(input) {
+	const url = new URL(input.base);
+	url.searchParams.set("channel", input.channel);
+	if (input.subscriberId !== void 0) url.searchParams.set("id", input.subscriberId);
+	if (input.since !== void 0) url.searchParams.set("since", String(input.since));
+	return url.toString();
+}
+/**
+* Builds the `Sec-WebSocket-Protocol` values that authenticate a gateway WS
+* upgrade. Browser `WebSocket` cannot set an `Authorization` header, so the
+* gateway also accepts the token as a `funnel.token.<token>` subprotocol.
+* Returns an empty array when no token is given (auth disabled / loopback).
+*
+* Usage: `new WebSocket(channelWsUrl({ base, channel }), channelWsProtocols(token))`
+*/
+function channelWsProtocols(token) {
+	if (!token) return [];
+	return [`funnel.token.${token}`];
+}
+//#endregion
+//#region lib/gateway/event-log/memory-event-log.ts
 /**
 * In-process `FunnelEventLog` backed by a plain array. Used by tests and by
 * embedders that do not need durability — replay works within the process
@@ -1818,7 +1780,7 @@ var MemoryFunnelEventLog = class extends FunnelEventLog {
 	close() {}
 };
 //#endregion
-//#region lib/gateway/connector-diagnostic-log.ts
+//#region lib/gateway/diagnostic-log/diagnostic-log.ts
 /**
 * Points in the listener's connection lifecycle. The single source of truth
 * for the value set: the `status` column schema, the `ConnectorConnectionStatus`
@@ -1909,7 +1871,7 @@ const connectorConnectionEventSchema = z.object({
 */
 var ConnectorDiagnosticLog = class {};
 //#endregion
-//#region lib/gateway/sqlite-connector-diagnostic-log.ts
+//#region lib/gateway/diagnostic-log/sqlite-diagnostic-log.ts
 /**
 * Cap on a raw payload kept verbatim. The point of the raw table is to see
 * what Slack/Discord actually sent, and a typical event is a few KB — so 256
@@ -2165,7 +2127,7 @@ const headFields = (payload) => {
 	}
 };
 //#endregion
-//#region lib/gateway/memory-connector-diagnostic-log.ts
+//#region lib/gateway/diagnostic-log/memory-diagnostic-log.ts
 /**
 * In-process `ConnectorDiagnosticLog` backed by one array per table. Used by tests
 * and embedders that do not need durability. Like the SQLite log it keeps
@@ -2242,4 +2204,4 @@ const takeRecent = (events, limit) => {
 	return events.slice(-limit);
 };
 //#endregion
-export { FunnelBroadcaster as _, connectorConnectionEventSchema as a, publishResponseSchema as b, MemoryFunnelEventLog as c, FunnelGatewayServer as d, ConnectorDiagnosticSqlReader as f, funnelEventSchema as g, FunnelEventLog as h, ConnectorDiagnosticLog as i, DEFAULT_GATEWAY_TOKEN_PATH as l, SqliteFunnelEventLog as m, SqliteConnectorDiagnosticLog as n, connectorProcessedEventSchema as o, FunnelListenerSupervisor as p, CONNECTOR_CONNECTION_STATUSES as r, connectorRawEventSchema as s, MemoryConnectorDiagnosticLog as t, FunnelGatewayToken as u, FunnelChannelPublisher as v, funnelTmpDir as x, publishRequestSchema as y };
+export { funnelTmpDir as C, publishResponseSchema as S, funnelEventSchema as _, connectorConnectionEventSchema as a, FunnelChannelPublisher as b, MemoryFunnelEventLog as c, DEFAULT_GATEWAY_TOKEN_PATH as d, FunnelGatewayToken as f, FunnelEventLog as g, SqliteFunnelEventLog as h, ConnectorDiagnosticLog as i, channelWsProtocols as l, FunnelListenerSupervisor as m, SqliteConnectorDiagnosticLog as n, connectorProcessedEventSchema as o, FunnelGatewayServer as p, CONNECTOR_CONNECTION_STATUSES as r, connectorRawEventSchema as s, MemoryConnectorDiagnosticLog as t, channelWsUrl as u, FunnelBroadcaster as v, publishRequestSchema as x, requireBearerToken as y };

package/dist/{memory-token-prompter-B5FFCsGP.d.ts → memory-token-prompter-Lo3YRDzq.d.ts}

@@ -1,7 +1,7 @@
-import { n as FunnelFileSystem } from "./file-system-BeOKXjlV.js";
-import { i as FunnelTokenPrompter } from "./local-config-sync-BdsrDZOu.js";
+import { n as FunnelFileSystem } from "./file-system-Wub9Nto4.js";
+import { i as FunnelTokenPrompter } from "./local-config-sync-B8b04LrZ.js";
 
-//#region lib/engine/local-config/local-config-json-schema.d.ts
+//#region lib/services/local-config/local-config-json-schema.d.ts
 /**
  * Generates the JSON Schema (draft 2020-12) for `funnel.json`. Useful for
  * `$schema` references in committed `funnel.json` files so editors can give
@@ -10,7 +10,7 @@ import { i as FunnelTokenPrompter } from "./local-config-sync-BdsrDZOu.js";
  */
 declare const funnelJsonSchema: () => Record<string, unknown>;
 //#endregion
-//#region lib/engine/local-config/local-config-writer.d.ts
+//#region lib/services/local-config/local-config-writer.d.ts
 type Deps = {
   fs: FunnelFileSystem;
 };

package/dist/{memory-token-prompter-CLerGsgM.js → memory-token-prompter-vBXxY20-.js}

@@ -1,6 +1,6 @@
-import { i as FunnelTokenPrompter, o as LOCAL_CONFIG_FILENAME } from "./local-config-json-schema-8IHjS4Q7.js";
+import { i as FunnelTokenPrompter, o as LOCAL_CONFIG_FILENAME } from "./local-config-json-schema-DE1zkMcb.js";
 import { join } from "node:path";
-//#region lib/engine/local-config/local-config-writer.ts
+//#region lib/services/local-config/local-config-writer.ts
 const isRecord = (value) => {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 };

package/dist/{profiles-f0mNmEyP.d.ts → profiles-EHTeCOqB.d.ts}

@@ -1,5 +1,6 @@
-import { a as ProfileConfig, n as FunnelIdGenerator, t as FunnelSettingsReader } from "./settings-reader-BSU6JyvM.js";
-import { n as FunnelFileSystem } from "./file-system-BeOKXjlV.js";
+import { r as ProfileConfig } from "./settings-schema-zhnMIa8I.js";
+import { n as FunnelIdGenerator, t as FunnelSettingsReader } from "./settings-reader-CBrgz01o.js";
+import { n as FunnelFileSystem } from "./file-system-Wub9Nto4.js";
 
 //#region lib/engine/profiles/profiles.d.ts
 type Deps = {

package/dist/profiles.d.ts

@@ -1,2 +1,2 @@
-import { t as FunnelProfiles } from "./profiles-f0mNmEyP.js";
+import { t as FunnelProfiles } from "./profiles-EHTeCOqB.js";
 export { FunnelProfiles };

package/dist/profiles.js

@@ -1,2 +1,2 @@
-import { t as FunnelProfiles } from "./profiles-wMRnjSid.js";
+import { t as FunnelProfiles } from "./profiles-MnXvYfZF.js";
 export { FunnelProfiles };

package/dist/recovery.d.ts

@@ -0,0 +1,2 @@
+import { a as RecoveryListenerControl, i as RecoveryGatewayControl, n as RecoveryAction, o as RecoveryResult, r as RecoveryChannelSource, t as FunnelRecovery } from "./funnel-recovery-BUBsu7WX.js";
+export { FunnelRecovery, RecoveryAction, RecoveryChannelSource, RecoveryGatewayControl, RecoveryListenerControl, RecoveryResult };

package/dist/recovery.js

@@ -0,0 +1,2 @@
+import { t as FunnelRecovery } from "./funnel-recovery-D9CxD5Zs.js";
+export { FunnelRecovery };

package/dist/{resolve-connector-token-BHmZLRrV.js → resolve-connector-token-CczqG_Ig.js}

@@ -1,4 +1,4 @@
-//#region lib/connectors/resolve-connector-token.ts
+//#region lib/engine/connectors/resolve-connector-token.ts
 /**
 * Resolves a connector token from either a literal value or the name of an env
 * var. A connector config carries one or the other per slot (see

package/dist/{schedule-connector-schema-iCI61gzU.js → schedule-connector-schema-B_xO5z5B.js}

@@ -1,5 +1,5 @@
 import { z } from "zod";
-//#region lib/connectors/schedule-connector-schema.ts
+//#region lib/engine/connectors/schedule-connector-schema.ts
 /**
 * Catch-up behavior when the daemon was down past one or more matching minutes.
 *