@structured-world/gitlab-mcp 10.1.0 → 12.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (387) hide show
  1. package/README.md +8 -8
  2. package/README.md.in +2 -2
  3. package/dist/src/accounts/chat-accounts.d.ts +17 -0
  4. package/dist/src/accounts/chat-accounts.js +245 -0
  5. package/dist/src/accounts/chat-accounts.js.map +1 -0
  6. package/dist/src/accounts/instance-tokens.d.ts +2 -0
  7. package/dist/src/accounts/instance-tokens.js +43 -0
  8. package/dist/src/accounts/instance-tokens.js.map +1 -0
  9. package/dist/src/accounts/link.d.ts +16 -0
  10. package/dist/src/accounts/link.js +469 -0
  11. package/dist/src/accounts/link.js.map +1 -0
  12. package/dist/src/accounts/token-account.d.ts +6 -0
  13. package/dist/src/accounts/token-account.js +13 -0
  14. package/dist/src/accounts/token-account.js.map +1 -0
  15. package/dist/src/channel-gateway/format.js +7 -1
  16. package/dist/src/channel-gateway/format.js.map +1 -1
  17. package/dist/src/channel-gateway/forwarding.d.ts +3 -0
  18. package/dist/src/channel-gateway/forwarding.js +8 -1
  19. package/dist/src/channel-gateway/forwarding.js.map +1 -1
  20. package/dist/src/channel-gateway/gateway.d.ts +7 -0
  21. package/dist/src/channel-gateway/gateway.js +80 -16
  22. package/dist/src/channel-gateway/gateway.js.map +1 -1
  23. package/dist/src/cli/docker/container-runtime.d.ts +1 -0
  24. package/dist/src/cli/docker/container-runtime.js +37 -5
  25. package/dist/src/cli/docker/container-runtime.js.map +1 -1
  26. package/dist/src/cli/docker/docker-command.js +11 -2
  27. package/dist/src/cli/docker/docker-command.js.map +1 -1
  28. package/dist/src/cli/docker/docker-utils.d.ts +1 -0
  29. package/dist/src/cli/docker/docker-utils.js +137 -27
  30. package/dist/src/cli/docker/docker-utils.js.map +1 -1
  31. package/dist/src/cli/docker/oauth-issuer-prompt.d.ts +2 -0
  32. package/dist/src/cli/docker/oauth-issuer-prompt.js +47 -0
  33. package/dist/src/cli/docker/oauth-issuer-prompt.js.map +1 -0
  34. package/dist/src/cli/docker/types.d.ts +18 -4
  35. package/dist/src/cli/docker/types.js.map +1 -1
  36. package/dist/src/cli/init/config-generator.d.ts +3 -2
  37. package/dist/src/cli/init/config-generator.js +15 -0
  38. package/dist/src/cli/init/config-generator.js.map +1 -1
  39. package/dist/src/cli/init/types.d.ts +7 -2
  40. package/dist/src/cli/init/types.js +9 -0
  41. package/dist/src/cli/init/types.js.map +1 -1
  42. package/dist/src/cli/init/wizard.js +31 -1
  43. package/dist/src/cli/init/wizard.js.map +1 -1
  44. package/dist/src/cli/install/codex.d.ts +25 -0
  45. package/dist/src/cli/install/codex.js +261 -0
  46. package/dist/src/cli/install/codex.js.map +1 -0
  47. package/dist/src/cli/install/detector.js +22 -0
  48. package/dist/src/cli/install/detector.js.map +1 -1
  49. package/dist/src/cli/install/index.d.ts +2 -1
  50. package/dist/src/cli/install/index.js +3 -1
  51. package/dist/src/cli/install/index.js.map +1 -1
  52. package/dist/src/cli/install/install-command.d.ts +5 -2
  53. package/dist/src/cli/install/install-command.js +52 -8
  54. package/dist/src/cli/install/install-command.js.map +1 -1
  55. package/dist/src/cli/install/installers.d.ts +8 -8
  56. package/dist/src/cli/install/installers.js +18 -3
  57. package/dist/src/cli/install/installers.js.map +1 -1
  58. package/dist/src/cli/install/notes.d.ts +2 -0
  59. package/dist/src/cli/install/notes.js +8 -0
  60. package/dist/src/cli/install/notes.js.map +1 -0
  61. package/dist/src/cli/install/types.d.ts +1 -0
  62. package/dist/src/cli/install/types.js +12 -0
  63. package/dist/src/cli/install/types.js.map +1 -1
  64. package/dist/src/cli/list-tools.js +14 -35
  65. package/dist/src/cli/list-tools.js.map +1 -1
  66. package/dist/src/cli/plugin/build.d.ts +23 -0
  67. package/dist/src/cli/plugin/build.js +165 -0
  68. package/dist/src/cli/plugin/build.js.map +1 -0
  69. package/dist/src/cli/plugin/command.d.ts +4 -0
  70. package/dist/src/cli/plugin/command.js +89 -0
  71. package/dist/src/cli/plugin/command.js.map +1 -0
  72. package/dist/src/cli/plugin/index.d.ts +5 -0
  73. package/dist/src/cli/plugin/index.js +15 -0
  74. package/dist/src/cli/plugin/index.js.map +1 -0
  75. package/dist/src/cli/plugin/listing.d.ts +21 -0
  76. package/dist/src/cli/plugin/listing.js +44 -0
  77. package/dist/src/cli/plugin/listing.js.map +1 -0
  78. package/dist/src/cli/plugin/validate.d.ts +21 -0
  79. package/dist/src/cli/plugin/validate.js +496 -0
  80. package/dist/src/cli/plugin/validate.js.map +1 -0
  81. package/dist/src/cli/plugin/zip.d.ts +6 -0
  82. package/dist/src/cli/plugin/zip.js +83 -0
  83. package/dist/src/cli/plugin/zip.js.map +1 -0
  84. package/dist/src/cli/setup/flows/configure-existing.js +5 -0
  85. package/dist/src/cli/setup/flows/configure-existing.js.map +1 -1
  86. package/dist/src/cli/setup/flows/local-setup.js +3 -0
  87. package/dist/src/cli/setup/flows/local-setup.js.map +1 -1
  88. package/dist/src/cli/setup/flows/server-setup.js +15 -0
  89. package/dist/src/cli/setup/flows/server-setup.js.map +1 -1
  90. package/dist/src/cli-utils.d.ts +2 -0
  91. package/dist/src/cli-utils.js +6 -0
  92. package/dist/src/cli-utils.js.map +1 -1
  93. package/dist/src/config/instances-loader.js +17 -3
  94. package/dist/src/config/instances-loader.js.map +1 -1
  95. package/dist/src/config/instances-schema.d.ts +8 -3
  96. package/dist/src/config/instances-schema.js +12 -6
  97. package/dist/src/config/instances-schema.js.map +1 -1
  98. package/dist/src/config.js.map +1 -1
  99. package/dist/src/configuration/caller.d.ts +10 -0
  100. package/dist/src/configuration/caller.js +39 -0
  101. package/dist/src/configuration/caller.js.map +1 -0
  102. package/dist/src/configuration/composed-feeds.d.ts +31 -0
  103. package/dist/src/configuration/composed-feeds.js +698 -0
  104. package/dist/src/configuration/composed-feeds.js.map +1 -0
  105. package/dist/src/configuration/composed-listings.d.ts +14 -0
  106. package/dist/src/configuration/composed-listings.js +157 -0
  107. package/dist/src/configuration/composed-listings.js.map +1 -0
  108. package/dist/src/configuration/groups.d.ts +8 -0
  109. package/dist/src/configuration/groups.js +39 -0
  110. package/dist/src/configuration/groups.js.map +1 -0
  111. package/dist/src/configuration/index.d.ts +6 -0
  112. package/dist/src/configuration/index.js +87 -0
  113. package/dist/src/configuration/index.js.map +1 -0
  114. package/dist/src/configuration/policy.d.ts +34 -0
  115. package/dist/src/configuration/policy.js +122 -0
  116. package/dist/src/configuration/policy.js.map +1 -0
  117. package/dist/src/configuration/scope-ids.d.ts +7 -0
  118. package/dist/src/configuration/scope-ids.js +78 -0
  119. package/dist/src/configuration/scope-ids.js.map +1 -0
  120. package/dist/src/configuration/scope-projects.d.ts +5 -0
  121. package/dist/src/configuration/scope-projects.js +76 -0
  122. package/dist/src/configuration/scope-projects.js.map +1 -0
  123. package/dist/src/configuration/scope-targets.d.ts +26 -0
  124. package/dist/src/configuration/scope-targets.js +307 -0
  125. package/dist/src/configuration/scope-targets.js.map +1 -0
  126. package/dist/src/configuration/scoped-execution.d.ts +6 -0
  127. package/dist/src/configuration/scoped-execution.js +577 -0
  128. package/dist/src/configuration/scoped-execution.js.map +1 -0
  129. package/dist/src/configuration/scoped-feeds.d.ts +22 -0
  130. package/dist/src/configuration/scoped-feeds.js +136 -0
  131. package/dist/src/configuration/scoped-feeds.js.map +1 -0
  132. package/dist/src/configuration/service.d.ts +52 -0
  133. package/dist/src/configuration/service.js +169 -0
  134. package/dist/src/configuration/service.js.map +1 -0
  135. package/dist/src/configuration/settings-store.d.ts +20 -0
  136. package/dist/src/configuration/settings-store.js +228 -0
  137. package/dist/src/configuration/settings-store.js.map +1 -0
  138. package/dist/src/configuration/types.d.ts +30 -0
  139. package/dist/src/configuration/types.js +20 -0
  140. package/dist/src/configuration/types.js.map +1 -0
  141. package/dist/src/contracts/storage.d.ts +3 -2
  142. package/dist/src/dashboard/html-template.js +8 -15
  143. package/dist/src/dashboard/html-template.js.map +1 -1
  144. package/dist/src/dashboard/metrics.d.ts +1 -1
  145. package/dist/src/entities/context/accounts.d.ts +19 -0
  146. package/dist/src/entities/context/accounts.js +115 -0
  147. package/dist/src/entities/context/accounts.js.map +1 -0
  148. package/dist/src/entities/context/connection-check.d.ts +64 -0
  149. package/dist/src/entities/context/connection-check.js +117 -0
  150. package/dist/src/entities/context/connection-check.js.map +1 -0
  151. package/dist/src/entities/context/context-manager.d.ts +10 -23
  152. package/dist/src/entities/context/context-manager.js +101 -282
  153. package/dist/src/entities/context/context-manager.js.map +1 -1
  154. package/dist/src/entities/context/handlers.d.ts +5 -5
  155. package/dist/src/entities/context/handlers.js +11 -14
  156. package/dist/src/entities/context/handlers.js.map +1 -1
  157. package/dist/src/entities/context/output-schema.d.ts +320 -0
  158. package/dist/src/entities/context/output-schema.js +210 -0
  159. package/dist/src/entities/context/output-schema.js.map +1 -0
  160. package/dist/src/entities/context/profile.d.ts +29 -0
  161. package/dist/src/entities/context/profile.js +72 -0
  162. package/dist/src/entities/context/profile.js.map +1 -0
  163. package/dist/src/entities/context/registry.js +140 -3
  164. package/dist/src/entities/context/registry.js.map +1 -1
  165. package/dist/src/entities/context/schema.d.ts +32 -14
  166. package/dist/src/entities/context/schema.js +36 -13
  167. package/dist/src/entities/context/schema.js.map +1 -1
  168. package/dist/src/entities/context/scope-search.d.ts +49 -0
  169. package/dist/src/entities/context/scope-search.js +71 -0
  170. package/dist/src/entities/context/scope-search.js.map +1 -0
  171. package/dist/src/entities/context/settings-panel.d.ts +13 -0
  172. package/dist/src/entities/context/settings-panel.js +508 -0
  173. package/dist/src/entities/context/settings-panel.js.map +1 -0
  174. package/dist/src/entities/context/settings.d.ts +78 -0
  175. package/dist/src/entities/context/settings.js +239 -0
  176. package/dist/src/entities/context/settings.js.map +1 -0
  177. package/dist/src/entities/context/types.d.ts +3 -4
  178. package/dist/src/entities/context/whoami.js +39 -31
  179. package/dist/src/entities/context/whoami.js.map +1 -1
  180. package/dist/src/entities/core/registry.js +34 -33
  181. package/dist/src/entities/core/registry.js.map +1 -1
  182. package/dist/src/entities/core/schema-readonly.d.ts +4 -4
  183. package/dist/src/entities/environments/schema-readonly.d.ts +4 -4
  184. package/dist/src/entities/files/registry.js +3 -2
  185. package/dist/src/entities/files/registry.js.map +1 -1
  186. package/dist/src/entities/iterations/registry.js +3 -2
  187. package/dist/src/entities/iterations/registry.js.map +1 -1
  188. package/dist/src/entities/mrs/registry.js +6 -4
  189. package/dist/src/entities/mrs/registry.js.map +1 -1
  190. package/dist/src/entities/mrs/schema-readonly.d.ts +2 -2
  191. package/dist/src/entities/mrs/schema-readonly.js +19 -2
  192. package/dist/src/entities/mrs/schema-readonly.js.map +1 -1
  193. package/dist/src/entities/mrs/schema.d.ts +1 -1
  194. package/dist/src/entities/pipelines/registry.js +23 -31
  195. package/dist/src/entities/pipelines/registry.js.map +1 -1
  196. package/dist/src/entities/pipelines/schema-readonly.d.ts +11 -11
  197. package/dist/src/entities/pipelines/schema-readonly.js +5 -2
  198. package/dist/src/entities/pipelines/schema-readonly.js.map +1 -1
  199. package/dist/src/entities/pipelines/trace.d.ts +20 -0
  200. package/dist/src/entities/pipelines/trace.js +156 -0
  201. package/dist/src/entities/pipelines/trace.js.map +1 -0
  202. package/dist/src/entities/runners/project-access.d.ts +14 -0
  203. package/dist/src/entities/runners/project-access.js +64 -0
  204. package/dist/src/entities/runners/project-access.js.map +1 -0
  205. package/dist/src/entities/runners/registry.js +54 -26
  206. package/dist/src/entities/runners/registry.js.map +1 -1
  207. package/dist/src/entities/search/schema-readonly.d.ts +28 -28
  208. package/dist/src/graphql/runners.d.ts +26 -1
  209. package/dist/src/graphql/runners.js +43 -6
  210. package/dist/src/graphql/runners.js.map +1 -1
  211. package/dist/src/graphql/vulnerabilities.d.ts +3 -0
  212. package/dist/src/graphql/vulnerabilities.js +1 -0
  213. package/dist/src/graphql/vulnerabilities.js.map +1 -1
  214. package/dist/src/handlers.js +351 -190
  215. package/dist/src/handlers.js.map +1 -1
  216. package/dist/src/main.js +23 -5
  217. package/dist/src/main.js.map +1 -1
  218. package/dist/src/mcp-apps.d.ts +6 -0
  219. package/dist/src/mcp-apps.js +8 -0
  220. package/dist/src/mcp-apps.js.map +1 -0
  221. package/dist/src/mcp-server-context.d.ts +3 -0
  222. package/dist/src/mcp-server-context.js +13 -0
  223. package/dist/src/mcp-server-context.js.map +1 -0
  224. package/dist/src/middleware/mcp-auth-routes.d.ts +3 -0
  225. package/dist/src/middleware/mcp-auth-routes.js +9 -0
  226. package/dist/src/middleware/mcp-auth-routes.js.map +1 -0
  227. package/dist/src/middleware/oauth-auth.js +87 -24
  228. package/dist/src/middleware/oauth-auth.js.map +1 -1
  229. package/dist/src/middleware/rate-limiter.js +11 -10
  230. package/dist/src/middleware/rate-limiter.js.map +1 -1
  231. package/dist/src/oauth/authorization-response.d.ts +1 -0
  232. package/dist/src/oauth/authorization-response.js +14 -0
  233. package/dist/src/oauth/authorization-response.js.map +1 -0
  234. package/dist/src/oauth/client-auth.d.ts +16 -0
  235. package/dist/src/oauth/client-auth.js +73 -0
  236. package/dist/src/oauth/client-auth.js.map +1 -0
  237. package/dist/src/oauth/code-exchange.d.ts +7 -0
  238. package/dist/src/oauth/code-exchange.js +38 -0
  239. package/dist/src/oauth/code-exchange.js.map +1 -0
  240. package/dist/src/oauth/config.d.ts +2 -0
  241. package/dist/src/oauth/config.js +37 -0
  242. package/dist/src/oauth/config.js.map +1 -1
  243. package/dist/src/oauth/endpoints/authorize.d.ts +1 -0
  244. package/dist/src/oauth/endpoints/authorize.js +361 -102
  245. package/dist/src/oauth/endpoints/authorize.js.map +1 -1
  246. package/dist/src/oauth/endpoints/callback.js +76 -41
  247. package/dist/src/oauth/endpoints/callback.js.map +1 -1
  248. package/dist/src/oauth/endpoints/index.d.ts +1 -0
  249. package/dist/src/oauth/endpoints/index.js +3 -1
  250. package/dist/src/oauth/endpoints/index.js.map +1 -1
  251. package/dist/src/oauth/endpoints/metadata.d.ts +1 -1
  252. package/dist/src/oauth/endpoints/metadata.js +23 -8
  253. package/dist/src/oauth/endpoints/metadata.js.map +1 -1
  254. package/dist/src/oauth/endpoints/register.d.ts +3 -2
  255. package/dist/src/oauth/endpoints/register.js +70 -19
  256. package/dist/src/oauth/endpoints/register.js.map +1 -1
  257. package/dist/src/oauth/endpoints/revoke.d.ts +2 -0
  258. package/dist/src/oauth/endpoints/revoke.js +78 -0
  259. package/dist/src/oauth/endpoints/revoke.js.map +1 -0
  260. package/dist/src/oauth/endpoints/token.js +136 -62
  261. package/dist/src/oauth/endpoints/token.js.map +1 -1
  262. package/dist/src/oauth/gitlab-device-flow.d.ts +27 -8
  263. package/dist/src/oauth/gitlab-device-flow.js +119 -57
  264. package/dist/src/oauth/gitlab-device-flow.js.map +1 -1
  265. package/dist/src/oauth/gitlab-request-bound.d.ts +1 -0
  266. package/dist/src/oauth/gitlab-request-bound.js +6 -0
  267. package/dist/src/oauth/gitlab-request-bound.js.map +1 -0
  268. package/dist/src/oauth/gitlab-token-refresh.d.ts +7 -0
  269. package/dist/src/oauth/gitlab-token-refresh.js +147 -0
  270. package/dist/src/oauth/gitlab-token-refresh.js.map +1 -0
  271. package/dist/src/oauth/grant-revocation.d.ts +10 -0
  272. package/dist/src/oauth/grant-revocation.js +179 -0
  273. package/dist/src/oauth/grant-revocation.js.map +1 -0
  274. package/dist/src/oauth/granted-scopes.d.ts +1 -0
  275. package/dist/src/oauth/granted-scopes.js +7 -0
  276. package/dist/src/oauth/granted-scopes.js.map +1 -0
  277. package/dist/src/oauth/index.d.ts +2 -2
  278. package/dist/src/oauth/index.js +4 -2
  279. package/dist/src/oauth/index.js.map +1 -1
  280. package/dist/src/oauth/instance-app.d.ts +4 -0
  281. package/dist/src/oauth/instance-app.js +45 -0
  282. package/dist/src/oauth/instance-app.js.map +1 -0
  283. package/dist/src/oauth/issued-tokens.d.ts +1 -0
  284. package/dist/src/oauth/issued-tokens.js +24 -0
  285. package/dist/src/oauth/issued-tokens.js.map +1 -0
  286. package/dist/src/oauth/oauth-app.d.ts +9 -0
  287. package/dist/src/oauth/oauth-app.js +14 -0
  288. package/dist/src/oauth/oauth-app.js.map +1 -0
  289. package/dist/src/oauth/request-params.d.ts +1 -0
  290. package/dist/src/oauth/request-params.js +17 -0
  291. package/dist/src/oauth/request-params.js.map +1 -0
  292. package/dist/src/oauth/resource.d.ts +12 -0
  293. package/dist/src/oauth/resource.js +66 -0
  294. package/dist/src/oauth/resource.js.map +1 -0
  295. package/dist/src/oauth/routes.d.ts +2 -0
  296. package/dist/src/oauth/routes.js +31 -0
  297. package/dist/src/oauth/routes.js.map +1 -0
  298. package/dist/src/oauth/session-store.d.ts +51 -36
  299. package/dist/src/oauth/session-store.js +156 -251
  300. package/dist/src/oauth/session-store.js.map +1 -1
  301. package/dist/src/oauth/storage/factory.js +1 -1
  302. package/dist/src/oauth/storage/factory.js.map +1 -1
  303. package/dist/src/oauth/storage/file.d.ts +29 -2
  304. package/dist/src/oauth/storage/file.js +194 -42
  305. package/dist/src/oauth/storage/file.js.map +1 -1
  306. package/dist/src/oauth/storage/memory.d.ts +35 -2
  307. package/dist/src/oauth/storage/memory.js +327 -32
  308. package/dist/src/oauth/storage/memory.js.map +1 -1
  309. package/dist/src/oauth/storage/types.d.ts +37 -1
  310. package/dist/src/oauth/storage/types.js +6 -1
  311. package/dist/src/oauth/storage/types.js.map +1 -1
  312. package/dist/src/oauth/tool-auth.d.ts +12 -0
  313. package/dist/src/oauth/tool-auth.js +108 -0
  314. package/dist/src/oauth/tool-auth.js.map +1 -0
  315. package/dist/src/oauth/types.d.ts +41 -0
  316. package/dist/src/profiles/scope-enforcer.d.ts +8 -0
  317. package/dist/src/profiles/scope-enforcer.js +86 -24
  318. package/dist/src/profiles/scope-enforcer.js.map +1 -1
  319. package/dist/src/profiles/types.js +4 -1
  320. package/dist/src/profiles/types.js.map +1 -1
  321. package/dist/src/registry-manager.d.ts +16 -4
  322. package/dist/src/registry-manager.js +122 -33
  323. package/dist/src/registry-manager.js.map +1 -1
  324. package/dist/src/server.js +82 -50
  325. package/dist/src/server.js.map +1 -1
  326. package/dist/src/services/AdminDetector.d.ts +1 -1
  327. package/dist/src/services/AdminDetector.js +4 -4
  328. package/dist/src/services/AdminDetector.js.map +1 -1
  329. package/dist/src/services/ConnectionManager.d.ts +2 -2
  330. package/dist/src/services/ConnectionManager.js +43 -70
  331. package/dist/src/services/ConnectionManager.js.map +1 -1
  332. package/dist/src/services/HealthMonitor.js +4 -2
  333. package/dist/src/services/HealthMonitor.js.map +1 -1
  334. package/dist/src/services/NamespaceTierDetector.js +26 -27
  335. package/dist/src/services/NamespaceTierDetector.js.map +1 -1
  336. package/dist/src/services/TokenScopeDetector.d.ts +6 -2
  337. package/dist/src/services/TokenScopeDetector.js +22 -3
  338. package/dist/src/services/TokenScopeDetector.js.map +1 -1
  339. package/dist/src/session-manager.d.ts +3 -1
  340. package/dist/src/session-manager.js +43 -10
  341. package/dist/src/session-manager.js.map +1 -1
  342. package/dist/src/types.d.ts +3 -2
  343. package/dist/src/types.js.map +1 -1
  344. package/dist/src/utils/bounded-map.d.ts +1 -0
  345. package/dist/src/utils/bounded-map.js +23 -0
  346. package/dist/src/utils/bounded-map.js.map +1 -0
  347. package/dist/src/utils/fetch.d.ts +1 -2
  348. package/dist/src/utils/fetch.js +12 -17
  349. package/dist/src/utils/fetch.js.map +1 -1
  350. package/dist/src/utils/gitlab-api.js +2 -1
  351. package/dist/src/utils/gitlab-api.js.map +1 -1
  352. package/dist/src/utils/gitlab-base-url.d.ts +2 -0
  353. package/dist/src/utils/gitlab-base-url.js +34 -0
  354. package/dist/src/utils/gitlab-base-url.js.map +1 -0
  355. package/dist/src/utils/html.d.ts +1 -0
  356. package/dist/src/utils/html.js +12 -0
  357. package/dist/src/utils/html.js.map +1 -0
  358. package/dist/src/utils/namespace.d.ts +1 -0
  359. package/dist/src/utils/namespace.js +72 -24
  360. package/dist/src/utils/namespace.js.map +1 -1
  361. package/dist/src/utils/schema-utils.d.ts +5 -3
  362. package/dist/src/utils/schema-utils.js +50 -22
  363. package/dist/src/utils/schema-utils.js.map +1 -1
  364. package/dist/src/utils/smart-user-search.js +2 -1
  365. package/dist/src/utils/smart-user-search.js.map +1 -1
  366. package/dist/src/utils/sync-directory.d.ts +1 -0
  367. package/dist/src/utils/sync-directory.js +49 -0
  368. package/dist/src/utils/sync-directory.js.map +1 -0
  369. package/dist/src/utils/tool-result.d.ts +4 -0
  370. package/dist/src/utils/tool-result.js +41 -0
  371. package/dist/src/utils/tool-result.js.map +1 -0
  372. package/dist/tsconfig.build.tsbuildinfo +1 -1
  373. package/package.json +74 -21
  374. package/plugin/assets/composer-icon-dark.png +0 -0
  375. package/plugin/assets/composer-icon-dark.svg +17 -0
  376. package/plugin/assets/composer-icon.png +0 -0
  377. package/plugin/assets/composer-icon.svg +17 -0
  378. package/plugin/assets/logo.png +0 -0
  379. package/plugin/assets/screenshot-1.png +0 -0
  380. package/plugin/assets/screenshot-2.png +0 -0
  381. package/plugin/schemas/mcp.schema.json +120 -0
  382. package/plugin/schemas/plugin.schema.json +65 -0
  383. package/skills/gitlab-ci/SKILL.md +16 -0
  384. package/skills/gitlab-discovery/SKILL.md +15 -0
  385. package/skills/gitlab-review/SKILL.md +16 -0
  386. package/skills/gitlab-setup/SKILL.md +16 -0
  387. package/skills/gitlab-work-items/SKILL.md +16 -0
