@angelmsger/fx 0.11.0 → 0.13.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 +155 -0
- package/README.md +9 -42
- package/defaults/tools.yaml +20 -3
- 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/ci/jenkins-cli/recipes.js +5 -1
- package/dist/adapters/ci/jenkins-cli/recipes.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/family/service.js +5 -0
- package/dist/adapters/family/service.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/log-store/openobserve-cli/provider.js +1 -1
- package/dist/adapters/log-store/openobserve-cli/provider.js.map +1 -1
- package/dist/adapters/log-store/openobserve-cli/recipes.js +5 -1
- package/dist/adapters/log-store/openobserve-cli/recipes.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/provider.js +1 -1
- package/dist/adapters/metrics/prometheus-cli/provider.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 +33 -7
- 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 +20 -12
- 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/init/standalone.js +341 -0
- package/dist/application/init/standalone.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 +49 -36
- 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 +6 -1
- package/dist/application/tool/show.js.map +1 -1
- package/dist/application/tool/toolchain.js +18 -5
- 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 +28 -29
- 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 +40 -14
- 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 +226 -51
- 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 +55 -96
- 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/rules/tools.js +1 -0
- package/dist/domain/manifest/rules/tools.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/tools.schema.js +6 -0
- package/dist/domain/manifest/tools.schema.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 +24 -22
- 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 +30 -16
- 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 +7 -8
- package/skills/fx-workspace/references/commands.md +39 -27
- package/skills/fx-workspace/references/initialization.md +17 -0
- 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
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
// Refresh eligible Git manifest sources and explain any local work retained.
|
|
2
|
-
import {
|
|
2
|
+
import { busyError } from '../../domain/errors.js';
|
|
3
|
+
import { workspaceLeaseKey } from '../../domain/lease.js';
|
|
4
|
+
import { assertWritable } from '../safety/posture.js';
|
|
5
|
+
import { resolveWorkspace } from '../workspace/resolve.js';
|
|
3
6
|
export class RefreshManifest {
|
|
4
7
|
reporter;
|
|
5
8
|
constructor(reporter) {
|
|
@@ -46,4 +49,25 @@ export class RefreshManifest {
|
|
|
46
49
|
return { ...outcome, source: source.description };
|
|
47
50
|
}
|
|
48
51
|
}
|
|
49
|
-
|
|
52
|
+
export async function refreshWorkspaceManifest(deps, resolve, run) {
|
|
53
|
+
const located = await resolveWorkspace(resolve);
|
|
54
|
+
const entry = (await resolve.config.read()).workspaces?.[located.name];
|
|
55
|
+
const source = entry?.source === undefined ? undefined : await deps.sourceFor(entry.source);
|
|
56
|
+
const lease = run.dryRun || run.posture.readOnly
|
|
57
|
+
? undefined
|
|
58
|
+
: await deps.lock.acquire({ key: workspaceLeaseKey(located.name), waitMs: 2000 });
|
|
59
|
+
if (lease === null)
|
|
60
|
+
throw busyError('LOCK_BUSY', 'The workspace', { nextSteps: ['Retry fx sync shortly.'] });
|
|
61
|
+
try {
|
|
62
|
+
return await new RefreshManifest(resolve.reporter).execute({
|
|
63
|
+
manifestDir: located.manifestDir,
|
|
64
|
+
source,
|
|
65
|
+
...run,
|
|
66
|
+
settle: () => deps.settle(located.name, located.manifestDir),
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
finally {
|
|
70
|
+
await lease?.release();
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=refresh.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/application/manifest/refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import path from 'node:path';
|
|
|
4
4
|
import { DevkitError } from '../../domain/errors.js';
|
|
5
5
|
import { setRepoField } from '../../domain/manifest/editor.js';
|
|
6
6
|
import { loadWorkspace } from '../../domain/manifest/loader.js';
|
|
7
|
+
import { isLostWrite } from '../../domain/projection.js';
|
|
7
8
|
import { assertWritable } from '../safety/posture.js';
|
|
8
9
|
import { MANIFEST_FILES } from './locate.js';
|
|
9
10
|
export class SetRepoField {
|
|
@@ -42,7 +43,7 @@ export class SetRepoField {
|
|
|
42
43
|
return plan;
|
|
43
44
|
assertWritable(input.posture, `manifest repo-set ${input.repo} ${input.field}`);
|
|
44
45
|
const result = await this.files.write({ ...target, before: snapshot, text: edit.text });
|
|
45
|
-
if (result
|
|
46
|
+
if (isLostWrite(result))
|
|
46
47
|
throw changedManifest();
|
|
47
48
|
return { ...plan, written: result === 'written' };
|
|
48
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../src/application/manifest/set.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,4EAA4E;AAE5E,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../src/application/manifest/set.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// People as rows, narrowed by area or status. An undeclared area is an error
|
|
2
2
|
// rather than an empty list.
|
|
3
3
|
import { DevkitError } from '../../domain/errors.js';
|
|
4
|
-
import { nearest } from '../../domain/fuzzy.js';
|
|
4
|
+
import { nearest, suggestionHint } from '../../domain/fuzzy.js';
|
|
5
5
|
import { areasOf, peopleOfArea } from '../../domain/members/owners.js';
|
|
6
6
|
import { membersOf } from './source.js';
|
|
7
7
|
export const MEMBER_COLUMNS = ['id', 'display', 'status', 'areas'];
|
|
@@ -16,9 +16,7 @@ export class MemberList {
|
|
|
16
16
|
if (input.area !== undefined && !groups.includes(input.area)) {
|
|
17
17
|
const suggestion = nearest(input.area, groups);
|
|
18
18
|
throw new DevkitError('not_found', 'AREA_NOT_FOUND', `"${input.area}" is not an area`, {
|
|
19
|
-
hint: suggestion
|
|
20
|
-
? `Areas: ${groups.join(', ') || '(none)'}.`
|
|
21
|
-
: `Did you mean "${suggestion}"?`,
|
|
19
|
+
hint: suggestionHint(suggestion, `Areas: ${groups.join(', ') || '(none)'}.`),
|
|
22
20
|
nextSteps: ['fx member list'],
|
|
23
21
|
});
|
|
24
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/application/member/list.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,6BAA6B;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/application/member/list.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,6BAA6B;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAGvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAcxC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAU,CAAC;AAE5E,MAAM,OAAO,UAAU;IACQ;IAA7B,YAA6B,IAAmB;QAAnB,SAAI,GAAJ,IAAI,CAAe;IAAG,CAAC;IAEpD,OAAO,CAAC,KAAsB;QAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7D,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC/C,MAAM,IAAI,WAAW,CAAC,WAAW,EAAE,gBAAgB,EAAE,IAAI,KAAK,CAAC,IAAI,kBAAkB,EAAE;gBACrF,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,UAAU,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,GAAG,CAAC;gBAC5E,SAAS,EAAE,CAAC,gBAAgB,CAAC;aAC9B,CAAC,CAAC;QACL,CAAC;QACD,MAAM,MAAM,GACV,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACpF,OAAO,OAAO,CAAC,MAAM;aAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACvD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC;aACpF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACX,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;YAC1B,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,QAAQ;YAC5B,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC;SAC9B,CAAC,CAAC,CAAC;IACR,CAAC;CACF"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// belongs to — the answer to "is this git author one of us". Several people can
|
|
3
3
|
// match one query, and all of them come back.
|
|
4
4
|
import { DevkitError } from '../../domain/errors.js';
|
|
5
|
+
import { suggestionHint } from '../../domain/fuzzy.js';
|
|
5
6
|
import { findPeople, suggestPerson } from '../../domain/members/resolve.js';
|
|
6
7
|
import { membersOf } from './source.js';
|
|
7
8
|
export const PERSON_COLUMNS = [
|
|
@@ -24,9 +25,7 @@ export class MemberShow {
|
|
|
24
25
|
if (matches.length === 0) {
|
|
25
26
|
const suggestion = suggestPerson(members, query);
|
|
26
27
|
throw new DevkitError('not_found', 'PERSON_NOT_FOUND', `Nobody in the members document is "${query}"`, {
|
|
27
|
-
hint: suggestion
|
|
28
|
-
? 'fx member list shows everyone.'
|
|
29
|
-
: `Did you mean "${suggestion}"?`,
|
|
28
|
+
hint: suggestionHint(suggestion, 'fx member list shows everyone.'),
|
|
30
29
|
nextSteps: ['fx member list'],
|
|
31
30
|
});
|
|
32
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/application/member/show.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,gFAAgF;AAChF,8CAA8C;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/application/member/show.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,gFAAgF;AAChF,8CAA8C;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAkB,MAAM,iCAAiC,CAAC;AAG5F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAYxC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI;IACJ,SAAS;IACT,OAAO;IACP,QAAQ;IACR,YAAY;IACZ,KAAK;IACL,UAAU;CACF,CAAC;AAEX,MAAM,OAAO,UAAU;IACQ;IAA7B,YAA6B,IAAmB;QAAnB,SAAI,GAAJ,IAAI,CAAe;IAAG,CAAC;IAEpD,OAAO,CAAC,KAAa;QACnB,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACjD,MAAM,IAAI,WAAW,CACnB,WAAW,EACX,kBAAkB,EAClB,sCAAsC,KAAK,GAAG,EAC9C;gBACE,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,gCAAgC,CAAC;gBAClE,SAAS,EAAE,CAAC,gBAAgB,CAAC;aAC9B,CACF,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YAClD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI;YAC/B,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;YAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,QAAQ;YACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,EAAE;YAC/B,UAAU,EAAE,SAAS;YACrB,GAAG,EAAE,GAAG,IAAI,IAAI;SACjB,CAAC,CAAC,CAAC;IACN,CAAC;CACF"}
|
|
@@ -1,31 +1,95 @@
|
|
|
1
|
-
//
|
|
1
|
+
// What a preparation stage and a doctor group report, and how their evidence is bound to
|
|
2
|
+
// the registered workspace and an executable recovery action.
|
|
2
3
|
import { preparation, preparationCheck, } from '../domain/preparation.js';
|
|
4
|
+
import { toolRecoveryCommand } from './tool/check.js';
|
|
3
5
|
import { workspaceToolScope } from './tool/scope.js';
|
|
4
|
-
|
|
6
|
+
// Approving a tool's read-only check and running it. Every check that asks for it gets
|
|
7
|
+
// this command, so the actions coalesce in `preparation`; each words it for its own report.
|
|
8
|
+
export function approveCheckAction(deps, tool, label) {
|
|
5
9
|
return {
|
|
6
|
-
|
|
7
|
-
actor: 'agent',
|
|
8
|
-
description: `Review ${tool}'s exact verification commands, then approve the read-only check`,
|
|
10
|
+
...label,
|
|
9
11
|
argv: ['fx', 'doctor', '--tool', tool, '--workspace', deps.ctx.name, '--yes'],
|
|
10
12
|
cwd: deps.ctx.root,
|
|
13
|
+
actor: 'agent',
|
|
11
14
|
requires_approval: true,
|
|
12
15
|
};
|
|
13
16
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
+
function inspectToolAction(deps, tool, command) {
|
|
18
|
+
return {
|
|
19
|
+
id: `tool:${tool}`,
|
|
20
|
+
description: `Inspect ${tool} preparation`,
|
|
21
|
+
argv: [
|
|
22
|
+
'fx',
|
|
23
|
+
'tool',
|
|
24
|
+
command,
|
|
25
|
+
tool,
|
|
26
|
+
'--workspace',
|
|
27
|
+
deps.ctx.name,
|
|
28
|
+
...(command === 'show' ? [] : ['--dry-run']),
|
|
29
|
+
],
|
|
30
|
+
cwd: deps.ctx.root,
|
|
31
|
+
actor: 'agent',
|
|
32
|
+
requires_approval: false,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
// What an agent does about a tool its check found unusable: approve the probe that was
|
|
36
|
+
// withheld, otherwise look at what the tool's preparation would do.
|
|
37
|
+
export function toolRecovery(deps, tool) {
|
|
38
|
+
if (tool.state === 'ok' || (tool.state === 'disabled' && !tool.preparation_required))
|
|
39
|
+
return [];
|
|
40
|
+
if (tool.failure?.code === 'VECTOR_UNTRUSTED')
|
|
41
|
+
return [
|
|
42
|
+
approveCheckAction(deps, tool.name, {
|
|
43
|
+
id: `tool:${tool.name}`,
|
|
44
|
+
description: `Review the exact ${tool.name} probe and approve it to continue`,
|
|
45
|
+
}),
|
|
46
|
+
];
|
|
47
|
+
return [inspectToolAction(deps, tool.name, toolRecoveryCommand(tool.state))];
|
|
48
|
+
}
|
|
49
|
+
export function verifyAction(deps, tool) {
|
|
50
|
+
return approveCheckAction(deps, tool, {
|
|
51
|
+
id: `approve-check:${tool}`,
|
|
52
|
+
description: `Review ${tool}'s exact verification commands, then approve the read-only check`,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
// What an agent does about a check that gave no answer: preview installing the tool that
|
|
56
|
+
// did not start, or ask the check that ran out of time again, within its environment.
|
|
17
57
|
export function noAnswerAction(deps, step, code) {
|
|
18
|
-
|
|
19
|
-
|
|
58
|
+
if (code === 'TOOL_MISSING')
|
|
59
|
+
return inspectToolAction(deps, step.tool, 'install');
|
|
20
60
|
return {
|
|
21
|
-
id:
|
|
61
|
+
id: `recheck:${step.id}`,
|
|
62
|
+
description: `Check ${step.tool} again; its check did not finish`,
|
|
63
|
+
argv: [
|
|
64
|
+
'fx',
|
|
65
|
+
'doctor',
|
|
66
|
+
'--tool',
|
|
67
|
+
step.tool,
|
|
68
|
+
...(step.env ? ['--env', step.env] : []),
|
|
69
|
+
'--workspace',
|
|
70
|
+
deps.ctx.name,
|
|
71
|
+
],
|
|
72
|
+
cwd: deps.ctx.root,
|
|
22
73
|
actor: 'agent',
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
74
|
+
requires_approval: false,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
// What a person does about a server that did not answer from this machine: reach the
|
|
78
|
+
// network it is served on, then check again.
|
|
79
|
+
export function unreachableAction(deps, step) {
|
|
80
|
+
return {
|
|
81
|
+
id: `reach:${step.id}`,
|
|
82
|
+
actor: 'user',
|
|
83
|
+
description: `Connect to the network ${step.tool} is served on, then check again`,
|
|
84
|
+
argv: [
|
|
85
|
+
'fx',
|
|
86
|
+
'doctor',
|
|
87
|
+
'--tool',
|
|
88
|
+
step.tool,
|
|
89
|
+
...(step.env ? ['--env', step.env] : []),
|
|
90
|
+
'--workspace',
|
|
91
|
+
deps.ctx.name,
|
|
92
|
+
],
|
|
29
93
|
cwd: deps.ctx.root,
|
|
30
94
|
requires_approval: false,
|
|
31
95
|
};
|
|
@@ -33,24 +97,27 @@ export function noAnswerAction(deps, step, code) {
|
|
|
33
97
|
export function repairAction(deps) {
|
|
34
98
|
return {
|
|
35
99
|
id: 'repair-managed-resources',
|
|
36
|
-
actor: 'agent',
|
|
37
100
|
description: "Repair the workspace's managed guides and Skills",
|
|
38
101
|
argv: ['fx', 'doctor', '--fix', '--workspace', deps.ctx.name],
|
|
39
102
|
cwd: deps.ctx.root,
|
|
103
|
+
actor: 'agent',
|
|
40
104
|
requires_approval: true,
|
|
41
105
|
};
|
|
42
106
|
}
|
|
43
|
-
|
|
107
|
+
// Initialization can fail before the workspace has a context, so the caller says where the
|
|
108
|
+
// command runs.
|
|
109
|
+
export function resumeAction(input) {
|
|
44
110
|
return {
|
|
45
111
|
id: 'resume-initialization',
|
|
46
|
-
description: 'Continue preparing this workspace after resolving the blockers',
|
|
47
|
-
argv: ['fx', 'init', '--resume', '--workspace',
|
|
48
|
-
cwd:
|
|
112
|
+
description: input.description ?? 'Continue preparing this workspace after resolving the blockers',
|
|
113
|
+
argv: ['fx', 'init', '--resume', '--workspace', input.workspace],
|
|
114
|
+
cwd: input.cwd,
|
|
49
115
|
actor: 'agent',
|
|
50
116
|
requires_approval: false,
|
|
51
117
|
};
|
|
52
118
|
}
|
|
53
|
-
export function workspacePreparation(deps,
|
|
119
|
+
export function workspacePreparation(deps, input) {
|
|
120
|
+
const { stages, checks, selection = {} } = input;
|
|
54
121
|
return preparation({
|
|
55
122
|
scope: {
|
|
56
123
|
workspace: deps.ctx.name,
|
|
@@ -67,8 +134,8 @@ export function workspacePreparation(deps, stages, checks, preview = false, sele
|
|
|
67
134
|
Object.keys(deps.ctx.manifest.environments?.result.doc.envs ?? {}),
|
|
68
135
|
},
|
|
69
136
|
checks,
|
|
70
|
-
preview,
|
|
71
|
-
resume,
|
|
137
|
+
preview: input.preview ?? false,
|
|
138
|
+
resume: input.resume ?? resumeAction({ workspace: deps.ctx.name, cwd: deps.ctx.root }),
|
|
72
139
|
});
|
|
73
140
|
}
|
|
74
141
|
export function findingCheck(finding, required = finding.required ?? finding.level === 'fail') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preparation.js","sourceRoot":"","sources":["../../src/application/preparation.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"preparation.js","sourceRoot":"","sources":["../../src/application/preparation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
// Records only this invocation's definite probe evidence. Readiness prompts
|
|
2
2
|
// stay outside the workspace lease; source snapshots are rechecked before writing.
|
|
3
3
|
import { busyError, handoffEnvelope } from '../../domain/errors.js';
|
|
4
|
+
import { withLease, workspaceLeaseKey } from '../../domain/lease.js';
|
|
4
5
|
import { MANIFEST_FILES } from '../../domain/manifest/files.js';
|
|
5
6
|
import { setYamlStrings } from '../../domain/manifest/path-editor.js';
|
|
6
7
|
import { coordinateFingerprint } from '../../domain/obs/observation.js';
|
|
7
8
|
import { confidenceForProbe } from '../../domain/obs/probe.js';
|
|
9
|
+
import { isLostWrite } from '../../domain/projection.js';
|
|
8
10
|
import { shellLine } from '../../domain/shell.js';
|
|
11
|
+
import { Where } from '../readiness/where.js';
|
|
9
12
|
import { assertWritable } from '../safety/posture.js';
|
|
10
|
-
import { Where } from '../where.js';
|
|
11
13
|
import { assertProbeSources, assertSafeNote, probeChangedError, planProbeRecord, recordValues, validateEdited, } from './plan.js';
|
|
12
14
|
export class ProbeRecord {
|
|
13
15
|
deps;
|
|
@@ -17,19 +19,16 @@ export class ProbeRecord {
|
|
|
17
19
|
async execute(input) {
|
|
18
20
|
const plan = await planProbeRecord(this.deps, input);
|
|
19
21
|
if (!plan.template || !plan.output.scope)
|
|
20
|
-
return {
|
|
22
|
+
return {
|
|
23
|
+
...plan.output,
|
|
24
|
+
handoff: recovery(plan.output.row, this.deps.workspace.commandShell),
|
|
25
|
+
};
|
|
21
26
|
if (input.dryRun)
|
|
22
27
|
return plan.output;
|
|
23
28
|
assertWritable(input.posture, 'where --probe --record');
|
|
24
29
|
const where = new Where(this.deps.workspace, this.deps.login);
|
|
25
30
|
const [ready] = await where.execute({ ...input, probe: false, check: input.check });
|
|
26
|
-
|
|
27
|
-
key: `workspace:${this.deps.workspace.ctx.name}`,
|
|
28
|
-
waitMs: 2000,
|
|
29
|
-
});
|
|
30
|
-
if (!lease)
|
|
31
|
-
throw busyError('PROBE_RECORD_BUSY', 'The workspace');
|
|
32
|
-
try {
|
|
31
|
+
return withLease(this.deps.lock, { key: workspaceLeaseKey(this.deps.workspace.ctx.name), waitMs: 2000 }, () => busyError('PROBE_RECORD_BUSY', 'The workspace'), async () => {
|
|
33
32
|
await assertProbeSources(this.deps, plan);
|
|
34
33
|
const [probed] = await where.execute({
|
|
35
34
|
...input,
|
|
@@ -42,16 +41,18 @@ export class ProbeRecord {
|
|
|
42
41
|
JSON.stringify(probed.probe_template) !== JSON.stringify(plan.template))
|
|
43
42
|
throw probeChangedError();
|
|
44
43
|
const row = { ...probed, ready: ready?.ready ?? null, handoff: ready?.handoff ?? null };
|
|
45
|
-
return
|
|
46
|
-
}
|
|
47
|
-
finally {
|
|
48
|
-
await lease.release();
|
|
49
|
-
}
|
|
44
|
+
return this.record(plan, row);
|
|
45
|
+
});
|
|
50
46
|
}
|
|
51
47
|
async record(plan, row) {
|
|
52
48
|
const after = confidenceForProbe(row.outcome ?? 'unknown');
|
|
53
49
|
if (!after)
|
|
54
|
-
return {
|
|
50
|
+
return {
|
|
51
|
+
...plan.output,
|
|
52
|
+
row,
|
|
53
|
+
action: 'skipped',
|
|
54
|
+
handoff: row.handoff ?? recovery(row, this.deps.workspace.commandShell),
|
|
55
|
+
};
|
|
55
56
|
await assertProbeSources(this.deps, plan);
|
|
56
57
|
const note = appendNote(plan.previousNote, `${this.deps.clock.now().toISOString().slice(0, 10)} UTC: ${row.outcome}; ${shellLine(plan.template)}`);
|
|
57
58
|
assertSafeNote(note);
|
|
@@ -69,7 +70,7 @@ export class ProbeRecord {
|
|
|
69
70
|
before: plan.environmentSnapshot,
|
|
70
71
|
text,
|
|
71
72
|
});
|
|
72
|
-
if (result
|
|
73
|
+
if (isLostWrite(result))
|
|
73
74
|
throw probeChangedError();
|
|
74
75
|
return {
|
|
75
76
|
...output,
|
|
@@ -85,8 +86,8 @@ function appendNote(before, line) {
|
|
|
85
86
|
return line;
|
|
86
87
|
return before + (before.endsWith('\n') ? '' : '\n') + line;
|
|
87
88
|
}
|
|
88
|
-
function recovery(row) {
|
|
89
|
-
const command = shellLine(['fx', 'can', row.capability, '--env', row.env]);
|
|
89
|
+
function recovery(row, shell) {
|
|
90
|
+
const command = shellLine(['fx', 'can', row.capability, '--env', row.env], shell);
|
|
90
91
|
return handoffEnvelope({
|
|
91
92
|
summary: 'No definite, recordable coordinate probe result is available.',
|
|
92
93
|
command,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/application/probe-record/index.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,mFAAmF;AAEnF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAwB,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/application/probe-record/index.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,mFAAmF;AAEnF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAwB,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAsB,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,KAAK,EAAiB,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,YAAY,EACZ,cAAc,GACf,MAAM,WAAW,CAAC;AAQnB,MAAM,OAAO,WAAW;IACO;IAA7B,YAA6B,IAAqB;QAArB,SAAI,GAAJ,IAAI,CAAiB;IAAG,CAAC;IAEtD,KAAK,CAAC,OAAO,CAAC,KAAuB;QACnC,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;YACtC,OAAO;gBACL,GAAG,IAAI,CAAC,MAAM;gBACd,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;aACrE,CAAC;QACJ,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrC,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,wBAAwB,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9D,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QACpF,OAAO,SAAS,CACd,IAAI,CAAC,IAAI,CAAC,IAAI,EACd,EAAE,GAAG,EAAE,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EACtE,GAAG,EAAE,CAAC,SAAS,CAAC,mBAAmB,EAAE,eAAe,CAAC,EACrD,KAAK,IAAI,EAAE;YACT,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC;gBACnC,GAAG,KAAK;gBACR,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,IAAI;gBACX,YAAY,EAAE,KAAK;aACpB,CAAC,CAAC;YACH,IACE,CAAC,MAAM;gBACP,qBAAqB,CAAC,MAAM,CAAC,KAAK,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;gBACxE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAEvE,MAAM,iBAAiB,EAAE,CAAC;YAC5B,MAAM,GAAG,GAAG,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,IAAI,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,IAAI,EAAE,CAAC;YACxF,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAChC,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,MAAM,CAAC,IAAqB,EAAE,GAAa;QACvD,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,IAAI,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,KAAK;YACR,OAAO;gBACL,GAAG,IAAI,CAAC,MAAM;gBACd,GAAG;gBACH,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;aACxE,CAAC;QACJ,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,UAAU,CACrB,IAAI,CAAC,YAAY,EACjB,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,IAAI,CAAC,QAAS,CAAC,EAAE,CACxG,CAAC;QACF,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,IAAI,GAAG,cAAc,CAAC;YAC1B,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAK;YACpC,MAAM,EAAE,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC;SACxC,CAAC,CAAC;QACH,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;QAC1E,IAAI,IAAI,KAAK,IAAI,CAAC,mBAAmB,CAAC,IAAI;YAAE,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;QACtF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YACzC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW;YACzC,QAAQ,EAAE,cAAc,CAAC,YAAY;YACrC,MAAM,EAAE,IAAI,CAAC,mBAAmB;YAChC,IAAI;SACL,CAAC,CAAC;QACH,IAAI,WAAW,CAAC,MAAM,CAAC;YAAE,MAAM,iBAAiB,EAAE,CAAC;QACnD,OAAO;YACL,GAAG,MAAM;YACT,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW;YACvD,OAAO,EAAE,MAAM,KAAK,SAAS;SAC9B,CAAC;IACJ,CAAC;CACF;AAED,SAAS,UAAU,CAAC,MAAc,EAAE,IAAY;IAC9C,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC;IACrD,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAC7D,CAAC;AAED,SAAS,QAAQ,CAAC,GAAa,EAAE,KAAgC;IAC/D,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;IAClF,OAAO,eAAe,CAAC;QACrB,OAAO,EAAE,+DAA+D;QACxE,OAAO;QACP,SAAS,EAAE;YACT;gBACE,EAAE,EAAE,kBAAkB;gBACtB,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,oFAAoF;aAC5F;SACF;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -8,11 +8,11 @@ import { loadEnvironments, loadWorkspace } from '../../domain/manifest/loader.js
|
|
|
8
8
|
import { setYamlStrings } from '../../domain/manifest/path-editor.js';
|
|
9
9
|
import { coordinateFingerprint, probeScope } from '../../domain/obs/observation.js';
|
|
10
10
|
import { shellLine } from '../../domain/shell.js';
|
|
11
|
-
import { Where } from '../where.js';
|
|
11
|
+
import { Where } from '../readiness/where.js';
|
|
12
12
|
import { findKnownRepo } from '../workspace/inspect.js';
|
|
13
13
|
export async function planProbeRecord(deps, input) {
|
|
14
14
|
if (!input.probe || !input.env || !input.platform)
|
|
15
|
-
throw inputRequired(input.repo);
|
|
15
|
+
throw inputRequired(input.repo, deps.workspace.commandShell);
|
|
16
16
|
const documents = await readDocuments(deps);
|
|
17
17
|
const [row] = await new Where(deps.workspace, deps.login).execute({
|
|
18
18
|
...input,
|
|
@@ -152,9 +152,11 @@ export function assertSafeNote(text) {
|
|
|
152
152
|
],
|
|
153
153
|
});
|
|
154
154
|
}
|
|
155
|
-
function inputRequired(repo) {
|
|
155
|
+
function inputRequired(repo, shell) {
|
|
156
156
|
return new DevkitError('usage', 'PROBE_RECORD_INPUT_REQUIRED', 'Recording requires --probe, --env and --platform', {
|
|
157
|
-
nextSteps: [
|
|
157
|
+
nextSteps: [
|
|
158
|
+
`${shellLine(['fx', 'where', repo], shell)} --env <env> --platform <platform> --probe --record --dry-run`,
|
|
159
|
+
],
|
|
158
160
|
});
|
|
159
161
|
}
|
|
160
162
|
export function probeChangedError() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/application/probe-record/plan.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,iFAAiF;AAEjF,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/application/probe-record/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
// Report readiness and recovery for a resolved capability or tool; without a
|
|
2
|
-
// target, list what there is to ask about.
|
|
3
|
-
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
2
|
+
// target, list what there is to ask about. An `mcp:<name>` target is a resource
|
|
3
|
+
// of the workspace harness and is answered there.
|
|
4
|
+
import { CAPABILITY_INFO, bindableCapabilities, } from '../../domain/capability.js';
|
|
5
|
+
import { DevkitError } from '../../domain/errors.js';
|
|
6
|
+
import { bindingOf, platformOf, servesCapability, } from '../../domain/manifest/providers.js';
|
|
7
|
+
import { shellLine } from '../../domain/shell.js';
|
|
8
|
+
import { canMcp } from '../harness/session.js';
|
|
9
|
+
import { workspaceCommand } from '../workspace/guidance.js';
|
|
10
|
+
import { Readiness } from './index.js';
|
|
9
11
|
export const CAPABILITY_COLUMNS = [
|
|
10
12
|
'capability',
|
|
11
13
|
'scope',
|
|
@@ -51,7 +53,7 @@ export class Can {
|
|
|
51
53
|
return bindableCapabilities().flatMap((capability) => this.bindingsOf(capability).map((binding) => ({
|
|
52
54
|
capability,
|
|
53
55
|
scope: CAPABILITY_INFO[capability].scope,
|
|
54
|
-
platform:
|
|
56
|
+
platform: platformOf(binding),
|
|
55
57
|
provider: binding.provider,
|
|
56
58
|
tool: readiness.targetOf(binding)?.tool?.name ?? null,
|
|
57
59
|
desc: CAPABILITY_INFO[capability].desc,
|
|
@@ -66,9 +68,8 @@ export class Can {
|
|
|
66
68
|
const instances = platforms.filter((binding) => binding.capability === capability);
|
|
67
69
|
return instances.length > 0 ? instances : [bindingOf([], capability)];
|
|
68
70
|
}
|
|
69
|
-
// A provider
|
|
70
|
-
//
|
|
71
|
-
// question. Without such a tool the binding names nothing at all.
|
|
71
|
+
// A provider the manifest defines itself (see manifestProviderTool) has no entry
|
|
72
|
+
// coordinate to offer: the readiness of its tool answers the question.
|
|
72
73
|
entry(target) {
|
|
73
74
|
const binding = target.binding;
|
|
74
75
|
if (binding === null || binding.provider === null)
|
|
@@ -91,4 +92,15 @@ export class Can {
|
|
|
91
92
|
};
|
|
92
93
|
}
|
|
93
94
|
}
|
|
95
|
+
const MCP_TARGET = 'mcp:';
|
|
96
|
+
export async function canTarget(input, routes) {
|
|
97
|
+
if (!input.target.startsWith(MCP_TARGET))
|
|
98
|
+
return (await routes.workspace()).execute(input);
|
|
99
|
+
return canMcp({
|
|
100
|
+
...routes.harness(),
|
|
101
|
+
name: input.target.slice(MCP_TARGET.length),
|
|
102
|
+
agent: input.agent,
|
|
103
|
+
envName: input.env,
|
|
104
|
+
});
|
|
105
|
+
}
|
|
94
106
|
//# sourceMappingURL=can.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"can.js","sourceRoot":"","sources":["../../../src/application/readiness/can.ts"],"names":[],"mappings":"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"}
|