@aria-cli/cli 1.0.54 → 1.0.56

package/dist/history/SessionHistoryClient.js

@@ -0,0 +1,186 @@
+/**
+ * IPC-backed session history client for the REPL.
+ *
+ * Bulk writes (appendMessages, replaceMessages, markCompleted) are dispatched
+ * to the daemon over the existing LocalControl IPC socket — fire-and-forget,
+ * never blocking the event loop.  Small writes (completeRun, claimSession,
+ * etc.) run locally with a short busy_timeout (100ms via lowContentionMode).
+ * Reads are served locally from the same WAL connection (instant).
+ *
+ * The daemon owns the canonical single-writer connection and serializes all
+ * IPC writes.  On IPC failure, writes fall back to the local connection.
+ */
+import { log } from "@aria-cli/types";
+import { clearStallPhase, setStallPhase } from "../event-loop-watchdog.js";
+/**
+ * Fire-and-forget IPC write. Logs on failure, never throws.
+ * Falls back to a local sync write if provided.
+ */
+/** Errors that are expected during normal teardown and should not be logged. */
+function isTeardownError(err) {
+    if (!(err instanceof Error))
+        return false;
+    const msg = err.message;
+    return msg.includes("has been released") || msg.includes("aborted");
+}
+function fireAndForget(label, ipcCall, fallback) {
+    if (!ipcCall) {
+        fallback?.();
+        return;
+    }
+    ipcCall.catch((err) => {
+        // Silently fall back during normal teardown (client released / aborted).
+        if (!isTeardownError(err)) {
+            log.warn(`[SessionHistoryClient] ${label} IPC failed:`, err?.message ?? err);
+        }
+        if (fallback) {
+            try {
+                fallback();
+            }
+            catch (localErr) {
+                log.warn(`[SessionHistoryClient] ${label} local fallback also failed:`, localErr?.message ?? localErr);
+            }
+        }
+    });
+}
+export class SessionHistoryClient {
+    readDb;
+    ipc;
+    constructor(
+    /** Local SessionHistory for reads + local fallback writes. */
+    readDb, 
+    /** IPC handle to the daemon's localControl API. */
+    ipc) {
+        this.readDb = readDb;
+        this.ipc = ipc;
+        // The daemon owns the main writer.  This local connection only does tiny
+        // writes (createSession, claimSession) so reduce busy_timeout from 5s to
+        // 100ms to avoid blocking the event loop.
+        readDb.enableLowContentionMode();
+    }
+    // ---------------------------------------------------------------------------
+    // Reads — local, instant, zero contention.  Proxy every read method so the
+    // client is a full drop-in replacement for SessionHistory.
+    // ---------------------------------------------------------------------------
+    withPhase(label, fn) {
+        setStallPhase(label);
+        try {
+            return fn();
+        }
+        finally {
+            clearStallPhase();
+        }
+    }
+    listSessions(...args) {
+        return this.withPhase("session-history:listSessions", () => this.readDb.listSessions(...args));
+    }
+    loadSessionMessages(...args) {
+        return this.withPhase("session-history:loadSessionMessages", () => this.readDb.loadSessionMessages(...args));
+    }
+    loadSession(...args) {
+        return this.withPhase("session-history:loadSession", () => this.readDb.loadSession(...args));
+    }
+    searchSessionsFts(...args) {
+        return this.withPhase("session-history:searchSessionsFts", () => this.readDb.searchSessionsFts(...args));
+    }
+    searchSessionSummaries(...args) {
+        return this.withPhase("session-history:searchSessionSummaries", () => this.readDb.searchSessionSummaries(...args));
+    }
+    findSessionByPrefix(...args) {
+        return this.readDb.findSessionByPrefix(...args);
+    }
+    getSessionRuntimeState(...args) {
+        return this.readDb.getSessionRuntimeState(...args);
+    }
+    getInteraction(...args) {
+        return this.readDb.getInteraction(...args);
+    }
+    getIncompleteSessions(...args) {
+        return this.readDb.getIncompleteSessions(...args);
+    }
+    getInputHistory(...args) {
+        return this.withPhase("session-history:getInputHistory", () => this.readDb.getInputHistory(...args));
+    }
+    addInputHistory(...args) {
+        return this.withPhase("session-history:addInputHistory", () => this.readDb.addInputHistory(...args));
+    }
+    getSessionCount(...args) {
+        return this.readDb.getSessionCount(...args);
+    }
+    markStaleSessionsCompleted(...args) {
+        return this.withPhase("session-history:markStaleSessionsCompleted", () => this.readDb.markStaleSessionsCompleted(...args));
+    }
+    getSession(...args) {
+        return this.readDb.getSession(...args);
+    }
+    // ---------------------------------------------------------------------------
+    // createSession — local write so it's immediately readable
+    // ---------------------------------------------------------------------------
+    createSession(...args) {
+        return this.readDb.createSession(...args);
+    }
+    // ---------------------------------------------------------------------------
+    // Writes — fire-and-forget via IPC to daemon
+    // ---------------------------------------------------------------------------
+    persistMessagesNonBlocking(sessionId, msgs) {
+        if (msgs.length === 0)
+            return;
+        // Mark session as incremental BEFORE the IPC call so that the orchestrator's
+        // deferred replaceConversationMessages sees it and short-circuits (no-op).
+        this.readDb.markSessionIncremental(sessionId);
+        fireAndForget("appendSessionMessages", this.ipc.appendSessionMessages?.(sessionId, msgs), () => this.readDb.addConversationMessages(sessionId, msgs));
+    }
+    /** Batched sync write — used by addConversationMessages callers. Routes to IPC. */
+    addConversationMessages(sessionId, msgs) {
+        this.persistMessagesNonBlocking(sessionId, msgs);
+    }
+    /** Single message write — routes to batched path. */
+    addConversationMessage(sessionId, msg) {
+        this.persistMessagesNonBlocking(sessionId, [msg]);
+    }
+    markCompleted(sessionId) {
+        fireAndForget("markSessionCompleted", this.ipc.markSessionCompleted?.(sessionId), () => this.readDb.markCompleted(sessionId));
+    }
+    replaceConversationMessages(sessionId, msgs) {
+        fireAndForget("replaceSessionMessages", this.ipc.replaceSessionMessages?.(sessionId, msgs), () => this.readDb.replaceConversationMessages(sessionId, msgs));
+    }
+    // ---------------------------------------------------------------------------
+    // Small writes — local only (fast single-row ops, not worth IPC overhead).
+    // With lowContentionMode (100ms busy_timeout), these never block the event
+    // loop meaningfully.  The daemon sees them through WAL visibility.
+    // ---------------------------------------------------------------------------
+    completeRun(...args) {
+        return this.readDb.completeRun(...args);
+    }
+    claimSessionForMutation(...args) {
+        return this.readDb.claimSessionForMutation(...args);
+    }
+    releaseSessionClaim(...args) {
+        return this.readDb.releaseSessionClaim(...args);
+    }
+    recordPausedRun(...args) {
+        return this.readDb.recordPausedRun(...args);
+    }
+    deleteSession(...args) {
+        return this.readDb.deleteSession(...args);
+    }
+    forkSession(...args) {
+        return this.readDb.forkSession(...args);
+    }
+    cancelInteraction(...args) {
+        return this.readDb.cancelInteraction(...args);
+    }
+    setSessionTitle(...args) {
+        return this.readDb.setSessionTitle(...args);
+    }
+    recordInteractionResponse(...args) {
+        return this.readDb.recordInteractionResponse(...args);
+    }
+    // ---------------------------------------------------------------------------
+    // Passthrough
+    // ---------------------------------------------------------------------------
+    close() {
+        this.readDb.close();
+    }
+}
+//# sourceMappingURL=SessionHistoryClient.js.map

