@interactive-inc/claude-funnel 0.2.0 → 0.4.0

package/README.md

@@ -3,17 +3,32 @@
 [![npm](https://img.shields.io/npm/v/@interactive-inc/claude-funnel.svg)](https://www.npmjs.com/package/@interactive-inc/claude-funnel)
 [![license](https://img.shields.io/npm/l/@interactive-inc/claude-funnel.svg)](./LICENSE)
 
-A hub CLI that connects multiple Claude Code agents to external services (Slack / GitHub / Discord). External events flow through subscription "channels" into Claude Code sessions, and outbound API calls from Claude are funneled through the same connectors.
+A hub CLI that connects multiple Claude Code agents to external services (Slack / GitHub / Discord) and time-based triggers (cron). External events flow through subscription "channels" into Claude Code sessions, and outbound API calls from Claude are funneled through the same connectors.
 
 The command is `funnel` or its shorthand `fnl`.
 
 ## Overview
 
 ```
-Slack/others         Connectors      Channels                Claude Code
-(external APIs) ─→   (funnel)  ─→    (subscription router) ──WS/MCP─→   (received as <channel> tags)
-                                                           ↑
-                                               funnel MCP server (funnel mcp)
+External sources
+(Slack / GitHub / Discord / cron)
+            │
+            ▼
+        Connectors
+       (per-type stores)
+            │
+            ▼
+         Channels
+   (subscription router)
+            │
+            ▼  WebSocket
+       Gateway daemon
+            │
+            ▼  MCP (stdio)
+       Claude Code
+  (events surfaced as <channel> tags;
+   outbound calls go back through the
+   same connectors via funnel MCP)
 ```
 
 ## Requirements
@@ -47,16 +62,36 @@ fnl gateway start
 fnl claude --channel my-inbox
 ```
 
+Schedule (cron) trigger:
+
+```bash
+# Register a schedule connector and a cron entry
+fnl connectors add daily --type schedule
+fnl connectors daily schedules add --cron "0 9 * * *" --prompt "morning standup"
+
+# Attach it to a channel just like any other connector
+fnl channels my-inbox connectors attach daily
+```
+
 ## Commands
 
 ```
 fnl connectors                              list
-fnl connectors add <name> --type <t> --bot-token <t> --app-token <t>
+fnl connectors add <name> --type slack    --bot-token xoxb-... --app-token xapp-...
+fnl connectors add <name> --type gh       [--poll-interval <sec>]
+fnl connectors add <name> --type discord  --bot-token <token>
+fnl connectors add <name> --type schedule
 fnl connectors <name>                       show details
-fnl connectors <name> set [--bot-token ...] [--app-token ...]
+fnl connectors <name> set [--bot-token ...] [--app-token ...] [--poll-interval ...]
 fnl connectors rename <old> <new>
 fnl connectors remove <name>
-fnl connectors <name> <method> <path> [body]   call API (get/post/put/delete/...)
+
+fnl connectors <name> schedules                              list cron entries
+fnl connectors <name> schedules add --cron "<expr>" --prompt "<text>" [--disabled]
+fnl connectors <name> schedules remove <id>
+
+fnl request slack   post <path> [body] --connector <name>   call Slack Web API
+fnl request discord <method> <path> [body] --connector <name>   call Discord REST API
 
 fnl channels                                list
 fnl channels add <name>
@@ -66,27 +101,31 @@ fnl channels <name> connectors detach <connector>
 fnl channels rename <old> <new>
 fnl channels remove <name>
 
-fnl agents                                  list agent presets (extra)
-fnl agents add <name> --channel <c> [--repo <r>] [--sub-agent <s>] [--env-file <f>]
-fnl agents <name>                           launch (sugar for fnl claude)
-fnl agents <name> set [--channel ...] [--repo ...] [--sub-agent ...] [--env-file ...]
-fnl agents rename <old> <new>
-fnl agents remove <name>
+fnl profiles                                list launch profiles
+fnl profiles add <name> --channel <c> [--repo <r>] [--sub-agent <s>] [--env-file <f>]
+fnl profiles <name> run                     launch (sugar for fnl claude)
+fnl profiles <name>                         launch (alias for run)
+fnl profiles <name> set [--channel ...] [--repo ...] [--sub-agent ...] [--env-file ...]
+fnl profiles rename <old> <new>
+fnl profiles remove <name>
 
 fnl repos                                   list repositories (extra)
-fnl repos add <name> --path <path>          register funnel MCP into .mcp.json
+fnl repos add <name> [--path <path>]        register funnel MCP (path defaults to cwd)
 fnl repos <name>                            show details
 fnl repos <name> set [--path <path>]
 fnl repos rename <old> <new>
 fnl repos remove <name>
 
+fnl claude                                  launch the "default" profile
+fnl claude --profile <name>                 launch a named profile
 fnl claude --channel <c> [--repo <r>] [--sub-agent <s>] [--env-file <f>]
-                                            launch Claude Code
+                                            raw launch (no profile)
 fnl mcp                                     run as an MCP server (invoked from .mcp.json)
 
 fnl gateway                                 running status
 fnl gateway start / stop / restart / run / logs
-fnl status                                  overall status (connectors / channels / agents / repos / gateway)
+fnl update                                  update funnel via bun i -g
+fnl status                                  overall status (connectors / channels / profiles / repos / gateway)
 
 fnl --version
 fnl --help        (every subcommand has --help)
@@ -96,16 +135,29 @@ fnl --help        (every subcommand has --help)
 
 ```
 Connector =
-  | { type: "slack",   name, botToken, appToken }          Slack Socket Mode
-  | { type: "gh",      name, pollInterval? }                GitHub (gh CLI)
-  | { type: "discord", name, botToken }                     Discord Gateway
+  | { type: "slack",    name, botToken, appToken }
+        Slack Socket Mode
+  | { type: "gh",       name, pollInterval? }
+        GitHub (gh CLI)
+  | { type: "discord",  name, botToken }
+        Discord Gateway
+  | { type: "schedule", name, entries[] }
+        cron-driven, entries = { id, cron, prompt, enabled }
+
+Channel    = { name, connectors[] }
+        subscription box
+
+Repository = { name, path }
+        extra
+
+Profile    = { name, channel, repo?, subAgent?, envFiles? }
+        launch profile
 
-Channel    = { name, connectors[] }                        subscription box
-Repository = { name, path }                                 extra
-Agent      = { name, channel, repo?, subAgent?, envFiles? } preset (extra)
+Settings = { channels[], repositories[], profiles[] }
+        → ~/.funnel/settings.json
 
-Settings = { connectors[], channels[], repositories[], agents[] }
-         → ~/.funnel/settings.json
+Connectors are stored per type, one file per connector:
+        → ~/.funnel/connectors/<type>/<name>.(json|jsonl)
 ```
 
 ## Discord bot setup
@@ -124,8 +176,12 @@ Settings = { connectors[], channels[], repositories[], agents[] }
 
 ## File layout
 
-- Config: `~/.funnel/settings.json`
+- Config: `~/.funnel/settings.json` (channels / repositories / profiles)
+- Connectors: `~/.funnel/connectors/<type>/<name>.(json|jsonl)`
+  - `slack/<name>.json`, `gh/<name>.json`, `discord/<name>.json`
+  - `schedule/<name>.jsonl` (one entry per line) and `schedule/<name>.state.json` (last-fired timestamps for catch-up)
 - PID: `~/.funnel/gateway.pid`
+- Claude PIDs: `~/.funnel/claude/<profile>.pid`
 - Event log: `/tmp/funnel/events/*.jsonl` (auto-deleted after 30 days)
 - Process log: `/tmp/funnel/gateway.log`
 

package/lib/funnel.ts

@@ -1,14 +1,23 @@
-import { FunnelAgents } from "@/modules/agents/funnel-agents"
 import { FunnelChannels } from "@/modules/channels/funnel-channels"
 import { FunnelClaude } from "@/modules/claude/funnel-claude"
+import {
+  type ConnectorStoresBundle,
+  createConnectorStores,
+} from "@/modules/connectors/funnel-connector-stores"
 import { FunnelConnectors } from "@/modules/connectors/funnel-connectors"
+import type { FunnelFileSystem } from "@/modules/fs/funnel-file-system"
 import { FunnelGateway } from "@/modules/gateway/funnel-gateway"
 import { FunnelMcp } from "@/modules/mcp/funnel-mcp"
+import { FunnelProfiles } from "@/modules/profiles/funnel-profiles"
 import { FunnelRepositories } from "@/modules/repos/funnel-repositories"
+import { FunnelSchedule } from "@/modules/schedule/funnel-schedule"
 import { FunnelSettingsReader } from "@/modules/settings/funnel-settings-reader"
 
 type Props = {
   store: FunnelSettingsReader
+  fs?: FunnelFileSystem
+  dir?: string
+  connectorStores?: ConnectorStoresBundle
 }
 
 export class Funnel {
@@ -16,16 +25,51 @@ export class Funnel {
     Object.freeze(this)
   }
 
+  get stores(): ConnectorStoresBundle {
+    return (
+      this.props.connectorStores ??
+      createConnectorStores({ fs: this.props.fs, dir: this.props.dir })
+    )
+  }
+
   get connectors(): FunnelConnectors {
-    return new FunnelConnectors({ store: this.props.store })
+    const stores = this.stores
+    const profiles = this.profiles
+    const channels: FunnelChannels = new FunnelChannels({
+      store: this.props.store,
+      connectorChecker: { has: (name) => connectors.has(name) },
+      profileChecker: profiles,
+      profileRefUpdater: profiles,
+    })
+    const connectors: FunnelConnectors = new FunnelConnectors({
+      ...stores,
+      refUpdater: channels,
+    })
+    return connectors
   }
 
   get channels(): FunnelChannels {
-    return new FunnelChannels({ store: this.props.store })
+    const stores = this.stores
+    const profiles = this.profiles
+    const channels: FunnelChannels = new FunnelChannels({
+      store: this.props.store,
+      connectorChecker: { has: (name) => connectors.has(name) },
+      profileChecker: profiles,
+      profileRefUpdater: profiles,
+    })
+    const connectors: FunnelConnectors = new FunnelConnectors({
+      ...stores,
+      refUpdater: channels,
+    })
+    return channels
+  }
+
+  get schedule(): FunnelSchedule {
+    return new FunnelSchedule({ store: this.stores.schedule })
   }
 
-  get agents(): FunnelAgents {
-    return new FunnelAgents({ store: this.props.store })
+  get profiles(): FunnelProfiles {
+    return new FunnelProfiles({ store: this.props.store })
   }
 
   get repositories(): FunnelRepositories {

package/lib/index.ts

@@ -1,5 +1,7 @@
 #!/usr/bin/env bun
 import pkg from "../package.json" with { type: "json" }
+import { createConnectorStores } from "@/modules/connectors/funnel-connector-stores"
+import { migrateLegacyConnectors } from "@/modules/connectors/migrate-legacy-connectors"
 import { startChannelServer } from "@/modules/mcp/channel-server"
 import { toRequest } from "@/modules/router/to-request"
 import { launchTui } from "@/modules/tui/tui"
@@ -7,19 +9,23 @@ import { app } from "@/routes"
 
 process.title = "funnel"
 
+migrateLegacyConnectors({ stores: createConnectorStores() })
+
 const HELP = `funnel — Open Claude Funnel
 
 usage: funnel [command]
 
 commands:
   (none)                launch TUI
-  claude --channel <c>  launch Claude Code
+  claude                launch Claude Code (default profile or --profile)
   connectors            manage external connections (Slack, etc.)
   channels              manage subscription boxes
-  agents                manage agent presets (extra)
+  profiles              manage launch profiles
+  request               send an outbound API call via a connector
   repos                 manage repositories (extra)
   gateway               manage the gateway
   status                show overall connection status
+  update                update funnel to the latest version
   mcp                   run as an MCP server (invoked from .mcp.json)
 
 options:

package/lib/modules/channels/channel-connector-ref-updater.ts

@@ -0,0 +1,4 @@
+export type ChannelConnectorRefUpdater = {
+  renameRef(oldName: string, newName: string): void
+  removeRef(connectorName: string): void
+}

package/lib/modules/channels/funnel-channels.ts

@@ -1,15 +1,27 @@
+import type { ConnectorExistenceChecker } from "@/modules/connectors/connector-existence-checker"
+import type { ProfileChannelChecker } from "@/modules/profiles/profile-channel-checker"
+import type { ProfileChannelRefUpdater } from "@/modules/profiles/profile-channel-ref-updater"
 import { FunnelSettingsReader } from "@/modules/settings/funnel-settings-reader"
 import type { ChannelConfig } from "@/modules/settings/settings-schema"
 
 type Deps = {
   store: FunnelSettingsReader
+  connectorChecker: ConnectorExistenceChecker
+  profileChecker: ProfileChannelChecker
+  profileRefUpdater: ProfileChannelRefUpdater
 }
 
 export class FunnelChannels {
   private readonly store: FunnelSettingsReader
+  private readonly connectorChecker: ConnectorExistenceChecker
+  private readonly profileChecker: ProfileChannelChecker
+  private readonly profileRefUpdater: ProfileChannelRefUpdater
 
   constructor(deps: Deps) {
     this.store = deps.store
+    this.connectorChecker = deps.connectorChecker
+    this.profileChecker = deps.profileChecker
+    this.profileRefUpdater = deps.profileRefUpdater
     Object.freeze(this)
   }
 
@@ -29,7 +41,7 @@ export class FunnelChannels {
     }
 
     for (const connectorName of config.connectors) {
-      if (!settings.connectors.some((c) => c.name === connectorName)) {
+      if (!this.connectorChecker.has(connectorName)) {
         throw new Error(`connector "${connectorName}" not found`)
       }
     }
@@ -46,8 +58,8 @@ export class FunnelChannels {
 
     if (index < 0) throw new Error(`channel "${name}" not found`)
 
-    if (settings.agents.some((a) => a.channel === name)) {
-      throw new Error(`channel "${name}" is referenced by an agent`)
+    if (this.profileChecker.hasChannelRef(name)) {
+      throw new Error(`channel "${name}" is referenced by a profile`)
     }
 
     settings.channels.splice(index, 1)
@@ -68,11 +80,9 @@ export class FunnelChannels {
 
     channel.name = newName
 
-    for (const agent of settings.agents) {
-      if (agent.channel === oldName) agent.channel = newName
-    }
-
     this.store.write(settings)
+
+    this.profileRefUpdater.renameChannelRef(oldName, newName)
   }
 
   attachConnector(name: string, connectorName: string): void {
@@ -82,7 +92,7 @@ export class FunnelChannels {
 
     if (!channel) throw new Error(`channel "${name}" not found`)
 
-    if (!settings.connectors.some((c) => c.name === connectorName)) {
+    if (!this.connectorChecker.has(connectorName)) {
       throw new Error(`connector "${connectorName}" not found`)
     }
 
@@ -110,4 +120,36 @@ export class FunnelChannels {
 
     this.store.write(settings)
   }
+
+  renameRef(oldName: string, newName: string): void {
+    const settings = this.store.read()
+    let changed = false
+
+    for (const channel of settings.channels) {
+      const i = channel.connectors.indexOf(oldName)
+
+      if (i >= 0) {
+        channel.connectors[i] = newName
+        changed = true
+      }
+    }
+
+    if (changed) this.store.write(settings)
+  }
+
+  removeRef(connectorName: string): void {
+    const settings = this.store.read()
+    let changed = false
+
+    for (const channel of settings.channels) {
+      const i = channel.connectors.indexOf(connectorName)
+
+      if (i >= 0) {
+        channel.connectors.splice(i, 1)
+        changed = true
+      }
+    }
+
+    if (changed) this.store.write(settings)
+  }
 }

package/lib/modules/claude/funnel-claude.ts

@@ -1,3 +1,4 @@
+import { join } from "node:path"
 import type { FunnelChannels } from "@/modules/channels/funnel-channels"
 import { FunnelFileSystem } from "@/modules/fs/funnel-file-system"
 import { NodeFunnelFileSystem } from "@/modules/fs/node-funnel-file-system"
@@ -7,6 +8,9 @@ import type { FunnelMcp } from "@/modules/mcp/funnel-mcp"
 import { FunnelProcessRunner } from "@/modules/process/funnel-process-runner"
 import { NodeFunnelProcessRunner } from "@/modules/process/node-funnel-process-runner"
 import type { FunnelRepositories } from "@/modules/repos/funnel-repositories"
+import { FUNNEL_DIR } from "@/modules/settings/funnel-settings-store"
+
+const CLAUDE_PID_DIR = join(FUNNEL_DIR, "claude")
 
 export type LaunchOptions = {
   channel: string
@@ -14,6 +18,7 @@ export type LaunchOptions = {
   subAgent?: string
   envFiles?: string[]
   userArgs?: string[]
+  profileName?: string
 }
 
 type Deps = {
@@ -53,6 +58,10 @@ export class FunnelClaude {
       throw new Error(`channel "${options.channel}" not found`)
     }
 
+    if (options.profileName && this.isRunning(options.profileName)) {
+      throw new Error(`profile "${options.profileName}" is already running`)
+    }
+
     const cwd = options.repo
       ? this.repositories.resolvePath(options.repo)
       : globalThis.process.cwd()
@@ -68,6 +77,11 @@ export class FunnelClaude {
       await this.gateway.start()
     }
 
+    if (options.profileName) {
+      this.writePidFile(options.profileName)
+      this.installCleanup(options.profileName)
+    }
+
     const claudeArgs = this.buildArgs(options, cwd)
     const env = this.buildEnv(options, cwd)
 
@@ -78,7 +92,71 @@ export class FunnelClaude {
       cwd,
     })
 
-    return await this.process.attach(["claude", ...claudeArgs], { cwd, env })
+    try {
+      return await this.process.attach(["claude", ...claudeArgs], { cwd, env })
+    } finally {
+      if (options.profileName) this.removePidFile(options.profileName)
+    }
+  }
+
+  isRunning(profileName: string): boolean {
+    const pid = this.readPid(profileName)
+
+    if (!pid) return false
+
+    return this.isProcessAlive(pid)
+  }
+
+  private pidPath(profileName: string): string {
+    return join(CLAUDE_PID_DIR, `${profileName}.pid`)
+  }
+
+  private readPid(profileName: string): number | null {
+    const path = this.pidPath(profileName)
+
+    if (!this.fs.existsSync(path)) return null
+
+    try {
+      const content = this.fs.readFileSync(path).trim()
+      const pid = Number(content)
+
+      if (!pid || pid <= 0) return null
+
+      return pid
+    } catch {
+      return null
+    }
+  }
+
+  private writePidFile(profileName: string): void {
+    this.fs.mkdirSync(CLAUDE_PID_DIR, { recursive: true })
+    this.fs.writeFileSync(this.pidPath(profileName), String(globalThis.process.pid))
+  }
+
+  private removePidFile(profileName: string): void {
+    const path = this.pidPath(profileName)
+
+    if (this.fs.existsSync(path)) this.fs.unlink(path)
+  }
+
+  private installCleanup(profileName: string): void {
+    const cleanup = () => this.removePidFile(profileName)
+
+    globalThis.process.once("exit", cleanup)
+    globalThis.process.once("SIGINT", cleanup)
+    globalThis.process.once("SIGTERM", cleanup)
+  }
+
+  private isProcessAlive(pid: number): boolean {
+    const result = this.process.runSync(["ps", "-p", String(pid), "-o", "state="])
+
+    if (result.exitCode !== 0) return false
+
+    const state = result.stdout.trim()
+
+    if (!state) return false
+
+    return !state.startsWith("Z")
   }
 
   private buildArgs(options: LaunchOptions, cwd: string): string[] {

package/lib/modules/connectors/connector-config-schema.ts

@@ -0,0 +1,16 @@
+import { z } from "zod"
+import { discordConnectorSchema } from "@/modules/connectors/discord-connector-schema"
+import { ghConnectorSchema } from "@/modules/connectors/gh-connector-schema"
+import { scheduleConnectorSchema } from "@/modules/connectors/schedule-connector-schema"
+import { slackConnectorSchema } from "@/modules/connectors/slack-connector-schema"
+
+export const connectorConfigSchema = z.discriminatedUnion("type", [
+  slackConnectorSchema,
+  ghConnectorSchema,
+  discordConnectorSchema,
+  scheduleConnectorSchema,
+])
+
+export type ConnectorConfig = z.infer<typeof connectorConfigSchema>
+
+export type ConnectorType = ConnectorConfig["type"]

package/lib/modules/connectors/connector-existence-checker.ts

@@ -0,0 +1,3 @@
+export type ConnectorExistenceChecker = {
+  has(name: string): boolean
+}

package/lib/modules/connectors/discord-connector-schema.ts

@@ -0,0 +1,9 @@
+import { z } from "zod"
+
+export const discordConnectorSchema = z.object({
+  type: z.literal("discord"),
+  name: z.string(),
+  botToken: z.string().min(10),
+})
+
+export type DiscordConnectorConfig = z.infer<typeof discordConnectorSchema>

package/lib/modules/connectors/funnel-callable-connector-store.ts

@@ -0,0 +1,9 @@
+import type { FunnelConnectorAdapter } from "@/modules/connectors/funnel-connector-adapter"
+import { FunnelConnectorTypeStore } from "@/modules/connectors/funnel-connector-type-store"
+import type { ConnectorConfig } from "@/modules/connectors/connector-config-schema"
+
+export abstract class FunnelCallableConnectorStore<
+  TConfig extends ConnectorConfig,
+> extends FunnelConnectorTypeStore<TConfig> {
+  abstract createAdapter(config: TConfig): FunnelConnectorAdapter
+}

package/lib/modules/connectors/funnel-connector-stores.ts

@@ -0,0 +1,24 @@
+import { FunnelDiscordStore } from "@/modules/connectors/funnel-discord-store"
+import { FunnelGhStore } from "@/modules/connectors/funnel-gh-store"
+import { FunnelScheduleStore } from "@/modules/connectors/funnel-schedule-store"
+import { FunnelSlackStore } from "@/modules/connectors/funnel-slack-store"
+import { FunnelFileSystem } from "@/modules/fs/funnel-file-system"
+
+export type ConnectorStoresBundle = {
+  slack: FunnelSlackStore
+  gh: FunnelGhStore
+  discord: FunnelDiscordStore
+  schedule: FunnelScheduleStore
+}
+
+type Deps = {
+  fs?: FunnelFileSystem
+  dir?: string
+}
+
+export const createConnectorStores = (deps: Deps = {}): ConnectorStoresBundle => ({
+  slack: new FunnelSlackStore(deps),
+  gh: new FunnelGhStore(deps),
+  discord: new FunnelDiscordStore(deps),
+  schedule: new FunnelScheduleStore(deps),
+})

package/lib/modules/connectors/funnel-connector-type-store.ts

@@ -0,0 +1,24 @@
+import type { FunnelConnectorListener } from "@/modules/connectors/funnel-connector-listener"
+import type { ConnectorConfig } from "@/modules/connectors/connector-config-schema"
+
+export abstract class FunnelConnectorTypeStore<TConfig extends ConnectorConfig> {
+  abstract readonly type: TConfig["type"]
+
+  abstract list(): TConfig[]
+
+  abstract get(name: string): TConfig | null
+
+  abstract has(name: string): boolean
+
+  abstract add(config: TConfig): void
+
+  abstract remove(name: string): void
+
+  abstract rename(oldName: string, newName: string): void
+
+  abstract createListener(config: TConfig): FunnelConnectorListener
+
+  createAllListeners(): { config: TConfig; listener: FunnelConnectorListener }[] {
+    return this.list().map((config) => ({ config, listener: this.createListener(config) }))
+  }
+}