@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.
- package/CHANGELOG.md +110 -0
- package/README.md +9 -42
- package/defaults/tools.yaml +6 -1
- package/dist/adapters/agent-host/toml-mcp.js +1 -3
- package/dist/adapters/agent-host/toml-mcp.js.map +1 -1
- package/dist/adapters/calendar/wecom-calendar-cli/provider.js +42 -0
- package/dist/adapters/calendar/wecom-calendar-cli/provider.js.map +1 -0
- package/dist/adapters/ci/github-actions/ci.js +9 -7
- package/dist/adapters/ci/github-actions/ci.js.map +1 -1
- package/dist/adapters/ci/github-actions/provider.js +2 -2
- package/dist/adapters/ci/github-actions/provider.js.map +1 -1
- package/dist/adapters/ci/jenkins-cli/ci.js +6 -1
- package/dist/adapters/ci/jenkins-cli/ci.js.map +1 -1
- package/dist/adapters/cluster/kubectl/provider.js +2 -3
- package/dist/adapters/cluster/kubectl/provider.js.map +1 -1
- package/dist/adapters/code-host/bitbucket-cli/contribution-call.js +5 -27
- package/dist/adapters/code-host/bitbucket-cli/contribution-call.js.map +1 -1
- package/dist/adapters/code-host/bitbucket-cli/provider.js.map +1 -1
- package/dist/adapters/code-host/bitbucket-cli/pull-request-reference.js +1 -19
- package/dist/adapters/code-host/bitbucket-cli/pull-request-reference.js.map +1 -1
- package/dist/adapters/code-host/bitbucket-cli/pull-request.js +3 -17
- package/dist/adapters/code-host/bitbucket-cli/pull-request.js.map +1 -1
- package/dist/adapters/code-host/bitbucket-cli/repository-identity.js +1 -4
- package/dist/adapters/code-host/bitbucket-cli/repository-identity.js.map +1 -1
- package/dist/adapters/code-host/github/contribution.js +179 -0
- package/dist/adapters/code-host/github/contribution.js.map +1 -0
- package/dist/adapters/code-host/github/import.js +27 -0
- package/dist/adapters/code-host/github/import.js.map +1 -0
- package/dist/adapters/code-host/github/provider.js +12 -14
- package/dist/adapters/code-host/github/provider.js.map +1 -1
- package/dist/adapters/code-host/local-git/import.js +2 -2
- package/dist/adapters/code-host/local-git/import.js.map +1 -1
- package/dist/adapters/code-host/local-git/provider.js +3 -3
- package/dist/adapters/code-host/local-git/provider.js.map +1 -1
- package/dist/adapters/error-tracker/sentry/client.js +1 -1
- package/dist/adapters/error-tracker/sentry/client.js.map +1 -1
- package/dist/adapters/family/cli.js +15 -17
- package/dist/adapters/family/cli.js.map +1 -1
- package/dist/adapters/family/contribution.js +65 -0
- package/dist/adapters/family/contribution.js.map +1 -0
- package/dist/adapters/family/service-protocol.js +1 -0
- package/dist/adapters/family/service-protocol.js.map +1 -1
- package/dist/adapters/fs/node-fs.js +5 -8
- package/dist/adapters/fs/node-fs.js.map +1 -1
- package/dist/adapters/git/run.js +17 -0
- package/dist/adapters/git/run.js.map +1 -0
- package/dist/adapters/git/system-git.js +36 -16
- package/dist/adapters/git/system-git.js.map +1 -1
- package/dist/adapters/github/gh.js +1 -1
- package/dist/adapters/github/gh.js.map +1 -1
- package/dist/adapters/manifest-source/git-repo.js +38 -18
- package/dist/adapters/manifest-source/git-repo.js.map +1 -1
- package/dist/adapters/manifest-source/stdin.js +4 -6
- package/dist/adapters/manifest-source/stdin.js.map +1 -1
- package/dist/adapters/metrics/prometheus-cli/service.js +9 -1
- package/dist/adapters/metrics/prometheus-cli/service.js.map +1 -1
- package/dist/adapters/process/deadline-process.js +7 -3
- package/dist/adapters/process/deadline-process.js.map +1 -1
- package/dist/adapters/process/diagnostic-process.js +2 -3
- package/dist/adapters/process/diagnostic-process.js.map +1 -1
- package/dist/adapters/registry/registry-policy.js +4 -14
- package/dist/adapters/registry/registry-policy.js.map +1 -1
- package/dist/application/agent/list.js +12 -0
- package/dist/application/agent/list.js.map +1 -1
- package/dist/application/agent/pick.js +12 -30
- package/dist/application/agent/pick.js.map +1 -1
- package/dist/application/agent/workspace-cleanup.js +4 -1
- package/dist/application/agent/workspace-cleanup.js.map +1 -1
- package/dist/application/config/export.js +3 -2
- package/dist/application/config/export.js.map +1 -1
- package/dist/application/config/import-registry.js +3 -3
- package/dist/application/config/import-registry.js.map +1 -1
- package/dist/application/config/import.js +12 -4
- package/dist/application/config/import.js.map +1 -1
- package/dist/application/config/resolve.js +2 -4
- package/dist/application/config/resolve.js.map +1 -1
- package/dist/application/contribution/identity.js +3 -3
- package/dist/application/contribution/identity.js.map +1 -1
- package/dist/application/contribution/push-registered.js +77 -0
- package/dist/application/contribution/push-registered.js.map +1 -0
- package/dist/application/contribution/push.js +12 -19
- package/dist/application/contribution/push.js.map +1 -1
- package/dist/application/contribution/validate.js +12 -13
- package/dist/application/contribution/validate.js.map +1 -1
- package/dist/application/docs/rendered.js +2 -1
- package/dist/application/docs/rendered.js.map +1 -1
- package/dist/application/doctor/index.js +43 -27
- package/dist/application/doctor/index.js.map +1 -1
- package/dist/application/doctor/manifest.js +5 -1
- package/dist/application/doctor/manifest.js.map +1 -1
- package/dist/application/doctor/repos.js +1 -1
- package/dist/application/doctor/repos.js.map +1 -1
- package/dist/application/doctor/tools.js +20 -31
- package/dist/application/doctor/tools.js.map +1 -1
- package/dist/application/doctor/types.js +0 -8
- package/dist/application/doctor/types.js.map +1 -1
- package/dist/application/env/names.js.map +1 -1
- package/dist/application/harness/apply.js +4 -3
- package/dist/application/harness/apply.js.map +1 -1
- package/dist/application/harness/cleanup.js +5 -14
- package/dist/application/harness/cleanup.js.map +1 -1
- package/dist/application/harness/mcp-readiness.js +3 -1
- package/dist/application/harness/mcp-readiness.js.map +1 -1
- package/dist/application/harness/names.js +2 -4
- package/dist/application/harness/names.js.map +1 -1
- package/dist/application/harness/plan.js +12 -10
- package/dist/application/harness/plan.js.map +1 -1
- package/dist/application/harness/reconcile.js +4 -14
- package/dist/application/harness/reconcile.js.map +1 -1
- package/dist/application/harness/session.js +2 -13
- package/dist/application/harness/session.js.map +1 -1
- package/dist/application/harness/stages.js +8 -18
- package/dist/application/harness/stages.js.map +1 -1
- package/dist/application/harness/types.js +1 -8
- package/dist/application/harness/types.js.map +1 -1
- package/dist/application/hook/apply.js +5 -4
- package/dist/application/hook/apply.js.map +1 -1
- package/dist/application/hook/automatic-sync.js +8 -3
- package/dist/application/hook/automatic-sync.js.map +1 -1
- package/dist/application/hook/cleanup.js +5 -14
- package/dist/application/hook/cleanup.js.map +1 -1
- package/dist/application/hook/dispatch.js +24 -3
- package/dist/application/hook/dispatch.js.map +1 -1
- package/dist/application/hook/observe.js +11 -9
- package/dist/application/hook/observe.js.map +1 -1
- package/dist/application/hook/plan.js.map +1 -1
- package/dist/application/hook/reconcile.js +2 -9
- package/dist/application/hook/reconcile.js.map +1 -1
- package/dist/application/hook/session.js +5 -12
- package/dist/application/hook/session.js.map +1 -1
- package/dist/application/hook/supervisor-report.js +2 -1
- package/dist/application/hook/supervisor-report.js.map +1 -1
- package/dist/application/hook/types.js +8 -1
- package/dist/application/hook/types.js.map +1 -1
- package/dist/application/init/errors.js +19 -19
- package/dist/application/init/errors.js.map +1 -1
- package/dist/application/init/index.js +60 -42
- package/dist/application/init/index.js.map +1 -1
- package/dist/application/init/preview-initialization.js +40 -0
- package/dist/application/init/preview-initialization.js.map +1 -0
- package/dist/application/init/preview.js +37 -19
- package/dist/application/init/preview.js.map +1 -1
- package/dist/application/init/resume.js +30 -0
- package/dist/application/init/resume.js.map +1 -0
- package/dist/application/init/source.js +8 -0
- package/dist/application/init/source.js.map +1 -0
- package/dist/application/{doctor/login.js → login/check.js} +22 -43
- package/dist/application/login/check.js.map +1 -0
- package/dist/application/login/collect.js +2 -1
- package/dist/application/login/collect.js.map +1 -1
- package/dist/application/login/command-failure.js +2 -0
- package/dist/application/login/command-failure.js.map +1 -1
- package/dist/application/login/deps.js +2 -3
- package/dist/application/login/deps.js.map +1 -1
- package/dist/application/login/run.js +149 -54
- package/dist/application/login/run.js.map +1 -1
- package/dist/application/login/stage.js +146 -0
- package/dist/application/login/stage.js.map +1 -0
- package/dist/application/login/verify.js +45 -34
- package/dist/application/login/verify.js.map +1 -1
- package/dist/application/manifest/context.js +5 -1
- package/dist/application/manifest/context.js.map +1 -1
- package/dist/application/{import.js → manifest/import.js} +34 -27
- package/dist/application/manifest/import.js.map +1 -0
- package/dist/application/manifest/lint.js +15 -23
- package/dist/application/manifest/lint.js.map +1 -1
- package/dist/application/manifest/load.js +7 -11
- package/dist/application/manifest/load.js.map +1 -1
- package/dist/application/manifest/prepare.js +3 -2
- package/dist/application/manifest/prepare.js.map +1 -1
- package/dist/application/manifest/providers.js +4 -1
- package/dist/application/manifest/providers.js.map +1 -1
- package/dist/application/{refresh-manifest.js → manifest/refresh.js} +26 -2
- package/dist/application/manifest/refresh.js.map +1 -0
- package/dist/application/manifest/set.js +2 -1
- package/dist/application/manifest/set.js.map +1 -1
- package/dist/application/member/list.js +2 -4
- package/dist/application/member/list.js.map +1 -1
- package/dist/application/member/show.js +2 -3
- package/dist/application/member/show.js.map +1 -1
- package/dist/application/preparation.js +92 -25
- package/dist/application/preparation.js.map +1 -1
- package/dist/application/probe-record/index.js +19 -18
- package/dist/application/probe-record/index.js.map +1 -1
- package/dist/application/probe-record/plan.js +6 -4
- package/dist/application/probe-record/plan.js.map +1 -1
- package/dist/application/{can.js → readiness/can.js} +23 -11
- package/dist/application/readiness/can.js.map +1 -0
- package/dist/application/readiness/index.js +22 -35
- package/dist/application/readiness/index.js.map +1 -1
- package/dist/application/readiness/resolve.js +13 -15
- package/dist/application/readiness/resolve.js.map +1 -1
- package/dist/application/readiness/verdicts.js +2 -7
- package/dist/application/readiness/verdicts.js.map +1 -1
- package/dist/application/{where.js → readiness/where.js} +19 -21
- package/dist/application/readiness/where.js.map +1 -0
- package/dist/application/release/ci.js +1 -1
- package/dist/application/release/ci.js.map +1 -1
- package/dist/application/release/index.js +12 -17
- package/dist/application/release/index.js.map +1 -1
- package/dist/application/safety/trust.js +12 -14
- package/dist/application/safety/trust.js.map +1 -1
- package/dist/application/self/update.js +23 -13
- package/dist/application/self/update.js.map +1 -1
- package/dist/application/services/command.js +6 -8
- package/dist/application/services/command.js.map +1 -1
- package/dist/application/services/operation.js +12 -19
- package/dist/application/services/operation.js.map +1 -1
- package/dist/application/services/recipes.js +7 -2
- package/dist/application/services/recipes.js.map +1 -1
- package/dist/application/services/stage.js +6 -4
- package/dist/application/services/stage.js.map +1 -1
- package/dist/application/services/types.js +7 -1
- package/dist/application/services/types.js.map +1 -1
- package/dist/application/skill/copies.js +13 -22
- package/dist/application/skill/copies.js.map +1 -1
- package/dist/application/skill/fx-copies.js +1 -1
- package/dist/application/skill/fx-copies.js.map +1 -1
- package/dist/application/skill/stage.js +24 -26
- package/dist/application/skill/stage.js.map +1 -1
- package/dist/application/skill/standalone.js +1 -1
- package/dist/application/skill/standalone.js.map +1 -1
- package/dist/application/skill/targets.js +2 -16
- package/dist/application/skill/targets.js.map +1 -1
- package/dist/application/skill/tool-skills.js +20 -10
- package/dist/application/skill/tool-skills.js.map +1 -1
- package/dist/application/sync/checks.js +7 -45
- package/dist/application/sync/checks.js.map +1 -1
- package/dist/application/sync/index.js +76 -26
- package/dist/application/sync/index.js.map +1 -1
- package/dist/application/sync/stages.js +33 -26
- package/dist/application/sync/stages.js.map +1 -1
- package/dist/application/sync/types.js +6 -1
- package/dist/application/sync/types.js.map +1 -1
- package/dist/application/tool/check.js +8 -0
- package/dist/application/tool/check.js.map +1 -1
- package/dist/application/tool/history.js +16 -0
- package/dist/application/tool/history.js.map +1 -0
- package/dist/application/tool/initialize.js +2 -1
- package/dist/application/tool/initialize.js.map +1 -1
- package/dist/application/tool/install.js +15 -18
- package/dist/application/tool/install.js.map +1 -1
- package/dist/application/tool/installed.js +1 -1
- package/dist/application/tool/installed.js.map +1 -1
- package/dist/application/tool/list.js.map +1 -1
- package/dist/application/tool/scope.js +8 -7
- package/dist/application/tool/scope.js.map +1 -1
- package/dist/application/tool/select.js +2 -4
- package/dist/application/tool/select.js.map +1 -1
- package/dist/application/tool/show.js.map +1 -1
- package/dist/application/tool/toolchain.js +19 -6
- package/dist/application/tool/toolchain.js.map +1 -1
- package/dist/application/update/check.js +2 -1
- package/dist/application/update/check.js.map +1 -1
- package/dist/application/workspace/command-operation.js +4 -3
- package/dist/application/workspace/command-operation.js.map +1 -1
- package/dist/application/{workspace-context.js → workspace/context.js} +26 -19
- package/dist/application/workspace/context.js.map +1 -0
- package/dist/application/workspace/deps.js +3 -3
- package/dist/application/workspace/deps.js.map +1 -1
- package/dist/application/workspace/guidance.js +2 -4
- package/dist/application/workspace/guidance.js.map +1 -1
- package/dist/application/workspace/health.js +4 -2
- package/dist/application/workspace/health.js.map +1 -1
- package/dist/application/workspace/inspect.js +1 -4
- package/dist/application/workspace/inspect.js.map +1 -1
- package/dist/application/workspace/manage.js +83 -97
- package/dist/application/workspace/manage.js.map +1 -1
- package/dist/application/workspace/operation.js +13 -14
- package/dist/application/workspace/operation.js.map +1 -1
- package/dist/application/workspace/plan.js +2 -1
- package/dist/application/workspace/plan.js.map +1 -1
- package/dist/application/workspace/registry.js +4 -3
- package/dist/application/workspace/registry.js.map +1 -1
- package/dist/application/workspace/resolve.js +10 -12
- package/dist/application/workspace/resolve.js.map +1 -1
- package/dist/application/workspace/resources.js +39 -32
- package/dist/application/workspace/resources.js.map +1 -1
- package/dist/application/workspace/source-preview.js +6 -3
- package/dist/application/workspace/source-preview.js.map +1 -1
- package/dist/application/{status.js → workspace/status.js} +51 -6
- package/dist/application/workspace/status.js.map +1 -0
- package/dist/cli/base.js +22 -28
- package/dist/cli/base.js.map +1 -1
- package/dist/cli/commands/agent/pick.js +4 -1
- package/dist/cli/commands/agent/pick.js.map +1 -1
- package/dist/cli/commands/agent/unpick.js +5 -1
- package/dist/cli/commands/agent/unpick.js.map +1 -1
- package/dist/cli/commands/can.js +5 -21
- package/dist/cli/commands/can.js.map +1 -1
- package/dist/cli/commands/config/import.js +1 -8
- package/dist/cli/commands/config/import.js.map +1 -1
- package/dist/cli/commands/doctor.js +2 -1
- package/dist/cli/commands/doctor.js.map +1 -1
- package/dist/cli/commands/env/pick.js +1 -0
- package/dist/cli/commands/env/pick.js.map +1 -1
- package/dist/cli/commands/env/select.js +1 -0
- package/dist/cli/commands/env/select.js.map +1 -1
- package/dist/cli/commands/env/unpick.js +1 -0
- package/dist/cli/commands/env/unpick.js.map +1 -1
- package/dist/cli/commands/hook/disable.js +1 -0
- package/dist/cli/commands/hook/disable.js.map +1 -1
- package/dist/cli/commands/hook/enable.js +1 -0
- package/dist/cli/commands/hook/enable.js.map +1 -1
- package/dist/cli/commands/init.js +14 -11
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/login.js +13 -2
- package/dist/cli/commands/login.js.map +1 -1
- package/dist/cli/commands/manifest/import.js +6 -2
- package/dist/cli/commands/manifest/import.js.map +1 -1
- package/dist/cli/commands/manifest/lint.js +5 -1
- package/dist/cli/commands/manifest/lint.js.map +1 -1
- package/dist/cli/commands/manifest/record-probe.js +1 -0
- package/dist/cli/commands/manifest/record-probe.js.map +1 -1
- package/dist/cli/commands/manifest/render.js +1 -0
- package/dist/cli/commands/manifest/render.js.map +1 -1
- package/dist/cli/commands/manifest/repo-set.js +1 -0
- package/dist/cli/commands/manifest/repo-set.js.map +1 -1
- package/dist/cli/commands/repo/add.js +1 -0
- package/dist/cli/commands/repo/add.js.map +1 -1
- package/dist/cli/commands/repo/fork.js +1 -0
- package/dist/cli/commands/repo/fork.js.map +1 -1
- package/dist/cli/commands/repo/pick.js +1 -0
- package/dist/cli/commands/repo/pick.js.map +1 -1
- package/dist/cli/commands/repo/remove.js +1 -0
- package/dist/cli/commands/repo/remove.js.map +1 -1
- package/dist/cli/commands/repo/select.js +1 -0
- package/dist/cli/commands/repo/select.js.map +1 -1
- package/dist/cli/commands/repo/unpick.js +1 -0
- package/dist/cli/commands/repo/unpick.js.map +1 -1
- package/dist/cli/commands/selection.js +1 -2
- package/dist/cli/commands/selection.js.map +1 -1
- package/dist/cli/commands/self/update.js +11 -14
- package/dist/cli/commands/self/update.js.map +1 -1
- package/dist/cli/commands/source/push.js +14 -13
- package/dist/cli/commands/source/push.js.map +1 -1
- package/dist/cli/commands/status.js +6 -36
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/commands/sync.js +7 -5
- package/dist/cli/commands/sync.js.map +1 -1
- package/dist/cli/commands/tool/history.js +2 -2
- package/dist/cli/commands/tool/history.js.map +1 -1
- package/dist/cli/commands/where.js +2 -1
- package/dist/cli/commands/where.js.map +1 -1
- package/dist/cli/commands/workspace/rebind.js +1 -4
- package/dist/cli/commands/workspace/rebind.js.map +1 -1
- package/dist/cli/completion.js +2 -4
- package/dist/cli/completion.js.map +1 -1
- package/dist/cli/hook-command.js +2 -2
- package/dist/cli/hook-command.js.map +1 -1
- package/dist/cli/main.js +4 -3
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/notices.js +26 -24
- package/dist/cli/notices.js.map +1 -1
- package/dist/cli/preparation-view.js +170 -52
- package/dist/cli/preparation-view.js.map +1 -1
- package/dist/cli/render/exceptional.js +11 -4
- package/dist/cli/render/exceptional.js.map +1 -1
- package/dist/cli/render/fields.js +1 -3
- package/dist/cli/render/fields.js.map +1 -1
- package/dist/cli/render/human.js +1 -3
- package/dist/cli/render/human.js.map +1 -1
- package/dist/cli/render/index.js +1 -1
- package/dist/cli/render/index.js.map +1 -1
- package/dist/cli/render/status-line.js +17 -3
- package/dist/cli/render/status-line.js.map +1 -1
- package/dist/cli/render/tone.js +29 -10
- package/dist/cli/render/tone.js.map +1 -1
- package/dist/cli/tool-command.js +4 -11
- package/dist/cli/tool-command.js.map +1 -1
- package/dist/cli/workspace-write-policy.js +8 -33
- package/dist/cli/workspace-write-policy.js.map +1 -1
- package/dist/composition/agent-cleanup.js +5 -1
- package/dist/composition/agent-cleanup.js.map +1 -1
- package/dist/composition/bundled.js +4 -1
- package/dist/composition/bundled.js.map +1 -1
- package/dist/composition/command-wiring.js +44 -99
- package/dist/composition/command-wiring.js.map +1 -1
- package/dist/composition/container.js +25 -20
- package/dist/composition/container.js.map +1 -1
- package/dist/composition/contributions.js +26 -71
- package/dist/composition/contributions.js.map +1 -1
- package/dist/composition/harness.js +3 -4
- package/dist/composition/harness.js.map +1 -1
- package/dist/composition/hook-entry.js +2 -1
- package/dist/composition/hook-entry.js.map +1 -1
- package/dist/composition/hook-wiring.js +8 -16
- package/dist/composition/hook-wiring.js.map +1 -1
- package/dist/composition/hook-worker.js +9 -11
- package/dist/composition/hook-worker.js.map +1 -1
- package/dist/composition/hooks.js +6 -3
- package/dist/composition/hooks.js.map +1 -1
- package/dist/composition/import.js +8 -6
- package/dist/composition/import.js.map +1 -1
- package/dist/composition/manifest-edit.js +1 -2
- package/dist/composition/manifest-edit.js.map +1 -1
- package/dist/composition/manifest-sources.js +3 -16
- package/dist/composition/manifest-sources.js.map +1 -1
- package/dist/composition/probe-record.js +1 -2
- package/dist/composition/probe-record.js.map +1 -1
- package/dist/composition/refresh.js +1 -1
- package/dist/composition/refresh.js.map +1 -1
- package/dist/composition/registry.js +8 -37
- package/dist/composition/registry.js.map +1 -1
- package/dist/composition/tool-install.js +5 -1
- package/dist/composition/tool-install.js.map +1 -1
- package/dist/composition/tool-inventory.js +10 -1
- package/dist/composition/tool-inventory.js.map +1 -1
- package/dist/composition/trace.js +3 -4
- package/dist/composition/trace.js.map +1 -1
- package/dist/composition/update.js +12 -1
- package/dist/composition/update.js.map +1 -1
- package/dist/composition/workspace-management.js +8 -2
- package/dist/composition/workspace-management.js.map +1 -1
- package/dist/domain/config/codec.js +2 -1
- package/dist/domain/config/codec.js.map +1 -1
- package/dist/domain/config/profile.js +0 -1
- package/dist/domain/config/profile.js.map +1 -1
- package/dist/domain/contribution/pull-request.js +12 -1
- package/dist/domain/contribution/pull-request.js.map +1 -1
- package/dist/domain/contribution/selection.js +4 -8
- package/dist/domain/contribution/selection.js.map +1 -1
- package/dist/domain/errors.js +10 -3
- package/dist/domain/errors.js.map +1 -1
- package/dist/domain/fuzzy.js +6 -1
- package/dist/domain/fuzzy.js.map +1 -1
- package/dist/domain/harness/actions.js +60 -0
- package/dist/domain/harness/actions.js.map +1 -0
- package/dist/domain/harness/deadlines.js +14 -0
- package/dist/domain/harness/deadlines.js.map +1 -0
- package/dist/domain/harness/hooks.js +8 -0
- package/dist/domain/harness/hooks.js.map +1 -1
- package/dist/domain/harness/session-start.js +2 -1
- package/dist/domain/harness/session-start.js.map +1 -1
- package/dist/domain/harness/state-recovery.js.map +1 -1
- package/dist/domain/import/infer.js +2 -9
- package/dist/domain/import/infer.js.map +1 -1
- package/dist/domain/lease.js +30 -0
- package/dist/domain/lease.js.map +1 -0
- package/dist/domain/manifest/decode.js +5 -8
- package/dist/domain/manifest/decode.js.map +1 -1
- package/dist/domain/manifest/document.js +3 -5
- package/dist/domain/manifest/document.js.map +1 -1
- package/dist/domain/manifest/editor.js +3 -7
- package/dist/domain/manifest/editor.js.map +1 -1
- package/dist/domain/manifest/explain.js +2 -4
- package/dist/domain/manifest/explain.js.map +1 -1
- package/dist/domain/manifest/issues.js +2 -2
- package/dist/domain/manifest/issues.js.map +1 -1
- package/dist/domain/manifest/loader.js +2 -1
- package/dist/domain/manifest/loader.js.map +1 -1
- package/dist/domain/manifest/overlay.js +6 -9
- package/dist/domain/manifest/overlay.js.map +1 -1
- package/dist/domain/manifest/providers.js +34 -2
- package/dist/domain/manifest/providers.js.map +1 -1
- package/dist/domain/manifest/quarantine.js +21 -1
- package/dist/domain/manifest/quarantine.js.map +1 -1
- package/dist/domain/manifest/reflect.js +2 -31
- package/dist/domain/manifest/reflect.js.map +1 -1
- package/dist/domain/manifest/rules/harness.js +2 -16
- package/dist/domain/manifest/rules/harness.js.map +1 -1
- package/dist/domain/manifest/service.schema.js +5 -14
- package/dist/domain/manifest/service.schema.js.map +1 -1
- package/dist/domain/manifest/skill-frontmatter.js +1 -1
- package/dist/domain/manifest/skill-frontmatter.js.map +1 -1
- package/dist/domain/manifest/types.js.map +1 -1
- package/dist/domain/outcome.js +5 -0
- package/dist/domain/outcome.js.map +1 -0
- package/dist/domain/path.js +9 -1
- package/dist/domain/path.js.map +1 -1
- package/dist/domain/preparation.js.map +1 -1
- package/dist/domain/projection.js +8 -0
- package/dist/domain/projection.js.map +1 -0
- package/dist/domain/public-url.js +22 -0
- package/dist/domain/public-url.js.map +1 -0
- package/dist/domain/release/ci.js +19 -8
- package/dist/domain/release/ci.js.map +1 -1
- package/dist/domain/report.js +1 -1
- package/dist/domain/report.js.map +1 -1
- package/dist/domain/setup/names.js +23 -0
- package/dist/domain/setup/names.js.map +1 -0
- package/dist/domain/setup/planner.js +19 -21
- package/dist/domain/setup/planner.js.map +1 -1
- package/dist/domain/setup/progress.js +57 -0
- package/dist/domain/setup/progress.js.map +1 -0
- package/dist/domain/setup/types.js +5 -0
- package/dist/domain/setup/types.js.map +1 -1
- package/dist/domain/shell.js +0 -7
- package/dist/domain/shell.js.map +1 -1
- package/dist/domain/skills/frontmatter.js +1 -1
- package/dist/domain/skills/frontmatter.js.map +1 -1
- package/dist/domain/skills/projection.js +2 -3
- package/dist/domain/skills/projection.js.map +1 -1
- package/dist/domain/sync-selection.js +2 -4
- package/dist/domain/sync-selection.js.map +1 -1
- package/dist/domain/toolchain/resolve.js +4 -0
- package/dist/domain/toolchain/resolve.js.map +1 -1
- package/dist/domain/toolchain/select.js +15 -9
- package/dist/domain/toolchain/select.js.map +1 -1
- package/dist/domain/toolchain/stderr.js +34 -14
- package/dist/domain/toolchain/stderr.js.map +1 -1
- package/dist/domain/values.js +18 -2
- package/dist/domain/values.js.map +1 -1
- package/dist/domain/workspace/commits.js +5 -0
- package/dist/domain/workspace/commits.js.map +1 -1
- package/dist/domain/workspace/operation-journal.js +93 -0
- package/dist/domain/workspace/operation-journal.js.map +1 -0
- package/dist/domain/workspace/plan.js +17 -1
- package/dist/domain/workspace/plan.js.map +1 -1
- package/dist/infra/config-store.js +8 -13
- package/dist/infra/config-store.js.map +1 -1
- package/dist/infra/contribution-store.js +21 -67
- package/dist/infra/contribution-store.js.map +1 -1
- package/dist/infra/harness-state.js +21 -49
- package/dist/infra/harness-state.js.map +1 -1
- package/dist/infra/local-store.js +8 -15
- package/dist/infra/local-store.js.map +1 -1
- package/dist/infra/owned-journal.js +57 -0
- package/dist/infra/owned-journal.js.map +1 -0
- package/dist/infra/projection-store.js +4 -3
- package/dist/infra/projection-store.js.map +1 -1
- package/dist/infra/tool-history.js +19 -49
- package/dist/infra/tool-history.js.map +1 -1
- package/dist/infra/trust-store.js +2 -9
- package/dist/infra/trust-store.js.map +1 -1
- package/dist/infra/workspace-home.js +7 -1
- package/dist/infra/workspace-home.js.map +1 -1
- package/dist/ports/ci.js +2 -1
- package/dist/ports/ci.js.map +1 -1
- package/package.json +1 -1
- package/skills/fx-workspace/SKILL.md +2 -3
- package/skills/fx-workspace/references/commands.md +35 -26
- package/skills/fx-workspace/references/workspace-tasks.md +6 -7
- package/dist/application/can.js.map +0 -1
- package/dist/application/doctor/login.js.map +0 -1
- package/dist/application/import.js.map +0 -1
- package/dist/application/init/setup.js +0 -125
- package/dist/application/init/setup.js.map +0 -1
- package/dist/application/preview-initialization.js +0 -41
- package/dist/application/preview-initialization.js.map +0 -1
- package/dist/application/refresh-manifest.js.map +0 -1
- package/dist/application/refresh-workspace-manifest.js +0 -27
- package/dist/application/refresh-workspace-manifest.js.map +0 -1
- package/dist/application/status.js.map +0 -1
- package/dist/application/where.js.map +0 -1
- package/dist/application/workspace-context.js.map +0 -1
- package/dist/domain/deadline.js +0 -17
- package/dist/domain/deadline.js.map +0 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// fixed order is the report's, not the execution's.
|
|
4
4
|
// Selection and gate warming follow docs/design/release.md, "Selection and order".
|
|
5
5
|
import { DevkitError } from '../../domain/errors.js';
|
|
6
|
-
import { nearest } from '../../domain/fuzzy.js';
|
|
6
|
+
import { nearest, suggestionHint } from '../../domain/fuzzy.js';
|
|
7
7
|
import { applyLocal } from '../../domain/manifest/local.js';
|
|
8
8
|
import { releasePolicyOf } from '../../domain/release/policy.js';
|
|
9
9
|
import { CHECKS, } from '../../domain/release/types.js';
|
|
@@ -12,6 +12,7 @@ import { report } from '../../domain/report.js';
|
|
|
12
12
|
import { environmentsOf, envNotFound } from '../env/names.js';
|
|
13
13
|
import { pooled } from '../pool.js';
|
|
14
14
|
import { Tally } from '../tally.js';
|
|
15
|
+
import { workspaceItemNotFound } from '../workspace/guidance.js';
|
|
15
16
|
import { checkCi } from './ci.js';
|
|
16
17
|
import { checkDeps } from './deps.js';
|
|
17
18
|
import { checkErrors } from './errors.js';
|
|
@@ -58,8 +59,8 @@ export class Release {
|
|
|
58
59
|
if (envs[env] === undefined)
|
|
59
60
|
throw envNotFound(this.deps, env, Object.keys(envs));
|
|
60
61
|
}
|
|
61
|
-
// One gate at a time, before the pool: a version probe's short deadline would
|
|
62
|
-
//
|
|
62
|
+
// One gate at a time, before the pool: a version probe's short deadline would not
|
|
63
|
+
// survive the pool's concurrent subprocesses, and a ready tool would read as unknown.
|
|
63
64
|
async warmGates(repos, checks, input) {
|
|
64
65
|
const doc = this.deps.ctx.manifest.workspace.result.doc;
|
|
65
66
|
const policies = repos.map((repo) => releasePolicyOf(doc, repo.name));
|
|
@@ -77,7 +78,12 @@ export class Release {
|
|
|
77
78
|
const shared = applyLocal(doc, {}).repos;
|
|
78
79
|
for (const name of input.repos ?? []) {
|
|
79
80
|
if (!shared.some((r) => r.name === name))
|
|
80
|
-
throw
|
|
81
|
+
throw workspaceItemNotFound(this.deps, {
|
|
82
|
+
kind: 'repo',
|
|
83
|
+
name,
|
|
84
|
+
known: shared.map((r) => r.name),
|
|
85
|
+
shared: true,
|
|
86
|
+
});
|
|
81
87
|
}
|
|
82
88
|
const off = (input.repos ?? []).filter((name) => !releasePolicyOf(doc, name).covered);
|
|
83
89
|
if (off.length > 0)
|
|
@@ -113,7 +119,7 @@ export class Release {
|
|
|
113
119
|
}
|
|
114
120
|
}
|
|
115
121
|
const COVERAGE_HINT = 'A repository is on it unless its manifest entry says release.covered: false.';
|
|
116
|
-
// The
|
|
122
|
+
// The ways a selection can name nothing. An empty report reads as a pass,
|
|
117
123
|
// so each is an error instead; see Coverage in domain/report.ts.
|
|
118
124
|
function emptyChecklist() {
|
|
119
125
|
return new DevkitError('not_found', 'CHECKLIST_EMPTY', 'No repository in this workspace is on the release checklist', {
|
|
@@ -124,9 +130,7 @@ function emptyChecklist() {
|
|
|
124
130
|
function tagNotFound(tags, known) {
|
|
125
131
|
const suggestion = tags.map((t) => nearest(t, known)).find((s) => s !== undefined);
|
|
126
132
|
return new DevkitError('not_found', 'TAG_NOT_FOUND', `No repository on the release checklist is tagged ${tags.map((t) => `"${t}"`).join(' or ')}`, {
|
|
127
|
-
hint: suggestion
|
|
128
|
-
? `Tags in use: ${known.join(', ') || '(none)'}.`
|
|
129
|
-
: `Did you mean "${suggestion}"?`,
|
|
133
|
+
hint: suggestionHint(suggestion, `Tags in use: ${known.join(', ') || '(none)'}.`),
|
|
130
134
|
nextSteps: ['fx repo list --tag <tag>'],
|
|
131
135
|
});
|
|
132
136
|
}
|
|
@@ -136,13 +140,4 @@ function notOnChecklist(names) {
|
|
|
136
140
|
nextSteps: ['fx repo show <repo>', 'fx manifest explain repos[].release.covered'],
|
|
137
141
|
});
|
|
138
142
|
}
|
|
139
|
-
function repoNotFound(name, known) {
|
|
140
|
-
const suggestion = nearest(name, known);
|
|
141
|
-
return new DevkitError('not_found', 'REPO_NOT_FOUND', `No repository named "${name}" in this workspace`, {
|
|
142
|
-
hint: suggestion === undefined
|
|
143
|
-
? 'fx repo list shows the known names.'
|
|
144
|
-
: `Did you mean "${suggestion}"?`,
|
|
145
|
-
nextSteps: ['fx repo list'],
|
|
146
|
-
});
|
|
147
|
-
}
|
|
148
143
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/application/release/index.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,kFAAkF;AAClF,oDAAoD;AACpD,mFAAmF;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/application/release/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,11 +11,9 @@ import { assertWritable } from './posture.js';
|
|
|
11
11
|
export class TrustGate {
|
|
12
12
|
store;
|
|
13
13
|
prompter;
|
|
14
|
-
|
|
15
|
-
constructor(store, prompter, _clock) {
|
|
14
|
+
constructor(store, prompter) {
|
|
16
15
|
this.store = store;
|
|
17
16
|
this.prompter = prompter;
|
|
18
|
-
this._clock = _clock;
|
|
19
17
|
}
|
|
20
18
|
async ensure(input) {
|
|
21
19
|
await this.decide(input, renderVector(input.vector));
|
|
@@ -67,27 +65,27 @@ export class TrustGate {
|
|
|
67
65
|
}
|
|
68
66
|
}
|
|
69
67
|
}
|
|
70
|
-
export function commandTrustHandoff(
|
|
71
|
-
const command = recoveryCommand(
|
|
68
|
+
export function commandTrustHandoff(trust, tool) {
|
|
69
|
+
const command = recoveryCommand(trust, 'doctor', '--tool', tool, ...(trust.posture.readOnly ? ['--allow-writes'] : []));
|
|
72
70
|
return handoffEnvelope({
|
|
73
|
-
summary: `${
|
|
71
|
+
summary: `${tool} has manifest commands a person has not trusted`,
|
|
74
72
|
userSteps: [
|
|
75
73
|
{
|
|
76
|
-
id: `${
|
|
74
|
+
id: `${tool}.trust`,
|
|
77
75
|
kind: 'manual',
|
|
78
|
-
title: `Review ${
|
|
76
|
+
title: `Review ${tool} manifest commands`,
|
|
79
77
|
instructions: 'Run the command in a terminal and confirm only the exact vectors you accept.',
|
|
80
78
|
},
|
|
81
79
|
],
|
|
82
80
|
command,
|
|
83
|
-
alternatives: [
|
|
84
|
-
recoveryCommand(input, 'tool', 'show', input.tool),
|
|
85
|
-
recoveryCommand(input, 'doctor'),
|
|
86
|
-
],
|
|
81
|
+
alternatives: [recoveryCommand(trust, 'tool', 'show', tool), recoveryCommand(trust, 'doctor')],
|
|
87
82
|
});
|
|
88
83
|
}
|
|
89
84
|
export function isTrustRequired(err) {
|
|
90
|
-
return
|
|
91
|
-
|
|
85
|
+
return err instanceof DevkitError && isTrustRequiredCode(err.code);
|
|
86
|
+
}
|
|
87
|
+
// The same answer for a failure that already travels as an envelope.
|
|
88
|
+
export function isTrustRequiredCode(code) {
|
|
89
|
+
return code === 'VECTOR_UNTRUSTED' || code === 'READONLY_BLOCKED';
|
|
92
90
|
}
|
|
93
91
|
//# sourceMappingURL=trust.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trust.js","sourceRoot":"","sources":["../../../src/application/safety/trust.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,wEAAwE;AACxE,0EAA0E;AAC1E,wEAAwE;AACxE,2EAA2E;AAC3E,0EAA0E;AAE1E,OAAO,EAAE,WAAW,EAAE,eAAe,EAAwB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"trust.js","sourceRoot":"","sources":["../../../src/application/safety/trust.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
// Update fx through its distribution registry after confirmation and the write gate.
|
|
2
|
-
// Capture installer output so machine-readable results remain valid on stdout.
|
|
2
|
+
// Capture installer output so machine-readable results remain valid on stdout. A
|
|
3
|
+
// completed install settles the update-check window on the version it installed.
|
|
3
4
|
import { DevkitError } from '../../domain/errors.js';
|
|
4
5
|
import { stderrReason } from '../../domain/toolchain/stderr.js';
|
|
5
6
|
import { assertWritable } from '../safety/posture.js';
|
|
6
7
|
import { REGISTRY_HANDOFF } from './registry.js';
|
|
8
|
+
export function isUpdated(output) {
|
|
9
|
+
return output.ran && output.code === 0;
|
|
10
|
+
}
|
|
7
11
|
export class SelfUpdate {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
constructor(process, prompter, installer) {
|
|
12
|
-
this.process = process;
|
|
13
|
-
this.prompter = prompter;
|
|
14
|
-
this.installer = installer;
|
|
12
|
+
deps;
|
|
13
|
+
constructor(deps) {
|
|
14
|
+
this.deps = deps;
|
|
15
15
|
}
|
|
16
16
|
async execute(input) {
|
|
17
17
|
if (input.registry === null) {
|
|
@@ -21,7 +21,7 @@ export class SelfUpdate {
|
|
|
21
21
|
handoff: REGISTRY_HANDOFF,
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
|
-
const vector = this.installer.vector(input.packageName, {
|
|
24
|
+
const vector = this.deps.installer.vector(input.packageName, {
|
|
25
25
|
registry: input.registry,
|
|
26
26
|
update: true,
|
|
27
27
|
registryScope: 'package',
|
|
@@ -33,7 +33,7 @@ export class SelfUpdate {
|
|
|
33
33
|
if (input.dryRun)
|
|
34
34
|
return { vector, ran: false, code: null, reason: 'dry run' };
|
|
35
35
|
assertWritable(input.posture, 'self update');
|
|
36
|
-
if (!(await this.installer.available()))
|
|
36
|
+
if (!(await this.deps.installer.available()))
|
|
37
37
|
throw new DevkitError('config', 'TOOL_MISSING', 'The self-update installer is unavailable', {
|
|
38
38
|
nextSteps: ['Install npm or add it to PATH, then retry.'],
|
|
39
39
|
handoff: {
|
|
@@ -45,17 +45,27 @@ export class SelfUpdate {
|
|
|
45
45
|
},
|
|
46
46
|
});
|
|
47
47
|
if (!input.yes) {
|
|
48
|
-
const go = await this.prompter.confirm(`Run \`${vector.join(' ')}\`?`, {
|
|
48
|
+
const go = await this.deps.prompter.confirm(`Run \`${vector.join(' ')}\`?`, {
|
|
49
|
+
defaultYes: true,
|
|
50
|
+
});
|
|
49
51
|
if (!go)
|
|
50
52
|
return { vector, ran: false, code: null, reason: 'declined' };
|
|
51
53
|
}
|
|
52
|
-
const result = await this.process.run(vector, { interactive: false });
|
|
53
|
-
|
|
54
|
+
const result = await this.deps.process.run(vector, { interactive: false });
|
|
55
|
+
const output = {
|
|
54
56
|
vector,
|
|
55
57
|
ran: true,
|
|
56
58
|
code: result.code,
|
|
57
59
|
reason: result.code === 0 ? null : stderrReason(result.stderr, result.code),
|
|
58
60
|
};
|
|
61
|
+
if (isUpdated(output))
|
|
62
|
+
await this.settleCheck(input);
|
|
63
|
+
return output;
|
|
64
|
+
}
|
|
65
|
+
async settleCheck(input) {
|
|
66
|
+
const { latest } = await this.deps.check.execute(input);
|
|
67
|
+
if (latest !== null)
|
|
68
|
+
await this.deps.check.markCurrent(input, latest);
|
|
59
69
|
}
|
|
60
70
|
}
|
|
61
71
|
//# sourceMappingURL=update.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/application/self/update.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/application/self/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,8 @@ export async function prepareCommand(deps, login, step, dryRun) {
|
|
|
16
16
|
const changes = plan.changes;
|
|
17
17
|
if (dryRun)
|
|
18
18
|
return { status: 'planned', detail: 'Public service settings would be prepared', changes };
|
|
19
|
-
assertWritable(
|
|
20
|
-
await
|
|
19
|
+
assertWritable(deps.trust.posture, step.id);
|
|
20
|
+
await deps.trust.gate.ensure(trustOf(preset, vector, step.id));
|
|
21
21
|
const applied = await runPreset(preset, vector, 'prepare');
|
|
22
22
|
if (applied.code !== 0)
|
|
23
23
|
return commandFailure(login.serviceProtocol.failure(applied.stderr), vector, deps);
|
|
@@ -27,13 +27,13 @@ export async function prepareCommand(deps, login, step, dryRun) {
|
|
|
27
27
|
async function consult(preset, vector) {
|
|
28
28
|
const { deps, login } = preset;
|
|
29
29
|
const preview = [...vector, '--dry-run'];
|
|
30
|
-
if (preset.dryRun && !(await
|
|
30
|
+
if (preset.dryRun && !(await deps.trust.gate.isTrusted(trustOf(preset, preview))))
|
|
31
31
|
return {
|
|
32
32
|
status: 'blocked',
|
|
33
33
|
detail: 'Service preview command is not trusted',
|
|
34
34
|
next_steps: [shellLine(preview, deps.commandShell)],
|
|
35
35
|
};
|
|
36
|
-
await
|
|
36
|
+
await deps.trust.gate.ensure(trustOf(preset, preview));
|
|
37
37
|
const result = await runPreset(preset, preview, 'preview');
|
|
38
38
|
if (result.code !== 0)
|
|
39
39
|
return commandFailure(login.serviceProtocol.failure(result.stderr), vector, deps);
|
|
@@ -46,16 +46,14 @@ async function consult(preset, vector) {
|
|
|
46
46
|
}
|
|
47
47
|
function trustOf(preset, vector, label) {
|
|
48
48
|
return {
|
|
49
|
-
...preset.
|
|
50
|
-
workspace: preset.deps.ctx.name,
|
|
51
|
-
commandShell: preset.deps.commandShell,
|
|
49
|
+
...preset.deps.trust,
|
|
52
50
|
vector,
|
|
53
51
|
origin: preset.step.origin,
|
|
54
52
|
label: label ?? `${preset.step.id} preview`,
|
|
55
53
|
};
|
|
56
54
|
}
|
|
57
55
|
function runPreset(preset, vector, phase) {
|
|
58
|
-
return preset.deps.
|
|
56
|
+
return preset.deps.process.run(vector, {
|
|
59
57
|
timeoutMs: 5000,
|
|
60
58
|
cwd: preset.deps.ctx.root,
|
|
61
59
|
diagnostic: { phase: `${preset.step.id} ${phase}` },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/application/services/command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAYtD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,IAAmB,EACnB,KAAgB,EAChB,IAAe,EACf,MAAe;IAEf,MAAM,MAAM,GAAW,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACrD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;IAC9B,MAAM,MAAM,GACV,IAAI,CAAC,WAAW,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAChG,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,IAAI,QAAQ,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IACxC,8DAA8D;IAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC;IACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IAC1C,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAChE,IAAI,QAAQ,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAClC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,IAAI,MAAM;QACR,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,2CAA2C,EAAE,OAAO,EAAE,CAAC;IAC7F,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/application/services/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ import path from 'node:path';
|
|
|
4
4
|
import { asDevkitError, DevkitError, toEnvelope } from '../../domain/errors.js';
|
|
5
5
|
import { atLeast } from '../../domain/semver.js';
|
|
6
6
|
import { matchesPublicDefaults } from '../../domain/setup/public-defaults.js';
|
|
7
|
+
import { toolRecovery } from '../preparation.js';
|
|
7
8
|
import { assertWritable } from '../safety/posture.js';
|
|
8
|
-
import { toolChecks } from '../sync/checks.js';
|
|
9
9
|
import { ToolCheck } from '../tool/check.js';
|
|
10
10
|
import { toolchainOf } from '../tool/toolchain.js';
|
|
11
11
|
import { workspaceCommand } from '../workspace/guidance.js';
|
|
@@ -17,7 +17,8 @@ export class ServiceOperation {
|
|
|
17
17
|
this.deps = deps;
|
|
18
18
|
this.login = login;
|
|
19
19
|
}
|
|
20
|
-
async execute(step,
|
|
20
|
+
async execute(step, options) {
|
|
21
|
+
const { dryRun } = options;
|
|
21
22
|
const base = { id: step.id, tool: step.tool, env: step.env ?? null };
|
|
22
23
|
try {
|
|
23
24
|
const preparation = step.preparation;
|
|
@@ -33,17 +34,9 @@ export class ServiceOperation {
|
|
|
33
34
|
? tool.minVersion
|
|
34
35
|
: preparation.minVersion,
|
|
35
36
|
}));
|
|
36
|
-
const [version] = await new ToolCheck({
|
|
37
|
-
run: this.deps.processRun,
|
|
38
|
-
which: this.deps.processWhich,
|
|
39
|
-
}).execute({
|
|
37
|
+
const [version] = await new ToolCheck(this.deps.process).execute({
|
|
40
38
|
tools,
|
|
41
|
-
trust: {
|
|
42
|
-
...this.login.trust,
|
|
43
|
-
workspace: this.deps.ctx.name,
|
|
44
|
-
commandShell: this.deps.commandShell,
|
|
45
|
-
dryRun,
|
|
46
|
-
},
|
|
39
|
+
trust: { ...this.deps.trust, dryRun },
|
|
47
40
|
});
|
|
48
41
|
if (version?.state !== 'ok')
|
|
49
42
|
return {
|
|
@@ -52,8 +45,10 @@ export class ServiceOperation {
|
|
|
52
45
|
detail: `${step.tool} is ${version?.state ?? 'unknown'}; requires ${version?.min_version ?? preparation.minVersion} for public service settings`,
|
|
53
46
|
...(version
|
|
54
47
|
? {
|
|
55
|
-
actions:
|
|
56
|
-
|
|
48
|
+
actions: toolRecovery(this.deps, {
|
|
49
|
+
...version,
|
|
50
|
+
preparation_required: step.required,
|
|
51
|
+
}),
|
|
57
52
|
}
|
|
58
53
|
: {}),
|
|
59
54
|
next_steps: [
|
|
@@ -101,11 +96,9 @@ export class ServiceOperation {
|
|
|
101
96
|
{ before: null, after: value },
|
|
102
97
|
])),
|
|
103
98
|
};
|
|
104
|
-
assertWritable(this.
|
|
105
|
-
await this.
|
|
106
|
-
...this.
|
|
107
|
-
workspace: this.deps.ctx.name,
|
|
108
|
-
commandShell: this.deps.commandShell,
|
|
99
|
+
assertWritable(this.deps.trust.posture, step.id);
|
|
100
|
+
await this.deps.trust.gate.ensure({
|
|
101
|
+
...this.deps.trust,
|
|
109
102
|
vector: ['fx', 'sync', '--only', 'services'],
|
|
110
103
|
origin: step.origin,
|
|
111
104
|
label: step.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../../../src/application/services/operation.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,0EAA0E;AAC1E,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAG9E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../../../src/application/services/operation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// Expand service configuration and personal login separately from one binding.
|
|
2
2
|
import { serviceVars } from '../../domain/manifest/service.schema.js';
|
|
3
|
+
import { SERVICE_RECIPE_ID } from '../../domain/setup/names.js';
|
|
3
4
|
export function serviceRecipes(input) {
|
|
4
5
|
const { descriptor, settings } = input;
|
|
5
6
|
const definition = descriptor.service?.(settings);
|
|
@@ -17,7 +18,7 @@ export function serviceRecipes(input) {
|
|
|
17
18
|
...common,
|
|
18
19
|
preparation: prep,
|
|
19
20
|
recipe: {
|
|
20
|
-
id:
|
|
21
|
+
id: SERVICE_RECIPE_ID,
|
|
21
22
|
tool,
|
|
22
23
|
perEnv: false,
|
|
23
24
|
kind: 'run',
|
|
@@ -32,7 +33,11 @@ export function serviceRecipes(input) {
|
|
|
32
33
|
},
|
|
33
34
|
...definition.recipes.map((recipe) => ({
|
|
34
35
|
...common,
|
|
35
|
-
recipe: {
|
|
36
|
+
recipe: {
|
|
37
|
+
...recipe,
|
|
38
|
+
perEnv: false,
|
|
39
|
+
requires: [SERVICE_RECIPE_ID, ...(recipe.requires ?? [])],
|
|
40
|
+
},
|
|
36
41
|
})),
|
|
37
42
|
];
|
|
38
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recipes.js","sourceRoot":"","sources":["../../../src/application/services/recipes.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,OAAO,EAAE,WAAW,EAAwB,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"recipes.js","sourceRoot":"","sources":["../../../src/application/services/recipes.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,OAAO,EAAE,WAAW,EAAwB,MAAM,yCAAyC,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAKhE,MAAM,UAAU,cAAc,CAAC,KAK9B;IACC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACvC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC;IAClD,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC;IAClC,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC;IACpC,MAAM,MAAM,GAAG;QACb,IAAI,EAAE,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE;QACjD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5D,CAAC;IACF,OAAO;QACL;YACE,GAAG,MAAM;YACT,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE;gBACN,EAAE,EAAE,iBAAiB;gBACrB,IAAI;gBACJ,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,kBAAkB,IAAI,mBAAmB;gBAChD,YAAY,EACV,6HAA6H;gBAC/H,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzD,MAAM,EACJ,IAAI,CAAC,IAAI,KAAK,SAAS;oBACrB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;oBACtF,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;aAC9B;SACF;QACD,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACrC,GAAG,MAAM;YACT,MAAM,EAAE;gBACN,GAAG,MAAM;gBACT,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;aAC1D;SACF,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC"}
|
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
// Explicit setup runs only public preparation, never login or credential acquisition.
|
|
2
2
|
import { preparationCheck } from '../../domain/preparation.js';
|
|
3
|
+
import { problemsOfRecipe, SERVICE_RECIPE_ID } from '../../domain/setup/names.js';
|
|
3
4
|
import { buildPlan } from '../login/collect.js';
|
|
4
5
|
import { workspaceToolScope } from '../tool/scope.js';
|
|
5
6
|
import { ServiceOperation } from './operation.js';
|
|
6
|
-
|
|
7
|
+
import { SERVICE_STATUSES } from './types.js';
|
|
8
|
+
export async function prepareServices(deps, login, options) {
|
|
7
9
|
const plan = buildPlan(deps, login, { scopeEnvs: deps.ctx.local.scope?.envs });
|
|
8
|
-
const problems = plan.problems
|
|
10
|
+
const problems = problemsOfRecipe(plan.problems, SERVICE_RECIPE_ID);
|
|
9
11
|
const operation = new ServiceOperation(deps, login);
|
|
10
12
|
const items = [];
|
|
11
13
|
for (const step of plan.steps.filter((step) => step.preparation))
|
|
12
|
-
items.push(await operation.execute(step,
|
|
13
|
-
const summary = Object.fromEntries(
|
|
14
|
+
items.push(await operation.execute(step, options));
|
|
15
|
+
const summary = Object.fromEntries(SERVICE_STATUSES.map((status) => [
|
|
14
16
|
status,
|
|
15
17
|
items.filter((item) => item.status === status).length,
|
|
16
18
|
]));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stage.js","sourceRoot":"","sources":["../../../src/application/services/stage.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"stage.js","sourceRoot":"","sources":["../../../src/application/services/stage.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAgD,MAAM,YAAY,CAAC;AAE5F,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAAmB,EACnB,KAAgB,EAChB,OAAqC;IAErC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/E,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpD,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC;QAC9D,KAAK,CAAC,IAAI,CAAC,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAChC,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;QAC/B,MAAM;QACN,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM;KACtD,CAAC,CACH,CAAC;IACF,OAAO;QACL,MAAM,EAAE;YACN,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACpB,gBAAgB,CACd,WAAW,IAAI,CAAC,EAAE,EAAE,EACpB,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAC3E,IAAI,CAAC,MAAM,EACX;gBACE,QAAQ,EAAE,IAAI,CAAC,EAAE;gBACjB,QAAQ,EAAE,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClE,KAAK,EAAE,MAAM;gBACb,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3E,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnD,CACF,CACF;YACD,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC1B,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CACnF;SACF;QACD,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE;QAClD,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;KAC7B,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
// What preparing one declared service reports back: the same row whether the
|
|
2
2
|
// work was a native command or an owned workspace file.
|
|
3
|
-
export
|
|
3
|
+
export const SERVICE_STATUSES = [
|
|
4
|
+
'unchanged',
|
|
5
|
+
'configured',
|
|
6
|
+
'planned',
|
|
7
|
+
'blocked',
|
|
8
|
+
'failed',
|
|
9
|
+
];
|
|
4
10
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/application/services/types.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,wDAAwD"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/application/services/types.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,wDAAwD;AAMxD,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,WAAW;IACX,YAAY;IACZ,SAAS;IACT,SAAS;IACT,QAAQ;CACA,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Share locked, recoverable bundled Skill replacement between explicit installation and sync.
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { busyError, DevkitError } from '../../domain/errors.js';
|
|
4
|
+
import { withLease } from '../../domain/lease.js';
|
|
4
5
|
import { pathKey } from '../../domain/path.js';
|
|
5
6
|
import { decideCopy } from '../../domain/skills/projection.js';
|
|
6
7
|
import { assertWritable } from '../safety/posture.js';
|
|
@@ -26,36 +27,26 @@ export async function withSkillLock(fs, lock, target, work) {
|
|
|
26
27
|
}
|
|
27
28
|
async function lockedSkillWork(fs, lock, target, work) {
|
|
28
29
|
const canonical = await canonicalSkillPath(fs, target);
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
nextSteps: ['Retry the Skill command after the other update completes.'],
|
|
33
|
-
});
|
|
34
|
-
try {
|
|
30
|
+
return withLease(lock, { key: `skill:${pathKey(canonical)}`, waitMs: 2000 }, () => busyError('SKILL_BUSY', 'The Skill', {
|
|
31
|
+
nextSteps: ['Retry the Skill command after the other update completes.'],
|
|
32
|
+
}), async () => {
|
|
35
33
|
if (pathKey(await canonicalSkillPath(fs, target)) !== pathKey(canonical))
|
|
36
34
|
throw new DevkitError('conflict', 'SKILL_TARGET_CHANGED', 'The Skill target changed', {
|
|
37
35
|
nextSteps: ['Inspect the target directory and retry.'],
|
|
38
36
|
});
|
|
39
|
-
return
|
|
40
|
-
}
|
|
41
|
-
finally {
|
|
42
|
-
await lease?.release();
|
|
43
|
-
}
|
|
37
|
+
return work(canonical);
|
|
38
|
+
});
|
|
44
39
|
}
|
|
45
40
|
export class SkillCopies {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
constructor(fs, version, skills) {
|
|
50
|
-
this.fs = fs;
|
|
51
|
-
this.version = version;
|
|
52
|
-
this.skills = skills;
|
|
41
|
+
deps;
|
|
42
|
+
constructor(deps) {
|
|
43
|
+
this.deps = deps;
|
|
53
44
|
}
|
|
54
45
|
async install(target, input = {}) {
|
|
55
|
-
return withSkillLock(this.fs, this.skills.globalLock, target, async (canonical) => {
|
|
46
|
+
return withSkillLock(this.deps.fs, this.deps.skills.globalLock, target, async (canonical) => {
|
|
56
47
|
await input.validate?.(canonical);
|
|
57
|
-
const observed = await observeCopy(this.fs, canonical);
|
|
58
|
-
let action = decideCopy(observed, this.version);
|
|
48
|
+
const observed = await observeCopy(this.deps.fs, canonical);
|
|
49
|
+
let action = decideCopy(observed, this.deps.version);
|
|
59
50
|
if (input.refresh && observed.kind === 'ours')
|
|
60
51
|
action = 'upgrade';
|
|
61
52
|
if (input.posture &&
|
|
@@ -64,7 +55,7 @@ export class SkillCopies {
|
|
|
64
55
|
if (action === 'foreign' && input.replace && (await input.replace([canonical])))
|
|
65
56
|
action = 'install';
|
|
66
57
|
if (action === 'install' || action === 'upgrade')
|
|
67
|
-
await this.fs.replaceDir(this.skills.bundledSkillDir, canonical);
|
|
58
|
+
await this.deps.fs.replaceDir(this.deps.skills.bundledSkillDir, canonical);
|
|
68
59
|
return action;
|
|
69
60
|
});
|
|
70
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copies.js","sourceRoot":"","sources":["../../../src/application/skill/copies.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAE9F,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAmB,MAAM,mCAAmC,CAAC;AAIhF,OAAO,EAAE,cAAc,EAAqB,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EAAc,EAAE,MAAc;IACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClG,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,EAAc,EACd,IAAU,EACV,MAAc,EACd,IAAuC;IAEvC,IAAI,CAAC;QACH,OAAO,MAAM,eAAe,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,EAAc,EACd,IAAU,EACV,MAAc,EACd,IAAuC;IAEvC,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACvD,
|
|
1
|
+
{"version":3,"file":"copies.js","sourceRoot":"","sources":["../../../src/application/skill/copies.ts"],"names":[],"mappings":"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"}
|