agent-tower 0.5.3-beta.6 → 0.5.3-beta.8
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/app.d.ts.map +1 -1
- package/dist/app.js +13 -0
- package/dist/app.js.map +1 -1
- package/dist/cli.js +26 -3
- package/dist/cli.js.map +1 -1
- package/dist/core/container.d.ts +2 -0
- package/dist/core/container.d.ts.map +1 -1
- package/dist/core/container.js +8 -0
- package/dist/core/container.js.map +1 -1
- package/dist/executors/__tests__/base.executor.test.js +83 -10
- package/dist/executors/__tests__/base.executor.test.js.map +1 -1
- package/dist/executors/__tests__/claude-code.executor.test.d.ts +2 -0
- package/dist/executors/__tests__/claude-code.executor.test.d.ts.map +1 -0
- package/dist/executors/__tests__/claude-code.executor.test.js +72 -0
- package/dist/executors/__tests__/claude-code.executor.test.js.map +1 -0
- package/dist/executors/__tests__/providers-availability.test.d.ts +2 -0
- package/dist/executors/__tests__/providers-availability.test.d.ts.map +1 -0
- package/dist/executors/__tests__/providers-availability.test.js +92 -0
- package/dist/executors/__tests__/providers-availability.test.js.map +1 -0
- package/dist/executors/__tests__/stdin-prompt.executors.test.d.ts +2 -0
- package/dist/executors/__tests__/stdin-prompt.executors.test.d.ts.map +1 -0
- package/dist/executors/__tests__/stdin-prompt.executors.test.js +177 -0
- package/dist/executors/__tests__/stdin-prompt.executors.test.js.map +1 -0
- package/dist/executors/base.executor.d.ts.map +1 -1
- package/dist/executors/base.executor.js +131 -33
- package/dist/executors/base.executor.js.map +1 -1
- package/dist/executors/claude-code.executor.d.ts.map +1 -1
- package/dist/executors/claude-code.executor.js +22 -52
- package/dist/executors/claude-code.executor.js.map +1 -1
- package/dist/executors/codex.executor.js +4 -4
- package/dist/executors/codex.executor.js.map +1 -1
- package/dist/executors/cursor-agent.executor.d.ts.map +1 -1
- package/dist/executors/cursor-agent.executor.js +4 -6
- package/dist/executors/cursor-agent.executor.js.map +1 -1
- package/dist/executors/gemini-cli.executor.d.ts.map +1 -1
- package/dist/executors/gemini-cli.executor.js +9 -8
- package/dist/executors/gemini-cli.executor.js.map +1 -1
- package/dist/executors/image-utils.d.ts.map +1 -1
- package/dist/executors/image-utils.js +4 -22
- package/dist/executors/image-utils.js.map +1 -1
- package/dist/index.js +37 -2
- package/dist/index.js.map +1 -1
- package/dist/middleware/__tests__/agent-cli-local-only.test.d.ts +2 -0
- package/dist/middleware/__tests__/agent-cli-local-only.test.d.ts.map +1 -0
- package/dist/middleware/__tests__/agent-cli-local-only.test.js +119 -0
- package/dist/middleware/__tests__/agent-cli-local-only.test.js.map +1 -0
- package/dist/middleware/agent-cli-local-only.d.ts +5 -0
- package/dist/middleware/agent-cli-local-only.d.ts.map +1 -0
- package/dist/middleware/agent-cli-local-only.js +80 -0
- package/dist/middleware/agent-cli-local-only.js.map +1 -0
- package/dist/pipeline/agent-pipeline.d.ts.map +1 -1
- package/dist/pipeline/agent-pipeline.js +27 -2
- package/dist/pipeline/agent-pipeline.js.map +1 -1
- package/dist/routes/__tests__/agent-cli-environment.test.d.ts +2 -0
- package/dist/routes/__tests__/agent-cli-environment.test.d.ts.map +1 -0
- package/dist/routes/__tests__/agent-cli-environment.test.js +139 -0
- package/dist/routes/__tests__/agent-cli-environment.test.js.map +1 -0
- package/dist/routes/agent-cli-environment.d.ts +3 -0
- package/dist/routes/agent-cli-environment.d.ts.map +1 -0
- package/dist/routes/agent-cli-environment.js +92 -0
- package/dist/routes/agent-cli-environment.js.map +1 -0
- package/dist/routes/index.d.ts.map +1 -1
- package/dist/routes/index.js +3 -0
- package/dist/routes/index.js.map +1 -1
- package/dist/services/__tests__/conversation.service.test.js +63 -0
- package/dist/services/__tests__/conversation.service.test.js.map +1 -1
- package/dist/services/__tests__/team-reconciler.service.test.js +2 -2
- package/dist/services/__tests__/team-reconciler.service.test.js.map +1 -1
- package/dist/services/__tests__/team-run.service.test.js +17 -16
- package/dist/services/__tests__/team-run.service.test.js.map +1 -1
- package/dist/services/agent-cli/__tests__/detection.test.d.ts +2 -0
- package/dist/services/agent-cli/__tests__/detection.test.d.ts.map +1 -0
- package/dist/services/agent-cli/__tests__/detection.test.js +77 -0
- package/dist/services/agent-cli/__tests__/detection.test.js.map +1 -0
- package/dist/services/agent-cli/__tests__/environment-task-manager.test.d.ts +2 -0
- package/dist/services/agent-cli/__tests__/environment-task-manager.test.d.ts.map +1 -0
- package/dist/services/agent-cli/__tests__/environment-task-manager.test.js +228 -0
- package/dist/services/agent-cli/__tests__/environment-task-manager.test.js.map +1 -0
- package/dist/services/agent-cli/__tests__/manifest-downloader.test.d.ts +2 -0
- package/dist/services/agent-cli/__tests__/manifest-downloader.test.d.ts.map +1 -0
- package/dist/services/agent-cli/__tests__/manifest-downloader.test.js +127 -0
- package/dist/services/agent-cli/__tests__/manifest-downloader.test.js.map +1 -0
- package/dist/services/agent-cli/detection.d.ts +27 -0
- package/dist/services/agent-cli/detection.d.ts.map +1 -0
- package/dist/services/agent-cli/detection.js +144 -0
- package/dist/services/agent-cli/detection.js.map +1 -0
- package/dist/services/agent-cli/downloader.d.ts +24 -0
- package/dist/services/agent-cli/downloader.d.ts.map +1 -0
- package/dist/services/agent-cli/downloader.js +152 -0
- package/dist/services/agent-cli/downloader.js.map +1 -0
- package/dist/services/agent-cli/environment.service.d.ts +35 -0
- package/dist/services/agent-cli/environment.service.d.ts.map +1 -0
- package/dist/services/agent-cli/environment.service.js +127 -0
- package/dist/services/agent-cli/environment.service.js.map +1 -0
- package/dist/services/agent-cli/manifest-validator.d.ts +4 -0
- package/dist/services/agent-cli/manifest-validator.d.ts.map +1 -0
- package/dist/services/agent-cli/manifest-validator.js +56 -0
- package/dist/services/agent-cli/manifest-validator.js.map +1 -0
- package/dist/services/agent-cli/manifest.d.ts +6 -0
- package/dist/services/agent-cli/manifest.d.ts.map +1 -0
- package/dist/services/agent-cli/manifest.js +180 -0
- package/dist/services/agent-cli/manifest.js.map +1 -0
- package/dist/services/agent-cli/security.d.ts +28 -0
- package/dist/services/agent-cli/security.d.ts.map +1 -0
- package/dist/services/agent-cli/security.js +148 -0
- package/dist/services/agent-cli/security.js.map +1 -0
- package/dist/services/agent-cli/task-manager.d.ts +39 -0
- package/dist/services/agent-cli/task-manager.d.ts.map +1 -0
- package/dist/services/agent-cli/task-manager.js +228 -0
- package/dist/services/agent-cli/task-manager.js.map +1 -0
- package/dist/services/conversation.service.d.ts.map +1 -1
- package/dist/services/conversation.service.js +17 -1
- package/dist/services/conversation.service.js.map +1 -1
- package/dist/services/mcp-config.service.js +1 -1
- package/dist/services/mcp-config.service.js.map +1 -1
- package/dist/services/mcp-config.service.test.js +19 -3
- package/dist/services/mcp-config.service.test.js.map +1 -1
- package/dist/services/session-manager.d.ts +9 -8
- package/dist/services/session-manager.d.ts.map +1 -1
- package/dist/services/session-manager.js +129 -16
- package/dist/services/session-manager.js.map +1 -1
- package/dist/services/task.service.d.ts +2 -2
- package/dist/services/team-run.service.d.ts.map +1 -1
- package/dist/services/team-run.service.js +4 -7
- package/dist/services/team-run.service.js.map +1 -1
- package/dist/services/terminal-manager.d.ts.map +1 -1
- package/dist/services/terminal-manager.js +39 -7
- package/dist/services/terminal-manager.js.map +1 -1
- package/dist/services/workspace.service.d.ts +7 -7
- package/dist/utils/error-log.d.ts +20 -0
- package/dist/utils/error-log.d.ts.map +1 -0
- package/dist/utils/error-log.js +176 -0
- package/dist/utils/error-log.js.map +1 -0
- package/dist/utils/error-log.test.d.ts +2 -0
- package/dist/utils/error-log.test.d.ts.map +1 -0
- package/dist/utils/error-log.test.js +233 -0
- package/dist/utils/error-log.test.js.map +1 -0
- package/dist/utils/prisma-cli-env.d.ts +3 -0
- package/dist/utils/prisma-cli-env.d.ts.map +1 -0
- package/dist/utils/prisma-cli-env.js +15 -0
- package/dist/utils/prisma-cli-env.js.map +1 -0
- package/dist/utils/prisma-cli-env.test.d.ts +2 -0
- package/dist/utils/prisma-cli-env.test.d.ts.map +1 -0
- package/dist/utils/prisma-cli-env.test.js +34 -0
- package/dist/utils/prisma-cli-env.test.js.map +1 -0
- package/dist/utils/process-launch.d.ts +4 -0
- package/dist/utils/process-launch.d.ts.map +1 -1
- package/dist/utils/process-launch.js +106 -16
- package/dist/utils/process-launch.js.map +1 -1
- package/dist/utils/process-launch.test.js +138 -3
- package/dist/utils/process-launch.test.js.map +1 -1
- package/dist/web/assets/{AgentDemoPage-BqUFGORQ.js → AgentDemoPage-gztcIidI.js} +1 -1
- package/dist/web/assets/AgentEnvironmentSettingsPage-CPNttAOj.js +1 -0
- package/dist/web/assets/AgentLogo-Bqjt1u2k.js +1 -0
- package/dist/web/assets/ConversationPage-DdfPLaBU.js +3 -0
- package/dist/web/assets/CreateTaskInput-DQSvlvL0.js +1 -0
- package/dist/web/assets/{DemoPage-DohwggTK.js → DemoPage-BHRQrxxs.js} +3 -3
- package/dist/web/assets/{GeneralSettingsPage-BqSO35vU.js → GeneralSettingsPage-c6tWGPk7.js} +1 -1
- package/dist/web/assets/{Icons-B5Qr68Dp.js → Icons-hnXjnfjL.js} +1 -1
- package/dist/web/assets/{LoadingPreviewPage-DBVTXpq2.js → LoadingPreviewPage-D_TI4PEx.js} +1 -1
- package/dist/web/assets/McpSettingsPage-D6b7ZWOS.js +1 -0
- package/dist/web/assets/{MemberAvatar-DmWOKCwf.js → MemberAvatar-DKsedKpu.js} +1 -1
- package/dist/web/assets/NotificationSettingsPage-Cv91U2pg.js +1 -0
- package/dist/web/assets/{ProfileSettingsPage-BcUtq3sY.js → ProfileSettingsPage-K_eadHzF.js} +1 -1
- package/dist/web/assets/ProjectKanbanPage-Cw4kAimX.js +89 -0
- package/dist/web/assets/{ProjectKanbanPage-G5OQeJvU.css → ProjectKanbanPage-DcpNTP1B.css} +1 -1
- package/dist/web/assets/ProjectSettingsPage-Vw4sQoAf.js +2 -0
- package/dist/web/assets/{ProviderSettingsPage-CX8WeQ3x.js → ProviderSettingsPage-DeNiqchP.js} +13 -13
- package/dist/web/assets/{SettingsMasterDetail-BtiI8TDc.js → SettingsMasterDetail-BusgjyV7.js} +1 -1
- package/dist/web/assets/TeamSettingsPage-DIQuN3Y5.js +1 -0
- package/dist/web/assets/{arc-BP5t0cJz.js → arc-cT4PVtdQ.js} +1 -1
- package/dist/web/assets/architectureDiagram-3BPJPVTR-DYwJxluW.js +36 -0
- package/dist/web/assets/{arrow-left-CH7x-bnE.js → arrow-left-DWeEJsaX.js} +1 -1
- package/dist/web/assets/{blockDiagram-GPEHLZMM-C0obS1hu.js → blockDiagram-GPEHLZMM-CaXsST1G.js} +1 -1
- package/dist/web/assets/{c4Diagram-AAUBKEIU-DLOq2msX.js → c4Diagram-AAUBKEIU-DKqAyb1m.js} +1 -1
- package/dist/web/assets/channel--M3xJN0e.js +1 -0
- package/dist/web/assets/check-CjNklwnC.js +1 -0
- package/dist/web/assets/{chevron-down-CBY3fFTT.js → chevron-down-o4IZE_P6.js} +1 -1
- package/dist/web/assets/chevron-right-DSyyoNau.js +1 -0
- package/dist/web/assets/{chevron-up-721LBv_e.js → chevron-up-BsLA8Xot.js} +1 -1
- package/dist/web/assets/{chunk-2J33WTMH-C07Su0AF.js → chunk-2J33WTMH-DoC7k16y.js} +1 -1
- package/dist/web/assets/{chunk-4BX2VUAB-DAdn-ED3.js → chunk-4BX2VUAB-CMKi8GO_.js} +1 -1
- package/dist/web/assets/{chunk-55IACEB6-BL4-BcAX.js → chunk-55IACEB6-Lyg5IKqI.js} +1 -1
- package/dist/web/assets/{chunk-727SXJPM-BmmMDMNV.js → chunk-727SXJPM-ColYow00.js} +1 -1
- package/dist/web/assets/{chunk-AQP2D5EJ-CeLsYTvJ.js → chunk-AQP2D5EJ-CoT-4pKg.js} +1 -1
- package/dist/web/assets/{chunk-FMBD7UC4-Bs7S01MB.js → chunk-FMBD7UC4-DVIaL62f.js} +1 -1
- package/dist/web/assets/{chunk-ND2GUHAM-uqytV5JO.js → chunk-ND2GUHAM-BNuafnYz.js} +1 -1
- package/dist/web/assets/{chunk-QZHKN3VN-DGM3LKCe.js → chunk-QZHKN3VN-mqqlxbRp.js} +1 -1
- package/dist/web/assets/{circle-alert-Dkp6R_Ml.js → circle-alert-FqsC_oWX.js} +1 -1
- package/dist/web/assets/classDiagram-4FO5ZUOK-BkKX675E.js +1 -0
- package/dist/web/assets/classDiagram-v2-Q7XG4LA2-BkKX675E.js +1 -0
- package/dist/web/assets/{code-block-OCS4YCEC-C_fs5i5h.js → code-block-OCS4YCEC-BHWPqjt4.js} +1 -1
- package/dist/web/assets/confirm-dialog-BRqwAzwk.js +1 -0
- package/dist/web/assets/copy-r1RvUhIY.js +1 -0
- package/dist/web/assets/cose-bilkent-S5V4N54A-Dx6hZ-zB.js +1 -0
- package/dist/web/assets/{dagre-BM42HDAG-D0-HOAOA.js → dagre-BM42HDAG-jCqcQJ4A.js} +1 -1
- package/dist/web/assets/{diagram-2AECGRRQ-Cyt7AAOQ.js → diagram-2AECGRRQ-BFaFAwAW.js} +1 -1
- package/dist/web/assets/{diagram-5GNKFQAL-BBv9SoKB.js → diagram-5GNKFQAL-D0VOgGBN.js} +1 -1
- package/dist/web/assets/{diagram-KO2AKTUF-DV5NTHkX.js → diagram-KO2AKTUF-OkBj16PX.js} +1 -1
- package/dist/web/assets/{diagram-LMA3HP47-eNPojcJF.js → diagram-LMA3HP47-Ca28pfZT.js} +1 -1
- package/dist/web/assets/{diagram-OG6HWLK6-DYNkChUG.js → diagram-OG6HWLK6-BdQf7KOI.js} +1 -1
- package/dist/web/assets/{erDiagram-TEJ5UH35-ZXZ2vyVY.js → erDiagram-TEJ5UH35-Bf80VYE6.js} +1 -1
- package/dist/web/assets/{flowDiagram-I6XJVG4X-E8oqHUJx.js → flowDiagram-I6XJVG4X-BZWZqm_C.js} +1 -1
- package/dist/web/assets/{folder-BxT7ExMF.js → folder-C-l50KQ-.js} +1 -1
- package/dist/web/assets/folder-picker-ROPpPW7C.js +1 -0
- package/dist/web/assets/ganttDiagram-6RSMTGT7-CWf25QDV.js +292 -0
- package/dist/web/assets/{gitGraphDiagram-PVQCEYII-3dNQBESX.js → gitGraphDiagram-PVQCEYII-9cyYoW83.js} +1 -1
- package/dist/web/assets/index-3VWij2vw.js +122 -0
- package/dist/web/assets/index-C4wUDrio.css +1 -0
- package/dist/web/assets/{index-DhYpUXuu.js → index-Cask0_DN.js} +4 -4
- package/dist/web/assets/{infoDiagram-5YYISTIA-DkDDpqvX.js → infoDiagram-5YYISTIA-DWSuhoXN.js} +1 -1
- package/dist/web/assets/{input-CupQF5Np.js → input-Dyl1onpD.js} +1 -1
- package/dist/web/assets/{ishikawaDiagram-YF4QCWOH-BSm79ZFA.js → ishikawaDiagram-YF4QCWOH-BfxkZcbP.js} +1 -1
- package/dist/web/assets/{journeyDiagram-JHISSGLW-BCP6kLky.js → journeyDiagram-JHISSGLW-keJyzDNt.js} +1 -1
- package/dist/web/assets/{kanban-definition-UN3LZRKU-jzLQwKw3.js → kanban-definition-UN3LZRKU-wo8SY3VQ.js} +1 -1
- package/dist/web/assets/{layers-CCP9NEZU.js → layers-CT4P8Wt_.js} +1 -1
- package/dist/web/assets/{linear-DWq5jvYH.js → linear-DXmYF97H.js} +1 -1
- package/dist/web/assets/mermaid-NOHMQCX5-DjJdrIaK.js +123 -0
- package/dist/web/assets/{message-square-tSoG7yGO.js → message-square-B0uoScMB.js} +1 -1
- package/dist/web/assets/{mindmap-definition-RKZ34NQL-C5FxGBPQ.js → mindmap-definition-RKZ34NQL-BR1VqGMr.js} +1 -1
- package/dist/web/assets/modal-CN741Elc.js +1 -0
- package/dist/web/assets/{pencil-BOmVWDhP.js → pencil-B05Eh9uE.js} +1 -1
- package/dist/web/assets/{pieDiagram-4H26LBE5-CmWVRs82.js → pieDiagram-4H26LBE5-DmIVi6kN.js} +1 -1
- package/dist/web/assets/{quadrantDiagram-W4KKPZXB-B4s3NNDO.js → quadrantDiagram-W4KKPZXB-Bh1fx3P_.js} +1 -1
- package/dist/web/assets/{requirementDiagram-4Y6WPE33-C2KmzOV2.js → requirementDiagram-4Y6WPE33-BheNLVEb.js} +1 -1
- package/dist/web/assets/{sankeyDiagram-5OEKKPKP-CJbPnzq8.js → sankeyDiagram-5OEKKPKP-CWuQByUh.js} +1 -1
- package/dist/web/assets/select-B2NVUyiF.js +1 -0
- package/dist/web/assets/{sequenceDiagram-3UESZ5HK-BFea2ow4.js → sequenceDiagram-3UESZ5HK-Blll85Hd.js} +1 -1
- package/dist/web/assets/{stateDiagram-AJRCARHV-osdtBRSX.js → stateDiagram-AJRCARHV-C31npQBQ.js} +1 -1
- package/dist/web/assets/stateDiagram-v2-BHNVJYJU-BXcVcTJl.js +1 -0
- package/dist/web/assets/switch-BiB7Kgpg.js +1 -0
- package/dist/web/assets/{textarea-Cj61Z7ha.js → textarea-Du_ydNYw.js} +1 -1
- package/dist/web/assets/{timeline-definition-PNZ67QCA-BlXV0jf2.js → timeline-definition-PNZ67QCA-BXjt2YG8.js} +1 -1
- package/dist/web/assets/{trash-2-D2zJVeEr.js → trash-2-CWVsy23V.js} +1 -1
- package/dist/web/assets/upload-C-wK_vWU.js +1 -0
- package/dist/web/assets/{use-profiles-BSYIQUHp.js → use-profiles-DwPVupVL.js} +1 -1
- package/dist/web/assets/{use-providers-Ct5qGj1d.js → use-providers-C-PIoFvi.js} +1 -1
- package/dist/web/assets/useNormalizedLogs-CGOi3cNq.js +1 -0
- package/dist/web/assets/{vennDiagram-CIIHVFJN-CCuhn7zI.js → vennDiagram-CIIHVFJN-DKpjIApG.js} +1 -1
- package/dist/web/assets/{wardley-L42UT6IY-Xu-SY-Xt.js → wardley-L42UT6IY-DvryVGdS.js} +1 -1
- package/dist/web/assets/{wardleyDiagram-YWT4CUSO-BDVBG-Eu.js → wardleyDiagram-YWT4CUSO-CtUF9zNr.js} +1 -1
- package/dist/web/assets/{xychartDiagram-2RQKCTM6-DC5IWyMr.js → xychartDiagram-2RQKCTM6-Qx4Q-1Xq.js} +1 -1
- package/dist/web/index.html +2 -2
- package/node_modules/@agent-tower/shared/dist/types.d.ts +123 -0
- package/node_modules/@agent-tower/shared/dist/types.d.ts.map +1 -1
- package/node_modules/@prisma/client/.prisma/client/edge.js +2 -2
- package/node_modules/@prisma/client/.prisma/client/index.js +2 -2
- package/package.json +1 -1
- package/dist/web/assets/AgentLogo-O_lfAIQi.js +0 -1
- package/dist/web/assets/ConversationPage-t8BHC8qL.js +0 -3
- package/dist/web/assets/CreateTaskInput-D5aroK_o.js +0 -2
- package/dist/web/assets/McpSettingsPage-B4hjk8Q6.js +0 -1
- package/dist/web/assets/NotificationSettingsPage-DiUyq7V-.js +0 -1
- package/dist/web/assets/ProjectKanbanPage-klp2fAN1.js +0 -89
- package/dist/web/assets/ProjectSettingsPage-D2gQsbTJ.js +0 -2
- package/dist/web/assets/TeamSettingsPage-CZgtzFUH.js +0 -1
- package/dist/web/assets/architectureDiagram-3BPJPVTR-B4nGdxyB.js +0 -36
- package/dist/web/assets/channel-ByQ8jatA.js +0 -1
- package/dist/web/assets/check-EXzHBr5H.js +0 -1
- package/dist/web/assets/chevron-right-DZo7j27r.js +0 -1
- package/dist/web/assets/classDiagram-4FO5ZUOK-BTR6CDm1.js +0 -1
- package/dist/web/assets/classDiagram-v2-Q7XG4LA2-BTR6CDm1.js +0 -1
- package/dist/web/assets/confirm-dialog-IGqDL03n.js +0 -1
- package/dist/web/assets/cose-bilkent-S5V4N54A-2VABc7UM.js +0 -1
- package/dist/web/assets/folder-picker-57gIIPSi.js +0 -1
- package/dist/web/assets/ganttDiagram-6RSMTGT7-CEAjt7Nr.js +0 -292
- package/dist/web/assets/index-B2TV-FU2.js +0 -120
- package/dist/web/assets/index-D1vY2KQU.css +0 -1
- package/dist/web/assets/loader-circle-RvIxJahM.js +0 -1
- package/dist/web/assets/mermaid-NOHMQCX5-v8DEF9xx.js +0 -122
- package/dist/web/assets/modal-Dc2shjmi.js +0 -1
- package/dist/web/assets/rotate-ccw-BJfFrvl2.js +0 -1
- package/dist/web/assets/select-C_UWYFsQ.js +0 -1
- package/dist/web/assets/stateDiagram-v2-BHNVJYJU-ChsboHHf.js +0 -1
- package/dist/web/assets/switch-C6O0UllM.js +0 -1
- package/dist/web/assets/terminal-BKrr_mRJ.js +0 -1
- package/dist/web/assets/upload-Q5mYpwnh.js +0 -1
- package/dist/web/assets/useNormalizedLogs-DqPhzW9t.js +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../../../src/services/agent-cli/security.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAEnE,eAAO,MAAM,yBAAyB,QAAyE,CAAC;AAWhH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAetD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAAC,UAAU,CA6B7F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQ9F;AAED,qBAAa,qBAAqB;IAM9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAN3B,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,UAAU,CAAK;gBAGJ,UAAU,SAAO,EACjB,QAAQ,SAAa;IAGxC,IAAI,CAAC,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,uBAAuB;IAItF,YAAY,CAAC,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,uBAAuB;IAc9F,IAAI,CAAC,QAAQ,SAAI,GAAG;QAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE;IAU/F,OAAO,CAAC,IAAI;CAOb;AAED,qBAAa,4BAA4B;IACvC,OAAO,CAAC,KAAK,CAAM;IACnB,OAAO,CAAC,UAAU,CAAS;IAE3B,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE;IA2B5B,KAAK,IAAI,MAAM,EAAE;CAWlB"}
|
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
export const SENSITIVE_ENV_KEY_PATTERN = /(?:^|_)(?:API[_-]?KEY|TOKEN|SECRET|PASSWORD|CREDENTIAL|AUTH)(?:_|$)/i;
|
|
2
|
+
const REDACTION_PATTERNS = [
|
|
3
|
+
/\bBearer\s+[A-Za-z0-9._~+/=-]+/gi,
|
|
4
|
+
/\b(?:sk|sk-proj|sk-ant|xoxb|ghp|github_pat)_[A-Za-z0-9._-]{8,}\b/gi,
|
|
5
|
+
/\b(?:OPENAI_API_KEY|ANTHROPIC_API_KEY|GEMINI_API_KEY|GOOGLE_API_KEY|CURSOR_API_KEY|CLAUDE_CODE_OAUTH_TOKEN|CODEX_HOME|ANTHROPIC_AUTH_TOKEN)\s*=\s*["']?[^"'\s]+/gi,
|
|
6
|
+
/\b(?:api[_-]?key|access[_-]?token|refresh[_-]?token|auth[_-]?token|token|secret)\s*[:=]\s*["']?[A-Za-z0-9._~+/=-]{8,}/gi,
|
|
7
|
+
];
|
|
8
|
+
const STREAM_REDACTOR_CARRY_LIMIT = 512;
|
|
9
|
+
export function redactAgentCliLog(data) {
|
|
10
|
+
let redacted = data;
|
|
11
|
+
for (const pattern of REDACTION_PATTERNS) {
|
|
12
|
+
redacted = redacted.replace(pattern, (match) => {
|
|
13
|
+
const separatorIndex = Math.max(match.lastIndexOf('='), match.lastIndexOf(':'));
|
|
14
|
+
if (separatorIndex > 0) {
|
|
15
|
+
return `${match.slice(0, separatorIndex + 1)}[REDACTED]`;
|
|
16
|
+
}
|
|
17
|
+
if (/^Bearer\s+/i.test(match)) {
|
|
18
|
+
return 'Bearer [REDACTED]';
|
|
19
|
+
}
|
|
20
|
+
return '[REDACTED]';
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
return redacted;
|
|
24
|
+
}
|
|
25
|
+
export function buildCleanAgentCliEnv(env = process.env) {
|
|
26
|
+
const allowedKeys = new Set([
|
|
27
|
+
'PATH',
|
|
28
|
+
'HOME',
|
|
29
|
+
'USER',
|
|
30
|
+
'LOGNAME',
|
|
31
|
+
'SHELL',
|
|
32
|
+
'LANG',
|
|
33
|
+
'LC_ALL',
|
|
34
|
+
'TERM',
|
|
35
|
+
'SystemRoot',
|
|
36
|
+
'COMSPEC',
|
|
37
|
+
'ComSpec',
|
|
38
|
+
'PATHEXT',
|
|
39
|
+
'LOCALAPPDATA',
|
|
40
|
+
'APPDATA',
|
|
41
|
+
'USERPROFILE',
|
|
42
|
+
]);
|
|
43
|
+
const cleaned = {};
|
|
44
|
+
for (const [key, value] of Object.entries(env)) {
|
|
45
|
+
if (value === undefined)
|
|
46
|
+
continue;
|
|
47
|
+
if (!allowedKeys.has(key))
|
|
48
|
+
continue;
|
|
49
|
+
if (key.startsWith('AGENT_TOWER_'))
|
|
50
|
+
continue;
|
|
51
|
+
if (SENSITIVE_ENV_KEY_PATTERN.test(key))
|
|
52
|
+
continue;
|
|
53
|
+
cleaned[key] = value;
|
|
54
|
+
}
|
|
55
|
+
return cleaned;
|
|
56
|
+
}
|
|
57
|
+
export function parseWhitelistedVersion(output, versionPattern) {
|
|
58
|
+
const pattern = versionPattern
|
|
59
|
+
? new RegExp(versionPattern)
|
|
60
|
+
: /\d+(?:\.\d+){1,3}/;
|
|
61
|
+
const match = output.match(pattern);
|
|
62
|
+
if (!match)
|
|
63
|
+
return null;
|
|
64
|
+
const value = match[0];
|
|
65
|
+
return /^[0-9A-Za-z][0-9A-Za-z._+-]{0,63}$/.test(value) ? value : null;
|
|
66
|
+
}
|
|
67
|
+
export class AgentCliLogRingBuffer {
|
|
68
|
+
maxEntries;
|
|
69
|
+
maxBytes;
|
|
70
|
+
entries = [];
|
|
71
|
+
next = 1;
|
|
72
|
+
totalBytes = 0;
|
|
73
|
+
constructor(maxEntries = 2000, maxBytes = 256 * 1024) {
|
|
74
|
+
this.maxEntries = maxEntries;
|
|
75
|
+
this.maxBytes = maxBytes;
|
|
76
|
+
}
|
|
77
|
+
push(source, data) {
|
|
78
|
+
return this.pushRedacted(source, redactAgentCliLog(data));
|
|
79
|
+
}
|
|
80
|
+
pushRedacted(source, data) {
|
|
81
|
+
const entry = {
|
|
82
|
+
seq: this.next++,
|
|
83
|
+
timestamp: new Date().toISOString(),
|
|
84
|
+
source,
|
|
85
|
+
data,
|
|
86
|
+
};
|
|
87
|
+
this.entries.push(entry);
|
|
88
|
+
this.totalBytes += Buffer.byteLength(entry.data, 'utf8');
|
|
89
|
+
this.trim();
|
|
90
|
+
return entry;
|
|
91
|
+
}
|
|
92
|
+
list(afterSeq = 0) {
|
|
93
|
+
const entries = this.entries.filter((entry) => entry.seq > afterSeq);
|
|
94
|
+
const firstSeq = this.entries[0]?.seq ?? this.next;
|
|
95
|
+
return {
|
|
96
|
+
entries,
|
|
97
|
+
nextSeq: this.next,
|
|
98
|
+
truncated: afterSeq > 0 && afterSeq < firstSeq - 1,
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
trim() {
|
|
102
|
+
while (this.entries.length > this.maxEntries || this.totalBytes > this.maxBytes) {
|
|
103
|
+
const removed = this.entries.shift();
|
|
104
|
+
if (!removed)
|
|
105
|
+
return;
|
|
106
|
+
this.totalBytes -= Buffer.byteLength(removed.data, 'utf8');
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
export class AgentCliStreamingLogRedactor {
|
|
111
|
+
carry = '';
|
|
112
|
+
overflowed = false;
|
|
113
|
+
push(data) {
|
|
114
|
+
if (this.overflowed) {
|
|
115
|
+
const lineBreak = data.search(/\r?\n/);
|
|
116
|
+
if (lineBreak < 0)
|
|
117
|
+
return [];
|
|
118
|
+
this.overflowed = false;
|
|
119
|
+
this.carry = '';
|
|
120
|
+
const newlineLength = data[lineBreak] === '\r' && data[lineBreak + 1] === '\n' ? 2 : 1;
|
|
121
|
+
return this.push(data.slice(lineBreak + newlineLength));
|
|
122
|
+
}
|
|
123
|
+
const combined = this.carry + data;
|
|
124
|
+
const lines = combined.split(/\r?\n/);
|
|
125
|
+
const completeLines = lines.slice(0, -1);
|
|
126
|
+
this.carry = lines[lines.length - 1] ?? '';
|
|
127
|
+
const output = completeLines.map((line) => `${redactAgentCliLog(line)}\n`);
|
|
128
|
+
if (this.carry.length > STREAM_REDACTOR_CARRY_LIMIT) {
|
|
129
|
+
this.carry = '';
|
|
130
|
+
this.overflowed = true;
|
|
131
|
+
output.push('[log line exceeded redaction window; partial content withheld]\n');
|
|
132
|
+
}
|
|
133
|
+
return output;
|
|
134
|
+
}
|
|
135
|
+
flush() {
|
|
136
|
+
if (this.overflowed) {
|
|
137
|
+
this.overflowed = false;
|
|
138
|
+
this.carry = '';
|
|
139
|
+
return [];
|
|
140
|
+
}
|
|
141
|
+
if (!this.carry)
|
|
142
|
+
return [];
|
|
143
|
+
const data = redactAgentCliLog(this.carry);
|
|
144
|
+
this.carry = '';
|
|
145
|
+
return [data];
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
//# sourceMappingURL=security.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../../src/services/agent-cli/security.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import type { AgentCliCommandSpec, AgentCliInstallLogResponse, AgentCliInstallTask } from '@agent-tower/shared';
|
|
2
|
+
import { type AgentCliStoredPreview } from './downloader.js';
|
|
3
|
+
export interface AgentCliRunnerProcess {
|
|
4
|
+
pid?: number;
|
|
5
|
+
stdout?: NodeJS.ReadableStream;
|
|
6
|
+
stderr?: NodeJS.ReadableStream;
|
|
7
|
+
kill(signal?: NodeJS.Signals | number): boolean;
|
|
8
|
+
once(event: 'exit', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this;
|
|
9
|
+
once(event: 'error', listener: (error: Error) => void): this;
|
|
10
|
+
}
|
|
11
|
+
export type AgentCliRunner = (command: string, args: string[], options: {
|
|
12
|
+
env: NodeJS.ProcessEnv;
|
|
13
|
+
detached: boolean;
|
|
14
|
+
stdio: 'pipe';
|
|
15
|
+
windowsHide: true;
|
|
16
|
+
}) => AgentCliRunnerProcess;
|
|
17
|
+
export type AgentCliVerifier = (spec: AgentCliCommandSpec) => Promise<void>;
|
|
18
|
+
export declare class AgentCliInstallTaskManager {
|
|
19
|
+
private readonly runner;
|
|
20
|
+
private readonly forceKillTimeoutMs;
|
|
21
|
+
private readonly verifier;
|
|
22
|
+
private tasks;
|
|
23
|
+
private buffers;
|
|
24
|
+
private processes;
|
|
25
|
+
private previewCleanup;
|
|
26
|
+
constructor(runner?: AgentCliRunner, forceKillTimeoutMs?: number, verifier?: AgentCliVerifier);
|
|
27
|
+
createTask(preview: AgentCliStoredPreview): {
|
|
28
|
+
reused: boolean;
|
|
29
|
+
task: AgentCliInstallTask;
|
|
30
|
+
};
|
|
31
|
+
getTask(taskId: string): AgentCliInstallTask;
|
|
32
|
+
getLogs(taskId: string, afterSeq?: number): AgentCliInstallLogResponse;
|
|
33
|
+
cancel(taskId: string): AgentCliInstallTask;
|
|
34
|
+
private getRunningTask;
|
|
35
|
+
private killProcessGroup;
|
|
36
|
+
private finishTask;
|
|
37
|
+
private handleInstallerExit;
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=task-manager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-manager.d.ts","sourceRoot":"","sources":["../../../src/services/agent-cli/task-manager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,mBAAmB,EACnB,0BAA0B,EAC1B,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EAAE,KAAK,qBAAqB,EAAqB,MAAM,iBAAiB,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAA;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAA;IAC9B,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,MAAM,GAAG,OAAO,CAAA;IAC/C,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI,CAAA;IACjG,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAA;CAC7D;AAED,MAAM,MAAM,cAAc,GAAG,CAC3B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE;IACP,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;IACtB,QAAQ,EAAE,OAAO,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,IAAI,CAAA;CAClB,KACE,qBAAqB,CAAC;AAE3B,MAAM,MAAM,gBAAgB,GAAG,CAAC,IAAI,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAyC5E,qBAAa,0BAA0B;IAOnC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,KAAK,CAA0C;IACvD,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,cAAc,CAA6B;gBAGhC,MAAM,GAAE,cAA8B,EACtC,kBAAkB,SAA+B,EACjD,QAAQ,GAAE,gBAAkC;IAG/D,UAAU,CAAC,OAAO,EAAE,qBAAqB,GAAG;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,mBAAmB,CAAA;KAAE;IAwE1F,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB;IAM5C,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,0BAA0B;IAYjE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB;IAqB3C,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,UAAU;YA+BJ,mBAAmB;CA0ClC"}
|
|
@@ -0,0 +1,228 @@
|
|
|
1
|
+
import { execFile, spawn } from 'node:child_process';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
3
|
+
import { ServiceError, ValidationError } from '../../errors.js';
|
|
4
|
+
import { AgentCliLogRingBuffer, AgentCliStreamingLogRedactor, buildCleanAgentCliEnv, } from './security.js';
|
|
5
|
+
import { removePreviewFile } from './downloader.js';
|
|
6
|
+
const FINAL_STATUSES = new Set([
|
|
7
|
+
'succeeded',
|
|
8
|
+
'failed',
|
|
9
|
+
'cancelled',
|
|
10
|
+
]);
|
|
11
|
+
const CANCEL_FORCE_KILL_TIMEOUT_MS = 5000;
|
|
12
|
+
function defaultRunner(command, args, options) {
|
|
13
|
+
return spawn(command, args, options);
|
|
14
|
+
}
|
|
15
|
+
function defaultVerifier(spec) {
|
|
16
|
+
return new Promise((resolve, reject) => {
|
|
17
|
+
execFile(spec.command, [...spec.args], {
|
|
18
|
+
timeout: spec.timeoutMs,
|
|
19
|
+
maxBuffer: 256 * 1024,
|
|
20
|
+
env: buildCleanAgentCliEnv(),
|
|
21
|
+
shell: false,
|
|
22
|
+
windowsHide: true,
|
|
23
|
+
encoding: 'utf8',
|
|
24
|
+
}, (error) => {
|
|
25
|
+
if (error) {
|
|
26
|
+
reject(error);
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
resolve();
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
function publicTask(task) {
|
|
34
|
+
return { ...task };
|
|
35
|
+
}
|
|
36
|
+
export class AgentCliInstallTaskManager {
|
|
37
|
+
runner;
|
|
38
|
+
forceKillTimeoutMs;
|
|
39
|
+
verifier;
|
|
40
|
+
tasks = new Map();
|
|
41
|
+
buffers = new Map();
|
|
42
|
+
processes = new Map();
|
|
43
|
+
previewCleanup = new Map();
|
|
44
|
+
constructor(runner = defaultRunner, forceKillTimeoutMs = CANCEL_FORCE_KILL_TIMEOUT_MS, verifier = defaultVerifier) {
|
|
45
|
+
this.runner = runner;
|
|
46
|
+
this.forceKillTimeoutMs = forceKillTimeoutMs;
|
|
47
|
+
this.verifier = verifier;
|
|
48
|
+
}
|
|
49
|
+
createTask(preview) {
|
|
50
|
+
const running = this.getRunningTask();
|
|
51
|
+
if (running) {
|
|
52
|
+
void removePreviewFile(preview.tempFilePath);
|
|
53
|
+
return { reused: true, task: publicTask(running) };
|
|
54
|
+
}
|
|
55
|
+
if (new Date(preview.expiresAt).getTime() <= Date.now()) {
|
|
56
|
+
void removePreviewFile(preview.tempFilePath);
|
|
57
|
+
throw new ServiceError('Agent CLI install preview expired', 'AGENT_CLI_PREVIEW_EXPIRED', 409);
|
|
58
|
+
}
|
|
59
|
+
const id = `agent-cli-task-${randomUUID()}`;
|
|
60
|
+
const now = new Date().toISOString();
|
|
61
|
+
const task = {
|
|
62
|
+
id,
|
|
63
|
+
toolId: preview.toolId,
|
|
64
|
+
previewId: preview.id,
|
|
65
|
+
status: 'running',
|
|
66
|
+
createdAt: now,
|
|
67
|
+
startedAt: now,
|
|
68
|
+
finishedAt: null,
|
|
69
|
+
exitCode: null,
|
|
70
|
+
signal: null,
|
|
71
|
+
};
|
|
72
|
+
const buffer = new AgentCliLogRingBuffer();
|
|
73
|
+
this.tasks.set(id, task);
|
|
74
|
+
this.buffers.set(id, buffer);
|
|
75
|
+
this.previewCleanup.set(id, preview.tempFilePath);
|
|
76
|
+
buffer.push('system', `Starting ${preview.toolId} installer`);
|
|
77
|
+
const command = preview.interpreter.command;
|
|
78
|
+
const args = [...preview.interpreter.args, preview.tempFilePath, ...preview.fixedArgs];
|
|
79
|
+
const child = this.runner(command, args, {
|
|
80
|
+
env: buildCleanAgentCliEnv(),
|
|
81
|
+
detached: process.platform !== 'win32',
|
|
82
|
+
stdio: 'pipe',
|
|
83
|
+
windowsHide: true,
|
|
84
|
+
});
|
|
85
|
+
this.processes.set(id, child);
|
|
86
|
+
const stdoutRedactor = new AgentCliStreamingLogRedactor();
|
|
87
|
+
const stderrRedactor = new AgentCliStreamingLogRedactor();
|
|
88
|
+
child.stdout?.on('data', (data) => {
|
|
89
|
+
for (const chunk of stdoutRedactor.push(String(data))) {
|
|
90
|
+
buffer.pushRedacted('stdout', chunk);
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
child.stderr?.on('data', (data) => {
|
|
94
|
+
for (const chunk of stderrRedactor.push(String(data))) {
|
|
95
|
+
buffer.pushRedacted('stderr', chunk);
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
child.once('error', (error) => {
|
|
99
|
+
buffer.push('system', `Installer process failed: ${error.message}`);
|
|
100
|
+
this.finishTask(id, 1, null, 'failed', 'PROCESS_ERROR', 'Installer process failed');
|
|
101
|
+
});
|
|
102
|
+
child.once('exit', (code, signal) => {
|
|
103
|
+
for (const chunk of stdoutRedactor.flush()) {
|
|
104
|
+
buffer.pushRedacted('stdout', chunk);
|
|
105
|
+
}
|
|
106
|
+
for (const chunk of stderrRedactor.flush()) {
|
|
107
|
+
buffer.pushRedacted('stderr', chunk);
|
|
108
|
+
}
|
|
109
|
+
void this.handleInstallerExit(id, preview.verifyCommand, code, signal);
|
|
110
|
+
});
|
|
111
|
+
return { reused: false, task: publicTask(task) };
|
|
112
|
+
}
|
|
113
|
+
getTask(taskId) {
|
|
114
|
+
const task = this.tasks.get(taskId);
|
|
115
|
+
if (!task)
|
|
116
|
+
throw new ServiceError('Agent CLI install task not found', 'NOT_FOUND', 404);
|
|
117
|
+
return publicTask(task);
|
|
118
|
+
}
|
|
119
|
+
getLogs(taskId, afterSeq = 0) {
|
|
120
|
+
if (!this.tasks.has(taskId)) {
|
|
121
|
+
throw new ServiceError('Agent CLI install task not found', 'NOT_FOUND', 404);
|
|
122
|
+
}
|
|
123
|
+
const buffer = this.buffers.get(taskId);
|
|
124
|
+
if (!buffer) {
|
|
125
|
+
return { taskId, entries: [], nextSeq: afterSeq + 1, truncated: false };
|
|
126
|
+
}
|
|
127
|
+
const { entries, nextSeq, truncated } = buffer.list(afterSeq);
|
|
128
|
+
return { taskId, entries, nextSeq, truncated };
|
|
129
|
+
}
|
|
130
|
+
cancel(taskId) {
|
|
131
|
+
const task = this.tasks.get(taskId);
|
|
132
|
+
if (!task)
|
|
133
|
+
throw new ServiceError('Agent CLI install task not found', 'NOT_FOUND', 404);
|
|
134
|
+
if (FINAL_STATUSES.has(task.status))
|
|
135
|
+
return publicTask(task);
|
|
136
|
+
task.status = 'cancelling';
|
|
137
|
+
this.buffers.get(taskId)?.push('system', 'Cancelling installer task');
|
|
138
|
+
const child = this.processes.get(taskId);
|
|
139
|
+
if (child) {
|
|
140
|
+
this.killProcessGroup(child, 'SIGTERM');
|
|
141
|
+
this.killProcessGroup(child, 'SIGHUP');
|
|
142
|
+
setTimeout(() => {
|
|
143
|
+
if (this.processes.has(taskId)) {
|
|
144
|
+
this.killProcessGroup(child, 'SIGKILL');
|
|
145
|
+
}
|
|
146
|
+
}, this.forceKillTimeoutMs).unref?.();
|
|
147
|
+
}
|
|
148
|
+
return publicTask(task);
|
|
149
|
+
}
|
|
150
|
+
getRunningTask() {
|
|
151
|
+
for (const task of this.tasks.values()) {
|
|
152
|
+
if (!FINAL_STATUSES.has(task.status))
|
|
153
|
+
return task;
|
|
154
|
+
}
|
|
155
|
+
return null;
|
|
156
|
+
}
|
|
157
|
+
killProcessGroup(child, signal) {
|
|
158
|
+
if (!child.pid || process.platform === 'win32') {
|
|
159
|
+
child.kill(signal);
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
try {
|
|
163
|
+
process.kill(-child.pid, signal);
|
|
164
|
+
}
|
|
165
|
+
catch {
|
|
166
|
+
child.kill(signal);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
finishTask(taskId, code, signal, status, errorCode, errorMessage) {
|
|
170
|
+
const task = this.tasks.get(taskId);
|
|
171
|
+
if (!task || FINAL_STATUSES.has(task.status))
|
|
172
|
+
return;
|
|
173
|
+
if (!FINAL_STATUSES.has(status)) {
|
|
174
|
+
throw new ValidationError(`Invalid final Agent CLI task status: ${status}`);
|
|
175
|
+
}
|
|
176
|
+
task.status = status;
|
|
177
|
+
task.finishedAt = new Date().toISOString();
|
|
178
|
+
task.exitCode = code;
|
|
179
|
+
task.signal = signal;
|
|
180
|
+
if (errorCode)
|
|
181
|
+
task.errorCode = errorCode;
|
|
182
|
+
if (errorMessage)
|
|
183
|
+
task.errorMessage = errorMessage;
|
|
184
|
+
this.processes.delete(taskId);
|
|
185
|
+
this.buffers.get(taskId)?.push('system', `Installer task ${status}`);
|
|
186
|
+
const tempFilePath = this.previewCleanup.get(taskId);
|
|
187
|
+
if (tempFilePath) {
|
|
188
|
+
this.previewCleanup.delete(taskId);
|
|
189
|
+
void removePreviewFile(tempFilePath);
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
async handleInstallerExit(taskId, verifyCommand, code, signal) {
|
|
193
|
+
this.processes.delete(taskId);
|
|
194
|
+
const task = this.tasks.get(taskId);
|
|
195
|
+
if (!task || FINAL_STATUSES.has(task.status))
|
|
196
|
+
return;
|
|
197
|
+
if (task.status === 'cancelling') {
|
|
198
|
+
this.finishTask(taskId, code, signal, 'cancelled');
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
if (code !== 0) {
|
|
202
|
+
this.finishTask(taskId, code, signal, 'failed');
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
205
|
+
task.status = 'verifying';
|
|
206
|
+
task.exitCode = code;
|
|
207
|
+
task.signal = signal;
|
|
208
|
+
this.buffers.get(taskId)?.push('system', 'Installer exited successfully; verifying CLI availability');
|
|
209
|
+
try {
|
|
210
|
+
await this.verifier(verifyCommand);
|
|
211
|
+
if (this.tasks.get(taskId)?.status === 'cancelling') {
|
|
212
|
+
this.finishTask(taskId, code, signal, 'cancelled');
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
215
|
+
this.buffers.get(taskId)?.push('system', 'Installer verification passed');
|
|
216
|
+
this.finishTask(taskId, code, signal, 'succeeded');
|
|
217
|
+
}
|
|
218
|
+
catch {
|
|
219
|
+
if (this.tasks.get(taskId)?.status === 'cancelling') {
|
|
220
|
+
this.finishTask(taskId, code, signal, 'cancelled');
|
|
221
|
+
return;
|
|
222
|
+
}
|
|
223
|
+
this.buffers.get(taskId)?.push('system', 'Installer verification failed');
|
|
224
|
+
this.finishTask(taskId, code, signal, 'failed', 'VERIFY_FAILED', 'Installer verification failed');
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
//# sourceMappingURL=task-manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../../src/services/agent-cli/task-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.service.d.ts","sourceRoot":"","sources":["../../src/services/conversation.service.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation.service.d.ts","sourceRoot":"","sources":["../../src/services/conversation.service.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAKxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAW3D,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AA2ED,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED,wBAAgB,gCAAgC,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,SAAwB,GAAG,MAAM,CAkBzG;AAED,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAAd,cAAc,EAAE,cAAc;IAErD,IAAI,CAAC,KAAK,SAAK;IAUf,QAAQ,CAAC,EAAE,EAAE,MAAM;IAQnB,MAAM,CAAC,KAAK,EAAE,uBAAuB;IAsErC,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,4BAA4B;IAsC3D,IAAI,CAAC,EAAE,EAAE,MAAM;IAkBf,MAAM,CAAC,EAAE,EAAE,MAAM;CAkBxB"}
|
|
@@ -5,10 +5,12 @@ import { prisma } from '../utils/index.js';
|
|
|
5
5
|
import { SessionContext, SessionStatus } from '../types/index.js';
|
|
6
6
|
import { NotFoundError, ServiceError, ValidationError } from '../errors.js';
|
|
7
7
|
import { getProviderById } from '../executors/index.js';
|
|
8
|
+
import { CommandBuildError } from '../executors/command-builder.js';
|
|
8
9
|
import { resolveDataDir } from '../utils/data-dir.js';
|
|
9
10
|
import { appendAttachmentMarkdownContext } from './attachment-context.js';
|
|
10
11
|
const CONVERSATIONS_DIR = 'conversations';
|
|
11
12
|
const TITLE_MAX_LENGTH = 80;
|
|
13
|
+
const AGENT_COMMAND_UNAVAILABLE = 'AGENT_COMMAND_UNAVAILABLE';
|
|
12
14
|
function pad(value) {
|
|
13
15
|
return String(value).padStart(2, '0');
|
|
14
16
|
}
|
|
@@ -68,6 +70,9 @@ function toConversationDto(conversation) {
|
|
|
68
70
|
updatedAt: conversation.updatedAt.toISOString(),
|
|
69
71
|
};
|
|
70
72
|
}
|
|
73
|
+
function toAgentCommandUnavailableError(error) {
|
|
74
|
+
return new ServiceError(`Agent command unavailable: ${error.message}`, AGENT_COMMAND_UNAVAILABLE, 400);
|
|
75
|
+
}
|
|
71
76
|
export function getConversationRoot() {
|
|
72
77
|
return path.join(resolveDataDir(), CONVERSATIONS_DIR);
|
|
73
78
|
}
|
|
@@ -156,6 +161,9 @@ export class ConversationService {
|
|
|
156
161
|
where: { id: created.session.id },
|
|
157
162
|
data: { status: SessionStatus.FAILED },
|
|
158
163
|
}).catch(() => { });
|
|
164
|
+
if (error instanceof CommandBuildError) {
|
|
165
|
+
throw toAgentCommandUnavailableError(error);
|
|
166
|
+
}
|
|
159
167
|
throw error;
|
|
160
168
|
}
|
|
161
169
|
const refreshed = await prisma.conversation.findUniqueOrThrow({
|
|
@@ -179,7 +187,15 @@ export class ConversationService {
|
|
|
179
187
|
if (!conversation.session) {
|
|
180
188
|
throw new ServiceError('Conversation has no session', 'CONVERSATION_SESSION_MISSING', 409);
|
|
181
189
|
}
|
|
182
|
-
|
|
190
|
+
try {
|
|
191
|
+
await this.sessionManager.sendMessage(conversation.session.id, message, input.providerId);
|
|
192
|
+
}
|
|
193
|
+
catch (error) {
|
|
194
|
+
if (error instanceof CommandBuildError) {
|
|
195
|
+
throw toAgentCommandUnavailableError(error);
|
|
196
|
+
}
|
|
197
|
+
throw error;
|
|
198
|
+
}
|
|
183
199
|
const updated = await prisma.conversation.update({
|
|
184
200
|
where: { id },
|
|
185
201
|
data: { lastActiveAt: new Date() },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.service.js","sourceRoot":"","sources":["../../src/services/conversation.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAa,cAAc,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE7E,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAE1E,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAC1C,MAAM,gBAAgB,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation.service.js","sourceRoot":"","sources":["../../src/services/conversation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ export function buildMcpConfigResponse(options) {
|
|
|
29
29
|
const configEnv = {
|
|
30
30
|
AGENT_TOWER_DATA_DIR: env.AGENT_TOWER_DATA_DIR || getDefaultDataDir(),
|
|
31
31
|
};
|
|
32
|
-
if (runtimeMode === 'desktop-packaged') {
|
|
32
|
+
if (runtimeMode === 'desktop-packaged' && env.ELECTRON_RUN_AS_NODE === '1') {
|
|
33
33
|
configEnv.ELECTRON_RUN_AS_NODE = '1';
|
|
34
34
|
}
|
|
35
35
|
const args = [mcpEntry];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.service.js","sourceRoot":"","sources":["../../src/services/mcp-config.service.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,WAAW,GAAG,aAAa,CAAC;AAElC,SAAS,kBAAkB,CAAC,GAAsB;IAChD,OAAO,GAAG,CAAC,gCAAgC,KAAK,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC;AAChG,CAAC;AAED,SAAS,eAAe,CAAC,GAAsB,EAAE,WAAmB;IAClE,OAAO,GAAG,CAAC,qBAAqB,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,eAAe,CAAC,OAAe,EAAE,IAAc,EAAE,GAA2B;IACnF,MAAM,YAAY,GAAG;QACnB,OAAO;QACP,IAAI;QACJ,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChD,CAAC;IACF,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,UAAU,EAAE;YACV,CAAC,WAAW,CAAC,EAAE,YAAY;SAC5B;KACF,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACd,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAGtC;IACC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,WAAW,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,WAAW,KAAK,kBAAkB;QAChD,CAAC,CAAC,GAAG,CAAC,wBAAwB,IAAI,OAAO,CAAC,QAAQ;QAClD,CAAC,CAAC,GAAG,CAAC,wBAAwB,IAAI,OAAO,CAAC,QAAQ,CAAC;IACrD,MAAM,SAAS,GAA2B;QACxC,oBAAoB,EAAE,GAAG,CAAC,oBAAoB,IAAI,iBAAiB,EAAE;KACtE,CAAC;IAEF,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-config.service.js","sourceRoot":"","sources":["../../src/services/mcp-config.service.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,WAAW,GAAG,aAAa,CAAC;AAElC,SAAS,kBAAkB,CAAC,GAAsB;IAChD,OAAO,GAAG,CAAC,gCAAgC,KAAK,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC;AAChG,CAAC;AAED,SAAS,eAAe,CAAC,GAAsB,EAAE,WAAmB;IAClE,OAAO,GAAG,CAAC,qBAAqB,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,eAAe,CAAC,OAAe,EAAE,IAAc,EAAE,GAA2B;IACnF,MAAM,YAAY,GAAG;QACnB,OAAO;QACP,IAAI;QACJ,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChD,CAAC;IACF,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,UAAU,EAAE;YACV,CAAC,WAAW,CAAC,EAAE,YAAY;SAC5B;KACF,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACd,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAGtC;IACC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,WAAW,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,WAAW,KAAK,kBAAkB;QAChD,CAAC,CAAC,GAAG,CAAC,wBAAwB,IAAI,OAAO,CAAC,QAAQ;QAClD,CAAC,CAAC,GAAG,CAAC,wBAAwB,IAAI,OAAO,CAAC,QAAQ,CAAC;IACrD,MAAM,SAAS,GAA2B;QACxC,oBAAoB,EAAE,GAAG,CAAC,oBAAoB,IAAI,iBAAiB,EAAE;KACtE,CAAC;IAEF,IAAI,WAAW,KAAK,kBAAkB,IAAI,GAAG,CAAC,oBAAoB,KAAK,GAAG,EAAE,CAAC;QAC3E,SAAS,CAAC,oBAAoB,GAAG,GAAG,CAAC;IACvC,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACxB,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAE7D,OAAO;QACL,UAAU,EAAE,WAAW;QACvB,WAAW;QACX,OAAO;QACP,IAAI;QACJ,GAAG,EAAE,SAAS;QACd,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAgC;QAC7D,UAAU;KACX,CAAC;AACJ,CAAC"}
|
|
@@ -7,21 +7,37 @@ describe('mcp-config service', () => {
|
|
|
7
7
|
serverDistDir: '/app/Resources/runtime/server/dist',
|
|
8
8
|
env: {
|
|
9
9
|
AGENT_TOWER_DESKTOP_RUNTIME_MODE: 'packaged',
|
|
10
|
-
AGENT_TOWER_NODE_RUNTIME: '
|
|
10
|
+
AGENT_TOWER_NODE_RUNTIME: 'C:\\Program Files\\Agent Tower\\resources\\runtime\\node\\node.exe',
|
|
11
11
|
AGENT_TOWER_MCP_ENTRY: '/app/Resources/runtime/server/dist/mcp/index.js',
|
|
12
12
|
AGENT_TOWER_DATA_DIR: '/Users/test/.agent-tower',
|
|
13
13
|
},
|
|
14
14
|
});
|
|
15
15
|
expect(config.runtimeMode).toBe('desktop-packaged');
|
|
16
|
-
expect(config.command).toBe('
|
|
16
|
+
expect(config.command).toBe('C:\\Program Files\\Agent Tower\\resources\\runtime\\node\\node.exe');
|
|
17
17
|
expect(config.args).toEqual(['/app/Resources/runtime/server/dist/mcp/index.js']);
|
|
18
18
|
expect(config.env).toEqual({
|
|
19
19
|
AGENT_TOWER_DATA_DIR: '/Users/test/.agent-tower',
|
|
20
|
-
ELECTRON_RUN_AS_NODE: '1',
|
|
21
20
|
});
|
|
22
21
|
expect(config.configJson).toContain('/app/Resources/runtime/server/dist/mcp/index.js');
|
|
23
22
|
expect(config.configJson).not.toContain('agent-tower-mcp');
|
|
24
23
|
});
|
|
24
|
+
it('keeps Electron node-mode env only for packaged fallback config', () => {
|
|
25
|
+
const config = buildMcpConfigResponse({
|
|
26
|
+
serverDistDir: '/app/Resources/runtime/server/dist',
|
|
27
|
+
env: {
|
|
28
|
+
AGENT_TOWER_DESKTOP_RUNTIME_MODE: 'packaged',
|
|
29
|
+
AGENT_TOWER_NODE_RUNTIME: '/app/Contents/MacOS/Agent Tower',
|
|
30
|
+
AGENT_TOWER_MCP_ENTRY: '/app/Resources/runtime/server/dist/mcp/index.js',
|
|
31
|
+
AGENT_TOWER_DATA_DIR: '/Users/test/.agent-tower',
|
|
32
|
+
ELECTRON_RUN_AS_NODE: '1',
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
expect(config.command).toBe('/app/Contents/MacOS/Agent Tower');
|
|
36
|
+
expect(config.env).toEqual({
|
|
37
|
+
AGENT_TOWER_DATA_DIR: '/Users/test/.agent-tower',
|
|
38
|
+
ELECTRON_RUN_AS_NODE: '1',
|
|
39
|
+
});
|
|
40
|
+
});
|
|
25
41
|
it('builds workspace config without global agent-tower-mcp command', () => {
|
|
26
42
|
const serverDistDir = path.resolve('/repo/packages/server/dist');
|
|
27
43
|
const config = buildMcpConfigResponse({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.service.test.js","sourceRoot":"","sources":["../../src/services/mcp-config.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAEhE,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,MAAM,GAAG,sBAAsB,CAAC;YACpC,aAAa,EAAE,oCAAoC;YACnD,GAAG,EAAE;gBACH,gCAAgC,EAAE,UAAU;gBAC5C,wBAAwB,EAAE
|
|
1
|
+
{"version":3,"file":"mcp-config.service.test.js","sourceRoot":"","sources":["../../src/services/mcp-config.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAEhE,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,MAAM,GAAG,sBAAsB,CAAC;YACpC,aAAa,EAAE,oCAAoC;YACnD,GAAG,EAAE;gBACH,gCAAgC,EAAE,UAAU;gBAC5C,wBAAwB,EAAE,oEAAoE;gBAC9F,qBAAqB,EAAE,iDAAiD;gBACxE,oBAAoB,EAAE,0BAA0B;aAC5B;SACvB,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;QACnD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAA;QACjG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,iDAAiD,CAAC,CAAC,CAAA;QAChF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;YACzB,oBAAoB,EAAE,0BAA0B;SACjD,CAAC,CAAA;QACF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,iDAAiD,CAAC,CAAA;QACtF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;IAC5D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,MAAM,GAAG,sBAAsB,CAAC;YACpC,aAAa,EAAE,oCAAoC;YACnD,GAAG,EAAE;gBACH,gCAAgC,EAAE,UAAU;gBAC5C,wBAAwB,EAAE,iCAAiC;gBAC3D,qBAAqB,EAAE,iDAAiD;gBACxE,oBAAoB,EAAE,0BAA0B;gBAChD,oBAAoB,EAAE,GAAG;aACL;SACvB,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;QAC9D,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;YACzB,oBAAoB,EAAE,0BAA0B;YAChD,oBAAoB,EAAE,GAAG;SAC1B,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAA;QAChE,MAAM,MAAM,GAAG,sBAAsB,CAAC;YACpC,aAAa;YACb,GAAG,EAAE;gBACH,oBAAoB,EAAE,mCAAmC;aACrC;SACvB,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC5C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,CAAA;QACvE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;YACzB,oBAAoB,EAAE,mCAAmC;SAC1D,CAAC,CAAA;QACF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;IAC5D,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|