package/dist/history/SessionHistoryClient.js.map

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

package/dist/history/conversation-message.js

@@ -0,0 +1,112 @@
+/**
+ * ConversationMessage — CLI-specific UI bridge.
+ *
+ * Re-exports all core types and functions from @aria-cli/aria,
+ * and provides the UI-specific bridge function for rendering.
+ */
+// Re-export everything from the aria package
+export * from "@aria-cli/aria/history/conversation-message.js";
+// ---------------------------------------------------------------------------
+// UI Bridge - converts ConversationMessage[] to HistoryMessage[] for rendering
+// ---------------------------------------------------------------------------
+/**
+ * Convert ConversationMessage[] to the legacy HistoryMessage[] format
+ * used by the existing CLI UI components.
+ *
+ * This bridges the new unified message format to the old rendering pipeline.
+ */
+export function conversationMessageToHistoryMessages(messages) {
+    const items = [];
+    for (const msg of messages) {
+        for (const block of msg.content) {
+            switch (block.type) {
+                case "thinking":
+                    items.push({
+                        id: `thinking-${crypto.randomUUID()}`,
+                        role: "thinking_history",
+                        content: block.content,
+                        wordCount: block.wordCount,
+                        durationSeconds: block.durationMs != null ? block.durationMs / 1000 : undefined,
+                        verb: block.verb,
+                        arionName: msg.arion?.name,
+                        arionEmoji: msg.arion?.emoji,
+                        arionColor: msg.arion?.color,
+                    });
+                    break;
+                case "tool_use":
+                    items.push({
+                        id: `tool-${crypto.randomUUID()}`,
+                        role: "tool_history",
+                        tool: {
+                            id: block.id,
+                            name: block.name,
+                            args: block.arguments,
+                            status: "pending",
+                            startTime: undefined,
+                            endTime: undefined,
+                        },
+                    });
+                    break;
+                case "tool_result": {
+                    // Find matching tool_history across ALL messages and update its result/status
+                    let toolItem;
+                    for (let idx = items.length - 1; idx >= 0; idx--) {
+                        const item = items[idx];
+                        if (item.role === "tool_history" &&
+                            item.tool.id === block.toolUseId) {
+                            toolItem = item;
+                            break;
+                        }
+                    }
+                    if (toolItem) {
+                        toolItem.tool.status = block.status === "error" ? "error" : "complete";
+                        if (block.status === "error") {
+                            toolItem.tool.error = block.content;
+                        }
+                        else {
+                            toolItem.tool.result = block.content;
+                        }
+                        if (block.resultData !== undefined) {
+                            toolItem.tool.resultData = block.resultData;
+                        }
+                        if (block.durationMs !== undefined) {
+                            toolItem.tool.durationMs = block.durationMs;
+                        }
+                        if (block.usage !== undefined) {
+                            toolItem.tool.usage = block.usage;
+                        }
+                    }
+                    break;
+                }
+                case "handoff":
+                    items.push({
+                        id: `handoff-${crypto.randomUUID()}`,
+                        role: "handoff_history",
+                        target: block.target,
+                        direction: block.direction,
+                    });
+                    break;
+                case "error":
+                    items.push({
+                        id: `error-${crypto.randomUUID()}`,
+                        role: "error",
+                        content: block.content,
+                        suggestion: block.suggestion,
+                    });
+                    break;
+                case "text":
+                    items.push({
+                        id: `msg-${crypto.randomUUID()}`,
+                        role: msg.role,
+                        content: block.text,
+                        arion: msg.arion
+                            ? { name: msg.arion.name, emoji: msg.arion.emoji, color: msg.arion.color }
+                            : undefined,
+                    });
+                    break;
+            }
+        }
+    }
+    return items;
+}
+//# sourceMappingURL=conversation-message.js.map

