@interactive-inc/claude-funnel 0.7.1 → 0.8.0

package/lib/routes/gateway/logs.ts

@@ -1,102 +0,0 @@
-import { readdirSync } from "node:fs"
-import { join } from "node:path"
-import { stringify } from "yaml"
-import { z } from "zod"
-import { factory } from "@/factory"
-import { NodeFunnelLogger } from "@/modules/logger/node-funnel-logger"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/gateway/logs.help"
-
-const logger = new NodeFunnelLogger()
-
-const tryParseJson = (s: string): unknown => {
-  try {
-    return JSON.parse(s)
-  } catch {
-    return null
-  }
-}
-
-export const gatewayLogsHandler = factory.createHandlers(
-  zValidator(
-    "query",
-    z.object({
-      n: z.string().optional(),
-    }),
-    help,
-  ),
-  async (c) => {
-    const query = c.req.valid("query")
-    const funnel = c.var.funnel
-    const logDir = funnel.gateway.getLogDir()
-
-    const files = readdirSync(logDir)
-      .filter((name) => name.endsWith(".jsonl"))
-      .sort()
-
-    if (files.length === 0) {
-      return c.text("no logs")
-    }
-
-    const latestFile = join(logDir, files[files.length - 1]!)
-    const lineCount = query.n ? Number(query.n) : 20
-
-    const tail = Bun.spawn(["tail", "-f", "-n", String(lineCount), latestFile], {
-      stdout: "pipe",
-      stderr: "inherit",
-    })
-
-    const forward = (signal: "SIGINT" | "SIGTERM") => {
-      tail.kill(signal)
-    }
-
-    process.on("SIGINT", () => forward("SIGINT"))
-    process.on("SIGTERM", () => forward("SIGTERM"))
-
-    const reader = tail.stdout.getReader()
-    const decoder = new TextDecoder()
-    let buffer = ""
-
-    logger.info("gateway.logs tail start", { file: latestFile })
-
-    while (true) {
-      const result = await reader.read()
-
-      if (result.done) break
-
-      buffer += decoder.decode(result.value, { stream: true })
-
-      const lines = buffer.split("\n")
-      buffer = lines.pop() ?? ""
-
-      for (const line of lines) {
-        if (!line.trim()) continue
-
-        const entry = tryParseJson(line) as {
-          timestamp: string
-          eventType: string
-          meta?: unknown
-          content: string
-        } | null
-
-        if (!entry) {
-          process.stdout.write(`${line}\n`)
-          continue
-        }
-
-        const parsedContent = tryParseJson(entry.content) ?? entry.content
-        const output = {
-          time: entry.timestamp,
-          type: entry.eventType,
-          ...(entry.meta ? { meta: entry.meta } : {}),
-          content: parsedContent,
-        }
-
-        process.stdout.write(`---\n${stringify(output)}`)
-      }
-    }
-
-    await tail.exited
-    process.exit(0)
-  },
-)

package/lib/routes/gateway/restart.help.ts

@@ -1,10 +0,0 @@
-export const help = `funnel gateway restart — restart the gateway
-
-usage: funnel gateway restart [--no-caffeine]
-
-Stops the running process then starts it again in background.
-On macOS wraps with caffeinate -i by default. Use --no-caffeine to disable.
-
-examples:
-  funnel gateway restart
-  funnel gateway restart --no-caffeine`

package/lib/routes/gateway/routes.ts

@@ -1,18 +0,0 @@
-import { factory } from "@/factory"
-import { gatewayGroupHandler } from "@/routes/gateway/group"
-import { gatewayLogsHandler } from "@/routes/gateway/logs"
-import { gatewayRestartHandler } from "@/routes/gateway/restart"
-import { gatewayRunHandler } from "@/routes/gateway/run"
-import { gatewayStartHandler } from "@/routes/gateway/start"
-import { gatewayStatusHandler } from "@/routes/gateway/status"
-import { gatewayStopHandler } from "@/routes/gateway/stop"
-
-export const gatewayRoutes = factory
-  .createApp()
-  .get("/", ...gatewayGroupHandler)
-  .get("/status", ...gatewayStatusHandler)
-  .get("/start", ...gatewayStartHandler)
-  .get("/stop", ...gatewayStopHandler)
-  .get("/restart", ...gatewayRestartHandler)
-  .get("/run", ...gatewayRunHandler)
-  .get("/logs", ...gatewayLogsHandler)

