@angelmsger/fx 0.10.1 → 0.12.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 (611) hide show
  1. package/CHANGELOG.md +166 -0
  2. package/README.md +13 -47
  3. package/defaults/tools.yaml +14 -0
  4. package/dist/adapters/agent-host/toml-mcp.js +1 -3
  5. package/dist/adapters/agent-host/toml-mcp.js.map +1 -1
  6. package/dist/adapters/calendar/wecom-calendar-cli/provider.js +42 -0
  7. package/dist/adapters/calendar/wecom-calendar-cli/provider.js.map +1 -0
  8. package/dist/adapters/ci/github-actions/ci.js +97 -0
  9. package/dist/adapters/ci/github-actions/ci.js.map +1 -0
  10. package/dist/adapters/ci/github-actions/provider.js +33 -0
  11. package/dist/adapters/ci/github-actions/provider.js.map +1 -0
  12. package/dist/adapters/ci/jenkins-cli/ci.js +6 -1
  13. package/dist/adapters/ci/jenkins-cli/ci.js.map +1 -1
  14. package/dist/adapters/cluster/kubectl/provider.js +2 -3
  15. package/dist/adapters/cluster/kubectl/provider.js.map +1 -1
  16. package/dist/adapters/code-host/bitbucket-cli/contribution-call.js +5 -27
  17. package/dist/adapters/code-host/bitbucket-cli/contribution-call.js.map +1 -1
  18. package/dist/adapters/code-host/bitbucket-cli/provider.js.map +1 -1
  19. package/dist/adapters/code-host/bitbucket-cli/pull-request-reference.js +1 -19
  20. package/dist/adapters/code-host/bitbucket-cli/pull-request-reference.js.map +1 -1
  21. package/dist/adapters/code-host/bitbucket-cli/pull-request.js +3 -17
  22. package/dist/adapters/code-host/bitbucket-cli/pull-request.js.map +1 -1
  23. package/dist/adapters/code-host/bitbucket-cli/repository-identity.js +1 -4
  24. package/dist/adapters/code-host/bitbucket-cli/repository-identity.js.map +1 -1
  25. package/dist/adapters/code-host/github/contribution.js +179 -0
  26. package/dist/adapters/code-host/github/contribution.js.map +1 -0
  27. package/dist/adapters/code-host/github/import.js +27 -0
  28. package/dist/adapters/code-host/github/import.js.map +1 -0
  29. package/dist/adapters/code-host/github/provider.js +205 -0
  30. package/dist/adapters/code-host/github/provider.js.map +1 -0
  31. package/dist/adapters/code-host/local-git/import.js +2 -2
  32. package/dist/adapters/code-host/local-git/import.js.map +1 -1
  33. package/dist/adapters/code-host/local-git/provider.js +3 -3
  34. package/dist/adapters/code-host/local-git/provider.js.map +1 -1
  35. package/dist/adapters/error-tracker/sentry/client.js +1 -1
  36. package/dist/adapters/error-tracker/sentry/client.js.map +1 -1
  37. package/dist/adapters/family/cli.js +15 -17
  38. package/dist/adapters/family/cli.js.map +1 -1
  39. package/dist/adapters/family/contribution.js +65 -0
  40. package/dist/adapters/family/contribution.js.map +1 -0
  41. package/dist/adapters/family/service-protocol.js +1 -0
  42. package/dist/adapters/family/service-protocol.js.map +1 -1
  43. package/dist/adapters/fs/node-fs.js +5 -8
  44. package/dist/adapters/fs/node-fs.js.map +1 -1
  45. package/dist/adapters/git/run.js +17 -0
  46. package/dist/adapters/git/run.js.map +1 -0
  47. package/dist/adapters/git/system-git.js +36 -16
  48. package/dist/adapters/git/system-git.js.map +1 -1
  49. package/dist/adapters/github/gh.js +103 -0
  50. package/dist/adapters/github/gh.js.map +1 -0
  51. package/dist/adapters/manifest-source/git-repo.js +38 -18
  52. package/dist/adapters/manifest-source/git-repo.js.map +1 -1
  53. package/dist/adapters/manifest-source/stdin.js +4 -6
  54. package/dist/adapters/manifest-source/stdin.js.map +1 -1
  55. package/dist/adapters/metrics/prometheus-cli/service.js +9 -1
  56. package/dist/adapters/metrics/prometheus-cli/service.js.map +1 -1
  57. package/dist/adapters/process/deadline-process.js +7 -3
  58. package/dist/adapters/process/deadline-process.js.map +1 -1
  59. package/dist/adapters/process/diagnostic-process.js +2 -3
  60. package/dist/adapters/process/diagnostic-process.js.map +1 -1
  61. package/dist/adapters/process/launch.js +55 -0
  62. package/dist/adapters/process/launch.js.map +1 -0
  63. package/dist/adapters/process/node-process.js +3 -3
  64. package/dist/adapters/process/node-process.js.map +1 -1
  65. package/dist/adapters/process/powershell.js +13 -2
  66. package/dist/adapters/process/powershell.js.map +1 -1
  67. package/dist/adapters/process/stdio-bridge.js +2 -2
  68. package/dist/adapters/process/stdio-bridge.js.map +1 -1
  69. package/dist/adapters/registry/registry-policy.js +4 -14
  70. package/dist/adapters/registry/registry-policy.js.map +1 -1
  71. package/dist/application/agent/list.js +12 -0
  72. package/dist/application/agent/list.js.map +1 -1
  73. package/dist/application/agent/pick.js +12 -30
  74. package/dist/application/agent/pick.js.map +1 -1
  75. package/dist/application/agent/workspace-cleanup.js +4 -1
  76. package/dist/application/agent/workspace-cleanup.js.map +1 -1
  77. package/dist/application/config/export.js +3 -2
  78. package/dist/application/config/export.js.map +1 -1
  79. package/dist/application/config/import-registry.js +3 -3
  80. package/dist/application/config/import-registry.js.map +1 -1
  81. package/dist/application/config/import.js +12 -4
  82. package/dist/application/config/import.js.map +1 -1
  83. package/dist/application/config/resolve.js +2 -4
  84. package/dist/application/config/resolve.js.map +1 -1
  85. package/dist/application/contribution/identity.js +3 -3
  86. package/dist/application/contribution/identity.js.map +1 -1
  87. package/dist/application/contribution/push-registered.js +77 -0
  88. package/dist/application/contribution/push-registered.js.map +1 -0
  89. package/dist/application/contribution/push.js +12 -19
  90. package/dist/application/contribution/push.js.map +1 -1
  91. package/dist/application/contribution/validate.js +12 -13
  92. package/dist/application/contribution/validate.js.map +1 -1
  93. package/dist/application/docs/derive.js +14 -5
  94. package/dist/application/docs/derive.js.map +1 -1
  95. package/dist/application/docs/rendered.js +2 -1
  96. package/dist/application/docs/rendered.js.map +1 -1
  97. package/dist/application/doctor/index.js +43 -27
  98. package/dist/application/doctor/index.js.map +1 -1
  99. package/dist/application/doctor/manifest.js +5 -1
  100. package/dist/application/doctor/manifest.js.map +1 -1
  101. package/dist/application/doctor/repos.js +1 -1
  102. package/dist/application/doctor/repos.js.map +1 -1
  103. package/dist/application/doctor/tools.js +20 -31
  104. package/dist/application/doctor/tools.js.map +1 -1
  105. package/dist/application/doctor/types.js +0 -8
  106. package/dist/application/doctor/types.js.map +1 -1
  107. package/dist/application/env/names.js.map +1 -1
  108. package/dist/application/harness/apply.js +4 -3
  109. package/dist/application/harness/apply.js.map +1 -1
  110. package/dist/application/harness/cleanup.js +5 -14
  111. package/dist/application/harness/cleanup.js.map +1 -1
  112. package/dist/application/harness/mcp-readiness.js +3 -1
  113. package/dist/application/harness/mcp-readiness.js.map +1 -1
  114. package/dist/application/harness/names.js +2 -4
  115. package/dist/application/harness/names.js.map +1 -1
  116. package/dist/application/harness/plan.js +12 -10
  117. package/dist/application/harness/plan.js.map +1 -1
  118. package/dist/application/harness/reconcile.js +4 -14
  119. package/dist/application/harness/reconcile.js.map +1 -1
  120. package/dist/application/harness/session.js +2 -13
  121. package/dist/application/harness/session.js.map +1 -1
  122. package/dist/application/harness/stages.js +8 -18
  123. package/dist/application/harness/stages.js.map +1 -1
  124. package/dist/application/harness/types.js +1 -8
  125. package/dist/application/harness/types.js.map +1 -1
  126. package/dist/application/hook/apply.js +5 -4
  127. package/dist/application/hook/apply.js.map +1 -1
  128. package/dist/application/hook/automatic-sync.js +8 -3
  129. package/dist/application/hook/automatic-sync.js.map +1 -1
  130. package/dist/application/hook/cleanup.js +5 -14
  131. package/dist/application/hook/cleanup.js.map +1 -1
  132. package/dist/application/hook/dispatch.js +24 -3
  133. package/dist/application/hook/dispatch.js.map +1 -1
  134. package/dist/application/hook/observe.js +11 -9
  135. package/dist/application/hook/observe.js.map +1 -1
  136. package/dist/application/hook/plan.js.map +1 -1
  137. package/dist/application/hook/reconcile.js +2 -9
  138. package/dist/application/hook/reconcile.js.map +1 -1
  139. package/dist/application/hook/session.js +5 -12
  140. package/dist/application/hook/session.js.map +1 -1
  141. package/dist/application/hook/supervisor-report.js +2 -1
  142. package/dist/application/hook/supervisor-report.js.map +1 -1
  143. package/dist/application/hook/types.js +8 -1
  144. package/dist/application/hook/types.js.map +1 -1
  145. package/dist/application/init/errors.js +19 -19
  146. package/dist/application/init/errors.js.map +1 -1
  147. package/dist/application/init/index.js +60 -42
  148. package/dist/application/init/index.js.map +1 -1
  149. package/dist/application/init/preview-initialization.js +40 -0
  150. package/dist/application/init/preview-initialization.js.map +1 -0
  151. package/dist/application/init/preview.js +37 -19
  152. package/dist/application/init/preview.js.map +1 -1
  153. package/dist/application/init/resume.js +30 -0
  154. package/dist/application/init/resume.js.map +1 -0
  155. package/dist/application/init/source.js +8 -0
  156. package/dist/application/init/source.js.map +1 -0
  157. package/dist/application/{doctor/login.js → login/check.js} +22 -43
  158. package/dist/application/login/check.js.map +1 -0
  159. package/dist/application/login/collect.js +14 -7
  160. package/dist/application/login/collect.js.map +1 -1
  161. package/dist/application/login/command-failure.js +2 -0
  162. package/dist/application/login/command-failure.js.map +1 -1
  163. package/dist/application/login/deps.js +2 -3
  164. package/dist/application/login/deps.js.map +1 -1
  165. package/dist/application/login/run.js +149 -54
  166. package/dist/application/login/run.js.map +1 -1
  167. package/dist/application/login/stage.js +146 -0
  168. package/dist/application/login/stage.js.map +1 -0
  169. package/dist/application/login/verify.js +45 -34
  170. package/dist/application/login/verify.js.map +1 -1
  171. package/dist/application/manifest/context.js +5 -1
  172. package/dist/application/manifest/context.js.map +1 -1
  173. package/dist/application/{import.js → manifest/import.js} +36 -28
  174. package/dist/application/manifest/import.js.map +1 -0
  175. package/dist/application/manifest/lint.js +15 -23
  176. package/dist/application/manifest/lint.js.map +1 -1
  177. package/dist/application/manifest/load.js +7 -11
  178. package/dist/application/manifest/load.js.map +1 -1
  179. package/dist/application/manifest/prepare.js +3 -2
  180. package/dist/application/manifest/prepare.js.map +1 -1
  181. package/dist/application/manifest/providers.js +4 -1
  182. package/dist/application/manifest/providers.js.map +1 -1
  183. package/dist/application/{refresh-manifest.js → manifest/refresh.js} +26 -2
  184. package/dist/application/manifest/refresh.js.map +1 -0
  185. package/dist/application/manifest/set.js +2 -1
  186. package/dist/application/manifest/set.js.map +1 -1
  187. package/dist/application/member/list.js +2 -4
  188. package/dist/application/member/list.js.map +1 -1
  189. package/dist/application/member/show.js +2 -3
  190. package/dist/application/member/show.js.map +1 -1
  191. package/dist/application/preparation.js +92 -25
  192. package/dist/application/preparation.js.map +1 -1
  193. package/dist/application/probe-record/index.js +19 -18
  194. package/dist/application/probe-record/index.js.map +1 -1
  195. package/dist/application/probe-record/plan.js +6 -4
  196. package/dist/application/probe-record/plan.js.map +1 -1
  197. package/dist/application/{can.js → readiness/can.js} +23 -11
  198. package/dist/application/readiness/can.js.map +1 -0
  199. package/dist/application/readiness/index.js +22 -35
  200. package/dist/application/readiness/index.js.map +1 -1
  201. package/dist/application/readiness/resolve.js +13 -15
  202. package/dist/application/readiness/resolve.js.map +1 -1
  203. package/dist/application/readiness/verdicts.js +2 -7
  204. package/dist/application/readiness/verdicts.js.map +1 -1
  205. package/dist/application/{where.js → readiness/where.js} +19 -21
  206. package/dist/application/readiness/where.js.map +1 -0
  207. package/dist/application/release/ci.js +16 -5
  208. package/dist/application/release/ci.js.map +1 -1
  209. package/dist/application/release/errors.js +4 -0
  210. package/dist/application/release/errors.js.map +1 -1
  211. package/dist/application/release/facts.js +24 -3
  212. package/dist/application/release/facts.js.map +1 -1
  213. package/dist/application/release/index.js +26 -22
  214. package/dist/application/release/index.js.map +1 -1
  215. package/dist/application/release/repo.js +109 -0
  216. package/dist/application/release/repo.js.map +1 -0
  217. package/dist/application/safety/trust.js +12 -14
  218. package/dist/application/safety/trust.js.map +1 -1
  219. package/dist/application/self/update.js +23 -13
  220. package/dist/application/self/update.js.map +1 -1
  221. package/dist/application/services/command.js +6 -8
  222. package/dist/application/services/command.js.map +1 -1
  223. package/dist/application/services/operation.js +12 -19
  224. package/dist/application/services/operation.js.map +1 -1
  225. package/dist/application/services/recipes.js +7 -2
  226. package/dist/application/services/recipes.js.map +1 -1
  227. package/dist/application/services/stage.js +6 -4
  228. package/dist/application/services/stage.js.map +1 -1
  229. package/dist/application/services/types.js +7 -1
  230. package/dist/application/services/types.js.map +1 -1
  231. package/dist/application/skill/copies.js +13 -22
  232. package/dist/application/skill/copies.js.map +1 -1
  233. package/dist/application/skill/fx-copies.js +1 -1
  234. package/dist/application/skill/fx-copies.js.map +1 -1
  235. package/dist/application/skill/stage.js +24 -26
  236. package/dist/application/skill/stage.js.map +1 -1
  237. package/dist/application/skill/standalone.js +1 -1
  238. package/dist/application/skill/standalone.js.map +1 -1
  239. package/dist/application/skill/targets.js +2 -16
  240. package/dist/application/skill/targets.js.map +1 -1
  241. package/dist/application/skill/tool-skills.js +20 -10
  242. package/dist/application/skill/tool-skills.js.map +1 -1
  243. package/dist/application/sync/checks.js +18 -45
  244. package/dist/application/sync/checks.js.map +1 -1
  245. package/dist/application/sync/index.js +76 -26
  246. package/dist/application/sync/index.js.map +1 -1
  247. package/dist/application/sync/stages.js +43 -26
  248. package/dist/application/sync/stages.js.map +1 -1
  249. package/dist/application/sync/types.js +6 -1
  250. package/dist/application/sync/types.js.map +1 -1
  251. package/dist/application/tool/check.js +8 -0
  252. package/dist/application/tool/check.js.map +1 -1
  253. package/dist/application/tool/history.js +16 -0
  254. package/dist/application/tool/history.js.map +1 -0
  255. package/dist/application/tool/initialize.js +2 -1
  256. package/dist/application/tool/initialize.js.map +1 -1
  257. package/dist/application/tool/install.js +15 -18
  258. package/dist/application/tool/install.js.map +1 -1
  259. package/dist/application/tool/installed.js +1 -1
  260. package/dist/application/tool/installed.js.map +1 -1
  261. package/dist/application/tool/list.js.map +1 -1
  262. package/dist/application/tool/scope.js +8 -7
  263. package/dist/application/tool/scope.js.map +1 -1
  264. package/dist/application/tool/select.js +2 -4
  265. package/dist/application/tool/select.js.map +1 -1
  266. package/dist/application/tool/show.js.map +1 -1
  267. package/dist/application/tool/toolchain.js +19 -6
  268. package/dist/application/tool/toolchain.js.map +1 -1
  269. package/dist/application/update/check.js +2 -1
  270. package/dist/application/update/check.js.map +1 -1
  271. package/dist/application/workspace/command-operation.js +4 -3
  272. package/dist/application/workspace/command-operation.js.map +1 -1
  273. package/dist/application/{workspace-context.js → workspace/context.js} +26 -19
  274. package/dist/application/workspace/context.js.map +1 -0
  275. package/dist/application/workspace/deps.js +3 -3
  276. package/dist/application/workspace/deps.js.map +1 -1
  277. package/dist/application/workspace/go-work.js +77 -0
  278. package/dist/application/workspace/go-work.js.map +1 -0
  279. package/dist/application/workspace/guidance.js +2 -4
  280. package/dist/application/workspace/guidance.js.map +1 -1
  281. package/dist/application/workspace/health.js +4 -2
  282. package/dist/application/workspace/health.js.map +1 -1
  283. package/dist/application/workspace/inspect.js +1 -4
  284. package/dist/application/workspace/inspect.js.map +1 -1
  285. package/dist/application/workspace/manage.js +83 -97
  286. package/dist/application/workspace/manage.js.map +1 -1
  287. package/dist/application/workspace/operation.js +13 -14
  288. package/dist/application/workspace/operation.js.map +1 -1
  289. package/dist/application/workspace/plan.js +2 -1
  290. package/dist/application/workspace/plan.js.map +1 -1
  291. package/dist/application/workspace/registry.js +4 -3
  292. package/dist/application/workspace/registry.js.map +1 -1
  293. package/dist/application/workspace/resolve.js +10 -12
  294. package/dist/application/workspace/resolve.js.map +1 -1
  295. package/dist/application/workspace/resources.js +47 -31
  296. package/dist/application/workspace/resources.js.map +1 -1
  297. package/dist/application/workspace/root-entries.js +3 -0
  298. package/dist/application/workspace/root-entries.js.map +1 -1
  299. package/dist/application/workspace/source-preview.js +6 -3
  300. package/dist/application/workspace/source-preview.js.map +1 -1
  301. package/dist/application/{status.js → workspace/status.js} +51 -6
  302. package/dist/application/workspace/status.js.map +1 -0
  303. package/dist/cli/base.js +25 -29
  304. package/dist/cli/base.js.map +1 -1
  305. package/dist/cli/commands/agent/pick.js +4 -1
  306. package/dist/cli/commands/agent/pick.js.map +1 -1
  307. package/dist/cli/commands/agent/unpick.js +5 -1
  308. package/dist/cli/commands/agent/unpick.js.map +1 -1
  309. package/dist/cli/commands/aliases.js +1 -0
  310. package/dist/cli/commands/aliases.js.map +1 -1
  311. package/dist/cli/commands/can.js +5 -21
  312. package/dist/cli/commands/can.js.map +1 -1
  313. package/dist/cli/commands/config/import.js +1 -8
  314. package/dist/cli/commands/config/import.js.map +1 -1
  315. package/dist/cli/commands/doctor.js +2 -1
  316. package/dist/cli/commands/doctor.js.map +1 -1
  317. package/dist/cli/commands/env/pick.js +1 -0
  318. package/dist/cli/commands/env/pick.js.map +1 -1
  319. package/dist/cli/commands/env/select.js +1 -0
  320. package/dist/cli/commands/env/select.js.map +1 -1
  321. package/dist/cli/commands/env/unpick.js +1 -0
  322. package/dist/cli/commands/env/unpick.js.map +1 -1
  323. package/dist/cli/commands/hook/disable.js +1 -0
  324. package/dist/cli/commands/hook/disable.js.map +1 -1
  325. package/dist/cli/commands/hook/enable.js +1 -0
  326. package/dist/cli/commands/hook/enable.js.map +1 -1
  327. package/dist/cli/commands/index.js +3 -3
  328. package/dist/cli/commands/index.js.map +1 -1
  329. package/dist/cli/commands/init.js +14 -11
  330. package/dist/cli/commands/init.js.map +1 -1
  331. package/dist/cli/commands/login.js +13 -2
  332. package/dist/cli/commands/login.js.map +1 -1
  333. package/dist/cli/commands/manifest/import.js +6 -2
  334. package/dist/cli/commands/manifest/import.js.map +1 -1
  335. package/dist/cli/commands/manifest/lint.js +5 -1
  336. package/dist/cli/commands/manifest/lint.js.map +1 -1
  337. package/dist/cli/commands/manifest/record-probe.js +1 -0
  338. package/dist/cli/commands/manifest/record-probe.js.map +1 -1
  339. package/dist/cli/commands/manifest/render.js +1 -0
  340. package/dist/cli/commands/manifest/render.js.map +1 -1
  341. package/dist/cli/commands/manifest/repo-set.js +1 -0
  342. package/dist/cli/commands/manifest/repo-set.js.map +1 -1
  343. package/dist/cli/commands/{release.js → release/check.js} +14 -13
  344. package/dist/cli/commands/release/check.js.map +1 -0
  345. package/dist/cli/commands/repo/add.js +1 -0
  346. package/dist/cli/commands/repo/add.js.map +1 -1
  347. package/dist/cli/commands/repo/fork.js +1 -0
  348. package/dist/cli/commands/repo/fork.js.map +1 -1
  349. package/dist/cli/commands/repo/pick.js +1 -0
  350. package/dist/cli/commands/repo/pick.js.map +1 -1
  351. package/dist/cli/commands/repo/remove.js +1 -0
  352. package/dist/cli/commands/repo/remove.js.map +1 -1
  353. package/dist/cli/commands/repo/select.js +1 -0
  354. package/dist/cli/commands/repo/select.js.map +1 -1
  355. package/dist/cli/commands/repo/unpick.js +1 -0
  356. package/dist/cli/commands/repo/unpick.js.map +1 -1
  357. package/dist/cli/commands/selection.js +1 -2
  358. package/dist/cli/commands/selection.js.map +1 -1
  359. package/dist/cli/commands/self/info.js +2 -2
  360. package/dist/cli/commands/self/info.js.map +1 -1
  361. package/dist/cli/commands/self/update.js +11 -14
  362. package/dist/cli/commands/self/update.js.map +1 -1
  363. package/dist/cli/commands/source/push.js +14 -13
  364. package/dist/cli/commands/source/push.js.map +1 -1
  365. package/dist/cli/commands/status.js +6 -36
  366. package/dist/cli/commands/status.js.map +1 -1
  367. package/dist/cli/commands/sync.js +7 -5
  368. package/dist/cli/commands/sync.js.map +1 -1
  369. package/dist/cli/commands/tool/history.js +2 -2
  370. package/dist/cli/commands/tool/history.js.map +1 -1
  371. package/dist/cli/commands/where.js +2 -1
  372. package/dist/cli/commands/where.js.map +1 -1
  373. package/dist/cli/commands/workspace/rebind.js +1 -4
  374. package/dist/cli/commands/workspace/rebind.js.map +1 -1
  375. package/dist/cli/completion.js +2 -4
  376. package/dist/cli/completion.js.map +1 -1
  377. package/dist/cli/flags.js +2 -2
  378. package/dist/cli/flags.js.map +1 -1
  379. package/dist/cli/help.js +2 -8
  380. package/dist/cli/help.js.map +1 -1
  381. package/dist/cli/hook-command.js +2 -2
  382. package/dist/cli/hook-command.js.map +1 -1
  383. package/dist/cli/main.js +4 -3
  384. package/dist/cli/main.js.map +1 -1
  385. package/dist/cli/notices.js +26 -24
  386. package/dist/cli/notices.js.map +1 -1
  387. package/dist/cli/preparation-view.js +170 -52
  388. package/dist/cli/preparation-view.js.map +1 -1
  389. package/dist/cli/release-view.js +105 -17
  390. package/dist/cli/release-view.js.map +1 -1
  391. package/dist/cli/render/exceptional.js +11 -4
  392. package/dist/cli/render/exceptional.js.map +1 -1
  393. package/dist/cli/render/fields.js +1 -3
  394. package/dist/cli/render/fields.js.map +1 -1
  395. package/dist/cli/render/human.js +1 -3
  396. package/dist/cli/render/human.js.map +1 -1
  397. package/dist/cli/render/index.js +1 -1
  398. package/dist/cli/render/index.js.map +1 -1
  399. package/dist/cli/render/report.js +1 -1
  400. package/dist/cli/render/report.js.map +1 -1
  401. package/dist/cli/render/status-line.js +17 -3
  402. package/dist/cli/render/status-line.js.map +1 -1
  403. package/dist/cli/render/tone.js +29 -10
  404. package/dist/cli/render/tone.js.map +1 -1
  405. package/dist/cli/route/index.js +13 -1
  406. package/dist/cli/route/index.js.map +1 -1
  407. package/dist/cli/tool-command.js +4 -11
  408. package/dist/cli/tool-command.js.map +1 -1
  409. package/dist/cli/workspace-write-policy.js +8 -33
  410. package/dist/cli/workspace-write-policy.js.map +1 -1
  411. package/dist/composition/agent-cleanup.js +5 -1
  412. package/dist/composition/agent-cleanup.js.map +1 -1
  413. package/dist/composition/bundled.js +7 -1
  414. package/dist/composition/bundled.js.map +1 -1
  415. package/dist/composition/command-wiring.js +44 -99
  416. package/dist/composition/command-wiring.js.map +1 -1
  417. package/dist/composition/container.js +25 -20
  418. package/dist/composition/container.js.map +1 -1
  419. package/dist/composition/contributions.js +26 -71
  420. package/dist/composition/contributions.js.map +1 -1
  421. package/dist/composition/harness.js +3 -4
  422. package/dist/composition/harness.js.map +1 -1
  423. package/dist/composition/hook-entry.js +2 -1
  424. package/dist/composition/hook-entry.js.map +1 -1
  425. package/dist/composition/hook-wiring.js +8 -16
  426. package/dist/composition/hook-wiring.js.map +1 -1
  427. package/dist/composition/hook-worker.js +9 -11
  428. package/dist/composition/hook-worker.js.map +1 -1
  429. package/dist/composition/hooks.js +6 -3
  430. package/dist/composition/hooks.js.map +1 -1
  431. package/dist/composition/import.js +8 -6
  432. package/dist/composition/import.js.map +1 -1
  433. package/dist/composition/manifest-edit.js +1 -2
  434. package/dist/composition/manifest-edit.js.map +1 -1
  435. package/dist/composition/manifest-sources.js +3 -16
  436. package/dist/composition/manifest-sources.js.map +1 -1
  437. package/dist/composition/probe-record.js +1 -2
  438. package/dist/composition/probe-record.js.map +1 -1
  439. package/dist/composition/refresh.js +1 -1
  440. package/dist/composition/refresh.js.map +1 -1
  441. package/dist/composition/registry.js +12 -37
  442. package/dist/composition/registry.js.map +1 -1
  443. package/dist/composition/tool-install.js +5 -1
  444. package/dist/composition/tool-install.js.map +1 -1
  445. package/dist/composition/tool-inventory.js +10 -1
  446. package/dist/composition/tool-inventory.js.map +1 -1
  447. package/dist/composition/trace.js +3 -4
  448. package/dist/composition/trace.js.map +1 -1
  449. package/dist/composition/update.js +12 -1
  450. package/dist/composition/update.js.map +1 -1
  451. package/dist/composition/workspace-management.js +8 -2
  452. package/dist/composition/workspace-management.js.map +1 -1
  453. package/dist/domain/config/codec.js +2 -1
  454. package/dist/domain/config/codec.js.map +1 -1
  455. package/dist/domain/config/profile.js +0 -1
  456. package/dist/domain/config/profile.js.map +1 -1
  457. package/dist/domain/contribution/pull-request.js +12 -1
  458. package/dist/domain/contribution/pull-request.js.map +1 -1
  459. package/dist/domain/contribution/selection.js +4 -8
  460. package/dist/domain/contribution/selection.js.map +1 -1
  461. package/dist/domain/errors.js +10 -3
  462. package/dist/domain/errors.js.map +1 -1
  463. package/dist/domain/fuzzy.js +6 -1
  464. package/dist/domain/fuzzy.js.map +1 -1
  465. package/dist/domain/harness/actions.js +60 -0
  466. package/dist/domain/harness/actions.js.map +1 -0
  467. package/dist/domain/harness/deadlines.js +14 -0
  468. package/dist/domain/harness/deadlines.js.map +1 -0
  469. package/dist/domain/harness/hooks.js +8 -0
  470. package/dist/domain/harness/hooks.js.map +1 -1
  471. package/dist/domain/harness/session-start.js +2 -1
  472. package/dist/domain/harness/session-start.js.map +1 -1
  473. package/dist/domain/harness/state-recovery.js.map +1 -1
  474. package/dist/domain/import/infer.js +2 -9
  475. package/dist/domain/import/infer.js.map +1 -1
  476. package/dist/domain/lease.js +30 -0
  477. package/dist/domain/lease.js.map +1 -0
  478. package/dist/domain/manifest/decode.js +5 -8
  479. package/dist/domain/manifest/decode.js.map +1 -1
  480. package/dist/domain/manifest/document.js +3 -5
  481. package/dist/domain/manifest/document.js.map +1 -1
  482. package/dist/domain/manifest/editor.js +3 -7
  483. package/dist/domain/manifest/editor.js.map +1 -1
  484. package/dist/domain/manifest/explain.js +2 -4
  485. package/dist/domain/manifest/explain.js.map +1 -1
  486. package/dist/domain/manifest/files.js +8 -7
  487. package/dist/domain/manifest/files.js.map +1 -1
  488. package/dist/domain/manifest/issues.js +2 -2
  489. package/dist/domain/manifest/issues.js.map +1 -1
  490. package/dist/domain/manifest/lint.js +4 -3
  491. package/dist/domain/manifest/lint.js.map +1 -1
  492. package/dist/domain/manifest/loader.js +2 -1
  493. package/dist/domain/manifest/loader.js.map +1 -1
  494. package/dist/domain/manifest/overlay.js +6 -9
  495. package/dist/domain/manifest/overlay.js.map +1 -1
  496. package/dist/domain/manifest/providers.js +34 -2
  497. package/dist/domain/manifest/providers.js.map +1 -1
  498. package/dist/domain/manifest/quarantine.js +21 -1
  499. package/dist/domain/manifest/quarantine.js.map +1 -1
  500. package/dist/domain/manifest/reflect.js +2 -31
  501. package/dist/domain/manifest/reflect.js.map +1 -1
  502. package/dist/domain/manifest/rules/harness.js +2 -16
  503. package/dist/domain/manifest/rules/harness.js.map +1 -1
  504. package/dist/domain/manifest/service.schema.js +5 -14
  505. package/dist/domain/manifest/service.schema.js.map +1 -1
  506. package/dist/domain/manifest/skill-frontmatter.js +1 -1
  507. package/dist/domain/manifest/skill-frontmatter.js.map +1 -1
  508. package/dist/domain/manifest/types.js.map +1 -1
  509. package/dist/domain/manifest/workspace.schema.js +9 -0
  510. package/dist/domain/manifest/workspace.schema.js.map +1 -1
  511. package/dist/domain/outcome.js +5 -0
  512. package/dist/domain/outcome.js.map +1 -0
  513. package/dist/domain/path.js +9 -1
  514. package/dist/domain/path.js.map +1 -1
  515. package/dist/domain/preparation.js.map +1 -1
  516. package/dist/domain/projection.js +8 -0
  517. package/dist/domain/projection.js.map +1 -0
  518. package/dist/domain/public-url.js +22 -0
  519. package/dist/domain/public-url.js.map +1 -0
  520. package/dist/domain/release/ci.js +29 -15
  521. package/dist/domain/release/ci.js.map +1 -1
  522. package/dist/domain/release/deps.js +3 -1
  523. package/dist/domain/release/deps.js.map +1 -1
  524. package/dist/domain/release/errors.js +8 -8
  525. package/dist/domain/release/errors.js.map +1 -1
  526. package/dist/domain/release/merge.js +26 -13
  527. package/dist/domain/release/merge.js.map +1 -1
  528. package/dist/domain/release/policy.js +2 -0
  529. package/dist/domain/release/policy.js.map +1 -1
  530. package/dist/domain/release/types.js +2 -1
  531. package/dist/domain/release/types.js.map +1 -1
  532. package/dist/domain/release/version.js +133 -0
  533. package/dist/domain/release/version.js.map +1 -0
  534. package/dist/domain/release/window.js +1 -1
  535. package/dist/domain/release/window.js.map +1 -1
  536. package/dist/domain/report.js +1 -1
  537. package/dist/domain/report.js.map +1 -1
  538. package/dist/domain/setup/names.js +23 -0
  539. package/dist/domain/setup/names.js.map +1 -0
  540. package/dist/domain/setup/planner.js +26 -26
  541. package/dist/domain/setup/planner.js.map +1 -1
  542. package/dist/domain/setup/progress.js +57 -0
  543. package/dist/domain/setup/progress.js.map +1 -0
  544. package/dist/domain/setup/types.js +5 -0
  545. package/dist/domain/setup/types.js.map +1 -1
  546. package/dist/domain/shell.js +0 -7
  547. package/dist/domain/shell.js.map +1 -1
  548. package/dist/domain/skills/frontmatter.js +1 -1
  549. package/dist/domain/skills/frontmatter.js.map +1 -1
  550. package/dist/domain/skills/projection.js +2 -3
  551. package/dist/domain/skills/projection.js.map +1 -1
  552. package/dist/domain/sync-selection.js +2 -4
  553. package/dist/domain/sync-selection.js.map +1 -1
  554. package/dist/domain/toolchain/resolve.js +4 -0
  555. package/dist/domain/toolchain/resolve.js.map +1 -1
  556. package/dist/domain/toolchain/select.js +15 -9
  557. package/dist/domain/toolchain/select.js.map +1 -1
  558. package/dist/domain/toolchain/stderr.js +34 -14
  559. package/dist/domain/toolchain/stderr.js.map +1 -1
  560. package/dist/domain/values.js +18 -2
  561. package/dist/domain/values.js.map +1 -1
  562. package/dist/domain/workspace/commits.js +9 -1
  563. package/dist/domain/workspace/commits.js.map +1 -1
  564. package/dist/domain/workspace/go-work.js +75 -0
  565. package/dist/domain/workspace/go-work.js.map +1 -0
  566. package/dist/domain/workspace/operation-journal.js +93 -0
  567. package/dist/domain/workspace/operation-journal.js.map +1 -0
  568. package/dist/domain/workspace/plan.js +17 -1
  569. package/dist/domain/workspace/plan.js.map +1 -1
  570. package/dist/domain/workspace/ref.js +3 -0
  571. package/dist/domain/workspace/ref.js.map +1 -1
  572. package/dist/infra/config-store.js +8 -13
  573. package/dist/infra/config-store.js.map +1 -1
  574. package/dist/infra/contribution-store.js +21 -67
  575. package/dist/infra/contribution-store.js.map +1 -1
  576. package/dist/infra/harness-state.js +21 -49
  577. package/dist/infra/harness-state.js.map +1 -1
  578. package/dist/infra/local-store.js +8 -15
  579. package/dist/infra/local-store.js.map +1 -1
  580. package/dist/infra/owned-journal.js +57 -0
  581. package/dist/infra/owned-journal.js.map +1 -0
  582. package/dist/infra/projection-store.js +4 -3
  583. package/dist/infra/projection-store.js.map +1 -1
  584. package/dist/infra/tool-history.js +19 -49
  585. package/dist/infra/tool-history.js.map +1 -1
  586. package/dist/infra/trust-store.js +2 -9
  587. package/dist/infra/trust-store.js.map +1 -1
  588. package/dist/infra/workspace-home.js +7 -1
  589. package/dist/infra/workspace-home.js.map +1 -1
  590. package/dist/ports/ci.js +2 -1
  591. package/dist/ports/ci.js.map +1 -1
  592. package/package.json +4 -1
  593. package/skills/fx-workspace/SKILL.md +2 -3
  594. package/skills/fx-workspace/references/commands.md +64 -53
  595. package/skills/fx-workspace/references/workspace-tasks.md +12 -12
  596. package/dist/application/can.js.map +0 -1
  597. package/dist/application/doctor/login.js.map +0 -1
  598. package/dist/application/import.js.map +0 -1
  599. package/dist/application/init/setup.js +0 -125
  600. package/dist/application/init/setup.js.map +0 -1
  601. package/dist/application/preview-initialization.js +0 -41
  602. package/dist/application/preview-initialization.js.map +0 -1
  603. package/dist/application/refresh-manifest.js.map +0 -1
  604. package/dist/application/refresh-workspace-manifest.js +0 -27
  605. package/dist/application/refresh-workspace-manifest.js.map +0 -1
  606. package/dist/application/status.js.map +0 -1
  607. package/dist/application/where.js.map +0 -1
  608. package/dist/application/workspace-context.js.map +0 -1
  609. package/dist/cli/commands/release.js.map +0 -1
  610. package/dist/domain/deadline.js +0 -17
  611. package/dist/domain/deadline.js.map +0 -1
