@interactive-inc/claude-funnel 0.24.0 → 0.25.1

package/dist/index.js

@@ -50,22 +50,22 @@ const channelConfigSchema = z.object({
 	id: z.string(),
 	name: z.string(),
 	delivery: channelDeliveryModeSchema.default("fanout"),
-	/** Args prepended to the claude argv on every launch bound to this channel. */
+	connectors: z.array(connectorConfigSchema).default([])
+});
+const profileConfigSchema = z.object({
+	name: z.string(),
+	path: z.string(),
+	channelId: z.string(),
+	/** Args prepended to the claude argv on every launch through this profile. */
 	options: z.array(z.string()).default([]),
 	/** Env vars layered under the launched claude process. process.env wins on collision. */
 	env: z.record(z.string(), z.string()).default({}),
 	/**
 	* When true (the default), funnel injects `--session-id <uuid>` so that
 	* relaunching from the same cwd resumes the previous claude session.
-	* Set to false for channels that should always start a fresh session.
+	* Set to false for profiles that should always start a fresh session.
 	*/
-	resume: z.boolean().default(true),
-	connectors: z.array(connectorConfigSchema).default([])
-});
-const profileConfigSchema = z.object({
-	name: z.string(),
-	path: z.string(),
-	channelId: z.string()
+	resume: z.boolean().default(true)
 });
 const SETTINGS_VERSION = 1;
 const settingsSchema = z.object({
@@ -312,9 +312,6 @@ var FunnelChannels = class {
 			id: this.idGenerator.generate(),
 			name: input.name,
 			delivery: input.delivery ?? "fanout",
-			options: input.options ?? [],
-			env: input.env ?? {},
-			resume: input.resume ?? true,
 			connectors: []
 		};
 		settings.channels.push(channel);
@@ -327,24 +324,6 @@ var FunnelChannels = class {
 		channel.delivery = delivery;
 		this.store.write(settings);
 	}
-	setResume(name, resume) {
-		const settings = this.store.read();
-		const channel = this.requireChannel(settings, name);
-		channel.resume = resume;
-		this.store.write(settings);
-	}
-	setOptions(name, options) {
-		const settings = this.store.read();
-		const channel = this.requireChannel(settings, name);
-		channel.options = options;
-		this.store.write(settings);
-	}
-	setEnv(name, env) {
-		const settings = this.store.read();
-		const channel = this.requireChannel(settings, name);
-		channel.env = env;
-		this.store.write(settings);
-	}
 	remove(name) {
 		const settings = this.store.read();
 		const index = settings.channels.findIndex((c) => c.name === name);
@@ -598,9 +577,9 @@ var FunnelClaude = class {
 			this.writePidFile(options.profileName);
 			this.installCleanup(options.profileName);
 		}
-		const session = channel.resume ? this.resolveSession(channel.id, cwd, options.userArgs ?? []) : null;
-		const claudeArgs = this.buildArgs(channel.options, options.userArgs ?? [], cwd, session);
-		const env = this.buildEnv(channel.id, channel.env);
+		const session = options.resume ?? true ? this.resolveSession(channel.id, cwd, options.userArgs ?? [], options.env ?? {}) : null;
+		const claudeArgs = this.buildArgs(options.options ?? [], options.userArgs ?? [], cwd, session);
+		const env = this.buildEnv(channel.id, options.env ?? {});
 		this.logger.info(`claude launch`, {
 			channel: options.channel,
 			channelId: channel.id,
@@ -650,8 +629,8 @@ var FunnelClaude = class {
 	isProcessAlive(pid) {
 		return this.process.isAlive(pid);
 	}
-	buildArgs(channelOptions, userArgs, cwd, session) {
-		const result = [...channelOptions, ...userArgs];
+	buildArgs(recipeOptions, userArgs, cwd, session) {
+		const result = [...recipeOptions, ...userArgs];
 		if (session !== null) if (session.mode === "resume") result.push("--resume", session.id);
 		else result.push("--session-id", session.id);
 		const mcpName = this.mcp.findInstalledName(cwd);
@@ -663,15 +642,22 @@ var FunnelClaude = class {
 	* a freshly minted one. Backs off when the user already passed a
 	* session-shaping flag, since combining them would either confuse claude
 	* or override the explicit user intent.
+	*
+	* A persisted id is only resumed when its session jsonl still exists on
+	* disk. claude errors out on `--resume <id>` for a missing conversation, and
+	* a persisted id can outlive its jsonl (claude pruned it, or the very first
+	* launch was aborted after `create` wrote the id but before the jsonl
+	* appeared). When the file is gone we mint a fresh session instead, which
+	* overwrites the dangling entry — so the store self-heals.
 	*/
-	resolveSession(channelId, cwd, userArgs) {
+	resolveSession(channelId, cwd, userArgs, recipeEnv) {
 		for (const arg of userArgs) {
 			if (arg === "-c" || arg === "--continue") return null;
 			if (arg === "--resume" || arg.startsWith("--resume=")) return null;
 			if (arg === "--session-id" || arg.startsWith("--session-id=")) return null;
 		}
 		const existing = this.sessions.get(channelId, cwd);
-		if (existing !== null) return {
+		if (existing !== null && this.sessionFileExists(cwd, existing, recipeEnv)) return {
 			id: existing,
 			mode: "resume"
 		};
@@ -680,9 +666,21 @@ var FunnelClaude = class {
 			mode: "new"
 		};
 	}
-	buildEnv(channelId, channelEnv) {
+	/**
+	* Mirrors claude's session storage path
+	* (`<config-dir>/projects/<cwd-with-slashes-as-dashes>/<id>.jsonl`) to check
+	* whether a recorded session still exists. 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 configDir = recipeEnv.CLAUDE_CONFIG_DIR ?? globalThis.process.env.CLAUDE_CONFIG_DIR ?? join(homedir(), ".claude");
+		const projectSlug = cwd.replace(/\//g, "-");
+		return this.fs.existsSync(join(configDir, "projects", projectSlug, `${sessionId}.jsonl`));
+	}
+	buildEnv(channelId, recipeEnv) {
 		const env = {};
-		for (const [key, value] of Object.entries(channelEnv)) env[key] = value;
+		for (const [key, value] of Object.entries(recipeEnv)) 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;
@@ -781,16 +779,17 @@ var MemoryFunnelIdGenerator = class extends FunnelIdGenerator {
 /**
 * Per-repo launch config (`funnel.json`).
 *
-* `fnl claude` reads this when no --profile is given and picks one of the
-* declared channels (`--channel <name>` selects by name; otherwise the first
-* entry wins). The chosen channel is materialized into
-* `~/.funnel/settings.json` on launch — token fields in connectors resolve
-* via literal / `env.<field>` / TTY prompt.
+* `fnl claude` reads this when no global --profile preset is used. It picks one
+* of the declared channels (`--channel <name>` selects by name; otherwise the
+* first entry wins) and materializes its transport (connectors / delivery) into
+* `~/.funnel/settings.json` on launch — token fields in connectors resolve via
+* literal / `env.<field>` / TTY prompt.
 *
-* Top-level `options` and `env` are defaults shared by every channel: each
-* channel's own `options` is appended after the shared ones (CLI semantics
-* keep the later flag winning), and `env` is a shallow merge with the
-* channel's keys overriding the shared ones.
+* The launch recipe (`options` / `env` / `resume`) lives on `profiles[]`, not on
+* the channel: a channel only describes where events come from. `fnl claude`
+* applies the first profile bound to the chosen channel (or `--profile <name>`
+* to pick another); the recipe is passed straight to the launcher and is not
+* persisted into the global profile list.
 */
 const slackEnvSchema = z.object({
 	botToken: z.string().optional(),
@@ -829,7 +828,13 @@ const connectorSpecSchema = z.discriminatedUnion("type", [
 ]);
 const channelSpecSchema = z.object({
 	name: z.string(),
-	/** Args prepended to the claude argv on every launch bound to this channel. */
+	connectors: z.array(connectorSpecSchema).optional()
+});
+const profileSpecSchema = z.object({
+	name: z.string(),
+	/** Name of the channel (declared in `channels[]`) this profile subscribes to. */
+	channel: z.string(),
+	/** Args prepended to the claude argv on every launch through this profile. */
 	options: z.array(z.string()).optional(),
 	/** Env vars layered under the launched claude process. process.env wins on collision. */
 	env: z.record(z.string(), z.string()).optional(),
@@ -837,15 +842,16 @@ const channelSpecSchema = z.object({
 	* When true (the default), funnel injects `--session-id <uuid>` so that
 	* relaunching from the same cwd resumes the previous claude session
 	* without bleeding into other channels or workspaces. Set to false for
-	* channels that should always start a fresh session.
+	* profiles that should always start a fresh session.
 	*/
-	resume: z.boolean().optional(),
-	connectors: z.array(connectorSpecSchema).optional()
+	resume: z.boolean().optional()
 });
 const localConfigSchema = z.object({
 	$schema: z.string().optional(),
-	/** Declared channels. First entry is the default; --channel <name> selects by name. */
-	channels: z.array(channelSpecSchema).min(1)
+	/** Declared channels (transport only). First entry is the default; --channel <name> selects by name. */
+	channels: z.array(channelSpecSchema).min(1),
+	/** Launch presets bound to a channel. First entry bound to the chosen channel is the default. */
+	profiles: z.array(profileSpecSchema).optional()
 });
 const LOCAL_CONFIG_FILENAME = "funnel.json";
 const LOCAL_ENV_FILENAME = ".env.local";
@@ -932,17 +938,6 @@ var FunnelLocalConfig = class {
 var FunnelTokenPrompter = class {};
 //#endregion
 //#region lib/engine/local-config/local-config-sync.ts
-const arraysEqual = (a, b) => {
-	if (a.length !== b.length) return false;
-	for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return false;
-	return true;
-};
-const recordsEqual = (a, b) => {
-	const keys = Object.keys(a);
-	if (keys.length !== Object.keys(b).length) return false;
-	for (const key of keys) if (a[key] !== b[key]) return false;
-	return true;
-};
 /**
 * Reconciles a single funnel.json channel spec with `~/.funnel/settings.json`.
 * The spec is the source of truth for the channel it declares:
@@ -975,21 +970,7 @@ var FunnelLocalConfigSync = class {
 		Object.freeze(this);
 	}
 	async ensure(channel, cwd) {
-		const existing = this.channels.get(channel.name);
-		const nextResume = channel.resume ?? true;
-		if (!existing) this.channels.add({
-			name: channel.name,
-			options: channel.options ?? [],
-			env: channel.env ?? {},
-			resume: nextResume
-		});
-		else {
-			const nextOptions = channel.options ?? [];
-			const nextEnv = channel.env ?? {};
-			if (!arraysEqual(existing.options, nextOptions)) this.channels.setOptions(channel.name, nextOptions);
-			if (!recordsEqual(existing.env, nextEnv)) this.channels.setEnv(channel.name, nextEnv);
-			if (existing.resume !== nextResume) this.channels.setResume(channel.name, nextResume);
-		}
+		if (!this.channels.get(channel.name)) this.channels.add({ name: channel.name });
 		if (channel.connectors === void 0) return {
 			touched: [],
 			removed: []
@@ -1428,9 +1409,10 @@ var MemoryFunnelProcessRunner = class extends FunnelProcessRunner {
 //#region lib/engine/profiles/profiles.ts
 /**
 * Named launch presets for `fnl claude`. Each profile bundles a working
-* directory, a sub-agent name, and the channel id its Claude instance will
-* subscribe to. Implements ProfileChannelChecker so FunnelChannels can refuse
-* to remove a channel that is still referenced.
+* directory, the channel id its Claude instance subscribes to, and the launch
+* recipe (`options` prepended to the claude argv, `env` layered under the
+* process, `resume` toggling session reuse). Implements ProfileChannelChecker
+* so FunnelChannels can refuse to remove a channel that is still referenced.
 *
 * The first entry in the persisted array is treated as the default profile;
 * `asDefault` reorders the array to put a named profile first.
@@ -1453,11 +1435,18 @@ var FunnelProfiles = class {
 	getDefault() {
 		return this.list()[0] ?? null;
 	}
-	add(config) {
+	add(input) {
 		const settings = this.store.read();
-		if (settings.profiles.some((p) => p.name === config.name)) throw new Error(`profile "${config.name}" already exists`);
-		if (!settings.channels.some((c) => c.id === config.channelId)) throw new Error(`channel id "${config.channelId}" not found`);
-		settings.profiles.push(config);
+		if (settings.profiles.some((p) => p.name === input.name)) throw new Error(`profile "${input.name}" already exists`);
+		if (!settings.channels.some((c) => c.id === input.channelId)) throw new Error(`channel id "${input.channelId}" not found`);
+		settings.profiles.push({
+			name: input.name,
+			path: input.path,
+			channelId: input.channelId,
+			options: input.options ?? [],
+			env: input.env ?? {},
+			resume: input.resume ?? true
+		});
 		this.store.write(settings);
 	}
 	remove(name) {
@@ -1497,6 +1486,9 @@ var FunnelProfiles = class {
 			profile.channelId = fields.channelId;
 		}
 		if (fields.path !== void 0) profile.path = fields.path;
+		if (fields.options !== void 0) profile.options = fields.options;
+		if (fields.env !== void 0) profile.env = fields.env;
+		if (fields.resume !== void 0) profile.resume = fields.resume;
 		this.store.write(settings);
 	}
 };
@@ -3847,14 +3839,14 @@ const startChannelServer = async (options = {}) => {
 /**
 * 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.
+* 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` 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."
+		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
@@ -4671,31 +4663,78 @@ examples:
 	return c.text("funnel gateway: stopped");
 });
 //#endregion
+//#region lib/cli/routes/parse-profile-recipe.ts
+/**
+* Turns the single-string CLI flags (`--agent`, `--options "<argv>"`,
+* `--env "k=v,k=v"`, `--resume` / `--no-resume`) into the profile recipe.
+* A field stays `undefined` when its flag is absent so `profiles.update`
+* leaves it untouched. `--options` is whitespace-split, so values that
+* themselves contain spaces are not expressible here — set those via
+* funnel.json instead.
+*/
+const parseProfileRecipe = (query) => {
+	const recipe = {};
+	if (query.agent !== void 0 || query.options !== void 0) {
+		const options = [];
+		if (query.agent !== void 0) options.push("--agent", query.agent);
+		if (query.options !== void 0) {
+			for (const token of query.options.split(/\s+/)) if (token.length > 0) options.push(token);
+		}
+		recipe.options = options;
+	}
+	if (query.env !== void 0) {
+		const env = {};
+		for (const pair of query.env.split(",")) {
+			const trimmed = pair.trim();
+			if (trimmed.length === 0) continue;
+			const eq = trimmed.indexOf("=");
+			if (eq < 0) continue;
+			env[trimmed.slice(0, eq)] = trimmed.slice(eq + 1);
+		}
+		recipe.env = env;
+	}
+	if (query["no-resume"] !== void 0) recipe.resume = false;
+	else if (query.resume !== void 0) recipe.resume = query.resume !== "false";
+	return recipe;
+};
+//#endregion
 //#region lib/cli/routes/profiles.add.$profile.ts
 const addHelp = `funnel profiles add — add a profile
 
-usage: funnel profiles add <name> --path <path> --channel <channel-name>
+usage: funnel profiles add <name> --path <path> --channel <channel-name> [recipe]
 
 options:
-  --path     working directory passed to claude as cwd
-  --channel  channel name (resolved to channel id internally)
+  --path        working directory passed to claude as cwd
+  --channel     channel name (resolved to channel id internally)
+  --agent       sub-agent name, prepended to the launch argv as --agent <name>
+  --options     extra launch argv as one whitespace-split string (e.g. "--brief")
+  --env         env vars layered under the process, as "KEY=VAL,KEY2=VAL2"
+  --no-resume   start a fresh claude session every launch (default resumes)
 
-Per-launch flags like --agent or --brief now live on the channel itself
-(set with \`fnl channels <name> set options ...\`), so profiles are only
-\`{ name, path, channelId }\`.`;
+The launch recipe (--agent / --options / --env / --resume) lives on the
+profile; the channel only declares transport (connectors / delivery).`;
 const profilesAddHandler = factory.createHandlers(zValidator$1("param", z.object({ profile: z.string() })), zValidator$1("query", z.object({
 	path: z.string(),
-	channel: z.string()
+	channel: z.string(),
+	agent: z.string().optional(),
+	options: z.string().optional(),
+	env: z.string().optional(),
+	resume: z.string().optional(),
+	"no-resume": z.string().optional()
 }), addHelp), (c) => {
 	const param = c.req.valid("param");
 	const query = c.req.valid("query");
 	const funnel = c.var.funnel;
 	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({
 		name: param.profile,
 		path: query.path,
-		channelId: channel.id
+		channelId: channel.id,
+		options: recipe.options,
+		env: recipe.env,
+		resume: recipe.resume
 	});
 	return c.text(`added profile "${param.profile}"`);
 });
@@ -4739,7 +4778,10 @@ const profilesLaunchHandler = factory.createHandlers(zValidator$1("param", z.obj
 		channel: profile.channelId,
 		cwd: profile.path,
 		userArgs: queryToCliArgs(c.req.url, RESERVED_KEYS),
-		profileName: profile.name
+		profileName: profile.name,
+		options: profile.options,
+		env: profile.env,
+		resume: profile.resume
 	});
 	process.exit(exitCode);
 });
@@ -4757,19 +4799,39 @@ const profilesRemoveHandler = factory.createHandlers(zValidator$1("param", z.obj
 //#region lib/cli/routes/profiles.set.$profile.ts
 const setHelp = `funnel profiles <name> set — update a profile
 
-usage: funnel profiles <name> set [--path <path>] [--channel <channel-name>]`;
+usage: funnel profiles <name> set [--path <path>] [--channel <channel-name>] [recipe]
+
+options:
+  --path        working directory passed to claude as cwd
+  --channel     channel name (resolved to channel id internally)
+  --agent       sub-agent name, prepended to the launch argv as --agent <name>
+  --options     extra launch argv as one whitespace-split string (e.g. "--brief")
+  --env         env vars layered under the process, as "KEY=VAL,KEY2=VAL2"
+  --resume / --no-resume  toggle claude session reuse
+
+Only the flags you pass are changed; --agent and --options together replace
+the profile's whole options list.`;
 const profilesSetHandler = factory.createHandlers(zValidator$1("param", z.object({ profile: z.string() })), zValidator$1("query", z.object({
 	path: z.string().optional(),
-	channel: z.string().optional()
+	channel: z.string().optional(),
+	agent: z.string().optional(),
+	options: z.string().optional(),
+	env: z.string().optional(),
+	resume: z.string().optional(),
+	"no-resume": z.string().optional()
 }), setHelp), (c) => {
 	const param = c.req.valid("param");
 	const query = c.req.valid("query");
 	const funnel = c.var.funnel;
 	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, {
 		path: query.path,
-		channelId: channel?.id
+		channelId: channel?.id,
+		options: recipe.options,
+		env: recipe.env,
+		resume: recipe.resume
 	});
 	return c.text(`updated profile "${param.profile}"`);
 });
@@ -4779,27 +4841,29 @@ usage: funnel profiles [subcommand]
 
 subcommands:
   (none)                          list (first entry is the default)
-  add <name> --path <path> --channel <channel>
-  <name> set [--path ...] [--channel ...]
+  add <name> --path <path> --channel <channel> [--agent ...] [--options ...] [--env ...] [--no-resume]
+  <name> set [--path ...] [--channel ...] [--agent ...] [--options ...] [--env ...] [--resume|--no-resume]
   <name> as-default               move profile to the front (becomes default)
   rename <old> <new>              rename
   remove <name>                   remove
   <name> run                      launch (sugar for fnl claude -p <name>)
   <name>                          launch (alias for run)
 
-Per-launch flags like --agent or --brief now live on the channel itself
-(set with \`fnl channels <name> set options ...\`), so profiles are only
-\`{ name, path, channelId }\`.
+A profile carries the launch recipe — \`--agent\` / \`--options\` prepended to
+the claude argv, \`--env\` layered under the process, \`--resume\` toggling
+session reuse. The channel it points at only declares transport (connectors).
 
 examples:
-  funnel profiles add cto --path /repo/myapp --channel prod-inbox
+  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.var.funnel.profiles.list();
 	if (profiles.length === 0) return c.text("no profiles");
 	const lines = profiles.map((profile, index) => {
 		const tag = index === 0 ? " (default)" : "";
-		return `${profile.name}${tag}  [path=${profile.path}, channel=${profile.channelId}]`;
+		const recipe = profile.options.length > 0 ? `, options=${profile.options.join(" ")}` : "";
+		const session = profile.resume ? "" : ", resume=false";
+		return `${profile.name}${tag}  [path=${profile.path}, channel=${profile.channelId}${recipe}${session}]`;
 	});
 	return c.text(lines.join("\n"));
 });
@@ -7116,4 +7180,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, FunnelDotenvReader, FunnelEventStore, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSessions, 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, channelSpecSchema, 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 };
+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, FunnelSessions, 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, channelSpecSchema, app as cliApp, connectorConfigSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, launchTui, localConfigSchema, profileConfigSchema, profileSpecSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };

package/funnel.schema.json

@@ -14,24 +14,6 @@
           "name": {
             "type": "string"
           },
-          "options": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "env": {
-            "type": "object",
-            "propertyNames": {
-              "type": "string"
-            },
-            "additionalProperties": {
-              "type": "string"
-            }
-          },
-          "resume": {
-            "type": "boolean"
-          },
           "connectors": {
             "type": "array",
             "items": {
@@ -151,6 +133,43 @@
         ],
         "additionalProperties": false
       }
+    },
+    "profiles": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "channel": {
+            "type": "string"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "env": {
+            "type": "object",
+            "propertyNames": {
+              "type": "string"
+            },
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "resume": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "name",
+          "channel"
+        ],
+        "additionalProperties": false
+      }
     }
   },
   "required": [
@@ -158,6 +177,6 @@
   ],
   "additionalProperties": false,
   "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."
+  "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."
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interactive-inc/claude-funnel",
-  "version": "0.24.0",
+  "version": "0.25.1",
   "description": "Hub CLI that routes external events (Slack / GitHub / Discord) to Claude Code agents through subscription channels over MCP.",
   "keywords": [
     "bun",