@qduc/term2 0.32.2 → 0.33.0

package/dist/services/session/session-lifecycle.d.ts

@@ -1,6 +1,12 @@
+import type { StateSnapshot } from '../logging/conversation-log-events.js';
+import { ConversationLogger } from '../logging/conversation-logger.js';
+import type { RewindTarget, RewindTargetId } from '../conversation/conversation-store.js';
+import type { ConversationAgentClient } from '../conversation-agent-client.js';
+import type { ProviderInputItem } from '../../contracts/provider-input.js';
+import type { UserTurn } from '../../types/user-turn.js';
+import { ConversationRecord } from '../conversation/conversation-record.js';
 import { SessionInputPlanner } from './session-input-planner.js';
-import { SessionToolTracker } from './session-tool-tracker.js';
-import { ConversationStore } from '../conversation/conversation-store.js';
+import type { ISettingsService } from '../service-interfaces.js';
 import type { ILoggingService } from '../service-interfaces.js';
 import type { SavedToolExecution } from '../tool-execution-ledger.js';
 import { TurnStatusMachine } from './turn-status-machine.js';
@@ -8,7 +14,6 @@ import type { ProviderContinuity } from '../provider-continuity.js';
 import { GenerationGuard } from '../generation-guard.js';
 import { SessionContinuityReset } from './session-continuity-reset.js';
 import type { SessionAccessState } from './session-access-state.js';
-import type { AssistantTurnJournal } from '../logging/assistant-turn-journal.js';
 import type { PendingInteractionState } from './pending-interaction-state.js';
 import type { SessionIdSource } from './session-identity.js';
 /**
@@ -16,7 +21,7 @@ import type { SessionIdSource } from './session-identity.js';
  * - pendingModeNotice
  * - generation resets, store clearing
  * - import/export reconciliation
- * - undo side effects
+ * - complete undo/retry/rewind operations and their logging
  * - approval/cache/input guard reset hooks
  *
  * ConversationSession delegates to this object for lifecycle operations
@@ -28,8 +33,10 @@ export declare class SessionLifecycle {
     pendingModeNotice: string | null;
     constructor(deps: {
         inputPlanner: SessionInputPlanner;
-        toolTracker: SessionToolTracker;
-        conversationStore: ConversationStore;
+        conversationLogger: ConversationLogger;
+        agentClient: ConversationAgentClient;
+        settingsService?: ISettingsService;
+        record: ConversationRecord;
         logger: ILoggingService;
         sessionId: SessionIdSource;
         appState: {
@@ -38,13 +45,6 @@ export declare class SessionLifecycle {
         providerContinuity: ProviderContinuity;
         generationGuard: GenerationGuard;
         continuityReset: SessionContinuityReset;
-        /**
-         * Streams assistant items into the durable journal. Undo/reset must prune
-         * it alongside the store and ledger: failure recovery rebuilds the tool
-         * ledger from this buffer, so skipped pruning would resurrect tool pairs
-         * from undone turns into the next provider request.
-         */
-        journal: AssistantTurnJournal;
         /** Handle-owned root capability; absent only for compatibility callers. */
         sessionAccess?: SessionAccessState;
         /** Notify the coordinator before a generation reset invalidates a turn. */
@@ -64,16 +64,6 @@ export declare class SessionLifecycle {
      * Keeps the conversation store intact but severs the response chain.
      */
     afterProviderChanged(): void;
-    /**
-     * Clean up after an undo operation.
-     *
-     * Call this *after* the user turn has been removed from the conversation store.
-     */
-    afterUndo(): void;
-    /**
-     * Reset state after rewinding to the last tool output.
-     */
-    afterToolRetry(): void;
     /**
      * Export the current session state for persistence.
      */
@@ -95,5 +85,65 @@ export declare class SessionLifecycle {
         toolLedger?: SavedToolExecution[];
         updatedAt?: string;
     }): void;