package/dist/history/conversation-message.js.map

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

package/dist/history/index.js

@@ -0,0 +1,8 @@
+// packages/cli/src/history/index.ts
+export { SessionHistory } from "./SessionHistory.js";
+export { SessionHistoryClient } from "./SessionHistoryClient.js";
+export { repairToolCallPairing } from "./repair-tool-pairing.js";
+export { ContentBlockSchema, ArionRefSchema, ConversationMessageSchema, createUserMessage, createSystemMessage, createErrorMessage, createIncomingMessagePair, toModelMessages, fromModelMessages, fromV1Columns, conversationMessageToHistoryMessages, extractTextContent, extractToolCalls, extractThinking, extractToolCallId, } from "./conversation-message.js";
+export { TurnAccumulator } from "./turn-accumulator.js";
+export { replaySessionFromJsonl, findJsonlForSession, mergeWithJsonlRecovery, } from "./jsonl-replay.js";
+//# sourceMappingURL=index.js.map

package/dist/history/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/history/index.ts"],"names":[],"mappings":"AAAA,oCAAoC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAejE,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,yBAAyB,EACzB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,oCAAoC,EACpC,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,iBAAiB,GAClB,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EACL,sBAAsB,EACtB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,mBAAmB,CAAC"}

package/dist/history/jsonl-replay.js

