@apralabs/apra-fleet 0.4.3 → 0.4.5
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/README.md +114 -33
- package/dist/agents/backlog-groomer.md +80 -27
- package/dist/agents/ci-watcher.md +42 -22
- package/dist/agents/deployer.md +59 -24
- package/dist/agents/doer.md +111 -41
- package/dist/agents/harvester.md +60 -48
- package/dist/agents/integ-test-runner.md +45 -23
- package/dist/agents/kb-reconciler.md +34 -7
- package/dist/agents/plan-reviewer.md +54 -24
- package/dist/agents/planner.md +71 -43
- package/dist/agents/regression-test-runner.md +106 -78
- package/dist/agents/reviewer.md +170 -57
- package/dist/agents/schemas/backlog-groomer-output.json +1 -1
- package/dist/agents/schemas/deployer-output.json +5 -0
- package/dist/agents/schemas/doer-output.json +110 -2
- package/dist/agents/schemas/harvester-input.json +1 -5
- package/dist/agents/schemas/planner-output.json +1 -1
- package/dist/agents/schemas/regression-test-runner-output.json +41 -7
- package/dist/agents/schemas/reviewer-output.json +166 -5
- package/dist/cli/agent-transform.d.ts +7 -0
- package/dist/cli/agent-transform.js +46 -1
- package/dist/cli/auth.d.ts +1 -0
- package/dist/cli/auth.js +42 -8
- package/dist/cli/beads-install.d.ts +35 -0
- package/dist/cli/beads-install.js +125 -0
- package/dist/cli/beads-pin.d.ts +5 -0
- package/dist/cli/beads-pin.js +26 -0
- package/dist/cli/call.d.ts +27 -0
- package/dist/cli/call.js +177 -0
- package/dist/cli/claude-mod.d.ts +75 -0
- package/dist/cli/claude-mod.js +288 -0
- package/dist/cli/config.d.ts +24 -1
- package/dist/cli/config.js +69 -2
- package/dist/cli/dolt-install.d.ts +19 -3
- package/dist/cli/dolt-install.js +51 -16
- package/dist/cli/fleet-se-guard.d.ts +59 -0
- package/dist/cli/fleet-se-guard.js +231 -0
- package/dist/cli/install-guard.d.ts +63 -0
- package/dist/cli/install-guard.js +156 -4
- package/dist/cli/install.d.ts +89 -21
- package/dist/cli/install.js +778 -160
- package/dist/cli/kb-commit.d.ts +2 -1
- package/dist/cli/kb-commit.js +1 -1
- package/dist/cli/kb-import.d.ts +2 -1
- package/dist/cli/kb-import.js +1 -1
- package/dist/cli/kb-profile.d.ts +16 -0
- package/dist/cli/kb-profile.js +81 -0
- package/dist/cli/register-member.js +20 -3
- package/dist/cli/remove-member.d.ts +4 -0
- package/dist/cli/remove-member.js +63 -0
- package/dist/cli/secret.js +9 -0
- package/dist/cli/start.js +62 -4
- package/dist/cli/status.d.ts +3 -0
- package/dist/cli/status.js +45 -12
- package/dist/cli/stop.js +64 -9
- package/dist/cli/uninstall.js +112 -16
- package/dist/cli/update.d.ts +4 -0
- package/dist/cli/update.js +52 -5
- package/dist/cli/watch.js +1 -1
- package/dist/cli/workflow.js +3 -2
- package/dist/commands/kb-server.d.ts +10 -1
- package/dist/commands/kb-server.js +292 -11
- package/dist/hub-service/http-server.d.ts +5 -1
- package/dist/hub-service/http-server.js +55 -5
- package/dist/index.js +177 -9
- package/dist/os/child-env-bound.d.ts +77 -0
- package/dist/os/child-env-bound.js +171 -0
- package/dist/os/git-executable.d.ts +57 -0
- package/dist/os/git-executable.js +85 -0
- package/dist/os/go-concurrency.d.ts +44 -0
- package/dist/os/go-concurrency.js +53 -0
- package/dist/os/index.d.ts +1 -0
- package/dist/os/index.js +1 -0
- package/dist/os/linux.d.ts +9 -2
- package/dist/os/linux.js +50 -15
- package/dist/os/macos.d.ts +1 -1
- package/dist/os/macos.js +2 -11
- package/dist/os/os-commands.d.ts +42 -2
- package/dist/os/os-commands.js +2 -0
- package/dist/os/windows-executable.d.ts +53 -0
- package/dist/os/windows-executable.js +185 -0
- package/dist/os/windows-gitbash.d.ts +24 -14
- package/dist/os/windows-gitbash.js +56 -18
- package/dist/os/windows-wrapper.d.ts +0 -4
- package/dist/os/windows-wrapper.js +2 -1
- package/dist/os/windows.d.ts +7 -2
- package/dist/os/windows.js +109 -32
- package/dist/paths.d.ts +30 -0
- package/dist/paths.js +52 -0
- package/dist/providers/agy.d.ts +6 -2
- package/dist/providers/agy.js +245 -106
- package/dist/providers/claude-permission-denial.d.ts +7 -0
- package/dist/providers/claude-permission-denial.js +137 -0
- package/dist/providers/claude.d.ts +86 -38
- package/dist/providers/claude.js +426 -164
- package/dist/providers/codex.js +5 -1
- package/dist/providers/copilot.js +5 -1
- package/dist/providers/opencode.d.ts +10 -2
- package/dist/providers/opencode.js +114 -53
- package/dist/providers/provider.d.ts +171 -33
- package/dist/providers/provider.js +164 -3
- package/dist/services/agent-provisioner.d.ts +29 -0
- package/dist/services/agent-provisioner.js +107 -0
- package/dist/services/agent-shadow.d.ts +96 -0
- package/dist/services/agent-shadow.js +479 -0
- package/dist/services/agy-project.d.ts +9 -2
- package/dist/services/agy-project.js +22 -19
- package/dist/services/auth-socket.d.ts +43 -0
- package/dist/services/auth-socket.js +97 -26
- package/dist/services/auth-web.js +1 -1
- package/dist/services/budget-awareness.d.ts +11 -11
- package/dist/services/budget-awareness.js +15 -3
- package/dist/services/claude-local-scope-mcp.d.ts +19 -0
- package/dist/services/claude-local-scope-mcp.js +91 -0
- package/dist/services/cloud/aws.js +2 -1
- package/dist/services/cloud/lifecycle.js +19 -2
- package/dist/services/cloud/task-wrapper.d.ts +0 -9
- package/dist/services/cloud/task-wrapper.js +15 -6
- package/dist/services/credential-store.d.ts +33 -0
- package/dist/services/credential-store.js +79 -2
- package/dist/services/event-loop-watchdog.d.ts +32 -0
- package/dist/services/event-loop-watchdog.js +140 -0
- package/dist/services/http-transport.d.ts +78 -1
- package/dist/services/http-transport.js +347 -52
- package/dist/services/in-flight-agents.d.ts +2 -0
- package/dist/services/in-flight-agents.js +4 -0
- package/dist/services/kb-tool-profile.d.ts +36 -0
- package/dist/services/kb-tool-profile.js +88 -0
- package/dist/services/knowledge/bible-basis-filter.d.ts +53 -0
- package/dist/services/knowledge/bible-basis-filter.js +134 -0
- package/dist/services/knowledge/bible-blob-id.d.ts +44 -0
- package/dist/services/knowledge/bible-blob-id.js +122 -0
- package/dist/services/knowledge/bible-import.d.ts +173 -0
- package/dist/services/knowledge/bible-import.js +344 -0
- package/dist/services/knowledge/file-hash.d.ts +31 -0
- package/dist/services/knowledge/file-hash.js +155 -24
- package/dist/services/knowledge/http-provider.d.ts +305 -21
- package/dist/services/knowledge/http-provider.js +801 -119
- package/dist/services/knowledge/kb-config.d.ts +65 -1
- package/dist/services/knowledge/kb-config.js +143 -3
- package/dist/services/knowledge/kb-http-auth-state.d.ts +26 -0
- package/dist/services/knowledge/kb-http-auth-state.js +40 -0
- package/dist/services/knowledge/kb-maintainer-grant.d.ts +15 -0
- package/dist/services/knowledge/kb-maintainer-grant.js +34 -0
- package/dist/services/knowledge/kb-providers.d.ts +13 -2
- package/dist/services/knowledge/kb-providers.js +75 -37
- package/dist/services/knowledge/kb-removed-scope-keys.d.ts +28 -0
- package/dist/services/knowledge/kb-removed-scope-keys.js +59 -0
- package/dist/services/knowledge/kb-scopes.d.ts +14 -0
- package/dist/services/knowledge/kb-scopes.js +47 -0
- package/dist/services/knowledge/kb-self.d.ts +204 -0
- package/dist/services/knowledge/kb-self.js +358 -0
- package/dist/services/knowledge/member-bible-view.d.ts +21 -0
- package/dist/services/knowledge/member-bible-view.js +207 -0
- package/dist/services/knowledge/path-validation.d.ts +7 -0
- package/dist/services/knowledge/path-validation.js +11 -0
- package/dist/services/knowledge/pre-init.js +1 -0
- package/dist/services/knowledge/project-slug.js +5 -4
- package/dist/services/knowledge/repository-header.d.ts +77 -0
- package/dist/services/knowledge/repository-header.js +233 -0
- package/dist/services/knowledge/require-sqlite-project.d.ts +1 -1
- package/dist/services/knowledge/require-sqlite-project.js +1 -1
- package/dist/services/knowledge/sqlite-provider.d.ts +233 -11
- package/dist/services/knowledge/sqlite-provider.js +719 -45
- package/dist/services/knowledge/types.d.ts +59 -3
- package/dist/services/member-access-secret.d.ts +70 -0
- package/dist/services/member-access-secret.js +195 -0
- package/dist/services/member-busy.d.ts +12 -0
- package/dist/services/member-busy.js +20 -0
- package/dist/services/member-call-counts.d.ts +24 -0
- package/dist/services/member-call-counts.js +58 -0
- package/dist/services/member-config-io.d.ts +193 -0
- package/dist/services/member-config-io.js +446 -0
- package/dist/services/member-fleet-install.d.ts +710 -0
- package/dist/services/member-fleet-install.js +1896 -0
- package/dist/services/member-secret-env.d.ts +42 -0
- package/dist/services/member-secret-env.js +68 -0
- package/dist/services/member-tool-allowlist.d.ts +49 -0
- package/dist/services/member-tool-allowlist.js +115 -0
- package/dist/services/model-pricing.d.ts +19 -0
- package/dist/services/model-pricing.js +54 -8
- package/dist/services/port-holder.d.ts +86 -0
- package/dist/services/port-holder.js +352 -0
- package/dist/services/preflight-check.js +2 -0
- package/dist/services/registry.d.ts +13 -2
- package/dist/services/registry.js +27 -1
- package/dist/services/relay-strategy.d.ts +2 -0
- package/dist/services/relay-strategy.js +8 -0
- package/dist/services/server-lifecycle.d.ts +26 -0
- package/dist/services/server-lifecycle.js +85 -0
- package/dist/services/service-manager/index.d.ts +7 -1
- package/dist/services/service-manager/index.js +17 -4
- package/dist/services/service-manager/linux.d.ts +1 -1
- package/dist/services/service-manager/linux.js +15 -7
- package/dist/services/service-manager/macos.d.ts +11 -1
- package/dist/services/service-manager/macos.js +45 -7
- package/dist/services/service-manager/service-path.d.ts +24 -0
- package/dist/services/service-manager/service-path.js +55 -0
- package/dist/services/service-manager/types.d.ts +54 -3
- package/dist/services/service-manager/types.js +29 -0
- package/dist/services/service-manager/windows.d.ts +187 -3
- package/dist/services/service-manager/windows.js +684 -50
- package/dist/services/service-notice.d.ts +21 -0
- package/dist/services/service-notice.js +81 -0
- package/dist/services/service-start-guard.d.ts +20 -0
- package/dist/services/service-start-guard.js +86 -0
- package/dist/services/session-cost.d.ts +24 -0
- package/dist/services/session-cost.js +105 -0
- package/dist/services/session-mcp-config.d.ts +83 -0
- package/dist/services/session-mcp-config.js +211 -0
- package/dist/services/session-registry.d.ts +13 -0
- package/dist/services/session-registry.js +13 -0
- package/dist/services/session-roots.d.ts +67 -0
- package/dist/services/session-roots.js +126 -0
- package/dist/services/sftp.d.ts +34 -0
- package/dist/services/sftp.js +304 -76
- package/dist/services/shell-probe.d.ts +0 -24
- package/dist/services/shell-probe.js +28 -3
- package/dist/services/singleton.d.ts +68 -2
- package/dist/services/singleton.js +168 -11
- package/dist/services/sprint-coordination.js +9 -3
- package/dist/services/ssh.d.ts +27 -0
- package/dist/services/ssh.js +229 -38
- package/dist/services/stall/find-log-file.js +12 -5
- package/dist/services/stall/index.d.ts +1 -1
- package/dist/services/stall/read-log-tail.d.ts +23 -0
- package/dist/services/stall/read-log-tail.js +33 -2
- package/dist/services/stall/stall-detector.d.ts +25 -1
- package/dist/services/stall/stall-detector.js +85 -6
- package/dist/services/stall/stall-poller.d.ts +16 -0
- package/dist/services/stall/stall-poller.js +50 -6
- package/dist/services/statusline.d.ts +21 -0
- package/dist/services/statusline.js +97 -1
- package/dist/services/stopped-marker.d.ts +16 -0
- package/dist/services/stopped-marker.js +55 -0
- package/dist/services/strategy.d.ts +33 -1
- package/dist/services/strategy.js +86 -17
- package/dist/services/supervisor-service-cleanup.d.ts +52 -0
- package/dist/services/supervisor-service-cleanup.js +333 -0
- package/dist/services/tool-registry.d.ts +8 -1
- package/dist/services/tool-registry.js +251 -62
- package/dist/services/tool-scope.d.ts +91 -0
- package/dist/services/tool-scope.js +124 -0
- package/dist/services/vcs/azure-devops.js +10 -0
- package/dist/services/vcs/bitbucket.d.ts +22 -1
- package/dist/services/vcs/bitbucket.js +163 -17
- package/dist/services/vcs/types.d.ts +25 -2
- package/dist/services/watch/project-resolver.js +3 -1
- package/dist/skills/auto-sprint-args/SKILL.md +2 -2
- package/dist/skills/fleet-sprint-cli/SKILL.md +39 -15
- package/dist/skills/pm/SKILL.md +3 -3
- package/dist/skills/pm/cost.md +5 -1
- package/dist/skills/pm/index.md +11 -9
- package/dist/skills/pm/kb-reconcile.md +29 -14
- package/dist/skills/pm/kb-review.md +1 -0
- package/dist/skills/pm/sprint.md +7 -6
- package/dist/tools/check-status.d.ts +104 -5
- package/dist/tools/check-status.js +326 -57
- package/dist/tools/child-id-allocator.d.ts +2 -2
- package/dist/tools/child-id-allocator.js +1 -1
- package/dist/tools/code-index-heal.d.ts +8 -0
- package/dist/tools/code-index-heal.js +21 -0
- package/dist/tools/code-index-state.d.ts +45 -0
- package/dist/tools/code-index-state.js +115 -0
- package/dist/tools/code-intelligence-codebase-memory.js +6 -33
- package/dist/tools/code-intelligence-freshness.js +1 -1
- package/dist/tools/code-intelligence-gitnexus.d.ts +49 -0
- package/dist/tools/code-intelligence-gitnexus.js +488 -55
- package/dist/tools/code-intelligence-kb-enrich.js +7 -6
- package/dist/tools/code-intelligence-readiness.d.ts +156 -0
- package/dist/tools/code-intelligence-readiness.js +291 -0
- package/dist/tools/code-intelligence-reindex.d.ts +219 -0
- package/dist/tools/code-intelligence-reindex.js +602 -50
- package/dist/tools/code-intelligence-telemetry.d.ts +6 -1
- package/dist/tools/code-intelligence-telemetry.js +12 -3
- package/dist/tools/code-intelligence.d.ts +81 -31
- package/dist/tools/code-intelligence.js +156 -52
- package/dist/tools/compose-permissions.d.ts +57 -2
- package/dist/tools/compose-permissions.js +497 -44
- package/dist/tools/execute-command.d.ts +11 -0
- package/dist/tools/execute-command.js +92 -18
- package/dist/tools/execute-prompt.d.ts +59 -15
- package/dist/tools/execute-prompt.js +550 -135
- package/dist/tools/fleet-snapshot.d.ts +21 -0
- package/dist/tools/fleet-snapshot.js +78 -0
- package/dist/tools/kb-bible-commit.d.ts +79 -0
- package/dist/tools/kb-bible-commit.js +348 -0
- package/dist/tools/kb-capture.d.ts +15 -11
- package/dist/tools/kb-capture.js +42 -11
- package/dist/tools/kb-context.d.ts +27 -7
- package/dist/tools/kb-context.js +85 -14
- package/dist/tools/kb-demote.d.ts +27 -0
- package/dist/tools/kb-demote.js +37 -0
- package/dist/tools/kb-export.d.ts +128 -7
- package/dist/tools/kb-export.js +273 -67
- package/dist/tools/kb-feedback.d.ts +15 -9
- package/dist/tools/kb-feedback.js +27 -11
- package/dist/tools/kb-freshness-sweep.d.ts +11 -7
- package/dist/tools/kb-freshness-sweep.js +7 -7
- package/dist/tools/kb-harvest.d.ts +11 -7
- package/dist/tools/kb-harvest.js +35 -16
- package/dist/tools/kb-import.d.ts +42 -10
- package/dist/tools/kb-import.js +185 -160
- package/dist/tools/kb-invalidate.d.ts +26 -11
- package/dist/tools/kb-invalidate.js +118 -12
- package/dist/tools/kb-list.d.ts +14 -10
- package/dist/tools/kb-list.js +61 -13
- package/dist/tools/kb-promote.d.ts +11 -7
- package/dist/tools/kb-promote.js +16 -8
- package/dist/tools/kb-query.d.ts +24 -11
- package/dist/tools/kb-query.js +230 -23
- package/dist/tools/kb-reconcile-prefilter.d.ts +11 -7
- package/dist/tools/kb-reconcile-prefilter.js +10 -8
- package/dist/tools/kb-resolve-contradiction.d.ts +11 -7
- package/dist/tools/kb-resolve-contradiction.js +7 -7
- package/dist/tools/kb-session-prime.d.ts +14 -7
- package/dist/tools/kb-session-prime.js +127 -47
- package/dist/tools/kb-setup.d.ts +31 -4
- package/dist/tools/kb-setup.js +172 -20
- package/dist/tools/kb-stats.d.ts +11 -10
- package/dist/tools/kb-stats.js +22 -41
- package/dist/tools/list-members.js +6 -3
- package/dist/tools/member-detail.d.ts +3 -0
- package/dist/tools/member-detail.js +95 -20
- package/dist/tools/member-reservation.d.ts +2 -2
- package/dist/tools/provision-auth.d.ts +39 -1
- package/dist/tools/provision-auth.js +269 -47
- package/dist/tools/provision-vcs-auth.d.ts +30 -5
- package/dist/tools/provision-vcs-auth.js +53 -7
- package/dist/tools/receive-files.js +8 -3
- package/dist/tools/register-member.d.ts +34 -8
- package/dist/tools/register-member.js +76 -58
- package/dist/tools/remove-member.js +110 -32
- package/dist/tools/send-email.d.ts +2 -2
- package/dist/tools/send-files.js +9 -6
- package/dist/tools/send-message.d.ts +3 -0
- package/dist/tools/send-message.js +15 -2
- package/dist/tools/session-stats.d.ts +17 -0
- package/dist/tools/session-stats.js +27 -0
- package/dist/tools/shutdown-server.js +5 -0
- package/dist/tools/stop-prompt.js +3 -1
- package/dist/tools/update-agent-cli.d.ts +19 -0
- package/dist/tools/update-agent-cli.js +59 -2
- package/dist/tools/update-member.d.ts +13 -10
- package/dist/tools/update-member.js +138 -7
- package/dist/tools/vcs-credential-exec.d.ts +45 -3
- package/dist/tools/vcs-credential-exec.js +98 -13
- package/dist/types.d.ts +98 -1
- package/dist/utils/agent-helpers.js +2 -0
- package/dist/utils/auth-env.d.ts +15 -4
- package/dist/utils/auth-env.js +52 -23
- package/dist/utils/find-on-path.d.ts +37 -0
- package/dist/utils/find-on-path.js +85 -0
- package/dist/utils/log-helpers.d.ts +37 -0
- package/dist/utils/log-helpers.js +106 -20
- package/dist/utils/owner-only-fs.d.ts +56 -0
- package/dist/utils/owner-only-fs.js +98 -0
- package/dist/utils/process-utils.d.ts +28 -0
- package/dist/utils/process-utils.js +72 -0
- package/dist/utils/prompt-errors.js +4 -1
- package/dist/utils/redact-known-secrets.d.ts +17 -0
- package/dist/utils/redact-known-secrets.js +70 -0
- package/dist/utils/session-caller.d.ts +4 -2
- package/dist/utils/session-caller.js +3 -2
- package/dist/utils/shell-escape.d.ts +42 -3
- package/dist/utils/shell-escape.js +70 -4
- package/dist/utils/skill-matrix.js +1 -1
- package/dist/utils/ssh-error-messages.js +3 -0
- package/dist/utils/vcs-provider-detect.js +2 -2
- package/dist/utils/workspace-trust.d.ts +24 -1
- package/dist/utils/workspace-trust.js +21 -17
- package/dist/workflows/auto-sprint.js +468 -52
- package/package.json +15 -9
- package/packages/apra-fleet-client/package.json +2 -2
- package/packages/apra-fleet-client/src/client/api.mjs +722 -38
- package/packages/apra-fleet-client/src/client/auto-start.mjs +434 -0
- package/packages/apra-fleet-client/src/client/client.mjs +9 -0
- package/packages/apra-fleet-client/src/client/factory.mjs +23 -4
- package/packages/apra-fleet-client/src/client/reconnecting-transport.mjs +170 -0
- package/packages/apra-fleet-client/src/client/server-resolution.mjs +267 -30
- package/packages/apra-fleet-client/src/client/transport.mjs +43 -3
- package/packages/apra-fleet-se/apra-pm/agents/backlog-groomer.md +80 -27
- package/packages/apra-fleet-se/apra-pm/agents/ci-watcher.md +42 -22
- package/packages/apra-fleet-se/apra-pm/agents/deployer.md +59 -24
- package/packages/apra-fleet-se/apra-pm/agents/doer.md +111 -41
- package/packages/apra-fleet-se/apra-pm/agents/harvester.md +60 -48
- package/packages/apra-fleet-se/apra-pm/agents/integ-test-runner.md +45 -23
- package/packages/apra-fleet-se/apra-pm/agents/kb-reconciler.md +34 -7
- package/packages/apra-fleet-se/apra-pm/agents/plan-reviewer.md +54 -24
- package/packages/apra-fleet-se/apra-pm/agents/planner.md +71 -43
- package/packages/apra-fleet-se/apra-pm/agents/regression-test-runner.md +106 -78
- package/packages/apra-fleet-se/apra-pm/agents/reviewer.md +170 -57
- package/packages/apra-fleet-se/apra-pm/agents/schemas/backlog-groomer-output.json +1 -1
- package/packages/apra-fleet-se/apra-pm/agents/schemas/deployer-output.json +5 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/doer-output.json +110 -2
- package/packages/apra-fleet-se/apra-pm/agents/schemas/harvester-input.json +1 -5
- package/packages/apra-fleet-se/apra-pm/agents/schemas/planner-output.json +1 -1
- package/packages/apra-fleet-se/apra-pm/agents/schemas/regression-test-runner-output.json +41 -7
- package/packages/apra-fleet-se/apra-pm/agents/schemas/reviewer-output.json +166 -5
- package/packages/apra-fleet-se/apra-pm/skills/pm/SKILL.md +3 -3
- package/packages/apra-fleet-se/apra-pm/skills/pm/cost.md +5 -1
- package/packages/apra-fleet-se/apra-pm/skills/pm/index.md +11 -9
- package/packages/apra-fleet-se/apra-pm/skills/pm/kb-reconcile.md +29 -14
- package/packages/apra-fleet-se/apra-pm/skills/pm/kb-review.md +1 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/sprint.md +7 -6
- package/packages/apra-fleet-se/bin/cli.mjs +282 -79
- package/packages/apra-fleet-se/bin/serve.mjs +186 -15
- package/packages/apra-fleet-se/fleet-sprint/abort.mjs +234 -46
- package/packages/apra-fleet-se/fleet-sprint/backlog-role.mjs +93 -0
- package/packages/apra-fleet-se/fleet-sprint/bd-sync-command.mjs +69 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-children.mjs +229 -53
- package/packages/apra-fleet-se/fleet-sprint/beads-identity-check.mjs +576 -33
- package/packages/apra-fleet-se/fleet-sprint/beads-identity.mjs +9 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-lock-probe.mjs +176 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-memory-hygiene.mjs +201 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-reachability.mjs +126 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-scope.mjs +271 -7
- package/packages/apra-fleet-se/fleet-sprint/beads-transitions.mjs +154 -8
- package/packages/apra-fleet-se/fleet-sprint/ci-gate.mjs +353 -0
- package/packages/apra-fleet-se/fleet-sprint/conflict-ladder.mjs +12 -0
- package/packages/apra-fleet-se/fleet-sprint/contracts.mjs +142 -3
- package/packages/apra-fleet-se/fleet-sprint/coordination.mjs +48 -8
- package/packages/apra-fleet-se/fleet-sprint/decision-notify.mjs +338 -0
- package/packages/apra-fleet-se/fleet-sprint/decision-wait.mjs +731 -0
- package/packages/apra-fleet-se/fleet-sprint/decisions.mjs +372 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-accounting.mjs +270 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-failure.mjs +22 -2
- package/packages/apra-fleet-se/fleet-sprint/dispatch-role.mjs +244 -22
- package/packages/apra-fleet-se/fleet-sprint/docs/README.md +56 -15
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-sync-redesign.md +6 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/fleet-sprint-diagram.md +3 -3
- package/packages/apra-fleet-se/fleet-sprint/dolt-settle.mjs +9 -3
- package/packages/apra-fleet-se/fleet-sprint/dolt-sync.mjs +651 -37
- package/packages/apra-fleet-se/fleet-sprint/errors.mjs +282 -15
- package/packages/apra-fleet-se/fleet-sprint/explicit-id-create-guard.mjs +4 -4
- package/packages/apra-fleet-se/fleet-sprint/git-sync.mjs +207 -10
- package/packages/apra-fleet-se/fleet-sprint/git-topology.mjs +169 -10
- package/packages/apra-fleet-se/fleet-sprint/guarded-modules.mjs +88 -5
- package/packages/apra-fleet-se/fleet-sprint/kb-hints.mjs +181 -0
- package/packages/apra-fleet-se/fleet-sprint/kb-injection.mjs +64 -0
- package/packages/apra-fleet-se/fleet-sprint/kb-maintainer.mjs +298 -0
- package/packages/apra-fleet-se/fleet-sprint/kb.mjs +1896 -305
- package/packages/apra-fleet-se/fleet-sprint/lower-quality.mjs +39 -0
- package/packages/apra-fleet-se/fleet-sprint/member-align.mjs +391 -0
- package/packages/apra-fleet-se/fleet-sprint/member-call.mjs +374 -0
- package/packages/apra-fleet-se/fleet-sprint/member-init-probe.mjs +644 -0
- package/packages/apra-fleet-se/fleet-sprint/member-provisioning.mjs +454 -1
- package/packages/apra-fleet-se/fleet-sprint/member-sync.mjs +250 -29
- package/packages/apra-fleet-se/fleet-sprint/orphan-reclaim.mjs +153 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/deploy.mjs +129 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/develop.mjs +302 -52
- package/packages/apra-fleet-se/fleet-sprint/phases/ensure-sprint-branch.mjs +1 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/final-review.mjs +142 -21
- package/packages/apra-fleet-se/fleet-sprint/phases/harvest.mjs +118 -36
- package/packages/apra-fleet-se/fleet-sprint/phases/integ-test.mjs +6 -6
- package/packages/apra-fleet-se/fleet-sprint/phases/plan.mjs +27 -18
- package/packages/apra-fleet-se/fleet-sprint/phases/publish-pr.mjs +99 -52
- package/packages/apra-fleet-se/fleet-sprint/phases/re-review.mjs +58 -10
- package/packages/apra-fleet-se/fleet-sprint/phases/regression-test.mjs +16 -11
- package/packages/apra-fleet-se/fleet-sprint/phases/replan.mjs +36 -3
- package/packages/apra-fleet-se/fleet-sprint/phases/review.mjs +90 -15
- package/packages/apra-fleet-se/fleet-sprint/pr-body.mjs +272 -0
- package/packages/apra-fleet-se/fleet-sprint/prompts.mjs +113 -28
- package/packages/apra-fleet-se/fleet-sprint/role-policies.mjs +19 -1
- package/packages/apra-fleet-se/fleet-sprint/runner.js +1631 -213
- package/packages/apra-fleet-se/fleet-sprint/se-os-commands.mjs +26 -0
- package/packages/apra-fleet-se/fleet-sprint/se-posix.mjs +183 -0
- package/packages/apra-fleet-se/fleet-sprint/se-windows.mjs +138 -0
- package/packages/apra-fleet-se/fleet-sprint/set-aside.mjs +288 -0
- package/packages/apra-fleet-se/fleet-sprint/shell-command-guard.mjs +44 -1
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-sprint-cli/SKILL.md +39 -15
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-supervisor/SKILL.md +87 -32
- package/packages/apra-fleet-se/fleet-sprint/sprint-args.mjs +158 -2
- package/packages/apra-fleet-se/fleet-sprint/sprint-report.mjs +132 -11
- package/packages/apra-fleet-se/fleet-sprint/sprint-state.mjs +31 -0
- package/packages/apra-fleet-se/fleet-sprint/usage-limit-controller.mjs +7 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-auth.mjs +774 -35
- package/packages/apra-fleet-se/fleet-sprint/vcs-module.mjs +134 -7
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/azure-devops.mjs +99 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/bitbucket.mjs +811 -17
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/github.mjs +223 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/index.mjs +138 -1
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/shell-helpers.mjs +8 -4
- package/packages/apra-fleet-se/fleet-sprint/verify-block.mjs +152 -0
- package/packages/apra-fleet-se/fleet-sprint/viewer-extensions.mjs +460 -23
- package/packages/apra-fleet-se/fleet-sprint/worklists.mjs +59 -3
- package/packages/apra-fleet-se/package.json +2 -2
- package/packages/apra-fleet-se/src/supervisor/api.mjs +1059 -0
- package/packages/apra-fleet-se/src/supervisor/backlog-member.mjs +332 -0
- package/packages/apra-fleet-se/src/supervisor/backlog.mjs +982 -0
- package/packages/apra-fleet-se/src/supervisor/beads-identity.mjs +246 -0
- package/packages/apra-fleet-se/src/supervisor/beads-view.mjs +438 -0
- package/packages/apra-fleet-se/src/supervisor/child-port.mjs +36 -0
- package/packages/apra-fleet-se/src/supervisor/dashboard.mjs +1662 -0
- package/packages/apra-fleet-se/src/supervisor/dolt-mutex.mjs +370 -0
- package/packages/apra-fleet-se/src/supervisor/dolt-orphan-sweep.mjs +338 -0
- package/packages/apra-fleet-se/src/supervisor/fleet-members.mjs +292 -0
- package/packages/apra-fleet-se/src/supervisor/history-view.mjs +276 -0
- package/packages/apra-fleet-se/src/supervisor/history.mjs +335 -0
- package/packages/apra-fleet-se/src/supervisor/id-allocator.mjs +611 -0
- package/packages/apra-fleet-se/src/supervisor/launch-form.mjs +444 -0
- package/packages/apra-fleet-se/src/supervisor/ledger.mjs +629 -0
- package/packages/apra-fleet-se/src/supervisor/lib/exec-bd.mjs +303 -0
- package/packages/apra-fleet-se/src/supervisor/log-timestamp.mjs +51 -0
- package/packages/apra-fleet-se/src/supervisor/log-view.mjs +159 -0
- package/packages/apra-fleet-se/src/supervisor/proxy.mjs +499 -0
- package/packages/apra-fleet-se/src/supervisor/readopt.mjs +136 -0
- package/packages/apra-fleet-se/src/supervisor/reconcile.mjs +263 -0
- package/packages/apra-fleet-se/src/supervisor/rename-with-retry.mjs +87 -0
- package/packages/apra-fleet-se/src/supervisor/scope-overlap.mjs +327 -0
- package/packages/apra-fleet-se/src/supervisor/self-log.mjs +133 -0
- package/packages/apra-fleet-se/src/supervisor/server.mjs +542 -0
- package/packages/apra-fleet-se/src/supervisor/spawner.mjs +544 -0
- package/packages/apra-fleet-se/src/supervisor/sprint-identity.mjs +96 -0
- package/packages/apra-fleet-se/src/supervisor/watchdog.mjs +993 -0
- package/packages/apra-fleet-workflow/package.json +3 -2
- package/packages/apra-fleet-workflow/src/viewer/index.mjs +150 -14
- package/packages/apra-fleet-workflow/src/viewer/request-guard.mjs +222 -0
- package/packages/apra-fleet-workflow/src/viewer/run-summary.mjs +127 -0
- package/packages/apra-fleet-workflow/src/workflow/index.mjs +105 -7
- package/packages/apra-fleet-workflow/src/workflow/pricing.mjs +75 -25
- package/plugins/claude-code/fleet-status/.claude-plugin/plugin.json +7 -0
- package/plugins/claude-code/fleet-status/hooks/hooks.json +1 -0
- package/plugins/claude-code/fleet-status/hooks/register.tsx +906 -0
- package/plugins/claude-code/fleet-status/types/index.d.ts +88 -0
- package/skills/fleet/auth-bitbucket.md +47 -20
- package/skills/fleet/onboarding.md +1 -1
- package/skills/fleet/permissions.md +9 -0
- package/skills/fleet/profiles/tag-kb-reconciler.json +2 -6
- package/skills/fleet/skill-matrix.md +3 -3
- package/version.json +1 -1
- package/dist/cli/agent-transform.d.ts.map +0 -1
- package/dist/cli/agent-transform.js.map +0 -1
- package/dist/cli/auth.d.ts.map +0 -1
- package/dist/cli/auth.js.map +0 -1
- package/dist/cli/config.d.ts.map +0 -1
- package/dist/cli/config.js.map +0 -1
- package/dist/cli/dolt-install.d.ts.map +0 -1
- package/dist/cli/dolt-install.js.map +0 -1
- package/dist/cli/install-guard.d.ts.map +0 -1
- package/dist/cli/install-guard.js.map +0 -1
- package/dist/cli/install.d.ts.map +0 -1
- package/dist/cli/install.js.map +0 -1
- package/dist/cli/join.d.ts.map +0 -1
- package/dist/cli/join.js.map +0 -1
- package/dist/cli/kb-commit.d.ts.map +0 -1
- package/dist/cli/kb-commit.js.map +0 -1
- package/dist/cli/kb-directives.d.ts.map +0 -1
- package/dist/cli/kb-directives.js.map +0 -1
- package/dist/cli/kb-import.d.ts.map +0 -1
- package/dist/cli/kb-import.js.map +0 -1
- package/dist/cli/register-member.d.ts.map +0 -1
- package/dist/cli/register-member.js.map +0 -1
- package/dist/cli/restart.d.ts.map +0 -1
- package/dist/cli/restart.js.map +0 -1
- package/dist/cli/secret.d.ts.map +0 -1
- package/dist/cli/secret.js.map +0 -1
- package/dist/cli/spoke.d.ts.map +0 -1
- package/dist/cli/spoke.js.map +0 -1
- package/dist/cli/start.d.ts.map +0 -1
- package/dist/cli/start.js.map +0 -1
- package/dist/cli/status.d.ts.map +0 -1
- package/dist/cli/status.js.map +0 -1
- package/dist/cli/stop.d.ts.map +0 -1
- package/dist/cli/stop.js.map +0 -1
- package/dist/cli/uninstall.d.ts.map +0 -1
- package/dist/cli/uninstall.js.map +0 -1
- package/dist/cli/update.d.ts.map +0 -1
- package/dist/cli/update.js.map +0 -1
- package/dist/cli/watch.d.ts.map +0 -1
- package/dist/cli/watch.js.map +0 -1
- package/dist/cli/workflow-assets.d.ts.map +0 -1
- package/dist/cli/workflow-assets.js.map +0 -1
- package/dist/cli/workflow.d.ts.map +0 -1
- package/dist/cli/workflow.js.map +0 -1
- package/dist/commands/kb-server.d.ts.map +0 -1
- package/dist/commands/kb-server.js.map +0 -1
- package/dist/delivery-mode.d.ts.map +0 -1
- package/dist/delivery-mode.js.map +0 -1
- package/dist/hub-service/activity.d.ts.map +0 -1
- package/dist/hub-service/activity.js.map +0 -1
- package/dist/hub-service/audit-log.d.ts.map +0 -1
- package/dist/hub-service/audit-log.js.map +0 -1
- package/dist/hub-service/db/pool.d.ts.map +0 -1
- package/dist/hub-service/db/pool.js.map +0 -1
- package/dist/hub-service/enrollment.d.ts.map +0 -1
- package/dist/hub-service/enrollment.js.map +0 -1
- package/dist/hub-service/envelope-routes.d.ts.map +0 -1
- package/dist/hub-service/envelope-routes.js.map +0 -1
- package/dist/hub-service/handlers/installers.d.ts.map +0 -1
- package/dist/hub-service/handlers/installers.js.map +0 -1
- package/dist/hub-service/http-server.d.ts.map +0 -1
- package/dist/hub-service/http-server.js.map +0 -1
- package/dist/hub-service/hub-jwt.d.ts.map +0 -1
- package/dist/hub-service/hub-jwt.js.map +0 -1
- package/dist/hub-service/jwt-revocation.d.ts.map +0 -1
- package/dist/hub-service/jwt-revocation.js.map +0 -1
- package/dist/hub-service/machines.d.ts.map +0 -1
- package/dist/hub-service/machines.js.map +0 -1
- package/dist/hub-service/main.d.ts.map +0 -1
- package/dist/hub-service/main.js.map +0 -1
- package/dist/hub-service/member-tokens.d.ts.map +0 -1
- package/dist/hub-service/member-tokens.js.map +0 -1
- package/dist/hub-service/member-view.d.ts.map +0 -1
- package/dist/hub-service/member-view.js.map +0 -1
- package/dist/hub-service/members.d.ts.map +0 -1
- package/dist/hub-service/members.js.map +0 -1
- package/dist/hub-service/presence.d.ts.map +0 -1
- package/dist/hub-service/presence.js.map +0 -1
- package/dist/hub-service/project-view.d.ts.map +0 -1
- package/dist/hub-service/project-view.js.map +0 -1
- package/dist/hub-service/projects.d.ts.map +0 -1
- package/dist/hub-service/projects.js.map +0 -1
- package/dist/hub-service/relay-queue.d.ts.map +0 -1
- package/dist/hub-service/relay-queue.js.map +0 -1
- package/dist/hub-service/session-jwt.d.ts.map +0 -1
- package/dist/hub-service/session-jwt.js.map +0 -1
- package/dist/hub-service/usage.d.ts.map +0 -1
- package/dist/hub-service/usage.js.map +0 -1
- package/dist/hub-service/users.d.ts.map +0 -1
- package/dist/hub-service/users.js.map +0 -1
- package/dist/hub-service/workspaces.d.ts.map +0 -1
- package/dist/hub-service/workspaces.js.map +0 -1
- package/dist/index.d.ts.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/onboarding/text.d.ts.map +0 -1
- package/dist/onboarding/text.js.map +0 -1
- package/dist/os/git-bash-candidates.d.ts.map +0 -1
- package/dist/os/git-bash-candidates.js.map +0 -1
- package/dist/os/index.d.ts.map +0 -1
- package/dist/os/index.js.map +0 -1
- package/dist/os/linux.d.ts.map +0 -1
- package/dist/os/linux.js.map +0 -1
- package/dist/os/macos.d.ts.map +0 -1
- package/dist/os/macos.js.map +0 -1
- package/dist/os/os-commands.d.ts.map +0 -1
- package/dist/os/os-commands.js.map +0 -1
- package/dist/os/windows-gitbash.d.ts.map +0 -1
- package/dist/os/windows-gitbash.js.map +0 -1
- package/dist/os/windows-wrapper.d.ts.map +0 -1
- package/dist/os/windows-wrapper.js.map +0 -1
- package/dist/os/windows.d.ts.map +0 -1
- package/dist/os/windows.js.map +0 -1
- package/dist/paths.d.ts.map +0 -1
- package/dist/paths.js.map +0 -1
- package/dist/providers/agy.d.ts.map +0 -1
- package/dist/providers/agy.js.map +0 -1
- package/dist/providers/claude.d.ts.map +0 -1
- package/dist/providers/claude.js.map +0 -1
- package/dist/providers/codex.d.ts.map +0 -1
- package/dist/providers/codex.js.map +0 -1
- package/dist/providers/copilot.d.ts.map +0 -1
- package/dist/providers/copilot.js.map +0 -1
- package/dist/providers/email/headers.d.ts.map +0 -1
- package/dist/providers/email/headers.js.map +0 -1
- package/dist/providers/email/index.d.ts.map +0 -1
- package/dist/providers/email/index.js.map +0 -1
- package/dist/providers/email/provider.d.ts.map +0 -1
- package/dist/providers/email/provider.js.map +0 -1
- package/dist/providers/email/sendgrid.d.ts.map +0 -1
- package/dist/providers/email/sendgrid.js.map +0 -1
- package/dist/providers/email/smtp.d.ts.map +0 -1
- package/dist/providers/email/smtp.js.map +0 -1
- package/dist/providers/index.d.ts.map +0 -1
- package/dist/providers/index.js.map +0 -1
- package/dist/providers/none.d.ts.map +0 -1
- package/dist/providers/none.js.map +0 -1
- package/dist/providers/opencode.d.ts.map +0 -1
- package/dist/providers/opencode.js.map +0 -1
- package/dist/providers/provider.d.ts.map +0 -1
- package/dist/providers/provider.js.map +0 -1
- package/dist/services/agent-provisioner.d.ts.map +0 -1
- package/dist/services/agent-provisioner.js.map +0 -1
- package/dist/services/agy-project.d.ts.map +0 -1
- package/dist/services/agy-project.js.map +0 -1
- package/dist/services/auth-socket.d.ts.map +0 -1
- package/dist/services/auth-socket.js.map +0 -1
- package/dist/services/auth-web.d.ts.map +0 -1
- package/dist/services/auth-web.js.map +0 -1
- package/dist/services/budget-awareness.d.ts.map +0 -1
- package/dist/services/budget-awareness.js.map +0 -1
- package/dist/services/cloud/activity.d.ts.map +0 -1
- package/dist/services/cloud/activity.js.map +0 -1
- package/dist/services/cloud/aws.d.ts.map +0 -1
- package/dist/services/cloud/aws.js.map +0 -1
- package/dist/services/cloud/cost.d.ts.map +0 -1
- package/dist/services/cloud/cost.js.map +0 -1
- package/dist/services/cloud/idle-manager.d.ts.map +0 -1
- package/dist/services/cloud/idle-manager.js.map +0 -1
- package/dist/services/cloud/lifecycle.d.ts.map +0 -1
- package/dist/services/cloud/lifecycle.js.map +0 -1
- package/dist/services/cloud/task-wrapper.d.ts.map +0 -1
- package/dist/services/cloud/task-wrapper.js.map +0 -1
- package/dist/services/cloud/types.d.ts.map +0 -1
- package/dist/services/cloud/types.js.map +0 -1
- package/dist/services/cloud-sync.d.ts.map +0 -1
- package/dist/services/cloud-sync.js.map +0 -1
- package/dist/services/context-admission.d.ts.map +0 -1
- package/dist/services/context-admission.js.map +0 -1
- package/dist/services/credential-cleanup.d.ts.map +0 -1
- package/dist/services/credential-cleanup.js.map +0 -1
- package/dist/services/credential-store.d.ts.map +0 -1
- package/dist/services/credential-store.js.map +0 -1
- package/dist/services/event-bus.d.ts.map +0 -1
- package/dist/services/event-bus.js.map +0 -1
- package/dist/services/exit-drain.d.ts.map +0 -1
- package/dist/services/exit-drain.js.map +0 -1
- package/dist/services/file-chunker.d.ts.map +0 -1
- package/dist/services/file-chunker.js.map +0 -1
- package/dist/services/file-transfer-relay.d.ts.map +0 -1
- package/dist/services/file-transfer-relay.js.map +0 -1
- package/dist/services/file-transfer.d.ts.map +0 -1
- package/dist/services/file-transfer.js.map +0 -1
- package/dist/services/git-config.d.ts.map +0 -1
- package/dist/services/git-config.js.map +0 -1
- package/dist/services/github-app.d.ts.map +0 -1
- package/dist/services/github-app.js.map +0 -1
- package/dist/services/http-transport.d.ts.map +0 -1
- package/dist/services/http-transport.js.map +0 -1
- package/dist/services/hub-client.d.ts.map +0 -1
- package/dist/services/hub-client.js.map +0 -1
- package/dist/services/icons.d.ts.map +0 -1
- package/dist/services/icons.js.map +0 -1
- package/dist/services/jwt.d.ts.map +0 -1
- package/dist/services/jwt.js.map +0 -1
- package/dist/services/knowledge/audn.d.ts.map +0 -1
- package/dist/services/knowledge/audn.js.map +0 -1
- package/dist/services/knowledge/file-hash.d.ts.map +0 -1
- package/dist/services/knowledge/file-hash.js.map +0 -1
- package/dist/services/knowledge/http-provider.d.ts.map +0 -1
- package/dist/services/knowledge/http-provider.js.map +0 -1
- package/dist/services/knowledge/kb-config.d.ts.map +0 -1
- package/dist/services/knowledge/kb-config.js.map +0 -1
- package/dist/services/knowledge/kb-providers.d.ts.map +0 -1
- package/dist/services/knowledge/kb-providers.js.map +0 -1
- package/dist/services/knowledge/kb-scope-input.d.ts +0 -5
- package/dist/services/knowledge/kb-scope-input.d.ts.map +0 -1
- package/dist/services/knowledge/kb-scope-input.js +0 -11
- package/dist/services/knowledge/kb-scope-input.js.map +0 -1
- package/dist/services/knowledge/kb-service.d.ts.map +0 -1
- package/dist/services/knowledge/kb-service.js.map +0 -1
- package/dist/services/knowledge/path-validation.d.ts.map +0 -1
- package/dist/services/knowledge/path-validation.js.map +0 -1
- package/dist/services/knowledge/pre-init.d.ts.map +0 -1
- package/dist/services/knowledge/pre-init.js.map +0 -1
- package/dist/services/knowledge/project-slug.d.ts.map +0 -1
- package/dist/services/knowledge/project-slug.js.map +0 -1
- package/dist/services/knowledge/require-sqlite-project.d.ts.map +0 -1
- package/dist/services/knowledge/require-sqlite-project.js.map +0 -1
- package/dist/services/knowledge/sqlite-provider.d.ts.map +0 -1
- package/dist/services/knowledge/sqlite-provider.js.map +0 -1
- package/dist/services/knowledge/types.d.ts.map +0 -1
- package/dist/services/knowledge/types.js.map +0 -1
- package/dist/services/known-hosts.d.ts.map +0 -1
- package/dist/services/known-hosts.js.map +0 -1
- package/dist/services/known-sessions.d.ts.map +0 -1
- package/dist/services/known-sessions.js.map +0 -1
- package/dist/services/member-home.d.ts.map +0 -1
- package/dist/services/member-home.js.map +0 -1
- package/dist/services/member-remote-url.d.ts.map +0 -1
- package/dist/services/member-remote-url.js.map +0 -1
- package/dist/services/model-pricing.d.ts.map +0 -1
- package/dist/services/model-pricing.js.map +0 -1
- package/dist/services/onboarding.d.ts.map +0 -1
- package/dist/services/onboarding.js.map +0 -1
- package/dist/services/orphan-recovery.d.ts.map +0 -1
- package/dist/services/orphan-recovery.js.map +0 -1
- package/dist/services/pending-responses.d.ts.map +0 -1
- package/dist/services/pending-responses.js.map +0 -1
- package/dist/services/preflight-check.d.ts.map +0 -1
- package/dist/services/preflight-check.js.map +0 -1
- package/dist/services/registry.d.ts.map +0 -1
- package/dist/services/registry.js.map +0 -1
- package/dist/services/relay-context.d.ts.map +0 -1
- package/dist/services/relay-context.js.map +0 -1
- package/dist/services/relay-executor.d.ts.map +0 -1
- package/dist/services/relay-executor.js.map +0 -1
- package/dist/services/relay-request.d.ts.map +0 -1
- package/dist/services/relay-request.js.map +0 -1
- package/dist/services/relay-strategy.d.ts.map +0 -1
- package/dist/services/relay-strategy.js.map +0 -1
- package/dist/services/secret-token.d.ts.map +0 -1
- package/dist/services/secret-token.js.map +0 -1
- package/dist/services/service-manager/index.d.ts.map +0 -1
- package/dist/services/service-manager/index.js.map +0 -1
- package/dist/services/service-manager/linux.d.ts.map +0 -1
- package/dist/services/service-manager/linux.js.map +0 -1
- package/dist/services/service-manager/macos.d.ts.map +0 -1
- package/dist/services/service-manager/macos.js.map +0 -1
- package/dist/services/service-manager/types.d.ts.map +0 -1
- package/dist/services/service-manager/types.js.map +0 -1
- package/dist/services/service-manager/windows.d.ts.map +0 -1
- package/dist/services/service-manager/windows.js.map +0 -1
- package/dist/services/session-registry.d.ts.map +0 -1
- package/dist/services/session-registry.js.map +0 -1
- package/dist/services/sftp.d.ts.map +0 -1
- package/dist/services/sftp.js.map +0 -1
- package/dist/services/shell-probe.d.ts.map +0 -1
- package/dist/services/shell-probe.js.map +0 -1
- package/dist/services/singleton.d.ts.map +0 -1
- package/dist/services/singleton.js.map +0 -1
- package/dist/services/sprint-coordination.d.ts.map +0 -1
- package/dist/services/sprint-coordination.js.map +0 -1
- package/dist/services/ssh.d.ts.map +0 -1
- package/dist/services/ssh.js.map +0 -1
- package/dist/services/stall/find-log-file.d.ts.map +0 -1
- package/dist/services/stall/find-log-file.js.map +0 -1
- package/dist/services/stall/index.d.ts.map +0 -1
- package/dist/services/stall/index.js.map +0 -1
- package/dist/services/stall/log-path-resolver.d.ts.map +0 -1
- package/dist/services/stall/log-path-resolver.js.map +0 -1
- package/dist/services/stall/read-log-tail.d.ts.map +0 -1
- package/dist/services/stall/read-log-tail.js.map +0 -1
- package/dist/services/stall/stall-detector.d.ts.map +0 -1
- package/dist/services/stall/stall-detector.js.map +0 -1
- package/dist/services/stall/stall-poller.d.ts.map +0 -1
- package/dist/services/stall/stall-poller.js.map +0 -1
- package/dist/services/stall/time-utils.d.ts.map +0 -1
- package/dist/services/stall/time-utils.js.map +0 -1
- package/dist/services/statusline.d.ts.map +0 -1
- package/dist/services/statusline.js.map +0 -1
- package/dist/services/strategy.d.ts.map +0 -1
- package/dist/services/strategy.js.map +0 -1
- package/dist/services/substitution-engine.d.ts.map +0 -1
- package/dist/services/substitution-engine.js.map +0 -1
- package/dist/services/task-cleanup.d.ts.map +0 -1
- package/dist/services/task-cleanup.js.map +0 -1
- package/dist/services/token-issuer.d.ts.map +0 -1
- package/dist/services/token-issuer.js.map +0 -1
- package/dist/services/tool-registry.d.ts.map +0 -1
- package/dist/services/tool-registry.js.map +0 -1
- package/dist/services/update-check.d.ts.map +0 -1
- package/dist/services/update-check.js.map +0 -1
- package/dist/services/user-config.d.ts.map +0 -1
- package/dist/services/user-config.js.map +0 -1
- package/dist/services/vcs/azure-devops.d.ts.map +0 -1
- package/dist/services/vcs/azure-devops.js.map +0 -1
- package/dist/services/vcs/bitbucket.d.ts.map +0 -1
- package/dist/services/vcs/bitbucket.js.map +0 -1
- package/dist/services/vcs/constants.d.ts.map +0 -1
- package/dist/services/vcs/constants.js.map +0 -1
- package/dist/services/vcs/github.d.ts.map +0 -1
- package/dist/services/vcs/github.js.map +0 -1
- package/dist/services/vcs/types.d.ts.map +0 -1
- package/dist/services/vcs/types.js.map +0 -1
- package/dist/services/version-check.d.ts.map +0 -1
- package/dist/services/version-check.js.map +0 -1
- package/dist/services/watch/fleet-log.d.ts.map +0 -1
- package/dist/services/watch/fleet-log.js.map +0 -1
- package/dist/services/watch/project-resolver.d.ts.map +0 -1
- package/dist/services/watch/project-resolver.js.map +0 -1
- package/dist/services/watch/transcript-formatter.d.ts.map +0 -1
- package/dist/services/watch/transcript-formatter.js.map +0 -1
- package/dist/smoke-test.d.ts.map +0 -1
- package/dist/smoke-test.js.map +0 -1
- package/dist/tools/check-status.d.ts.map +0 -1
- package/dist/tools/check-status.js.map +0 -1
- package/dist/tools/child-id-allocator.d.ts.map +0 -1
- package/dist/tools/child-id-allocator.js.map +0 -1
- package/dist/tools/cloud-control.d.ts.map +0 -1
- package/dist/tools/cloud-control.js.map +0 -1
- package/dist/tools/code-intelligence-codebase-memory.d.ts.map +0 -1
- package/dist/tools/code-intelligence-codebase-memory.js.map +0 -1
- package/dist/tools/code-intelligence-freshness.d.ts.map +0 -1
- package/dist/tools/code-intelligence-freshness.js.map +0 -1
- package/dist/tools/code-intelligence-gitnexus.d.ts.map +0 -1
- package/dist/tools/code-intelligence-gitnexus.js.map +0 -1
- package/dist/tools/code-intelligence-kb-enrich.d.ts.map +0 -1
- package/dist/tools/code-intelligence-kb-enrich.js.map +0 -1
- package/dist/tools/code-intelligence-reindex.d.ts.map +0 -1
- package/dist/tools/code-intelligence-reindex.js.map +0 -1
- package/dist/tools/code-intelligence-telemetry.d.ts.map +0 -1
- package/dist/tools/code-intelligence-telemetry.js.map +0 -1
- package/dist/tools/code-intelligence-tests.d.ts.map +0 -1
- package/dist/tools/code-intelligence-tests.js.map +0 -1
- package/dist/tools/code-intelligence.d.ts.map +0 -1
- package/dist/tools/code-intelligence.js.map +0 -1
- package/dist/tools/compose-permissions.d.ts.map +0 -1
- package/dist/tools/compose-permissions.js.map +0 -1
- package/dist/tools/credential-store-delete.d.ts.map +0 -1
- package/dist/tools/credential-store-delete.js.map +0 -1
- package/dist/tools/credential-store-list.d.ts.map +0 -1
- package/dist/tools/credential-store-list.js.map +0 -1
- package/dist/tools/credential-store-set.d.ts.map +0 -1
- package/dist/tools/credential-store-set.js.map +0 -1
- package/dist/tools/credential-store-update.d.ts.map +0 -1
- package/dist/tools/credential-store-update.js.map +0 -1
- package/dist/tools/dolt-push-mutex.d.ts.map +0 -1
- package/dist/tools/dolt-push-mutex.js.map +0 -1
- package/dist/tools/execute-command.d.ts.map +0 -1
- package/dist/tools/execute-command.js.map +0 -1
- package/dist/tools/execute-prompt.d.ts.map +0 -1
- package/dist/tools/execute-prompt.js.map +0 -1
- package/dist/tools/get-member-model-pricing.d.ts.map +0 -1
- package/dist/tools/get-member-model-pricing.js.map +0 -1
- package/dist/tools/kb-capture.d.ts.map +0 -1
- package/dist/tools/kb-capture.js.map +0 -1
- package/dist/tools/kb-context.d.ts.map +0 -1
- package/dist/tools/kb-context.js.map +0 -1
- package/dist/tools/kb-export.d.ts.map +0 -1
- package/dist/tools/kb-export.js.map +0 -1
- package/dist/tools/kb-feedback.d.ts.map +0 -1
- package/dist/tools/kb-feedback.js.map +0 -1
- package/dist/tools/kb-freshness-sweep.d.ts.map +0 -1
- package/dist/tools/kb-freshness-sweep.js.map +0 -1
- package/dist/tools/kb-harvest.d.ts.map +0 -1
- package/dist/tools/kb-harvest.js.map +0 -1
- package/dist/tools/kb-import.d.ts.map +0 -1
- package/dist/tools/kb-import.js.map +0 -1
- package/dist/tools/kb-invalidate.d.ts.map +0 -1
- package/dist/tools/kb-invalidate.js.map +0 -1
- package/dist/tools/kb-list.d.ts.map +0 -1
- package/dist/tools/kb-list.js.map +0 -1
- package/dist/tools/kb-promote.d.ts.map +0 -1
- package/dist/tools/kb-promote.js.map +0 -1
- package/dist/tools/kb-query.d.ts.map +0 -1
- package/dist/tools/kb-query.js.map +0 -1
- package/dist/tools/kb-reconcile-prefilter.d.ts.map +0 -1
- package/dist/tools/kb-reconcile-prefilter.js.map +0 -1
- package/dist/tools/kb-resolve-contradiction.d.ts.map +0 -1
- package/dist/tools/kb-resolve-contradiction.js.map +0 -1
- package/dist/tools/kb-session-prime.d.ts.map +0 -1
- package/dist/tools/kb-session-prime.js.map +0 -1
- package/dist/tools/kb-setup.d.ts.map +0 -1
- package/dist/tools/kb-setup.js.map +0 -1
- package/dist/tools/kb-stats.d.ts.map +0 -1
- package/dist/tools/kb-stats.js.map +0 -1
- package/dist/tools/list-members.d.ts.map +0 -1
- package/dist/tools/list-members.js.map +0 -1
- package/dist/tools/member-detail.d.ts.map +0 -1
- package/dist/tools/member-detail.js.map +0 -1
- package/dist/tools/member-reservation.d.ts.map +0 -1
- package/dist/tools/member-reservation.js.map +0 -1
- package/dist/tools/monitor-task.d.ts.map +0 -1
- package/dist/tools/monitor-task.js.map +0 -1
- package/dist/tools/provision-auth.d.ts.map +0 -1
- package/dist/tools/provision-auth.js.map +0 -1
- package/dist/tools/provision-vcs-auth.d.ts.map +0 -1
- package/dist/tools/provision-vcs-auth.js.map +0 -1
- package/dist/tools/receive-files.d.ts.map +0 -1
- package/dist/tools/receive-files.js.map +0 -1
- package/dist/tools/register-member.d.ts.map +0 -1
- package/dist/tools/register-member.js.map +0 -1
- package/dist/tools/remove-member.d.ts.map +0 -1
- package/dist/tools/remove-member.js.map +0 -1
- package/dist/tools/report-status.d.ts.map +0 -1
- package/dist/tools/report-status.js.map +0 -1
- package/dist/tools/respond-to-message.d.ts.map +0 -1
- package/dist/tools/respond-to-message.js.map +0 -1
- package/dist/tools/revoke-vcs-auth.d.ts.map +0 -1
- package/dist/tools/revoke-vcs-auth.js.map +0 -1
- package/dist/tools/send-email.d.ts.map +0 -1
- package/dist/tools/send-email.js.map +0 -1
- package/dist/tools/send-files.d.ts.map +0 -1
- package/dist/tools/send-files.js.map +0 -1
- package/dist/tools/send-message.d.ts.map +0 -1
- package/dist/tools/send-message.js.map +0 -1
- package/dist/tools/setup-git-app.d.ts.map +0 -1
- package/dist/tools/setup-git-app.js.map +0 -1
- package/dist/tools/setup-ssh-key.d.ts.map +0 -1
- package/dist/tools/setup-ssh-key.js.map +0 -1
- package/dist/tools/shutdown-server.d.ts.map +0 -1
- package/dist/tools/shutdown-server.js.map +0 -1
- package/dist/tools/stop-prompt.d.ts.map +0 -1
- package/dist/tools/stop-prompt.js.map +0 -1
- package/dist/tools/update-agent-cli.d.ts.map +0 -1
- package/dist/tools/update-agent-cli.js.map +0 -1
- package/dist/tools/update-member.d.ts.map +0 -1
- package/dist/tools/update-member.js.map +0 -1
- package/dist/tools/vcs-credential-exec.d.ts.map +0 -1
- package/dist/tools/vcs-credential-exec.js.map +0 -1
- package/dist/tools/version.d.ts.map +0 -1
- package/dist/tools/version.js.map +0 -1
- package/dist/types.d.ts.map +0 -1
- package/dist/types.js.map +0 -1
- package/dist/utils/agent-helpers.d.ts.map +0 -1
- package/dist/utils/agent-helpers.js.map +0 -1
- package/dist/utils/ansi.d.ts.map +0 -1
- package/dist/utils/ansi.js.map +0 -1
- package/dist/utils/auth-env.d.ts.map +0 -1
- package/dist/utils/auth-env.js.map +0 -1
- package/dist/utils/collect-secret.d.ts.map +0 -1
- package/dist/utils/collect-secret.js.map +0 -1
- package/dist/utils/credential-validation.d.ts.map +0 -1
- package/dist/utils/credential-validation.js.map +0 -1
- package/dist/utils/crypto.d.ts.map +0 -1
- package/dist/utils/crypto.js.map +0 -1
- package/dist/utils/deep-merge.d.ts.map +0 -1
- package/dist/utils/deep-merge.js.map +0 -1
- package/dist/utils/file-permissions.d.ts.map +0 -1
- package/dist/utils/file-permissions.js.map +0 -1
- package/dist/utils/gpu-parser.d.ts.map +0 -1
- package/dist/utils/gpu-parser.js.map +0 -1
- package/dist/utils/log-helpers.d.ts.map +0 -1
- package/dist/utils/log-helpers.js.map +0 -1
- package/dist/utils/oob-timeout.d.ts.map +0 -1
- package/dist/utils/oob-timeout.js.map +0 -1
- package/dist/utils/opencode-model-validation.d.ts.map +0 -1
- package/dist/utils/opencode-model-validation.js.map +0 -1
- package/dist/utils/pid-helpers.d.ts.map +0 -1
- package/dist/utils/pid-helpers.js.map +0 -1
- package/dist/utils/platform.d.ts.map +0 -1
- package/dist/utils/platform.js.map +0 -1
- package/dist/utils/process-utils.d.ts.map +0 -1
- package/dist/utils/process-utils.js.map +0 -1
- package/dist/utils/prompt-errors.d.ts.map +0 -1
- package/dist/utils/prompt-errors.js.map +0 -1
- package/dist/utils/resolve-member.d.ts.map +0 -1
- package/dist/utils/resolve-member.js.map +0 -1
- package/dist/utils/secure-input.d.ts.map +0 -1
- package/dist/utils/secure-input.js.map +0 -1
- package/dist/utils/session-caller.d.ts.map +0 -1
- package/dist/utils/session-caller.js.map +0 -1
- package/dist/utils/shell-escape.d.ts.map +0 -1
- package/dist/utils/shell-escape.js.map +0 -1
- package/dist/utils/skill-matrix.d.ts.map +0 -1
- package/dist/utils/skill-matrix.js.map +0 -1
- package/dist/utils/ssh-error-messages.d.ts.map +0 -1
- package/dist/utils/ssh-error-messages.js.map +0 -1
- package/dist/utils/vcs-provider-detect.d.ts.map +0 -1
- package/dist/utils/vcs-provider-detect.js.map +0 -1
- package/dist/utils/work-folder-validation.d.ts.map +0 -1
- package/dist/utils/work-folder-validation.js.map +0 -1
- package/dist/utils/workspace-trust.d.ts.map +0 -1
- package/dist/utils/workspace-trust.js.map +0 -1
- package/dist/version.d.ts.map +0 -1
- package/dist/version.js.map +0 -1
|
@@ -85,8 +85,10 @@
|
|
|
85
85
|
* ASCII only.
|
|
86
86
|
*/
|
|
87
87
|
|
|
88
|
-
import { DoltDivergedError, DoltSyncError } from './errors.mjs';
|
|
89
|
-
import {
|
|
88
|
+
import { DoltDivergedError, DoltSyncError, DoltWindowsSpawnLimitError, DoltLockHeldError, UnpublishedSchemaMigrationsError } from './errors.mjs';
|
|
89
|
+
import { bdSyncCommandFor, normalizeMemberTarget, POSIX_MEMBER_TARGET } from './bd-sync-command.mjs';
|
|
90
|
+
import { buildLockHolderProbe, parseLockHolderProbe, describeLockProcess } from './beads-lock-probe.mjs';
|
|
91
|
+
import { classifyFailure, toDoltVerdict, commandBinary } from './vcs-module.mjs';
|
|
90
92
|
import { buildSettleCallback } from './dolt-settle.mjs';
|
|
91
93
|
|
|
92
94
|
// ---------------------------------------------------------------------------
|
|
@@ -614,6 +616,40 @@ export function isSpawnOutageFailure(output) {
|
|
|
614
616
|
return DOLT_SPAWN_OUTAGE_PATTERNS.some((re) => re.test(text));
|
|
615
617
|
}
|
|
616
618
|
|
|
619
|
+
/** The Windows CreateProcess ERROR_NOT_ENOUGH_MEMORY wording. */
|
|
620
|
+
const WINDOWS_SPAWN_LIMIT_RE = /Not enough memory resources are available/i;
|
|
621
|
+
|
|
622
|
+
/** Lines Dolt/git append after a failed git spawn that point at credentials
|
|
623
|
+
* (`hint: dolt does not support interactive credential prompts`, Git
|
|
624
|
+
* Credential Manager notes). After a CreateProcess refusal git never ran, so
|
|
625
|
+
* no credential was ever consulted and these lines only mislead. */
|
|
626
|
+
const MISLEADING_CREDENTIAL_HINT_RE = /^\s*hint:|credential manager|\bgcm\b/i;
|
|
627
|
+
|
|
628
|
+
/** Prefix naming the real cause of a Windows spawn refusal. Deliberately free
|
|
629
|
+
* of any wording the 'dolt' provider's rule tables match (auth, remote,
|
|
630
|
+
* divergence), so re-classifying the surfaced text gives the same verdict as
|
|
631
|
+
* the raw text. */
|
|
632
|
+
export const WINDOWS_SPAWN_LIMIT_MESSAGE =
|
|
633
|
+
'Windows refused to start a child process (CreateProcess ERROR_NOT_ENOUGH_MEMORY): this is the Windows process-creation resource limit, '
|
|
634
|
+
+ 'NOT a credential or remote problem, and free RAM does not rule it out. The usual causes are an oversized environment block handed to the '
|
|
635
|
+
+ 'child (duplicated PATH, oversized inherited variables) or desktop-heap exhaustion in a non-interactive session; it is retried as a transient spawn outage.';
|
|
636
|
+
|
|
637
|
+
/**
|
|
638
|
+
* The text a failed `bd dolt` step surfaces (logs, DoltSyncError messages).
|
|
639
|
+
* Identity for every failure except the Windows process-creation limit, which
|
|
640
|
+
* gets WINDOWS_SPAWN_LIMIT_MESSAGE prepended and its misleading credential
|
|
641
|
+
* hint lines removed. Classification must still run on the RAW text.
|
|
642
|
+
*
|
|
643
|
+
* @param {string} output - raw stderr/stdout of the failed command
|
|
644
|
+
* @returns {string}
|
|
645
|
+
*/
|
|
646
|
+
export function surfaceDoltFailureText(output) {
|
|
647
|
+
const text = String(output == null ? '' : output);
|
|
648
|
+
if (!WINDOWS_SPAWN_LIMIT_RE.test(text)) return text;
|
|
649
|
+
const kept = text.split(/\r?\n/).filter((line) => !MISLEADING_CREDENTIAL_HINT_RE.test(line)).join('\n').trim();
|
|
650
|
+
return `${WINDOWS_SPAWN_LIMIT_MESSAGE} Original output (credential hints removed): ${kept}`;
|
|
651
|
+
}
|
|
652
|
+
|
|
617
653
|
// apra-fleet-jxdf.2: every `bd dolt pull`/`bd dolt push` this module issues
|
|
618
654
|
// used to inherit whatever generic default the injected command() primitive
|
|
619
655
|
// falls back to when no timeout is specified (120s, sized for an ordinary
|
|
@@ -649,6 +685,241 @@ export function doltBackoffDelayMs(attempt, baseMs = DOLT_BACKOFF_BASE_MS, maxMs
|
|
|
649
685
|
|
|
650
686
|
const defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
651
687
|
|
|
688
|
+
// ---------------------------------------------------------------------------
|
|
689
|
+
// Member OS/shell for the bd sync command string
|
|
690
|
+
// ---------------------------------------------------------------------------
|
|
691
|
+
//
|
|
692
|
+
// A Windows member runs every `bd dolt pull`/`bd dolt push` with a bounded
|
|
693
|
+
// GOMAXPROCS (see bd-sync-command.mjs for why and for the exact strings), so
|
|
694
|
+
// runDoltStep needs the member's { os, shell }. Two sources, in order:
|
|
695
|
+
// 1. `opts.memberTarget` on the call -- an { os, shell } object or a
|
|
696
|
+
// `(member) => { os, shell }` function (tests, and any caller that has
|
|
697
|
+
// already resolved the member);
|
|
698
|
+
// 2. the sprint-wide resolver installed once at sprint start with
|
|
699
|
+
// setMemberTargetResolver() -- the runner wires the cached
|
|
700
|
+
// member_detail-backed resolveMemberTarget there, so no extra
|
|
701
|
+
// member_detail round trip happens per sync once a member is resolved.
|
|
702
|
+
// With neither, or when resolution fails, the member is treated as POSIX and
|
|
703
|
+
// the command strings stay byte-identical to the pre-existing ones.
|
|
704
|
+
|
|
705
|
+
/** @type {((member: string) => Promise<{ os: string, shell: string }>|{ os: string, shell: string })|null} */
|
|
706
|
+
let memberTargetResolver = null;
|
|
707
|
+
|
|
708
|
+
/**
|
|
709
|
+
* Install (or clear, with null) the sprint-wide member { os, shell } resolver
|
|
710
|
+
* runDoltStep falls back to when a call passes no `memberTarget`.
|
|
711
|
+
*
|
|
712
|
+
* @param {Function|null} resolver
|
|
713
|
+
*/
|
|
714
|
+
export function setMemberTargetResolver(resolver) {
|
|
715
|
+
memberTargetResolver = typeof resolver === 'function' ? resolver : null;
|
|
716
|
+
}
|
|
717
|
+
|
|
718
|
+
/**
|
|
719
|
+
* Resolve `member`'s { os, shell } for command construction. Never throws: a
|
|
720
|
+
* failed lookup is logged and degrades to POSIX (the unchanged strings).
|
|
721
|
+
*
|
|
722
|
+
* @param {string} member
|
|
723
|
+
* @param {object|Function|undefined} memberTarget
|
|
724
|
+
* @param {Function} log
|
|
725
|
+
* @returns {Promise<{ os: string, shell: string }>}
|
|
726
|
+
*/
|
|
727
|
+
async function resolveDoltMemberTarget(member, memberTarget, log) {
|
|
728
|
+
const source = (memberTarget !== undefined && memberTarget !== null) ? memberTarget : memberTargetResolver;
|
|
729
|
+
if (!source) return POSIX_MEMBER_TARGET;
|
|
730
|
+
try {
|
|
731
|
+
const target = typeof source === 'function' ? await source(member) : source;
|
|
732
|
+
const normalized = normalizeMemberTarget(target);
|
|
733
|
+
return normalized.os ? normalized : POSIX_MEMBER_TARGET;
|
|
734
|
+
} catch (err) {
|
|
735
|
+
log(`[Dolt] could not resolve the OS/shell of member '${member}' (${(err && err.message) || err}); building its bd sync commands for a POSIX shell.`);
|
|
736
|
+
return POSIX_MEMBER_TARGET;
|
|
737
|
+
}
|
|
738
|
+
}
|
|
739
|
+
|
|
740
|
+
/** Remedy text of the typed Windows spawn-limit sync failure. */
|
|
741
|
+
export const WINDOWS_SPAWN_LIMIT_REMEDY =
|
|
742
|
+
'Remedy: on that Windows member, stop other process-heavy work (or wait for it to finish) and re-run the sync; '
|
|
743
|
+
+ 'if it recurs, shrink the environment block the member\'s processes inherit (deduplicate PATH, drop oversized variables) '
|
|
744
|
+
+ 'and run the fleet service in an interactive session so it does not exhaust the non-interactive desktop heap.';
|
|
745
|
+
|
|
746
|
+
/**
|
|
747
|
+
* The typed terminal error for a step that ended on the Windows
|
|
748
|
+
* process-creation limit (runDoltStep's `spawnLimit` flag).
|
|
749
|
+
*
|
|
750
|
+
* @param {string} member
|
|
751
|
+
* @param {string} operation - e.g. 'pull', 'push', 'push-reconcile'
|
|
752
|
+
* @param {{ error: string }} step
|
|
753
|
+
* @returns {DoltWindowsSpawnLimitError}
|
|
754
|
+
*/
|
|
755
|
+
function windowsSpawnLimitSyncError(member, operation, step) {
|
|
756
|
+
return new DoltWindowsSpawnLimitError(
|
|
757
|
+
`[Dolt] D-${operation} for member '${member}' failed: Windows refused to start bd's git child processes (the Windows process-creation limit, `
|
|
758
|
+
+ `CreateProcess ERROR_NOT_ENOUGH_MEMORY) on every attempt until the transient retry budget ran out. Not a credential, remote or data problem. `
|
|
759
|
+
+ `${WINDOWS_SPAWN_LIMIT_REMEDY} Raw: ${step.error}`,
|
|
760
|
+
{ member, doltOutput: step.error, details: { operation } },
|
|
761
|
+
);
|
|
762
|
+
}
|
|
763
|
+
|
|
764
|
+
/**
|
|
765
|
+
* The typed terminal error for a step whose beads lock was held by a foreign
|
|
766
|
+
* process (runDoltStep's 'lock-held' kind).
|
|
767
|
+
*
|
|
768
|
+
* @param {string} member
|
|
769
|
+
* @param {string} operation
|
|
770
|
+
* @param {{ error: string, lockHolders?: object[] }} step
|
|
771
|
+
* @returns {DoltLockHeldError}
|
|
772
|
+
*/
|
|
773
|
+
function lockHeldSyncError(member, operation, step) {
|
|
774
|
+
const holders = step.lockHolders || [];
|
|
775
|
+
return new DoltLockHeldError(
|
|
776
|
+
`[Dolt] D-${operation} for member '${member}' failed: a beads lock on that member is held by another process that started before this sync -- `
|
|
777
|
+
+ `${holders.map(describeLockProcess).join('; ') || 'holder unknown'}. The sync was waiting on that lock silently. `
|
|
778
|
+
+ 'Remedy: stop that process on the member (it is not part of this sync) or wait for it to exit, then re-run the sync.',
|
|
779
|
+
{ member, doltOutput: step.error, details: { operation, holders } },
|
|
780
|
+
);
|
|
781
|
+
}
|
|
782
|
+
|
|
783
|
+
/**
|
|
784
|
+
* The typed terminal error a failed step maps to, or null for a generic
|
|
785
|
+
* failure (the caller then throws its own DoltSyncError).
|
|
786
|
+
*
|
|
787
|
+
* @param {string} member
|
|
788
|
+
* @param {string} operation
|
|
789
|
+
* @param {{ kind?: string, spawnLimit?: boolean, error: string }} step
|
|
790
|
+
* @returns {DoltSyncError|null}
|
|
791
|
+
*/
|
|
792
|
+
function typedStepError(member, operation, step) {
|
|
793
|
+
if (step.kind === 'lock-held') return lockHeldSyncError(member, operation, step);
|
|
794
|
+
if (step.spawnLimit) return windowsSpawnLimitSyncError(member, operation, step);
|
|
795
|
+
return null;
|
|
796
|
+
}
|
|
797
|
+
|
|
798
|
+
// ---------------------------------------------------------------------------
|
|
799
|
+
// Lock-holder watchdog for a silent `bd dolt pull`/`bd dolt push`
|
|
800
|
+
// ---------------------------------------------------------------------------
|
|
801
|
+
//
|
|
802
|
+
// A bd sync that waits on a beads lock prints nothing until it gets the lock,
|
|
803
|
+
// so a lock held by some other long-lived process on the member used to look
|
|
804
|
+
// like a silent hang ending in the DOLT_STEP_TIMEOUT_S inactivity kill. Each
|
|
805
|
+
// attempt that is still in flight after DOLT_LOCK_PROBE_AFTER_MS gets exactly
|
|
806
|
+
// ONE lock-holder probe (beads-lock-probe.mjs): a separate short command on
|
|
807
|
+
// the same member, run while the sync is still waiting. Its result is logged.
|
|
808
|
+
//
|
|
809
|
+
// FOREIGN vs OWN holder. The bd process this attempt started legitimately
|
|
810
|
+
// holds the lock while it works, and a slow incremental pull can run for
|
|
811
|
+
// minutes. So a holder only counts as contention when it is provably older
|
|
812
|
+
// than this attempt: its process age exceeds the attempt's elapsed time by
|
|
813
|
+
// more than DOLT_LOCK_HOLDER_AGE_SLACK_S. Both are durations (member clock vs
|
|
814
|
+
// orchestrator clock), so no clock sync is assumed. An own or unknown-age
|
|
815
|
+
// holder is logged and the attempt keeps waiting.
|
|
816
|
+
//
|
|
817
|
+
// THE BOUND. A foreign holder fails the attempt at once with a typed
|
|
818
|
+
// DoltLockHeldError naming it: at most DOLT_LOCK_PROBE_AFTER_MS plus the
|
|
819
|
+
// probe's own timeout (60s + 30s = 90s) after the attempt started, instead of
|
|
820
|
+
// the 600s inactivity kill. 60s is far past a healthy sync (seconds; the
|
|
821
|
+
// incident's retry landed in 4s) yet short enough to name the holder while it
|
|
822
|
+
// is still alive. A lock-held failure is not retried: the holder is long-lived
|
|
823
|
+
// by construction, so a retry would just wait on it again.
|
|
824
|
+
//
|
|
825
|
+
// The abandoned sync command keeps running on the member (there is no
|
|
826
|
+
// cancel channel); its promise is handed to `onAbandonedAttempt` so the push
|
|
827
|
+
// bracket can hold the push mutex until it ends (see doltPushAfter).
|
|
828
|
+
//
|
|
829
|
+
// Side effects of running the probe concurrently: the member's statusline
|
|
830
|
+
// busy marker may flip to idle when the probe ends while the sync is still in
|
|
831
|
+
// flight, and a resumed run's journal replay sees the probe as an extra
|
|
832
|
+
// command whose position depends on timing, so replay diverges at that point
|
|
833
|
+
// and continues live.
|
|
834
|
+
|
|
835
|
+
/** How long a bd sync attempt may stay silent before its lock-holder probe. */
|
|
836
|
+
export const DOLT_LOCK_PROBE_AFTER_MS = 60_000;
|
|
837
|
+
|
|
838
|
+
/** Timeout of the lock-holder probe command itself. */
|
|
839
|
+
export const DOLT_LOCK_PROBE_TIMEOUT_S = 30;
|
|
840
|
+
|
|
841
|
+
/** A holder must be at least this much older than the attempt to count as foreign. */
|
|
842
|
+
export const DOLT_LOCK_HOLDER_AGE_SLACK_S = 5;
|
|
843
|
+
|
|
844
|
+
const defaultLockProbeTimer = {
|
|
845
|
+
set(fn, ms) {
|
|
846
|
+
const handle = setTimeout(fn, ms);
|
|
847
|
+
if (handle && typeof handle.unref === 'function') handle.unref();
|
|
848
|
+
return handle;
|
|
849
|
+
},
|
|
850
|
+
clear(handle) {
|
|
851
|
+
clearTimeout(handle);
|
|
852
|
+
},
|
|
853
|
+
};
|
|
854
|
+
|
|
855
|
+
/**
|
|
856
|
+
* Run the lock-holder probe once for a sync attempt that is still in flight,
|
|
857
|
+
* log what it found, and return the foreign holders. Never throws for an
|
|
858
|
+
* ordinary failure (a failed probe is logged and reports no holder); a
|
|
859
|
+
* cancellation still propagates.
|
|
860
|
+
*
|
|
861
|
+
* @returns {Promise<{ foreignHolders: object[] }>}
|
|
862
|
+
*/
|
|
863
|
+
async function probeLockHolders({ command, member, target, label, log, attemptStartedAt, now }) {
|
|
864
|
+
const elapsedS = Math.max(0, Math.round((now() - attemptStartedAt) / 1000));
|
|
865
|
+
let res;
|
|
866
|
+
try {
|
|
867
|
+
res = await command(buildLockHolderProbe(target), {
|
|
868
|
+
member_name: member, silent: true, failSoft: true,
|
|
869
|
+
label: `beads lock-holder probe for '${member}'`, timeout_s: DOLT_LOCK_PROBE_TIMEOUT_S,
|
|
870
|
+
});
|
|
871
|
+
} catch (err) {
|
|
872
|
+
if (err && err.name === 'CancelledError') throw err;
|
|
873
|
+
res = { ok: false, output: '', error: (err && err.message) || String(err) };
|
|
874
|
+
}
|
|
875
|
+
if (!res || !res.ok) {
|
|
876
|
+
log(`[Dolt] ${label} has produced no result after ${elapsedS}s on member '${member}'; the beads lock-holder probe failed (${(res && res.error) || 'no result'}), so the holders are unknown. Still waiting.`);
|
|
877
|
+
return { foreignHolders: [] };
|
|
878
|
+
}
|
|
879
|
+
const parsed = parseLockHolderProbe(res.output);
|
|
880
|
+
const foreignHolders = parsed.holders.filter((h) => h.ageS !== null && h.ageS > elapsedS + DOLT_LOCK_HOLDER_AGE_SLACK_S);
|
|
881
|
+
const parts = [`[Dolt] ${label} has produced no result after ${elapsedS}s on member '${member}'.`];
|
|
882
|
+
if (parsed.noLookup) parts.push(`Beads lock holders cannot be listed on this member: ${parsed.noLookup}.`);
|
|
883
|
+
if (parsed.holders.length > 0) parts.push(`Beads lock holders: ${parsed.holders.map(describeLockProcess).join('; ')}.`);
|
|
884
|
+
else if (!parsed.noLookup) parts.push('Beads lock holders: none found.');
|
|
885
|
+
if (parsed.candidates.length > 0) parts.push(`Running bd/dolt processes (candidates): ${parsed.candidates.map(describeLockProcess).join('; ')}.`);
|
|
886
|
+
parts.push(foreignHolders.length > 0
|
|
887
|
+
? `Held by a process that started before this sync (more than ${DOLT_LOCK_HOLDER_AGE_SLACK_S}s older than the ${elapsedS}s attempt) -- failing fast.`
|
|
888
|
+
: 'No lock held by a process older than this sync -- still waiting.');
|
|
889
|
+
log(parts.join(' '));
|
|
890
|
+
return { foreignHolders };
|
|
891
|
+
}
|
|
892
|
+
|
|
893
|
+
/**
|
|
894
|
+
* Await one sync attempt under the lock-holder watchdog. Resolves to
|
|
895
|
+
* `{ res }` when the command finishes (probe or not), or to `{ lockHeld }`
|
|
896
|
+
* when the probe names a foreign holder first.
|
|
897
|
+
*/
|
|
898
|
+
async function awaitSyncAttempt({ pending, command, member, target, label, log, attemptStartedAt, now, lockProbeAfterMs, lockProbeTimer }) {
|
|
899
|
+
if (!(Number(lockProbeAfterMs) > 0)) return { res: await pending };
|
|
900
|
+
const timer = lockProbeTimer || defaultLockProbeTimer;
|
|
901
|
+
let fired = false;
|
|
902
|
+
let handle = null;
|
|
903
|
+
const probed = new Promise((resolve, reject) => {
|
|
904
|
+
handle = timer.set(() => {
|
|
905
|
+
fired = true;
|
|
906
|
+
probeLockHolders({ command, member, target, label, log, attemptStartedAt, now }).then(resolve, reject);
|
|
907
|
+
}, Number(lockProbeAfterMs));
|
|
908
|
+
});
|
|
909
|
+
const first = await Promise.race([
|
|
910
|
+
pending.then((res) => ({ done: true, res })),
|
|
911
|
+
probed.then((probe) => ({ done: false, probe })),
|
|
912
|
+
]);
|
|
913
|
+
if (first.done) {
|
|
914
|
+
if (!fired) timer.clear(handle);
|
|
915
|
+
// A probe that was already running finishes and logs on its own.
|
|
916
|
+
probed.catch(() => {});
|
|
917
|
+
return { res: first.res };
|
|
918
|
+
}
|
|
919
|
+
if (first.probe.foreignHolders.length > 0) return { lockHeld: first.probe.foreignHolders };
|
|
920
|
+
return { res: await pending };
|
|
921
|
+
}
|
|
922
|
+
|
|
652
923
|
/**
|
|
653
924
|
* Run a single `bd dolt` command via the injected command() with failSoft,
|
|
654
925
|
* retrying ONLY transient failures up to `maxTransientRetries` times, with a
|
|
@@ -673,11 +944,19 @@ const defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
|
673
944
|
* 'diverged' classification remains excluded and is still returned
|
|
674
945
|
* immediately, never retried.
|
|
675
946
|
*
|
|
676
|
-
* @returns {Promise<{ ok: boolean, output: string, error: string|null, kind?: 'no-remote'|'empty-remote'|'remote-unreachable'|'diverged'|'auth'|'transient'|'unknown' }>}
|
|
947
|
+
* @returns {Promise<{ ok: boolean, output: string, error: string|null, kind?: 'no-remote'|'empty-remote'|'remote-unreachable'|'diverged'|'auth'|'transient'|'missing-tool'|'unknown', missingTool?: string }>}
|
|
677
948
|
*/
|
|
678
|
-
async function runDoltStep({ command, member, cmd, label, log, maxTransientRetries, onAuthFailure, sleep = defaultSleep, backoffBaseMs = DOLT_BACKOFF_BASE_MS, timeoutS = DOLT_STEP_TIMEOUT_S, spawnOutageBudgetMs = DOLT_SPAWN_OUTAGE_BUDGET_MS, now = Date.now }) {
|
|
949
|
+
async function runDoltStep({ command, member, cmd, label, log, maxTransientRetries, onAuthFailure, sleep = defaultSleep, backoffBaseMs = DOLT_BACKOFF_BASE_MS, timeoutS = DOLT_STEP_TIMEOUT_S, spawnOutageBudgetMs = DOLT_SPAWN_OUTAGE_BUDGET_MS, now = Date.now, memberTarget, lockProbeAfterMs = DOLT_LOCK_PROBE_AFTER_MS, lockProbeTimer, onAbandonedAttempt }) {
|
|
950
|
+
// `cmd` stays the LOGICAL command (classification, commandBinary, labels);
|
|
951
|
+
// `issued` is the member-bound string, which on a Windows member bounds
|
|
952
|
+
// GOMAXPROCS for bd (resolved once per step, not per attempt). The same
|
|
953
|
+
// target builds the lock-holder probe.
|
|
954
|
+
const target = await resolveDoltMemberTarget(member, memberTarget, log);
|
|
955
|
+
const issued = bdSyncCommandFor(cmd, target);
|
|
679
956
|
let attempt = 0;
|
|
680
957
|
let authHealAttempted = false;
|
|
958
|
+
/** The info the self-heal was invoked with, reported back on a failed retry. */
|
|
959
|
+
let healTrigger = null;
|
|
681
960
|
const startedAt = now();
|
|
682
961
|
// An explicitly passed `maxTransientRetries` caps BOTH ladders (see the
|
|
683
962
|
// ROUND-3 CORRECTION in the constants block); left undefined, the generic
|
|
@@ -690,15 +969,45 @@ async function runDoltStep({ command, member, cmd, label, log, maxTransientRetri
|
|
|
690
969
|
: DOLT_SPAWN_OUTAGE_MAX_RETRIES;
|
|
691
970
|
// eslint-disable-next-line no-constant-condition
|
|
692
971
|
while (true) {
|
|
693
|
-
const
|
|
694
|
-
|
|
695
|
-
const
|
|
696
|
-
|
|
972
|
+
const attemptStartedAt = now();
|
|
973
|
+
const pending = Promise.resolve(command(issued, { member_name: member, silent: true, failSoft: true, label, timeout_s: timeoutS }));
|
|
974
|
+
const waited = await awaitSyncAttempt({ pending, command, member, target, label, log, attemptStartedAt, now, lockProbeAfterMs, lockProbeTimer });
|
|
975
|
+
if (waited.lockHeld) {
|
|
976
|
+
// The sync command is still waiting on the member; stop waiting
|
|
977
|
+
// for it here and hand it to the caller (the push bracket keeps
|
|
978
|
+
// its mutex until it ends). Not retried -- see the watchdog notes.
|
|
979
|
+
pending.catch(() => {});
|
|
980
|
+
if (typeof onAbandonedAttempt === 'function') onAbandonedAttempt(pending);
|
|
981
|
+
const error = `beads lock held by another process: ${waited.lockHeld.map(describeLockProcess).join('; ')}`;
|
|
982
|
+
log(`[Dolt] ${label} FAILED (lock-held) for member '${member}' -- not retrying while that process holds the lock: ${error}`);
|
|
983
|
+
return { ok: false, output: '', error, kind: 'lock-held', lockHolders: waited.lockHeld, selfHealed: authHealAttempted };
|
|
984
|
+
}
|
|
985
|
+
const res = waited.res;
|
|
986
|
+
if (res && res.ok) {
|
|
987
|
+
if (authHealAttempted) log(`[Dolt] self-heal recovered: ${label} succeeded for member '${member}' on the retry after re-provisioning credentials.`);
|
|
988
|
+
return res;
|
|
989
|
+
}
|
|
990
|
+
const rawError = res ? res.error : 'unknown command failure';
|
|
991
|
+
// Same verdict classifyDoltFailure() returns, read once here so a
|
|
992
|
+
// missing-tool failure can also name the binary. Classified on the
|
|
993
|
+
// RAW text; everything surfaced below uses `error`, which names the
|
|
994
|
+
// real cause of a Windows process-creation refusal instead of the
|
|
995
|
+
// credential hints dolt appends to it (surfaceDoltFailureText).
|
|
996
|
+
const classified = classifyFailure(rawError, { provider: 'dolt', tool: commandBinary(cmd) });
|
|
997
|
+
const kind = toDoltVerdict(classified.kind);
|
|
998
|
+
const error = surfaceDoltFailureText(rawError);
|
|
999
|
+
if (kind === 'missing-tool') {
|
|
1000
|
+
// GitHub #616: a missing binary is never retried and never sent to
|
|
1001
|
+
// the credential self-heal -- neither can install it.
|
|
1002
|
+
const tool = classified.missingTool || commandBinary(cmd);
|
|
1003
|
+
log(`[Dolt] ${label} FAILED (missing-tool): '${tool}' was not found on member '${member}' -- install it on that member or put it on that member's PATH. Not retrying and not re-provisioning credentials. Raw: ${error}`);
|
|
1004
|
+
return { ok: false, output: res ? res.output : '', error, kind, missingTool: tool, selfHealed: false };
|
|
1005
|
+
}
|
|
697
1006
|
if (kind === 'transient') {
|
|
698
1007
|
// Sub-classify WITHIN the transient verdict: only the spawn-outage
|
|
699
1008
|
// class gets the long wall-clock budget (see the constants block
|
|
700
1009
|
// above for why the count-based ladder was replaced).
|
|
701
|
-
if (isSpawnOutageFailure(
|
|
1010
|
+
if (isSpawnOutageFailure(rawError)) {
|
|
702
1011
|
const elapsedMs = now() - startedAt;
|
|
703
1012
|
// The attempt ceiling is a backstop, not the policy: at the 30s
|
|
704
1013
|
// backoff cap a 3-minute budget spends itself in ~10 retries, so
|
|
@@ -729,8 +1038,9 @@ async function runDoltStep({ command, member, cmd, label, log, maxTransientRetri
|
|
|
729
1038
|
// this used to drop only the former, unlike repair()).
|
|
730
1039
|
forgetMemberSyncState(member);
|
|
731
1040
|
log(`[Dolt] ${kind} failure for member '${member}' (${label}); invoking self-heal (provision_vcs_auth) once before a single bounded retry: ${error}`);
|
|
1041
|
+
healTrigger = { member, label, cmd, error, source: 'dolt', failureKind: kind };
|
|
732
1042
|
try {
|
|
733
|
-
await onAuthFailure(
|
|
1043
|
+
await onAuthFailure(healTrigger);
|
|
734
1044
|
} catch (healErr) {
|
|
735
1045
|
log(`[Dolt] self-heal for member '${member}' (${label}) failed; not retrying further: ${healErr.message}`);
|
|
736
1046
|
log(`[Dolt] ${label} FAILED (${kind}) -- reads/writes for member '${member}' may be stale until this is resolved. Raw: ${error}`);
|
|
@@ -759,11 +1069,42 @@ async function runDoltStep({ command, member, cmd, label, log, maxTransientRetri
|
|
|
759
1069
|
// stale" apart from "the credentials were just refreshed and the
|
|
760
1070
|
// failure text is lying" -- see doltPushGuarded's post-reconcile
|
|
761
1071
|
// re-push branch.
|
|
1072
|
+
if (authHealAttempted) {
|
|
1073
|
+
log(`[Dolt] self-heal did not recover: ${label} still failed for member '${member}' after re-provisioning credentials.`);
|
|
1074
|
+
// Let the self-heal remember this futile heal for the rest of the
|
|
1075
|
+
// run, so the next step failing the same way is not re-healed.
|
|
1076
|
+
if (typeof onAuthFailure.recordHealOutcome === 'function') {
|
|
1077
|
+
try { await onAuthFailure.recordHealOutcome({ ...healTrigger, recovered: false }); }
|
|
1078
|
+
catch (recordErr) { log(`[Dolt] could not record the failed self-heal for member '${member}': ${recordErr.message}`); }
|
|
1079
|
+
}
|
|
1080
|
+
}
|
|
762
1081
|
log(`[Dolt] ${label} FAILED (${kind}) -- reads/writes for member '${member}' may be stale until this is resolved. Raw: ${error}`);
|
|
763
|
-
|
|
1082
|
+
// A transient failure that is still the Windows process-creation
|
|
1083
|
+
// limit after the retry budget is flagged so the caller throws the
|
|
1084
|
+
// typed DoltWindowsSpawnLimitError instead of a generic sync failure.
|
|
1085
|
+
const spawnLimit = kind === 'transient' && WINDOWS_SPAWN_LIMIT_RE.test(String(rawError || ''));
|
|
1086
|
+
return { ok: false, output: res ? res.output : '', error, kind, selfHealed: authHealAttempted, ...(spawnLimit ? { spawnLimit: true } : {}) };
|
|
764
1087
|
}
|
|
765
1088
|
}
|
|
766
1089
|
|
|
1090
|
+
/**
|
|
1091
|
+
* The terminal error for a D-pull/D-push whose binary is missing on the member
|
|
1092
|
+
* (GitHub #616): names the binary and the member, and says plainly that
|
|
1093
|
+
* credentials were not touched.
|
|
1094
|
+
* @param {string} member
|
|
1095
|
+
* @param {'pull'|'push'} operation
|
|
1096
|
+
* @param {{ error: string, missingTool?: string }} step
|
|
1097
|
+
* @returns {DoltSyncError}
|
|
1098
|
+
*/
|
|
1099
|
+
function missingToolSyncError(member, operation, step) {
|
|
1100
|
+
const tool = step.missingTool || 'bd';
|
|
1101
|
+
return new DoltSyncError(
|
|
1102
|
+
`[Dolt] D-${operation} for member '${member}' failed: '${tool}' is not installed or not on PATH on member '${member}' -- ` +
|
|
1103
|
+
`install it there (or fix that member's PATH) and retry. Not a credential problem; credentials were not re-provisioned. Raw: ${step.error}`,
|
|
1104
|
+
{ member, doltOutput: step.error, details: { kind: 'missing-tool', operation, tool } },
|
|
1105
|
+
);
|
|
1106
|
+
}
|
|
1107
|
+
|
|
767
1108
|
/**
|
|
768
1109
|
* D-pull: bring `member`'s beads clone up to the shared remote before it reads
|
|
769
1110
|
* or is dispatched -- `bd dolt pull`. Transient (network / server / lock)
|
|
@@ -909,9 +1250,10 @@ async function attemptSettle({ settle, member, operation, error, log }) {
|
|
|
909
1250
|
// error, a skipped needed pull is not. A NO-OP push (nothing local to
|
|
910
1251
|
// publish) is indistinguishable from a real one at this layer and is treated
|
|
911
1252
|
// the same way -- it proves nothing about the clone's freshness, so it may
|
|
912
|
-
// not keep a fingerprint either.
|
|
913
|
-
//
|
|
914
|
-
//
|
|
1253
|
+
// not keep a fingerprint either. The D-push bracket does read the tip
|
|
1254
|
+
// before and after the push, but only to decide whether the push LANDED
|
|
1255
|
+
// (see "D-push landed check" below); that read is never recorded as a
|
|
1256
|
+
// fingerprint, so the race above cannot reach a skip.
|
|
915
1257
|
//
|
|
916
1258
|
// FAIL-OPEN, ALWAYS. Every uncertainty -- no recorded tip yet, ls-remote failed
|
|
917
1259
|
// or timed out, unparseable output, a sync.remote that could not be positively
|
|
@@ -1209,11 +1551,149 @@ export function clearLastSyncedTip(member) {
|
|
|
1209
1551
|
return lastSyncedTips.delete(member) ? 1 : 0;
|
|
1210
1552
|
}
|
|
1211
1553
|
|
|
1554
|
+
// ---------------------------------------------------------------------------
|
|
1555
|
+
// D-push landed check: a push is only logged as landed when refs/dolt/data
|
|
1556
|
+
// actually moved
|
|
1557
|
+
// ---------------------------------------------------------------------------
|
|
1558
|
+
//
|
|
1559
|
+
// `bd dolt push` exiting 0 is not proof the remote moved: a push that timed
|
|
1560
|
+
// out at the transport used to be read as success and logged "landed" while
|
|
1561
|
+
// refs/dolt/data proved otherwise. So the D-push bracket reads refs/dolt/data
|
|
1562
|
+
// immediately before the first push and again after a push reports success:
|
|
1563
|
+
// * the tip CHANGED -> the push landed. It may also carry another machine's
|
|
1564
|
+
// later push on top of ours; that is still a landed push (Dolt's git
|
|
1565
|
+
// blobstore publishes with a lease on the head it fetched, so a push that
|
|
1566
|
+
// did not land fails instead of exiting 0). Bookkeeping is unchanged: the
|
|
1567
|
+
// fingerprint is FORGOTTEN, never minted from the post-push read -- see
|
|
1568
|
+
// "WHY A PUSH CANNOT MINT A FINGERPRINT" above. These reads only ever
|
|
1569
|
+
// decide landed/not-landed; neither is ever recorded.
|
|
1570
|
+
// * the tip did NOT change -> either a legitimate no-op push (nothing local
|
|
1571
|
+
// to publish; verified live: refs/dolt/data stays put and bd still prints
|
|
1572
|
+
// "Push complete.") or a push that did not land. `bd diff
|
|
1573
|
+
// remotes/origin/<branch> <branch>` tells them apart: no changes means
|
|
1574
|
+
// the remote already had everything (up-to-date), changes mean the
|
|
1575
|
+
// clone still holds work the remote lacks (NOT landed -> failure).
|
|
1576
|
+
// * anything inconclusive -- no git-transport (`git+`) sync.remote URL to
|
|
1577
|
+
// read (a bare remote name, a Dolt-native file:// or cloud remote), a
|
|
1578
|
+
// failed or unparseable read
|
|
1579
|
+
// -- keeps the pre-check behavior and logs that the landing could not be
|
|
1580
|
+
// verified. Only positive evidence of a non-landed push fails it.
|
|
1581
|
+
|
|
1582
|
+
/** Read refs/dolt/data at `url` for the D-push landed check. Never throws.
|
|
1583
|
+
* `empty` is true when ls-remote succeeded but the remote has no
|
|
1584
|
+
* refs/dolt/data yet (a first push). */
|
|
1585
|
+
async function readTipForPushCheck(member, { command, url, when }) {
|
|
1586
|
+
let res;
|
|
1587
|
+
try {
|
|
1588
|
+
res = await command(`git ${GIT_NO_PROMPT_FLAGS} ls-remote ${url} ${DOLT_DATA_REF}`, {
|
|
1589
|
+
member_name: member,
|
|
1590
|
+
silent: true,
|
|
1591
|
+
failSoft: true,
|
|
1592
|
+
label: `D-push ${when}-push remote-tip read for '${member}'`,
|
|
1593
|
+
timeout_s: DOLT_TIP_PROBE_TIMEOUT_S,
|
|
1594
|
+
});
|
|
1595
|
+
} catch (err) {
|
|
1596
|
+
return { sha: null, why: `ls-remote threw: ${(err && err.message) || err}` };
|
|
1597
|
+
}
|
|
1598
|
+
if (!res || res.ok === false) return { sha: null, why: `ls-remote failed: ${res ? res.error : 'no result'}` };
|
|
1599
|
+
const output = typeof res === 'object' ? res.output : res;
|
|
1600
|
+
const sha = parseLsRemoteTip(output);
|
|
1601
|
+
if (sha) return { sha };
|
|
1602
|
+
if (String(output == null ? '' : output).trim() === '') return { sha: null, empty: true, why: `the remote has no ${DOLT_DATA_REF}` };
|
|
1603
|
+
return { sha: null, why: `ls-remote returned no parseable ${DOLT_DATA_REF} SHA` };
|
|
1604
|
+
}
|
|
1605
|
+
|
|
1606
|
+
/**
|
|
1607
|
+
* Parse `bd diff <from> <to> --json`: does the clone hold changes the
|
|
1608
|
+
* remote-tracking branch lacks?
|
|
1609
|
+
* @param {string|null|undefined} output
|
|
1610
|
+
* @returns {boolean|null} true = unpushed changes, false = none, null = unknown
|
|
1611
|
+
*/
|
|
1612
|
+
export function parseBdDiffPending(output) {
|
|
1613
|
+
const text = String(output == null ? '' : output).trim();
|
|
1614
|
+
if (/^No changes between /m.test(text)) return false;
|
|
1615
|
+
try {
|
|
1616
|
+
const parsed = JSON.parse(text);
|
|
1617
|
+
if (Array.isArray(parsed)) return parsed.length > 0;
|
|
1618
|
+
} catch { /* not JSON */ }
|
|
1619
|
+
return null;
|
|
1620
|
+
}
|
|
1621
|
+
|
|
1622
|
+
/** Branch names bd may report that are safe to put in a command string on
|
|
1623
|
+
* any member shell (no whitespace, quotes or shell metacharacters). */
|
|
1624
|
+
const SAFE_DOLT_BRANCH_RE = /^[A-Za-z0-9._/-]+$/;
|
|
1625
|
+
|
|
1626
|
+
/**
|
|
1627
|
+
* Does `member`'s clone still hold changes its Dolt remote-tracking branch
|
|
1628
|
+
* lacks? Reads the current branch from `bd vc status --json`, then diffs
|
|
1629
|
+
* remotes/origin/<branch> against it. Never throws.
|
|
1630
|
+
* @returns {Promise<{ pending: boolean|null, why?: string }>}
|
|
1631
|
+
*/
|
|
1632
|
+
async function readUnpushedDoltChanges(member, { command }) {
|
|
1633
|
+
let branch = null;
|
|
1634
|
+
try {
|
|
1635
|
+
const res = await command('bd vc status --json', { member_name: member, silent: true, failSoft: true, label: `D-push landed check: branch read for '${member}'`, timeout_s: DOLT_TIP_PROBE_TIMEOUT_S });
|
|
1636
|
+
if (res && res.ok !== false) {
|
|
1637
|
+
const parsed = JSON.parse(String((typeof res === 'object' ? res.output : res) || ''));
|
|
1638
|
+
if (parsed && typeof parsed.branch === 'string') branch = parsed.branch;
|
|
1639
|
+
}
|
|
1640
|
+
} catch { /* unknown branch -> inconclusive below */ }
|
|
1641
|
+
if (!branch || !SAFE_DOLT_BRANCH_RE.test(branch)) return { pending: null, why: 'could not read the clone\'s Dolt branch' };
|
|
1642
|
+
let res;
|
|
1643
|
+
try {
|
|
1644
|
+
res = await command(`bd diff remotes/origin/${branch} ${branch} --json`, { member_name: member, silent: true, failSoft: true, label: `D-push landed check: unpushed-change read for '${member}'`, timeout_s: DOLT_TIP_PROBE_TIMEOUT_S });
|
|
1645
|
+
} catch (err) {
|
|
1646
|
+
return { pending: null, why: `bd diff threw: ${(err && err.message) || err}` };
|
|
1647
|
+
}
|
|
1648
|
+
if (!res || res.ok === false) return { pending: null, why: `bd diff failed: ${res ? res.error : 'no result'}` };
|
|
1649
|
+
const pending = parseBdDiffPending(typeof res === 'object' ? res.output : res);
|
|
1650
|
+
return pending === null ? { pending: null, why: 'bd diff output was not recognized' } : { pending };
|
|
1651
|
+
}
|
|
1652
|
+
|
|
1653
|
+
/**
|
|
1654
|
+
* Start the D-push landed check: resolve the ls-remote URL from the memoized
|
|
1655
|
+
* sync.remote and read refs/dolt/data before the push.
|
|
1656
|
+
* @returns {Promise<{ url: string|null, preTip: string|null, preEmpty: boolean, why?: string }>}
|
|
1657
|
+
*/
|
|
1658
|
+
async function beginDoltPushLandedCheck(member, { command, log }) {
|
|
1659
|
+
let url = null;
|
|
1660
|
+
try {
|
|
1661
|
+
const raw = (await readMemberSyncRemote(member, { command, log })).url;
|
|
1662
|
+
// Only a git-transport Dolt remote (bd spells it `git+<url>`) publishes
|
|
1663
|
+
// refs/dolt/data. A Dolt-native remote (file://, DoltHub, cloud
|
|
1664
|
+
// storage) keeps its own chunk store; a directory that merely also
|
|
1665
|
+
// happens to be a git repo would answer ls-remote with no refs both
|
|
1666
|
+
// before and after a push that did land.
|
|
1667
|
+
url = typeof raw === 'string' && raw.trim().startsWith('git+') ? toGitLsRemoteUrl(raw) : null;
|
|
1668
|
+
} catch { url = null; }
|
|
1669
|
+
if (!url) return { url: null, preTip: null, preEmpty: false, why: 'sync.remote is not a git-transport (git+) URL whose refs/dolt/data can be read' };
|
|
1670
|
+
const pre = await readTipForPushCheck(member, { command, url, when: 'pre' });
|
|
1671
|
+
return { url, preTip: pre.sha, preEmpty: !!pre.empty, why: pre.why };
|
|
1672
|
+
}
|
|
1673
|
+
|
|
1674
|
+
/**
|
|
1675
|
+
* Finish the D-push landed check after a push reported success.
|
|
1676
|
+
* @returns {Promise<{ status: 'moved'|'up-to-date'|'not-landed'|'unverified', tip?: string, why?: string }>}
|
|
1677
|
+
*/
|
|
1678
|
+
async function checkDoltPushLanded(member, { command, check }) {
|
|
1679
|
+
if (!check.url || (!check.preTip && !check.preEmpty)) return { status: 'unverified', why: check.why };
|
|
1680
|
+
const post = await readTipForPushCheck(member, { command, url: check.url, when: 'post' });
|
|
1681
|
+
if (!post.sha) {
|
|
1682
|
+
if (post.empty) return { status: 'not-landed', why: `the remote still has no ${DOLT_DATA_REF} after the push` };
|
|
1683
|
+
return { status: 'unverified', why: post.why };
|
|
1684
|
+
}
|
|
1685
|
+
if (post.sha !== check.preTip) return { status: 'moved', tip: post.sha };
|
|
1686
|
+
const unpushed = await readUnpushedDoltChanges(member, { command });
|
|
1687
|
+
if (unpushed.pending === false) return { status: 'up-to-date', tip: post.sha };
|
|
1688
|
+
if (unpushed.pending === true) return { status: 'not-landed', tip: post.sha, why: `${DOLT_DATA_REF} is still ${post.sha} and the clone still holds changes the remote lacks` };
|
|
1689
|
+
return { status: 'unverified', tip: post.sha, why: `${DOLT_DATA_REF} did not move (${post.sha}) and whether the clone had anything to publish could not be read: ${unpushed.why}` };
|
|
1690
|
+
}
|
|
1691
|
+
|
|
1212
1692
|
export async function doltPullBefore(member, opts = {}) {
|
|
1213
1693
|
// `maxTransientRetries` is deliberately NOT defaulted here: runDoltStep()
|
|
1214
1694
|
// must see whether the caller passed it (an explicit value caps both
|
|
1215
1695
|
// retry ladders; undefined selects each ladder's own default).
|
|
1216
|
-
const { command, log = () => {}, maxTransientRetries, checkSyncRemoteConfigured, skipPull = false, onAuthFailure, sleep, backoffBaseMs, timeoutS, settle, remoteTipFingerprint = true, spawnOutageBudgetMs, now } = opts;
|
|
1696
|
+
const { command, log = () => {}, maxTransientRetries, checkSyncRemoteConfigured, skipPull = false, onAuthFailure, sleep, backoffBaseMs, timeoutS, settle, remoteTipFingerprint = true, spawnOutageBudgetMs, now, memberTarget, lockProbeAfterMs, lockProbeTimer, onAbandonedAttempt } = opts;
|
|
1217
1697
|
if (typeof command !== 'function') {
|
|
1218
1698
|
throw new Error("doltPullBefore requires an injected command() in opts");
|
|
1219
1699
|
}
|
|
@@ -1259,7 +1739,7 @@ export async function doltPullBefore(member, opts = {}) {
|
|
|
1259
1739
|
|
|
1260
1740
|
const pull = await runDoltStep({
|
|
1261
1741
|
command, member, cmd: 'bd dolt pull',
|
|
1262
|
-
label: `D-pull for '${member}'`, log, maxTransientRetries, onAuthFailure, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now,
|
|
1742
|
+
label: `D-pull for '${member}'`, log, maxTransientRetries, onAuthFailure, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now, memberTarget, lockProbeAfterMs, lockProbeTimer, onAbandonedAttempt,
|
|
1263
1743
|
});
|
|
1264
1744
|
if (!pull.ok) {
|
|
1265
1745
|
if (pull.kind === 'no-remote') {
|
|
@@ -1307,6 +1787,9 @@ export async function doltPullBefore(member, opts = {}) {
|
|
|
1307
1787
|
{ member, doltOutput: pull.error, details: { kind: 'auth', operation: 'pull' } },
|
|
1308
1788
|
);
|
|
1309
1789
|
}
|
|
1790
|
+
if (pull.kind === 'missing-tool') {
|
|
1791
|
+
throw missingToolSyncError(member, 'pull', pull);
|
|
1792
|
+
}
|
|
1310
1793
|
if (pull.kind === 'remote-unreachable') {
|
|
1311
1794
|
const url = extractDoltRemoteUrl(pull.error);
|
|
1312
1795
|
throw new DoltSyncError(
|
|
@@ -1314,6 +1797,8 @@ export async function doltPullBefore(member, opts = {}) {
|
|
|
1314
1797
|
{ member, doltOutput: pull.error, remoteUrl: url },
|
|
1315
1798
|
);
|
|
1316
1799
|
}
|
|
1800
|
+
const typedPullError = typedStepError(member, 'pull', pull);
|
|
1801
|
+
if (typedPullError) throw typedPullError;
|
|
1317
1802
|
throw new DoltSyncError(
|
|
1318
1803
|
`[Dolt] D-pull failed for member '${member}': ${pull.error}`,
|
|
1319
1804
|
{ member, doltOutput: pull.error },
|
|
@@ -1360,6 +1845,42 @@ export function extractConflictingTables(doltOutput) {
|
|
|
1360
1845
|
return [...tables];
|
|
1361
1846
|
}
|
|
1362
1847
|
|
|
1848
|
+
/**
|
|
1849
|
+
* True when a failed D-pull carries the signature of a clone whose bd
|
|
1850
|
+
* auto-applied schema migrations were never published: dolt refuses the merge
|
|
1851
|
+
* because uncommitted local changes (the migrated `events` table) would be
|
|
1852
|
+
* stomped. Only a DoltSyncError (not a divergence/auth classification, which
|
|
1853
|
+
* keep their own handling) can match.
|
|
1854
|
+
*/
|
|
1855
|
+
export function isUnpublishedMigrationPullFailure(err) {
|
|
1856
|
+
if (!(err instanceof DoltSyncError) || err instanceof DoltDivergedError) return false;
|
|
1857
|
+
if (err.details && err.details.kind === 'auth') return false;
|
|
1858
|
+
return /local changes would be stomped by merge/i.test(String(err.doltOutput || err.message || ''));
|
|
1859
|
+
}
|
|
1860
|
+
|
|
1861
|
+
/**
|
|
1862
|
+
* Heal for the signature above: publish the migrations with `bd dolt push`
|
|
1863
|
+
* (through doltPushAfter, so it takes the global push mutex when one is
|
|
1864
|
+
* supplied) and retry the pull exactly once. Any failure becomes an
|
|
1865
|
+
* UnpublishedSchemaMigrationsError naming the cause and the fix commands.
|
|
1866
|
+
*/
|
|
1867
|
+
async function publishMigrationsAndRetryPull(member, opts, firstErr) {
|
|
1868
|
+
const { log = () => {} } = opts;
|
|
1869
|
+
log(`[Dolt] D-pull for member '${member}' failed because its beads clone holds unpublished local schema migrations (bd auto-applied them); publishing with 'bd dolt push' and retrying the pull once.`);
|
|
1870
|
+
try {
|
|
1871
|
+
await doltPushAfter(member, { ...opts, pushBeads: true });
|
|
1872
|
+
// The pull must really run: a fingerprint skip would claim freshness.
|
|
1873
|
+
clearLastSyncedTip(member);
|
|
1874
|
+
return await doltPullBefore(member, opts);
|
|
1875
|
+
} catch (healErr) {
|
|
1876
|
+
throw new UnpublishedSchemaMigrationsError(
|
|
1877
|
+
`[Dolt] member '${member}' beads clone has unpublished local schema migrations (bd auto-applied them), so the D-pull fails with "local changes would be stomped by merge" -- and publishing them failed: ${healErr.message}. ` +
|
|
1878
|
+
`Fix: give '${member}' a valid VCS credential (provision_vcs_auth), then run 'bd dolt push' in its beads workspace to publish the migration, then 'bd dolt pull', and relaunch.`,
|
|
1879
|
+
{ member, doltOutput: firstErr.doltOutput, cause: healErr },
|
|
1880
|
+
);
|
|
1881
|
+
}
|
|
1882
|
+
}
|
|
1883
|
+
|
|
1363
1884
|
/**
|
|
1364
1885
|
* Pre-flight beads-health gate: the same D-pull probe as doltPullBefore(),
|
|
1365
1886
|
* run before a sprint issues any mutating git or PR command, so a diverged
|
|
@@ -1384,7 +1905,12 @@ export function extractConflictingTables(doltOutput) {
|
|
|
1384
1905
|
export async function preflightBeadsHealthGate(member, opts = {}) {
|
|
1385
1906
|
const { command, log = () => {} } = opts;
|
|
1386
1907
|
try {
|
|
1387
|
-
|
|
1908
|
+
try {
|
|
1909
|
+
return await doltPullBefore(member, opts);
|
|
1910
|
+
} catch (firstErr) {
|
|
1911
|
+
if (!isUnpublishedMigrationPullFailure(firstErr)) throw firstErr;
|
|
1912
|
+
return await publishMigrationsAndRetryPull(member, opts, firstErr);
|
|
1913
|
+
}
|
|
1388
1914
|
} catch (err) {
|
|
1389
1915
|
if (!(err instanceof DoltDivergedError)) {
|
|
1390
1916
|
throw err;
|
|
@@ -1471,7 +1997,15 @@ export async function doltPushAfter(member, opts = {}) {
|
|
|
1471
1997
|
// doltPullBefore. `remoteTipFingerprint` is accepted for call-site parity
|
|
1472
1998
|
// with doltPullBefore but has nothing to switch off on the push side any
|
|
1473
1999
|
// more: a push never probes and never records (it only forgets).
|
|
1474
|
-
const { command, pushBeads = true, log = () => {}, maxTransientRetries, mutex, sprintId, checkSyncRemoteConfigured, onAuthFailure, sleep, backoffBaseMs, timeoutS, settle, renewIntervalMs = DOLT_MUTEX_RENEW_INTERVAL_MS, spawnOutageBudgetMs, now } = opts;
|
|
2000
|
+
const { command, pushBeads = true, log = () => {}, maxTransientRetries, mutex, sprintId, checkSyncRemoteConfigured, onAuthFailure, sleep, backoffBaseMs, timeoutS, settle, renewIntervalMs = DOLT_MUTEX_RENEW_INTERVAL_MS, spawnOutageBudgetMs, now, memberTarget, lockProbeAfterMs, lockProbeTimer } = opts;
|
|
2001
|
+
// Sync commands this push gave up on while they were still running on the
|
|
2002
|
+
// member (a lock-held fail-fast, see runDoltStep). The push mutex is kept
|
|
2003
|
+
// until they end -- see the release in the finally below.
|
|
2004
|
+
const abandonedAttempts = [];
|
|
2005
|
+
const onAbandonedAttempt = (pending) => {
|
|
2006
|
+
abandonedAttempts.push(pending);
|
|
2007
|
+
if (typeof opts.onAbandonedAttempt === 'function') opts.onAbandonedAttempt(pending);
|
|
2008
|
+
};
|
|
1475
2009
|
if (typeof command !== 'function') {
|
|
1476
2010
|
throw new Error("doltPushAfter requires an injected command() in opts");
|
|
1477
2011
|
}
|
|
@@ -1511,6 +2045,8 @@ export async function doltPushAfter(member, opts = {}) {
|
|
|
1511
2045
|
// exclusion mid-operation. Renew on an interval well under the lease while
|
|
1512
2046
|
// we hold it, and stop renewing in the same `finally` that releases.
|
|
1513
2047
|
let grant = null;
|
|
2048
|
+
/** The pre-push refs/dolt/data read; set inside the mutex below. */
|
|
2049
|
+
let landedCheck = { url: null, preTip: null, preEmpty: false, why: 'not read' };
|
|
1514
2050
|
if (mutex && typeof mutex.acquire === 'function') {
|
|
1515
2051
|
grant = await mutex.acquire(sprintId || member, { pid: process.pid });
|
|
1516
2052
|
}
|
|
@@ -1531,15 +2067,34 @@ export async function doltPushAfter(member, opts = {}) {
|
|
|
1531
2067
|
if (typeof renewTimer.unref === 'function') renewTimer.unref();
|
|
1532
2068
|
}
|
|
1533
2069
|
try {
|
|
2070
|
+
// Read refs/dolt/data before the first push so a push that reports
|
|
2071
|
+
// success can be checked against it (see "D-push landed check" above).
|
|
2072
|
+
// Inside the mutex: no other push from this fleet can move the tip
|
|
2073
|
+
// between this read and our push.
|
|
2074
|
+
landedCheck = await beginDoltPushLandedCheck(member, { command, log });
|
|
1534
2075
|
return await doltPushGuarded();
|
|
1535
2076
|
} finally {
|
|
1536
|
-
|
|
1537
|
-
|
|
1538
|
-
|
|
1539
|
-
|
|
1540
|
-
|
|
1541
|
-
|
|
2077
|
+
const releaseMutex = async () => {
|
|
2078
|
+
if (renewTimer) clearInterval(renewTimer);
|
|
2079
|
+
if (grant && mutex && typeof mutex.release === 'function') {
|
|
2080
|
+
try {
|
|
2081
|
+
await mutex.release(grant.token);
|
|
2082
|
+
} catch (relErr) {
|
|
2083
|
+
log(`[Dolt] mutex release after D-push for member '${member}' failed (non-fatal; lease will expire): ${relErr.message}`);
|
|
2084
|
+
}
|
|
1542
2085
|
}
|
|
2086
|
+
};
|
|
2087
|
+
if (abandonedAttempts.length > 0 && grant) {
|
|
2088
|
+
// A `bd dolt push` this bracket stopped waiting for is still
|
|
2089
|
+
// running on the member and could still publish once the lock
|
|
2090
|
+
// frees. Releasing the mutex now would let another writer push
|
|
2091
|
+
// concurrently with it, so the mutex (and its lease renewal) is
|
|
2092
|
+
// held until that command ends -- bounded by its own command
|
|
2093
|
+
// timeout -- while this call returns immediately.
|
|
2094
|
+
log(`[Dolt] D-push for member '${member}' stopped waiting for a sync command that is still running on the member; keeping the push mutex until that command ends so it cannot publish concurrently with another writer.`);
|
|
2095
|
+
Promise.allSettled(abandonedAttempts).then(releaseMutex);
|
|
2096
|
+
} else {
|
|
2097
|
+
await releaseMutex();
|
|
1543
2098
|
}
|
|
1544
2099
|
}
|
|
1545
2100
|
|
|
@@ -1581,14 +2136,57 @@ export async function doltPushAfter(member, opts = {}) {
|
|
|
1581
2136
|
}
|
|
1582
2137
|
}
|
|
1583
2138
|
|
|
2139
|
+
/**
|
|
2140
|
+
* A push step reported success. Decide whether it actually landed (see
|
|
2141
|
+
* "D-push landed check" above) before logging it as landed or returning
|
|
2142
|
+
* success. A push that provably did not land is retried once; if it still
|
|
2143
|
+
* did not land, a DoltSyncError with details.kind 'push-not-landed' is
|
|
2144
|
+
* thrown for the caller's degrade/fatal policy (DoltSync.syncAfter).
|
|
2145
|
+
*/
|
|
2146
|
+
async function confirmPushLanded(result, label) {
|
|
2147
|
+
let verdict = await checkDoltPushLanded(member, { command, check: landedCheck });
|
|
2148
|
+
if (verdict.status === 'not-landed') {
|
|
2149
|
+
log(`[Dolt] ${label} reported success but the push did NOT land: ${verdict.why}. Retrying the push once.`);
|
|
2150
|
+
const retry = await runDoltStep({
|
|
2151
|
+
command, member, cmd: 'bd dolt push',
|
|
2152
|
+
label: `D-push retry after an unlanded push for '${member}'`, log, maxTransientRetries, onAuthFailure, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now, memberTarget, lockProbeAfterMs, lockProbeTimer, onAbandonedAttempt,
|
|
2153
|
+
});
|
|
2154
|
+
const typedRetryError = retry.ok ? null : typedStepError(member, 'push retry after an unlanded push', retry);
|
|
2155
|
+
if (typedRetryError) {
|
|
2156
|
+
clearLastSyncedTip(member);
|
|
2157
|
+
throw typedRetryError;
|
|
2158
|
+
}
|
|
2159
|
+
const firstWhy = verdict.why;
|
|
2160
|
+
verdict = retry.ok
|
|
2161
|
+
? await checkDoltPushLanded(member, { command, check: landedCheck })
|
|
2162
|
+
: { status: 'not-landed', why: `${firstWhy}; the retry push failed: ${retry.error}` };
|
|
2163
|
+
if (verdict.status === 'not-landed') {
|
|
2164
|
+
clearLastSyncedTip(member);
|
|
2165
|
+
throw new DoltSyncError(
|
|
2166
|
+
`[Dolt] D-push for member '${member}' did not land on the remote: \`bd dolt push\` reported success but ${verdict.why}. The member's beads changes have NOT reached the shared remote.`,
|
|
2167
|
+
{ member, doltOutput: verdict.why, details: { kind: 'push-not-landed', operation: 'push' } },
|
|
2168
|
+
);
|
|
2169
|
+
}
|
|
2170
|
+
}
|
|
2171
|
+
if (verdict.status === 'up-to-date') {
|
|
2172
|
+
clearLastSyncedTip(member);
|
|
2173
|
+
log(`[Dolt] D-push for member '${member}': nothing to publish (${DOLT_DATA_REF} unchanged and the clone holds no changes the remote lacks).`);
|
|
2174
|
+
return { ...result, upToDate: true };
|
|
2175
|
+
}
|
|
2176
|
+
if (verdict.status === 'unverified' && landedCheck.url) {
|
|
2177
|
+
log(`[Dolt] D-push for member '${member}' reported success, but whether it landed could not be verified: ${verdict.why}`);
|
|
2178
|
+
}
|
|
2179
|
+
forgetTipAfterPush();
|
|
2180
|
+
return result;
|
|
2181
|
+
}
|
|
2182
|
+
|
|
1584
2183
|
async function doltPushGuarded() {
|
|
1585
2184
|
let push = await runDoltStep({
|
|
1586
2185
|
command, member, cmd: 'bd dolt push',
|
|
1587
|
-
label: `D-push for '${member}'`, log, maxTransientRetries, onAuthFailure, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now,
|
|
2186
|
+
label: `D-push for '${member}'`, log, maxTransientRetries, onAuthFailure, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now, memberTarget, lockProbeAfterMs, lockProbeTimer, onAbandonedAttempt,
|
|
1588
2187
|
});
|
|
1589
2188
|
if (push.ok) {
|
|
1590
|
-
|
|
1591
|
-
return { ok: true, member, pushed: true, reconciled: false };
|
|
2189
|
+
return await confirmPushLanded({ ok: true, member, pushed: true, reconciled: false }, `D-push for member '${member}'`);
|
|
1592
2190
|
}
|
|
1593
2191
|
|
|
1594
2192
|
if (push.kind === 'no-remote') {
|
|
@@ -1624,6 +2222,9 @@ export async function doltPushAfter(member, opts = {}) {
|
|
|
1624
2222
|
{ member, doltOutput: push.error, details: { kind: 'auth', operation: 'push' } },
|
|
1625
2223
|
);
|
|
1626
2224
|
}
|
|
2225
|
+
if (push.kind === 'missing-tool') {
|
|
2226
|
+
throw missingToolSyncError(member, 'push', push);
|
|
2227
|
+
}
|
|
1627
2228
|
if (push.kind === 'remote-unreachable') {
|
|
1628
2229
|
const url = extractDoltRemoteUrl(push.error);
|
|
1629
2230
|
throw new DoltSyncError(
|
|
@@ -1631,6 +2232,8 @@ export async function doltPushAfter(member, opts = {}) {
|
|
|
1631
2232
|
{ member, doltOutput: push.error, remoteUrl: url },
|
|
1632
2233
|
);
|
|
1633
2234
|
}
|
|
2235
|
+
const typedPushError = typedStepError(member, 'push', push);
|
|
2236
|
+
if (typedPushError) throw typedPushError;
|
|
1634
2237
|
throw new DoltSyncError(
|
|
1635
2238
|
`[Dolt] D-push for member '${member}' failed: ${push.error}`,
|
|
1636
2239
|
{ member, doltOutput: push.error },
|
|
@@ -1643,7 +2246,7 @@ export async function doltPushAfter(member, opts = {}) {
|
|
|
1643
2246
|
log(`[Dolt] D-push for member '${member}' was rejected (another writer pushed first); reconciling with a single D-pull then one re-push (first-successful-pusher-wins).`);
|
|
1644
2247
|
const reconcile = await runDoltStep({
|
|
1645
2248
|
command, member, cmd: 'bd dolt pull',
|
|
1646
|
-
label: `D-push reconcile pull for '${member}'`, log, maxTransientRetries, onAuthFailure, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now,
|
|
2249
|
+
label: `D-push reconcile pull for '${member}'`, log, maxTransientRetries, onAuthFailure, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now, memberTarget, lockProbeAfterMs, lockProbeTimer, onAbandonedAttempt,
|
|
1647
2250
|
});
|
|
1648
2251
|
if (!reconcile.ok) {
|
|
1649
2252
|
if (reconcile.kind === 'diverged') {
|
|
@@ -1655,19 +2258,24 @@ export async function doltPushAfter(member, opts = {}) {
|
|
|
1655
2258
|
'push-reconcile',
|
|
1656
2259
|
);
|
|
1657
2260
|
}
|
|
2261
|
+
const typedReconcileError = typedStepError(member, 'push reconcile pull', reconcile);
|
|
2262
|
+
if (typedReconcileError) throw typedReconcileError;
|
|
1658
2263
|
throw new DoltSyncError(
|
|
1659
2264
|
`[Dolt] D-push reconcile pull for member '${member}' failed: ${reconcile.error}`,
|
|
1660
2265
|
{ member, doltOutput: reconcile.error },
|
|
1661
2266
|
);
|
|
1662
2267
|
}
|
|
1663
2268
|
|
|
2269
|
+
// The remote moved under the rejected first push (that is why it was
|
|
2270
|
+
// rejected), so the landed check's pre-push tip is re-read now: compared
|
|
2271
|
+
// against the stale one, another writer's push would read as ours landing.
|
|
2272
|
+
landedCheck = await beginDoltPushLandedCheck(member, { command, log });
|
|
1664
2273
|
push = await runDoltStep({
|
|
1665
2274
|
command, member, cmd: 'bd dolt push',
|
|
1666
|
-
label: `D-push re-push after reconcile for '${member}'`, log, maxTransientRetries, onAuthFailure, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now,
|
|
2275
|
+
label: `D-push re-push after reconcile for '${member}'`, log, maxTransientRetries, onAuthFailure, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now, memberTarget, lockProbeAfterMs, lockProbeTimer, onAbandonedAttempt,
|
|
1667
2276
|
});
|
|
1668
2277
|
if (push.ok) {
|
|
1669
|
-
|
|
1670
|
-
return { ok: true, member, pushed: true, reconciled: true };
|
|
2278
|
+
return await confirmPushLanded({ ok: true, member, pushed: true, reconciled: true }, `D-push re-push after reconcile for member '${member}'`);
|
|
1671
2279
|
}
|
|
1672
2280
|
|
|
1673
2281
|
if (push.kind === 'auth' && !push.selfHealed) {
|
|
@@ -1726,7 +2334,7 @@ export async function doltPushAfter(member, opts = {}) {
|
|
|
1726
2334
|
|
|
1727
2335
|
const secondReconcile = await runDoltStep({
|
|
1728
2336
|
command, member, cmd: 'bd dolt pull',
|
|
1729
|
-
label: `D-push second reconcile pull for '${member}'`, log, maxTransientRetries, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now,
|
|
2337
|
+
label: `D-push second reconcile pull for '${member}'`, log, maxTransientRetries, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now, memberTarget, lockProbeAfterMs, lockProbeTimer, onAbandonedAttempt,
|
|
1730
2338
|
});
|
|
1731
2339
|
if (!secondReconcile.ok) {
|
|
1732
2340
|
if (secondReconcile.kind === 'diverged') {
|
|
@@ -1738,19 +2346,21 @@ export async function doltPushAfter(member, opts = {}) {
|
|
|
1738
2346
|
'push-reconcile',
|
|
1739
2347
|
);
|
|
1740
2348
|
}
|
|
2349
|
+
const typedSecondReconcileError = typedStepError(member, 'push second reconcile pull', secondReconcile);
|
|
2350
|
+
if (typedSecondReconcileError) throw typedSecondReconcileError;
|
|
1741
2351
|
throw new DoltSyncError(
|
|
1742
2352
|
`[Dolt] D-push second reconcile pull for member '${member}' failed: ${secondReconcile.error}`,
|
|
1743
2353
|
{ member, doltOutput: secondReconcile.error },
|
|
1744
2354
|
);
|
|
1745
2355
|
}
|
|
1746
2356
|
|
|
2357
|
+
landedCheck = await beginDoltPushLandedCheck(member, { command, log });
|
|
1747
2358
|
push = await runDoltStep({
|
|
1748
2359
|
command, member, cmd: 'bd dolt push',
|
|
1749
|
-
label: `D-push second re-push after reconcile for '${member}'`, log, maxTransientRetries, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now,
|
|
2360
|
+
label: `D-push second re-push after reconcile for '${member}'`, log, maxTransientRetries, sleep, backoffBaseMs, timeoutS, spawnOutageBudgetMs, now, memberTarget, lockProbeAfterMs, lockProbeTimer, onAbandonedAttempt,
|
|
1750
2361
|
});
|
|
1751
2362
|
if (push.ok) {
|
|
1752
|
-
|
|
1753
|
-
return { ok: true, member, pushed: true, reconciled: true };
|
|
2363
|
+
return await confirmPushLanded({ ok: true, member, pushed: true, reconciled: true }, `D-push second re-push after reconcile for member '${member}'`);
|
|
1754
2364
|
}
|
|
1755
2365
|
|
|
1756
2366
|
return await surfaceDivergence(
|
|
@@ -1905,16 +2515,20 @@ export function classifySyncError(err) {
|
|
|
1905
2515
|
// doltPushAfter), so it always maps to 'conflict-unresolvable' here, never
|
|
1906
2516
|
// 'conflict-resolvable' (that state exists only transiently, mid-reconcile,
|
|
1907
2517
|
// and is never itself reported as a degraded terminal outcome).
|
|
1908
|
-
const NEUTRAL_KIND_MAP = {
|
|
2518
|
+
export const NEUTRAL_KIND_MAP = Object.freeze({
|
|
1909
2519
|
diverged: 'conflict-unresolvable',
|
|
1910
2520
|
auth: 'auth',
|
|
1911
2521
|
transient: 'transient',
|
|
1912
2522
|
'no-remote': 'no-store',
|
|
1913
2523
|
'empty-remote': 'no-store',
|
|
1914
2524
|
'remote-unreachable': 'store-unreachable',
|
|
2525
|
+
// A missing bd/dolt binary on the member (GitHub #616). The ADR taxonomy
|
|
2526
|
+
// has no environment-fault kind, and 'store-unreachable' would misreport a
|
|
2527
|
+
// reachable store, so it maps to 'unknown' -- explicitly, not by fallback.
|
|
2528
|
+
'missing-tool': 'unknown',
|
|
1915
2529
|
unknown: 'unknown',
|
|
1916
2530
|
error: 'unknown',
|
|
1917
|
-
};
|
|
2531
|
+
});
|
|
1918
2532
|
|
|
1919
2533
|
/**
|
|
1920
2534
|
* Map an adapter-flavored outcome `kind` (classifySyncError's return value) to
|