@interactive-inc/claude-funnel 0.10.1 → 0.15.2

package/dist/index.js

@@ -1,12 +1,13 @@
 import { i as FunnelDiscordAdapter, n as FunnelDiscordListener, t as discordConnectorSchema } from "./discord-connector-schema-ygf5Df-2.js";
 import { n as FunnelLogger, r as FunnelConnectorListener, t as NodeFunnelLogger } from "./node-logger-DQz_BGOD.js";
 import { a as FunnelProcessRunner, i as NodeFunnelProcessRunner, n as FunnelGhListener, r as FunnelGhAdapter, t as ghConnectorSchema } from "./gh-connector-schema-2ml29MBC.js";
-import { a as ScheduleStateStore, i as FunnelScheduleListener, n as scheduleConnectorSchema, o as NodeFunnelFileSystem, r as scheduleEntrySchema, s as FunnelFileSystem, t as scheduleCatchupPolicySchema } from "./schedule-connector-schema-CkuIQ0JQ.js";
-import { i as FunnelSlackAdapter, n as FunnelSlackListener, r as FunnelSlackEventProcessor, t as slackConnectorSchema } from "./slack-connector-schema-Cd22WiHB.js";
+import { a as ScheduleStateStore, i as FunnelScheduleListener, n as scheduleConnectorSchema, o as NodeFunnelFileSystem, r as scheduleEntrySchema, s as FunnelFileSystem, t as scheduleCatchupPolicySchema } from "./schedule-connector-schema-FxP7LPlx.js";
+import { i as FunnelSlackAdapter, n as FunnelSlackListener, r as FunnelSlackEventProcessor, t as slackConnectorSchema } from "./slack-connector-schema-B4hsf3AY.js";
 import { dirname, join, resolve } from "node:path";
 import { existsSync, mkdirSync, readFileSync } from "node:fs";
 import { z } from "zod";
 import { homedir } from "node:os";
+import { stderr, stdin } from "node:process";
 import { fileURLToPath } from "node:url";
 import { timingSafeEqual } from "node:crypto";
 import { createFactory } from "hono/factory";
