@qduc/term2 0.9.2 → 0.9.3

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

@@ -2,7 +2,7 @@ import { ConversationStore } from '../conversation/conversation-store.js';
 import { ApprovalState } from '../approval/approval-state.js';
 import { TurnItemAccumulator } from './turn-item-accumulator.js';
 import { getMethod } from '../interruption-info.js';
-import { ShellAutoApprovalResolver } from '../approval/shell-auto-approval-resolver.js';
+import { DelegatingShellAutoApprovalResolver, } from '../approval/shell-auto-approval-resolver.js';
 import { ApprovalFlowCoordinator } from '../approval/approval-flow-coordinator.js';
 import { SessionToolTracker } from './session-tool-tracker.js';
 import { ConversationLogger } from '../logging/conversation-logger.js';
@@ -13,23 +13,20 @@ import { TurnCoordinator } from './turn-coordinator.js';
 import { SessionStreamProcessor } from './session-stream-processor.js';
 import { SessionManager } from './session-manager.js';
 import { SessionRuntimeController } from './session-runtime-controller.js';
-import { ContinuationDriver } from './continuation-driver.js';
 import { ContinuationPlanApplier } from './continuation-plan-applier.js';
-import { ContinuationStreamCycle } from './continuation-stream-cycle.js';
 import { ContinuationRecoveryHandler } from './continuation-recovery-handler.js';
 import { DefaultConversationRecoveryPolicy } from '../retry/recovery-policy.js';
 import { DefaultRecoveryExecutor } from '../retry/recovery-executor.js';
 import { GenerationGuard } from '../generation-guard.js';
 import { DefaultRetryClassifier } from '../retry/retry-classifier.js';
 import { RetryEventPresenter } from '../retry/retry-event-presenter.js';
-import { InitialTurnRunner } from './initial-turn-runner.js';
-import { DefaultTurnExecutor } from './turn-executor.js';
+import { TurnWorkflow } from './turn-workflow.js';
 import { TurnStatusMachine } from './turn-status-machine.js';
 import { TurnAttemptFactory } from './turn-attempt-factory.js';
 import { InitialInputPreparer } from './initial-input-preparer.js';
-import { InitialStreamCycle } from './initial-stream-cycle.js';
 import { InitialTurnRecoveryHandler } from './initial-turn-recovery-handler.js';
 import { AssistantTurnJournal } from '../logging/assistant-turn-journal.js';
+import { SessionContinuityReset } from './session-continuity-reset.js';
 const asAskUserAnswerSink = (value) => value && typeof value.setAskUserAnswer === 'function' ? value : null;
 const asSubagentEventSinkHost = (value) => value && typeof value.setSubagentEventSink === 'function'
     ? value
