@angelmsger/fx 0.11.0 → 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 (548) hide show
  1. package/CHANGELOG.md +110 -0
  2. package/README.md +9 -42
  3. package/defaults/tools.yaml +6 -1
  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 +9 -7
  9. package/dist/adapters/ci/github-actions/ci.js.map +1 -1
  10. package/dist/adapters/ci/github-actions/provider.js +2 -2
  11. package/dist/adapters/ci/github-actions/provider.js.map +1 -1
  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 +12 -14
  30. package/dist/adapters/code-host/github/provider.js.map +1 -1
  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 +1 -1
  50. package/dist/adapters/github/gh.js.map +1 -1
  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/registry/registry-policy.js +4 -14
  62. package/dist/adapters/registry/registry-policy.js.map +1 -1
  63. package/dist/application/agent/list.js +12 -0
  64. package/dist/application/agent/list.js.map +1 -1
  65. package/dist/application/agent/pick.js +12 -30
  66. package/dist/application/agent/pick.js.map +1 -1
  67. package/dist/application/agent/workspace-cleanup.js +4 -1
  68. package/dist/application/agent/workspace-cleanup.js.map +1 -1
  69. package/dist/application/config/export.js +3 -2
  70. package/dist/application/config/export.js.map +1 -1
  71. package/dist/application/config/import-registry.js +3 -3
  72. package/dist/application/config/import-registry.js.map +1 -1
  73. package/dist/application/config/import.js +12 -4
  74. package/dist/application/config/import.js.map +1 -1
  75. package/dist/application/config/resolve.js +2 -4
  76. package/dist/application/config/resolve.js.map +1 -1
  77. package/dist/application/contribution/identity.js +3 -3
  78. package/dist/application/contribution/identity.js.map +1 -1
  79. package/dist/application/contribution/push-registered.js +77 -0
  80. package/dist/application/contribution/push-registered.js.map +1 -0
  81. package/dist/application/contribution/push.js +12 -19
  82. package/dist/application/contribution/push.js.map +1 -1
  83. package/dist/application/contribution/validate.js +12 -13
  84. package/dist/application/contribution/validate.js.map +1 -1
  85. package/dist/application/docs/rendered.js +2 -1
  86. package/dist/application/docs/rendered.js.map +1 -1
  87. package/dist/application/doctor/index.js +43 -27
  88. package/dist/application/doctor/index.js.map +1 -1
  89. package/dist/application/doctor/manifest.js +5 -1
  90. package/dist/application/doctor/manifest.js.map +1 -1
  91. package/dist/application/doctor/repos.js +1 -1
  92. package/dist/application/doctor/repos.js.map +1 -1
  93. package/dist/application/doctor/tools.js +20 -31
  94. package/dist/application/doctor/tools.js.map +1 -1
  95. package/dist/application/doctor/types.js +0 -8
  96. package/dist/application/doctor/types.js.map +1 -1
  97. package/dist/application/env/names.js.map +1 -1
  98. package/dist/application/harness/apply.js +4 -3
  99. package/dist/application/harness/apply.js.map +1 -1
  100. package/dist/application/harness/cleanup.js +5 -14
  101. package/dist/application/harness/cleanup.js.map +1 -1
  102. package/dist/application/harness/mcp-readiness.js +3 -1
  103. package/dist/application/harness/mcp-readiness.js.map +1 -1
  104. package/dist/application/harness/names.js +2 -4
  105. package/dist/application/harness/names.js.map +1 -1
  106. package/dist/application/harness/plan.js +12 -10
  107. package/dist/application/harness/plan.js.map +1 -1
  108. package/dist/application/harness/reconcile.js +4 -14
  109. package/dist/application/harness/reconcile.js.map +1 -1
  110. package/dist/application/harness/session.js +2 -13
  111. package/dist/application/harness/session.js.map +1 -1
  112. package/dist/application/harness/stages.js +8 -18
  113. package/dist/application/harness/stages.js.map +1 -1
  114. package/dist/application/harness/types.js +1 -8
  115. package/dist/application/harness/types.js.map +1 -1
  116. package/dist/application/hook/apply.js +5 -4
  117. package/dist/application/hook/apply.js.map +1 -1
  118. package/dist/application/hook/automatic-sync.js +8 -3
  119. package/dist/application/hook/automatic-sync.js.map +1 -1
  120. package/dist/application/hook/cleanup.js +5 -14
  121. package/dist/application/hook/cleanup.js.map +1 -1
  122. package/dist/application/hook/dispatch.js +24 -3
  123. package/dist/application/hook/dispatch.js.map +1 -1
  124. package/dist/application/hook/observe.js +11 -9
  125. package/dist/application/hook/observe.js.map +1 -1
  126. package/dist/application/hook/plan.js.map +1 -1
  127. package/dist/application/hook/reconcile.js +2 -9
  128. package/dist/application/hook/reconcile.js.map +1 -1
  129. package/dist/application/hook/session.js +5 -12
  130. package/dist/application/hook/session.js.map +1 -1
  131. package/dist/application/hook/supervisor-report.js +2 -1
  132. package/dist/application/hook/supervisor-report.js.map +1 -1
  133. package/dist/application/hook/types.js +8 -1
  134. package/dist/application/hook/types.js.map +1 -1
  135. package/dist/application/init/errors.js +19 -19
  136. package/dist/application/init/errors.js.map +1 -1
  137. package/dist/application/init/index.js +60 -42
  138. package/dist/application/init/index.js.map +1 -1
  139. package/dist/application/init/preview-initialization.js +40 -0
  140. package/dist/application/init/preview-initialization.js.map +1 -0
  141. package/dist/application/init/preview.js +37 -19
  142. package/dist/application/init/preview.js.map +1 -1
  143. package/dist/application/init/resume.js +30 -0
  144. package/dist/application/init/resume.js.map +1 -0
  145. package/dist/application/init/source.js +8 -0
  146. package/dist/application/init/source.js.map +1 -0
  147. package/dist/application/{doctor/login.js → login/check.js} +22 -43
  148. package/dist/application/login/check.js.map +1 -0
  149. package/dist/application/login/collect.js +2 -1
  150. package/dist/application/login/collect.js.map +1 -1
  151. package/dist/application/login/command-failure.js +2 -0
  152. package/dist/application/login/command-failure.js.map +1 -1
  153. package/dist/application/login/deps.js +2 -3
  154. package/dist/application/login/deps.js.map +1 -1
  155. package/dist/application/login/run.js +149 -54
  156. package/dist/application/login/run.js.map +1 -1
  157. package/dist/application/login/stage.js +146 -0
  158. package/dist/application/login/stage.js.map +1 -0
  159. package/dist/application/login/verify.js +45 -34
  160. package/dist/application/login/verify.js.map +1 -1
  161. package/dist/application/manifest/context.js +5 -1
  162. package/dist/application/manifest/context.js.map +1 -1
  163. package/dist/application/{import.js → manifest/import.js} +34 -27
  164. package/dist/application/manifest/import.js.map +1 -0
  165. package/dist/application/manifest/lint.js +15 -23
  166. package/dist/application/manifest/lint.js.map +1 -1
  167. package/dist/application/manifest/load.js +7 -11
  168. package/dist/application/manifest/load.js.map +1 -1
  169. package/dist/application/manifest/prepare.js +3 -2
  170. package/dist/application/manifest/prepare.js.map +1 -1
  171. package/dist/application/manifest/providers.js +4 -1
  172. package/dist/application/manifest/providers.js.map +1 -1
  173. package/dist/application/{refresh-manifest.js → manifest/refresh.js} +26 -2
  174. package/dist/application/manifest/refresh.js.map +1 -0
  175. package/dist/application/manifest/set.js +2 -1
  176. package/dist/application/manifest/set.js.map +1 -1
  177. package/dist/application/member/list.js +2 -4
  178. package/dist/application/member/list.js.map +1 -1
  179. package/dist/application/member/show.js +2 -3
  180. package/dist/application/member/show.js.map +1 -1
  181. package/dist/application/preparation.js +92 -25
  182. package/dist/application/preparation.js.map +1 -1
  183. package/dist/application/probe-record/index.js +19 -18
  184. package/dist/application/probe-record/index.js.map +1 -1
  185. package/dist/application/probe-record/plan.js +6 -4
  186. package/dist/application/probe-record/plan.js.map +1 -1
  187. package/dist/application/{can.js → readiness/can.js} +23 -11
  188. package/dist/application/readiness/can.js.map +1 -0
  189. package/dist/application/readiness/index.js +22 -35
  190. package/dist/application/readiness/index.js.map +1 -1
  191. package/dist/application/readiness/resolve.js +13 -15
  192. package/dist/application/readiness/resolve.js.map +1 -1
  193. package/dist/application/readiness/verdicts.js +2 -7
  194. package/dist/application/readiness/verdicts.js.map +1 -1
  195. package/dist/application/{where.js → readiness/where.js} +19 -21
  196. package/dist/application/readiness/where.js.map +1 -0
  197. package/dist/application/release/ci.js +1 -1
  198. package/dist/application/release/ci.js.map +1 -1
  199. package/dist/application/release/index.js +12 -17
  200. package/dist/application/release/index.js.map +1 -1
  201. package/dist/application/safety/trust.js +12 -14
  202. package/dist/application/safety/trust.js.map +1 -1
  203. package/dist/application/self/update.js +23 -13
  204. package/dist/application/self/update.js.map +1 -1
  205. package/dist/application/services/command.js +6 -8
  206. package/dist/application/services/command.js.map +1 -1
  207. package/dist/application/services/operation.js +12 -19
  208. package/dist/application/services/operation.js.map +1 -1
  209. package/dist/application/services/recipes.js +7 -2
  210. package/dist/application/services/recipes.js.map +1 -1
  211. package/dist/application/services/stage.js +6 -4
  212. package/dist/application/services/stage.js.map +1 -1
  213. package/dist/application/services/types.js +7 -1
  214. package/dist/application/services/types.js.map +1 -1
  215. package/dist/application/skill/copies.js +13 -22
  216. package/dist/application/skill/copies.js.map +1 -1
  217. package/dist/application/skill/fx-copies.js +1 -1
  218. package/dist/application/skill/fx-copies.js.map +1 -1
  219. package/dist/application/skill/stage.js +24 -26
  220. package/dist/application/skill/stage.js.map +1 -1
  221. package/dist/application/skill/standalone.js +1 -1
  222. package/dist/application/skill/standalone.js.map +1 -1
  223. package/dist/application/skill/targets.js +2 -16
  224. package/dist/application/skill/targets.js.map +1 -1
  225. package/dist/application/skill/tool-skills.js +20 -10
  226. package/dist/application/skill/tool-skills.js.map +1 -1
  227. package/dist/application/sync/checks.js +7 -45
  228. package/dist/application/sync/checks.js.map +1 -1
  229. package/dist/application/sync/index.js +76 -26
  230. package/dist/application/sync/index.js.map +1 -1
  231. package/dist/application/sync/stages.js +33 -26
  232. package/dist/application/sync/stages.js.map +1 -1
  233. package/dist/application/sync/types.js +6 -1
  234. package/dist/application/sync/types.js.map +1 -1
  235. package/dist/application/tool/check.js +8 -0
  236. package/dist/application/tool/check.js.map +1 -1
  237. package/dist/application/tool/history.js +16 -0
  238. package/dist/application/tool/history.js.map +1 -0
  239. package/dist/application/tool/initialize.js +2 -1
  240. package/dist/application/tool/initialize.js.map +1 -1
  241. package/dist/application/tool/install.js +15 -18
  242. package/dist/application/tool/install.js.map +1 -1
  243. package/dist/application/tool/installed.js +1 -1
  244. package/dist/application/tool/installed.js.map +1 -1
  245. package/dist/application/tool/list.js.map +1 -1
  246. package/dist/application/tool/scope.js +8 -7
  247. package/dist/application/tool/scope.js.map +1 -1
  248. package/dist/application/tool/select.js +2 -4
  249. package/dist/application/tool/select.js.map +1 -1
  250. package/dist/application/tool/show.js.map +1 -1
  251. package/dist/application/tool/toolchain.js +19 -6
  252. package/dist/application/tool/toolchain.js.map +1 -1
  253. package/dist/application/update/check.js +2 -1
  254. package/dist/application/update/check.js.map +1 -1
  255. package/dist/application/workspace/command-operation.js +4 -3
  256. package/dist/application/workspace/command-operation.js.map +1 -1
  257. package/dist/application/{workspace-context.js → workspace/context.js} +26 -19
  258. package/dist/application/workspace/context.js.map +1 -0
  259. package/dist/application/workspace/deps.js +3 -3
  260. package/dist/application/workspace/deps.js.map +1 -1
  261. package/dist/application/workspace/guidance.js +2 -4
  262. package/dist/application/workspace/guidance.js.map +1 -1
  263. package/dist/application/workspace/health.js +4 -2
  264. package/dist/application/workspace/health.js.map +1 -1
  265. package/dist/application/workspace/inspect.js +1 -4
  266. package/dist/application/workspace/inspect.js.map +1 -1
  267. package/dist/application/workspace/manage.js +83 -97
  268. package/dist/application/workspace/manage.js.map +1 -1
  269. package/dist/application/workspace/operation.js +13 -14
  270. package/dist/application/workspace/operation.js.map +1 -1
  271. package/dist/application/workspace/plan.js +2 -1
  272. package/dist/application/workspace/plan.js.map +1 -1
  273. package/dist/application/workspace/registry.js +4 -3
  274. package/dist/application/workspace/registry.js.map +1 -1
  275. package/dist/application/workspace/resolve.js +10 -12
  276. package/dist/application/workspace/resolve.js.map +1 -1
  277. package/dist/application/workspace/resources.js +39 -32
  278. package/dist/application/workspace/resources.js.map +1 -1
  279. package/dist/application/workspace/source-preview.js +6 -3
  280. package/dist/application/workspace/source-preview.js.map +1 -1
  281. package/dist/application/{status.js → workspace/status.js} +51 -6
  282. package/dist/application/workspace/status.js.map +1 -0
  283. package/dist/cli/base.js +22 -28
  284. package/dist/cli/base.js.map +1 -1
  285. package/dist/cli/commands/agent/pick.js +4 -1
  286. package/dist/cli/commands/agent/pick.js.map +1 -1
  287. package/dist/cli/commands/agent/unpick.js +5 -1
  288. package/dist/cli/commands/agent/unpick.js.map +1 -1
  289. package/dist/cli/commands/can.js +5 -21
  290. package/dist/cli/commands/can.js.map +1 -1
  291. package/dist/cli/commands/config/import.js +1 -8
  292. package/dist/cli/commands/config/import.js.map +1 -1
  293. package/dist/cli/commands/doctor.js +2 -1
  294. package/dist/cli/commands/doctor.js.map +1 -1
  295. package/dist/cli/commands/env/pick.js +1 -0
  296. package/dist/cli/commands/env/pick.js.map +1 -1
  297. package/dist/cli/commands/env/select.js +1 -0
  298. package/dist/cli/commands/env/select.js.map +1 -1
  299. package/dist/cli/commands/env/unpick.js +1 -0
  300. package/dist/cli/commands/env/unpick.js.map +1 -1
  301. package/dist/cli/commands/hook/disable.js +1 -0
  302. package/dist/cli/commands/hook/disable.js.map +1 -1
  303. package/dist/cli/commands/hook/enable.js +1 -0
  304. package/dist/cli/commands/hook/enable.js.map +1 -1
  305. package/dist/cli/commands/init.js +14 -11
  306. package/dist/cli/commands/init.js.map +1 -1
  307. package/dist/cli/commands/login.js +13 -2
  308. package/dist/cli/commands/login.js.map +1 -1
  309. package/dist/cli/commands/manifest/import.js +6 -2
  310. package/dist/cli/commands/manifest/import.js.map +1 -1
  311. package/dist/cli/commands/manifest/lint.js +5 -1
  312. package/dist/cli/commands/manifest/lint.js.map +1 -1
  313. package/dist/cli/commands/manifest/record-probe.js +1 -0
  314. package/dist/cli/commands/manifest/record-probe.js.map +1 -1
  315. package/dist/cli/commands/manifest/render.js +1 -0
  316. package/dist/cli/commands/manifest/render.js.map +1 -1
  317. package/dist/cli/commands/manifest/repo-set.js +1 -0
  318. package/dist/cli/commands/manifest/repo-set.js.map +1 -1
  319. package/dist/cli/commands/repo/add.js +1 -0
  320. package/dist/cli/commands/repo/add.js.map +1 -1
  321. package/dist/cli/commands/repo/fork.js +1 -0
  322. package/dist/cli/commands/repo/fork.js.map +1 -1
  323. package/dist/cli/commands/repo/pick.js +1 -0
  324. package/dist/cli/commands/repo/pick.js.map +1 -1
  325. package/dist/cli/commands/repo/remove.js +1 -0
  326. package/dist/cli/commands/repo/remove.js.map +1 -1
  327. package/dist/cli/commands/repo/select.js +1 -0
  328. package/dist/cli/commands/repo/select.js.map +1 -1
  329. package/dist/cli/commands/repo/unpick.js +1 -0
  330. package/dist/cli/commands/repo/unpick.js.map +1 -1
  331. package/dist/cli/commands/selection.js +1 -2
  332. package/dist/cli/commands/selection.js.map +1 -1
  333. package/dist/cli/commands/self/update.js +11 -14
  334. package/dist/cli/commands/self/update.js.map +1 -1
  335. package/dist/cli/commands/source/push.js +14 -13
  336. package/dist/cli/commands/source/push.js.map +1 -1
  337. package/dist/cli/commands/status.js +6 -36
  338. package/dist/cli/commands/status.js.map +1 -1
  339. package/dist/cli/commands/sync.js +7 -5
  340. package/dist/cli/commands/sync.js.map +1 -1
  341. package/dist/cli/commands/tool/history.js +2 -2
  342. package/dist/cli/commands/tool/history.js.map +1 -1
  343. package/dist/cli/commands/where.js +2 -1
  344. package/dist/cli/commands/where.js.map +1 -1
  345. package/dist/cli/commands/workspace/rebind.js +1 -4
  346. package/dist/cli/commands/workspace/rebind.js.map +1 -1
  347. package/dist/cli/completion.js +2 -4
  348. package/dist/cli/completion.js.map +1 -1
  349. package/dist/cli/hook-command.js +2 -2
  350. package/dist/cli/hook-command.js.map +1 -1
  351. package/dist/cli/main.js +4 -3
  352. package/dist/cli/main.js.map +1 -1
  353. package/dist/cli/notices.js +26 -24
  354. package/dist/cli/notices.js.map +1 -1
  355. package/dist/cli/preparation-view.js +170 -52
  356. package/dist/cli/preparation-view.js.map +1 -1
  357. package/dist/cli/render/exceptional.js +11 -4
  358. package/dist/cli/render/exceptional.js.map +1 -1
  359. package/dist/cli/render/fields.js +1 -3
  360. package/dist/cli/render/fields.js.map +1 -1
  361. package/dist/cli/render/human.js +1 -3
  362. package/dist/cli/render/human.js.map +1 -1
  363. package/dist/cli/render/index.js +1 -1
  364. package/dist/cli/render/index.js.map +1 -1
  365. package/dist/cli/render/status-line.js +17 -3
  366. package/dist/cli/render/status-line.js.map +1 -1
  367. package/dist/cli/render/tone.js +29 -10
  368. package/dist/cli/render/tone.js.map +1 -1
  369. package/dist/cli/tool-command.js +4 -11
  370. package/dist/cli/tool-command.js.map +1 -1
  371. package/dist/cli/workspace-write-policy.js +8 -33
  372. package/dist/cli/workspace-write-policy.js.map +1 -1
  373. package/dist/composition/agent-cleanup.js +5 -1
  374. package/dist/composition/agent-cleanup.js.map +1 -1
  375. package/dist/composition/bundled.js +4 -1
  376. package/dist/composition/bundled.js.map +1 -1
  377. package/dist/composition/command-wiring.js +44 -99
  378. package/dist/composition/command-wiring.js.map +1 -1
  379. package/dist/composition/container.js +25 -20
  380. package/dist/composition/container.js.map +1 -1
  381. package/dist/composition/contributions.js +26 -71
  382. package/dist/composition/contributions.js.map +1 -1
  383. package/dist/composition/harness.js +3 -4
  384. package/dist/composition/harness.js.map +1 -1
  385. package/dist/composition/hook-entry.js +2 -1
  386. package/dist/composition/hook-entry.js.map +1 -1
  387. package/dist/composition/hook-wiring.js +8 -16
  388. package/dist/composition/hook-wiring.js.map +1 -1
  389. package/dist/composition/hook-worker.js +9 -11
  390. package/dist/composition/hook-worker.js.map +1 -1
  391. package/dist/composition/hooks.js +6 -3
  392. package/dist/composition/hooks.js.map +1 -1
  393. package/dist/composition/import.js +8 -6
  394. package/dist/composition/import.js.map +1 -1
  395. package/dist/composition/manifest-edit.js +1 -2
  396. package/dist/composition/manifest-edit.js.map +1 -1
  397. package/dist/composition/manifest-sources.js +3 -16
  398. package/dist/composition/manifest-sources.js.map +1 -1
  399. package/dist/composition/probe-record.js +1 -2
  400. package/dist/composition/probe-record.js.map +1 -1
  401. package/dist/composition/refresh.js +1 -1
  402. package/dist/composition/refresh.js.map +1 -1
  403. package/dist/composition/registry.js +8 -37
  404. package/dist/composition/registry.js.map +1 -1
  405. package/dist/composition/tool-install.js +5 -1
  406. package/dist/composition/tool-install.js.map +1 -1
  407. package/dist/composition/tool-inventory.js +10 -1
  408. package/dist/composition/tool-inventory.js.map +1 -1
  409. package/dist/composition/trace.js +3 -4
  410. package/dist/composition/trace.js.map +1 -1
  411. package/dist/composition/update.js +12 -1
  412. package/dist/composition/update.js.map +1 -1
  413. package/dist/composition/workspace-management.js +8 -2
  414. package/dist/composition/workspace-management.js.map +1 -1
  415. package/dist/domain/config/codec.js +2 -1
  416. package/dist/domain/config/codec.js.map +1 -1
  417. package/dist/domain/config/profile.js +0 -1
  418. package/dist/domain/config/profile.js.map +1 -1
  419. package/dist/domain/contribution/pull-request.js +12 -1
  420. package/dist/domain/contribution/pull-request.js.map +1 -1
  421. package/dist/domain/contribution/selection.js +4 -8
  422. package/dist/domain/contribution/selection.js.map +1 -1
  423. package/dist/domain/errors.js +10 -3
  424. package/dist/domain/errors.js.map +1 -1
  425. package/dist/domain/fuzzy.js +6 -1
  426. package/dist/domain/fuzzy.js.map +1 -1
  427. package/dist/domain/harness/actions.js +60 -0
  428. package/dist/domain/harness/actions.js.map +1 -0
  429. package/dist/domain/harness/deadlines.js +14 -0
  430. package/dist/domain/harness/deadlines.js.map +1 -0
  431. package/dist/domain/harness/hooks.js +8 -0
  432. package/dist/domain/harness/hooks.js.map +1 -1
  433. package/dist/domain/harness/session-start.js +2 -1
  434. package/dist/domain/harness/session-start.js.map +1 -1
  435. package/dist/domain/harness/state-recovery.js.map +1 -1
  436. package/dist/domain/import/infer.js +2 -9
  437. package/dist/domain/import/infer.js.map +1 -1
  438. package/dist/domain/lease.js +30 -0
  439. package/dist/domain/lease.js.map +1 -0
  440. package/dist/domain/manifest/decode.js +5 -8
  441. package/dist/domain/manifest/decode.js.map +1 -1
  442. package/dist/domain/manifest/document.js +3 -5
  443. package/dist/domain/manifest/document.js.map +1 -1
  444. package/dist/domain/manifest/editor.js +3 -7
  445. package/dist/domain/manifest/editor.js.map +1 -1
  446. package/dist/domain/manifest/explain.js +2 -4
  447. package/dist/domain/manifest/explain.js.map +1 -1
  448. package/dist/domain/manifest/issues.js +2 -2
  449. package/dist/domain/manifest/issues.js.map +1 -1
  450. package/dist/domain/manifest/loader.js +2 -1
  451. package/dist/domain/manifest/loader.js.map +1 -1
  452. package/dist/domain/manifest/overlay.js +6 -9
  453. package/dist/domain/manifest/overlay.js.map +1 -1
  454. package/dist/domain/manifest/providers.js +34 -2
  455. package/dist/domain/manifest/providers.js.map +1 -1
  456. package/dist/domain/manifest/quarantine.js +21 -1
  457. package/dist/domain/manifest/quarantine.js.map +1 -1
  458. package/dist/domain/manifest/reflect.js +2 -31
  459. package/dist/domain/manifest/reflect.js.map +1 -1
  460. package/dist/domain/manifest/rules/harness.js +2 -16
  461. package/dist/domain/manifest/rules/harness.js.map +1 -1
  462. package/dist/domain/manifest/service.schema.js +5 -14
  463. package/dist/domain/manifest/service.schema.js.map +1 -1
  464. package/dist/domain/manifest/skill-frontmatter.js +1 -1
  465. package/dist/domain/manifest/skill-frontmatter.js.map +1 -1
  466. package/dist/domain/manifest/types.js.map +1 -1
  467. package/dist/domain/outcome.js +5 -0
  468. package/dist/domain/outcome.js.map +1 -0
  469. package/dist/domain/path.js +9 -1
  470. package/dist/domain/path.js.map +1 -1
  471. package/dist/domain/preparation.js.map +1 -1
  472. package/dist/domain/projection.js +8 -0
  473. package/dist/domain/projection.js.map +1 -0
  474. package/dist/domain/public-url.js +22 -0
  475. package/dist/domain/public-url.js.map +1 -0
  476. package/dist/domain/release/ci.js +19 -8
  477. package/dist/domain/release/ci.js.map +1 -1
  478. package/dist/domain/report.js +1 -1
  479. package/dist/domain/report.js.map +1 -1
  480. package/dist/domain/setup/names.js +23 -0
  481. package/dist/domain/setup/names.js.map +1 -0
  482. package/dist/domain/setup/planner.js +19 -21
  483. package/dist/domain/setup/planner.js.map +1 -1
  484. package/dist/domain/setup/progress.js +57 -0
  485. package/dist/domain/setup/progress.js.map +1 -0
  486. package/dist/domain/setup/types.js +5 -0
  487. package/dist/domain/setup/types.js.map +1 -1
  488. package/dist/domain/shell.js +0 -7
  489. package/dist/domain/shell.js.map +1 -1
  490. package/dist/domain/skills/frontmatter.js +1 -1
  491. package/dist/domain/skills/frontmatter.js.map +1 -1
  492. package/dist/domain/skills/projection.js +2 -3
  493. package/dist/domain/skills/projection.js.map +1 -1
  494. package/dist/domain/sync-selection.js +2 -4
  495. package/dist/domain/sync-selection.js.map +1 -1
  496. package/dist/domain/toolchain/resolve.js +4 -0
  497. package/dist/domain/toolchain/resolve.js.map +1 -1
  498. package/dist/domain/toolchain/select.js +15 -9
  499. package/dist/domain/toolchain/select.js.map +1 -1
  500. package/dist/domain/toolchain/stderr.js +34 -14
  501. package/dist/domain/toolchain/stderr.js.map +1 -1
  502. package/dist/domain/values.js +18 -2
  503. package/dist/domain/values.js.map +1 -1
  504. package/dist/domain/workspace/commits.js +5 -0
  505. package/dist/domain/workspace/commits.js.map +1 -1
  506. package/dist/domain/workspace/operation-journal.js +93 -0
  507. package/dist/domain/workspace/operation-journal.js.map +1 -0
  508. package/dist/domain/workspace/plan.js +17 -1
  509. package/dist/domain/workspace/plan.js.map +1 -1
  510. package/dist/infra/config-store.js +8 -13
  511. package/dist/infra/config-store.js.map +1 -1
  512. package/dist/infra/contribution-store.js +21 -67
  513. package/dist/infra/contribution-store.js.map +1 -1
  514. package/dist/infra/harness-state.js +21 -49
  515. package/dist/infra/harness-state.js.map +1 -1
  516. package/dist/infra/local-store.js +8 -15
  517. package/dist/infra/local-store.js.map +1 -1
  518. package/dist/infra/owned-journal.js +57 -0
  519. package/dist/infra/owned-journal.js.map +1 -0
  520. package/dist/infra/projection-store.js +4 -3
  521. package/dist/infra/projection-store.js.map +1 -1
  522. package/dist/infra/tool-history.js +19 -49
  523. package/dist/infra/tool-history.js.map +1 -1
  524. package/dist/infra/trust-store.js +2 -9
  525. package/dist/infra/trust-store.js.map +1 -1
  526. package/dist/infra/workspace-home.js +7 -1
  527. package/dist/infra/workspace-home.js.map +1 -1
  528. package/dist/ports/ci.js +2 -1
  529. package/dist/ports/ci.js.map +1 -1
  530. package/package.json +1 -1
  531. package/skills/fx-workspace/SKILL.md +2 -3
  532. package/skills/fx-workspace/references/commands.md +35 -26
  533. package/skills/fx-workspace/references/workspace-tasks.md +6 -7
  534. package/dist/application/can.js.map +0 -1
  535. package/dist/application/doctor/login.js.map +0 -1
  536. package/dist/application/import.js.map +0 -1
  537. package/dist/application/init/setup.js +0 -125
  538. package/dist/application/init/setup.js.map +0 -1
  539. package/dist/application/preview-initialization.js +0 -41
  540. package/dist/application/preview-initialization.js.map +0 -1
  541. package/dist/application/refresh-manifest.js.map +0 -1
  542. package/dist/application/refresh-workspace-manifest.js +0 -27
  543. package/dist/application/refresh-workspace-manifest.js.map +0 -1
  544. package/dist/application/status.js.map +0 -1
  545. package/dist/application/where.js.map +0 -1
  546. package/dist/application/workspace-context.js.map +0 -1
  547. package/dist/domain/deadline.js +0 -17
  548. package/dist/domain/deadline.js.map +0 -1
