@interactive-inc/claude-funnel 0.21.1 → 0.22.0

package/dist/index.js

@@ -1,12 +1,12 @@
-import { i as FunnelDiscordAdapter, n as FunnelDiscordListener, t as discordConnectorSchema } from "./discord-connector-schema-ygf5Df-2.js";
-import { n as FunnelLogger, r as FunnelConnectorListener, t as NodeFunnelLogger } from "./node-logger-DQz_BGOD.js";
-import { a as FunnelProcessRunner, i as NodeFunnelProcessRunner, n as FunnelGhListener, r as FunnelGhAdapter, t as ghConnectorSchema } from "./gh-connector-schema-CD5HIkrd.js";
-import { a as ScheduleStateStore, i as FunnelScheduleListener, n as scheduleConnectorSchema, o as NodeFunnelFileSystem, r as scheduleEntrySchema, s as FunnelFileSystem, t as scheduleCatchupPolicySchema } from "./schedule-connector-schema-FxP7LPlx.js";
-import { i as FunnelSlackAdapter, n as FunnelSlackListener, r as FunnelSlackEventProcessor, t as slackConnectorSchema } from "./slack-connector-schema-BM9xshol.js";
+import { i as FunnelDiscordAdapter, n as FunnelDiscordListener, t as discordConnectorSchema } from "./discord-connector-schema-CR8RJ08_.js";
+import { i as FunnelConnectorListener, n as funnelTmpDir, r as FunnelLogger, t as NodeFunnelLogger } from "./node-logger-B97ZiGwj.js";
+import { a as FunnelProcessRunner, i as NodeFunnelProcessRunner, n as FunnelGhListener, r as FunnelGhAdapter, t as ghConnectorSchema } from "./gh-connector-schema-CAC24s0r.js";
+import { a as ScheduleStateStore, i as FunnelScheduleListener, n as scheduleConnectorSchema, o as NodeFunnelFileSystem, r as scheduleEntrySchema, s as FunnelFileSystem, t as scheduleCatchupPolicySchema } from "./schedule-connector-schema-BZpH6ZmR.js";
+import { i as FunnelSlackAdapter, n as FunnelSlackListener, r as FunnelSlackEventProcessor, t as slackConnectorSchema } from "./slack-connector-schema-B3jr-RTH.js";
 import { dirname, join, resolve } from "node:path";
 import { existsSync, mkdirSync, readFileSync } from "node:fs";
-import { z } from "zod";
 import { homedir } from "node:os";
+import { z } from "zod";
 import { stderr, stdin } from "node:process";
 import { fileURLToPath } from "node:url";
 import { timingSafeEqual } from "node:crypto";