package/lib/routes/gateway/run.help.ts

@@ -1,12 +0,0 @@
-export const help = `funnel gateway run — run the gateway in foreground
-
-usage: funnel gateway run [--no-caffeine]
-
-For developers. The process is tied to the current terminal and exits on SIGINT / SIGTERM.
-On macOS wraps with caffeinate -i by default. Use --no-caffeine to disable.
-
-For normal usage prefer funnel gateway start.
-
-examples:
-  funnel gateway run
-  funnel gateway run --no-caffeine`

package/lib/routes/gateway/run.ts

@@ -1,35 +0,0 @@
-import { resolve } from "node:path"
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/gateway/run.help"
-
-export const gatewayRunHandler = factory.createHandlers(
-  zValidator(
-    "query",
-    z.object({
-      "no-caffeine": z.string().optional(),
-    }),
-    help,
-  ),
-  async (c) => {
-    const query = c.req.valid("query")
-    const gatewayScript = resolve(import.meta.dir, "../../modules/gateway/daemon.ts")
-
-    const useCaffeinate = query["no-caffeine"] !== "true" && process.platform === "darwin"
-    const command = useCaffeinate
-      ? ["caffeinate", "-i", "bun", gatewayScript]
-      : ["bun", gatewayScript]
-
-    const proc = Bun.spawn(command, {
-      stdio: ["inherit", "inherit", "inherit"],
-    })
-
-    process.on("SIGINT", () => proc.kill("SIGINT"))
-    process.on("SIGTERM", () => proc.kill("SIGTERM"))
-
-    const exitCode = await proc.exited
-
-    process.exit(exitCode)
-  },
-)

package/lib/routes/gateway/start.help.ts

@@ -1,15 +0,0 @@
-export const help = `funnel gateway start — start the gateway in background
-
-usage: funnel gateway start [--no-caffeine]
-
-Daemonized with nohup, so it keeps running after the terminal is closed.
-On macOS wraps the process with caffeinate -i by default to prevent idle sleep.
-Use --no-caffeine to disable caffeinate.
-
-port: 9742 (override via FUNNEL_PORT)
-pid:  ~/.funnel/gateway.pid
-log:  /tmp/funnel/gateway.log
-
-examples:
-  funnel gateway start
-  funnel gateway start --no-caffeine`

package/lib/routes/gateway/start.ts

@@ -1,32 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/gateway/start.help"
-
-export const gatewayStartHandler = factory.createHandlers(
-  zValidator(
-    "query",
-    z.object({
-      "no-caffeine": z.string().optional(),
-    }),
-    help,
-  ),
-  async (c) => {
-    const query = c.req.valid("query")
-    const funnel = c.var.funnel
-
-    if (funnel.gateway.isRunning()) {
-      const status = funnel.gateway.getStatus()
-
-      return c.text(`funnel gateway: already running (pid ${status.pid})`)
-    }
-
-    const started = await funnel.gateway.start({
-      caffeinate: query["no-caffeine"] !== "true",
-    })
-
-    return started
-      ? c.text("funnel gateway: started")
-      : c.text("funnel gateway: failed to start", 500)
-  },
-)

package/lib/routes/gateway/status.help.ts

@@ -1,9 +0,0 @@
-export const help = `funnel gateway status — show gateway running status
-
-usage: funnel gateway status
-
-When running, prints PID, port, and connected channel count. When not running, exits with 503.
-
-examples:
-  funnel gateway status
-  funnel gateway`

package/lib/routes/gateway/status.ts

@@ -1,28 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/gateway/status.help"
-
-export const gatewayStatusHandler = factory.createHandlers(
-  zValidator("query", z.object({}), help),
-  async (c) => {
-    const funnel = c.var.funnel
-    const status = funnel.gateway.getStatus()
-
-    if (!status.running) {
-      return c.text("funnel gateway: not running", 503)
-    }
-
-    const res = await fetch(`http://localhost:${status.port}/health`).catch(() => null)
-
-    if (!res) {
-      return c.text(`funnel gateway: running (pid ${status.pid}) — health check failed`)
-    }
-
-    const health = (await res.json()) as Record<string, unknown>
-
-    return c.text(
-      `funnel gateway: running (pid ${status.pid})\n  port: ${status.port}\n  clients: ${health.clients ?? 0}`,
-    )
-  },
-)

