@agentdeck/bridge 1.0.4 → 1.0.6

package/dist/codex-otel.js

@@ -0,0 +1,487 @@
+// codex-otel.ts — Ingest OTLP/HTTP JSON spans emitted by Codex (CLI and the
+// ChatGPT.app Codex desktop app) and turn them into session state.
+//
+// Codex's OTel exporter is configured to POST at the daemon
+// (`[otel.trace_exporter.otlp-http] endpoint = ".../otel/v1/traces"`), but only
+// the Swift daemon implemented that route — the Node daemon answered 404 and
+// every span was discarded. This is the Node port of
+// `apple/AgentDeck/Daemon/Modules/CodexTelemetryModule.swift`; keep the two
+// aligned when Codex's span vocabulary moves. The parser half is a faithful
+// mirror (same span names, attribute aliases, cwd tiers, durable-id rules); the
+// tracker half is deliberately Node-specific, because this daemon also has the
+// ps/lsof passive observer that Swift (App Store, no subprocesses) cannot have —
+// see `CodexOtelTracker`.
+//
+// Codex's OTel keys are not a documented stable API, so we accept several
+// naming variants (dotted vs underscored, `codex.thread_id` vs `thread.id`) and
+// silently drop anything unrecognized.
+//
+// What today's builds actually emit (measured 2026-08-04 against ChatGPT.app
+// 150.0.7871.182 / `codex-app-server` 0.146.0-alpha.9.2, 11.5k spans):
+// **no conversation identity at all**. `thread.id` there is the tokio worker
+// thread ("3", "8", …) — which `isDurableSessionId` correctly rejects — and the
+// build emits no turn-boundary span, only mid-turn `run_sampling_request` /
+// `receiving` / tool spans. So every span folds onto the anonymous key and this
+// module drives nothing for that build; the session comes from the ps/lsof
+// observer, whose rollout carries the identity the spans lack. See the live
+// fixture in `__tests__/codex-otel.test.ts` — that test is where a future build
+// gaining `codex.thread_id` UUIDs or `turn/start` spans will show up first.
+// Ingest cost on that traffic is ~0.44 ms per batch, so serving the route is
+// cheap even while it yields nothing.
+import { rawSessionId } from '@agentdeck/shared';
+import { resolveProjectNameFromCwdCached } from './utils/project-name.js';
+/** Singleton key for trace-backed spans that carry no durable thread id. */
+export const ANONYMOUS_OTEL_THREAD_ID = 'otel-active';
+/**
+ * Route Codex's OTel exporter posts to. `hooks/src/codex-install.ts`
+ * (`buildOtelEndpoint`) writes this path into `~/.codex/config.toml` and
+ * `CodexOtelRoutes` serves it on the Swift daemon — the three must agree. The
+ * hooks package carries its own literal because it has no workspace deps.
+ */
+export const CODEX_OTEL_TRACES_PATH = '/otel/v1/traces';
+/**
+ * Span names that start a user turn. Their own `cwd` attribute is session-level
+ * (the workspace), unlike tool spans whose `cwd` may be subprocess-scoped. Keep
+ * aligned with the `turnStart` dispatch case below.
+ */
+const TURN_START_SPAN_NAMES = new Set([
+    'codex.turn',
+    'codex.turn.start',
+    'turn.start',
+    'op.dispatch.user.turn',
+    'op.dispatch.user.input.with.turn.context',
+]);
+const TOOL_CALL_SPAN_NAMES = new Set([
+    'codex.tool.call', 'tool.call', 'turn.tool.call', 'build.tool.call',
+    'handle.tool.call', 'handle.tool.call.with.source', 'exec.command', 'mcp.tools.call',
+]);
+const TOOL_RESULT_SPAN_NAMES = new Set([
+    'codex.tool.result', 'tool.result', 'tool.call.duration.ms',
+    'dispatch.tool.call.with.code.mode.result', 'handle.output.item.done',
+]);
+const TURN_END_SPAN_NAMES = new Set(['codex.turn.end', 'turn.end', 'session.task.turn']);
+const ACTIVITY_SPAN_NAMES = new Set([
+    'receiving', 'handle.responses', 'responses.websocket.stream.request',
+    'model.client.stream.responses.websocket', 'stream.request',
+]);
+/**
+ * Attribute aliases under which Codex builds have been observed publishing the
+ * workspace directory. Centralised so the resource-level scan, the span-level
+ * scan, and the classifier read the same list.
+ */
+const CWD_ATTRIBUTE_KEYS = [
+    'cwd', 'codex.cwd', 'working.directory', 'working_directory', 'working.dir',
+    'workdir', 'workspace.path', 'workspace.root', 'workspace_root',
+    'project.path', 'project.root', 'project_root', 'repo.path',
+    'repository.path', 'terminal.cwd', 'process.cwd',
+];
+const THREAD_ID_KEYS = ['codex.thread_id', 'codex.thread.id', 'thread.id', 'thread_id', 'threadId'];
+const TURN_ID_KEYS = ['codex.turn_id', 'turn.id', 'turn_id'];
+const TOOL_NAME_KEYS = ['tool.name', 'tool', 'codex.tool', 'mcp.tool.name', 'mcp.tool'];
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function recordArray(value) {
+    return Array.isArray(value) ? value.filter(isRecord) : [];
+}
+/**
+ * OTLP attributes are arrays of `{ key, value: { <type>Value } }`. Flatten to a
+ * plain map so callers can dot-key into it without re-parsing the envelope.
+ */
+function flattenAttrs(raw) {
+    const out = {};
+    for (const kv of recordArray(raw)) {
+        const key = kv.key;
+        const wrap = kv.value;
+        if (typeof key !== 'string' || !isRecord(wrap))
+            continue;
+        if (typeof wrap.stringValue === 'string') {
+            out[key] = wrap.stringValue;
+            continue;
+        }
+        if (wrap.intValue !== undefined) {
+            // OTLP encodes int64 as a number or a stringified number depending on SDK
+            // version — accept both so an exporter swap doesn't silently drop keys.
+            if (typeof wrap.intValue === 'number')
+                out[key] = wrap.intValue;
+            else if (typeof wrap.intValue === 'string' && /^-?\d+$/.test(wrap.intValue))
+                out[key] = Number(wrap.intValue);
+            continue;
+        }
+        if (typeof wrap.boolValue === 'boolean') {
+            out[key] = wrap.boolValue;
+            continue;
+        }
+        if (typeof wrap.doubleValue === 'number') {
+            out[key] = wrap.doubleValue;
+            continue;
+        }
+    }
+    return out;
+}
+/** First non-empty string/int attribute among `keys`. */
+function stringAttr(attrs, keys) {
+    for (const key of keys) {
+        const value = attrs[key];
+        if (typeof value === 'string' && value.length > 0)
+            return value;
+        if (typeof value === 'number')
+            return String(value);
+    }
+    return undefined;
+}
+function stripCodexPrefix(raw) {
+    return raw.startsWith('codex:') ? raw.slice('codex:'.length) : raw;
+}
+/**
+ * A thread id worth synthesizing a session row for: long enough to be a real
+ * conversation id and not purely numeric. Short numeric ids (`thread.id: "11"`)
+ * are turn-scoped companion-task counters — accepting them spawned ghost
+ * creatures on the dashboard.
+ */
+function isDurableSessionId(raw) {
+    const trimmed = stripCodexPrefix(raw).trim();
+    if (trimmed.length < 12)
+        return false;
+    return /\D/.test(trimmed);
+}
+/**
+ * First attribute among `keys` whose value is durable — a preference order, not
+ * a winner-take-all early exit. Some Codex builds emit both a turn-scoped short
+ * id (`codex.thread_id: "11"`) and the real UUID (`thread.id: "019dee40-…"`) on
+ * the same span; taking the first non-empty one would drop the good id.
+ */
+function firstDurableAttr(attrs, keys) {
+    for (const key of keys) {
+        const value = attrs[key];
+        if (typeof value === 'string' && value.length > 0 && isDurableSessionId(value))
+            return value;
+        if (typeof value === 'number' && isDurableSessionId(String(value)))
+            return String(value);
+    }
+    return undefined;
+}
+function threadIdAttr(attrs) {
+    const threadId = firstDurableAttr(attrs, THREAD_ID_KEYS);
+    if (threadId)
+        return stripCodexPrefix(threadId);
+    const sessionId = firstDurableAttr(attrs, ['session_id', 'session.id']);
+    if (sessionId)
+        return stripCodexPrefix(sessionId);
+    return undefined;
+}
+function traceIdAttr(span) {
+    for (const key of ['traceId', 'traceID', 'trace_id']) {
+        const value = span[key];
+        if (typeof value === 'string' && value.length > 0)
+            return value;
+    }
+    return undefined;
+}
+/**
+ * Some Codex App / app-server batches carry useful progress spans but omit a
+ * durable thread id. Rather than drop them, fold them onto one anonymous key so
+ * liveness is still observable — a singleton, so internal traces can't spawn one
+ * sprite each. Real thread ids always win.
+ */
+function anonymousThreadIdIfTraceBacked(span) {
+    return traceIdAttr(span) === undefined ? undefined : ANONYMOUS_OTEL_THREAD_ID;
+}
+function normalizeSpanName(rawName) {
+    return rawName.replaceAll('_', '.').replaceAll('/', '.');
+}
+function isTurnStartSpan(span) {
+    const rawName = span.name;
+    if (typeof rawName !== 'string')
+        return false;
+    return TURN_START_SPAN_NAMES.has(normalizeSpanName(rawName));
+}
+function cwdFromAttributes(attrs) {
+    return stringAttr(attrs, CWD_ATTRIBUTE_KEYS);
+}
+function inferredToolName(normalizedSpanName) {
+    return normalizedSpanName === 'exec.command' ? 'exec' : 'tool';
+}
+function* eachSpan(json) {
+    for (const resource of recordArray(json.resourceSpans)) {
+        const resourceAttrs = flattenAttrs(isRecord(resource.resource) ? resource.resource.attributes : undefined);
+        for (const scope of recordArray(resource.scopeSpans)) {
+            for (const span of recordArray(scope.spans)) {
+                yield { span, resourceAttrs };
+            }
+        }
+    }
+}
+/**
+ * Per-thread session cwd, in two priority tiers — never batch-wide (that leaks
+ * A→B across concurrent sessions) and never from a tool/activity span's own cwd
+ * attribute (those carry per-call subprocess cwd like `exec_command`'s
+ * `process.cwd` pointing at /tmp). A wrong first value would permanently lock a
+ * session's project label, because the tracker's upgrade guard only fires once.
+ *
+ *  Tier 1 — turnStart spans' own cwd. Session-level per Codex's contract.
+ *  Tier 2 — resource-level cwd. Workspace-scoped for every thread under it.
+ */
+function buildCwdByThread(json) {
+    const cwdByThread = new Map();
+    for (const { span, resourceAttrs } of eachSpan(json)) {
+        if (!isTurnStartSpan(span))
+            continue;
+        const spanAttrs = flattenAttrs(span.attributes);
+        const cwd = cwdFromAttributes(spanAttrs);
+        if (!cwd)
+            continue;
+        const merged = { ...resourceAttrs, ...spanAttrs };
+        const threadId = threadIdAttr(merged) ?? anonymousThreadIdIfTraceBacked(span);
+        if (threadId && !cwdByThread.has(threadId))
+            cwdByThread.set(threadId, cwd);
+    }
+    for (const { span, resourceAttrs } of eachSpan(json)) {
+        const resourceCwd = cwdFromAttributes(resourceAttrs);
+        if (!resourceCwd)
+            continue;
+        const merged = { ...resourceAttrs, ...flattenAttrs(span.attributes) };
+        const threadId = threadIdAttr(merged) ?? anonymousThreadIdIfTraceBacked(span);
+        if (threadId && !cwdByThread.has(threadId))
+            cwdByThread.set(threadId, resourceCwd);
+    }
+    return cwdByThread;
+}
+function classify(span, resourceAttrs, cwdByThread) {
+    const rawName = span.name;
+    if (typeof rawName !== 'string')
+        return undefined;
+    const attrs = { ...resourceAttrs, ...flattenAttrs(span.attributes) };
+    const threadId = threadIdAttr(attrs) ?? anonymousThreadIdIfTraceBacked(span);
+    if (!threadId)
+        return undefined;
+    const turnId = stringAttr(attrs, TURN_ID_KEYS) ?? traceIdAttr(span) ?? '';
+    // turnStart trusts its own cwd attr, falling back to the thread map. Every
+    // other span type IGNORES its own cwd attr (subprocess-scoped) and uses only
+    // the thread-scoped fallback built above.
+    const cwd = isTurnStartSpan(span)
+        ? (cwdFromAttributes(attrs) ?? cwdByThread.get(threadId))
+        : cwdByThread.get(threadId);
+    const normalized = normalizeSpanName(rawName);
+    if (TURN_START_SPAN_NAMES.has(normalized))
+        return { kind: 'turnStart', threadId, turnId, cwd };
+    if (TOOL_CALL_SPAN_NAMES.has(normalized)) {
+        const tool = stringAttr(attrs, TOOL_NAME_KEYS) ?? inferredToolName(normalized);
+        return { kind: 'toolCall', threadId, turnId, tool, cwd };
+    }
+    if (TOOL_RESULT_SPAN_NAMES.has(normalized))
+        return { kind: 'toolResult', threadId, turnId };
+    if (TURN_END_SPAN_NAMES.has(normalized))
+        return { kind: 'turnEnd', threadId, turnId };
+    if (ACTIVITY_SPAN_NAMES.has(normalized))
+        return { kind: 'activity', threadId, turnId, name: rawName, cwd };
+    return undefined;
+}
+/** Parse an OTLP/HTTP `ExportTraceServiceRequest` body into ordered events. */
+export function parseCodexSpans(json) {
+    if (!isRecord(json))
+        return [];
+    const cwdByThread = buildCwdByThread(json);
+    const events = [];
+    for (const { span, resourceAttrs } of eachSpan(json)) {
+        const event = classify(span, resourceAttrs, cwdByThread);
+        if (event)
+            events.push(event);
+    }
+    return events;
+}
+/** Diagnostic for unrecognized future schemas — span names, not whole bodies. */
+export function spanNameSummary(json, limit = 12) {
+    if (!isRecord(json))
+        return '';
+    const names = [];
+    for (const { span } of eachSpan(json)) {
+        if (typeof span.name === 'string' && span.name.length > 0)
+            names.push(span.name);
+        if (names.length >= limit)
+            break;
+    }
+    return names.join(',');
+}
+/** A turn OTel says ended stops driving a synthesized row after this long. */
+const POST_TERMINAL_TTL_MS = 60_000;
+/** Any thread this quiet is dropped — a dead exporter must not pin a creature. */
+const THREAD_IDLE_TTL_MS = 5 * 60_000;
+/**
+ * How long an OTel observation may override the ps observer's state. Beyond
+ * this the rollout tail is the fresher signal again.
+ */
+const STATE_OVERLAY_TTL_MS = 2 * 60_000;
+/**
+ * Thread state distilled from OTLP spans, projected onto the sessions list.
+ *
+ * The division of labour is Node-specific. Swift has no process visibility, so
+ * there OTel is the *only* Codex-app session source. Here the ps/lsof observer
+ * already produces a richer row (model, tokens, goal, context) for any Codex
+ * that holds a rollout open, so OTel plays two narrower parts:
+ *
+ *  1. Overlay — turn boundaries land in milliseconds, where the observer only
+ *     re-reads the rollout tail every scan interval. When both describe the same
+ *     thread, a fresh OTel state/tool wins.
+ *  2. Fallback — when no observed row matches (rollout not open, lsof blind,
+ *     a Codex the process scan can't see), synthesize a `codex-app` row so the
+ *     session still appears. This is the Swift-parity path.
+ */
+export class CodexOtelTracker {
+    threads = new Map();
+    /** Fired when ingestion changed something worth broadcasting. */
+    onChanged;
+    /** Ingest one OTLP body. Returns the number of recognized events. */
+    ingest(json, now = Date.now()) {
+        const events = parseCodexSpans(json);
+        let changed = false;
+        for (const event of events) {
+            // Anonymous trace-backed spans are liveness noise, not an identity: they
+            // must never synthesize or drive a session row (Swift parity —
+            // `shouldUseCodexOtelThreadForSessionState`).
+            if (event.threadId === ANONYMOUS_OTEL_THREAD_ID)
+                continue;
+            changed = this.apply(event, now) || changed;
+        }
+        this.sweep(now);
+        if (changed)
+            this.onChanged?.();
+        return events.length;
+    }
+    apply(event, now) {
+        const existing = this.threads.get(event.threadId);
+        // Progress-only spans keep a live turn from ageing out; they must never
+        // revive a finished or idle thread, nor open one (Swift
+        // `shouldUseCodexOtelActivityForState`). Bailing before the `lastEventAt`
+        // bump is what keeps a dead thread expiring on schedule.
+        if (event.kind === 'activity'
+            && (!existing || existing.terminalAt !== undefined || existing.state !== 'processing')) {
+            return false;
+        }
+        const thread = existing ?? {
+            threadId: event.threadId,
+            state: 'idle',
+            startedAt: now,
+            lastEventAt: now,
+        };
+        const before = JSON.stringify(thread);
+        thread.lastEventAt = now;
+        // cwd upgrades once, empty→set. Later spans can only carry a subprocess cwd
+        // (the parser already restricts the source), so overwriting would lock the
+        // project label onto the wrong path.
+        if (!thread.cwd && event.kind !== 'toolResult' && event.kind !== 'turnEnd' && event.cwd) {
+            thread.cwd = event.cwd;
+        }
+        switch (event.kind) {
+            case 'turnStart':
+                thread.servicedTurnId = event.turnId;
+                thread.terminalAt = undefined;
+                thread.state = 'processing';
+                thread.currentTool = undefined;
+                break;
+            case 'toolCall':
+                if (thread.terminalAt !== undefined)
+                    break; // late span from a finished turn
+                thread.state = 'processing';
+                thread.currentTool = usefulToolName(event.tool);
+                break;
+            case 'toolResult':
+                if (thread.terminalAt !== undefined)
+                    break;
+                thread.state = 'processing';
+                thread.currentTool = undefined;
+                break;
+            case 'turnEnd':
+                // Stop-drift guard: a `turnEnd` can land seconds late, by which point a
+                // newer prompt already opened a fresh turn. Close only the turn OTel is
+                // actually servicing; when OTel never saw this turn's start, let it
+                // close (nothing else here knows better).
+                if (thread.servicedTurnId && event.turnId && thread.servicedTurnId !== event.turnId)
+                    break;
+                thread.state = 'idle';
+                thread.currentTool = undefined;
+                thread.servicedTurnId = undefined;
+                thread.terminalAt = now;
+                break;
+            case 'activity':
+                // Guarded above; reaching here only refreshes `lastEventAt`.
+                break;
+        }
+        this.threads.set(event.threadId, thread);
+        return JSON.stringify(thread) !== before;
+    }
+    sweep(now) {
+        for (const [threadId, thread] of this.threads) {
+            const terminalExpired = thread.terminalAt !== undefined
+                && now - thread.terminalAt > POST_TERMINAL_TTL_MS;
+            if (terminalExpired || now - thread.lastEventAt > THREAD_IDLE_TTL_MS) {
+                this.threads.delete(threadId);
+            }
+        }
+    }
+    /** Live thread snapshot (diagnostics / tests). */
+    snapshot() {
+        return [...this.threads.values()];
+    }
+    /**
+     * Overlay fresh OTel state onto matching observed rows, and append a
+     * `codex-app` row for every thread the process scan didn't find.
+     */
+    applyTo(observed, now = Date.now()) {
+        this.sweep(now);
+        if (this.threads.size === 0)
+            return observed;
+        const matched = new Set();
+        const overlaid = observed.map((session) => {
+            if (session.agentType !== 'codex-cli' && session.agentType !== 'codex-app')
+                return session;
+            const thread = this.threads.get(rawSessionId(session.id));
+            if (!thread)
+                return session;
+            matched.add(thread.threadId);
+            if (now - thread.lastEventAt > STATE_OVERLAY_TTL_MS)
+                return session;
+            return {
+                ...session,
+                state: thread.state,
+                // `currentTask` is the observer's rollout-derived label; only replace it
+                // while OTel has a tool in flight, so a finished turn falls back to the
+                // richer text instead of blanking.
+                ...(thread.currentTool ? { currentTask: thread.currentTool } : {}),
+            };
+        });
+        const synthesized = [];
+        for (const thread of this.threads.values()) {
+            if (matched.has(thread.threadId))
+                continue;
+            const cwd = thread.cwd;
+            synthesized.push({
+                id: `observed:codex-app:${thread.threadId}`,
+                port: 0,
+                pid: 0,
+                // No cwd yet means no project: borrowing a sibling session's name is how
+                // the macOS dashboard once labelled Codex with a neighbour's project.
+                projectName: cwd ? resolveProjectNameFromCwdCached(cwd) : 'Codex',
+                agentType: 'codex-app',
+                alive: true,
+                state: thread.state,
+                controlMode: 'observed',
+                cwd,
+                currentTask: thread.currentTool,
+                startedAt: new Date(thread.startedAt).toISOString(),
+            });
+        }
+        return synthesized.length > 0 ? [...overlaid, ...synthesized] : overlaid;
+    }
+}
+/**
+ * Drop tool labels that carry no information for a dashboard row. Codex emits
+ * `tool`/`unknown` placeholders on spans whose name attribute is missing.
+ */
+function usefulToolName(tool) {
+    const trimmed = tool.trim();
+    if (!trimmed || trimmed === 'tool' || trimmed === 'unknown')
+        return undefined;
+    return trimmed;
+}
+//# sourceMappingURL=codex-otel.js.map

