@interactive-inc/claude-funnel 0.16.1 → 0.18.0

package/dist/{gh-connector-schema-BZFAS-p-.d.ts → gh-connector-schema-BNyTaASt.d.ts}

@@ -14,6 +14,9 @@ type RunResult = {
 type AttachOptions = {
   cwd?: string;
   env?: Record<string, string>;
+  /** Invoked synchronously after the child process has been spawned, with its PID.
+   *  Useful for hosts that need to register the spawned process before it exits. */
+  onSpawned?: (pid: number) => void;
 };
 type DetachOptions = {
   env?: Record<string, string>;

package/dist/{gh-connector-schema-2ml29MBC.js → gh-connector-schema-CD5HIkrd.js}

@@ -52,7 +52,7 @@ var NodeFunnelProcessRunner = class extends FunnelProcessRunner {
 		};
 	}
 	async attach(command, options = {}) {
-		return await Bun.spawn(command, {
+		const proc = Bun.spawn(command, {
 			cwd: options.cwd,
 			env: toEnv(options.env),
 			stdio: [
@@ -60,7 +60,9 @@ var NodeFunnelProcessRunner = class extends FunnelProcessRunner {
 				"inherit",
 				"inherit"
 			]
-		}).exited;
+		});
+		if (options.onSpawned) options.onSpawned(proc.pid);
+		return await proc.exited;
 	}
 	detach(command, options = {}) {
 		Bun.spawn(command, {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { n as FunnelConnectorAdapter, t as CallInput } from "./connector-adapter-CXB-q_XC.js";
 import { n as discordConnectorSchema, t as DiscordConnectorConfig } from "./discord-connector-schema-Dww2I4zH.js";
 import { n as FunnelConnectorListener, r as NotifyFn, t as FunnelLogger } from "./logger-CTlXs7z4.js";
-import { a as FunnelProcessRunner, i as DetachOptions, n as ghConnectorSchema, o as RunOptions, r as AttachOptions, s as RunResult, t as GhConnectorConfig } from "./gh-connector-schema-BZFAS-p-.js";
+import { a as FunnelProcessRunner, i as DetachOptions, n as ghConnectorSchema, o as RunOptions, r as AttachOptions, s as RunResult, t as GhConnectorConfig } from "./gh-connector-schema-BNyTaASt.js";
 import { a as FunnelFileSystem, c as ScheduleEntry, d as scheduleEntrySchema, i as FileStat, l as scheduleCatchupPolicySchema, n as ScheduleOnFired, o as ScheduleCatchupPolicy, s as ScheduleConnectorConfig, u as scheduleConnectorSchema } from "./schedule-listener-BPodvbld.js";
 import { a as SlackProcessed, c as SlackRawEvent, i as FunnelSlackEventProcessor, l as SlackConnectorConfig, n as SlackOnAppCreated, o as SlackProcessedEmit, r as SlackPreprocessEvent, s as SlackProcessedSkip, u as slackConnectorSchema } from "./slack-listener-CHj6uMY-.js";
 import { z } from "zod";
@@ -150,6 +150,8 @@ declare const channelConfigSchema: z.ZodObject<{
     fanout: "fanout";
     exclusive: "exclusive";
   }>>;
+  options: z.ZodDefault<z.ZodArray<z.ZodString>>;
+  env: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
   connectors: z.ZodDefault<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
     id: z.ZodString;
     name: z.ZodString;
@@ -195,9 +197,7 @@ type ChannelConfig = z.infer<typeof channelConfigSchema>;
 declare const profileConfigSchema: z.ZodObject<{
   name: z.ZodString;
   path: z.ZodString;
-  subAgent: z.ZodString;
   channelId: z.ZodString;
-  brief: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
 type ProfileConfig = z.infer<typeof profileConfigSchema>;
 declare const SETTINGS_VERSION = 1;
@@ -210,6 +210,8 @@ declare const settingsSchema: z.ZodObject<{
       fanout: "fanout";
       exclusive: "exclusive";
     }>>;
+    options: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    env: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
     connectors: z.ZodDefault<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
       id: z.ZodString;
       name: z.ZodString;
@@ -254,9 +256,7 @@ declare const settingsSchema: z.ZodObject<{
   profiles: z.ZodDefault<z.ZodArray<z.ZodObject<{
     name: z.ZodString;
     path: z.ZodString;
-    subAgent: z.ZodString;
     channelId: z.ZodString;
-    brief: z.ZodOptional<z.ZodBoolean>;
   }, z.core.$strip>>>;
 }, z.core.$strip>;
 type Settings = z.infer<typeof settingsSchema>;
@@ -318,8 +318,12 @@ declare class FunnelChannels {
   add(input: {
     name: string;
     delivery?: ChannelDeliveryMode;
+    options?: string[];
+    env?: Record<string, string>;
   }): ChannelConfig;
   setDelivery(name: string, delivery: ChannelDeliveryMode): void;
+  setOptions(name: string, options: string[]): void;
+  setEnv(name: string, env: Record<string, string>): void;
   remove(name: string): void;
   rename(oldName: string, newName: string): void;
   listConnectors(channelName: string): ConnectorConfig[];
@@ -392,11 +396,12 @@ declare class FunnelMcp {
 type LaunchOptions = {
   channel: string;
   cwd?: string;
-  subAgent?: string;
   userArgs?: string[];
-  profileName?: string; /** Forward `--brief` to claude on launch (enables the SendUserMessage tool). */
-  brief?: boolean; /** Extra env vars merged under process.env (process.env wins on collision). */
-  extraEnv?: Record<string, string>;
+  profileName?: string;
+  /** Invoked synchronously after the child claude process has been spawned, with its PID.
+   *  Useful for hosts that need to register the spawned process before it exits
+   *  (e.g. multi-session registries that track per-claude liveness). */
+  onSpawned?: (pid: number) => void;
 };
 type Deps$12 = {
   channels: FunnelChannels;
@@ -508,8 +513,6 @@ declare const channelSpecSchema: z.ZodObject<{
 type ChannelSpec = z.infer<typeof channelSpecSchema>;
 declare const localConfigSchema: z.ZodObject<{
   $schema: z.ZodOptional<z.ZodString>;
-  options: z.ZodOptional<z.ZodArray<z.ZodString>>;
-  env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
   channels: z.ZodArray<z.ZodObject<{
     name: z.ZodString;
     options: z.ZodOptional<z.ZodArray<z.ZodString>>;
@@ -2410,10 +2413,8 @@ declare const createCliApp: (funnel: Funnel) => _$hono_hono_base0.HonoBase<Env,
         };
       } & {
         query: {
-          path: string | string[];
-          "sub-agent": string | string[];
-          channel: string | string[];
-          brief?: string | string[] | undefined;
+          path: string;
+          channel: string;
         };
       };
       output: string;
@@ -2426,10 +2427,8 @@ declare const createCliApp: (funnel: Funnel) => _$hono_hono_base0.HonoBase<Env,
         };
       } & {
         query: {
-          path: string | string[];
-          "sub-agent": string | string[];
-          channel: string | string[];
-          brief?: string | string[] | undefined;
+          path: string;
+          channel: string;
         };
       };
       output: `added profile "${string}"`;
@@ -2456,10 +2455,7 @@ declare const createCliApp: (funnel: Funnel) => _$hono_hono_base0.HonoBase<Env,
       } & {
         query: {
           path?: string | undefined;
-          "sub-agent"?: string | undefined;
           channel?: string | undefined;
-          brief?: string | string[] | undefined;
-          "no-brief"?: string | string[] | undefined;
         };
       };
       output: string;
@@ -2473,10 +2469,7 @@ declare const createCliApp: (funnel: Funnel) => _$hono_hono_base0.HonoBase<Env,
       } & {
         query: {
           path?: string | undefined;
-          "sub-agent"?: string | undefined;
           channel?: string | undefined;
-          brief?: string | string[] | undefined;
-          "no-brief"?: string | string[] | undefined;
         };
       };
       output: `updated profile "${string}"`;
@@ -3701,10 +3694,8 @@ declare const app: _$hono_hono_base0.HonoBase<Env, {
         };
       } & {
         query: {
-          path: string | string[];
-          "sub-agent": string | string[];
-          channel: string | string[];
-          brief?: string | string[] | undefined;
+          path: string;
+          channel: string;
         };
       };
       output: string;
@@ -3717,10 +3708,8 @@ declare const app: _$hono_hono_base0.HonoBase<Env, {
         };
       } & {
         query: {
-          path: string | string[];
-          "sub-agent": string | string[];
-          channel: string | string[];
-          brief?: string | string[] | undefined;
+          path: string;
+          channel: string;
         };
       };
       output: `added profile "${string}"`;
@@ -3747,10 +3736,7 @@ declare const app: _$hono_hono_base0.HonoBase<Env, {
       } & {
         query: {
           path?: string | undefined;
-          "sub-agent"?: string | undefined;
           channel?: string | undefined;
-          brief?: string | string[] | undefined;
-          "no-brief"?: string | string[] | undefined;
         };
       };
       output: string;
@@ -3764,10 +3750,7 @@ declare const app: _$hono_hono_base0.HonoBase<Env, {
       } & {
         query: {
           path?: string | undefined;
-          "sub-agent"?: string | undefined;
           channel?: string | undefined;
-          brief?: string | string[] | undefined;
-          "no-brief"?: string | string[] | undefined;
         };
       };
       output: `updated profile "${string}"`;
@@ -4212,4 +4195,4 @@ ${string}`;
 //#region lib/tui/tui.d.ts
 declare function launchTui(funnel: Funnel): Promise<void>;
 //#endregion
-export { AttachOptions, BroadcastEvent, BroadcastSubscriber, ChannelConfig, ChannelConnectorView, ChannelDeliveryMode, ChannelServerOptions, ChannelSpec, ConnectorConfig, ConnectorSpec, ConnectorType, DEFAULT_GATEWAY_TOKEN_PATH, DetachOptions, DiscordConnectorConfig, Env, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, FileStat, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelDotenvReader, FunnelEvent, FunnelEventStore, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, GhConnectorConfig, LOCAL_CONFIG_FILENAME, LOCAL_ENV_FILENAME, LaunchOptions, ListListenersResult, ListenerEntry, ListenerOpResult, LocalConfig, LogEntry, MemoryFunnelClock, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MemoryProcessCall, MemoryProcessHandler, MemoryProcessResponse, MemoryProcessSyncHandler, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, NotifyFn, ProfileConfig, PublishRequest, PublishResponse, PublishResult, ReplayableEvent, RunOptions, RunResult, SETTINGS_PATH, SETTINGS_VERSION, ScheduleCatchupPolicy, ScheduleConnectorConfig, ScheduleEntry, ScheduleListenerOptions, Settings, SlackConnectorConfig, SlackListenerOptions, SlackProcessed, SlackProcessedEmit, SlackProcessedSkip, SlackRawEvent, 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 { AttachOptions, BroadcastEvent, BroadcastSubscriber, ChannelConfig, ChannelConnectorView, ChannelDeliveryMode, ChannelServerOptions, ChannelSpec, ConnectorConfig, ConnectorSpec, ConnectorType, DEFAULT_GATEWAY_TOKEN_PATH, DetachOptions, DiscordConnectorConfig, Env, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, FileStat, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelDotenvReader, FunnelEvent, FunnelEventStore, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, type GatewayEmitInput, type GatewayRouteDeps, type Env$1 as GatewayServerEnv, GhConnectorConfig, LOCAL_CONFIG_FILENAME, LOCAL_ENV_FILENAME, LaunchOptions, ListListenersResult, ListenerEntry, ListenerOpResult, LocalConfig, LogEntry, MemoryFunnelClock, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MemoryProcessCall, MemoryProcessHandler, MemoryProcessResponse, MemoryProcessSyncHandler, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, NotifyFn, ProfileConfig, PublishRequest, PublishResponse, PublishResult, ReplayableEvent, RunOptions, RunResult, SETTINGS_PATH, SETTINGS_VERSION, ScheduleCatchupPolicy, ScheduleConnectorConfig, ScheduleEntry, ScheduleListenerOptions, Settings, SlackConnectorConfig, SlackListenerOptions, SlackProcessed, SlackProcessedEmit, SlackProcessedSkip, SlackRawEvent, 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 };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { i as FunnelDiscordAdapter, n as FunnelDiscordListener, t as discordConnectorSchema } from "./discord-connector-schema-ygf5Df-2.js";
 import { n as FunnelLogger, r as FunnelConnectorListener, t as NodeFunnelLogger } from "./node-logger-DQz_BGOD.js";
-import { a as FunnelProcessRunner, i as NodeFunnelProcessRunner, n as FunnelGhListener, r as FunnelGhAdapter, t as ghConnectorSchema } from "./gh-connector-schema-2ml29MBC.js";
+import { a as FunnelProcessRunner, i as NodeFunnelProcessRunner, n as FunnelGhListener, r as FunnelGhAdapter, t as ghConnectorSchema } from "./gh-connector-schema-CD5HIkrd.js";
 import { a as ScheduleStateStore, i as FunnelScheduleListener, n as scheduleConnectorSchema, o as NodeFunnelFileSystem, r as scheduleEntrySchema, s as FunnelFileSystem, t as scheduleCatchupPolicySchema } from "./schedule-connector-schema-FxP7LPlx.js";
 import { i as FunnelSlackAdapter, n as FunnelSlackListener, r as FunnelSlackEventProcessor, t as slackConnectorSchema } from "./slack-connector-schema-B4hsf3AY.js";
 import { dirname, join, resolve } from "node:path";
@@ -50,15 +50,16 @@ 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. */
+	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({}),
 	connectors: z.array(connectorConfigSchema).default([])
 });
 const profileConfigSchema = z.object({
 	name: z.string(),
 	path: z.string(),
-	subAgent: z.string(),
-	channelId: z.string(),
-	/** Forwards `--brief` to claude on launch (enables the SendUserMessage tool). */
-	brief: z.boolean().optional()
+	channelId: z.string()
 });
 const SETTINGS_VERSION = 1;
 const settingsSchema = z.object({
@@ -305,6 +306,8 @@ var FunnelChannels = class {
 			id: this.idGenerator.generate(),
 			name: input.name,
 			delivery: input.delivery ?? "fanout",
+			options: input.options ?? [],
+			env: input.env ?? {},
 			connectors: []
 		};
 		settings.channels.push(channel);
@@ -317,6 +320,18 @@ var FunnelChannels = class {
 		channel.delivery = delivery;
 		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);
@@ -567,18 +582,18 @@ var FunnelClaude = class {
 			this.writePidFile(options.profileName);
 			this.installCleanup(options.profileName);
 		}
-		const claudeArgs = this.buildArgs(options, cwd);
-		const env = this.buildEnv(channel.id, options.extraEnv);
+		const claudeArgs = this.buildArgs(channel.options, options.userArgs ?? [], cwd);
+		const env = this.buildEnv(channel.id, channel.env);
 		this.logger.info(`claude launch`, {
 			channel: options.channel,
 			channelId: channel.id,
-			subAgent: options.subAgent,
 			cwd
 		});
 		try {
 			return await this.process.attach(["claude", ...claudeArgs], {
 				cwd,
-				env
+				env,
+				onSpawned: options.onSpawned
 			});
 		} finally {
 			if (options.profileName) this.removePidFile(options.profileName);
@@ -628,17 +643,15 @@ var FunnelClaude = class {
 		if (!state) return false;
 		return !state.startsWith("Z");
 	}
-	buildArgs(options, cwd) {
-		const result = [...options.userArgs ?? []];
+	buildArgs(channelOptions, userArgs, cwd) {
+		const result = [...channelOptions, ...userArgs];
 		const mcpName = this.mcp.findInstalledName(cwd);
 		if (mcpName && !result.includes("--dangerously-load-development-channels") && !result.includes("--channels")) result.push("--dangerously-load-development-channels", `server:${mcpName}`);
-		if (!result.includes("--agent") && options.subAgent) result.push("--agent", options.subAgent);
-		if (options.brief && !result.includes("--brief")) result.push("--brief");
 		return result;
 	}
-	buildEnv(channelId, extraEnv) {
+	buildEnv(channelId, channelEnv) {
 		const env = {};
-		if (extraEnv) for (const [key, value] of Object.entries(extraEnv)) env[key] = value;
+		for (const [key, value] of Object.entries(channelEnv)) 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;
@@ -783,16 +796,14 @@ 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. */
 	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(),
 	connectors: z.array(connectorSpecSchema).optional()
 });
 const localConfigSchema = z.object({
 	$schema: z.string().optional(),
-	/** Extra args forwarded to every channel's launch before the channel's own options. User-supplied CLI args still come last. */
-	options: z.array(z.string()).optional(),
-	/** Environment variables shared by every channel. Each channel's env merges on top; process.env wins overall. */
-	env: z.record(z.string(), z.string()).optional(),
 	/** Declared channels. First entry is the default; --channel <name> selects by name. */
 	channels: z.array(channelSpecSchema).min(1)
 });
@@ -881,6 +892,17 @@ 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:
@@ -910,7 +932,18 @@ var FunnelLocalConfigSync = class {
 		Object.freeze(this);
 	}
 	async ensure(channel, cwd) {
-		if (!this.channels.get(channel.name)) this.channels.add({ name: channel.name });
+		const existing = this.channels.get(channel.name);
+		if (!existing) this.channels.add({
+			name: channel.name,
+			options: channel.options ?? [],
+			env: channel.env ?? {}
+		});
+		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 (channel.connectors === void 0) return;
 		const dotenv = this.dotenv.read(cwd);
 		const touched = /* @__PURE__ */ new Set();
@@ -1222,6 +1255,7 @@ var MemoryFunnelProcessRunner = class extends FunnelProcessRunner {
 			command,
 			options
 		});
+		if (options.onSpawned) options.onSpawned(1);
 		return (await this.handler(command)).exitCode ?? 0;
 	}
 	detach(command, options = {}) {
@@ -1315,7 +1349,6 @@ var FunnelProfiles = class {
 			profile.channelId = fields.channelId;
 		}
 		if (fields.path !== void 0) profile.path = fields.path;
-		if (fields.subAgent !== void 0) profile.subAgent = fields.subAgent;
 		this.store.write(settings);
 	}
 };
@@ -3361,6 +3394,7 @@ var Funnel = class Funnel {
 			process: this.process,
 			clock: this.clock,
 			logger: this.logger,
+			dir: this.paths.dir,
 			killCompetingSlack: options.killCompetingSlack,
 			token: options.token ?? this.gatewayToken.ensure(),
 			extraRoutes: options.extraRoutes
@@ -4121,10 +4155,8 @@ const claudeHandler = factory.createHandlers(zValidator$1("query", z.object({
 		const exitCode = await funnel.claude.launch({
 			channel: profile.channelId,
 			cwd: profile.path,
-			subAgent: profile.subAgent,
 			userArgs,
-			profileName: profile.name,
-			brief: profile.brief
+			profileName: profile.name
 		});
 		process.exit(exitCode);
 	}
@@ -4137,15 +4169,7 @@ const claudeHandler = factory.createHandlers(zValidator$1("query", z.object({
 		const exitCode = await funnel.claude.launch({
 			channel: picked.name,
 			cwd,
-			userArgs: [
-				...local.options ?? [],
-				...picked.options ?? [],
-				...userArgs
-			],
-			extraEnv: {
-				...local.env ?? {},
-				...picked.env ?? {}
-			}
+			userArgs
 		});
 		process.exit(exitCode);
 	}
@@ -4154,10 +4178,8 @@ const claudeHandler = factory.createHandlers(zValidator$1("query", z.object({
 	const exitCode = await funnel.claude.launch({
 		channel: defaultProfile.channelId,
 		cwd: defaultProfile.path,
-		subAgent: defaultProfile.subAgent,
 		userArgs,
-		profileName: defaultProfile.name,
-		brief: defaultProfile.brief
+		profileName: defaultProfile.name
 	});
 	process.exit(exitCode);
 });
@@ -4387,18 +4409,18 @@ examples:
 //#region lib/cli/routes/profiles.add.$profile.ts
 const addHelp = `funnel profiles add — add a profile
 
-usage: funnel profiles add <name> --path <path> --sub-agent <agent> --channel <channel-name> [--brief]
+usage: funnel profiles add <name> --path <path> --channel <channel-name>
 
 options:
-  --path        working directory passed to claude as cwd
-  --sub-agent   sub-agent name passed to claude --agent
-  --channel     channel name (resolved to channel id internally)
-  --brief       forward --brief to claude on launch (enables SendUserMessage tool)`;
+  --path     working directory passed to claude as cwd
+  --channel  channel name (resolved to channel id internally)
+
+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 }\`.`;
 const profilesAddHandler = factory.createHandlers(zValidator$1("param", z.object({ profile: z.string() })), zValidator$1("query", z.object({
 	path: z.string(),
-	"sub-agent": z.string(),
-	channel: z.string(),
-	brief: z.coerce.boolean().optional()
+	channel: z.string()
 }), addHelp), (c) => {
 	const param = c.req.valid("param");
 	const query = c.req.valid("query");
@@ -4408,9 +4430,7 @@ const profilesAddHandler = factory.createHandlers(zValidator$1("param", z.object
 	funnel.profiles.add({
 		name: param.profile,
 		path: query.path,
-		subAgent: query["sub-agent"],
-		channelId: channel.id,
-		...query.brief !== void 0 ? { brief: query.brief } : {}
+		channelId: channel.id
 	});
 	return c.text(`added profile "${param.profile}"`);
 });
@@ -4453,7 +4473,6 @@ const profilesLaunchHandler = factory.createHandlers(zValidator$1("param", z.obj
 	const exitCode = await funnel.claude.launch({
 		channel: profile.channelId,
 		cwd: profile.path,
-		subAgent: profile.subAgent,
 		userArgs: queryToCliArgs(c.req.url, RESERVED_KEYS),
 		profileName: profile.name
 	});
@@ -4473,25 +4492,19 @@ 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>] [--sub-agent <agent>] [--channel <channel-name>] [--brief | --no-brief]`;
+usage: funnel profiles <name> set [--path <path>] [--channel <channel-name>]`;
 const profilesSetHandler = factory.createHandlers(zValidator$1("param", z.object({ profile: z.string() })), zValidator$1("query", z.object({
 	path: z.string().optional(),
-	"sub-agent": z.string().optional(),
-	channel: z.string().optional(),
-	brief: z.coerce.boolean().optional(),
-	"no-brief": z.coerce.boolean().optional()
+	channel: 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 brief = query["no-brief"] ? false : query.brief;
 	funnel.profiles.update(param.profile, {
 		path: query.path,
-		subAgent: query["sub-agent"],
-		channelId: channel?.id,
-		...brief !== void 0 ? { brief } : {}
+		channelId: channel?.id
 	});
 	return c.text(`updated profile "${param.profile}"`);
 });
@@ -4501,23 +4514,27 @@ usage: funnel profiles [subcommand]
 
 subcommands:
   (none)                          list (first entry is the default)
-  add <name> --path <path> --sub-agent <agent> --channel <channel>
-  <name> set [--path ...] [--sub-agent ...] [--channel ...]
+  add <name> --path <path> --channel <channel>
+  <name> set [--path ...] [--channel ...]
   <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 }\`.
+
 examples:
-  funnel profiles add cto --path /repo/myapp --sub-agent cto --channel prod-inbox
+  funnel profiles add cto --path /repo/myapp --channel prod-inbox
   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}, sub-agent=${profile.subAgent}, channel=${profile.channelId}]`;
+		return `${profile.name}${tag}  [path=${profile.path}, channel=${profile.channelId}]`;
 	});
 	return c.text(lines.join("\n"));
 });
@@ -4571,7 +4588,7 @@ const statusHandler = factory.createHandlers(zValidator$1("query", z.object({}),
 		const tag = index === 0 ? " (default)" : "";
 		const channel = funnel.channels.getById(profile.channelId);
 		const channelLabel = channel ? channel.name : `id:${profile.channelId}`;
-		lines.push(`  - ${profile.name}${tag} [path=${profile.path}, sub-agent=${profile.subAgent}, channel=${channelLabel}]`);
+		lines.push(`  - ${profile.name}${tag} [path=${profile.path}, channel=${channelLabel}]`);
 	}
 	lines.push("");
 	if (!gatewayStatus.running) lines.push("gateway: not running");
@@ -4949,7 +4966,7 @@ function ProfileLauncher(props) {
 						children: profile.name
 					}), /* @__PURE__ */ jsx("span", {
 						fg: funnel.faint,
-						children: `  → channel ${profile.channelId} · path ${profile.path} · sub-agent ${profile.subAgent}`
+						children: `  → channel ${profile.channelId} · path ${profile.path}`
 					})]
 				}, profile.name);
 			})
