agent-tower 0.7.2-beta.1 → 0.7.2-beta.6
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.
- package/dist/executors/base.executor.d.ts.map +1 -1
- package/dist/executors/base.executor.js +6 -3
- package/dist/executors/base.executor.js.map +1 -1
- package/dist/routes/__tests__/workspaces.test.js +80 -0
- package/dist/routes/__tests__/workspaces.test.js.map +1 -1
- package/dist/routes/workspaces.js +1 -1
- package/dist/routes/workspaces.js.map +1 -1
- package/dist/runtime/__tests__/cli-driver-lifecycle.test.js +49 -8
- package/dist/runtime/__tests__/cli-driver-lifecycle.test.js.map +1 -1
- package/dist/runtime/__tests__/runtime-coordinator.test.js +13 -0
- package/dist/runtime/__tests__/runtime-coordinator.test.js.map +1 -1
- package/dist/runtime/cli-driver.js +32 -12
- package/dist/runtime/cli-driver.js.map +1 -1
- package/dist/runtime/contracts.d.ts +9 -2
- package/dist/runtime/contracts.d.ts.map +1 -1
- package/dist/runtime/runtime-coordinator.d.ts +2 -0
- package/dist/runtime/runtime-coordinator.d.ts.map +1 -1
- package/dist/runtime/runtime-coordinator.js +10 -0
- package/dist/runtime/runtime-coordinator.js.map +1 -1
- package/dist/services/__tests__/session-manager.lifecycle.test.js +136 -0
- package/dist/services/__tests__/session-manager.lifecycle.test.js.map +1 -1
- package/dist/services/__tests__/session-manager.team-run.test.js +44 -47
- package/dist/services/__tests__/session-manager.team-run.test.js.map +1 -1
- package/dist/services/__tests__/team-reconciler.service.test.js +30 -0
- package/dist/services/__tests__/team-reconciler.service.test.js.map +1 -1
- package/dist/services/__tests__/terminal-manager.test.js +70 -0
- package/dist/services/__tests__/terminal-manager.test.js.map +1 -1
- package/dist/services/project.service.d.ts.map +1 -1
- package/dist/services/project.service.js +30 -4
- package/dist/services/project.service.js.map +1 -1
- package/dist/services/session-manager.d.ts +1 -0
- package/dist/services/session-manager.d.ts.map +1 -1
- package/dist/services/session-manager.js +40 -5
- package/dist/services/session-manager.js.map +1 -1
- package/dist/services/session-runtime-cleanup-gate.d.ts +1 -0
- package/dist/services/session-runtime-cleanup-gate.d.ts.map +1 -1
- package/dist/services/session-runtime-cleanup-gate.js +5 -3
- package/dist/services/session-runtime-cleanup-gate.js.map +1 -1
- package/dist/services/team-reconciler.service.d.ts +1 -0
- package/dist/services/team-reconciler.service.d.ts.map +1 -1
- package/dist/services/team-reconciler.service.js +1 -0
- package/dist/services/team-reconciler.service.js.map +1 -1
- package/dist/services/terminal-manager.d.ts.map +1 -1
- package/dist/services/terminal-manager.js +9 -4
- package/dist/services/terminal-manager.js.map +1 -1
- package/dist/services/workspace.service.js +8 -8
- package/dist/services/workspace.service.js.map +1 -1
- package/dist/utils/__tests__/spawned-process-identity.test.d.ts +2 -0
- package/dist/utils/__tests__/spawned-process-identity.test.d.ts.map +1 -0
- package/dist/utils/__tests__/spawned-process-identity.test.js +31 -0
- package/dist/utils/__tests__/spawned-process-identity.test.js.map +1 -0
- package/dist/utils/spawned-process-identity.d.ts +1 -1
- package/dist/utils/spawned-process-identity.d.ts.map +1 -1
- package/dist/utils/spawned-process-identity.js +11 -3
- package/dist/utils/spawned-process-identity.js.map +1 -1
- package/dist/web/assets/AgentDemoPage-D0LQRcXm.js +1 -0
- package/dist/web/assets/{AgentEnvironmentSettingsPage-DfVjAeK8.js → AgentEnvironmentSettingsPage-BnWVgvNe.js} +1 -1
- package/dist/web/assets/AgentLogo-BDyW3ihb.js +1 -0
- package/dist/web/assets/BranchSelect-Dmp5hq0i.js +1 -0
- package/dist/web/assets/BrandLogo-YGT4Vlw5.js +1 -0
- package/dist/web/assets/{ConversationPage-Bh_x9kK3.js → ConversationPage-BhapUYGe.js} +2 -2
- package/dist/web/assets/CreateTaskInput-GLF3Oyc1.js +1 -0
- package/dist/web/assets/{DemoPage-xys5j303.js → DemoPage-BwX2SvcN.js} +1 -1
- package/dist/web/assets/DesignSystemPage-j-1-1JtQ.js +16 -0
- package/dist/web/assets/EditableTaskTitle-mHT39coo.js +70 -0
- package/dist/web/assets/{ExecutionPermissionSelector-CTeKhMaB.js → ExecutionPermissionSelector-DeeNd4Kh.js} +1 -1
- package/dist/web/assets/{GeneralSettingsPage-BZEcE8xN.js → GeneralSettingsPage-BBe3EXcj.js} +1 -1
- package/dist/web/assets/{LoadingPreviewPage-D81UstX2.js → LoadingPreviewPage-BxEFnEQh.js} +1 -1
- package/dist/web/assets/McpSettingsPage-DDA8yUxu.js +1 -0
- package/dist/web/assets/{MemberAvatar-BuueBvLu.js → MemberAvatar-CCRbS97s.js} +1 -1
- package/dist/web/assets/MobileTaskDetail-BOIFPybn.js +5 -0
- package/dist/web/assets/NotificationSettingsPage-B2kUnE8w.js +1 -0
- package/dist/web/assets/{ProfileSettingsPage-DdK3Q2wl.js → ProfileSettingsPage-DPZpUoFd.js} +1 -1
- package/dist/web/assets/ProjectKanbanPage-DQnwUBFg.js +12 -0
- package/dist/web/assets/ProjectSettingsPage-CcXAOYb7.js +2 -0
- package/dist/web/assets/{ProviderSettingsPage-CiTp3QwX.js → ProviderSettingsPage-BAIRvcAS.js} +3 -3
- package/dist/web/assets/{SettingsMasterDetail-BhepxZ5b.js → SettingsMasterDetail-BuxwsR9R.js} +1 -1
- package/dist/web/assets/TaskDetail-B3pOSx3f.js +3 -0
- package/dist/web/assets/TeamSettingsPage-DoWmzvKu.js +1 -0
- package/dist/web/assets/agent-meta-MzuGtqxl.js +1 -0
- package/dist/web/assets/arc-Bm_QIbJA.js +1 -0
- package/dist/web/assets/{architectureDiagram-3BPJPVTR-Byb8rrNU.js → architectureDiagram-3BPJPVTR-B5EIiXuX.js} +1 -1
- package/dist/web/assets/arrow-down-BVePf1ZM.js +1 -0
- package/dist/web/assets/at-sign-BE17rU5b.js +1 -0
- package/dist/web/assets/{blockDiagram-GPEHLZMM-DGcS4UET.js → blockDiagram-GPEHLZMM-GFwnvSLM.js} +1 -1
- package/dist/web/assets/{c4Diagram-AAUBKEIU-BRyJRATZ.js → c4Diagram-AAUBKEIU-iJfLTxEa.js} +1 -1
- package/dist/web/assets/channel-CYYV7_Oi.js +1 -0
- package/dist/web/assets/check-qs0S_9rB.js +1 -0
- package/dist/web/assets/chevron-down-BaQEBzp3.js +1 -0
- package/dist/web/assets/chevron-up-D0y6skqr.js +1 -0
- package/dist/web/assets/{chunk-2J33WTMH-DgL3sVcs.js → chunk-2J33WTMH-CDxRPp-8.js} +1 -1
- package/dist/web/assets/{chunk-4BX2VUAB-BVgUUvCo.js → chunk-4BX2VUAB-mzPbgyiz.js} +1 -1
- package/dist/web/assets/{chunk-55IACEB6-CfD9Uy7p.js → chunk-55IACEB6-KNAJbQyw.js} +1 -1
- package/dist/web/assets/{chunk-727SXJPM-D8gRbLX6.js → chunk-727SXJPM-BqGfqkDK.js} +2 -2
- package/dist/web/assets/{chunk-AQP2D5EJ-CwBPJyzk.js → chunk-AQP2D5EJ-D27ue-H0.js} +1 -1
- package/dist/web/assets/{chunk-FMBD7UC4-B0b7Iiv3.js → chunk-FMBD7UC4-DRza-3q8.js} +1 -1
- package/dist/web/assets/{chunk-ND2GUHAM-D0Y5tagg.js → chunk-ND2GUHAM-CUgkviLu.js} +1 -1
- package/dist/web/assets/{chunk-QZHKN3VN-qVEPtRTm.js → chunk-QZHKN3VN-BAlOJwZb.js} +1 -1
- package/dist/web/assets/{circle-alert-C_ON1rCL.js → circle-alert-Cbvy2cMo.js} +1 -1
- package/dist/web/assets/classDiagram-4FO5ZUOK-Cl-3ikxt.js +1 -0
- package/dist/web/assets/classDiagram-v2-Q7XG4LA2-Cl-3ikxt.js +1 -0
- package/dist/web/assets/code-block-OCS4YCEC-CO23R1Os.js +2 -0
- package/dist/web/assets/{confirm-dialog-Drhw7wmk.js → confirm-dialog-BrgNTypL.js} +1 -1
- package/dist/web/assets/copy-DejkmIHZ.js +1 -0
- package/dist/web/assets/{cose-bilkent-S5V4N54A-BoSlujEJ.js → cose-bilkent-S5V4N54A-8TBY7BP_.js} +1 -1
- package/dist/web/assets/cssMode-hzDRnxMx.js +1 -0
- package/dist/web/assets/{dagre-BM42HDAG-DWm_GyDR.js → dagre-BM42HDAG-CkMzDiim.js} +1 -1
- package/dist/web/assets/{diagram-2AECGRRQ-CVtgrsl0.js → diagram-2AECGRRQ-CAOQJ2N1.js} +1 -1
- package/dist/web/assets/{diagram-5GNKFQAL-XNMIXdme.js → diagram-5GNKFQAL-DKhE0hiI.js} +1 -1
- package/dist/web/assets/{diagram-KO2AKTUF-CYXdL2cC.js → diagram-KO2AKTUF-DBdkXSpa.js} +1 -1
- package/dist/web/assets/{diagram-LMA3HP47-8MCVTTrT.js → diagram-LMA3HP47-DRi2t32c.js} +1 -1
- package/dist/web/assets/{diagram-OG6HWLK6-DMWgHctP.js → diagram-OG6HWLK6-DtP92tI1.js} +1 -1
- package/dist/web/assets/{erDiagram-TEJ5UH35-D3qp5csl.js → erDiagram-TEJ5UH35-DWFKXtst.js} +1 -1
- package/dist/web/assets/{flowDiagram-I6XJVG4X-D-Bem31x.js → flowDiagram-I6XJVG4X-LDE0h4ri.js} +1 -1
- package/dist/web/assets/{freemarker2-D7pixABp.js → freemarker2-CLksOOZX.js} +3 -3
- package/dist/web/assets/{ganttDiagram-6RSMTGT7-D5ctgPCm.js → ganttDiagram-6RSMTGT7-DD2RfdyV.js} +1 -1
- package/dist/web/assets/gauge-CPlvCZUV.js +1 -0
- package/dist/web/assets/{gitGraphDiagram-PVQCEYII-lA3I18_r.js → gitGraphDiagram-PVQCEYII-DkKrR8ex.js} +1 -1
- package/dist/web/assets/globe-CD4g63c9.js +1 -0
- package/dist/web/assets/handlebars-C1M9t0Lo.js +1 -0
- package/dist/web/assets/html-DKVKQovh.js +1 -0
- package/dist/web/assets/htmlMode-BSWjg5ir.js +1 -0
- package/dist/web/assets/index-BnqdwOEH.css +1 -0
- package/dist/web/assets/{index-ClhIruws.js → index-CMJV-mgF.js} +13 -13
- package/dist/web/assets/{index-CA_B15_q.js → index-D_QVcsLn.js} +5 -5
- package/dist/web/assets/{infoDiagram-5YYISTIA-CGy_XnVP.js → infoDiagram-5YYISTIA-BdPA9Xfi.js} +1 -1
- package/dist/web/assets/{ishikawaDiagram-YF4QCWOH-DFGAkcYD.js → ishikawaDiagram-YF4QCWOH-220u4uiv.js} +1 -1
- package/dist/web/assets/javascript-WwrMY2Bg.js +1 -0
- package/dist/web/assets/{journeyDiagram-JHISSGLW-C9ZHl7QM.js → journeyDiagram-JHISSGLW-BvE0Y3tZ.js} +1 -1
- package/dist/web/assets/{jsonMode-bD-WsLyj.js → jsonMode-Dz0hnnvg.js} +4 -4
- package/dist/web/assets/{kanban-definition-UN3LZRKU-BbbRnxDG.js → kanban-definition-UN3LZRKU-Q0JH1P6D.js} +1 -1
- package/dist/web/assets/key-round-DZm1FLLr.js +1 -0
- package/dist/web/assets/{layers-BlEewgM8.js → layers-Dda7MM7a.js} +1 -1
- package/dist/web/assets/{linear-D04wUvKo.js → linear-Dr6SfnSn.js} +1 -1
- package/dist/web/assets/link-BUeSP3T7.js +1 -0
- package/dist/web/assets/liquid-CzGEh0ls.js +1 -0
- package/dist/web/assets/{lspLanguageFeatures-jn1q-hoP.js → lspLanguageFeatures-Bbp4PWlJ.js} +1 -1
- package/dist/web/assets/mdx-y6S3OMMk.js +1 -0
- package/dist/web/assets/mermaid-NOHMQCX5-C72362la.js +123 -0
- package/dist/web/assets/{message-square-CTrwLud_.js → message-square-CFriSt4D.js} +1 -1
- package/dist/web/assets/{mindmap-definition-RKZ34NQL-n24WGa7x.js → mindmap-definition-RKZ34NQL-bvDaNfKs.js} +1 -1
- package/dist/web/assets/{modal-BFDGLwoR.js → modal-DeigO7aN.js} +1 -1
- package/dist/web/assets/{monaco-CirwkIGR.js → monaco-BuDK9Fat.js} +3 -3
- package/dist/web/assets/paperclip-BOSklTt7.js +1 -0
- package/dist/web/assets/pencil-BRQ9W_a-.js +1 -0
- package/dist/web/assets/{pieDiagram-4H26LBE5-CUMw3DZK.js → pieDiagram-4H26LBE5-BQCca9Cq.js} +2 -2
- package/dist/web/assets/play-Mxkwq69n.js +1 -0
- package/dist/web/assets/python-CMnGKsU9.js +1 -0
- package/dist/web/assets/{quadrantDiagram-W4KKPZXB-DMshWJZy.js → quadrantDiagram-W4KKPZXB-BEM2U7Cd.js} +1 -1
- package/dist/web/assets/razor-mLurbGgY.js +1 -0
- package/dist/web/assets/{requirementDiagram-4Y6WPE33-B4Jx_Yx6.js → requirementDiagram-4Y6WPE33-CcmFIALZ.js} +1 -1
- package/dist/web/assets/{sankeyDiagram-5OEKKPKP-CN2JbWht.js → sankeyDiagram-5OEKKPKP-D9Nrfbqk.js} +1 -1
- package/dist/web/assets/{select-CLV6rtRD.js → select-DKS02St6.js} +1 -1
- package/dist/web/assets/{sequenceDiagram-3UESZ5HK-B4bMaYD_.js → sequenceDiagram-3UESZ5HK-5udQDi0x.js} +1 -1
- package/dist/web/assets/server-DJaSJ9m1.js +1 -0
- package/dist/web/assets/stateDiagram-AJRCARHV-D-cF1NGV.js +1 -0
- package/dist/web/assets/stateDiagram-v2-BHNVJYJU-a4ugQnZs.js +1 -0
- package/dist/web/assets/status-styles-sQm4KLdp.js +1 -0
- package/dist/web/assets/{switch-Ch_hFX_n.js → switch-7LWQ_sEx.js} +1 -1
- package/dist/web/assets/task-CDYaC_No.js +42 -0
- package/dist/web/assets/task-priority-acVgTiil.js +1 -0
- package/dist/web/assets/{textarea-DDy2_gLQ.js → textarea-Ft9KMoEI.js} +1 -1
- package/dist/web/assets/{timeline-definition-PNZ67QCA-BuLxqHOL.js → timeline-definition-PNZ67QCA-DXS236a-.js} +1 -1
- package/dist/web/assets/{trash-2-DrNpNvRo.js → trash-2-Bc-URu8c.js} +1 -1
- package/dist/web/assets/{tsMode-qES9KHvZ.js → tsMode-Vr3bndW1.js} +4 -4
- package/dist/web/assets/typescript-BfjoaUSn.js +1 -0
- package/dist/web/assets/{upload-D6SifUfr.js → upload-C9Z4jLtv.js} +1 -1
- package/dist/web/assets/use-attachments-EypT-7PI.js +2 -0
- package/dist/web/assets/{use-profiles-DUoivbBF.js → use-profiles-nMPGwy3v.js} +1 -1
- package/dist/web/assets/use-projects-DI27nNwl.js +1 -0
- package/dist/web/assets/{use-providers-BKYsoOBU.js → use-providers-DB9ghBPq.js} +1 -1
- package/dist/web/assets/use-workspaces-d4n9m9cX.js +1 -0
- package/dist/web/assets/useNormalizedLogs-DRoPbP0w.js +1 -0
- package/dist/web/assets/useTokenUsage-4qTDa8SY.js +1 -0
- package/dist/web/assets/{vennDiagram-CIIHVFJN-LoQ_fciU.js → vennDiagram-CIIHVFJN-BzyNrP06.js} +1 -1
- package/dist/web/assets/{wardley-L42UT6IY-Dh_9I9Zv.js → wardley-L42UT6IY-BQ4SyU9_.js} +1 -1
- package/dist/web/assets/{wardleyDiagram-YWT4CUSO-CQ-yZsuW.js → wardleyDiagram-YWT4CUSO-CcCqmB58.js} +1 -1
- package/dist/web/assets/xml-BGVoPR0b.js +1 -0
- package/dist/web/assets/{xychartDiagram-2RQKCTM6-HLyImhwf.js → xychartDiagram-2RQKCTM6-RWm1MtQk.js} +1 -1
- package/dist/web/assets/yaml-eFhNavrs.js +1 -0
- package/dist/web/index.html +2 -2
- package/node_modules/@agent-tower/shared/dist/types.d.ts +1 -1
- package/node_modules/@agent-tower/shared/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/dist/web/assets/AgentDemoPage-CCw9EfsA.js +0 -1
- package/dist/web/assets/AgentLogo-BhKP5dmt.js +0 -1
- package/dist/web/assets/CreateTaskInput-D_KCLZ4q.js +0 -1
- package/dist/web/assets/McpSettingsPage-Ch1U9tIg.js +0 -1
- package/dist/web/assets/NotificationSettingsPage-IHVOP-Vc.js +0 -1
- package/dist/web/assets/ProjectKanbanPage-VFkvX9IJ.js +0 -86
- package/dist/web/assets/ProjectSettingsPage-BlRbxcf8.js +0 -2
- package/dist/web/assets/TeamSettingsPage-JaLFYXmJ.js +0 -1
- package/dist/web/assets/arc-Bd616RKq.js +0 -1
- package/dist/web/assets/channel-DJbXDmr3.js +0 -1
- package/dist/web/assets/check-Bj-p_n7C.js +0 -1
- package/dist/web/assets/chevron-down-BouKK_Vr.js +0 -1
- package/dist/web/assets/chevron-right-DJVYJhGF.js +0 -1
- package/dist/web/assets/chevron-up-CRlA9Cjl.js +0 -1
- package/dist/web/assets/classDiagram-4FO5ZUOK-BIz565rI.js +0 -1
- package/dist/web/assets/classDiagram-v2-Q7XG4LA2-BIz565rI.js +0 -1
- package/dist/web/assets/code-block-OCS4YCEC-wB-pkznC.js +0 -2
- package/dist/web/assets/cssMode-DBSRGK6o.js +0 -1
- package/dist/web/assets/globe-AjOch0vk.js +0 -1
- package/dist/web/assets/handlebars-B10IREzV.js +0 -1
- package/dist/web/assets/html-BpG68rDt.js +0 -1
- package/dist/web/assets/htmlMode-DuHt_Jpu.js +0 -1
- package/dist/web/assets/index-NxnivNNl.css +0 -1
- package/dist/web/assets/javascript-BupP80yJ.js +0 -1
- package/dist/web/assets/liquid-C57aZJpn.js +0 -1
- package/dist/web/assets/mdx-CEldzbGM.js +0 -1
- package/dist/web/assets/mermaid-NOHMQCX5-BsnLQ2rU.js +0 -124
- package/dist/web/assets/pencil-DQeFTV0j.js +0 -1
- package/dist/web/assets/python-B5Uu3BYh.js +0 -1
- package/dist/web/assets/razor-BW2eCr4L.js +0 -1
- package/dist/web/assets/server-Dhw531hF.js +0 -1
- package/dist/web/assets/stateDiagram-AJRCARHV-CJAmyasO.js +0 -1
- package/dist/web/assets/stateDiagram-v2-BHNVJYJU-CXOXut1l.js +0 -1
- package/dist/web/assets/typescript-DyiE-tjk.js +0 -1
- package/dist/web/assets/use-projects-CNU2P0v0.js +0 -1
- package/dist/web/assets/use-workspaces-C1HJqhNs.js +0 -1
- package/dist/web/assets/useNormalizedLogs-Bu2oXEky.js +0 -1
- package/dist/web/assets/xml-BNpVw2Ox.js +0 -1
- package/dist/web/assets/yaml-DtqgC7D8.js +0 -1
- /package/dist/web/assets/{ProjectKanbanPage-DcpNTP1B.css → EditableTaskTitle-DcpNTP1B.css} +0 -0
|
@@ -88,6 +88,76 @@ describe('TerminalManager process ownership', () => {
|
|
|
88
88
|
await manager.destroyAll();
|
|
89
89
|
}
|
|
90
90
|
});
|
|
91
|
+
it('terminates a Windows terminal even when identity probes exceed the exit wait budget', async () => {
|
|
92
|
+
const shell = new FakePty();
|
|
93
|
+
let rootAlive = true;
|
|
94
|
+
let now = 0;
|
|
95
|
+
const clock = vi.spyOn(Date, 'now').mockImplementation(() => now);
|
|
96
|
+
const root = { pid: shell.pid, parentPid: process.pid, birthMarker: 'root-birth' };
|
|
97
|
+
const adapter = {
|
|
98
|
+
captureProcess: vi.fn(async () => root),
|
|
99
|
+
captureDescendants: vi.fn(async () => { now += 50; return []; }),
|
|
100
|
+
isProcessAlive: vi.fn(async () => rootAlive),
|
|
101
|
+
terminateTree: vi.fn(async () => { now += 50; rootAlive = false; shell.exit(); }),
|
|
102
|
+
};
|
|
103
|
+
const manager = new TerminalManager(new EventBus(), {
|
|
104
|
+
spawn: vi.fn(() => shell), windowsProcessAdapter: adapter,
|
|
105
|
+
platform: 'win32', forceTimeoutMs: 10,
|
|
106
|
+
});
|
|
107
|
+
const terminal = manager.create('windows-slow-identity-probe');
|
|
108
|
+
try {
|
|
109
|
+
await manager.destroy(terminal.terminalId);
|
|
110
|
+
expect(adapter.terminateTree).toHaveBeenCalledWith(root.pid);
|
|
111
|
+
expect(rootAlive).toBe(false);
|
|
112
|
+
expect(manager.size).toBe(0);
|
|
113
|
+
}
|
|
114
|
+
finally {
|
|
115
|
+
rootAlive = false;
|
|
116
|
+
shell.exit();
|
|
117
|
+
try {
|
|
118
|
+
await manager.destroyAll();
|
|
119
|
+
}
|
|
120
|
+
finally {
|
|
121
|
+
clock.mockRestore();
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
});
|
|
125
|
+
it('retains Windows terminal ownership when termination fails and allows a retry', async () => {
|
|
126
|
+
const shell = new FakePty();
|
|
127
|
+
let rootAlive = true;
|
|
128
|
+
let canTerminate = false;
|
|
129
|
+
const root = { pid: shell.pid, parentPid: process.pid, birthMarker: 'root-birth' };
|
|
130
|
+
const adapter = {
|
|
131
|
+
captureProcess: vi.fn(async () => root),
|
|
132
|
+
captureDescendants: vi.fn(async () => []),
|
|
133
|
+
isProcessAlive: vi.fn(async () => rootAlive),
|
|
134
|
+
terminateTree: vi.fn(async () => {
|
|
135
|
+
if (canTerminate) {
|
|
136
|
+
rootAlive = false;
|
|
137
|
+
shell.exit();
|
|
138
|
+
}
|
|
139
|
+
}),
|
|
140
|
+
};
|
|
141
|
+
const manager = new TerminalManager(new EventBus(), {
|
|
142
|
+
spawn: vi.fn(() => shell), windowsProcessAdapter: adapter,
|
|
143
|
+
platform: 'win32', forceTimeoutMs: 30,
|
|
144
|
+
});
|
|
145
|
+
const terminal = manager.create('windows-termination-retry');
|
|
146
|
+
try {
|
|
147
|
+
await expect(manager.destroy(terminal.terminalId)).rejects.toThrow('process tree did not exit');
|
|
148
|
+
expect(adapter.terminateTree).toHaveBeenCalledWith(root.pid);
|
|
149
|
+
expect(manager.has(terminal.terminalId)).toBe(true);
|
|
150
|
+
canTerminate = true;
|
|
151
|
+
await manager.cleanupBySocket('windows-termination-retry');
|
|
152
|
+
expect(rootAlive).toBe(false);
|
|
153
|
+
expect(manager.size).toBe(0);
|
|
154
|
+
}
|
|
155
|
+
finally {
|
|
156
|
+
rootAlive = false;
|
|
157
|
+
shell.exit();
|
|
158
|
+
await manager.destroyAll();
|
|
159
|
+
}
|
|
160
|
+
});
|
|
91
161
|
it('does not terminate a Windows PID reused after its descendant was recorded', async () => {
|
|
92
162
|
const shell = new FakePty();
|
|
93
163
|
let alive = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-manager.test.js","sourceRoot":"","sources":["../../../src/services/__tests__/terminal-manager.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"terminal-manager.test.js","sourceRoot":"","sources":["../../../src/services/__tests__/terminal-manager.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AAExE,MAAM,OAAO;IACX,GAAG,GAAG,IAAI,CAAC;IACX,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IAChB,MAAM,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IACT,KAAK,GAAG,IAAI,GAAG,EAAyC,CAAC;IACjE,MAAM,KAAK,OAAO,EAAE,OAAO,KAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACrC,MAAM,CAAC,QAA+C;QACpD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzB,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IACxD,CAAC;IACD,IAAI,KAAK,KAAK,MAAM,QAAQ,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAC9E;AAED,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,UAAU,GAAG,IAAI,CAAC;QACtB,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAE,SAAS,GAAG,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7G,MAAM,OAAO,GAA+B;YAC1C,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,GAAG,KAAK,GAAG,cAAc,CAAC,CAAC,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9G,uBAAuB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;YACvF,kBAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpG,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;YACxF,mBAAmB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;YAC5F,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC;YACtC,kBAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;gBACtC,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,GAAG,IAAI,SAAS,EAAE,CAAC;oBAAC,SAAS,GAAG,KAAK,CAAC;oBAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAAC,CAAC;gBAC/E,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;SACH,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,IAAI,QAAQ,EAAE,EAAE;YAClD,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAQ,EAAE,kBAAkB,EAAE,OAAO;YAC7D,QAAQ,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE;SAC5D,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;YAChG,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpD,UAAU,GAAG,KAAK,CAAC;YACnB,MAAM,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YACxC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;gBAAS,CAAC;YAAC,UAAU,GAAG,KAAK,CAAC;YAAC,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;QACnF,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,UAAU,GAAG,IAAI,CAAC;QACtB,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;QACnF,MAAM,KAAK,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9E,MAAM,OAAO,GAA8B;YACzC,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC;YACvC,kBAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACxE,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAC,QAAQ,EAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;YAC5F,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE,GAAG,IAAI,GAAG,KAAK,KAAK,CAAC,GAAG;gBAAE,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;SAClF,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,IAAI,QAAQ,EAAE,EAAE;YAClD,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAQ,EAAE,qBAAqB,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO;SACpF,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACpD,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1F,SAAS,GAAG,KAAK,CAAC;YAClB,KAAK,CAAC,IAAI,EAAE,CAAC;YACb,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC3C,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9D,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACjE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;gBAAS,CAAC;YAAC,UAAU,GAAG,KAAK,CAAC;YAAC,SAAS,GAAG,KAAK,CAAC;YAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAAC,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qFAAqF,EAAE,KAAK,IAAI,EAAE;QACnG,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;QACnF,MAAM,OAAO,GAA8B;YACzC,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC;YACvC,kBAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,GAAG,GAAG,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;YAChE,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC;YAC5C,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,GAAG,GAAG,IAAI,EAAE,CAAC,CAAC,SAAS,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SAClF,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,IAAI,QAAQ,EAAE,EAAE;YAClD,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAQ,EAAE,qBAAqB,EAAE,OAAO;YAChE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE;SACtC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;QAC/D,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC3C,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7D,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;gBAAS,CAAC;YACT,SAAS,GAAG,KAAK,CAAC;YAClB,KAAK,CAAC,IAAI,EAAE,CAAC;YACb,IAAI,CAAC;gBAAC,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;YAAC,CAAC;oBAAS,CAAC;gBAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;QAC5F,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;QACnF,MAAM,OAAO,GAA8B;YACzC,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC;YACvC,kBAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC;YACzC,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC;YAC5C,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE;gBAC9B,IAAI,YAAY,EAAE,CAAC;oBAAC,SAAS,GAAG,KAAK,CAAC;oBAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAAC,CAAC;YACxD,CAAC,CAAC;SACH,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,IAAI,QAAQ,EAAE,EAAE;YAClD,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAQ,EAAE,qBAAqB,EAAE,OAAO;YAChE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE;SACtC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAC7D,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;YAChG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7D,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpD,YAAY,GAAG,IAAI,CAAC;YACpB,MAAM,OAAO,CAAC,eAAe,CAAC,2BAA2B,CAAC,CAAC;YAC3D,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;gBAAS,CAAC;YAAC,SAAS,GAAG,KAAK,CAAC;YAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAAC,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QACzF,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;QACnF,MAAM,KAAK,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;QAClF,MAAM,OAAO,GAA8B;YACzC,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC;YACvC,kBAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACxE,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC;YACxC,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC;SAC5C,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,IAAI,QAAQ,EAAE,EAAE;YAClD,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAQ,EAAE,qBAAqB,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO;SACpF,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1F,uEAAuE;YACvE,KAAK,GAAG,KAAK,CAAC;YACd,KAAK,CAAC,IAAI,EAAE,CAAC;YACb,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC3C,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YACrD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;gBAAS,CAAC;YAAC,KAAK,GAAG,KAAK,CAAC;YAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAAC,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,YAAY,EAAE,uBAAuB,CAAC,CAAC,CAAC,8CAA8C,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACjK,MAAM,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,GAAG,EAAE;YACvC,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,GAAG;SAChE,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;QACvE,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,GAAG,CAAC,EAAE,CAAC,iBAAiB,EAAE,KAAK,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC;YACrB,MAAM,KAAK,GAAG,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvD,IAAI,KAAK;gBAAE,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,GAAG,CAAC;QAC5E,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,EAAE,GAAG,IAAI,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,KAAK,CAAC;QAAC,CAAC,CAAC,CAAC,CAAC;QACtG,IAAI,CAAC;YACH,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,IAAI,KAAK,uBAAuB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,sGAAsG,CAAC,IAAI,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YAC/Q,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YACxE,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC1B,IAAI,IAAI,KAAK,uBAAuB,EAAE,CAAC;oBACrC,kEAAkE;oBAClE,oEAAoE;oBACpE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC3D,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBAC7C,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnE,CAAC;iBAAM,CAAC;gBACN,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;YAC3G,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrD,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpE,CAAC;gBAAS,CAAC;YACT,KAAK,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC;gBAAE,IAAI,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;oBAAC,IAAI,CAAC;wBAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;oBAAC,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;gBAAC,CAAC;YACrH,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC,EAAE,KAAK,CAAC,CAAC;AACZ,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.service.d.ts","sourceRoot":"","sources":["../../src/services/project.service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"project.service.d.ts","sourceRoot":"","sources":["../../src/services/project.service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAmBhE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAG5F,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,kBAAkB;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,UAAU,gBAAgB;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,UAAU,eAAe,CAAC,CAAC;IACzB,IAAI,EAAE,CAAC,EAAE,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,iBAAiB;AACjB,UAAU,SAAS;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,mBAAmB;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,oBAAoB,CAAC,CAAC;IAC9B,OAAO,EAAE,CAAC,CAAC;IACX,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AA4KD,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAAjB,iBAAiB,GAAE,IAAI,CAAC,0BAA0B,EAAE,qBAAqB,CAAmC;IAG/H;;OAEG;IACG,OAAO,CAAC,MAAM,GAAE,gBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IA4C3E;;OAEG;IACG,QAAQ,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuCzB;;;;;OAKG;IACG,MAAM,CAAC,KAAK,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;IA4CtC;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;IAoD5C,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAQrE;;OAEG;IACG,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,GAAE,mBAAwB;;;;;;;;;;;;;;;;;;;IA2FnD,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,GAAE,mBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAoD9F;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM;IAKvB,OAAO,CAAC,eAAe;CAexB"}
|
|
@@ -4,7 +4,7 @@ import path from 'node:path';
|
|
|
4
4
|
import { prisma } from '../utils/index.js';
|
|
5
5
|
import { NotFoundError, ValidationError } from '../errors.js';
|
|
6
6
|
import { execGit } from '../git/git-cli.js';
|
|
7
|
-
import { detectAndStoreProjectGitCapability, detectProjectGitCapability, ensureProjectIsMutable, getStoredProjectGitCapability, hasGitMetadata, } from './project-guards.js';
|
|
7
|
+
import { detectAndStoreProjectGitCapability, detectProjectGitCapability, ensureProjectIsMutable, getStoredProjectGitCapability, hasGitMetadata, ensureProjectSupportsWorktrees, } from './project-guards.js';
|
|
8
8
|
import { TaskStatus, SessionStatus, WorkspaceStatus, WorkspaceKind, } from '../types/index.js';
|
|
9
9
|
import { getWorkspaceBackgroundService } from '../core/container.js';
|
|
10
10
|
import { defaultWorkspaceLifecycleBarrier } from './workspace-lifecycle-barrier.js';
|
|
@@ -282,9 +282,35 @@ export class ProjectService {
|
|
|
282
282
|
throw new ValidationError(`A project with name "${input.name}" already exists`);
|
|
283
283
|
}
|
|
284
284
|
}
|
|
285
|
-
const
|
|
286
|
-
|
|
287
|
-
|
|
285
|
+
const mainBranch = input.mainBranch?.trim();
|
|
286
|
+
if (mainBranch !== undefined) {
|
|
287
|
+
await ensureProjectSupportsWorktrees(project, 'change the default base branch');
|
|
288
|
+
try {
|
|
289
|
+
if (!mainBranch)
|
|
290
|
+
throw new Error('Empty branch');
|
|
291
|
+
await execGit(project.repoPath, ['check-ref-format', `refs/heads/${mainBranch}`]);
|
|
292
|
+
await execGit(project.repoPath, ['show-ref', '--verify', '--quiet', `refs/heads/${mainBranch}`]);
|
|
293
|
+
}
|
|
294
|
+
catch {
|
|
295
|
+
throw new ValidationError('Default base branch must be an existing local branch');
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
const updated = await prisma.$transaction(async (tx) => {
|
|
299
|
+
if (mainBranch !== undefined) {
|
|
300
|
+
const current = await tx.project.findUniqueOrThrow({ where: { id } });
|
|
301
|
+
// Legacy workspaces fall back to the project default. Pin that effective
|
|
302
|
+
// target before changing the default so existing work stays on its base.
|
|
303
|
+
if (mainBranch !== current.mainBranch) {
|
|
304
|
+
await tx.workspace.updateMany({
|
|
305
|
+
where: { task: { projectId: id }, OR: [{ baseBranch: null }, { baseBranch: '' }] },
|
|
306
|
+
data: { baseBranch: current.mainBranch },
|
|
307
|
+
});
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
return tx.project.update({
|
|
311
|
+
where: { id },
|
|
312
|
+
data: { ...input, ...(mainBranch !== undefined ? { mainBranch } : {}) },
|
|
313
|
+
});
|
|
288
314
|
});
|
|
289
315
|
return this.withGitMetadata(updated);
|
|
290
316
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.service.js","sourceRoot":"","sources":["../../src/services/project.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project.service.js","sourceRoot":"","sources":["../../src/services/project.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAC1C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EACL,kCAAkC,EAClC,0BAA0B,EAC1B,sBAAsB,EACtB,6BAA6B,EAC7B,cAAc,EACd,8BAA8B,GAC/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,UAAU,EACV,aAAa,EACb,eAAe,EACf,aAAa,GACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAErE,OAAO,EAAE,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AA0DpF,KAAK,UAAU,gBAAgB,CAAC,QAAgB;IAC9C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5B,OAAO,KAAK,IAAI,IAAI,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CAAC,YAAoB;IACrD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,eAAe,CACvB,gCAAgC,YAAY,EAAE,CAC/C,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACvC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,eAAe,CACvB,oCAAoC,YAAY,EAAE,CACnD,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,YAAoB;IACxD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,eAAe,CACvB,0DAA0D,YAAY,EAAE,CACzE,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,mBAAmB,CAAC,QAAgB;IACjD,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7D,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,QAAQ,EAAE;gBACtB,IAAI;gBACJ,uBAAuB;gBACvB,IAAI;gBACJ,8BAA8B;gBAC9B,QAAQ;gBACR,eAAe;gBACf,eAAe;gBACf,IAAI;gBACJ,uBAAuB;aACxB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7D,MAAM,IAAI,eAAe,CACvB,wDAAwD,GAAG,EAAE,CAC9D,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,QAAgB;IACvD,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAClC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,QAAgB;IAC/C,MAAM,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AACrG,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,QAAgB;IAIhD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5C,yBAAyB,CAAC,YAAY,CAAC,CAAC;IAExC,OAAO;QACL,YAAY;QACZ,aAAa,EAAE,MAAM,gBAAgB,CAAC,YAAY,CAAC;KACpD,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,QAAgB,EAChB,aAAsB;IAMtB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5C,yBAAyB,CAAC,YAAY,CAAC,CAAC;IAExC,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;gBACL,YAAY;gBACZ,aAAa,EAAE,IAAI;gBACnB,WAAW;aACZ,CAAC;QACJ,CAAC;QAED,MAAM,sBAAsB,CAAC,YAAY,CAAC,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,yBAAyB,CAAC,YAAY,CAAC,CAAC;YAC9C,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,iBAAiB,CAAC,YAAY,CAAC,CAAC;YACtC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,MAAM,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IAED,OAAO;QACL,YAAY;QACZ,aAAa,EAAE,MAAM,gBAAgB,CAAC,YAAY,CAAC;QACnD,WAAW;KACZ,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,QAAgB;IACrD,IAAI,CAAC;QACH,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CAChC,eAAmE,EACnE,QAAgE;IAEhE,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC1D,IAAI,gBAAgB,IAAI,YAAY,IAAI,gBAAgB,KAAK,YAAY,EAAE,CAAC;QAC1E,QAAQ,CAAC,IAAI,CACX,qCAAqC,gBAAgB,SAAS,YAAY,IAAI,CAC/E,CAAC;IACJ,CAAC;IAED,IAAI,eAAe,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC5D,IAAI,eAAe,CAAC,aAAa,KAAK,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC7D,QAAQ,CAAC,IAAI,CACX,uFAAuF,CACxF,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,IAAI,eAAe,CAAC,aAAa,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;QACpE,QAAQ,CAAC,IAAI,CACX,gIAAgI,CACjI,CAAC;IACJ,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,OAAO,cAAc;IAEN;IADnB,YACmB,oBAA6E,6BAA6B,EAAE;QAA5G,sBAAiB,GAAjB,iBAAiB,CAA2F;IAC5H,CAAC;IAEJ;;OAEG;IACH,KAAK,CAAC,OAAO,CAAC,SAA2B,EAAE;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QAChC,MAAM,KAAK,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAExE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;gBACtB,KAAK;gBACL,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;gBAC9B,IAAI;gBACJ,IAAI,EAAE,KAAK;aACZ,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC;SAChC,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC;YAC3C,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACxB,EAAE,EAAE,CAAC,WAAW,CAAC;gBACjB,KAAK,EAAE;oBACL,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACpD,SAAS,EAAE,IAAI;iBAChB;gBACD,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;aAC1B,CAAC,CAAC;QACP,MAAM,0BAA0B,GAAG,IAAI,GAAG,CACxC,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CACzE,CAAC;QAEF,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC3B,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;gBAChC,cAAc,EAAE,CACd,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,SAAS,CAChE,CAAC,WAAW,EAAE;aAChB,CAAC,CAAC;YACH,KAAK;YACL,IAAI;YACJ,KAAK;YACL,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;SACrC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ,CAAC,EAAU;QACvB,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;YAC9C,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE;SACnD,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,aAAa,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,aAAa;QACb,MAAM,SAAS,GAAc;YAC3B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;YAC3B,IAAI,EAAE,CAAC;YACP,UAAU,EAAE,CAAC;YACb,QAAQ,EAAE,CAAC;YACX,IAAI,EAAE,CAAC;SACR,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YACjC,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpB,KAAK,UAAU,CAAC,IAAI;oBAClB,SAAS,CAAC,IAAI,EAAE,CAAC;oBACjB,MAAM;gBACR,KAAK,UAAU,CAAC,WAAW;oBACzB,SAAS,CAAC,UAAU,EAAE,CAAC;oBACvB,MAAM;gBACR,KAAK,UAAU,CAAC,SAAS;oBACvB,SAAS,CAAC,QAAQ,EAAE,CAAC;oBACrB,MAAM;gBACR,KAAK,UAAU,CAAC,IAAI;oBAClB,SAAS,CAAC,IAAI,EAAE,CAAC;oBACjB,MAAM;YACV,CAAC;QACH,CAAC;QAED,OAAO,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC;IACzD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,KAAyB;QACpC,SAAS;QACT,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;YAC9C,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE;SAC5B,CAAC,CAAC;QACH,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,eAAe,CACvB,wBAAwB,KAAK,CAAC,IAAI,kBAAkB,CACrD,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,2BAA2B,CACpF,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,aAAa,IAAI,KAAK,CAC7B,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,0BAA0B,CAAC,YAAY,CAAC,CAAC;YAClE,MAAM,sBAAsB,GAAG,IAAI,IAAI,EAAE,CAAC;YAC1C,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;gBAC1C,IAAI,EAAE;oBACJ,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;oBAC9B,QAAQ,EAAE,YAAY;oBACtB,aAAa;oBACb,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,MAAM;oBACtC,SAAS,EAAE,KAAK,CAAC,SAAS;oBAC1B,WAAW,EAAE,KAAK,CAAC,WAAW;oBAC9B,aAAa,EAAE,KAAK,CAAC,aAAa;oBAClC,SAAS,EAAE,UAAU,CAAC,SAAS;oBAC/B,aAAa,EAAE,UAAU,CAAC,aAAa;oBACvC,mBAAmB,EAAE,UAAU,CAAC,MAAM;oBACtC,sBAAsB;iBACvB;aACF,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,iBAAiB,CAAC,YAAY,CAAC,CAAC;YACxC,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAyB;QAChD,UAAU;QACV,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,aAAa,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,sBAAsB,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;QAEvD,aAAa;QACb,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;gBAC9C,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE;aAC5B,CAAC,CAAC;YACH,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,IAAI,eAAe,CACvB,wBAAwB,KAAK,CAAC,IAAI,kBAAkB,CACrD,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;QAC5C,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,8BAA8B,CAAC,OAAO,EAAE,gCAAgC,CAAC,CAAC;YAChF,IAAI,CAAC;gBACH,IAAI,CAAC,UAAU;oBAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;gBACjD,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,kBAAkB,EAAE,cAAc,UAAU,EAAE,CAAC,CAAC,CAAC;gBAClF,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,UAAU,EAAE,CAAC,CAAC,CAAC;YACnG,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAI,eAAe,CAAC,sDAAsD,CAAC,CAAC;YACpF,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YACrD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBACtE,yEAAyE;gBACzE,yEAAyE;gBACzE,IAAI,UAAU,KAAK,OAAO,CAAC,UAAU,EAAE,CAAC;oBACtC,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC;wBAC5B,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,EAAE;wBAClF,IAAI,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;qBACzC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,OAAO,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;gBACvB,KAAK,EAAE,EAAE,EAAE,EAAE;gBACb,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;aACxE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,EAAU;QACnC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,aAAa,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,kCAAkC,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CAAC,EAAU,EAAE,QAA6B,EAAE;QACvD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;YAC9C,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,OAAO,EAAE;gBACP,KAAK,EAAE;oBACL,OAAO,EAAE;wBACP,UAAU,EAAE;4BACV,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;yBAC5B;qBACF;iBACF;aACF;SACF,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,aAAa,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,MAAM,IAAI,eAAe,CAAC,YAAY,OAAO,CAAC,IAAI,uBAAuB,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvE,OAAO,gCAAgC,CAAC,cAAc,CACpD,aAAa,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAC9C,KAAK,IAAI,EAAE;YACT,MAAM,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CACzD,SAAS,CAAC,QAAQ,CAAC,MAAM,CACvB,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,MAAM,KAAK,aAAa,CAAC,OAAO;gBACxC,OAAO,CAAC,MAAM,KAAK,aAAa,CAAC,OAAO,CAC3C,CACF,CAAC;YAEF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,eAAe,CACvB,YAAY,OAAO,CAAC,IAAI,sEAAsE,CAC/F,CAAC;YACJ,CAAC;YAED,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;gBACtC,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YACjE,CAAC;YAED,MAAM,kBAAkB,GAAG,aAAa;iBACrC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,KAAK,eAAe,CAAC,MAAM,CAAC;iBAClE,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAEpC,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClC,MAAM,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC;oBAChC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE;oBACzC,IAAI,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,SAAS,EAAE;iBAC5C,CAAC,CAAC;YACL,CAAC;YAED,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACrB,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,CACpC,IAAI,GAAG,CACL,aAAa;qBACV,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,KAAK,aAAa,CAAC,QAAQ,CAAC;qBACzE,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC;qBAC1C,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CACtD,CACF,CAAC;gBAEF,MAAM,OAAO,CAAC,GAAG,CACf,mBAAmB,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CACvC,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAC9D,CACF,CAAC;gBACF,MAAM,UAAU,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAExE,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC7B,MAAM,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC;wBAChC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE;wBACrE,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;qBAC3C,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;gBAC3C,KAAK,EAAE,EAAE,EAAE,EAAE;gBACb,IAAI,EAAE;oBACJ,UAAU,EAAE,IAAI,IAAI,EAAE;oBACtB,aAAa,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI;iBACpD;aACF,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU,EAAE,QAA6B,EAAE;QACvD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,aAAa,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,MAAM,IAAI,eAAe,CAAC,YAAY,OAAO,CAAC,IAAI,mBAAmB,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,MAAM,kBAAkB,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC3E,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC;QAE/E,IAAI,gBAAgB,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1C,MAAM,IAAI,eAAe,CACvB,YAAY,OAAO,CAAC,IAAI,yDAAyD,CAClF,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,gBAAgB;YAC/B,CAAC,CAAC,MAAM,kBAAkB,CAAC,KAAK,CAAC,QAAS,CAAC,IAAI,EAAE,CAAC;YAClD,CAAC,CAAC;gBACE,YAAY,EAAE,OAAO,CAAC,QAAQ;gBAC9B,aAAa,EAAE,OAAO,CAAC,aAAa;aACrC,CAAC;QAEN,MAAM,QAAQ,GAAG,yBAAyB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE9D,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YAC3C,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,IAAI,EAAE;gBACJ,QAAQ,EAAE,QAAQ,CAAC,YAAY;gBAC/B,aAAa,EAAE,QAAQ,CAAC,aAAa;gBACrC,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,IAAI;aACpB;SACF,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,kCAAkC,CAAC,QAAQ,CAAC,CAAC;QAEtE,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC;gBAC5B,GAAG,QAAQ;gBACX,SAAS,EAAE,UAAU,CAAC,SAAS;gBAC/B,aAAa,EAAE,UAAU,CAAC,aAAa;gBACvC,mBAAmB,EAAE,UAAU,CAAC,MAAM;gBACtC,sBAAsB,EAAE,UAAU,CAAC,sBAAsB;aAC1D,CAAC;YACF,QAAQ;SACT,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,EAAU;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,eAAe,CAMrB,OAAU;QAEV,MAAM,UAAU,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACvE,OAAO;YACL,GAAG,IAAI;YACP,GAAG,UAAU;SACd,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -145,6 +145,7 @@ export declare class SessionManager {
|
|
|
145
145
|
stopConversationQueue(): void;
|
|
146
146
|
/** Dispose a TeamRun-owned runtime after its invocation reaches a terminal state. */
|
|
147
147
|
disposeRuntimeSession(sessionId: string, expectedRuntimeInstanceId?: string): Promise<void>;
|
|
148
|
+
retryFailedRuntimeDisposals(limit?: number): Promise<void>;
|
|
148
149
|
retryRuntimeProcessCleanup(input: PersistedAcpProcessIdentity & {
|
|
149
150
|
sessionId: string;
|
|
150
151
|
runtimeInstanceId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/services/session-manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAA6D,MAAM,mBAAmB,CAAC;AAgBzG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAiBrE,OAAO,EAAE,WAAW,EAAwB,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE9F,OAAO,EAA8B,KAAK,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAIhH,OAAO,EAKL,KAAK,eAAe,EAMrB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,mCAAmC,CAAC;AAoH3C,UAAU,kBAAkB;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AASD,UAAU,kBAAkB;IAC1B,sEAAsE;IACtE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,cAAc;IAmDvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAGzB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IArDvC,OAAO,CAAC,mBAAmB,CAAoD;IAC/E,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,6BAA6B,CAAoC;IACzE,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,uBAAuB,CAA6B;IAC5D,OAAO,CAAC,qBAAqB,CAAoC;IACjE,4EAA4E;IAC5E,OAAO,CAAC,gBAAgB,CAAoC;IAC5D,OAAO,CAAC,oBAAoB,CAAoC;IAChE,2GAA2G;IAC3G,OAAO,CAAC,kBAAkB,CAAoC;IAC9D,OAAO,CAAC,0BAA0B,CAAiC;IACnE;;;;OAIG;IACH,OAAO,CAAC,oBAAoB,CAAoC;IAChE,OAAO,CAAC,2BAA2B,CAAyB;IAC5D,0EAA0E;IAC1E,OAAO,CAAC,yBAAyB,CAAoC;IACrE,OAAO,CAAC,gCAAgC,CAAyB;IACjE,0FAA0F;IAC1F,OAAO,CAAC,sBAAsB,CAA2C;IACzE,yFAAyF;IACzF,OAAO,CAAC,uBAAuB,CAA6B;IAC5D,+FAA+F;IAC/F,OAAO,CAAC,kBAAkB,CAA6B;IAEvD,OAAO,CAAC,iBAAiB,CAA6B;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;IACvD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IACxD,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6B;IAC/D,mFAAmF;IACnF,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAGtC;IACN,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAoD;IACpG,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA8B;IACtE,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAoC;IAC/E,yEAAyE;IACzE,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAoC;IAC7E,OAAO,CAAC,yBAAyB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8B;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAU;IACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAU;gBAGpC,QAAQ,EAAE,QAAQ,EACnC,cAAc,CAAC,EAAE,qBAAqB,EACtC,eAAe,CAAC,EAAE,eAAe,EAChB,oBAAoB,GAAE,0BAAuD;
|
|
1
|
+
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/services/session-manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAA6D,MAAM,mBAAmB,CAAC;AAgBzG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAiBrE,OAAO,EAAE,WAAW,EAAwB,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE9F,OAAO,EAA8B,KAAK,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAIhH,OAAO,EAKL,KAAK,eAAe,EAMrB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,mCAAmC,CAAC;AAoH3C,UAAU,kBAAkB;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AASD,UAAU,kBAAkB;IAC1B,sEAAsE;IACtE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,cAAc;IAmDvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAGzB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IArDvC,OAAO,CAAC,mBAAmB,CAAoD;IAC/E,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,6BAA6B,CAAoC;IACzE,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,uBAAuB,CAA6B;IAC5D,OAAO,CAAC,qBAAqB,CAAoC;IACjE,4EAA4E;IAC5E,OAAO,CAAC,gBAAgB,CAAoC;IAC5D,OAAO,CAAC,oBAAoB,CAAoC;IAChE,2GAA2G;IAC3G,OAAO,CAAC,kBAAkB,CAAoC;IAC9D,OAAO,CAAC,0BAA0B,CAAiC;IACnE;;;;OAIG;IACH,OAAO,CAAC,oBAAoB,CAAoC;IAChE,OAAO,CAAC,2BAA2B,CAAyB;IAC5D,0EAA0E;IAC1E,OAAO,CAAC,yBAAyB,CAAoC;IACrE,OAAO,CAAC,gCAAgC,CAAyB;IACjE,0FAA0F;IAC1F,OAAO,CAAC,sBAAsB,CAA2C;IACzE,yFAAyF;IACzF,OAAO,CAAC,uBAAuB,CAA6B;IAC5D,+FAA+F;IAC/F,OAAO,CAAC,kBAAkB,CAA6B;IAEvD,OAAO,CAAC,iBAAiB,CAA6B;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;IACvD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IACxD,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6B;IAC/D,mFAAmF;IACnF,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAGtC;IACN,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAoD;IACpG,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA8B;IACtE,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAoC;IAC/E,yEAAyE;IACzE,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAoC;IAC7E,OAAO,CAAC,yBAAyB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8B;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAU;IACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAU;gBAGpC,QAAQ,EAAE,QAAQ,EACnC,cAAc,CAAC,EAAE,qBAAqB,EACtC,eAAe,CAAC,EAAE,eAAe,EAChB,oBAAoB,GAAE,0BAAuD;IAiI1F,QAAQ,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAOzB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,GAAE,WAA6B,GAAG,eAAe;IAI/F;;;;OAIG;IACG,0BAA0B,CAC9B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA+D9B,4EAA4E;IACtE,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB7C,kEAAkE;IAClE,qBAAqB,IAAI,IAAI;IAI7B,qFAAqF;IAC/E,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,yBAAyB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3F,2BAA2B,CAAC,KAAK,SAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,0BAA0B,CAAC,KAAK,EAAE,2BAA2B,GAAG;QACpE,SAAS,EAAE,MAAM,CAAC;QAClB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,IAAI,CAAC;IA8CjB,sBAAsB,CACpB,iBAAiB,EAAE,MAAM,EACzB,SAAS,CAAC,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,GAChC,OAAO;YAOI,iCAAiC;IAwC/C,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,gCAAgC;IAMlC,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW9D,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/F,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,MAAkB,EAAE,UAAU,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;IAuClH,KAAK,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA2ChB,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoDrD,WAAW,CACf,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,2BAA2B,CAAC,EAAE,MAAM,EACpC,OAAO,GAAE,kBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAwI5B,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;YA0BzC,uBAAuB;IA2GrC,uCAAuC;IACvC,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI7C,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIzC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIhD;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAmBnC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAIjD,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI3D,yEAAyE;IACnE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BjC,OAAO,CAAC,qBAAqB;YAiCf,wBAAwB;YAgGxB,uBAAuB;IAUrC,OAAO,CAAC,qBAAqB;YAkBf,gBAAgB;IAkL9B,OAAO,CAAC,uBAAuB;YASjB,kBAAkB;YAmDlB,0BAA0B;YAiB1B,mCAAmC;YAqBnC,uBAAuB;YAsBvB,6BAA6B;IAsC3C,OAAO,CAAC,sBAAsB;IA8D9B,OAAO,CAAC,kBAAkB;YAkBZ,6BAA6B;YAkB7B,yBAAyB;IAwUvC,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,gCAAgC;IASxC,OAAO,CAAC,mCAAmC;IAM3C,OAAO,CAAC,gCAAgC;YAY1B,6BAA6B;YAiB7B,gCAAgC;YAgChC,8BAA8B;IA4D5C,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,6BAA6B;YAmBvB,0BAA0B;IAsCxC;;;;OAIG;YACW,iBAAiB;IAmC/B,OAAO,CAAC,uBAAuB;YAiCjB,oBAAoB;YA2BpB,8BAA8B;YAiB9B,eAAe;IAmE7B,OAAO,CAAC,+BAA+B;IAWvC,OAAO,CAAC,6BAA6B;YAUvB,0BAA0B;IAUxC,OAAO,CAAC,sBAAsB;IAqD9B,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,2BAA2B;IAenC,OAAO,CAAC,sBAAsB;IAc9B;;;;;;;OAOG;YACW,oBAAoB;IA4ClC;;OAEG;IACH,OAAO,CAAC,8BAA8B;IAUtC;;;;;;;OAOG;YACW,mBAAmB;IAwCjC;;;;OAIG;YACW,iBAAiB;IA2J/B,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,wBAAwB;IA+BhC,OAAO,CAAC,uBAAuB;IAK/B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,qBAAqB;YAOf,wBAAwB;IAItC,OAAO,CAAC,eAAe;IAwBvB,OAAO,CAAC,oBAAoB;IAwB5B,OAAO,CAAC,4BAA4B;YA2BtB,4BAA4B;IAsB1C,OAAO,CAAC,sBAAsB;IAgB9B,OAAO,CAAC,wBAAwB;YAQlB,0BAA0B;IAWxC,OAAO,CAAC,eAAe;CASxB"}
|
|
@@ -221,12 +221,13 @@ export class SessionManager {
|
|
|
221
221
|
]);
|
|
222
222
|
const processConfirmed = process?.cleanupState === 'CONFIRMED'
|
|
223
223
|
&& !this.hasRuntimeProcessOwner(runtimeInstanceId, sessionId, resolvedClaim);
|
|
224
|
-
const
|
|
225
|
-
&& launch?.runtimeLaunchState === RUNTIME_LAUNCH_STATES.SAFE_PRE_CHILD_FAILURE
|
|
224
|
+
const safelyFailedLaunch = process == null
|
|
225
|
+
&& (launch?.runtimeLaunchState === RUNTIME_LAUNCH_STATES.SAFE_PRE_CHILD_FAILURE
|
|
226
|
+
|| launch?.runtimeLaunchState === RUNTIME_LAUNCH_STATES.CLEANED_START_FAILURE)
|
|
226
227
|
&& launch.runtimeLaunchClaimCount === resolvedClaim
|
|
227
228
|
&& launch.runtimeLaunchResolvedCount === resolvedClaim;
|
|
228
229
|
if (!processConfirmed
|
|
229
|
-
&& !
|
|
230
|
+
&& !safelyFailedLaunch) {
|
|
230
231
|
throw new AgentRuntimeError('runtime_cleanup_pending', 'close', `Runtime process cleanup evidence for '${runtimeInstanceId}' is not durably confirmed`, true);
|
|
231
232
|
}
|
|
232
233
|
},
|
|
@@ -374,6 +375,9 @@ export class SessionManager {
|
|
|
374
375
|
async disposeRuntimeSession(sessionId, expectedRuntimeInstanceId) {
|
|
375
376
|
await this.runtimeCoordinator.disposeSession(sessionId, expectedRuntimeInstanceId);
|
|
376
377
|
}
|
|
378
|
+
async retryFailedRuntimeDisposals(limit = 50) {
|
|
379
|
+
await this.runtimeCoordinator.retryFailedDisposals(limit);
|
|
380
|
+
}
|
|
377
381
|
async retryRuntimeProcessCleanup(input) {
|
|
378
382
|
if (!Number.isInteger(input.launchClaimNumber) || input.launchClaimNumber <= 0) {
|
|
379
383
|
await this.quarantinePersistedRuntimeProcess(input.sessionId, input.runtimeInstanceId, 'Runtime cleanup evidence is missing launchClaimNumber; automated signalling is disabled', null);
|
|
@@ -741,7 +745,7 @@ export class SessionManager {
|
|
|
741
745
|
await runtimeDisposal;
|
|
742
746
|
if (!await this.isRuntimeCleanupConfirmed(id)) {
|
|
743
747
|
this.terminalSessions.delete(id);
|
|
744
|
-
|
|
748
|
+
throw new ServiceError('Session cleanup is still pending: runtime launch or process termination has not been confirmed.', 'RUNTIME_CLEANUP_PENDING', 409);
|
|
745
749
|
}
|
|
746
750
|
this.maybeClearTerminalState(id);
|
|
747
751
|
if (terminalStatus && !persistedTerminal) {
|
|
@@ -764,7 +768,7 @@ export class SessionManager {
|
|
|
764
768
|
// the next admission when this rejects, allowing a later retry/recovery.
|
|
765
769
|
if (!await this.isRuntimeCleanupConfirmed(id)) {
|
|
766
770
|
this.terminalSessions.delete(id);
|
|
767
|
-
|
|
771
|
+
throw new ServiceError('Session cleanup is still pending: runtime launch or process termination has not been confirmed.', 'RUNTIME_CLEANUP_PENDING', 409);
|
|
768
772
|
}
|
|
769
773
|
await this.externalSessionPersistence.get(id);
|
|
770
774
|
const msgStore = sessionMsgStoreManager.get(id);
|
|
@@ -1395,6 +1399,37 @@ export class SessionManager {
|
|
|
1395
1399
|
const launchClaimNumber = Number.isInteger(event.launchClaimNumber) && event.launchClaimNumber > 0
|
|
1396
1400
|
? event.launchClaimNumber
|
|
1397
1401
|
: null;
|
|
1402
|
+
if (event.type === 'launch_cleanup_completed') {
|
|
1403
|
+
if (launchClaimNumber == null || !event.runtimeInstanceId) {
|
|
1404
|
+
throw new ServiceError('Failed launch cleanup is missing its generation', 'RUNTIME_LAUNCH_CLAIM_MISMATCH', 409);
|
|
1405
|
+
}
|
|
1406
|
+
await prisma.$transaction(async (tx) => {
|
|
1407
|
+
const process = await tx.executionProcess.findFirst({
|
|
1408
|
+
where: { sessionId: event.towerSessionId, launchClaimNumber },
|
|
1409
|
+
select: { id: true },
|
|
1410
|
+
});
|
|
1411
|
+
if (process) {
|
|
1412
|
+
throw new ServiceError('Recorded processes require process tree cleanup evidence', 'RUNTIME_LAUNCH_CLAIM_MISMATCH', 409);
|
|
1413
|
+
}
|
|
1414
|
+
// CAS makes retries idempotent and prevents a late old generation from
|
|
1415
|
+
// resolving a newer launch. A normal process event cannot take this path.
|
|
1416
|
+
await tx.session.updateMany({
|
|
1417
|
+
where: {
|
|
1418
|
+
id: event.towerSessionId,
|
|
1419
|
+
runtimeLaunchClaimCount: launchClaimNumber,
|
|
1420
|
+
runtimeLaunchResolvedCount: launchClaimNumber - 1,
|
|
1421
|
+
runtimeLaunchState: { in: [RUNTIME_LAUNCH_STATES.CLAIMED, RUNTIME_LAUNCH_STATES.QUARANTINED] },
|
|
1422
|
+
},
|
|
1423
|
+
data: {
|
|
1424
|
+
runtimeLaunchState: RUNTIME_LAUNCH_STATES.CLEANED_START_FAILURE,
|
|
1425
|
+
runtimeLaunchResolvedCount: { increment: 1 },
|
|
1426
|
+
runtimeLaunchDiagnostic: 'Parent-owned failed launch confirmed complete process tree cleanup',
|
|
1427
|
+
runtimeLaunchNextDiagnosticAt: null,
|
|
1428
|
+
},
|
|
1429
|
+
});
|
|
1430
|
+
});
|
|
1431
|
+
return;
|
|
1432
|
+
}
|
|
1398
1433
|
if (event.type === 'started') {
|
|
1399
1434
|
let processRecord;
|
|
1400
1435
|
try {
|