package/lib/routes/gateway/stop.help.ts

@@ -1,8 +0,0 @@
-export const help = `funnel gateway stop — stop the gateway
-
-usage: funnel gateway stop
-
-Terminates the process whose PID is stored in ~/.funnel/gateway.pid.
-
-examples:
-  funnel gateway stop`

package/lib/routes/gateway/stop.ts

@@ -1,21 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/gateway/stop.help"
-
-export const gatewayStopHandler = factory.createHandlers(
-  zValidator("query", z.object({}), help),
-  async (c) => {
-    const funnel = c.var.funnel
-
-    if (!funnel.gateway.isRunning()) {
-      return c.text("funnel gateway: no running process")
-    }
-
-    const stopped = await funnel.gateway.stop()
-
-    return stopped
-      ? c.text("funnel gateway: stopped")
-      : c.text("funnel gateway: failed to stop", 500)
-  },
-)

package/lib/routes/profiles/add.help.ts

@@ -1,3 +0,0 @@
-export const help = `funnel profiles add — add a profile
-
-usage: funnel profiles add <name> --channel <ch> [--repo <r>] [--sub-agent <s>] [--env-file <f>]`

package/lib/routes/profiles/add.ts

@@ -1,33 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/profiles/add.help"
-
-export const profilesAddHandler = factory.createHandlers(
-  zValidator("param", z.object({ name: z.string() })),
-  zValidator(
-    "query",
-    z.object({
-      channel: z.string(),
-      repo: z.string().optional(),
-      "sub-agent": z.string().optional(),
-      "env-file": z.string().optional(),
-    }),
-    help,
-  ),
-  (c) => {
-    const param = c.req.valid("param")
-    const query = c.req.valid("query")
-    const funnel = c.var.funnel
-
-    funnel.profiles.add({
-      name: param.name,
-      channel: query.channel,
-      repo: query.repo,
-      subAgent: query["sub-agent"],
-      envFiles: query["env-file"] ? [query["env-file"]] : undefined,
-    })
-
-    return c.text(`added profile "${param.name}"`)
-  },
-)

package/lib/routes/profiles/group.help.ts

@@ -1,16 +0,0 @@
-export const help = `funnel profiles — manage launch profiles
-
-usage: funnel profiles [subcommand]
-
-subcommands:
-  (none)                          list
-  add <name> --channel <ch> [--repo <r>] [--sub-agent <s>] [--env-file <f>]
-  <name> set [--channel ...] [--repo ...] [--sub-agent ...] [--env-file ...]
-  rename <old> <new>              rename
-  remove <name>                   remove
-  <name> run                      launch (sugar for fnl claude)
-  <name>                          launch (alias for run)
-
-examples:
-  funnel profiles add cto --channel prod-inbox --repo myapp --sub-agent cto
-  funnel profiles cto run`

package/lib/routes/profiles/group.ts

@@ -1,25 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/profiles/group.help"
-
-export const profilesGroupHandler = factory.createHandlers(
-  zValidator("query", z.object({}), help),
-  (c) => {
-    const funnel = c.var.funnel
-    const profiles = funnel.profiles.list()
-
-    if (profiles.length === 0) return c.text("no profiles")
-
-    const lines = profiles.map((profile) => {
-      const parts = [`channel=${profile.channel}`]
-
-      if (profile.repo) parts.push(`repo=${profile.repo}`)
-      if (profile.subAgent) parts.push(`subAgent=${profile.subAgent}`)
-
-      return `${profile.name}  [${parts.join(", ")}]`
-    })
-
-    return c.text(lines.join("\n"))
-  },
-)

package/lib/routes/profiles/launch.help.ts

@@ -1,4 +0,0 @@
-export const help = `funnel profiles <name> run — launch a profile (sugar for fnl claude)
-
-usage: funnel profiles <name> run [additional claude args...]
-       funnel profiles <name>     (alias)`

package/lib/routes/profiles/launch.ts