@@ -0,0 +1,146 @@
1
+ // Initialization and every explicit sync perform local preparation, so a login the
2
+ // person already has is associated without anyone asking for it. Personal sign-in and
3
+ // operator-owned files always remain explicit handoffs.
4
+ import path from 'node:path';
5
+ import { preparationCheck, } from '../../domain/preparation.js';
6
+ import { gaveNoAnswer, unansweredSteps } from '../../domain/setup/progress.js';
7
+ import { isLocalPreparation } from '../../domain/setup/types.js';
8
+ import { noAnswerAction, resumeAction, unreachableAction, verifyAction, } from '../preparation.js';
9
+ import { isTrustRequiredCode } from '../safety/trust.js';
10
+ import { workspaceToolScope } from '../tool/scope.js';
11
+ import { expectedPath } from './handoff.js';
12
+ import { isSettled, Login } from './run.js';
13
+ import { expandHome } from './verify.js';
14
+ export async function prepareWorkspaceSetup(deps, login, input) {
15
+ const scope = workspaceToolScope(deps.ctx, {});
16
+ const useCase = new Login(deps, login);
17
+ const plan = await useCase.plan({ tools: scope.configuredNames });
18
+ const output = await useCase.execute({
19
+ tools: scope.configuredNames,
20
+ mode: 'prepare',
21
+ skipManual: false,
22
+ dryRun: input.dryRun,
23
+ noInput: true,
24
+ posture: input.posture,
25
+ });
26
+ const codes = new Map(output.items.map((item) => [item.id, item.failure?.code]));
27
+ const unanswered = unansweredSteps(plan.steps, (step) => gaveNoAnswer(codes.get(step.id)));
28
+ return {
29
+ summary: output.summary,
30
+ details: { items: output.items, problems: output.problems },
31
+ checks: [
32
+ ...output.items.map((item) => stepCheck(deps, login, item, {
33
+ step: plan.steps.find((step) => step.id === item.id),
34
+ required: scope.required.has(item.tool),
35
+ unknown: unanswered.has(item.id),
36
+ initializing: input.initializing,
37
+ })),
38
+ ...output.problems.map((problem) => preparationCheck(`setup:${problem.step}`, 'blocked', problem.detail, {
39
+ owner: 'maintainer',
40
+ })),
41
+ ],
42
+ };
43
+ }
44
+ // One step's row as a preparation check, keeping why it is pending and what it waits on.
45
+ function stepCheck(deps, login, item, context) {
46
+ const { step, unknown } = context;
47
+ const ready = isSettled(item.result);
48
+ const expected = ready || unknown ? undefined : expectedFile(deps, step, login.home);
49
+ const detail = `${item.title}: ${item.detail ?? item.result}${expected === undefined ? '' : `; expected ${expected}`}`;
50
+ const pending = unknown ? 'unknown' : 'blocked';
51
+ const check = ready ? undefined : item.handoff?.check;
52
+ const cause = check?.result === 'failed' ? check.cause : undefined;
53
+ const { initializing } = context;
54
+ return preparationCheck(`login:${item.id}`, ready ? 'ready' : pending, detail, {
55
+ resource: item.id,
56
+ required: context.required,
57
+ owner: unknown || (isLocalPreparation(step) && !settled(item)) ? 'agent' : 'user',
58
+ ...(cause === undefined ? {} : { cause }),
59
+ ...(check?.result === 'blocked' ? { waits_on: `login:${check.by}` } : {}),
60
+ ...(ready
61
+ ? {}
62
+ : {
63
+ actions: item.actions ??
64
+ actionsFor(deps, step, login.home, { item, unknown, cause, initializing }),
65
+ }),
66
+ ...(item.failure ? { failure: item.failure, code: item.failure.code } : {}),
67
+ });
68
+ }
69
+ // A preparation step whose companion said running it again will not help is the person's:
70
+ // repairing it would repeat the failure, and signing in would wait on it again. What
71
+ // resolves it is the companion's own recovery, which its failure carries. Only the
72
+ // companion's own code says so: the generic one means it said nothing, and fx's own gates,
73
+ // such as an unapproved vector, are resolved by approving it.
74
+ function settled(item) {
75
+ const { failure } = item;
76
+ return (failure !== undefined &&
77
+ !failure.retryable &&
78
+ failure.code !== 'SETUP_COMMAND_FAILED' &&
79
+ !isTrustRequiredCode(failure.code));
80
+ }
81
+ // A check that gave no answer offers its own recovery; a step waiting on it offers none.
82
+ // A server that cannot be reached is checked again once the network is back; no sign-in
83
+ // would change it.
84
+ function actionsFor(deps, step, home, row) {
85
+ const code = row.item.failure?.code;
86
+ if (code !== undefined && gaveNoAnswer(code))
87
+ return [noAnswerAction(deps, step, code)];
88
+ if (row.unknown)
89
+ return [];
90
+ if (row.cause === 'network')
91
+ return [unreachableAction(deps, step)];
92
+ if (!isLocalPreparation(step) && code === 'VECTOR_UNTRUSTED')
93
+ return [verifyAction(deps, step.tool)];
94
+ const { initializing, item } = row;
95
+ if (isLocalPreparation(step) && settled(item))
96
+ return [];
97
+ return setupActions(deps, step, home, { initializing, handoff: item.handoff });
98
+ }
99
+ // The handoff a finding already carries for a step, with what its check said.
100
+ export function handoffOf(finding, step) {
101
+ return finding.handoff?.user_steps.find((item) => item.id === step.id);
102
+ }
103
+ function expectedFile(deps, step, home) {
104
+ const expected = expectedPath(step);
105
+ return expected === undefined
106
+ ? undefined
107
+ : path.resolve(deps.ctx.root, expandHome(expected, home));
108
+ }
109
+ export function setupActions(deps, step, home, options = {}) {
110
+ const { initializing = false, handoff } = options;
111
+ const expected = expectedFile(deps, step, home);
112
+ if (isLocalPreparation(step)) {
113
+ const resume = resumeAction({ workspace: deps.ctx.name, cwd: deps.ctx.root });
114
+ return [
115
+ {
116
+ ...resume,
117
+ id: `approve:${step.id}`,
118
+ description: initializing
119
+ ? 'Review the remaining initialization effects and continue this workspace'
120
+ : `Repair ${step.tool}'s local preparation and the workspace's managed guides and Skills`,
121
+ argv: initializing
122
+ ? [...resume.argv, '--yes']
123
+ : ['fx', 'doctor', '--fix', '--tool', step.tool, '--workspace', deps.ctx.name, '--yes'],
124
+ requires_approval: true,
125
+ },
126
+ ];
127
+ }
128
+ return [
129
+ {
130
+ id: `login:${step.id}`,
131
+ description: `${handoff?.instructions ?? step.instructions ?? step.title}${expected === undefined ? '' : ` Expected file: ${expected}.`}`,
132
+ argv: [
133
+ 'fx',
134
+ 'login',
135
+ step.tool,
136
+ '--workspace',
137
+ deps.ctx.name,
138
+ ...(step.env ? ['--env', step.env] : []),
139
+ ],
140
+ cwd: deps.ctx.root,
141
+ actor: 'user',
142
+ requires_approval: true,
143
+ },
144
+ ];
145
+ }
146
+ //# sourceMappingURL=stage.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"stage.js","sourceRoot":"","sources":["../../../src/application/login/stage.ts"],"names":[],"mappings":"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"}
@@ -2,10 +2,11 @@
2
2
  // something doctor, login, can and where can all do freely; only a patch-supplied
