@interactive-inc/claude-funnel 0.32.0 → 0.34.0

package/dist/index.d.ts

@@ -1492,6 +1492,15 @@ declare const funnelJsonSchema: () => Record<string, unknown>;
  * spawned with the env set resolves the override.
  */
 declare function resolveFunnelDir(): string;
+declare const DEFAULT_GATEWAY_PORT = 9742;
+/**
+ * Resolves the gateway port. Defaults to 9742 — the port a programmatically
+ * hosted gateway (`new Funnel().gatewayServer()`) uses. The `funnel` CLI entry
+ * sets `FUNNEL_PORT` to a distinct default so a CLI launch never collides with
+ * an embedding app's gateway on 9742. Read at call time so a daemon spawned
+ * with the env set resolves the override.
+ */
+declare function resolveFunnelPort(): number;
 declare const FUNNEL_DIR: string;
 declare const SETTINGS_PATH: string;
 type Deps = {
@@ -1507,11 +1516,11 @@ declare class FunnelSettingsStore extends FunnelSettingsReader {
   read(): Settings;
   private looksLikeLegacy;
   /**
-   * Non-destructive migration for profiles written before `id` existed. The id
-   * is a later addition to an otherwise-compatible schema, so rather than
-   * rejecting the file we mint a uuid for each profile that lacks one; the next
-   * `write` persists it. Mutates `parsed` in place (it is freshly JSON-parsed
-   * and discarded after the schema parse, so no shared state is touched).
+   * Non-destructive migration for profiles written before `id` existed. Mints a
+   * uuid for each profile lacking one and returns whether anything was minted, so
+   * `read` can persist it immediately — a profile id must be STABLE across reads,
+   * otherwise `setSessionId` (a second read) sees a different id and can't match
+   * the one the launch used. Mutates `parsed` in place (freshly JSON-parsed).
    */
   private backfillProfileIds;
   write(settings: Settings): void;
@@ -4580,4 +4589,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_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, 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_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

@@ -112,6 +112,17 @@ function resolveFunnelDir() {
 	if (override && override.length > 0) return override;
 	return join(homedir(), ".funnel");
 }
+const DEFAULT_GATEWAY_PORT = 9742;
+/**
+* Resolves the gateway port. Defaults to 9742 — the port a programmatically
+* hosted gateway (`new Funnel().gatewayServer()`) uses. The `funnel` CLI entry
+* sets `FUNNEL_PORT` to a distinct default so a CLI launch never collides with
+* an embedding app's gateway on 9742. Read at call time so a daemon spawned
+* with the env set resolves the override.
+*/
+function resolveFunnelPort() {
+	return Number(process.env.FUNNEL_PORT) || 9742;
+}
 const FUNNEL_DIR = join(homedir(), ".funnel");
 const SETTINGS_PATH = join(FUNNEL_DIR, "settings.json");
 const defaultFs$5 = new NodeFunnelFileSystem();
@@ -137,9 +148,10 @@ var FunnelSettingsStore = class extends FunnelSettingsReader {
 		const parsed = JSON.parse(content);
 		if (this.looksLikeLegacy(parsed)) throw new Error(`legacy settings.json detected at ${this.path}. The schema changed (channel.connectors are now nested objects with ids; profile fields renamed). Migration is intentionally not provided. Back up and remove the old file:\n  mv ${this.path} ${this.path}.bak`);
 		if (parsed && typeof parsed === "object" && "version" in parsed && parsed.version !== 1) throw new Error(`unsupported settings.json version (${this.path}): expected 1, got ${String(parsed.version)}`);
-		this.backfillProfileIds(parsed);
+		const minted = this.backfillProfileIds(parsed);
 		const result = settingsSchema.safeParse(parsed);
 		if (!result.success) throw new Error(`invalid settings.json (${this.path}): ${result.error.issues.map((i) => `${i.path.join(".")}: ${i.message}`).join(", ")}`);
+		if (minted) this.write(result.data);
 		return result.data;
 	}
 	looksLikeLegacy(parsed) {
@@ -161,21 +173,26 @@ var FunnelSettingsStore = class extends FunnelSettingsReader {
 		return false;
 	}
 	/**
-	* Non-destructive migration for profiles written before `id` existed. The id
-	* is a later addition to an otherwise-compatible schema, so rather than
-	* rejecting the file we mint a uuid for each profile that lacks one; the next
-	* `write` persists it. Mutates `parsed` in place (it is freshly JSON-parsed
-	* and discarded after the schema parse, so no shared state is touched).
+	* Non-destructive migration for profiles written before `id` existed. Mints a
+	* uuid for each profile lacking one and returns whether anything was minted, so
+	* `read` can persist it immediately — a profile id must be STABLE across reads,
+	* otherwise `setSessionId` (a second read) sees a different id and can't match
+	* the one the launch used. Mutates `parsed` in place (freshly JSON-parsed).
 	*/
 	backfillProfileIds(parsed) {
-		if (!parsed || typeof parsed !== "object") return;
+		if (!parsed || typeof parsed !== "object") return false;
 		const obj = parsed;
-		if (!Array.isArray(obj.profiles)) return;
+		if (!Array.isArray(obj.profiles)) return false;
+		let minted = false;
 		for (const profile of obj.profiles) {
 			if (!profile || typeof profile !== "object") continue;
 			const p = profile;
-			if (typeof p.id !== "string") p.id = this.idGenerator.generate();
+			if (typeof p.id !== "string") {
+				p.id = this.idGenerator.generate();
+				minted = true;
+			}
 		}
+		return minted;
 	}
 	write(settings) {
 		this.fs.mkdirSync(dirname(this.path), { recursive: true });
@@ -784,6 +801,7 @@ var FunnelClaude = class {
 		for (const [key, value] of Object.entries(recipeEnv)) env[key] = value;
 		for (const [key, value] of Object.entries(globalThis.process.env)) if (typeof value === "string") env[key] = value;
 		env.FUNNEL_CHANNEL_ID = channelId;
+		env.FUNNEL_PORT = String(resolveFunnelPort());
 		return env;
 	}
 };
@@ -1802,7 +1820,6 @@ const resolveDaemonScript = () => {
 };
 //#endregion
 //#region lib/gateway/gateway.ts
-const DEFAULT_PORT$1 = 9742;
 const STARTUP_TIMEOUT_MS = 5e3;
 const SIGTERM_TIMEOUT_MS = 2e3;
 const POLL_INTERVAL_MS = 100;
@@ -1836,7 +1853,7 @@ var FunnelGateway = class {
 		this.tmpDir = deps.tmpDir ?? funnelTmpDir();
 		this.pidFile = join(this.dir, "gateway.pid");
 		this.gatewayLog = join(this.tmpDir, "gateway.log");
-		this.port = deps.port ?? DEFAULT_PORT$1;
+		this.port = deps.port ?? resolveFunnelPort();
 		this.sleep = deps.sleep ?? defaultSleep$1;
 		Object.freeze(this);
 	}
@@ -3044,7 +3061,6 @@ const statusHandler$1 = factory$1.createHandlers((c) => {
 const gatewayRoutes = factory$1.createApp().get("/health", ...healthHandler).get("/status", ...statusHandler$1).get("/listeners", ...listenersListHandler).post("/listeners/:channel/:connector/start", ...listenersStartHandler).delete("/listeners/:channel/:connector", ...listenersStopHandler).post("/listeners/:channel/:connector/restart", ...listenersRestartHandler).post("/channels/:channel/connectors/:connector/call", ...channelsConnectorsCallHandler).post("/channels/:channel/publish", ...channelsPublishHandler$1);
 //#endregion
 //#region lib/gateway/gateway-server.ts
-const DEFAULT_PORT = 9742;
 const DEFAULT_HOST = "127.0.0.1";
 const LOOPBACK_HOSTS = new Set([
 	"127.0.0.1",
@@ -3087,7 +3103,7 @@ var FunnelGatewayServer = class {
 	constructor(deps) {
 		this.channels = deps.channels;
 		this.settings = deps.settings;
-		this.port = deps.port ?? DEFAULT_PORT;
+		this.port = deps.port ?? resolveFunnelPort();
 		this.hostname = deps.hostname ?? DEFAULT_HOST;
 		this.dbPath = deps.dbPath ?? defaultDbPath();
 		this.process = deps.process;
@@ -3857,10 +3873,9 @@ const usageHintForType = (type) => {
 //#endregion
 //#region lib/engine/mcp/channel-server.ts
 const DEFAULT_FUNNEL_DIR = join(homedir(), ".funnel");
-const DEFAULT_GATEWAY_BASE_URL = "http://localhost:9742";
 const startChannelServer = async (options = {}) => {
 	const dir = options.dir ?? DEFAULT_FUNNEL_DIR;
-	const gatewayBaseUrl = options.gatewayUrl ?? process.env.FUNNEL_GATEWAY_URL ?? DEFAULT_GATEWAY_BASE_URL;
+	const gatewayBaseUrl = options.gatewayUrl ?? process.env.FUNNEL_GATEWAY_URL ?? `http://localhost:${resolveFunnelPort()}`;
 	const gatewayWsUrl = `${gatewayBaseUrl.replace(/^http/, "ws")}/ws`;
 	const channelId = options.channelId ?? process.env.FUNNEL_CHANNEL_ID;
 	const channel = channelId ? readChannelConnectors(dir, channelId) : null;
@@ -5387,7 +5402,7 @@ Spawned as a detached background process so it keeps running after the terminal
 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)
+port: 9743 (CLI default; override via FUNNEL_PORT)
 pid:  ~/.funnel/gateway.pid
 log:  ${join(funnelTmpDir(), "gateway.log")}
 
@@ -5747,4 +5762,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_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, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };
+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 };

package/package.json

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