@flighthq/debug 0.5.1-next.3302.76ece6b → 0.5.1-next.4304.322dc96

package/README.md

@@ -13,5 +13,5 @@ Import the supported application-facing API from `@flighthq/debug`. The `@flight
 This package is part of the locked-version Flight SDK graph. Applications may instead install and import `@flighthq/sdk` when package-level tree shaking is sufficient.
 
 - [Flight project](https://github.com/flighthq/flight)
-- [Source for @flighthq/debug@0.5.1-next.3302.76ece6b](https://github.com/flighthq/flight/tree/76ece6bee38e3d07816f341b7f017bfcec3e8e29/packages/debug)
-- [License](https://github.com/flighthq/flight/blob/76ece6bee38e3d07816f341b7f017bfcec3e8e29/LICENSE.md)
+- [Source for @flighthq/debug@0.5.1-next.4304.322dc96](https://github.com/flighthq/flight/tree/322dc963fc5a404a31bc0cc612e906de504ea024/packages/debug)
+- [License](https://github.com/flighthq/flight/blob/322dc963fc5a404a31bc0cc612e906de504ea024/LICENSE.md)

package/dist/debug.d.ts

@@ -1,8 +1,22 @@
-import type { DebugOptions, DebugSubsystemHooks, DebugSubsystemName, RenderState } from '@flighthq/types/contract';
-export declare function disableDebug(): void;
-export declare function enableDebug(options?: Readonly<DebugOptions>): void;
-export declare function enableFlightDiagnostics(state: RenderState): void;
-export declare function isDebugEnabled(): boolean;
-export declare function registerDebugSubsystem(name: DebugSubsystemName, hooks: Readonly<DebugSubsystemHooks>): void;
-export declare function unregisterDebugSubsystem(name: DebugSubsystemName): boolean;
+import type { EntityConstruction } from '@flighthq/entity/contract';
+import type { LogState } from '@flighthq/log/contract';
+import type { DebugOptions, DebugSubsystemHooks, DebugSubsystemName, Entity, LogSink, RenderState } from '@flighthq/types/contract';
+import { LogLevel } from '@flighthq/types/contract';
+export interface DebugState extends Entity {
+    enabled: boolean;
+    enabledSubsystems: Readonly<DebugSubsystemHooks>[];
+    frameNumber: number;
+    installedSink: LogSink | null;
+    savedChannelLevels: Map<string, LogLevel | null>;
+    savedGlobalLevel: LogLevel;
+    subsystems: Map<string, Readonly<DebugSubsystemHooks>>;
+}
+export declare function createDebugState(): DebugState;
+export declare function disableDebug(state: DebugState, logState: LogState): void;
+export declare function enableDebug(state: DebugState, logState: LogState, options?: Readonly<DebugOptions>): void;
+export declare function enableFlightDiagnostics(debugState: DebugState, logState: LogState, state: RenderState): void;
+export declare function initializeDebugState(out: EntityConstruction<DebugState>): void;
+export declare function isDebugEnabled(state: Readonly<DebugState>): boolean;
+export declare function registerDebugSubsystem(state: DebugState, name: DebugSubsystemName, hooks: Readonly<DebugSubsystemHooks>): void;
+export declare function unregisterDebugSubsystem(state: DebugState, name: DebugSubsystemName): boolean;
 //# sourceMappingURL=debug.d.ts.map

package/dist/debug.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../src/debug.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAElB,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAOlC,wBAAgB,YAAY,IAAI,IAAI,CAOnC;AASD,wBAAgB,WAAW,CAAC,OAAO,GAAE,QAAQ,CAAC,YAAY,CAAM,GAAG,IAAI,CA8CtE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAIhE;AAGD,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAOD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAE3G;AAID,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAE1E"}
+{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../src/debug.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAYvD,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,OAAO,EACP,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAIpD,MAAM,WAAW,UAAW,SAAQ,MAAM;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;IACnD,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,OAAO,GAAG,IAAI,CAAC;IAC9B,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC,CAAC;IACjD,gBAAgB,EAAE,QAAQ,CAAC;IAC3B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC;CACxD;AAGD,wBAAgB,gBAAgB,IAAI,UAAU,CAI7C;AAMD,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAOxE;AASD,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GAAE,QAAQ,CAAC,YAAY,CAAM,GAAG,IAAI,CA8C7G;AAID,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI,CAI5G;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,kBAAkB,CAAC,UAAU,CAAC,GAAG,IAAI,CAQ9E;AAGD,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,OAAO,CAEnE;AAOD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,kBAAkB,EACxB,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,GACnC,IAAI,CAEN;AAID,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAE7F"}

package/dist/debug.js

@@ -1,55 +1,62 @@
+import { allocateEntity, finishEntity } from '@flighthq/entity/contract';
 import { addLogSink, clearLogChannelLevel, createConsoleLogSink, getLogChannelLevel, getLogLevel, removeLogSink, setLogChannelLevel, setLogLevel, } from '@flighthq/log/contract';
 import { enableColorAdjustmentGuards, enableRenderRegistriesGuards } from '@flighthq/render/contract';
 import { LogLevel } from '@flighthq/types/contract';
+// Creates an empty debug state: no registered subsystems and no active session.
+export function createDebugState() {
+    const out = allocateEntity();
+    initializeDebugState(out);
+    return finishEntity(out);
+}
 // The one call that returns Flight to the zero-debug baseline: removes the sink enableDebug
 // installed, restores the log levels it raised, and runs the disable-guards binding of every
 // subsystem it switched on. No-op when debug is not enabled (idempotent, sentinel — not a throw).
 // After this, importing @flighthq/debug costs nothing and no debug output is produced.
-export function disableDebug() {
-    if (!_enabled)
+export function disableDebug(state, logState) {
+    if (!state.enabled)
         return;
-    for (const hooks of _enabledSubsystems)
+    for (const hooks of state.enabledSubsystems)
         hooks.disableGuards?.();
-    _enabledSubsystems.length = 0;
-    _removeDebugSink();
-    _restoreDebugLevels();
-    _enabled = false;
+    state.enabledSubsystems.length = 0;
+    _removeDebugSink(state, logState);
+    _restoreDebugLevels(state, logState);
+    state.enabled = false;
 }
-// The friendly entry point to Flight's diagnostics. Installs a dev console LogSink (a text-formatted
-// one by default; override with `options.sink`), raises the global log level (default
+// The friendly entry point to Flight's diagnostics. Installs a dev console LogSink on `logState` (a
+// text-formatted one by default; override with `options.sink`), raises the global log level (default
 // LogLevel.Debug) and the per-channel levels of the selected subsystems plus any explicit
 // `options.channels`, and runs each selected subsystem's registered guard-enabler. `options.subsystems`
 // selects which registered subsystems to switch on; omit it to switch on every registered subsystem.
 // Idempotent: a second call while already enabled is a no-op (disableDebug first to re-enable with
 // different options).
-export function enableDebug(options = {}) {
-    if (_enabled)
+export function enableDebug(state, logState, options = {}) {
+    if (state.enabled)
         return;
     const level = options.level ?? LogLevel.Debug;
-    const subsystems = _resolveDebugSubsystems(options.subsystems);
+    const subsystems = _resolveDebugSubsystems(state, options.subsystems);
     const channels = _collectDebugChannels(subsystems, options.channels);
-    _savedGlobalLevel = getLogLevel();
-    const savedChannelLevels = new Map(channels.map((channel) => [channel, getLogChannelLevel(channel)]));
+    state.savedGlobalLevel = getLogLevel(logState);
+    const savedChannelLevels = new Map(channels.map((channel) => [channel, getLogChannelLevel(logState, channel)]));
     try {
-        _applyDebugLevels(level, channels);
-        _installDebugSink(options.sink ?? createConsoleLogSink());
+        _applyDebugLevels(logState, level, channels);
+        _installDebugSink(state, logState, options.sink ?? createConsoleLogSink(logState));
         for (const hooks of subsystems) {
-            _enabledSubsystems.push(hooks);
+            state.enabledSubsystems.push(hooks);
             hooks.enableGuards?.();
         }
     }
     catch (error) {
-        for (let index = _enabledSubsystems.length - 1; index >= 0; index--) {
+        for (let index = state.enabledSubsystems.length - 1; index >= 0; index--) {
             try {
-                _enabledSubsystems[index].disableGuards?.();
+                state.enabledSubsystems[index].disableGuards?.();
             }
             catch {
                 // Keep unwinding; the original enable error owns this failed transaction.
             }
         }
-        _enabledSubsystems.length = 0;
+        state.enabledSubsystems.length = 0;
         try {
-            _removeDebugSink();
+            _removeDebugSink(state, logState);
         }
         catch {
             // Keep restoring levels; the original enable error must not be masked.
@@ -57,58 +64,65 @@ export function enableDebug(options = {}) {
         for (const [channel, savedLevel] of savedChannelLevels) {
             try {
                 if (savedLevel === null)
-                    clearLogChannelLevel(channel);
+                    clearLogChannelLevel(logState, channel);
                 else
-                    setLogChannelLevel(channel, savedLevel);
+                    setLogChannelLevel(logState, channel, savedLevel);
             }
             catch {
                 // Keep restoring the remaining levels; the original enable error must survive.
             }
         }
         try {
-            setLogLevel(_savedGlobalLevel);
+            setLogLevel(logState, state.savedGlobalLevel);
         }
         catch {
             // The original enable error remains the public failure even if rollback also fails.
         }
         throw error;
     }
-    _savedChannelLevels = savedChannelLevels;
-    _enabled = true;
+    state.savedChannelLevels = savedChannelLevels;
+    state.enabled = true;
+}
+// Enables a debug session with the default options, then the generic render guards for one render
+// state, reporting through the same caller-owned log state.
+export function enableFlightDiagnostics(debugState, logState, state) {
+    enableDebug(debugState, logState);
+    enableColorAdjustmentGuards(state, logState);
+    enableRenderRegistriesGuards(state, logState);
 }
-export function enableFlightDiagnostics(state) {
-    enableDebug();
-    enableColorAdjustmentGuards(state);
-    enableRenderRegistriesGuards(state);
+// Resets a debug state to no registered subsystems and no active session (the construction
+// initializer of createDebugState).
+export function initializeDebugState(out) {
+    out.enabled = false;
+    out.enabledSubsystems = [];
+    out.frameNumber = 0;
+    out.installedSink = null;
+    out.savedChannelLevels = new Map();
+    out.savedGlobalLevel = LogLevel.Verbose;
+    out.subsystems = new Map();
 }
 // Whether enableDebug is currently in effect (a sink is installed and levels/guards are raised).
-export function isDebugEnabled() {
-    return _enabled;
+export function isDebugEnabled(state) {
+    return state.enabled;
 }
 // Registers a diagnostic subsystem's wiring — the log channels whose verbosity enableDebug should
 // raise and the guard-enabler/-disabler bindings it should run for `name`. A package's thin debug
 // adapter (or the app) calls this so enableDebug(['render']) can drive the subsystem without
 // @flighthq/debug importing it. Last-write-wins; vendor-prefix custom subsystem names ('acme.Foo')
 // to avoid colliding with built-ins.
-export function registerDebugSubsystem(name, hooks) {
-    _subsystems.set(name, hooks);
+export function registerDebugSubsystem(state, name, hooks) {
+    state.subsystems.set(name, hooks);
 }
 // Removes a subsystem registration. Returns false when nothing was registered under `name`
 // (sentinel, not a throw). Does not affect an already-active debug session.
-export function unregisterDebugSubsystem(name) {
-    return _subsystems.delete(name);
+export function unregisterDebugSubsystem(state, name) {
+    return state.subsystems.delete(name);
 }
-const _subsystems = new Map();
-const _enabledSubsystems = [];
-let _enabled = false;
-let _installedSink = null;
-let _savedGlobalLevel = LogLevel.Verbose;
-let _savedChannelLevels = new Map();
 // Raises the global level and every selected channel's level to `level` for the session.
-function _applyDebugLevels(level, channels) {
-    setLogLevel(level);
+function _applyDebugLevels(logState, level, channels) {
+    setLogLevel(logState, level);
     for (const channel of channels)
-        setLogChannelLevel(channel, level);
+        setLogChannelLevel(logState, channel, level);
 }
 // Gathers the channels to raise: every selected subsystem's channels plus any explicit extras.
 function _collectDebugChannels(subsystems, extra) {
@@ -122,25 +136,25 @@ function _collectDebugChannels(subsystems, extra) {
     return channels;
 }
 // Installs the debug sink and records it so disableDebug can remove exactly this one.
-function _installDebugSink(sink) {
-    _installedSink = sink;
-    addLogSink(sink);
+function _installDebugSink(state, logState, sink) {
+    state.installedSink = sink;
+    addLogSink(logState, sink);
 }
 // Removes the installed debug sink, if any.
-function _removeDebugSink() {
-    if (_installedSink === null)
+function _removeDebugSink(state, logState) {
+    if (state.installedSink === null)
         return;
-    removeLogSink(_installedSink);
-    _installedSink = null;
+    removeLogSink(logState, state.installedSink);
+    state.installedSink = null;
 }
 // Resolves the subsystem hooks to drive: the named ones when `names` is given (unregistered names
 // are skipped), otherwise every registered subsystem.
-function _resolveDebugSubsystems(names) {
+function _resolveDebugSubsystems(state, names) {
     if (names === undefined)
-        return [..._subsystems.values()];
+        return [...state.subsystems.values()];
     const resolved = [];
     for (const name of names) {
-        const hooks = _subsystems.get(name);
+        const hooks = state.subsystems.get(name);
         if (hooks !== undefined)
             resolved.push(hooks);
     }
@@ -148,14 +162,14 @@ function _resolveDebugSubsystems(names) {
 }
 // Restores the global level and per-channel overrides enableDebug saved. Only the channels debug
 // raised are touched; channel overrides the caller set before the session are preserved.
-function _restoreDebugLevels() {
-    setLogLevel(_savedGlobalLevel);
-    for (const [channel, savedLevel] of _savedChannelLevels) {
+function _restoreDebugLevels(state, logState) {
+    setLogLevel(logState, state.savedGlobalLevel);
+    for (const [channel, savedLevel] of state.savedChannelLevels) {
         if (savedLevel === null)
-            clearLogChannelLevel(channel);
+            clearLogChannelLevel(logState, channel);
         else
-            setLogChannelLevel(channel, savedLevel);
+            setLogChannelLevel(logState, channel, savedLevel);
     }
-    _savedChannelLevels = new Map();
+    state.savedChannelLevels = new Map();
 }
 //# sourceMappingURL=debug.js.map

package/dist/debug.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug.js","sourceRoot":"","sources":["../src/debug.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"debug.js","sourceRoot":"","sources":["../src/debug.ts"],"names":[],"mappings":"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"}

package/dist/debugTiming.d.ts

@@ -1,6 +1,8 @@
+import type { LogState } from '@flighthq/log/contract';
 import type { LogTimer } from '@flighthq/types/contract';
-export declare function beginDebugSpan(name: string, channel?: string | null): LogTimer | null;
-export declare function endDebugSpan(timer: Readonly<LogTimer> | null): number;
-export declare function markDebugFrame(label?: string, channel?: string | null): void;
-export declare function measureDebugSpan<T>(name: string, fn: () => T, channel?: string | null): T;
+import type { DebugState } from './debug.ts';
+export declare function beginDebugSpan(state: Readonly<DebugState>, nowMs: number, name: string, channel?: string | null): LogTimer | null;
+export declare function endDebugSpan(logState: LogState, nowMs: number, timer: Readonly<LogTimer> | null): number;
+export declare function markDebugFrame(state: DebugState, logState: LogState, nowMs: number, label?: string, channel?: string | null): void;
+export declare function measureDebugSpan<T>(state: Readonly<DebugState>, logState: LogState, clock: () => number, name: string, fn: () => T, channel?: string | null): T;
 //# sourceMappingURL=debugTiming.d.ts.map

package/dist/debugTiming.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debugTiming.d.ts","sourceRoot":"","sources":["../src/debugTiming.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AASzD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,MAAM,GAAG,IAAW,GAAG,QAAQ,GAAG,IAAI,CAE3F;AAKD,wBAAgB,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,MAAM,CAErE;AAMD,wBAAgB,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,MAAM,GAAG,IAAW,GAAG,IAAI,CAGlF;AAMD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,GAAE,MAAM,GAAG,IAAW,GAAG,CAAC,CAO/F"}
+{"version":3,"file":"debugTiming.d.ts","sourceRoot":"","sources":["../src/debugTiming.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAQ7C,wBAAgB,cAAc,CAC5B,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC3B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,MAAM,GAAG,IAAW,GAC5B,QAAQ,GAAG,IAAI,CAEjB;AAKD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,MAAM,CAExG;AAOD,wBAAgB,cAAc,CAC5B,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,GAAE,MAAM,GAAG,IAAW,GAC5B,IAAI,CAGN;AAMD,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,EAC3B,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,CAAC,EACX,OAAO,GAAE,MAAM,GAAG,IAAW,GAC5B,CAAC,CAOH"}

package/dist/debugTiming.js

@@ -1,42 +1,41 @@
 import { endLogTimer, logDebug, startLogTimer } from '@flighthq/log/contract';
 import { isDebugEnabled } from "./debug.js";
-// Opens a named timing span, but only while a debug session is active: returns a LogTimer to hand to
-// endDebugSpan, or null when debug is disabled (production, or before enableDebug). Gating here is the
-// point — with debug off, opening a span is one boolean check and allocates nothing, so span
-// instrumentation left in shipping code costs effectively nothing. Pair every non-null result with
-// endDebugSpan (measureDebugSpan brackets both for a single synchronous call).
-export function beginDebugSpan(name, channel = null) {
-    return isDebugEnabled() ? startLogTimer(name, channel) : null;
+// Opens a named timing span at the caller's clock reading `nowMs`, but only while a debug session is
+// active: returns a LogTimer to hand to endDebugSpan, or null when debug is disabled (production, or
+// before enableDebug). Gating here is the point — with debug off, opening a span is one boolean check
+// and allocates nothing, so span instrumentation left in shipping code costs effectively nothing. Pair
+// every non-null result with endDebugSpan (measureDebugSpan brackets both for a single synchronous call).
+export function beginDebugSpan(state, nowMs, name, channel = null) {
+    return isDebugEnabled(state) ? startLogTimer(name, channel, nowMs) : null;
 }
-// Closes a span opened by beginDebugSpan, emitting its elapsed-time Debug entry through the active
-// debug sink and returning the elapsed milliseconds. A null timer — debug was disabled when the span
-// opened — is a no-op returning -1, the sentinel for "not measured".
-export function endDebugSpan(timer) {
-    return timer === null ? -1 : endLogTimer(timer);
+// Closes a span opened by beginDebugSpan, emitting its elapsed-time Debug entry through `logState` and
+// returning the elapsed milliseconds. A null timer — debug was disabled when the span opened — is a
+// no-op returning -1, the sentinel for "not measured".
+export function endDebugSpan(logState, nowMs, timer) {
+    return timer === null ? -1 : endLogTimer(logState, nowMs, timer);
 }
 // Emits a frame-boundary marker while a debug session is active, so the per-frame span entries between
 // two markers can be read against the frame they fell in. `label` names the frame; omit it to tag the
-// marker with a process-monotonic frame counter. No-op (and no counter advance) when debug is disabled,
-// so a per-frame call in the app loop costs a single boolean check in production.
-export function markDebugFrame(label, channel = null) {
-    if (!isDebugEnabled())
+// marker with the state's ascending frame counter, which a new session does not reset. No-op (and no
+// counter advance) when debug is disabled, so a per-frame call in the app loop costs a single boolean
+// check in production.
+export function markDebugFrame(state, logState, nowMs, label, channel = null) {
+    if (!isDebugEnabled(state))
         return;
-    logDebug({ frame: label ?? ++_debugFrameNumber }, channel);
+    logDebug(logState, nowMs, { frame: label ?? ++state.frameNumber }, channel);
 }
 // Brackets a synchronous function as a timing span: times `fn` while a debug session is active,
 // emitting one elapsed-time entry, and returns `fn`'s result. When debug is disabled `fn` still runs —
 // only the timing is skipped — so wrapping a call never changes behavior, only observability. The span
-// is closed even if `fn` throws.
-export function measureDebugSpan(name, fn, channel = null) {
-    const timer = beginDebugSpan(name, channel);
+// is closed even if `fn` throws. `clock` is read once when the span opens and once when it closes.
+export function measureDebugSpan(state, logState, clock, name, fn, channel = null) {
+    const timer = beginDebugSpan(state, clock(), name, channel);
     try {
         return fn();
     }
     finally {
-        endDebugSpan(timer);
+        if (timer !== null)
+            endDebugSpan(logState, clock(), timer);
     }
 }
-// Monotonic id handed to unlabeled frame markers. Not reset between sessions — a marker's job is to
-// correlate span entries with a frame boundary, for which a unique ascending id suffices.
-let _debugFrameNumber = 0;
 //# sourceMappingURL=debugTiming.js.map

package/dist/debugTiming.js.map

@@ -1 +1 @@
-{"version":3,"file":"debugTiming.js","sourceRoot":"","sources":["../src/debugTiming.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAG9E,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qGAAqG;AACrG,uGAAuG;AACvG,6FAA6F;AAC7F,mGAAmG;AACnG,+EAA+E;AAC/E,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,UAAyB,IAAI;IACxE,OAAO,cAAc,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChE,CAAC;AAED,mGAAmG;AACnG,qGAAqG;AACrG,qEAAqE;AACrE,MAAM,UAAU,YAAY,CAAC,KAAgC;IAC3D,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAClD,CAAC;AAED,uGAAuG;AACvG,sGAAsG;AACtG,wGAAwG;AACxG,kFAAkF;AAClF,MAAM,UAAU,cAAc,CAAC,KAAc,EAAE,UAAyB,IAAI;IAC1E,IAAI,CAAC,cAAc,EAAE;QAAE,OAAO;IAC9B,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,iBAAiB,EAAE,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC;AAED,gGAAgG;AAChG,uGAAuG;AACvG,uGAAuG;AACvG,iCAAiC;AACjC,MAAM,UAAU,gBAAgB,CAAI,IAAY,EAAE,EAAW,EAAE,UAAyB,IAAI;IAC1F,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,IAAI,CAAC;QACH,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,oGAAoG;AACpG,0FAA0F;AAC1F,IAAI,iBAAiB,GAAG,CAAC,CAAC"}
+{"version":3,"file":"debugTiming.js","sourceRoot":"","sources":["../src/debugTiming.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAI9E,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,qGAAqG;AACrG,qGAAqG;AACrG,sGAAsG;AACtG,uGAAuG;AACvG,0GAA0G;AAC1G,MAAM,UAAU,cAAc,CAC5B,KAA2B,EAC3B,KAAa,EACb,IAAY,EACZ,UAAyB,IAAI;IAE7B,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5E,CAAC;AAED,uGAAuG;AACvG,oGAAoG;AACpG,uDAAuD;AACvD,MAAM,UAAU,YAAY,CAAC,QAAkB,EAAE,KAAa,EAAE,KAAgC;IAC9F,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AACnE,CAAC;AAED,uGAAuG;AACvG,sGAAsG;AACtG,qGAAqG;AACrG,sGAAsG;AACtG,uBAAuB;AACvB,MAAM,UAAU,cAAc,CAC5B,KAAiB,EACjB,QAAkB,EAClB,KAAa,EACb,KAAc,EACd,UAAyB,IAAI;IAE7B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;QAAE,OAAO;IACnC,QAAQ,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;AAC9E,CAAC;AAED,gGAAgG;AAChG,uGAAuG;AACvG,uGAAuG;AACvG,mGAAmG;AACnG,MAAM,UAAU,gBAAgB,CAC9B,KAA2B,EAC3B,QAAkB,EAClB,KAAmB,EACnB,IAAY,EACZ,EAAW,EACX,UAAyB,IAAI;IAE7B,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,CAAC;QACH,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;YAAS,CAAC;QACT,IAAI,KAAK,KAAK,IAAI;YAAE,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC"}

package/dist/index.d.ts

@@ -1,2 +1,3 @@
-export { beginDebugSpan, disableDebug, enableDebug, enableFlightDiagnostics, endDebugSpan, isDebugEnabled, markDebugFrame, measureDebugSpan, registerDebugSubsystem, unregisterDebugSubsystem, } from './contract.ts';
+export { beginDebugSpan, createDebugState, disableDebug, enableDebug, enableFlightDiagnostics, endDebugSpan, isDebugEnabled, markDebugFrame, measureDebugSpan, registerDebugSubsystem, unregisterDebugSubsystem, } from './contract.ts';
+export type { DebugState } from './contract.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,YAAY,EACZ,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,YAAY,EACZ,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC"}

package/dist/index.js

@@ -1,2 +1,2 @@
-export { beginDebugSpan, disableDebug, enableDebug, enableFlightDiagnostics, endDebugSpan, isDebugEnabled, markDebugFrame, measureDebugSpan, registerDebugSubsystem, unregisterDebugSubsystem, } from "./contract.js";
+export { beginDebugSpan, createDebugState, disableDebug, enableDebug, enableFlightDiagnostics, endDebugSpan, isDebugEnabled, markDebugFrame, measureDebugSpan, registerDebugSubsystem, unregisterDebugSubsystem, } from "./contract.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,YAAY,EACZ,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,YAAY,EACZ,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/debug",
-  "version": "0.5.1-next.3302.76ece6b",
+  "version": "0.5.1-next.4304.322dc96",
   "author": "Joshua Granick and other contributors",
   "license": "MIT",
   "repository": {
@@ -38,9 +38,10 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/log": "0.5.1-next.3302.76ece6b",
-    "@flighthq/render": "0.5.1-next.3302.76ece6b",
-    "@flighthq/types": "0.5.1-next.3302.76ece6b"
+    "@flighthq/entity": "0.5.1-next.4304.322dc96",
+    "@flighthq/log": "0.5.1-next.4304.322dc96",
+    "@flighthq/render": "0.5.1-next.4304.322dc96",
+    "@flighthq/types": "0.5.1-next.4304.322dc96"
   },
   "devDependencies": {
     "typescript": "^5.3.0"

package/src/debug.test.ts

@@ -1,6 +1,8 @@
+import type { LogState } from '@flighthq/log/contract';
 import {
   clearLogChannelLevels,
   clearLogSinks,
+  createLogState,
   createMemoryLogSink,
   getLogChannelLevel,
   getLogLevel,
@@ -14,14 +16,17 @@ import {
   areRenderRegistriesGuardsEnabled,
   createRenderState,
 } from '@flighthq/render/contract';
-import type { MemoryLogSink } from '@flighthq/types/contract';
+import type { LogEntry, MemoryLogSink } from '@flighthq/types/contract';
 import { LogLevel } from '@flighthq/types/contract';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
+import type { DebugState } from './debug.ts';
 import {
+  createDebugState,
   disableDebug,
   enableDebug,
   enableFlightDiagnostics,
+  initializeDebugState,
   isDebugEnabled,
   registerDebugSubsystem,
   unregisterDebugSubsystem,
@@ -32,132 +37,170 @@ import {
 const testSubsystemNames = ['render', 'input', 'audio', 'acme.custom'];
 
 function readMemory(sink: MemoryLogSink): readonly unknown[] {
-  return getMemoryLogSinkEntries(sink);
+  return readLogEntries(sink);
+}
+
+// Monotonic test clock: each read advances one millisecond, so spans measure a positive duration.
+function clock(): number {
+  return ++clockMs;
+}
+
+function readLogEntries(sink: Readonly<MemoryLogSink>): LogEntry[] {
+  const entries: LogEntry[] = [];
+  getMemoryLogSinkEntries(entries, sink);
+  return entries;
 }
 
 beforeEach(() => {
-  if (isDebugEnabled()) disableDebug();
-  for (const name of testSubsystemNames) unregisterDebugSubsystem(name);
-  clearLogSinks();
-  clearLogChannelLevels();
-  setLogLevel(LogLevel.Verbose);
+  clockMs = 0;
+  debugState = createDebugState();
+  logState = createLogState();
+  if (isDebugEnabled(debugState)) disableDebug(debugState, logState);
+  for (const name of testSubsystemNames) unregisterDebugSubsystem(debugState, name);
+  clearLogSinks(logState);
+  clearLogChannelLevels(logState);
+  setLogLevel(logState, LogLevel.Verbose);
 });
 
 afterEach(() => {
-  if (isDebugEnabled()) disableDebug();
-  for (const name of testSubsystemNames) unregisterDebugSubsystem(name);
-  clearLogSinks();
-  clearLogChannelLevels();
-  setLogLevel(LogLevel.Verbose);
+  if (isDebugEnabled(debugState)) disableDebug(debugState, logState);
+  for (const name of testSubsystemNames) unregisterDebugSubsystem(debugState, name);
+  clearLogSinks(logState);
+  clearLogChannelLevels(logState);
+  setLogLevel(logState, LogLevel.Verbose);
+});
+
+describe('createDebugState', () => {
+  it('starts disabled with no frame, sink, saved levels, or subsystems', () => {
+    const state = createDebugState();
+    expect(state.enabled).toBe(false);
+    expect(state.enabledSubsystems).toEqual([]);
+    expect(state.frameNumber).toBe(0);
+    expect(state.installedSink).toBeNull();
+    expect(state.savedChannelLevels.size).toBe(0);
+    expect(state.subsystems.size).toBe(0);
+  });
+
+  it('returns independent states', () => {
+    expect(createDebugState().subsystems).not.toBe(createDebugState().subsystems);
+  });
 });
 
 describe('disableDebug', () => {
   it('removes the installed sink so a later log does not reach it', () => {
     const memory = createMemoryLogSink(16);
-    registerDebugSubsystem('render', { channels: ['render'] });
-    enableDebug({ subsystems: ['render'], sink: memory.sink });
+    registerDebugSubsystem(debugState, 'render', { channels: ['render'] });
+    enableDebug(debugState, logState, { subsystems: ['render'], sink: memory.sink });
 
-    log(LogLevel.Debug, 'before', 'render');
+    log(logState, 0, LogLevel.Debug, 'before', 'render');
     expect(readMemory(memory)).toHaveLength(1);
 
-    disableDebug();
-    log(LogLevel.Debug, 'after', 'render');
+    disableDebug(debugState, logState);
+    log(logState, 0, LogLevel.Debug, 'after', 'render');
     expect(readMemory(memory)).toHaveLength(1);
   });
 
   it('runs each enabled subsystem disableGuards binding', () => {
     const disableGuards = vi.fn();
-    registerDebugSubsystem('render', { disableGuards });
-    enableDebug({ subsystems: ['render'], sink: createMemoryLogSink(1).sink });
+    registerDebugSubsystem(debugState, 'render', { disableGuards });
+    enableDebug(debugState, logState, { subsystems: ['render'], sink: createMemoryLogSink(1).sink });
 
     expect(disableGuards).not.toHaveBeenCalled();
-    disableDebug();
+    disableDebug(debugState, logState);
     expect(disableGuards).toHaveBeenCalledTimes(1);
   });
 
   it('restores the global level and clears the channel overrides it raised', () => {
-    setLogLevel(LogLevel.Warn);
-    registerDebugSubsystem('render', { channels: ['render'] });
-    enableDebug({ subsystems: ['render'], level: LogLevel.Verbose, sink: createMemoryLogSink(1).sink });
+    setLogLevel(logState, LogLevel.Warn);
+    registerDebugSubsystem(debugState, 'render', { channels: ['render'] });
+    enableDebug(debugState, logState, {
+      subsystems: ['render'],
+      level: LogLevel.Verbose,
+      sink: createMemoryLogSink(1).sink,
+    });
 
-    disableDebug();
-    expect(getLogLevel()).toBe(LogLevel.Warn);
-    expect(getLogChannelLevel('render')).toBeNull();
+    disableDebug(debugState, logState);
+    expect(getLogLevel(logState)).toBe(LogLevel.Warn);
+    expect(getLogChannelLevel(logState, 'render')).toBeNull();
   });
 
   it('preserves channel overrides the caller set before the session', () => {
-    setLogChannelLevel('unrelated', LogLevel.Error);
-    registerDebugSubsystem('render', { channels: ['render'] });
-    enableDebug({ subsystems: ['render'], sink: createMemoryLogSink(1).sink });
+    setLogChannelLevel(logState, 'unrelated', LogLevel.Error);
+    registerDebugSubsystem(debugState, 'render', { channels: ['render'] });
+    enableDebug(debugState, logState, { subsystems: ['render'], sink: createMemoryLogSink(1).sink });
 
-    expect(getLogChannelLevel('render')).toBe(LogLevel.Debug);
+    expect(getLogChannelLevel(logState, 'render')).toBe(LogLevel.Debug);
 
-    disableDebug();
-    expect(getLogChannelLevel('render')).toBeNull();
-    expect(getLogChannelLevel('unrelated')).toBe(LogLevel.Error);
+    disableDebug(debugState, logState);
+    expect(getLogChannelLevel(logState, 'render')).toBeNull();
+    expect(getLogChannelLevel(logState, 'unrelated')).toBe(LogLevel.Error);
   });
 
   it('restores a pre-existing override on a channel debug also raised', () => {
-    setLogChannelLevel('render', LogLevel.Warn);
-    registerDebugSubsystem('render', { channels: ['render'] });
-    enableDebug({ subsystems: ['render'], level: LogLevel.Verbose, sink: createMemoryLogSink(1).sink });
+    setLogChannelLevel(logState, 'render', LogLevel.Warn);
+    registerDebugSubsystem(debugState, 'render', { channels: ['render'] });
+    enableDebug(debugState, logState, {
+      subsystems: ['render'],
+      level: LogLevel.Verbose,
+      sink: createMemoryLogSink(1).sink,
+    });
 
-    expect(getLogChannelLevel('render')).toBe(LogLevel.Verbose);
+    expect(getLogChannelLevel(logState, 'render')).toBe(LogLevel.Verbose);
 
-    disableDebug();
-    expect(getLogChannelLevel('render')).toBe(LogLevel.Warn);
+    disableDebug(debugState, logState);
+    expect(getLogChannelLevel(logState, 'render')).toBe(LogLevel.Warn);
   });
 
   it('is a no-op when debug is not enabled', () => {
-    expect(isDebugEnabled()).toBe(false);
-    expect(() => disableDebug()).not.toThrow();
-    expect(isDebugEnabled()).toBe(false);
+    expect(isDebugEnabled(debugState)).toBe(false);
+    expect(() => disableDebug(debugState, logState)).not.toThrow();
+    expect(isDebugEnabled(debugState)).toBe(false);
   });
 });
 
 describe('enableDebug', () => {
   it('runs a selected subsystem enableGuards and raises its channel levels', () => {
     const enableGuards = vi.fn();
-    registerDebugSubsystem('render', { channels: ['render', 'render.batch'], enableGuards });
+    registerDebugSubsystem(debugState, 'render', { channels: ['render', 'render.batch'], enableGuards });
 
-    enableDebug({ subsystems: ['render'], sink: createMemoryLogSink(1).sink });
+    enableDebug(debugState, logState, { subsystems: ['render'], sink: createMemoryLogSink(1).sink });
 
     expect(enableGuards).toHaveBeenCalledTimes(1);
-    expect(getLogChannelLevel('render')).toBe(LogLevel.Debug);
-    expect(getLogChannelLevel('render.batch')).toBe(LogLevel.Debug);
-    expect(isDebugEnabled()).toBe(true);
+    expect(getLogChannelLevel(logState, 'render')).toBe(LogLevel.Debug);
+    expect(getLogChannelLevel(logState, 'render.batch')).toBe(LogLevel.Debug);
+    expect(isDebugEnabled(debugState)).toBe(true);
   });
 
   it('routes a log on a raised channel to the installed sink', () => {
     const memory = createMemoryLogSink(16);
-    registerDebugSubsystem('render', { channels: ['render'] });
-    enableDebug({ subsystems: ['render'], sink: memory.sink });
+    registerDebugSubsystem(debugState, 'render', { channels: ['render'] });
+    enableDebug(debugState, logState, { subsystems: ['render'], sink: memory.sink });
 
-    log(LogLevel.Debug, { msg: 'draw' }, 'render');
+    log(logState, 0, LogLevel.Debug, { msg: 'draw' }, 'render');
     expect(readMemory(memory)).toHaveLength(1);
   });
 
   it('honors an explicit level and extra channels', () => {
-    registerDebugSubsystem('render', { channels: ['render'] });
-    enableDebug({
+    registerDebugSubsystem(debugState, 'render', { channels: ['render'] });
+    enableDebug(debugState, logState, {
       subsystems: ['render'],
       level: LogLevel.Verbose,
       channels: ['app'],
       sink: createMemoryLogSink(1).sink,
     });
 
-    expect(getLogLevel()).toBe(LogLevel.Verbose);
-    expect(getLogChannelLevel('render')).toBe(LogLevel.Verbose);
-    expect(getLogChannelLevel('app')).toBe(LogLevel.Verbose);
+    expect(getLogLevel(logState)).toBe(LogLevel.Verbose);
+    expect(getLogChannelLevel(logState, 'render')).toBe(LogLevel.Verbose);
+    expect(getLogChannelLevel(logState, 'app')).toBe(LogLevel.Verbose);
   });
 
   it('enables every registered subsystem when none are named', () => {
     const renderGuards = vi.fn();
     const inputGuards = vi.fn();
-    registerDebugSubsystem('render', { enableGuards: renderGuards });
-    registerDebugSubsystem('input', { enableGuards: inputGuards });
+    registerDebugSubsystem(debugState, 'render', { enableGuards: renderGuards });
+    registerDebugSubsystem(debugState, 'input', { enableGuards: inputGuards });
 
-    enableDebug({ sink: createMemoryLogSink(1).sink });
+    enableDebug(debugState, logState, { sink: createMemoryLogSink(1).sink });
 
     expect(renderGuards).toHaveBeenCalledTimes(1);
     expect(inputGuards).toHaveBeenCalledTimes(1);
@@ -165,20 +208,20 @@ describe('enableDebug', () => {
 
   it('skips an unregistered subsystem name without throwing', () => {
     const memory = createMemoryLogSink(1);
-    expect(() => enableDebug({ subsystems: ['audio'], sink: memory.sink })).not.toThrow();
-    expect(isDebugEnabled()).toBe(true);
+    expect(() => enableDebug(debugState, logState, { subsystems: ['audio'], sink: memory.sink })).not.toThrow();
+    expect(isDebugEnabled(debugState)).toBe(true);
   });
 
   it('is idempotent — a second enable while active does not re-run guards or re-install', () => {
     const enableGuards = vi.fn();
     const memory = createMemoryLogSink(16);
-    registerDebugSubsystem('render', { channels: ['render'], enableGuards });
+    registerDebugSubsystem(debugState, 'render', { channels: ['render'], enableGuards });
 
-    enableDebug({ subsystems: ['render'], sink: memory.sink });
-    enableDebug({ subsystems: ['render'], sink: memory.sink });
+    enableDebug(debugState, logState, { subsystems: ['render'], sink: memory.sink });
+    enableDebug(debugState, logState, { subsystems: ['render'], sink: memory.sink });
 
     expect(enableGuards).toHaveBeenCalledTimes(1);
-    log(LogLevel.Debug, 'once', 'render');
+    log(logState, 0, LogLevel.Debug, 'once', 'render');
     expect(readMemory(memory)).toHaveLength(1);
   });
 
@@ -200,31 +243,31 @@ describe('enableDebug', () => {
         if (failEnable) throw originalError;
       },
     });
-    registerDebugSubsystem('render', hooks('render'));
-    registerDebugSubsystem('input', hooks('input', false, true));
-    registerDebugSubsystem('audio', hooks('audio', true));
-    setLogLevel(LogLevel.Warn);
-    setLogChannelLevel('render', LogLevel.Error);
-    setLogChannelLevel('input', LogLevel.Info);
-    setLogChannelLevel('unrelated', LogLevel.Verbose);
+    registerDebugSubsystem(debugState, 'render', hooks('render'));
+    registerDebugSubsystem(debugState, 'input', hooks('input', false, true));
+    registerDebugSubsystem(debugState, 'audio', hooks('audio', true));
+    setLogLevel(logState, LogLevel.Warn);
+    setLogChannelLevel(logState, 'render', LogLevel.Error);
+    setLogChannelLevel(logState, 'input', LogLevel.Info);
+    setLogChannelLevel(logState, 'unrelated', LogLevel.Verbose);
 
     let thrown: unknown;
     try {
-      enableDebug({ subsystems: ['render', 'input', 'audio'], sink: memory.sink });
+      enableDebug(debugState, logState, { subsystems: ['render', 'input', 'audio'], sink: memory.sink });
     } catch (error) {
       thrown = error;
     }
 
     expect(thrown).toBe(originalError);
-    expect(isDebugEnabled()).toBe(false);
+    expect(isDebugEnabled(debugState)).toBe(false);
     expect([...activeGuards]).toEqual([]);
     expect(rollbackOrder).toEqual(['audio', 'input', 'render']);
-    expect(getLogLevel()).toBe(LogLevel.Warn);
-    expect(getLogChannelLevel('render')).toBe(LogLevel.Error);
-    expect(getLogChannelLevel('input')).toBe(LogLevel.Info);
-    expect(getLogChannelLevel('audio')).toBeNull();
-    expect(getLogChannelLevel('unrelated')).toBe(LogLevel.Verbose);
-    log(LogLevel.Error, 'after failed enable');
+    expect(getLogLevel(logState)).toBe(LogLevel.Warn);
+    expect(getLogChannelLevel(logState, 'render')).toBe(LogLevel.Error);
+    expect(getLogChannelLevel(logState, 'input')).toBe(LogLevel.Info);
+    expect(getLogChannelLevel(logState, 'audio')).toBeNull();
+    expect(getLogChannelLevel(logState, 'unrelated')).toBe(LogLevel.Verbose);
+    log(logState, 0, LogLevel.Error, 'after failed enable');
     expect(readMemory(memory)).toEqual([]);
   });
 });
@@ -232,41 +275,55 @@ describe('enableDebug', () => {
 describe('enableFlightDiagnostics', () => {
   it('enables the console diagnostics session and every generic render guard for the state', () => {
     const state = createRenderState();
-    enableFlightDiagnostics(state);
-    expect(isDebugEnabled()).toBe(true);
+    enableFlightDiagnostics(debugState, logState, state);
+    expect(isDebugEnabled(debugState)).toBe(true);
     expect(areColorAdjustmentGuardsEnabled(state)).toBe(true);
     expect(areRenderRegistriesGuardsEnabled(state)).toBe(true);
   });
 });
 
+describe('initializeDebugState', () => {
+  it('resets a used state to the fresh baseline', () => {
+    const state = createDebugState();
+    state.enabled = true;
+    state.frameNumber = 12;
+    state.savedChannelLevels.set('render', null);
+    initializeDebugState(state);
+    expect(state.enabled).toBe(false);
+    expect(state.frameNumber).toBe(0);
+    expect(state.savedChannelLevels.size).toBe(0);
+    expect(state.savedGlobalLevel).toBe(LogLevel.Verbose);
+  });
+});
+
 describe('isDebugEnabled', () => {
   it('reports the enable/disable lifecycle', () => {
-    expect(isDebugEnabled()).toBe(false);
-    enableDebug({ sink: createMemoryLogSink(1).sink });
-    expect(isDebugEnabled()).toBe(true);
-    disableDebug();
-    expect(isDebugEnabled()).toBe(false);
+    expect(isDebugEnabled(debugState)).toBe(false);
+    enableDebug(debugState, logState, { sink: createMemoryLogSink(1).sink });
+    expect(isDebugEnabled(debugState)).toBe(true);
+    disableDebug(debugState, logState);
+    expect(isDebugEnabled(debugState)).toBe(false);
   });
 });
 
 describe('registerDebugSubsystem', () => {
   it('drives a newly registered subsystem through enableDebug', () => {
     const enableGuards = vi.fn();
-    registerDebugSubsystem('acme.custom', { channels: ['acme.custom'], enableGuards });
+    registerDebugSubsystem(debugState, 'acme.custom', { channels: ['acme.custom'], enableGuards });
 
-    enableDebug({ subsystems: ['acme.custom'], sink: createMemoryLogSink(1).sink });
+    enableDebug(debugState, logState, { subsystems: ['acme.custom'], sink: createMemoryLogSink(1).sink });
 
     expect(enableGuards).toHaveBeenCalledTimes(1);
-    expect(getLogChannelLevel('acme.custom')).toBe(LogLevel.Debug);
+    expect(getLogChannelLevel(logState, 'acme.custom')).toBe(LogLevel.Debug);
   });
 
   it('is last-write-wins for a repeated name', () => {
     const first = vi.fn();
     const second = vi.fn();
-    registerDebugSubsystem('render', { enableGuards: first });
-    registerDebugSubsystem('render', { enableGuards: second });
+    registerDebugSubsystem(debugState, 'render', { enableGuards: first });
+    registerDebugSubsystem(debugState, 'render', { enableGuards: second });
 
-    enableDebug({ subsystems: ['render'], sink: createMemoryLogSink(1).sink });
+    enableDebug(debugState, logState, { subsystems: ['render'], sink: createMemoryLogSink(1).sink });
 
     expect(first).not.toHaveBeenCalled();
     expect(second).toHaveBeenCalledTimes(1);
@@ -276,14 +333,18 @@ describe('registerDebugSubsystem', () => {
 describe('unregisterDebugSubsystem', () => {
   it('returns true and stops the subsystem from being driven', () => {
     const enableGuards = vi.fn();
-    registerDebugSubsystem('render', { enableGuards });
+    registerDebugSubsystem(debugState, 'render', { enableGuards });
 
-    expect(unregisterDebugSubsystem('render')).toBe(true);
-    enableDebug({ subsystems: ['render'], sink: createMemoryLogSink(1).sink });
+    expect(unregisterDebugSubsystem(debugState, 'render')).toBe(true);
+    enableDebug(debugState, logState, { subsystems: ['render'], sink: createMemoryLogSink(1).sink });
     expect(enableGuards).not.toHaveBeenCalled();
   });
 
   it('returns false for a name that was never registered', () => {
-    expect(unregisterDebugSubsystem('audio')).toBe(false);
+    expect(unregisterDebugSubsystem(debugState, 'audio')).toBe(false);
   });
 });
+
+let clockMs = 0;
+let debugState: DebugState = createDebugState();
+let logState: LogState = createLogState();

package/src/debugTiming.test.ts

@@ -1,44 +1,61 @@
+import type { LogState } from '@flighthq/log/contract';
 import {
   addLogSink,
   clearLogChannelLevels,
   clearLogSinks,
+  createLogState,
   createMemoryLogSink,
   getMemoryLogSinkEntries,
   setLogLevel,
 } from '@flighthq/log/contract';
-import type { MemoryLogSink } from '@flighthq/types/contract';
+import type { LogEntry, MemoryLogSink } from '@flighthq/types/contract';
 import { LogLevel } from '@flighthq/types/contract';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { disableDebug, enableDebug, isDebugEnabled } from './debug.ts';
+import type { DebugState } from './debug.ts';
+import { createDebugState, disableDebug, enableDebug, isDebugEnabled } from './debug.ts';
 import { beginDebugSpan, endDebugSpan, markDebugFrame, measureDebugSpan } from './debugTiming.ts';
 
 function entryData(sink: MemoryLogSink): Readonly<Record<string, unknown>>[] {
-  return getMemoryLogSinkEntries(sink).map((entry) => (entry as { data: Record<string, unknown> }).data);
+  return readLogEntries(sink).map((entry) => (entry as { data: Record<string, unknown> }).data);
+}
+
+// Monotonic test clock: each read advances one millisecond, so spans measure a positive duration.
+function clock(): number {
+  return ++clockMs;
+}
+
+function readLogEntries(sink: Readonly<MemoryLogSink>): LogEntry[] {
+  const entries: LogEntry[] = [];
+  getMemoryLogSinkEntries(entries, sink);
+  return entries;
 }
 
 beforeEach(() => {
-  if (isDebugEnabled()) disableDebug();
-  clearLogSinks();
-  clearLogChannelLevels();
-  setLogLevel(LogLevel.Verbose);
+  clockMs = 0;
+  debugState = createDebugState();
+  logState = createLogState();
+  if (isDebugEnabled(debugState)) disableDebug(debugState, logState);
+  clearLogSinks(logState);
+  clearLogChannelLevels(logState);
+  setLogLevel(logState, LogLevel.Verbose);
 });
 
 afterEach(() => {
-  if (isDebugEnabled()) disableDebug();
-  clearLogSinks();
-  clearLogChannelLevels();
-  setLogLevel(LogLevel.Verbose);
+  if (isDebugEnabled(debugState)) disableDebug(debugState, logState);
+  clearLogSinks(logState);
+  clearLogChannelLevels(logState);
+  setLogLevel(logState, LogLevel.Verbose);
 });
 
 describe('beginDebugSpan', () => {
   it('returns null when debug is disabled', () => {
-    expect(beginDebugSpan('draw')).toBeNull();
+    expect(beginDebugSpan(debugState, clock(), 'draw')).toBeNull();
   });
 
   it('returns a running timer when debug is enabled', () => {
-    enableDebug({ sink: createMemoryLogSink(1).sink });
-    const timer = beginDebugSpan('draw');
+    enableDebug(debugState, logState, { sink: createMemoryLogSink(1).sink });
+    const timer = beginDebugSpan(debugState, clock(), 'draw');
     expect(timer).not.toBeNull();
     expect(timer!.label).toBe('draw');
   });
@@ -46,14 +63,15 @@ describe('beginDebugSpan', () => {
 
 describe('endDebugSpan', () => {
   it('is a no-op returning -1 for a null timer', () => {
-    expect(endDebugSpan(null)).toBe(-1);
+    expect(endDebugSpan(logState, clock(), null)).toBe(-1);
   });
 
   it('emits an elapsed-time entry and returns the elapsed milliseconds', () => {
     const memory = createMemoryLogSink(16);
-    enableDebug({ sink: memory.sink });
-    const elapsed = endDebugSpan(beginDebugSpan('draw'));
-    expect(elapsed).toBeGreaterThanOrEqual(0);
+    enableDebug(debugState, logState, { sink: memory.sink });
+    const timer = beginDebugSpan(debugState, clock(), 'draw');
+    const elapsed = endDebugSpan(logState, clock(), timer);
+    expect(elapsed).toBe(1);
     const data = entryData(memory);
     expect(data).toHaveLength(1);
     expect(data[0].label).toBe('draw');
@@ -64,23 +82,23 @@ describe('endDebugSpan', () => {
 describe('markDebugFrame', () => {
   it('is a no-op when debug is disabled', () => {
     const memory = createMemoryLogSink(4);
-    addLogSink(memory.sink);
-    markDebugFrame();
-    expect(getMemoryLogSinkEntries(memory)).toHaveLength(0);
+    addLogSink(logState, memory.sink);
+    markDebugFrame(debugState, logState, clock());
+    expect(readLogEntries(memory)).toHaveLength(0);
   });
 
   it('emits a labeled frame marker when debug is enabled', () => {
     const memory = createMemoryLogSink(16);
-    enableDebug({ sink: memory.sink });
-    markDebugFrame('level-load');
+    enableDebug(debugState, logState, { sink: memory.sink });
+    markDebugFrame(debugState, logState, clock(), 'level-load');
     expect(entryData(memory)[0].frame).toBe('level-load');
   });
 
   it('tags an unlabeled marker with an ascending counter', () => {
     const memory = createMemoryLogSink(16);
-    enableDebug({ sink: memory.sink });
-    markDebugFrame();
-    markDebugFrame();
+    enableDebug(debugState, logState, { sink: memory.sink });
+    markDebugFrame(debugState, logState, clock());
+    markDebugFrame(debugState, logState, clock());
     const [a, b] = entryData(memory);
     expect(typeof a.frame).toBe('number');
     expect(b.frame as number).toBeGreaterThan(a.frame as number);
@@ -89,24 +107,24 @@ describe('markDebugFrame', () => {
 
 describe('measureDebugSpan', () => {
   it('returns the wrapped function result', () => {
-    expect(measureDebugSpan('compute', () => 42)).toBe(42);
+    expect(measureDebugSpan(debugState, logState, clock, 'compute', () => 42)).toBe(42);
   });
 
   it('runs the function but emits nothing when debug is disabled', () => {
     const memory = createMemoryLogSink(4);
-    addLogSink(memory.sink);
+    addLogSink(logState, memory.sink);
     let ran = false;
-    measureDebugSpan('compute', () => {
+    measureDebugSpan(debugState, logState, clock, 'compute', () => {
       ran = true;
     });
     expect(ran).toBe(true);
-    expect(getMemoryLogSinkEntries(memory)).toHaveLength(0);
+    expect(readLogEntries(memory)).toHaveLength(0);
   });
 
   it('emits one timing entry named for the span when debug is enabled', () => {
     const memory = createMemoryLogSink(16);
-    enableDebug({ sink: memory.sink });
-    measureDebugSpan('compute', () => 1);
+    enableDebug(debugState, logState, { sink: memory.sink });
+    measureDebugSpan(debugState, logState, clock, 'compute', () => 1);
     const data = entryData(memory);
     expect(data).toHaveLength(1);
     expect(data[0].label).toBe('compute');
@@ -114,12 +132,16 @@ describe('measureDebugSpan', () => {
 
   it('closes the span even when the function throws', () => {
     const memory = createMemoryLogSink(16);
-    enableDebug({ sink: memory.sink });
+    enableDebug(debugState, logState, { sink: memory.sink });
     expect(() =>
-      measureDebugSpan('boom', () => {
+      measureDebugSpan(debugState, logState, clock, 'boom', () => {
         throw new Error('nope');
       }),
     ).toThrow('nope');
     expect(entryData(memory)).toHaveLength(1);
   });
 });
+
+let clockMs = 0;
+let debugState: DebugState = createDebugState();
+let logState: LogState = createLogState();