@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/application/harness/apply.ts"],"names":[],"mappings":"AAAA,uEAAuE;AAEvE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/application/harness/apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,24 +5,15 @@ import { readSettings } from '../config/settings.js';
|
|
|
5
5
|
import { ReconcileHarness } from './reconcile.js';
|
|
6
6
|
export class CleanupAgentHarness {
|
|
7
7
|
deps;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
manifestDirFor;
|
|
11
|
-
constructor(deps, config, fs, manifestDirFor) {
|
|
8
|
+
registered;
|
|
9
|
+
constructor(deps, registered) {
|
|
12
10
|
this.deps = deps;
|
|
13
|
-
this.
|
|
14
|
-
this.fs = fs;
|
|
15
|
-
this.manifestDirFor = manifestDirFor;
|
|
11
|
+
this.registered = registered;
|
|
16
12
|
}
|
|
17
13
|
async execute(input) {
|
|
18
|
-
const config = await this.config.read();
|
|
14
|
+
const config = await this.registered.config.read();
|
|
19
15
|
const selected = await this.selected(input, config);
|
|
20
|
-
return cleanupAgentWorkspaces({
|
|
21
|
-
config: this.config,
|
|
22
|
-
fs: this.fs,
|
|
23
|
-
lock: this.deps.lock,
|
|
24
|
-
manifestDirFor: this.manifestDirFor,
|
|
25
|
-
}, {
|
|
16
|
+
return cleanupAgentWorkspaces({ ...this.registered, lock: this.deps.lock }, {
|
|
26
17
|
...input,
|
|
27
18
|
workspaces: Object.keys(config.workspaces ?? {}),
|
|
28
19
|
kind: 'harness',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/application/harness/cleanup.ts"],"names":[],"mappings":"AAAA,oFAAoF;
|
|
1
|
+
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/application/harness/cleanup.ts"],"names":[],"mappings":"AAAA,oFAAoF;AAKpF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAA6B,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGlD,MAAM,OAAO,mBAAmB;IAEX;IACA;IAFnB,YACmB,IAAiB,EACjB,UAAgC;QADhC,SAAI,GAAJ,IAAI,CAAa;QACjB,eAAU,GAAV,UAAU,CAAsB;IAChD,CAAC;IACJ,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACpD,OAAO,sBAAsB,CAC3B,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAC5C;YACE,GAAG,KAAK;YACR,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;YAChD,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;gBACnC,MAAM,MAAM,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;oBAC3D,SAAS;oBACT,IAAI;oBACJ,OAAO,EAAE,SAAS;oBAClB,QAAQ;oBACR,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,GAAG,EAAE,KAAK;oBACV,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,aAAa,EAAE,KAAK,CAAC,GAAG;iBACzB,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAClC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CACrF,CAAC;YACJ,CAAC;SACF,CACF,CAAC;IACJ,CAAC;IACO,KAAK,CAAC,QAAQ,CACpB,KAAwB,EACxB,MAAgD;QAEhD,OAAO,CACL,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAC3F;aACE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;aACtB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;CACF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
// Checks MCP prerequisites without starting servers or exposing command output.
|
|
2
|
+
import { categoryOfExitCode } from '../../domain/errors.js';
|
|
2
3
|
import { assessMcpSupport, referencedVariables } from '../../domain/harness/mcp.js';
|
|
3
4
|
import { matchesJson } from '../../domain/setup/json-check.js';
|
|
4
5
|
import { mcpTrust, mcpCheckTrust } from './plan.js';
|
|
@@ -63,7 +64,8 @@ export class McpReadiness {
|
|
|
63
64
|
return verdict(input, 'unconfigured', 'The companion response did not satisfy the declared readiness check.');
|
|
64
65
|
return verdict(input, 'ready', null, 'checked');
|
|
65
66
|
}
|
|
66
|
-
|
|
67
|
+
const category = categoryOfExitCode(result.code);
|
|
68
|
+
return verdict(input, category === 'auth' || category === 'permission' ? 'unconfigured' : 'unknown', 'The companion check did not establish readiness; resolve access or connectivity and retry.');
|
|
67
69
|
}
|
|
68
70
|
}
|
|
69
71
|
function verdict(input, status, message, evidence = 'unverified') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-readiness.js","sourceRoot":"","sources":["../../../src/application/harness/mcp-readiness.ts"],"names":[],"mappings":"AAAA,gFAAgF;
|
|
1
|
+
{"version":3,"file":"mcp-readiness.js","sourceRoot":"","sources":["../../../src/application/harness/mcp-readiness.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
// Resolves declared MCP resources with shared typo recovery.
|
|
2
2
|
import { DevkitError } from '../../domain/errors.js';
|
|
3
|
-
import { nearest } from '../../domain/fuzzy.js';
|
|
3
|
+
import { nearest, suggestionHint } from '../../domain/fuzzy.js';
|
|
4
4
|
export function findMcpResource(harness, name) {
|
|
5
5
|
const resource = harness?.mcp.find((item) => item.name === name);
|
|
6
6
|
if (resource)
|
|
7
7
|
return resource;
|
|
8
8
|
const suggestion = nearest(name, harness?.mcp.map((item) => item.name) ?? []);
|
|
9
9
|
throw new DevkitError('not_found', 'MCP_UNKNOWN', 'The MCP resource is not declared', {
|
|
10
|
-
hint: suggestion
|
|
11
|
-
? `Did you mean "${suggestion}"?`
|
|
12
|
-
: 'The optional harness manifest declares MCP resources.',
|
|
10
|
+
hint: suggestionHint(suggestion, 'The optional harness manifest declares MCP resources.'),
|
|
13
11
|
nextSteps: ['fx mcp list', 'fx manifest explain --kind harness mcp'],
|
|
14
12
|
});
|
|
15
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../src/application/harness/names.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../src/application/harness/names.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGhE,MAAM,UAAU,eAAe,CAAC,OAA4B,EAAE,IAAY;IACxE,MAAM,QAAQ,GAAG,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACjE,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9E,MAAM,IAAI,WAAW,CAAC,WAAW,EAAE,aAAa,EAAE,kCAAkC,EAAE;QACpF,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,uDAAuD,CAAC;QACzF,SAAS,EAAE,CAAC,aAAa,EAAE,wCAAwC,CAAC;KACrE,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -104,19 +104,10 @@ async function finishTarget({ deps, input, target, before, receipt, row, project
|
|
|
104
104
|
if (!(await deps.trust.isTrusted(request)))
|
|
105
105
|
trusts.push(request);
|
|
106
106
|
const trusted = trusts.length === 0;
|
|
107
|
-
let action = 'unchanged';
|
|
108
|
-
if (change)
|
|
109
|
-
action = receipt === undefined ? 'created' : 'updated';
|
|
110
|
-
if (change && target.remove)
|
|
111
|
-
action = 'removed';
|
|
112
|
-
// Last, so it wins: an unapproved vector is what the row has to say, whatever the
|
|
113
|
-
// change would otherwise have been called.
|
|
114
|
-
if (!trusted)
|
|
115
|
-
action = 'untrusted';
|
|
116
107
|
return {
|
|
117
108
|
row: {
|
|
118
109
|
...row,
|
|
119
|
-
action,
|
|
110
|
+
action: plannedAction({ trusted, changed: change !== null, target, receipt }),
|
|
120
111
|
handoff: trusted
|
|
121
112
|
? null
|
|
122
113
|
: harnessHandoff('Review the MCP startup vector and environment references before projection.'),
|
|
@@ -125,6 +116,17 @@ async function finishTarget({ deps, input, target, before, receipt, row, project
|
|
|
125
116
|
trusts,
|
|
126
117
|
};
|
|
127
118
|
}
|
|
119
|
+
function plannedAction(input) {
|
|
120
|
+
// An unapproved vector is what the row has to say, whatever the change would
|
|
121
|
+
// otherwise have been called.
|
|
122
|
+
if (!input.trusted)
|
|
123
|
+
return 'untrusted';
|
|
124
|
+
if (!input.changed)
|
|
125
|
+
return 'unchanged';
|
|
126
|
+
if (input.target.remove)
|
|
127
|
+
return 'removed';
|
|
128
|
+
return input.receipt === undefined ? 'created' : 'updated';
|
|
129
|
+
}
|
|
128
130
|
export function mcpTrust(input, resource) {
|
|
129
131
|
return {
|
|
130
132
|
...input,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/application/harness/plan.ts"],"names":[],"mappings":"AAAA,yEAAyE;
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/application/harness/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// Coordinates trust, workspace locking and recoverable harness writes.
|
|
2
2
|
import { busyError } from '../../domain/errors.js';
|
|
3
|
+
import { withLease, workspaceLeaseKey } from '../../domain/lease.js';
|
|
3
4
|
import { assertWritable } from '../safety/posture.js';
|
|
4
5
|
import { applyHarnessChange, harnessConflict, readHarnessState } from './apply.js';
|
|
5
6
|
import { planHarness } from './plan.js';
|
|
@@ -9,7 +10,7 @@ export class ReconcileHarness {
|
|
|
9
10
|
this.deps = deps;
|
|
10
11
|
}
|
|
11
12
|
async execute(input) {
|
|
12
|
-
const preview = await planHarness(this.deps, input, await readHarnessState(this.deps, input, false));
|
|
13
|
+
const preview = await planHarness(this.deps, input, await readHarnessState(this.deps, input, { persist: false }));
|
|
13
14
|
if (input.dryRun || input.action === 'inspect')
|
|
14
15
|
return { items: preview.items, written: false };
|
|
15
16
|
const pending = (await this.deps.state.read(input.workspace))?.pending;
|
|
@@ -18,18 +19,7 @@ export class ReconcileHarness {
|
|
|
18
19
|
assertWritable(input.posture, 'project workspace harness');
|
|
19
20
|
for (const trust of preview.trusts)
|
|
20
21
|
await this.deps.trust.ensure(trust);
|
|
21
|
-
|
|
22
|
-
key: `workspace:${input.workspace}`,
|
|
23
|
-
waitMs: 2000,
|
|
24
|
-
});
|
|
25
|
-
if (!lease)
|
|
26
|
-
throw busyError('LOCK_BUSY', 'The workspace projection state');
|
|
27
|
-
try {
|
|
28
|
-
return await this.apply(input, preview);
|
|
29
|
-
}
|
|
30
|
-
finally {
|
|
31
|
-
await lease.release();
|
|
32
|
-
}
|
|
22
|
+
return withLease(this.deps.lock, { key: workspaceLeaseKey(input.workspace), waitMs: 2000 }, () => busyError('LOCK_BUSY', 'The workspace projection state'), () => this.apply(input, preview));
|
|
33
23
|
}
|
|
34
24
|
async apply(input, preview) {
|
|
35
25
|
if (input.source) {
|
|
@@ -38,7 +28,7 @@ export class ReconcileHarness {
|
|
|
38
28
|
throw harnessConflict();
|
|
39
29
|
}
|
|
40
30
|
const recovered = Boolean((await this.deps.state.read(input.workspace))?.pending);
|
|
41
|
-
let state = await readHarnessState(this.deps, input, true);
|
|
31
|
+
let state = await readHarnessState(this.deps, input, { persist: true });
|
|
42
32
|
const current = await planHarness(this.deps, input, state);
|
|
43
33
|
if (JSON.stringify(current.changes) !== JSON.stringify(preview.changes))
|
|
44
34
|
throw harnessConflict();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/application/harness/reconcile.ts"],"names":[],"mappings":"AAAA,uEAAuE;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,MAAM,OAAO,gBAAgB;IACE;IAA7B,YAA6B,IAAiB;QAAjB,SAAI,GAAJ,IAAI,CAAa;IAAG,CAAC;IAClD,KAAK,CAAC,OAAO,CAAC,KAAmB;QAC/B,MAAM,OAAO,GAAG,MAAM,WAAW,CAC/B,IAAI,CAAC,IAAI,EACT,KAAK,EACL,MAAM,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/application/harness/reconcile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
// Loads a validated harness snapshot and evaluates workspace MCP queries through ports.
|
|
2
2
|
import { DevkitError } from '../../domain/errors.js';
|
|
3
|
-
import { nearest } from '../../domain/fuzzy.js';
|
|
4
3
|
import { MANIFEST_FILES } from '../../domain/manifest/files.js';
|
|
5
4
|
import { loadHarness } from '../../domain/manifest/loader.js';
|
|
6
|
-
import { enabledHosts } from '../agent/list.js';
|
|
5
|
+
import { enabledHosts, findHost } from '../agent/list.js';
|
|
7
6
|
import { readSettings } from '../config/settings.js';
|
|
8
7
|
import { resolveWorkspace } from '../workspace/resolve.js';
|
|
9
8
|
import { InspectMcp } from './inspect.js';
|
|
@@ -47,7 +46,7 @@ export async function canMcp(command) {
|
|
|
47
46
|
throw new DevkitError('usage', 'MCP_ENV_UNSUPPORTED', 'MCP resources are workspace-scoped; omit --env', { nextSteps: ['fx mcp list'] });
|
|
48
47
|
const { deps, input } = await loadHarnessCommand(command);
|
|
49
48
|
const resource = findMcpResource(input.harness, command.name);
|
|
50
|
-
const agent = command.agent === undefined ? null :
|
|
49
|
+
const agent = command.agent === undefined ? null : findHost(command.deps.hosts, command.agent);
|
|
51
50
|
const projection = agent
|
|
52
51
|
? (await new ReconcileHarness(deps).execute({
|
|
53
52
|
...input,
|
|
@@ -62,16 +61,6 @@ export async function canMcp(command) {
|
|
|
62
61
|
env: command.env,
|
|
63
62
|
}).execute({ workspace: input.workspace, resource, agent, posture: command.posture, projection });
|
|
64
63
|
}
|
|
65
|
-
function findAgent(hosts, id) {
|
|
66
|
-
const host = hosts.find((item) => item.id === id);
|
|
67
|
-
if (host)
|
|
68
|
-
return host;
|
|
69
|
-
const suggestion = nearest(id, hosts.map((item) => item.id));
|
|
70
|
-
throw new DevkitError('not_found', 'AGENT_UNKNOWN', 'The agent is not registered', {
|
|
71
|
-
hint: suggestion ? `Did you mean "${suggestion}"?` : 'Use an agent ID from fx agent list.',
|
|
72
|
-
nextSteps: ['fx agent list'],
|
|
73
|
-
});
|
|
74
|
-
}
|
|
75
64
|
export async function inspectMcp(command) {
|
|
76
65
|
const { deps, input } = await loadHarnessCommand(command);
|
|
77
66
|
return new InspectMcp({ ...deps, process: command.process }).execute({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/application/harness/session.ts"],"names":[],"mappings":"AAAA,wFAAwF;AAExF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/application/harness/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
// Connects harness projection and readiness to sync and doctor.
|
|
2
2
|
import { asDevkitError, DevkitError } from '../../domain/errors.js';
|
|
3
|
+
import { harnessActionState } from '../../domain/harness/actions.js';
|
|
4
|
+
import { workspaceLeaseKey } from '../../domain/lease.js';
|
|
3
5
|
import { preparationCheck } from '../../domain/preparation.js';
|
|
4
6
|
import { finding } from '../../domain/report.js';
|
|
7
|
+
import { countBy } from '../../domain/values.js';
|
|
5
8
|
import { McpReadinessBatch } from './mcp-readiness-batch.js';
|
|
6
9
|
import { ReconcileHarness } from './reconcile.js';
|
|
7
10
|
import { loadHarnessCommand } from './session.js';
|
|
@@ -14,7 +17,7 @@ export async function manageHarness(command) {
|
|
|
14
17
|
});
|
|
15
18
|
const lock = held
|
|
16
19
|
? {
|
|
17
|
-
acquire: async (request) => request.key ===
|
|
20
|
+
acquire: async (request) => request.key === workspaceLeaseKey(input.workspace)
|
|
18
21
|
? { release: async () => { } }
|
|
19
22
|
: deps.lock.acquire(request),
|
|
20
23
|
}
|
|
@@ -29,9 +32,8 @@ export async function manageHarness(command) {
|
|
|
29
32
|
export function harnessStage(command) {
|
|
30
33
|
return async () => {
|
|
31
34
|
const result = await manageHarness(command);
|
|
32
|
-
const summary =
|
|
33
|
-
for (const row of result.items)
|
|
34
|
-
summary[row.action] = (summary[row.action] ?? 0) + 1;
|
|
35
|
+
const summary = countBy(result.items, (row) => row.action);
|
|
36
|
+
for (const row of result.items)
|
|
35
37
|
if (row.handoff)
|
|
36
38
|
command.resolve.reporter.notice({
|
|
37
39
|
code: 'HARNESS_NOT_READY',
|
|
@@ -39,21 +41,9 @@ export function harnessStage(command) {
|
|
|
39
41
|
nextSteps: ['fx doctor'],
|
|
40
42
|
data: { handoff: row.handoff },
|
|
41
43
|
});
|
|
42
|
-
}
|
|
43
|
-
const checks = result.items.map((row) => {
|
|
44
|
-
let state = 'blocked';
|
|
45
|
-
if (['created', 'updated', 'unchanged', 'removed'].includes(row.action))
|
|
46
|
-
state = 'ready';
|
|
47
|
-
if (row.action === 'unsupported')
|
|
48
|
-
state = 'skipped';
|
|
49
|
-
return preparationCheck(`harness:${row.key}`, state, `${row.name}: ${row.action}`, {
|
|
50
|
-
resource: row.name,
|
|
51
|
-
required: row.kind === 'rules',
|
|
52
|
-
owner: 'user',
|
|
53
|
-
});
|
|
54
|
-
});
|
|
44
|
+
const checks = result.items.map((row) => preparationCheck(`harness:${row.key}`, harnessActionState(row.action), `${row.name}: ${row.action}`, { resource: row.name, required: row.kind === 'rules', owner: 'user' }));
|
|
55
45
|
const activation = result.items
|
|
56
|
-
.filter((row) => row.kind === 'mcp' && row.action !== '
|
|
46
|
+
.filter((row) => row.kind === 'mcp' && harnessActionState(row.action) !== 'skipped')
|
|
57
47
|
.map((row) => preparationCheck(`activation:${row.key}`, 'unknown', `${row.name}: native activation is unverified`, { resource: row.name, required: false, owner: 'user' }));
|
|
58
48
|
return {
|
|
59
49
|
summary,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stages.js","sourceRoot":"","sources":["../../../src/application/harness/stages.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"stages.js","sourceRoot":"","sources":["../../../src/application/harness/stages.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAIjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAuB,MAAM,cAAc,CAAC;AAevE,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAsB;IACxD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,cAAc,CAAC;IACpC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC;QAC1E,MAAM,IAAI,WAAW,CAAC,UAAU,EAAE,sBAAsB,EAAE,+BAA+B,EAAE;YACzF,SAAS,EAAE,CAAC,kCAAkC,CAAC;SAChD,CAAC,CAAC;IACL,MAAM,IAAI,GAAG,IAAI;QACf,CAAC,CAAC;YACE,OAAO,EAAE,KAAK,EAAE,OAAwC,EAAE,EAAE,CAC1D,OAAO,CAAC,GAAG,KAAK,iBAAiB,CAAC,KAAK,CAAC,SAAS,CAAC;gBAChD,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC,EAAE;gBAC7B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;SACjC;QACH,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IACd,OAAO,IAAI,gBAAgB,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC;QACrD,GAAG,KAAK;QACR,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;AACL,CAAC;AACD,MAAM,UAAU,YAAY,CAC1B,OAAsB;IAEtB,OAAO,KAAK,IAAI,EAAE;QAChB,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK;YAC5B,IAAI,GAAG,CAAC,OAAO;gBACb,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC9B,IAAI,EAAE,mBAAmB;oBACzB,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,MAAM,EAAE;oBACrC,SAAS,EAAE,CAAC,WAAW,CAAC;oBACxB,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE;iBAC/B,CAAC,CAAC;QACP,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACtC,gBAAgB,CACd,WAAW,GAAG,CAAC,GAAG,EAAE,EACpB,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,EAC9B,GAAG,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,MAAM,EAAE,EAC5B,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CACtE,CACF,CAAC;QACF,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK;aAC5B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,IAAI,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC;aACnF,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACX,gBAAgB,CACd,cAAc,GAAG,CAAC,GAAG,EAAE,EACvB,SAAS,EACT,GAAG,GAAG,CAAC,IAAI,mCAAmC,EAC9C,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CACvD,CACF,CAAC;QACJ,OAAO;YACL,OAAO;YACP,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE;YAChC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,GAAG,UAAU,CAAC;YAClC,eAAe,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;SACvE,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AACD,MAAM,UAAU,aAAa,CAAC,OAAuB,EAAE,IAAiB;IACtE,OAAO;QACL,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC;QACxC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACrB,MAAM,aAAa,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1F,CAAC;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,OAAuB,EAAE,IAAiB;IACpE,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAClF,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACxC,OAAO,CACL,IAAI,EACJ,GAAG,CAAC,GAAG,EACP,GAAG,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAC1C,GAAG,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,MAAM,gCAAgC,EAC1D;YACE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,SAAS;YACjC,GAAG,CAAC,GAAG,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,yBAAyB,EAAE,CAAC;SAC1E,CACF,CACF,CAAC;QACF,IAAI,IAAI,KAAK,KAAK;YAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,iBAAiB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1F,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,+EAA+E;QAC/E,oEAAoE;QACpE,OAAO;YACL,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,8BAA8B,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC3F,GAAG,EAAE,qCAAqC;gBAC1C,QAAQ,EAAE,YAAY;aACvB,CAAC;SACH,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,OAAuB,EACvB,MAAsD;IAEtD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAC/B,MAAM,OAAO,GAAG,MAAM,IAAI,iBAAiB,CAAC;QAC1C,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,GAAG,EAAE,OAAO,CAAC,GAAG;KACjB,CAAC,CAAC,OAAO,CAAC;QACT,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE;QACnC,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC5B,OAAO,CACL,KAAK,EACL,SAAS,MAAM,CAAC,QAAQ,EAAE,EAC1B,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EACzC,GAAG,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,QAAQ,GAAG,EAC3D;QACE,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,SAAS;QACpC,QAAQ,EAAE,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS;KACjE,CACF,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/application/harness/types.ts"],"names":[],"mappings":"AAAA,6EAA6E
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/application/harness/types.ts"],"names":[],"mappings":"AAAA,6EAA6E"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Writes planned entries under the caller's hooks lease and records what survived.
|
|
2
|
+
import { hookActionState } from '../../domain/harness/actions.js';
|
|
3
|
+
import { isLostWrite } from '../../domain/projection.js';
|
|
2
4
|
import { ownedReceipts } from './plan.js';
|
|
3
|
-
const UNFINISHED = ['busy', 'conflict', 'foreign', 'invalid'];
|
|
4
5
|
export async function applyHookPlan(deps, input, plan) {
|
|
5
6
|
const receipts = [...ownedReceipts(input, plan.state)];
|
|
6
7
|
const items = [];
|
|
@@ -17,9 +18,9 @@ export async function applyHookPlan(deps, input, plan) {
|
|
|
17
18
|
});
|
|
18
19
|
items.push({
|
|
19
20
|
...item.row,
|
|
20
|
-
...(result
|
|
21
|
+
...(isLostWrite(result) ? { action: result } : {}),
|
|
21
22
|
});
|
|
22
|
-
if (result
|
|
23
|
+
if (isLostWrite(result))
|
|
23
24
|
continue;
|
|
24
25
|
const at = receipts.findIndex((r) => r.agent === item.receipt.agent);
|
|
25
26
|
if (at >= 0)
|
|
@@ -52,7 +53,7 @@ function stateOf(input, plan, receipts) {
|
|
|
52
53
|
};
|
|
53
54
|
}
|
|
54
55
|
async function commitPreference(deps, input, items) {
|
|
55
|
-
const complete = items.every((item) =>
|
|
56
|
+
const complete = items.every((item) => hookActionState(item.action) !== 'blocked');
|
|
56
57
|
if (complete && (input.action === 'inject' || input.action === 'remove')) {
|
|
57
58
|
await deps.local.update(input.workspace, (local) => ({
|
|
58
59
|
...local,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/application/hook/apply.ts"],"names":[],"mappings":"AAAA,mFAAmF;
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/application/hook/apply.ts"],"names":[],"mappings":"AAAA,mFAAmF;AAEnF,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAG1C,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAc,EACd,KAAqB,EACrB,IAAc;IAEd,MAAM,QAAQ,GAAG,CAAC,GAAG,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACvD,MAAM,KAAK,GAAc,EAAE,CAAC;IAC5B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,SAAS;QACX,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YACpC,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC;YACT,GAAG,IAAI,CAAC,GAAG;YACX,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnD,CAAC,CAAC;QACH,IAAI,WAAW,CAAC,MAAM,CAAC;YAAE,SAAS;QAClC,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,OAAQ,CAAC,KAAK,CAAC,CAAC;QACtE,IAAI,EAAE,IAAI,CAAC;YAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,QAAQ;YAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9D,6EAA6E;QAC7E,iEAAiE;QACjE,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC7C,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC/C,MAAM,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACrD,OAAO;QACL,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,KAAK;QACL,OAAO,EAAE,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,KAAK,KAAK;QAC9D,KAAK;KACN,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CACd,KAAqB,EACrB,IAAc,EACd,QAAgC;IAEhC,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC;QACvB,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,WAAW,IAAI,IAAI;QAC5C,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,WAAW,IAAI,IAAI;QAC5C,YAAY,EAAE,IAAI,CAAC,KAAK,EAAE,YAAY,IAAI,EAAE;KAC7C,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,IAAc,EACd,KAAqB,EACrB,KAAyB;IAEzB,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC;IACnF,IAAI,QAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACnD,GAAG,KAAK;YACR,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE;SAC9C,CAAC,CAAC,CAAC;IACN,CAAC;AACH,CAAC"}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
// recorded before IO so interrupted workers do not hammer an unavailable
|
|
3
3
|
// upstream; dated evidence never asserts current tool readiness.
|
|
4
4
|
import { asDevkitError } from '../../domain/errors.js';
|
|
5
|
+
import { SESSION_BURST_MS } from '../../domain/harness/deadlines.js';
|
|
6
|
+
import { hooksLeaseKey, workspaceLeaseKey } from '../../domain/lease.js';
|
|
5
7
|
import { samePath } from '../../domain/path.js';
|
|
6
8
|
import { MANIFEST_UPDATE_TTL_MS } from '../update/policy.js';
|
|
7
9
|
export class AutomaticSync {
|
|
@@ -16,7 +18,10 @@ export class AutomaticSync {
|
|
|
16
18
|
if (!(await this.deps.canWrite()))
|
|
17
19
|
return;
|
|
18
20
|
this.delayed = [];
|
|
19
|
-
const lease = await this.deps.lock.acquire({
|
|
21
|
+
const lease = await this.deps.lock.acquire({
|
|
22
|
+
key: workspaceLeaseKey(input.workspace),
|
|
23
|
+
waitMs: 0,
|
|
24
|
+
});
|
|
20
25
|
if (!lease)
|
|
21
26
|
return;
|
|
22
27
|
try {
|
|
@@ -32,7 +37,7 @@ export class AutomaticSync {
|
|
|
32
37
|
if (previous?.lastAttempt !== null &&
|
|
33
38
|
previous?.lastAttempt !== undefined &&
|
|
34
39
|
now - previous.lastAttempt >= 0 &&
|
|
35
|
-
now - previous.lastAttempt <
|
|
40
|
+
now - previous.lastAttempt < SESSION_BURST_MS)
|
|
36
41
|
return;
|
|
37
42
|
const refreshAt = previous?.lastRefresh;
|
|
38
43
|
const refreshing = refreshAt === null ||
|
|
@@ -124,7 +129,7 @@ export class AutomaticSync {
|
|
|
124
129
|
await this.update(input, {}, phase.name, observations);
|
|
125
130
|
}
|
|
126
131
|
async update(input, patch, phase, observations = []) {
|
|
127
|
-
const lease = await this.deps.lock.acquire({ key:
|
|
132
|
+
const lease = await this.deps.lock.acquire({ key: hooksLeaseKey(input.workspace), waitMs: 0 });
|
|
128
133
|
if (!lease) {
|
|
129
134
|
// A hook never waits for the state lease, and a dropped outcome would
|
|
130
135
|
// read as unchanged.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automatic-sync.js","sourceRoot":"","sources":["../../../src/application/hook/automatic-sync.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,yEAAyE;AACzE,iEAAiE;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"automatic-sync.js","sourceRoot":"","sources":["../../../src/application/hook/automatic-sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,24 +5,15 @@ import { readSettings } from '../config/settings.js';
|
|
|
5
5
|
import { ReconcileHooks } from './reconcile.js';
|
|
6
6
|
export class CleanupAgentHooks {
|
|
7
7
|
deps;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
manifestDirFor;
|
|
11
|
-
constructor(deps, config, fs, manifestDirFor) {
|
|
8
|
+
registered;
|
|
9
|
+
constructor(deps, registered) {
|
|
12
10
|
this.deps = deps;
|
|
13
|
-
this.
|
|
14
|
-
this.fs = fs;
|
|
15
|
-
this.manifestDirFor = manifestDirFor;
|
|
11
|
+
this.registered = registered;
|
|
16
12
|
}
|
|
17
13
|
async execute(input) {
|
|
18
|
-
const file = await this.config.read();
|
|
14
|
+
const file = await this.registered.config.read();
|
|
19
15
|
const settings = readSettings({ env: input.env, file });
|
|
20
|
-
return cleanupAgentWorkspaces({
|
|
21
|
-
config: this.config,
|
|
22
|
-
fs: this.fs,
|
|
23
|
-
lock: this.deps.lock,
|
|
24
|
-
manifestDirFor: this.manifestDirFor,
|
|
25
|
-
}, {
|
|
16
|
+
return cleanupAgentWorkspaces({ ...this.registered, lock: this.deps.lock }, {
|
|
26
17
|
...input,
|
|
27
18
|
workspaces: Object.keys(file.workspaces ?? {}),
|
|
28
19
|
reconcile: async (workspace, root) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/application/hook/cleanup.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,+EAA+E;
|
|
1
|
+
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/application/hook/cleanup.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,+EAA+E;AAI/E,OAAO,EAAE,sBAAsB,EAA6B,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,MAAM,OAAO,iBAAiB;IAET;IACA;IAFnB,YACmB,IAAc,EACd,UAAgC;QADhC,SAAI,GAAJ,IAAI,CAAU;QACd,eAAU,GAAV,UAAU,CAAsB;IAChD,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,YAAY,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,OAAO,sBAAsB,CAC3B,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAC5C;YACE,GAAG,KAAK;YACR,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;YAC9C,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;gBACnC,MAAM,MAAM,GAAG,MAAM,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;oBACzD,SAAS;oBACT,IAAI;oBACJ,MAAM,EAAE,MAAM;oBACd,YAAY,EAAE,KAAK,CAAC,GAAG;oBACvB,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,UAAU,EAAE,QAAQ,CAAC,MAAM;oBAC3B,aAAa,EAAE,QAAQ,CAAC,KAAK;iBAC9B,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC,KAAK;qBAChB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;qBAC9C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACzE,CAAC;SACF,CACF,CAAC;IACJ,CAAC;CACF"}
|