@@ -133,23 +134,33 @@ const defaultLogger$5 = new NodeFunnelLogger();
 *
 * `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.
 */
 var FunnelConnectorFactory = class {
 	fs;
 	process;
 	logger;
 	dir;
+	slackListenerOptions;
+	scheduleListenerOptions;
 	constructor(deps = {}) {
 		this.fs = deps.fs ?? defaultFs$4;
 		this.process = deps.process ?? defaultProcess$3;
 		this.logger = deps.logger ?? defaultLogger$5;
 		this.dir = deps.dir ?? FUNNEL_DIR;
+		this.slackListenerOptions = deps.slackListenerOptions ?? {};
+		this.scheduleListenerOptions = deps.scheduleListenerOptions ?? {};
 		Object.freeze(this);
 	}
 	createListener(channelId, config) {
 		if (config.type === "slack") return new FunnelSlackListener({
 			config,
-			logger: this.logger
+			logger: this.logger,
+			onAppCreated: this.slackListenerOptions.onAppCreated,
+			preprocessEvent: this.slackListenerOptions.preprocessEvent
 		});
 		if (config.type === "gh") return new FunnelGhListener({
 			config,
@@ -166,7 +177,8 @@ var FunnelConnectorFactory = class {
 				path: join(this.connectorDir(channelId, config.id), "state.json"),
 				fs: this.fs
 			}),
-			logger: this.logger
+			logger: this.logger,
+			onFired: this.scheduleListenerOptions.onFired
 		});
 	}
 	createAdapter(config) {
@@ -556,7 +568,7 @@ var FunnelClaude = class {
 			this.installCleanup(options.profileName);
 		}
 		const claudeArgs = this.buildArgs(options, cwd);
-		const env = this.buildEnv(channel.id);
+		const env = this.buildEnv(channel.id, options.extraEnv);
 		this.logger.info(`claude launch`, {
 			channel: options.channel,
 			channelId: channel.id,
@@ -624,8 +636,9 @@ var FunnelClaude = class {
 		if (options.brief && !result.includes("--brief")) result.push("--brief");
 		return result;
 	}
-	buildEnv(channelId) {
+	buildEnv(channelId, extraEnv) {
 		const env = {};
+		if (extraEnv) for (const [key, value] of Object.entries(extraEnv)) env[key] = value;
 		for (const [key, value] of Object.entries(globalThis.process.env)) if (typeof value === "string") env[key] = value;
 		env.FUNNEL_CHANNEL_ID = channelId;
 		return env;
@@ -720,6 +733,332 @@ var MemoryFunnelIdGenerator = class extends FunnelIdGenerator {
 	}
 };
 //#endregion
+//#region lib/engine/local-config/local-config-schema.ts
+/**
+* Per-repo launch config (`funnel.json`).
+*
+* `fnl claude` reads this when no --profile / --channel is given and uses it
+* to set the channel binding, sub-agent, and brief flag. When `connectors`
+* is declared, missing channels/connectors are materialized into the local
+* `~/.funnel/settings.json` on launch.
+*
+* Token fields per connector resolve in this order:
+*
+*   1. Literal value at the field itself (e.g. `botToken: "xoxb-..."`)
+*   2. Env-var reference at `env.<field>` (e.g. `env: { botToken: "SLACK_BOT_TOKEN" }`);
+*      resolved from process.env first, then ./.env.local
+*   3. Field omitted everywhere → prompted for once on a TTY and persisted to
+*      `~/.funnel/settings.json`; non-TTY launches fail fast.
+*
+* `funnel.json` itself is never written to. Only `channel` is required.
+*/
+const slackEnvSchema = z.object({
+	botToken: z.string().optional(),
+	appToken: z.string().optional()
+}).optional();
+const slackConnectorSpecSchema = z.object({
+	type: z.literal("slack"),
+	name: z.string(),
+	botToken: z.string().optional(),
+	appToken: z.string().optional(),
+	env: slackEnvSchema
+});
+const discordEnvSchema = z.object({ botToken: z.string().optional() }).optional();
+const discordConnectorSpecSchema = z.object({
+	type: z.literal("discord"),
+	name: z.string(),
+	botToken: z.string().optional(),
+	env: discordEnvSchema
+});
+const ghConnectorSpecSchema = z.object({
+	type: z.literal("gh"),
+	name: z.string(),
+	pollInterval: z.number().int().positive().optional()
+});
+const scheduleConnectorSpecSchema = z.object({
+	type: z.literal("schedule"),
+	name: z.string()
+});
+const connectorSpecSchema = z.discriminatedUnion("type", [
+	slackConnectorSpecSchema,
+	discordConnectorSpecSchema,
+	ghConnectorSpecSchema,
+	scheduleConnectorSpecSchema
+]);
+const localConfigSchema = z.object({
+	$schema: z.string().optional(),
+	channel: z.string(),
+	/** Extra args forwarded to the claude CLI. Prepended before user-supplied CLI args so user args still win on collision (e.g. --model, --agent, --brief, --resume, positional session ids). */
+	options: z.array(z.string()).optional(),
+	env: z.record(z.string(), z.string()).optional(),
+	connectors: z.array(connectorSpecSchema).optional()
+});
+const LOCAL_CONFIG_FILENAME = "funnel.json";
+const LOCAL_ENV_FILENAME = ".env.local";
+//#endregion
+//#region lib/engine/local-config/dotenv-reader.ts
+const VARIABLE_LINE = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*?)\s*$/;
+const unquote = (value) => {
+	if (value.length < 2) return value;
+	const first = value[0];
+	const last = value[value.length - 1];
+	if (first === "\"" && last === "\"") return value.slice(1, -1);
+	if (first === "'" && last === "'") return value.slice(1, -1);
+	return value;
+};
+/**
+* Minimal `.env.local` parser. Supports `KEY=value` lines, blank lines, and
+* `#` comments. Strips matching surrounding single or double quotes. No
+* interpolation, no `export` prefix — anything fancier should live in a real
+* env file loaded by the shell.
+*/
+var FunnelDotenvReader = class {
+	fs;
+	constructor(deps) {
+		this.fs = deps.fs;
+		Object.freeze(this);
+	}
+	read(cwd) {
+		const path = join(cwd, LOCAL_ENV_FILENAME);
+		if (!this.fs.existsSync(path)) return {};
+		const raw = this.fs.readFileSync(path);
+		const out = {};
+		for (const line of raw.split("\n")) {
+			const trimmed = line.trim();
+			if (trimmed === "" || trimmed.startsWith("#")) continue;
+			const match = trimmed.match(VARIABLE_LINE);
+			if (!match) continue;
+			const key = match[1];
+			const value = match[2];
+			if (!key) continue;
+			out[key] = unquote(value ?? "");
+		}
+		return out;
+	}
+};
+//#endregion
+//#region lib/engine/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
+* profile, help). Throws on present-but-invalid files so misconfiguration
+* surfaces loudly instead of silently launching the wrong channel.
+*/
+var FunnelLocalConfig = class {
+	fs;
+	constructor(deps) {
+		this.fs = deps.fs;
+		Object.freeze(this);
+	}
+	read(cwd) {
+		const path = join(cwd, LOCAL_CONFIG_FILENAME);
+		if (!this.fs.existsSync(path)) return null;
+		const raw = this.fs.readFileSync(path);
+		const parsed = (() => {
+			try {
+				return JSON.parse(raw);
+			} catch (error) {
+				const message = error instanceof Error ? error.message : String(error);
+				throw new Error(`${LOCAL_CONFIG_FILENAME} is not valid JSON: ${message}`);
+			}
+		})();
+		const result = localConfigSchema.safeParse(parsed);
+		if (!result.success) throw new Error(`${LOCAL_CONFIG_FILENAME} is invalid: ${result.error.message}`);
+		return result.data;
+	}
+};
+//#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
+* funnel.json token field is absent and not present in `~/.funnel`. The Node
+* implementation refuses to prompt when stdin is not a TTY so non-interactive
+* launches (CI, agent spawning agent, daemons) fail fast instead of hanging.
+*/
+var FunnelTokenPrompter = class {};
+//#endregion
+//#region lib/engine/local-config/local-config-sync.ts
+/**
+* Reconciles a `funnel.json` 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
+*   - any connector left in the channel that the spec did not touch → removed
+*
+* Removal only fires when funnel.json has a `connectors` field. An absent
+* field means "do not manage connectors from here" and leaves everything in
+* `~/.funnel` alone.
+*/
+var FunnelLocalConfigSync = class {
+	channels;
+	dotenv;
+	prompter;
+	env;
+	constructor(deps) {
+		this.channels = deps.channels;
+		this.dotenv = deps.dotenv;
+		this.prompter = deps.prompter;
+		this.env = deps.env ?? process.env;
+		Object.freeze(this);
+	}
+	async ensure(local, cwd) {
+		if (!this.channels.get(local.channel)) this.channels.add({ name: local.channel });
+		if (local.connectors === void 0) return;
+		const dotenv = this.dotenv.read(cwd);
+		const touched = /* @__PURE__ */ new Set();
+		for (const spec of local.connectors) {
+			const id = await this.ensureConnector(local.channel, spec, dotenv);
+			touched.add(id);
+		}
+		this.removeExtras(local.channel, touched);
+	}
+	async ensureConnector(channelName, spec, dotenv) {
+		if (spec.type === "slack") return await this.ensureSlack(channelName, spec, dotenv);
+		if (spec.type === "discord") return await this.ensureDiscord(channelName, spec, dotenv);
+		if (spec.type === "gh") return this.ensureGh(channelName, spec);
+		return this.ensureSchedule(channelName, spec);
+	}
+	async ensureSlack(channelName, spec, dotenv) {
+		const byName = this.findExistingSlack(channelName, spec.name);
+		const botToken = await this.resolveField({
+			literal: spec.botToken,
+			envVar: spec.env?.botToken,
+			dotenv,
+			label: `${spec.name}.botToken`,
+			existing: byName?.botToken
+		});
+		const appToken = await this.resolveField({
+			literal: spec.appToken,
+			envVar: spec.env?.appToken,
+			dotenv,
+			label: `${spec.name}.appToken`,
+			existing: byName?.appToken
+		});
+		if (byName) {
+			if (byName.botToken !== botToken || byName.appToken !== appToken) this.channels.updateSlackConnector(channelName, spec.name, {
+				botToken,
+				appToken
+			});
+			return byName.id;
+		}
+		const byToken = this.findSlackByToken(channelName, [botToken, appToken]);
+		if (byToken) {
+			this.channels.renameConnector(channelName, byToken.name, spec.name);
+			if (byToken.botToken !== botToken || byToken.appToken !== appToken) this.channels.updateSlackConnector(channelName, spec.name, {
+				botToken,
+				appToken
+			});
+			return byToken.id;
+		}
+		return this.channels.addConnector(channelName, {
+			type: "slack",
+			name: spec.name,
+			botToken,
+			appToken
+		}).id;
+	}
+	async ensureDiscord(channelName, spec, dotenv) {
+		const byName = this.findExistingDiscord(channelName, spec.name);
+		const botToken = await this.resolveField({
+			literal: spec.botToken,
+			envVar: spec.env?.botToken,
+			dotenv,
+			label: `${spec.name}.botToken`,
+			existing: byName?.botToken
+		});
+		if (byName) {
+			if (byName.botToken !== botToken) this.channels.updateDiscordConnector(channelName, spec.name, { botToken });
+			return byName.id;
+		}
+		const byToken = this.findDiscordByToken(channelName, botToken);
+		if (byToken) {
+			this.channels.renameConnector(channelName, byToken.name, spec.name);
+			if (byToken.botToken !== botToken) this.channels.updateDiscordConnector(channelName, spec.name, { botToken });
+			return byToken.id;
+		}
+		return this.channels.addConnector(channelName, {
+			type: "discord",
+			name: spec.name,
+			botToken
+		}).id;
+	}
+	ensureGh(channelName, spec) {
+		const existing = this.channels.getConnector(channelName, spec.name);
+		if (existing && existing.type !== "gh") throw new Error(`connector "${spec.name}" exists in channel "${channelName}" with type "${existing.type}", funnel.json declares "gh"`);
+		if (existing && existing.type === "gh") {
+			if (spec.pollInterval !== void 0 && existing.pollInterval !== spec.pollInterval) this.channels.updateGhConnector(channelName, spec.name, { pollInterval: spec.pollInterval });
+			return existing.id;
+		}
+		return this.channels.addConnector(channelName, {
+			type: "gh",
+			name: spec.name,
+			...spec.pollInterval !== void 0 ? { pollInterval: spec.pollInterval } : {}
+		}).id;
+	}
+	ensureSchedule(channelName, spec) {
+		const existing = this.channels.getConnector(channelName, spec.name);
+		if (existing && existing.type !== "schedule") throw new Error(`connector "${spec.name}" exists in channel "${channelName}" with type "${existing.type}", funnel.json declares "schedule"`);
+		if (existing && existing.type === "schedule") return existing.id;
+		return this.channels.addConnector(channelName, {
+			type: "schedule",
+			name: spec.name
+		}).id;
+	}
+	findExistingSlack(channelName, connectorName) {
+		const existing = this.channels.getConnector(channelName, connectorName);
+		if (!existing) return null;
+		if (existing.type !== "slack") throw new Error(`connector "${connectorName}" exists in channel "${channelName}" with type "${existing.type}", funnel.json declares "slack"`);
+		return existing;
+	}
+	findExistingDiscord(channelName, connectorName) {
+		const existing = this.channels.getConnector(channelName, connectorName);
+		if (!existing) return null;
+		if (existing.type !== "discord") throw new Error(`connector "${connectorName}" exists in channel "${channelName}" with type "${existing.type}", funnel.json declares "discord"`);
+		return existing;
+	}
+	findSlackByToken(channelName, tokens) {
+		const channel = this.channels.get(channelName);
+		if (!channel) return null;
+		for (const connector of channel.connectors) {
+			if (connector.type !== "slack") continue;
+			if (tokens.includes(connector.botToken) || tokens.includes(connector.appToken)) return connector;
+		}
+		return null;
+	}
+	findDiscordByToken(channelName, token) {
+		const channel = this.channels.get(channelName);
+		if (!channel) return null;
+		for (const connector of channel.connectors) {
+			if (connector.type !== "discord") continue;
+			if (connector.botToken === token) return connector;
+		}
+		return null;
+	}
+	removeExtras(channelName, touched) {
+		const channel = this.channels.get(channelName);
+		if (!channel) return;
+		const stale = channel.connectors.filter((c) => !touched.has(c.id));
+		for (const connector of stale) this.channels.removeConnector(channelName, connector.name);
+	}
+	async resolveField(input) {
+		if (input.literal !== void 0 && input.envVar !== void 0) throw new Error(`${input.label} is set both as a literal and as env.${input.label.split(".").pop()}; pick one`);
+		if (input.literal !== void 0 && input.literal !== "") return input.literal;
+		if (input.envVar !== void 0 && input.envVar !== "") {
+			const fromProcessEnv = this.env[input.envVar];
+			if (fromProcessEnv) return fromProcessEnv;
+			const fromDotenv = input.dotenv[input.envVar];
+			if (fromDotenv) return fromDotenv;
+			throw new Error(`${input.label} references env var "${input.envVar}" but it is not set in process env or .env.local`);
+		}
+		if (input.existing) return input.existing;
+		return await this.prompter.promptSecret(input.label);
+	}
+};
+//#endregion
 //#region lib/engine/logger/memory-logger.ts
 var MemoryFunnelLogger = class extends FunnelLogger {
 	file = null;
@@ -977,6 +1316,73 @@ var FunnelProfiles = class {
 	}
 };
 //#endregion