+    reset(): void;
+    undoLastUserTurn(): {
+        text: string;
+        images?: UserTurn['images'];
+    } | null;
+    /** Discard the latest attempt, retaining the exact original provider input. */
+    retryLastUserTurn(): boolean;
+    peekLastToolOutput(): {
+        index: number;
+        callId?: string;
+        toolName?: string;
+        output?: unknown;
+        itemType: string;
+    } | null;
+    retryLastToolOutput(): {
+        index: number;
+        callId?: string;
+        toolName?: string;
+        output?: unknown;
+        itemType: string;
+    } | null;
+    undoNUserTurns(n: number): {
+        text: string;
+        images?: UserTurn['images'];
+    } | null;
+    listUserTurns(): {
+        index: number;
+        text: string;
+        imageCount: number;
+    }[];
+    listRewindTargets(): RewindTarget[];
+    /**
+     * Rewind through a snapshot-scoped domain target. This is the only target
+     * based rewind entry point: lifecycle cleanup and undo logging happen once,
+     * and only after the store accepted the target.
+     */
+    rewindToTarget(targetId: RewindTargetId): {
+        text: string;
+        images?: UserTurn['images'];
+    } | null;
+    getCurrentSnapshot(): StateSnapshot;
+    getProviderHistorySnapshot(): import("../conversation/conversation-store.js").ProviderHistorySnapshot;
+    replaceHistoryAtRevision(expectedRevision: number, history: readonly ProviderInputItem[]): boolean;
+    exportState(): {
+        history: unknown[];
+        previousResponseId: string | null;
+        toolLedger: SavedToolExecution[];
+    };
+    importState(state: {
+        history: unknown[];
+        previousResponseId: string | null;
+        toolLedger?: SavedToolExecution[];
+        updatedAt?: string;
+    }): void;
+    addShellContext(historyText: string): void;
+    queueModeNotice(text: string): void;
+    previewLargeUncachedInput(input: string | UserTurn, now?: number): import("../large-uncached-input-guard.js").LargeUncachedInputDecision;
+    previewInputSurge(input: string | UserTurn): import("../input-surge-guard.js").InputSurgeDecision;
 }
+/** Complete public state operations; cleanup primitives remain an internal concern. */
+export type SessionState = Pick<SessionLifecycle, 'reset' | 'undoLastUserTurn' | 'retryLastUserTurn' | 'peekLastToolOutput' | 'retryLastToolOutput' | 'undoNUserTurns' | 'listUserTurns' | 'listRewindTargets' | 'rewindToTarget' | 'getCurrentSnapshot' | 'getProviderHistorySnapshot' | 'replaceHistoryAtRevision' | 'exportState' | 'importState' | 'addShellContext' | 'queueModeNotice' | 'previewLargeUncachedInput' | 'previewInputSurge'>;
 //# sourceMappingURL=session-lifecycle.d.ts.map

package/dist/services/session/session-lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-lifecycle.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-lifecycle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAGvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D;;;;;;;;;;GAUG;AACH,qBAAa,gBAAgB;;IAC3B,mEAAmE;IACnE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAgBxC,YAAY,IAAI,EAAE;QAChB,YAAY,EAAE,mBAAmB,CAAC;QAClC,WAAW,EAAE,kBAAkB,CAAC;QAChC,iBAAiB,EAAE,iBAAiB,CAAC;QACrC,MAAM,EAAE,eAAe,CAAC;QACxB,SAAS,EAAE,eAAe,CAAC;QAC3B,QAAQ,EAAE;YAAE,aAAa,EAAE,iBAAiB,CAAA;SAAE,CAAC;QAC/C,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,eAAe,EAAE,eAAe,CAAC;QACjC,eAAe,EAAE,sBAAsB,CAAC;QACxC;;;;;WAKG;QACH,OAAO,EAAE,oBAAoB,CAAC;QAC9B,2EAA2E;QAC3E,aAAa,CAAC,EAAE,kBAAkB,CAAC;QACnC,2EAA2E;QAC3E,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;QACjC,kBAAkB,CAAC,EAAE,uBAAuB,CAAC;KAC9C,EAcA;IAID;;;OAGG;IACH,YAAY,CAAC,OAAO,CAAC,EAAE;QAAE,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAWjF;IAED;;;OAGG;IACH,oBAAoB,IAAI,IAAI,CAK3B;IAED;;;;OAIG;IACH,SAAS,IAAI,IAAI,CAQhB;IAED;;OAEG;IACH,cAAc,IAAI,IAAI,CAOrB;IAED;;OAEG;IACH,oBAAoB,IAAI;QACtB,OAAO,EAAE,OAAO,EAAE,CAAC;QACnB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAClC,UAAU,EAAE,kBAAkB,EAAE,CAAC;KAClC,CAMA;IAED;;;;;;OAMG;IACH,oBAAoB,CAAC,KAAK,EAAE;QAC1B,OAAO,EAAE,OAAO,EAAE,CAAC;QACnB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAClC,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAC;QAClC,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GAAG,IAAI,CA0CP;CAYF"}
+{"version":3,"file":"session-lifecycle.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-lifecycle.ts"],"names":[],"mappings":"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"}

package/dist/services/session/session-lifecycle.js

@@ -1,12 +1,12 @@
-import { projectImportedState, ProjectionWarningCode } from '../conversation/conversation-state-projector.js';
-import { ImportedConversationStateSchema } from '../conversation/conversation-state-schema.js';
+import { getMethod } from '../interruption-info.js';
+import { ProjectionWarningCode } from '../conversation/conversation-state-projector.js';
 import { resolveSessionId } from './session-identity.js';
 /**
  * Owns and manages session-level state transitions:
  * - pendingModeNotice
  * - generation resets, store clearing
  * - import/export reconciliation
- * - undo side effects
+ * - complete undo/retry/rewind operations and their logging
  * - approval/cache/input guard reset hooks
  *
  * ConversationSession delegates to this object for lifecycle operations
@@ -16,8 +16,7 @@ export class SessionLifecycle {
     /** A pending mode-notice text to prepend to the next user turn. */
     pendingModeNotice = null;
     #inputPlanner;
-    #toolTracker;
-    #conversationStore;
+    #record;
     #logger;
     #sessionId;
     #appState;
@@ -26,12 +25,16 @@ export class SessionLifecycle {
     #continuityReset;
     #sessionAccess;
     #terminateActiveTurn;
-    #journal;
     #pendingInteraction;
+    #conversationLogger;
+    #agentClient;
+    #settingsService;
     constructor(deps) {
         this.#inputPlanner = deps.inputPlanner;
-        this.#toolTracker = deps.toolTracker;
-        this.#conversationStore = deps.conversationStore;
+        this.#conversationLogger = deps.conversationLogger;
+        this.#agentClient = deps.agentClient;
+        this.#settingsService = deps.settingsService;
+        this.#record = deps.record;
         this.#logger = deps.logger;
         this.#sessionId = deps.sessionId;
         this.#appState = deps.appState;
@@ -40,7 +43,6 @@ export class SessionLifecycle {
         this.#continuityReset = deps.continuityReset;
         this.#sessionAccess = deps.sessionAccess;
         this.#terminateActiveTurn = deps.terminateActiveTurn;
-        this.#journal = deps.journal;
         this.#pendingInteraction = deps.pendingInteraction;
     }
     // ── Public lifecycle methods ─────────────────────────────────────
@@ -53,10 +55,8 @@ export class SessionLifecycle {
         this.#generationGuard.invalidate();
         this.#clearAccessState();
         this.#continuityReset.reset(options);
-        this.#conversationStore.clear();
-        this.#toolTracker.reset();
+        this.#record.reset();
         this.#inputPlanner.reset();
-        this.#journal.clear();
         this.#pendingInteraction?.clear();
         this.#appState.statusMachine.abort();
     }
@@ -73,24 +73,12 @@ export class SessionLifecycle {
     /**
      * Clean up after an undo operation.
      *
-     * Call this *after* the user turn has been removed from the conversation store.
+     * Private step of an accepted synchronous history operation. No caller must
+     * remember a separate cleanup or logging call.
      */
-    afterUndo() {
+    #afterUndo() {
         this.#terminateActiveTurn?.();
         this.#generationGuard.invalidate();
-        this.#pruneToolLedgerToCurrentHistory();
-        this.#journal.pruneToUserTurnCount(this.#conversationStore.listUserTurns().length);
-        this.#continuityReset.reset();
-        this.#inputPlanner.markUndoOrRewind();
-        this.#appState.statusMachine.abort();
-    }
-    /**
-     * Reset state after rewinding to the last tool output.
-     */
-    afterToolRetry() {
-        this.#terminateActiveTurn?.();
-        this.#generationGuard.invalidate();
-        this.#pruneToolLedgerToCurrentHistory();
         this.#continuityReset.reset();
         this.#inputPlanner.markUndoOrRewind();
         this.#appState.statusMachine.abort();
@@ -99,11 +87,7 @@ export class SessionLifecycle {
      * Export the current session state for persistence.
      */
     exportPersistedState() {
-        return {
-            history: this.#toolTracker.getReconciledHistory(),
-            previousResponseId: this.#providerContinuity.previousResponseId,
-            toolLedger: this.#toolTracker.export(),
-        };
+        return this.#record.exportState(this.#providerContinuity.previousResponseId);
     }
     /**
      * Import a previously persisted session state.
@@ -113,15 +97,9 @@ export class SessionLifecycle {
      * first resumed turn sends full history.
      */
     importPersistedState(state) {
-        const validatedState = ImportedConversationStateSchema.parse(state);
+        const { validated: validatedState, projected } = this.#record.importState(state);
+        this.#terminateActiveTurn?.();
         this.#clearAccessState();
-        this.#conversationStore.clear();
-        this.#toolTracker.import(validatedState.toolLedger);
-        const projected = projectImportedState({
-            history: validatedState.history,
-            previousResponseId: validatedState.previousResponseId,
-            toolLedger: validatedState.toolLedger,
-        });
         if (projected.warnings.length > 0) {
             const addedCompletedPairs = projected.warnings.find((warning) => warning.code === ProjectionWarningCode.CompletedToolHistoryInserted)
                 ?.detail?.addedCompletedPairs ?? 0;
@@ -136,9 +114,6 @@ export class SessionLifecycle {
                 droppedIncompleteCalls,
             });
         }
-        for (const item of projected.history) {
-            this.#conversationStore.addImportedItem(item);
-        }
         // Provider-side response chains can expire while the local transcript remains valid.
         // Force the first resumed turn to resync from full history; successful completion
         // will populate a fresh previousResponseId for subsequent chained turns.
@@ -149,8 +124,115 @@ export class SessionLifecycle {
         this.#generationGuard.invalidate();
         this.#appState.statusMachine.abort();
     }
-    #pruneToolLedgerToCurrentHistory() {
-        this.#toolTracker.pruneToCurrentHistory();
+    // ── Reset ─────────────────────────────────────────────────────────
+    reset() {
+        this.resetSession();
+    }
+    // ── Undo ──────────────────────────────────────────────────────────
+    undoLastUserTurn() {
+        const removed = this.#record.removeLastUserTurn();
+        if (removed === null)
+            return null;
+        this.#completeUndo(1);
+        return removed;
+    }
+    /** Discard the latest attempt, retaining the exact original provider input. */
+    retryLastUserTurn() {
+        const retry = this.#record.retryLastUserTurn();
+        if (!retry)
+            return false;
+        this.#afterUndo();
+        this.#conversationLogger.log({
+            type: 'undo',
+            removedUserTurns: 1,
+            snapshot: { ...this.getCurrentSnapshot(), ...retry.discardedSnapshot },
+        });
+        return true;
+    }
+    peekLastToolOutput() {
+        return this.#record.peekLastToolOutput();
+    }
+    retryLastToolOutput() {
+        const removed = this.#record.removeAfterLastToolOutput();
+        if (removed === null)
+            return null;
+        this.#afterUndo();
+        return removed;
+    }
+    undoNUserTurns(n) {
+        const removed = this.#record.removeNLastUserTurns(n);
+        if (removed === null)
+            return null;
+        this.#completeUndo(n);
+        return removed;
+    }
+    listUserTurns() {
+        return this.#record.listUserTurns();
+    }
+    listRewindTargets() {
+        return this.#record.listRewindTargets();
+    }
+    /**
+     * Rewind through a snapshot-scoped domain target. This is the only target
+     * based rewind entry point: lifecycle cleanup and undo logging happen once,
+     * and only after the store accepted the target.
+     */
+    rewindToTarget(targetId) {
+        const removed = this.#record.rewindToTarget(targetId);
+        if (removed === null)
+            return null;
+        this.#completeUndo(removed.discardedTurns);
+        return { text: removed.text, ...(removed.images ? { images: removed.images } : {}) };
+    }
+    // ── Snapshot / State ──────────────────────────────────────────────
+    getCurrentSnapshot() {
+        const providerFn = getMethod(this.#agentClient, 'getProvider');
+        const provider = providerFn
+            ? providerFn.call(this.#agentClient)
+            : this.#settingsService?.get('agent.modelSelection').provider;
+        const model = this.#settingsService?.get('agent.modelSelection').model;
+        return this.#record.snapshot({
+            previousResponseId: this.#providerContinuity.previousResponseId,
+            ...(model ? { model } : {}),
+            ...(provider ? { provider } : {}),
+        });
+    }
+    getProviderHistorySnapshot() {
+        return this.#record.getProviderHistorySnapshot();
+    }
+    replaceHistoryAtRevision(expectedRevision, history) {
+        return this.#record.replaceHistoryAtRevision(expectedRevision, history);
+    }
+    exportState() {
+        return this.exportPersistedState();
+    }
+    importState(state) {
+        this.importPersistedState(state);
+    }
+    // ── Shell context / mode notice ───────────────────────────────────
+    addShellContext(historyText) {
+        this.#record.addShellContext(historyText);
+    }
+    queueModeNotice(text) {
+        // Compose instead of overwrite: a profile transition and tool-toggle
+        // warnings (or several toggles in one batch) must all reach the next turn.
+        const existing = this.pendingModeNotice;
+        this.pendingModeNotice = existing ? `${existing}\n\n${text}` : text;
+    }
+    previewLargeUncachedInput(input, now = Date.now()) {
+        return this.#inputPlanner.previewLargeUncachedInput(input, now, {
+            pendingModeNotice: this.pendingModeNotice,
+        });
+    }
+    previewInputSurge(input) {
+        return this.#inputPlanner.previewInputSurge(input, {
+            pendingModeNotice: this.pendingModeNotice,
+        });
+    }
+    /** No await separates accepted history changes, retirement, reset and undo logging. */
+    #completeUndo(count) {
+        this.#afterUndo();
+        this.#conversationLogger.log({ type: 'undo', removedUserTurns: count, snapshot: this.getCurrentSnapshot() });
     }
     #clearAccessState() {
         if (this.#sessionAccess) {

package/dist/services/session/session-lifecycle.js.map

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

package/dist/services/session/session-stream-processor.d.ts

@@ -1,38 +1,18 @@
 import type { ILoggingService } from '../service-interfaces.js';
 import type { SessionToolTracker } from './session-tool-tracker.js';
-import type { ConversationStore } from '../conversation/conversation-store.js';
-import type { ConversationLogger } from '../logging/conversation-logger.js';
-import type { ProviderContinuity } from '../provider-continuity.js';
-import type { OpenAIRootCheckpointLifecycleObserver } from '../openai-root-checkpoint-lifecycle-observer.js';
 import type { AgentStream } from '../agent-stream.js';
 import type { ConversationEvent } from '../conversation/conversation-events.js';
-import { AssistantTurnJournal } from '../logging/assistant-turn-journal.js';
 import { type StreamAccumulator } from '../stream-event-processor.js';
-import type { ProviderOpaqueItem } from '../../contracts/conversation-items.js';
-import { GenerationGuard, type GenerationToken } from '../generation-guard.js';
+import { GenerationGuard } from '../generation-guard.js';
 import { ToolCallMarkerStore } from '../../utils/streaming/extract-command-messages.js';
 import type { SessionIdSource } from './session-identity.js';
-export type StreamHistorySource = 'startStream' | 'continueRunStream' | 'abortResolution';
-export type StreamFinalizationResult = {
-    kind: 'stale';
-} | {
-    kind: 'partial';
-} | {
-    kind: 'committed';
-};
-export declare const lastOpenAICompaction: (items: readonly unknown[]) => ProviderOpaqueItem | undefined;
+import type { StreamHistorySource } from '../conversation/conversation-record-stream.js';
+export type { StreamHistorySource } from '../conversation/conversation-record-stream.js';
 export interface SessionStreamProcessorDeps {
     logger: ILoggingService;
     sessionId: SessionIdSource;
     toolTracker: SessionToolTracker;
-    conversationStore: ConversationStore;
-    conversationLogger: ConversationLogger;
-    providerContinuity: ProviderContinuity;
-    /** Owned-root OpenAI lifecycle diagnostics; absent for every other client. */
-    openAIRootCheckpointLifecycleObserver?: OpenAIRootCheckpointLifecycleObserver;
     generationGuard: GenerationGuard;
-    /** Assistant-output journal; every raw run item is fed into it. */
-    journal: AssistantTurnJournal;
     /** Cancels provider work when the output safety guard terminates a stream. */
     abortStream?: () => void;
     toolCallMarkers?: ToolCallMarkerStore;
@@ -48,14 +28,8 @@ export declare class SessionStreamProcessor {
     private readonly deps;
     constructor(deps: SessionStreamProcessorDeps);
     /**
-     * Processes the AgentStream, records function calls/results,
-     * dedupes tool started events, logs tool results, and returns the accumulator.
+     * Projects accepted events, dedupes display events and returns presentation data.
      */
     process(stream: AgentStream, options: StreamProcessOptions): AsyncGenerator<ConversationEvent, StreamAccumulator, void>;
-    /**
-     * Finalizes the stream outcome by updating previousResponseId,
-     * checking for replayed tools, and updating the conversation store history.
-     */
-    finalize(stream: AgentStream, token: GenerationToken, inputMode: 'delta' | 'full_history', source: StreamHistorySource): StreamFinalizationResult;
 }
 //# sourceMappingURL=session-stream-processor.d.ts.map

package/dist/services/session/session-stream-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-stream-processor.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-stream-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AAC7G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAgD,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAQpH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AACxF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,mBAAmB,GAAG,iBAAiB,CAAC;AAE1F,MAAM,MAAM,wBAAwB,GAChC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAuC1B,eAAO,MAAM,oBAAoB,UAAW,SAAS,OAAO,EAAE,KAAG,kBAAkB,GAAG,SAcrF,CAAC;AAqGF,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,eAAe,CAAC;IAC3B,WAAW,EAAE,kBAAkB,CAAC;IAChC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,8EAA8E;IAC9E,qCAAqC,CAAC,EAAE,qCAAqC,CAAC;IAC9E,eAAe,EAAE,eAAe,CAAC;IACjC,mEAAmE;IACnE,OAAO,EAAE,oBAAoB,CAAC;IAC9B,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,eAAe,CAAC,EAAE,mBAAmB,CAAC;CACvC;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,mBAAmB,CAAC;IAC5B,wBAAwB,EAAE,OAAO,CAAC;IAClC,2BAA2B,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC3C;AAED,qBAAa,sBAAsB;;IAGrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,0BAA0B,EAE5D;IAED;;;OAGG;IACI,OAAO,CACZ,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,oBAAoB,GAC5B,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,IAAI,CAAC,CA2H5D;IAED;;;OAGG;IACH,QAAQ,CACN,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,eAAe,EACtB,SAAS,EAAE,OAAO,GAAG,cAAc,EACnC,MAAM,EAAE,mBAAmB,GAC1B,wBAAwB,CAgH1B;CAWF"}
+{"version":3,"file":"session-stream-processor.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-stream-processor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAgD,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACpH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AACxF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACzF,YAAY,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEzF,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,eAAe,CAAC;IAC3B,WAAW,EAAE,kBAAkB,CAAC;IAChC,eAAe,EAAE,eAAe,CAAC;IACjC,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,eAAe,CAAC,EAAE,mBAAmB,CAAC;CACvC;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,mBAAmB,CAAC;IAC5B,wBAAwB,EAAE,OAAO,CAAC;IAClC,2BAA2B,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC3C;AAED,qBAAa,sBAAsB;;IAGrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,0BAA0B,EAE5D;IAED;;OAEG;IACI,OAAO,CACZ,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,oBAAoB,GAC5B,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAwE5D;CACF"}