dsh-fast 0.2.12 → 0.2.14

package/lib/index.js

@@ -202,20 +202,39 @@ const SPILL_NOTICE_MARKERS = ["Full", "stored at:"];
 * surface order. 0.1.5-alpha.1 derives the prompt from surface node 0; an empty
 * node is dormant and never restores older text. Mirrors
 * `SystemPromptProjection` in the host agent loop.
-* @param session - the session to read.
+* @param surfaceEvents - the current surface events in model-history order
+*   (from the optional `sessionQuery` service, or {@link surfaceEventsOf}).
 * @returns the effective system message, or undefined when none is active.
 */
-function effectiveSystemMessage(session) {
+function effectiveSystemMessage(surfaceEvents) {
 	let effective;
-	for (const seq of session.surface.nodes) {
-		const event = session.eventAt(seq);
-		if (event?.type !== "system/message") continue;
+	for (const event of surfaceEvents) {
+		if (event.type !== "system/message") continue;
 		const message = event.data.message;
 		if (message.content.length === 0) continue;
 		effective = message;
 	}
 	return effective;
 }
+/**
+* The current surface events of a live session, resolved from one snapshot of
+* the accepted log. This is the fallback read for hosts that compose no
+* `sessionQuery` service: it replaces the deprecated `Session.eventAt(seq)`
+* accessor (new calls are prohibited) while keeping the same surface-node
+* order and the same log as the source of truth.
+* @param session - the session to read.
+* @returns the surface events in model-history order.
+*/
+function surfaceEventsOf(session) {
+	const bySeq = /* @__PURE__ */ new Map();
+	for (const event of session.snapshotEvents()) bySeq.set(event.seq, event);
+	const events = [];
+	for (const seq of session.surface.nodes) {
+		const event = bySeq.get(seq);
+		if (event !== void 0) events.push(event);
+	}
+	return events;
+}
 /** The display/durable text of a system message (text blocks plus structural JSON). */
 function systemTextOf(message) {
 	let text = "";
@@ -350,13 +369,15 @@ var FastCollector = class {
 	* @param sections - optional named system-prompt sections (from the optional
 	*   `systemPrompt` service); absent = the whole rendered system prompt is
 	*   attributed to the `other` bucket.
+	* @param surfaceEvents - optional pre-read surface events (the async
+	*   `sessionQuery` read path); absent = the sync fallback read.
 	* @returns the snapshot.
 	*/
-	snapshot(session, measure, sections) {
+	snapshot(session, measure, sections, surfaceEvents) {
 		const state = this.live.get(session);
 		if (state === void 0) return emptySnapshot();
 		const measurement = measure === void 0 ? void 0 : measure(session);
-		const systemMessage = effectiveSystemMessage(session);
+		const systemMessage = effectiveSystemMessage(surfaceEvents ?? surfaceEventsOf(session));
 		const legacySystem = systemMessage === void 0 ? legacySystemText(state.lastHeader) : void 0;
 		const systemTokens = systemMessage === void 0 ? estimateLegacySystemTokens(legacySystem) : estimateSystemTokens(systemMessage);
 		const toolSchemaTokens = estimateToolsTokens(state.lastHeader);
@@ -745,9 +766,25 @@ function appendSample(history, sample, maxSamples) {
 	return { samples: [...history?.samples ?? [], sample].slice(-maxSamples) };
 }
 //#endregion
+//#region src/notices.ts
+/**
+* Build a {@link OnceNotifier} that forwards the first message per key to the
+* sink and swallows every later one.
+* @param sink - where the first message per key goes (typically `logger.warn`).
+* @returns the notifier.
+*/
+function createOnceNotifier(sink) {
+	const seen = /* @__PURE__ */ new Set();
+	return (key, message) => {
+		if (seen.has(key)) return;
+		seen.add(key);
+		sink(message);
+	};
+}
+//#endregion
 //#region src/version.ts
 /** Single-source plugin version, bumped by `scripts/release.mjs`. @module dsh-fast/version */
-const VERSION = "0.2.12";
+const VERSION = "0.2.14";
 //#endregion
 //#region src/index.ts
 const name = "fast";
@@ -772,11 +809,37 @@ async function apply(ctx, config = {}) {
 	}
 	const collector = new FastCollector(resolved);
 	const domain = await ctx.storageDomain.open(fastDomainSpec);
+	if (ctx.fiber.uid === null) {
+		await domain.close();
+		return;
+	}
 	const sessions = domain.table("sessions");
+	/**
+	* One-time visible degradation notices: a subsystem fallback that used to be
+	* silent now says so once per process, so a report built from heuristics is
+	* never mistaken for a measured one.
+	*/
+	const warnFallbackOnce = createOnceNotifier((message) => logger.warn(message));
+	/** The optional metrics outlet; a no-op when the service is absent or throws. */
+	const inspector = ctx.get("inspector");
+	const publishSnapshot = (session, snapshot) => {
+		if (inspector === void 0 || typeof inspector.publish !== "function") return;
+		try {
+			inspector.publish("dsh-fast/snapshot", {
+				sessionId: session.id,
+				snapshot
+			});
+		} catch (error) {
+			warnFallbackOnce("inspector", `inspector metric outlet failed, continuing with the report surfaces only: ${error instanceof Error ? error.message : String(error)}`);
+		}
+	};
 	/** Lazy, contained lookup of the optional token meter. */
 	const measure = (session) => {
 		const meter = ctx.get("tokenMeter");
-		if (meter === void 0) return void 0;
+		if (meter === void 0) {
+			warnFallbackOnce("tokenMeter", "tokenMeter is not composed: total/surface tokens fall back to the fixed-density heuristic (spill and compaction counters stay exact)");
+			return;
+		}
 		try {
 			const measurement = meter.measure(session);
 			return {
@@ -791,7 +854,10 @@ async function apply(ctx, config = {}) {
 	/** Assemble the named system-prompt sections for the per-section breakdown. */
 	const assembleSections = async () => {
 		const systemPrompt = ctx.get("systemPrompt");
-		if (systemPrompt === void 0) return void 0;
+		if (systemPrompt === void 0) {
+			warnFallbackOnce("systemPrompt", "systemPrompt is not composed: the whole rendered prompt is attributed to the \"other\" bucket instead of the per-section breakdown");
+			return;
+		}
 		try {
 			return (await systemPrompt.assemble()).sections.map((section) => ({
 				name: section.name,
@@ -802,9 +868,30 @@ async function apply(ctx, config = {}) {
 			return;
 		}
 	};
+	/**
+	* Read the current surface events for one session through the optional
+	* `sessionQuery` service. This replaces the deprecated synchronous
+	* `Session.eventAt(seq)` read; a host that composes no `sessionQuery` leaves
+	* the collector on its own non-deprecated sync fallback, and a failing read
+	* degrades to that fallback with one warning instead of failing the report.
+	* @param session - the session to read.
+	* @returns the surface events in model-history order, or undefined to fall back.
+	*/
+	const readSurfaceEvents = async (session) => {
+		const sessionQuery = ctx.get("sessionQuery");
+		if (sessionQuery === void 0) return void 0;
+		try {
+			return (await sessionQuery.readSurface(session.id)).events;
+		} catch (error) {
+			logger.warn(`session "${session.id}": surface read failed, falling back to the synchronous read: ${error instanceof Error ? error.message : String(error)}`);
+			return;
+		}
+	};
 	/** Build the complete report for one session. */
 	const reportFor = async (session) => {
-		return buildReport(collector.snapshot(session, measure, await assembleSections()), {
+		const snapshot = collector.snapshot(session, measure, await assembleSections(), await readSurfaceEvents(session));
+		publishSnapshot(session, snapshot);
+		return buildReport(snapshot, {
 			sessionId: session.id,
 			...resolved.includeCwd && session.header.cwd !== void 0 ? { cwd: session.header.cwd } : {},
 			generatedAt: Date.now()
@@ -812,7 +899,8 @@ async function apply(ctx, config = {}) {
 	};
 	/** Append one snapshot to the session's durable history (fire-and-forget). */
 	const persist = async (session) => {
-		const snapshot = collector.snapshot(session, measure, await assembleSections());
+		const snapshot = collector.snapshot(session, measure, await assembleSections(), await readSurfaceEvents(session));
+		publishSnapshot(session, snapshot);
 		const next = appendSample(sessions.get(session.id), {
 			at: Date.now(),
 			snapshot
@@ -821,7 +909,7 @@ async function apply(ctx, config = {}) {
 			logger.warn(`session "${session.id}": persist failed: ${error instanceof Error ? error.message : String(error)}`);
 		});
 	};
-	ctx.commands.register({
+	const fastCommand = {
 		name: "fast",
 		description: "Print the dsh-fast performance report for the active session.",
 		async handler(invocation) {
@@ -830,8 +918,8 @@ async function apply(ctx, config = {}) {
 				text: renderFastText(await reportFor(invocation.agent.session))
 			};
 		}
-	});
-	ctx.tools.register(defineTool({
+	};
+	const fastReportTool = defineTool({
 		name: "fast_report",
 		description: "Return the current dsh-fast performance report for the active session: session load timing, spill hits, compaction count and trigger, context-injection volume (AGENTS.md/skills/tool-schema token share), LLM cache hit rate, and optimization suggestions.",
 		parameters: {},
@@ -1077,21 +1165,25 @@ async function apply(ctx, config = {}) {
 			if (session === void 0) throw new Error("fast_report requires an agent-owned session");
 			return await reportFor(session);
 		}
-	}));
-	ctx.on("session/created", (session) => {
-		collector.handleSessionCreated(session);
-	});
-	ctx.on("session/disposed", (session) => {
-		collector.handleSessionDisposed(session);
-	});
-	ctx.on("session/event", (session, event) => {
-		try {
-			collector.handleEvent(session, event);
-		} catch (error) {
-			logger.warn(`session "${session.id}": event handling failed: ${error instanceof Error ? error.message : String(error)}`);
-		}
 	});
 	ctx.effect(() => {
+		const disposers = [
+			ctx.commands.register(fastCommand),
+			ctx.tools.register(fastReportTool),
+			ctx.on("session/created", (session) => {
+				collector.handleSessionCreated(session);
+			}),
+			ctx.on("session/disposed", (session) => {
+				collector.handleSessionDisposed(session);
+			}),
+			ctx.on("session/event", (session, event) => {
+				try {
+					collector.handleEvent(session, event);
+				} catch (error) {
+					logger.warn(`session "${session.id}": event handling failed: ${error instanceof Error ? error.message : String(error)}`);
+				}
+			})
+		];
 		const timer = setInterval(() => {
 			for (const session of collector.liveSessions()) {
 				if (!collector.isDirty(session)) continue;
@@ -1101,6 +1193,7 @@ async function apply(ctx, config = {}) {
 		}, resolved.snapshotIntervalMs);
 		return async () => {
 			clearInterval(timer);
+			for (const dispose of disposers.reverse()) dispose();
 			await domain.close();
 		};
 	});

package/lib/types/collector.d.ts

@@ -30,10 +30,21 @@ export type MeasureFn = (session: Session) => TokenMeasurement | undefined;
  * surface order. 0.1.5-alpha.1 derives the prompt from surface node 0; an empty
  * node is dormant and never restores older text. Mirrors
  * `SystemPromptProjection` in the host agent loop.
- * @param session - the session to read.
+ * @param surfaceEvents - the current surface events in model-history order
+ *   (from the optional `sessionQuery` service, or {@link surfaceEventsOf}).
  * @returns the effective system message, or undefined when none is active.
  */
-export declare function effectiveSystemMessage(session: Session): SystemMessage | undefined;
+export declare function effectiveSystemMessage(surfaceEvents: readonly SessionEvent[]): SystemMessage | undefined;
+/**
+ * The current surface events of a live session, resolved from one snapshot of
+ * the accepted log. This is the fallback read for hosts that compose no
+ * `sessionQuery` service: it replaces the deprecated `Session.eventAt(seq)`
+ * accessor (new calls are prohibited) while keeping the same surface-node
+ * order and the same log as the source of truth.
+ * @param session - the session to read.
+ * @returns the surface events in model-history order.
+ */
+export declare function surfaceEventsOf(session: Session): readonly SessionEvent[];
 /** Flatten a tool result's model-facing text blocks to one string. */
 export declare function flattenToolResultText(message: ToolResultMessage): string;
 /**
@@ -84,9 +95,11 @@ export declare class FastCollector {
      * @param sections - optional named system-prompt sections (from the optional
      *   `systemPrompt` service); absent = the whole rendered system prompt is
      *   attributed to the `other` bucket.
+     * @param surfaceEvents - optional pre-read surface events (the async
+     *   `sessionQuery` read path); absent = the sync fallback read.
      * @returns the snapshot.
      */
-    snapshot(session: Session, measure?: MeasureFn, sections?: readonly SystemSection[]): FastSnapshot;
+    snapshot(session: Session, measure?: MeasureFn, sections?: readonly SystemSection[], surfaceEvents?: readonly SessionEvent[]): FastSnapshot;
     /** Aggregate cache counters into the report shape. */
     private cacheStats;
     /** Fold one provider usage record. */

package/lib/types/collector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../src/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAe,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAGpH,OAAO,KAAK,EAAE,YAAY,EAAc,YAAY,EAAE,MAAM,YAAY,CAAA;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,eAAe,CAAA;AAEtB;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;CAC/B;AAED,+CAA+C;AAC/C,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,gBAAgB,GAAG,SAAS,CAAA;AAK1E;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,GAAG,SAAS,CAUlF;AAqBD,sEAAsE;AACtE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAQxE;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAGvE;AAED,0EAA0E;AAC1E,wBAAgB,QAAQ,CACtB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,IAAI,CAAC,YAAY,EAAE,aAAa,GAAG,YAAY,GAAG,cAAc,CAAC,CAOnE;AAED,+EAA+E;AAC/E,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIzE;AAsBD;;;;GAIG;AACH,qBAAa,aAAa;IAIZ,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgC;IAErD,kDAAkD;gBACrB,MAAM,EAAE,cAAc;IAEnD,oDAAoD;IACpD,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAI5C,wCAAwC;IACxC,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAI7C;;;;OAIG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI;IAmCxD,qDAAqD;IACrD,YAAY,IAAI,gBAAgB,CAAC,OAAO,CAAC;IAIzC,kEAAkE;IAClE,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO;IAI9B,kDAAkD;IAClD,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO;IAIlC,yDAAyD;IACzD,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAKjC;;;;;;;;;OASG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS,aAAa,EAAE,GAAG,YAAY;IAgDlG,sDAAsD;IACtD,OAAO,CAAC,UAAU;IAUlB,sCAAsC;IACtC,OAAO,CAAC,SAAS;IAYjB,iEAAiE;IACjE,OAAO,CAAC,KAAK;CAwBd"}
+{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../src/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAe,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAGpH,OAAO,KAAK,EAAE,YAAY,EAAc,YAAY,EAAE,MAAM,YAAY,CAAA;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,eAAe,CAAA;AAEtB;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;CAC/B;AAED,+CAA+C;AAC/C,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,gBAAgB,GAAG,SAAS,CAAA;AAK1E;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,SAAS,YAAY,EAAE,GAAG,aAAa,GAAG,SAAS,CASxG;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,YAAY,EAAE,CASzE;AAqBD,sEAAsE;AACtE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAQxE;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAGvE;AAED,0EAA0E;AAC1E,wBAAgB,QAAQ,CACtB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,IAAI,CAAC,YAAY,EAAE,aAAa,GAAG,YAAY,GAAG,cAAc,CAAC,CAOnE;AAED,+EAA+E;AAC/E,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIzE;AAsBD;;;;GAIG;AACH,qBAAa,aAAa;IAIZ,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgC;IAErD,kDAAkD;gBACrB,MAAM,EAAE,cAAc;IAEnD,oDAAoD;IACpD,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAI5C,wCAAwC;IACxC,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAI7C;;;;OAIG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI;IAmCxD,qDAAqD;IACrD,YAAY,IAAI,gBAAgB,CAAC,OAAO,CAAC;IAIzC,kEAAkE;IAClE,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO;IAI9B,kDAAkD;IAClD,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO;IAIlC,yDAAyD;IACzD,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAKjC;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS,aAAa,EAAE,EAAE,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,YAAY;IAgD3I,sDAAsD;IACtD,OAAO,CAAC,UAAU;IAUlB,sCAAsC;IACtC,OAAO,CAAC,SAAS;IAYjB,iEAAiE;IACjE,OAAO,CAAC,KAAK;CAwBd"}

package/lib/types/collector.js

@@ -15,14 +15,14 @@ const SPILL_NOTICE_MARKERS = ['Full', 'stored at:'];
  * surface order. 0.1.5-alpha.1 derives the prompt from surface node 0; an empty
  * node is dormant and never restores older text. Mirrors
  * `SystemPromptProjection` in the host agent loop.
- * @param session - the session to read.
+ * @param surfaceEvents - the current surface events in model-history order
+ *   (from the optional `sessionQuery` service, or {@link surfaceEventsOf}).
  * @returns the effective system message, or undefined when none is active.
  */
-export function effectiveSystemMessage(session) {
+export function effectiveSystemMessage(surfaceEvents) {
     let effective;
-    for (const seq of session.surface.nodes) {
-        const event = session.eventAt(seq);
-        if (event?.type !== 'system/message')
+    for (const event of surfaceEvents) {
+        if (event.type !== 'system/message')
             continue;
         const message = event.data.message;
         if (message.content.length === 0)
@@ -31,6 +31,27 @@ export function effectiveSystemMessage(session) {
     }
     return effective;
 }
+/**
+ * The current surface events of a live session, resolved from one snapshot of
+ * the accepted log. This is the fallback read for hosts that compose no
+ * `sessionQuery` service: it replaces the deprecated `Session.eventAt(seq)`
+ * accessor (new calls are prohibited) while keeping the same surface-node
+ * order and the same log as the source of truth.
+ * @param session - the session to read.
+ * @returns the surface events in model-history order.
+ */
+export function surfaceEventsOf(session) {
+    const bySeq = new Map();
+    for (const event of session.snapshotEvents())
+        bySeq.set(event.seq, event);
+    const events = [];
+    for (const seq of session.surface.nodes) {
+        const event = bySeq.get(seq);
+        if (event !== undefined)
+            events.push(event);
+    }
+    return events;
+}
 /** The display/durable text of a system message (text blocks plus structural JSON). */
 function systemTextOf(message) {
     let text = '';
@@ -176,14 +197,16 @@ export class FastCollector {
      * @param sections - optional named system-prompt sections (from the optional
      *   `systemPrompt` service); absent = the whole rendered system prompt is
      *   attributed to the `other` bucket.
+     * @param surfaceEvents - optional pre-read surface events (the async
+     *   `sessionQuery` read path); absent = the sync fallback read.
      * @returns the snapshot.
      */
-    snapshot(session, measure, sections) {
+    snapshot(session, measure, sections, surfaceEvents) {
         const state = this.live.get(session);
         if (state === undefined)
             return emptySnapshot();
         const measurement = measure === undefined ? undefined : measure(session);
-        const systemMessage = effectiveSystemMessage(session);
+        const systemMessage = effectiveSystemMessage(surfaceEvents ?? surfaceEventsOf(session));
         const legacySystem = systemMessage === undefined ? legacySystemText(state.lastHeader) : undefined;
         const systemTokens = systemMessage === undefined
             ? estimateLegacySystemTokens(legacySystem)

package/lib/types/collector.js.map

@@ -1 +1 @@
-{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../src/collector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../src/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAOH,OAAO,EACL,sBAAsB,EACtB,0BAA0B,EAC1B,oBAAoB,EACpB,mBAAmB,GAEpB,MAAM,eAAe,CAAA;AAkBtB,+FAA+F;AAC/F,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,YAAY,CAAU,CAAA;AAE5D;;;;;;;;GAQG;AACH,MAAM,UAAU,sBAAsB,CAAC,aAAsC;IAC3E,IAAI,SAAoC,CAAA;IACxC,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB;YAAE,SAAQ;QAC7C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAA;QAClC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,SAAQ;QAC1C,SAAS,GAAG,OAAO,CAAA;IACrB,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC9C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAwB,CAAA;IAC7C,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,cAAc,EAAE;QAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACzE,MAAM,MAAM,GAAmB,EAAE,CAAA;IACjC,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC5B,IAAI,KAAK,KAAK,SAAS;YAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC7C,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,uFAAuF;AACvF,SAAS,YAAY,CAAC,OAAsB;IAC1C,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,OAAO;QAAE,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACvG,OAAO,IAAI,CAAA;AACb,CAAC;AAED;;;;;;GAMG;AACH,SAAS,gBAAgB,CAAC,MAA+B;IACvD,MAAM,MAAM,GAAI,MAA2C,EAAE,MAAM,CAAA;IACnE,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;AACxD,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,qBAAqB,CAAC,OAA0B;IAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IAChC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAA;IAClC,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;YAAE,IAAI,IAAI,KAAK,CAAC,IAAI,CAAA;IAC/C,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAA0B;IAC5D,MAAM,IAAI,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAC3C,OAAO,oBAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;AACpE,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,QAAQ,CACtB,KAAa,EACb,MAAc,EACd,KAAa,EACb,OAAe;IAEf,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;IACzE,OAAO;QACL,WAAW,EAAE,MAAM,GAAG,KAAK;QAC3B,UAAU,EAAE,KAAK,GAAG,KAAK;QACzB,YAAY,EAAE,OAAO,GAAG,KAAK;KAC9B,CAAA;AACH,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,SAAS,CAAC,KAAa,EAAE,SAAiB;IACxD,MAAM,WAAW,GAAG,KAAK,GAAG,SAAS,CAAA;IACrC,IAAI,WAAW,IAAI,CAAC;QAAE,OAAO,IAAI,CAAA;IACjC,OAAO,SAAS,GAAG,WAAW,CAAA;AAChC,CAAC;AAsBD;;;;GAIG;AACH,MAAM,OAAO,aAAa;IAIK;IAHZ,IAAI,GAAG,IAAI,GAAG,EAAsB,CAAA;IAErD,kDAAkD;IAClD,YAA6B,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;IAAG,CAAC;IAEvD,oDAAoD;IACpD,oBAAoB,CAAC,OAAgB;QACnC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACrB,CAAC;IAED,wCAAwC;IACxC,qBAAqB,CAAC,OAAgB;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,OAAgB,EAAE,KAAmB;QAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACjC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,gBAAgB;gBACnB,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAA;gBACpC,IAAI,KAAK,CAAC,oBAAoB,KAAK,IAAI,EAAE,CAAC;oBACxC,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,CAAA;oBACxE,KAAK,CAAC,KAAK,GAAG,IAAI,CAAA;gBACpB,CAAC;gBACD,MAAK;YACP,KAAK,mBAAmB;gBACtB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACvC,MAAK;YACP,KAAK,kBAAkB;gBACrB,KAAK,CAAC,eAAe,IAAI,CAAC,CAAA;gBAC1B,IAAI,KAAK,CAAC,IAAI,CAAC,eAAe,KAAK,SAAS;oBAAE,KAAK,CAAC,mBAAmB,IAAI,CAAC,CAAA;;oBACvE,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAA;gBAChC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAA;gBAClB,MAAK;YACP,KAAK,oBAAoB;gBACvB,KAAK,CAAC,wBAAwB,IAAI,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAA;gBAC/D,KAAK,CAAC,KAAK,GAAG,IAAI,CAAA;gBAClB,MAAK;YACP,KAAK,aAAa;gBAChB,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,IAAI,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBAChF,KAAK,CAAC,cAAc,IAAI,CAAC,CAAA;oBACzB,KAAK,CAAC,KAAK,GAAG,IAAI,CAAA;gBACpB,CAAC;gBACD,MAAK;YACP;gBACE,2DAA2D;gBAC3D,MAAK;QACT,CAAC;IACH,CAAC;IAED,qDAAqD;IACrD,YAAY;QACV,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;IACzB,CAAC;IAED,kEAAkE;IAClE,GAAG,CAAC,OAAgB;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;IAED,kDAAkD;IAClD,OAAO,CAAC,OAAgB;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,IAAI,KAAK,CAAA;IAC/C,CAAC;IAED,yDAAyD;IACzD,SAAS,CAAC,OAAgB;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACpC,IAAI,KAAK,KAAK,SAAS;YAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAA;IAC9C,CAAC;IAED;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,OAAgB,EAAE,OAAmB,EAAE,QAAmC,EAAE,aAAuC;QAC1H,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACpC,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,aAAa,EAAE,CAAA;QAC/C,MAAM,WAAW,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACxE,MAAM,aAAa,GAAG,sBAAsB,CAAC,aAAa,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CAAA;QACvF,MAAM,YAAY,GAAG,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACjG,MAAM,YAAY,GAAG,aAAa,KAAK,SAAS;YAC9C,CAAC,CAAC,0BAA0B,CAAC,YAAY,CAAC;YAC1C,CAAC,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAA;QACvC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QAC9D,MAAM,qBAAqB,GAAG,WAAW,EAAE,aAAa,IAAI,CAAC,CAAA;QAC7D,2EAA2E;QAC3E,4EAA4E;QAC5E,0EAA0E;QAC1E,MAAM,aAAa,GAAG,aAAa,KAAK,SAAS;YAC/C,CAAC,CAAC,qBAAqB;YACvB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,qBAAqB,GAAG,YAAY,CAAC,CAAA;QACrD,MAAM,WAAW,GAAG,WAAW,EAAE,WAAW,IAAI,CAAC,YAAY,GAAG,gBAAgB,GAAG,aAAa,CAAC,CAAA;QACjG,MAAM,UAAU,GAAG,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;QAC3F,MAAM,iBAAiB,GAA6B,UAAU,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YACrG,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;QACzC,MAAM,eAAe,GAAG,sBAAsB,CAAC,QAAQ,IAAI,iBAAiB,CAAC,CAAA;QAC7E,OAAO;YACL,IAAI,EAAE;gBACJ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,UAAU,EAAE,KAAK,CAAC,YAAY;gBAC9B,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;aACjD;YACD,KAAK,EAAE,EAAE,sBAAsB,EAAE,KAAK,CAAC,cAAc,EAAE,SAAS,EAAE,IAAI,EAAE;YACxE,UAAU,EAAE;gBACV,KAAK,EAAE,KAAK,CAAC,eAAe;gBAC5B,MAAM,EAAE,KAAK,CAAC,gBAAgB;gBAC9B,SAAS,EAAE,KAAK,CAAC,mBAAmB;gBACpC,cAAc,EAAE,KAAK,CAAC,wBAAwB;aAC/C;YACD,OAAO,EAAE;gBACP,WAAW;gBACX,YAAY;gBACZ,gBAAgB;gBAChB,aAAa;gBACb,GAAG,QAAQ,CAAC,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,CAAC;gBACvE,eAAe;aAChB;YACD,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;SAC9B,CAAA;IACH,CAAC;IAED,sDAAsD;IAC9C,UAAU,CAAC,KAAgB;QACjC,OAAO;YACL,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,eAAe,CAAC;SAC7D,CAAA;IACH,CAAC;IAED,sCAAsC;IAC9B,SAAS,CACf,KAAgB,EAChB,KAAqH;QAErH,IAAI,KAAK,KAAK,SAAS;YAAE,OAAM;QAC/B,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,CAAA;QACtC,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,CAAA;QACxC,KAAK,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,CAAA;QACnD,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAA;QACrD,KAAK,CAAC,KAAK,GAAG,IAAI,CAAA;IACpB,CAAC;IAED,iEAAiE;IACzD,KAAK,CAAC,OAAgB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACvC,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,QAAQ,CAAA;QAC3C,MAAM,KAAK,GAAc;YACvB,OAAO;YACP,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE;YACvB,IAAI,EAAE,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;YACnD,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,oBAAoB,EAAE,IAAI;YAC1B,cAAc,EAAE,CAAC;YACjB,eAAe,EAAE,CAAC;YAClB,gBAAgB,EAAE,CAAC;YACnB,mBAAmB,EAAE,CAAC;YACtB,wBAAwB,EAAE,CAAC;YAC3B,WAAW,EAAE,CAAC;YACd,eAAe,EAAE,CAAC;YAClB,gBAAgB,EAAE,CAAC;YACnB,YAAY,EAAE,CAAC;YACf,UAAU,EAAE,SAAS;YACrB,KAAK,EAAE,IAAI;SACZ,CAAA;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAC7B,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAED,8DAA8D;AAC9D,SAAS,aAAa;IACpB,OAAO;QACL,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE;QACjE,KAAK,EAAE,EAAE,sBAAsB,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE;QACrD,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE;QACpE,OAAO,EAAE;YACP,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;YACf,gBAAgB,EAAE,CAAC;YACnB,aAAa,EAAE,CAAC;YAChB,WAAW,EAAE,CAAC;YACd,UAAU,EAAE,CAAC;YACb,YAAY,EAAE,CAAC;YACf,eAAe,EAAE;gBACf,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;gBAC3C,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;gBACzC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;gBAC1C,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;aACzC;SACF;QACD,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;KACnG,CAAA;AACH,CAAC"}

package/lib/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAA;AASnD,eAAO,MAAM,IAAI,SAAS,CAAA;AAC1B,kFAAkF;AAClF,eAAO,MAAM,MAAM,UAAyC,CAAA;AAE5D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACnD,YAAY,EAAE,MAAM,IAAI,UAAU,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAClF,YAAY,EACV,UAAU,EACV,YAAY,EACZ,SAAS,EACT,UAAU,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,qBAAqB,GACtB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/G,OAAO,EAAE,sBAAsB,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC5E,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAcxE;;;;;GAKG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA0M5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAMlD,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAA;AAUnD,eAAO,MAAM,IAAI,SAAS,CAAA;AAC1B,kFAAkF;AAClF,eAAO,MAAM,MAAM,UAAyC,CAAA;AAE5D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACnD,YAAY,EAAE,MAAM,IAAI,UAAU,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAClF,YAAY,EACV,UAAU,EACV,YAAY,EACZ,SAAS,EACT,UAAU,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,qBAAqB,GACtB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/G,OAAO,EAAE,sBAAsB,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC5E,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AA6BxE;;;;;GAKG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmR5E"}

package/lib/types/index.js

@@ -17,6 +17,7 @@ import { resolveConfig } from "./config.js";
 import { FastCollector } from "./collector.js";
 import { buildReport, renderFastText } from "./analyze.js";
 import { fastDomainSpec, appendSample } from "./store.js";
+import { createOnceNotifier } from "./notices.js";
 import { VERSION } from "./version.js";
 export const name = 'fast';
 /** The `/fast` command, the `fast_report` tool, and the durable metric domain. */
@@ -43,15 +44,43 @@ export async function apply(ctx, config = {}) {
     }
     const collector = new FastCollector(resolved);
     const domain = await ctx.storageDomain.open(fastDomainSpec);
+    // Disposal during the open await: the fiber is gone, so no effect may be
+    // registered any more — release the freshly opened handle instead of leaking
+    // it (the storage facility is single-open per name, so an unreleased handle
+    // also blocks a later remount).
+    if (ctx.fiber.uid === null) {
+        await domain.close();
+        return;
+    }
     const sessions = domain.table('sessions');
+    /**
+     * One-time visible degradation notices: a subsystem fallback that used to be
+     * silent now says so once per process, so a report built from heuristics is
+     * never mistaken for a measured one.
+     */
+    const warnFallbackOnce = createOnceNotifier(message => logger.warn(message));
+    /** The optional metrics outlet; a no-op when the service is absent or throws. */
+    const inspector = ctx.get('inspector');
+    const publishSnapshot = (session, snapshot) => {
+        if (inspector === undefined || typeof inspector.publish !== 'function')
+            return;
+        try {
+            inspector.publish('dsh-fast/snapshot', { sessionId: session.id, snapshot });
+        }
+        catch (error) {
+            warnFallbackOnce('inspector', `inspector metric outlet failed, continuing with the report surfaces only: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    };
     // Consumer — the report paths use the optional tokenMeter/systemPrompt
     // services at call time; the /fast handler and the fast_report execute turn
     // the measurements into the model-visible report.
     /** Lazy, contained lookup of the optional token meter. */
     const measure = (session) => {
         const meter = ctx.get('tokenMeter');
-        if (meter === undefined)
+        if (meter === undefined) {
+            warnFallbackOnce('tokenMeter', 'tokenMeter is not composed: total/surface tokens fall back to the fixed-density heuristic (spill and compaction counters stay exact)');
             return undefined;
+        }
         try {
             const measurement = meter.measure(session);
             return { totalTokens: measurement.totalTokens, surfaceTokens: measurement.surfaceTokens };
@@ -64,8 +93,10 @@ export async function apply(ctx, config = {}) {
     /** Assemble the named system-prompt sections for the per-section breakdown. */
     const assembleSections = async () => {
         const systemPrompt = ctx.get('systemPrompt');
-        if (systemPrompt === undefined)
+        if (systemPrompt === undefined) {
+            warnFallbackOnce('systemPrompt', 'systemPrompt is not composed: the whole rendered prompt is attributed to the "other" bucket instead of the per-section breakdown');
             return undefined;
+        }
         try {
             const assembly = await systemPrompt.assemble();
             return assembly.sections.map(section => ({ name: section.name, text: section.text }));
@@ -75,9 +106,32 @@ export async function apply(ctx, config = {}) {
             return undefined;
         }
     };
+    /**
+     * Read the current surface events for one session through the optional
+     * `sessionQuery` service. This replaces the deprecated synchronous
+     * `Session.eventAt(seq)` read; a host that composes no `sessionQuery` leaves
+     * the collector on its own non-deprecated sync fallback, and a failing read
+     * degrades to that fallback with one warning instead of failing the report.
+     * @param session - the session to read.
+     * @returns the surface events in model-history order, or undefined to fall back.
+     */
+    const readSurfaceEvents = async (session) => {
+        const sessionQuery = ctx.get('sessionQuery');
+        if (sessionQuery === undefined)
+            return undefined;
+        try {
+            const surface = await sessionQuery.readSurface(session.id);
+            return surface.events;
+        }
+        catch (error) {
+            logger.warn(`session "${session.id}": surface read failed, falling back to the synchronous read: ${error instanceof Error ? error.message : String(error)}`);
+            return undefined;
+        }
+    };
     /** Build the complete report for one session. */
     const reportFor = async (session) => {
-        const snapshot = collector.snapshot(session, measure, await assembleSections());
+        const snapshot = collector.snapshot(session, measure, await assembleSections(), await readSurfaceEvents(session));
+        publishSnapshot(session, snapshot);
         return buildReport(snapshot, {
             sessionId: session.id,
             ...(resolved.includeCwd && session.header.cwd !== undefined ? { cwd: session.header.cwd } : {}),
@@ -86,25 +140,27 @@ export async function apply(ctx, config = {}) {
     };
     /** Append one snapshot to the session's durable history (fire-and-forget). */
     const persist = async (session) => {
-        const snapshot = collector.snapshot(session, measure, await assembleSections());
+        const snapshot = collector.snapshot(session, measure, await assembleSections(), await readSurfaceEvents(session));
+        publishSnapshot(session, snapshot);
         const next = appendSample(sessions.get(session.id), { at: Date.now(), snapshot }, resolved.maxHistorySamples);
         void sessions.put(session.id, next).catch((error) => {
             logger.warn(`session "${session.id}": persist failed: ${error instanceof Error ? error.message : String(error)}`);
         });
     };
-    // Human slash command: the on-demand report.
-    ctx.commands.register({
+    // Human slash command: the on-demand report. The definition is registered
+    // inside the single lifecycle effect below, which owns every registration.
+    const fastCommand = {
         name: 'fast',
         description: 'Print the dsh-fast performance report for the active session.',
         async handler(invocation) {
             const report = await reportFor(invocation.agent.session);
             return { kind: 'success', text: renderFastText(report) };
         },
-    });
+    };
     // Model tool: the same report as structured data.
-    // Service Provider — ctx.tools.register mounts the fast_report tool (the
+    // Service Provider — the lifecycle effect mounts the fast_report tool (the
     // /fast slash command above registers on ctx.commands).
-    ctx.tools.register(defineTool({
+    const fastReportTool = defineTool({
         name: 'fast_report',
         description: 'Return the current dsh-fast performance report for the active session: session load timing, spill hits, compaction count and trigger, context-injection volume (AGENTS.md/skills/tool-schema token share), LLM cache hit rate, and optimization suggestions.',
         parameters: {},
@@ -197,24 +253,32 @@ export async function apply(ctx, config = {}) {
             }
             return await reportFor(session);
         },
-    }));
-    // Session lifecycle: adopt and fold.
-    ctx.on('session/created', (session) => {
-        collector.handleSessionCreated(session);
-    });
-    ctx.on('session/disposed', (session) => {
-        collector.handleSessionDisposed(session);
-    });
-    ctx.on('session/event', (session, event) => {
-        try {
-            collector.handleEvent(session, event);
-        }
-        catch (error) {
-            logger.warn(`session "${session.id}": event handling failed: ${error instanceof Error ? error.message : String(error)}`);
-        }
     });
-    // Async sampling: one effect owns the timer and the domain teardown.
+    // One effect owns every registration and resource: the /fast command, the
+    // fast_report tool, the three session listeners, the sampling timer and the
+    // domain handle. The disposer tears them down in reverse registration order
+    // (timer → listeners → tool → command → domain close), so an unmount during
+    // apply can neither lose a registration nor leak the domain — the previous
+    // shape registered all five outside any effect and had nothing to roll back.
     ctx.effect(() => {
+        const disposers = [
+            ctx.commands.register(fastCommand),
+            ctx.tools.register(fastReportTool),
+            ctx.on('session/created', (session) => {
+                collector.handleSessionCreated(session);
+            }),
+            ctx.on('session/disposed', (session) => {
+                collector.handleSessionDisposed(session);
+            }),
+            ctx.on('session/event', (session, event) => {
+                try {
+                    collector.handleEvent(session, event);
+                }
+                catch (error) {
+                    logger.warn(`session "${session.id}": event handling failed: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            }),
+        ];
         const timer = setInterval(() => {
             for (const session of collector.liveSessions()) {
                 if (!collector.isDirty(session))
@@ -225,6 +289,8 @@ export async function apply(ctx, config = {}) {
         }, resolved.snapshotIntervalMs);
         return async () => {
             clearInterval(timer);
+            for (const dispose of disposers.reverse())
+                dispose();
             await domain.close();
         };
     });