@apralabs/apra-fleet 0.4.0 → 0.4.1
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 +145 -7
- package/dist/agents/backlog-groomer.md +17 -1
- package/dist/agents/ci-watcher.md +13 -1
- package/dist/agents/deployer.md +15 -3
- package/dist/agents/doer.md +35 -1
- package/dist/agents/harvester.md +22 -3
- package/dist/agents/integ-test-runner.md +18 -2
- package/dist/agents/kb-reconciler.md +216 -0
- package/dist/agents/plan-reviewer.md +14 -1
- package/dist/agents/planner.md +88 -5
- package/dist/agents/regression-test-runner.md +19 -1
- package/dist/agents/reviewer.md +104 -3
- package/dist/agents/schemas/doer-output.json +63 -3
- package/dist/agents/schemas/harvester-output.json +59 -2
- package/dist/agents/schemas/integ-test-runner-output.json +2 -2
- package/dist/agents/schemas/kb-reconciler-output.json +87 -0
- package/dist/agents/schemas/planner-output.json +65 -0
- package/dist/agents/schemas/reviewer-output.json +105 -8
- package/dist/cli/install.d.ts +1 -0
- package/dist/cli/install.d.ts.map +1 -1
- package/dist/cli/install.js +136 -5
- package/dist/cli/install.js.map +1 -1
- package/dist/cli/join.js +1 -1
- package/dist/cli/join.js.map +1 -1
- package/dist/cli/kb-commit.d.ts +12 -0
- package/dist/cli/kb-commit.d.ts.map +1 -0
- package/dist/cli/kb-commit.js +53 -0
- package/dist/cli/kb-commit.js.map +1 -0
- package/dist/cli/kb-directives.d.ts +17 -0
- package/dist/cli/kb-directives.d.ts.map +1 -0
- package/dist/cli/kb-directives.js +146 -0
- package/dist/cli/kb-directives.js.map +1 -0
- package/dist/cli/kb-import.d.ts +13 -0
- package/dist/cli/kb-import.d.ts.map +1 -0
- package/dist/cli/kb-import.js +56 -0
- package/dist/cli/kb-import.js.map +1 -0
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +11 -0
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/watch.d.ts +53 -4
- package/dist/cli/watch.d.ts.map +1 -1
- package/dist/cli/watch.js +118 -17
- package/dist/cli/watch.js.map +1 -1
- package/dist/commands/kb-server.d.ts +8 -0
- package/dist/commands/kb-server.d.ts.map +1 -0
- package/dist/commands/kb-server.js +221 -0
- package/dist/commands/kb-server.js.map +1 -0
- package/dist/index.js +77 -2
- package/dist/index.js.map +1 -1
- package/dist/os/linux.d.ts +1 -0
- package/dist/os/linux.d.ts.map +1 -1
- package/dist/os/linux.js +18 -1
- package/dist/os/linux.js.map +1 -1
- package/dist/os/os-commands.d.ts +5 -0
- package/dist/os/os-commands.d.ts.map +1 -1
- package/dist/os/windows.d.ts +35 -0
- package/dist/os/windows.d.ts.map +1 -1
- package/dist/os/windows.js +67 -31
- package/dist/os/windows.js.map +1 -1
- package/dist/providers/agy.d.ts +12 -1
- package/dist/providers/agy.d.ts.map +1 -1
- package/dist/providers/agy.js +134 -9
- package/dist/providers/agy.js.map +1 -1
- package/dist/providers/claude.d.ts +11 -1
- package/dist/providers/claude.d.ts.map +1 -1
- package/dist/providers/claude.js +47 -19
- package/dist/providers/claude.js.map +1 -1
- package/dist/providers/codex.d.ts +11 -1
- package/dist/providers/codex.d.ts.map +1 -1
- package/dist/providers/codex.js +29 -6
- package/dist/providers/codex.js.map +1 -1
- package/dist/providers/copilot.d.ts +11 -1
- package/dist/providers/copilot.d.ts.map +1 -1
- package/dist/providers/copilot.js +26 -6
- package/dist/providers/copilot.js.map +1 -1
- package/dist/providers/email/headers.d.ts +15 -0
- package/dist/providers/email/headers.d.ts.map +1 -0
- package/dist/providers/email/headers.js +42 -0
- package/dist/providers/email/headers.js.map +1 -0
- package/dist/providers/email/index.d.ts +18 -0
- package/dist/providers/email/index.d.ts.map +1 -0
- package/dist/providers/email/index.js +60 -0
- package/dist/providers/email/index.js.map +1 -0
- package/dist/providers/email/provider.d.ts +49 -0
- package/dist/providers/email/provider.d.ts.map +1 -0
- package/dist/providers/email/provider.js +2 -0
- package/dist/providers/email/provider.js.map +1 -0
- package/dist/providers/email/sendgrid.d.ts +12 -0
- package/dist/providers/email/sendgrid.d.ts.map +1 -0
- package/dist/providers/email/sendgrid.js +67 -0
- package/dist/providers/email/sendgrid.js.map +1 -0
- package/dist/providers/email/smtp.d.ts +65 -0
- package/dist/providers/email/smtp.d.ts.map +1 -0
- package/dist/providers/email/smtp.js +373 -0
- package/dist/providers/email/smtp.js.map +1 -0
- package/dist/providers/gemini.d.ts +11 -1
- package/dist/providers/gemini.d.ts.map +1 -1
- package/dist/providers/gemini.js +38 -4
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/none.d.ts +11 -1
- package/dist/providers/none.d.ts.map +1 -1
- package/dist/providers/none.js +21 -0
- package/dist/providers/none.js.map +1 -1
- package/dist/providers/opencode.d.ts +11 -1
- package/dist/providers/opencode.d.ts.map +1 -1
- package/dist/providers/opencode.js +55 -4
- package/dist/providers/opencode.js.map +1 -1
- package/dist/providers/provider.d.ts +77 -0
- package/dist/providers/provider.d.ts.map +1 -1
- package/dist/providers/provider.js +44 -0
- package/dist/providers/provider.js.map +1 -1
- package/dist/services/agent-provisioner.d.ts.map +1 -1
- package/dist/services/agent-provisioner.js +3 -6
- package/dist/services/agent-provisioner.js.map +1 -1
- package/dist/services/cloud/lifecycle.d.ts.map +1 -1
- package/dist/services/cloud/lifecycle.js +3 -0
- package/dist/services/cloud/lifecycle.js.map +1 -1
- package/dist/services/cloud/task-wrapper.d.ts +18 -0
- package/dist/services/cloud/task-wrapper.d.ts.map +1 -1
- package/dist/services/cloud/task-wrapper.js +157 -0
- package/dist/services/cloud/task-wrapper.js.map +1 -1
- package/dist/services/github-app.d.ts.map +1 -1
- package/dist/services/github-app.js +11 -2
- package/dist/services/github-app.js.map +1 -1
- package/dist/services/knowledge/audn.d.ts +37 -0
- package/dist/services/knowledge/audn.d.ts.map +1 -0
- package/dist/services/knowledge/audn.js +219 -0
- package/dist/services/knowledge/audn.js.map +1 -0
- package/dist/services/knowledge/file-hash.d.ts +11 -0
- package/dist/services/knowledge/file-hash.d.ts.map +1 -0
- package/dist/services/knowledge/file-hash.js +123 -0
- package/dist/services/knowledge/file-hash.js.map +1 -0
- package/dist/services/knowledge/http-provider.d.ts +46 -0
- package/dist/services/knowledge/http-provider.d.ts.map +1 -0
- package/dist/services/knowledge/http-provider.js +254 -0
- package/dist/services/knowledge/http-provider.js.map +1 -0
- package/dist/services/knowledge/kb-providers.d.ts +15 -0
- package/dist/services/knowledge/kb-providers.d.ts.map +1 -0
- package/dist/services/knowledge/kb-providers.js +92 -0
- package/dist/services/knowledge/kb-providers.js.map +1 -0
- package/dist/services/knowledge/kb-scope-input.d.ts +5 -0
- package/dist/services/knowledge/kb-scope-input.d.ts.map +1 -0
- package/dist/services/knowledge/kb-scope-input.js +11 -0
- package/dist/services/knowledge/kb-scope-input.js.map +1 -0
- package/dist/services/knowledge/kb-service.d.ts +3 -0
- package/dist/services/knowledge/kb-service.d.ts.map +1 -0
- package/dist/services/knowledge/kb-service.js +2 -0
- package/dist/services/knowledge/kb-service.js.map +1 -0
- package/dist/services/knowledge/path-validation.d.ts +2 -0
- package/dist/services/knowledge/path-validation.d.ts.map +1 -0
- package/dist/services/knowledge/path-validation.js +13 -0
- package/dist/services/knowledge/path-validation.js.map +1 -0
- package/dist/services/knowledge/pre-init.d.ts +14 -0
- package/dist/services/knowledge/pre-init.d.ts.map +1 -0
- package/dist/services/knowledge/pre-init.js +147 -0
- package/dist/services/knowledge/pre-init.js.map +1 -0
- package/dist/services/knowledge/project-slug.d.ts +2 -0
- package/dist/services/knowledge/project-slug.d.ts.map +1 -0
- package/dist/services/knowledge/project-slug.js +49 -0
- package/dist/services/knowledge/project-slug.js.map +1 -0
- package/dist/services/knowledge/sqlite-provider.d.ts +147 -0
- package/dist/services/knowledge/sqlite-provider.d.ts.map +1 -0
- package/dist/services/knowledge/sqlite-provider.js +1646 -0
- package/dist/services/knowledge/sqlite-provider.js.map +1 -0
- package/dist/services/knowledge/types.d.ts +163 -0
- package/dist/services/knowledge/types.d.ts.map +1 -0
- package/dist/services/knowledge/types.js +9 -0
- package/dist/services/knowledge/types.js.map +1 -0
- package/dist/services/member-home.d.ts +89 -0
- package/dist/services/member-home.d.ts.map +1 -0
- package/dist/services/member-home.js +256 -0
- package/dist/services/member-home.js.map +1 -0
- package/dist/services/member-remote-url.d.ts +34 -0
- package/dist/services/member-remote-url.d.ts.map +1 -0
- package/dist/services/member-remote-url.js +39 -0
- package/dist/services/member-remote-url.js.map +1 -0
- package/dist/services/orphan-recovery.d.ts +5 -2
- package/dist/services/orphan-recovery.d.ts.map +1 -1
- package/dist/services/orphan-recovery.js +19 -8
- package/dist/services/orphan-recovery.js.map +1 -1
- package/dist/services/preflight-check.d.ts +56 -0
- package/dist/services/preflight-check.d.ts.map +1 -0
- package/dist/services/preflight-check.js +277 -0
- package/dist/services/preflight-check.js.map +1 -0
- package/dist/services/stall/log-path-resolver.d.ts +11 -8
- package/dist/services/stall/log-path-resolver.d.ts.map +1 -1
- package/dist/services/stall/log-path-resolver.js +17 -40
- package/dist/services/stall/log-path-resolver.js.map +1 -1
- package/dist/services/stall/stall-detector.d.ts +32 -0
- package/dist/services/stall/stall-detector.d.ts.map +1 -1
- package/dist/services/stall/stall-detector.js +149 -6
- package/dist/services/stall/stall-detector.js.map +1 -1
- package/dist/services/stall/stall-poller.d.ts +34 -0
- package/dist/services/stall/stall-poller.d.ts.map +1 -1
- package/dist/services/stall/stall-poller.js +134 -2
- package/dist/services/stall/stall-poller.js.map +1 -1
- package/dist/services/strategy.d.ts.map +1 -1
- package/dist/services/strategy.js +2 -2
- package/dist/services/strategy.js.map +1 -1
- package/dist/services/tool-registry.d.ts.map +1 -1
- package/dist/services/tool-registry.js +87 -1
- package/dist/services/tool-registry.js.map +1 -1
- package/dist/services/vcs/github.d.ts.map +1 -1
- package/dist/services/vcs/github.js +32 -1
- package/dist/services/vcs/github.js.map +1 -1
- package/dist/services/version-check.d.ts +22 -0
- package/dist/services/version-check.d.ts.map +1 -0
- package/dist/services/version-check.js +103 -0
- package/dist/services/version-check.js.map +1 -0
- package/dist/skills/fleet-sprint-cli/SKILL.md +13 -2
- package/dist/skills/pm/beads.md +6 -0
- package/dist/skills/pm/fleet-addendum.md +6 -0
- package/dist/skills/pm/index.md +56 -0
- package/dist/skills/pm/kb-reconcile.md +132 -0
- package/dist/skills/pm/kb-review.md +109 -0
- package/dist/tools/check-status.d.ts +47 -0
- package/dist/tools/check-status.d.ts.map +1 -1
- package/dist/tools/check-status.js +242 -0
- package/dist/tools/check-status.js.map +1 -1
- package/dist/tools/child-id-allocator.d.ts +2 -2
- package/dist/tools/code-intelligence-codebase-memory.d.ts +11 -0
- package/dist/tools/code-intelligence-codebase-memory.d.ts.map +1 -0
- package/dist/tools/code-intelligence-codebase-memory.js +270 -0
- package/dist/tools/code-intelligence-codebase-memory.js.map +1 -0
- package/dist/tools/code-intelligence-freshness.d.ts +2 -0
- package/dist/tools/code-intelligence-freshness.d.ts.map +1 -0
- package/dist/tools/code-intelligence-freshness.js +26 -0
- package/dist/tools/code-intelligence-freshness.js.map +1 -0
- package/dist/tools/code-intelligence-gitnexus.d.ts +14 -0
- package/dist/tools/code-intelligence-gitnexus.d.ts.map +1 -0
- package/dist/tools/code-intelligence-gitnexus.js +475 -0
- package/dist/tools/code-intelligence-gitnexus.js.map +1 -0
- package/dist/tools/code-intelligence-kb-enrich.d.ts +2 -0
- package/dist/tools/code-intelligence-kb-enrich.d.ts.map +1 -0
- package/dist/tools/code-intelligence-kb-enrich.js +65 -0
- package/dist/tools/code-intelligence-kb-enrich.js.map +1 -0
- package/dist/tools/code-intelligence-reindex.d.ts +7 -0
- package/dist/tools/code-intelligence-reindex.d.ts.map +1 -0
- package/dist/tools/code-intelligence-reindex.js +106 -0
- package/dist/tools/code-intelligence-reindex.js.map +1 -0
- package/dist/tools/code-intelligence-telemetry.d.ts +5 -0
- package/dist/tools/code-intelligence-telemetry.d.ts.map +1 -0
- package/dist/tools/code-intelligence-telemetry.js +52 -0
- package/dist/tools/code-intelligence-telemetry.js.map +1 -0
- package/dist/tools/code-intelligence-tests.d.ts +2 -0
- package/dist/tools/code-intelligence-tests.d.ts.map +1 -0
- package/dist/tools/code-intelligence-tests.js +24 -0
- package/dist/tools/code-intelligence-tests.js.map +1 -0
- package/dist/tools/code-intelligence.d.ts +114 -0
- package/dist/tools/code-intelligence.d.ts.map +1 -0
- package/dist/tools/code-intelligence.js +124 -0
- package/dist/tools/code-intelligence.js.map +1 -0
- package/dist/tools/compose-permissions.d.ts +26 -0
- package/dist/tools/compose-permissions.d.ts.map +1 -1
- package/dist/tools/compose-permissions.js +244 -33
- package/dist/tools/compose-permissions.js.map +1 -1
- package/dist/tools/execute-command.d.ts +2 -0
- package/dist/tools/execute-command.d.ts.map +1 -1
- package/dist/tools/execute-command.js +86 -16
- package/dist/tools/execute-command.js.map +1 -1
- package/dist/tools/execute-prompt.d.ts +13 -1
- package/dist/tools/execute-prompt.d.ts.map +1 -1
- package/dist/tools/execute-prompt.js +257 -45
- package/dist/tools/execute-prompt.js.map +1 -1
- package/dist/tools/kb-capture.d.ts +53 -0
- package/dist/tools/kb-capture.d.ts.map +1 -0
- package/dist/tools/kb-capture.js +130 -0
- package/dist/tools/kb-capture.js.map +1 -0
- package/dist/tools/kb-context.d.ts +17 -0
- package/dist/tools/kb-context.d.ts.map +1 -0
- package/dist/tools/kb-context.js +29 -0
- package/dist/tools/kb-context.js.map +1 -0
- package/dist/tools/kb-export.d.ts +19 -0
- package/dist/tools/kb-export.d.ts.map +1 -0
- package/dist/tools/kb-export.js +344 -0
- package/dist/tools/kb-export.js.map +1 -0
- package/dist/tools/kb-feedback.d.ts +23 -0
- package/dist/tools/kb-feedback.d.ts.map +1 -0
- package/dist/tools/kb-feedback.js +43 -0
- package/dist/tools/kb-feedback.js.map +1 -0
- package/dist/tools/kb-freshness-sweep.d.ts +14 -0
- package/dist/tools/kb-freshness-sweep.d.ts.map +1 -0
- package/dist/tools/kb-freshness-sweep.js +29 -0
- package/dist/tools/kb-freshness-sweep.js.map +1 -0
- package/dist/tools/kb-harvest.d.ts +20 -0
- package/dist/tools/kb-harvest.d.ts.map +1 -0
- package/dist/tools/kb-harvest.js +143 -0
- package/dist/tools/kb-harvest.js.map +1 -0
- package/dist/tools/kb-import.d.ts +44 -0
- package/dist/tools/kb-import.d.ts.map +1 -0
- package/dist/tools/kb-import.js +239 -0
- package/dist/tools/kb-import.js.map +1 -0
- package/dist/tools/kb-invalidate.d.ts +19 -0
- package/dist/tools/kb-invalidate.d.ts.map +1 -0
- package/dist/tools/kb-invalidate.js +34 -0
- package/dist/tools/kb-invalidate.js.map +1 -0
- package/dist/tools/kb-list.d.ts +32 -0
- package/dist/tools/kb-list.d.ts.map +1 -0
- package/dist/tools/kb-list.js +43 -0
- package/dist/tools/kb-list.js.map +1 -0
- package/dist/tools/kb-promote.d.ts +20 -0
- package/dist/tools/kb-promote.d.ts.map +1 -0
- package/dist/tools/kb-promote.js +20 -0
- package/dist/tools/kb-promote.js.map +1 -0
- package/dist/tools/kb-query.d.ts +35 -0
- package/dist/tools/kb-query.d.ts.map +1 -0
- package/dist/tools/kb-query.js +111 -0
- package/dist/tools/kb-query.js.map +1 -0
- package/dist/tools/kb-reconcile-prefilter.d.ts +14 -0
- package/dist/tools/kb-reconcile-prefilter.d.ts.map +1 -0
- package/dist/tools/kb-reconcile-prefilter.js +26 -0
- package/dist/tools/kb-reconcile-prefilter.js.map +1 -0
- package/dist/tools/kb-resolve-contradiction.d.ts +23 -0
- package/dist/tools/kb-resolve-contradiction.d.ts.map +1 -0
- package/dist/tools/kb-resolve-contradiction.js +37 -0
- package/dist/tools/kb-resolve-contradiction.js.map +1 -0
- package/dist/tools/kb-session-prime.d.ts +26 -0
- package/dist/tools/kb-session-prime.d.ts.map +1 -0
- package/dist/tools/kb-session-prime.js +392 -0
- package/dist/tools/kb-session-prime.js.map +1 -0
- package/dist/tools/kb-setup.d.ts +20 -0
- package/dist/tools/kb-setup.d.ts.map +1 -0
- package/dist/tools/kb-setup.js +49 -0
- package/dist/tools/kb-setup.js.map +1 -0
- package/dist/tools/kb-stats.d.ts +20 -0
- package/dist/tools/kb-stats.d.ts.map +1 -0
- package/dist/tools/kb-stats.js +115 -0
- package/dist/tools/kb-stats.js.map +1 -0
- package/dist/tools/member-detail.d.ts.map +1 -1
- package/dist/tools/member-detail.js +8 -0
- package/dist/tools/member-detail.js.map +1 -1
- package/dist/tools/monitor-task.d.ts.map +1 -1
- package/dist/tools/monitor-task.js +21 -3
- package/dist/tools/monitor-task.js.map +1 -1
- package/dist/tools/provision-auth.d.ts.map +1 -1
- package/dist/tools/provision-auth.js +10 -3
- package/dist/tools/provision-auth.js.map +1 -1
- package/dist/tools/register-member.d.ts +3 -0
- package/dist/tools/register-member.d.ts.map +1 -1
- package/dist/tools/register-member.js +30 -1
- package/dist/tools/register-member.js.map +1 -1
- package/dist/tools/remove-member.d.ts.map +1 -1
- package/dist/tools/remove-member.js +17 -3
- package/dist/tools/remove-member.js.map +1 -1
- package/dist/tools/report-status.d.ts.map +1 -1
- package/dist/tools/report-status.js +2 -1
- package/dist/tools/report-status.js.map +1 -1
- package/dist/tools/send-email.d.ts +69 -0
- package/dist/tools/send-email.d.ts.map +1 -0
- package/dist/tools/send-email.js +177 -0
- package/dist/tools/send-email.js.map +1 -0
- package/dist/tools/setup-ssh-key.d.ts.map +1 -1
- package/dist/tools/setup-ssh-key.js +2 -0
- package/dist/tools/setup-ssh-key.js.map +1 -1
- package/dist/tools/update-member.d.ts +3 -0
- package/dist/tools/update-member.d.ts.map +1 -1
- package/dist/tools/update-member.js +25 -1
- package/dist/tools/update-member.js.map +1 -1
- package/dist/types.d.ts +1 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/prompt-errors.js +1 -1
- package/dist/utils/prompt-errors.js.map +1 -1
- package/dist/utils/session-caller.d.ts +28 -0
- package/dist/utils/session-caller.d.ts.map +1 -0
- package/dist/utils/session-caller.js +24 -0
- package/dist/utils/session-caller.js.map +1 -0
- package/dist/utils/work-folder-validation.d.ts +39 -0
- package/dist/utils/work-folder-validation.d.ts.map +1 -0
- package/dist/utils/work-folder-validation.js +60 -0
- package/dist/utils/work-folder-validation.js.map +1 -0
- package/dist/workflows/auto-sprint.js +546 -6
- package/package.json +7 -4
- package/packages/apra-fleet-client/src/client/api.mjs +118 -4
- package/packages/apra-fleet-se/apra-pm/agents/backlog-groomer.md +17 -1
- package/packages/apra-fleet-se/apra-pm/agents/ci-watcher.md +13 -1
- package/packages/apra-fleet-se/apra-pm/agents/deployer.md +15 -3
- package/packages/apra-fleet-se/apra-pm/agents/doer.md +35 -1
- package/packages/apra-fleet-se/apra-pm/agents/harvester.md +22 -3
- package/packages/apra-fleet-se/apra-pm/agents/integ-test-runner.md +18 -2
- package/packages/apra-fleet-se/apra-pm/agents/kb-reconciler.md +216 -0
- package/packages/apra-fleet-se/apra-pm/agents/plan-reviewer.md +14 -1
- package/packages/apra-fleet-se/apra-pm/agents/planner.md +88 -5
- package/packages/apra-fleet-se/apra-pm/agents/regression-test-runner.md +19 -1
- package/packages/apra-fleet-se/apra-pm/agents/reviewer.md +104 -3
- package/packages/apra-fleet-se/apra-pm/agents/schemas/doer-output.json +63 -3
- package/packages/apra-fleet-se/apra-pm/agents/schemas/harvester-output.json +59 -2
- package/packages/apra-fleet-se/apra-pm/agents/schemas/integ-test-runner-output.json +2 -2
- package/packages/apra-fleet-se/apra-pm/agents/schemas/kb-reconciler-output.json +87 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/planner-output.json +65 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/reviewer-output.json +105 -8
- package/packages/apra-fleet-se/apra-pm/skills/pm/beads.md +6 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/fleet-addendum.md +6 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/index.md +56 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/kb-reconcile.md +132 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/kb-review.md +109 -0
- package/packages/apra-fleet-se/bin/cli.mjs +7 -0
- package/packages/apra-fleet-se/bin/serve.mjs +14 -2
- package/packages/apra-fleet-se/fleet-sprint/contracts.mjs +31 -5
- package/packages/apra-fleet-se/fleet-sprint/docs/README.md +1 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/coach-role-design.md +23 -151
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-manual-recovery-verified.md +256 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-sync-redesign.md +1482 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/escalate-to-llm-design.md +908 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/shared-orchestrator-reservation-design.md +399 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-settle.mjs +972 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-sync.mjs +167 -101
- package/packages/apra-fleet-se/fleet-sprint/errors.mjs +50 -6
- package/packages/apra-fleet-se/fleet-sprint/runner.js +1416 -116
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-sprint-cli/SKILL.md +13 -2
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-supervisor/SKILL.md +350 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-progress.mjs +101 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/github.mjs +30 -17
- package/packages/apra-fleet-se/fleet-sprint/viewer-extensions.mjs +62 -2
- package/packages/apra-fleet-se/package.json +1 -0
- package/packages/apra-fleet-workflow/src/viewer/index.mjs +127 -13
- package/packages/apra-fleet-workflow/src/viewer/run-title.mjs +60 -0
- package/packages/apra-fleet-workflow/src/workflow/index.mjs +8 -4
- package/skills/fleet/knowledge-agent.md +66 -0
- package/skills/fleet/permissions.md +28 -4
- package/skills/fleet/profiles/base-dev.json +10 -1
- package/skills/fleet/profiles/base-reviewer.json +8 -1
- package/skills/fleet/profiles/tag-kb-reconciler.json +20 -0
- package/version.json +1 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-tier2-runbook.md +0 -127
- package/packages/apra-fleet-se/fleet-sprint/dolt-recovery-path-b.mjs +0 -339
- package/packages/apra-fleet-se/fleet-sprint/dolt-recovery-tier2.mjs +0 -360
- package/packages/apra-fleet-se/fleet-sprint/dolt-recovery.mjs +0 -363
|
@@ -1,363 +0,0 @@
|
|
|
1
|
-
// apra-fleet-eft.9.4 (Plan 3.4 -- Dolt conflict recovery ladder, Path A).
|
|
2
|
-
//
|
|
3
|
-
// Path A is the SCRIPTED, resolve-in-place recovery for the one dolt conflict
|
|
4
|
-
// shape we can safely arbitrate mechanically: a single conflicted row in the
|
|
5
|
-
// `issues` table (or an explicitly extended allowlist). It runs as a pure
|
|
6
|
-
// command()/sql()-driven orchestrator procedure -- ZERO agent dispatch -- and
|
|
7
|
-
// is gated behind TWO deterministic checks so it can only ever proceed on the
|
|
8
|
-
// exact conflict shape it was verified against.
|
|
9
|
-
//
|
|
10
|
-
// -----------------------------------------------------------------------------
|
|
11
|
-
// Why this exists (and why it is gated so tightly):
|
|
12
|
-
//
|
|
13
|
-
// The D-push bracket (apra-fleet-eft.9.1/9.2) already reconciles the common
|
|
14
|
-
// "remote moved first" race mechanically (first-successful-pusher-wins: pull
|
|
15
|
-
// once, re-push once). What it CANNOT do is reconcile a genuine row-level
|
|
16
|
-
// MERGE CONFLICT -- constraint C.2 (row-level, not cell-level, conflicts in
|
|
17
|
-
// bd 1.1.0 embedded mode) and C.3 (one unresolved conflict wedges the ENTIRE
|
|
18
|
-
// clone sync). A wedged clone cannot pull, push, or dispatch anything until
|
|
19
|
-
// the conflict is resolved.
|
|
20
|
-
//
|
|
21
|
-
// The upstream `bd dolt` embedded surface offers no way to re-open and
|
|
22
|
-
// resolve such a merge in place. This runbook (VERIFIED 2026-07-16, plan
|
|
23
|
-
// 3.4) does it by temporarily standing up a dolt sql-server against the SAME
|
|
24
|
-
// embedded data dir, re-opening the aborted merge through SQL, resolving the
|
|
25
|
-
// single conflicted row, committing, and pushing -- then tearing the server
|
|
26
|
-
// down and flipping metadata.json back to embedded mode. Reversibility (flip
|
|
27
|
-
// back + teardown on EVERY path, including failure) and zero data loss were
|
|
28
|
-
// both verified.
|
|
29
|
-
//
|
|
30
|
-
// -----------------------------------------------------------------------------
|
|
31
|
-
// The two deterministic gates (assessConflictGates below), both required:
|
|
32
|
-
//
|
|
33
|
-
// Gate 1 (table): every conflicted table is in the allowlist (default
|
|
34
|
-
// ['issues']). A conflict touching any other table is NOT something this
|
|
35
|
-
// scripted path understands -- it must escalate (9.6), never guess.
|
|
36
|
-
//
|
|
37
|
-
// Gate 2 (shape): a PLAIN SINGLE-ROW conflict -- exactly one conflicted
|
|
38
|
-
// table, with exactly one conflicting row. A multi-row conflict is not a
|
|
39
|
-
// shape a fixed ours/theirs rule can safely arbitrate without risking
|
|
40
|
-
// silently discarding real work, so it too must escalate, not proceed.
|
|
41
|
-
//
|
|
42
|
-
// A gate rejection is returned (not thrown) with proceeded:false so the
|
|
43
|
-
// caller (Tier 2 escalation, apra-fleet-eft.9.6) can route it onward. Only a
|
|
44
|
-
// genuine operational failure (server won't start, SQL error, push still
|
|
45
|
-
// rejected) throws a typed DoltDivergedError/DoltSyncError.
|
|
46
|
-
//
|
|
47
|
-
// -----------------------------------------------------------------------------
|
|
48
|
-
// The 10-step VERIFIED runbook (implemented exactly, in this order):
|
|
49
|
-
//
|
|
50
|
-
// 1. Detect: a `bd dolt pull` whose exit/error text is a conflict (see
|
|
51
|
-
// isDoltPullConflict) is the trigger.
|
|
52
|
-
// 2. Start `dolt sql-server --data-dir <embeddedDataDir>` on an ephemeral
|
|
53
|
-
// loopback (127.0.0.1) port, EXTERNALLY MANAGED. `bd dolt start` points
|
|
54
|
-
// the server at the wrong data dir (GH#2438), so we spawn it ourselves.
|
|
55
|
-
// 3. Flip metadata.json dolt_mode -> "server" (so bd talks to our server).
|
|
56
|
-
// 4. Re-open the aborted merge: `SET @@dolt_allow_commit_conflicts = 1`.
|
|
57
|
-
// 5. `CALL DOLT_MERGE('<remote>/<branch>')` -- the step upstream docs omit;
|
|
58
|
-
// without it there is no in-progress merge to resolve.
|
|
59
|
-
// 6. `SELECT * FROM dolt_conflicts` -- THE GATE. assessConflictGates()
|
|
60
|
-
// decides proceed/reject from this alone.
|
|
61
|
-
// 7. `CALL DOLT_CONFLICTS_RESOLVE('--theirs'|'--ours', '<table>')` -- the
|
|
62
|
-
// table-name arg is REQUIRED (dolt errors without it).
|
|
63
|
-
// 8. `CALL DOLT_COMMIT('-m', ...)` the resolved merge.
|
|
64
|
-
// 9. `bd dolt pull` then `bd dolt push` to republish the reconciled clone.
|
|
65
|
-
// 10. Teardown: stop the sql-server and flip metadata.json back to
|
|
66
|
-
// "embedded" -- ALWAYS, in a finally, even on failure (reversibility).
|
|
67
|
-
//
|
|
68
|
-
// Every SQL statement and shell command is issued through an injected
|
|
69
|
-
// sql()/command() so unit tests drive the whole procedure against a scripted
|
|
70
|
-
// (deliberately wedged) mock clone with no live dolt server.
|
|
71
|
-
// =============================================================================
|
|
72
|
-
|
|
73
|
-
import { DoltDivergedError, DoltSyncError } from './errors.mjs';
|
|
74
|
-
|
|
75
|
-
/** Default beads embedded data dir the sql-server is pointed at (step 2). The
|
|
76
|
-
* `embeddeddolt` suffix, not `.beads` itself, is the actual dolt data dir --
|
|
77
|
-
* the exact dir `bd dolt start` gets wrong (GH#2438). */
|
|
78
|
-
export const DEFAULT_EMBEDDED_DATA_DIR = '.beads/embeddeddolt';
|
|
79
|
-
|
|
80
|
-
/** The only table this scripted path is allowed to resolve conflicts in.
|
|
81
|
-
* Extendable via opts.allowlistTables, but never silently widened. */
|
|
82
|
-
export const DEFAULT_ALLOWLIST_TABLES = ['issues'];
|
|
83
|
-
|
|
84
|
-
/** Loopback host the ephemeral sql-server binds. Never a routable interface --
|
|
85
|
-
* this server exists only for the life of one recovery. */
|
|
86
|
-
export const RECOVERY_SQL_SERVER_HOST = '127.0.0.1';
|
|
87
|
-
|
|
88
|
-
/**
|
|
89
|
-
* Substrings in a failed `bd dolt pull` that mark it as a genuine (un-fast-
|
|
90
|
-
* forwardable) MERGE CONFLICT -- the trigger for Path A. Deliberately the
|
|
91
|
-
* conflict-only subset of runner.js's DOLT_DIVERGED_PATTERNS: a plain
|
|
92
|
-
* non-fast-forward "remote moved" rejection is handled by the D-push
|
|
93
|
-
* reconcile, NOT by this heavier resolve-in-place path.
|
|
94
|
-
* @type {RegExp[]}
|
|
95
|
-
*/
|
|
96
|
-
const DOLT_PULL_CONFLICT_PATTERNS = [
|
|
97
|
-
/conflict/i,
|
|
98
|
-
/unresolved (merge|conflict)/i,
|
|
99
|
-
/merge (is )?required/i,
|
|
100
|
-
/automatic merge failed/i,
|
|
101
|
-
/cannot merge/i,
|
|
102
|
-
];
|
|
103
|
-
|
|
104
|
-
/**
|
|
105
|
-
* Does this `bd dolt pull` failure output describe a genuine merge conflict
|
|
106
|
-
* (the Path A trigger), as opposed to a transient/network failure or a plain
|
|
107
|
-
* non-fast-forward rejection? Classified from git/dolt's OWN output text, the
|
|
108
|
-
* same posture as the git ladder's porcelain-first detection.
|
|
109
|
-
*
|
|
110
|
-
* @param {string} output - raw stderr/stdout of the failed `bd dolt pull`
|
|
111
|
-
* @returns {boolean}
|
|
112
|
-
*/
|
|
113
|
-
export function isDoltPullConflict(output) {
|
|
114
|
-
const text = String(output == null ? '' : output);
|
|
115
|
-
return DOLT_PULL_CONFLICT_PATTERNS.some((re) => re.test(text));
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
/**
|
|
119
|
-
* The two deterministic gates, computed from `SELECT * FROM dolt_conflicts`
|
|
120
|
-
* (step 6). That view returns one row per conflicted table with a
|
|
121
|
-
* `num_conflicts` count. Both gates must pass for Path A to proceed.
|
|
122
|
-
*
|
|
123
|
-
* passedTableGate: at least one conflicted table AND every conflicted table
|
|
124
|
-
* is in the allowlist.
|
|
125
|
-
* passedShapeGate: exactly ONE conflicted table, whose num_conflicts is
|
|
126
|
-
* exactly 1 (a plain single-row conflict).
|
|
127
|
-
*
|
|
128
|
-
* @param {Array<{ table?: string, num_conflicts?: number|string }>} conflictRows
|
|
129
|
-
* @param {string[]} allowlist
|
|
130
|
-
* @returns {{ tables: string[], totalConflicts: number, passedTableGate: boolean, passedShapeGate: boolean, passed: boolean }}
|
|
131
|
-
*/
|
|
132
|
-
export function assessConflictGates(conflictRows, allowlist = DEFAULT_ALLOWLIST_TABLES) {
|
|
133
|
-
const rows = Array.isArray(conflictRows) ? conflictRows : [];
|
|
134
|
-
const allow = Array.isArray(allowlist) && allowlist.length > 0 ? allowlist : DEFAULT_ALLOWLIST_TABLES;
|
|
135
|
-
const tables = rows.map((r) => String(r && r.table != null ? r.table : '')).filter((t) => t !== '');
|
|
136
|
-
const totalConflicts = rows.reduce((sum, r) => sum + Number((r && r.num_conflicts) || 0), 0);
|
|
137
|
-
|
|
138
|
-
const passedTableGate = tables.length > 0 && tables.every((t) => allow.includes(t));
|
|
139
|
-
const passedShapeGate = rows.length === 1
|
|
140
|
-
&& tables.length === 1
|
|
141
|
-
&& Number(rows[0] && rows[0].num_conflicts) === 1;
|
|
142
|
-
|
|
143
|
-
return {
|
|
144
|
-
tables,
|
|
145
|
-
totalConflicts,
|
|
146
|
-
passedTableGate,
|
|
147
|
-
passedShapeGate,
|
|
148
|
-
passed: passedTableGate && passedShapeGate,
|
|
149
|
-
};
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
/** Extract the `rows` array from an injected sql() result, tolerating either
|
|
153
|
-
* `{ ok, rows }` or a bare array. Throws a DoltSyncError on a failed query so
|
|
154
|
-
* the caller's finally still runs teardown. */
|
|
155
|
-
function sqlRows(res, label, member) {
|
|
156
|
-
if (Array.isArray(res)) return res;
|
|
157
|
-
if (res && res.ok === false) {
|
|
158
|
-
throw new DoltSyncError(
|
|
159
|
-
`[Dolt] Path A SQL step failed (${label}) for member '${member}': ${res.error || 'unknown sql failure'}`,
|
|
160
|
-
{ member, doltOutput: res.error || null },
|
|
161
|
-
);
|
|
162
|
-
}
|
|
163
|
-
if (res && Array.isArray(res.rows)) return res.rows;
|
|
164
|
-
return [];
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
-
/**
|
|
168
|
-
* Path A: scripted, resolve-in-place dolt conflict recovery behind the two
|
|
169
|
-
* deterministic gates. Runs the 10-step VERIFIED runbook end-to-end via
|
|
170
|
-
* injected command()/sql()/spawnSqlServer -- NO agent dispatch.
|
|
171
|
-
*
|
|
172
|
-
* Return contract (never partial): on gate rejection returns
|
|
173
|
-
* `{ ok:false, proceeded:false, resolved:false, gate, reason }` so the caller
|
|
174
|
-
* (9.6) can escalate; on success returns
|
|
175
|
-
* `{ ok:true, proceeded:true, resolved:true, gate, doltLog, reason }`. Any
|
|
176
|
-
* genuine operational failure throws DoltDivergedError/DoltSyncError. On EVERY
|
|
177
|
-
* path (success, gate rejection, thrown failure) the sql-server is torn down
|
|
178
|
-
* and metadata.json is flipped back to "embedded" -- reversibility is asserted
|
|
179
|
-
* in a finally, exactly as the runbook was verified.
|
|
180
|
-
*
|
|
181
|
-
* @param {{
|
|
182
|
-
* member: string,
|
|
183
|
-
* command: (cmd: string, opts?: object) => Promise<{ ok: boolean, output?: string, error?: string|null }>,
|
|
184
|
-
* sql: (query: string, opts?: object) => Promise<{ ok?: boolean, rows?: object[], error?: string|null }|object[]>,
|
|
185
|
-
* spawnSqlServer: (opts: { dataDir: string, host: string, port: number }) => Promise<{ stop: () => Promise<void>|void }>,
|
|
186
|
-
* allocatePort?: () => Promise<number>|number,
|
|
187
|
-
* readMetadata: () => Promise<object>|object,
|
|
188
|
-
* writeMetadata: (meta: object) => Promise<void>|void,
|
|
189
|
-
* dataDir?: string,
|
|
190
|
-
* remote?: string,
|
|
191
|
-
* branch?: string,
|
|
192
|
-
* allowlistTables?: string[],
|
|
193
|
-
* resolveStrategy?: '--theirs'|'--ours',
|
|
194
|
-
* log?: (msg: string) => void,
|
|
195
|
-
* }} opts
|
|
196
|
-
* @returns {Promise<{ ok: boolean, proceeded: boolean, resolved: boolean, gate: object, reason: string, doltLog?: object[] }>}
|
|
197
|
-
*/
|
|
198
|
-
export async function recoverDoltConflictPathA(opts = {}) {
|
|
199
|
-
const {
|
|
200
|
-
member,
|
|
201
|
-
command,
|
|
202
|
-
sql,
|
|
203
|
-
spawnSqlServer,
|
|
204
|
-
allocatePort,
|
|
205
|
-
readMetadata,
|
|
206
|
-
writeMetadata,
|
|
207
|
-
dataDir = DEFAULT_EMBEDDED_DATA_DIR,
|
|
208
|
-
remote = 'origin',
|
|
209
|
-
branch = 'main',
|
|
210
|
-
allowlistTables = DEFAULT_ALLOWLIST_TABLES,
|
|
211
|
-
// First-successful-pusher-wins mirror (Plan 3.3): the remote already
|
|
212
|
-
// published; the wedged clone is the loser and takes THEIRS. Both
|
|
213
|
-
// sides' history is preserved in dolt_log regardless (the merge commit
|
|
214
|
-
// keeps both parents) -- ours/theirs only picks the surviving row.
|
|
215
|
-
resolveStrategy = '--theirs',
|
|
216
|
-
log = () => {},
|
|
217
|
-
} = opts;
|
|
218
|
-
|
|
219
|
-
if (typeof command !== 'function') throw new Error('recoverDoltConflictPathA requires an injected command() in opts');
|
|
220
|
-
if (typeof sql !== 'function') throw new Error('recoverDoltConflictPathA requires an injected sql() in opts');
|
|
221
|
-
if (typeof spawnSqlServer !== 'function') throw new Error('recoverDoltConflictPathA requires an injected spawnSqlServer() in opts');
|
|
222
|
-
if (typeof readMetadata !== 'function' || typeof writeMetadata !== 'function') {
|
|
223
|
-
throw new Error('recoverDoltConflictPathA requires injected readMetadata()/writeMetadata() in opts');
|
|
224
|
-
}
|
|
225
|
-
if (resolveStrategy !== '--theirs' && resolveStrategy !== '--ours') {
|
|
226
|
-
throw new Error(`recoverDoltConflictPathA: resolveStrategy must be '--theirs' or '--ours' (got ${resolveStrategy})`);
|
|
227
|
-
}
|
|
228
|
-
|
|
229
|
-
const port = await (typeof allocatePort === 'function' ? allocatePort() : allocateEphemeralPort());
|
|
230
|
-
|
|
231
|
-
// Reversibility bookkeeping: track exactly what we mutated so the finally
|
|
232
|
-
// undoes only (and all of) it, even if we throw partway through.
|
|
233
|
-
let server = null;
|
|
234
|
-
let metadataFlipped = false;
|
|
235
|
-
let mergeOpen = false;
|
|
236
|
-
|
|
237
|
-
try {
|
|
238
|
-
// --- Step 2: stand up the ephemeral, externally-managed sql-server ---
|
|
239
|
-
log(`[Dolt] Path A: starting ephemeral dolt sql-server for member '${member}' at ${RECOVERY_SQL_SERVER_HOST}:${port} --data-dir ${dataDir} (externally managed; 'bd dolt start' targets the wrong dir -- GH#2438).`);
|
|
240
|
-
server = await spawnSqlServer({ dataDir, host: RECOVERY_SQL_SERVER_HOST, port });
|
|
241
|
-
|
|
242
|
-
// --- Step 3: flip metadata.json to server mode ---
|
|
243
|
-
const originalMeta = await readMetadata();
|
|
244
|
-
const serverMeta = {
|
|
245
|
-
...originalMeta,
|
|
246
|
-
dolt_mode: 'server',
|
|
247
|
-
dolt_server: { host: RECOVERY_SQL_SERVER_HOST, port },
|
|
248
|
-
};
|
|
249
|
-
await writeMetadata(serverMeta);
|
|
250
|
-
metadataFlipped = true;
|
|
251
|
-
log(`[Dolt] Path A: flipped metadata.json dolt_mode -> server for member '${member}'.`);
|
|
252
|
-
|
|
253
|
-
// --- Step 4: re-open the aborted merge (allow committing conflicts) ---
|
|
254
|
-
await sqlRows(await sql('SET @@dolt_allow_commit_conflicts = 1', { member_name: member, label: 'Path A allow-commit-conflicts' }), 'set allow_commit_conflicts', member);
|
|
255
|
-
|
|
256
|
-
// --- Step 5: CALL DOLT_MERGE(origin/main) -- the omitted step ---
|
|
257
|
-
mergeOpen = true;
|
|
258
|
-
await sqlRows(await sql(`CALL DOLT_MERGE('${remote}/${branch}')`, { member_name: member, label: 'Path A dolt_merge' }), 'dolt_merge', member);
|
|
259
|
-
|
|
260
|
-
// --- Step 6: SELECT * FROM dolt_conflicts -- THE GATE ---
|
|
261
|
-
const conflictRows = sqlRows(await sql('SELECT * FROM dolt_conflicts', { member_name: member, label: 'Path A dolt_conflicts gate' }), 'select dolt_conflicts', member);
|
|
262
|
-
const gate = assessConflictGates(conflictRows, allowlistTables);
|
|
263
|
-
|
|
264
|
-
if (!gate.passed) {
|
|
265
|
-
const why = !gate.passedTableGate
|
|
266
|
-
? `conflicted table(s) [${gate.tables.join(', ') || '(none)'}] not in allowlist [${(allowlistTables || DEFAULT_ALLOWLIST_TABLES).join(', ')}]`
|
|
267
|
-
: `not a plain single-row conflict (${gate.tables.length} table(s), ${gate.totalConflicts} row conflict(s) total)`;
|
|
268
|
-
log(`[Dolt] Path A GATE REJECTED for member '${member}': ${why}. Not proceeding (escalate to Tier 2); reverting.`);
|
|
269
|
-
return { ok: false, proceeded: false, resolved: false, gate, reason: `Path A gate rejected: ${why}` };
|
|
270
|
-
}
|
|
271
|
-
|
|
272
|
-
const conflictTable = gate.tables[0];
|
|
273
|
-
log(`[Dolt] Path A GATES PASSED for member '${member}': single-row conflict in allowlisted table '${conflictTable}'. Resolving in place (${resolveStrategy}).`);
|
|
274
|
-
|
|
275
|
-
// --- Step 7: CALL DOLT_CONFLICTS_RESOLVE('--theirs', '<table>') ---
|
|
276
|
-
// The table-name arg is REQUIRED -- dolt_conflicts_resolve errors
|
|
277
|
-
// without it. First-successful-pusher-wins => default --theirs.
|
|
278
|
-
await sqlRows(
|
|
279
|
-
await sql(`CALL DOLT_CONFLICTS_RESOLVE('${resolveStrategy}', '${conflictTable}')`, { member_name: member, label: 'Path A dolt_conflicts_resolve' }),
|
|
280
|
-
'dolt_conflicts_resolve', member,
|
|
281
|
-
);
|
|
282
|
-
|
|
283
|
-
// --- Step 8: commit the resolved merge ---
|
|
284
|
-
await sqlRows(
|
|
285
|
-
await sql(`CALL DOLT_COMMIT('-m', 'Path A scripted resolve-in-place of single-row ${conflictTable} conflict (${resolveStrategy}) for member ${member}')`, { member_name: member, label: 'Path A dolt_commit' }),
|
|
286
|
-
'dolt_commit', member,
|
|
287
|
-
);
|
|
288
|
-
mergeOpen = false;
|
|
289
|
-
|
|
290
|
-
// Confirm zero data loss: both sides' history must be present in
|
|
291
|
-
// dolt_log (the merge commit keeps both parents). Returned for the
|
|
292
|
-
// caller/test to assert against.
|
|
293
|
-
const doltLog = sqlRows(await sql('SELECT * FROM dolt_log', { member_name: member, label: 'Path A dolt_log verify' }), 'select dolt_log', member);
|
|
294
|
-
|
|
295
|
-
// --- Step 9: pull + push to republish the reconciled clone ---
|
|
296
|
-
const pull = await command('bd dolt pull', { member_name: member, silent: true, failSoft: true, label: `Path A post-resolve D-pull for '${member}'` });
|
|
297
|
-
if (pull && pull.ok === false) {
|
|
298
|
-
throw new DoltDivergedError(
|
|
299
|
-
`[Dolt] Path A post-resolve pull still failed for member '${member}': ${pull.error}`,
|
|
300
|
-
{ member, doltOutput: pull.error, operation: 'path-a-pull' },
|
|
301
|
-
);
|
|
302
|
-
}
|
|
303
|
-
const push = await command('bd dolt push', { member_name: member, silent: true, failSoft: true, label: `Path A post-resolve D-push for '${member}'` });
|
|
304
|
-
if (push && push.ok === false) {
|
|
305
|
-
throw new DoltDivergedError(
|
|
306
|
-
`[Dolt] Path A resolved the conflict but the republishing push was still rejected for member '${member}': ${push.error}`,
|
|
307
|
-
{ member, doltOutput: push.error, operation: 'path-a-push' },
|
|
308
|
-
);
|
|
309
|
-
}
|
|
310
|
-
|
|
311
|
-
log(`[Dolt] Path A SUCCEEDED for member '${member}': single-row '${conflictTable}' conflict resolved in place and republished; both sides present in dolt_log (${doltLog.length} commit(s)).`);
|
|
312
|
-
return { ok: true, proceeded: true, resolved: true, gate, doltLog, reason: `Path A resolved single-row ${conflictTable} conflict in place` };
|
|
313
|
-
} finally {
|
|
314
|
-
// --- Step 10: reversibility -- ALWAYS teardown + flip back, even on
|
|
315
|
-
// failure. Best-effort: a teardown hiccup must not mask the real error
|
|
316
|
-
// that is already propagating, and each undo is independent.
|
|
317
|
-
if (mergeOpen) {
|
|
318
|
-
try {
|
|
319
|
-
await sql("CALL DOLT_MERGE('--abort')", { member_name: member, label: 'Path A merge abort (revert)' });
|
|
320
|
-
} catch (abortErr) {
|
|
321
|
-
log(`[Dolt] Path A: best-effort merge abort for member '${member}' failed (non-fatal): ${abortErr.message}`);
|
|
322
|
-
}
|
|
323
|
-
}
|
|
324
|
-
if (metadataFlipped) {
|
|
325
|
-
try {
|
|
326
|
-
const meta = await readMetadata();
|
|
327
|
-
const embeddedMeta = { ...meta, dolt_mode: 'embedded' };
|
|
328
|
-
delete embeddedMeta.dolt_server;
|
|
329
|
-
await writeMetadata(embeddedMeta);
|
|
330
|
-
log(`[Dolt] Path A: flipped metadata.json dolt_mode back to embedded for member '${member}'.`);
|
|
331
|
-
} catch (metaErr) {
|
|
332
|
-
log(`[Dolt] Path A: WARNING -- could not flip metadata.json back to embedded for member '${member}': ${metaErr.message}`);
|
|
333
|
-
}
|
|
334
|
-
}
|
|
335
|
-
if (server && typeof server.stop === 'function') {
|
|
336
|
-
try {
|
|
337
|
-
await server.stop();
|
|
338
|
-
log(`[Dolt] Path A: torn down ephemeral sql-server for member '${member}'.`);
|
|
339
|
-
} catch (stopErr) {
|
|
340
|
-
log(`[Dolt] Path A: WARNING -- could not stop ephemeral sql-server for member '${member}': ${stopErr.message}`);
|
|
341
|
-
}
|
|
342
|
-
}
|
|
343
|
-
}
|
|
344
|
-
}
|
|
345
|
-
|
|
346
|
-
/**
|
|
347
|
-
* Default ephemeral loopback port allocator: bind a throwaway net server to
|
|
348
|
-
* port 0, read the OS-assigned port, release it, and hand it back. Injected
|
|
349
|
-
* (opts.allocatePort) in tests so no real socket is touched.
|
|
350
|
-
* @returns {Promise<number>}
|
|
351
|
-
*/
|
|
352
|
-
export async function allocateEphemeralPort() {
|
|
353
|
-
const net = await import('node:net');
|
|
354
|
-
return new Promise((resolve, reject) => {
|
|
355
|
-
const srv = net.createServer();
|
|
356
|
-
srv.on('error', reject);
|
|
357
|
-
srv.listen(0, RECOVERY_SQL_SERVER_HOST, () => {
|
|
358
|
-
const addr = srv.address();
|
|
359
|
-
const port = addr && typeof addr === 'object' ? addr.port : 0;
|
|
360
|
-
srv.close(() => resolve(port));
|
|
361
|
-
});
|
|
362
|
-
});
|
|
363
|
-
}
|