@interactive-inc/claude-funnel 0.15.1 → 0.16.1

package/dist/index.d.ts

@@ -476,9 +476,8 @@ declare const connectorSpecSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   name: z.ZodString;
 }, z.core.$strip>], "type">;
 type ConnectorSpec = z.infer<typeof connectorSpecSchema>;
-declare const localConfigSchema: z.ZodObject<{
-  $schema: z.ZodOptional<z.ZodString>;
-  channel: z.ZodString;
+declare const channelSpecSchema: z.ZodObject<{
+  name: z.ZodString;
   options: z.ZodOptional<z.ZodArray<z.ZodString>>;
   env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
   connectors: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -506,6 +505,41 @@ declare const localConfigSchema: z.ZodObject<{
     name: z.ZodString;
   }, z.core.$strip>], "type">>>;
 }, z.core.$strip>;
+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>>;
+    env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    connectors: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
+      type: z.ZodLiteral<"slack">;
+      name: z.ZodString;
+      botToken: z.ZodOptional<z.ZodString>;
+      appToken: z.ZodOptional<z.ZodString>;
+      env: z.ZodOptional<z.ZodObject<{
+        botToken: z.ZodOptional<z.ZodString>;
+        appToken: z.ZodOptional<z.ZodString>;
+      }, z.core.$strip>>;
+    }, z.core.$strip>, z.ZodObject<{
+      type: z.ZodLiteral<"discord">;
+      name: z.ZodString;
+      botToken: z.ZodOptional<z.ZodString>;
+      env: z.ZodOptional<z.ZodObject<{
+        botToken: z.ZodOptional<z.ZodString>;
+      }, z.core.$strip>>;
+    }, z.core.$strip>, z.ZodObject<{
+      type: z.ZodLiteral<"gh">;
+      name: z.ZodString;
+      pollInterval: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strip>, z.ZodObject<{
+      type: z.ZodLiteral<"schedule">;
+      name: z.ZodString;
+    }, z.core.$strip>], "type">>>;
+  }, z.core.$strip>>;
+}, z.core.$strip>;
 type LocalConfig = z.infer<typeof localConfigSchema>;
 declare const LOCAL_CONFIG_FILENAME = "funnel.json";
 declare const LOCAL_ENV_FILENAME = ".env.local";
@@ -545,8 +579,8 @@ type Deps$9 = {
   env?: NodeJS.ProcessEnv;
 };
 /**
- * Reconciles a `funnel.json` spec with `~/.funnel/settings.json`. The spec
- * is the source of truth for the channel it declares:
+ * Reconciles a single funnel.json channel spec with `~/.funnel/settings.json`.
+ * The spec is the source of truth for the channel it declares:
  *
  *   - missing channel → created
  *   - declared connector matched by name → tokens reconciled
@@ -555,9 +589,10 @@ type Deps$9 = {
  *   - declared connector with no match → added
  *   - any connector left in the channel that the spec did not touch → removed
  *
- * Removal only fires when funnel.json has a `connectors` field. An absent
- * field means "do not manage connectors from here" and leaves everything in
- * `~/.funnel` alone.
+ * Removal only fires when the channel spec has a `connectors` field. An
+ * absent field means "do not manage connectors from here" and leaves
+ * everything in `~/.funnel` alone. Other channels in funnel.json (not
+ * passed to this call) are untouched.
  */
 declare class FunnelLocalConfigSync {
   private readonly channels;
@@ -565,7 +600,7 @@ declare class FunnelLocalConfigSync {
   private readonly prompter;
   private readonly env;
   constructor(deps: Deps$9);
-  ensure(local: LocalConfig, cwd: string): Promise<void>;
+  ensure(channel: ChannelSpec, cwd: string): Promise<void>;
   private ensureConnector;
   private ensureSlack;
   private ensureDiscord;
@@ -1613,7 +1648,7 @@ declare const createCliApp: (funnel: Funnel) => _$hono_hono_base0.HonoBase<Env,
           channel?: string | undefined;
         };
       };
-      output: "funnel claude — launch Claude Code\n\nusage:\n  funnel claude                          launch using funnel.json in cwd, or the default profile\n  funnel claude -p <name>                launch a named profile\n  funnel claude --profile <name>         (long form)\n  funnel claude --channel <name>         raw launch (no profile, cwd = current dir)\n  funnel claude [...]                    any other argument is forwarded to the claude CLI\n\nresolution order when no --profile / --channel is given:\n  1. ./funnel.json in the current directory\n  2. the default profile (first entry in fnl profiles)\n\nfunnel-specific options (everything else passes through to claude verbatim):\n  -p, --profile      profile name to launch\n  --channel          channel name (raw launch, ignored when --profile is given)\n  -h, --help         show this help\n\nPositional args, unknown short flags (e.g. -c, -r), and claude's own flags\n(--agent, --resume, --model, --print, --output-format ...) are all forwarded.\nOn launch the FUNNEL_CHANNEL_ID env var is set and MCP connects to the gateway.";
+      output: "funnel claude — launch Claude Code\n\nusage:\n  funnel claude                          launch the first channel from funnel.json, or the default profile\n  funnel claude --channel <name>         with funnel.json: select that channel; without: raw launch\n  funnel claude -p <name>                launch a named profile\n  funnel claude --profile <name>         (long form)\n  funnel claude [...]                    any other argument is forwarded to the claude CLI\n\nresolution order:\n  1. --help                              print this help\n  2. --profile <name>                    named profile (ignores funnel.json)\n  3. ./funnel.json in the current directory + --channel selects (or first wins)\n  4. --channel <name> with no funnel.json → raw launch using an existing settings.json channel\n  5. the default profile (first entry in fnl profiles)\n\nfunnel-specific options (everything else passes through to claude verbatim):\n  -p, --profile      profile name to launch\n  --channel          channel name (selects from funnel.json, or raw-launches if no funnel.json)\n  -h, --help         show this help\n\nPositional args, unknown short flags (e.g. -c, -r), and claude's own flags\n(--agent, --resume, --model, --print, --output-format ...) are all forwarded.\nOn launch the FUNNEL_CHANNEL_ID env var is set and MCP connects to the gateway.";
       outputFormat: "text";
       status: _$hono_utils_http_status0.ContentfulStatusCode;
     };
@@ -2904,7 +2939,7 @@ declare const app: _$hono_hono_base0.HonoBase<Env, {
           channel?: string | undefined;
         };
       };
-      output: "funnel claude — launch Claude Code\n\nusage:\n  funnel claude                          launch using funnel.json in cwd, or the default profile\n  funnel claude -p <name>                launch a named profile\n  funnel claude --profile <name>         (long form)\n  funnel claude --channel <name>         raw launch (no profile, cwd = current dir)\n  funnel claude [...]                    any other argument is forwarded to the claude CLI\n\nresolution order when no --profile / --channel is given:\n  1. ./funnel.json in the current directory\n  2. the default profile (first entry in fnl profiles)\n\nfunnel-specific options (everything else passes through to claude verbatim):\n  -p, --profile      profile name to launch\n  --channel          channel name (raw launch, ignored when --profile is given)\n  -h, --help         show this help\n\nPositional args, unknown short flags (e.g. -c, -r), and claude's own flags\n(--agent, --resume, --model, --print, --output-format ...) are all forwarded.\nOn launch the FUNNEL_CHANNEL_ID env var is set and MCP connects to the gateway.";
+      output: "funnel claude — launch Claude Code\n\nusage:\n  funnel claude                          launch the first channel from funnel.json, or the default profile\n  funnel claude --channel <name>         with funnel.json: select that channel; without: raw launch\n  funnel claude -p <name>                launch a named profile\n  funnel claude --profile <name>         (long form)\n  funnel claude [...]                    any other argument is forwarded to the claude CLI\n\nresolution order:\n  1. --help                              print this help\n  2. --profile <name>                    named profile (ignores funnel.json)\n  3. ./funnel.json in the current directory + --channel selects (or first wins)\n  4. --channel <name> with no funnel.json → raw launch using an existing settings.json channel\n  5. the default profile (first entry in fnl profiles)\n\nfunnel-specific options (everything else passes through to claude verbatim):\n  -p, --profile      profile name to launch\n  --channel          channel name (selects from funnel.json, or raw-launches if no funnel.json)\n  -h, --help         show this help\n\nPositional args, unknown short flags (e.g. -c, -r), and claude's own flags\n(--agent, --resume, --model, --print, --output-format ...) are all forwarded.\nOn launch the FUNNEL_CHANNEL_ID env var is set and MCP connects to the gateway.";
       outputFormat: "text";
       status: _$hono_utils_http_status0.ContentfulStatusCode;
     };