@@ -46,23 +43,13 @@ export function createSessionRuntimeInternals(options) {
     const conversationStore = new ConversationStore();
     const approvalState = new ApprovalState();
     const toolTracker = new SessionToolTracker(conversationStore);
-    let currentShellAutoApproval = new ShellAutoApprovalResolver({
+    const shellAutoApproval = new DelegatingShellAutoApprovalResolver({
         conversationStore,
         agentClient,
         logger,
         settingsService,
         sessionContextService,
     });
-    const shellAutoApproval = new Proxy({}, {
-        get(_target, prop, receiver) {
-            if (prop === 'setDelegate') {
-                return (newDelegate) => {
-                    currentShellAutoApproval = newDelegate;
-                };
-            }
-            return Reflect.get(currentShellAutoApproval, prop, receiver);
-        },
-    });
     const appState = { statusMachine: new TurnStatusMachine() };
     const providerContinuity = new ProviderContinuity();
     const inputPlanner = new SessionInputPlanner({
@@ -71,7 +58,9 @@ export function createSessionRuntimeInternals(options) {
         toolTracker,
         providerContinuity,
     });
-    let journal = null;
+    const journal = new AssistantTurnJournal({
+        getCurrentTurnId: () => toolTracker.getCurrentTurnId(),
+    });
     const conversationLogger = new ConversationLogger({
         turnAccumulator: resolvedTurnAccumulator,
         logger,
@@ -87,7 +76,7 @@ export function createSessionRuntimeInternals(options) {
         },
         getCurrentTurnId: () => toolTracker.getCurrentTurnId(),
         getToolLedger: () => toolTracker.export(),
-        getJournal: () => journal ?? undefined,
+        journal,
     });
     const approvalFlow = new ApprovalFlowCoordinator({
         agentClient,
@@ -97,19 +86,25 @@ export function createSessionRuntimeInternals(options) {
         toolTracker,
         generationGuard,
     });
-    const state = new SessionLifecycle({
-        inputPlanner,
+    const continuityReset = new SessionContinuityReset({
+        providerContinuity,
         approvalFlow,
         toolTracker,
         shellAutoApproval,
+        inputPlanner,
         turnAccumulator: resolvedTurnAccumulator,
-        conversationStore,
         agentClient,
+    });
+    const state = new SessionLifecycle({
+        inputPlanner,
+        toolTracker,
+        conversationStore,
         logger,
         sessionId: id,
         appState,
         providerContinuity,
         generationGuard,
+        continuityReset,
     });
     const streamProcessor = new SessionStreamProcessor({
         logger,
@@ -119,7 +114,7 @@ export function createSessionRuntimeInternals(options) {
         conversationLogger,
         providerContinuity,
         generationGuard,
-        getJournal: () => journal ?? undefined,
+        journal,
     });
     const breakChaining = () => {
         providerContinuity.breakChaining();
@@ -153,6 +148,7 @@ export function createSessionRuntimeInternals(options) {
         toolTracker,
         state,
         resolveRetryLimit,
+        journal,
     });
     const inputPreparer = new InitialInputPreparer({
         conversationStore,
@@ -162,19 +158,6 @@ export function createSessionRuntimeInternals(options) {
         sessionId: id,
         state,
     });
-    const streamCycle = new InitialStreamCycle({
-        agentClient,
-        approvalFlow,
-        conversationStore,
-        inputPlanner,
-        logger,
-        providerContinuity,
-        sessionId: id,
-        shellAutoApproval,
-        streamProcessor,
-        toolTracker,
-        turnAccumulator: resolvedTurnAccumulator,
-    });
     const recoveryHandler = new InitialTurnRecoveryHandler({
         conversationStore,
         freshStartRetriesAllowed: retryOptions?.allowFreshStartRetries ?? true,
@@ -192,18 +175,7 @@ export function createSessionRuntimeInternals(options) {
         toolTracker,
         logger,
         sessionId: id,
-    });
-    const continuationStreamCycle = new ContinuationStreamCycle({
-        agentClient,
-        streamProcessor,
-        conversationStore,
-        turnAccumulator: resolvedTurnAccumulator,
-        toolTracker,
-        approvalFlow,
-        shellAutoApproval,
-        logger,
-        sessionId: id,
-        providerContinuity,
+        journal,
     });
     const continuationRecoveryHandler = new ContinuationRecoveryHandler({
         logger,
@@ -216,20 +188,7 @@ export function createSessionRuntimeInternals(options) {
         resolveRetryLimit,
         toolTracker,
     });
-    const continuationDriver = new ContinuationDriver({
-        generationGuard,
-        logger,
-        sessionId: id,
-        shellAutoApproval,
-        inputPlanner,
-        conversationStore,
-        approvalFlow,
-        planApplier,
-        streamCycle: continuationStreamCycle,
-        recoveryHandler: continuationRecoveryHandler,
-        toolTracker,
-    });
-    const initialTurnRunner = new InitialTurnRunner({
+    const turnWorkflow = new TurnWorkflow({
         agentClient,
         logger,
         sessionId: id,
@@ -239,18 +198,19 @@ export function createSessionRuntimeInternals(options) {
         generationGuard,
         attemptFactory,
         inputPreparer,
-        streamCycle,
+        streamProcessor,
         recoveryHandler,
-        getJournal: () => journal ?? undefined,
-    });
-    const turnExecutor = new DefaultTurnExecutor({
-        initialTurnRunner,
-        continuationDriver,
-        shellAutoApproval,
+        journal,
+        inputPlanner,
+        conversationStore,
+        approvalFlow,
+        planApplier,
+        continuationRecoveryHandler,
+        providerContinuity,
     });
     const turnCoordinator = new TurnCoordinator({
         statusMachine: appState.statusMachine,
-        turnExecutor,
+        turnWorkflow,
         approvalFlow,
         providerContinuity,
     });
@@ -263,26 +223,6 @@ export function createSessionRuntimeInternals(options) {
         settingsService,
         inputPlanner,
     });
-    const ensureJournal = (sink) => {
-        if (!journal) {
-            journal = new AssistantTurnJournal({
-                getCurrentTurnId: () => toolTracker.getCurrentTurnId(),
-                sink: (event) => {
-                    try {
-                        sink(event);
-                    }
-                    catch (err) {
-                        logger.warn('Journal sink threw', {
-                            eventType: 'conversation_log.sink_failed',
-                            category: 'persistence',
-                            errorMessage: err instanceof Error ? err.message : String(err),
-                        });
-                    }
-                },
-            });
-        }
-        return journal;
-    };
     const runtimeController = new SessionRuntimeController({
         agentClient,
         state,
@@ -303,6 +243,7 @@ export function createSessionRuntimeInternals(options) {
     return {
         sessionId: id,
         sessionStartedAt: startedAt,
+        logger,
         conversationStore,
         approvalState,
         toolTracker,
@@ -314,22 +255,20 @@ export function createSessionRuntimeInternals(options) {
         streamProcessor,
         appState,
         turnCoordinator,
-        turnExecutor,
         stateFacade,
         runtimeController,
         dispose,
         generationGuard,
         providerContinuity,
         breakChaining,
-        continuationDriver,
         recoveryPolicy,
         recoveryExecutor,
         retryClassifier,
         retryEventPresenter,
         turnAccumulator: resolvedTurnAccumulator,
-        initialTurnRunner,
+        turnWorkflow,
         freshStartRetriesAllowed: retryOptions?.allowFreshStartRetries ?? true,
-        ensureJournal,
+        journal,
         resolvedAskUserAnswerSink,
         resolvedSubagentEventSinkHost,
     };
@@ -339,7 +278,7 @@ export const createConversationSession = createSessionRuntimeInternals;
 // ── Session Runtime Factory ───────────────────────────────────────
 /** @internal Wraps a shared internals instance into the closed runtime. */
 export function buildSessionRuntime(internals) {
-    const { turnCoordinator, stateFacade, runtimeController, conversationLogger, ensureJournal, dispose, approvalFlow, resolvedAskUserAnswerSink, resolvedSubagentEventSinkHost, } = internals;
+    const { turnCoordinator, stateFacade, runtimeController, conversationLogger, journal, dispose, approvalFlow, resolvedAskUserAnswerSink, resolvedSubagentEventSinkHost, } = internals;
     return {
         sessionId: internals.sessionId,
         sessionStartedAt: internals.sessionStartedAt,
@@ -353,9 +292,20 @@ export function buildSessionRuntime(internals) {
         logs: {
             setLogSink: (sink) => {
                 conversationLogger.setLogSink(sink);
-                if (sink) {
-                    ensureJournal(sink);
-                }
+                journal.setSink(sink
+                    ? (event) => {
+                        try {
+                            sink(event);
+                        }
+                        catch (err) {
+                            internals.logger.warn('Journal sink threw', {
+                                eventType: 'conversation_log.sink_failed',
+                                category: 'persistence',
+                                errorMessage: err instanceof Error ? err.message : String(err),
+                            });
+                        }
+                    }
+                    : null);
             },
             dispatchEventToLog: conversationLogger.dispatchEventToLog.bind(conversationLogger),
             log: conversationLogger.log.bind(conversationLogger),

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

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

package/dist/services/session/session-context-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-context-service.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-context-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAE9F,qBAAa,qBAAsB,YAAW,sBAAsB;;IAGlE,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,qBAAqB,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAIjE,UAAU,IAAI,qBAAqB,GAAG,IAAI;CAG3C;AAED,eAAO,MAAM,4BAA4B,EAAE,sBAO1C,CAAC"}
+{"version":3,"file":"session-context-service.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-context-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAE9F,qBAAa,qBAAsB,YAAW,sBAAsB;;IAGlE,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,qBAAqB,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAEhE;IAED,UAAU,IAAI,qBAAqB,GAAG,IAAI,CAEzC;CACF;AAED,eAAO,MAAM,4BAA4B,EAAE,sBAO1C,CAAC"}

package/dist/services/session/session-continuity-reset.d.ts

@@ -0,0 +1,23 @@
+import type { ApprovalFlowCoordinator } from '../approval/approval-flow-coordinator.js';
+import type { ShellAutoApprovalResolver } from '../approval/shell-auto-approval-resolver.js';
+import type { ConversationAgentClient } from '../conversation-agent-client.js';
+import type { ProviderContinuity } from '../provider-continuity.js';
+import type { SessionInputPlanner } from './session-input-planner.js';
+import type { SessionToolTracker } from './session-tool-tracker.js';
+import type { TurnItemAccumulator } from './turn-item-accumulator.js';
+export declare class SessionContinuityReset {
+    #private;
+    constructor(deps: {
+        providerContinuity: ProviderContinuity;
+        approvalFlow: ApprovalFlowCoordinator;
+        toolTracker: SessionToolTracker;
+        shellAutoApproval: ShellAutoApprovalResolver;
+        inputPlanner: SessionInputPlanner;
+        turnAccumulator: TurnItemAccumulator;
+        agentClient: ConversationAgentClient;
+    });
+    reset({ clearConversations }?: {
+        clearConversations?: boolean;
+    }): void;
+}
+//# sourceMappingURL=session-continuity-reset.d.ts.map

package/dist/services/session/session-continuity-reset.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-continuity-reset.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-continuity-reset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACxF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAC7F,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,qBAAa,sBAAsB;;IASjC,YAAY,IAAI,EAAE;QAChB,kBAAkB,EAAE,kBAAkB,CAAC;QACvC,YAAY,EAAE,uBAAuB,CAAC;QACtC,WAAW,EAAE,kBAAkB,CAAC;QAChC,iBAAiB,EAAE,yBAAyB,CAAC;QAC7C,YAAY,EAAE,mBAAmB,CAAC;QAClC,eAAe,EAAE,mBAAmB,CAAC;QACrC,WAAW,EAAE,uBAAuB,CAAC;KACtC,EAQA;IAED,KAAK,CAAC,EAAE,kBAAyB,EAAE,GAAE;QAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,IAAI,CAchF;CACF"}

package/dist/services/session/session-continuity-reset.js

@@ -0,0 +1,34 @@
+import { getMethod } from '../interruption-info.js';
+export class SessionContinuityReset {
+    #providerContinuity;
+    #approvalFlow;
+    #toolTracker;
+    #shellAutoApproval;
+    #inputPlanner;
+    #turnAccumulator;
+    #agentClient;
+    constructor(deps) {
+        this.#providerContinuity = deps.providerContinuity;
+        this.#approvalFlow = deps.approvalFlow;
+        this.#toolTracker = deps.toolTracker;
+        this.#shellAutoApproval = deps.shellAutoApproval;
+        this.#inputPlanner = deps.inputPlanner;
+        this.#turnAccumulator = deps.turnAccumulator;
+        this.#agentClient = deps.agentClient;
+    }
+    reset({ clearConversations = true } = {}) {
+        this.#providerContinuity.clear();
+        this.#approvalFlow.clearPending();
+        this.#approvalFlow.consumeAborted();
+        this.#toolTracker.clearArguments();
+        this.#toolTracker.clearEmittedToolStarted();
+        this.#shellAutoApproval.clearCache();
+        this.#inputPlanner.reset();
+        this.#turnAccumulator.resetPersistedTurnState();
+        if (clearConversations) {
+            const clearConversationsFn = getMethod(this.#agentClient, 'clearConversations');
+            clearConversationsFn?.call(this.#agentClient);
+        }
+    }
+}
+//# sourceMappingURL=session-continuity-reset.js.map

package/dist/services/session/session-continuity-reset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-continuity-reset.js","sourceRoot":"","sources":["../../../source/services/session/session-continuity-reset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AASpD,MAAM,OAAO,sBAAsB;IACxB,mBAAmB,CAAqB;IACxC,aAAa,CAA0B;IACvC,YAAY,CAAqB;IACjC,kBAAkB,CAA4B;IAC9C,aAAa,CAAsB;IACnC,gBAAgB,CAAsB;IACtC,YAAY,CAA0B;IAE/C,YAAY,IAQX;QACC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACnD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC;QAC7C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,EAAE,kBAAkB,GAAG,IAAI,EAAE,GAAqC,EAAE;QACxE,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QACjC,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QAClC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;QACpC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,CAAC;QAC5C,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC;QACrC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,CAAC;QAEhD,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,oBAAoB,GAAG,SAAS,CAAW,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;YAC1F,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;CACF"}

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

@@ -1,49 +1,6 @@
-import type { ILoggingService, ISessionContextService, ISettingsService } from '../service-interfaces.js';
-import type { AskUserAnswerSink, ConversationAgentClient, SubagentEventSinkHost } from '../conversation-agent-client.js';
-import { type ConversationSessionRetryOptions } from './session-composition.js';
-import type { ConversationAdapter } from '../conversation/conversation-adapter.js';
-import type { SessionManager } from './session-manager.js';
-import type { SessionRuntimeController } from './session-runtime-controller.js';
-import type { ConversationLogger } from '../logging/conversation-logger.js';
-import type { ApprovalState } from '../approval/approval-state.js';
-import type { ShellAutoApprovalResolver } from '../approval/shell-auto-approval-resolver.js';
-import type { SessionToolTracker } from './session-tool-tracker.js';
-import type { SessionInputPlanner } from './session-input-planner.js';
-import { ConversationSession } from './conversation-session.js';
-export type CreateConversationSessionOptions = {
-    sessionId: string;
-    /** ISO timestamp; defaults to now. */
-    sessionStartedAt?: string;
-    agentClient: ConversationAgentClient;
-    askUserAnswerSink?: AskUserAnswerSink | null;
-    subagentEventSinkHost?: SubagentEventSinkHost | null;
-    deps: {
-        logger: ILoggingService;
-        settingsService?: ISettingsService;
-        sessionContextService: ISessionContextService;
-    };
-    retryOptions?: ConversationSessionRetryOptions;
-};
-/** Resources returned to callers (ConversationService, non-interactive, etc.). */
-export type ConversationSessionBundle = {
-    session: ConversationSession;
-    terminalAdapter: ConversationAdapter;
-    stateFacade: SessionManager;
-    runtimeController: SessionRuntimeController;
-    conversationLogger: ConversationLogger;
-    approvalState: ApprovalState;
-    shellAutoApproval: ShellAutoApprovalResolver;
-    toolTracker: SessionToolTracker;
-    inputPlanner: SessionInputPlanner;
-    dispose: () => void;
-};
 /**
- * Production factory. Creates a ConversationSession together with all private
- * resources required by ConversationService, non-interactive, and subagent
- * callers. Use this instead of constructing ConversationSession directly.
- *
- * Interactive, non-interactive, and subagent paths all use this factory with
- * their respective profiles.
+ * Compatibility entry point for callers that still import `session-factory`.
+ * The composition root lives in `session-composition`.
  */
-export declare function createConversationSession(options: CreateConversationSessionOptions): ConversationSessionBundle;
+export { createConversationSession, createConversationSessionComposition, type ConversationSessionBundle, type ConversationSessionComposition, type ConversationSessionRetryOptions, type CreateConversationSessionCompositionOptions, type CreateConversationSessionOptions, } from './session-composition.js';
 //# sourceMappingURL=session-factory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"session-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE1G,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAwC,KAAK,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AACtH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAYhE,MAAM,MAAM,gCAAgC,GAAG;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,sCAAsC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,uBAAuB,CAAC;IACrC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAC7C,qBAAqB,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACrD,IAAI,EAAE;QACJ,MAAM,EAAE,eAAe,CAAC;QACxB,eAAe,CAAC,EAAE,gBAAgB,CAAC;QACnC,qBAAqB,EAAE,sBAAsB,CAAC;KAC/C,CAAC;IACF,YAAY,CAAC,EAAE,+BAA+B,CAAC;CAChD,CAAC;AAEF,kFAAkF;AAClF,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,mBAAmB,CAAC;IAC7B,eAAe,EAAE,mBAAmB,CAAC;IACrC,WAAW,EAAE,cAAc,CAAC;IAC5B,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,WAAW,EAAE,kBAAkB,CAAC;IAChC,YAAY,EAAE,mBAAmB,CAAC;IAClC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,gCAAgC,GAAG,yBAAyB,CA0C9G"}
+{"version":3,"file":"session-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-factory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,yBAAyB,EACzB,oCAAoC,EACpC,KAAK,yBAAyB,EAC9B,KAAK,8BAA8B,EACnC,KAAK,+BAA+B,EACpC,KAAK,2CAA2C,EAChD,KAAK,gCAAgC,GACtC,MAAM,0BAA0B,CAAC"}

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

@@ -1,47 +1,6 @@
-import { TurnItemAccumulator } from './turn-item-accumulator.js';
-import { createConversationSessionComposition } from './session-composition.js';
-import { ConversationSession } from './conversation-session.js';
-const asAskUserAnswerSink = (value) => value && typeof value.setAskUserAnswer === 'function' ? value : null;
-const asSubagentEventSinkHost = (value) => value && typeof value.setSubagentEventSink === 'function'
-    ? value
-    : null;
 /**
- * Production factory. Creates a ConversationSession together with all private
- * resources required by ConversationService, non-interactive, and subagent
- * callers. Use this instead of constructing ConversationSession directly.
- *
- * Interactive, non-interactive, and subagent paths all use this factory with
- * their respective profiles.
+ * Compatibility entry point for callers that still import `session-factory`.
+ * The composition root lives in `session-composition`.
  */
-export function createConversationSession(options) {
-    const { sessionId, sessionStartedAt, agentClient, askUserAnswerSink = null, subagentEventSinkHost = null, deps, retryOptions, } = options;
-    const startedAt = sessionStartedAt ?? new Date().toISOString();
-    const turnAccumulator = new TurnItemAccumulator();
-    const composition = createConversationSessionComposition({
-        sessionId,
-        sessionStartedAt: startedAt,
-        agentClient,
-        askUserAnswerSink: askUserAnswerSink ?? asAskUserAnswerSink(agentClient),
-        subagentEventSinkHost: subagentEventSinkHost ?? asSubagentEventSinkHost(agentClient),
-        deps,
-        retryOptions,
-        turnAccumulator,
-    });
-    const session = new ConversationSession(sessionId, {
-        startedAt,
-        composition,
-    });
-    return {
-        session,
-        terminalAdapter: composition.terminalAdapter,
-        stateFacade: composition.stateFacade,
-        runtimeController: composition.runtimeController,
-        conversationLogger: composition.conversationLogger,
-        approvalState: composition.approvalState,
-        shellAutoApproval: composition.shellAutoApproval,
-        toolTracker: composition.toolTracker,
-        inputPlanner: composition.inputPlanner,
-        dispose: composition.dispose,
-    };
-}
+export { createConversationSession, createConversationSessionComposition, } from './session-composition.js';
 //# sourceMappingURL=session-factory.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"session-factory.js","sourceRoot":"","sources":["../../../source/services/session/session-factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAMjE,OAAO,EAAE,oCAAoC,EAAwC,MAAM,0BAA0B,CAAC;AAStH,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAA4B,EAAE,CACvE,KAAK,IAAI,OAAQ,KAA2B,CAAC,gBAAgB,KAAK,UAAU,CAAC,CAAC,CAAE,KAA2B,CAAC,CAAC,CAAC,IAAI,CAAC;AAErH,MAAM,uBAAuB,GAAG,CAAC,KAAc,EAAgC,EAAE,CAC/E,KAAK,IAAI,OAAQ,KAA+B,CAAC,oBAAoB,KAAK,UAAU;IAClF,CAAC,CAAE,KAA+B;IAClC,CAAC,CAAC,IAAI,CAAC;AAiCX;;;;;;;GAOG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAyC;IACjF,MAAM,EACJ,SAAS,EACT,gBAAgB,EAChB,WAAW,EACX,iBAAiB,GAAG,IAAI,EACxB,qBAAqB,GAAG,IAAI,EAC5B,IAAI,EACJ,YAAY,GACb,GAAG,OAAO,CAAC;IACZ,MAAM,SAAS,GAAG,gBAAgB,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAE/D,MAAM,eAAe,GAAG,IAAI,mBAAmB,EAAE,CAAC;IAElD,MAAM,WAAW,GAAG,oCAAoC,CAAC;QACvD,SAAS;QACT,gBAAgB,EAAE,SAAS;QAC3B,WAAW;QACX,iBAAiB,EAAE,iBAAiB,IAAI,mBAAmB,CAAC,WAAW,CAAC;QACxE,qBAAqB,EAAE,qBAAqB,IAAI,uBAAuB,CAAC,WAAW,CAAC;QACpF,IAAI;QACJ,YAAY;QACZ,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE;QACjD,SAAS;QACT,WAAW;KACZ,CAAC,CAAC;IAEH,OAAO;QACL,OAAO;QACP,eAAe,EAAE,WAAW,CAAC,eAAe;QAC5C,WAAW,EAAE,WAAW,CAAC,WAAW;QACpC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;QAChD,kBAAkB,EAAE,WAAW,CAAC,kBAAkB;QAClD,aAAa,EAAE,WAAW,CAAC,aAAa;QACxC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;QAChD,WAAW,EAAE,WAAW,CAAC,WAAW;QACpC,YAAY,EAAE,WAAW,CAAC,YAAY;QACtC,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"session-factory.js","sourceRoot":"","sources":["../../../source/services/session/session-factory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,yBAAyB,EACzB,oCAAoC,GAMrC,MAAM,0BAA0B,CAAC"}

package/dist/services/session/session-factory.test.js

@@ -47,34 +47,37 @@ const makeMockClient = (overrides = {}) => ({
     ...overrides,
 });
 // ── Factory return shape ───────────────────────────────────────────
-test('createConversationSession returns session with correct id', (t) => {
-    const { session } = createConversationSession({
+test('createConversationSession returns bundle with correct sessionId', (t) => {
+    const { sessionId } = createConversationSession({
         sessionId: 'test-123',
         agentClient: makeMockClient(),
         deps: { logger: makeLogger(), sessionContextService },
     });
-    t.is(session.id, 'test-123');
+    t.is(sessionId, 'test-123');
 });
-test('createConversationSession returns session with correct startedAt when provided', (t) => {
+test('createConversationSession is the public name for the session composition root', (t) => {
+    t.is(createConversationSession, createConversationSessionComposition);
+});
+test('createConversationSession returns bundle with correct sessionStartedAt when provided', (t) => {
     const ts = '2024-01-01T00:00:00.000Z';
-    const { session } = createConversationSession({
+    const { sessionStartedAt } = createConversationSession({
         sessionId: 'test-ts',
         sessionStartedAt: ts,
         agentClient: makeMockClient(),
         deps: { logger: makeLogger(), sessionContextService },
     });
-    t.is(session.startedAt, ts);
+    t.is(sessionStartedAt, ts);
 });
-test('createConversationSession returns session with auto startedAt when not provided', (t) => {
+test('createConversationSession returns bundle with auto sessionStartedAt when not provided', (t) => {
     const before = new Date().toISOString();
-    const { session } = createConversationSession({
+    const { sessionStartedAt } = createConversationSession({
         sessionId: 'auto-ts',
         agentClient: makeMockClient(),
         deps: { logger: makeLogger(), sessionContextService },
     });
     const after = new Date().toISOString();
-    t.true(session.startedAt >= before);
-    t.true(session.startedAt <= after);
+    t.true(sessionStartedAt >= before);
+    t.true(sessionStartedAt <= after);
 });
 test('createConversationSession returns a terminalAdapter with sendMessage', (t) => {
     const { terminalAdapter } = createConversationSession({
@@ -157,31 +160,29 @@ test('dispose() is idempotent — safe to call twice without throwing', (t) => {
     });
 });
 test('dispose() resets previousResponseId so next run starts fresh', (t) => {
-    const { session, dispose } = createConversationSession({
+    const { dispose } = createConversationSession({
         sessionId: 'prev-resp-id',
         agentClient: makeMockClient(),
         deps: { logger: makeLogger(), sessionContextService },
     });
-    // Manually set a previousResponseId on the session state to simulate a completed run
-    // Access via session's internal state via exportState (which reads from state)
-    // We'll just check that dispose doesn't throw and that abort() was called
+    // We'll just check that dispose doesn't throw
     t.notThrows(() => dispose());
 });
 // ── No callback into partially-constructed session ────────────────
-test('session.abort() does not require ConversationSession to hold a back-reference', (t) => {
+test('turnCoordinator.abort() does not throw', (t) => {
     const abortCalled = { value: false };
     const mockClient = makeMockClient({
         abort: () => {
             abortCalled.value = true;
         },
     });
-    const { session } = createConversationSession({
+    const { turnCoordinator } = createConversationSession({
         sessionId: 'abort-test',
         agentClient: mockClient,
         deps: { logger: makeLogger(), sessionContextService },
     });
     // Should not throw
-    t.notThrows(() => session.abort());
+    t.notThrows(() => turnCoordinator.abort());
 });
 // ── Non-interactive path ──────────────────────────────────────────
 test('createConversationSession can be used as ConversationSessionLike', (t) => {