+//#region lib/engine/token-prompter/node-token-prompter.ts
+const STAR = "*";
+const CR = "\r";
+const LF = "\n";
+const BACKSPACE = String.fromCharCode(8);
+const DEL = String.fromCharCode(127);
+const CTRL_C = String.fromCharCode(3);
+const CTRL_D = String.fromCharCode(4);
+/**
+* Reads a secret from stdin in raw mode. Echoes a `*` per byte so the user
+* can see progress without exposing the token. Refuses to prompt when stdin
+* is not a TTY — callers should surface the resulting error with a hint
+* pointing at the corresponding env var or CLI command.
+*/
+var NodeFunnelTokenPrompter = class extends FunnelTokenPrompter {
+	async promptSecret(label) {
+		if (!stdin.isTTY) throw new Error(`cannot prompt for "${label}": stdin is not a TTY. Set the matching env var or run \`fnl channels <ch> connectors add ...\` first.`);
+		stderr.write(`${label}: `);
+		const wasRaw = stdin.isRaw;
+		stdin.setRawMode(true);
+		stdin.resume();
+		try {
+			return await this.readSecret();
+		} finally {
+			stdin.setRawMode(wasRaw);
+			stdin.pause();
+			stderr.write(LF);
+		}
+	}
+	readSecret() {
+		return new Promise((resolve, reject) => {
+			let buffer = "";
+			const onData = (chunk) => {
+				for (const byte of chunk) {
+					const char = String.fromCharCode(byte);
+					if (char === LF || char === CR) {
+						stdin.off("data", onData);
+						resolve(buffer);
+						return;
+					}
+					if (char === CTRL_C) {
+						stdin.off("data", onData);
+						reject(/* @__PURE__ */ new Error("prompt cancelled"));
+						return;
+					}
+					if (char === CTRL_D) {
+						stdin.off("data", onData);
+						if (buffer.length === 0) reject(/* @__PURE__ */ new Error("prompt cancelled"));
+						else resolve(buffer);
+						return;
+					}
+					if (char === BACKSPACE || char === DEL) {
+						if (buffer.length > 0) {
+							buffer = buffer.slice(0, -1);
+							stderr.write("\b \b");
+						}
+						continue;
+					}
+					buffer += char;
+					stderr.write(STAR);
+				}
+			};
+			stdin.on("data", onData);
+		});
+	}
+};
+//#endregion
 //#region lib/engine/settings/mock-settings-reader.ts
 const createSettings = (partial = {}) => ({
 	version: 1,
@@ -1135,6 +1541,7 @@ var FunnelGateway = class {
 	process;
 	fs;
 	clock;
+	dir;
 	pidFile;
 	logDir;
 	gatewayLog;
@@ -1145,9 +1552,9 @@ var FunnelGateway = class {
 		this.process = deps.process ?? defaultProcess$1;
 		this.fs = deps.fs ?? defaultFs$1;
 		this.clock = deps.clock ?? defaultClock;
-		const baseDir = deps.dir ?? FUNNEL_DIR;
+		this.dir = deps.dir ?? FUNNEL_DIR;
 		this.tmpDir = deps.tmpDir ?? DEFAULT_TMP_DIR$1;
-		this.pidFile = join(baseDir, "gateway.pid");
+		this.pidFile = join(this.dir, "gateway.pid");
 		this.logDir = join(this.tmpDir, "events");
 		this.gatewayLog = join(this.tmpDir, "gateway.log");
 		this.port = deps.port ?? DEFAULT_PORT$1;
@@ -1186,7 +1593,7 @@ var FunnelGateway = class {
 		return this.isRunning();
 	}
 	buildStartCommand(gatewayScript, options = {}) {
-		return `nohup ${options.caffeinate !== false && globalThis.process.platform === "darwin" ? "caffeinate -i " : ""}bun ${gatewayScript} >> ${this.gatewayLog} 2>&1 &`;
+		return `nohup ${options.caffeinate !== false && globalThis.process.platform === "darwin" ? "caffeinate -i " : ""}bun ${gatewayScript} ${`funnel-gateway[${this.dir}]`} >> ${this.gatewayLog} 2>&1 &`;
 	}
 	async stop() {
 		const pid = this.readPid();
@@ -2087,12 +2494,15 @@ var FunnelListenerSupervisor = class FunnelListenerSupervisor {
 //#region lib/gateway/kill-competing-slack-gateways.ts
 const defaultProcess = new NodeFunnelProcessRunner();
 const defaultLogger$1 = new NodeFunnelLogger();
-const isBun = (args) => {
-	return args.includes("bun ") || /\/bun(\s|$)/.test(args);
-};
-const looksLikeSlackGateway = (args) => {
-	return /(gateway|bolt|slack)/i.test(args);
-};
+const titleFor = (dir) => `funnel-gateway[${dir}]`;
+/**
+* Kills other funnel daemon processes that share the SAME funnel home dir,
+* which is the only situation that causes a real conflict (duplicate Slack
+* Socket Mode connections with the same tokens). Daemons rooted at a
+* different `~/.funnel/` are left alone — they hold different tokens and
+* speak to different Slack apps. The daemon advertises its dir via
+* `process.title = "funnel-gateway[<dir>]"`, which this routine matches.
+*/
 const killCompetingSlackGateways = async (props) => {
 	const runner = props.process ?? defaultProcess;
 	const logger = props.logger ?? defaultLogger$1;
@@ -2103,6 +2513,7 @@ const killCompetingSlackGateways = async (props) => {
 		"pid=,args="
 	]);
 	if (result.exitCode !== 0) return [];
+	const expectedTitle = titleFor(props.dir);
 	const killed = [];
 	for (const raw of result.stdout.split("\n")) {
 		const line = raw.trim();
@@ -2113,8 +2524,7 @@ const killCompetingSlackGateways = async (props) => {
 		const args = match[2];
 		if (!Number.isInteger(pid) || pid <= 0) continue;
 		if (pid === props.selfPid) continue;
-		if (!isBun(args)) continue;
-		if (!looksLikeSlackGateway(args)) continue;
+		if (!args.includes(expectedTitle)) continue;
 		runner.kill(pid, "SIGTERM");
 		killed.push(pid);
 		logger.info("killed competing Slack gateway process", {
@@ -2306,12 +2716,14 @@ var FunnelGatewayServer = class {
 	process;
 	logger;
 	selfPid;
+	dir;
 	killCompetingSlack;
 	token;
 	broadcaster;
 	eventStore;
 	supervisor;
 	nowMs;
+	extraRoutes;
 	startedAt = null;
 	server = null;
 	constructor(deps) {
@@ -2322,8 +2734,10 @@ var FunnelGatewayServer = class {
 		this.process = deps.process;
 		this.logger = deps.logger ?? defaultLogger;
 		this.selfPid = deps.selfPid ?? globalThis.process.pid;
+		this.dir = deps.dir ?? FUNNEL_DIR;
 		this.killCompetingSlack = deps.killCompetingSlack ?? true;
 		this.token = deps.token ?? "";
+		this.extraRoutes = deps.extraRoutes ?? null;
 		const clock = deps.clock;
 		this.nowMs = clock ? () => clock.millis() : () => Date.now();
 		if (!existsSync(this.logDir)) mkdirSync(this.logDir, { recursive: true });
@@ -2485,7 +2899,7 @@ var FunnelGatewayServer = class {
 			base.use("/status", requireBearerToken({ expected: this.token }));
 			base.use("/channels/*", requireBearerToken({ expected: this.token }));
 		}
-		return base.route("/", gatewayRoutes);
+		return (this.extraRoutes ? base.route("/", this.extraRoutes) : base).route("/", gatewayRoutes);
 	}
 	/**
 	* Reads the bearer token from the WebSocket upgrade request. Accepts:
@@ -2515,6 +2929,7 @@ var FunnelGatewayServer = class {
 		if (this.killCompetingSlack && allConnectors.some((c) => c.type === "slack")) {
 			const killed = await killCompetingSlackGateways({
 				selfPid: this.selfPid,
+				dir: this.dir,
 				process: this.process,
 				logger: this.logger
 			});
@@ -2811,7 +3226,9 @@ var Funnel = class Funnel {
 			fs: this.fs,
 			process: this.process,
 			logger: this.logger,
-			dir: this.paths.dir
+			dir: this.paths.dir,
+			slackListenerOptions: this.props.slackListenerOptions,
+			scheduleListenerOptions: this.props.scheduleListenerOptions
 		});
 		return this.memos.factory;
 	}
@@ -2831,6 +3248,30 @@ var Funnel = class Funnel {
 		if (!this.memos.profiles) this.memos.profiles = new FunnelProfiles({ store: this.store });
 		return this.memos.profiles;
 	}
+	/** Reads `funnel.json` from a cwd. `fnl claude` consults it before falling back to the default profile. */
+	get localConfig() {
+		if (!this.memos.localConfig) this.memos.localConfig = new FunnelLocalConfig({ fs: this.fs });
+		return this.memos.localConfig;
+	}
+	/** Parses `.env.local` from a cwd (used by sync to back $VAR references). */
+	get dotenv() {
+		if (!this.memos.dotenv) this.memos.dotenv = new FunnelDotenvReader({ fs: this.fs });
+		return this.memos.dotenv;
+	}
+	/** Secret prompter. Defaults to a TTY-only stdin reader; tests inject MemoryFunnelTokenPrompter. */
+	get tokenPrompter() {
+		if (!this.memos.tokenPrompter) this.memos.tokenPrompter = this.props.tokenPrompter ?? new NodeFunnelTokenPrompter();
+		return this.memos.tokenPrompter;
+	}
+	/** Reconciles funnel.json's channel + connectors with `~/.funnel/settings.json` on launch. */
+	get localConfigSync() {
+		if (!this.memos.localConfigSync) this.memos.localConfigSync = new FunnelLocalConfigSync({
+			channels: this.channels,
+			dotenv: this.dotenv,
+			prompter: this.tokenPrompter
+		});
+		return this.memos.localConfigSync;
+	}
 	/** funnel MCP installer (writes/removes `.mcp.json` entries in target repos). */
 	get mcp() {
 		if (!this.memos.mcp) this.memos.mcp = new FunnelMcp({ fs: this.fs });
@@ -2917,7 +3358,8 @@ var Funnel = class Funnel {
 			clock: this.clock,
 			logger: this.logger,
 			killCompetingSlack: options.killCompetingSlack,
-			token: options.token ?? this.gatewayToken.ensure()
+			token: options.token ?? this.gatewayToken.ensure(),
+			extraRoutes: options.extraRoutes
 		});
 	}
 };
@@ -3104,6 +3546,41 @@ const startChannelServer = async (options = {}) => {
 	}).start();
 };
 //#endregion
+//#region lib/engine/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
+* autocomplete and validation for channel / subAgent / env / connectors[]
+* without anyone hand-maintaining a separate schema.
+*/
+const funnelJsonSchema = () => {
+	return {
+		...z.toJSONSchema(localConfigSchema, { target: "draft-2020-12" }),
+		title: "Funnel per-repo launch config",
+		description: "Used by `fnl claude` when no --profile / --channel is given. Declares the channel to subscribe to, optional sub-agent and brief flag, environment variables to layer under process.env, and optional connectors to materialize into ~/.funnel/settings.json on launch."
+	};
+};
+//#endregion
+//#region lib/engine/token-prompter/memory-token-prompter.ts
+/**
+* Pre-seeded answers keyed by prompt label. Tests configure the map up front;
+* unmapped labels throw so the test surfaces unexpected prompts loudly.
+*/
+var MemoryFunnelTokenPrompter = class extends FunnelTokenPrompter {
+	answers;
+	asked = [];
+	constructor(props = {}) {
+		super();
+		this.answers = new Map(Object.entries(props.answers ?? {}));
+	}
+	async promptSecret(label) {
+		this.asked.push(label);
+		const answer = this.answers.get(label);
+		if (answer === void 0) throw new Error(`no answer seeded for prompt "${label}"`);
+		return answer;
+	}
+};
+//#endregion
 //#region lib/cli/factory.ts
 const factory = createFactory();
 //#endregion
@@ -3598,16 +4075,23 @@ examples:
 const claudeHelp = `funnel claude — launch Claude Code
 
 usage:
-  funnel claude                          launch the default profile (first in the list)
+  funnel claude                          launch using funnel.json in cwd, or the default profile
   funnel claude -p <name>                launch a named profile
   funnel claude --profile <name>         (long form)
   funnel claude --channel <name>         raw launch (no profile, cwd = current dir)
+  funnel claude [...]                    any other argument is forwarded to the claude CLI
 
-options:
+resolution order when no --profile / --channel is given:
+  1. ./funnel.json in the current directory
+  2. the default profile (first entry in fnl profiles)
+
+funnel-specific options (everything else passes through to claude verbatim):
   -p, --profile      profile name to launch
   --channel          channel name (raw launch, ignored when --profile is given)
+  -h, --help         show this help
 
-Any other arguments are forwarded to the claude CLI.
+Positional args, unknown short flags (e.g. -c, -r), and claude's own flags
+(--agent, --resume, --model, --print, --output-format ...) are all forwarded.
 On launch the FUNNEL_CHANNEL_ID env var is set and MCP connects to the gateway.`;
 const RESERVED_KEYS$1 = ["profile", "channel"];
 const claudeHandler = factory.createHandlers(zValidator$1("query", z.object({
@@ -3616,25 +4100,48 @@ const claudeHandler = factory.createHandlers(zValidator$1("query", z.object({
 }).passthrough(), claudeHelp), async (c) => {
 	const query = c.req.valid("query");
 	const funnel = c.var.funnel;
+	const userArgs = queryToCliArgs(c.req.url, RESERVED_KEYS$1);
 	if (query.channel && !query.profile) {
 		const exitCode = await funnel.claude.launch({
 			channel: query.channel,
-			userArgs: queryToCliArgs(c.req.url, RESERVED_KEYS$1)
+			userArgs
 		});
 		process.exit(exitCode);
 	}
-	const profile = query.profile ? funnel.profiles.get(query.profile) : funnel.profiles.getDefault();
-	if (!profile) {
-		if (query.profile) throw new HTTPException(404, { message: `profile "${query.profile}" not found` });
-		return c.text(claudeHelp);
+	if (query.profile) {
+		const profile = funnel.profiles.get(query.profile);
+		if (!profile) throw new HTTPException(404, { message: `profile "${query.profile}" not found` });
+		const exitCode = await funnel.claude.launch({
+			channel: profile.channelId,
+			cwd: profile.path,
+			subAgent: profile.subAgent,
+			userArgs,
+			profileName: profile.name,
+			brief: profile.brief
+		});
+		process.exit(exitCode);
 	}
+	const cwd = process.cwd();
+	const local = funnel.localConfig.read(cwd);
+	if (local) {
+		await funnel.localConfigSync.ensure(local, cwd);
+		const exitCode = await funnel.claude.launch({
+			channel: local.channel,
+			cwd,
+			userArgs: [...local.options ?? [], ...userArgs],
+			extraEnv: local.env
+		});
+		process.exit(exitCode);
+	}
+	const defaultProfile = funnel.profiles.getDefault();
+	if (!defaultProfile) return c.text(claudeHelp);
 	const exitCode = await funnel.claude.launch({
-		channel: profile.channelId,
-		cwd: profile.path,
-		subAgent: profile.subAgent,
-		userArgs: queryToCliArgs(c.req.url, RESERVED_KEYS$1),
-		profileName: profile.name,
-		brief: profile.brief
+		channel: defaultProfile.channelId,
+		cwd: defaultProfile.path,
+		subAgent: defaultProfile.subAgent,
+		userArgs,
+		profileName: defaultProfile.name,
+		brief: defaultProfile.brief
 	});
 	process.exit(exitCode);
 });
@@ -3998,6 +4505,24 @@ examples:
 	});
 	return c.text(lines.join("\n"));
 });
+const schemaHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel schema — print the JSON Schema for funnel.json
+
+usage: funnel schema
+
+Outputs the draft 2020-12 JSON Schema describing the per-repo funnel.json
+file. Pipe it into a local file and reference it from funnel.json so editors
+can validate and autocomplete the config:
+
+  fnl schema > funnel.schema.json
+
+  # funnel.json
+  {
+    "$schema": "./funnel.schema.json",
+    "channel": "ops"
+  }`), async (c) => {
+	const schema = funnelJsonSchema();
+	return c.text(`${JSON.stringify(schema, null, 2)}\n`);
+});
 //#endregion
 //#region lib/cli/routes/status.ts
 const statusHelp = `funnel status — show overall connection status
@@ -4091,7 +4616,7 @@ const createCliApp = (funnel) => {
 		if (error instanceof HTTPException) return c.text(`error: ${error.message}`, error.status);
 		return c.text(`error: ${error instanceof Error ? error.message : String(error)}`, 400);
 	});
-	return base.get("/claude", ...claudeHandler).get("/channels", ...channelsGroupHandler).post("/channels/add", ...helpRoute(addHelp$3)).post("/channels/add/:channel", ...channelsAddHandler).post("/channels/remove", ...helpRoute(removeHelp$1)).post("/channels/remove/:channel", ...channelsRemoveHandler).post("/channels/rename/:channel/:newName", ...channelsRenameHandler).post("/channels/:channel/rename/:newName", ...channelsRenameHandler).post("/channels/rename", ...helpRoute(renameHelp$1)).post("/channels/:channel/rename", ...helpRoute(renameHelp$1)).post("/channels/:channel/set/delivery/:mode", ...channelsSetDeliveryHandler).post("/channels/publish", ...helpRoute(publishHelp)).post("/channels/:channel/publish", ...channelsPublishHandler).get("/channels/:channel", ...channelsShowHandler).get("/channels/:channel/connectors", ...channelsConnectorsGroupHandler).post("/channels/:channel/connectors/add", ...helpRoute(addHelp$2)).post("/channels/:channel/connectors/add/:connector", ...channelsConnectorsAddHandler).post("/channels/:channel/connectors/remove", ...helpRoute(removeHelp$3)).post("/channels/:channel/connectors/remove/:connector", ...channelsConnectorsRemoveHandler).post("/channels/:channel/connectors/set", ...helpRoute(setHelp$1)).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", ...helpRoute(renameHelp$2)).post("/channels/:channel/connectors/:connector/rename", ...helpRoute(renameHelp$2)).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", ...helpRoute(addHelp$1)).post("/channels/:channel/connectors/:connector/schedules/add/:id", ...channelsConnectorsSchedulesAddHandler).post("/channels/:channel/connectors/:connector/schedules/remove", ...helpRoute(removeHelp$2)).post("/channels/:channel/connectors/:connector/schedules/remove/:id", ...channelsConnectorsSchedulesRemoveHandler).get("/profiles", ...profilesGroupHandler).post("/profiles/add", ...helpRoute(addHelp)).post("/profiles/add/:profile", ...profilesAddHandler).post("/profiles/set", ...helpRoute(setHelp)).post("/profiles/set/:profile", ...profilesSetHandler).post("/profiles/remove", ...helpRoute(removeHelp)).post("/profiles/remove/:profile", ...profilesRemoveHandler).post("/profiles/rename/:profile/:newName", ...profilesRenameHandler).post("/profiles/:profile/rename/:newName", ...profilesRenameHandler).post("/profiles/rename", ...helpRoute(renameHelp)).post("/profiles/:profile/rename", ...helpRoute(renameHelp)).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/listeners", ...gatewayListenersHandler).get("/status", ...statusHandler).get("/update", ...updateHandler);
+	return base.get("/claude", ...claudeHandler).get("/channels", ...channelsGroupHandler).post("/channels/add", ...helpRoute(addHelp$3)).post("/channels/add/:channel", ...channelsAddHandler).post("/channels/remove", ...helpRoute(removeHelp$1)).post("/channels/remove/:channel", ...channelsRemoveHandler).post("/channels/rename/:channel/:newName", ...channelsRenameHandler).post("/channels/:channel/rename/:newName", ...channelsRenameHandler).post("/channels/rename", ...helpRoute(renameHelp$1)).post("/channels/:channel/rename", ...helpRoute(renameHelp$1)).post("/channels/:channel/set/delivery/:mode", ...channelsSetDeliveryHandler).post("/channels/publish", ...helpRoute(publishHelp)).post("/channels/:channel/publish", ...channelsPublishHandler).get("/channels/:channel", ...channelsShowHandler).get("/channels/:channel/connectors", ...channelsConnectorsGroupHandler).post("/channels/:channel/connectors/add", ...helpRoute(addHelp$2)).post("/channels/:channel/connectors/add/:connector", ...channelsConnectorsAddHandler).post("/channels/:channel/connectors/remove", ...helpRoute(removeHelp$3)).post("/channels/:channel/connectors/remove/:connector", ...channelsConnectorsRemoveHandler).post("/channels/:channel/connectors/set", ...helpRoute(setHelp$1)).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", ...helpRoute(renameHelp$2)).post("/channels/:channel/connectors/:connector/rename", ...helpRoute(renameHelp$2)).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", ...helpRoute(addHelp$1)).post("/channels/:channel/connectors/:connector/schedules/add/:id", ...channelsConnectorsSchedulesAddHandler).post("/channels/:channel/connectors/:connector/schedules/remove", ...helpRoute(removeHelp$2)).post("/channels/:channel/connectors/:connector/schedules/remove/:id", ...channelsConnectorsSchedulesRemoveHandler).get("/profiles", ...profilesGroupHandler).post("/profiles/add", ...helpRoute(addHelp)).post("/profiles/add/:profile", ...profilesAddHandler).post("/profiles/set", ...helpRoute(setHelp)).post("/profiles/set/:profile", ...profilesSetHandler).post("/profiles/remove", ...helpRoute(removeHelp)).post("/profiles/remove/:profile", ...profilesRemoveHandler).post("/profiles/rename/:profile/:newName", ...profilesRenameHandler).post("/profiles/:profile/rename/:newName", ...profilesRenameHandler).post("/profiles/rename", ...helpRoute(renameHelp)).post("/profiles/:profile/rename", ...helpRoute(renameHelp)).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/listeners", ...gatewayListenersHandler).get("/schema", ...schemaHandler).get("/status", ...statusHandler).get("/update", ...updateHandler);
 };
 /** CLI Hono app wired to a default `new Funnel()`. For embedding with a custom Funnel use `createCliApp`. */
 const app = createCliApp(new Funnel());
@@ -6306,4 +6831,4 @@ async function launchTui(funnel) {
 	});
 }
 //#endregion
-export { DEFAULT_GATEWAY_TOKEN_PATH, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelEventStore, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, MemoryFunnelClock, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, channelConfigSchema, channelDeliveryModeSchema, app as cliApp, connectorConfigSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, ghConnectorSchema, launchTui, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };
+export { DEFAULT_GATEWAY_TOKEN_PATH, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelDotenvReader, FunnelEventStore, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, LOCAL_CONFIG_FILENAME, LOCAL_ENV_FILENAME, MemoryFunnelClock, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, channelConfigSchema, channelDeliveryModeSchema, app as cliApp, connectorConfigSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, launchTui, localConfigSchema, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };