@interactive-inc/claude-funnel 0.10.0 → 0.15.1

package/dist/{schedule-connector-schema-CkuIQ0JQ.js → schedule-connector-schema-FxP7LPlx.js}

@@ -160,6 +160,7 @@ var FunnelScheduleListener = class extends FunnelConnectorListener {
 	lastFiredStore;
 	logger;
 	now;
+	onFired;
 	timer = null;
 	stopped = false;
 	constructor(deps) {
@@ -168,6 +169,7 @@ var FunnelScheduleListener = class extends FunnelConnectorListener {
 		this.lastFiredStore = deps.lastFiredStore;
 		this.logger = deps.logger ?? defaultLogger;
 		this.now = deps.now ?? (() => /* @__PURE__ */ new Date());
+		this.onFired = deps.onFired ?? null;
 	}
 	async start(notify) {
 		this.stopped = false;
@@ -243,6 +245,15 @@ var FunnelScheduleListener = class extends FunnelConnectorListener {
 		};
 		if (catchup) meta.catchup = "true";
 		await notify(entry.prompt, meta);
+		if (this.onFired) try {
+			await this.onFired(entry, firedAt);
+		} catch (error) {
+			this.logger.error("schedule onFired callback failed", {
+				connector: this.config.name,
+				id: entry.id,
+				error: error instanceof Error ? error.message : String(error)
+			});
+		}
 	}
 	findMostRecentMatch(cron, from, until, entryId) {
 		const maxIterations = Math.min(MAX_CATCHUP_MINUTES, Math.floor((until.getTime() - from.getTime()) / 6e4) + 1);

package/dist/{file-system-Co60LrmR.d.ts → schedule-listener-BPodvbld.d.ts}

@@ -1,3 +1,4 @@
+import { n as FunnelConnectorListener, r as NotifyFn, t as FunnelLogger } from "./logger-CTlXs7z4.js";
 import { z } from "zod";
 
 //#region lib/connectors/schedule-connector-schema.d.ts
@@ -71,4 +72,58 @@ declare abstract class FunnelFileSystem {
   abstract statSync(path: string): FileStat;
 }
 //#endregion
-export { ScheduleEntry as a, scheduleEntrySchema as c, ScheduleConnectorConfig as i, FunnelFileSystem as n, scheduleCatchupPolicySchema as o, ScheduleCatchupPolicy as r, scheduleConnectorSchema as s, FileStat as t };
+//#region lib/connectors/schedule-state-store.d.ts
+type Deps$1 = {
+  path: string;
+  fs?: FunnelFileSystem;
+};
+/**
+ * Per-connector lastFiredAt persistence for the schedule listener. The path is
+ * passed in by FunnelConnectorFactory so this store does not know about the
+ * funnel directory layout (`channels/<id>/connectors/<id>/state.json` lives
+ * outside this class).
+ */
+declare class ScheduleStateStore {
+  private readonly path;
+  private readonly fs;
+  constructor(deps: Deps$1);
+  load(): Map<string, Date>;
+  save(state: Map<string, Date>): void;
+}
+//#endregion
+//#region lib/connectors/schedule-listener.d.ts
+type ScheduleOnFired = (entry: ScheduleEntry, firedAt: Date) => void | Promise<void>;
+type Deps = {
+  config: ScheduleConnectorConfig;
+  lastFiredStore: ScheduleStateStore;
+  logger?: FunnelLogger;
+  now?: () => Date;
+  /**
+   * Invoked after a schedule entry fires successfully. Use to remove one-shot
+   * entries from the connector config, or to log per-fire side effects.
+   * Errors from this callback are caught and logged; they do not abort the tick.
+   */
+  onFired?: ScheduleOnFired;
+};
+declare class FunnelScheduleListener extends FunnelConnectorListener {
+  private readonly config;
+  private readonly lastFiredStore;
+  private readonly logger;
+  private readonly now;
+  private readonly onFired;
+  private timer;
+  private stopped;
+  constructor(deps: Deps);
+  start(notify: NotifyFn): Promise<void>;
+  stop(): Promise<void>;
+  isAlive(): boolean;
+  tick(notify: NotifyFn): Promise<void>;
+  private fireEntry;
+  private notifyOne;
+  private findMostRecentMatch;
+  private findAllMatches;
+  private logInvalidCron;
+  private truncateToMinute;
+}
+//#endregion
+export { FunnelFileSystem as a, ScheduleEntry as c, scheduleEntrySchema as d, FileStat as i, scheduleCatchupPolicySchema as l, ScheduleOnFired as n, ScheduleCatchupPolicy as o, ScheduleStateStore as r, ScheduleConnectorConfig as s, FunnelScheduleListener as t, scheduleConnectorSchema as u };

package/dist/{slack-connector-schema-Cd22WiHB.js → slack-connector-schema-B4hsf3AY.js}

@@ -85,11 +85,15 @@ const defaultLogger = new NodeFunnelLogger();
 var FunnelSlackListener = class extends FunnelConnectorListener {
 	config;
 	logger;
+	onAppCreated;
+	preprocessEvent;
 	app = null;
 	constructor(deps) {
 		super();
 		this.config = deps.config;
 		this.logger = deps.logger ?? defaultLogger;
+		this.onAppCreated = deps.onAppCreated ?? null;
+		this.preprocessEvent = deps.preprocessEvent ?? null;
 	}
 	async start(notify) {
 		const app = new App({
@@ -103,10 +107,14 @@ var FunnelSlackListener = class extends FunnelConnectorListener {
 			ownBotUserId: authResult.user_id ?? "",
 			ownBotId: authResult.bot_id ?? ""
 		});
+		const preprocess = this.preprocessEvent;
 		app.use(async (args) => {
 			const parsed = middlewareArgsSchema.safeParse(args);
 			if (!parsed.success || !parsed.data.event) return;
-			const result = processor.process(parsed.data.event);
+			const rawEvent = parsed.data.event;
+			const event = preprocess ? preprocess(rawEvent) : rawEvent;
+			if (event === null) return;
+			const result = processor.process(event);
 			if (result.skip) return;
 			if (result.shouldReact) try {
 				await app.client.reactions.add({
@@ -121,6 +129,7 @@ var FunnelSlackListener = class extends FunnelConnectorListener {
 		app.error(async (error) => {
 			this.logger.error("Slack error", { error: error instanceof Error ? error.message : String(error) });
 		});
+		if (this.onAppCreated) await this.onAppCreated(app);
 		await app.start();
 		this.app = app;
 	}

package/dist/slack-listener-CHj6uMY-.d.ts

@@ -0,0 +1,74 @@
+import { n as FunnelConnectorListener, r as NotifyFn, t as FunnelLogger } from "./logger-CTlXs7z4.js";
+import { z } from "zod";
+import { App } from "@slack/bolt";
+
+//#region lib/connectors/slack-connector-schema.d.ts
+declare const slackConnectorSchema: z.ZodObject<{
+  id: z.ZodString;
+  name: z.ZodString;
+  type: z.ZodLiteral<"slack">;
+  botToken: z.ZodString;
+  appToken: z.ZodString;
+  createdAt: z.ZodOptional<z.ZodString>;
+  updatedAt: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+type SlackConnectorConfig = z.infer<typeof slackConnectorSchema>;
+//#endregion
+//#region lib/connectors/slack-event-processor.d.ts
+type SlackRawEvent = Record<string, unknown>;
+type SlackProcessedSkip = {
+  skip: true;
+};
+type SlackProcessedEmit = {
+  skip: false;
+  content: string;
+  meta: Record<string, string>;
+  shouldReact: boolean;
+  channel: string;
+  timestamp: string;
+};
+type SlackProcessed = SlackProcessedSkip | SlackProcessedEmit;
+type Props = {
+  ownBotUserId: string;
+  ownBotId: string;
+  now?: () => number;
+};
+declare class FunnelSlackEventProcessor {
+  private readonly ownBotUserId;
+  private readonly ownBotId;
+  private readonly now;
+  private readonly dedup;
+  constructor(props: Props);
+  process(event: SlackRawEvent): SlackProcessed;
+}
+//#endregion
+//#region lib/connectors/slack-listener.d.ts
+type SlackOnAppCreated = (app: App) => void | Promise<void>;
+type SlackPreprocessEvent = (event: SlackRawEvent) => SlackRawEvent | null;
+type Deps = {
+  config: SlackConnectorConfig;
+  logger?: FunnelLogger;
+  /**
+   * Invoked after the Bolt App is constructed, before it starts.
+   * Use to attach app.action handlers, custom middleware, etc.
+   */
+  onAppCreated?: SlackOnAppCreated;
+  /**
+   * Transform or drop the raw Slack event before the built-in processor sees it.
+   * Return null to drop the event entirely.
+   */
+  preprocessEvent?: SlackPreprocessEvent;
+};
+declare class FunnelSlackListener extends FunnelConnectorListener {
+  private readonly config;
+  private readonly logger;
+  private readonly onAppCreated;
+  private readonly preprocessEvent;
+  private app;
+  constructor(deps: Deps);
+  start(notify: NotifyFn): Promise<void>;
+  stop(): Promise<void>;
+  isAlive(): boolean;
+}
+//#endregion
+export { SlackProcessed as a, SlackRawEvent as c, FunnelSlackEventProcessor as i, SlackConnectorConfig as l, SlackOnAppCreated as n, SlackProcessedEmit as o, SlackPreprocessEvent as r, SlackProcessedSkip as s, FunnelSlackListener as t, slackConnectorSchema as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interactive-inc/claude-funnel",
-  "version": "0.10.0",
+  "version": "0.15.1",
   "description": "Hub CLI that routes external events (Slack / GitHub / Discord) to Claude Code agents through subscription channels over MCP.",
   "keywords": [
     "bun",
@@ -27,12 +27,8 @@
     "funnel": "./dist/bin.js"
   },
   "files": [
-    "lib/**/*.ts",
-    "lib/**/*.tsx",
-    "!lib/**/*.test.ts",
-    "!lib/**/*.test.tsx",
-    "!lib/**/*.bun-test.ts",
     "dist/**/*",
+    "schemas/**/*",
     "README.md",
     "LICENSE"
   ],

package/schemas/funnel.schema.json

@@ -0,0 +1,144 @@
+{
+  "$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."
+}
+

package/dist/slack-connector-schema-D7zAHN8k.d.ts

@@ -1,15 +0,0 @@
-import { z } from "zod";
-
-//#region lib/connectors/slack-connector-schema.d.ts
-declare const slackConnectorSchema: z.ZodObject<{
-  id: z.ZodString;
-  name: z.ZodString;
-  type: z.ZodLiteral<"slack">;
-  botToken: z.ZodString;
-  appToken: z.ZodString;
-  createdAt: z.ZodOptional<z.ZodString>;
-  updatedAt: z.ZodOptional<z.ZodString>;
-}, z.core.$strip>;
-type SlackConnectorConfig = z.infer<typeof slackConnectorSchema>;
-//#endregion
-export { slackConnectorSchema as n, SlackConnectorConfig as t };

package/lib/bin.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env bun
-
-import "@/cli"

package/lib/cli/factory.ts

@@ -1,10 +0,0 @@
-import { createFactory } from "hono/factory"
-import type { Funnel } from "@/funnel"
-
-export type Env = {
-  Variables: {
-    funnel: Funnel
-  }
-}
-
-export const factory = createFactory<Env>()

package/lib/cli/index.ts

@@ -1,85 +0,0 @@
-import pkg from "@/../package.json" with { type: "json" }
-import { startChannelServer } from "@/engine/mcp/channel-server"
-import { toRequest } from "@/cli/router/to-request"
-import { launchTui } from "@/tui/tui"
-import { createCliApp } from "@/cli/routes"
-import { Funnel } from "@/funnel"
-
-process.title = "funnel"
-
-const funnel = new Funnel()
-
-const app = createCliApp(funnel)
-
-const HELP = `funnel — Open Claude Funnel
-
-usage: funnel [command]
-
-commands:
-  (none)                launch TUI
-  claude                launch Claude Code (default profile or --profile)
-  channels              manage subscription boxes (and their nested connectors)
-  profiles              manage launch profiles
-  gateway               manage the gateway daemon (HTTP + WS)
-  status                show overall connection status
-  update                update funnel to the latest version
-  mcp                   run as an MCP server (invoked from .mcp.json)
-
-options:
-  --help, -h            show help
-  --version, -v         show version
-
-more: funnel <command> --help`
-
-const args = process.argv.slice(2)
-
-if (args.length === 0) {
-  await launchTui(funnel)
-  process.exit(0)
-}
-
-if (args[0] === "--version" || args[0] === "-v") {
-  process.stdout.write(`${pkg.version}\n`)
-  process.exit(0)
-}
-
-if (args[0] === "mcp") {
-  await startChannelServer({ dir: funnel.paths.dir })
-}
-
-if (args[0] !== "mcp") {
-  const { method, url } = toRequest(args)
-
-  const parsed = new URL(url)
-  
-  const wantsHelp = parsed.searchParams.has("help")
-
-  if (wantsHelp && parsed.pathname === "/") {
-    process.stdout.write(`${HELP}\n`)
-    process.exit(0)
-  }
-
-  const res = await app.request(url, { method })
-
-  if (res.ok) {
-    const body = await res.text()
-    if (body) process.stdout.write(`${body}\n`)
-    process.exit(0)
-  }
-
-  if (wantsHelp) {
-    const segments = parsed.pathname.split("/").filter(Boolean)
-    const group = segments[0]
-    const fallback = group
-      ? await app.request(`http://localhost/${group}?help=true`, { method: "GET" })
-      : null
-
-    const text = fallback?.ok ? await fallback.text() : HELP
-    process.stdout.write(`${text}\n`)
-    process.exit(0)
-  }
-
-  const text = await res.text()
-  if (text) process.stderr.write(`${text}\n`)
-  process.exit(1)
-}

package/lib/cli/router/query-to-cli-args.ts

@@ -1,20 +0,0 @@
-const BUILTIN_SKIP = new Set(["help"])
-
-export const queryToCliArgs = (url: string, reservedKeys: string[] = []): string[] => {
-  const skipped = new Set([...BUILTIN_SKIP, ...reservedKeys])
-  const args: string[] = []
-  const searchParams = new URL(url).searchParams
-
-  for (const entry of searchParams.entries()) {
-    const key = entry[0]
-    const value = entry[1]
-
-    if (skipped.has(key)) continue
-
-    args.push(`--${key}`)
-
-    if (value !== "true") args.push(value)
-  }
-
-  return args
-}

package/lib/cli/router/to-request.ts

@@ -1,113 +0,0 @@
-const SHORT_FLAGS: Record<string, string> = {
-  h: "help",
-  n: "name",
-  p: "profile",
-}
-
-// All CLI verbs map to POST and stay in the URL (no method-stripping).
-// Hono routes disambiguate by URL segment (e.g. /channels/add/:channel vs /channels/remove/:channel).
-const METHOD_KEYWORDS = new Set([
-  "add",
-  "set",
-  "remove",
-  "rename",
-  "as-default",
-  "request",
-  "publish",
-])
-
-const API_CALL_METHODS = new Set(["get", "post", "put", "patch", "delete", "head", "options"])
-
-const isValue = (arg: string | undefined): arg is string => {
-  return typeof arg === "string" && !arg.startsWith("-")
-}
-
-const consumeApiCall = (args: string[], i: number, params: URLSearchParams): number => {
-  const nextPath = args[i + 1]
-
-  if (!isValue(nextPath)) return 1
-
-  params.set("path", nextPath)
-
-  const nextBody = args[i + 2]
-
-  if (!isValue(nextBody)) return 2
-
-  params.set("body", nextBody)
-
-  return 3
-}
-
-export const toRequest = (args: string[]) => {
-  const segments: string[] = []
-  const params = new URLSearchParams()
-  let method = "GET"
-
-  let i = 0
-  while (i < args.length) {
-    const arg = args[i]!
-
-    if (arg.startsWith("--")) {
-      const key = arg.slice(2)
-      const next = args[i + 1]
-
-      if (isValue(next)) {
-        params.set(key, next)
-        i += 2
-      } else {
-        params.set(key, "true")
-        i++
-      }
-
-      continue
-    }
-
-    if (arg.startsWith("-") && arg.length === 2) {
-      const long = SHORT_FLAGS[arg[1]!]
-
-      if (!long) {
-        i++
-        continue
-      }
-
-      const next = args[i + 1]
-
-      if (isValue(next)) {
-        params.set(long, next)
-        i += 2
-      } else {
-        params.set(long, "true")
-        i++
-      }
-
-      continue
-    }
-
-    if (METHOD_KEYWORDS.has(arg)) {
-      method = "POST"
-      segments.push(arg)
-      i++
-      continue
-    }
-
-    if (API_CALL_METHODS.has(arg) && !params.has("path")) {
-      segments.push(arg)
-      i += consumeApiCall(args, i, params)
-      continue
-    }
-
-    if (arg.includes("/") && !params.has("path")) {
-      params.set("path", arg)
-      i++
-      continue
-    }
-
-    segments.push(arg)
-    i++
-  }
-
-  const path = segments.length > 0 ? `/${segments.join("/")}` : "/"
-  const query = params.size > 0 ? `?${params}` : ""
-
-  return { method, path, url: `http://localhost${path}${query}` }
-}

package/lib/cli/router/validator.ts

@@ -1,27 +0,0 @@
-import { zValidator as zv } from "@hono/zod-validator"
-import { HTTPException } from "hono/http-exception"
-import type { ZodType } from "zod"
-
-export const zValidator = <Target extends "param" | "query" | "json", T extends ZodType>(
-  target: Target,
-  schema: T,
-  helpText?: string,
-) =>
-  zv(target, schema, (result, c) => {
-    if (helpText && c.req.query("help")) {
-      return c.text(helpText)
-    }
-
-    if (result.success) return
-
-    const issue = result.error.issues[0]
-
-    if (!issue) {
-      throw new HTTPException(400, { message: "invalid request" })
-    }
-
-    const path = issue.path.join(".")
-    const message = path ? `${path}: ${issue.message}` : issue.message
-
-    throw new HTTPException(400, { message })
-  })

package/lib/cli/routes/channels.$channel.connectors.$connector.rename.$newName.ts

@@ -1,27 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/cli/factory"
-import { zValidator } from "@/cli/router/validator"
-
-export const renameHelp = `funnel channels <channel> connectors rename <connector> <new-name>
-
-usage: funnel channels <channel> connectors rename <connector> <new-name>`
-
-export const channelsConnectorsRenameHandler = factory.createHandlers(
-  zValidator(
-    "param",
-    z.object({ channel: z.string(), connector: z.string(), newName: z.string() }),
-  ),
-  zValidator("query", z.object({}), renameHelp),
-  async (c) => {
-    const param = c.req.valid("param")
-    const funnel = c.var.funnel
-
-    await funnel.listeners.stop(param.channel, param.connector)
-
-    funnel.channels.renameConnector(param.channel, param.connector, param.newName)
-
-    await funnel.listeners.start(param.channel, param.newName)
-
-    return c.text(`renamed connector "${param.connector}" to "${param.newName}"`)
-  },
-)