@@ -1,36 +0,0 @@
-import { HTTPException } from "hono/http-exception"
-import { z } from "zod"
-import { factory } from "@/factory"
-import { queryToCliArgs } from "@/modules/router/query-to-cli-args"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/profiles/launch.help"
-
-const RESERVED_KEYS = ["channel", "repo", "sub-agent", "env-file"]
-
-export const profilesLaunchHandler = factory.createHandlers(
-  zValidator("param", z.object({ name: z.string() })),
-  zValidator("query", z.object({}).passthrough(), help),
-  async (c) => {
-    const param = c.req.valid("param")
-    const funnel = c.var.funnel
-    const profile = funnel.profiles.get(param.name)
-
-    if (!profile) throw new HTTPException(404, { message: `profile "${param.name}" not found` })
-
-    const overrideChannel = c.req.query("channel")
-    const overrideRepo = c.req.query("repo")
-    const overrideSubAgent = c.req.query("sub-agent")
-    const overrideEnvFile = c.req.query("env-file")
-
-    const exitCode = await funnel.claude.launch({
-      channel: overrideChannel ?? profile.channel,
-      repo: overrideRepo ?? profile.repo,
-      subAgent: overrideSubAgent ?? profile.subAgent,
-      envFiles: overrideEnvFile ? [overrideEnvFile] : profile.envFiles,
-      userArgs: queryToCliArgs(c.req.url, RESERVED_KEYS),
-      profileName: profile.name,
-    })
-
-    process.exit(exitCode)
-  },
-)

package/lib/routes/profiles/remove.help.ts

@@ -1,3 +0,0 @@
-export const help = `funnel profiles remove — remove a profile
-
-usage: funnel profiles remove <name>`

package/lib/routes/profiles/remove.ts

@@ -1,17 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/profiles/remove.help"
-
-export const profilesRemoveHandler = factory.createHandlers(
-  zValidator("param", z.object({ name: z.string() })),
-  zValidator("query", z.object({}), help),
-  (c) => {
-    const param = c.req.valid("param")
-    const funnel = c.var.funnel
-
-    funnel.profiles.remove(param.name)
-
-    return c.text(`removed profile "${param.name}"`)
-  },
-)

package/lib/routes/profiles/rename.help.ts

@@ -1,5 +0,0 @@
-export const help = `funnel profiles rename — rename a profile
-
-usage:
-  funnel profiles rename <old> <new>
-  funnel profiles <old> rename <new>`

package/lib/routes/profiles/rename.ts

@@ -1,17 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/profiles/rename.help"
-
-export const profilesRenameHandler = factory.createHandlers(
-  zValidator("param", z.object({ name: z.string(), newName: z.string() })),
-  zValidator("query", z.object({}), help),
-  (c) => {
-    const param = c.req.valid("param")
-    const funnel = c.var.funnel
-
-    funnel.profiles.rename(param.name, param["newName"])
-
-    return c.text(`renamed profile "${param.name}" to "${param["newName"]}"`)
-  },
-)

package/lib/routes/profiles/routes.ts

@@ -1,18 +0,0 @@
-import { factory } from "@/factory"
-import { profilesAddHandler } from "@/routes/profiles/add"
-import { profilesGroupHandler } from "@/routes/profiles/group"
-import { profilesLaunchHandler } from "@/routes/profiles/launch"
-import { profilesRemoveHandler } from "@/routes/profiles/remove"
-import { profilesRenameHandler } from "@/routes/profiles/rename"
-import { profilesSetHandler } from "@/routes/profiles/set"
-
-export const profilesRoutes = factory
-  .createApp()
-  .get("/", ...profilesGroupHandler)
-  .put("/:name/rename/:newName", ...profilesRenameHandler)
-  .put("/rename/:name/:newName", ...profilesRenameHandler)
-  .post("/:name", ...profilesAddHandler)
-  .put("/:name", ...profilesSetHandler)
-  .delete("/:name", ...profilesRemoveHandler)
-  .get("/:name/run", ...profilesLaunchHandler)
-  .get("/:name", ...profilesLaunchHandler)

package/lib/routes/profiles/set.help.ts

@@ -1,5 +0,0 @@
-export const help = `funnel profiles <name> set — update a profile
-
-usage: funnel profiles <name> set [--channel <ch>] [--repo <r>] [--sub-agent <s>] [--env-file <f>]
-
-pass an empty string to --repo / --sub-agent to unset them.`

package/lib/routes/profiles/set.ts

