@apralabs/apra-fleet 0.4.2 → 0.4.4
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 +103 -34
- package/dist/agents/backlog-groomer.md +87 -14
- package/dist/agents/ci-watcher.md +35 -9
- package/dist/agents/deployer.md +63 -11
- package/dist/agents/doer.md +99 -41
- package/dist/agents/harvester.md +47 -27
- package/dist/agents/integ-test-runner.md +38 -10
- package/dist/agents/kb-reconciler.md +37 -7
- package/dist/agents/plan-reviewer.md +145 -32
- package/dist/agents/planner.md +180 -69
- package/dist/agents/regression-test-runner.md +98 -64
- package/dist/agents/reviewer.md +117 -45
- package/dist/agents/schemas/backlog-groomer-output.json +1 -1
- package/dist/agents/schemas/doer-output.json +32 -0
- package/dist/agents/schemas/harvester-input.json +1 -5
- package/dist/agents/schemas/plan-reviewer-output.json +37 -0
- 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 +62 -3
- package/dist/cli/agent-transform.d.ts +90 -2
- package/dist/cli/agent-transform.js +310 -20
- package/dist/cli/auth.d.ts +1 -0
- package/dist/cli/auth.js +66 -17
- 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 +27 -0
- package/dist/cli/call.d.ts +27 -0
- package/dist/cli/call.js +177 -0
- package/dist/cli/config.d.ts +31 -6
- package/dist/cli/config.js +113 -36
- package/dist/cli/dolt-install.d.ts +18 -2
- package/dist/cli/dolt-install.js +46 -15
- package/dist/cli/fleet-se-guard.d.ts +51 -0
- package/dist/cli/fleet-se-guard.js +215 -0
- package/dist/cli/install-guard.d.ts +54 -0
- package/dist/cli/install-guard.js +132 -4
- package/dist/cli/install.d.ts +100 -11
- package/dist/cli/install.js +864 -139
- package/dist/cli/kb-commit.d.ts +2 -1
- package/dist/cli/kb-commit.js +1 -1
- package/dist/cli/kb-directives.js +2 -1
- package/dist/cli/kb-import.d.ts +2 -1
- package/dist/cli/kb-import.js +1 -1
- package/dist/cli/register-member.js +26 -5
- 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 +59 -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 +101 -15
- package/dist/cli/update.js +33 -2
- package/dist/cli/watch.js +1 -1
- package/dist/cli/workflow.js +3 -2
- package/dist/commands/kb-server.d.ts +3 -0
- package/dist/commands/kb-server.js +52 -5
- package/dist/hub-service/http-server.d.ts +5 -1
- package/dist/hub-service/http-server.js +55 -5
- package/dist/index.js +158 -11
- package/dist/os/child-env-bound.d.ts +77 -0
- package/dist/os/child-env-bound.js +171 -0
- package/dist/os/linux.d.ts +13 -2
- package/dist/os/linux.js +75 -16
- package/dist/os/macos.d.ts +1 -1
- package/dist/os/macos.js +2 -11
- package/dist/os/os-commands.d.ts +78 -4
- package/dist/os/windows-gitbash.d.ts +6 -0
- package/dist/os/windows-gitbash.js +32 -3
- package/dist/os/windows-wrapper.d.ts +0 -4
- package/dist/os/windows-wrapper.js +2 -1
- package/dist/os/windows.d.ts +11 -2
- package/dist/os/windows.js +121 -32
- package/dist/paths.d.ts +21 -0
- package/dist/paths.js +35 -0
- package/dist/providers/agy.d.ts +120 -7
- package/dist/providers/agy.js +741 -86
- 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 +132 -6
- package/dist/providers/claude.js +644 -48
- package/dist/providers/codex.d.ts +4 -2
- package/dist/providers/codex.js +23 -2
- package/dist/providers/copilot.d.ts +4 -2
- package/dist/providers/copilot.js +24 -2
- package/dist/providers/none.d.ts +4 -2
- package/dist/providers/none.js +17 -2
- package/dist/providers/opencode.d.ts +12 -2
- package/dist/providers/opencode.js +135 -54
- package/dist/providers/provider.d.ts +368 -35
- package/dist/providers/provider.js +219 -2
- 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 +103 -0
- package/dist/services/agy-project.js +354 -0
- package/dist/services/auth-socket.d.ts +25 -0
- package/dist/services/auth-socket.js +72 -27
- package/dist/services/auth-web.js +2 -2
- 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 +52 -6
- package/dist/services/cloud/task-wrapper.d.ts +0 -9
- package/dist/services/cloud/task-wrapper.js +15 -6
- package/dist/services/credential-cleanup.js +35 -17
- package/dist/services/event-loop-watchdog.d.ts +32 -0
- package/dist/services/event-loop-watchdog.js +140 -0
- package/dist/services/exit-drain.d.ts +44 -0
- package/dist/services/exit-drain.js +52 -0
- package/dist/services/github-app.js +32 -4
- package/dist/services/http-transport.d.ts +50 -1
- package/dist/services/http-transport.js +238 -25
- package/dist/services/in-flight-agents.d.ts +2 -0
- package/dist/services/in-flight-agents.js +4 -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 +113 -0
- package/dist/services/knowledge/bible-import.d.ts +65 -0
- package/dist/services/knowledge/bible-import.js +211 -0
- package/dist/services/knowledge/file-hash.d.ts +31 -0
- package/dist/services/knowledge/file-hash.js +153 -23
- package/dist/services/knowledge/http-provider.d.ts +4 -3
- package/dist/services/knowledge/http-provider.js +17 -5
- package/dist/services/knowledge/kb-config.d.ts +42 -0
- package/dist/services/knowledge/kb-config.js +54 -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 +11 -1
- package/dist/services/knowledge/kb-providers.js +199 -17
- 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 +91 -0
- package/dist/services/knowledge/kb-self.js +198 -0
- package/dist/services/knowledge/member-bible-view.d.ts +21 -0
- package/dist/services/knowledge/member-bible-view.js +194 -0
- package/dist/services/knowledge/pre-init.js +1 -0
- package/dist/services/knowledge/project-slug.js +2 -2
- package/dist/services/knowledge/require-sqlite-project.d.ts +32 -0
- package/dist/services/knowledge/require-sqlite-project.js +38 -0
- package/dist/services/knowledge/sqlite-provider.d.ts +64 -11
- package/dist/services/knowledge/sqlite-provider.js +303 -41
- package/dist/services/knowledge/types.d.ts +45 -2
- package/dist/services/member-access-secret.d.ts +70 -0
- package/dist/services/member-access-secret.js +195 -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 +192 -0
- package/dist/services/member-config-io.js +443 -0
- package/dist/services/member-fleet-install.d.ts +710 -0
- package/dist/services/member-fleet-install.js +1895 -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 +111 -0
- package/dist/services/model-pricing.d.ts +19 -0
- package/dist/services/model-pricing.js +60 -10
- package/dist/services/port-holder.d.ts +86 -0
- package/dist/services/port-holder.js +351 -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/secret-token.d.ts +38 -0
- package/dist/services/secret-token.js +51 -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 +39 -2
- package/dist/services/service-manager/types.js +29 -0
- package/dist/services/service-manager/windows.d.ts +194 -3
- package/dist/services/service-manager/windows.js +705 -30
- package/dist/services/service-notice.d.ts +14 -0
- package/dist/services/service-notice.js +62 -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/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 +287 -40
- 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 +53 -12
- package/dist/services/stall/stall-detector.d.ts +78 -5
- package/dist/services/stall/stall-detector.js +296 -39
- package/dist/services/stall/stall-poller.d.ts +16 -0
- package/dist/services/stall/stall-poller.js +50 -6
- 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 +165 -19
- package/dist/services/substitution-engine.js +2 -2
- package/dist/services/supervisor-service-cleanup.d.ts +52 -0
- package/dist/services/supervisor-service-cleanup.js +332 -0
- package/dist/services/tool-registry.d.ts +8 -1
- package/dist/services/tool-registry.js +164 -61
- package/dist/services/tool-scope.d.ts +58 -0
- package/dist/services/tool-scope.js +99 -0
- package/dist/services/vcs/azure-devops.d.ts +66 -1
- package/dist/services/vcs/azure-devops.js +192 -21
- package/dist/services/vcs/types.d.ts +1 -1
- package/dist/services/watch/project-resolver.js +1 -0
- package/dist/skills/auto-sprint-args/SKILL.md +2 -2
- package/dist/skills/fleet-sprint-cli/SKILL.md +48 -6
- package/dist/skills/pm/SKILL.md +4 -4
- package/dist/skills/pm/cost.md +0 -3
- package/dist/skills/pm/fleet-addendum.md +2 -2
- package/dist/skills/pm/index.md +4 -2
- package/dist/skills/pm/kb-reconcile.md +29 -14
- package/dist/skills/pm/kb-review.md +1 -0
- package/dist/skills/pm/sprint.md +5 -5
- package/dist/tools/check-status.d.ts +60 -9
- package/dist/tools/check-status.js +211 -52
- 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 +30 -0
- package/dist/tools/code-intelligence-gitnexus.js +333 -57
- package/dist/tools/code-intelligence-kb-enrich.js +7 -6
- package/dist/tools/code-intelligence-readiness.d.ts +99 -0
- package/dist/tools/code-intelligence-readiness.js +206 -0
- package/dist/tools/code-intelligence-reindex.d.ts +195 -0
- package/dist/tools/code-intelligence-reindex.js +530 -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 +63 -2
- package/dist/tools/compose-permissions.js +673 -72
- package/dist/tools/credential-store-set.js +1 -1
- package/dist/tools/execute-command.d.ts +11 -0
- package/dist/tools/execute-command.js +111 -32
- package/dist/tools/execute-prompt.d.ts +69 -12
- package/dist/tools/execute-prompt.js +1610 -895
- package/dist/tools/kb-bible-commit.d.ts +65 -0
- package/dist/tools/kb-bible-commit.js +239 -0
- package/dist/tools/kb-capture.d.ts +15 -11
- package/dist/tools/kb-capture.js +71 -16
- package/dist/tools/kb-context.d.ts +27 -7
- package/dist/tools/kb-context.js +60 -9
- package/dist/tools/kb-export.d.ts +98 -9
- package/dist/tools/kb-export.js +230 -92
- package/dist/tools/kb-feedback.d.ts +13 -9
- package/dist/tools/kb-feedback.js +16 -8
- package/dist/tools/kb-freshness-sweep.d.ts +11 -7
- package/dist/tools/kb-freshness-sweep.js +10 -8
- package/dist/tools/kb-harvest.d.ts +11 -7
- package/dist/tools/kb-harvest.js +7 -7
- package/dist/tools/kb-import.d.ts +26 -10
- package/dist/tools/kb-import.js +170 -159
- package/dist/tools/kb-invalidate.d.ts +17 -10
- package/dist/tools/kb-invalidate.js +41 -8
- package/dist/tools/kb-list.d.ts +14 -10
- package/dist/tools/kb-list.js +33 -11
- package/dist/tools/kb-promote.d.ts +11 -7
- package/dist/tools/kb-promote.js +14 -8
- package/dist/tools/kb-query.d.ts +21 -11
- package/dist/tools/kb-query.js +76 -13
- package/dist/tools/kb-reconcile-prefilter.d.ts +11 -7
- package/dist/tools/kb-reconcile-prefilter.js +13 -9
- package/dist/tools/kb-resolve-contradiction.d.ts +11 -7
- package/dist/tools/kb-resolve-contradiction.js +10 -8
- package/dist/tools/kb-session-prime.d.ts +14 -7
- package/dist/tools/kb-session-prime.js +44 -44
- package/dist/tools/kb-setup.d.ts +11 -4
- package/dist/tools/kb-setup.js +146 -27
- package/dist/tools/kb-stats.d.ts +11 -10
- package/dist/tools/kb-stats.js +84 -82
- package/dist/tools/list-members.d.ts +2 -2
- package/dist/tools/list-members.js +6 -2
- package/dist/tools/member-detail.d.ts +5 -2
- package/dist/tools/member-detail.js +105 -17
- package/dist/tools/member-reservation.d.ts +60 -3
- package/dist/tools/member-reservation.js +61 -20
- package/dist/tools/provision-auth.d.ts +118 -1
- package/dist/tools/provision-auth.js +402 -92
- package/dist/tools/provision-vcs-auth.d.ts +93 -3
- package/dist/tools/provision-vcs-auth.js +209 -49
- package/dist/tools/receive-files.js +3 -1
- package/dist/tools/register-member.d.ts +44 -15
- package/dist/tools/register-member.js +175 -70
- package/dist/tools/remove-member.js +118 -15
- package/dist/tools/send-email.d.ts +2 -2
- package/dist/tools/send-files.js +6 -4
- package/dist/tools/session-stats.d.ts +17 -0
- package/dist/tools/session-stats.js +27 -0
- package/dist/tools/setup-git-app.js +11 -7
- package/dist/tools/shutdown-server.d.ts +2 -0
- package/dist/tools/shutdown-server.js +28 -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 +23 -17
- package/dist/tools/update-member.js +181 -18
- package/dist/tools/vcs-credential-exec.d.ts +127 -0
- package/dist/tools/vcs-credential-exec.js +203 -0
- package/dist/types.d.ts +111 -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 +108 -22
- 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 +68 -0
- package/dist/utils/prompt-errors.js +11 -2
- package/dist/utils/session-caller.d.ts +4 -2
- package/dist/utils/session-caller.js +3 -2
- package/dist/utils/shell-escape.d.ts +58 -3
- package/dist/utils/shell-escape.js +91 -5
- package/dist/utils/ssh-error-messages.js +3 -0
- package/dist/utils/vcs-provider-detect.d.ts +65 -0
- package/dist/utils/vcs-provider-detect.js +109 -0
- package/dist/utils/workspace-trust.d.ts +26 -0
- package/dist/utils/workspace-trust.js +91 -1
- package/dist/workflows/auto-sprint.js +397 -56
- package/package.json +15 -10
- package/packages/apra-fleet-client/package.json +2 -2
- package/packages/apra-fleet-client/src/client/api.mjs +864 -31
- 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/errors.mjs +6 -2
- package/packages/apra-fleet-client/src/client/factory.mjs +23 -4
- package/packages/apra-fleet-client/src/client/reconnecting-transport.mjs +137 -0
- package/packages/apra-fleet-client/src/client/server-resolution.mjs +267 -30
- package/packages/apra-fleet-client/src/client/transport.mjs +37 -3
- package/packages/apra-fleet-se/apra-pm/agents/_shared/GRAPH-SEMANTICS.md +10 -2
- package/packages/apra-fleet-se/apra-pm/agents/backlog-groomer.md +87 -14
- package/packages/apra-fleet-se/apra-pm/agents/ci-watcher.md +35 -9
- package/packages/apra-fleet-se/apra-pm/agents/deployer.md +63 -11
- package/packages/apra-fleet-se/apra-pm/agents/doer.md +99 -41
- package/packages/apra-fleet-se/apra-pm/agents/harvester.md +47 -27
- package/packages/apra-fleet-se/apra-pm/agents/integ-test-runner.md +38 -10
- package/packages/apra-fleet-se/apra-pm/agents/kb-reconciler.md +37 -7
- package/packages/apra-fleet-se/apra-pm/agents/plan-reviewer.md +145 -32
- package/packages/apra-fleet-se/apra-pm/agents/planner.md +180 -69
- package/packages/apra-fleet-se/apra-pm/agents/regression-test-runner.md +98 -64
- package/packages/apra-fleet-se/apra-pm/agents/reviewer.md +117 -45
- package/packages/apra-fleet-se/apra-pm/agents/schemas/backlog-groomer-output.json +1 -1
- package/packages/apra-fleet-se/apra-pm/agents/schemas/doer-output.json +32 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/harvester-input.json +1 -5
- package/packages/apra-fleet-se/apra-pm/agents/schemas/plan-reviewer-output.json +37 -0
- 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 +62 -3
- package/packages/apra-fleet-se/apra-pm/skills/pm/SKILL.md +4 -4
- package/packages/apra-fleet-se/apra-pm/skills/pm/cost.md +0 -3
- package/packages/apra-fleet-se/apra-pm/skills/pm/fleet-addendum.md +2 -2
- package/packages/apra-fleet-se/apra-pm/skills/pm/index.md +4 -2
- 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 +5 -5
- package/packages/apra-fleet-se/bin/cli.mjs +326 -48
- package/packages/apra-fleet-se/bin/serve.mjs +218 -11
- package/packages/apra-fleet-se/fleet-sprint/abort.mjs +517 -0
- package/packages/apra-fleet-se/fleet-sprint/backlog-role.mjs +93 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-children.mjs +646 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-identity-check.mjs +825 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-identity.mjs +217 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-memory-hygiene.mjs +201 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-scope.mjs +745 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-transitions.mjs +447 -0
- package/packages/apra-fleet-se/fleet-sprint/branch-ensure.mjs +96 -0
- package/packages/apra-fleet-se/fleet-sprint/ci-gate.mjs +353 -0
- package/packages/apra-fleet-se/fleet-sprint/conflict-ladder.mjs +20 -0
- package/packages/apra-fleet-se/fleet-sprint/contracts.mjs +121 -15
- package/packages/apra-fleet-se/fleet-sprint/coordination.mjs +539 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-accounting.mjs +270 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-failure.mjs +204 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-role.mjs +1310 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-safety-guard.mjs +216 -4
- package/packages/apra-fleet-se/fleet-sprint/docs/README.md +53 -15
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-sync-redesign.md +281 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/escalate-to-llm-design.md +1 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/fleet-sprint-diagram.md +3 -3
- package/packages/apra-fleet-se/fleet-sprint/docs/run-sprint-cycle-prelude-decision.md +215 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-literal-guard.mjs +56 -1
- package/packages/apra-fleet-se/fleet-sprint/dolt-sync.mjs +1327 -44
- package/packages/apra-fleet-se/fleet-sprint/errors.mjs +470 -4
- package/packages/apra-fleet-se/fleet-sprint/explicit-id-create-guard.mjs +501 -0
- package/packages/apra-fleet-se/fleet-sprint/fatal-diagnostics.mjs +134 -0
- package/packages/apra-fleet-se/fleet-sprint/full-db-fetch-guard.mjs +102 -0
- package/packages/apra-fleet-se/fleet-sprint/git-sync.mjs +747 -0
- package/packages/apra-fleet-se/fleet-sprint/git-topology.mjs +543 -0
- package/packages/apra-fleet-se/fleet-sprint/guarded-modules.mjs +613 -0
- package/packages/apra-fleet-se/fleet-sprint/inline-ladder-guard.mjs +216 -0
- 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 +1684 -0
- package/packages/apra-fleet-se/fleet-sprint/lower-quality.mjs +39 -0
- package/packages/apra-fleet-se/fleet-sprint/mcp-result.mjs +75 -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 +699 -0
- package/packages/apra-fleet-se/fleet-sprint/member-sync.mjs +802 -0
- package/packages/apra-fleet-se/fleet-sprint/member-target.mjs +93 -0
- package/packages/apra-fleet-se/fleet-sprint/newtask-text.mjs +266 -0
- package/packages/apra-fleet-se/fleet-sprint/orphan-reclaim.mjs +153 -0
- package/packages/apra-fleet-se/fleet-sprint/parent-notes-staleness.mjs +201 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/deploy.mjs +218 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/develop.mjs +869 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/ensure-sprint-branch.mjs +295 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/final-review.mjs +466 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/harvest.mjs +212 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/integ-test.mjs +358 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/plan.mjs +395 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/publish-pr.mjs +345 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/re-review.mjs +264 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/regression-test.mjs +179 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/replan.mjs +230 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/review.mjs +365 -0
- package/packages/apra-fleet-se/fleet-sprint/pr-body.mjs +259 -0
- package/packages/apra-fleet-se/fleet-sprint/prompts.mjs +617 -0
- package/packages/apra-fleet-se/fleet-sprint/role-policies.mjs +1434 -0
- package/packages/apra-fleet-se/fleet-sprint/round-session.mjs +100 -0
- package/packages/apra-fleet-se/fleet-sprint/runner.js +2289 -9928
- package/packages/apra-fleet-se/fleet-sprint/se-os-commands.mjs +24 -0
- package/packages/apra-fleet-se/fleet-sprint/se-posix.mjs +147 -12
- package/packages/apra-fleet-se/fleet-sprint/se-windows.mjs +111 -0
- package/packages/apra-fleet-se/fleet-sprint/shell-command-guard.mjs +347 -0
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-sprint-cli/SKILL.md +48 -6
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-supervisor/SKILL.md +98 -25
- package/packages/apra-fleet-se/fleet-sprint/sprint-args.mjs +590 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-report.mjs +339 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-state.mjs +185 -0
- package/packages/apra-fleet-se/fleet-sprint/unbracketed-push-guard.mjs +234 -0
- package/packages/apra-fleet-se/fleet-sprint/usage-limit-controller.mjs +218 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-auth.mjs +1445 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-module.mjs +284 -23
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/azure-devops.mjs +170 -21
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/bitbucket.mjs +28 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/github.mjs +354 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/index.mjs +189 -16
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/shell-helpers.mjs +9 -4
- package/packages/apra-fleet-se/fleet-sprint/verify-block.mjs +152 -0
- package/packages/apra-fleet-se/fleet-sprint/viewer-extensions.mjs +311 -22
- package/packages/apra-fleet-se/fleet-sprint/worklists.mjs +559 -0
- package/packages/apra-fleet-se/package.json +2 -2
- package/packages/apra-fleet-se/src/supervisor/api.mjs +919 -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 +1659 -0
- package/packages/apra-fleet-se/src/supervisor/dolt-mutex.mjs +350 -0
- package/packages/apra-fleet-se/src/supervisor/dolt-orphan-sweep.mjs +338 -0
- package/packages/apra-fleet-se/src/supervisor/fleet-members.mjs +279 -0
- package/packages/apra-fleet-se/src/supervisor/history-view.mjs +276 -0
- package/packages/apra-fleet-se/src/supervisor/history.mjs +328 -0
- package/packages/apra-fleet-se/src/supervisor/id-allocator.mjs +521 -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 +474 -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 +399 -0
- package/packages/apra-fleet-se/src/supervisor/spawner.mjs +542 -0
- package/packages/apra-fleet-se/src/supervisor/sprint-identity.mjs +96 -0
- package/packages/apra-fleet-se/src/supervisor/watchdog.mjs +987 -0
- package/packages/apra-fleet-workflow/package.json +1 -1
- package/packages/apra-fleet-workflow/src/viewer/index.mjs +81 -15
- package/packages/apra-fleet-workflow/src/viewer/run-summary.mjs +127 -0
- package/packages/apra-fleet-workflow/src/workflow/index.mjs +118 -10
- package/packages/apra-fleet-workflow/src/workflow/pricing.mjs +75 -25
- package/skills/fleet/SKILL.md +8 -8
- package/skills/fleet/auth-azdevops.md +14 -3
- package/skills/fleet/auth-bitbucket.md +2 -2
- package/skills/fleet/auth-github.md +5 -4
- package/skills/fleet/onboarding.md +3 -3
- package/skills/fleet/permissions.md +14 -1
- package/skills/fleet/profiles/node.json +1 -1
- package/skills/fleet/profiles/tag-kb-reconciler.json +2 -6
- package/skills/fleet/troubleshooting.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/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/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-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/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/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/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/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
|
@@ -0,0 +1,802 @@
|
|
|
1
|
+
// =============================================================================
|
|
2
|
+
// MEMBER SYNC -- the per-member git/dolt sync brackets
|
|
3
|
+
// (apra-fleet-3swo.6.10)
|
|
4
|
+
// =============================================================================
|
|
5
|
+
//
|
|
6
|
+
// Moved VERBATIM out of runner.js. This module owns the four bracket entry
|
|
7
|
+
// points the orchestrator wraps every dispatch (and every resume) in:
|
|
8
|
+
//
|
|
9
|
+
// 1. syncMemberBefore() -- G-pull: fetch + ff-only merge (or a reset to the
|
|
10
|
+
// remote tip on a mutating retry) before a member does any work.
|
|
11
|
+
// 2. syncMemberAfter() -- G-push: push, with ONE bounded pull-rebase retry
|
|
12
|
+
// and the Tier 2 conflict-resolution dispatch behind it.
|
|
13
|
+
// 3. syncMemberAfterOrdered() -- the ordered post-dispatch step: G-push
|
|
14
|
+
// (code) BEFORE D-push (beads), so a bead close can never be published
|
|
15
|
+
// ahead of the code that justifies it.
|
|
16
|
+
// 4. resyncReacquiredMember() -- the resume path's unconditional
|
|
17
|
+
// re-reconciliation of ONE member that was just re-acquired.
|
|
18
|
+
//
|
|
19
|
+
// These are the CALLERS of the git-topology layer (./git-topology.mjs), not
|
|
20
|
+
// part of it: every git command they issue goes through runGitStep, and every
|
|
21
|
+
// failure they classify goes through resolveGitProviderForClassification.
|
|
22
|
+
// git-topology.mjs's own header records that these four deliberately stayed in
|
|
23
|
+
// runner.js when it was extracted; they now live here, which is why this
|
|
24
|
+
// extraction had to run AFTER that one -- the other order would have forced a
|
|
25
|
+
// temporary back-import from runner.js into the new module.
|
|
26
|
+
//
|
|
27
|
+
// WHY resolveSettleShell did NOT move with them: syncMemberAfterOrdered calls
|
|
28
|
+
// it to resolve the member's registered shell before building the dolt-settle
|
|
29
|
+
// callback, but it stays DEFINED IN runner.js and is imported back from there
|
|
30
|
+
// (see the import below for the anchoring test and the call-site split). It was
|
|
31
|
+
// module-private before this extraction and is now merely exported so this
|
|
32
|
+
// module can reach it; it is not otherwise part of runner.js's moved surface.
|
|
33
|
+
//
|
|
34
|
+
// GUARD REGISTRATION: this module is registered in ./guarded-modules.mjs as
|
|
35
|
+
// part of this extraction (see that file's STANDING RULE). It carries
|
|
36
|
+
// syncMemberAfter's one member_name-bearing command() site -- the Tier 2
|
|
37
|
+
// post-resolution `git status --porcelain` read -- and, more importantly, it
|
|
38
|
+
// is where syncMemberAfterOrdered now lives, which is the sanctioned wrapper
|
|
39
|
+
// unbracketed-push-guard.mjs resolves BY NAME WITHIN A FILE: its bare
|
|
40
|
+
// syncMemberAfter()/DoltSync.syncAfter() calls stay sanctioned only because
|
|
41
|
+
// the wrapper that contains them travelled here with them.
|
|
42
|
+
//
|
|
43
|
+
// Dependency-injection stance is unchanged: nothing here does I/O of its own.
|
|
44
|
+
// Every git command is issued via an injected command() with an explicit
|
|
45
|
+
// `member_name`, and the resume path's git/dolt runners are injected too, so
|
|
46
|
+
// unit tests drive all of it with no live fleet.
|
|
47
|
+
// =============================================================================
|
|
48
|
+
|
|
49
|
+
import { GitDivergedError, GitSyncError } from './errors.mjs';
|
|
50
|
+
import { runGitStep, resolveGitProviderForClassification, isMissingRemoteRefError } from './git-topology.mjs';
|
|
51
|
+
import { parseUnmergedPaths, detectAndAbortRebaseConflict, dispatchConflictResolutionAgent } from './conflict-ladder.mjs';
|
|
52
|
+
import { DoltSync } from './dolt-sync.mjs';
|
|
53
|
+
import { buildSettleCallback } from './dolt-settle.mjs';
|
|
54
|
+
import { decideEnsureBranchAction } from './branch-ensure.mjs';
|
|
55
|
+
// resolveSettleShell stays in runner.js: test/sprint-state.test.mjs anchors it
|
|
56
|
+
// there by symbol ('resolveSettleShell must still exist in runner.js'), and six
|
|
57
|
+
// of its seven call sites are runner.js's own orchestrator-side settle brackets.
|
|
58
|
+
// This is the same runner.js back-import abort.mjs, prompts.mjs and worklists.mjs
|
|
59
|
+
// already use; nothing here touches it at module-evaluation time, so the cycle
|
|
60
|
+
// resolves through the hoisted function declaration at call time.
|
|
61
|
+
import { resolveSettleShell } from './runner.js';
|
|
62
|
+
|
|
63
|
+
// ---------------------------------------------------------------------------
|
|
64
|
+
// Orchestrator-bracketed git sync helpers
|
|
65
|
+
// ---------------------------------------------------------------------------
|
|
66
|
+
//
|
|
67
|
+
// Stance: SINGLE-WRITER TOKEN PASSING. The writer pushes, then the next reader
|
|
68
|
+
// pulls, so every intra-sprint git merge is fast-forward BY CONSTRUCTION. A
|
|
69
|
+
// non-FF result is therefore not a merge to resolve -- it is proof the
|
|
70
|
+
// invariant is already broken, so it is a HARD, TYPED error
|
|
71
|
+
// (GitDivergedError), never auto-resolved.
|
|
72
|
+
//
|
|
73
|
+
// Every bracket must fail-soft-with-retry in a way that DISTINGUISHES
|
|
74
|
+
// transient-retry (network unreachable, an index/ref lock) from diverged-abort
|
|
75
|
+
// (non-FF, unmerged/conflicted paths). A diverged state must NEVER be retried
|
|
76
|
+
// blindly. classifyGitFailure() is that classifier -- it moved to
|
|
77
|
+
// ./git-topology.mjs with runGitStep (apra-fleet-3swo.6.3); the two failure
|
|
78
|
+
// classes surface as two distinct WorkflowError subclasses (GitSyncError vs
|
|
79
|
+
// GitDivergedError) so callers and tests can assert them apart.
|
|
80
|
+
//
|
|
81
|
+
// Every git command is issued via the injected command() with an explicit
|
|
82
|
+
// `member_name` -- agents never run sync themselves; the orchestrator brackets
|
|
83
|
+
// each dispatch. `command` is dependency-injected so unit tests can drive these
|
|
84
|
+
// helpers with a mock command() and no live fleet.
|
|
85
|
+
|
|
86
|
+
// isMissingRemoteRefError() moved to ./git-topology.mjs so runGitStep can skip
|
|
87
|
+
// the auth self-heal for a missing remote ref (apra-fleet-ta3); re-exported
|
|
88
|
+
// here for existing importers.
|
|
89
|
+
export { isMissingRemoteRefError };
|
|
90
|
+
|
|
91
|
+
/**
|
|
92
|
+
* G-pull: bring `member` up to the shared branch tip before it does any work --
|
|
93
|
+
* `git fetch` then `git merge --ff-only`. Because of single-writer token
|
|
94
|
+
* passing this merge is fast-forward by construction; a non-FF result is a
|
|
95
|
+
* distinct typed GitDivergedError (NOT a generic failure), never auto-merged.
|
|
96
|
+
* Transient (network/lock) failures are retried up to `maxTransientRetries`;
|
|
97
|
+
* divergence is never retried.
|
|
98
|
+
*
|
|
99
|
+
* Every git command is issued via the injected command() with an explicit
|
|
100
|
+
* member_name.
|
|
101
|
+
*
|
|
102
|
+
* An optional injected `onAuthFailure` is threaded through to runGitStep's
|
|
103
|
+
* bounded one-shot self-heal, since a stale token can break a pull as easily as
|
|
104
|
+
* a push.
|
|
105
|
+
*
|
|
106
|
+
* An optional `resetToRemoteTip` (default false) changes the pull half from
|
|
107
|
+
* `git merge --ff-only` to `git reset --hard <remote>/<branch>` so a RETRIED
|
|
108
|
+
* doer dispatch resumes on the published tip instead of failing on (or
|
|
109
|
+
* re-committing over) a divergence its own prior attempt left behind. It must
|
|
110
|
+
* only be set on a retry that may have mutated state (withGitSync's
|
|
111
|
+
* resumeOntoRemoteTip); omitting it keeps the ff-only-merge behaviour for every
|
|
112
|
+
* first attempt. Before the reset, any unpublished local commits and
|
|
113
|
+
* uncommitted tracked changes are pinned on a local fleet-salvage/ side ref
|
|
114
|
+
* (see salvageBeforeReset); if that fails, no reset happens.
|
|
115
|
+
*
|
|
116
|
+
* apra-fleet-417.7: an optional injected `resolveMemberProvider` (see
|
|
117
|
+
* createMemberVcsProviderResolver) is resolved ONCE at the top of this call
|
|
118
|
+
* and threaded into every runGitStep call below, so a G-pull auth failure for
|
|
119
|
+
* a non-GitHub member classifies via that member's own provider chain.
|
|
120
|
+
*
|
|
121
|
+
* @param {string} member
|
|
122
|
+
* @param {{ command: Function, log?: Function, maxTransientRetries?: number, remote?: string, branch?: string, onAuthFailure?: Function, resetToRemoteTip?: boolean, resolveMemberProvider?: (member: string) => Promise<string|undefined> }} opts
|
|
123
|
+
* @returns {Promise<{ ok: true, member: string }>}
|
|
124
|
+
*/
|
|
125
|
+
export async function syncMemberBefore(member, opts = {}) {
|
|
126
|
+
const { command, log = () => {}, maxTransientRetries = 1, remote = 'origin', branch, onAuthFailure, resetToRemoteTip = false, resolveMemberProvider } = opts;
|
|
127
|
+
if (typeof command !== 'function') {
|
|
128
|
+
throw new Error("syncMemberBefore requires an injected command() in opts");
|
|
129
|
+
}
|
|
130
|
+
const provider = await resolveGitProviderForClassification(resolveMemberProvider, member, log);
|
|
131
|
+
|
|
132
|
+
const fetchCmd = branch ? `git fetch ${remote} ${branch}` : `git fetch ${remote}`;
|
|
133
|
+
const fetch = await runGitStep({
|
|
134
|
+
command, member, cmd: fetchCmd,
|
|
135
|
+
label: `G-pull fetch for '${member}'`, log, maxTransientRetries, onAuthFailure, provider,
|
|
136
|
+
});
|
|
137
|
+
if (!fetch.ok) {
|
|
138
|
+
// A brand-new sprint branch created locally from base, before its
|
|
139
|
+
// first G-push, makes this fetch fail with "couldn't find remote ref
|
|
140
|
+
// <branch>". That is a benign, expected state: there is nothing on the
|
|
141
|
+
// remote to pull, so the bracket's pull half is a no-op, not an error.
|
|
142
|
+
// Only this precise git message may be treated as
|
|
143
|
+
// branch-doesn't-exist; anything else must still surface.
|
|
144
|
+
if (isMissingRemoteRefError(fetch.error)) {
|
|
145
|
+
log(`[Sync] G-pull for member '${member}': branch '${branch}' does not exist on '${remote}' yet (not pushed); skipping pull (nothing to sync down).`);
|
|
146
|
+
return { ok: true, member };
|
|
147
|
+
}
|
|
148
|
+
// A fetch cannot "diverge" -- any failure here is transient-exhausted
|
|
149
|
+
// or unknown; surface it as a (non-diverged) sync error.
|
|
150
|
+
throw new GitSyncError(
|
|
151
|
+
`[Sync] G-pull fetch failed for member '${member}': ${fetch.error}`,
|
|
152
|
+
{ member, gitOutput: fetch.error },
|
|
153
|
+
);
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
// On a RETRIED dispatch whose prior attempt was not provably a no-mutation
|
|
157
|
+
// failure (it may have committed and/or pushed its streak), `git merge
|
|
158
|
+
// --ff-only` is the wrong recovery: if the prior attempt pushed and the
|
|
159
|
+
// local tip then diverged with a re-implemented duplicate commit, the
|
|
160
|
+
// ff-only merge raises GitDivergedError and the streak can NEVER resume,
|
|
161
|
+
// because every subsequent push/merge fails non-fast-forward. Hard-resetting
|
|
162
|
+
// onto the freshly fetched remote tip makes the retry resume ON TOP of
|
|
163
|
+
// already-published work instead of re-committing it. Only the code checkout
|
|
164
|
+
// is touched (beads live in a separate Dolt clone). A concrete branch is
|
|
165
|
+
// required to name a remote tip; without one this falls through to the
|
|
166
|
+
// ff-only merge below.
|
|
167
|
+
//
|
|
168
|
+
// SALVAGE FIRST (GitHub #716). The reset must never be the only copy of
|
|
169
|
+
// the prior attempt's work: a stall kill or a transport drop can leave real
|
|
170
|
+
// unpublished commits and uncommitted tracked edits behind. Before every
|
|
171
|
+
// reset, salvageBeforeReset() pins them on a LOCAL side ref
|
|
172
|
+
// (fleet-salvage/<branch-slug>/<short-sha>) without moving the sprint
|
|
173
|
+
// branch, staging anything, or touching untracked files. If the salvage
|
|
174
|
+
// cannot be completed the reset does not run (fail closed).
|
|
175
|
+
if (resetToRemoteTip && branch) {
|
|
176
|
+
const resetTarget = `${remote}/${branch}`;
|
|
177
|
+
const salvage = await salvageBeforeReset(member, { command, log, remote, branch });
|
|
178
|
+
const reset = await runGitStep({
|
|
179
|
+
command, member, cmd: `git reset --hard ${resetTarget}`,
|
|
180
|
+
label: `G-pull reset-to-remote-tip for '${member}'`, log, maxTransientRetries, onAuthFailure, provider,
|
|
181
|
+
});
|
|
182
|
+
if (!reset.ok) {
|
|
183
|
+
const salvageNote = salvage ? ` The prior work is also saved on local ref '${salvage.ref}'.` : '';
|
|
184
|
+
throw new GitSyncError(
|
|
185
|
+
`[Sync] G-pull reset-to-remote-tip failed for member '${member}'; the local branch was left at its prior tip.${salvageNote} ${reset.error}`,
|
|
186
|
+
{ member, gitOutput: reset.error, details: salvage ? { salvageRef: salvage.ref } : undefined },
|
|
187
|
+
);
|
|
188
|
+
}
|
|
189
|
+
log(`[Sync] G-pull for member '${member}': hard-reset local branch onto '${resetTarget}' so a retried dispatch resumes on the published tip instead of re-committing.`);
|
|
190
|
+
return salvage ? { ok: true, member, salvageRef: salvage.ref } : { ok: true, member };
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
const mergeCmd = branch ? `git merge --ff-only ${remote}/${branch}` : 'git merge --ff-only';
|
|
194
|
+
const merge = await runGitStep({
|
|
195
|
+
command, member, cmd: mergeCmd,
|
|
196
|
+
label: `G-pull ff-only merge for '${member}'`, log, maxTransientRetries, onAuthFailure, provider,
|
|
197
|
+
});
|
|
198
|
+
if (!merge.ok) {
|
|
199
|
+
if (merge.kind === 'diverged') {
|
|
200
|
+
throw new GitDivergedError(
|
|
201
|
+
`[Sync] G-pull for member '${member}' could not fast-forward -- it has DIVERGED from the shared branch and must not be auto-merged: ${merge.error}`,
|
|
202
|
+
{ member, gitOutput: merge.error, operation: 'pull' },
|
|
203
|
+
);
|
|
204
|
+
}
|
|
205
|
+
throw new GitSyncError(
|
|
206
|
+
`[Sync] G-pull ff-only merge failed for member '${member}': ${merge.error}`,
|
|
207
|
+
{ member, gitOutput: merge.error },
|
|
208
|
+
);
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
return { ok: true, member };
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
// G-push landed check. `git push` exiting 0 is not proof the shared branch
|
|
215
|
+
// now carries this member's work (a push reported as success by a transport
|
|
216
|
+
// that never delivered it was read as landed). After a push reports success,
|
|
217
|
+
// confirm the remote branch CONTAINS the local HEAD: equal tips, or -- when
|
|
218
|
+
// another writer pushed on top of ours in the meantime -- a remote tip that
|
|
219
|
+
// has our HEAD as an ancestor. Only positive evidence that the branch lacks
|
|
220
|
+
// our HEAD fails the push; an inconclusive read (unparseable output, a failed
|
|
221
|
+
// fetch, no branch name) keeps the pre-check behavior and is logged.
|
|
222
|
+
|
|
223
|
+
/** Refs/remotes safe to place in a command string on any member shell. */
|
|
224
|
+
const SAFE_GIT_NAME_RE = /^[A-Za-z0-9._/-]+$/;
|
|
225
|
+
const GIT_SHA_RE = /^[0-9a-f]{40,64}$/i;
|
|
226
|
+
|
|
227
|
+
function outputOf(res) {
|
|
228
|
+
if (!res || res.ok === false) return null;
|
|
229
|
+
return String((typeof res === 'object' ? res.output : res) ?? '');
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
// ---------------------------------------------------------------------------
|
|
233
|
+
// Retry salvage (GitHub #716)
|
|
234
|
+
// ---------------------------------------------------------------------------
|
|
235
|
+
//
|
|
236
|
+
// syncMemberBefore's resetToRemoteTip mode runs `git reset --hard` on a member
|
|
237
|
+
// checkout whose prior attempt may have been killed mid-work. That reset must
|
|
238
|
+
// never destroy work that exists nowhere else, so salvageBeforeReset() first
|
|
239
|
+
// pins it on a LOCAL side ref:
|
|
240
|
+
//
|
|
241
|
+
// - `git rev-parse HEAD <remote>/<branch>` and `git rev-list --count` decide
|
|
242
|
+
// whether the local branch has commits the remote tip lacks;
|
|
243
|
+
// - `git stash create` snapshots uncommitted TRACKED changes as a dangling
|
|
244
|
+
// commit WITHOUT touching the index, the work tree or the stash reflog
|
|
245
|
+
// (untracked files -- .env, build output, provider permission files the
|
|
246
|
+
// fleet writes into the work folder -- are excluded by design and are not
|
|
247
|
+
// deleted by `reset --hard` either). The stash commit's first parent is
|
|
248
|
+
// HEAD, so one ref on it reaches both the WIP and every local commit;
|
|
249
|
+
// - `git branch -f fleet-salvage/<branch-slug>/<short-sha> <sha>` creates
|
|
250
|
+
// the ref. The sprint branch itself is never moved, nothing is staged and
|
|
251
|
+
// nothing is committed on it, and the ref is never pushed (every push in
|
|
252
|
+
// this module names the sprint branch explicitly).
|
|
253
|
+
//
|
|
254
|
+
// Every command is a plain token list: no shell expansion, no revision
|
|
255
|
+
// operators beyond `--not`, and every output is parsed here in JavaScript, so
|
|
256
|
+
// the same strings run unchanged in a POSIX shell or PowerShell. These local
|
|
257
|
+
// commands deliberately do not go through runGitStep: a failure here is never
|
|
258
|
+
// a credential problem, so the auth self-heal and transient retries do not
|
|
259
|
+
// apply. Any failure or unparseable output throws GitSyncError and the caller
|
|
260
|
+
// does not reset (fail closed).
|
|
261
|
+
|
|
262
|
+
const SALVAGE_REF_PREFIX = 'fleet-salvage';
|
|
263
|
+
// Identity for `git stash create` only (it writes a commit object, which needs
|
|
264
|
+
// a committer even on a member with no git identity configured). Plain tokens:
|
|
265
|
+
// no spaces, no angle brackets, no '@'.
|
|
266
|
+
const SALVAGE_IDENTITY_ARGS = '-c user.name=fleet-salvage -c user.email=fleet-salvage.invalid';
|
|
267
|
+
const FULL_SHA_LINE_RE = /^[0-9a-f]{40,64}$/i;
|
|
268
|
+
|
|
269
|
+
/** Lines of a command's output, trimmed, blanks dropped. */
|
|
270
|
+
function outputLines(text) {
|
|
271
|
+
return String(text || '').split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
/** A single-component ref slug for `branch`: anything outside [A-Za-z0-9_-] becomes '-'. */
|
|
275
|
+
export function salvageBranchSlug(branch) {
|
|
276
|
+
const slug = String(branch || '').replace(/[^A-Za-z0-9_-]+/g, '-').replace(/^-+|-+$/g, '');
|
|
277
|
+
return slug || 'branch';
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
/**
|
|
281
|
+
* Pin a member's unpublished commits and uncommitted tracked changes on a
|
|
282
|
+
* local fleet-salvage/ ref before a reset onto `<remote>/<branch>`. Resolves
|
|
283
|
+
* null when there is nothing to save; throws GitSyncError when the salvage
|
|
284
|
+
* could not be completed (the caller must then not reset).
|
|
285
|
+
*
|
|
286
|
+
* @param {string} member
|
|
287
|
+
* @param {{ command: Function, log?: Function, remote: string, branch: string }} opts
|
|
288
|
+
* @returns {Promise<null|{ ref: string, target: string, headSha: string, remoteTipSha: string, ahead: number, stashSha: string|null }>}
|
|
289
|
+
*/
|
|
290
|
+
export async function salvageBeforeReset(member, { command, log = () => {}, remote, branch }) {
|
|
291
|
+
const remoteRef = `${remote}/${branch}`;
|
|
292
|
+
const fail = (what, output) => {
|
|
293
|
+
throw new GitSyncError(
|
|
294
|
+
`[Sync] Retry salvage for member '${member}' failed (${what}); NOT resetting onto '${remoteRef}', so the local branch and its uncommitted changes are left exactly as they were.${output ? ` Output: ${output}` : ''}`,
|
|
295
|
+
{ member, gitOutput: output || null, details: { kind: 'retry-salvage-failed' } },
|
|
296
|
+
);
|
|
297
|
+
};
|
|
298
|
+
const run = async (cmd, label) => {
|
|
299
|
+
let res;
|
|
300
|
+
try {
|
|
301
|
+
res = await command(cmd, { member_name: member, silent: true, failSoft: true, label: `${label} for '${member}'` });
|
|
302
|
+
} catch (err) {
|
|
303
|
+
res = { ok: false, error: (err && err.message) || String(err) };
|
|
304
|
+
}
|
|
305
|
+
return res || { ok: false, error: 'no result' };
|
|
306
|
+
};
|
|
307
|
+
|
|
308
|
+
// 1. Local HEAD and the freshly fetched remote tip, in one read.
|
|
309
|
+
const revs = await run(`git rev-parse HEAD ${remoteRef}`, 'Retry salvage: HEAD and remote tip read');
|
|
310
|
+
const revOut = outputOf(revs);
|
|
311
|
+
if (revOut === null) fail(`could not read HEAD and ${remoteRef}`, revs.error);
|
|
312
|
+
const shas = outputLines(revOut).filter((l) => FULL_SHA_LINE_RE.test(l)).map((l) => l.toLowerCase());
|
|
313
|
+
if (shas.length !== 2) fail(`unrecognized output reading HEAD and ${remoteRef}`, revOut.trim());
|
|
314
|
+
const [headSha, remoteTipSha] = shas;
|
|
315
|
+
|
|
316
|
+
// 2. Commits on the local branch that the remote tip lacks.
|
|
317
|
+
let ahead = 0;
|
|
318
|
+
if (headSha !== remoteTipSha) {
|
|
319
|
+
const countRes = await run(`git rev-list --count ${headSha} --not ${remoteTipSha}`, 'Retry salvage: unpublished commit count');
|
|
320
|
+
const countOut = outputOf(countRes);
|
|
321
|
+
if (countOut === null) fail('could not count unpublished local commits', countRes.error);
|
|
322
|
+
const countLines = outputLines(countOut).filter((l) => /^\d+$/.test(l));
|
|
323
|
+
if (countLines.length !== 1) fail('unrecognized output counting unpublished local commits', countOut.trim());
|
|
324
|
+
ahead = Number(countLines[0]);
|
|
325
|
+
}
|
|
326
|
+
|
|
327
|
+
// 3. Uncommitted tracked changes, as a dangling commit (empty = clean).
|
|
328
|
+
const stashRes = await run(`git ${SALVAGE_IDENTITY_ARGS} stash create`, 'Retry salvage: snapshot of uncommitted tracked changes');
|
|
329
|
+
const stashOut = outputOf(stashRes);
|
|
330
|
+
if (stashOut === null) fail('could not snapshot uncommitted tracked changes', stashRes.error);
|
|
331
|
+
const stashLines = outputLines(stashOut);
|
|
332
|
+
let stashSha = null;
|
|
333
|
+
if (stashLines.length > 0) {
|
|
334
|
+
const found = stashLines.filter((l) => FULL_SHA_LINE_RE.test(l));
|
|
335
|
+
if (found.length !== 1) fail('unrecognized output snapshotting uncommitted tracked changes', stashOut.trim());
|
|
336
|
+
stashSha = found[0].toLowerCase();
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
if (ahead === 0 && !stashSha) {
|
|
340
|
+
log(`[Sync] Retry salvage for member '${member}': nothing unpublished to save (no local commits ahead of '${remoteRef}', no uncommitted tracked changes); no side ref created.`);
|
|
341
|
+
return null;
|
|
342
|
+
}
|
|
343
|
+
|
|
344
|
+
// 4. The side ref. The sprint branch is not touched.
|
|
345
|
+
const target = stashSha || headSha;
|
|
346
|
+
const slug = salvageBranchSlug(branch);
|
|
347
|
+
const ref = `${SALVAGE_REF_PREFIX}/${slug}/${target.slice(0, 12)}`;
|
|
348
|
+
const branchRes = await run(`git branch -f ${ref} ${target}`, 'Retry salvage: create side ref');
|
|
349
|
+
if (outputOf(branchRes) === null) {
|
|
350
|
+
const text = String(branchRes.error || branchRes.output || '');
|
|
351
|
+
const conflict = text.match(/'refs\/heads\/([^']+)' exists;\s*cannot create/i);
|
|
352
|
+
if (conflict || /cannot lock ref/i.test(text)) {
|
|
353
|
+
const blocking = conflict ? conflict[1] : `${SALVAGE_REF_PREFIX}/${slug}`;
|
|
354
|
+
throw new GitSyncError(
|
|
355
|
+
`[Sync] Retry salvage for member '${member}' could not create side ref '${ref}': an existing ref '${blocking}' blocks that name (a ref cannot be both a branch and a directory of branches). ` +
|
|
356
|
+
`NOT resetting onto '${remoteRef}'; the local branch is unchanged. Inspect it with 'git log ${blocking}', then delete it with 'git branch -D ${blocking}' in that member's work folder and re-run. Output: ${text.trim()}`,
|
|
357
|
+
{ member, gitOutput: text || null, details: { kind: 'retry-salvage-ref-conflict', ref, conflictingRef: blocking } },
|
|
358
|
+
);
|
|
359
|
+
}
|
|
360
|
+
fail(`could not create side ref '${ref}'`, text.trim());
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
const recovery = [`git log ${ref}`];
|
|
364
|
+
if (ahead > 0) recovery.push(`git cherry-pick ${remoteTipSha}..${headSha}`);
|
|
365
|
+
if (stashSha) recovery.push(`git stash apply ${stashSha}`);
|
|
366
|
+
log(
|
|
367
|
+
`[Sync] Retry salvage for member '${member}': saved ${ahead} unpublished local commit(s)` +
|
|
368
|
+
`${stashSha ? ' and the uncommitted tracked changes' : ''} on local side ref '${ref}' before resetting onto '${remoteRef}'. ` +
|
|
369
|
+
`Recover with: ${recovery.join(' ; ')}. Untracked files are left in place. The side ref is local only and is never pushed.`
|
|
370
|
+
);
|
|
371
|
+
return { ref, target, headSha, remoteTipSha, ahead, stashSha };
|
|
372
|
+
}
|
|
373
|
+
|
|
374
|
+
/**
|
|
375
|
+
* Does `remote`/`branch` contain `member`'s local HEAD? Never throws.
|
|
376
|
+
*
|
|
377
|
+
* @param {string} member
|
|
378
|
+
* @param {{ command: Function, remote: string, branch?: string }} opts
|
|
379
|
+
* @returns {Promise<{ status: 'contained'|'not-contained'|'unverified', why?: string, localHead?: string, remoteTip?: string }>}
|
|
380
|
+
*/
|
|
381
|
+
export async function checkGitPushLanded(member, { command, remote, branch }) {
|
|
382
|
+
if (!branch) return { status: 'unverified', why: 'no branch name to check the push against' };
|
|
383
|
+
if (!SAFE_GIT_NAME_RE.test(branch) || !SAFE_GIT_NAME_RE.test(remote)) return { status: 'unverified', why: 'remote or branch name is outside the safe character set' };
|
|
384
|
+
const run = async (cmd, label) => {
|
|
385
|
+
try {
|
|
386
|
+
return await command(cmd, { member_name: member, silent: true, failSoft: true, label: `${label} for '${member}'` });
|
|
387
|
+
} catch (err) {
|
|
388
|
+
return { ok: false, error: (err && err.message) || String(err) };
|
|
389
|
+
}
|
|
390
|
+
};
|
|
391
|
+
|
|
392
|
+
const headOut = outputOf(await run('git rev-parse HEAD', 'G-push landed check: local HEAD read'));
|
|
393
|
+
const localHead = headOut === null ? null : headOut.trim().split(/\r?\n/)[0].trim();
|
|
394
|
+
if (!localHead || !GIT_SHA_RE.test(localHead)) return { status: 'unverified', why: 'could not read the local HEAD' };
|
|
395
|
+
|
|
396
|
+
const lsOut = outputOf(await run(`git ls-remote ${remote} refs/heads/${branch}`, 'G-push landed check: remote branch read'));
|
|
397
|
+
if (lsOut === null) return { status: 'unverified', why: `could not read ${remote}/${branch}` };
|
|
398
|
+
let remoteTip = null;
|
|
399
|
+
for (const line of lsOut.split(/\r?\n/)) {
|
|
400
|
+
const m = line.match(/^([0-9a-f]{40,64})\s+(\S+)\s*$/i);
|
|
401
|
+
if (m && m[2] === `refs/heads/${branch}`) { remoteTip = m[1].toLowerCase(); break; }
|
|
402
|
+
}
|
|
403
|
+
if (!remoteTip) {
|
|
404
|
+
if (lsOut.trim() === '') return { status: 'not-contained', localHead, why: `branch '${branch}' does not exist on '${remote}'` };
|
|
405
|
+
return { status: 'unverified', localHead, why: `unrecognized ls-remote output for ${remote}/${branch}` };
|
|
406
|
+
}
|
|
407
|
+
if (remoteTip === localHead.toLowerCase()) return { status: 'contained', localHead, remoteTip };
|
|
408
|
+
|
|
409
|
+
// The remote moved past (or away from) our HEAD. Fetch it, then count
|
|
410
|
+
// commits in our HEAD that the remote tip lacks: 0 means contained.
|
|
411
|
+
const fetchRes = await run(`git fetch ${remote} ${branch}`, 'G-push landed check: remote branch fetch');
|
|
412
|
+
if (outputOf(fetchRes) === null) return { status: 'unverified', localHead, remoteTip, why: `could not fetch ${remote}/${branch}: ${fetchRes && fetchRes.error}` };
|
|
413
|
+
const countOut = outputOf(await run(`git rev-list --count ${localHead} --not ${remoteTip}`, 'G-push landed check: containment count'));
|
|
414
|
+
const count = countOut === null ? NaN : Number(countOut.trim());
|
|
415
|
+
if (!Number.isInteger(count)) return { status: 'unverified', localHead, remoteTip, why: 'could not compare the local HEAD with the remote tip' };
|
|
416
|
+
if (count === 0) return { status: 'contained', localHead, remoteTip };
|
|
417
|
+
return { status: 'not-contained', localHead, remoteTip, why: `${remote}/${branch} is at ${remoteTip}, which lacks ${count} commit(s) of the local HEAD ${localHead}` };
|
|
418
|
+
}
|
|
419
|
+
|
|
420
|
+
/**
|
|
421
|
+
* G-push: publish `member`'s committed work to the shared branch after a
|
|
422
|
+
* dispatch -- `git push` with ONE bounded pull-rebase retry. If the
|
|
423
|
+
* push is rejected as non-FF (another writer got there first), do a single
|
|
424
|
+
* `git pull --rebase` and re-push exactly once; if it is STILL rejected, raise
|
|
425
|
+
* a typed GitDivergedError -- the single-writer invariant is violated and the
|
|
426
|
+
* push must never be retried further/blindly. Transient (network/lock)
|
|
427
|
+
* failures are retried up to `maxTransientRetries`; divergence is never
|
|
428
|
+
* retried beyond the one bounded rebase.
|
|
429
|
+
*
|
|
430
|
+
* `pushCode: false` makes this a no-op (a read-only bracket has nothing to
|
|
431
|
+
* publish). Every git command is issued via the injected command() with an
|
|
432
|
+
* explicit member_name.
|
|
433
|
+
*
|
|
434
|
+
* Tier 2 of the git conflict ladder: when the pull-rebase retry hits a REAL
|
|
435
|
+
* content conflict (unmerged paths, not just a plain non-FF race), an optional
|
|
436
|
+
* injected `agent()` gets exactly ONE bounded conflict-resolution-runbook
|
|
437
|
+
* dispatch before this function gives up and throws the typed
|
|
438
|
+
* GitDivergedError. The agent's own claim of success is never trusted: this
|
|
439
|
+
* function mechanically re-checks `git status --porcelain` for a clean tree and
|
|
440
|
+
* then attempts one real re-push; only that observed outcome decides whether
|
|
441
|
+
* Tier 2 resolved the conflict. Omitting `agent` leaves Tier 1 only.
|
|
442
|
+
*
|
|
443
|
+
* An optional injected `onAuthFailure` is threaded through to every runGitStep
|
|
444
|
+
* call below for a bounded one-shot self-heal (call it once, retry the same
|
|
445
|
+
* command once) whenever a step is classified 'auth'.
|
|
446
|
+
*
|
|
447
|
+
* apra-fleet-417.7: an optional injected `resolveMemberProvider` (see
|
|
448
|
+
* createMemberVcsProviderResolver) is resolved ONCE at the top of this call
|
|
449
|
+
* and threaded into every runGitStep call below, so a G-push auth failure for
|
|
450
|
+
* a non-GitHub member classifies via that member's own provider chain.
|
|
451
|
+
*
|
|
452
|
+
* @param {string} member
|
|
453
|
+
* @param {{
|
|
454
|
+
* command: Function, pushCode?: boolean, log?: Function,
|
|
455
|
+
* maxTransientRetries?: number, remote?: string, branch?: string,
|
|
456
|
+
* agent?: Function, resolveConflictModel?: string, onAuthFailure?: Function,
|
|
457
|
+
* resolveMemberProvider?: (member: string) => Promise<string|undefined>,
|
|
458
|
+
* }} opts
|
|
459
|
+
* @returns {Promise<{ ok: true, member: string, pushed: boolean, rebased: boolean, tier2Resolved?: boolean }>}
|
|
460
|
+
*/
|
|
461
|
+
export async function syncMemberAfter(member, opts = {}) {
|
|
462
|
+
const {
|
|
463
|
+
command, pushCode = true, log = () => {}, maxTransientRetries = 1, remote = 'origin', branch,
|
|
464
|
+
agent, resolveConflictModel, onAuthFailure, resolveMemberProvider, setUpstream = false,
|
|
465
|
+
} = opts;
|
|
466
|
+
if (typeof command !== 'function') {
|
|
467
|
+
throw new Error("syncMemberAfter requires an injected command() in opts");
|
|
468
|
+
}
|
|
469
|
+
|
|
470
|
+
if (!pushCode) {
|
|
471
|
+
return { ok: true, member, pushed: false, rebased: false };
|
|
472
|
+
}
|
|
473
|
+
const provider = await resolveGitProviderForClassification(resolveMemberProvider, member, log);
|
|
474
|
+
|
|
475
|
+
// apra-fleet: `setUpstream` (opt-in, default false -- every existing
|
|
476
|
+
// caller's command text is byte-for-byte unchanged) is for Publish PR's
|
|
477
|
+
// push specifically: it needs `-u` to set the tracking branch on a brand
|
|
478
|
+
// new sprint branch's first push, AND that distinct spelling is what lets
|
|
479
|
+
// mock-sprint-publish-push-failure.test.mjs's `gitGhFailurePattern` (and
|
|
480
|
+
// any real-world log grep) target Publish's push in isolation from every
|
|
481
|
+
// OTHER per-dispatch G-push in the same sprint, which all share the plain
|
|
482
|
+
// `git push <remote> <branch>` spelling below.
|
|
483
|
+
const pushCmd = branch ? `git push${setUpstream ? ' -u' : ''} ${remote} ${branch}` : 'git push';
|
|
484
|
+
|
|
485
|
+
// A push step reported success: only return success when the remote
|
|
486
|
+
// branch provably carries our HEAD, or the check is inconclusive.
|
|
487
|
+
const confirmLanded = async (result, label) => {
|
|
488
|
+
const verdict = await checkGitPushLanded(member, { command, remote, branch });
|
|
489
|
+
if (verdict.status === 'not-contained') {
|
|
490
|
+
throw new GitSyncError(
|
|
491
|
+
`[Sync] ${label} reported success but the push did NOT land: ${verdict.why}. The member's commits have NOT reached the shared branch.`,
|
|
492
|
+
{ member, gitOutput: verdict.why, details: { kind: 'push-not-landed', operation: 'push', localHead: verdict.localHead, remoteTip: verdict.remoteTip } },
|
|
493
|
+
);
|
|
494
|
+
}
|
|
495
|
+
if (verdict.status === 'unverified' && branch) {
|
|
496
|
+
log(`[Sync] ${label} reported success, but whether it landed could not be verified: ${verdict.why}`);
|
|
497
|
+
}
|
|
498
|
+
return result;
|
|
499
|
+
};
|
|
500
|
+
|
|
501
|
+
let push = await runGitStep({
|
|
502
|
+
command, member, cmd: pushCmd,
|
|
503
|
+
label: `G-push for '${member}'`, log, maxTransientRetries, onAuthFailure, provider,
|
|
504
|
+
});
|
|
505
|
+
if (push.ok) {
|
|
506
|
+
return await confirmLanded({ ok: true, member, pushed: true, rebased: false }, `G-push for member '${member}'`);
|
|
507
|
+
}
|
|
508
|
+
|
|
509
|
+
if (push.kind !== 'diverged') {
|
|
510
|
+
// Transient-exhausted or unknown non-FF failure -- not a divergence,
|
|
511
|
+
// so no rebase retry; surface the (non-diverged) sync error.
|
|
512
|
+
throw new GitSyncError(
|
|
513
|
+
`[Sync] G-push for member '${member}' failed: ${push.error}`,
|
|
514
|
+
{ member, gitOutput: push.error },
|
|
515
|
+
);
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
// Non-FF push: attempt EXACTLY ONE pull --rebase then re-push.
|
|
519
|
+
log(`[Sync] G-push for member '${member}' was rejected as non-fast-forward; attempting a single pull --rebase then one re-push.`);
|
|
520
|
+
const rebaseCmd = branch ? `git pull --rebase ${remote} ${branch}` : 'git pull --rebase';
|
|
521
|
+
const rebase = await runGitStep({
|
|
522
|
+
command, member, cmd: rebaseCmd,
|
|
523
|
+
label: `G-push pull-rebase retry for '${member}'`, log, maxTransientRetries, onAuthFailure, provider,
|
|
524
|
+
});
|
|
525
|
+
if (!rebase.ok) {
|
|
526
|
+
// Missing-remote-ref guard (apra-fleet-ta3.3). ROOT CAUSE: the
|
|
527
|
+
// initial push above can be classified 'diverged' even when `remote`
|
|
528
|
+
// has NO such branch at all -- git's non-fast-forward rejection
|
|
529
|
+
// trailers ("failed to push some refs", "[rejected]") are GENERIC:
|
|
530
|
+
// they are also the trailer git prints for other push rejections,
|
|
531
|
+
// and nothing in that first push's own error text can distinguish
|
|
532
|
+
// "the remote branch exists and truly diverged" from "the remote
|
|
533
|
+
// branch does not exist yet". The only place that distinction
|
|
534
|
+
// becomes observable is here: `git pull --rebase` against a
|
|
535
|
+
// nonexistent remote branch fails with the SAME exact, unambiguous
|
|
536
|
+
// "couldn't find remote ref <branch>" message syncMemberBefore
|
|
537
|
+
// already treats as benign (see isMissingRemoteRefError() above) --
|
|
538
|
+
// so this is not a divergence to reconcile, it is a brand-new local
|
|
539
|
+
// branch that has simply never been pushed. Skip the doomed
|
|
540
|
+
// rebase/conflict machinery entirely and retry a plain push, which
|
|
541
|
+
// creates the branch on `remote`.
|
|
542
|
+
if (isMissingRemoteRefError(rebase.error)) {
|
|
543
|
+
log(`[Sync] G-push pull-rebase for member '${member}': branch '${branch}' does not exist on '${remote}' yet (never pushed) -- nothing to rebase against; retrying the push directly to create it.`);
|
|
544
|
+
const createPush = await runGitStep({
|
|
545
|
+
command, member, cmd: pushCmd,
|
|
546
|
+
label: `G-push retry (create missing remote branch) for '${member}'`, log, maxTransientRetries, onAuthFailure, provider,
|
|
547
|
+
});
|
|
548
|
+
if (createPush.ok) {
|
|
549
|
+
return await confirmLanded({ ok: true, member, pushed: true, rebased: false }, `G-push retry (create missing remote branch) for member '${member}'`);
|
|
550
|
+
}
|
|
551
|
+
if (createPush.kind === 'diverged') {
|
|
552
|
+
// The branch now exists on the remote -- a concurrent writer
|
|
553
|
+
// must have published it between our rebase attempt and this
|
|
554
|
+
// retry. That IS a genuine divergence; the single-writer
|
|
555
|
+
// invariant is violated and this must not be retried further.
|
|
556
|
+
throw new GitDivergedError(
|
|
557
|
+
`[Sync] G-push for member '${member}' was rejected on retry after a missing-remote-ref rebase skip -- another writer published '${branch}' first; the single-writer token invariant is violated: ${createPush.error}`,
|
|
558
|
+
{ member, gitOutput: createPush.error, operation: 'push' },
|
|
559
|
+
);
|
|
560
|
+
}
|
|
561
|
+
throw new GitSyncError(
|
|
562
|
+
`[Sync] G-push retry (create missing remote branch) for member '${member}' failed: ${createPush.error}`,
|
|
563
|
+
{ member, gitOutput: createPush.error },
|
|
564
|
+
);
|
|
565
|
+
}
|
|
566
|
+
|
|
567
|
+
// Tier 1 scripted detection: confirm from git's own porcelain status --
|
|
568
|
+
// not from this failing command's exit code/message classification --
|
|
569
|
+
// whether the rebase actually left unmerged paths, and if so restore a
|
|
570
|
+
// clean tree via `git rebase --abort` BEFORE the typed divergence error
|
|
571
|
+
// below propagates. This is the single Tier 1 -> Tier 2 escalation
|
|
572
|
+
// point.
|
|
573
|
+
const unmergedPaths = await detectAndAbortRebaseConflict({ command, member, log, maxTransientRetries, runGitStep });
|
|
574
|
+
|
|
575
|
+
// Tier 2: unmergedPaths.length > 0 means a real content conflict, not
|
|
576
|
+
// just a non-FF race. Attempt exactly ONE bounded agent-with-runbook
|
|
577
|
+
// dispatch (when an agent() was injected) before falling back to the
|
|
578
|
+
// typed GitDivergedError below. Every outcome (agent throws, agent
|
|
579
|
+
// returns, or agent unavailable) is mechanically re-verified against
|
|
580
|
+
// real git state -- never the agent's own claim.
|
|
581
|
+
if (unmergedPaths.length > 0 && typeof agent === 'function') {
|
|
582
|
+
try {
|
|
583
|
+
await dispatchConflictResolutionAgent({
|
|
584
|
+
agent, member, branch, unmergedPaths, log, model: resolveConflictModel, remote,
|
|
585
|
+
});
|
|
586
|
+
} catch (tier2Err) {
|
|
587
|
+
log(`[Sync] Tier 2 conflict-resolution dispatch for member '${member}' threw and will not be retried (script-first: no further escalation): ${tier2Err.message}`);
|
|
588
|
+
}
|
|
589
|
+
|
|
590
|
+
const postTier2Status = await command('git status --porcelain', { member_name: member, silent: true, failSoft: true, label: `Tier 2 post-resolution clean-state check for '${member}'` });
|
|
591
|
+
const stillUnmerged = parseUnmergedPaths(postTier2Status && postTier2Status.output ? postTier2Status.output : '');
|
|
592
|
+
if (stillUnmerged.length === 0) {
|
|
593
|
+
const rePush = await runGitStep({
|
|
594
|
+
command, member, cmd: pushCmd,
|
|
595
|
+
label: `G-push after Tier 2 conflict resolution for '${member}'`, log, maxTransientRetries, onAuthFailure, provider,
|
|
596
|
+
});
|
|
597
|
+
if (rePush.ok) {
|
|
598
|
+
const landed = await confirmLanded({ ok: true, member, pushed: true, rebased: true, tier2Resolved: true }, `G-push after Tier 2 conflict resolution for member '${member}'`);
|
|
599
|
+
log(`[Sync] Tier 2 conflict resolution for member '${member}' succeeded -- working tree clean and the resolved code was pushed.`);
|
|
600
|
+
return landed;
|
|
601
|
+
}
|
|
602
|
+
log(`[Sync] Tier 2 conflict resolution for member '${member}' left a clean tree but the re-push still failed: ${rePush.error}`);
|
|
603
|
+
} else {
|
|
604
|
+
log(`[Sync] Tier 2 conflict resolution for member '${member}' did not fully resolve -- porcelain still shows unmerged path(s): ${stillUnmerged.join(', ')}. Restoring a clean tree before failing this streak.`);
|
|
605
|
+
await detectAndAbortRebaseConflict({ command, member, log, maxTransientRetries, runGitStep });
|
|
606
|
+
}
|
|
607
|
+
}
|
|
608
|
+
|
|
609
|
+
if (rebase.kind === 'diverged' || unmergedPaths.length > 0) {
|
|
610
|
+
throw new GitDivergedError(
|
|
611
|
+
`[Sync] G-push pull-rebase for member '${member}' hit unmergeable divergence (conflict) -- must not be retried blindly: ${rebase.error}`,
|
|
612
|
+
{ member, gitOutput: rebase.error, operation: 'push-rebase', details: { unmergedPaths } },
|
|
613
|
+
);
|
|
614
|
+
}
|
|
615
|
+
throw new GitSyncError(
|
|
616
|
+
`[Sync] G-push pull-rebase for member '${member}' failed: ${rebase.error}`,
|
|
617
|
+
{ member, gitOutput: rebase.error },
|
|
618
|
+
);
|
|
619
|
+
}
|
|
620
|
+
|
|
621
|
+
push = await runGitStep({
|
|
622
|
+
command, member, cmd: pushCmd,
|
|
623
|
+
label: `G-push re-push after rebase for '${member}'`, log, maxTransientRetries, onAuthFailure, provider,
|
|
624
|
+
});
|
|
625
|
+
if (push.ok) {
|
|
626
|
+
return await confirmLanded({ ok: true, member, pushed: true, rebased: true }, `G-push re-push after rebase for member '${member}'`);
|
|
627
|
+
}
|
|
628
|
+
|
|
629
|
+
// Still rejected after the one bounded rebase -- diverged, never retried further.
|
|
630
|
+
throw new GitDivergedError(
|
|
631
|
+
`[Sync] G-push for member '${member}' still rejected after one pull-rebase retry -- the single-writer token invariant is violated; refusing to retry further: ${push.error}`,
|
|
632
|
+
{ member, gitOutput: push.error, operation: 'push' },
|
|
633
|
+
);
|
|
634
|
+
}
|
|
635
|
+
|
|
636
|
+
/**
|
|
637
|
+
* The ordered post-dispatch sync step every withGitSync() bracket's `finally`
|
|
638
|
+
* runs: G-push (code) BEFORE D-push (beads).
|
|
639
|
+
*
|
|
640
|
+
* For code-writing roles (pushCode:true), G-push MUST succeed before D-push is
|
|
641
|
+
* attempted. If G-push throws at all, D-push is skipped ENTIRELY and the error
|
|
642
|
+
* is rethrown, never swallowed -- closing a bead in dolt while the code that
|
|
643
|
+
* justifies the close never left this member's checkout would advertise an
|
|
644
|
+
* UNREACHABLE CLOSE: a reviewer, or the next streak's G-pull, would see the
|
|
645
|
+
* bead done and find no matching commit on the shared branch.
|
|
646
|
+
*
|
|
647
|
+
* With pushCode:false, syncMemberAfter never touches git and cannot throw, so
|
|
648
|
+
* D-push always still runs.
|
|
649
|
+
*
|
|
650
|
+
* `agent`/`resolveConflictModel` are threaded through to syncMemberAfter's
|
|
651
|
+
* conflict-resolution escalation; `onAuthFailure` is threaded through to BOTH
|
|
652
|
+
* syncMemberAfter and doltPushAfter for their bounded one-shot self-heal.
|
|
653
|
+
*
|
|
654
|
+
* @param {string} member
|
|
655
|
+
* @param {{
|
|
656
|
+
* command: Function, pushCode?: boolean, pushBeads?: boolean,
|
|
657
|
+
* log?: Function, mutex?: { acquire: Function, release: Function },
|
|
658
|
+
* sprintId?: string, branch?: string, maxTransientRetries?: number,
|
|
659
|
+
* remote?: string, agent?: Function, resolveConflictModel?: string,
|
|
660
|
+
* onAuthFailure?: Function,
|
|
661
|
+
* resolveMemberProvider?: (member: string) => Promise<string|undefined>,
|
|
662
|
+
* args?: { callTool?: Function },
|
|
663
|
+
* sprintState?: object,
|
|
664
|
+
* }} opts
|
|
665
|
+
* @returns {Promise<{ ok: true, member: string, gPush: object, dPush: object }>}
|
|
666
|
+
*/
|
|
667
|
+
export async function syncMemberAfterOrdered(member, opts = {}) {
|
|
668
|
+
const {
|
|
669
|
+
command, pushCode = true, pushBeads = true, log = () => {},
|
|
670
|
+
mutex, sprintId, branch, maxTransientRetries = 1, remote = 'origin',
|
|
671
|
+
agent, resolveConflictModel, onAuthFailure, resolveMemberProvider, args, sprintState,
|
|
672
|
+
} = opts;
|
|
673
|
+
|
|
674
|
+
let gPush;
|
|
675
|
+
try {
|
|
676
|
+
gPush = await syncMemberAfter(member, { command, pushCode, log, branch, maxTransientRetries, remote, agent, resolveConflictModel, onAuthFailure, resolveMemberProvider });
|
|
677
|
+
} catch (gPushErr) {
|
|
678
|
+
log(`[Sync] G-push failed for member '${member}' -- skipping D-push and failing this streak rather than advertising an unreachable close (a beads close whose justifying code never reached the shared branch): ${gPushErr.message}`);
|
|
679
|
+
throw gPushErr;
|
|
680
|
+
}
|
|
681
|
+
|
|
682
|
+
// EXPLICITLY FATAL (apra-fleet-417.3.1): DoltSync.syncAfter is degraded by
|
|
683
|
+
// default, but this is the post-dispatch bracket -- the member's beads
|
|
684
|
+
// closes must reach the shared remote or the orchestrator's next read sees
|
|
685
|
+
// a bead this streak believes it closed. A silent degrade here would
|
|
686
|
+
// advertise an unreachable close, exactly what the G-push-before-D-push
|
|
687
|
+
// ordering above exists to prevent, and would erase the
|
|
688
|
+
// BEADS_SYNC_CONFLICT terminal reason the dashboard reports.
|
|
689
|
+
//
|
|
690
|
+
// Before that fatal divergence surfaces, run the deterministic settle
|
|
691
|
+
// (settleDoltConflicts, dolt-settle.mjs). It is TOTAL over row-level
|
|
692
|
+
// conflicts -- no gates, no allowlist, no LLM escalation -- and a resolved
|
|
693
|
+
// settle is a VERIFIED recovery, because settle republishes (bd dolt pull
|
|
694
|
+
// + push) and checks the push actually landed before returning. The streak
|
|
695
|
+
// only fails (DoltDivergedError -> BEADS_SYNC_CONFLICT) when settle itself
|
|
696
|
+
// hits an operational failure (no usable dolt binary, the ephemeral server
|
|
697
|
+
// would not start, a SQL statement errored).
|
|
698
|
+
//
|
|
699
|
+
// Notably, the data-loss hazard that forced the old ladder's Path B to be
|
|
700
|
+
// disabled at THIS call site does not exist for settle: it never discards
|
|
701
|
+
// and re-bootstraps a clone, so an arbitrary multi-command dispatch's bead
|
|
702
|
+
// mutations cannot be silently thrown away here. There is no pendingMutation
|
|
703
|
+
// to capture and replay because nothing is ever dropped.
|
|
704
|
+
// Thread this member's REGISTERED shell into dolt-settle the same way
|
|
705
|
+
// the pre-dispatch bracket does (apra-fleet-7dir.16/.24), guarded on
|
|
706
|
+
// `args.callTool` so a caller with no MCP client (mock-sprint scenarios)
|
|
707
|
+
// keeps the pre-shell-aware default.
|
|
708
|
+
const shell = await resolveSettleShell({ args, member, log, sprintState });
|
|
709
|
+
const settle = buildSettleCallback(member, { command, log, shell });
|
|
710
|
+
const dPush = await DoltSync.syncAfter(member, { command, pushBeads, log, mutex, sprintId, onAuthFailure, fatal: true, settle });
|
|
711
|
+
return { ok: true, member, gPush, dPush };
|
|
712
|
+
}
|
|
713
|
+
|
|
714
|
+
/**
|
|
715
|
+
* (apra-fleet-p2to.4.2) Re-sync ONE member that was just re-acquired on resume.
|
|
716
|
+
* Runs -- UNCONDITIONALLY, never gated on a "looks unchanged" heuristic -- the
|
|
717
|
+
* same three reconciliation steps a fresh dispatch would rely on, because while
|
|
718
|
+
* this sprint was paused both origin and the beads DB can have moved (another
|
|
719
|
+
* sprint, a human push) on top of the released member:
|
|
720
|
+
*
|
|
721
|
+
* 1. `git fetch` (base branch, then the sprint branch soft -- a brand-new
|
|
722
|
+
* branch legitimately has no remote ref yet).
|
|
723
|
+
* 2. The pure decideEnsureBranchAction() probe: fetch outcome + a local-branch
|
|
724
|
+
* existence probe + (when both tips exist) a two-way ancestor comparison,
|
|
725
|
+
* fed into the SAME decision helper the Ensure Sprint Branch phase uses.
|
|
726
|
+
* An 'abort' decision (fetch failed for a non-"missing ref" reason, or the
|
|
727
|
+
* tips diverged) THROWS rather than touch git -- resuming onto a diverged
|
|
728
|
+
* branch could silently discard real pushed work. A 'checkout' decision is
|
|
729
|
+
* executed so the member's working branch is reconciled to origin's new
|
|
730
|
+
* tip before work continues.
|
|
731
|
+
* 3. `bd dolt pull` -- re-sync the beads clone to whatever landed while paused.
|
|
732
|
+
*
|
|
733
|
+
* All I/O is injected so this stays transport-agnostic and unit-testable:
|
|
734
|
+
* - `runGit(cmd)` -> Promise<{ ok: boolean, stdout?: string, error?: string }>
|
|
735
|
+
* (a SOFT git runner: it never throws; this function decides which failures
|
|
736
|
+
* are fatal).
|
|
737
|
+
* - `doltPull(member)` -> Promise<any> (runs `bd dolt pull` on the member).
|
|
738
|
+
*
|
|
739
|
+
* @param {{ member: string, branch: string, baseBranch: string,
|
|
740
|
+
* runGit: (cmd: string) => Promise<{ ok: boolean, stdout?: string, error?: string }>,
|
|
741
|
+
* doltPull: (member: string) => Promise<any>, log?: Function }} opts
|
|
742
|
+
* @returns {Promise<void>}
|
|
743
|
+
*/
|
|
744
|
+
export async function resyncReacquiredMember(opts = {}) {
|
|
745
|
+
const { member, branch, baseBranch, runGit, doltPull, log = () => {} } = opts;
|
|
746
|
+
if (typeof runGit !== 'function' || typeof doltPull !== 'function') {
|
|
747
|
+
throw new TypeError('resyncReacquiredMember requires runGit() and doltPull() to be injected');
|
|
748
|
+
}
|
|
749
|
+
|
|
750
|
+
async function gitStep(cmd, { failSoft = false } = {}) {
|
|
751
|
+
const res = await runGit(cmd);
|
|
752
|
+
if (!failSoft && !(res && res.ok)) {
|
|
753
|
+
throw new Error(
|
|
754
|
+
`[resume-resync] '${cmd}' failed on member '${member}': ${(res && (res.error || res.stdout)) || 'unknown error'}`
|
|
755
|
+
);
|
|
756
|
+
}
|
|
757
|
+
return res || { ok: false };
|
|
758
|
+
}
|
|
759
|
+
|
|
760
|
+
// 1. git fetch: base (hard -- a missing base is a real problem) then the
|
|
761
|
+
// sprint branch (soft -- a brand-new branch has no remote ref yet).
|
|
762
|
+
await gitStep(`git fetch origin ${baseBranch} --quiet`);
|
|
763
|
+
const branchFetch = await gitStep(`git fetch origin ${branch} --quiet`, { failSoft: true });
|
|
764
|
+
|
|
765
|
+
// 2. decideEnsureBranchAction probe: local-branch existence + tip comparison.
|
|
766
|
+
const localProbe = await gitStep(`git rev-parse --verify --quiet refs/heads/${branch}`, { failSoft: true });
|
|
767
|
+
const localBranchExists = localProbe.ok;
|
|
768
|
+
let localTipStatus;
|
|
769
|
+
if (branchFetch.ok && localBranchExists) {
|
|
770
|
+
const localIsAncestorOfRemote = await gitStep(
|
|
771
|
+
`git merge-base --is-ancestor ${branch} origin/${branch}`, { failSoft: true }
|
|
772
|
+
);
|
|
773
|
+
const remoteIsAncestorOfLocal = await gitStep(
|
|
774
|
+
`git merge-base --is-ancestor origin/${branch} ${branch}`, { failSoft: true }
|
|
775
|
+
);
|
|
776
|
+
if (localIsAncestorOfRemote.ok) {
|
|
777
|
+
localTipStatus = 'behind-or-equal';
|
|
778
|
+
} else if (remoteIsAncestorOfLocal.ok) {
|
|
779
|
+
localTipStatus = 'ahead';
|
|
780
|
+
} else {
|
|
781
|
+
localTipStatus = 'diverged';
|
|
782
|
+
}
|
|
783
|
+
}
|
|
784
|
+
const decision = decideEnsureBranchAction({
|
|
785
|
+
branch,
|
|
786
|
+
baseBranch,
|
|
787
|
+
branchFetchOk: branchFetch.ok,
|
|
788
|
+
branchFetchError: branchFetch.error,
|
|
789
|
+
localBranchExists,
|
|
790
|
+
localTipStatus,
|
|
791
|
+
});
|
|
792
|
+
if (decision.action === 'abort') {
|
|
793
|
+
throw new Error(`[resume-resync] ${decision.message} (member '${member}')`);
|
|
794
|
+
}
|
|
795
|
+
// Reconcile the member's working branch to origin's (possibly moved) tip.
|
|
796
|
+
await gitStep(decision.command);
|
|
797
|
+
|
|
798
|
+
// 3. bd dolt pull: re-sync the beads clone.
|
|
799
|
+
await doltPull(member);
|
|
800
|
+
|
|
801
|
+
log(`[resume-resync] member '${member}' re-synced (git fetch + branch reconcile + beads D-pull) before work resumed`);
|
|
802
|
+
}
|