factory-factory 0.4.6 → 0.4.8

package/dist/src/backend/services/session/service/lifecycle/session.service.js

@@ -1,6 +1,6 @@
 import pLimit from 'p-limit';
-import { createLogger } from '../../../../../backend/services/logger.service.js';
-import { PromptTimeoutError } from '../../../../../backend/services/session/service/acp/index.js';
+import { createLogger } from '../../../logger.service.js';
+import { PromptTimeoutError } from '../acp/index.js';
 import { SessionLifecycleEventKind, SessionLifecycleEventReason } from '../../../../../shared/core/index.js';
 import { toErrorMessage, toProviderFailureChatMessage } from './session.error-message.js';
 const logger = createLogger('session');
@@ -32,9 +32,7 @@ export class SessionService {
     acpEventProcessor;
     promptTurnCompletionService;
     lifecycleEventService;
-    getStopGeneration;
-    isStopGenerationCurrent;
-    isSessionStopping;
+    lifecycleGate;
     acpPromptLimiters = new Map();
     workspaceBridge = null;
     constructor(options) {
@@ -43,9 +41,7 @@ export class SessionService {
         this.acpEventProcessor = options.acpEventProcessor;
         this.promptTurnCompletionService = options.promptTurnCompletionService;
         this.lifecycleEventService = options.lifecycleEventService;
-        this.getStopGeneration = options.getStopGeneration;
-        this.isStopGenerationCurrent = options.isStopGenerationCurrent;
-        this.isSessionStopping = options.isSessionStopping;
+        this.lifecycleGate = options.lifecycleGate;
     }
     configure(bridges) {
         this.workspaceBridge = bridges.workspace;
@@ -152,7 +148,7 @@ export class SessionService {
         return limiter;
     }
     async executeAcpMessage(sessionId, prompt, timeoutMs, timeoutKind) {
-        const stopGeneration = this.getStopGeneration(sessionId);
+        const stopGeneration = this.lifecycleGate.getGeneration(sessionId);
         const workspaceId = this.acpEventProcessor.getWorkspaceId(sessionId);
         let workspaceActivityGeneration;
         let promptCompleted = false;
@@ -209,8 +205,8 @@ export class SessionService {
                 }
             }
             if ((promptCompleted || (promptErrorSet && !this.isTurnAlreadyInProgressError(promptError))) &&
-                !this.isSessionStopping(sessionId) &&
-                this.isStopGenerationCurrent(sessionId, stopGeneration)) {
+                !this.lifecycleGate.isSessionStopping(sessionId) &&
+                this.lifecycleGate.isGenerationCurrent(sessionId, stopGeneration)) {
                 this.promptTurnCompletionService.schedule(sessionId);
             }
         }
@@ -247,13 +243,14 @@ export class SessionService {
         });
     }
     shouldRecordPromptFailure(sessionId, stopGeneration, error) {
-        if (this.isTurnAlreadyInProgressError(error) || this.isSessionStopping(sessionId)) {
+        if (this.isTurnAlreadyInProgressError(error) ||
+            this.lifecycleGate.isSessionStopping(sessionId)) {
             return false;
         }
-        return this.getStopGeneration(sessionId) === stopGeneration;
+        return this.lifecycleGate.getGeneration(sessionId) === stopGeneration;
     }
     completePromptTurnIfCurrent(sessionId, stopGeneration, orphanedToolCallReason, runtime) {
-        if (!this.isStopGenerationCurrent(sessionId, stopGeneration)) {
+        if (!this.lifecycleGate.isGenerationCurrent(sessionId, stopGeneration)) {
             return;
         }
         this.acpEventProcessor.finishPromptTurn(sessionId);

package/dist/src/backend/services/session/service/lifecycle/session.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/lifecycle/session.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/lifecycle/session.service.ts"],"names":[],"mappings":"AACA,OAAO,MAA8B,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAA0B,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAIpG,OAAO,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AAGvF,OAAO,EAAE,cAAc,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAKvF,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;AACvC,MAAM,8BAA8B,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC1D,MAAM,+BAA+B,GAAG,gDAAgD,CAAC;AAIzF,SAAS,qBAAqB,CAAC,SAAiB;IAC9C,MAAM,KAAK,GAAG;QACZ,EAAE,YAAY,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE;QAC/C,EAAE,YAAY,EAAE,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE;QAC5C,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE;KACxC,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,SAAS,IAAI,IAAI,CAAC,YAAY,IAAI,SAAS,GAAG,IAAI,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;YAC1E,MAAM,KAAK,GAAG,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC;YAC5C,OAAO,GAAG,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAClC,CAAC;IACH,CAAC;IACD,OAAO,GAAG,SAAS,cAAc,CAAC;AACpC,CAAC;AAED,SAAS,cAAc,CAAC,SAAiB,EAAE,WAA8B;IACvE,IAAI,WAAW,KAAK,oBAAoB,IAAI,SAAS,KAAK,8BAA8B,EAAE,CAAC;QACzF,OAAO,yCAAyC,CAAC;IACnD,CAAC;IACD,OAAO,wCAAwC,qBAAqB,CAAC,SAAS,CAAC,SAAS,CAAC;AAC3F,CAAC;AAcD,MAAM,OAAO,cAAc;IACR,cAAc,CAAoB;IAClC,oBAAoB,CAAuB;IAC3C,iBAAiB,CAAoB;IACrC,2BAA2B,CAAqC;IAChE,qBAAqB,CAA+C;IACpE,aAAa,CAG5B;IACe,iBAAiB,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE9D,eAAe,GAA2C,IAAI,CAAC;IAEvE,YAAY,OAAmC;QAC7C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;QACzD,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACnD,IAAI,CAAC,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,CAAC;QACvE,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;QAC3D,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAC7C,CAAC;IAKD,SAAS,CAAC,OAAuD;QAC/D,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IAC3C,CAAC;IAED,kBAAkB,CAAC,SAAiB,EAAE,OAAoC;QACxE,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,MAAM,GACV,OAAO,OAAO,KAAK,QAAQ;gBACzB,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;gBACnC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC;YAChE,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,8BAA8B,EAAE;gBAC5E,WAAW,EAAE,oBAAoB;aAClC,CAAC;iBACC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;iBACrB,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;gBAC3C,IAAI,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC7C,MAAM,CAAC,KAAK,CAAC,2DAA2D,EAAE;wBACxE,SAAS;wBACT,KAAK,EAAE,YAAY;qBACpB,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE;wBAChC,SAAS;wBACT,KAAK,EAAE,YAAY;qBACpB,CAAC,CAAC;gBACL,CAAC;gBACD,MAAM,KAAK,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,+CAA+C,SAAS,EAAE,CAAC,CAAC;QACpF,MAAM,CAAC,IAAI,CAAC,4CAA4C,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACzE,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAKO,eAAe,CAAC,OAA2B,EAAE,cAAuB;QAC1E,MAAM,MAAM,GAAmB,EAAE,CAAC;QAClC,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;YAC3B,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,KAAK,MAAM;oBACT,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC/C,MAAM;gBACR,KAAK,UAAU;oBACb,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACnD,MAAM;gBACR,KAAK,OAAO;oBACV,IAAI,cAAc,EAAE,CAAC;wBACnB,MAAM,CAAC,IAAI,CAAC;4BACV,IAAI,EAAE,OAAO;4BACb,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;4BACtB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;yBACjC,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,yCAAyC,EAAE,CAAC,CAAC;oBACjF,CAAC;oBACD,MAAM;gBACR,KAAK,aAAa;oBAChB,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;wBACrC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;oBACpD,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBACpE,CAAC;oBACD,MAAM;gBACR;oBACE,MAAM;YACV,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAOD,cAAc,CACZ,SAAiB,EACjB,MAAsB,EACtB,SAAkB,EAClB,OAA+B;QAE/B,OAAO,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,GAAG,EAAE,CAClD,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,IAAI,YAAY,CAAC,CAC3F,CAAC;IACJ,CAAC;IAEO,uBAAuB,CAAI,SAAiB,EAAE,IAAsB;QAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/E,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,qBAAqB,CAAC,SAAiB;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QACD,OAAO,CAAC,UAAU,EAAE,CAAC;QAIrB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC;IAEO,+BAA+B,CAAC,SAAiB,EAAE,OAAsB;QAC/E,IACE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,OAAO;YACjD,OAAO,CAAC,WAAW,KAAK,CAAC;YACzB,OAAO,CAAC,YAAY,KAAK,CAAC,EAC1B,CAAC;YACD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAEO,mBAAmB,CAAC,SAAiB;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,SAAiB,EACjB,MAAsB,EACtB,SAA6B,EAC7B,WAA8B;QAE9B,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,2BAA+C,CAAC;QACpD,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI,WAAoB,CAAC;QACzB,IAAI,cAAc,GAAG,KAAK,CAAC;QAE3B,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,SAAS,EAAE;YACtD,KAAK,EAAE,SAAS;YAChB,YAAY,EAAE,OAAO;YACrB,QAAQ,EAAE,SAAS;YACnB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC,CAAC;QAEH,IAAI,WAAW,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACxC,2BAA2B,GAAG,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAChG,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YAClF,eAAe,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,4BAA4B,CAAC;gBAChC,SAAS;gBACT,cAAc;gBACd,UAAU,EAAE,MAAM,CAAC,UAAU;aAC9B,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,UAAU,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,GAAG,KAAK,CAAC;YACpB,cAAc,GAAG,IAAI,CAAC;YACtB,IAAI,IAAI,CAAC,yBAAyB,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC;gBACrE,MAAM,IAAI,CAAC,mBAAmB,CAAC;oBAC7B,SAAS;oBACT,WAAW;oBACX,UAAU;oBACV,KAAK;oBACL,WAAW;iBACZ,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,2BAA2B,CAAC,SAAS,EAAE,cAAc,EAAE,cAAc,EAAE;gBAC1E,KAAK,EAAE,OAAO;gBACd,YAAY,EAAE,OAAO;gBACrB,QAAQ,EAAE,MAAM;gBAChB,YAAY,EAAE,cAAc,CAAC,KAAK,CAAC;gBACnC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CAAC,CAAC;YACH,MAAM,KAAK,CAAC;QACd,CAAC;gBAAS,CAAC;YACT,IAAI,WAAW,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACxC,IAAI,2BAA2B,KAAK,SAAS,EAAE,CAAC;oBAC9C,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;gBAC/D,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,EAAE,2BAA2B,CAAC,CAAC;gBAC5F,CAAC;YACH,CAAC;YACD,IACE,CAAC,eAAe,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC,CAAC,CAAC;gBACxF,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,SAAS,CAAC;gBAChD,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,EACjE,CAAC;gBACD,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;IACH,CAAC;IAEO,4BAA4B,CAAC,EACnC,SAAS,EACT,cAAc,EACd,UAAU,GAKX;QACC,IAAI,CAAC,2BAA2B,CAAC,SAAS,EAAE,cAAc,EAAE,eAAe,UAAU,EAAE,EAAE;YACvF,KAAK,EAAE,MAAM;YACb,YAAY,EAAE,OAAO;YACrB,QAAQ,EAAE,MAAM;YAChB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,EAChC,SAAS,EACT,WAAW,EACX,UAAU,EACV,KAAK,EACL,WAAW,GAOZ;QACC,MAAM,MAAM,GACV,KAAK,YAAY,kBAAkB;YACjC,CAAC,CAAC,2BAA2B,CAAC,cAAc;YAC5C,CAAC,CAAC,2BAA2B,CAAC,cAAc,CAAC;QACjD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,CAAC,IAAI,CAAC,gEAAgE,EAAE;gBAC5E,SAAS;gBACT,UAAU;gBACV,MAAM;aACP,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC;YACtC,WAAW;YACX,SAAS;YACT,IAAI,EAAE,yBAAyB,CAAC,gBAAgB;YAChD,MAAM;YACN,OAAO,EACL,KAAK,YAAY,kBAAkB;gBACjC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC;gBAC9C,CAAC,CAAC,4BAA4B,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC;YACxF,SAAS,EAAE,QAAQ,UAAU,OAAO;SACrC,CAAC,CAAC;IACL,CAAC;IAEO,yBAAyB,CAC/B,SAAiB,EACjB,cAAsB,EACtB,KAAc;QAEd,IACE,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC;YACxC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAC/C,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,cAAc,CAAC;IACxE,CAAC;IAEO,2BAA2B,CACjC,SAAiB,EACjB,cAAsB,EACtB,sBAA8B,EAC9B,OAA4B;QAE5B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAAC;YACvE,OAAO;QACT,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;QACpF,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IAEO,4BAA4B,CAAC,KAAc;QACjD,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;IACzE,CAAC;CACF"}

package/dist/src/backend/services/session/service/lifecycle/session.service.test.js

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { sessionDomainService } from '../../../../../backend/services/session/service/session-domain.service.js';
-import { sessionEventBus } from '../../../../../backend/services/session/service/session-event-bus.js';
+import { sessionDomainService } from '../session-domain.service.js';
+import { sessionEventBus } from '../session-event-bus.js';
 import { SessionStatus } from '../../../../../shared/core/index.js';
 import { unsafeCoerce } from '../../../../../test-utils/unsafe-coerce.js';
 const mockNotifyToolStart = vi.fn();
@@ -20,6 +20,32 @@ vi.mock('@/backend/services/workspace');
 vi.mock('./closed-session-persistence.service');
 vi.mock('@/backend/services/session/service/acp', async (importOriginal) => {
     const actual = (await importOriginal());
+    const RuntimeQuiescence = actual.AcpRuntimeQuiescence;
+    const stopClient = vi.fn(async () => undefined);
+    let quiescence = new RuntimeQuiescence({ stopClient });
+    beforeEach(() => {
+        stopClient.mockReset().mockResolvedValue(undefined);
+        quiescence = new RuntimeQuiescence({ stopClient });
+    });
+    const runtimeManager = {
+        getClient: vi.fn().mockReturnValue(undefined),
+        getOrCreateClient: vi.fn(),
+        runClientCreationOperation: vi.fn((sessionId, purpose, operation) => quiescence.runClientCreationOperation(sessionId, purpose, operation)),
+        stopClient,
+        stopAndQuiesce: vi.fn((sessionId) => quiescence.stopAndQuiesce(sessionId)),
+        beginShutdown: vi.fn().mockReturnValue([]),
+        stopAllClients: vi.fn(),
+        sendPrompt: vi.fn(),
+        cancelPrompt: vi.fn(),
+        isSessionRunning: vi.fn().mockReturnValue(false),
+        isSessionWorking: vi.fn().mockReturnValue(false),
+        isAnySessionWorking: vi.fn().mockReturnValue(false),
+        isBrowseOnlySession: vi.fn().mockReturnValue(false),
+        isStopInProgress: vi.fn().mockReturnValue(false),
+        setConfigOption: vi.fn(),
+        setSessionMode: vi.fn(),
+        setSessionModel: vi.fn(),
+    };
     return {
         ...actual,
         AcpEventTranslator: class MockAcpEventTranslator {
@@ -29,23 +55,7 @@ vi.mock('@/backend/services/session/service/acp', async (importOriginal) => {
             cancelAll = vi.fn();
             resolvePermission = vi.fn();
         },
-        acpRuntimeManager: {
-            getClient: vi.fn().mockReturnValue(undefined),
-            getOrCreateClient: vi.fn(),
-            stopClient: vi.fn(),
-            beginShutdown: vi.fn().mockReturnValue([]),
-            stopAllClients: vi.fn(),
-            sendPrompt: vi.fn(),
-            cancelPrompt: vi.fn(),
-            isSessionRunning: vi.fn().mockReturnValue(false),
-            isSessionWorking: vi.fn().mockReturnValue(false),
-            isAnySessionWorking: vi.fn().mockReturnValue(false),
-            isBrowseOnlySession: vi.fn().mockReturnValue(false),
-            isStopInProgress: vi.fn().mockReturnValue(false),
-            setConfigOption: vi.fn(),
-            setSessionMode: vi.fn(),
-            setSessionModel: vi.fn(),
-        },
+        acpRuntimeManager: runtimeManager,
     };
 });
 vi.mock('@/backend/interceptors/registry', () => ({
@@ -83,31 +93,27 @@ vi.mock('@/backend/services/session/service/logging/acp-trace-logger.service', (
         closeSession: (...args) => mockAcpTraceLoggerCloseSession(...args),
     },
 }));
-import { acpRuntimeManager } from '../../../../../backend/services/session/service/acp/index.js';
-import { workspaceDataService } from '../../../../../backend/services/workspace/index.js';
+import { acpRuntimeManager } from '../acp/index.js';
+import { workspaceDataService } from '../../../workspace/index.js';
 import { closedSessionPersistenceService } from './closed-session-persistence.service.js';
 import { sessionPromptBuilder } from './session.prompt-builder.js';
 import { sessionRepository } from './session.repository.js';
+import { createDeferred } from './session-lifecycle.test-helpers.js';
 import { acpEventProcessor, sessionLifecycleService, sessionPromptTurnCompletionService, sessionService, } from './session-services.js';
-function getAcpProcessorState() {
-    return acpEventProcessor;
-}
+const activeRuntime = {
+    incarnationId: '11111111-1111-4111-8111-111111111111',
+    purpose: 'active',
+    managed: false,
+};
+const getAcpProcessorState = () => acpEventProcessor;
 function mockCreatedAcpClient(acpHandle) {
     vi.mocked(acpRuntimeManager.getOrCreateClient).mockImplementation(() => {
         vi.mocked(acpRuntimeManager.getClient).mockReturnValue(acpHandle);
         return Promise.resolve(acpHandle);
     });
 }
-function createDeferred() {
-    let resolvePromise;
-    let rejectPromise;
-    const promise = new Promise((resolve, reject) => {
-        resolvePromise = resolve;
-        rejectPromise = reject;
-    });
-    return { promise, resolve: resolvePromise, reject: rejectPromise };
-}
 describe('SessionService', () => {
+    const sessionId = 'session-fixture-isolation';
     beforeEach(() => {
         vi.clearAllMocks();
         mockNotifyToolStart.mockReset();
@@ -125,12 +131,8 @@ describe('SessionService', () => {
             recordRatchetSessionEnd: mockRecordRatchetSessionEnd,
             resetPRDiscoveryBackoff: vi.fn(async () => true),
         };
-        sessionService.configure({
-            workspace: workspaceBridge,
-        });
-        sessionLifecycleService.configure({
-            workspace: workspaceBridge,
-        });
+        sessionService.configure({ workspace: workspaceBridge });
+        sessionLifecycleService.configure({ workspace: workspaceBridge });
         vi.mocked(acpRuntimeManager.getClient).mockReturnValue(undefined);
         vi.mocked(acpRuntimeManager.isSessionRunning).mockReturnValue(false);
         vi.mocked(acpRuntimeManager.isSessionWorking).mockReturnValue(false);
@@ -144,6 +146,18 @@ describe('SessionService', () => {
         vi.mocked(closedSessionPersistenceService.persistClosedSession).mockResolvedValue();
         vi.mocked(sessionRepository.updateSessionIfStatus).mockResolvedValue(1);
     });
+    it('can leave a runtime quiescence barrier pending', async () => {
+        const pending = createDeferred();
+        void acpRuntimeManager.runClientCreationOperation(sessionId, 'active', () => pending.promise);
+        void acpRuntimeManager.stopAndQuiesce(sessionId);
+        await expect(acpRuntimeManager.runClientCreationOperation(sessionId, 'active', () => Promise.resolve('late'))).rejects.toThrow('ACP session stop requested');
+    });
+    it('starts the next test with isolated runtime quiescence state', async () => {
+        await expect(acpRuntimeManager.runClientCreationOperation(sessionId, 'active', (registration) => {
+            expect(registration.isOnlyOperation()).toBe(true);
+            return Promise.resolve('created');
+        })).resolves.toBe('created');
+    });
     it('starts a session via ACP runtime and updates DB state', async () => {
         const session = unsafeCoerce({
             id: 'session-1',
@@ -620,7 +634,7 @@ describe('SessionService', () => {
             workingDir: '/tmp/work',
         }));
     });
-    it('does not overwrite COMPLETED status when process exits during stopSession', async () => {
+    it('preserves the stop-owned IDLE transition when the process exits cleanly during stopSession', async () => {
         const session = unsafeCoerce({
             id: 'session-race-test',
             workspaceId: 'workspace-1',
@@ -664,15 +678,17 @@ describe('SessionService', () => {
         const stopPromise = sessionLifecycleService.stopSession('session-race-test');
         await Promise.resolve();
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await acpHandlers.onExit('session-race-test', 0);
-        expect(sessionRepository.updateSession).toHaveBeenCalledWith('session-race-test', {
-            status: SessionStatus.COMPLETED,
+        await acpHandlers.onRuntimeExit({
+            ...activeRuntime,
+            sessionId: 'session-race-test',
+            exitCode: 0,
+            managed: true,
         });
+        expect(sessionRepository.updateSession).not.toHaveBeenCalled();
         stopLoad.resolve(session);
         await stopPromise;
-        expect(sessionRepository.updateSession).not.toHaveBeenCalledWith('session-race-test', {
-            status: SessionStatus.IDLE,
-        });
+        expect(sessionRepository.updateSession).not.toHaveBeenCalled();
+        expect(sessionRepository.updateSessionIfStatus).toHaveBeenCalledOnce();
         expect(sessionRepository.updateSessionIfStatus).toHaveBeenCalledWith('session-race-test', {
             status: SessionStatus.IDLE,
         }, [SessionStatus.RUNNING]);
@@ -902,7 +918,7 @@ describe('SessionService', () => {
         const secondRejection = expect(secondSend).rejects.toMatchObject({ name: 'AbortError' });
         await Promise.resolve();
         expect(acpRuntimeManager.sendPrompt).toHaveBeenCalledTimes(1);
-        await acpHandlers.onExit('session-runtime-exit', 1);
+        await acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: session.id, exitCode: 1 });
         await secondRejection;
         expect(acpRuntimeManager.sendPrompt).toHaveBeenCalledTimes(1);
         firstPrompt.resolve({ stopReason: 'end_turn' });
@@ -960,7 +976,7 @@ describe('SessionService', () => {
             .spyOn(sessionDomainService, 'appendClaudeEvent')
             .mockReturnValue(77);
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await acpHandlers.onExit('session-runtime-exit', 1);
+        await acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: session.id, exitCode: 1 });
         expect(emitDeltaSpy).toHaveBeenCalledWith('session-runtime-exit', expect.objectContaining({
             type: 'tool_progress',
             tool_use_id: 'call-1',
@@ -1388,7 +1404,7 @@ describe('SessionService', () => {
         const clearSessionSpy = vi.spyOn(sessionDomainService, 'clearSession');
         await sessionLifecycleService.startSession('session-1');
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await acpHandlers.onExit('session-1', 0);
+        await acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: 'session-1', exitCode: 0 });
         expect(sessionRepository.updateSession).toHaveBeenCalledWith('session-1', {
             status: SessionStatus.COMPLETED,
         });
@@ -1444,7 +1460,7 @@ describe('SessionService', () => {
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
         await sessionLifecycleService.startSession('session-1');
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await expect(acpHandlers.onExit('session-1', 0)).resolves.toBeUndefined();
+        await expect(acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: 'session-1', exitCode: 0 })).resolves.toBeUndefined();
         expect(sessionRepository.updateSession).toHaveBeenCalledWith('session-1', {
             status: SessionStatus.COMPLETED,
         });
@@ -1489,7 +1505,7 @@ describe('SessionService', () => {
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
         await sessionLifecycleService.startSession('session-2');
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await acpHandlers.onExit('session-2', 0);
+        await acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: 'session-2', exitCode: 0 });
         expect(sessionRepository.updateSession).toHaveBeenCalledWith('session-2', {
             status: SessionStatus.COMPLETED,
         });
@@ -1536,7 +1552,7 @@ describe('SessionService', () => {
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
         vi.mocked(sessionRepository.updateSession).mockReset();
         vi.mocked(sessionRepository.updateSession).mockReturnValueOnce(exitUpdate.promise);
-        const exitPromise = acpHandlers.onExit(sessionId, 1);
+        const exitPromise = acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId, exitCode: 1 });
         await vi.waitFor(() => {
             expect(sessionRepository.updateSession).toHaveBeenCalledWith(sessionId, {
                 status: SessionStatus.FAILED,
@@ -1590,7 +1606,7 @@ describe('SessionService', () => {
     it.each([
         { exitCode: 1, expectedStatus: SessionStatus.FAILED },
         { exitCode: null, expectedStatus: SessionStatus.FAILED },
-    ])('persists $expectedStatus on ACP exit code $exitCode', async ({ exitCode, expectedStatus, }) => {
+    ])('persists $expectedStatus on ACP exit code $exitCode', async ({ exitCode, expectedStatus }) => {
         const session = unsafeCoerce({
             id: 'session-2',
             workspaceId: 'workspace-1',
@@ -1628,7 +1644,7 @@ describe('SessionService', () => {
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
         await sessionLifecycleService.startSession('session-2');
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await acpHandlers.onExit('session-2', exitCode);
+        await acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: 'session-2', exitCode });
         expect(sessionRepository.updateSession).toHaveBeenCalledWith('session-2', {
             status: expectedStatus,
         });
@@ -1689,7 +1705,7 @@ describe('SessionService', () => {
         vi.mocked(acpRuntimeManager.isSessionRunning).mockImplementation(() => {
             throw new Error('isSessionRunning failed');
         });
-        await expect(acpHandlers.onExit('session-2', 0)).rejects.toThrow('isSessionRunning failed');
+        await expect(acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: 'session-2', exitCode: 0 })).rejects.toThrow('isSessionRunning failed');
         expect(mockAcpTraceLoggerCloseSession).toHaveBeenCalledWith('session-2');
     });
     it('updates DB status when ACP client is created', async () => {