@@ -0,0 +1,154 @@
+/**
+ * JSONL Replay — reconstructs ConversationMessage[] from a JSONL event log.
+ *
+ * The JsonlEventLogger writes every RunEvent to disk as newline-delimited JSON.
+ * This module reads those logs back and feeds them through a TurnAccumulator
+ * to reconstruct the conversation messages for crash recovery and session resume.
+ *
+ * Each JSONL line has the shape: { ts: string, event: RunEvent }
+ */
+import { readFileSync, existsSync } from "node:fs";
+import { TurnAccumulator } from "./turn-accumulator.js";
+import { createUserMessage } from "./conversation-message.js";
+/**
+ * Replay a JSONL event log file and reconstruct ConversationMessage[].
+ *
+ * Feeds each RunEvent through a fresh TurnAccumulator. On turn boundaries
+ * (turn_complete events), the accumulator flushes and messages are collected.
+ * Any remaining pending content is flushed at the end (handles mid-turn crashes).
+ *
+ * Returns user + assistant + tool messages. User messages are captured via
+ * synthetic `user_message` events logged before each LLM call.
+ */
+export function replaySessionFromJsonl(jsonlPath) {
+    if (!existsSync(jsonlPath))
+        return [];
+    const raw = readFileSync(jsonlPath, "utf-8");
+    const lines = raw.split("\n").filter((line) => line.trim().length > 0);
+    const accumulator = new TurnAccumulator();
+    const allMessages = [];
+    for (const line of lines) {
+        let entry;
+        try {
+            entry = JSON.parse(line);
+        }
+        catch {
+            // Malformed line (truncated on crash) — skip
+            continue;
+        }
+        if (!entry.event || typeof entry.event.type !== "string")
+            continue;
+        // User messages are logged as synthetic events — not RunEvents.
+        // Convert them directly to ConversationMessage without the accumulator.
+        if (entry.event.type === "user_message") {
+            // Flush any pending assistant content before the user message
+            if (accumulator.hasPendingContent()) {
+                allMessages.push(...accumulator.flush());
+            }
+            const content = entry.event.content ?? "";
+            const id = entry.event.id;
+            const userMsg = createUserMessage(content);
+            if (id)
+                userMsg.id = id;
+            allMessages.push(userMsg);
+            continue;
+        }
+        // Feed the RunEvent through the accumulator
+        const signal = accumulator.ingest(entry.event);
+        if (signal === "flush") {
+            const turnMessages = accumulator.flush();
+            allMessages.push(...turnMessages);
+        }
+    }
+    // Flush any remaining pending content (mid-turn crash recovery)
+    if (accumulator.hasPendingContent()) {
+        const partial = accumulator.flush();
+        allMessages.push(...partial);
+    }
+    return allMessages;
+}
+/**
+ * Find the JSONL log file for a session within an Arion's log directory.
+ * Returns the file path if found, null otherwise.
+ *
+ * JSONL files are named {sessionId}.jsonl under the Arion's logs/ directory.
+ */
+/**
+ * Extract a content fingerprint from a ConversationMessage for identity-based dedup.
+ *
+ * Uses API-assigned identifiers (tool_use IDs, tool_result references) when available —
+ * these are stable across replays. Falls back to role+content text for messages without
+ * tool blocks (user text, assistant text), since their UUIDs are regenerated on replay.
+ */
+function extractContentFingerprint(msg) {
+    for (const block of msg.content) {
+        if (block.type === "tool_use" && block.id) {
+            return `tool_use:${block.id}`;
+        }
+        if (block.type === "tool_result" && block.toolUseId) {
+            return `tool_result:${block.toolUseId}`;
+        }
+    }
+    // Text-only messages: fingerprint by role + text content (stable across replays)
+    const text = msg.content
+        .filter((b) => b.type === "text")
+        .map((b) => b.text)
+        .join("");
+    return `${msg.role}:${text}`;
+}
+/**
+ * Merge SQLite messages with JSONL-replayed messages for crash recovery.
+ *
+ * Strategy: SQLite is the primary store; JSONL fills gaps from crash recovery.
+ * Uses content-based identity (tool_use IDs, tool_result references) to detect
+ * which JSONL messages are truly missing from SQLite, avoiding the position-based
+ * counting that breaks when JSONL accumulates events across multiple session runs
+ * with different message coalescing boundaries.
+ *
+ * Returns { messages, backfillMessages } where backfillMessages are the
+ * messages JSONL had that SQLite was missing (for SQLite index backfill).
+ */
+export function mergeWithJsonlRecovery(sqliteMessages, jsonlPath) {
+    if (!jsonlPath) {
+        return { messages: sqliteMessages, backfillMessages: [] };
+    }
+    let jsonlMessages;
+    try {
+        jsonlMessages = replaySessionFromJsonl(jsonlPath);
+    }
+    catch {
+        return { messages: sqliteMessages, backfillMessages: [] };
+    }
+    if (jsonlMessages.length === 0) {
+        return { messages: sqliteMessages, backfillMessages: [] };
+    }
+    // If SQLite already has at least as many messages, it's complete.
+    if (sqliteMessages.length >= jsonlMessages.length) {
+        return { messages: sqliteMessages, backfillMessages: [] };
+    }
+    // JSONL has more messages than SQLite — crash recovery needed.
+    // Use content-based identity to find which JSONL messages are truly missing.
+    // Tool_use IDs and tool_result references are API-assigned and stable across replays.
+    const sqliteFingerprints = new Set(sqliteMessages.map(extractContentFingerprint));
+    const backfillMessages = [];
+    for (const msg of jsonlMessages) {
+        const fp = extractContentFingerprint(msg);
+        if (!sqliteFingerprints.has(fp)) {
+            backfillMessages.push(msg);
+        }
+    }
+    // Combine: SQLite messages (primary, in persisted order) + truly new JSONL messages
+    const messages = [...sqliteMessages, ...backfillMessages];
+    return { messages, backfillMessages };
+}
+export function findJsonlForSession(ariaDir, arionName, sessionId) {
+    const perArionPath = `${ariaDir}/arions/${arionName}/logs/${sessionId}.jsonl`;
+    if (existsSync(perArionPath))
+        return perArionPath;
+    // Fallback: check legacy global path
+    const globalPath = `${ariaDir}/logs/${sessionId}.jsonl`;
+    if (existsSync(globalPath))
+        return globalPath;
+    return null;
+}
+//# sourceMappingURL=jsonl-replay.js.map