3
3
  // command vector has to be trusted first.
4
4
  import path from 'node:path';
5
- import { DevkitError } from '../../domain/errors.js';
5
+ import { toolMissingError } from '../../domain/errors.js';
6
6
  import { failureCaseOf } from '../../domain/setup/failure-case.js';
7
7
  import { matchesJson, statedReason } from '../../domain/setup/json-check.js';
8
8
  import { stderrReason } from '../../domain/toolchain/stderr.js';
9
+ import { messageOf } from '../../domain/values.js';
9
10
  import { ServiceOperation } from '../services/operation.js';
10
11
  import { workspaceCommand } from '../workspace/guidance.js';
11
12
  // Identity and access checks may contact a remote service or unlock native storage.
@@ -20,7 +21,9 @@ export class Verifier {
20
21
  }
21
22
  async verify(step, options = {}) {
22
23
  if (step.preparation) {
23
- const result = await new ServiceOperation(this.deps, this.setup).execute(step, true);
24
+ const result = await new ServiceOperation(this.deps, this.setup).execute(step, {
25
+ dryRun: true,
26
+ });
24
27
  return {
25
28
  ok: result.status === 'unchanged',
26
29
  detail: result.detail,
@@ -40,33 +43,19 @@ export class Verifier {
40
43
  return { ok: true, detail: `authenticated as ${user}` };
41
44
  }
42
45
  catch (err) {
43
- return { ok: false, detail: err instanceof Error ? err.message : String(err) };
46
+ return { ok: false, detail: messageOf(err) };
44
47
  }
45
48
  }
46
- const trust = {
47
- tool: step.tool,
48
- workspace: this.deps.ctx.name,
49
- commandShell: this.deps.commandShell,
49
+ const { gate } = this.deps.trust;
50
+ const trust = stepTrust(this.deps.trust, step, {
50
51
  vector: verify.command,
51
52
  label: `${step.id} check`,
52
- origin: step.origin,
53
- yes: this.setup.trust.yes,
54
- posture: this.setup.trust.posture,
55
- ...(step.executionEnv
56
- ? {
57
- execution: {
58
- purpose: 'service authentication',
59
- resource: step.id,
60
- bindings: step.executionEnv,
61
- },
62
- }
63
- : {}),
64
- };
65
- if (options.dryRun && !(await this.setup.trust.gate.isTrusted(trust)))
53
+ });
54
+ if (options.dryRun && !(await gate.isTrusted(trust)))
66
55
  return { ok: false, detail: 'manifest command is not trusted', withheld: true };
67
- await this.setup.trust.gate.ensure(trust);
56
+ await gate.ensure(trust);
68
57
  const vector = expandHomeIn(verify.command, this.setup.home);
69
- const result = await this.deps.processRun(vector, {
58
+ const result = await this.deps.process.run(vector, {
70
59
  timeoutMs: CHECK_TIMEOUT_MS,
71
60
  cwd: this.deps.ctx.root,
72
61
  env: step.executionEnv,
@@ -78,7 +67,7 @@ export class Verifier {
78
67
  return commandVerdict(verify, result);
79
68
  }
80
69
  toolMissing(tool, binary) {
81
- return new DevkitError('config', 'TOOL_MISSING', `${binary} is not installed or not on PATH`, {
70
+ return toolMissingError(binary, {
82
71
  hint: 'The check did not run, so it says nothing about this step.',
83
72
  nextSteps: [
84
73
  workspaceCommand(this.deps, 'tool', 'show', tool),
@@ -87,10 +76,27 @@ export class Verifier {
87
76
  });
88
77
  }
89
78
  }
90
- // A check that gave no answer: its tool did not start, or it outlived its deadline.
91
- // Nothing about the step follows from it, so nobody is handed the step for it.
92
- export function gaveNoAnswer(code) {
93
- return code === 'TOOL_MISSING' || code === 'PROCESS_TIMEOUT';
79
+ // What the trust gate is asked about one of a step's vectors, its check's or its command's.
80
+ export function stepTrust(trust, step, asked) {
81
+ return {
82
+ tool: step.tool,
83
+ workspace: trust.workspace,
84
+ commandShell: trust.commandShell,
85
+ vector: asked.vector,
86
+ label: asked.label,
87
+ origin: step.origin,
88
+ yes: trust.yes,
89
+ posture: asked.posture ?? trust.posture,
90
+ ...(step.executionEnv
91
+ ? {
92
+ execution: {
93
+ purpose: 'service authentication',
94
+ resource: step.id,
95
+ bindings: step.executionEnv,
96
+ },
97
+ }
98
+ : {}),
99
+ };
94
100
  }
95
101
  function commandVerdict(verify, result) {
96
102
  const unmet = verify.json !== undefined && !matchesJson(result.stdout, verify.json)
@@ -98,12 +104,11 @@ function commandVerdict(verify, result) {
98
104
  verify.json.unmet ??
99
105
  `expected ${verify.json.path} to be ${String(verify.json.equals)}`)
100
106
  : undefined;
101
- if (result.code === 0)
102
- return unmet === undefined
103
- ? { ok: true, detail: `${verify.command.join(' ')} succeeded` }
104
- : { ok: false, detail: unmet };
105
- // A tool that fails silently still answered the declared expectation on stdout.
106
- const silent = result.stderr.trim() === '';
107
+ if (result.code === 0 && unmet === undefined)
108
+ return { ok: true, detail: passed(verify) };
109
+ // A tool that fails silently, or answers without failing, still answered the declared
110
+ // expectation on stdout.
111
+ const silent = result.code === 0 || result.stderr.trim() === '';
107
112
  const read = failureCaseOf(result, verify.failures);
108
113
  return {
109
114
  ok: false,
@@ -119,6 +124,12 @@ function commandVerdict(verify, result) {
119
124
  }),
120
125
  };
121
126
  }
127
+ // What a passing check established; the command itself is in the step's plan.
128
+ function passed(verify) {
129
+ return verify.json === undefined
130
+ ? 'the check passed'
131
+ : `${verify.json.path} is ${String(verify.json.equals)}`;
132
+ }
122
133
  // Manifest paths say `~` the way a person would; a tool receiving them
123
134
  // through a vector does not go through a shell, so fx expands it.
124
135
  export function expandHome(target, home) {
@@ -1 +1 @@
1
- {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../src/application/login/verify.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../src/application/login/verify.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,11 @@
4
4
  import { bindPlatforms, bindProviders, } from '../../domain/manifest/providers.js';
5
5
  import { LoadManifest } from './load.js';
6
6
  export async function loadManifestContext(input) {
7
- const bundle = await new LoadManifest(input.fs, input.bundledTools, input.diagnostics).execute({
7
+ const bundle = await new LoadManifest({
8
+ fs: input.fs,
9
+ bundledTools: input.bundledTools,
10
+ diagnostics: input.diagnostics,
11
+ }).execute({
8
12
  dir: input.dir,
9
13
  cliVersion: input.cliVersion,
10
14
  providers: input.providers,
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/application/manifest/context.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,4EAA4E;AAC5E,gEAAgE;AAEhE,OAAO,EACL,aAAa,EACb,aAAa,GAId,MAAM,oCAAoC,CAAC;AAK5C,OAAO,EAAE,YAAY,EAAuB,MAAM,WAAW,CAAC;AAsB9D,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAAwB;IAChE,MAAM,MAAM,GAAG,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;QAC7F,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,MAAM,OAAO,GAAG;QACd,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO;QAClC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;KAC1C,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACrB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpB,IAAI,EAAE,yBAAyB;YAC/B,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,iBAAiB,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,mDAAmD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpJ,SAAS,EAAE,CAAC,sBAAsB,EAAE,cAAc,CAAC;YACnD,IAAI,EAAE,EAAE,OAAO,EAAE;SAClB,CAAC,CAAC;IACL,CAAC;IACD,OAAO;QACL,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,MAAM;QACN,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;QACrE,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;KAC3E,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/application/manifest/context.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,4EAA4E;AAC5E,gEAAgE;AAEhE,OAAO,EACL,aAAa,EACb,aAAa,GAId,MAAM,oCAAoC,CAAC;AAK5C,OAAO,EAAE,YAAY,EAAuB,MAAM,WAAW,CAAC;AAsB9D,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAAwB;IAChE,MAAM,MAAM,GAAG,MAAM,IAAI,YAAY,CAAC;QACpC,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,WAAW,EAAE,KAAK,CAAC,WAAW;KAC/B,CAAC,CAAC,OAAO,CAAC;QACT,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,MAAM,OAAO,GAAG;QACd,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO;QAClC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;KAC1C,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACrB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpB,IAAI,EAAE,yBAAyB;YAC/B,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,iBAAiB,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,mDAAmD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpJ,SAAS,EAAE,CAAC,sBAAsB,EAAE,cAAc,CAAC;YACnD,IAAI,EAAE,EAAE,OAAO,EAAE;SAClB,CAAC,CAAC;IACL,CAAC;IACD,OAAO;QACL,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,MAAM;QACN,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;QACrE,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;KAC3E,CAAC;AACJ,CAAC"}
@@ -1,17 +1,20 @@
1
1
  // Inspect existing checkouts and write only a candidate manifest, retaining unresolved inference for review.
2
2
  import path from 'node:path';
3
- import { DevkitError } from '../domain/errors.js';
4
- import { foldDefaults } from '../domain/import/fold.js';
5
- import { parseGitmodules } from '../domain/import/gitmodules.js';
6
- import { hostOf, inferRepo, isPersonal, } from '../domain/import/infer.js';
7
- import { renderManifest } from '../domain/import/render.js';
8
- import { isAtOrInside } from '../domain/path.js';
9
- import { assertWritable } from './safety/posture.js';
3
+ import { DevkitError } from '../../domain/errors.js';
4
+ import { foldDefaults } from '../../domain/import/fold.js';
5
+ import { parseGitmodules } from '../../domain/import/gitmodules.js';
6
+ import { hostOf, inferRepo, isPersonal, } from '../../domain/import/infer.js';
7
+ import { renderManifest } from '../../domain/import/render.js';
8
+ import { isAtOrInside } from '../../domain/path.js';
9
+ import { shellLine } from '../../domain/shell.js';
10
+ import { assertWritable } from '../safety/posture.js';
10
11
  const SKIP = new Set(['node_modules']);
11
- function insideRoot(root, target) {
12
+ function insideRoot(root, target, shell) {
12
13
  return new DevkitError('conflict', 'IMPORT_INSIDE_ROOT', `${target} lies inside ${root}, the directory being described`, {
13
14
  hint: 'The imported directory is a workspace of checkouts; the manifest belongs in a checkout of the manifest repository.',
14
- nextSteps: [`fx manifest import ${root} -o <manifest repository>/manifest/workspace.yaml`],
15
+ nextSteps: [
16
+ `${shellLine(['fx', 'manifest', 'import', root], shell)} -o <manifest repository>/manifest/workspace.yaml`,
17
+ ],
15
18
  });
16
19
  }
17
20
  export class Import {
@@ -23,12 +26,12 @@ export class Import {
23
26
  const root = path.resolve(input.dir);
24
27
  const target = input.out === undefined ? null : path.resolve(input.out);
25
28
  if (target !== null && isAtOrInside(await this.physical(target), await this.physical(root)))
26
- throw insideRoot(root, target);
27
- const skipped = [];
28
- const observed = await this.observe(root, skipped);
29
- const repos = await this.identify(await this.infer(observed, skipped));
29
+ throw insideRoot(root, target, this.deps.commandShell);
30
+ const observed = await this.observe(root);
31
+ const inferred = await this.infer(observed.repos);
32
+ const repos = await this.identify(inferred.repos);
30
33
  const manifest = renderManifest(foldDefaults(repos));
31
- const report = summarize(repos, skipped);
34
+ const report = summarize(repos, [...observed.skipped, ...inferred.skipped]);
32
35
  if (target === null || input.dryRun)
33
36
  return { path: target, written: false, manifest, report };
34
37
  assertWritable(input.posture, 'import');
@@ -70,19 +73,20 @@ export class Import {
70
73
  // A directory is a repository only when git's toplevel is the directory
71
74
  // itself; a plain directory inside a repository would otherwise inherit
72
75
  // the enclosing remotes. Containers are entered one level, no deeper.
73
- async observe(root, skipped) {
76
+ async observe(root) {
74
77
  const gitmodules = parseGitmodules((await this.deps.fs.readText(path.join(root, '.gitmodules'))) ?? '');
75
78
  const found = [];
79
+ const skipped = [];
76
80
  for (const name of await this.children(root)) {
77
81
  const dir = path.join(root, name);
78
- if (await this.isRepoRoot(dir)) {
82
+ if (await this.deps.git.isToplevel(dir)) {
79
83
  found.push(await this.observeRepo(root, dir, gitmodules[name]?.branch));
80
84
  continue;
81
85
  }
82
86
  const inside = [];
83
87
  for (const child of await this.children(dir)) {
84
88
  const sub = path.join(dir, child);
85
- if (await this.isRepoRoot(sub)) {
89
+ if (await this.deps.git.isToplevel(sub)) {
86
90
  inside.push(child);
87
91
  found.push(await this.observeRepo(root, sub, gitmodules[`${name}/${child}`]?.branch));
88
92
  }
@@ -90,7 +94,7 @@ export class Import {
90
94
  if (inside.length === 0)
91
95
  skipped.push({ path: name, reason: 'not a repository' });
92
96
  }
93
- return found;
97
+ return { repos: found, skipped };
94
98
  }
95
99
  async children(dir) {
96
100
  const names = [];
@@ -102,12 +106,6 @@ export class Import {
102
106
  }
103
107
  return names;
104
108
  }
105
- async isRepoRoot(dir) {
106
- const top = await this.deps.git.toplevel(dir);
107
- if (top === undefined)
108
- return false;
109
- return (await this.deps.fs.realpath(top)) === (await this.deps.fs.realpath(dir));
110
- }
111
109
  async observeRepo(root, dir, gitmodulesBranch) {
112
110
  const remotes = await this.deps.git.remotes(dir);
113
111
  const remoteHeads = {};
@@ -127,8 +125,9 @@ export class Import {
127
125
  }
128
126
  // Two passes: the projects named by rungs 1 and 2 are the candidate
129
127
  // list rung 3 searches for the fork-only checkouts.
130
- async infer(observed, skipped) {
128
+ async infer(observed) {
131
129
  const repos = [];
130
+ const skipped = [];
132
131
  const later = [];
133
132
  for (const obs of observed) {
134
133
  const origin = obs.remotes['origin'];
@@ -160,7 +159,7 @@ export class Import {
160
159
  : `${result.skipped}; ${unsettledNote(unsettled)}`,
161
160
  });
162
161
  }
163
- return repos;
162
+ return { repos, skipped };
164
163
  }
165
164
  // The ladder is synchronous; the code host is not. Every candidate pair is
166
165
  // asked once, up front, and every host is resolved once however many
@@ -170,7 +169,7 @@ export class Import {
170
169
  const hosts = new Map();
171
170
  for (const obs of later) {
172
171
  const host = hostOf(obs.remotes['origin'] ?? '');
173
- const pending = hosts.get(host) ?? this.deps.codeHost(host);
172
+ const pending = hosts.get(host) ?? this.codeHostAt(host);
174
173
  hosts.set(host, pending);
175
174
  const codeHost = await pending;
176
175
  for (const project of seen) {
@@ -182,6 +181,14 @@ export class Import {
182
181
  }
183
182
  return answers;
184
183
  }
184
+ // An import runs before any workspace binds a provider, so only a host that is a
185
+ // directory on this machine can be asked; every other host stays unasked. A local
186
+ // host that will not resolve is a configuration failure the caller must see.
187
+ async codeHostAt(host) {
188
+ if (!path.isAbsolute(host) || !(await this.deps.fs.exists(host)))
189
+ return undefined;
190
+ return this.deps.localCodeHost(host);
191
+ }
185
192
  }
186
193
  async function probe(codeHost, project, name) {
187
194
  try {
@@ -0,0 +1 @@
1
+ {"version":3,"file":"import.js","sourceRoot":"","sources":["../../../src/application/manifest/import.ts"],"names":[],"mappings":"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"}
@@ -4,22 +4,20 @@ import path from 'node:path';
4
4
  import { lintManifest } from '../../domain/manifest/lint.js';
5
5
  import { loadToolsDocument, loadToolsPatchDocument } from '../../domain/manifest/loader.js';
6
6
  import { bindPlatforms } from '../../domain/manifest/providers.js';
7
+ import { setupKeyOf } from '../../domain/setup/names.js';
7
8
  import { lintSkill } from '../../domain/skills/lint.js';
8
9
  import { placeholders } from '../../domain/template.js';
9
10
  import { teamSkillsRoot } from '../skill/observe.js';
10
11
  import { LoadManifest } from './load.js';
11
12
  import { ValidateManifest } from './validate.js';
12
13
  export class LintManifest {
13
- fs;
14
- bundledTools;
15
- describeProvider;
16
- constructor(fs, bundledTools, describeProvider = () => undefined) {
17
- this.fs = fs;
18
- this.bundledTools = bundledTools;
19
- this.describeProvider = describeProvider;
14
+ deps;
15
+ constructor(deps) {
16
+ this.deps = deps;
20
17
  }
21
18
  async execute(input) {
22
- const validation = await new ValidateManifest(this.fs, this.bundledTools).execute({
19
+ const { fs, bundledTools, describeProvider } = this.deps;
20
+ const validation = await new ValidateManifest(fs, bundledTools).execute({
23
21
  ...input,
24
22
  strict: false,
25
23
  });
@@ -31,9 +29,7 @@ export class LintManifest {
31
29
  })));
32
30
  if (invalid.length > 0)
33
31
  return [...invalid, ...(await this.skills(input.dir))];
34
- const bundle = await new LoadManifest(this.fs, this.bundledTools).execute({
35
- ...input,
36
- });
32
+ const bundle = await new LoadManifest({ fs, bundledTools }).execute({ ...input });
37
33
  const patch = bundle.tools.patchText;
38
34
  const members = bundle.members?.result.doc;
39
35
  const environmentDoc = bundle.environments?.result.doc;
@@ -49,12 +45,7 @@ export class LintManifest {
49
45
  ? []
50
46
  : bindPlatforms(environmentDoc, input.providers)).flatMap((binding) => binding.provider === null
51
47
  ? []
52
- : [
53
- [
54
- binding.provider,
55
- setupHints(this.describeProvider(binding.provider)?.recipes ?? []),
56
- ],
57
- ])),
48
+ : [[binding.provider, setupHints(describeProvider?.(binding.provider)?.recipes ?? [])]])),
58
49
  ...(bundle.environments === undefined
59
50
  ? {}
60
51
  : { environments: bundle.environments.result.doc }),
@@ -62,7 +53,7 @@ export class LintManifest {
62
53
  ? {}
63
54
  : {
64
55
  tools: {
65
- base: loadToolsDocument(this.bundledTools(), input).doc,
56
+ base: loadToolsDocument(bundledTools(), input).doc,
66
57
  patch: loadToolsPatchDocument(patch, input).doc,
67
58
  },
68
59
  }),
@@ -70,12 +61,13 @@ export class LintManifest {
70
61
  return [...documents, ...(await this.skills(input.dir))];
71
62
  }
72
63
  async skills(dir) {
64
+ const { fs } = this.deps;
73
65
  const root = teamSkillsRoot(dir);
74
66
  const findings = [];
75
- for (const name of (await this.fs.readDir(root)).sort()) {
76
- if (!(await this.fs.isDirectory(path.join(root, name))))
67
+ for (const name of (await fs.readDir(root)).sort()) {
68
+ if (!(await fs.isDirectory(path.join(root, name))))
77
69
  continue;
78
- findings.push(...lintSkill(name, await this.fs.readText(path.join(root, name, 'SKILL.md'))));
70
+ findings.push(...lintSkill(name, await fs.readText(path.join(root, name, 'SKILL.md'))));
79
71
  }
80
72
  return findings;
81
73
  }
@@ -86,8 +78,8 @@ function setupHints(recipes) {
86
78
  .filter((recipe) => recipe.perEnv && (recipe.kind === 'file' || recipe.kind === 'manual'))
87
79
  .flatMap((recipe) => [recipe.open ?? '', recipe.instructions ?? '']
88
80
  .flatMap(placeholders)
89
- .filter((key) => key.startsWith('setup.') && !recipe.defaults?.[key]?.trim())
90
- .map((key) => key.slice('setup.'.length)))),
81
+ .filter((name) => !recipe.defaults?.[name]?.trim())
82
+ .flatMap((name) => setupKeyOf(name) ?? []))),
91
83
  ];
92
84
  }
93
85
  //# sourceMappingURL=lint.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../src/application/manifest/lint.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../src/application/manifest/lint.ts"],"names":[],"mappings":"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"}