@qduc/term2 0.32.2 → 0.34.0

package/dist/services/session/session-tool-tracker.js

@@ -1,220 +1,31 @@
-import { ToolExecutionLedger, callIdOf } from '../tool-execution-ledger.js';
-import { projectProviderHistory } from '../conversation/conversation-state-projector.js';
-/**
- * Owns all tool-tracking state for a conversation session.
- *
- * This includes the tool execution ledger, tool-call arguments cache,
- * and deduplication sets for invalid packets and started events.
- *
- * The session delegates to this tracker rather than interleaving
- * tool-tracking logic with other concerns.
- */
+/** Presentation caches only; accepted tool evidence belongs to ConversationRecord. */
 export class SessionToolTracker {
-    conversationStore;
-    toolLedger = new ToolExecutionLedger();
     toolCallArgumentsById = new Map();
     emittedInvalidToolCallPackets = new Set();
     emittedToolStartedCallIds = new Set();
     emittedSubagentToolStartedIds = new Set();
     emittedCommandMessageIdsByCallId = new Map();
-    constructor(conversationStore) {
-        this.conversationStore = conversationStore;
-        this.#attachUserTurnCount();
+    snapshotArguments() {
+        return new Map(this.toolCallArgumentsById);
     }
-    #attachUserTurnCount() {
-        this.toolLedger.setUserTurnCountSource(() => this.conversationStore.listUserTurns().length);
-    }
-    /**
-     * Get the underlying ledger for direct access when needed.
-     */
-    get ledger() {
-        return this.toolLedger;
-    }
-    /**
-     * Get the tool-call arguments cache for direct access when needed.
-     */
-    get argumentsById() {
-        return this.toolCallArgumentsById;
-    }
-    /**
-     * Get the invalid packets set for direct access when needed.
-     */
-    get invalidPackets() {
-        return this.emittedInvalidToolCallPackets;
-    }
-    /**
-     * Begin a new turn in the ledger.
-     */
-    beginTurn() {
-        this.toolLedger.beginTurn();
-    }
-    /**
-     * Returns the id of the turn currently in progress, or 'turn-0' if no turn
-     * has begun yet. Exposed for the journal and logger to tag entries with a
-     * stable turn identifier that survives approval continuations.
-     */
-    getCurrentTurnId() {
-        return this.toolLedger.getCurrentTurnId();
-    }
-    /**
-     * Returns call IDs for every tool call recorded in the current turn,
-     * regardless of status. The chained-input filter requires the complete set
-     * because the provider API requires a tool output for every tool call in an
-     * assistant turn — including rejected calls, for which the SDK produces a
-     * synthetic output.
-     */
-    activeCallIdsForCurrentTurn() {
-        return this.toolLedger.activeCallIdsForTurn();
-    }
-    /** Returns only completed tool-result call IDs recorded during the current turn. */
-    completedResultCallIdsForCurrentTurn() {
-        return this.toolLedger.completedResultCallIdsForCurrentTurn();
-    }
-    /**
-     * Admission evidence for post-tool connection recovery: whether every live-turn
-     * tool completed and whether reconciled history still holds those pairs.
-     */
-    inspectCommittedToolContinuation() {
-        const turnId = this.getCurrentTurnId();
-        const live = this.toolLedger.export().filter((entry) => entry.turnId === turnId);
-        const completed = live.filter((entry) => entry.status === 'completed');
-        const historyCallIds = new Set(this.getReconciledHistory()
-            .map((item) => callIdOf(item))
-            .filter((callId) => Boolean(callId)));
+    /** Work on a detached segment view; only a current generation commits it. */
+    beginProjection(preserveArguments) {
+        const argumentsById = preserveArguments ? this.snapshotArguments() : new Map();
+        const invalidPackets = new Set(this.emittedInvalidToolCallPackets);
         return {
-            completedToolCount: completed.length,
-            allToolsCompleted: live.length > 0 && live.every((entry) => entry.status === 'completed'),
-            completedPairsPresentInHistory: completed.every((entry) => historyCallIds.has(entry.callId)),
+            argumentsById,
+            invalidPackets,
+            commit: () => {
+                this.toolCallArgumentsById = new Map(argumentsById);
+                for (const packet of invalidPackets)
+                    this.emittedInvalidToolCallPackets.add(packet);
+            },
         };
     }
-    /**
-     * Call ids recorded this turn that still lack a completed tool result.
-     * Aborted/unknown/started entries count — local synthetic results do not pay
-     * provider-side tool debt while previousResponseId still points at the chain.
-     */
-    unsettledToolCallIdsForCurrentTurn() {
-        const completed = new Set(this.completedResultCallIdsForCurrentTurn());
-        return this.activeCallIdsForCurrentTurn().filter((callId) => !completed.has(callId));
-    }
-    /**
-     * Export the current ledger state.
-     */
-    export() {
-        return this.toolLedger.export();
-    }
-    /**
-     * Import a saved ledger state.
-     */
-    import(entries) {
-        this.toolLedger.import(entries);
-    }
-    /**
-     * Record a function call in the ledger.
-     */
-    recordFunctionCall(item) {
-        this.toolLedger.recordFunctionCall(item);
+    /** A settled result allows a later provider reuse of the call id to render anew. */
+    noteResultObserved(callId) {
+        this.emittedToolStartedCallIds.delete(callId);
     }
-    /**
-     * Record reasoning that should be replayed before the next tool call.
-     */
-    recordReasoningText(text) {
-        this.toolLedger.recordReasoningText(text);
-    }
-    /**
-     * Record a function result in the ledger.
-     */
-    recordFunctionResult(item) {
-        this.toolLedger.recordFunctionResult(item);
-        // The call is settled. A later tool_started with this id is a new execution (the provider reused
-        // the id), not a re-emit of this one, so it must be shown.
-        const callId = callIdOf(item);
-        if (callId)
-            this.emittedToolStartedCallIds.delete(callId);
-    }
-    /**
-     * Record an aborted approval in the ledger.
-     */
-    recordAbortedApproval(output, errorMessage, callId) {
-        this.toolLedger.recordAbortedApproval(output, errorMessage, callId);
-    }
-    /**
-     * Mark that tool execution has begun for this callId (side effects may occur).
-     */
-    markDispatched(callId) {
-        this.toolLedger.markDispatched(callId);
-    }
-    /**
-     * Mark open calls as aborted with the given error message.
-     */
-    markOpenCallsAborted(errorMessage, callId) {
-        this.toolLedger.markOpenCallsAborted(errorMessage, callId);
-    }
-    /**
-     * Settle open calls after stream failure: dispatched → unknown, otherwise aborted.
-     */
-    settleOpenCallsOnStreamFailure(reason = 'Stream failed', callId) {
-        return this.toolLedger.settleOpenCallsOnStreamFailure(reason, callId);
-    }
-    /**
-     * Get a recovery summary if there are recovered/dropped calls.
-     */
-    getRecoverySummary() {
-        return this.toolLedger.getRecoverySummary();
-    }
-    /**
-     * Restore completed, aborted, and unknown tool ledger entries from a snapshot.
-     *
-     * Completed entries carry their results forward so they can be reprojected
-     * into history. Aborted and unknown entries (with synthetic results) are also
-     * preserved so the reconciler injects result pairs for interrupted tool calls
-     * instead of leaving dangling function_call items.
-     */
-    restoreCompletedEntries(snapshot) {
-        const merged = [...snapshot];
-        const indexByCallId = new Map();
-        merged.forEach((entry, index) => {
-            indexByCallId.set(entry.callId, index);
-        });
-        for (const entry of this.toolLedger.export()) {
-            if (entry.status !== 'completed' && entry.status !== 'aborted' && entry.status !== 'unknown') {
-                continue;
-            }
-            const existingIndex = indexByCallId.get(entry.callId);
-            if (existingIndex !== undefined) {
-                merged[existingIndex] = entry;
-                continue;
-            }
-            indexByCallId.set(entry.callId, merged.length);
-            merged.push(entry);
-        }
-        this.toolLedger.import(merged);
-    }
-    /**
-     * Prune the tool ledger to only include entries from the current history.
-     */
-    pruneToCurrentHistory() {
-        const userTurnCount = this.conversationStore.listUserTurns().length;
-        const historyCallIds = new Set(this.conversationStore
-            .getHistory()
-            .map((item) => callIdOf(item))
-            .filter(Boolean));
-        const filteredEntries = this.toolLedger.export().filter((entry) => {
-            if (entry.userTurnCount !== undefined) {
-                return entry.userTurnCount <= userTurnCount;
-            }
-            const match = /^turn-(\d+)$/.exec(entry.turnId);
-            if (match) {
-                return Number.parseInt(match[1], 10) <= userTurnCount;
-            }
-            return historyCallIds.has(entry.callId);
-        });
-        this.toolLedger.import(filteredEntries);
-    }
-    /**
-     * Deduplicate tool_started events. One execution emits tool_started twice: when the model's call
-     * streams in, and again from the approval/continuation plan before the tool runs. Only the first is
-     * kept. Recording the call's result ends the execution (see recordFunctionResult).
-     */
     dedupeToolStarted(event) {
         if (event.type === 'subagent_tool_started') {
             const key = `${event.agentId}:${event.toolCallId}`;
@@ -253,47 +64,9 @@ export class SessionToolTracker {
         this.emittedCommandMessageIdsByCallId.delete(callId);
         return ids;
     }
-    /**
-     * Reconcile history with the tool ledger and return the reconciled history.
-     */
-    getReconciledHistory() {
-        return projectProviderHistory({
-            history: this.conversationStore.getHistory(),
-            toolLedger: this.toolLedger.export(),
-        }).history;
-    }
-    /**
-     * Reconcile history with the tool ledger and update the store if needed.
-     * Returns true if any changes were made.
-     */
-    reconcileAndUpdateHistory() {
-        const projected = projectProviderHistory({
-            history: this.conversationStore.getHistory(),
-            toolLedger: this.toolLedger.export(),
-        });
-        if (projected.warnings.length > 0) {
-            this.conversationStore.replaceHistory(projected.history);
-            return true;
-        }
-        return false;
-    }
-    /**
-     * Clear tool-call arguments cache.
-     */
     clearArguments() {
         this.toolCallArgumentsById.clear();
     }
-    /**
-     * Restore tool-call arguments from a saved map.
-     */
-    restoreArguments(savedArgs) {
-        this.toolCallArgumentsById.clear();
-        if (savedArgs?.size) {
-            for (const [key, value] of savedArgs.entries()) {
-                this.toolCallArgumentsById.set(key, value);
-            }
-        }
-    }
     /**
      * Clear emitted tool started call IDs.
      */
@@ -301,12 +74,5 @@ export class SessionToolTracker {
         this.emittedToolStartedCallIds.clear();
         this.emittedCommandMessageIdsByCallId.clear();
     }
-    /**
-     * Reset the tracker to a fresh state (for session reset).
-     */
-    reset() {
-        this.toolLedger = new ToolExecutionLedger();
-        this.#attachUserTurnCount();
-    }
 }
 //# sourceMappingURL=session-tool-tracker.js.map

package/dist/services/session/session-tool-tracker.js.map

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

package/dist/services/session/{turn-workflow.d.ts → session-turn-adapter.d.ts}

@@ -12,45 +12,14 @@ import type { UserTurn } from '../../types/user-turn.js';
 import type { InitialTurnRunOptions, TurnAttemptFactory } from './turn-attempt-factory.js';
 import type { InitialInputPreparer } from './initial-input-preparer.js';
 import type { InitialTurnRecoveryHandler } from './initial-turn-recovery-handler.js';
-import { AssistantTurnJournal } from '../logging/assistant-turn-journal.js';
+import type { ConversationRecord } from '../conversation/conversation-record.js';
 import type { TurnOutcome } from './turn-status-machine.js';
-import type { ConversationTerminal } from '../../contracts/conversation.js';
-import type { RetryCounts } from '../retry/retry-contracts.js';
-export type InternalTurnOutcome = {
-    kind: 'response';
-    terminal: ConversationTerminal;
-} | {
-    kind: 'approval_required';
-    terminal: ConversationTerminal;
-} | {
-    kind: 'stale';
-} | {
-    kind: 'failed';
-} | {
-    kind: 'fresh_start_required';
-    retryCounts: RetryCounts;
-    delayMs?: number;
-    useStandardServiceTier?: boolean;
-    disableChainingForAttempt?: boolean;
-} | {
-    kind: 'abort_resolution_required';
-    abortedContext: AbortedApprovalContext;
-    userText: string;
-    generation: number;
-} | {
-    kind: 'auto_approval_required';
-    generation: number;
-    callId?: string;
-    command?: string;
-};
-import type { AbortedApprovalContext } from '../approval/approval-state.js';
 import type { ApprovalDecisionPolicy } from '../approval/approval-decision-policy.js';
-import type { ConversationStore } from '../conversation/conversation-store.js';
 import type { SessionInputPlanner } from './session-input-planner.js';
 import type { ApprovalFlowCoordinator } from '../approval/approval-flow-coordinator.js';
 import type { ContinuationPlanApplier } from './continuation-plan-applier.js';
 import type { ContinuationRecoveryHandler } from './continuation-recovery-handler.js';
-import { type ContinuationInit } from './continuation-state.js';
+import { type ContinuationInit } from './turn-projection-state.js';
 import { ToolApprovalBatchCoordinator } from '../approval/tool-approval-batch-coordinator.js';
 import type { ProviderContinuity } from '../provider-continuity.js';
 import type { SessionStreamProcessor } from './session-stream-processor.js';
@@ -61,7 +30,7 @@ import type { HookLifecyclePort } from '../hooks/hook-service.js';
 import type { HookEventFactory } from '../hooks/hook-event-factory.js';
 import type { ToolApprovalPolicyRegistry } from '../approval/tool-approval-policy-registry.js';
 import type { SessionIdSource } from './session-identity.js';
-export interface TurnWorkflowDeps {
+export interface SessionTurnAdapterDeps {
     agentClient: ConversationAgentClient;
     logger: ILoggingService;
     sessionId: SessionIdSource;
@@ -73,9 +42,8 @@ export interface TurnWorkflowDeps {
     inputPreparer: InitialInputPreparer;
     streamProcessor: SessionStreamProcessor;
     recoveryHandler: InitialTurnRecoveryHandler;
-    journal: AssistantTurnJournal;
+    record: ConversationRecord;
     inputPlanner: SessionInputPlanner;
-    conversationStore: ConversationStore;
     approvalFlow: ApprovalFlowCoordinator;
     planApplier: ContinuationPlanApplier;
     continuationRecoveryHandler: ContinuationRecoveryHandler;
@@ -90,10 +58,11 @@ export interface TurnWorkflowDeps {
     hookEvents?: HookEventFactory;
     toolCallMarkers?: ToolCallMarkerStore;
 }
-export declare class TurnWorkflow {
+/** Session preparation, projection and decisions. The application runtime owns execution. */
+export declare class SessionTurnAdapter {
     #private;
     private readonly deps;
-    constructor(deps: TurnWorkflowDeps);
+    constructor(deps: SessionTurnAdapterDeps);
     /**
      * Tell the run loop where this turn begins and ends, so a message steered
      * into it survives the gaps between its streams — the preparation before the
@@ -110,13 +79,11 @@ export declare class TurnWorkflow {
     editSteer(id: string, items: readonly ProviderInputItem[]): boolean;
     /** Internal composition seam for correlating physical tool calls to a turn. */
     setHookTurnId(turnId: string | undefined): void;
-    executeInitial(attemptOrInput: TurnAttempt | string | UserTurn, options?: InitialTurnRunOptions): AsyncGenerator<ConversationEvent, TurnOutcome, void>;
+    executeInitial(input: TurnAttempt | string | UserTurn, options?: InitialTurnRunOptions): AsyncGenerator<ConversationEvent, TurnOutcome, void>;
+    /** An answer resolves the owned wait; it never starts a continuation run. */
     executeContinuation(init: ContinuationInit, policy?: ApprovalDecisionPolicy): AsyncGenerator<ConversationEvent, TurnOutcome, void>;
-    /** Re-observe an already-running post-execute stream without involving SDK approvals. */
     continuePostExecute(): AsyncGenerator<ConversationEvent, TurnOutcome, void>;
-    executeInitialAttempt(attemptOrInput: TurnAttempt | string | UserTurn, options?: InitialTurnRunOptions): AsyncGenerator<ConversationEvent, InternalTurnOutcome, void>;
-    executeContinuationAttempt(init: ContinuationInit, policy?: ApprovalDecisionPolicy): AsyncGenerator<ConversationEvent, InternalTurnOutcome, void>;
     abortLiveRun(): Promise<void>;
     get activePostExecuteRunId(): string | null;
 }
-//# sourceMappingURL=turn-workflow.d.ts.map
+//# sourceMappingURL=session-turn-adapter.d.ts.map

package/dist/services/session/session-turn-adapter.d.ts.map

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