@mulmoclaude/core 1.9.0 → 1.11.0

package/dist/google/pushPlan.d.ts

@@ -4,7 +4,7 @@ import { ShadowEvent } from './calendarPushState.js';
  *  read-only, so a record column mapped to either is ignored here rather than
  *  rejected — the mapping was authored for the pull, and a push has no business
  *  invalidating it. */
-export declare const PUSHABLE_SOURCE_FIELDS: readonly ["summary", "start", "end", "colorId"];
+export declare const PUSHABLE_SOURCE_FIELDS: readonly ["summary", "start", "end", "colorId", "description", "location"];
 export type PushableSourceField = (typeof PUSHABLE_SOURCE_FIELDS)[number];
 /** The subset of a schema's `map` a push can act on: collection field → event field. */
 export declare function pushableMap(map: Record<string, string>): Record<string, PushableSourceField>;

package/dist/remote-host/health.d.ts

@@ -0,0 +1,13 @@
+export declare const RUNNER_HEALTH_STATES: readonly ["online", "reconnecting", "offline"];
+export type RunnerHealthState = (typeof RUNNER_HEALTH_STATES)[number];
+export interface RunnerHealth {
+    state: RunnerHealthState;
+    /** Last channel error seen, for the popover and the log. Null before the first one. */
+    lastError: string | null;
+    /** ms epoch of the last state change, so the UI can say how long it has been down. */
+    changedAt: number;
+}
+export declare const isRunnerHealthState: (value: unknown) => value is RunnerHealthState;
+/** Narrows a parsed HTTP payload. The client renders whatever this accepts, so a
+ *  half-shaped health has to read as "no health reported" rather than as a state. */
+export declare const isRunnerHealth: (value: unknown) => value is RunnerHealth;

package/dist/remote-host/index.cjs

@@ -1,31 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-let firebase_firestore = require("firebase/firestore");
-//#region src/remote-host/index.ts
-/** Widen a JSON-shaped handler payload to the channel's `JsonObject`.
-*
-*  Exists so the `Jsonify` reasoning above lives in ONE place. Before this,
-*  eight remote-host handlers each carried their own `as unknown as JsonObject`
-*  with the justification re-argued in eight slightly different comments —
-*  which is how a rule stops being reviewable. */
-var toJsonObject = (payload) => payload;
-var isExpired = (command, now) => typeof command.expiresAt === "number" && now >= command.expiresAt;
-var byCreatedAt = (left, right) => (left.createdAt ?? 0) - (right.createdAt ?? 0);
-var REMOTE_HOST_PROTOCOL_VERSION = 2;
-var buildHostPresence = (channel, handlers, online) => ({
-	online,
-	hostId: channel.hostId,
-	protocolVersion: 2,
-	capabilities: Object.keys(handlers)
-});
-var commandsCollection = (firestore, channel) => (0, firebase_firestore.collection)(firestore, "users", channel.uid, "hosts", channel.hostId, "commands");
-var hostDoc = (firestore, channel) => (0, firebase_firestore.doc)(firestore, "users", channel.uid, "hosts", channel.hostId);
-//#endregion
-exports.REMOTE_HOST_PROTOCOL_VERSION = REMOTE_HOST_PROTOCOL_VERSION;
-exports.buildHostPresence = buildHostPresence;
-exports.byCreatedAt = byCreatedAt;
-exports.commandsCollection = commandsCollection;
-exports.hostDoc = hostDoc;
-exports.isExpired = isExpired;
-exports.toJsonObject = toJsonObject;
-
-//# sourceMappingURL=index.cjs.map
+const require_remote_host = require("../remote-host-DkDVxNim.cjs");
+exports.REMOTE_HOST_PROTOCOL_VERSION = require_remote_host.REMOTE_HOST_PROTOCOL_VERSION;
+exports.RUNNER_HEALTH_STATES = require_remote_host.RUNNER_HEALTH_STATES;
+exports.buildHostPresence = require_remote_host.buildHostPresence;
+exports.byCreatedAt = require_remote_host.byCreatedAt;
+exports.commandsCollection = require_remote_host.commandsCollection;
+exports.hostDoc = require_remote_host.hostDoc;
+exports.isExpired = require_remote_host.isExpired;
+exports.isRunnerHealth = require_remote_host.isRunnerHealth;
+exports.isRunnerHealthState = require_remote_host.isRunnerHealthState;
+exports.toJsonObject = require_remote_host.toJsonObject;