@@ -1,32 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/profiles/set.help"
-
-export const profilesSetHandler = factory.createHandlers(
-  zValidator("param", z.object({ name: z.string() })),
-  zValidator(
-    "query",
-    z.object({
-      channel: z.string().optional(),
-      repo: z.string().optional(),
-      "sub-agent": z.string().optional(),
-      "env-file": z.string().optional(),
-    }),
-    help,
-  ),
-  (c) => {
-    const param = c.req.valid("param")
-    const query = c.req.valid("query")
-    const funnel = c.var.funnel
-
-    funnel.profiles.update(param.name, {
-      channel: query.channel,
-      repo: query.repo,
-      subAgent: query["sub-agent"],
-      envFiles: query["env-file"] !== undefined ? [query["env-file"]] : undefined,
-    })
-
-    return c.text(`updated profile "${param.name}"`)
-  },
-)

package/lib/routes/repos/add.help.ts

@@ -1,6 +0,0 @@
-export const help = `funnel repos add — add a repo
-
-usage: funnel repos add <name> [--path <path>]
-
-Writes the funnel MCP server into the .mcp.json of the given directory.
-When --path is omitted, the current working directory is used.`

package/lib/routes/repos/add.ts

@@ -1,20 +0,0 @@
-import { resolve } from "node:path"
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/repos/add.help"
-
-export const reposAddHandler = factory.createHandlers(
-  zValidator("param", z.object({ name: z.string() })),
-  zValidator("query", z.object({ path: z.string().optional() }), help),
-  (c) => {
-    const param = c.req.valid("param")
-    const query = c.req.valid("query")
-    const funnel = c.var.funnel
-    const path = resolve(query.path ?? process.cwd())
-
-    funnel.repositories.add({ name: param.name, path })
-
-    return c.text(`added repo "${param.name}"`)
-  },
-)

package/lib/routes/repos/group.help.ts

@@ -1,11 +0,0 @@
-export const help = `funnel repos — manage repositories (extra)
-
-usage: funnel repos [subcommand]
-
-subcommands:
-  (none)                   list
-  add <name> [--path <p>]  add (path defaults to cwd; writes funnel into .mcp.json)
-  <name> set --path <p>    change path
-  rename <old> <new>       rename
-  remove <name>            remove
-  <name>                   show details`

package/lib/routes/repos/group.ts

@@ -1,18 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/repos/group.help"
-
-export const reposGroupHandler = factory.createHandlers(
-  zValidator("query", z.object({}), help),
-  (c) => {
-    const funnel = c.var.funnel
-    const repos = funnel.repositories.list()
-
-    if (repos.length === 0) return c.text("no repos")
-
-    const lines = repos.map((repo) => `${repo.name}  ${repo.path}`)
-
-    return c.text(lines.join("\n"))
-  },
-)

package/lib/routes/repos/remove.help.ts

@@ -1,3 +0,0 @@
-export const help = `funnel repos remove — remove a repo
-
-usage: funnel repos remove <name>`

package/lib/routes/repos/remove.ts

@@ -1,17 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/repos/remove.help"
-
-export const reposRemoveHandler = factory.createHandlers(
-  zValidator("param", z.object({ name: z.string() })),
-  zValidator("query", z.object({}), help),
-  (c) => {
-    const param = c.req.valid("param")
-    const funnel = c.var.funnel
-
-    funnel.repositories.remove(param.name)
-
-    return c.text(`removed repo "${param.name}"`)
-  },
-)

package/lib/routes/repos/rename.help.ts

@@ -1,5 +0,0 @@
-export const help = `funnel repos rename — rename a repo
-
-usage:
-  funnel repos rename <old> <new>
-  funnel repos <old> rename <new>`

package/lib/routes/repos/rename.ts

@@ -1,17 +0,0 @@
-import { z } from "zod"
-import { factory } from "@/factory"
-import { zValidator } from "@/modules/router/validator"
-import { help } from "@/routes/repos/rename.help"
-
-export const reposRenameHandler = factory.createHandlers(
-  zValidator("param", z.object({ name: z.string(), newName: z.string() })),
-  zValidator("query", z.object({}), help),
-  (c) => {
-    const param = c.req.valid("param")
-    const funnel = c.var.funnel
-
-    funnel.repositories.rename(param.name, param["newName"])
-
-    return c.text(`renamed repo "${param.name}" to "${param["newName"]}"`)
-  },
-)