@interactive-inc/claude-funnel 0.7.1 → 0.8.0

package/dist/highlights-x6tmsnaa.scm

@@ -0,0 +1,115 @@
+; Query from: https://raw.githubusercontent.com/nvim-treesitter/nvim-treesitter/99ddf573531c4dbe53f743ecbc1595af5eb1d32f/queries/markdown_inline/highlights.scm
+; From MDeiml/tree-sitter-markdown
+(code_span) @markup.raw @nospell
+
+(emphasis) @markup.italic
+
+(strong_emphasis) @markup.strong
+
+(strikethrough) @markup.strikethrough
+
+(shortcut_link
+  (link_text) @nospell)
+
+[
+  (backslash_escape)
+  (hard_line_break)
+] @string.escape
+
+; Conceal codeblock and text style markers
+([
+  (code_span_delimiter)
+  (emphasis_delimiter)
+] @conceal
+  (#set! conceal ""))
+
+; Inline links - style all parts
+(inline_link
+  ["[" "(" ")"] @markup.link)
+
+(inline_link
+  "]" @markup.link.bracket.close)
+
+; Conceal opening bracket
+((inline_link
+  "[" @conceal)
+  (#set! conceal ""))
+
+; Conceal closing bracket with space replacement
+((inline_link
+  "]" @conceal)
+  (#set! conceal " "))
+
+; Conceal image links
+(image
+  [
+    "!"
+    "["
+    "]"
+    "("
+    (link_destination)
+    ")"
+  ] @markup.link
+  (#set! conceal ""))
+
+; Conceal full reference links
+(full_reference_link
+  [
+    "["
+    "]"
+    (link_label)
+  ] @markup.link
+  (#set! conceal ""))
+
+; Conceal collapsed reference links
+(collapsed_reference_link
+  [
+    "["
+    "]"
+  ] @markup.link
+  (#set! conceal ""))
+
+; Conceal shortcut links
+(shortcut_link
+  [
+    "["
+    "]"
+  ] @markup.link
+  (#set! conceal ""))
+
+[
+  (link_destination)
+  (uri_autolink)
+] @markup.link.url @nospell
+
+[
+  (link_label)
+  (link_text)
+  (link_title)
+  (image_description)
+] @markup.link.label
+
+; Replace common HTML entities.
+((entity_reference) @character.special
+  (#eq? @character.special " ")
+  (#set! conceal ""))
+
+((entity_reference) @character.special
+  (#eq? @character.special "<")
+  (#set! conceal "<"))
+
+((entity_reference) @character.special
+  (#eq? @character.special "&gt;")
+  (#set! conceal ">"))
+
+((entity_reference) @character.special
+  (#eq? @character.special "&amp;")
+  (#set! conceal "&"))
+
+((entity_reference) @character.special
+  (#eq? @character.special "&quot;")
+  (#set! conceal "\""))
+
+((entity_reference) @character.special
+  (#any-of? @character.special "&ensp;" "&emsp;")
+  (#set! conceal " "))

package/dist/injections-73j83es3.scm

@@ -0,0 +1,27 @@
+; Query from: https://raw.githubusercontent.com/nvim-treesitter/nvim-treesitter/refs/heads/master/queries/markdown/injections.scm
+(fenced_code_block
+  (info_string
+    (language) @_lang)
+  (code_fence_content) @injection.content
+  (#set-lang-from-info-string! @_lang))
+
+((html_block) @injection.content
+  (#set! injection.language "html")
+  (#set! injection.combined)
+  (#set! injection.include-children))
+
+((minus_metadata) @injection.content
+  (#set! injection.language "yaml")
+  (#offset! @injection.content 1 0 -1 0)
+  (#set! injection.include-children))
+
+((plus_metadata) @injection.content
+  (#set! injection.language "toml")
+  (#offset! @injection.content 1 0 -1 0)
+  (#set! injection.include-children))
+
+([
+  (inline)
+  (pipe_table_cell)
+] @injection.content
+  (#set! injection.language "markdown_inline"))

package/lib/bin.ts

@@ -0,0 +1,78 @@
+#!/usr/bin/env bun
+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 { app } from "@/cli/routes"
+import { Funnel } from "@/funnel"
+
+process.title = "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(new 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()
+} else {
+  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/{modules → cli}/router/to-request.ts

@@ -1,20 +1,19 @@
 const SHORT_FLAGS: Record<string, string> = {
   h: "help",
   n: "name",
+  p: "profile",
 }
 
-const STRIPPED_METHOD_KEYWORDS: Record<string, string> = {
-  add: "POST",
-  remove: "DELETE",
-  set: "PUT",
-}
-
-const KEPT_METHOD_KEYWORDS: Record<string, string> = {
-  rename: "PUT",
-  attach: "PUT",
-  detach: "DELETE",
-  default: "PUT",
-}
+// 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",
+])
 
 const API_CALL_METHODS = new Set(["get", "post", "put", "patch", "delete", "head", "options"])
 
@@ -83,14 +82,8 @@ export const toRequest = (args: string[]) => {
       continue
     }
 
-    if (STRIPPED_METHOD_KEYWORDS[arg]) {
-      method = STRIPPED_METHOD_KEYWORDS[arg]!
-      i++
-      continue
-    }
-
-    if (KEPT_METHOD_KEYWORDS[arg]) {
-      method = KEPT_METHOD_KEYWORDS[arg]!
+    if (METHOD_KEYWORDS.has(arg)) {
+      method = "POST"
       segments.push(arg)
       i++
       continue

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

@@ -0,0 +1,27 @@
+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}"`)
+  },
+)

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

@@ -0,0 +1,40 @@
+import { z } from "zod"
+import { factory } from "@/cli/factory"
+import { zValidator } from "@/cli/router/validator"
+
+export const requestHelp = `funnel channels <channel> connectors <connector> request — call a connector's outbound API
+
+usage: funnel channels <channel> connectors <connector> request --method=<api.method> [--key=value ...]`
+
+export const channelsConnectorsRequestHandler = factory.createHandlers(
+  zValidator("param", z.object({ channel: z.string(), connector: z.string() })),
+  zValidator(
+    "query",
+    z
+      .object({
+        method: z.string(),
+      })
+      .passthrough(),
+    requestHelp,
+  ),
+  async (c) => {
+    const param = c.req.valid("param")
+    const query = c.req.valid("query")
+    const funnel = c.var.funnel
+
+    const passthrough: Record<string, string> = {}
+
+    for (const [k, v] of new URL(c.req.url).searchParams) {
+      if (k === "method") continue
+      passthrough[k] = v
+    }
+
+    const response = await funnel.channels.call(param.channel, param.connector, {
+      method: query.method,
+      path: query.method,
+      body: passthrough,
+    })
+
+    return c.text(typeof response === "string" ? response : JSON.stringify(response, null, 2))
+  },
+)

package/lib/cli/routes/channels.$channel.connectors.$connector.schedules.add.$id.ts

@@ -0,0 +1,41 @@
+import { z } from "zod"
+import { factory } from "@/cli/factory"
+import { zValidator } from "@/cli/router/validator"
+import { scheduleCatchupPolicySchema } from "@/connectors/schedule-connector-schema"
+
+export const addHelp = `funnel channels <ch> connectors <conn> schedules add <id> — add a schedule entry
+
+usage: funnel channels <ch> connectors <conn> schedules add <id> --cron="*/5 * * * *" --prompt="..." [--enabled=true] [--catchup-policy=latest|all|skip]`
+
+export const channelsConnectorsSchedulesAddHandler = factory.createHandlers(
+  zValidator("param", z.object({ channel: z.string(), connector: z.string(), id: z.string() })),
+  zValidator(
+    "query",
+    z.object({
+      cron: z.string(),
+      prompt: z.string(),
+      enabled: z.coerce.boolean().optional(),
+      "catchup-policy": scheduleCatchupPolicySchema.optional(),
+    }),
+    addHelp,
+  ),
+  async (c) => {
+    const param = c.req.valid("param")
+    const query = c.req.valid("query")
+    const funnel = c.var.funnel
+
+    const entry = funnel.channels.addScheduleEntry(param.channel, param.connector, {
+      id: param.id,
+      cron: query.cron,
+      prompt: query.prompt,
+      ...(query.enabled !== undefined ? { enabled: query.enabled } : {}),
+      ...(query["catchup-policy"] !== undefined
+        ? { catchupPolicy: query["catchup-policy"] }
+        : {}),
+    })
+
+    await funnel.listeners.restart(param.channel, param.connector)
+
+    return c.text(`added schedule entry "${entry.id}"`)
+  },
+)

package/lib/cli/routes/channels.$channel.connectors.$connector.schedules.remove.$id.ts

@@ -0,0 +1,22 @@
+import { z } from "zod"
+import { factory } from "@/cli/factory"
+import { zValidator } from "@/cli/router/validator"
+
+export const removeHelp = `funnel channels <ch> connectors <conn> schedules remove <id>
+
+usage: funnel channels <ch> connectors <conn> schedules remove <id>`
+
+export const channelsConnectorsSchedulesRemoveHandler = factory.createHandlers(
+  zValidator("param", z.object({ channel: z.string(), connector: z.string(), id: z.string() })),
+  zValidator("query", z.object({}), removeHelp),
+  async (c) => {
+    const param = c.req.valid("param")
+    const funnel = c.var.funnel
+
+    funnel.channels.removeScheduleEntry(param.channel, param.connector, param.id)
+
+    await funnel.listeners.restart(param.channel, param.connector)
+
+    return c.text(`removed schedule entry "${param.id}"`)
+  },
+)

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

@@ -0,0 +1,23 @@
+import { z } from "zod"
+import { factory } from "@/cli/factory"
+import { zValidator } from "@/cli/router/validator"
+
+export const groupHelp = `funnel channels <ch> connectors <conn> schedules — list schedule entries
+
+usage: funnel channels <ch> connectors <conn> schedules`
+
+export const channelsConnectorsSchedulesGroupHandler = factory.createHandlers(
+  zValidator("param", z.object({ channel: z.string(), connector: z.string() })),
+  zValidator("query", z.object({}), groupHelp),
+  (c) => {
+    const param = c.req.valid("param")
+    const funnel = c.var.funnel
+    const entries = funnel.channels.listScheduleEntries(param.channel, param.connector)
+
+    if (entries.length === 0) return c.text("no schedule entries")
+
+    return c.text(
+      entries.map((e) => `${e.id}\t${e.cron}\t${e.enabled ? "on" : "off"}\t${e.prompt}`).join("\n"),
+    )
+  },
+)

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

@@ -0,0 +1,26 @@
+import { HTTPException } from "hono/http-exception"
+import { z } from "zod"
+import { factory } from "@/cli/factory"
+import { zValidator } from "@/cli/router/validator"
+
+export const showHelp = `funnel channels <channel> connectors show <connector> — show connector config
+
+usage: funnel channels <channel> connectors show <connector>`
+
+export const channelsConnectorsShowHandler = factory.createHandlers(
+  zValidator("param", z.object({ channel: z.string(), connector: z.string() })),
+  zValidator("query", z.object({}), showHelp),
+  (c) => {
+    const param = c.req.valid("param")
+    const funnel = c.var.funnel
+    const connector = funnel.channels.getConnector(param.channel, param.connector)
+
+    if (!connector) {
+      throw new HTTPException(404, {
+        message: `connector "${param.connector}" not found in channel "${param.channel}"`,
+      })
+    }
+
+    return c.text(JSON.stringify(connector, null, 2))
+  },
+)

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

@@ -0,0 +1,92 @@
+import { z } from "zod"
+import { factory } from "@/cli/factory"
+import { zValidator } from "@/cli/router/validator"
+
+export const addHelp = `funnel channels <channel> connectors add <connector> — add a connector to a channel
+
+usage:
+  funnel channels <channel> connectors add <connector> --type=slack --bot-token=xoxb-... --app-token=xapp-...
+  funnel channels <channel> connectors add <connector> --type=gh [--poll-interval=60]
+  funnel channels <channel> connectors add <connector> --type=discord --bot-token=...
+  funnel channels <channel> connectors add <connector> --type=schedule
+
+Token uniqueness is enforced across all channels.`
+
+const slackBody = z.object({
+  type: z.literal("slack"),
+  "bot-token": z.string().startsWith("xoxb-"),
+  "app-token": z.string().startsWith("xapp-"),
+})
+
+const ghBody = z.object({
+  type: z.literal("gh"),
+  "poll-interval": z.coerce.number().int().positive().optional(),
+})
+
+const discordBody = z.object({
+  type: z.literal("discord"),
+  "bot-token": z.string().min(10),
+})
+
+const scheduleBody = z.object({
+  type: z.literal("schedule"),
+})
+
+const addBody = z.discriminatedUnion("type", [slackBody, ghBody, discordBody, scheduleBody])
+
+export const channelsConnectorsAddHandler = factory.createHandlers(
+  zValidator("param", z.object({ channel: z.string(), connector: z.string() })),
+  zValidator("query", addBody, addHelp),
+  async (c) => {
+    const param = c.req.valid("param")
+    const query = c.req.valid("query")
+    const funnel = c.var.funnel
+
+    if (query.type === "slack") {
+      const created = funnel.channels.addConnector(param.channel, {
+        type: "slack",
+        name: param.connector,
+        botToken: query["bot-token"],
+        appToken: query["app-token"],
+      })
+
+      await funnel.listeners.start(param.channel, created.name)
+
+      return c.text(`added slack connector "${created.name}" to channel "${param.channel}"`)
+    }
+
+    if (query.type === "gh") {
+      const created = funnel.channels.addConnector(param.channel, {
+        type: "gh",
+        name: param.connector,
+        ...(query["poll-interval"] !== undefined ? { pollInterval: query["poll-interval"] } : {}),
+      })
+
+      await funnel.listeners.start(param.channel, created.name)
+
+      return c.text(`added gh connector "${created.name}" to channel "${param.channel}"`)
+    }
+
+    if (query.type === "discord") {
+      const created = funnel.channels.addConnector(param.channel, {
+        type: "discord",
+        name: param.connector,
+        botToken: query["bot-token"],
+      })
+
+      await funnel.listeners.start(param.channel, created.name)
+
+      return c.text(`added discord connector "${created.name}" to channel "${param.channel}"`)
+    }
+
+    const created = funnel.channels.addConnector(param.channel, {
+      type: "schedule",
+      name: param.connector,
+      entries: [],
+    })
+
+    await funnel.listeners.start(param.channel, created.name)
+
+    return c.text(`added schedule connector "${created.name}" to channel "${param.channel}"`)
+  },
+)

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

@@ -0,0 +1,22 @@
+import { z } from "zod"
+import { factory } from "@/cli/factory"
+import { zValidator } from "@/cli/router/validator"
+
+export const removeHelp = `funnel channels <channel> connectors remove <connector> — remove a connector
+
+usage: funnel channels <channel> connectors remove <connector>`
+
+export const channelsConnectorsRemoveHandler = factory.createHandlers(
+  zValidator("param", z.object({ channel: z.string(), connector: z.string() })),
+  zValidator("query", z.object({}), removeHelp),
+  async (c) => {
+    const param = c.req.valid("param")
+    const funnel = c.var.funnel
+
+    await funnel.listeners.stop(param.channel, param.connector)
+
+    funnel.channels.removeConnector(param.channel, param.connector)
+
+    return c.text(`removed connector "${param.connector}" from channel "${param.channel}"`)
+  },
+)

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

@@ -0,0 +1,63 @@
+import { HTTPException } from "hono/http-exception"
+import { z } from "zod"
+import { factory } from "@/cli/factory"
+import { zValidator } from "@/cli/router/validator"
+
+export const setHelp = `funnel channels <channel> connectors set <connector> — update connector fields
+
+usage:
+  funnel channels <ch> connectors set <conn> [--bot-token=...] [--app-token=...]   # slack
+  funnel channels <ch> connectors set <conn> [--bot-token=...]                    # discord
+  funnel channels <ch> connectors set <conn> [--poll-interval=N]                  # gh`
+
+export const channelsConnectorsSetHandler = factory.createHandlers(
+  zValidator("param", z.object({ channel: z.string(), connector: z.string() })),
+  zValidator(
+    "query",
+    z
+      .object({
+        "bot-token": z.string().optional(),
+        "app-token": z.string().optional(),
+        "poll-interval": z.coerce.number().int().positive().optional(),
+      })
+      .passthrough(),
+    setHelp,
+  ),
+  async (c) => {
+    const param = c.req.valid("param")
+    const query = c.req.valid("query")
+    const funnel = c.var.funnel
+    const existing = funnel.channels.getConnector(param.channel, param.connector)
+
+    if (!existing) {
+      throw new HTTPException(404, {
+        message: `connector "${param.connector}" not found in channel "${param.channel}"`,
+      })
+    }
+
+    if (existing.type === "slack") {
+      funnel.channels.updateSlackConnector(param.channel, param.connector, {
+        ...(query["bot-token"] !== undefined ? { botToken: query["bot-token"] } : {}),
+        ...(query["app-token"] !== undefined ? { appToken: query["app-token"] } : {}),
+      })
+    } else if (existing.type === "discord") {
+      funnel.channels.updateDiscordConnector(
+        param.channel,
+        param.connector,
+        query["bot-token"] !== undefined ? { botToken: query["bot-token"] } : {},
+      )
+    } else if (existing.type === "gh") {
+      funnel.channels.updateGhConnector(
+        param.channel,
+        param.connector,
+        query["poll-interval"] !== undefined ? { pollInterval: query["poll-interval"] } : {},
+      )
+    } else {
+      throw new HTTPException(400, { message: "schedule connectors have no settable fields" })
+    }
+
+    await funnel.listeners.restart(param.channel, param.connector)
+
+    return c.text(`updated connector "${param.connector}" in channel "${param.channel}"`)
+  },
+)

package/lib/cli/routes/channels.$channel.connectors.ts

@@ -0,0 +1,26 @@
+import { HTTPException } from "hono/http-exception"
+import { z } from "zod"
+import { factory } from "@/cli/factory"
+import { zValidator } from "@/cli/router/validator"
+
+export const groupHelp = `funnel channels <channel> connectors — list connectors in a channel
+
+usage: funnel channels <channel> connectors`
+
+export const channelsConnectorsGroupHandler = factory.createHandlers(
+  zValidator("param", z.object({ channel: z.string() })),
+  zValidator("query", z.object({}), groupHelp),
+  (c) => {
+    const param = c.req.valid("param")
+    const funnel = c.var.funnel
+    const channel = funnel.channels.get(param.channel)
+
+    if (!channel) {
+      throw new HTTPException(404, { message: `channel "${param.channel}" not found` })
+    }
+
+    if (channel.connectors.length === 0) return c.text(`no connectors in channel "${channel.name}"`)
+
+    return c.text(channel.connectors.map((c) => `${c.name} (${c.type}, id: ${c.id})`).join("\n"))
+  },
+)