package/dist/remote-host/index.d.ts

@@ -58,3 +58,5 @@ export interface HostPresence {
 export declare const buildHostPresence: (channel: Channel, handlers: CommandHandlers, online: boolean) => HostPresence;
 export declare const commandsCollection: (firestore: Firestore, channel: Channel) => CollectionReference<DocumentData>;
 export declare const hostDoc: (firestore: Firestore, channel: Channel) => DocumentReference<DocumentData>;
+export { RUNNER_HEALTH_STATES, isRunnerHealth, isRunnerHealthState } from './health.js';
+export type { RunnerHealth, RunnerHealthState } from './health.js';

package/dist/remote-host/index.js

@@ -1,24 +1,2 @@
-import { collection, doc } from "firebase/firestore";
-//#region src/remote-host/index.ts
-/** Widen a JSON-shaped handler payload to the channel's `JsonObject`.
-*
-*  Exists so the `Jsonify` reasoning above lives in ONE place. Before this,
-*  eight remote-host handlers each carried their own `as unknown as JsonObject`
-*  with the justification re-argued in eight slightly different comments —
-*  which is how a rule stops being reviewable. */
-var toJsonObject = (payload) => payload;
-var isExpired = (command, now) => typeof command.expiresAt === "number" && now >= command.expiresAt;
-var byCreatedAt = (left, right) => (left.createdAt ?? 0) - (right.createdAt ?? 0);
-var REMOTE_HOST_PROTOCOL_VERSION = 2;
-var buildHostPresence = (channel, handlers, online) => ({
-	online,
-	hostId: channel.hostId,
-	protocolVersion: 2,
-	capabilities: Object.keys(handlers)
-});
-var commandsCollection = (firestore, channel) => collection(firestore, "users", channel.uid, "hosts", channel.hostId, "commands");
-var hostDoc = (firestore, channel) => doc(firestore, "users", channel.uid, "hosts", channel.hostId);
-//#endregion
-export { REMOTE_HOST_PROTOCOL_VERSION, buildHostPresence, byCreatedAt, commandsCollection, hostDoc, isExpired, toJsonObject };
-
-//# sourceMappingURL=index.js.map
+import { a as hostDoc, c as RUNNER_HEALTH_STATES, i as commandsCollection, l as isRunnerHealth, n as buildHostPresence, o as isExpired, r as byCreatedAt, s as toJsonObject, t as REMOTE_HOST_PROTOCOL_VERSION, u as isRunnerHealthState } from "../remote-host-D_BRFHcI.js";
+export { REMOTE_HOST_PROTOCOL_VERSION, RUNNER_HEALTH_STATES, buildHostPresence, byCreatedAt, commandsCollection, hostDoc, isExpired, isRunnerHealth, isRunnerHealthState, toJsonObject };

package/dist/remote-host/server/index.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_dist = require("../../dist-pWpC-b04.cjs");
-const require_remote_host_index = require("../index.cjs");
+const require_remote_host = require("../../remote-host-DkDVxNim.cjs");
 let firebase_firestore = require("firebase/firestore");
 let firebase_auth = require("firebase/auth");
 let firebase_app = require("firebase/app");
@@ -63,7 +63,7 @@ var unexpectedPaths = (paths, expected = []) => paths.filter((path) => !expected
 //#endregion
 //#region src/remote-host/server/presenceBeat.ts
 var PRESENCE_STALE_BEATS = 3;
-var errorText = (error) => error instanceof Error ? error.message : String(error);
+var errorText$1 = (error) => error instanceof Error ? error.message : String(error);
 var notify = (report, onThrow) => {
 	try {
 		report();
@@ -75,7 +75,7 @@ var createPresenceBeat = (deps) => {
 	const now = deps.now ?? Date.now;
 	const state = { lastAckMs: now() };
 	const announce = (online) => {
-		const fail = (error) => notify(() => deps.onError(errorText(error)));
+		const fail = (error) => notify(() => deps.onError(errorText$1(error)));
 		const ack = () => notify(() => {
 			state.lastAckMs = now();
 		});
@@ -196,7 +196,7 @@ var expireCommand = async (ref, command, options, uid) => {
 };
 var processCommand = async (ctx, ref, command, now) => {
 	const { handlers, options } = ctx;
-	if (require_remote_host_index.isExpired(command, now)) {
+	if (require_remote_host.isExpired(command, now)) {
 		await expireCommand(ref, command, options, ctx.uid);
 		return;
 	}
@@ -223,7 +223,7 @@ var dispatchAddedCommands = (ctx, snapshot) => {
 	snapshot.docChanges().filter((change) => change.type === "added").map((change) => ({
 		ref: change.doc.ref,
 		command: change.doc.data()
-	})).sort((left, right) => require_remote_host_index.byCreatedAt(left.command, right.command)).forEach(({ ref, command }) => {
+	})).sort((left, right) => require_remote_host.byCreatedAt(left.command, right.command)).forEach(({ ref, command }) => {
 		processCommand(ctx, ref, command, now).catch(noop$2);
 	});
 };
@@ -276,7 +276,7 @@ var listenForCommands = (queuedCommands, ctx, goOffline) => {
 var heartbeatMs = (options) => options.heartbeatMs ?? 6e4;
 var presenceStaleAfterMs = (options = {}) => heartbeatMs(options) * 3;
 var buildPresenceBeat = (firestore, channel, handlers, options, onStale) => {
-	const presence = require_remote_host_index.hostDoc(firestore, channel);
+	const presence = require_remote_host.hostDoc(firestore, channel);
 	const report = (message) => options.onEvent?.({
 		phase: "error",
 		method: "presence",
@@ -284,7 +284,7 @@ var buildPresenceBeat = (firestore, channel, handlers, options, onStale) => {
 	});
 	return createPresenceBeat({
 		write: (online) => (0, firebase_firestore.setDoc)(presence, {
-			...require_remote_host_index.buildHostPresence(channel, handlers, online),
+			...require_remote_host.buildHostPresence(channel, handlers, online),
 			updatedAt: (0, firebase_firestore.serverTimestamp)()
 		}),
 		onError: (message) => report(`presence write failed: ${message}`),
@@ -317,7 +317,7 @@ var startHostRunner = (firestore, channel, handlers, options = {}) => {
 	}
 	presence.announce(true);
 	run.beat = setInterval(presence.beat, heartbeatMs(options));
-	run.stopListening = listenForCommands((0, firebase_firestore.query)(require_remote_host_index.commandsCollection(firestore, channel), (0, firebase_firestore.where)("status", "==", "queued")), {
+	run.stopListening = listenForCommands((0, firebase_firestore.query)(require_remote_host.commandsCollection(firestore, channel), (0, firebase_firestore.where)("status", "==", "queued")), {
 		firestore,
 		handlers,
 		options,
@@ -326,6 +326,215 @@ var startHostRunner = (firestore, channel, handlers, options = {}) => {
 	return () => shutDown(run, presence);
 };
 //#endregion
+//#region src/remote-host/server/resilientRunner.ts
+var ONE_SECOND_MS$1 = 1e3;
+var ONE_MINUTE_MS = 60 * ONE_SECOND_MS$1;
+var RECONNECT_BASE_MS = ONE_SECOND_MS$1;
+var RECONNECT_MAX_MS = ONE_MINUTE_MS;
+var SETTLE_MS = ONE_MINUTE_MS;
+var GIVE_UP_MS = 5 * ONE_MINUTE_MS;
+var PROBE_INTERVAL_MS = 90 * ONE_SECOND_MS$1;
+var reconnectDelayMs = (attempt) => Math.min(RECONNECT_MAX_MS, RECONNECT_BASE_MS * 2 ** attempt);
+var errorText = (error) => error instanceof Error ? error.message : String(error);
+var scheduleWithTimeout = (task, delayMs) => {
+	const timer = setTimeout(task, delayMs);
+	return () => clearTimeout(timer);
+};
+var setState = (ctx, next) => {
+	ctx.state = next;
+	try {
+		ctx.deps.onHealth?.({
+			state: next,
+			lastError: ctx.lastError,
+			changedAt: ctx.now()
+		});
+	} catch (error) {
+		ctx.deps.log.warn(`host runner health observer threw: ${errorText(error)}`);
+	}
+};
+var clearTimer = (ctx) => {
+	ctx.cancelTimer?.();
+	ctx.cancelTimer = null;
+};
+var clearProbe = (ctx) => {
+	ctx.cancelProbe?.();
+	ctx.cancelProbe = null;
+};
+function scheduleProbe(ctx) {
+	if (ctx.stopped || !ctx.deps.checkAlive) return;
+	clearProbe(ctx);
+	ctx.cancelProbe = ctx.schedule(() => void runProbe(ctx), PROBE_INTERVAL_MS);
+}
+var STALE_REASON = "presence went stale — the phone can no longer see this host";
+async function askAlive(ctx) {
+	try {
+		return {
+			alive: await ctx.deps.checkAlive?.() ?? null,
+			reason: STALE_REASON
+		};
+	} catch (error) {
+		return {
+			alive: false,
+			reason: `presence probe failed: ${errorText(error)}`
+		};
+	}
+}
+async function runProbe(ctx) {
+	ctx.cancelProbe = null;
+	if (ctx.stopped || ctx.state !== "online") return;
+	const answer = await askAlive(ctx);
+	if (ctx.stopped || ctx.state !== "online") return;
+	if (answer.alive === false) {
+		ctx.lastError = answer.reason;
+		ctx.deps.log.warn(`host runner ${answer.reason}`);
+		onUnderlyingClosed(ctx);
+		return;
+	}
+	scheduleProbe(ctx);
+}
+var releaseUnderlying = (ctx) => {
+	const stop = ctx.stopUnderlying;
+	ctx.stopUnderlying = null;
+	try {
+		stop?.();
+	} catch (error) {
+		ctx.deps.log.warn(`host runner teardown failed: ${errorText(error)}`);
+	}
+};
+var markRecovered = (ctx) => {
+	ctx.downSinceMs = null;
+	ctx.attempt = 0;
+	ctx.lastError = null;
+	if (ctx.state === "online") return;
+	ctx.deps.log.info("host runner re-subscribed");
+	setState(ctx, "online");
+	scheduleProbe(ctx);
+};
+async function settle(ctx) {
+	ctx.cancelTimer = null;
+	if (ctx.stopped) return;
+	const answer = await askAlive(ctx);
+	if (ctx.stopped) return;
+	if (answer.alive === false) {
+		ctx.lastError = answer.reason;
+		ctx.deps.log.warn(`host runner is up but still unreachable — ${answer.reason}`);
+		onUnderlyingClosed(ctx);
+		return;
+	}
+	markRecovered(ctx);
+}
+var giveUp = (ctx) => {
+	ctx.stopped = true;
+	clearProbe(ctx);
+	ctx.deps.log.warn(`host runner stayed down for ${Math.round(GIVE_UP_MS / ONE_SECOND_MS$1)}s, giving up (${ctx.lastError ?? "no error reported"})`);
+	setState(ctx, "offline");
+	ctx.deps.options.onClosed?.();
+};
+function scheduleRelaunch(ctx) {
+	const delayMs = reconnectDelayMs(ctx.attempt);
+	ctx.attempt += 1;
+	ctx.deps.log.warn(`host runner closed (${ctx.lastError ?? "no error reported"}); re-subscribing in ${Math.round(delayMs / ONE_SECOND_MS$1)}s`);
+	if (ctx.state !== "reconnecting") setState(ctx, "reconnecting");
+	ctx.cancelTimer = ctx.schedule(() => launch(ctx), delayMs);
+}
+function onUnderlyingClosed(ctx) {
+	if (ctx.stopped) return;
+	releaseUnderlying(ctx);
+	clearTimer(ctx);
+	clearProbe(ctx);
+	ctx.downSinceMs ??= ctx.now();
+	if (ctx.now() - ctx.downSinceMs >= GIVE_UP_MS) giveUp(ctx);
+	else scheduleRelaunch(ctx);
+}
+var CHANNEL_METHODS = /* @__PURE__ */ new Set(["listen", "presence"]);
+var runnerOptions = (ctx) => ({
+	...ctx.deps.options,
+	onEvent: (event) => {
+		if (event.phase === "error") {
+			const text = `${event.method}: ${event.message ?? "no detail"}`;
+			if (CHANNEL_METHODS.has(event.method)) ctx.lastError = text;
+			ctx.deps.log.warn(`host runner event error — ${text}`);
+		}
+		ctx.deps.options.onEvent?.(event);
+	},
+	onClosed: () => onUnderlyingClosed(ctx)
+});
+function launch(ctx) {
+	ctx.cancelTimer = null;
+	if (ctx.stopped) return;
+	try {
+		ctx.stopUnderlying = ctx.deps.start(runnerOptions(ctx));
+	} catch (error) {
+		ctx.lastError = errorText(error);
+		onUnderlyingClosed(ctx);
+		return;
+	}
+	ctx.cancelTimer = ctx.schedule(() => void settle(ctx), SETTLE_MS);
+}
+function startResilientHostRunner(deps) {
+	const ctx = {
+		deps,
+		schedule: deps.schedule ?? scheduleWithTimeout,
+		now: deps.now ?? Date.now,
+		stopUnderlying: null,
+		cancelTimer: null,
+		attempt: 0,
+		downSinceMs: null,
+		lastError: null,
+		state: "online",
+		stopped: false,
+		cancelProbe: null
+	};
+	setState(ctx, "online");
+	launch(ctx);
+	scheduleProbe(ctx);
+	return () => {
+		ctx.stopped = true;
+		clearTimer(ctx);
+		clearProbe(ctx);
+		releaseUnderlying(ctx);
+	};
+}
+//#endregion
+//#region src/remote-host/server/presenceProbe.ts
+var ONE_SECOND_MS = 1e3;
+var PRESENCE_STALE_MS = presenceStaleAfterMs();
+var PROBE_TIMEOUT_MS = 30 * ONE_SECOND_MS;
+var hasToMillis = (value) => "toMillis" in value && typeof Reflect.get(value, "toMillis") === "function";
+var asMillis = (value) => {
+	if (typeof value === "number") return value;
+	if (typeof value === "object" && value !== null && hasToMillis(value)) return value.toMillis();
+	return null;
+};
+/** Judge a presence document that was read successfully. Exported for its own test:
+*  the freshness rule is the part worth pinning, and it needs no Firestore. */
+var presenceIsFresh = (data, now, staleAfterMs = PRESENCE_STALE_MS) => {
+	if (!data) return null;
+	const updatedAt = asMillis(data.updatedAt);
+	if (updatedAt === null) return null;
+	if (data.online === false) return null;
+	return now - updatedAt < staleAfterMs;
+};
+/** Reject once `timeoutMs` has passed, so a stalled read answers instead of hanging. */
+var withTimeout = async (work, timeoutMs) => {
+	const timer = { handle: null };
+	const deadline = new Promise((_, reject) => {
+		timer.handle = setTimeout(() => reject(/* @__PURE__ */ new Error(`presence read did not answer within ${Math.round(timeoutMs / ONE_SECOND_MS)}s`)), timeoutMs);
+	});
+	try {
+		return await Promise.race([work, deadline]);
+	} finally {
+		if (timer.handle) clearTimeout(timer.handle);
+	}
+};
+/** Reads the host's own presence document from the server and reports whether it is fresh. */
+var createPresenceProbe = (deps) => {
+	const now = deps.now ?? Date.now;
+	return async () => {
+		return presenceIsFresh((await withTimeout((0, firebase_firestore.getDocFromServer)(require_remote_host.hostDoc(deps.firestore(), deps.channel)), deps.timeoutMs ?? PROBE_TIMEOUT_MS)).data(), now(), deps.staleAfterMs ?? PRESENCE_STALE_MS);
+	};
+};
+//#endregion
 //#region src/remote-host/server/lifecycle.ts
 var noop$1 = () => void 0;
 var silentLogger = {
@@ -559,16 +768,22 @@ var createRemoteHostSession = (config) => {
 exports.DEFAULT_HEARTBEAT_MS = DEFAULT_HEARTBEAT_MS;
 exports.LISTEN_RETRY_WINDOW_MS = LISTEN_RETRY_WINDOW_MS;
 exports.PRESENCE_STALE_BEATS = PRESENCE_STALE_BEATS;
+exports.PRESENCE_STALE_MS = PRESENCE_STALE_MS;
 exports.createHostSessionPersistence = createHostSessionPersistence;
+exports.createPresenceProbe = createPresenceProbe;
 exports.createRemoteHost = createRemoteHost;
 exports.createRemoteHostAuth = createRemoteHostAuth;
 exports.createRemoteHostFirebase = createRemoteHostFirebase;
 exports.createRemoteHostSession = createRemoteHostSession;
 exports.isSeedableBlob = isSeedableBlob;
+exports.presenceIsFresh = presenceIsFresh;
 exports.presenceStaleAfterMs = presenceStaleAfterMs;
+exports.reconnectDelayMs = reconnectDelayMs;
 exports.startHostRunner = startHostRunner;
+exports.startResilientHostRunner = startResilientHostRunner;
 exports.stripUndefined = stripUndefined;
 exports.undefinedPaths = undefinedPaths;
 exports.unexpectedPaths = unexpectedPaths;
+exports.withTimeout = withTimeout;
 
 //# sourceMappingURL=index.cjs.map