@@ -0,0 +1,103 @@
1
+ // gh, the GitHub CLI, serves two providers: the github code host and GitHub Actions
2
+ // ci. This is the one place that runs it. gh reports a failed request as an HTTP
3
+ // status on stderr, so a failure is translated into the family's exit categories and
4
+ // classified by the same `queryFailed` every companion's failures go through.
5
+ import { stderrReason } from '../../domain/toolchain/stderr.js';
6
+ import { EXIT, toolMissing } from '../family/cli.js';
7
+ export const BINARY = 'gh';
8
+ export const DEFAULT_HOSTNAME = 'github.com';
9
+ // gh signs in per host, so the step is per host too: a binding names its host through
10
+ // `hostname` (see `recipeVars`), the same host from both providers is planned once, and
11
+ // two hosts are two steps. Only the active account of that host is checked, the one gh
12
+ // will use.
13
+ export const GH_RECIPES = [
14
+ {
15
+ id: 'login-{hostname}',
16
+ tool: BINARY,
17
+ perEnv: false,
18
+ kind: 'run',
19
+ phase: 'authenticate',
20
+ title: 'Log in to GitHub at {hostname}',
21
+ instructions: 'Signs gh in through the browser or with a token. fx reads repositories and Actions runs with that sign-in; private repositories need the repo scope gh asks for by default.',
22
+ run: ['auth', 'login', '--hostname', '{hostname}'],
23
+ verify: { command: ['auth', 'status', '--active', '--hostname', '{hostname}'] },
24
+ },
25
+ ];
26
+ // gh's own [HOST/]OWNER/NAME. Left without a host, gh would pick one from GH_HOST or
27
+ // its configuration, so a bare OWNER/NAME is spelled out as github.com's.
28
+ export function qualifiedRepository(repository) {
29
+ const parts = repository.split('/');
30
+ if (parts.length > 2)
31
+ return { hostname: parts[0] ?? DEFAULT_HOSTNAME, repository };
32
+ return { hostname: DEFAULT_HOSTNAME, repository: `${DEFAULT_HOSTNAME}/${repository}` };
33
+ }
34
+ export class GhCli {
35
+ process;
36
+ constructor(process) {
37
+ this.process = process;
38
+ }
39
+ async call(args, options = {}) {
40
+ const result = await this.process.run([BINARY, ...args], {
41
+ timeoutMs: options.timeoutMs,
42
+ diagnostic: { phase: `${BINARY} ${args.slice(0, 2).join(' ')}`.trim() },
43
+ });
44
+ if (result.notStarted)
45
+ throw toolMissing(BINARY);
46
+ if (result.code === 0)
47
+ return { code: 0, stdout: result.stdout, data: parse(result.stdout), error: undefined };
48
+ const status = httpStatus(result.stderr);
49
+ const message = stderrReason(result.stderr, result.code).replace(/^gh: /, '');
50
+ return {
51
+ code: exitOf(result.code, status, message),
52
+ stdout: result.stdout,
53
+ data: undefined,
54
+ error: { message, ...(status === undefined ? {} : { http_status: status }) },
55
+ };
56
+ }
57
+ }
58
+ // `--paginate --jq` prints one JSON value per line. A line that does not parse makes
59
+ // the whole answer unreadable rather than shorter.
60
+ export function jsonLines(text) {
61
+ const values = [];
62
+ for (const line of text.split('\n')) {
63
+ if (line.trim() === '')
64
+ continue;
65
+ const value = parse(line);
66
+ if (value === undefined)
67
+ return undefined;
68
+ values.push(value);
69
+ }
70
+ return values;
71
+ }
72
+ // `gh api` ends its message with "(HTTP 404)"; other commands open it with "HTTP 404:".
73
+ function httpStatus(stderr) {
74
+ const match = /\(HTTP (\d{3})\)|^HTTP (\d{3}):/m.exec(stderr);
75
+ const status = match?.[1] ?? match?.[2];
76
+ return status === undefined ? undefined : Number(status);
77
+ }
78
+ // gh's own exit 4 means it holds no credential at all. Any other failure is a plain
79
+ // failure: gh's remaining codes (cancelled, pending checks) would read as categories.
80
+ function exitOf(code, status, message) {
81
+ if (code === 4 || status === 401)
82
+ return EXIT.auth;
83
+ if (status === 429 || (status === 403 && /rate limit/i.test(message)))
84
+ return EXIT.rate_limit;
85
+ if (status === 403)
86
+ return EXIT.permission;
87
+ if (status === 404)
88
+ return EXIT.not_found;
89
+ if (status !== undefined && status >= 500)
90
+ return EXIT.server;
91
+ if (/error connecting to/i.test(message))
92
+ return EXIT.network;
93
+ return 1;
94
+ }
95
+ function parse(text) {
96
+ try {
97
+ return JSON.parse(text);
98
+ }
99
+ catch {
100
+ return undefined;
101
+ }
102
+ }
103
+ //# sourceMappingURL=gh.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"gh.js","sourceRoot":"","sources":["../../../src/adapters/github/gh.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,8 @@
1
1
  // Materialize and safely refresh Git manifest checkouts, preserving local work.