@@ -6,6 +6,7 @@ const stdio_js_1 = require("@modelcontextprotocol/sdk/client/stdio.js");
6
6
  const index_js_2 = require("@modelcontextprotocol/sdk/server/index.js");
7
7
  const stdio_js_2 = require("@modelcontextprotocol/sdk/server/stdio.js");
8
8
  const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
9
+ const mcp_apps_1 = require("../mcp-apps");
9
10
  const interceptor_1 = require("./interceptor");
10
11
  const format_1 = require("./format");
11
12
  const forwarding_1 = require("./forwarding");
@@ -20,11 +21,16 @@ class ChannelGateway {
20
21
  reconnecting = false;
21
22
  closing = false;
22
23
  pendingWaiters = 0;
24
+ catalogReads = new Map();
25
+ catalogGeneration = 0;
26
+ completeGeneration = 0;
23
27
  constructor(config) {
24
28
  this.config = config;
25
29
  this.server = new index_js_2.Server({ name: config.name ?? 'gitlab-ci-gateway', version: config.version ?? '0.1.0' }, {
26
30
  capabilities: {
27
- tools: {},
31
+ tools: { listChanged: true },
32
+ resources: {},
33
+ extensions: mcp_apps_1.MCP_APPS_EXTENSION,
28
34
  experimental: { 'claude/channel': {} },
29
35
  },
30
36
  instructions: 'Forwards the full gitlab-mcp tool catalog. When a CI pipeline/job is ' +
@@ -49,22 +55,67 @@ class ChannelGateway {
49
55
  await this.transport?.close().catch(() => { });
50
56
  }
51
57
  newClient() {
52
- return new index_js_1.Client({ name: this.config.name ?? 'gitlab-ci-gateway', version: '0.1.0' });
58
+ const client = new index_js_1.Client({ name: this.config.name ?? 'gitlab-ci-gateway', version: '0.1.0' });
59
+ client.setNotificationHandler(types_js_1.ToolListChangedNotificationSchema, () => {
60
+ void this.server.sendToolListChanged().catch(() => { });
61
+ });
62
+ return client;
53
63
  }
54
64
  registerHandlers() {
55
- this.server.setRequestHandler(types_js_1.ListToolsRequestSchema, async () => {
56
- const { tools } = (await (0, forwarding_1.forwardWithPolicy)({
57
- isRead: () => true,
58
- isConnected: () => this.connected,
59
- waitForConnection: () => this.waitForConnection(),
60
- call: () => this.client.listTools(),
61
- }, 'tools/list', undefined));
62
- return { tools };
65
+ this.server.setRequestHandler(types_js_1.ListToolsRequestSchema, async (request) => {
66
+ const generation = ++this.catalogGeneration;
67
+ const catalog = (await this.readDownstream('tools/list', (client) => client.listTools(request.params)));
68
+ const complete = !request.params?.cursor && !catalog.nextCursor;
69
+ this.recordCatalogReads(catalog, generation, complete);
70
+ return catalog;
63
71
  });
64
72
  this.server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
65
73
  const { name, arguments: args } = request.params;
66
74
  return (await this.interceptor.handleCall(name, args ?? {}));
67
75
  });
76
+ this.server.setRequestHandler(types_js_1.ListResourcesRequestSchema, async (request) => {
77
+ return (await this.readDownstream('resources/list', (client) => client.listResources(request.params)));
78
+ });
79
+ this.server.setRequestHandler(types_js_1.ReadResourceRequestSchema, async (request) => {
80
+ return (await this.readDownstream('resources/read', (client) => client.readResource(request.params)));
81
+ });
82
+ }
83
+ recordCatalogReads(catalog, generation, complete) {
84
+ if (generation < this.completeGeneration)
85
+ return;
86
+ for (const tool of catalog.tools) {
87
+ const known = this.catalogReads.get(tool.name);
88
+ if (known && known.generation > generation)
89
+ continue;
90
+ const read = tool.annotations?.readOnlyHint ?? (0, forwarding_1.isReadCall)(tool.name);
91
+ this.catalogReads.set(tool.name, { read, generation });
92
+ }
93
+ if (!complete)
94
+ return;
95
+ this.completeGeneration = generation;
96
+ for (const [name, known] of this.catalogReads) {
97
+ if (known.generation < generation)
98
+ this.catalogReads.delete(name);
99
+ }
100
+ }
101
+ isRead(name) {
102
+ return this.catalogReads.get(name)?.read ?? (0, forwarding_1.isReadCall)(name);
103
+ }
104
+ readDownstream(name, read) {
105
+ return (0, forwarding_1.forwardWithPolicy)({
106
+ isRead: () => true,
107
+ isConnected: () => this.connected,
108
+ waitForConnection: () => this.waitForConnection(),
109
+ call: async () => {
110
+ const client = this.client;
111
+ try {
112
+ return await read(client);
113
+ }
114
+ catch (error) {
115
+ this.rethrowDownstreamError(client, error);
116
+ }
117
+ },
118
+ }, name, undefined);
68
119
  }
69
120
  async connectDownstream() {
70
121
  const maxBackoff = this.config.maxBackoffMs ?? 30_000;
@@ -86,8 +137,10 @@ class ChannelGateway {
86
137
  return;
87
138
  }
88
139
  this.connected = true;
89
- if (this.reconnecting)
140
+ if (this.reconnecting) {
90
141
  this.notifyLink('restored');
142
+ void this.server.sendToolListChanged().catch(() => { });
143
+ }
91
144
  return;
92
145
  }
93
146
  catch {
@@ -131,17 +184,28 @@ class ChannelGateway {
131
184
  }
132
185
  forward(name, args) {
133
186
  return (0, forwarding_1.forwardWithPolicy)({
134
- isRead: forwarding_1.isReadCall,
187
+ isRead: (name) => this.isRead(name),
135
188
  isConnected: () => this.connected,
136
189
  waitForConnection: () => this.waitForConnection(),
137
190
  call: (n, a) => this.callDownstream(n, a),
138
191
  }, name, args);
139
192
  }
140
193
  async callDownstream(name, args) {
141
- return await this.client.callTool({
142
- name,
143
- arguments: (args ?? {}),
144
- });
194
+ const client = this.client;
195
+ try {
196
+ return await client.callTool({ name, arguments: (args ?? {}) });
197
+ }
198
+ catch (error) {
199
+ this.rethrowDownstreamError(client, error);
200
+ }
201
+ }
202
+ rethrowDownstreamError(client, error) {
203
+ if (!client.transport &&
204
+ error instanceof types_js_1.McpError &&
205
+ error.code === types_js_1.ErrorCode.ConnectionClosed) {
206
+ throw new forwarding_1.DownstreamDisconnectedError(error);
207
+ }
208
+ throw error;
145
209
  }
146
210
  emit(event) {
147
211
  const { content, meta } = (0, format_1.formatEvent)(event);
@@ -1 +1 @@
1
- {"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../src/channel-gateway/gateway.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../src/channel-gateway/gateway.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import { ContainerRuntimeInfo } from './types';
2
+ export declare function completionDependencyError(info: ContainerRuntimeInfo): string | undefined;
2
3
  export declare function detectContainerRuntime(): ContainerRuntimeInfo;
3
4
  export declare function getContainerRuntime(): ContainerRuntimeInfo;
4
5
  export declare function resetRuntimeCache(): void;
@@ -1,5 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.completionDependencyError = completionDependencyError;
3
4
  exports.detectContainerRuntime = detectContainerRuntime;
4
5
  exports.getContainerRuntime = getContainerRuntime;
5
6
  exports.resetRuntimeCache = resetRuntimeCache;
@@ -36,33 +37,64 @@ function parseVersion(output) {
36
37
  const match = output.match(/(\d+\.\d+\.\d+)/);
37
38
  return match?.[1];
38
39
  }
40
+ function describeCompose(cmd, output) {
41
+ if (!output)
42
+ return { cmd };
43
+ return {
44
+ cmd,
45
+ provider: /podman-compose/i.test(output) ? 'podman-compose' : 'docker-compose',
46
+ version: parseVersion(output),
47
+ };
48
+ }
39
49
  function detectComposeCmd(runtime) {
40
50
  const runtimeCmd = runtime;
41
51
  if (commandSucceeds(runtimeCmd, ['compose', 'version'])) {
42
- return [runtimeCmd, 'compose'];
52
+ const cmd = [runtimeCmd, 'compose'];
53
+ return describeCompose(cmd, commandOutput(runtimeCmd, ['compose', 'version']));
43
54
  }
44
55
  const standaloneCompose = `${runtimeCmd}-compose`;
45
56
  if (commandSucceeds(standaloneCompose, ['--version'])) {
46
- return [standaloneCompose];
57
+ return describeCompose([standaloneCompose], commandOutput(standaloneCompose, ['--version']));
47
58
  }
48
59
  if (commandSucceeds('docker-compose', ['--version'])) {
49
- return ['docker-compose'];
60
+ return describeCompose(['docker-compose'], commandOutput('docker-compose', ['--version']));
50
61
  }
51
62
  return null;
52
63
  }
64
+ function versionAtLeast(actual, minimum) {
65
+ const a = actual.split('.').map(Number);
66
+ const m = minimum.split('.').map(Number);
67
+ for (let i = 0; i < m.length; i++) {
68
+ if (a[i] !== m[i])
69
+ return a[i] > m[i];
70
+ }
71
+ return true;
72
+ }
73
+ function completionDependencyError(info) {
74
+ const required = 'Docker Compose v2 or podman-compose 1.6.0 or later';
75
+ if (!info.composeCmd || !info.composeVersion) {
76
+ return `Could not determine the compose version; PostgreSQL deployments need ${required}.`;
77
+ }
78
+ const minimum = info.composeProvider === 'podman-compose' ? '1.6.0' : '2.0.0';
79
+ if (versionAtLeast(info.composeVersion, minimum))
80
+ return undefined;
81
+ return `${info.composeProvider} ${info.composeVersion} cannot order the database migration before the server; install ${required}.`;
82
+ }
53
83
  function detectContainerRuntime() {
54
84
  const runtimes = ['docker', 'podman'];
55
85
  for (const runtime of runtimes) {
56
86
  const versionOutput = commandOutput(runtime, ['--version']);
57
87
  if (versionOutput) {
58
88
  const runtimeAvailable = commandSucceeds(runtime, ['info']);
59
- const composeCmd = detectComposeCmd(runtime);
89
+ const compose = detectComposeCmd(runtime);
60
90
  const runtimeVersion = parseVersion(versionOutput);
61
91
  return {
62
92
  runtime,
63
93
  runtimeCmd: runtime,
64
94
  runtimeAvailable,
65
- composeCmd,
95
+ composeCmd: compose?.cmd ?? null,
96
+ ...(compose?.provider && { composeProvider: compose.provider }),
97
+ ...(compose?.version && { composeVersion: compose.version }),
66
98
  runtimeVersion,
67
99
  };
68
100
  }
@@ -1 +1 @@
1
- {"version":3,"file":"container-runtime.js","sourceRoot":"","sources":["../../../../src/cli/docker/container-runtime.ts"],"names":[],"mappings":";;AAsFA,wDA6BC;AAMD,kDAGC;AAKD,8CAEC;AA9HD,iDAA0C;AAI1C,IAAI,aAAa,GAAgC,IAAI,CAAC;AAKtD,SAAS,eAAe,CAAC,GAAW,EAAE,IAAc;IAClD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,GAAG,EAAE,IAAI,EAAE;YAClC,KAAK,EAAE,MAAM;YACb,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAKD,SAAS,aAAa,CAAC,GAAW,EAAE,IAAc;IAChD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,GAAG,EAAE,IAAI,EAAE;YAClC,KAAK,EAAE,MAAM;YACb,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACzC,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAOD,SAAS,YAAY,CAAC,MAAc;IAClC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC9C,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC;AAOD,SAAS,gBAAgB,CAAC,OAAyB;IACjD,MAAM,UAAU,GAAG,OAAO,CAAC;IAG3B,IAAI,eAAe,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;QACxD,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACjC,CAAC;IAGD,MAAM,iBAAiB,GAAG,GAAG,UAAU,UAAU,CAAC;IAClD,IAAI,eAAe,CAAC,iBAAiB,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC7B,CAAC;IAGD,IAAI,eAAe,CAAC,gBAAgB,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;QACrD,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAOD,SAAgB,sBAAsB;IACpC,MAAM,QAAQ,GAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE1D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAC5D,IAAI,aAAa,EAAE,CAAC;YAElB,MAAM,gBAAgB,GAAG,eAAe,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;YAC5D,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC7C,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;YAEnD,OAAO;gBACL,OAAO;gBACP,UAAU,EAAE,OAAO;gBACnB,gBAAgB;gBAChB,UAAU;gBACV,cAAc;aACf,CAAC;QACJ,CAAC;IACH,CAAC;IAGD,OAAO;QACL,OAAO,EAAE,QAAQ;QACjB,UAAU,EAAE,QAAQ;QACpB,gBAAgB,EAAE,KAAK;QACvB,UAAU,EAAE,IAAI;QAChB,cAAc,EAAE,SAAS;KAC1B,CAAC;AACJ,CAAC;AAMD,SAAgB,mBAAmB;IACjC,aAAa,KAAK,sBAAsB,EAAE,CAAC;IAC3C,OAAO,aAAa,CAAC;AACvB,CAAC;AAKD,SAAgB,iBAAiB;IAC/B,aAAa,GAAG,IAAI,CAAC;AACvB,CAAC"}
1
+ {"version":3,"file":"container-runtime.js","sourceRoot":"","sources":["../../../../src/cli/docker/container-runtime.ts"],"names":[],"mappings":"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"}
@@ -48,6 +48,7 @@ const p = __importStar(require("@clack/prompts"));
48
48
  const crypto_1 = require("crypto");
49
49
  const docker_utils_1 = require("./docker-utils");
50
50
  const types_1 = require("./types");
51
+ const oauth_issuer_prompt_1 = require("./oauth-issuer-prompt");
51
52
  function parseDockerSubcommand(args) {
52
53
  const subcommand = args[0];
53
54
  const subArgs = args.slice(1);
@@ -152,17 +153,25 @@ async function initDocker() {
152
153
  return;
153
154
  }
154
155
  let oauthSessionSecret;
156
+ let oauthIssuer;
155
157
  if (enableOAuth) {
156
158
  p.note('OAuth mode allows users to authenticate with multiple GitLab instances.\n' +
157
159
  "You'll need to register OAuth applications on each GitLab instance.", 'OAuth Mode');
160
+ const issuer = await (0, oauth_issuer_prompt_1.promptOAuthIssuer)(Number.parseInt(port, 10));
161
+ if (p.isCancel(issuer)) {
162
+ p.cancel('Setup cancelled');
163
+ return;
164
+ }
165
+ oauthIssuer = issuer;
158
166
  oauthSessionSecret = (0, crypto_1.randomBytes)(32).toString('hex');
159
- p.log.warn('Session secret will be stored in docker-compose.yml. Keep this file secure and do NOT commit to version control.');
167
+ p.log.warn('Session secret will be stored in the .env file next to docker-compose.yml. Keep this file secure and do NOT commit to version control.');
160
168
  }
161
169
  const config = {
162
170
  ...types_1.DEFAULT_DOCKER_CONFIG,
163
171
  port: parseInt(port, 10),
164
172
  oauthEnabled: enableOAuth,
165
173
  oauthSessionSecret,
174
+ oauthIssuer,
166
175
  };
167
176
  const spinner = p.spinner();
168
177
  spinner.start('Creating Docker configuration...');
@@ -327,7 +336,7 @@ async function dockerAddInstance(host) {
327
336
  }
328
337
  const envName = instanceHost.toUpperCase().replace(/[^A-Z0-9]/g, '_') + '_SECRET';
329
338
  p.note(`Store your OAuth secret in environment variable: ${envName}\n` +
330
- `Add to docker-compose.yml environment section or use .env file.`, 'OAuth Secret');
339
+ `Add ${envName}=<secret> to the .env file next to docker-compose.yml.`, 'OAuth Secret');
331
340
  oauth = {
332
341
  clientId,
333
342
  clientSecretEnv: envName,
@@ -1 +1 @@
1
- {"version":3,"file":"docker-command.js","sourceRoot":"","sources":["../../../../src/cli/docker/docker-command.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"docker-command.js","sourceRoot":"","sources":["../../../../src/cli/docker/docker-command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCA,sDAwBC;AAKD,gCAiDC;AAKD,gCA0HC;AAKD,kCAYC;AAKD,gCASC;AAKD,sCASC;AAKD,sCASC;AAKD,gCAiBC;AAKD,8CAsIC;AAKD,oDAOC;AAKD,4CA4DC;AAzhBD,kDAAoC;AACpC,mCAAqC;AACrC,iDAYwB;AACxB,mCAAgE;AAChE,+DAA0D;AAmB1D,SAAgB,qBAAqB,CAAC,IAAc;IAIlD,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAiC,CAAC;IAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAE9B,MAAM,gBAAgB,GAAuB;QAC3C,QAAQ;QACR,MAAM;QACN,OAAO;QACP,MAAM;QACN,SAAS;QACT,SAAS;QACT,MAAM;QACN,cAAc;QACd,iBAAiB;KAClB,CAAC;IAEF,IAAI,UAAU,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACzD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAClD,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACjC,CAAC;AAKD,SAAgB,UAAU;IACxB,MAAM,MAAM,GAAG,IAAA,8BAAe,GAAE,CAAC;IAEjC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,uBAAuB,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAEzE,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,qBAAqB,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACrE,OAAO,CAAC,GAAG,CAAC,wBAAwB,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAE3E,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;QACrE,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACnC,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,MAAM,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC;IAChF,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YACpD,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YACpC,CAAC;YACD,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;gBAC3B,OAAO,CAAC,GAAG,CAAC,eAAe,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAA,mCAAoB,GAAE,EAAE,CAAC,CAAC;AAC/D,CAAC;AAKM,KAAK,UAAU,UAAU;IAC9B,CAAC,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAG9C,MAAM,MAAM,GAAG,IAAA,8BAAe,GAAE,CAAC;IAEjC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;QAC5B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QACxC,CAAC,CAAC,IAAI,CAAC,8DAA8D,EAAE,gBAAgB,CAAC,CAAC;QACzF,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC7B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAChD,CAAC,CAAC,IAAI,CACJ,mJAAmJ,EACnJ,iBAAiB,CAClB,CAAC;QACF,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC5B,OAAO;IACT,CAAC;IAGD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC;QACxB,OAAO,EAAE,0BAA0B;QACnC,WAAW,EAAE,MAAM;QACnB,YAAY,EAAE,MAAM;QACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YACtC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,KAAK,EAAE,CAAC;gBACzC,OAAO,2CAA2C,CAAC;YACrD,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC5B,OAAO;IACT,CAAC;IAGD,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC;QAClC,OAAO,EAAE,0CAA0C;QACnD,YAAY,EAAE,KAAK;KACpB,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC5B,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,IAAI,kBAAsC,CAAC;IAC3C,IAAI,WAA+B,CAAC;IAEpC,IAAI,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC,IAAI,CACJ,2EAA2E;YACzE,qEAAqE,EACvE,YAAY,CACb,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAA,uCAAiB,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACvB,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC5B,OAAO;QACT,CAAC;QACD,WAAW,GAAG,MAAM,CAAC;QAGrB,kBAAkB,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC,CAAC,GAAG,CAAC,IAAI,CACR,wIAAwI,CACzI,CAAC;IACJ,CAAC;IAGD,MAAM,MAAM,GAAG;QACb,GAAG,6BAAqB;QACxB,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QACxB,YAAY,EAAE,WAAW;QACzB,kBAAkB;QAClB,WAAW;KACZ,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5B,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAElD,IAAI,CAAC;QACH,IAAA,+BAAgB,EAAC,MAAM,CAAC,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAE9C,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,IAAA,mCAAoB,GAAE,EAAE,CAAC,CAAC;QAG7D,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC;YAC/B,OAAO,EAAE,0BAA0B;YACnC,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,CAAC,CAAC,MAAM,CAAC,2CAA2C,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YACvC,MAAM,MAAM,GAAG,IAAA,6BAAc,GAAE,CAAC;YAChC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;gBAC1C,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,eAAe,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACrC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACtE,CAAC;AACH,CAAC;AAKD,SAAgB,WAAW;IACzB,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,IAAA,6BAAc,GAAE,CAAC;IAEhC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACnC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,gCAAgC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAChE,CAAC;AACH,CAAC;AAKD,SAAgB,UAAU;IACxB,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,IAAA,4BAAa,GAAE,CAAC;IAE/B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,+BAA+B,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAKD,SAAgB,aAAa;IAC3B,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,IAAA,+BAAgB,GAAE,CAAC;IAElC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACvC,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,kCAAkC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAKD,SAAgB,aAAa;IAC3B,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,IAAA,+BAAgB,GAAE,CAAC;IAElC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,kCAAkC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAKD,SAAgB,UAAU,CAAC,SAAkB,KAAK,EAAE,QAAgB,GAAG;IACrE,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,8BAA8B,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,IAAA,uBAAQ,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEtC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC5B,OAAO,CAAC,KAAK,CAAC,uBAAuB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,IAAA,sBAAO,EAAC,KAAK,CAAC,CAAC;QAE9B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,uBAAuB,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;AACH,CAAC;AAKM,KAAK,UAAU,iBAAiB,CAAC,IAAa;IACnD,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAG/B,IAAI,YAAoB,CAAC;IACzB,IAAI,IAAI,EAAE,CAAC;QACT,YAAY,GAAG,IAAI,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC;YAC7B,OAAO,EAAE,uBAAuB;YAChC,WAAW,EAAE,oBAAoB;YACjC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;gBAClB,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC/B,OAAO,kBAAkB,CAAC;gBAC5B,CAAC;gBAED,MAAM,eAAe,GACnB,oEAAoE,CAAC;gBACvE,MAAM,WAAW,GAAG,8CAA8C,CAAC;gBAInE,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBACzC,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAC5E,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;wBAC5C,OAAO,SAAS,CAAC;oBACnB,CAAC;oBACD,OAAO,6CAA6C,CAAC;gBACvD,CAAC;gBAGD,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAChC,OAAO,SAAS,CAAC;gBACnB,CAAC;gBAED,OAAO,uCAAuC,CAAC;YACjD,CAAC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1B,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,YAAY,GAAG,SAAS,CAAC;IAC3B,CAAC;IAGD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC;QACxB,OAAO,EAAE,eAAe;QACxB,WAAW,EAAE,gBAAgB;QAC7B,YAAY,EAAE,YAAY;KAC3B,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC5B,OAAO;IACT,CAAC;IAGD,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC;QACrC,OAAO,EAAE,oCAAoC;QAC7C,YAAY,EAAE,KAAK;KACpB,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/B,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,IAAI,KAA8B,CAAC;IAEnC,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC;YAC5B,OAAO,EAAE,uBAAuB;YAChC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;gBAClB,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;oBAChC,OAAO,4BAA4B,CAAC;gBACtC,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC5B,OAAO;QACT,CAAC;QAGD,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;QAElF,CAAC,CAAC,IAAI,CACJ,oDAAoD,OAAO,IAAI;YAC7D,OAAO,OAAO,wDAAwD,EACxE,cAAc,CACf,CAAC;QAEF,KAAK,GAAG;YACN,QAAQ;YACR,eAAe,EAAE,OAAO;SACzB,CAAC;IACJ,CAAC;IAGD,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC;QAC5B,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE;YACP,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,qBAAqB,EAAE;YACpD,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB,EAAE;YAClD,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE;YAC9C,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;YACpC,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,eAAe,EAAE;YAClD,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE;SAC1C;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC5B,OAAO;IACT,CAAC;IAGD,MAAM,QAAQ,GAAmB;QAC/B,IAAI,EAAE,YAAY;QAClB,IAAI;QACJ,KAAK;QACL,aAAa,EAAE,MAAM;KACtB,CAAC;IAEF,IAAA,0BAAW,EAAC,QAAQ,CAAC,CAAC;IAEtB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,YAAY,EAAE,CAAC,CAAC;IACjD,CAAC,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAC;AAC/E,CAAC;AAKD,SAAgB,oBAAoB,CAAC,IAAY;IAC/C,IAAI,IAAA,6BAAc,EAAC,IAAI,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IACrD,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAKM,KAAK,UAAU,gBAAgB,CAAC,IAAc;IACnD,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAE5D,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,QAAQ;YACX,UAAU,EAAE,CAAC;YACb,MAAM;QAER,KAAK,MAAM;YACT,MAAM,UAAU,EAAE,CAAC;YACnB,MAAM;QAER,KAAK,OAAO;YACV,WAAW,EAAE,CAAC;YACd,MAAM;QAER,KAAK,MAAM;YACT,UAAU,EAAE,CAAC;YACb,MAAM;QAER,KAAK,SAAS;YACZ,aAAa,EAAE,CAAC;YAChB,MAAM;QAER,KAAK,SAAS;YACZ,aAAa,EAAE,CAAC;YAChB,MAAM;QAER,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACtE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/D,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YACpE,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC1B,MAAM;QACR,CAAC;QAED,KAAK,cAAc;YACjB,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,MAAM;QAER,KAAK,iBAAiB;YACpB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;YACrE,CAAC;YACD,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM;QAER;YACE,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,yEAAyE,CAAC,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,qEAAqE,CAAC,CAAC;YACnF,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;YACnE,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;YAClE,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;YACrE,OAAO,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC;YACjF,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;YACvE,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;YACvE,OAAO,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;YAC1E,MAAM;IACV,CAAC;AACH,CAAC"}
@@ -23,3 +23,4 @@ export declare function addInstance(instance: GitLabInstance): void;
23
23
  export declare function removeInstance(host: string): boolean;
24
24
  export declare function initDockerConfig(config?: Partial<DockerConfig>): DockerConfig;
25
25
  export declare function saveEnvFile(config: DockerConfig): void;
26
+ export declare function mergeEnvFile(existing: string, managed: ReadonlyMap<string, string>): string;
@@ -26,6 +26,7 @@ exports.addInstance = addInstance;
26
26
  exports.removeInstance = removeInstance;
27
27
  exports.initDockerConfig = initDockerConfig;
28
28
  exports.saveEnvFile = saveEnvFile;
29
+ exports.mergeEnvFile = mergeEnvFile;
29
30
  const child_process_1 = require("child_process");
30
31
  const crypto_1 = require("crypto");
31
32
  const fs_1 = require("fs");
@@ -132,21 +133,51 @@ function getDockerStatus(containerName = 'gitlab-mcp') {
132
133
  result.instances = loadInstances();
133
134
  return result;
134
135
  }
136
+ const BUNDLED_POSTGRESQL_URL = 'postgresql://gitlab_mcp:${POSTGRES_PASSWORD}@postgres:5432/gitlab_mcp';
137
+ function sessionDatabaseUrl(config) {
138
+ if (!config.oauthEnabled)
139
+ return undefined;
140
+ if (config.deploymentType === 'compose-bundle')
141
+ return BUNDLED_POSTGRESQL_URL;
142
+ if (config.deploymentType === 'external-db') {
143
+ if (!config.databaseUrl) {
144
+ throw new Error('An external-db deployment with OAuth needs the PostgreSQL connection URL');
145
+ }
146
+ return '${OAUTH_STORAGE_POSTGRESQL_URL}';
147
+ }
148
+ return undefined;
149
+ }
150
+ const CORE_IMAGE_REPOSITORY = 'ghcr.io/structured-world/gitlab-mcp';
151
+ function databaseImage(image) {
152
+ if (image !== CORE_IMAGE_REPOSITORY && !image.startsWith(`${CORE_IMAGE_REPOSITORY}:`)) {
153
+ if (!image.startsWith(`${CORE_IMAGE_REPOSITORY}@`))
154
+ return image;
155
+ throw new Error('Pin the gitlab-mcp-db image by tag or digest for a PostgreSQL deployment');
156
+ }
157
+ return image.replace(CORE_IMAGE_REPOSITORY, `${CORE_IMAGE_REPOSITORY}-db`);
158
+ }
159
+ function envLiteralUrl(url) {
160
+ return `'${url.replaceAll("'", '%27')}'`;
161
+ }
135
162
  function generateDockerCompose(config) {
163
+ const databaseUrl = sessionDatabaseUrl(config);
164
+ const image = databaseUrl ? databaseImage(config.image) : config.image;
165
+ const environment = [
166
+ 'TRANSPORT=sse',
167
+ 'HOST=0.0.0.0',
168
+ 'PORT=3333',
169
+ `OAUTH_ENABLED=${config.oauthEnabled}`,
170
+ ];
171
+ const volumes = ['gitlab-mcp-data:/data'];
136
172
  const compose = {
137
173
  version: '3.8',
138
174
  services: {
139
175
  'gitlab-mcp': {
140
- image: config.image,
176
+ image,
141
177
  container_name: config.containerName,
142
178
  ports: [`\${PORT:-${config.port}}:3333`],
143
- environment: [
144
- 'TRANSPORT=sse',
145
- 'HOST=0.0.0.0',
146
- 'PORT=3333',
147
- `OAUTH_ENABLED=${config.oauthEnabled}`,
148
- ],
149
- volumes: ['gitlab-mcp-data:/data'],
179
+ environment,
180
+ volumes,
150
181
  restart: 'unless-stopped',
151
182
  },
152
183
  },
@@ -154,6 +185,29 @@ function generateDockerCompose(config) {
154
185
  'gitlab-mcp-data': {},
155
186
  },
156
187
  };
188
+ if (config.oauthEnabled) {
189
+ environment.push('OAUTH_SESSION_SECRET=${OAUTH_SESSION_SECRET}', 'OAUTH_ISSUER=${OAUTH_ISSUER}');
190
+ if (databaseUrl) {
191
+ environment.push('OAUTH_STORAGE_TYPE=postgresql', `OAUTH_STORAGE_POSTGRESQL_URL=${databaseUrl}`);
192
+ }
193
+ else {
194
+ environment.push('OAUTH_STORAGE_TYPE=file', 'OAUTH_STORAGE_FILE_PATH=/data/oauth-sessions.json');
195
+ }
196
+ compose.services['gitlab-mcp'].env_file = ['.env', INSTANCES_ENV_FILE];
197
+ }
198
+ if (databaseUrl) {
199
+ compose.services.migrate = {
200
+ image,
201
+ restart: 'no',
202
+ working_dir: '/app/node_modules/@structured-world/gitlab-mcp-db',
203
+ entrypoint: ['node', 'dist/src/migrate.js'],
204
+ environment: [`OAUTH_STORAGE_POSTGRESQL_URL=${databaseUrl}`],
205
+ ...(config.deploymentType === 'compose-bundle' && { depends_on: ['postgres'] }),
206
+ };
207
+ compose.services['gitlab-mcp'].depends_on = {
208
+ migrate: { condition: 'service_completed_successfully' },
209
+ };
210
+ }
157
211
  if (config.deploymentType === 'compose-bundle' && config.oauthEnabled) {
158
212
  compose.services.postgres = {
159
213
  image: 'postgres:16-alpine',
@@ -166,26 +220,20 @@ function generateDockerCompose(config) {
166
220
  ],
167
221
  volumes: ['postgres-data:/var/lib/postgresql/data'],
168
222
  restart: 'unless-stopped',
223
+ healthcheck: {
224
+ test: ['CMD-SHELL', 'pg_isready -U gitlab_mcp'],
225
+ interval: '5s',
226
+ timeout: '5s',
227
+ retries: 5,
228
+ },
169
229
  };
170
- compose.services['gitlab-mcp'].depends_on = ['postgres'];
171
230
  if (compose.volumes) {
172
231
  compose.volumes['postgres-data'] = {};
173
232
  }
174
233
  }
175
- if (config.oauthEnabled) {
176
- let databaseUrl;
177
- if (config.deploymentType === 'compose-bundle') {
178
- databaseUrl = 'postgresql://gitlab_mcp:${POSTGRES_PASSWORD}@postgres:5432/gitlab_mcp';
179
- }
180
- else {
181
- databaseUrl = config.databaseUrl ?? 'file:/data/sessions.db';
182
- }
183
- compose.services['gitlab-mcp'].environment.push('OAUTH_SESSION_SECRET=${OAUTH_SESSION_SECRET}', `DATABASE_URL=${databaseUrl}`);
184
- compose.services['gitlab-mcp'].volumes.push('./instances.yml:/app/config/instances.yml:ro');
185
- }
186
234
  if (config.environment) {
187
235
  for (const [key, value] of Object.entries(config.environment)) {
188
- compose.services['gitlab-mcp'].environment.push(`${key}=${value}`);
236
+ environment.push(`${key}=${value}`);
189
237
  }
190
238
  }
191
239
  return yaml_1.default.stringify(compose);
@@ -243,6 +291,32 @@ function saveInstances(instances) {
243
291
  const instancesPath = (0, path_1.join)(configDir, 'instances.yml');
244
292
  const content = generateInstancesYaml(instances);
245
293
  (0, fs_1.writeFileSync)(instancesPath, content, 'utf8');
294
+ saveServerInstances(instances);
295
+ }
296
+ const INSTANCES_ENV_FILE = 'instances.env';
297
+ const JSON_QUOTE_ESCAPE = `${String.fromCodePoint(92)}u0027`;
298
+ function saveServerInstances(instances) {
299
+ const configDir = getExpandedConfigDir();
300
+ if (!(0, fs_1.existsSync)(configDir)) {
301
+ (0, fs_1.mkdirSync)(configDir, { recursive: true });
302
+ }
303
+ let value = '';
304
+ if (instances.length > 0) {
305
+ const config = {
306
+ instances: instances.map((instance) => ({
307
+ url: instance.host.includes('://') ? instance.host : `https://${instance.host}`,
308
+ label: instance.name,
309
+ ...(instance.oauth && {
310
+ oauth: {
311
+ clientId: instance.oauth.clientId,
312
+ clientSecretEnv: instance.oauth.clientSecretEnv,
313
+ },
314
+ }),
315
+ })),
316
+ };
317
+ value = `'${JSON.stringify(config).replaceAll("'", JSON_QUOTE_ESCAPE)}'`;
318
+ }
319
+ (0, fs_1.writeFileSync)((0, path_1.join)(configDir, INSTANCES_ENV_FILE), `GITLAB_INSTANCES=${value}\n`, 'utf8');
246
320
  }
247
321
  function saveDockerCompose(config) {
248
322
  const configDir = getExpandedConfigDir();
@@ -363,6 +437,9 @@ function initDockerConfig(config = {}) {
363
437
  if (fullConfig.instances.length > 0) {
364
438
  saveInstances(fullConfig.instances);
365
439
  }
440
+ else if (fullConfig.oauthEnabled) {
441
+ saveServerInstances([]);
442
+ }
366
443
  return fullConfig;
367
444
  }
368
445
  function saveEnvFile(config) {
@@ -370,17 +447,50 @@ function saveEnvFile(config) {
370
447
  if (!(0, fs_1.existsSync)(configDir)) {
371
448
  (0, fs_1.mkdirSync)(configDir, { recursive: true });
372
449
  }
373
- const lines = [];
450
+ const managed = new Map();
374
451
  if (config.oauthSessionSecret) {
375
- lines.push(`OAUTH_SESSION_SECRET=${config.oauthSessionSecret}`);
452
+ managed.set('OAUTH_SESSION_SECRET', config.oauthSessionSecret);
453
+ }
454
+ if (config.oauthEnabled) {
455
+ managed.set('OAUTH_ISSUER', config.oauthIssuer ?? `http://localhost:${config.port}`);
376
456
  }
377
457
  if (config.deploymentType === 'compose-bundle' && config.oauthEnabled) {
378
- const pgPassword = (0, crypto_1.randomBytes)(24).toString('base64url');
379
- lines.push(`POSTGRES_PASSWORD=${pgPassword}`);
458
+ managed.set('POSTGRES_PASSWORD', (0, crypto_1.randomBytes)(24).toString('base64url'));
380
459
  }
381
- if (lines.length > 0) {
460
+ if (config.deploymentType === 'external-db' && config.oauthEnabled && config.databaseUrl) {
461
+ managed.set('OAUTH_STORAGE_POSTGRESQL_URL', envLiteralUrl(config.databaseUrl));
462
+ }
463
+ if (managed.size > 0) {
382
464
  const envPath = (0, path_1.join)(configDir, '.env');
383
- (0, fs_1.writeFileSync)(envPath, lines.join('\n') + '\n', { encoding: 'utf8', mode: 0o600 });
465
+ let existing = '';
466
+ if ((0, fs_1.existsSync)(envPath)) {
467
+ (0, fs_1.chmodSync)(envPath, 0o600);
468
+ existing = (0, fs_1.readFileSync)(envPath, 'utf8');
469
+ }
470
+ (0, fs_1.writeFileSync)(envPath, mergeEnvFile(existing, managed), { encoding: 'utf8', mode: 0o600 });
471
+ }
472
+ }
473
+ const GENERATED_ENV_KEYS = new Set(['OAUTH_SESSION_SECRET', 'POSTGRES_PASSWORD']);
474
+ function envLineKey(line) {
475
+ return /^\s*(?:export\s+)?([A-Za-z_]\w*)\s*=/.exec(line)?.[1];
476
+ }
477
+ function mergeEnvFile(existing, managed) {
478
+ const written = new Set();
479
+ const lines = existing === '' ? [] : existing.replace(/\n$/, '').split('\n');
480
+ const merged = lines.flatMap((line) => {
481
+ const key = envLineKey(line);
482
+ const value = key === undefined ? undefined : managed.get(key);
483
+ if (key === undefined || value === undefined)
484
+ return [line];
485
+ if (written.has(key))
486
+ return [];
487
+ written.add(key);
488
+ return [GENERATED_ENV_KEYS.has(key) ? line : `${key}=${value}`];
489
+ });
490
+ for (const [key, value] of managed) {
491
+ if (!written.has(key))
492
+ merged.push(`${key}=${value}`);
384
493
  }
494
+ return merged.join('\n') + '\n';
385
495
  }
386
496
  //# sourceMappingURL=docker-utils.js.map