@interactive-inc/claude-funnel 0.40.0 → 0.49.0

package/dist/index.js

@@ -5,7 +5,7 @@ import { a as ScheduleStateStore, i as FunnelScheduleListener, n as scheduleConn
 import { i as FunnelSlackAdapter, n as FunnelSlackListener, r as FunnelSlackEventProcessor, t as slackConnectorSchema } from "./slack-connector-schema-DDbSGPZn.js";
 import { dirname, join, resolve } from "node:path";
 import { hc } from "hono/client";
-import { appendFileSync, chmodSync, existsSync, mkdirSync, readFileSync } from "node:fs";
+import { appendFileSync, chmodSync, existsSync, mkdirSync } from "node:fs";
 import { z } from "zod";
 import { homedir, tmpdir } from "node:os";
 import { stderr, stdin } from "node:process";
@@ -15,9 +15,6 @@ import { createFactory } from "hono/factory";
 import { Database } from "bun:sqlite";
 import { HTTPException } from "hono/http-exception";
 import { zValidator } from "@hono/zod-validator";
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 //#region lib/engine/id/id-generator.ts
 /**
 * ID generator boundary. Default NodeFunnelIdGenerator wraps `crypto.randomUUID()`;
@@ -125,7 +122,7 @@ function resolveFunnelPort() {
 }
 const FUNNEL_DIR = join(homedir(), ".funnel");
 const SETTINGS_PATH = join(FUNNEL_DIR, "settings.json");
-const defaultFs$5 = new NodeFunnelFileSystem();
+const defaultFs$6 = new NodeFunnelFileSystem();
 const defaultIdGenerator$2 = new NodeFunnelIdGenerator();
 var FunnelSettingsStore = class extends FunnelSettingsReader {
 	path;
@@ -134,7 +131,7 @@ var FunnelSettingsStore = class extends FunnelSettingsReader {
 	constructor(deps = {}) {
 		super();
 		this.path = deps.path ?? SETTINGS_PATH;
-		this.fs = deps.fs ?? defaultFs$5;
+		this.fs = deps.fs ?? defaultFs$6;
 		this.idGenerator = deps.idGenerator ?? defaultIdGenerator$2;
 		Object.freeze(this);
 	}
@@ -205,8 +202,8 @@ var FunnelSettingsStore = class extends FunnelSettingsReader {
 };
 //#endregion
 //#region lib/connectors/connector-factory.ts
-const defaultFs$4 = new NodeFunnelFileSystem();
-const defaultProcess$3 = new NodeFunnelProcessRunner();
+const defaultFs$5 = new NodeFunnelFileSystem();
+const defaultProcess$4 = new NodeFunnelProcessRunner();
 /**
 * Pure factory for per-type listeners and adapters. The factory has no CRUD
 * responsibility — connector configs live inside settings.json under their
@@ -228,8 +225,8 @@ var FunnelConnectorFactory = class {
 	slackListenerOptions;
 	scheduleListenerOptions;
 	constructor(deps = {}) {
-		this.fs = deps.fs ?? defaultFs$4;
-		this.process = deps.process ?? defaultProcess$3;
+		this.fs = deps.fs ?? defaultFs$5;
+		this.process = deps.process ?? defaultProcess$4;
 		this.logger = deps.logger;
 		this.diagnosticLog = deps.diagnosticLog;
 		this.dir = deps.dir ?? FUNNEL_DIR;
@@ -382,7 +379,7 @@ var FunnelChannels = class {
 	constructor(deps) {
 		this.store = deps.store;
 		this.factory = deps.factory;
-		this.profileChecker = deps.profileChecker;
+		this.profileChecker = deps.profileChecker ?? null;
 		this.clock = deps.clock ?? defaultClock$1;
 		this.idGenerator = deps.idGenerator ?? defaultIdGenerator$1;
 		Object.freeze(this);
@@ -420,7 +417,7 @@ var FunnelChannels = class {
 		const index = settings.channels.findIndex((c) => c.name === name);
 		if (index < 0) throw new Error(`channel "${name}" not found`);
 		const channel = settings.channels[index];
-		if (channel && this.profileChecker.hasChannelRef(channel.id)) throw new Error(`channel "${name}" is referenced by a profile`);
+		if (channel && this.profileChecker?.hasChannelRef(channel.id)) throw new Error(`channel "${name}" is referenced by a profile`);
 		settings.channels.splice(index, 1);
 		this.store.write(settings);
 	}
@@ -639,41 +636,38 @@ var FunnelChannels = class {
 };
 //#endregion
 //#region lib/engine/claude/claude.ts
-const defaultProcess$2 = new NodeFunnelProcessRunner();
-const defaultFs$3 = new NodeFunnelFileSystem();
+const defaultProcess$3 = new NodeFunnelProcessRunner();
 const defaultIdGenerator = new NodeFunnelIdGenerator();
 /**
 * Launches Claude Code with funnel pre-wired: ensures the gateway is running,
 * installs the funnel MCP into the target repo's `.mcp.json` if missing,
-* injects `FUNNEL_CHANNEL_ID` into the child env, and writes a per-profile
-* PID file to enforce singleton launches.
+* injects `FUNNEL_CHANNEL_ID` into the child env, and delegates singleton
+* enforcement to a ProcessGuard.
 */
 var FunnelClaude = class {
 	channels;
 	mcp;
 	gateway;
-	profiles;
+	sessions;
+	guard;
 	process;
-	fs;
 	idGenerator;
 	logger;
-	pidDir;
 	constructor(deps) {
 		this.channels = deps.channels;
 		this.mcp = deps.mcp;
 		this.gateway = deps.gateway;
-		this.profiles = deps.profiles;
-		this.process = deps.process ?? defaultProcess$2;
-		this.fs = deps.fs ?? defaultFs$3;
+		this.sessions = deps.sessions;
+		this.guard = deps.guard;
+		this.process = deps.process ?? defaultProcess$3;
 		this.idGenerator = deps.idGenerator ?? defaultIdGenerator;
 		this.logger = deps.logger;
-		this.pidDir = join(deps.dir ?? FUNNEL_DIR, "claude");
 		Object.freeze(this);
 	}
 	async launch(options) {
 		const channel = this.channels.get(options.channel) ?? this.channels.getById(options.channel);
 		if (!channel) throw new Error(`channel "${options.channel}" not found`);
-		if (options.profileId && this.isRunning(options.profileId)) throw new Error(`profile "${options.profileId}" is already running`);
+		if (options.profileId && this.guard.isRunning(options.profileId)) throw new Error(`profile "${options.profileId}" is already running`);
 		const cwd = options.cwd ?? globalThis.process.cwd();
 		if ((options.installMcp ?? true) && !this.mcp.findInstalledName(cwd)) {
 			this.mcp.install(cwd);
@@ -683,10 +677,7 @@ var FunnelClaude = class {
 			this.logger?.info(`starting gateway automatically`);
 			await this.gateway.start();
 		}
-		if (options.profileId) {
-			this.writePidFile(options.profileId);
-			this.installCleanup(options.profileId);
-		}
+		if (options.profileId) this.guard.acquire(options.profileId);
 		const session = (options.resume ?? false) && options.profileId ? this.resolveSession(options.profileId, cwd, options.userArgs ?? [], options.env ?? {}) : null;
 		const claudeArgs = this.buildArgs(options.options ?? [], options.userArgs ?? [], cwd, session);
 		const env = this.buildEnv(channel.id, options.env ?? {});
@@ -702,43 +693,9 @@ var FunnelClaude = class {
 				onSpawned: options.onSpawned
 			});
 		} finally {
-			if (options.profileId) this.removePidFile(options.profileId);
-		}
-	}
-	isRunning(profileId) {
-		const pid = this.readPid(profileId);
-		if (!pid) return false;
-		return this.isProcessAlive(pid);
-	}
-	pidPath(profileId) {
-		return join(this.pidDir, `${profileId}.pid`);
-	}
-	readPid(profileId) {
-		const path = this.pidPath(profileId);
-		if (!this.fs.existsSync(path)) return null;
-		try {
-			const content = this.fs.readFileSync(path).trim();
-			const pid = Number(content);
-			if (!pid || pid <= 0) return null;
-			return pid;
-		} catch {
-			return null;
+			if (options.profileId) this.guard.release(options.profileId);
 		}
 	}
-	writePidFile(profileId) {
-		this.fs.mkdirSync(this.pidDir, { recursive: true });
-		this.fs.writeFileSync(this.pidPath(profileId), String(globalThis.process.pid));
-	}
-	removePidFile(profileId) {
-		const path = this.pidPath(profileId);
-		if (this.fs.existsSync(path)) this.fs.unlink(path);
-	}
-	installCleanup(profileId) {
-		globalThis.process.once("exit", () => this.removePidFile(profileId));
-	}
-	isProcessAlive(pid) {
-		return this.process.isAlive(pid);
-	}
 	buildArgs(recipeOptions, userArgs, cwd, session) {
 		const result = [...recipeOptions, ...userArgs];
 		if (session !== null) if (session.mode === "resume") result.push("--resume", session.id);
@@ -772,31 +729,18 @@ var FunnelClaude = class {
 			if (arg === "--resume" || arg.startsWith("--resume=")) return null;
 			if (arg === "--session-id" || arg.startsWith("--session-id=")) return null;
 		}
-		const existing = this.profiles.getSessionId(profileId);
-		if (existing !== null && this.sessionFileExists(cwd, existing, recipeEnv)) return {
+		const existing = this.sessions.getSessionId(profileId);
+		if (existing !== null && this.sessions.sessionFileExists(cwd, existing, recipeEnv)) return {
 			id: existing,
 			mode: "resume"
 		};
 		const fresh = this.idGenerator.generate();
-		this.profiles.setSessionId(profileId, fresh);
+		this.sessions.setSessionId(profileId, fresh);
 		return {
 			id: fresh,
 			mode: "new"
 		};
 	}
-	/**
-	* Mirrors claude's session storage path
-	* (`<config-dir>/projects/<cwd-with-slashes-as-dashes>/<id>.jsonl`) to check
-	* whether a recorded session still exists AND is non-empty. Reads the same
-	* `CLAUDE_CONFIG_DIR` the child will run under so the check matches reality; a
-	* wrong guess can only ever produce a false negative (start fresh), never a
-	* bad resume.
-	*/
-	sessionFileExists(cwd, sessionId, recipeEnv) {
-		const path = join(recipeEnv.CLAUDE_CONFIG_DIR ?? globalThis.process.env.CLAUDE_CONFIG_DIR ?? join(homedir(), ".claude"), "projects", cwd.replace(/\//g, "-"), `${sessionId}.jsonl`);
-		if (!this.fs.existsSync(path)) return false;
-		return this.fs.readFileSync(path).trim().length > 0;
-	}
 	buildEnv(channelId, recipeEnv) {
 		const env = {};
 		for (const [key, value] of Object.entries(recipeEnv)) env[key] = value;
@@ -807,91 +751,47 @@ var FunnelClaude = class {
 	}
 };
 //#endregion
-//#region lib/engine/fs/memory-file-system.ts
-const SECRET_MODE = 384;
-var MemoryFunnelFileSystem = class extends FunnelFileSystem {
-	dirs;
-	files;
-	mtimes;
-	modes;
-	now;
-	constructor(props = {}) {
-		super();
-		this.dirs = new Set(props.dirs ?? []);
-		this.files = new Map(Object.entries(props.files ?? {}));
-		this.mtimes = new Map(Object.entries(props.mtimes ?? {}));
-		this.modes = new Map(Object.entries(props.modes ?? {}));
-		this.now = props.now ?? (() => Date.now());
-	}
-	existsSync(path) {
-		return this.dirs.has(path) || this.files.has(path);
-	}
-	readFileSync(path) {
-		return this.files.get(path) ?? "";
-	}
-	writeFileSync(path, data) {
-		this.files.set(path, data);
-		this.touch(path);
+//#region lib/engine/claude/file-process-guard.ts
+const defaultFs$4 = new NodeFunnelFileSystem();
+const defaultProcess$2 = new NodeFunnelProcessRunner();
+var FileProcessGuard = class {
+	fs;
+	process;
+	pidDir;
+	constructor(deps = {}) {
+		this.fs = deps.fs ?? defaultFs$4;
+		this.process = deps.process ?? defaultProcess$2;
+		this.pidDir = join(deps.dir ?? FUNNEL_DIR, "claude");
+		Object.freeze(this);
 	}
-	writeSecretFileSync(path, data) {
-		this.files.set(path, data);
-		this.modes.set(path, SECRET_MODE);
-		this.touch(path);
+	isRunning(profileId) {
+		const pid = this.readPid(profileId);
+		if (!pid) return false;
+		return this.process.isAlive(pid);
 	}
-	appendFileSync(path, data) {
-		const prev = this.files.get(path) ?? "";
-		this.files.set(path, prev + data);
-		this.touch(path);
+	acquire(profileId) {
+		this.fs.mkdirSync(this.pidDir, { recursive: true });
+		this.fs.writeFileSync(this.pidPath(profileId), String(globalThis.process.pid));
+		globalThis.process.once("exit", () => this.release(profileId));
 	}
-	unlink(path) {
-		this.files.delete(path);
-		this.mtimes.delete(path);
-		this.modes.delete(path);
+	release(profileId) {
+		const path = this.pidPath(profileId);
+		if (this.fs.existsSync(path)) this.fs.unlink(path);
 	}
-	mkdirSync(path, options) {
-		this.dirs.add(path);
+	pidPath(profileId) {
+		return join(this.pidDir, `${profileId}.pid`);
 	}
-	readdirSync(path) {
-		const prefix = path.endsWith("/") ? path : `${path}/`;
-		const names = [];
-		for (const file of this.files.keys()) {
-			if (!file.startsWith(prefix)) continue;
-			const rest = file.slice(prefix.length);
-			if (!rest.includes("/")) names.push(rest);
+	readPid(profileId) {
+		const path = this.pidPath(profileId);
+		if (!this.fs.existsSync(path)) return null;
+		try {
+			const content = this.fs.readFileSync(path).trim();
+			const pid = Number(content);
+			if (!pid || pid <= 0) return null;
+			return pid;
+		} catch {
+			return null;
 		}
-		return names;
-	}
-	statSync(path) {
-		const mtimeMs = this.mtimes.get(path);
-		if (mtimeMs === void 0) throw new Error(`not found: ${path}`);
-		return {
-			mtimeMs,
-			mode: this.modes.get(path) ?? null
-		};
-	}
-	setMtime(path, mtimeMs) {
-		this.mtimes.set(path, mtimeMs);
-	}
-	setMode(path, mode) {
-		this.modes.set(path, mode);
-	}
-	touch(path) {
-		if (!this.mtimes.has(path)) this.mtimes.set(path, this.now());
-		else this.mtimes.set(path, this.now());
-	}
-};
-//#endregion
-//#region lib/engine/id/memory-id-generator.ts
-var MemoryFunnelIdGenerator = class extends FunnelIdGenerator {
-	counter = 0;
-	prefix;
-	constructor(props = {}) {
-		super();
-		this.prefix = props.prefix ?? "id";
-	}
-	generate() {
-		this.counter++;
-		return `${this.prefix}-${this.counter}`;
 	}
 };
 //#endregion
@@ -1247,85 +1147,13 @@ var FunnelLocalConfigSync = class {
 		};
 	}
 };
-//#endregion
-//#region lib/engine/local-config/local-config-writer.ts
-const isRecord = (value) => {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-};
-const withIdFirst = (config, id) => {
-	const ordered = {};
-	if (config.$schema !== void 0) ordered.$schema = config.$schema;
-	ordered.id = id;
-	for (const key of Object.keys(config)) {
-		if (key === "$schema" || key === "id") continue;
-		ordered[key] = config[key];
-	}
-	return ordered;
-};
-/**
-* The one path that mutates the repo-committed funnel.json, and it only ever
-* inserts `id`. On first launch a repo has no `id`; funnel generates one and
-* writes it back here so future launches resolve the same `~/.funnel/projects/<id>/`.
-* Idempotent — a no-op once `id` is present. Kept separate from the read-only
-* FunnelLocalConfig so reads stay side-effect free.
-*/
-var FunnelLocalConfigWriter = class {
-	fs;
-	constructor(deps) {
-		this.fs = deps.fs;
-		Object.freeze(this);
-	}
-	ensureId(cwd, id) {
-		const path = join(cwd, LOCAL_CONFIG_FILENAME);
-		if (!this.fs.existsSync(path)) return;
-		const parsed = JSON.parse(this.fs.readFileSync(path));
-		if (!isRecord(parsed)) return;
-		if (typeof parsed.id === "string" && parsed.id !== "") return;
-		const ordered = withIdFirst(parsed, id);
-		this.fs.writeFileSync(path, `${JSON.stringify(ordered, null, 2)}\n`);
-	}
-};
-//#endregion
-//#region lib/engine/logger/memory-logger.ts
-var MemoryFunnelLogger = class extends FunnelLogger {
-	file = null;
-	entries = [];
-	info(message, meta) {
-		this.entries.push({
-			level: "info",
-			message,
-			meta
-		});
-	}
-	warn(message, meta) {
-		this.entries.push({
-			level: "warn",
-			message,
-			meta
-		});
-	}
-	error(message, meta) {
-		this.entries.push({
-			level: "error",
-			message,
-			meta
-		});
-	}
-	clear() {
-		this.entries.length = 0;
-	}
-};
-//#endregion
-//#region lib/engine/mcp/mcp.ts
-const FUNNEL_MCP_COMMAND = "bun";
 const FUNNEL_MCP_ARGS = ["funnel", "mcp"];
-const FUNNEL_MCP_NAME = "funnel";
 const mcpEntrySchema = z.object({
 	command: z.string().optional(),
 	args: z.array(z.string()).optional()
 });
 const mcpConfigSchema = z.object({ mcpServers: z.record(z.string(), mcpEntrySchema).optional() });
-const defaultFs$2 = new NodeFunnelFileSystem();
+const defaultFs$3 = new NodeFunnelFileSystem();
 /**
 * Installs/uninstalls the funnel MCP entry into a target repository's
 * `.mcp.json`. Detects an existing entry by command match so renaming is
@@ -1334,7 +1162,7 @@ const defaultFs$2 = new NodeFunnelFileSystem();
 var FunnelMcp = class {
 	fs;
 	constructor(deps = {}) {
-		this.fs = deps.fs ?? defaultFs$2;
+		this.fs = deps.fs ?? defaultFs$3;
 		Object.freeze(this);
 	}
 	install(repoPath) {
@@ -1403,107 +1231,8 @@ var FunnelMcp = class {
 	}
 };
 //#endregion
-//#region lib/engine/process/memory-process-runner.ts
-const empty = {
-	exitCode: 0,
-	stdout: "",
-	stderr: ""
-};
-var MemoryFunnelProcessRunner = class extends FunnelProcessRunner {
-	calls = [];
-	killed = [];
-	handler = () => empty;
-	syncHandler = () => empty;
-	aliveStub = null;
-	listStub = null;
-	on(handler) {
-		this.handler = handler;
-		return this;
-	}
-	onSync(handler) {
-		this.syncHandler = handler;
-		return this;
-	}
-	onIsAlive(stub) {
-		this.aliveStub = stub;
-		return this;
-	}
-	onListProcessesContaining(stub) {
-		this.listStub = stub;
-		return this;
-	}
-	async run(command, options = {}) {
-		this.calls.push({
-			kind: "run",
-			command,
-			options
-		});
-		const result = await this.handler(command);
-		return {
-			exitCode: result.exitCode ?? 0,
-			stdout: result.stdout ?? "",
-			stderr: result.stderr ?? ""
-		};
-	}
-	runSync(command) {
-		this.calls.push({
-			kind: "runSync",
-			command
-		});
-		const result = this.syncHandler(command);
-		return {
-			exitCode: result.exitCode ?? 0,
-			stdout: result.stdout ?? "",
-			stderr: result.stderr ?? ""
-		};
-	}
-	async attach(command, options = {}) {
-		this.calls.push({
-			kind: "attach",
-			command,
-			options
-		});
-		if (options.onSpawned) options.onSpawned(1);
-		return (await this.handler(command)).exitCode ?? 0;
-	}
-	detach(command, options = {}) {
-		this.calls.push({
-			kind: "detach",
-			command,
-			options
-		});
-	}
-	kill(pid, signal = "SIGTERM") {
-		this.calls.push({
-			kind: "kill",
-			command: [String(pid), signal]
-		});
-		this.killed.push({
-			pid,
-			signal
-		});
-	}
-	isAlive(pid) {
-		if (this.aliveStub) return this.aliveStub(pid);
-		const result = this.syncHandler([
-			"ps",
-			"-p",
-			String(pid),
-			"-o",
-			"state="
-		]);
-		if ((result.exitCode ?? 0) !== 0) return false;
-		const state = (result.stdout ?? "").trim();
-		if (!state) return false;
-		return !state.startsWith("Z");
-	}
-	listProcessesContaining(marker) {
-		if (this.listStub) return this.listStub(marker);
-		return [];
-	}
-};
-//#endregion
 //#region lib/engine/profiles/profiles.ts
+const defaultFs$2 = new NodeFunnelFileSystem();
 /**
 * Named launch presets for `fnl claude`. Each profile bundles a working
 * directory, the channel id its Claude instance subscribes to, and the launch
@@ -1524,9 +1253,11 @@ var MemoryFunnelProcessRunner = class extends FunnelProcessRunner {
 var FunnelProfiles = class {
 	store;
 	idGenerator;
+	fs;
 	constructor(deps) {
 		this.store = deps.store;
 		this.idGenerator = deps.idGenerator;
+		this.fs = deps.fs ?? defaultFs$2;
 		Object.freeze(this);
 	}
 	list() {
@@ -1596,6 +1327,19 @@ var FunnelProfiles = class {
 		profile.sessionId = sessionId;
 		this.store.write(settings);
 	}
+	/**
+	* Mirrors claude's session storage path
+	* (`<config-dir>/projects/<cwd-with-slashes-as-dashes>/<id>.jsonl`) to check
+	* whether a recorded session still exists AND is non-empty. Reads the same
+	* `CLAUDE_CONFIG_DIR` the child will run under so the check matches reality; a
+	* wrong guess can only ever produce a false negative (start fresh), never a
+	* bad resume.
+	*/
+	sessionFileExists(cwd, sessionId, env) {
+		const path = join(env.CLAUDE_CONFIG_DIR ?? globalThis.process.env.CLAUDE_CONFIG_DIR ?? join(homedir(), ".claude"), "projects", cwd.replace(/\//g, "-"), `${sessionId}.jsonl`);
+		if (!this.fs.existsSync(path)) return false;
+		return this.fs.readFileSync(path).trim().length > 0;
+	}
 	update(name, fields) {
 		const settings = this.store.read();
 		const profile = settings.profiles.find((p) => p.name === name);
@@ -1641,42 +1385,260 @@ var NodeFunnelTokenPrompter = class extends FunnelTokenPrompter {
 			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);
+	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/fs/memory-file-system.ts
+const SECRET_MODE = 384;
+var MemoryFunnelFileSystem = class extends FunnelFileSystem {
+	dirs;
+	files;
+	mtimes;
+	modes;
+	now;
+	constructor(props = {}) {
+		super();
+		this.dirs = new Set(props.dirs ?? []);
+		this.files = new Map(Object.entries(props.files ?? {}));
+		this.mtimes = new Map(Object.entries(props.mtimes ?? {}));
+		this.modes = new Map(Object.entries(props.modes ?? {}));
+		this.now = props.now ?? (() => Date.now());
+	}
+	existsSync(path) {
+		return this.dirs.has(path) || this.files.has(path);
+	}
+	readFileSync(path) {
+		return this.files.get(path) ?? "";
+	}
+	writeFileSync(path, data) {
+		this.files.set(path, data);
+		this.touch(path);
+	}
+	writeSecretFileSync(path, data) {
+		this.files.set(path, data);
+		this.modes.set(path, SECRET_MODE);
+		this.touch(path);
+	}
+	appendFileSync(path, data) {
+		const prev = this.files.get(path) ?? "";
+		this.files.set(path, prev + data);
+		this.touch(path);
+	}
+	unlink(path) {
+		this.files.delete(path);
+		this.mtimes.delete(path);
+		this.modes.delete(path);
+	}
+	mkdirSync(path, options) {
+		this.dirs.add(path);
+	}
+	readdirSync(path) {
+		const prefix = path.endsWith("/") ? path : `${path}/`;
+		const names = [];
+		for (const file of this.files.keys()) {
+			if (!file.startsWith(prefix)) continue;
+			const rest = file.slice(prefix.length);
+			if (!rest.includes("/")) names.push(rest);
+		}
+		return names;
+	}
+	statSync(path) {
+		const mtimeMs = this.mtimes.get(path);
+		if (mtimeMs === void 0) throw new Error(`not found: ${path}`);
+		return {
+			mtimeMs,
+			mode: this.modes.get(path) ?? null
+		};
+	}
+	setMtime(path, mtimeMs) {
+		this.mtimes.set(path, mtimeMs);
+	}
+	setMode(path, mode) {
+		this.modes.set(path, mode);
+	}
+	touch(path) {
+		if (!this.mtimes.has(path)) this.mtimes.set(path, this.now());
+		else this.mtimes.set(path, this.now());
+	}
+};
+//#endregion
+//#region lib/engine/id/memory-id-generator.ts
+var MemoryFunnelIdGenerator = class extends FunnelIdGenerator {
+	counter = 0;
+	prefix;
+	constructor(props = {}) {
+		super();
+		this.prefix = props.prefix ?? "id";
+	}
+	generate() {
+		this.counter++;
+		return `${this.prefix}-${this.counter}`;
+	}
+};
+//#endregion
+//#region lib/engine/logger/memory-logger.ts
+var MemoryFunnelLogger = class extends FunnelLogger {
+	file = null;
+	entries = [];
+	info(message, meta) {
+		this.entries.push({
+			level: "info",
+			message,
+			meta
+		});
+	}
+	warn(message, meta) {
+		this.entries.push({
+			level: "warn",
+			message,
+			meta
+		});
+	}
+	error(message, meta) {
+		this.entries.push({
+			level: "error",
+			message,
+			meta
+		});
+	}
+	clear() {
+		this.entries.length = 0;
+	}
+};
+//#endregion
+//#region lib/engine/process/memory-process-runner.ts
+const empty = {
+	exitCode: 0,
+	stdout: "",
+	stderr: ""
+};
+var MemoryFunnelProcessRunner = class extends FunnelProcessRunner {
+	calls = [];
+	killed = [];
+	handler = () => empty;
+	syncHandler = () => empty;
+	aliveStub = null;
+	listStub = null;
+	on(handler) {
+		this.handler = handler;
+		return this;
+	}
+	onSync(handler) {
+		this.syncHandler = handler;
+		return this;
+	}
+	onIsAlive(stub) {
+		this.aliveStub = stub;
+		return this;
+	}
+	onListProcessesContaining(stub) {
+		this.listStub = stub;
+		return this;
+	}
+	async run(command, options = {}) {
+		this.calls.push({
+			kind: "run",
+			command,
+			options
+		});
+		const result = await this.handler(command);
+		return {
+			exitCode: result.exitCode ?? 0,
+			stdout: result.stdout ?? "",
+			stderr: result.stderr ?? ""
+		};
+	}
+	runSync(command) {
+		this.calls.push({
+			kind: "runSync",
+			command
+		});
+		const result = this.syncHandler(command);
+		return {
+			exitCode: result.exitCode ?? 0,
+			stdout: result.stdout ?? "",
+			stderr: result.stderr ?? ""
+		};
+	}
+	async attach(command, options = {}) {
+		this.calls.push({
+			kind: "attach",
+			command,
+			options
+		});
+		if (options.onSpawned) options.onSpawned(1);
+		return (await this.handler(command)).exitCode ?? 0;
+	}
+	detach(command, options = {}) {
+		this.calls.push({
+			kind: "detach",
+			command,
+			options
+		});
+	}
+	kill(pid, signal = "SIGTERM") {
+		this.calls.push({
+			kind: "kill",
+			command: [String(pid), signal]
+		});
+		this.killed.push({
+			pid,
+			signal
 		});
 	}
+	isAlive(pid) {
+		if (this.aliveStub) return this.aliveStub(pid);
+		const result = this.syncHandler([
+			"ps",
+			"-p",
+			String(pid),
+			"-o",
+			"state="
+		]);
+		if ((result.exitCode ?? 0) !== 0) return false;
+		const state = (result.stdout ?? "").trim();
+		if (!state) return false;
+		return !state.startsWith("Z");
+	}
+	listProcessesContaining(marker) {
+		if (this.listStub) return this.listStub(marker);
+		return [];
+	}
 };
 //#endregion
 //#region lib/engine/settings/mock-settings-reader.ts
@@ -1743,9 +1705,8 @@ const publishRequestSchema = z.object({
 	connector: z.string().min(1).optional(),
 	/**
 	* Address the event to a single subscriber. When set, only the WS client that
-	* declared this id at upgrade time (`?id=<subscriberId>`) receives it among the
-	* channel's regular subscribers; tap=all observers still see it. Omit for the
-	* default fanout. The route surfaces it to subscribers as `meta.target`.
+	* declared this id at upgrade time (`?id=<subscriberId>`) receives it. Omit for
+	* the default fanout. The route surfaces it to subscribers as `meta.target`.
 	*/
 	target: z.string().min(1).optional()
 });
@@ -2107,7 +2068,6 @@ var FunnelBroadcaster = class {
 		return [...persisted.filter((event) => event.offset < cutoff), ...fromMemory];
 	}
 	matchesClient(event, data) {
-		if (data.tapAll) return true;
 		const target = event.meta?.target;
 		if (target && target !== data.subscriberId) return false;
 		const channelId = event.meta?.channelId;
@@ -2117,25 +2077,18 @@ var FunnelBroadcaster = class {
 		return data.connectors.includes(connector);
 	}
 	/**
-	* Returns the list of WS clients that should receive `event`. Tap=all clients always
-	* receive (passive observation). For each per-channel group:
+	* Returns the list of WS clients that should receive `event`. For each per-channel group:
 	*   - fanout → every matching client receives
 	*   - exclusive → exactly one client receives, picked round-robin per channel
 	*
-	* `meta.target` narrows the regular (non-tap) recipient set first via
-	* `matchesClient`: only the subscriber whose `subscriberId` equals `target`
-	* stays in the running, so a targeted event reaches one named instance while
-	* still being observable by tap=all clients.
+	* `meta.target` narrows the recipient set via `matchesClient`: only the subscriber
+	* whose `subscriberId` equals `target` receives a targeted event.
 	*/
 	pickRecipients(event) {
 		const exclusiveByChannel = /* @__PURE__ */ new Map();
 		const recipients = [];
 		for (const [ws, data] of this.clients) {
 			if (!this.matchesClient(event, data)) continue;
-			if (data.tapAll) {
-				recipients.push(ws);
-				continue;
-			}
 			if (data.delivery === "exclusive") {
 				const list = exclusiveByChannel.get(data.channel) ?? [];
 				list.push(ws);
@@ -3340,7 +3293,6 @@ const defaultOnError = () => {};
 */
 var FunnelGatewayServer = class {
 	channels;
-	settings;
 	port;
 	hostname;
 	dbPath;
@@ -3360,7 +3312,6 @@ var FunnelGatewayServer = class {
 	server = null;
 	constructor(deps) {
 		this.channels = deps.channels;
-		this.settings = deps.settings;
 		this.port = deps.port ?? resolveFunnelPort();
 		this.hostname = deps.hostname ?? DEFAULT_HOST;
 		this.dbPath = deps.dbPath ?? defaultDbPath();
@@ -3461,11 +3412,10 @@ var FunnelGatewayServer = class {
 		const url = new URL(request.url);
 		if (url.pathname === "/ws" && request.headers.get("upgrade") === "websocket") {
 			if (this.token && !this.tokenMatchesUpgrade(request)) return new Response("unauthorized", { status: 401 });
-			const tapAll = url.searchParams.get("tap") === "all";
-			const requestedChannel = tapAll ? "" : url.searchParams.get("channel") ?? "";
-			const channel = !tapAll && requestedChannel ? this.resolveChannel(requestedChannel) : null;
-			const channelId = tapAll ? "" : channel?.id ?? requestedChannel;
-			const channelName = tapAll ? null : channel?.name ?? null;
+			const requestedChannel = url.searchParams.get("channel") ?? "";
+			const channel = requestedChannel ? this.resolveChannel(requestedChannel) : null;
+			const channelId = channel?.id ?? requestedChannel;
+			const channelName = channel?.name ?? null;
 			const connectors = channel?.connectors ?? [];
 			const delivery = channel?.delivery ?? "fanout";
 			const sinceRaw = url.searchParams.get("since");
@@ -3476,7 +3426,6 @@ var FunnelGatewayServer = class {
 				channel: channelId,
 				channelName,
 				connectors,
-				tapAll,
 				delivery,
 				subscriberId,
 				since
@@ -3491,36 +3440,24 @@ var FunnelGatewayServer = class {
 			for (const event of replay) ws.send(JSON.stringify(event));
 		}
 		this.broadcaster.addClient(ws, ws.data);
-		if (ws.data.channelName) {
-			const meta = {
-				event_type: "system",
-				action: "channel_connect",
-				channel: ws.data.channelName,
-				channelId: ws.data.channel,
-				connectors: ws.data.connectors.join(","),
-				total: String(this.broadcaster.getClientCount())
-			};
-			this.logger?.info("channel connected", meta);
-		} else this.logger?.info("tap-all client connected", {
+		this.logger?.info("channel connected", {
 			event_type: "system",
-			action: "tap_connect",
+			action: "channel_connect",
+			channel: ws.data.channelName ?? "",
+			channelId: ws.data.channel,
+			connectors: ws.data.connectors.join(","),
 			total: String(this.broadcaster.getClientCount())
 		});
 	}
 	handleWsClose(ws) {
 		this.broadcaster.removeClient(ws);
-		if (ws.data.channelName) this.logger?.info("channel disconnected", {
+		this.logger?.info("channel disconnected", {
 			event_type: "system",
 			action: "channel_disconnect",
-			channel: ws.data.channelName,
+			channel: ws.data.channelName ?? "",
 			channelId: ws.data.channel,
 			total: String(this.broadcaster.getClientCount())
 		});
-		else this.logger?.info("tap-all client disconnected", {
-			event_type: "system",
-			action: "tap_disconnect",
-			total: String(this.broadcaster.getClientCount())
-		});
 	}
 	logServerStarted() {
 		this.logger?.info("gateway started", {
@@ -3570,7 +3507,7 @@ var FunnelGatewayServer = class {
 		return false;
 	}
 	resolveChannel(requested) {
-		const channel = this.settings.read()?.channels.find((c) => c.id === requested || c.name === requested);
+		const channel = this.channels.get(requested) ?? this.channels.getById(requested);
 		if (!channel) return null;
 		return {
 			id: channel.id,
@@ -3632,10 +3569,10 @@ var FunnelGatewayServer = class {
 		return { offset: event.offset };
 	}
 	lookupChannelId(channelName) {
-		return this.settings.read().channels.find((c) => c.name === channelName)?.id ?? null;
+		return this.channels.get(channelName)?.id ?? null;
 	}
 	lookupConnectorId(channelId, connectorName) {
-		return (this.settings.read().channels.find((c) => c.id === channelId)?.connectors.find((c) => c.name === connectorName))?.id ?? null;
+		return this.channels.getById(channelId)?.connectors.find((c) => c.name === connectorName)?.id ?? null;
 	}
 };
 //#endregion
@@ -3827,7 +3764,7 @@ const buildFunnelDebugReport = async (deps, channelFilter) => {
 			errors: listenerEntry.errors,
 			lastEventAt: listenerEntry.lastEventAt
 		} : null;
-		const claudeClients = (gatewayData?.clients ?? []).filter((cl) => !cl.tapAll && (cl.channelName === ch.name || cl.channel === ch.name));
+		const claudeClients = (gatewayData?.clients ?? []).filter((cl) => cl.channelName === ch.name || cl.channel === ch.name);
 		report.channels.push({
 			name: ch.name,
 			connectors: ch.connectors.map((conn) => conn.name),
@@ -3870,15 +3807,14 @@ const SANDBOX_DIR = "/sandbox/.funnel";
 const SANDBOX_TMP_DIR = "/sandbox/tmp";
 const noopOnError = () => {};
 /**
-* Facade exposing every funnel facet as a getter.
+* Facade that wires every funnel facet together and exposes the public surface.
 *
-* The same `Funnel` is used by the CLI and as a programmable library.
-* All side-effecting boundaries (filesystem, process, logger, clock, id, paths) are
-* injectable via `Props` — passing memory implementations gives a fully sandboxed
+* All side-effecting boundaries (filesystem, process, logger, clock, id, paths)
+* are injected via Props — passing memory implementations gives a fully sandboxed
 * Funnel that touches no real disk, processes, or wall-clock time.
 *
-* Connectors live nested inside their owning channel (channels[].connectors[]),
-* so connector CRUD is reached via `funnel.channels.addConnector(...)` etc.
+* Fully immutable: all fields are resolved in the constructor and frozen.
+* No lazy initialisation — every dependency is wired at construction time.
 *
 * @example
 * ```ts
@@ -3889,9 +3825,104 @@ const noopOnError = () => {};
 * ```
 */
 var Funnel = class Funnel {
-	memos = {};
+	paths;
+	channels;
+	gateway;
+	gatewayToken;
+	publisher;
+	listeners;
+	claude;
+	profiles;
+	localConfig;
+	localConfigSync;
+	fs;
+	process;
+	logger;
+	clock;
+	onError;
 	constructor(props = {}) {
-		this.props = props;
+		const dir = props.dir ?? resolveFunnelDir();
+		const tmpDir = props.tmpDir ?? funnelTmpDir();
+		const fs = props.fs ?? new NodeFunnelFileSystem();
+		const process = props.process ?? new NodeFunnelProcessRunner();
+		const clock = props.clock ?? new NodeFunnelClock();
+		const idGenerator = props.idGenerator ?? new NodeFunnelIdGenerator();
+		this.paths = {
+			dir,
+			tmpDir,
+			settings: join(dir, "settings.json")
+		};
+		this.fs = fs;
+		this.process = process;
+		this.logger = props.logger;
+		this.clock = clock;
+		this.onError = props.onError ?? noopOnError;
+		const store = props.store ?? new FunnelSettingsStore({
+			path: this.paths.settings,
+			fs,
+			idGenerator
+		});
+		const factory = new FunnelConnectorFactory({
+			fs,
+			process,
+			logger: this.logger,
+			diagnosticLog: props.diagnosticLog,
+			dir,
+			slackListenerOptions: props.slackListenerOptions,
+			scheduleListenerOptions: props.scheduleListenerOptions
+		});
+		this.channels = new FunnelChannels({
+			store,
+			factory,
+			clock,
+			idGenerator
+		});
+		this.gateway = new FunnelGateway({
+			fs,
+			process,
+			clock,
+			dir,
+			tmpDir,
+			port: props.port
+		});
+		this.gatewayToken = new FunnelGatewayToken({
+			fs,
+			dir
+		});
+		this.publisher = new FunnelChannelPublisher({
+			port: this.gateway.getPort(),
+			isDaemonRunning: () => this.gateway.isRunning(),
+			getToken: () => this.gatewayToken.read()
+		});
+		this.listeners = new FunnelListenersClient({
+			port: this.gateway.getPort(),
+			isDaemonRunning: () => this.gateway.isRunning(),
+			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,
+			prompter: props.tokenPrompter ?? new NodeFunnelTokenPrompter()
+		});
+		this.claude = new FunnelClaude({
+			channels: this.channels,
+			mcp,
+			gateway: this.gateway,
+			sessions: this.profiles,
+			guard: new FileProcessGuard({
+				fs,
+				process,
+				dir
+			}),
+			process,
+			logger: this.logger
+		});
 		Object.freeze(this);
 	}
 	/**
@@ -3901,6 +3932,7 @@ var Funnel = class Funnel {
 	*/
 	static inMemory(props = {}) {
 		return new Funnel({
+			...props,
 			store: props.store ?? new MockFunnelSettingsReader(),
 			fs: props.fs ?? new MemoryFunnelFileSystem(),
 			process: props.process ?? new MemoryFunnelProcessRunner(),
@@ -3911,183 +3943,6 @@ var Funnel = class Funnel {
 			tmpDir: props.tmpDir ?? SANDBOX_TMP_DIR
 		});
 	}
-	/** Resolved on-disk paths the facade will read/write when methods are called. Pure compute, not memoized. */
-	get paths() {
-		const dir = this.props.dir ?? resolveFunnelDir();
-		return {
-			dir,
-			tmpDir: this.props.tmpDir ?? funnelTmpDir(),
-			settings: join(dir, "settings.json")
-		};
-	}
-	/** Filesystem boundary. Defaults to NodeFunnelFileSystem. */
-	get fs() {
-		if (!this.memos.fs) this.memos.fs = this.props.fs ?? new NodeFunnelFileSystem();
-		return this.memos.fs;
-	}
-	/** Process runner boundary. Defaults to NodeFunnelProcessRunner. */
-	get process() {
-		if (!this.memos.process) this.memos.process = this.props.process ?? new NodeFunnelProcessRunner();
-		return this.memos.process;
-	}
-	/** Logger boundary. Optional — when no logger is injected, every facet's `this.logger?.x` call is a silent no-op. Production entry points (cli, daemon) inject a NodeFunnelLogger. */
-	get logger() {
-		return this.props.logger;
-	}
-	/** Clock boundary. Defaults to NodeFunnelClock. */
-	get clock() {
-		if (!this.memos.clock) this.memos.clock = this.props.clock ?? new NodeFunnelClock();
-		return this.memos.clock;
-	}
-	/**
-	* Error hook. Forwards Funnel-internal exceptions that would otherwise be
-	* swallowed. Defaults to a no-op when no host hook was passed.
-	*/
-	get onError() {
-		return this.props.onError ?? noopOnError;
-	}
-	/** ID generator boundary. Defaults to NodeFunnelIdGenerator. */
-	get idGenerator() {
-		if (!this.memos.idGenerator) this.memos.idGenerator = this.props.idGenerator ?? new NodeFunnelIdGenerator();
-		return this.memos.idGenerator;
-	}
-	/** Settings reader. If not injected, a FunnelSettingsStore rooted at `dir` is created. */
-	get store() {
-		if (!this.memos.store) this.memos.store = this.props.store ?? new FunnelSettingsStore({
-			path: this.paths.settings,
-			fs: this.fs,
-			idGenerator: this.idGenerator
-		});
-		return this.memos.store;
-	}
-	/** Pure factory that constructs per-type listeners and adapters from connector configs. */
-	get factory() {
-		if (!this.memos.factory) this.memos.factory = new FunnelConnectorFactory({
-			fs: this.fs,
-			process: this.process,
-			logger: this.logger,
-			diagnosticLog: this.props.diagnosticLog,
-			dir: this.paths.dir,
-			slackListenerOptions: this.props.slackListenerOptions,
-			scheduleListenerOptions: this.props.scheduleListenerOptions
-		});
-		return this.memos.factory;
-	}
-	/** Channel CRUD + nested connector CRUD + schedule entries + listener/adapter dispatch. */
-	get channels() {
-		if (!this.memos.channels) this.memos.channels = new FunnelChannels({
-			store: this.store,
-			factory: this.factory,
-			profileChecker: this.profiles,
-			clock: this.clock,
-			idGenerator: this.idGenerator
-		});
-		return this.memos.channels;
-	}
-	/** Launch profiles (named presets for `fnl claude`: path + sub-agent + channel id). */
-	get profiles() {
-		if (!this.memos.profiles) this.memos.profiles = new FunnelProfiles({
-			store: this.store,
-			idGenerator: this.idGenerator
-		});
-		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;
-	}
-	/** Writes the stable `id` into funnel.json on first launch so state can be scoped to `~/.funnel/projects/<id>/`. */
-	get localConfigWriter() {
-		if (!this.memos.localConfigWriter) this.memos.localConfigWriter = new FunnelLocalConfigWriter({ fs: this.fs });
-		return this.memos.localConfigWriter;
-	}
-	/** 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,
-			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 });
-		return this.memos.mcp;
-	}
-	/** Launch Claude Code with a channel injected via env, MCP installed, gateway ensured. */
-	get claude() {
-		if (!this.memos.claude) this.memos.claude = new FunnelClaude({
-			channels: this.channels,
-			mcp: this.mcp,
-			gateway: this.gateway,
-			profiles: this.profiles,
-			fs: this.fs,
-			process: this.process,
-			idGenerator: this.idGenerator,
-			logger: this.logger,
-			dir: this.paths.dir
-		});
-		return this.memos.claude;
-	}
-	/** Gateway daemon controller (PID-file, start/stop the separate `bun daemon.ts` process). */
-	get gateway() {
-		if (!this.memos.gateway) this.memos.gateway = new FunnelGateway({
-			fs: this.fs,
-			process: this.process,
-			clock: this.clock,
-			dir: this.paths.dir,
-			tmpDir: this.paths.tmpDir
-		});
-		return this.memos.gateway;
-	}
-	/** Read / generate the daemon's gateway token (mode 0600 file under `dir`). */
-	get gatewayToken() {
-		if (!this.memos.gatewayToken) this.memos.gatewayToken = new FunnelGatewayToken({
-			fs: this.fs,
-			dir: this.paths.dir
-		});
-		return this.memos.gatewayToken;
-	}
-	/**
-	* HTTP client for `POST /channels/:channel/publish` on the running gateway
-	* daemon. Use it to push arbitrary content into a channel from outside any
-	* connector. Returns `{ state: "offline" }` if the daemon isn't up.
-	*/
-	get publisher() {
-		if (!this.memos.publisher) {
-			const gateway = this.gateway;
-			const token = this.gatewayToken;
-			this.memos.publisher = new FunnelChannelPublisher({
-				port: gateway.getPort(),
-				isDaemonRunning: () => gateway.isRunning(),
-				getToken: () => token.read()
-			});
-		}
-		return this.memos.publisher;
-	}
-	/**
-	* HTTP client for listener operations on the running gateway daemon.
-	* Returns `{ state: "offline" }` when the daemon is offline so hot-reload
-	* paths stay write-only without parsing strings.
-	*/
-	get listeners() {
-		if (!this.memos.listeners) {
-			const gateway = this.gateway;
-			const token = this.gatewayToken;
-			this.memos.listeners = new FunnelListenersClient({
-				port: gateway.getPort(),
-				isDaemonRunning: () => gateway.isRunning(),
-				getToken: () => token.read()
-			});
-		}
-		return this.memos.listeners;
-	}
 	/**
 	* In-process gateway server. Unlike `gateway.start()` (which spawns a daemon),
 	* this returns a class that runs `Bun.serve` + listeners inside the current process —
@@ -4096,7 +3951,6 @@ var Funnel = class Funnel {
 	gatewayServer(options = {}) {
 		return new FunnelGatewayServer({
 			channels: this.channels,
-			settings: this.store,
 			port: options.port,
 			hostname: options.hostname,
 			dbPath: options.dbPath,
@@ -4111,6 +3965,20 @@ var Funnel = class Funnel {
 			extraRoutes: options.extraRoutes
 		});
 	}
+	/**
+	* Run the gateway daemon in the foreground (tied to this terminal).
+	* For background daemon management, use `funnel.gateway.start()` instead.
+	*/
+	async runGatewayForeground(options = {}) {
+		const gatewayScript = resolveDaemonScript();
+		const command = options.caffeinate !== false && globalThis.process.platform === "darwin" ? [
+			"caffeinate",
+			"-is",
+			"bun",
+			gatewayScript
+		] : ["bun", gatewayScript];
+		return this.process.attach(command);
+	}
 	async debug(channelName) {
 		return buildFunnelDebugReport({
 			gateway: this.gateway,
@@ -4124,331 +3992,6 @@ var Funnel = class Funnel {
 	}
 };
 //#endregion
-//#region lib/engine/mcp/channel-subscriber.ts
-const RECONNECT_DELAY = 1e3;
-const MAX_RECONNECT_DELAY = 1e4;
-/**
-* Subscribes to the gateway WebSocket for a single channel and forwards
-* incoming events to the MCP server as `notifications/claude/channel`.
-* Reconnects with exponential backoff and replays missed events via `?since=<offset>`.
-*/
-var FunnelChannelSubscriber = class {
-	state = {
-		reconnectDelay: RECONNECT_DELAY,
-		lastOffset: 0
-	};
-	constructor(props) {
-		this.props = props;
-		Object.freeze(this);
-	}
-	start() {
-		this.connect();
-	}
-	connect() {
-		const sinceQuery = this.state.lastOffset > 0 ? `&since=${this.state.lastOffset}` : "";
-		const wsUrl = `${this.props.baseUrl}${sinceQuery}`;
-		const ws = new WebSocket(wsUrl, this.props.protocols);
-		ws.addEventListener("open", () => {
-			this.state.reconnectDelay = RECONNECT_DELAY;
-			process.stderr.write(`funnel: connected (${wsUrl})\n`);
-		});
-		ws.addEventListener("message", (event) => this.handleMessage(event));
-		ws.addEventListener("close", () => {
-			process.stderr.write(`funnel: disconnected, reconnecting in ${this.state.reconnectDelay}ms\n`);
-			setTimeout(() => this.connect(), this.state.reconnectDelay);
-			this.state.reconnectDelay = Math.min(this.state.reconnectDelay * 2, MAX_RECONNECT_DELAY);
-		});
-		ws.addEventListener("error", () => {});
-	}
-	async handleMessage(event) {
-		try {
-			const payload = JSON.parse(String(event.data));
-			const eventType = payload.meta?.event_type ?? "unknown";
-			if (typeof payload.offset === "number" && payload.offset > this.state.lastOffset) this.state.lastOffset = payload.offset;
-			process.stderr.write(`funnel: received event (${eventType})\n`);
-			await this.props.server.notification({
-				method: "notifications/claude/channel",
-				params: {
-					content: payload.content,
-					meta: payload.meta
-				}
-			});
-		} catch (error) {
-			process.stderr.write(`funnel: error: ${error instanceof Error ? error.message : String(error)}\n`);
-		}
-	}
-};
-//#endregion
-//#region lib/engine/mcp/read-channel-connectors.ts
-const TOOL_CONNECTOR_TYPES = new Set([
-	"slack",
-	"gh",
-	"discord"
-]);
-const readChannelConnectors = (dir, channelId) => {
-	const settingsPath = join(dir, "settings.json");
-	if (!existsSync(settingsPath)) return null;
-	const raw = JSON.parse(readFileSync(settingsPath, "utf-8"));
-	const parsed = settingsSchema.safeParse(raw);
-	if (!parsed.success) return null;
-	const channel = parsed.data.channels.find((c) => c.id === channelId);
-	if (!channel) return null;
-	const connectors = channel.connectors.filter((c) => TOOL_CONNECTOR_TYPES.has(c.type)).map((c) => ({
-		name: c.name,
-		type: c.type
-	}));
-	return {
-		channelName: channel.name,
-		connectors
-	};
-};
-//#endregion
-//#region lib/engine/mcp/read-gateway-token.ts
-const readGatewayToken = (dir) => {
-	const fromEnv = process.env.FUNNEL_GATEWAY_TOKEN;
-	if (fromEnv && fromEnv.length > 0) return fromEnv;
-	const path = join(dir, "gateway.token");
-	if (!existsSync(path)) return null;
-	const value = readFileSync(path, "utf-8").trim();
-	return value.length > 0 ? value : null;
-};
-//#endregion
-//#region lib/engine/mcp/usage-hint-for-type.ts
-const usageHintForType = (type) => {
-	if (type === "slack") return [
-		"Slack Web API.",
-		"To reply in the same thread: method=POST path=chat.postMessage body={ channel: meta.channel_id, text: \"...\", thread_ts: meta.thread_ts }",
-		"To react: method=POST path=reactions.add body={ channel: meta.channel_id, timestamp: meta.thread_ts, name: \"thumbsup\" }",
-		"Use meta fields from the incoming event: channel_id (Slack channel), thread_ts (thread anchor), user_id (sender)."
-	].join(" ");
-	if (type === "discord") return [
-		"Discord REST API.",
-		"To reply: method=POST path=/channels/<meta.channel_id>/messages body={ content: \"...\" }",
-		"Use meta fields: channel_id (Discord channel), user_id (sender), guild_id."
-	].join(" ");
-	if (type === "gh") return [
-		"GitHub REST via gh CLI.",
-		"To comment: method=POST path=repos/<meta.repository>/issues/<number>/comments body={ body: \"...\" }",
-		"Parse <number> from meta.subject_url. meta fields: repository (owner/repo), subject_type, subject_url, reason."
-	].join(" ");
-	return "Generic adapter call.";
-};
-//#endregion
-//#region lib/engine/mcp/channel-server.ts
-const DEFAULT_FUNNEL_DIR = join(homedir(), ".funnel");
-const BUILTIN_TOOL_NAMES = ["fnl_status", "fnl_debug"];
-const isBuiltinTool = (name) => BUILTIN_TOOL_NAMES.includes(name);
-const readAllChannels = (dir) => {
-	const settingsPath = join(dir, "settings.json");
-	if (!existsSync(settingsPath)) return [];
-	try {
-		const raw = JSON.parse(readFileSync(settingsPath, "utf-8"));
-		const parsed = settingsSchema.safeParse(raw);
-		if (!parsed.success) return [];
-		return parsed.data.channels.map((c) => ({
-			id: c.id,
-			name: c.name
-		}));
-	} catch {
-		return [];
-	}
-};
-const startChannelServer = async (options = {}) => {
-	const dir = options.dir ?? DEFAULT_FUNNEL_DIR;
-	const gatewayBaseUrl = options.gatewayUrl ?? process.env.FUNNEL_GATEWAY_URL ?? `http://127.0.0.1:${resolveFunnelPort()}`;
-	const gatewayWsUrl = `${gatewayBaseUrl.replace(/^http/, "ws")}/ws`;
-	const channelId = options.channelId ?? process.env.FUNNEL_CHANNEL_ID;
-	const channel = channelId ? readChannelConnectors(dir, channelId) : null;
-	const token = options.token ?? readGatewayToken(dir);
-	const allChannels = readAllChannels(dir);
-	const currentChannelName = channel?.channelName ?? null;
-	const channelContext = allChannels.length > 0 ? [
-		"",
-		"Configured channels (use as the `channel` argument to fnl_debug):",
-		...allChannels.map((ch) => `  ${ch.name}${ch.name === currentChannelName ? " ← this session" : ""}`)
-	].join("\n") : "";
-	const server = new Server({
-		name: FUNNEL_MCP_NAME,
-		version: "1.0.0"
-	}, {
-		capabilities: {
-			experimental: { "claude/channel": {} },
-			tools: {}
-		},
-		instructions: [
-			`Events arrive as notifications (method: notifications/claude/channel) with two fields:`,
-			`  content — the event payload as a JSON string (parse it to read the message)`,
-			`  meta    — key/value strings describing the event`,
-			"",
-			"meta fields by event_type:",
-			"  slack:    event_type=slack  channel_id=C…  thread_ts=1234.5678  user_id=U…  mentioned=true|false",
-			"  gh:       event_type=gh     repository=owner/repo  subject_type=Issue|PullRequest  subject_url=…  reason=…",
-			"  discord:  event_type=discord  channel_id=…  user_id=…  guild_id=…  mentioned=true|false",
-			"  schedule: event_type=schedule  entry_id=…",
-			"",
-			"To reply to a Slack message in the same thread, call the connector tool with:",
-			`  method: POST`,
-			`  path:   chat.postMessage`,
-			`  body:   { channel: meta.channel_id, text: "your reply", thread_ts: meta.thread_ts }`,
-			"",
-			"To comment on a GitHub issue/PR (extract from subject_url in meta):",
-			`  method: POST`,
-			`  path:   repos/<meta.repository>/issues/<number>/comments   (parse number from meta.subject_url)`,
-			`  body:   { body: "your reply" }`,
-			"",
-			"Built-in diagnostic tools — call proactively when events seem missing or delayed:",
-			"  fnl_status — gateway running state, all listeners alive/dead, Claude WS clients",
-			"  fnl_debug  — per-channel diagnosis with last 10 events, rootCause, suggestedActions",
-			"               omit channel arg to diagnose all channels; check summary.suggestedActions first",
-			channelContext
-		].join("\n")
-	});
-	server.setRequestHandler(ListToolsRequestSchema, async () => {
-		const connectorTools = (channel?.connectors ?? []).map((c) => ({
-			name: c.name,
-			description: `Call the "${c.name}" (${c.type}) connector. ${usageHintForType(c.type)}`,
-			inputSchema: {
-				type: "object",
-				properties: {
-					method: {
-						type: "string",
-						description: "HTTP verb or API method (e.g. POST, chat.postMessage)"
-					},
-					path: {
-						type: "string",
-						description: "API path or method name (adapter-specific)"
-					},
-					body: {
-						type: "object",
-						description: "Request body / params (adapter-specific)"
-					}
-				},
-				required: ["method", "path"]
-			}
-		}));
-		const channelEnum = allChannels.length > 0 ? allChannels.map((ch) => ch.name) : void 0;
-		const builtinTools = [{
-			name: "fnl_status",
-			description: "Return the current funnel gateway status as JSON — gateway running state, listener alive/dead per channel, and connected Claude WS clients. Call this when you need to check whether the gateway is up or why events stopped arriving.",
-			inputSchema: {
-				type: "object",
-				properties: {}
-			}
-		}, {
-			name: "fnl_debug",
-			description: "Return a full channel diagnosis as JSON — gateway health, listener state, Claude WS connection, last 10 inbound events with outcome, connectionErrors (when listener is dead), and diagnosis.rootCause. Call this first when debugging missing events. Omit `channel` to diagnose all channels at once.",
-			inputSchema: {
-				type: "object",
-				properties: { channel: channelEnum ? {
-					type: "string",
-					description: `Channel name to inspect. One of: ${channelEnum.join(", ")}. Omit to get all channels.`,
-					enum: channelEnum
-				} : {
-					type: "string",
-					description: "Channel name to inspect. Omit to get all channels."
-				} }
-			}
-		}];
-		return { tools: [...connectorTools, ...builtinTools] };
-	});
-	server.setRequestHandler(CallToolRequestSchema, async (request) => {
-		const toolName = request.params.name;
-		if (isBuiltinTool(toolName)) return handleBuiltinTool(toolName, request.params.arguments, gatewayBaseUrl, token, allChannels);
-		if (!channel) throw new Error("FUNNEL_CHANNEL_ID is not set or channel not found in settings.json");
-		const args = request.params.arguments ?? {};
-		const method = typeof args.method === "string" ? args.method : "";
-		const path = typeof args.path === "string" ? args.path : "";
-		const body = args.body ?? {};
-		if (!method || !path) throw new Error("`method` and `path` are required");
-		const url = `${gatewayBaseUrl}/channels/${encodeURIComponent(channel.channelName)}/connectors/${encodeURIComponent(toolName)}/call`;
-		const headers = { "content-type": "application/json" };
-		if (token) headers.authorization = `Bearer ${token}`;
-		const res = await fetch(url, {
-			method: "POST",
-			headers,
-			body: JSON.stringify({
-				method,
-				path,
-				body
-			})
-		});
-		const text = await res.text();
-		if (!res.ok) throw new Error(`gateway call failed (${res.status}): ${text}`);
-		return { content: [{
-			type: "text",
-			text
-		}] };
-	});
-	const transport = new StdioServerTransport();
-	await server.connect(transport);
-	if (!channelId) return;
-	new FunnelChannelSubscriber({
-		server,
-		baseUrl: `${gatewayWsUrl}?channel=${encodeURIComponent(channelId)}`,
-		protocols: token ? [`funnel.token.${token}`] : void 0
-	}).start();
-};
-const handleBuiltinTool = async (name, args, gatewayBaseUrl, token, allChannels) => {
-	const headers = {};
-	if (token) headers.authorization = `Bearer ${token}`;
-	if (name === "fnl_status") {
-		const res = await fetch(`${gatewayBaseUrl}/status`, { headers }).catch(() => null);
-		if (!res) return { content: [{
-			type: "text",
-			text: JSON.stringify({
-				running: false,
-				error: "gateway unreachable",
-				hint: "run: fnl gateway start",
-				knownChannels: allChannels.map((ch) => ch.name)
-			})
-		}] };
-		const body = await res.json();
-		return { content: [{
-			type: "text",
-			text: JSON.stringify(body)
-		}] };
-	}
-	const channelArg = typeof args?.channel === "string" ? args.channel : null;
-	const url = channelArg ? `${gatewayBaseUrl}/debug?channel=${encodeURIComponent(channelArg)}` : `${gatewayBaseUrl}/debug`;
-	const res = await fetch(url, { headers }).catch(() => null);
-	if (!res) return { content: [{
-		type: "text",
-		text: JSON.stringify({
-			gateway: { running: false },
-			channels: allChannels.map((ch) => ({
-				id: ch.id,
-				name: ch.name,
-				diagnosis: {
-					status: "error",
-					message: "gateway is not running",
-					nextAction: "fnl gateway start",
-					rootCause: null
-				}
-			}))
-		})
-	}] };
-	const body = await res.json();
-	return { content: [{
-		type: "text",
-		text: JSON.stringify(body)
-	}] };
-};
-//#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 channels[] (transport) and profiles[]
-* (launch recipe) 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` to declare channels (transport: connectors to materialize into ~/.funnel/settings.json on launch) and profiles (launch recipe: options / env / resume) bound to those channels."
-	};
-};
-//#endregion
 //#region lib/engine/logger/node-logger.ts
 const defaultLogFile = () => join(funnelTmpDir(), "funnel.log");
 var NodeFunnelLogger = class extends FunnelLogger {
@@ -4489,26 +4032,6 @@ var NoopFunnelLogger = class extends FunnelLogger {
 	error() {}
 };
 //#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/gateway/memory-funnel-event-log.ts
 /**
 * In-process `FunnelEventLog` backed by a plain array. Used by tests and by
@@ -5464,7 +4987,6 @@ modes:
   fanout      every connected WS client receives every event (default)
   exclusive   each event is delivered to exactly one connected client (round-robin)
 
-tap=all clients (TUI dashboard, debugging) always receive regardless of mode.
 `), (c) => {
 	const param = c.req.valid("param");
 	c.env.funnel.channels.setDelivery(param.channel, param.mode);
@@ -5661,19 +5183,19 @@ const claudeHandler = factory.createHandlers(zValidator$1("query", z.object({
 	channel: z.string().optional()
 }).passthrough(), claudeHelp), async (c) => {
 	const query = c.req.valid("query");
-	const funnel = c.env.funnel;
+	const { funnel, claude, profiles, localConfig, localConfigSync } = c.env;
 	const userArgs = queryToCliArgs(c.req.url, RESERVED_KEYS$1);
 	if (query.channel && !query.profile) {
-		const exitCode = await funnel.claude.launch({
+		const exitCode = await claude.launch({
 			channel: query.channel,
 			userArgs
 		});
 		process.exit(exitCode);
 	}
 	if (query.profile) {
-		const profile = funnel.profiles.get(query.profile);
+		const profile = profiles.get(query.profile);
 		if (!profile) throw new HTTPException(404, { message: `profile "${query.profile}" not found` });
-		const exitCode = await funnel.claude.launch({
+		const exitCode = await claude.launch({
 			channel: profile.channelId,
 			cwd: profile.path,
 			userArgs,
@@ -5685,24 +5207,24 @@ const claudeHandler = factory.createHandlers(zValidator$1("query", z.object({
 		process.exit(exitCode);
 	}
 	const cwd = process.cwd();
-	const local = funnel.localConfig.read(cwd);
+	const local = localConfig.read(cwd);
 	if (local) {
 		const picked = query.channel !== void 0 ? local.channels.find((c) => c.name === query.channel) : local.channels[0];
 		if (!picked) throw new HTTPException(404, { message: query.channel ? `channel "${query.channel}" is not declared in funnel.json` : `funnel.json declares no channels` });
-		const synced = await funnel.localConfigSync.ensure(picked);
+		const synced = await localConfigSync.ensure(picked);
 		for (const outcome of synced.touched) if (outcome.changed) await funnel.listeners.restart(picked.name, outcome.name);
 		else await funnel.listeners.start(picked.name, outcome.name);
 		for (const name of synced.removed) await funnel.listeners.stop(picked.name, name);
-		const exitCode = await funnel.claude.launch({
+		const exitCode = await claude.launch({
 			channel: picked.name,
 			cwd,
 			userArgs
 		});
 		process.exit(exitCode);
 	}
-	const defaultProfile = funnel.profiles.getDefault();
+	const defaultProfile = profiles.getDefault();
 	if (!defaultProfile) return c.text(claudeHelp);
-	const exitCode = await funnel.claude.launch({
+	const exitCode = await claude.launch({
 		channel: defaultProfile.channelId,
 		cwd: defaultProfile.path,
 		userArgs,
@@ -6195,7 +5717,7 @@ const buildChannelReport = async (targetChannel, gatewayStatus, gatewayBodyOrNul
 			errors: l.errors,
 			lastEventAt: l.lastEventAt
 		}));
-		baseReport.claudeClients = gatewayBodyOrNull.clients.filter((cl) => !cl.tapAll && cl.channelName === targetChannelName).length;
+		baseReport.claudeClients = gatewayBodyOrNull.clients.filter((cl) => cl.channelName === targetChannelName).length;
 	}
 	if (store) {
 		const evRows = queryRows(new ConnectorDiagnosticSqlReader(store), "SELECT seq, ts, type, outcome, payload FROM processed WHERE channel_id = ? ORDER BY seq DESC LIMIT ?", [targetChannel.id, limit]);
@@ -6705,15 +6227,7 @@ examples:
   funnel gateway run
   funnel gateway run --no-caffeine`), async (c) => {
 	const query = c.req.valid("query");
-	const funnel = c.env.funnel;
-	const gatewayScript = resolveDaemonScript();
-	const command = query["no-caffeine"] !== "true" && process.platform === "darwin" ? [
-		"caffeinate",
-		"-is",
-		"bun",
-		gatewayScript
-	] : ["bun", gatewayScript];
-	const exitCode = await funnel.process.attach(command);
+	const exitCode = await c.env.funnel.runGatewayForeground({ caffeinate: query["no-caffeine"] !== "true" });
 	process.exit(exitCode);
 });
 //#endregion
@@ -6857,10 +6371,11 @@ const profilesAddHandler = factory.createHandlers(zValidator$1("param", z.object
 	const param = c.req.valid("param");
 	const query = c.req.valid("query");
 	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` });
 	const recipe = parseProfileRecipe(query);
-	funnel.profiles.add({
+	profiles.add({
 		name: param.profile,
 		path: query.path,
 		channelId: channel.id,
@@ -6876,7 +6391,9 @@ usage: funnel profiles <name> as-default
 
 the first profile in the list is treated as the default for fnl claude.`), (c) => {
 	const param = c.req.valid("param");
-	c.env.funnel.profiles.asDefault(param.profile);
+	c.env.funnel;
+	const { profiles, claude } = c.env;
+	profiles.asDefault(param.profile);
 	return c.text(`profile "${param.profile}" is now the default`);
 });
 //#endregion
@@ -6902,7 +6419,9 @@ const profilesRenameHandler = 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.profiles.rename(param.profile, param.newName);
+	c.env.funnel;
+	const { profiles, claude } = c.env;
+	profiles.rename(param.profile, param.newName);
 	return c.text(`renamed profile "${param.profile}" to "${param.newName}"`);
 });
 //#endregion
@@ -6914,10 +6433,11 @@ usage: funnel profiles <name> run [additional claude args...]
 const RESERVED_KEYS = [];
 const profilesLaunchHandler = factory.createHandlers(zValidator$1("param", z.object({ profile: z.string() })), zValidator$1("query", z.object({}).passthrough(), launchHelp), async (c) => {
 	const param = c.req.valid("param");
-	const funnel = c.env.funnel;
-	const profile = funnel.profiles.get(param.profile);
+	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` });
-	const exitCode = await funnel.claude.launch({
+	const exitCode = await claude.launch({
 		channel: profile.channelId,
 		cwd: profile.path,
 		userArgs: queryToCliArgs(c.req.url, RESERVED_KEYS),
@@ -6938,7 +6458,9 @@ const profilesRemoveHelpHandler = factory.createHandlers((c) => c.text(help$1));
 //#region lib/cli/routes/profiles.remove.$profile.ts
 const profilesRemoveHandler = factory.createHandlers(zValidator$1("param", z.object({ profile: z.string() })), zValidator$1("query", z.object({})), (c) => {
 	const param = c.req.valid("param");
-	c.env.funnel.profiles.remove(param.profile);
+	c.env.funnel;
+	const { profiles, claude } = c.env;
+	profiles.remove(param.profile);
 	return c.text(`removed profile "${param.profile}"`);
 });
 //#endregion
@@ -6972,10 +6494,11 @@ const profilesSetHandler = factory.createHandlers(zValidator$1("param", z.object
 	const param = c.req.valid("param");
 	const query = c.req.valid("query");
 	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` });
 	const recipe = parseProfileRecipe(query);
-	funnel.profiles.update(param.profile, {
+	profiles.update(param.profile, {
 		path: query.path,
 		channelId: channel?.id,
 		options: recipe.options,
@@ -7006,9 +6529,11 @@ examples:
   funnel profiles add cto --path /repo/myapp --channel prod-inbox --agent pm --options "--brief"
   funnel profiles cto as-default
   funnel profiles cto run`), (c) => {
-	const profiles = c.env.funnel.profiles.list();
-	if (profiles.length === 0) return c.text("no profiles");
-	const lines = profiles.map((profile, index) => {
+	c.env.funnel;
+	const { profiles } = c.env;
+	const profileList = profiles.list();
+	if (profileList.length === 0) return c.text("no profiles");
+	const lines = profileList.map((profile, index) => {
 		const tag = index === 0 ? " (default)" : "";
 		const recipe = profile.options.length > 0 ? `, options=${profile.options.join(" ")}` : "";
 		const session = profile.resume ? "" : ", resume=false";
@@ -7016,6 +6541,21 @@ examples:
 	});
 	return c.text(lines.join("\n"));
 });
+//#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 channels[] (transport) and profiles[]
+* (launch recipe) 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` to declare channels (transport: connectors to materialize into ~/.funnel/settings.json on launch) and profiles (launch recipe: options / env / resume) bound to those channels."
+	};
+};
 const schemaHandler = factory.createHandlers(zValidator$1("query", z.object({}), `funnel schema — print the JSON Schema for funnel.json
 
 usage: funnel schema
@@ -7060,9 +6600,9 @@ const isGatewayStatus = (value) => {
 	if (!("listeners" in value) || !Array.isArray(value.listeners)) return false;
 	return true;
 };
-const buildStatusLines = async (funnel) => {
+const buildStatusLines = async (funnel, profiles) => {
 	const channels = funnel.channels.list();
-	const profiles = funnel.profiles.list();
+	const profileList = profiles.list();
 	const gatewayStatus = funnel.gateway.getStatus();
 	const lines = [];
 	lines.push("= funnel status =");
@@ -7088,7 +6628,6 @@ const buildStatusLines = async (funnel) => {
 	const listenerAliveByChannel = /* @__PURE__ */ new Map();
 	if (gatewayData) {
 		for (const client of gatewayData.clients) {
-			if (client.tapAll) continue;
 			const key = client.channelName ?? client.channel;
 			clientsByChannel.set(key, (clientsByChannel.get(key) ?? 0) + 1);
 		}
@@ -7109,8 +6648,8 @@ const buildStatusLines = async (funnel) => {
 		lines.push(`  ${indicator} ${paddedName}  [${connectorLabel}]${claudeLabel}`);
 	}
 	lines.push("");
-	lines.push(`profiles: ${profiles.length}`);
-	for (const [index, profile] of profiles.entries()) {
+	lines.push(`profiles: ${profileList.length}`);
+	for (const [index, profile] of profileList.entries()) {
 		const tag = index === 0 ? " (default)" : "";
 		const channel = funnel.channels.getById(profile.channelId);
 		const channelLabel = channel ? channel.name : `id:${profile.channelId}`;
@@ -7131,11 +6670,11 @@ const statusHandler = factory.createHandlers(zValidator$1("query", z.object({
 	const isWatch = query.watch === "true" || query.watch === "";
 	const intervalSec = Math.min(60, Math.max(1, query.interval ? Number(query.interval) : 3));
 	if (!isWatch) {
-		const lines = await buildStatusLines(funnel);
+		const lines = await buildStatusLines(funnel, c.env.profiles);
 		return c.text(lines.join("\n"));
 	}
 	const render = async () => {
-		const lines = await buildStatusLines(funnel);
+		const lines = await buildStatusLines(funnel, c.env.profiles);
 		const ts = (/* @__PURE__ */ new Date()).toISOString().slice(11, 19);
 		process.stdout.write("\x1B[2J\x1B[H");
 		process.stdout.write(lines.join("\n"));
@@ -7177,4 +6716,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("/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_MCP_ARGS, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelEventLog, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLocalConfigWriter, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, LOCAL_CONFIG_FILENAME, MemoryConnectorDiagnosticLog, MemoryFunnelClock, MemoryFunnelEventLog, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, SqliteConnectorDiagnosticLog, SqliteFunnelEventLog, channelConfigSchema, channelDeliveryModeSchema, channelSpecSchema, routes as cliRoutes, connectorConfigSchema, connectorConnectionEventSchema, connectorProcessedEventSchema, connectorRawEventSchema, connectorSpecSchema, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, localConfigSchema, profileConfigSchema, profileSpecSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, resolveFunnelDir, resolveFunnelPort, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };
+export { CONNECTOR_CONNECTION_STATUSES, ConnectorDiagnosticLog, ConnectorDiagnosticSqlReader, DEFAULT_GATEWAY_PORT, DEFAULT_GATEWAY_TOKEN_PATH, FUNNEL_DIR, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelEventLog, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLogger, FunnelProcessRunner, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, MemoryConnectorDiagnosticLog, MemoryFunnelClock, MemoryFunnelEventLog, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, SqliteConnectorDiagnosticLog, SqliteFunnelEventLog, channelConfigSchema, channelDeliveryModeSchema, routes as cliRoutes, connectorConfigSchema, connectorConnectionEventSchema, connectorProcessedEventSchema, connectorRawEventSchema, createSettings, discordConnectorSchema, factory, funnelEventSchema, ghConnectorSchema, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, resolveFunnelDir, resolveFunnelPort, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, toRequest };