package/dist/codex-otel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-otel.js","sourceRoot":"","sources":["../src/codex-otel.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,mEAAmE;AACnE,EAAE;AACF,4DAA4D;AAC5D,gFAAgF;AAChF,6EAA6E;AAC7E,qDAAqD;AACrD,4EAA4E;AAC5E,4EAA4E;AAC5E,gFAAgF;AAChF,+EAA+E;AAC/E,iFAAiF;AACjF,0BAA0B;AAC1B,EAAE;AACF,0EAA0E;AAC1E,gFAAgF;AAChF,uCAAuC;AACvC,EAAE;AACF,6EAA6E;AAC7E,uEAAuE;AACvE,6EAA6E;AAC7E,gFAAgF;AAChF,4EAA4E;AAC5E,gFAAgF;AAChF,2EAA2E;AAC3E,4EAA4E;AAC5E,gFAAgF;AAChF,4EAA4E;AAC5E,6EAA6E;AAC7E,sCAAsC;AAEtC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAU1E,4EAA4E;AAC5E,MAAM,CAAC,MAAM,wBAAwB,GAAG,aAAa,CAAC;AAEtD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,iBAAiB,CAAC;AAIxD;;;;GAIG;AACH,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC;IACpC,YAAY;IACZ,kBAAkB;IAClB,YAAY;IACZ,uBAAuB;IACvB,0CAA0C;CAC3C,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC;IACnC,iBAAiB,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB;IACnE,kBAAkB,EAAE,8BAA8B,EAAE,cAAc,EAAE,gBAAgB;CACrF,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC;IACrC,mBAAmB,EAAE,aAAa,EAAE,uBAAuB;IAC3D,0CAA0C,EAAE,yBAAyB;CACtE,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,CAAC,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC;AAEzF,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;IAClC,WAAW,EAAE,kBAAkB,EAAE,oCAAoC;IACrE,yCAAyC,EAAE,gBAAgB;CAC5D,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,kBAAkB,GAAG;IACzB,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,aAAa;IAC3E,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB;IAC/D,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW;IAC3D,iBAAiB,EAAE,cAAc,EAAE,aAAa;CACjD,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;AACpG,MAAM,YAAY,GAAG,CAAC,eAAe,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAC7D,MAAM,cAAc,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;AAExF,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5D,CAAC;AAED;;;GAGG;AACH,SAAS,YAAY,CAAC,GAAY;IAChC,MAAM,GAAG,GAAU,EAAE,CAAC;IACtB,KAAK,MAAM,EAAE,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC;QACnB,MAAM,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC;QACtB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,SAAS;QACzD,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;YAAC,SAAS;QAAC,CAAC;QACpF,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,0EAA0E;YAC1E,wEAAwE;YACxE,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ;gBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;iBAC3D,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9G,SAAS;QACX,CAAC;QACD,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;YAAC,SAAS;QAAC,CAAC;QACjF,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;YAAC,SAAS;QAAC,CAAC;IACtF,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,yDAAyD;AACzD,SAAS,UAAU,CAAC,KAAY,EAAE,IAAc;IAC9C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QAChE,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAW;IACnC,OAAO,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACrE,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,GAAW;IACrC,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,KAAK,CAAC;IACtC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,KAAY,EAAE,IAAc;IACpD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,kBAAkB,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAC7F,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,YAAY,CAAC,KAAY;IAChC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACzD,IAAI,QAAQ;QAAE,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IACxE,IAAI,SAAS;QAAE,OAAO,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAClD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,WAAW,CAAC,IAA6B;IAChD,KAAK,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;IAClE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;GAKG;AACH,SAAS,8BAA8B,CAAC,IAA6B;IACnE,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,wBAAwB,CAAC;AAChF,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAe;IACxC,OAAO,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,eAAe,CAAC,IAA6B;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;IAC1B,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,qBAAqB,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAY;IACrC,OAAO,UAAU,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,gBAAgB,CAAC,kBAA0B;IAClD,OAAO,kBAAkB,KAAK,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;AACjE,CAAC;AAED,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAA6B;IAC9C,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QACvD,MAAM,aAAa,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC3G,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACrD,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5C,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,gBAAgB,CAAC,IAA6B;IACrD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC9C,KAAK,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAAE,SAAS;QACrC,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,MAAM,MAAM,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,SAAS,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,8BAA8B,CAAC,IAAI,CAAC,CAAC;QAC9E,IAAI,QAAQ,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC7E,CAAC;IACD,KAAK,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,WAAW,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACrD,IAAI,CAAC,WAAW;YAAE,SAAS;QAC3B,MAAM,MAAM,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACtE,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,8BAA8B,CAAC,IAAI,CAAC,CAAC;QAC9E,IAAI,QAAQ,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACrF,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,QAAQ,CACf,IAA6B,EAC7B,aAAoB,EACpB,WAAgC;IAEhC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;IAC1B,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAClD,MAAM,KAAK,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;IAErE,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,8BAA8B,CAAC,IAAI,CAAC,CAAC;IAC7E,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAE1E,2EAA2E;IAC3E,6EAA6E;IAC7E,0CAA0C;IAC1C,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC;QAC/B,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzD,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE9B,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAC/F,IAAI,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,IAAI,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC/E,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC3D,CAAC;IACD,IAAI,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAC5F,IAAI,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACtF,IAAI,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IAC3G,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,eAAe,CAAC,IAAa;IAC3C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QACzD,IAAI,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,eAAe,CAAC,IAAa,EAAE,KAAK,GAAG,EAAE;IACvD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjF,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK;YAAE,MAAM;IACnC,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAmBD,8EAA8E;AAC9E,MAAM,oBAAoB,GAAG,MAAM,CAAC;AACpC,kFAAkF;AAClF,MAAM,kBAAkB,GAAG,CAAC,GAAG,MAAM,CAAC;AACtC;;;GAGG;AACH,MAAM,oBAAoB,GAAG,CAAC,GAAG,MAAM,CAAC;AAExC;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,gBAAgB;IACV,OAAO,GAAG,IAAI,GAAG,EAA2B,CAAC;IAE9D,iEAAiE;IACjE,SAAS,CAA2B;IAEpC,qEAAqE;IACrE,MAAM,CAAC,IAAa,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;QACpC,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,yEAAyE;YACzE,+DAA+D;YAC/D,8CAA8C;YAC9C,IAAI,KAAK,CAAC,QAAQ,KAAK,wBAAwB;gBAAE,SAAS;YAC1D,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChB,IAAI,OAAO;YAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,KAAqB,EAAE,GAAW;QAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClD,wEAAwE;QACxE,wDAAwD;QACxD,0EAA0E;QAC1E,yDAAyD;QACzD,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;eACxB,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,IAAI,QAAQ,CAAC,KAAK,KAAK,YAAY,CAAC,EAAE,CAAC;YACzF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,MAAM,GAAoB,QAAQ,IAAI;YAC1C,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,KAAK,EAAE,MAAM;YACb,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,GAAG;SACjB,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,CAAC,WAAW,GAAG,GAAG,CAAC;QAEzB,4EAA4E;QAC5E,2EAA2E;QAC3E,qCAAqC;QACrC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YACxF,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;QACzB,CAAC;QAED,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,WAAW;gBACd,MAAM,CAAC,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC;gBACrC,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;gBAC9B,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC;gBAC5B,MAAM,CAAC,WAAW,GAAG,SAAS,CAAC;gBAC/B,MAAM;YACR,KAAK,UAAU;gBACb,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS;oBAAE,MAAM,CAAC,iCAAiC;gBAC7E,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC;gBAC5B,MAAM,CAAC,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAChD,MAAM;YACR,KAAK,YAAY;gBACf,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS;oBAAE,MAAM;gBAC3C,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC;gBAC5B,MAAM,CAAC,WAAW,GAAG,SAAS,CAAC;gBAC/B,MAAM;YACR,KAAK,SAAS;gBACZ,wEAAwE;gBACxE,wEAAwE;gBACxE,oEAAoE;gBACpE,0CAA0C;gBAC1C,IAAI,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,cAAc,KAAK,KAAK,CAAC,MAAM;oBAAE,MAAM;gBAC3F,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC;gBACtB,MAAM,CAAC,WAAW,GAAG,SAAS,CAAC;gBAC/B,MAAM,CAAC,cAAc,GAAG,SAAS,CAAC;gBAClC,MAAM,CAAC,UAAU,GAAG,GAAG,CAAC;gBACxB,MAAM;YACR,KAAK,UAAU;gBACb,6DAA6D;gBAC7D,MAAM;QACV,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,GAAW;QACvB,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC9C,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,KAAK,SAAS;mBAClD,GAAG,GAAG,MAAM,CAAC,UAAU,GAAG,oBAAoB,CAAC;YACpD,IAAI,eAAe,IAAI,GAAG,GAAG,MAAM,CAAC,WAAW,GAAG,kBAAkB,EAAE,CAAC;gBACrE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAED,kDAAkD;IAClD,QAAQ;QACN,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,QAA2B,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;QACnD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChB,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,QAAQ,CAAC;QAE7C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACxC,IAAI,OAAO,CAAC,SAAS,KAAK,WAAW,IAAI,OAAO,CAAC,SAAS,KAAK,WAAW;gBAAE,OAAO,OAAO,CAAC;YAC3F,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1D,IAAI,CAAC,MAAM;gBAAE,OAAO,OAAO,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC7B,IAAI,GAAG,GAAG,MAAM,CAAC,WAAW,GAAG,oBAAoB;gBAAE,OAAO,OAAO,CAAC;YACpE,OAAO;gBACL,GAAG,OAAO;gBACV,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,yEAAyE;gBACzE,wEAAwE;gBACxE,mCAAmC;gBACnC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnE,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAsB,EAAE,CAAC;QAC1C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAAE,SAAS;YAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;YACvB,WAAW,CAAC,IAAI,CAAC;gBACf,EAAE,EAAE,sBAAsB,MAAM,CAAC,QAAQ,EAAE;gBAC3C,IAAI,EAAE,CAAC;gBACP,GAAG,EAAE,CAAC;gBACN,yEAAyE;gBACzE,sEAAsE;gBACtE,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO;gBACjE,SAAS,EAAE,WAAW;gBACtB,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,WAAW,EAAE,UAAU;gBACvB,GAAG;gBACH,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,SAAS,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;aACpD,CAAC,CAAC;QACL,CAAC;QACD,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC3E,CAAC;CACF;AAED;;;GAGG;AACH,SAAS,cAAc,CAAC,IAAY;IAClC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC9E,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/codex-rate-limits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-rate-limits.d.ts","sourceRoot":"","sources":["../src/codex-rate-limits.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,eAAe,EAAwB,MAAM,mBAAmB,CAAC;AAkI7F;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,GAAE,MAA8B,GAAG,eAAe,GAAG,IAAI,CAEhG;AA+CD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CA4BjF;AASD,wBAAgB,mBAAmB,IAAI,eAAe,GAAG,IAAI,CAU5D"}
+{"version":3,"file":"codex-rate-limits.d.ts","sourceRoot":"","sources":["../src/codex-rate-limits.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,eAAe,EAAwB,MAAM,mBAAmB,CAAC;AAqI7F;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,GAAE,MAA8B,GAAG,eAAe,GAAG,IAAI,CAEhG;AAuDD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAgCjF;AASD,wBAAgB,mBAAmB,IAAI,eAAe,GAAG,IAAI,CAU5D"}

package/dist/codex-rate-limits.js

@@ -75,9 +75,12 @@ function parseFirstUsable(candidates) {
         const tail = readTail(full);
         const parsed = tail ? parseCodexRateLimitsFromText(tail) : null;
         if (parsed) {
-            // Stamp the rollout mtime as a secondary freshness anchor (the per-window
-            // `stale` flag set in buildUsageEvent is authoritative).
-            parsed.capturedAt = new Date(mtime).toISOString();
+            // Freshness anchor. Prefer the snapshot LINE's own timestamp over the file
+            // mtime: a rollout keeps growing with lines that carry no `rate_limits`
+            // (reasoning, tool output), so mtime drifts forward while the newest usage
+            // reading stays put — that would under-report the age of exactly the frozen
+            // snapshot this anchor exists to expose. mtime is the fallback.
+            parsed.capturedAt = parsed.capturedAt ?? new Date(mtime).toISOString();
             return parsed;
         }
     }
@@ -125,6 +128,14 @@ function toCredits(raw) {
         balance: raw.balance != null ? String(raw.balance) : undefined,
     };
 }
