@interactive-inc/claude-funnel 0.66.0 → 0.68.0

package/dist/{slot-fields-D-pvMgTK.js → slot-fields-eCWizJqS.js}

@@ -1,6 +1,6 @@
-import { t as errorMessageOf } from "./error-message-of-ColuYmAk.js";
-import { t as FunnelConnectorListener } from "./connector-listener-mPGZYa8e.js";
-import { t as FunnelConnectorDiagnosticsRecorder } from "./connector-diagnostics-recorder-COtNEmUp.js";
+import { t as errorMessageOf } from "./error-message-of-BG4ezZ_s.js";
+import { t as FunnelConnectorListener } from "./connector-listener-BcQMzY6Q.js";
+import { t as FunnelConnectorDiagnosticsRecorder } from "./connector-diagnostics-recorder-BmOijU1p.js";
 import { Flume, createFlumeDefaultDeps } from "@interactive-inc/flume";
 //#region lib/engine/connectors/flume-deps.ts
 /**
@@ -46,7 +46,7 @@ const flumeLogHandler = (logger) => {
 	};
 };
 const buildMeta = (log) => {
-	const meta = { ...log.detail ?? {} };
+	const meta = { ...log.detail };
 	if (log.error) {
 		meta.error = log.error.message;
 		if (log.error.stack) meta.stack = log.error.stack;

package/dist/{sqlite-diagnostic-log-CwhXE9Qh.js → sqlite-diagnostic-log-Qs4cf9I_.js}

@@ -1,15 +1,15 @@
-import { n as gatewayLoopbackUrl, t as loopbackFetch } from "./loopback-fetch-CVNuN3YZ.js";
-import { t as NodeFunnelFileSystem } from "./node-file-system-BOXIHW_Q.js";
-import { t as NodeFunnelProcessRunner } from "./node-process-runner-DxTvycoK.js";
-import { n as FUNNEL_DIR, s as resolveFunnelPort } from "./settings-store-ccv291GV.js";
-import { t as FunnelAuthFailedError } from "./funnel-error-0t1MK1R6.js";
-import { t as ConnectorDiagnosticSqlReader } from "./diagnostic-sql-reader-oXZnWFf_.js";
-import { t as FunnelLogSqliteSink } from "./funnel-log-sqlite-sink-DLYkY0pZ.js";
+import { n as gatewayLoopbackUrl, t as loopbackFetch } from "./loopback-fetch-HP-bo9Kv.js";
+import { t as NodeFunnelFileSystem } from "./node-file-system-xJx7dymE.js";
+import { t as NodeFunnelProcessRunner } from "./node-process-runner-D4rzPl8Q.js";
+import { n as FUNNEL_DIR, s as resolveFunnelPort } from "./settings-store-ZFWBhOnp.js";
+import { t as FunnelAuthFailedError } from "./funnel-error-DoSBCogD.js";
+import { n as diagnosticEventOfProcessed, t as diagnosticConnectionEventOf } from "./diagnostic-event-CxMM5Bl2.js";
+import { t as SqliteEventLog } from "./sqlite-event-log-eZuXKszJ.js";
 import { dirname, join } from "node:path";
 import { chmodSync, existsSync, mkdirSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { z } from "zod";
-import { timingSafeEqual } from "node:crypto";
+import { createHash, randomUUID, timingSafeEqual } from "node:crypto";
 import { createFactory } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
 import { zValidator } from "@hono/zod-validator";
@@ -128,6 +128,7 @@ var ConnectorDiagnosticLog = class {};
 * rejecting a malformed payload.
 */
 var MemoryConnectorDiagnosticLog = class extends ConnectorDiagnosticLog {
+	now;
 	raws = [];
 	processeds = [];
 	connections = [];
@@ -158,21 +159,31 @@ var MemoryConnectorDiagnosticLog = class extends ConnectorDiagnosticLog {
 		});
 	}
 	queryRaw(query) {
-		return takeRecent(this.raws.filter((event) => matches(event, query)), query.limit);
+		const matched = this.raws.filter((event) => {
+			if (!matches(event, query)) return false;
+			if (query.eventId !== void 0 && event.eventId !== query.eventId) return false;
+			return true;
+		});
+		return takeRecent(matched, query.limit);
 	}
 	queryProcessed(query) {
-		return takeRecent(this.processeds.filter((event) => {
+		const matched = this.processeds.filter((event) => {
 			if (!matches(event, query)) return false;
+			if (query.eventId !== void 0 && event.eventId !== query.eventId) return false;
 			if (query.outcome !== void 0 && event.outcome !== query.outcome) return false;
+			if (query.outcomePrefix !== void 0 && !event.outcome.startsWith(query.outcomePrefix)) return false;
 			return true;
-		}), query.limit);
+		});
+		return takeRecent(matched, query.limit);
 	}
 	queryConnection(query) {
-		return takeRecent(this.connections.filter((event) => {
+		const matched = this.connections.filter((event) => {
 			if (!matches(event, query)) return false;
 			if (query.status !== void 0 && event.status !== query.status) return false;
+			if (query.statuses !== void 0 && !query.statuses.includes(event.status)) return false;
 			return true;
-		}), query.limit);
+		});
+		return takeRecent(matched, query.limit);
 	}
 	clear() {
 		this.raws.length = 0;
@@ -185,6 +196,7 @@ const matches = (event, query) => {
 	if (query.type !== void 0 && event.type !== query.type) return false;
 	if (query.connectorId !== void 0 && event.connectorId !== query.connectorId) return false;
 	if (query.channelId !== void 0 && event.channelId !== query.channelId) return false;
+	if ("seq" in event && query.seq !== void 0 && event.seq !== query.seq) return false;
 	return true;
 };
 const takeRecent = (events, limit) => {
@@ -279,7 +291,8 @@ var FunnelChannelPublisher = class {
 */
 const requireBearerToken = (deps) => {
 	return async (c, next) => {
-		if (!constantTimeEqual((c.req.header("authorization") ?? "").match(/^Bearer\s+(.+)$/i)?.[1] ?? "", deps.expected)) return c.text("unauthorized", 401);
+		const presented = (c.req.header("authorization") ?? "").match(/^Bearer\s+(.+)$/i)?.[1] ?? "";
+		if (!constantTimeEqual(presented, deps.expected)) return c.text("unauthorized", 401);
 		return await next();
 	};
 };
@@ -447,7 +460,6 @@ var FunnelBroadcaster = class {
 			offset: this.latestOffset
 		};
 		const payload = JSON.stringify(event);
-		meta?.connector;
 		this.eventsBroadcast += 1;
 		this.lastBroadcastAt = this.now();
 		if (this.replayBufferSize > 0) {
@@ -574,7 +586,7 @@ var SqliteFunnelEventLog = class extends FunnelEventLog {
 		this.now = props.now ?? (() => Date.now());
 		this.logger = props.logger;
 		this.onError = props.onError;
-		this.sink = new FunnelLogSqliteSink({
+		this.sink = new SqliteEventLog({
 			path: props.path,
 			indexes: ["channel_id", "connector_id"],
 			extractIndexes: (event) => ({
@@ -626,7 +638,10 @@ var SqliteFunnelEventLog = class extends FunnelEventLog {
 	* so this returns the full slice and lets the caller filter.
 	*/
 	loadSince(since) {
-		const records = this.sink.query({ sinceSeq: since });
+		const records = this.sink.query({
+			sinceSeq: since,
+			limit: Number.MAX_SAFE_INTEGER
+		});
 		const out = [];
 		for (const record of records) out.push({
 			content: record.event.content,
@@ -885,7 +900,7 @@ var FunnelListenerRegistry = class FunnelListenerRegistry {
 	async stopAll() {
 		this.stopHealthCheck();
 		this.pendingRetry.clear();
-		for (const [, entry] of [...this.running.entries()]) await this.stop(entry.channelName, entry.config.name);
+		for (const [, entry] of this.running.entries()) await this.stop(entry.channelName, entry.config.name);
 	}
 	ensureStats(key) {
 		const existing = this.stats.get(key);
@@ -932,7 +947,7 @@ var FunnelListenerRegistry = class FunnelListenerRegistry {
 		this.healthCheckInFlight = true;
 		try {
 			const dead = [];
-			for (const [key, entry] of [...this.running.entries()]) {
+			for (const [key, entry] of this.running.entries()) {
 				if (entry.listener.isAlive()) {
 					this.failureCounts.delete(key);
 					continue;
@@ -945,7 +960,7 @@ var FunnelListenerRegistry = class FunnelListenerRegistry {
 			}
 			await Promise.all(dead.map((target) => this.recoverDead(target.channelName, target.connectorName, target.type)));
 			const retries = [];
-			for (const [key, pending] of [...this.pendingRetry.entries()]) {
+			for (const [key, pending] of this.pendingRetry.entries()) {
 				if (this.running.has(key)) {
 					this.pendingRetry.delete(key);
 					continue;
@@ -1181,19 +1196,6 @@ const channelsPublishHandler = factory.createHandlers(zParam(z.object({ channel:
 });
 //#endregion
 //#region lib/gateway/routes/debug.ts
-const extractPreview = (payload) => {
-	if (typeof payload !== "string" || payload.length === 0) return null;
-	try {
-		const parsed = JSON.parse(payload);
-		if (parsed !== null && typeof parsed === "object" && "text" in parsed) {
-			const text = String(parsed.text);
-			return text.length > 80 ? `${text.slice(0, 80)}…` : text;
-		}
-	} catch {
-		return payload.length > 80 ? `${payload.slice(0, 80)}…` : payload;
-	}
-	return payload.length > 80 ? `${payload.slice(0, 80)}…` : payload;
-};
 const buildChannelDiagnosis = (channel) => {
 	const rootCause = (channel.connectionErrors[channel.connectionErrors.length - 1] ?? null)?.detail ?? null;
 	if (channel.connectors.length === 0) return {
@@ -1242,11 +1244,6 @@ const debugHandler = factory.createHandlers(async (c) => {
 	const gatewayListeners = deps.registry.list();
 	const gatewayClients = deps.broadcaster.listChannels();
 	const metrics = deps.broadcaster.getMetrics();
-	const tmpDir = funnelTmpDir();
-	const rawPath = join(tmpDir, "connector-raw.db");
-	const processedPath = join(tmpDir, "connector-processed.db");
-	const connectionPath = join(tmpDir, "connector-connection.db");
-	const hasStore = existsSync(rawPath) && existsSync(processedPath) && existsSync(connectionPath);
 	const channels = targetChannels.map((ch) => {
 		const listenerEntry = gatewayListeners.find((l) => l.channelName === ch.name) ?? null;
 		const listener = listenerEntry ? {
@@ -1256,61 +1253,30 @@ const debugHandler = factory.createHandlers(async (c) => {
 			lastEventAt: listenerEntry.lastEventAt
 		} : null;
 		const claudeClients = gatewayClients.filter((cl) => cl.channel === ch.id || cl.channel === ch.name).length;
-		const recentEvents = [];
-		const connectionErrors = [];
-		if (hasStore) {
-			const reader = new ConnectorDiagnosticSqlReader({
-				rawPath,
-				processedPath,
-				connectionPath
-			});
-			const rows = (() => {
-				try {
-					return reader.query("SELECT seq, ts, type, outcome, payload FROM processed WHERE channel_id = ? ORDER BY seq DESC LIMIT 10", [ch.id]);
-				} finally {
-					reader.close();
-				}
-			})();
-			if (!(rows instanceof Error)) for (const row of [...rows].reverse()) {
-				const rawPayload = typeof row.payload === "string" ? row.payload : null;
-				let payloadParsed = null;
-				if (rawPayload) try {
-					const parsed = JSON.parse(rawPayload);
-					if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)) payloadParsed = parsed;
-				} catch {
-					payloadParsed = null;
-				}
-				recentEvents.push({
-					seq: typeof row.seq === "number" ? row.seq : null,
-					ts: typeof row.ts === "number" ? row.ts : null,
-					type: typeof row.type === "string" ? row.type : "?",
-					outcome: typeof row.outcome === "string" ? row.outcome : "?",
-					payload: rawPayload,
-					payloadParsed,
-					preview: extractPreview(row.payload)
-				});
+		const recentEvents = (() => {
+			if (!deps.diagnosticLog) return [];
+			try {
+				return deps.diagnosticLog.queryProcessed({
+					channelId: ch.id,
+					limit: 10
+				}).map(diagnosticEventOfProcessed);
+			} catch {
+				return [];
 			}
-			if (listener && (!listener.alive || listener.errors > 0) || !listener) {
-				const errReader = new ConnectorDiagnosticSqlReader({
-					rawPath,
-					processedPath,
-					connectionPath
-				});
-				const errRows = (() => {
-					try {
-						return errReader.query("SELECT ts, type, status, detail FROM connection WHERE channel_id = ? AND status IN ('auth-failed','error') ORDER BY seq DESC LIMIT 3", [ch.id]);
-					} finally {
-						errReader.close();
-					}
-				})();
-				if (!(errRows instanceof Error)) for (const row of [...errRows].reverse()) connectionErrors.push({
-					ts: typeof row.ts === "number" ? row.ts : null,
-					type: typeof row.type === "string" ? row.type : "?",
-					status: typeof row.status === "string" ? row.status : "?",
-					detail: typeof row.detail === "string" && row.detail.length > 0 ? row.detail : null
-				});
+		})();
+		const needsConnErrors = listener && (!listener.alive || listener.errors > 0) || !listener;
+		const connectionErrors = (() => {
+			if (!needsConnErrors || !deps.diagnosticLog) return [];
+			try {
+				return deps.diagnosticLog.queryConnection({
+					channelId: ch.id,
+					statuses: ["auth-failed", "error"],
+					limit: 3
+				}).map(diagnosticConnectionEventOf);
+			} catch {
+				return [];
 			}
-		}
+		})();
 		const base = {
 			id: ch.id,
 			name: ch.name,
@@ -1410,15 +1376,26 @@ function buildGatewayRoutes() {
 }
 const gatewayRoutes = buildGatewayRoutes();
 //#endregion
+//#region lib/gateway/default-event-db-path.ts
+/**
+* Gives each durable gateway endpoint its own replay database. Port zero is
+* ephemeral, so each construction receives a fresh scope instead of pretending
+* that replay can survive a restart onto a different assigned port.
+*/
+function defaultEventDbPath(props) {
+	const endpoint = props.port === 0 ? randomUUID() : String(props.port);
+	const scope = createHash("sha256").update(`${props.funnelDir}\0${endpoint}`).digest("hex").slice(0, 20);
+	return join(props.tmpDir, "events", `${scope}.db`);
+}
+//#endregion
 //#region lib/gateway/gateway-server.ts
 const DEFAULT_HOST = "127.0.0.1";
-const LOOPBACK_HOSTS = new Set([
+const LOOPBACK_HOSTS = /* @__PURE__ */ new Set([
 	"127.0.0.1",
 	"localhost",
 	"::1",
 	"::ffff:127.0.0.1"
 ]);
-const defaultDbPath = () => join(funnelTmpDir(), "events.db");
 const defaultOnError = () => {};
 /**
 * In-process gateway: runs `Bun.serve` (HTTP + WebSocket /ws), boots connector
@@ -1449,6 +1426,7 @@ var FunnelGatewayServer = class {
 	nowMs;
 	extraRoutes;
 	ownsEventLog;
+	diagnosticLog;
 	startedAt = null;
 	server = null;
 	disposed = false;
@@ -1456,16 +1434,21 @@ var FunnelGatewayServer = class {
 		this.channels = deps.channels;
 		this.configuredPort = deps.port ?? resolveFunnelPort();
 		this.configuredHostname = deps.hostname ?? DEFAULT_HOST;
-		this.dbPath = deps.dbPath ?? defaultDbPath();
+		this.dir = deps.dir ?? FUNNEL_DIR;
+		this.dbPath = deps.dbPath ?? defaultEventDbPath({
+			tmpDir: deps.tmpDir ?? funnelTmpDir(),
+			funnelDir: this.dir,
+			port: this.configuredPort
+		});
 		this.process = deps.process;
 		this.logger = deps.logger;
 		this.onError = deps.onError ?? defaultOnError;
 		this.selfPid = deps.selfPid ?? globalThis.process.pid;
-		this.dir = deps.dir ?? FUNNEL_DIR;
 		this.killCompetingSlack = deps.killCompetingSlack ?? true;
 		this.token = deps.token ?? "";
 		this.allowInsecureHost = deps.allowInsecureHost ?? false;
 		this.extraRoutes = deps.extraRoutes ?? null;
+		this.diagnosticLog = deps.diagnosticLog;
 		const clock = deps.clock;
 		this.nowMs = clock ? () => clock.millis() : () => Date.now();
 		if (deps.eventLog) {
@@ -1658,7 +1641,8 @@ var FunnelGatewayServer = class {
 				registry: this.registry,
 				channels: this.channels,
 				uptimeMs: () => this.startedAt ? this.nowMs() - this.startedAt : 0,
-				emit: (input) => this.emit(input)
+				emit: (input) => this.emit(input),
+				diagnosticLog: this.diagnosticLog
 			});
 			return next();
 		});
@@ -1923,7 +1907,7 @@ var SqliteConnectorDiagnosticLog = class extends ConnectorDiagnosticLog {
 			...ageCap,
 			...rawMax !== void 0 ? { maxRows: rawMax } : {}
 		};
-		this.raw = new FunnelLogSqliteSink({
+		this.raw = new SqliteEventLog({
 			path: props.rawPath,
 			indexes: [
 				"event_id",
@@ -1937,7 +1921,7 @@ var SqliteConnectorDiagnosticLog = class extends ConnectorDiagnosticLog {
 			}),
 			...rawCap
 		});
-		this.processed = new FunnelLogSqliteSink({
+		this.processed = new SqliteEventLog({
 			path: props.processedPath,
 			indexes: [
 				"event_id",
@@ -1953,7 +1937,7 @@ var SqliteConnectorDiagnosticLog = class extends ConnectorDiagnosticLog {
 			}),
 			...verdictCap
 		});
-		this.connection = new FunnelLogSqliteSink({
+		this.connection = new SqliteEventLog({
 			path: props.connectionPath,
 			indexes: [
 				"connector_id",
@@ -2019,10 +2003,13 @@ var SqliteConnectorDiagnosticLog = class extends ConnectorDiagnosticLog {
 		});
 	}
 	queryRaw(query) {
+		const where = buildWhere(query);
+		if (query.eventId !== void 0) where.event_id = query.eventId;
 		return this.raw.query({
 			...query.type !== void 0 ? { type: query.type } : {},
+			...query.seq !== void 0 ? { seq: query.seq } : {},
 			...query.limit !== void 0 ? { limit: query.limit } : {},
-			where: buildWhere(query),
+			where,
 			order: "desc"
 		}).map((record) => ({
 			seq: record.seq,
@@ -2036,11 +2023,14 @@ var SqliteConnectorDiagnosticLog = class extends ConnectorDiagnosticLog {
 	}
 	queryProcessed(query) {
 		const where = buildWhere(query);
+		if (query.eventId !== void 0) where.event_id = query.eventId;
 		if (query.outcome !== void 0) where.outcome = query.outcome;
 		return this.processed.query({
 			...query.type !== void 0 ? { type: query.type } : {},
+			...query.seq !== void 0 ? { seq: query.seq } : {},
 			...query.limit !== void 0 ? { limit: query.limit } : {},
 			where,
+			...query.outcomePrefix !== void 0 ? { wherePrefix: { outcome: query.outcomePrefix } } : {},
 			order: "desc"
 		}).map((record) => ({
 			seq: record.seq,
@@ -2058,8 +2048,10 @@ var SqliteConnectorDiagnosticLog = class extends ConnectorDiagnosticLog {
 		if (query.status !== void 0) where.status = query.status;
 		return this.connection.query({
 			...query.type !== void 0 ? { type: query.type } : {},
+			...query.seq !== void 0 ? { seq: query.seq } : {},
 			...query.limit !== void 0 ? { limit: query.limit } : {},
 			where,
+			...query.statuses !== void 0 ? { whereIn: { status: query.statuses } } : {},
 			order: "desc"
 		}).map((record) => ({
 			seq: record.seq,