@qduc/term2 0.11.1 → 0.13.0

package/dist/services/session/session-input-planner.js

@@ -1,5 +1,5 @@
 import { InputSurgeGuard } from '../input-surge-guard.js';
-import { LargeUncachedInputGuard } from '../large-uncached-input-guard.js';
+import { getSerializedInputBytes, LargeUncachedInputGuard, } from '../large-uncached-input-guard.js';
 import { getProvider } from '../../providers/index.js';
 import { getMethod } from '../interruption-info.js';
 import { normalizeUserTurn } from '../../types/user-turn.js';
@@ -8,6 +8,13 @@ const supportsConversationChaining = (providerId) => {
     const providerDef = getProvider(providerId);
     return providerDef?.capabilities?.supportsConversationChaining ?? false;
 };
+/**
+ * Byte size of `JSON.stringify([...finalizedHistory, draftItem])` without
+ * re-serializing the finalized prefix. Finalized messages never change while
+ * the user types, so callers cache `historyBytes`/`historyLength` once per
+ * history identity and only re-measure the draft.
+ */
+export const combineHistoryAndDraftBytes = (historyBytes, historyLength, draftItemBytes) => (historyLength === 0 ? draftItemBytes + 2 : historyBytes + draftItemBytes + 1);
 /**
  * Owns all input construction and guard logic for a conversation session.
  *
@@ -25,13 +32,19 @@ export class SessionInputPlanner {
     #agentClient;
     #toolTracker;
     #providerContinuity;
+    #getProviderHistorySnapshot;
+    /** Cheap history identity — must not clone the transcript. */
+    #getHistoryIdentity;
     #inputSurgeGuard = new InputSurgeGuard();
     #largeUncachedInputGuard = new LargeUncachedInputGuard();
+    #outgoingSizeCache = null;
     constructor(deps) {
         this.#settingsService = deps.settingsService;
         this.#agentClient = deps.agentClient;
         this.#toolTracker = deps.toolTracker;
         this.#providerContinuity = deps.providerContinuity;
+        this.#getProviderHistorySnapshot = deps.getProviderHistorySnapshot;
+        this.#getHistoryIdentity = deps.getHistoryIdentity;
     }
     /**
      * Inspect the input for a potential input surge condition.
@@ -73,6 +86,7 @@ export class SessionInputPlanner {
     reset() {
         this.#inputSurgeGuard.reset();
         this.#largeUncachedInputGuard.reset();
+        this.#outgoingSizeCache = null;
     }
     /**
      * Mark a resumed session on the large-uncached-input guard.
@@ -115,6 +129,7 @@ export class SessionInputPlanner {
                 streamInput: statelessHistory,
                 inputSurgeKind: 'full_history',
                 effectiveTurn: turn,
+                providerHistorySnapshot: this.#getProviderHistorySnapshot?.(),
             };
         }
         const effectiveTurn = options.includeTurn ? this.#turnWithModeNotice(turn, options.pendingModeNotice) : turn;
@@ -125,7 +140,17 @@ export class SessionInputPlanner {
         // Fall back to stateless mode where the arguments can be sanitized before
         // sending.
         const hasMalformedArgs = hasMalformedToolCallArguments(outgoingHistory);
-        const useChaining = supportsChaining && !hasMalformedArgs && this.#providerContinuity.isChainingAvailable(outgoingHistory.length);
+        // Unpaid tool debt means previous_response_id still requires function_call
+        // outputs. A text-only delta would 400 ("No tool output found for function
+        // call …"). Drop the chain and send self-contained full history instead.
+        const hasUnsettledChainDebt = this.#providerContinuity.hasOutstandingToolDebt();
+        if (hasUnsettledChainDebt && this.#providerContinuity.previousResponseId) {
+            this.#providerContinuity.clear();
+        }
+        const useChaining = supportsChaining &&
+            !hasMalformedArgs &&
+            !hasUnsettledChainDebt &&
+            this.#providerContinuity.isChainingAvailable(outgoingHistory.length);
         const latestInput = outgoingHistory[outgoingHistory.length - 1] ?? effectiveTurn.text;
         const chainedInput = effectiveTurn.images?.length ? latestInput : effectiveTurn.text;
         // Stateless (full-history) inputs must be self-contained: the Responses
@@ -145,29 +170,115 @@ export class SessionInputPlanner {
                 : statelessHistory,
             inputSurgeKind: useChaining ? 'delta' : 'full_history',
             effectiveTurn,
+            providerHistorySnapshot: this.#getProviderHistorySnapshot?.(),
         };
     }
     /**
      * Preview what the large-uncached-input guard would decide for the given input.
      *
      * Does not mutate any state or consume the pending mode notice.
+     *
+     * Cost model while typing:
+     * 1. Session risk check (`mightWarn`) — free; skips everything when a warn
+     *    is impossible (active chat, same config).
+     * 2. Finalized history is measured once per history identity and cached —
+     *    finalized messages never change while the user types.
+     * 3. Each preview only re-sizes the draft turn and combines it with the
+     *    cached history bytes (no full-history `JSON.stringify`).
      */
     previewLargeUncachedInput(input, now, context) {
-        const turn = normalizeUserTurn(input);
-        const { streamInput } = this.build(turn, {
-            includeTurn: true,
-            pendingModeNotice: context?.pendingModeNotice ?? null,
-        });
-        return this.#largeUncachedInputGuard.inspect({
-            input: streamInput,
-            now: now ?? Date.now(),
+        const at = now ?? Date.now();
+        const riskContext = {
+            now: at,
             provider: this.#getProviderForGuard(),
             model: this.#getModelForGuard(),
             reasoningEffort: this.#getReasoningEffortForGuard(),
             mode: this.#getTrafficMode(),
+        };
+        if (!this.#largeUncachedInputGuard.mightWarn(riskContext)) {
+            return {
+                action: 'allow',
+                warningKey: '',
+                reasons: [],
+                estimatedTokens: 0,
+                estimatedBytes: 0,
+            };
+        }
+        const turn = normalizeUserTurn(input);
+        const effectiveTurn = this.#turnWithModeNotice(turn, context?.pendingModeNotice ?? null);
+        const { estimatedBytes, contentKey } = this.#estimateOutgoingInputSize(effectiveTurn);
+        return this.#largeUncachedInputGuard.inspect({
+            estimatedBytes,
+            contentKey,
+            ...riskContext,
         });
     }
     // ── Private helpers ──────────────────────────────────────────────
