npm - @qduc/term2 - Versions diffs - 0.14.0 → 0.15.0 - Mend

@qduc/term2 0.14.0 → 0.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (903) hide show

package/dist/services/session/initial-turn-recovery-handler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"initial-turn-recovery-handler.js","sourceRoot":"","sources":["../../../source/services/session/initial-turn-recovery-handler.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;~~AAsB7D~~,MAAM,OAAO,0BAA0B;IACR,IAAI;IAAjC,YAA6B,IAAoC;oBAApC,IAAI;IAAmC,CAAC;IAErE,KAAK,CAAC,CAAC,MAAM,CAAC,GAIb;QACC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;QAEvC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACxD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC3B,CAAC;QAED,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;YAClD,KAAK;YACL,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,MAAM;YACN,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,IAAI,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,KAAK,~~eAAe~~,EAAE,CAAC;~~YAC1F~~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~~YACzE~~,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;SACtD,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,KAAc;QACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE;YAClD,SAAS,EAAE,eAAe;YAC1B,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,OAAO;YACd,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;YAC9B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;YAC5C,YAAY,EAAE,aAAa,CAAC,KAAK,CAAC;YAClC,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;SACxD,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"initial-turn-recovery-handler.js","sourceRoot":"","sources":["../../../source/services/session/initial-turn-recovery-handler.ts"],"names":[],"mappings":"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"}

package/dist/services/session/session-client-factory.d.ts CHANGED Viewed

@@ -61,7 +61,9 @@ export declare function createBackgroundShellWatchScheduler(): BackgroundShellWa
  * it creates, so replacement sessions cannot retain a prior closure-bound
  * client or its subscriptions.
  */
-export declare function createOwnedSessionClientFactory(settings: ISettingsService, createClient: (sessionId: string, toolOwnership: ToolOwnershipRegistry, postExecutePauseCapability: PostExecutePauseCapability, access: SessionAccessState, continuationProjectionMode: ContinuationProjectionMode, providerContinuity: ProviderContinuity, requestCapture: OpenAICandidateObserver, toolLifecycle?: ToolExecutionLifecyclePort, backgroundShellRegistry?: BackgroundShellRegistry<BackgroundShellExecutionResult>, allowBackgroundShell?: boolean, backgroundShellOutput?: BackgroundShellOutputBundle) => DisposableConversationAgentClient, hookLifecycle?: HookLifecyclePort): SessionClientFactory;
+export declare function createOwnedSessionClientFactory(settings: ISettingsService, createClient: (sessionId: string, toolOwnership: ToolOwnershipRegistry, postExecutePauseCapability: PostExecutePauseCapability, access: SessionAccessState, continuationProjectionMode: ContinuationProjectionMode, providerContinuity: ProviderContinuity, requestCapture: OpenAICandidateObserver, toolLifecycle?: ToolExecutionLifecyclePort, backgroundShellRegistry?: BackgroundShellRegistry<BackgroundShellExecutionResult>, allowBackgroundShell?: boolean, backgroundShellOutput?: BackgroundShellOutputBundle) => DisposableConversationAgentClient, hookLifecycle?: HookLifecyclePort, defaults?: {
+    allowBackgroundShell?: boolean;
+}): SessionClientFactory;
 /**
  * Compatibility seam for callers that provide a prebuilt client. Its owner
  * remains responsible for disposal, including across ConversationService reset.

package/dist/services/session/session-client-factory.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"session-client-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-client-factory.ts"],"names":[],"mappings":"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~~GAChC~~,oBAAoB,CAkGtB;AAED;;;GAGG;AACH,wBAAgB,qCAAqC,CACnD,WAAW,EAAE,uBAAuB,EACpC,aAAa,EAAE,qBAAqB,GACnC,oBAAoB,CAmBtB"}
1	+ {"version":3,"file":"session-client-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-client-factory.ts"],"names":[],"mappings":"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"}

package/dist/services/session/session-client-factory.js CHANGED Viewed

@@ -29,7 +29,7 @@ export function createBackgroundShellWatchScheduler() {
  * it creates, so replacement sessions cannot retain a prior closure-bound
  * client or its subscriptions.
  */
-export function createOwnedSessionClientFactory(settings, createClient, hookLifecycle) {
+export function createOwnedSessionClientFactory(settings, createClient, hookLifecycle, defaults) {
     return {
         create(sessionId, options) {
             const continuationProjectionMode = settings.get('agent.provider') === 'openai' ? 'openai-provider' : 'legacy';
@@ -52,7 +52,7 @@ export function createOwnedSessionClientFactory(settings, createClient, hookLife
                 })
                 : undefined;
             const toolLifecycle = hookLifecycle && hookEvents ? createToolExecutionLifecyclePort(hookLifecycle, hookEvents) : undefined;
-            const allowBackgroundShell = options?.allowBackgroundShell !== false;
+            const allowBackgroundShell = options?.allowBackgroundShell ?? defaults?.allowBackgroundShell ?? true;
             const backgroundShellRegistry = allowBackgroundShell
                 ? new BackgroundShellRegistry()
                 : undefined;

package/dist/services/session/session-client-factory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"session-client-factory.js","sourceRoot":"","sources":["../../../source/services/session/session-client-factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EACL,kDAAkD,GAEnD,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,4CAA4C,GAE7C,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AAEnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EACL,sBAAsB,GAGvB,MAAM,sCAAsC,CAAC;AAoC9C;;;;;GAKG;AACH,MAAM,UAAU,mCAAmC;IACjD,OAAO;QACL,QAAQ,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC9D,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAwB,CAAC;KAC3D,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,+BAA+B,CAC7C,QAA0B,EAC1B,YAYsC,EACtC,aAAiC;~~IAEjC~~,OAAO;QACL,MAAM,CAAC,SAAS,EAAE,OAAO;YACvB,MAAM,0BAA0B,GAC9B,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC7E,MAAM,aAAa,GAAG,IAAI,qBAAqB,EAAE,CAAC;YAClD,MAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,kBAAkB,GAAG,IAAI,0BAA0B,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACrG,MAAM,0BAA0B,GAAG,IAAI,0BAA0B,CAAC,kBAAkB,CAAC,CAAC;YACtF,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;YACpD,MAAM,qCAAqC,GACzC,0BAA0B,KAAK,iBAAiB;gBAC9C,CAAC,CAAC,IAAI,4CAA4C,EAAE;gBACpD,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,0BAA0B,GAAG,IAAI,0BAA0B,EAAE,CAAC;YACpE,MAAM,cAAc,GAAG,IAAI,uBAAuB,CAChD,kBAAkB,EAClB,qCAAqC,EACrC,0BAA0B,CAC3B,CAAC;YACF,MAAM,UAAU,GAAG,aAAa;gBAC9B,CAAC,CAAC,IAAI,gBAAgB,CAAC;oBACnB,SAAS;oBACT,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC,KAAK,IAAI;oBACtE,oBAAoB,EAAE,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC,KAAK,IAAI;oBAChF,kBAAkB,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC,KAAK,IAAI;iBAC7E,CAAC;gBACJ,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,aAAa,GACjB,aAAa,IAAI,UAAU,CAAC,CAAC,CAAC,gCAAgC,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACxG,MAAM,oBAAoB,GAAG,OAAO,EAAE,oBAAoB,~~KAAK~~,~~KAAK~~,CAAC;~~YACrE~~,MAAM,uBAAuB,GAAG,oBAAoB;gBAClD,CAAC,CAAC,IAAI,uBAAuB,EAAkC;gBAC/D,CAAC,CAAC,SAAS,CAAC;YACd,wEAAwE;YACxE,sEAAsE;YACtE,+CAA+C;YAC/C,MAAM,qBAAqB,GAA4C,oBAAoB;gBACzF,CAAC,CAAC,CAAC,GAAG,EAAE;oBACJ,MAAM,KAAK,GAAG,IAAI,0BAA0B,EAAE,CAAC;oBAC/C,OAAO;wBACL,KAAK;wBACL,OAAO,EAAE,IAAI,sBAAsB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,mCAAmC,EAAE,EAAE,CAAC;qBACjG,CAAC;gBACJ,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,yCAAyC,GAC7C,0BAA0B,KAAK,iBAAiB;gBAC9C,CAAC,CAAC,IAAI,kDAAkD,CACpD,kBAAkB,EAClB,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,EACjC,SAAS,EACT,GAAG,EAAE,CAAC,0BAA0B,CAAC,OAAO,CACzC;gBACH,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,WAAW,GAAG,YAAY,CAC9B,SAAS,EACT,aAAa,EACb,0BAA0B,EAC1B,MAAM,EACN,0BAA0B,EAC1B,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,uBAAuB,EACvB,oBAAoB,EACpB,qBAAqB,CACtB,CAAC;YAEF,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,OAAO;gBACL,WAAW;gBACX,kBAAkB;gBAClB,yCAAyC;gBACzC,qCAAqC;gBACrC,0BAA0B;gBAC1B,aAAa;gBACb,MAAM;gBACN,kBAAkB;gBAClB,0BAA0B;gBAC1B,aAAa;gBACb,UAAU;gBACV,aAAa;gBACb,uBAAuB;gBACvB,qBAAqB;gBACrB,OAAO;oBACL,IAAI,QAAQ;wBAAE,OAAO;oBACrB,QAAQ,GAAG,IAAI,CAAC;oBAChB,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;oBACxB,KAAK,uBAAuB,EAAE,OAAO,EAAE,CAAC;oBACxC,0BAA0B,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;oBAChD,kBAAkB,CAAC,KAAK,EAAE,CAAC;oBAC3B,aAAa,CAAC,KAAK,EAAE,CAAC;oBACtB,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,CAAC;aACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qCAAqC,CACnD,WAAoC,EACpC,aAAoC;IAEpC,OAAO;QACL,MAAM;YACJ,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;YACpD,MAAM,kBAAkB,GAAG,IAAI,0BAA0B,CAAC;gBACxD,SAAS,EAAE,cAAc;gBACzB,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE;aAC3B,CAAC,CAAC;YACH,OAAO;gBACL,WAAW;gBACX,kBAAkB;gBAClB,0BAA0B,EAAE,QAAQ;gBACpC,aAAa;gBACb,kBAAkB;gBAClB,0BAA0B,EAAE,IAAI,0BAA0B,CAAC,kBAAkB,CAAC;gBAC9E,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;aAClB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"session-client-factory.js","sourceRoot":"","sources":["../../../source/services/session/session-client-factory.ts"],"names":[],"mappings":"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"}

package/dist/services/session/session-composition.d.ts CHANGED Viewed

@@ -40,6 +40,7 @@ import type { HookLifecyclePort } from '../hooks/hook-service.js';
 import { HookEventFactory } from '../hooks/hook-event-factory.js';
 import { PendingInteractionState } from './pending-interaction-state.js';
 import { BackgroundSubagentApprovalController } from '../approval/background-subagent-approval-controller.js';
+import { ToolCallMarkerStore } from '../../utils/streaming/extract-command-messages.js';
 export type ConversationSessionRetryOptions = {
     /**
      * When false, retries are only allowed if an AgentStream exists so the turn
@@ -55,6 +56,7 @@ export type SessionRuntimeInternals = {
     conversationStore: ConversationStore;
     approvalState: ApprovalState;
     toolTracker: SessionToolTracker;
+    toolCallMarkers: ToolCallMarkerStore;
     shellAutoApproval: ShellAutoApprovalResolver;
     approvalFlow: ApprovalFlowCoordinator;
     inputPlanner: SessionInputPlanner;
@@ -137,6 +139,7 @@ export type CreateSessionRuntimeInternalsOptions = {
     /** Installed only on the root runtime; nested runtimes omit this port. */
     hookLifecycle?: HookLifecyclePort;
     hookEvents?: HookEventFactory;
+    toolCallMarkers?: ToolCallMarkerStore;
 };
 export type CreateConversationSessionOptions = Omit<CreateSessionRuntimeInternalsOptions, 'turnAccumulator'>;
 export type ConversationSessionBundle = Pick<SessionRuntimeInternals, 'sessionId' | 'sessionStartedAt' | 'turnCoordinator' | 'stateFacade' | 'runtimeController' | 'conversationLogger' | 'approvalState' | 'shellAutoApproval' | 'toolTracker' | 'inputPlanner' | 'dispose' | 'journal'>;

package/dist/services/session/session-composition.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"session-composition.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-composition.ts"],"names":[],"mappings":"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~~AAmB9G~~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~~CAC/B~~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~~CAokBpH~~;AAED,2FAA2F;AAC3F,eAAO,MAAM,yBAAyB,EAAE,CAAC,OAAO,EAAE,gCAAgC,KAAK,yBACxD,CAAC;AAIhC,2EAA2E;AAC3E,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,uBAAuB,GAAG,cAAc,CA0EtF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,gCAAgC,GAAG,cAAc,~~CAO9F~~"}
1	+ {"version":3,"file":"session-composition.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-composition.ts"],"names":[],"mappings":"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"}

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

@@ -37,6 +37,8 @@ import { PostExecutePendingRegistry, } from './post-execute-pending-registry.js'
 import { HookEventFactory } from '../hooks/hook-event-factory.js';
 import { PendingInteractionState } from './pending-interaction-state.js';
 import { BackgroundSubagentApprovalController } from '../approval/background-subagent-approval-controller.js';
+import { ToolCallMarkerStore } from '../../utils/streaming/extract-command-messages.js';
+import { registerSessionRuntime } from '../workspace/active-workspace-root.js';
 const asAskUserAnswerSink = (value) => value && typeof value.setAskUserAnswer === 'function' ? value : null;
 const asSubagentEventSinkHost = (value) => value && typeof value.setSubagentEventSink === 'function'
     ? value
@@ -46,10 +48,11 @@ const asBackgroundShellEventSinkHost = (value) => value && typeof value.setBackg
     : null;
 // ── Composition factory ───────────────────────────────────────────
 export function createSessionRuntimeInternals(options) {
-    const { sessionId: id, sessionStartedAt, agentClient, providerContinuity: suppliedProviderContinuity, openAIRootFreshTurnSelectorParityObserver, openAIRootCheckpointLifecycleObserver, toolOwnership, postExecutePending: suppliedPostExecutePending, postExecutePauseCapability, sessionAccess, askUserAnswerSink, subagentEventSinkHost, deps, retryOptions, turnAccumulator, hookLifecycle, hookEvents: suppliedHookEvents, } = options;
+    const { sessionId: id, sessionStartedAt, agentClient, providerContinuity: suppliedProviderContinuity, openAIRootFreshTurnSelectorParityObserver, openAIRootCheckpointLifecycleObserver, toolOwnership, postExecutePending: suppliedPostExecutePending, postExecutePauseCapability, sessionAccess, askUserAnswerSink, subagentEventSinkHost, deps, retryOptions, turnAccumulator, hookLifecycle, hookEvents: suppliedHookEvents, toolCallMarkers: suppliedToolCallMarkers, } = options;
     const { logger, settingsService, sessionContextService } = deps;
     const startedAt = sessionStartedAt ?? new Date().toISOString();
     const resolvedTurnAccumulator = turnAccumulator ?? new TurnItemAccumulator();
+    const toolCallMarkers = suppliedToolCallMarkers ?? new ToolCallMarkerStore();
     const resolvedAskUserAnswerSink = askUserAnswerSink ?? asAskUserAnswerSink(agentClient);
     const resolvedSubagentEventSinkHost = subagentEventSinkHost ?? asSubagentEventSinkHost(agentClient);
     const resolvedBackgroundShellEventSinkHost = asBackgroundShellEventSinkHost(agentClient);
@@ -110,6 +113,7 @@ export function createSessionRuntimeInternals(options) {
     const backgroundSubagentApprovals = new BackgroundSubagentApprovalController({
         logger,
         sessionId: id,
+        toolOwnership,
         nestedCompatibility: getMethod(agentClient, 'getNestedToolCompatibilityState')?.call(agentClient),
     });
     const generationGuard = new GenerationGuard();
@@ -224,6 +228,7 @@ export function createSessionRuntimeInternals(options) {
         sessionAccess,
         hookLifecycle,
         hookEvents,
+        toolCallMarkers,
     });
     const continuityReset = new SessionContinuityReset({
         providerContinuity,
@@ -289,6 +294,7 @@ export function createSessionRuntimeInternals(options) {
         generationGuard,
         journal,
         abortStream: () => agentClient.abort(),
+        toolCallMarkers,
     });
     const breakChaining = () => {
         providerContinuity.breakChaining();
@@ -312,8 +318,7 @@ export function createSessionRuntimeInternals(options) {
         if (typeof configured === 'number' && Number.isInteger(configured) && configured >= 0) {
             return configured;
         }
-        const clientLimit = getMethod(agentClient, 'getStreamMaxRetries')?.call(agentClient);
-        return typeof clientLimit === 'number' && Number.isInteger(clientLimit) && clientLimit >= 0 ? clientLimit : 2;
+        return 2;
     };
     const attemptFactory = new TurnAttemptFactory({
         agentClient,
@@ -333,6 +338,7 @@ export function createSessionRuntimeInternals(options) {
         state,
     });
     const recoveryHandler = new InitialTurnRecoveryHandler({
+        breakChaining,
         conversationStore,
         freshStartRetriesAllowed: retryOptions?.allowFreshStartRetries ?? true,
         generationGuard,
@@ -352,6 +358,7 @@ export function createSessionRuntimeInternals(options) {
         journal,
     });
     const continuationRecoveryHandler = new ContinuationRecoveryHandler({
+        breakChaining,
         logger,
         sessionId: id,
         generationGuard,
@@ -385,6 +392,7 @@ export function createSessionRuntimeInternals(options) {
         sessionAccess,
         postExecutePending,
         setActivePostExecuteRunId: postExecutePauseCapability?.setActiveRunId.bind(postExecutePauseCapability),
+        toolCallMarkers,
         hookLifecycle,
         hookEvents,
     });
@@ -431,6 +439,7 @@ export function createSessionRuntimeInternals(options) {
         // so they must be cancelled even when no turn is in flight.
         getMethod(agentClient, 'cancelBackgroundRuns')?.call(agentClient);
         getMethod(agentClient, 'cancelBackgroundShellJobs')?.call(agentClient);
+        getMethod(agentClient, 'disposeShellChildren')?.call(agentClient);
         notificationObserver = null;
         taskObserver = null;
         const subagentDisposal = getMethod(agentClient, 'disposeBackgroundSubagents')?.call(agentClient);
@@ -470,6 +479,7 @@ export function createSessionRuntimeInternals(options) {
             settingsService?.get('agent.provider') ??
             'openai';
         const model = settingsService?.get('agent.model') ?? 'gpt-5';
+        const reasoningEffort = settingsService?.get('agent.reasoningEffort');
         const catalog = getCatalogModel(provider, model);
         const compactThreshold = settingsService?.get('agent.contextCompaction.compactThreshold') ?? 0.8;
         const configuredMaxOutput = settingsService?.get('agent.maxOutputTokens');
@@ -478,7 +488,7 @@ export function createSessionRuntimeInternals(options) {
                 const options = {
                     provider,
                     model,
-                    reasoningEffort: 'none',
+                    reasoningEffort,
                     instructions: CONTEXT_COMPACTION_INSTRUCTIONS,
                     maxTokens: maxOutputTokens,
                 };
@@ -539,6 +549,7 @@ export function createSessionRuntimeInternals(options) {
         conversationStore,
         approvalState,
         toolTracker,
+        toolCallMarkers,
         shellAutoApproval,
         approvalFlow,
         inputPlanner,
@@ -640,9 +651,42 @@ export function buildSessionRuntime(internals) {
  * the conversation-layer adapter. Internal composition details remain private.
  */
 export function createSessionRuntime(options) {
-    return buildSessionRuntime(createSessionRuntimeInternals({
-        ...options,
-        turnAccumulator: undefined,
-    }));
+    const releaseRuntime = registerSessionRuntime();
+    try {
+        const runtime = buildSessionRuntime(createSessionRuntimeInternals({
+            ...options,
+            turnAccumulator: undefined,
+        }));
+        let released = false;
+        const releaseOnce = () => {
+            if (released)
+                return;
+            released = true;
+            releaseRuntime();
+        };
+        const dispose = runtime.dispose;
+        runtime.dispose = () => {
+            try {
+                dispose();
+            }
+            finally {
+                releaseOnce();
+            }
+        };
+        const shutdown = runtime.shutdown;
+        runtime.shutdown = async () => {
+            try {
+                await shutdown();
+            }
+            finally {
+                releaseOnce();
+            }
+        };
+        return runtime;
+    }
+    catch (error) {
+        releaseRuntime();
+        throw error;
+    }
 }
 //# sourceMappingURL=session-composition.js.map

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

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

@@ -10,6 +10,7 @@ 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 { ToolCallMarkerStore } from '../../utils/streaming/extract-command-messages.js';
 export type StreamHistorySource = 'startStream' | 'continueRunStream' | 'abortResolution';
 export type StreamFinalizationResult = {
     kind: 'stale';
@@ -33,6 +34,7 @@ export interface SessionStreamProcessorDeps {
     journal: AssistantTurnJournal;
     /** Cancels provider work when the output safety guard terminates a stream. */
     abortStream?: () => void;
+    toolCallMarkers?: ToolCallMarkerStore;
 }
 export interface StreamProcessOptions {
     gen: number;

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

	@@ -1 +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;~~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,~~CA6H5D~~;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"}
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;AAE/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAExF,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;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,CA8H5D;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"}

package/dist/services/session/session-stream-processor.js CHANGED Viewed

@@ -6,6 +6,7 @@ import { projectConversationMessage } from '../conversation/conversation-message
 import { normalizeRunItem } from '../conversation/run-item-normalizer.js';
 import { projectPersistedAssistantItemToProviderHistory } from '../conversation/conversation-turn-items.js';
 import { RepetitionDetector, RepetitiveModelOutputError } from './repetition-detector.js';
+import { ToolCallMarkerStore } from '../../utils/streaming/extract-command-messages.js';
 const hasConversationMessageItems = (items) => items.some(projectConversationMessage);
 /**
  * ApplicationRunLoop output is the canonical application event stream. Provider
@@ -124,8 +125,10 @@ const warnIfStreamHistoryReplayedTools = ({ logger, sessionId, source, snapshot,
 };
 export class SessionStreamProcessor {
     deps;
+    #toolCallMarkers;
     constructor(deps) {
         this.deps = deps;
+        this.#toolCallMarkers = deps.toolCallMarkers ?? new ToolCallMarkerStore();
     }
     /**
      * Processes the AgentStream, records function calls/results,
@@ -159,6 +162,7 @@ export class SessionStreamProcessor {
             toolCallArgumentsById: workingToolArguments,
             emittedInvalidToolCallPackets: workingInvalidPackets,
             preserveExistingToolArgs: true,
+            markerStore: this.#toolCallMarkers,
             onFunctionCallItem: (item) => {
                 this.deps.generationGuard.runIfCurrent(options.gen, () => {
                     const reasoningText = pendingLedgerReasoningText || acc.reasoningOutput.slice(consumedLedgerReasoningLength);

package/dist/services/session/session-stream-processor.js.map CHANGED Viewed

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

package/dist/services/session/terminal-result-collector.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { ConversationEvent, FinalResponseEvent } from '../conversation/conversation-events.js';
+import type { ConversationEvent, ConversationEventSink, FinalResponseEvent } from '../conversation/conversation-events.js';
 import type { ConversationTerminal } from '../../contracts/conversation.js';
 import type { CommandMessage } from '../../tools/types.js';
 import { AmbiguousModelOutcomeError } from '../retry/retry-errors.js';
@@ -13,7 +13,7 @@ export declare function collectTerminalResult(events: AsyncIterable<Conversation
     onTextChunk?: (fullText: string, chunk: string) => void;
     onReasoningChunk?: (fullText: string, chunk: string) => void;
     onCommandMessage?: (message: CommandMessage) => void;
-    onEvent?: (event: ConversationEvent) => void;
+    onEvent?: ConversationEventSink;
     getRawInterruption?: () => unknown;
     onFinalEvent?: (event: FinalResponseEvent) => void;
 }): Promise<ConversationTerminal>;

package/dist/services/session/terminal-result-collector.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal-result-collector.d.ts","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,~~EAAE~~,iBAAiB,~~EAAE~~,kBAAkB,~~EAAE~~,MAAM,wCAAwC,CAAC;~~AACpG~~,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAItE;;;;GAIG;AACH,qBAAa,sCAAuC,SAAQ,0BAA0B;CAAG;AAEzF,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,CAAC,iBAAiB,CAAC,EACxC,EACE,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EACP,kBAAkB,EAClB,YAAY,GACb,GAAE;IACD,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IACrD,OAAO,CAAC,EAAE,~~CAAC~~,~~KAAK,EAAE,iBAAiB,KAAK,IAAI,~~CAAC;~~IAC7C~~,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CAC/C,GACL,OAAO,CAAC,oBAAoB,CAAC,~~CAkK~~/B"}
1	+ {"version":3,"file":"terminal-result-collector.d.ts","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAItE;;;;GAIG;AACH,qBAAa,sCAAuC,SAAQ,0BAA0B;CAAG;AAEzF,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,CAAC,iBAAiB,CAAC,EACxC,EACE,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EACP,kBAAkB,EAClB,YAAY,GACb,GAAE;IACD,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IACrD,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CAC/C,GACL,OAAO,CAAC,oBAAoB,CAAC,CAmK/B"}

package/dist/services/session/terminal-result-collector.js CHANGED Viewed

@@ -47,7 +47,7 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
         return isEmptyUsage(usage) ? undefined : usage;
     };
     for await (const event of events) {
-        onEvent?.(event);
+        await onEvent?.(event);
         switch (event.type) {
             case 'text_delta': {
                 const full = event.fullText ?? '';
@@ -84,6 +84,7 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
                         callId: event.approval.callId,
                         llmAdvisory: event.approval.llmAdvisory,
                         postExecute: event.approval.postExecute,
+                        runBudgetEvent: event.approval.runBudgetEvent,
                     },
                     ...(usage ? { usage } : {}),
                     ...(costRecords?.length ? { costRecords } : {}),

package/dist/services/session/terminal-result-collector.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal-result-collector.js","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"~~AAMA~~,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,MAAM,YAAY,GAAG,CAAC,KAAkC,EAAW,EAAE,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAEhH;;;;GAIG;AACH,MAAM,OAAO,sCAAuC,SAAQ,0BAA0B;CAAG;AAEzF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,MAAwC,EACxC,EACE,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EACP,kBAAkB,EAClB,YAAY,GACb,GAOG,EAAE;IAEN,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,MAAM,eAAe,GAAqB,EAAE,CAAC;IAC7C,MAAM,SAAS,GAAiC,EAAE,CAAC;IACnD,IAAI,sBAAsB,GAAG,EAAE,CAAC;IAChC,IAAI,iBAAiB,GAAG,EAAE,CAAC;IAE3B,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,sBAAsB,EAAE,CAAC;YAC3B,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,CAAC;YACpE,sBAAsB,GAAG,EAAE,CAAC;QAC9B,CAAC;QACD,IAAI,iBAAiB,EAAE,CAAC;YACtB,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;YACpE,iBAAiB,GAAG,EAAE,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,4EAA4E;IAC5E,wEAAwE;IACxE,qEAAqE;IACrE,yEAAyE;IACzE,4DAA4D;IAC5D,kEAAkE;IAClE,kEAAkE;IAClE,sEAAsE;IACtE,iEAAiE;IACjE,IAAI,QAAqC,CAAC;IAC1C,IAAI,mBAAgD,CAAC;IAErD,2EAA2E;IAC3E,qEAAqE;IACrE,yEAAyE;IACzE,6EAA6E;IAC7E,mBAAmB;IACnB,IAAI,cAA8C,CAAC;IAEnD,MAAM,aAAa,GAAG,GAAgC,EAAE;QACtD,MAAM,KAAK,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC;QACvE,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IACjD,CAAC,CAAC;IAEF,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;~~QAEjB~~,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;gBAClC,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;gBACjC,IAAI,sBAAsB,EAAE,CAAC;oBAC3B,YAAY,EAAE,CAAC;gBACjB,CAAC;gBACD,iBAAiB,IAAI,KAAK,CAAC,KAAK,CAAC;gBACjC,MAAM;YACR,CAAC;YACD,KAAK,iBAAiB,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;gBAClC,gBAAgB,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;gBACtC,IAAI,iBAAiB,EAAE,CAAC;oBACtB,YAAY,EAAE,CAAC;gBACjB,CAAC;gBACD,sBAAsB,IAAI,KAAK,CAAC,KAAK,CAAC;gBACtC,MAAM;YACR,CAAC;YACD,KAAK,iBAAiB,EAAE,CAAC;gBACvB,gBAAgB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAClC,MAAM;YACR,CAAC;YACD,KAAK,mBAAmB,EAAE,CAAC;gBACzB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,aAAa,EAAE,CAAC;gBAC7C,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC;gBACnF,OAAO;oBACL,IAAI,EAAE,mBAAmB;oBACzB,QAAQ,EAAE;wBACR,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS;wBACnC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ;wBACjC,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,aAAa;wBAC3C,eAAe,EAAE,kBAAkB,EAAE,EAAE;wBACvC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;wBAC7B,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,WAAW;wBACvC,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,WAAW;~~qBACxC~~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"}
1	+ {"version":3,"file":"terminal-result-collector.js","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"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"}