@interactive-inc/claude-funnel 0.34.0 → 0.36.0

package/dist/index.d.ts

@@ -395,7 +395,8 @@ type GatewayController = {
 };
 //#endregion
 //#region lib/engine/mcp/mcp.d.ts
-declare const FUNNEL_MCP_COMMAND = "funnel";
+declare const FUNNEL_MCP_COMMAND = "bun";
+declare const FUNNEL_MCP_ARGS: string[];
 declare const FUNNEL_MCP_NAME = "funnel";
 type Deps$13 = {
   fs?: FunnelFileSystem;
@@ -412,6 +413,7 @@ declare class FunnelMcp {
   uninstall(repoPath: string): void;
   findInstalledName(cwd: string): string | null;
   private findServerName;
+  private isFunnelEntry;
   private readConfig;
   private writeConfig;
 }
@@ -550,9 +552,10 @@ declare class FunnelClaude {
   /**
    * Mirrors claude's session storage path
    * (`<config-dir>/projects/<cwd-with-slashes-as-dashes>/<id>.jsonl`) to check
-   * whether a recorded session still exists. Reads the same `CLAUDE_CONFIG_DIR`
-   * the child will run under so the check matches reality; a wrong guess can
-   * only ever produce a false negative (start fresh), never a bad resume.
+   * whether a recorded session still exists AND is non-empty. Reads the same
+   * `CLAUDE_CONFIG_DIR` the child will run under so the check matches reality; a
+   * wrong guess can only ever produce a false negative (start fresh), never a
+   * bad resume.
    */
   private sessionFileExists;
   private buildEnv;
@@ -1467,7 +1470,7 @@ declare class Funnel {
 //#endregion
 //#region lib/engine/mcp/channel-server.d.ts
 type ChannelServerOptions = {
-  /** Funnel home directory (settings.json + gateway.token). Defaults to ~/.funnel. */dir?: string; /** Gateway base URL. Defaults to `$FUNNEL_GATEWAY_URL` or `http://localhost:9742`. */
+  /** Funnel home directory (settings.json + gateway.token). Defaults to ~/.funnel. */dir?: string; /** Gateway base URL. Defaults to `$FUNNEL_GATEWAY_URL` or `http://127.0.0.1:<port>`. */
   gatewayUrl?: string; /** Channel id to subscribe to. Defaults to `$FUNNEL_CHANNEL_ID`. */
   channelId?: string; /** Auth token. Defaults to `$FUNNEL_GATEWAY_TOKEN` then `<dir>/gateway.token`. */
   token?: string;
@@ -4589,4 +4592,4 @@ ${string}`;
   };
 }, "/", "/update">;
 //#endregion
-export { AliveStub, AttachOptions, BroadcastEvent, BroadcastSubscriber, CONNECTOR_CONNECTION_STATUSES, ChannelConfig, ChannelConnectorView, ChannelDeliveryMode, ChannelServerOptions, ChannelSpec, ConnectorConfig, ConnectorConnectionEvent, ConnectorConnectionQuery, ConnectorConnectionRecord, ConnectorConnectionStatus, ConnectorDiagnosticLog, ConnectorDiagnosticSqlReader, ConnectorProcessedEvent, ConnectorProcessedQuery, ConnectorProcessedRecord, ConnectorQuery, ConnectorRawEvent, ConnectorRawQuery, ConnectorRawRecord, ConnectorSpec, ConnectorSyncOutcome, ConnectorType, DEFAULT_GATEWAY_PORT, DEFAULT_GATEWAY_TOKEN_PATH, DetachOptions, DiscordConnectorConfig, Env, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, FileStat, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelEvent, FunnelEventLog, FunnelEventRecord, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLocalConfigWriter, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, type GatewayEmitInput, type GatewayRouteDeps, type Env$1 as GatewayServerEnv, GhConnectorConfig, LOCAL_CONFIG_FILENAME, LaunchOptions, ListListenersResult, ListenerEntry, ListenerOpResult, LocalConfig, LocalConfigSyncResult, LogEntry, MemoryConnectorDiagnosticLog, MemoryFunnelClock, MemoryFunnelEventLog, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MemoryProcessCall, MemoryProcessHandler, MemoryProcessResponse, MemoryProcessSyncHandler, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, NotifyFn, OnFunnelError, ProcessListStub, ProcessSnapshot, ProfileConfig, ProfileSpec, PublishRequest, PublishResponse, PublishResult, ReplayableEvent, RunOptions, RunResult, SETTINGS_PATH, SETTINGS_VERSION, ScheduleCatchupPolicy, ScheduleConnectorConfig, ScheduleEntry, ScheduleListenerOptions, Settings, SlackConnectorConfig, SlackListenerOptions, SlackProcessed, SlackProcessedEmit, SlackProcessedSkip, SlackRawEvent, SlackSkipReason, SqliteConnectorDiagnosticLog, SqliteFunnelEventLog, StoredConnectionEvent, StoredProcessedEvent, StoredRawEvent, channelConfigSchema, channelDeliveryModeSchema, channelSpecSchema, app as cliApp, connectorConfigSchema, connectorConnectionEventSchema, connectorProcessedEventSchema, connectorRawEventSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, localConfigSchema, profileConfigSchema, profileSpecSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, resolveFunnelDir, resolveFunnelPort, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };
+export { AliveStub, AttachOptions, BroadcastEvent, BroadcastSubscriber, CONNECTOR_CONNECTION_STATUSES, ChannelConfig, ChannelConnectorView, ChannelDeliveryMode, ChannelServerOptions, ChannelSpec, ConnectorConfig, ConnectorConnectionEvent, ConnectorConnectionQuery, ConnectorConnectionRecord, ConnectorConnectionStatus, ConnectorDiagnosticLog, ConnectorDiagnosticSqlReader, ConnectorProcessedEvent, ConnectorProcessedQuery, ConnectorProcessedRecord, ConnectorQuery, ConnectorRawEvent, ConnectorRawQuery, ConnectorRawRecord, ConnectorSpec, ConnectorSyncOutcome, ConnectorType, DEFAULT_GATEWAY_PORT, DEFAULT_GATEWAY_TOKEN_PATH, DetachOptions, DiscordConnectorConfig, Env, FUNNEL_DIR, FUNNEL_MCP_ARGS, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, FileStat, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelEvent, FunnelEventLog, FunnelEventRecord, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLocalConfigWriter, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, type GatewayEmitInput, type GatewayRouteDeps, type Env$1 as GatewayServerEnv, GhConnectorConfig, LOCAL_CONFIG_FILENAME, LaunchOptions, ListListenersResult, ListenerEntry, ListenerOpResult, LocalConfig, LocalConfigSyncResult, LogEntry, MemoryConnectorDiagnosticLog, MemoryFunnelClock, MemoryFunnelEventLog, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MemoryProcessCall, MemoryProcessHandler, MemoryProcessResponse, MemoryProcessSyncHandler, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, NotifyFn, OnFunnelError, ProcessListStub, ProcessSnapshot, ProfileConfig, ProfileSpec, PublishRequest, PublishResponse, PublishResult, ReplayableEvent, RunOptions, RunResult, SETTINGS_PATH, SETTINGS_VERSION, ScheduleCatchupPolicy, ScheduleConnectorConfig, ScheduleEntry, ScheduleListenerOptions, Settings, SlackConnectorConfig, SlackListenerOptions, SlackProcessed, SlackProcessedEmit, SlackProcessedSkip, SlackRawEvent, SlackSkipReason, SqliteConnectorDiagnosticLog, SqliteFunnelEventLog, StoredConnectionEvent, StoredProcessedEvent, StoredRawEvent, channelConfigSchema, channelDeliveryModeSchema, channelSpecSchema, app as cliApp, connectorConfigSchema, connectorConnectionEventSchema, connectorProcessedEventSchema, connectorRawEventSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, localConfigSchema, profileConfigSchema, profileSpecSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, resolveFunnelDir, resolveFunnelPort, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };

package/dist/index.js

@@ -787,14 +787,15 @@ var FunnelClaude = class {
 	/**
 	* Mirrors claude's session storage path
 	* (`<config-dir>/projects/<cwd-with-slashes-as-dashes>/<id>.jsonl`) to check
-	* whether a recorded session still exists. Reads the same `CLAUDE_CONFIG_DIR`
-	* the child will run under so the check matches reality; a wrong guess can
-	* only ever produce a false negative (start fresh), never a bad resume.
+	* whether a recorded session still exists AND is non-empty. Reads the same
+	* `CLAUDE_CONFIG_DIR` the child will run under so the check matches reality; a
+	* wrong guess can only ever produce a false negative (start fresh), never a
+	* bad resume.
 	*/
 	sessionFileExists(cwd, sessionId, recipeEnv) {
-		const configDir = recipeEnv.CLAUDE_CONFIG_DIR ?? globalThis.process.env.CLAUDE_CONFIG_DIR ?? join(homedir(), ".claude");
-		const projectSlug = cwd.replace(/\//g, "-");
-		return this.fs.existsSync(join(configDir, "projects", projectSlug, `${sessionId}.jsonl`));
+		const path = join(recipeEnv.CLAUDE_CONFIG_DIR ?? globalThis.process.env.CLAUDE_CONFIG_DIR ?? join(homedir(), ".claude"), "projects", cwd.replace(/\//g, "-"), `${sessionId}.jsonl`);
+		if (!this.fs.existsSync(path)) return false;
+		return this.fs.readFileSync(path).trim().length > 0;
 	}
 	buildEnv(channelId, recipeEnv) {
 		const env = {};
@@ -1316,7 +1317,8 @@ var MemoryFunnelLogger = class extends FunnelLogger {
 };
 //#endregion
 //#region lib/engine/mcp/mcp.ts
-const FUNNEL_MCP_COMMAND = "funnel";
+const FUNNEL_MCP_COMMAND = "bun";
+const FUNNEL_MCP_ARGS = ["funnel", "mcp"];
 const FUNNEL_MCP_NAME = "funnel";
 const mcpEntrySchema = z.object({
 	command: z.string().optional(),
@@ -1341,8 +1343,8 @@ var FunnelMcp = class {
 		const servers = config.mcpServers ?? {};
 		const targetName = this.findServerName(servers) ?? "funnel";
 		servers[targetName] = {
-			command: FUNNEL_MCP_COMMAND,
-			args: ["mcp"]
+			command: "bun",
+			args: FUNNEL_MCP_ARGS
 		};
 		this.writeConfig(repoPath, {
 			...config,
@@ -1369,10 +1371,17 @@ var FunnelMcp = class {
 	findServerName(servers) {
 		for (const entry of Object.entries(servers)) {
 			const name = entry[0];
-			if (entry[1]?.command === "funnel") return name;
+			const value = entry[1];
+			if (this.isFunnelEntry(value)) return name;
 		}
 		return null;
 	}
+	isFunnelEntry(value) {
+		if (!value) return false;
+		if (value.command === "bun" && value.args?.[0] === "funnel") return true;
+		if (value.command === "funnel") return true;
+		return false;
+	}
 	readConfig(repoPath) {
 		const mcpPath = join(repoPath, ".mcp.json");
 		if (!this.fs.existsSync(mcpPath)) return {};
@@ -1758,7 +1767,7 @@ var FunnelChannelPublisher = class {
 	async publish(channelName, request) {
 		if (!this.isDaemonRunning()) return OFFLINE$1;
 		try {
-			const url = `http://localhost:${this.port}/channels/${encodeURIComponent(channelName)}/publish`;
+			const url = `http://127.0.0.1:${this.port}/channels/${encodeURIComponent(channelName)}/publish`;
 			const res = await fetch(url, {
 				method: "POST",
 				headers: {
@@ -3463,7 +3472,7 @@ var FunnelListenersClient = class {
 	async list() {
 		if (!this.isDaemonRunning()) return { state: "offline" };
 		try {
-			const res = await fetch(`http://localhost:${this.port}/listeners`, { headers: this.authHeaders() });
+			const res = await fetch(`http://127.0.0.1:${this.port}/listeners`, { headers: this.authHeaders() });
 			if (!res.ok) return {
 				state: "error",
 				reason: `HTTP ${res.status}`
@@ -3505,7 +3514,7 @@ var FunnelListenersClient = class {
 	}
 	async call(method, path) {
 		try {
-			const res = await fetch(`http://localhost:${this.port}${path}`, {
+			const res = await fetch(`http://127.0.0.1:${this.port}${path}`, {
 				method,
 				headers: this.authHeaders()
 			});
@@ -3875,7 +3884,7 @@ const usageHintForType = (type) => {
 const DEFAULT_FUNNEL_DIR = join(homedir(), ".funnel");
 const startChannelServer = async (options = {}) => {
 	const dir = options.dir ?? DEFAULT_FUNNEL_DIR;
-	const gatewayBaseUrl = options.gatewayUrl ?? process.env.FUNNEL_GATEWAY_URL ?? `http://localhost:${resolveFunnelPort()}`;
+	const gatewayBaseUrl = options.gatewayUrl ?? process.env.FUNNEL_GATEWAY_URL ?? `http://127.0.0.1:${resolveFunnelPort()}`;
 	const gatewayWsUrl = `${gatewayBaseUrl.replace(/^http/, "ws")}/ws`;
 	const channelId = options.channelId ?? process.env.FUNNEL_CHANNEL_ID;
 	const channel = channelId ? readChannelConnectors(dir, channelId) : null;
@@ -5177,7 +5186,7 @@ examples:
 const renderGatewayStatus = async (c) => {
 	const status = c.var.funnel.gateway.getStatus();
 	if (!status.running) throw new HTTPException(503, { message: "funnel gateway: not running" });
-	const res = await fetch(`http://localhost:${status.port}/health`).catch(() => null);
+	const res = await fetch(`http://127.0.0.1:${status.port}/health`).catch(() => null);
 	if (!res) return c.text(`funnel gateway: running (pid ${status.pid}) — health check failed`);
 	const health = await res.json();
 	const clients = health !== null && typeof health === "object" && "clients" in health ? health.clients : 0;
@@ -5702,7 +5711,7 @@ const statusHandler = factory.createHandlers(zValidator$1("query", z.object({}),
 	if (!gatewayStatus.running) lines.push("gateway: not running");
 	else {
 		lines.push(`gateway: running (pid ${gatewayStatus.pid}, port ${gatewayStatus.port})`);
-		const res = await fetch(`http://localhost:${gatewayStatus.port}/status`).catch(() => null);
+		const res = await fetch(`http://127.0.0.1:${gatewayStatus.port}/status`).catch(() => null);
 		if (res && res.ok) {
 			const body = await res.json();
 			if (isGatewayStatus(body)) {
@@ -5762,4 +5771,4 @@ const createCliApp = (funnel) => {
 /** CLI Hono app wired to a default `new Funnel()`. For embedding with a custom Funnel use `createCliApp`. */
 const app = createCliApp(new Funnel());
 //#endregion
-export { CONNECTOR_CONNECTION_STATUSES, ConnectorDiagnosticLog, ConnectorDiagnosticSqlReader, DEFAULT_GATEWAY_PORT, DEFAULT_GATEWAY_TOKEN_PATH, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelEventLog, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLocalConfigWriter, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, LOCAL_CONFIG_FILENAME, MemoryConnectorDiagnosticLog, MemoryFunnelClock, MemoryFunnelEventLog, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, SqliteConnectorDiagnosticLog, SqliteFunnelEventLog, channelConfigSchema, channelDeliveryModeSchema, channelSpecSchema, app as cliApp, connectorConfigSchema, connectorConnectionEventSchema, connectorProcessedEventSchema, connectorRawEventSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, localConfigSchema, profileConfigSchema, profileSpecSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, resolveFunnelDir, resolveFunnelPort, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };
+export { CONNECTOR_CONNECTION_STATUSES, ConnectorDiagnosticLog, ConnectorDiagnosticSqlReader, DEFAULT_GATEWAY_PORT, DEFAULT_GATEWAY_TOKEN_PATH, FUNNEL_DIR, FUNNEL_MCP_ARGS, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelEventLog, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLocalConfigWriter, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, LOCAL_CONFIG_FILENAME, MemoryConnectorDiagnosticLog, MemoryFunnelClock, MemoryFunnelEventLog, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, SETTINGS_PATH, SETTINGS_VERSION, SqliteConnectorDiagnosticLog, SqliteFunnelEventLog, channelConfigSchema, channelDeliveryModeSchema, channelSpecSchema, app as cliApp, connectorConfigSchema, connectorConnectionEventSchema, connectorProcessedEventSchema, connectorRawEventSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, localConfigSchema, profileConfigSchema, profileSpecSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, resolveFunnelDir, resolveFunnelPort, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };

package/package.json

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