@@ -4177,4 +4212,4 @@ ${string}`;
 //#region lib/tui/tui.d.ts
 declare function launchTui(funnel: Funnel): Promise<void>;
 //#endregion
-export { AttachOptions, BroadcastEvent, BroadcastSubscriber, ChannelConfig, ChannelConnectorView, ChannelDeliveryMode, ChannelServerOptions, 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, 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, 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

@@ -737,20 +737,16 @@ var MemoryFunnelIdGenerator = class extends FunnelIdGenerator {
 /**
 * Per-repo launch config (`funnel.json`).
 *
-* `fnl claude` reads this when no --profile / --channel is given and uses it
-* to set the channel binding, sub-agent, and brief flag. When `connectors`
-* is declared, missing channels/connectors are materialized into the local
-* `~/.funnel/settings.json` on launch.
+* `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.
 *
-* Token fields per connector resolve in this order:
-*
-*   1. Literal value at the field itself (e.g. `botToken: "xoxb-..."`)
-*   2. Env-var reference at `env.<field>` (e.g. `env: { botToken: "SLACK_BOT_TOKEN" }`);
-*      resolved from process.env first, then ./.env.local
-*   3. Field omitted everywhere → prompted for once on a TTY and persisted to
-*      `~/.funnel/settings.json`; non-TTY launches fail fast.
-*
-* `funnel.json` itself is never written to. Only `channel` is required.
+* 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.
 */
 const slackEnvSchema = z.object({
 	botToken: z.string().optional(),
@@ -785,13 +781,20 @@ const connectorSpecSchema = z.discriminatedUnion("type", [
 	ghConnectorSpecSchema,
 	scheduleConnectorSpecSchema
 ]);
+const channelSpecSchema = z.object({
+	name: z.string(),
+	options: z.array(z.string()).optional(),
+	env: z.record(z.string(), z.string()).optional(),
+	connectors: z.array(connectorSpecSchema).optional()
+});
 const localConfigSchema = z.object({
 	$schema: z.string().optional(),
-	channel: z.string(),
-	/** Extra args forwarded to the claude CLI. Prepended before user-supplied CLI args so user args still win on collision (e.g. --model, --agent, --brief, --resume, positional session ids). */
+	/** 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(),
-	connectors: z.array(connectorSpecSchema).optional()
+	/** Declared channels. First entry is the default; --channel <name> selects by name. */
+	channels: z.array(channelSpecSchema).min(1)
 });
 const LOCAL_CONFIG_FILENAME = "funnel.json";
 const LOCAL_ENV_FILENAME = ".env.local";
@@ -879,8 +882,8 @@ var FunnelTokenPrompter = class {};
 //#endregion
 //#region lib/engine/local-config/local-config-sync.ts
 /**
-* Reconciles a `funnel.json` spec with `~/.funnel/settings.json`. The spec
-* is the source of truth for the channel it declares:
+* Reconciles a single funnel.json channel spec with `~/.funnel/settings.json`.
+* The spec is the source of truth for the channel it declares:
 *
 *   - missing channel → created
 *   - declared connector matched by name → tokens reconciled
@@ -889,9 +892,10 @@ var FunnelTokenPrompter = class {};
 *   - declared connector with no match → added
 *   - any connector left in the channel that the spec did not touch → removed
 *
-* Removal only fires when funnel.json has a `connectors` field. An absent
-* field means "do not manage connectors from here" and leaves everything in
-* `~/.funnel` alone.
+* Removal only fires when the channel spec has a `connectors` field. An
+* absent field means "do not manage connectors from here" and leaves
+* everything in `~/.funnel` alone. Other channels in funnel.json (not
+* passed to this call) are untouched.
 */
 var FunnelLocalConfigSync = class {
 	channels;
@@ -905,16 +909,16 @@ var FunnelLocalConfigSync = class {
 		this.env = deps.env ?? process.env;
 		Object.freeze(this);
 	}
-	async ensure(local, cwd) {
-		if (!this.channels.get(local.channel)) this.channels.add({ name: local.channel });
-		if (local.connectors === void 0) return;
+	async ensure(channel, cwd) {
+		if (!this.channels.get(channel.name)) this.channels.add({ name: channel.name });
+		if (channel.connectors === void 0) return;
 		const dotenv = this.dotenv.read(cwd);
 		const touched = /* @__PURE__ */ new Set();
-		for (const spec of local.connectors) {
-			const id = await this.ensureConnector(local.channel, spec, dotenv);
+		for (const spec of channel.connectors) {
+			const id = await this.ensureConnector(channel.name, spec, dotenv);
 			touched.add(id);
 		}
-		this.removeExtras(local.channel, touched);
+		this.removeExtras(channel.name, touched);
 	}
 	async ensureConnector(channelName, spec, dotenv) {
 		if (spec.type === "slack") return await this.ensureSlack(channelName, spec, dotenv);
@@ -4075,19 +4079,22 @@ examples:
 const claudeHelp = `funnel claude — launch Claude Code
 
 usage:
-  funnel claude                          launch using funnel.json in cwd, or the default profile
+  funnel claude                          launch the first channel from funnel.json, or the default profile
+  funnel claude --channel <name>         with funnel.json: select that channel; without: raw launch
   funnel claude -p <name>                launch a named profile
   funnel claude --profile <name>         (long form)
-  funnel claude --channel <name>         raw launch (no profile, cwd = current dir)
   funnel claude [...]                    any other argument is forwarded to the claude CLI
 
-resolution order when no --profile / --channel is given:
-  1. ./funnel.json in the current directory
-  2. the default profile (first entry in fnl profiles)
+resolution order:
+  1. --help                              print this help
+  2. --profile <name>                    named profile (ignores funnel.json)
+  3. ./funnel.json in the current directory + --channel selects (or first wins)
+  4. --channel <name> with no funnel.json → raw launch using an existing settings.json channel
+  5. the default profile (first entry in fnl profiles)
 
 funnel-specific options (everything else passes through to claude verbatim):
   -p, --profile      profile name to launch
-  --channel          channel name (raw launch, ignored when --profile is given)
+  --channel          channel name (selects from funnel.json, or raw-launches if no funnel.json)
   -h, --help         show this help
 
 Positional args, unknown short flags (e.g. -c, -r), and claude's own flags
@@ -4124,12 +4131,21 @@ const claudeHandler = factory.createHandlers(zValidator$1("query", z.object({
 	const cwd = process.cwd();
 	const local = funnel.localConfig.read(cwd);
 	if (local) {
-		await funnel.localConfigSync.ensure(local, cwd);
+		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` });
+		await funnel.localConfigSync.ensure(picked, cwd);
 		const exitCode = await funnel.claude.launch({
-			channel: local.channel,
+			channel: picked.name,
 			cwd,
-			userArgs: [...local.options ?? [], ...userArgs],
-			extraEnv: local.env
+			userArgs: [
+				...local.options ?? [],
+				...picked.options ?? [],
+				...userArgs
+			],
+			extraEnv: {
+				...local.env ?? {},
+				...picked.env ?? {}
+			}
 		});
 		process.exit(exitCode);
 	}
@@ -6831,4 +6847,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, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, LOCAL_CONFIG_FILENAME, LOCAL_ENV_FILENAME, MemoryFunnelClock, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, channelConfigSchema, channelDeliveryModeSchema, app as cliApp, connectorConfigSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, launchTui, localConfigSchema, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };
+export { DEFAULT_GATEWAY_TOKEN_PATH, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelDotenvReader, FunnelEventStore, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, LOCAL_CONFIG_FILENAME, LOCAL_ENV_FILENAME, MemoryFunnelClock, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, channelConfigSchema, channelDeliveryModeSchema, 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/funnel.schema.json

@@ -0,0 +1,172 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "$schema": {
+      "type": "string"
+    },
+    "options": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "env": {
+      "type": "object",
+      "propertyNames": {
+        "type": "string"
+      },
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "channels": {
+      "minItems": 1,
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "env": {
+            "type": "object",
+            "propertyNames": {
+              "type": "string"
+            },
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "connectors": {
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "const": "slack"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "botToken": {
+                      "type": "string"
+                    },
+                    "appToken": {
+                      "type": "string"
+                    },
+                    "env": {
+                      "type": "object",
+                      "properties": {
+                        "botToken": {
+                          "type": "string"
+                        },
+                        "appToken": {
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    }
+                  },
+                  "required": [
+                    "type",
+                    "name"
+                  ],
+                  "additionalProperties": false
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "const": "discord"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "botToken": {
+                      "type": "string"
+                    },
+                    "env": {
+                      "type": "object",
+                      "properties": {
+                        "botToken": {
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    }
+                  },
+                  "required": [
+                    "type",
+                    "name"
+                  ],
+                  "additionalProperties": false
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "const": "gh"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "pollInterval": {
+                      "type": "integer",
+                      "exclusiveMinimum": 0,
+                      "maximum": 9007199254740991
+                    }
+                  },
+                  "required": [
+                    "type",
+                    "name"
+                  ],
+                  "additionalProperties": false
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "const": "schedule"
+                    },
+                    "name": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "type",
+                    "name"
+                  ],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "channels"
+  ],
+  "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."
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interactive-inc/claude-funnel",
-  "version": "0.15.1",
+  "version": "0.16.1",
   "description": "Hub CLI that routes external events (Slack / GitHub / Discord) to Claude Code agents through subscription channels over MCP.",
   "keywords": [
     "bun",
@@ -28,7 +28,7 @@
   },
   "files": [
     "dist/**/*",
-    "schemas/**/*",
+    "funnel.schema.json",
     "README.md",
     "LICENSE"
   ],

package/schemas/funnel.schema.json

@@ -1,144 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "type": "object",
-  "properties": {
-    "$schema": {
-      "type": "string"
-    },
-    "channel": {
-      "type": "string"
-    },
-    "options": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
-    },
-    "env": {
-      "type": "object",
-      "propertyNames": {
-        "type": "string"
-      },
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "connectors": {
-      "type": "array",
-      "items": {
-        "oneOf": [
-          {
-            "type": "object",
-            "properties": {
-              "type": {
-                "type": "string",
-                "const": "slack"
-              },
-              "name": {
-                "type": "string"
-              },
-              "botToken": {
-                "type": "string"
-              },
-              "appToken": {
-                "type": "string"
-              },
-              "env": {
-                "type": "object",
-                "properties": {
-                  "botToken": {
-                    "type": "string"
-                  },
-                  "appToken": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
-            },
-            "required": [
-              "type",
-              "name"
-            ],
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "properties": {
-              "type": {
-                "type": "string",
-                "const": "discord"
-              },
-              "name": {
-                "type": "string"
-              },
-              "botToken": {
-                "type": "string"
-              },
-              "env": {
-                "type": "object",
-                "properties": {
-                  "botToken": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
-              }
-            },
-            "required": [
-              "type",
-              "name"
-            ],
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "properties": {
-              "type": {
-                "type": "string",
-                "const": "gh"
-              },
-              "name": {
-                "type": "string"
-              },
-              "pollInterval": {
-                "type": "integer",
-                "exclusiveMinimum": 0,
-                "maximum": 9007199254740991
-              }
-            },
-            "required": [
-              "type",
-              "name"
-            ],
-            "additionalProperties": false
-          },
-          {
-            "type": "object",
-            "properties": {
-              "type": {
-                "type": "string",
-                "const": "schedule"
-              },
-              "name": {
-                "type": "string"
-              }
-            },
-            "required": [
-              "type",
-              "name"
-            ],
-            "additionalProperties": false
-          }
-        ]
-      }
-    }
-  },
-  "required": [
-    "channel"
-  ],
-  "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."
-}
-