@interactive-inc/claude-funnel 0.21.1 → 0.22.0

package/dist/{gh-connector-schema-CD5HIkrd.js → gh-connector-schema-CAC24s0r.js}

@@ -1,14 +1,68 @@
 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 { openSync } from "node:fs";
 import { z } from "zod";
 //#region lib/engine/process/process-runner.ts
 /**
 * Process boundary covering one-shot runs, sync runs, foreground attach, and
 * detached background spawns. Default is NodeFunnelProcessRunner (Bun.spawn);
 * MemoryFunnelProcessRunner records calls and lets tests stub responses.
+*
+* Liveness and process-listing helpers absorb POSIX/Windows differences so
+* callers do not branch on `process.platform`. `isAlive` checks whether a PID
+* names a live (non-zombie) process; `listProcessesContaining` enumerates
+* processes whose command line includes `marker`, used for funnel-gateway tag
+* matching across daemons that share a home dir.
 */
 var FunnelProcessRunner = class {};
 //#endregion
+//#region lib/engine/process/parse-csv-row.ts
+/**
+* Parse a single CSV row produced by Windows tools such as
+* `ConvertTo-Csv -NoTypeInformation`. Returns the trimmed cell array.
+* Supports embedded quotes via the `""` escape and quoted commas.
+*/
+function parseCsvRow(line) {
+	const cells = [];
+	const chars = Array.from(line);
+	let current = "";
+	let inQuotes = false;
+	let cursor = 0;
+	while (cursor < chars.length) {
+		const char = chars[cursor] ?? "";
+		if (inQuotes) {
+			if (char === "\"" && chars[cursor + 1] === "\"") {
+				current += "\"";
+				cursor += 2;
+				continue;
+			}
+			if (char === "\"") {
+				inQuotes = false;
+				cursor += 1;
+				continue;
+			}
+			current += char;
+			cursor += 1;
+			continue;
+		}
+		if (char === "\"") {
+			inQuotes = true;
+			cursor += 1;
+			continue;
+		}
+		if (char === ",") {
+			cells.push(current);
+			current = "";
+			cursor += 1;
+			continue;
+		}
+		current += char;
+		cursor += 1;
+	}
+	cells.push(current);
+	return cells;
+}
+//#endregion
 //#region lib/engine/process/node-process-runner.ts
 const toEnv = (env) => {
 	if (!env) return void 0;
@@ -17,6 +71,7 @@ const toEnv = (env) => {
 	for (const [key, value] of Object.entries(env)) merged[key] = value;
 	return merged;
 };
+const isWindows = () => process.platform === "win32";
 var NodeFunnelProcessRunner = class extends FunnelProcessRunner {
 	constructor() {
 		super();
@@ -65,13 +120,16 @@ var NodeFunnelProcessRunner = class extends FunnelProcessRunner {
 		return await proc.exited;
 	}
 	detach(command, options = {}) {
+		const stdoutTarget = options.stdoutFile ? openSync(options.stdoutFile, "a") : "ignore";
+		const stderrTarget = options.stderrFile ? options.stderrFile === options.stdoutFile && typeof stdoutTarget === "number" ? stdoutTarget : openSync(options.stderrFile, "a") : "ignore";
 		Bun.spawn(command, {
 			env: toEnv(options.env),
 			stdio: [
 				"ignore",
-				"ignore",
-				"ignore"
-			]
+				stdoutTarget,
+				stderrTarget
+			],
+			windowsHide: true
 		}).unref();
 	}
 	kill(pid, signal = "SIGTERM") {
@@ -79,6 +137,92 @@ var NodeFunnelProcessRunner = class extends FunnelProcessRunner {
 			process.kill(pid, signal);
 		} catch {}
 	}
+	isAlive(pid) {
+		if (!Number.isInteger(pid) || pid <= 0) return false;
+		if (isWindows()) return this.isAliveWindows(pid);
+		return this.isAlivePosix(pid);
+	}
+	listProcessesContaining(marker) {
+		if (!marker) return [];
+		if (isWindows()) return this.listProcessesContainingWindows(marker);
+		return this.listProcessesContainingPosix(marker);
+	}
+	isAlivePosix(pid) {
+		const result = this.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");
+	}
+	isAliveWindows(pid) {
+		const result = this.runSync([
+			"tasklist",
+			"/FI",
+			`PID eq ${pid}`,
+			"/NH",
+			"/FO",
+			"CSV"
+		]);
+		if (result.exitCode !== 0) return false;
+		return result.stdout.includes(`"${pid}"`);
+	}
+	listProcessesContainingPosix(marker) {
+		const result = this.runSync([
+			"ps",
+			"-e",
+			"-o",
+			"pid=,args="
+		]);
+		if (result.exitCode !== 0) return [];
+		const snapshots = [];
+		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 command = match[2] ?? "";
+			if (!Number.isInteger(pid) || pid <= 0) continue;
+			if (!command.includes(marker)) continue;
+			snapshots.push({
+				pid,
+				command
+			});
+		}
+		return snapshots;
+	}
+	listProcessesContainingWindows(marker) {
+		const result = this.runSync([
+			"powershell",
+			"-NoProfile",
+			"-Command",
+			"Get-CimInstance Win32_Process | Select-Object ProcessId,CommandLine | ConvertTo-Csv -NoTypeInformation"
+		]);
+		if (result.exitCode !== 0) return [];
+		const snapshots = [];
+		const lines = result.stdout.split(/\r?\n/).slice(1);
+		for (const raw of lines) {
+			const line = raw.trim();
+			if (!line) continue;
+			const cells = parseCsvRow(line);
+			if (cells.length < 2) continue;
+			const pid = Number(cells[0]);
+			const command = cells[1] ?? "";
+			if (!Number.isInteger(pid) || pid <= 0) continue;
+			if (!command.includes(marker)) continue;
+			snapshots.push({
+				pid,
+				command
+			});
+		}
+		return snapshots;
+	}
 };
 //#endregion
 //#region lib/connectors/gh-adapter.ts