2
- import { realpath } from 'node:fs/promises';
3
2
  import path from 'node:path';
4
3
  import { DevkitError } from '../../domain/errors.js';
4
+ import { messageOf } from '../../domain/values.js';
5
+ import { lastLine, runGit } from '../git/run.js';
5
6
  import { PAYLOAD_PATHS } from './payload.js';
6
7
  export class GitRepoSource {
7
8
  url;
@@ -37,8 +38,7 @@ export class GitRepoSource {
37
38
  const head = await this.git.sha(dir, 'HEAD');
38
39
  if (head === undefined)
39
40
  return undefined;
40
- const ancestor = await this.process.run([
41
- 'git',
41
+ const ancestor = await runGit(this.process, [
42
42
  '-C',
43
43
  this.localDirectory,
44
44
  'merge-base',
@@ -58,9 +58,8 @@ export class GitRepoSource {
58
58
  if (state.untracked > 0)
59
59
  return 'untracked files in the manifest source';
60
60
  const [untracked, ignored] = await Promise.all([
61
- this.process.run(['git', '-C', dir, 'ls-files', '--others', '--exclude-standard']),
62
- this.process.run([
63
- 'git',
61
+ runGit(this.process, ['-C', dir, 'ls-files', '--others', '--exclude-standard']),
62
+ runGit(this.process, [
64
63
  '-C',
65
64
  dir,
66
65
  'ls-files',
@@ -90,7 +89,7 @@ export class GitRepoSource {
90
89
  root: `${dir}@${ref}`,
91
90
  contents: 'commit',
92
91
  readText: async (file) => {
93
- const result = await this.process.run(['git', '-C', dir, 'show', `${ref}:${file}`]);
92
+ const result = await runGit(this.process, ['-C', dir, 'show', `${ref}:${file}`]);
94
93
  if (result.code === 0)
95
94
  return result.stdout;
96
95
  if (file !== 'manifest/workspace.yaml')
@@ -104,16 +103,14 @@ export class GitRepoSource {
104
103
  };
105
104
  }
106
105
  async materialize(dir) {
107
- const top = await this.git.toplevel(dir);
108
- if (top !== undefined && top === (await realpath(dir))) {
106
+ if (await this.git.isToplevel(dir)) {
109
107
  const remotes = await this.git.remotes(dir);
110
108
  if (remotes['upstream'] !== this.url)
111
109
  throw new DevkitError('conflict', 'SOURCE_MISMATCH', 'Existing manifest checkout has a different upstream', { nextSteps: ['Inspect the existing source checkout before retrying.'] });
112
110
  await this.refresh(dir);
113
111
  return;
114
112
  }
115
- const result = await this.process.run([
116
- 'git',
113
+ const result = await runGit(this.process, [
117
114
  'clone',
118
115
  '--quiet',
119
116
  '--origin',
@@ -133,7 +130,7 @@ export class GitRepoSource {
133
130
  await this.git.fetch(dir, 'upstream');
134
131
  }
135
132
  catch (err) {
136
- throw new DevkitError('network', 'MANIFEST_REFRESH_FAILED', `Could not fetch the manifest repository into ${dir}: ${err instanceof Error ? err.message : String(err)}`, {
133
+ throw new DevkitError('network', 'MANIFEST_REFRESH_FAILED', `Could not fetch the manifest repository into ${dir}: ${messageOf(err)}`, {
137
134
  hint: 'The manifest repository must be reachable with your git credentials.',
138
135
  nextSteps: [`git -C ${dir} fetch upstream`],
139
136
  });
@@ -144,19 +141,42 @@ export class GitRepoSource {
144
141
  const onBranch = state.branch === branch;
145
142
  const protection = await this.worktreeProtection(dir, state);
146
143
  if (protection !== undefined)
147
- return kept(protection);
144
+ return kept(protection + (await this.landed(dir, state, branch)));
148
145
  const outcome = await this.git.fastForward(dir, 'upstream', branch);
149
146
  if (outcome === 'diverged') {
150
147
  const suffix = onBranch ? '' : '; its ref was not moved';
151
148
  return kept(`local commits on ${branch} diverge from upstream${suffix}`);
152
149
  }
150
+ if (outcome === 'empty_remote')
151
+ return kept('upstream has no branches yet');
152
+ if (outcome === 'no_remote_branch')
153
+ return kept(`upstream has no ${branch} branch`);
153
154
  if (!onBranch)
154
- return kept(`on ${state.branch ?? 'a detached HEAD'}, not ${branch}; only the ${branch} ref moved`);
155
+ return kept(`on ${state.branch ?? 'a detached HEAD'}, not ${branch}; only the ${branch} ref moved` +
156
+ (await this.landed(dir, state, branch)));
155
157
  return { result: outcome };
156
158
  }
157
- }
158
- function lastLine(text) {
159
- const lines = text.trim().split('\n');
160
- return lines[lines.length - 1] ?? '';
159
+ // Whether the commits of a checkout kept on another branch already reached upstream,
160
+ // so the person knows returning to the default branch loses nothing committed.
161
+ async landed(dir, state, branch) {
162
+ if (state.branch === branch)
163
+ return '';
164
+ const target = `upstream/${branch}`;
165
+ const merged = await runGit(this.process, [
166
+ '-C',
167
+ dir,
168
+ 'merge-base',
169
+ '--is-ancestor',
170
+ 'HEAD',
171
+ target,
172
+ ]);
173
+ if (merged.code === 0)
174
+ return `; its commits are already in ${target}`;
175
+ const [head, upstream] = await Promise.all([
176
+ this.git.sha(dir, 'HEAD^{tree}'),
177
+ this.git.sha(dir, `${target}^{tree}`),
178
+ ]);
179
+ return head !== undefined && head === upstream ? `; its content matches ${target}` : '';
180
+ }
161
181
  }
162
182
  //# sourceMappingURL=git-repo.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"git-repo.js","sourceRoot":"","sources":["../../../src/adapters/manifest-source/git-repo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git-repo.js","sourceRoot":"","sources":["../../../src/adapters/manifest-source/git-repo.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ import { randomUUID } from 'node:crypto';
4
4
  import YAML from 'yaml';
5
5
  import { DevkitError } from '../../domain/errors.js';
6
6
  import { MANIFEST_FILES } from '../../domain/manifest/files.js';
7
+ import { isRecord } from '../../domain/values.js';
7
8
  import { FileSource } from './file.js';
8
9
  import { assertPayloadPath } from './payload.js';
9
10
  export class StdinSource {
@@ -47,9 +48,9 @@ export class StdinSource {
47
48
  catch {
48
49
  throw invalid('stdin must contain valid YAML or JSON');
49
50
  }
50
- if (!record(value) || !('source_version' in value))
51
+ if (!isRecord(value) || !('source_version' in value))
51
52
  return [{ name: MANIFEST_FILES.workspace, bytes: Buffer.from(this.text), executable: false }];
52
- if (value['source_version'] !== 1 || !record(value['files']))
53
+ if (value['source_version'] !== 1 || !isRecord(value['files']))
53
54
  throw invalid('Expected source_version: 1 and a files mapping');
54
55
  const files = Object.entries(value['files']).map(([name, content]) => decode(name, content));
55
56
  if (!files.some((file) => file.name === MANIFEST_FILES.workspace))
@@ -60,16 +61,13 @@ export class StdinSource {
60
61
  return files;
61
62
  }
62
63
  }
63
- function record(value) {
64
- return value !== null && typeof value === 'object' && !Array.isArray(value);
65
- }
66
64
  function decode(name, content) {
67
65
  assertPayloadPath(name);
68
66
  if (name === 'docs' || name === 'skills')
69
67
  throw invalid(`${name} must contain files`);
70
68
  if (typeof content === 'string')
71
69
  return { name, bytes: Buffer.from(content), executable: false };
72
- if (!record(content) ||
70
+ if (!isRecord(content) ||
73
71
  typeof content['base64'] !== 'string' ||
74
72
  (content['executable'] !== undefined && typeof content['executable'] !== 'boolean'))
75
73
  throw invalid(`${name} must be text or {base64, executable?}`);
@@ -1 +1 @@
1
- {"version":3,"file":"stdin.js","sourceRoot":"","sources":["../../../src/adapters/manifest-source/stdin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stdin.js","sourceRoot":"","sources":["../../../src/adapters/manifest-source/stdin.ts"],"names":[],"mappings":"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"}
@@ -5,11 +5,19 @@ import { familyService, serviceScope } from '../../family/service.js';
5
5
  export const BINARY = 'prometheus-cli';
6
6
  // `auth status` exits zero when the server does not answer, so only `authenticated` tells.
7
7
  // Its own request timeout stays under fx's check deadline: a server that never answers is
8
- // then the companion's verdict rather than a check fx had to abandon.
8
+ // then the companion's verdict rather than a check fx had to abandon. prometheus-cli says
9
+ // `request to <url> failed` only when no HTTP answer came back at all.
9
10
  export function answers(scope) {
10
11
  return {
11
12
  command: [...scope, '--timeout', '10s', 'auth', 'status', '--format', 'json'],
12
13
  json: { path: 'authenticated', equals: true, reason: 'error' },
14
+ failures: [
15
+ {
16
+ cause: 'network',
17
+ stdout: '"error":\\s*"request to [^"]* failed"',
18
+ instructions: 'The server did not answer from this machine. Connect to the network it is served on, then check again; no sign-in is involved.',
19
+ },
20
+ ],
13
21
  };
14
22
  }
15
23
  export function prometheusService(settings) {
@@ -1 +1 @@
1
- {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../src/adapters/metrics/prometheus-cli/service.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,0FAA0F;AAC1F,6FAA6F;AAK7F,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEtE,MAAM,CAAC,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAEvC,2FAA2F;AAC3F,0FAA0F;AAC1F,sEAAsE;AACtE,MAAM,UAAU,OAAO,CAAC,KAAwB;IAC9C,OAAO;QACL,OAAO,EAAE,CAAC,GAAG,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC;QAC7E,IAAI,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;KAC/D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAyB;IACzD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IACzE,IAAI,QAAQ,CAAC,WAAW,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IACnD,OAAO;QACL,GAAG,MAAM;QACT,OAAO,EAAE;YACP;gBACE,EAAE,EAAE,QAAQ;gBACZ,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,6BAA6B;gBACpC,YAAY,EACV,2GAA2G;gBAC7G,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;aACxC;SACF;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../src/adapters/metrics/prometheus-cli/service.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,0FAA0F;AAC1F,6FAA6F;AAK7F,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEtE,MAAM,CAAC,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAEvC,2FAA2F;AAC3F,0FAA0F;AAC1F,0FAA0F;AAC1F,uEAAuE;AACvE,MAAM,UAAU,OAAO,CAAC,KAAwB;IAC9C,OAAO;QACL,OAAO,EAAE,CAAC,GAAG,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC;QAC7E,IAAI,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;QAC9D,QAAQ,EAAE;YACR;gBACE,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,uCAAuC;gBAC/C,YAAY,EACV,gIAAgI;aACnI;SACF;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAyB;IACzD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IACzE,IAAI,QAAQ,CAAC,WAAW,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IACnD,OAAO;QACL,GAAG,MAAM;QACT,OAAO,EAAE;YACP;gBACE,EAAE,EAAE,QAAQ;gBACZ,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,6BAA6B;gBACpC,YAAY,EACV,2GAA2G;gBAC7G,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;aACxC;SACF;KACF,CAAC;AACJ,CAAC"}
@@ -2,18 +2,22 @@
2
2
  // The underlying process adapter retains responsibility for cancellation.
3
3
  export class DeadlineProcess {
4
4
  process;
5
- deadline = performance.now() + 29000;
6
- constructor(process) {
5
+ budget;
6
+ deadline;
7
+ constructor(process, budget) {
7
8
  this.process = process;
9
+ this.budget = budget;
10
+ this.deadline = performance.now() + budget.totalMs;
8
11
  }
9
12
  which(binary, options) {
10
13
  return this.process.which(binary, options);
11
14
  }
12
15
  run(vector, options = {}) {
16
+ const { commandMs } = this.budget;
13
17
  return this.process.run(vector, {
14
18
  ...options,
15
19
  interactive: false,
16
- timeoutMs: Math.max(1, Math.min(options.timeoutMs ?? 15000, 15000, this.deadline - performance.now())),
20
+ timeoutMs: Math.max(1, Math.min(options.timeoutMs ?? commandMs, commandMs, this.deadline - performance.now())),
17
21
  env: { ...options.env, GIT_TERMINAL_PROMPT: '0', GCM_INTERACTIVE: 'Never' },
18
22
  });
19
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"deadline-process.js","sourceRoot":"","sources":["../../../src/adapters/process/deadline-process.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,0EAA0E;AAI1E,MAAM,OAAO,eAAe;IAEG;IADZ,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;IACtD,YAA6B,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IACjD,KAAK,CAAC,MAAc,EAAE,OAAyC;QAC7D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IACD,GAAG,CAAC,MAAyB,EAAE,UAAsB,EAAE;QACrD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;YAC9B,GAAG,OAAO;YACV,WAAW,EAAE,KAAK;YAClB,SAAS,EAAE,IAAI,CAAC,GAAG,CACjB,CAAC,EACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,CAC/E;YACD,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,eAAe,EAAE,OAAO,EAAE;SAC5E,CAAC,CAAC;IACL,CAAC;CACF"}
1
+ {"version":3,"file":"deadline-process.js","sourceRoot":"","sources":["../../../src/adapters/process/deadline-process.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,0EAA0E;AAW1E,MAAM,OAAO,eAAe;IAGP;IACA;IAHF,QAAQ,CAAS;IAClC,YACmB,OAAgB,EAChB,MAAsB;QADtB,YAAO,GAAP,OAAO,CAAS;QAChB,WAAM,GAAN,MAAM,CAAgB;QAEvC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;IACrD,CAAC;IACD,KAAK,CAAC,MAAc,EAAE,OAAyC;QAC7D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IACD,GAAG,CAAC,MAAyB,EAAE,UAAsB,EAAE;QACrD,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAClC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;YAC9B,GAAG,OAAO;YACV,WAAW,EAAE,KAAK;YAClB,SAAS,EAAE,IAAI,CAAC,GAAG,CACjB,CAAC,EACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,CACvF;YACD,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,eAAe,EAAE,OAAO,EAAE;SAC5E,CAAC,CAAC;IACL,CAAC;CACF"}
@@ -1,6 +1,7 @@
1
1
  // Process diagnostics decorate the one subprocess port, preserving its result
2
2
  // while emitting a bounded, credential-free account of each completed call.
3
3
  import { redactText, redactVector, summarizeDiagnostic } from '../../domain/diagnostics.js';
4
+ import { messageOf } from '../../domain/values.js';
4
5
  export class DiagnosticProcess {
5
6
  inner;
6
7
  diagnostics;
@@ -15,9 +16,7 @@ export class DiagnosticProcess {
15
16
  return result;
16
17
  }
17
18
  catch (err) {
18
- const stderr = options.sensitiveOutput
19
- ? undefined
20
- : summarizeDiagnostic(err instanceof Error ? err.message : String(err));
19
+ const stderr = options.sensitiveOutput ? undefined : summarizeDiagnostic(messageOf(err));
21
20
  this.diagnostics.emit({
22
21
  ...baseEvent(vector, options),
23
22
  ...(stderr === undefined ? {} : { stderr }),
@@ -1 +1 @@
1
- {"version":3,"file":"diagnostic-process.js","sourceRoot":"","sources":["../../../src/adapters/process/diagnostic-process.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"diagnostic-process.js","sourceRoot":"","sources":["../../../src/adapters/process/diagnostic-process.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,55 @@
1
+ // Start an executable that findExecutable resolved. A batch file runs under cmd.exe,
2
+ // which reads the command line first. The batch then reads each argument itself
3
+ // (`%~1`, as mvn.cmd does) or hands them all on (`%*`, as the shims npm, Scoop and
4
+ // Chocolatey install do), and cmd reads that line again. Caret escaping throughout,
5
+ // as cross-spawn applies it, suits only one of those readers, so fx starts every batch
6
+ // file itself and leaves everything else to cross-spawn.
7
+ import { spawn as spawnNode } from 'node:child_process';
8
+ import path from 'node:path';
9
+ import spawn from 'cross-spawn';
10
+ const BATCH = /\.(?:bat|cmd)$/i;
11
+ // What cmd acts on outside quotes.
12
+ const SPECIAL = /[&|<>^()!]/;
13
+ export function launch(executable, args, options) {
14
+ if (process.platform !== 'win32' || !BATCH.test(executable))
15
+ return spawn(executable, [...args], options);
16
+ // /v:off keeps !name! literal whatever delayed expansion the registry turns on.
17
+ return spawnNode(process.env['comspec'] ?? 'cmd.exe', ['/d', '/v:off', '/s', '/c', `"${batchLine([path.normalize(executable), ...args])}"`], { ...options, windowsVerbatimArguments: true });
18
+ }
19
+ // Every argument is quoted for the program at the end of the chain, and cmd leaves
20
+ // whatever sits inside quotes alone, so an argument without a quote of its own reaches
21
+ // `%~1` unchanged. A quote inside an argument turns cmd's quoting off until the next
22
+ // one; there, cmd's special characters are escaped for both of its reads. Each percent
23
+ // sign is followed by an empty expansion, so no %name% survives to expand.
24
+ function batchLine(vector) {
25
+ let line = '';
26
+ let quoted = false;
27
+ for (const char of vector.map(programArgument).join(' ')) {
28
+ if (char === '"')
29
+ quoted = !quoted;
30
+ if (char === '%')
31
+ line += '%%cd:~,%';
32
+ else if (!quoted && SPECIAL.test(char))
33
+ line += '^^^' + char;
34
+ else
35
+ line += char;
36
+ }
37
+ return line;
38
+ }
39
+ // The program's own reading of its command line: backslashes are literal except in
40
+ // a run before a quote, so such a run is doubled, before an inner quote and before
41
+ // the closing one.
42
+ function programArgument(arg) {
43
+ let text = '"';
44
+ let slashes = 0;
45
+ for (const char of arg) {
46
+ if (char === '\\') {
47
+ slashes += 1;
48
+ continue;
49
+ }
50
+ text += '\\'.repeat(char === '"' ? slashes * 2 + 1 : slashes) + char;
51
+ slashes = 0;
52
+ }
53
+ return text + '\\'.repeat(slashes * 2) + '"';
54
+ }
55
+ //# sourceMappingURL=launch.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"launch.js","sourceRoot":"","sources":["../../../src/adapters/process/launch.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,gFAAgF;AAChF,mFAAmF;AACnF,oFAAoF;AACpF,uFAAuF;AACvF,yDAAyD;AAEzD,OAAO,EAAE,KAAK,IAAI,SAAS,EAAwC,MAAM,oBAAoB,CAAC;AAC9F,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,MAAM,KAAK,GAAG,iBAAiB,CAAC;AAChC,mCAAmC;AACnC,MAAM,OAAO,GAAG,YAAY,CAAC;AAE7B,MAAM,UAAU,MAAM,CACpB,UAAkB,EAClB,IAAuB,EACvB,OAAqB;IAErB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;QACzD,OAAO,KAAK,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IAC/C,gFAAgF;IAChF,OAAO,SAAS,CACd,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,SAAS,EACnC,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,EACrF,EAAE,GAAG,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,CAC/C,CAAC;AACJ,CAAC;AAED,mFAAmF;AACnF,uFAAuF;AACvF,qFAAqF;AACrF,uFAAuF;AACvF,2EAA2E;AAC3E,SAAS,SAAS,CAAC,MAAyB;IAC1C,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACzD,IAAI,IAAI,KAAK,GAAG;YAAE,MAAM,GAAG,CAAC,MAAM,CAAC;QACnC,IAAI,IAAI,KAAK,GAAG;YAAE,IAAI,IAAI,UAAU,CAAC;aAChC,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC;;YACxD,IAAI,IAAI,IAAI,CAAC;IACpB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mFAAmF;AACnF,mFAAmF;AACnF,mBAAmB;AACnB,SAAS,eAAe,CAAC,GAAW;IAClC,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,CAAC;YACb,SAAS;QACX,CAAC;QACD,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;QACrE,OAAO,GAAG,CAAC,CAAC;IACd,CAAC;IACD,OAAO,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;AAC/C,CAAC"}
@@ -1,8 +1,8 @@
1
1
  // Execute process vectors through the Process port. Missing executables return
2
2
  // exit 127; bounded piped calls reject on timeout or cancellation and reap children.
3
- import spawn from 'cross-spawn';
4
3
  import { DevkitError } from '../../domain/errors.js';
5
4
  import { findExecutable, mergeEnvironment } from './executable.js';
5
+ import { launch } from './launch.js';
6
6
  import { supervisedRole } from './supervision.js';
7
7
  import { terminateChild } from './terminate.js';
8
8
  const ABORTED = 'PROCESS_ABORTED';
@@ -79,7 +79,7 @@ export class NodeProcess {
79
79
  return new Promise((resolve, reject) => {
80
80
  const bounded = isBounded(options);
81
81
  const ownGroup = leavesSession(options);
82
- const child = spawn(binary, args, {
82
+ const child = launch(binary, args, {
83
83
  cwd: options.cwd,
84
84
  env: options.env,
85
85
  windowsHide: true,
@@ -143,7 +143,7 @@ export class NodeProcess {
143
143
  }
144
144
  runInteractive(binary, args, options) {
145
145
  return new Promise((resolve, reject) => {
146
- const child = spawn(binary, args, {
146
+ const child = launch(binary, args, {
147
147
  cwd: options.cwd,
148
148
  env: options.env,
149
149
  stdio: 'inherit',
@@ -1 +1 @@
1
- {"version":3,"file":"node-process.js","sourceRoot":"","sources":["../../../src/adapters/process/node-process.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"node-process.js","sourceRoot":"","sources":["../../../src/adapters/process/node-process.ts"],"names":[],"mappings":"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"}
@@ -14,9 +14,19 @@ export function powershellVector(script) {
14
14
  export function windowsHookCommand(vector, owner) {
15
15
  const [binary = '', ...args] = vector;
16
16
  const commandLine = args.map(nativeQuote).join(' ');
17
+ // A progress record (PowerShell's first-use module preparation, say) would reach
18
+ // stderr serialized as CLIXML.
17
19
  const script = `# fx-owner:${owner}
20
+ $ProgressPreference = 'SilentlyContinue'
18
21
  $ErrorActionPreference = 'Stop'
19
22
  try {
23
+ # On a UTF-8 console, Windows PowerShell starts a child's redirected input with a
24
+ # byte order mark; the same code page without the mark changes nothing else.
25
+ try {
26
+ if ([Console]::InputEncoding.CodePage -eq 65001) {
27
+ [Console]::InputEncoding = New-Object System.Text.UTF8Encoding $false
28
+ }
29
+ } catch {}
20
30
  $s = New-Object System.Diagnostics.ProcessStartInfo
21
31
  $s.FileName = ${powershellQuote(binary)}
22
32
  $s.Arguments = ${powershellQuote(commandLine)}
@@ -31,8 +41,9 @@ try {
31
41
  [Console]::OpenStandardInput().CopyTo($p.StandardInput.BaseStream)
32
42
  $p.StandardInput.Close()
33
43
  $p.WaitForExit()
34
- $o.GetAwaiter().GetResult()
35
- $e.GetAwaiter().GetResult()
44
+ # A finished copy yields a value that PowerShell would print to the agent.
45
+ $null = $o.GetAwaiter().GetResult()
46
+ $null = $e.GetAwaiter().GetResult()
36
47
  } catch {}
37
48
  exit 0`;
38
49
  return powershellVector(script).join(' ');
@@ -1 +1 @@
1
- {"version":3,"file":"powershell.js","sourceRoot":"","sources":["../../../src/adapters/process/powershell.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,gFAAgF;AAEhF,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,UAAU,gBAAgB,CAAC,MAAc;IAC7C,OAAO;QACL,gBAAgB;QAChB,SAAS;QACT,YAAY;QACZ,iBAAiB;QACjB,iBAAiB;QACjB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;KAClD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAyB,EAAE,KAAa;IACzE,MAAM,CAAC,MAAM,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC;IACtC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,cAAc,KAAK;;;;kBAIlB,eAAe,CAAC,MAAM,CAAC;mBACtB,eAAe,CAAC,WAAW,CAAC;;;;;;;;;;;;;;;OAexC,CAAC;IACN,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe,EAAE,KAAa;IAC5D,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IACjE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1D,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,cAAc,KAAK,IAAI,CAAC,CAAC;AAChG,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC;AACnF,CAAC"}
1
+ {"version":3,"file":"powershell.js","sourceRoot":"","sources":["../../../src/adapters/process/powershell.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,gFAAgF;AAEhF,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,UAAU,gBAAgB,CAAC,MAAc;IAC7C,OAAO;QACL,gBAAgB;QAChB,SAAS;QACT,YAAY;QACZ,iBAAiB;QACjB,iBAAiB;QACjB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;KAClD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAyB,EAAE,KAAa;IACzE,MAAM,CAAC,MAAM,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC;IACtC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpD,iFAAiF;IACjF,+BAA+B;IAC/B,MAAM,MAAM,GAAG,cAAc,KAAK;;;;;;;;;;;;kBAYlB,eAAe,CAAC,MAAM,CAAC;mBACtB,eAAe,CAAC,WAAW,CAAC;;;;;;;;;;;;;;;;OAgBxC,CAAC;IACN,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe,EAAE,KAAa;IAC5D,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IACjE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1D,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,cAAc,KAAK,IAAI,CAAC,CAAC;AAChG,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC;AACnF,CAAC"}
@@ -2,8 +2,8 @@
2
2
  // or notices. The projected vector has already passed workspace trust. The
3
3
  // bridge reports the status it observed; landing it on the process is the
4
4
  // entry point's job.
5
- import spawn from 'cross-spawn';
6
5
  import { findExecutable, mergeEnvironment } from './executable.js';
6
+ import { launch } from './launch.js';
7
7
  import { terminateChild } from './terminate.js';
8
8
  // A shell reports a command it could not find as 127, and MCP hosts read that
9
9
  // status the same way.
@@ -16,7 +16,7 @@ export async function runStdioBridge(vector) {
16
16
  const executable = await findExecutable(binary, { env });
17
17
  if (!executable)
18
18
  return { exitCode: COMMAND_NOT_FOUND };
19
- const child = spawn(executable, args, { env, stdio: 'inherit', windowsHide: true });
19
+ const child = launch(executable, args, { env, stdio: 'inherit', windowsHide: true });
20
20
  const stop = () => terminateChild(child);
21
21
  for (const signal of ['SIGINT', 'SIGTERM', 'SIGHUP'])
22
22
  process.once(signal, stop);
@@ -1 +1 @@
1
- {"version":3,"file":"stdio-bridge.js","sourceRoot":"","sources":["../../../src/adapters/process/stdio-bridge.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,2EAA2E;AAC3E,0EAA0E;AAC1E,qBAAqB;AAErB,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,8EAA8E;AAC9E,uBAAuB;AACvB,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAE9B,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAAyB;IAC5D,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC;IACjC,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACpC,MAAM,GAAG,GAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IACzD,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IACxD,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IACpF,MAAM,IAAI,GAAG,GAAS,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAU;QAAE,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC1F,MAAM,QAAQ,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;QACrD,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAU;QAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACzF,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"stdio-bridge.js","sourceRoot":"","sources":["../../../src/adapters/process/stdio-bridge.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,2EAA2E;AAC3E,0EAA0E;AAC1E,qBAAqB;AAErB,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,8EAA8E;AAC9E,uBAAuB;AACvB,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAE9B,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAAyB;IAC5D,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC;IACjC,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACpC,MAAM,GAAG,GAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IACzD,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IACxD,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,MAAM,IAAI,GAAG,GAAS,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAU;QAAE,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC1F,MAAM,QAAQ,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;QACrD,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAU;QAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACzF,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC"}