+    /**
+     * Size the next outgoing payload using a cache of the finalized history.
+     * Only the draft turn is re-serialized on cache hits.
+     */
+    #estimateOutgoingInputSize(effectiveTurn) {
+        const cache = this.#getOutgoingSizeCache();
+        if (cache.useChaining) {
+            if (effectiveTurn.images?.length) {
+                const item = this.#makeUserInputItem(effectiveTurn);
+                // Chained image turns send `[userItem]`, not the bare text.
+                const estimatedBytes = getSerializedInputBytes([item]);
+                return { estimatedBytes, contentKey: `${cache.key}\nimg:${estimatedBytes}` };
+            }
+            const text = effectiveTurn.text ?? '';
+            const estimatedBytes = getSerializedInputBytes(text);
+            return { estimatedBytes, contentKey: `${cache.key}\n${text}` };
+        }
+        const draftItem = this.#makeUserInputItem(effectiveTurn);
+        const draftItemBytes = getSerializedInputBytes(draftItem);
+        const estimatedBytes = combineHistoryAndDraftBytes(cache.finalizedHistoryBytes, cache.finalizedHistoryLength, draftItemBytes);
+        return {
+            estimatedBytes,
+            contentKey: `${cache.key}\n${effectiveTurn.text ?? ''}\n${draftItemBytes}`,
+        };
+    }
+    #getOutgoingSizeCache() {
+        const key = this.#outgoingSizeCacheKey();
+        if (this.#outgoingSizeCache?.key === key) {
+            return this.#outgoingSizeCache;
+        }
+        const provider = this.#getProviderForGuard() ?? 'openai';
+        const dynamicSupportsChaining = getMethod(this.#agentClient, 'supportsConversationChaining');
+        const supportsChaining = dynamicSupportsChaining
+            ? dynamicSupportsChaining.call(this.#agentClient)
+            : supportsConversationChaining(provider);
+        const history = this.#toolTracker.getReconciledHistory();
+        // The draft user turn is never a function_call, so malformed-arg detection
+        // on history alone matches build(includeTurn: true).
+        const hasMalformedArgs = hasMalformedToolCallArguments(history);
+        const useChaining = supportsChaining && !hasMalformedArgs && this.#providerContinuity.isChainingAvailable(history.length + 1);
+        if (useChaining) {
+            this.#outgoingSizeCache = {
+                key,
+                useChaining: true,
+                finalizedHistoryBytes: 0,
+                finalizedHistoryLength: 0,
+            };
+            return this.#outgoingSizeCache;
+        }
+        const finalizedHistory = sanitizeMalformedToolCallArguments(dropUnpairedFunctionCalls(history));
+        this.#outgoingSizeCache = {
+            key,
+            useChaining: false,
+            finalizedHistoryBytes: getSerializedInputBytes(finalizedHistory),
+            finalizedHistoryLength: finalizedHistory.length,
+        };
+        return this.#outgoingSizeCache;
+    }
+    #outgoingSizeCacheKey() {
+        const historyIdentity = this.#getHistoryIdentity?.() ?? this.#getProviderHistorySnapshot?.()?.identity ?? 'unknown-history';
+        // Continuity can flip full-history vs delta without a history revision.
+        const continuity = `${this.#providerContinuity.previousResponseId ?? ''}:${this.#providerContinuity.chainingBroken ? 1 : 0}`;
+        const provider = this.#getProviderForGuard() ?? '';
+        return `${historyIdentity}|${continuity}|${provider}`;
+    }
     #getTrafficMode() {
         if (!this.#settingsService)
             return 'standard';

package/dist/services/session/session-input-planner.js.map

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

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

@@ -7,6 +7,7 @@ import { TurnStatusMachine } from './turn-status-machine.js';
 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';
 /**
  * Owns and manages session-level state transitions:
  * - pendingModeNotice
@@ -34,6 +35,10 @@ export declare class SessionLifecycle {
         providerContinuity: ProviderContinuity;
         generationGuard: GenerationGuard;
         continuityReset: SessionContinuityReset;
+        /** Handle-owned root capability; absent only for compatibility callers. */
+        sessionAccess?: SessionAccessState;
+        /** Notify the coordinator before a generation reset invalidates a turn. */
+        terminateActiveTurn?: () => void;
     });
     /**
      * Full session reset: clears conversation store, tool tracker, input planner,

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;AAMvE;;;;;;;;;;GAUG;AACH,qBAAa,gBAAgB;;IAC3B,mEAAmE;IACnE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAYxC,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,MAAM,CAAC;QAClB,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;KACzC,EAUA;IAID;;;OAGG;IACH,YAAY,CAAC,OAAO,CAAC,EAAE;QAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAS7D;IAED;;;OAGG;IACH,oBAAoB,IAAI,IAAI,CAI3B;IAED;;;;OAIG;IACH,SAAS,IAAI,IAAI,CAMhB;IAED;;OAEG;IACH,cAAc,IAAI,IAAI,CAMrB;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,CA2CP;CAKF"}
+{"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;AAEpE;;;;;;;;;;GAUG;AACH,qBAAa,gBAAgB;;IAC3B,mEAAmE;IACnE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAcxC,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,MAAM,CAAC;QAClB,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,2EAA2E;QAC3E,aAAa,CAAC,EAAE,kBAAkB,CAAC;QACnC,2EAA2E;QAC3E,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;KAClC,EAYA;IAID;;;OAGG;IACH,YAAY,CAAC,OAAO,CAAC,EAAE;QAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAS7D;IAED;;;OAGG;IACH,oBAAoB,IAAI,IAAI,CAK3B;IAED;;;;OAIG;IACH,SAAS,IAAI,IAAI,CAOhB;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"}

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

@@ -1,7 +1,5 @@
 import { projectImportedState, ProjectionWarningCode } from '../conversation/conversation-state-projector.js';
 import { ImportedConversationStateSchema } from '../conversation/conversation-state-schema.js';
-import { sessionReadAccess } from '../approval/session-read-access.js';
-import { clearDockerHostControlSession } from '../../utils/shell/sandbox/docker-host-control-grants.js';
 /**
  * Owns and manages session-level state transitions:
  * - pendingModeNotice
@@ -25,6 +23,8 @@ export class SessionLifecycle {
     #providerContinuity;
     #generationGuard;
     #continuityReset;
+    #sessionAccess;
+    #terminateActiveTurn;
     constructor(deps) {
         this.#inputPlanner = deps.inputPlanner;
         this.#toolTracker = deps.toolTracker;
@@ -35,6 +35,8 @@ export class SessionLifecycle {
         this.#providerContinuity = deps.providerContinuity;
         this.#generationGuard = deps.generationGuard;
         this.#continuityReset = deps.continuityReset;
+        this.#sessionAccess = deps.sessionAccess;
+        this.#terminateActiveTurn = deps.terminateActiveTurn;
     }
     // ── Public lifecycle methods ─────────────────────────────────────
     /**
@@ -42,9 +44,9 @@ export class SessionLifecycle {
      * and all continuity state.
      */
     resetSession(options) {
+        this.#terminateActiveTurn?.();
         this.#generationGuard.invalidate();
-        sessionReadAccess.clear(this.#sessionId);
-        clearDockerHostControlSession(this.#sessionId);
+        this.#clearAccessState();
         this.#continuityReset.reset(options);
         this.#conversationStore.clear();
         this.#toolTracker.reset();
@@ -56,6 +58,7 @@ export class SessionLifecycle {
      * Keeps the conversation store intact but severs the response chain.
      */
     afterProviderChanged() {
+        this.#terminateActiveTurn?.();
         this.#generationGuard.invalidate();
         this.#continuityReset.reset();
         this.#appState.statusMachine.abort();
@@ -66,6 +69,7 @@ export class SessionLifecycle {
      * Call this *after* the user turn has been removed from the conversation store.
      */
     afterUndo() {
+        this.#terminateActiveTurn?.();
         this.#generationGuard.invalidate();
         this.#pruneToolLedgerToCurrentHistory();
         this.#continuityReset.reset();
@@ -76,6 +80,7 @@ export class SessionLifecycle {
      * Reset state after rewinding to the last tool output.
      */
     afterToolRetry() {
+        this.#terminateActiveTurn?.();
         this.#generationGuard.invalidate();
         this.#pruneToolLedgerToCurrentHistory();
         this.#continuityReset.reset();
@@ -101,8 +106,7 @@ export class SessionLifecycle {
      */
     importPersistedState(state) {
         const validatedState = ImportedConversationStateSchema.parse(state);
-        sessionReadAccess.clear(this.#sessionId);
-        clearDockerHostControlSession(this.#sessionId);
+        this.#clearAccessState();
         this.#conversationStore.clear();
         this.#toolTracker.import(validatedState.toolLedger);
         const projected = projectImportedState({
@@ -140,5 +144,11 @@ export class SessionLifecycle {
     #pruneToolLedgerToCurrentHistory() {
         this.#toolTracker.pruneToCurrentHistory();
     }
+    #clearAccessState() {
+        if (this.#sessionAccess) {
+            this.#sessionAccess.clearTransient();
+            return;
+        }
+    }
 }
 //# sourceMappingURL=session-lifecycle.js.map

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-manager.d.ts

@@ -1,7 +1,7 @@
 import type { UserTurn } from '../../types/user-turn.js';
 import type { ConversationAgentClient } from '../conversation-agent-client.js';
 import type { ISettingsService } from '../service-interfaces.js';
-import { ConversationStore } from '../conversation/conversation-store.js';
+import { ConversationStore, type RewindTarget, type RewindTargetId } from '../conversation/conversation-store.js';
 import { ConversationLogger } from '../logging/conversation-logger.js';
 import type { StateSnapshot } from '../logging/conversation-log-events.js';
 import { SessionLifecycle } from './session-lifecycle.js';
@@ -52,6 +52,16 @@ export declare class SessionManager {
         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;
     exportState(): {
         history: unknown[];

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

@@ -1 +1 @@
-{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAItE;;;;GAIG;AACH,qBAAa,cAAc;;IASzB,YAAY,IAAI,EAAE;QAChB,iBAAiB,EAAE,iBAAiB,CAAC;QACrC,WAAW,EAAE,kBAAkB,CAAC;QAChC,KAAK,EAAE,gBAAgB,CAAC;QACxB,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,WAAW,EAAE,uBAAuB,CAAC;QACrC,eAAe,CAAC,EAAE,gBAAgB,CAAC;QACnC,YAAY,EAAE,mBAAmB,CAAC;KACnC,EAQA;IAID,KAAK,IAAI,IAAI,CAEZ;IAID,gBAAgB,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;KAAE,GAAG,IAAI,CAKvE;IAED,kBAAkB,IAAI;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,IAAI,CAQP;IAED,mBAAmB,IAAI;QACrB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,IAAI,CAOP;IAED,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;KAAE,GAAG,IAAI,CAK9E;IAED,aAAa,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE,CAErE;IAID,kBAAkB,IAAI,aAAa,CAalC;IAED,WAAW,IAAI;QACb,OAAO,EAAE,OAAO,EAAE,CAAC;QACnB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAClC,UAAU,EAAE,kBAAkB,EAAE,CAAC;KAClC,CAEA;IAED,WAAW,CAAC,KAAK,EAAE;QACjB,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,CAEP;IAID,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAEzC;IAED,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAElC;IAED,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,GAAG,SAAa,yEAInE;IAED,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,wDAIzC;CAYF"}
+{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-manager.ts"],"names":[],"mappings":"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"}

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

@@ -62,12 +62,25 @@ export class SessionManager {
     listUserTurns() {
         return this.#conversationStore.listUserTurns();
     }
+    listRewindTargets() {
+        return this.#conversationStore.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.#conversationStore.rewindToTarget(targetId);
+        if (removed === null)
+            return null;
+        this.#afterUndo(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.provider');
+        const provider = providerFn ? providerFn.call(this.#agentClient) : this.#settingsService?.get('agent.provider');
         const model = this.#settingsService?.get('agent.model');
         return projectSnapshot({
             history: this.#conversationStore.getHistory(),

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

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

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

@@ -3,10 +3,12 @@ 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';
 export type StreamHistorySource = 'startStream' | 'continueRunStream' | 'abortResolution';
 export type StreamFinalizationResult = {
@@ -16,6 +18,7 @@ export type StreamFinalizationResult = {
 } | {
     kind: 'committed';
 };
+export declare const lastOpenAICompaction: (items: readonly unknown[]) => ProviderOpaqueItem | undefined;
 export interface SessionStreamProcessorDeps {
     logger: ILoggingService;
     sessionId: string;
@@ -23,6 +26,8 @@ export interface SessionStreamProcessorDeps {
     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;
@@ -36,6 +41,7 @@ export interface StreamProcessOptions {
     previouslyEmittedCommandIds?: Set<string>;
 }
 export declare class SessionStreamProcessor {
+    #private;
     private readonly deps;
     constructor(deps: SessionStreamProcessorDeps);
     /**

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,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;AAMpH,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG/E,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;AA0D1B,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,kBAAkB,CAAC;IAChC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;IACjC,mEAAmE;IACnE,OAAO,EAAE,oBAAoB,CAAC;IAC9B,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B;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;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,0BAA0B,EAAI;IAEjE;;;OAGG;IACI,OAAO,CACZ,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,oBAAoB,GAC5B,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,IAAI,CAAC,CA0H5D;IAED;;;OAGG;IACH,QAAQ,CACN,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,eAAe,EACtB,SAAS,EAAE,OAAO,GAAG,cAAc,EACnC,MAAM,EAAE,mBAAmB,GAC1B,wBAAwB,CAyC1B;CACF"}
+{"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;AAG/E,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;AAmC1B,eAAO,MAAM,oBAAoB,UAAW,SAAS,OAAO,EAAE,KAAG,kBAAkB,GAAG,SAcrF,CAAC;AAqGF,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,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;CAC1B;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;;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,0BAA0B,EAAI;IAEjE;;;OAGG;IACI,OAAO,CACZ,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,oBAAoB,GAC5B,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,IAAI,CAAC,CA0H5D;IAED;;;OAGG;IACH,QAAQ,CACN,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,eAAe,EACtB,SAAS,EAAE,OAAO,GAAG,cAAc,EACnC,MAAM,EAAE,mBAAmB,GAC1B,wBAAwB,CA4G1B;CAWF"}