package/dist/history/jsonl-replay.js.map

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

package/dist/history/repair-tool-pairing.js

@@ -0,0 +1,84 @@
+function hasMeaningfulAssistantContent(content) {
+    return typeof content !== "string" || content.trim().length > 0;
+}
+function stripToolCalls(msg) {
+    const { toolCalls, ...rest } = msg;
+    return rest;
+}
+function hasToolResultLater(messages, startIdx, toolCallId) {
+    for (let i = startIdx; i < messages.length; i++) {
+        const msg = messages[i];
+        if (msg.role === "tool" && msg.toolCallId === toolCallId) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Repair tool call/result pairing in a message sequence.
+ *
+ * Ensures:
+ * 1. Every tool result has a matching tool call (removes orphans)
+ * 2. Every tool call has a matching result (adds synthetic "interrupted" result)
+ * 3. Synthetic results are placed AFTER real results for the same assistant (R2-C3)
+ * 4. Tool messages without toolCallId are removed (R2 F-10)
+ * 5. thoughtSignature is preserved on tool calls (Gemini requirement)
+ *
+ * Inspired by Codex's normalize_history() and OpenClaw's repairToolUseResultPairing().
+ */
+export function repairToolCallPairing(messages) {
+    const result = [];
+    for (let i = 0; i < messages.length; i++) {
+        const msg = messages[i];
+        if (msg.role === "assistant" && msg.toolCalls?.length) {
+            const toolCallIds = new Set(msg.toolCalls.map((tc) => tc.id));
+            const immediateResultIds = new Set();
+            const immediateToolResults = [];
+            let cursor = i + 1;
+            while (cursor < messages.length && messages[cursor].role === "tool") {
+                const toolMsg = messages[cursor];
+                if (toolMsg.toolCallId &&
+                    toolCallIds.has(toolMsg.toolCallId) &&
+                    !immediateResultIds.has(toolMsg.toolCallId)) {
+                    immediateResultIds.add(toolMsg.toolCallId);
+                    immediateToolResults.push(toolMsg);
+                }
+                cursor++;
+            }
+            const keptToolCalls = msg.toolCalls.filter((tc) => {
+                if (immediateResultIds.has(tc.id)) {
+                    return true;
+                }
+                return !hasToolResultLater(messages, cursor, tc.id);
+            });
+            const syntheticCalls = keptToolCalls.filter((tc) => !immediateResultIds.has(tc.id));
+            if (keptToolCalls.length === msg.toolCalls.length) {
+                result.push(msg);
+            }
+            else if (keptToolCalls.length > 0) {
+                result.push({ ...msg, toolCalls: keptToolCalls });
+            }
+            else if (hasMeaningfulAssistantContent(msg.content)) {
+                result.push(stripToolCalls(msg));
+            }
+            result.push(...immediateToolResults);
+            for (const tc of syntheticCalls) {
+                result.push({
+                    role: "tool",
+                    content: `[Tool execution interrupted — no result for ${tc.name}]`,
+                    toolCallId: tc.id,
+                });
+            }
+            i = cursor - 1;
+            continue;
+        }
+        // Tool messages are only valid when consumed as part of the immediate
+        // assistant -> tool_result boundary handled above.
+        if (msg.role === "tool") {
+            continue;
+        }
+        result.push(msg);
+    }
+    return result;
+}
+//# sourceMappingURL=repair-tool-pairing.js.map

package/dist/history/repair-tool-pairing.js.map

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

package/dist/history/stall-phase-bridge.js

@@ -0,0 +1,11 @@
+/**
+ * Bridge between SessionHistory's injectable stall-phase callbacks and
+ * the CLI's event-loop watchdog.
+ */
+import { setStallPhase, clearStallPhase, getStallPhase } from "../event-loop-watchdog.js";
+export const cliStallPhase = {
+    get: getStallPhase,
+    set: setStallPhase,
+    clear: clearStallPhase,
+};
+//# sourceMappingURL=stall-phase-bridge.js.map

package/dist/history/stall-phase-bridge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stall-phase-bridge.js","sourceRoot":"","sources":["../../src/history/stall-phase-bridge.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAG1F,MAAM,CAAC,MAAM,aAAa,GAAqD;IAC7E,GAAG,EAAE,aAAa;IAClB,GAAG,EAAE,aAAa;IAClB,KAAK,EAAE,eAAe;CACvB,CAAC"}