@@ -647,17 +647,7 @@ var FunnelClaude = class {
 		globalThis.process.once("exit", () => this.removePidFile(profileName));
 	}
 	isProcessAlive(pid) {
-		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");
+		return this.process.isAlive(pid);
 	}
 	buildArgs(channelOptions, userArgs, cwd, sessionId) {
 		const result = [...channelOptions, ...userArgs];
@@ -1332,6 +1322,8 @@ var MemoryFunnelProcessRunner = class extends FunnelProcessRunner {
 	killed = [];
 	handler = () => empty;
 	syncHandler = () => empty;
+	aliveStub = null;
+	listStub = null;
 	on(handler) {
 		this.handler = handler;
 		return this;
@@ -1340,6 +1332,14 @@ var MemoryFunnelProcessRunner = class extends FunnelProcessRunner {
 		this.syncHandler = handler;
 		return this;
 	}
+	onIsAlive(stub) {
+		this.aliveStub = stub;
+		return this;
+	}
+	onListProcessesContaining(stub) {
+		this.listStub = stub;
+		return this;
+	}
 	async run(command, options = {}) {
 		this.calls.push({
 			kind: "run",
@@ -1391,6 +1391,24 @@ var MemoryFunnelProcessRunner = class extends FunnelProcessRunner {
 			signal
 		});
 	}
+	isAlive(pid) {
+		if (this.aliveStub) return this.aliveStub(pid);
+		const result = this.syncHandler([
+			"ps",
+			"-p",
+			String(pid),
+			"-o",
+			"state="
+		]);
+		if ((result.exitCode ?? 0) !== 0) return false;
+		const state = (result.stdout ?? "").trim();
+		if (!state) return false;
+		return !state.startsWith("Z");
+	}
+	listProcessesContaining(marker) {
+		if (this.listStub) return this.listStub(marker);
+		return [];
+	}
 };
 //#endregion
 //#region lib/engine/profiles/profiles.ts
@@ -1749,7 +1767,6 @@ const resolveDaemonScript = () => {
 //#endregion
 //#region lib/gateway/gateway.ts
 const DEFAULT_PORT$1 = 9742;
-const DEFAULT_TMP_DIR$1 = "/tmp/funnel";
 const STARTUP_TIMEOUT_MS = 5e3;
 const SIGTERM_TIMEOUT_MS = 2e3;
 const POLL_INTERVAL_MS$1 = 100;
@@ -1771,7 +1788,6 @@ var FunnelGateway = class {
 	clock;
 	dir;
 	pidFile;
-	logDir;
 	gatewayLog;
 	tmpDir;
 	port;
@@ -1781,9 +1797,8 @@ var FunnelGateway = class {
 		this.fs = deps.fs ?? defaultFs$1;
 		this.clock = deps.clock ?? defaultClock;
 		this.dir = deps.dir ?? FUNNEL_DIR;
-		this.tmpDir = deps.tmpDir ?? DEFAULT_TMP_DIR$1;
+		this.tmpDir = deps.tmpDir ?? funnelTmpDir();
 		this.pidFile = join(this.dir, "gateway.pid");
-		this.logDir = join(this.tmpDir, "events");
 		this.gatewayLog = join(this.tmpDir, "gateway.log");
 		this.port = deps.port ?? DEFAULT_PORT$1;
 		this.sleep = deps.sleep ?? defaultSleep$1;
@@ -1808,11 +1823,10 @@ var FunnelGateway = class {
 		this.fs.mkdirSync(this.tmpDir, { recursive: true });
 		const gatewayScript = resolveDaemonScript();
 		const command = this.buildStartCommand(gatewayScript, options);
-		this.process.detach([
-			"bash",
-			"-c",
-			command
-		]);
+		this.process.detach(command, {
+			stdoutFile: this.gatewayLog,
+			stderrFile: this.gatewayLog
+		});
 		const deadline = this.clock.millis() + STARTUP_TIMEOUT_MS;
 		while (this.clock.millis() < deadline) {
 			if (this.isRunning()) return true;
@@ -1821,7 +1835,19 @@ var FunnelGateway = class {
 		return this.isRunning();
 	}
 	buildStartCommand(gatewayScript, options = {}) {
-		return `nohup ${options.caffeinate !== false && globalThis.process.platform === "darwin" ? "caffeinate -i " : ""}bun ${gatewayScript} ${`funnel-gateway[${this.dir}]`} >> ${this.gatewayLog} 2>&1 &`;
+		const tag = `funnel-gateway[${this.dir}]`;
+		if (options.caffeinate !== false && globalThis.process.platform === "darwin") return [
+			"caffeinate",
+			"-is",
+			"bun",
+			gatewayScript,
+			tag
+		];
+		return [
+			"bun",
+			gatewayScript,
+			tag
+		];
 	}
 	async stop() {
 		const pid = this.readPid();
@@ -1873,9 +1899,6 @@ var FunnelGateway = class {
 			started
 		};
 	}
-	getLogDir() {
-		return this.logDir;
-	}
 	getGatewayLog() {
 		return this.gatewayLog;
 	}
@@ -1897,17 +1920,7 @@ var FunnelGateway = class {
 		this.fs.unlink(this.pidFile);
 	}
 	isProcessAlive(pid) {
-		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");
+		return this.process.isAlive(pid);
 	}
 };
 //#endregion
@@ -2728,36 +2741,24 @@ const titleFor = (dir) => `funnel-gateway[${dir}]`;
 * which is the only situation that causes a real conflict (duplicate Slack
 * Socket Mode connections with the same tokens). Daemons rooted at a
 * different `~/.funnel/` are left alone — they hold different tokens and
-* speak to different Slack apps. The daemon advertises its dir via
-* `process.title = "funnel-gateway[<dir>]"`, which this routine matches.
+* speak to different Slack apps. The daemon advertises its dir via the
+* `funnel-gateway[<dir>]` marker appended to argv (also assigned to
+* `process.title` on POSIX). `FunnelProcessRunner.listProcessesContaining`
+* absorbs the POSIX/Windows enumeration difference behind the marker match.
 */
 const killCompetingSlackGateways = async (props) => {
 	const runner = props.process ?? defaultProcess;
 	const logger = props.logger ?? defaultLogger$1;
-	const result = await runner.run([
-		"ps",
-		"-e",
-		"-o",
-		"pid=,args="
-	]);
-	if (result.exitCode !== 0) return [];
 	const expectedTitle = titleFor(props.dir);
+	const snapshots = runner.listProcessesContaining(expectedTitle);
 	const killed = [];
-	for (const raw of result.stdout.split("\n")) {
-		const line = raw.trim();
-		if (!line) continue;
-		const match = /^(\d+)\s+(.+)$/.exec(line);
-		if (!match) continue;
-		const pid = Number(match[1]);
-		const args = match[2];
-		if (!Number.isInteger(pid) || pid <= 0) continue;
-		if (pid === props.selfPid) continue;
-		if (!args.includes(expectedTitle)) continue;
-		runner.kill(pid, "SIGTERM");
-		killed.push(pid);
+	for (const snapshot of snapshots) {
+		if (snapshot.pid === props.selfPid) continue;
+		runner.kill(snapshot.pid, "SIGTERM");
+		killed.push(snapshot.pid);
 		logger.info("killed competing Slack gateway process", {
-			pid,
-			args: args.slice(0, 160)
+			pid: snapshot.pid,
+			args: snapshot.command.slice(0, 160)
 		});
 	}
 	return killed;
@@ -2923,8 +2924,7 @@ const gatewayRoutes = factory$1.createApp().get("/health", ...healthHandler).get
 //#endregion
 //#region lib/gateway/gateway-server.ts
 const DEFAULT_PORT = 9742;
-const DEFAULT_LOG_DIR = "/tmp/funnel/events";
-const DB_FILENAME = "events.db";
+const defaultDbPath = () => join(funnelTmpDir(), "events.db");
 const defaultLogger = new NodeFunnelLogger();
 /**
 * In-process gateway: runs `Bun.serve` (HTTP + WebSocket /ws), boots connector
@@ -2940,7 +2940,7 @@ var FunnelGatewayServer = class {
 	channels;
 	settings;
 	port;
-	logDir;
+	dbPath;
 	process;
 	logger;
 	selfPid;
@@ -2958,7 +2958,7 @@ var FunnelGatewayServer = class {
 		this.channels = deps.channels;
 		this.settings = deps.settings;
 		this.port = deps.port ?? DEFAULT_PORT;
-		this.logDir = deps.logDir ?? DEFAULT_LOG_DIR;
+		this.dbPath = deps.dbPath ?? defaultDbPath();
 		this.process = deps.process;
 		this.logger = deps.logger ?? defaultLogger;
 		this.selfPid = deps.selfPid ?? globalThis.process.pid;
@@ -2968,9 +2968,10 @@ var FunnelGatewayServer = class {
 		this.extraRoutes = deps.extraRoutes ?? null;
 		const clock = deps.clock;
 		this.nowMs = clock ? () => clock.millis() : () => Date.now();
-		if (!existsSync(this.logDir)) mkdirSync(this.logDir, { recursive: true });
+		const dbDir = dirname(this.dbPath);
+		if (!existsSync(dbDir)) mkdirSync(dbDir, { recursive: true });
 		this.eventStore = new FunnelEventStore({
-			path: join(this.logDir, DB_FILENAME),
+			path: this.dbPath,
 			now: this.nowMs
 		});
 		this.broadcaster = new FunnelBroadcaster({
@@ -3174,7 +3175,7 @@ var FunnelGatewayServer = class {
 			channel: entry.channelName,
 			connector: entry.name
 		});
-		this.logger.info(`event store: ${join(this.logDir, DB_FILENAME)}`);
+		this.logger.info(`event store: ${this.dbPath}`);
 		this.logger.info("funnel gateway running");
 	}
 	/**
@@ -3361,7 +3362,6 @@ var FunnelListenersClient = class {
 };
 //#endregion
 //#region lib/funnel.ts
-const DEFAULT_TMP_DIR = "/tmp/funnel";
 const SANDBOX_DIR = "/sandbox/.funnel";
 const SANDBOX_TMP_DIR = "/sandbox/tmp";
 /**
@@ -3411,7 +3411,7 @@ var Funnel = class Funnel {
 		const dir = this.props.dir ?? FUNNEL_DIR;
 		return {
 			dir,
-			tmpDir: this.props.tmpDir ?? DEFAULT_TMP_DIR,
+			tmpDir: this.props.tmpDir ?? funnelTmpDir(),
 			settings: join(dir, "settings.json")
 		};
 	}
@@ -3591,7 +3591,7 @@ var Funnel = class Funnel {
 			channels: this.channels,
 			settings: this.store,
 			port: options.port,
-			logDir: options.logDir,
+			dbPath: options.dbPath,
 			process: this.process,
 			clock: this.clock,
 			logger: this.logger,
@@ -4445,13 +4445,13 @@ usage: funnel gateway logs [-n <N>]
 options:
   -n <N>                number of trailing lines to show (default: 20)
 
-Tails /tmp/funnel/funnel.log (the daemon's diagnostic stream — gateway
+Tails ${join(funnelTmpDir(), "funnel.log")} (the daemon's diagnostic stream — gateway
 lifecycle, channel connect/disconnect, listener boot). Exit with SIGINT.
 Output is formatted as YAML.
 
 Domain events fanned out to WebSocket clients live in the SQLite event
-store (<logDir>/events.db); they are not shown here. Subscribe via the
-WS endpoint or query the store directly.
+store (${join(funnelTmpDir(), "events.db")}); they are not shown here. Subscribe via
+the WS endpoint or query the store directly.
 
 examples:
   funnel gateway logs
@@ -4525,7 +4525,7 @@ const gatewayRestartHandler = factory.createHandlers(zValidator$1("query", z.obj
 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.
+On macOS wraps with caffeinate -is by default. Use --no-caffeine to disable.
 
 examples:
   funnel gateway restart
@@ -4544,7 +4544,7 @@ const gatewayRunHandler = factory.createHandlers(zValidator$1("query", z.object(
 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.
+On macOS wraps with caffeinate -is by default. Use --no-caffeine to disable.
 
 For normal usage prefer funnel gateway start.
 
@@ -4556,28 +4556,31 @@ examples:
 	const gatewayScript = resolveDaemonScript();
 	const command = query["no-caffeine"] !== "true" && process.platform === "darwin" ? [
 		"caffeinate",
-		"-i",
+		"-is",
 		"bun",
 		gatewayScript
 	] : ["bun", gatewayScript];
 	const exitCode = await funnel.process.attach(command);
 	process.exit(exitCode);
 });
-const gatewayStartHandler = factory.createHandlers(zValidator$1("query", z.object({ "no-caffeine": z.string().optional() }), `funnel gateway start — start the gateway in background
+//#endregion
+//#region lib/cli/routes/gateway.start.ts
+const startHelp = `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.
+Spawned as a detached background process so it keeps running after the terminal is closed.
+On macOS wraps the process with caffeinate -is by default to prevent idle and system sleep.
 Use --no-caffeine to disable caffeinate.
 
 port: 9742 (override via FUNNEL_PORT)
 pid:  ~/.funnel/gateway.pid
-log:  /tmp/funnel/gateway.log
+log:  ${join(funnelTmpDir(), "gateway.log")}
 
 examples:
   funnel gateway start
-  funnel gateway start --no-caffeine`), async (c) => {
+  funnel gateway start --no-caffeine`;
+const gatewayStartHandler = factory.createHandlers(zValidator$1("query", z.object({ "no-caffeine": z.string().optional() }), startHelp), async (c) => {
 	const query = c.req.valid("query");
 	const funnel = c.var.funnel;
 	if (funnel.gateway.isRunning()) {

package/dist/{logger-CTlXs7z4.d.ts → logger-B3aXsVcX.d.ts}

@@ -20,7 +20,7 @@ declare abstract class FunnelConnectorListener {
 //#region lib/engine/logger/logger.d.ts
 /**
  * Structured logger with three levels and an optional log-file path.
- * Defaults to NodeFunnelLogger (appends to /tmp/funnel/funnel.log);
+ * Defaults to NodeFunnelLogger (appends to `<os.tmpdir()>/funnel/funnel.log`);
  * MemoryFunnelLogger captures entries in memory and NoopFunnelLogger silences output.
  */
 declare abstract class FunnelLogger {

package/dist/{node-logger-DQz_BGOD.js → node-logger-B97ZiGwj.js}

@@ -1,5 +1,6 @@
 import { dirname, join } from "node:path";
 import { appendFileSync, mkdirSync } from "node:fs";
+import { tmpdir } from "node:os";
 //#region lib/connectors/connector-listener.ts
 /**
 * Long-lived event source for one connector.
@@ -21,19 +22,31 @@ var FunnelConnectorListener = class {
 //#region lib/engine/logger/logger.ts
 /**
 * Structured logger with three levels and an optional log-file path.
-* Defaults to NodeFunnelLogger (appends to /tmp/funnel/funnel.log);
+* Defaults to NodeFunnelLogger (appends to `<os.tmpdir()>/funnel/funnel.log`);
 * MemoryFunnelLogger captures entries in memory and NoopFunnelLogger silences output.
 */
 var FunnelLogger = class {};
 //#endregion
+//#region lib/engine/settings/tmp-dir.ts
+/**
+* Resolves the funnel temp/log root for the current OS. Defaults to
+* `<os.tmpdir()>/funnel` so Windows lands under `%TEMP%\funnel` and POSIX
+* lands under `/tmp/funnel`. Callers may override via `FUNNEL_TMP_DIR`.
+*/
+function funnelTmpDir() {
+	const override = process.env.FUNNEL_TMP_DIR;
+	if (override && override.length > 0) return override;
+	return join(tmpdir(), "funnel");
+}
+//#endregion
 //#region lib/engine/logger/node-logger.ts
-const DEFAULT_LOG_FILE = join("/tmp/funnel", "funnel.log");
+const defaultLogFile = () => join(funnelTmpDir(), "funnel.log");
 var NodeFunnelLogger = class extends FunnelLogger {
 	file;
 	now;
 	constructor(props = {}) {
 		super();
-		this.file = props.file ?? DEFAULT_LOG_FILE;
+		this.file = props.file ?? defaultLogFile();
 		this.now = props.now ?? (() => /* @__PURE__ */ new Date());
 		Object.freeze(this);
 	}
@@ -58,4 +71,4 @@ var NodeFunnelLogger = class extends FunnelLogger {
 	}
 };
 //#endregion
-export { FunnelLogger as n, FunnelConnectorListener as r, NodeFunnelLogger as t };
+export { FunnelConnectorListener as i, funnelTmpDir as n, FunnelLogger as r, NodeFunnelLogger as t };

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

@@ -1,4 +1,4 @@
-import { r as FunnelConnectorListener, t as NodeFunnelLogger } from "./node-logger-DQz_BGOD.js";
+import { i as FunnelConnectorListener, t as NodeFunnelLogger } from "./node-logger-B97ZiGwj.js";
 import { dirname } from "node:path";
 import { appendFileSync, chmodSync, existsSync, mkdirSync, readFileSync, readdirSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { z } from "zod";

package/dist/{schedule-listener-BPodvbld.d.ts → schedule-listener-CBYF2bGZ.d.ts}

@@ -1,4 +1,4 @@
-import { n as FunnelConnectorListener, r as NotifyFn, t as FunnelLogger } from "./logger-CTlXs7z4.js";
+import { n as FunnelConnectorListener, r as NotifyFn, t as FunnelLogger } from "./logger-B3aXsVcX.js";
 import { z } from "zod";
 
 //#region lib/connectors/schedule-connector-schema.d.ts

package/dist/{slack-connector-schema-BM9xshol.js → slack-connector-schema-B3jr-RTH.js}

@@ -1,5 +1,5 @@
 import { t as FunnelConnectorAdapter } from "./connector-adapter-D5Utumgz.js";
-import { r as FunnelConnectorListener, t as NodeFunnelLogger } from "./node-logger-DQz_BGOD.js";
+import { i as FunnelConnectorListener, t as NodeFunnelLogger } from "./node-logger-B97ZiGwj.js";
 import { z } from "zod";
 import { WebClient } from "@slack/web-api";
 import { App, LogLevel } from "@slack/bolt";

package/dist/{slack-listener-CHj6uMY-.d.ts → slack-listener-tQH7cXU7.d.ts}

@@ -1,4 +1,4 @@
-import { n as FunnelConnectorListener, r as NotifyFn, t as FunnelLogger } from "./logger-CTlXs7z4.js";
+import { n as FunnelConnectorListener, r as NotifyFn, t as FunnelLogger } from "./logger-B3aXsVcX.js";
 import { z } from "zod";
 import { App } from "@slack/bolt";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interactive-inc/claude-funnel",
-  "version": "0.21.1",
+  "version": "0.22.0",
   "description": "Hub CLI that routes external events (Slack / GitHub / Discord) to Claude Code agents through subscription channels over MCP.",
   "keywords": [
     "bun",