@@ -6464,9 +6481,6 @@ function ProfilesView(props) {
 			} else if (field === "path") {
 				const next = raw.trim();
 				if (next) props.funnel.profiles.update(profile.name, { path: next });
-			} else if (field === "sub-agent") {
-				const next = raw.trim();
-				if (next) props.funnel.profiles.update(profile.name, { subAgent: next });
 			}
 		} catch (error) {
 			props.funnel.logger.error(error instanceof Error ? error.message : String(error));
@@ -6490,7 +6504,6 @@ function ProfilesView(props) {
 			props.funnel.profiles.add({
 				name,
 				path: "",
-				subAgent: "",
 				channelId
 			});
 			props.setFocusedKey(fieldKey(name, "name"));
@@ -6524,14 +6537,6 @@ function ProfilesView(props) {
 					onCommit: (raw) => commit(profile, "path", raw),
 					placeholder: "repository path"
 				}),
-				/* @__PURE__ */ jsx(EditableField, {
-					label: "sub-agent",
-					initialValue: profile.subAgent,
-					focused: props.focusedKey === fieldKey(profile.name, "sub-agent"),
-					onFocus: () => props.setFocusedKey(fieldKey(profile.name, "sub-agent")),
-					onCommit: (raw) => commit(profile, "sub-agent", raw),
-					placeholder: "claude --agent value"
-				}),
 				/* @__PURE__ */ jsx(EditableField, {
 					label: "channel",
 					initialValue: profile.channelId,
@@ -6657,7 +6662,6 @@ function App(props) {
 			await props.funnel.claude.launch({
 				channel: profile.channelId,
 				cwd: profile.path,
-				subAgent: profile.subAgent,
 				profileName: profile.name
 			});
 		} catch (error) {

package/funnel.schema.json

@@ -5,21 +5,6 @@
     "$schema": {
       "type": "string"
     },
-    "options": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
-    },
-    "env": {
-      "type": "object",
-      "propertyNames": {
-        "type": "string"
-      },
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
     "channels": {
       "minItems": 1,
       "type": "array",

package/package.json

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