+/** Normalize a rollout line's `timestamp` to ISO-8601, or undefined when the
+ *  line carries none / an unparseable one (older rollout formats). */
+function parseRolloutTimestamp(ts) {
+    if (typeof ts !== 'string' || !ts)
+        return undefined;
+    const ms = new Date(ts).getTime();
+    return isNaN(ms) ? undefined : new Date(ms).toISOString();
+}
 function toWindow(raw) {
     if (!raw || typeof raw.used_percent !== 'number' || typeof raw.window_minutes !== 'number') {
         return undefined;
@@ -169,6 +180,7 @@ export function parseCodexRateLimitsFromText(text) {
                 planType: typeof rl.plan_type === 'string' ? rl.plan_type : undefined,
                 limitId,
                 credits,
+                capturedAt: parseRolloutTimestamp(obj.timestamp),
             };
         }
         catch {

package/dist/codex-rate-limits.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-rate-limits.js","sourceRoot":"","sources":["../src/codex-rate-limits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AA6CxB,MAAM,mBAAmB,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;AAOxF;oDACoD;AACpD,SAAS,aAAa,CAAC,GAAW;IAChC,IAAI,CAAC;QACH,OAAO,EAAE;aACN,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aACzC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;aAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aAClB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;2EAG2E;AAC3E,SAAS,aAAa,CAAC,IAAY,EAAE,OAAe;IAClD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC3C,KAAK,MAAM,GAAG,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;gBACnC,IAAI,GAAG,CAAC,MAAM,IAAI,OAAO;oBAAE,OAAO,GAAG,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;4CAI4C;AAC5C,SAAS,qBAAqB,CAAC,IAAY,EAAE,OAAO,GAAG,CAAC,EAAE,QAAQ,GAAG,CAAC;IACpE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,KAAK,GAAuB,EAAE,CAAC;IACrC,KAAK,MAAM,MAAM,IAAI,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QAClD,IAAI,OAAiB,CAAC;QACtB,IAAI,CAAC;YACH,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,SAAS;YACjE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAClC,IAAI,CAAC;gBACH,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YACzD,CAAC;YAAC,MAAM,CAAC;gBACP,6BAA6B;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;AAClC,CAAC;AAED;;+EAE+E;AAC/E,SAAS,gBAAgB,CAAC,UAA8B;IACtD,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,UAAU,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChE,IAAI,MAAM,EAAE,CAAC;YACX,0EAA0E;YAC1E,yDAAyD;YACzD,MAAM,CAAC,UAAU,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAClD,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe,mBAAmB,EAAE;IACtE,OAAO,gBAAgB,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;AACvD,CAAC;AAED;kFACkF;AAClF,SAAS,QAAQ,CAAC,IAAY,EAAE,QAAQ,GAAG,MAAM;IAC/C,IAAI,EAAE,GAAkB,IAAI,CAAC;IAC7B,IAAI,CAAC;QACH,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC5B,MAAM,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,GAAG,KAAK,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QACpC,OAAO,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;YAAS,CAAC;QACT,IAAI,EAAE,KAAK,IAAI;YAAE,IAAI,CAAC;gBAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;IACnE,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,GAAgB;IACjC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,WAAW,KAAK,SAAS,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC;QAChH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO;QACL,UAAU,EAAE,GAAG,CAAC,WAAW,KAAK,IAAI;QACpC,SAAS,EAAE,GAAG,CAAC,SAAS,KAAK,IAAI;QACjC,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;KAC/D,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,GAAe;IAC/B,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,YAAY,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,cAAc,KAAK,QAAQ,EAAE,CAAC;QAC3F,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,QAAQ,GACZ,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,GAAG,CAAC,SAAS,GAAG,CAAC;QACpD,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE;QAC9C,CAAC,CAAC,SAAS,CAAC;IAChB,OAAO;QACL,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QACzD,aAAa,EAAE,GAAG,CAAC,cAAc;QACjC,QAAQ;KACT,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAAC,IAAY;IACvD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;YAAE,SAAS;QACrD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAiE,CAAC;YAC7F,MAAM,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,WAAW,CAAC;YACrC,IAAI,CAAC,EAAE;gBAAE,SAAS;YAClB,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YACtC,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1E,uEAAuE;YACvE,yEAAyE;YACzE,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO;gBAAE,SAAS;YAC7D,OAAO;gBACL,OAAO;gBACP,SAAS;gBACT,QAAQ,EAAE,OAAO,EAAE,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBACrE,OAAO;gBACP,OAAO;aACR,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;QACzE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,+EAA+E;AAC/E,+EAA+E;AAC/E,6EAA6E;AAC7E,sCAAsC;AACtC,IAAI,QAAQ,GAAG,EAAE,CAAC;AAClB,IAAI,UAAU,GAA2B,IAAI,CAAC;AAE9C,MAAM,UAAU,mBAAmB;IACjC,MAAM,UAAU,GAAG,qBAAqB,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,IAAI,GAAG,IAAI,GAAG,KAAK,QAAQ;QAAE,OAAO,UAAU,CAAC;IAE/C,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC5C,QAAQ,GAAG,GAAG,CAAC;IACf,UAAU,GAAG,MAAM,CAAC;IACpB,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"codex-rate-limits.js","sourceRoot":"","sources":["../src/codex-rate-limits.ts"],"names":[],"mappings":"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"}

package/dist/daemon-server.d.ts

@@ -12,6 +12,7 @@
  */
 import WebSocket from 'ws';
 import { BridgeCore } from './bridge-core.js';
+import { type ApiUsageData } from './usage-api.js';
 /**
  * Single-path transport dedup. A physical ESP32 can be reachable over BOTH a
  * USB serial connection and a WiFi WebSocket at once (e.g. inkdeck/ttgo/tc001
@@ -51,6 +52,8 @@ export declare const __wifiOtaTestApi: {
     performWifiEsp32Ota: typeof performWifiEsp32Ota;
 };
 declare function performWifiEsp32Ota(core: BridgeCore, target: string, firmwarePath: string): Promise<Record<string, unknown>>;
+/** @internal Exported for the relay-fallback regression test. */
+export declare function fetchUsageRelayed(selfPort: number): Promise<ApiUsageData | null>;
 /**
  * Stamp OpenClaw origin onto a timeline entry emitted by the Gateway adapter.
  *
@@ -64,6 +67,7 @@ declare function performWifiEsp32Ota(core: BridgeCore, target: string, firmwareP
 export declare function enrichGatewayTimelineEntry<T extends {
     agentType?: string;
     projectName?: string;
+    sessionId?: string;
 }>(entry: T): T;
 /**
  * Classify a `/hooks/<eventName>` POST for the observed-session pipeline.

package/dist/daemon-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"daemon-server.d.ts","sourceRoot":"","sources":["../src/daemon-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,UAAU,EAA8B,MAAM,kBAAkB,CAAC;AAsO1E;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EAC5C,YAAY,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAClD,OAAO,CAST;AAkBD,iBAAS,iBAAiB,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,GAAG,IAAI,CAyC1E;AAYD,iBAAS,yBAAyB,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,CAStD;AAED,iBAAS,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAsBlE;AA6ED,gBAAgB;AAChB,wBAAgB,uBAAuB,CAAC,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKzH;AACD,gBAAgB;AAChB,wBAAgB,wBAAwB,IAAI,IAAI,CAS/C;AACD,gBAAgB;AAChB,eAAO,MAAM,gBAAgB;;;;;CAK5B,CAAC;AAEF,iBAAe,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA8F3H;AAoID;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,SAAS;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,EAC/F,KAAK,EAAE,CAAC,GACP,CAAC,CAMH;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,aAAa,GAAG,WAAW,GAAG,UAAU,GAAG,aAAa,CAAA;CAAE,CAU3F;AAID,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAiHD,wBAAsB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAwkGpE"}
+{"version":3,"file":"daemon-server.d.ts","sourceRoot":"","sources":["../src/daemon-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,UAAU,EAA8B,MAAM,kBAAkB,CAAC;AAmF1E,OAAO,EAA8D,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AA6P/G;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EAC5C,YAAY,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAClD,OAAO,CAST;AAkBD,iBAAS,iBAAiB,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,GAAG,IAAI,CA+C1E;AAYD,iBAAS,yBAAyB,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,CAStD;AAED,iBAAS,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAsBlE;AA6ED,gBAAgB;AAChB,wBAAgB,uBAAuB,CAAC,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKzH;AACD,gBAAgB;AAChB,wBAAgB,wBAAwB,IAAI,IAAI,CAS/C;AACD,gBAAgB;AAChB,eAAO,MAAM,gBAAgB;;;;;CAK5B,CAAC;AAEF,iBAAe,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA8F3H;AAoHD,iEAAiE;AACjE,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAsBtF;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,SAAS;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EACnH,KAAK,EAAE,CAAC,GACP,CAAC,CAWH;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,aAAa,GAAG,WAAW,GAAG,UAAU,GAAG,aAAa,CAAA;CAAE,CAa3F;AAID,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAiHD,wBAAsB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAuwHpE"}