package/dist/{gh-connector-schema-BNyTaASt.d.ts → gh-connector-schema-Cmi57jvL.d.ts}

@@ -19,12 +19,24 @@ type AttachOptions = {
   onSpawned?: (pid: number) => void;
 };
 type DetachOptions = {
-  env?: Record<string, string>;
+  env?: Record<string, string>; /** Append stdout to this file. Parent dir is the caller's responsibility. */
+  stdoutFile?: string; /** Append stderr to this file. Parent dir is the caller's responsibility. */
+  stderrFile?: string;
+};
+type ProcessSnapshot = {
+  pid: number;
+  command: string;
 };
 /**
  * Process boundary covering one-shot runs, sync runs, foreground attach, and
  * detached background spawns. Default is NodeFunnelProcessRunner (Bun.spawn);
  * MemoryFunnelProcessRunner records calls and lets tests stub responses.
+ *
+ * Liveness and process-listing helpers absorb POSIX/Windows differences so
+ * callers do not branch on `process.platform`. `isAlive` checks whether a PID
+ * names a live (non-zombie) process; `listProcessesContaining` enumerates
+ * processes whose command line includes `marker`, used for funnel-gateway tag
+ * matching across daemons that share a home dir.
  */
 declare abstract class FunnelProcessRunner {
   abstract run(command: string[], options?: RunOptions): Promise<RunResult>;
@@ -32,6 +44,8 @@ declare abstract class FunnelProcessRunner {
   abstract attach(command: string[], options?: AttachOptions): Promise<number>;
   abstract detach(command: string[], options?: DetachOptions): void;
   abstract kill(pid: number, signal?: string): void;
+  abstract isAlive(pid: number): boolean;
+  abstract listProcessesContaining(marker: string): ProcessSnapshot[];
 }
 //#endregion
 //#region lib/connectors/gh-connector-schema.d.ts
@@ -45,4 +59,4 @@ declare const ghConnectorSchema: z.ZodObject<{
 }, z.core.$strip>;
 type GhConnectorConfig = z.infer<typeof ghConnectorSchema>;
 //#endregion
-export { FunnelProcessRunner as a, DetachOptions as i, ghConnectorSchema as n, RunOptions as o, AttachOptions as r, RunResult as s, GhConnectorConfig as t };
+export { FunnelProcessRunner as a, RunResult as c, DetachOptions as i, ghConnectorSchema as n, ProcessSnapshot as o, AttachOptions as r, RunOptions as s, GhConnectorConfig as t };

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import { n as FunnelConnectorAdapter, t as CallInput } from "./connector-adapter-CXB-q_XC.js";
 import { n as discordConnectorSchema, t as DiscordConnectorConfig } from "./discord-connector-schema-Dww2I4zH.js";
-import { n as FunnelConnectorListener, r as NotifyFn, t as FunnelLogger } from "./logger-CTlXs7z4.js";
-import { a as FunnelProcessRunner, i as DetachOptions, n as ghConnectorSchema, o as RunOptions, r as AttachOptions, s as RunResult, t as GhConnectorConfig } from "./gh-connector-schema-BNyTaASt.js";
-import { a as FunnelFileSystem, c as ScheduleEntry, d as scheduleEntrySchema, i as FileStat, l as scheduleCatchupPolicySchema, n as ScheduleOnFired, o as ScheduleCatchupPolicy, s as ScheduleConnectorConfig, u as scheduleConnectorSchema } from "./schedule-listener-BPodvbld.js";
-import { a as SlackProcessed, c as SlackRawEvent, i as FunnelSlackEventProcessor, l as SlackConnectorConfig, n as SlackOnAppCreated, o as SlackProcessedEmit, r as SlackPreprocessEvent, s as SlackProcessedSkip, u as slackConnectorSchema } from "./slack-listener-CHj6uMY-.js";
+import { n as FunnelConnectorListener, r as NotifyFn, t as FunnelLogger } from "./logger-B3aXsVcX.js";
+import { a as FunnelProcessRunner, c as RunResult, i as DetachOptions, n as ghConnectorSchema, o as ProcessSnapshot, r as AttachOptions, s as RunOptions, t as GhConnectorConfig } from "./gh-connector-schema-Cmi57jvL.js";
+import { a as FunnelFileSystem, c as ScheduleEntry, d as scheduleEntrySchema, i as FileStat, l as scheduleCatchupPolicySchema, n as ScheduleOnFired, o as ScheduleCatchupPolicy, s as ScheduleConnectorConfig, u as scheduleConnectorSchema } from "./schedule-listener-CBYF2bGZ.js";
+import { a as SlackProcessed, c as SlackRawEvent, i as FunnelSlackEventProcessor, l as SlackConnectorConfig, n as SlackOnAppCreated, o as SlackProcessedEmit, r as SlackPreprocessEvent, s as SlackProcessedSkip, u as slackConnectorSchema } from "./slack-listener-tQH7cXU7.js";
 import { z } from "zod";
 import * as _$hono_factory0 from "hono/factory";
 import { Hono } from "hono";
@@ -1001,7 +1001,6 @@ declare class FunnelGateway {
   private readonly clock;
   private readonly dir;
   private readonly pidFile;
-  private readonly logDir;
   private readonly gatewayLog;
   private readonly tmpDir;
   private readonly port;
@@ -1018,7 +1017,7 @@ declare class FunnelGateway {
   }): Promise<boolean>;
   buildStartCommand(gatewayScript: string, options?: {
     caffeinate?: boolean;
-  }): string;
+  }): string[];
   stop(): Promise<boolean>;
   restart(options?: {
     onlyIfRunning?: boolean;
@@ -1029,7 +1028,6 @@ declare class FunnelGateway {
     stopped: boolean;
     started: boolean;
   }>;
-  getLogDir(): string;
   getGatewayLog(): string;
   getPort(): number;
   private readPid;
@@ -1117,8 +1115,8 @@ declare class FunnelEventStore {
 type Deps$3 = {
   channels: FunnelChannels;
   settings: FunnelSettingsReader;
-  port?: number; /** Directory holding the SQLite event store. The DB file lives at `<logDir>/events.db`. */
-  logDir?: string;
+  port?: number; /** SQLite event store file path. Parent directory is created on demand. Defaults to `<os.tmpdir()>/funnel/events.db`. */
+  dbPath?: string;
   process?: FunnelProcessRunner;
   clock?: FunnelClock;
   logger?: FunnelLogger;
@@ -1156,7 +1154,7 @@ declare class FunnelGatewayServer {
   private readonly channels;
   private readonly settings;
   private readonly port;
-  private readonly logDir;
+  private readonly dbPath;
   private readonly process?;
   private readonly logger;
   private readonly selfPid;
@@ -1310,7 +1308,7 @@ type Props$5 = {
   clock?: FunnelClock; /** ID generator for channel and connector ids. Use MemoryFunnelIdGenerator for deterministic tests. */
   idGenerator?: FunnelIdGenerator; /** Prompter used by FunnelLocalConfigSync when funnel.json omits a token. Defaults to a TTY-only stdin prompter. */
   tokenPrompter?: FunnelTokenPrompter; /** Funnel home directory (settings.json + per-channel/per-connector dirs). Defaults to ~/.funnel. */
-  dir?: string; /** Temp / runtime directory (gateway logs and PID adjacent files). Defaults to /tmp/funnel. */
+  dir?: string; /** Temp / runtime directory (gateway logs and PID adjacent files). Defaults to `<os.tmpdir()>/funnel`. */
   tmpDir?: string;
   /**
    * Host integration hooks for Slack listeners — `onAppCreated` for attaching
@@ -1414,7 +1412,7 @@ declare class Funnel {
    */
   gatewayServer(options?: {
     port?: number;
-    logDir?: string;
+    dbPath?: string;
     killCompetingSlack?: boolean; /** Override the auth token. Defaults to the persisted gateway.token. Pass "" to disable auth (tests). */
     token?: string;
     /**
@@ -1525,6 +1523,12 @@ declare class NodeFunnelProcessRunner extends FunnelProcessRunner {
   attach(command: string[], options?: AttachOptions): Promise<number>;
   detach(command: string[], options?: DetachOptions): void;
   kill(pid: number, signal?: string): void;
+  isAlive(pid: number): boolean;
+  listProcessesContaining(marker: string): ProcessSnapshot[];
+  private isAlivePosix;
+  private isAliveWindows;
+  private listProcessesContainingPosix;
+  private listProcessesContainingWindows;
 }
 //#endregion
 //#region lib/engine/process/memory-process-runner.d.ts
@@ -1554,6 +1558,8 @@ type MemoryProcessCall = {
   kind: "kill";
   command: string[];
 };
+type AliveStub = (pid: number) => boolean;
+type ProcessListStub = (marker: string) => ProcessSnapshot[];
 declare class MemoryFunnelProcessRunner extends FunnelProcessRunner {
   readonly calls: MemoryProcessCall[];
   readonly killed: {
@@ -1562,13 +1568,19 @@ declare class MemoryFunnelProcessRunner extends FunnelProcessRunner {
   }[];
   private handler;
   private syncHandler;
+  private aliveStub;
+  private listStub;
   on(handler: MemoryProcessHandler): this;
   onSync(handler: MemoryProcessSyncHandler): this;
+  onIsAlive(stub: AliveStub): this;
+  onListProcessesContaining(stub: ProcessListStub): this;
   run(command: string[], options?: RunOptions): Promise<RunResult>;
   runSync(command: string[]): RunResult;
   attach(command: string[], options?: AttachOptions): Promise<number>;
   detach(command: string[], options?: DetachOptions): void;
   kill(pid: number, signal?: string): void;
+  isAlive(pid: number): boolean;
+  listProcessesContaining(marker: string): ProcessSnapshot[];
 }
 //#endregion
 //#region lib/engine/logger/node-logger.d.ts
@@ -4263,4 +4275,4 @@ ${string}`;
 //#region lib/tui/tui.d.ts
 declare function launchTui(funnel: Funnel): Promise<void>;
 //#endregion
-export { AttachOptions, BroadcastEvent, BroadcastSubscriber, ChannelConfig, ChannelConnectorView, ChannelDeliveryMode, ChannelServerOptions, ChannelSpec, ConnectorConfig, ConnectorSpec, ConnectorSyncOutcome, ConnectorType, DEFAULT_GATEWAY_TOKEN_PATH, DetachOptions, DiscordConnectorConfig, Env, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, FileStat, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelDotenvReader, FunnelEvent, FunnelEventStore, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSessions, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, type GatewayEmitInput, type GatewayRouteDeps, type Env$1 as GatewayServerEnv, GhConnectorConfig, LOCAL_CONFIG_FILENAME, LOCAL_ENV_FILENAME, LaunchOptions, ListListenersResult, ListenerEntry, ListenerOpResult, LocalConfig, LocalConfigSyncResult, LogEntry, MemoryFunnelClock, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MemoryProcessCall, MemoryProcessHandler, MemoryProcessResponse, MemoryProcessSyncHandler, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, NotifyFn, ProfileConfig, PublishRequest, PublishResponse, PublishResult, ReplayableEvent, RunOptions, RunResult, SETTINGS_PATH, SETTINGS_VERSION, ScheduleCatchupPolicy, ScheduleConnectorConfig, ScheduleEntry, ScheduleListenerOptions, Settings, SlackConnectorConfig, SlackListenerOptions, SlackProcessed, SlackProcessedEmit, SlackProcessedSkip, SlackRawEvent, channelConfigSchema, channelDeliveryModeSchema, channelSpecSchema, app as cliApp, connectorConfigSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, launchTui, localConfigSchema, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };
+export { AliveStub, AttachOptions, BroadcastEvent, BroadcastSubscriber, ChannelConfig, ChannelConnectorView, ChannelDeliveryMode, ChannelServerOptions, ChannelSpec, ConnectorConfig, ConnectorSpec, ConnectorSyncOutcome, ConnectorType, DEFAULT_GATEWAY_TOKEN_PATH, DetachOptions, DiscordConnectorConfig, Env, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, FileStat, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelDotenvReader, FunnelEvent, FunnelEventStore, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSessions, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, type GatewayEmitInput, type GatewayRouteDeps, type Env$1 as GatewayServerEnv, GhConnectorConfig, LOCAL_CONFIG_FILENAME, LOCAL_ENV_FILENAME, LaunchOptions, ListListenersResult, ListenerEntry, ListenerOpResult, LocalConfig, LocalConfigSyncResult, LogEntry, MemoryFunnelClock, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MemoryProcessCall, MemoryProcessHandler, MemoryProcessResponse, MemoryProcessSyncHandler, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, NotifyFn, ProcessListStub, ProcessSnapshot, ProfileConfig, PublishRequest, PublishResponse, PublishResult, ReplayableEvent, RunOptions, RunResult, SETTINGS_PATH, SETTINGS_VERSION, ScheduleCatchupPolicy, ScheduleConnectorConfig, ScheduleEntry, ScheduleListenerOptions, Settings, SlackConnectorConfig, SlackListenerOptions, SlackProcessed, SlackProcessedEmit, SlackProcessedSkip, SlackRawEvent, channelConfigSchema, channelDeliveryModeSchema, channelSpecSchema, app as cliApp, connectorConfigSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, launchTui, localConfigSchema, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };