@apralabs/apra-fleet 0.4.1 → 0.4.3
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 +53 -12
- package/dist/agents/backlog-groomer.md +42 -21
- package/dist/agents/ci-watcher.md +14 -0
- package/dist/agents/deployer.md +59 -46
- package/dist/agents/doer.md +157 -134
- package/dist/agents/harvester.md +31 -32
- package/dist/agents/integ-test-runner.md +92 -113
- package/dist/agents/kb-reconciler.md +40 -42
- package/dist/agents/plan-reviewer.md +139 -63
- package/dist/agents/planner.md +176 -100
- package/dist/agents/regression-test-runner.md +77 -81
- package/dist/agents/reviewer.md +69 -85
- package/dist/agents/schemas/integ-test-runner-output.json +1 -1
- package/dist/agents/schemas/plan-reviewer-output.json +37 -0
- package/dist/agents/schemas/regression-test-runner-output.json +4 -17
- package/dist/cli/agent-transform.d.ts +83 -2
- package/dist/cli/agent-transform.d.ts.map +1 -1
- package/dist/cli/agent-transform.js +266 -21
- package/dist/cli/agent-transform.js.map +1 -1
- package/dist/cli/auth.d.ts.map +1 -1
- package/dist/cli/auth.js +29 -11
- package/dist/cli/auth.js.map +1 -1
- package/dist/cli/config.d.ts +7 -5
- package/dist/cli/config.d.ts.map +1 -1
- package/dist/cli/config.js +44 -43
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/install.d.ts +33 -0
- package/dist/cli/install.d.ts.map +1 -1
- package/dist/cli/install.js +294 -61
- package/dist/cli/install.js.map +1 -1
- package/dist/cli/kb-directives.d.ts.map +1 -1
- package/dist/cli/kb-directives.js +2 -1
- package/dist/cli/kb-directives.js.map +1 -1
- package/dist/cli/register-member.d.ts.map +1 -1
- package/dist/cli/register-member.js +7 -3
- package/dist/cli/register-member.js.map +1 -1
- package/dist/cli/start.d.ts.map +1 -1
- package/dist/cli/start.js +7 -0
- package/dist/cli/start.js.map +1 -1
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +5 -3
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/watch.d.ts +26 -3
- package/dist/cli/watch.d.ts.map +1 -1
- package/dist/cli/watch.js +41 -9
- package/dist/cli/watch.js.map +1 -1
- package/dist/commands/kb-server.d.ts +3 -0
- package/dist/commands/kb-server.d.ts.map +1 -1
- package/dist/commands/kb-server.js +43 -3
- package/dist/commands/kb-server.js.map +1 -1
- package/dist/index.js +3 -3
- package/dist/os/git-bash-candidates.d.ts +35 -0
- package/dist/os/git-bash-candidates.d.ts.map +1 -0
- package/dist/os/git-bash-candidates.js +46 -0
- package/dist/os/git-bash-candidates.js.map +1 -0
- package/dist/os/index.d.ts +13 -4
- package/dist/os/index.d.ts.map +1 -1
- package/dist/os/index.js +17 -2
- package/dist/os/index.js.map +1 -1
- package/dist/os/linux.d.ts +6 -0
- package/dist/os/linux.d.ts.map +1 -1
- package/dist/os/linux.js +36 -3
- package/dist/os/linux.js.map +1 -1
- package/dist/os/os-commands.d.ts +68 -2
- package/dist/os/os-commands.d.ts.map +1 -1
- package/dist/os/os-commands.js.map +1 -1
- package/dist/os/windows-gitbash.d.ts +98 -0
- package/dist/os/windows-gitbash.d.ts.map +1 -0
- package/dist/os/windows-gitbash.js +259 -0
- package/dist/os/windows-gitbash.js.map +1 -0
- package/dist/os/windows.d.ts +6 -0
- package/dist/os/windows.d.ts.map +1 -1
- package/dist/os/windows.js +73 -8
- package/dist/os/windows.js.map +1 -1
- package/dist/providers/agy.d.ts +118 -8
- package/dist/providers/agy.d.ts.map +1 -1
- package/dist/providers/agy.js +580 -55
- package/dist/providers/agy.js.map +1 -1
- package/dist/providers/claude.d.ts +83 -4
- package/dist/providers/claude.d.ts.map +1 -1
- package/dist/providers/claude.js +365 -12
- package/dist/providers/claude.js.map +1 -1
- package/dist/providers/codex.d.ts +7 -4
- package/dist/providers/codex.d.ts.map +1 -1
- package/dist/providers/codex.js +24 -4
- package/dist/providers/codex.js.map +1 -1
- package/dist/providers/copilot.d.ts +7 -4
- package/dist/providers/copilot.d.ts.map +1 -1
- package/dist/providers/copilot.js +27 -4
- package/dist/providers/copilot.js.map +1 -1
- package/dist/providers/index.d.ts +0 -1
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +0 -3
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/none.d.ts +7 -4
- package/dist/providers/none.d.ts.map +1 -1
- package/dist/providers/none.js +22 -4
- package/dist/providers/none.js.map +1 -1
- package/dist/providers/opencode.d.ts +6 -3
- package/dist/providers/opencode.d.ts.map +1 -1
- package/dist/providers/opencode.js +27 -4
- package/dist/providers/opencode.js.map +1 -1
- package/dist/providers/provider.d.ts +215 -11
- package/dist/providers/provider.d.ts.map +1 -1
- package/dist/providers/provider.js +58 -2
- package/dist/providers/provider.js.map +1 -1
- package/dist/services/agent-provisioner.js +2 -2
- package/dist/services/agent-provisioner.js.map +1 -1
- package/dist/services/agy-project.d.ts +102 -0
- package/dist/services/agy-project.d.ts.map +1 -0
- package/dist/services/agy-project.js +356 -0
- package/dist/services/agy-project.js.map +1 -0
- package/dist/services/auth-socket.js +4 -4
- package/dist/services/auth-web.js +1 -1
- package/dist/services/cloud/activity.js +2 -2
- package/dist/services/cloud/activity.js.map +1 -1
- package/dist/services/cloud/lifecycle.d.ts.map +1 -1
- package/dist/services/cloud/lifecycle.js +33 -4
- package/dist/services/cloud/lifecycle.js.map +1 -1
- package/dist/services/context-admission.d.ts.map +1 -1
- package/dist/services/context-admission.js +9 -7
- package/dist/services/context-admission.js.map +1 -1
- package/dist/services/credential-cleanup.d.ts.map +1 -1
- package/dist/services/credential-cleanup.js +47 -10
- package/dist/services/credential-cleanup.js.map +1 -1
- package/dist/services/exit-drain.d.ts +44 -0
- package/dist/services/exit-drain.d.ts.map +1 -0
- package/dist/services/exit-drain.js +52 -0
- package/dist/services/exit-drain.js.map +1 -0
- package/dist/services/github-app.d.ts.map +1 -1
- package/dist/services/github-app.js +32 -4
- package/dist/services/github-app.js.map +1 -1
- package/dist/services/http-transport.d.ts +1 -0
- package/dist/services/http-transport.d.ts.map +1 -1
- package/dist/services/http-transport.js +48 -1
- package/dist/services/http-transport.js.map +1 -1
- package/dist/services/knowledge/kb-config.d.ts +42 -0
- package/dist/services/knowledge/kb-config.d.ts.map +1 -0
- package/dist/services/knowledge/kb-config.js +54 -0
- package/dist/services/knowledge/kb-config.js.map +1 -0
- package/dist/services/knowledge/kb-providers.d.ts +7 -1
- package/dist/services/knowledge/kb-providers.d.ts.map +1 -1
- package/dist/services/knowledge/kb-providers.js +191 -17
- package/dist/services/knowledge/kb-providers.js.map +1 -1
- package/dist/services/knowledge/require-sqlite-project.d.ts +32 -0
- package/dist/services/knowledge/require-sqlite-project.d.ts.map +1 -0
- package/dist/services/knowledge/require-sqlite-project.js +38 -0
- package/dist/services/knowledge/require-sqlite-project.js.map +1 -0
- package/dist/services/member-home.d.ts +1 -1
- package/dist/services/member-home.d.ts.map +1 -1
- package/dist/services/member-home.js +15 -12
- package/dist/services/member-home.js.map +1 -1
- package/dist/services/model-pricing.d.ts.map +1 -1
- package/dist/services/model-pricing.js +7 -8
- package/dist/services/model-pricing.js.map +1 -1
- package/dist/services/orphan-recovery.d.ts +6 -3
- package/dist/services/orphan-recovery.d.ts.map +1 -1
- package/dist/services/orphan-recovery.js +17 -14
- package/dist/services/orphan-recovery.js.map +1 -1
- package/dist/services/preflight-check.js +2 -2
- package/dist/services/preflight-check.js.map +1 -1
- package/dist/services/secret-token.d.ts +38 -0
- package/dist/services/secret-token.d.ts.map +1 -0
- package/dist/services/secret-token.js +51 -0
- package/dist/services/secret-token.js.map +1 -0
- package/dist/services/service-manager/types.d.ts +3 -1
- package/dist/services/service-manager/types.d.ts.map +1 -1
- package/dist/services/service-manager/windows.d.ts +14 -2
- package/dist/services/service-manager/windows.d.ts.map +1 -1
- package/dist/services/service-manager/windows.js +65 -7
- package/dist/services/service-manager/windows.js.map +1 -1
- package/dist/services/shell-probe.d.ts +131 -0
- package/dist/services/shell-probe.d.ts.map +1 -0
- package/dist/services/shell-probe.js +210 -0
- package/dist/services/shell-probe.js.map +1 -0
- package/dist/services/singleton.d.ts +2 -0
- package/dist/services/singleton.d.ts.map +1 -1
- package/dist/services/singleton.js +1 -1
- package/dist/services/singleton.js.map +1 -1
- package/dist/services/ssh.d.ts.map +1 -1
- package/dist/services/ssh.js +60 -4
- package/dist/services/ssh.js.map +1 -1
- package/dist/services/stall/find-log-file.d.ts.map +1 -1
- package/dist/services/stall/find-log-file.js +22 -16
- package/dist/services/stall/find-log-file.js.map +1 -1
- package/dist/services/stall/read-log-tail.d.ts.map +1 -1
- package/dist/services/stall/read-log-tail.js +26 -15
- package/dist/services/stall/read-log-tail.js.map +1 -1
- package/dist/services/stall/stall-detector.d.ts +53 -4
- package/dist/services/stall/stall-detector.d.ts.map +1 -1
- package/dist/services/stall/stall-detector.js +212 -34
- package/dist/services/stall/stall-detector.js.map +1 -1
- package/dist/services/stall/stall-poller.d.ts.map +1 -1
- package/dist/services/stall/stall-poller.js +35 -42
- package/dist/services/stall/stall-poller.js.map +1 -1
- package/dist/services/strategy.d.ts +9 -0
- package/dist/services/strategy.d.ts.map +1 -1
- package/dist/services/strategy.js +119 -8
- package/dist/services/strategy.js.map +1 -1
- package/dist/services/substitution-engine.js +2 -2
- package/dist/services/substitution-engine.js.map +1 -1
- package/dist/services/tool-registry.d.ts.map +1 -1
- package/dist/services/tool-registry.js +5 -3
- package/dist/services/tool-registry.js.map +1 -1
- package/dist/services/user-config.js +1 -1
- package/dist/services/user-config.js.map +1 -1
- package/dist/services/vcs/azure-devops.d.ts +67 -2
- package/dist/services/vcs/azure-devops.d.ts.map +1 -1
- package/dist/services/vcs/azure-devops.js +281 -15
- package/dist/services/vcs/azure-devops.js.map +1 -1
- package/dist/services/vcs/bitbucket.d.ts.map +1 -1
- package/dist/services/vcs/bitbucket.js +16 -0
- package/dist/services/vcs/bitbucket.js.map +1 -1
- package/dist/services/vcs/github.d.ts.map +1 -1
- package/dist/services/vcs/github.js +24 -0
- package/dist/services/vcs/github.js.map +1 -1
- package/dist/services/vcs/types.d.ts +123 -2
- package/dist/services/vcs/types.d.ts.map +1 -1
- package/dist/skills/fleet-sprint-cli/SKILL.md +20 -1
- package/dist/skills/pm/SKILL.md +1 -2
- package/dist/skills/pm/cost.md +0 -4
- package/dist/skills/pm/fleet-addendum.md +2 -3
- package/dist/tools/check-status.d.ts +7 -4
- package/dist/tools/check-status.d.ts.map +1 -1
- package/dist/tools/check-status.js +5 -3
- package/dist/tools/check-status.js.map +1 -1
- package/dist/tools/cloud-control.js +2 -2
- package/dist/tools/cloud-control.js.map +1 -1
- package/dist/tools/compose-permissions.d.ts +6 -0
- package/dist/tools/compose-permissions.d.ts.map +1 -1
- package/dist/tools/compose-permissions.js +211 -50
- package/dist/tools/compose-permissions.js.map +1 -1
- package/dist/tools/credential-store-set.js +1 -1
- package/dist/tools/execute-command.d.ts.map +1 -1
- package/dist/tools/execute-command.js +56 -29
- package/dist/tools/execute-command.js.map +1 -1
- package/dist/tools/execute-prompt.d.ts +15 -2
- package/dist/tools/execute-prompt.d.ts.map +1 -1
- package/dist/tools/execute-prompt.js +1214 -873
- package/dist/tools/execute-prompt.js.map +1 -1
- package/dist/tools/kb-capture.d.ts +2 -2
- package/dist/tools/kb-capture.d.ts.map +1 -1
- package/dist/tools/kb-capture.js +29 -5
- package/dist/tools/kb-capture.js.map +1 -1
- package/dist/tools/kb-export.d.ts +2 -2
- package/dist/tools/kb-export.d.ts.map +1 -1
- package/dist/tools/kb-export.js +3 -28
- package/dist/tools/kb-export.js.map +1 -1
- package/dist/tools/kb-feedback.d.ts.map +1 -1
- package/dist/tools/kb-feedback.js +3 -1
- package/dist/tools/kb-feedback.js.map +1 -1
- package/dist/tools/kb-freshness-sweep.d.ts.map +1 -1
- package/dist/tools/kb-freshness-sweep.js +3 -1
- package/dist/tools/kb-freshness-sweep.js.map +1 -1
- package/dist/tools/kb-import.d.ts.map +1 -1
- package/dist/tools/kb-import.js +2 -1
- package/dist/tools/kb-import.js.map +1 -1
- package/dist/tools/kb-list.d.ts.map +1 -1
- package/dist/tools/kb-list.js +3 -1
- package/dist/tools/kb-list.js.map +1 -1
- package/dist/tools/kb-query.d.ts +2 -2
- package/dist/tools/kb-reconcile-prefilter.d.ts.map +1 -1
- package/dist/tools/kb-reconcile-prefilter.js +3 -1
- package/dist/tools/kb-reconcile-prefilter.js.map +1 -1
- package/dist/tools/kb-resolve-contradiction.d.ts.map +1 -1
- package/dist/tools/kb-resolve-contradiction.js +3 -1
- package/dist/tools/kb-resolve-contradiction.js.map +1 -1
- package/dist/tools/kb-setup.d.ts.map +1 -1
- package/dist/tools/kb-setup.js +125 -20
- package/dist/tools/kb-setup.js.map +1 -1
- package/dist/tools/kb-stats.d.ts.map +1 -1
- package/dist/tools/kb-stats.js +64 -43
- package/dist/tools/kb-stats.js.map +1 -1
- package/dist/tools/list-members.d.ts +2 -2
- package/dist/tools/list-members.d.ts.map +1 -1
- package/dist/tools/list-members.js +7 -2
- package/dist/tools/list-members.js.map +1 -1
- package/dist/tools/member-detail.d.ts +2 -2
- package/dist/tools/member-detail.d.ts.map +1 -1
- package/dist/tools/member-detail.js +22 -3
- package/dist/tools/member-detail.js.map +1 -1
- package/dist/tools/member-reservation.d.ts +58 -1
- package/dist/tools/member-reservation.d.ts.map +1 -1
- package/dist/tools/member-reservation.js +71 -18
- package/dist/tools/member-reservation.js.map +1 -1
- package/dist/tools/monitor-task.d.ts.map +1 -1
- package/dist/tools/monitor-task.js +17 -2
- package/dist/tools/monitor-task.js.map +1 -1
- package/dist/tools/provision-auth.d.ts +80 -1
- package/dist/tools/provision-auth.d.ts.map +1 -1
- package/dist/tools/provision-auth.js +147 -59
- package/dist/tools/provision-auth.js.map +1 -1
- package/dist/tools/provision-vcs-auth.d.ts +96 -3
- package/dist/tools/provision-vcs-auth.d.ts.map +1 -1
- package/dist/tools/provision-vcs-auth.js +254 -88
- package/dist/tools/provision-vcs-auth.js.map +1 -1
- package/dist/tools/register-member.d.ts +21 -12
- package/dist/tools/register-member.d.ts.map +1 -1
- package/dist/tools/register-member.js +141 -16
- 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 +29 -4
- package/dist/tools/remove-member.js.map +1 -1
- package/dist/tools/revoke-vcs-auth.js +2 -2
- package/dist/tools/revoke-vcs-auth.js.map +1 -1
- package/dist/tools/send-email.d.ts +2 -2
- package/dist/tools/setup-git-app.d.ts.map +1 -1
- package/dist/tools/setup-git-app.js +11 -7
- package/dist/tools/setup-git-app.js.map +1 -1
- package/dist/tools/setup-ssh-key.d.ts.map +1 -1
- package/dist/tools/setup-ssh-key.js +2 -1
- package/dist/tools/setup-ssh-key.js.map +1 -1
- package/dist/tools/shutdown-server.d.ts +2 -0
- package/dist/tools/shutdown-server.d.ts.map +1 -1
- package/dist/tools/shutdown-server.js +23 -1
- package/dist/tools/shutdown-server.js.map +1 -1
- package/dist/tools/stop-prompt.js +2 -2
- package/dist/tools/stop-prompt.js.map +1 -1
- package/dist/tools/update-agent-cli.js +2 -2
- package/dist/tools/update-agent-cli.js.map +1 -1
- package/dist/tools/update-member.d.ts +21 -12
- package/dist/tools/update-member.d.ts.map +1 -1
- package/dist/tools/update-member.js +61 -12
- package/dist/tools/update-member.js.map +1 -1
- package/dist/tools/vcs-credential-exec.d.ts +127 -0
- package/dist/tools/vcs-credential-exec.d.ts.map +1 -0
- package/dist/tools/vcs-credential-exec.js +197 -0
- package/dist/tools/vcs-credential-exec.js.map +1 -0
- package/dist/types.d.ts +24 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/agent-helpers.d.ts +36 -0
- package/dist/utils/agent-helpers.d.ts.map +1 -1
- package/dist/utils/agent-helpers.js +39 -1
- package/dist/utils/agent-helpers.js.map +1 -1
- package/dist/utils/log-helpers.d.ts.map +1 -1
- package/dist/utils/log-helpers.js +2 -2
- package/dist/utils/log-helpers.js.map +1 -1
- package/dist/utils/platform.d.ts +7 -0
- package/dist/utils/platform.d.ts.map +1 -1
- package/dist/utils/platform.js +11 -1
- package/dist/utils/platform.js.map +1 -1
- package/dist/utils/prompt-errors.d.ts.map +1 -1
- package/dist/utils/prompt-errors.js +7 -1
- package/dist/utils/prompt-errors.js.map +1 -1
- package/dist/utils/shell-escape.d.ts +16 -0
- package/dist/utils/shell-escape.d.ts.map +1 -1
- package/dist/utils/shell-escape.js +22 -2
- package/dist/utils/shell-escape.js.map +1 -1
- package/dist/utils/vcs-provider-detect.d.ts +65 -0
- package/dist/utils/vcs-provider-detect.d.ts.map +1 -0
- package/dist/utils/vcs-provider-detect.js +109 -0
- package/dist/utils/vcs-provider-detect.js.map +1 -0
- package/dist/utils/workspace-trust.d.ts +20 -17
- package/dist/utils/workspace-trust.d.ts.map +1 -1
- package/dist/utils/workspace-trust.js +91 -1
- package/dist/utils/workspace-trust.js.map +1 -1
- package/dist/workflows/auto-sprint.js +180 -32
- package/package.json +7 -5
- package/packages/apra-fleet-client/src/client/api.mjs +403 -12
- package/packages/apra-fleet-client/src/client/errors.mjs +6 -2
- 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 +42 -21
- package/packages/apra-fleet-se/apra-pm/agents/ci-watcher.md +14 -0
- package/packages/apra-fleet-se/apra-pm/agents/deployer.md +59 -46
- package/packages/apra-fleet-se/apra-pm/agents/doer.md +157 -134
- package/packages/apra-fleet-se/apra-pm/agents/harvester.md +31 -32
- package/packages/apra-fleet-se/apra-pm/agents/integ-test-runner.md +92 -113
- package/packages/apra-fleet-se/apra-pm/agents/kb-reconciler.md +40 -42
- package/packages/apra-fleet-se/apra-pm/agents/plan-reviewer.md +139 -63
- package/packages/apra-fleet-se/apra-pm/agents/planner.md +176 -100
- package/packages/apra-fleet-se/apra-pm/agents/regression-test-runner.md +77 -81
- package/packages/apra-fleet-se/apra-pm/agents/reviewer.md +69 -85
- package/packages/apra-fleet-se/apra-pm/agents/schemas/integ-test-runner-output.json +1 -1
- package/packages/apra-fleet-se/apra-pm/agents/schemas/plan-reviewer-output.json +37 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/regression-test-runner-output.json +4 -17
- package/packages/apra-fleet-se/apra-pm/skills/pm/SKILL.md +1 -2
- package/packages/apra-fleet-se/apra-pm/skills/pm/cost.md +0 -4
- package/packages/apra-fleet-se/apra-pm/skills/pm/fleet-addendum.md +2 -3
- package/packages/apra-fleet-se/bin/cli.mjs +280 -3
- package/packages/apra-fleet-se/bin/serve.mjs +114 -5
- package/packages/apra-fleet-se/fleet-sprint/abort.mjs +481 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-children.mjs +491 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-identity-check.mjs +282 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-identity.mjs +208 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-scope.mjs +638 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-transitions.mjs +301 -0
- package/packages/apra-fleet-se/fleet-sprint/branch-ensure.mjs +96 -0
- package/packages/apra-fleet-se/fleet-sprint/conflict-ladder.mjs +8 -0
- package/packages/apra-fleet-se/fleet-sprint/contracts.mjs +199 -34
- package/packages/apra-fleet-se/fleet-sprint/coordination.mjs +516 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-failure.mjs +184 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-role.mjs +1121 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-safety-guard.mjs +216 -4
- package/packages/apra-fleet-se/fleet-sprint/docs/README.md +23 -8
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-manual-recovery-verified.md +10 -8
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-sync-redesign.md +285 -4
- package/packages/apra-fleet-se/fleet-sprint/docs/escalate-to-llm-design.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/docs/shared-orchestrator-reservation-design.md +12 -12
- package/packages/apra-fleet-se/fleet-sprint/docs/stabilization-log.md +14 -4
- package/packages/apra-fleet-se/fleet-sprint/dolt-literal-guard.mjs +56 -1
- package/packages/apra-fleet-se/fleet-sprint/dolt-settle.mjs +275 -99
- package/packages/apra-fleet-se/fleet-sprint/dolt-sync.mjs +1054 -39
- package/packages/apra-fleet-se/fleet-sprint/errors.mjs +308 -0
- 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 +556 -0
- package/packages/apra-fleet-se/fleet-sprint/git-topology.mjs +495 -0
- package/packages/apra-fleet-se/fleet-sprint/guarded-modules.mjs +564 -0
- package/packages/apra-fleet-se/fleet-sprint/inline-ladder-guard.mjs +216 -0
- package/packages/apra-fleet-se/fleet-sprint/kb.mjs +728 -0
- package/packages/apra-fleet-se/fleet-sprint/mcp-result.mjs +75 -0
- package/packages/apra-fleet-se/fleet-sprint/member-provisioning.mjs +252 -0
- package/packages/apra-fleet-se/fleet-sprint/member-sync.mjs +581 -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/parent-notes-staleness.mjs +201 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/deploy.mjs +136 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/develop.mjs +822 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/ensure-sprint-branch.mjs +294 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/final-review.mjs +403 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/harvest.mjs +180 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/integ-test.mjs +358 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/plan.mjs +390 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/publish-pr.mjs +323 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/re-review.mjs +232 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/regression-test.mjs +174 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/replan.mjs +197 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/review.mjs +305 -0
- package/packages/apra-fleet-se/fleet-sprint/prompts.mjs +559 -0
- package/packages/apra-fleet-se/fleet-sprint/role-policies.mjs +1416 -0
- package/packages/apra-fleet-se/fleet-sprint/round-session.mjs +100 -0
- package/packages/apra-fleet-se/fleet-sprint/runner.js +1672 -9072
- package/packages/apra-fleet-se/fleet-sprint/se-os-commands.mjs +134 -0
- package/packages/apra-fleet-se/fleet-sprint/se-posix.mjs +159 -0
- package/packages/apra-fleet-se/fleet-sprint/se-windows-gitbash.mjs +97 -0
- package/packages/apra-fleet-se/fleet-sprint/se-windows.mjs +143 -0
- package/packages/apra-fleet-se/fleet-sprint/shell-command-guard.mjs +304 -0
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-sprint-cli/SKILL.md +20 -1
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-supervisor/SKILL.md +21 -2
- package/packages/apra-fleet-se/fleet-sprint/sprint-args.mjs +454 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-report.mjs +239 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-state.mjs +163 -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 +211 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-auth.mjs +1279 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-module.mjs +204 -19
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/azure-devops.mjs +707 -12
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/bitbucket.mjs +28 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/dolt.mjs +33 -4
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/github.mjs +191 -43
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/index.mjs +333 -6
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/shell-helpers.mjs +165 -0
- package/packages/apra-fleet-se/fleet-sprint/viewer-extensions.mjs +167 -37
- package/packages/apra-fleet-se/fleet-sprint/worklists.mjs +559 -0
- package/packages/apra-fleet-se/package.json +1 -1
- package/packages/apra-fleet-workflow/src/viewer/index.mjs +178 -1
- package/packages/apra-fleet-workflow/src/workflow/index.mjs +478 -32
- package/skills/fleet/SKILL.md +27 -16
- package/skills/fleet/auth-azdevops.md +57 -7
- package/skills/fleet/auth-bitbucket.md +5 -5
- package/skills/fleet/auth-github.md +7 -6
- package/skills/fleet/beads-conflict-resolution.md +141 -0
- package/skills/fleet/beads.md +16 -12
- package/skills/fleet/onboarding.md +6 -6
- package/skills/fleet/permissions.md +11 -7
- package/skills/fleet/profiles/node.json +1 -1
- package/skills/fleet/skill-matrix.md +1 -1
- package/skills/fleet/troubleshooting.md +4 -3
- package/version.json +1 -1
- package/dist/providers/gemini.d.ts +0 -52
- package/dist/providers/gemini.d.ts.map +0 -1
- package/dist/providers/gemini.js +0 -236
- package/dist/providers/gemini.js.map +0 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/coach-role-design.md +0 -23
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getAgent } from '../registry.js';
|
|
2
2
|
import { getStrategy } from '../strategy.js';
|
|
3
|
-
import { getAgentOS } from '../../utils/agent-helpers.js';
|
|
3
|
+
import { getAgentOS, getAgentShell, isPosixShell } from '../../utils/agent-helpers.js';
|
|
4
4
|
import { logLine, logWarn } from '../../utils/log-helpers.js';
|
|
5
5
|
import { getProvider } from '../../providers/index.js';
|
|
6
6
|
import { getMemberPathContext } from '../member-home.js';
|
|
@@ -20,7 +20,15 @@ export async function pollDirectoryActivity(memberId) {
|
|
|
20
20
|
return NO_SIGNAL;
|
|
21
21
|
const provider = agent.llmProvider ?? 'claude';
|
|
22
22
|
const adapter = getProvider(provider);
|
|
23
|
-
const
|
|
23
|
+
const os = getAgentOS(agent);
|
|
24
|
+
const shell = getAgentShell(agent);
|
|
25
|
+
// apra-fleet-7dir.2.5: `posix` decides which SHELL command string this
|
|
26
|
+
// function builds below (bash for a gitbash Windows member); it is
|
|
27
|
+
// deliberately independent of the `targetOs` passed to
|
|
28
|
+
// resolveSessionLogDir, which decides remote PATH-JOIN format and is out
|
|
29
|
+
// of scope for this task.
|
|
30
|
+
const posix = isPosixShell(os, shell);
|
|
31
|
+
const isWindows = os === 'windows';
|
|
24
32
|
// Capability check FIRST, with a sentinel home dir: does this provider have a
|
|
25
33
|
// pollable log directory at all? codex/copilot/none return null for any home
|
|
26
34
|
// dir whatsoever. Asking here (a pure function call) means we never pay for a
|
|
@@ -70,9 +78,9 @@ export async function pollDirectoryActivity(memberId) {
|
|
|
70
78
|
// since this polls the log dir before a session's first turn creates it.
|
|
71
79
|
// `Get-Date -Format o` as the terminal stage (rather than a constructor
|
|
72
80
|
// call) means a zero-object pipeline just produces no output, no error.
|
|
73
|
-
const cmd =
|
|
74
|
-
? `
|
|
75
|
-
: `
|
|
81
|
+
const cmd = posix
|
|
82
|
+
? `find "${escapedPosixDir}" -maxdepth 5 -type f -exec stat -c %Y {} + 2>/dev/null | sort -nr | head -n1`
|
|
83
|
+
: `powershell -c "if (Test-Path -Path '${escapedWinDir}') { Get-ChildItem -Path '${escapedWinDir}' -Depth 5 -File -ErrorAction SilentlyContinue | Sort-Object LastWriteTimeUtc -Descending | Select-Object -First 1 -ExpandProperty LastWriteTimeUtc | Get-Date -Format o }"`;
|
|
76
84
|
try {
|
|
77
85
|
const result = await strategy.execCommand(cmd, 5000);
|
|
78
86
|
const trimmed = result.stdout.trim();
|
|
@@ -80,7 +88,7 @@ export async function pollDirectoryActivity(memberId) {
|
|
|
80
88
|
return { mtimeMs: null, signalAvailable: authoritative };
|
|
81
89
|
// Windows emits an ISO-8601 timestamp (`Get-Date -Format o`); POSIX
|
|
82
90
|
// emits whole seconds since epoch.
|
|
83
|
-
const ms =
|
|
91
|
+
const ms = posix ? Number(trimmed) * 1000 : Date.parse(trimmed);
|
|
84
92
|
if (!Number.isFinite(ms) || ms <= 0)
|
|
85
93
|
return { mtimeMs: null, signalAvailable: authoritative };
|
|
86
94
|
// A guessed directory that actually produced an mtime IS verified: real
|
|
@@ -98,13 +106,13 @@ export async function pollDirectoryActivity(memberId) {
|
|
|
98
106
|
* yields `null`, which callers treat as "no additional signal" rather than
|
|
99
107
|
* "confirmed no activity" (see stall-detector.ts's mtime cross-check).
|
|
100
108
|
*/
|
|
101
|
-
async function fetchMtimeMs(strategy, logFilePath,
|
|
109
|
+
async function fetchMtimeMs(strategy, logFilePath, posix) {
|
|
102
110
|
// See the matching note in pollDirectoryActivity above: no intermediate
|
|
103
111
|
// `$variable` here either, for the same reason.
|
|
104
|
-
const cmd =
|
|
105
|
-
? `powershell -c "[DateTimeOffset]::new((Get-Item -LiteralPath '${logFilePath}' -ErrorAction SilentlyContinue).LastWriteTimeUtc, [TimeSpan]::Zero).ToUnixTimeMilliseconds()"`
|
|
112
|
+
const cmd = posix
|
|
106
113
|
// GNU stat (`-c %Y`) first; BSD/macOS stat (`-f %m`) as a fallback -- both report whole seconds.
|
|
107
|
-
|
|
114
|
+
? `stat -c %Y "${logFilePath}" 2>/dev/null || stat -f %m "${logFilePath}" 2>/dev/null`
|
|
115
|
+
: `powershell -c "[DateTimeOffset]::new((Get-Item -LiteralPath '${logFilePath}' -ErrorAction SilentlyContinue).LastWriteTimeUtc, [TimeSpan]::Zero).ToUnixTimeMilliseconds()"`;
|
|
108
116
|
try {
|
|
109
117
|
const result = await strategy.execCommand(cmd, 5000);
|
|
110
118
|
const trimmed = result.stdout.trim();
|
|
@@ -113,7 +121,7 @@ async function fetchMtimeMs(strategy, logFilePath, isWindows) {
|
|
|
113
121
|
const n = Number(trimmed);
|
|
114
122
|
if (!Number.isFinite(n) || n <= 0)
|
|
115
123
|
return null;
|
|
116
|
-
return
|
|
124
|
+
return posix ? n * 1000 : n;
|
|
117
125
|
}
|
|
118
126
|
catch {
|
|
119
127
|
return null;
|
|
@@ -142,7 +150,7 @@ export async function pollLogFile(memberId, logFilePath) {
|
|
|
142
150
|
if (!agent) {
|
|
143
151
|
return { lastTimestamp: null, error: `Agent ${memberId} not found` };
|
|
144
152
|
}
|
|
145
|
-
const
|
|
153
|
+
const posix = isPosixShell(getAgentOS(agent), getAgentShell(agent));
|
|
146
154
|
const provider = agent.llmProvider ?? 'claude';
|
|
147
155
|
// apra-fleet-6z8.2: the tail window must be wide enough that a parseable
|
|
148
156
|
// entry is reliably present. 500 bytes is thinner than a single tool_result
|
|
@@ -152,16 +160,23 @@ export async function pollLogFile(memberId, logFilePath) {
|
|
|
152
160
|
// stream megabytes over SSH every poll (the byte cap is applied from the END,
|
|
153
161
|
// so the final line stays complete; only the leading fragment is lost, and
|
|
154
162
|
// the parser already skips that).
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
163
|
+
// apra-fleet-jxdf.7: the POSIX branch's `tail -c ${TAIL_BYTES}` byte cap has
|
|
164
|
+
// no PowerShell equivalent here -- `Get-Content -Tail` alone hands back
|
|
165
|
+
// whichever raw lines it read, so a single oversized tool_result line (a
|
|
166
|
+
// multi-MB bd/git payload) reaches extractPendingToolTimeoutMs uncapped.
|
|
167
|
+
// Join the tail lines and trim from the front the same way the POSIX pipe
|
|
168
|
+
// does, so both platforms give that parser the same completed-final-line
|
|
169
|
+
// guarantee the module doc comment above already assumes for everyone.
|
|
170
|
+
const cmd = posix
|
|
171
|
+
? `tail -n ${TAIL_LINES} "${logFilePath}" | tail -c ${TAIL_BYTES}`
|
|
172
|
+
: `powershell -c "$c = (Get-Content -Tail ${TAIL_LINES} -Path '${logFilePath}') -join [Environment]::NewLine; if ($c.Length -gt ${TAIL_BYTES}) { $c.Substring($c.Length - ${TAIL_BYTES}) } else { $c }"`;
|
|
158
173
|
try {
|
|
159
174
|
const strategy = getStrategy(agent);
|
|
160
175
|
// apra-fleet-iuc.2: fetch the file's own mtime independently of the
|
|
161
176
|
// content-based read below. Never throws and never affects the
|
|
162
177
|
// content-read's own error handling -- it is purely additive signal that
|
|
163
178
|
// stall-detector.ts cross-checks against the content timestamp.
|
|
164
|
-
const mtimeMs = await fetchMtimeMs(strategy, logFilePath,
|
|
179
|
+
const mtimeMs = await fetchMtimeMs(strategy, logFilePath, posix);
|
|
165
180
|
const result = await strategy.execCommand(cmd, 5000);
|
|
166
181
|
if (result.code !== 0) {
|
|
167
182
|
if (/No such file|cannot access|not recognized|does not exist|ItemNotFoundException/i.test(result.stderr)) {
|
|
@@ -171,11 +186,9 @@ export async function pollLogFile(memberId, logFilePath) {
|
|
|
171
186
|
return { lastTimestamp: null, error: `Command failed (code ${result.code}): ${result.stderr}`, mtimeMs };
|
|
172
187
|
}
|
|
173
188
|
const lines = result.stdout.split('\n').filter(l => l.trim());
|
|
174
|
-
const extracted = provider === '
|
|
175
|
-
?
|
|
176
|
-
:
|
|
177
|
-
? extractAgyTimestamp(memberId, lines, result.stdout)
|
|
178
|
-
: extractClaudeTimestamp(memberId, lines, result.stdout);
|
|
189
|
+
const extracted = provider === 'agy'
|
|
190
|
+
? extractAgyTimestamp(memberId, lines, result.stdout)
|
|
191
|
+
: extractClaudeTimestamp(memberId, lines, result.stdout);
|
|
179
192
|
const pendingToolTimeoutMs = extractPendingToolTimeoutMs(provider, lines);
|
|
180
193
|
return { ...extracted, mtimeMs, pendingToolTimeoutMs };
|
|
181
194
|
}
|
|
@@ -274,7 +287,7 @@ function extractClaudeTimestamp(memberId, lines, rawTail = '') {
|
|
|
274
287
|
*
|
|
275
288
|
* Claude-only by construction: the provider gate lives HERE, not in the
|
|
276
289
|
* caller, so pollLogFile's call site stays provider-agnostic and a future
|
|
277
|
-
* AGY/OpenCode
|
|
290
|
+
* AGY/OpenCode transcript schema change can never accidentally start
|
|
278
291
|
* (or stop) feeding this function without an explicit case added below.
|
|
279
292
|
*/
|
|
280
293
|
function extractPendingToolTimeoutMs(provider, lines) {
|
|
@@ -302,24 +315,4 @@ function extractPendingToolTimeoutMs(provider, lines) {
|
|
|
302
315
|
const timeout = input?.['timeout'];
|
|
303
316
|
return typeof timeout === 'number' && Number.isFinite(timeout) && timeout > 0 ? timeout : null;
|
|
304
317
|
}
|
|
305
|
-
function extractGeminiTimestamp(memberId, lines) {
|
|
306
|
-
for (let i = lines.length - 1; i >= 0; i--) {
|
|
307
|
-
try {
|
|
308
|
-
const parsed = JSON.parse(lines[i]);
|
|
309
|
-
const set = parsed['$set'];
|
|
310
|
-
if (set !== undefined) {
|
|
311
|
-
const ts = set['lastUpdated'];
|
|
312
|
-
if (typeof ts === 'string') {
|
|
313
|
-
return { lastTimestamp: ts };
|
|
314
|
-
}
|
|
315
|
-
logLine('stall_poll_format_error', JSON.stringify({ memberId, error: '$set entry missing lastUpdated' }));
|
|
316
|
-
return { lastTimestamp: null };
|
|
317
|
-
}
|
|
318
|
-
}
|
|
319
|
-
catch {
|
|
320
|
-
// partial line -- skip
|
|
321
|
-
}
|
|
322
|
-
}
|
|
323
|
-
return { lastTimestamp: null };
|
|
324
|
-
}
|
|
325
318
|
//# sourceMappingURL=stall-poller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stall-poller.js","sourceRoot":"","sources":["../../../src/services/stall/stall-poller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAsB,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"stall-poller.js","sourceRoot":"","sources":["../../../src/services/stall/stall-poller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
import type { Agent, SSHExecResult, TransferResult } from '../types.js';
|
|
2
|
+
/** Build the wrapped `powershell -EncodedCommand ...` string RemoteStrategy.
|
|
3
|
+
* deleteFiles sends on a Windows agent -- extracted as a pure, exported
|
|
4
|
+
* function (apra-fleet-ot2z.15.6) so the paired live-PowerShell test
|
|
5
|
+
* (apra-fleet-ot2z.15.5) can execute the REAL script this module sends
|
|
6
|
+
* instead of hand-copying its shape, which would let the two drift apart
|
|
7
|
+
* silently. Same escapeWindowsArg quoting, same Set-Location then
|
|
8
|
+
* Remove-Item with -Force -ErrorAction SilentlyContinue, same
|
|
9
|
+
* wrapPowerShellEncoded wrapping as the pre-refactor inline version. */
|
|
10
|
+
export declare function buildWindowsDeleteFilesScript(folder: string, relativePaths: string[]): string;
|
|
2
11
|
export interface AgentStrategy {
|
|
3
12
|
execCommand(command: string, timeoutMs?: number, maxTotalMs?: number, onPidCaptured?: (pid: number) => void, abortSignal?: AbortSignal): Promise<SSHExecResult>;
|
|
4
13
|
transferFiles(localPaths: string[], destinationPath?: string, abortSignal?: AbortSignal): Promise<TransferResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy.d.ts","sourceRoot":"","sources":["../../src/services/strategy.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"strategy.d.ts","sourceRoot":"","sources":["../../src/services/strategy.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAaxE;;;;;;;yEAOyE;AACzE,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,CAI7F;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAChK,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAClH,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,gBAAgB,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAClH,kGAAkG;IAClG,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,cAAc,IAAI,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9E,KAAK,IAAI,IAAI,CAAC;CACf;AAsWD,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,aAAa,CAQvD"}
|
|
@@ -5,13 +5,27 @@ import path from 'node:path';
|
|
|
5
5
|
import { StringDecoder } from 'node:string_decoder';
|
|
6
6
|
import { v4 as uuid } from 'uuid';
|
|
7
7
|
import { getOsCommands } from '../os/index.js';
|
|
8
|
-
import { getAgentOS, setStoredPid, clearStoredPid } from '../utils/agent-helpers.js';
|
|
8
|
+
import { getAgentOS, getAgentShell, setStoredPid, clearStoredPid } from '../utils/agent-helpers.js';
|
|
9
9
|
import { escapeDoubleQuoted, escapeWindowsArg } from '../utils/shell-escape.js';
|
|
10
10
|
import { wrapPowerShellEncoded } from '../os/windows.js';
|
|
11
|
+
import { completesOnProcessExit, exitDrainMs } from './exit-drain.js';
|
|
11
12
|
const MAX_OUTPUT_BYTES = 10 * 1024 * 1024; // 10 MB
|
|
12
13
|
import { execCommand as sshExecCommand, testConnection as sshTestConnection, closeConnection as sshCloseConnection } from './ssh.js';
|
|
13
14
|
import { uploadFiles, downloadFiles } from './file-transfer.js';
|
|
14
15
|
import { RelayStrategy } from './relay-strategy.js';
|
|
16
|
+
/** Build the wrapped `powershell -EncodedCommand ...` string RemoteStrategy.
|
|
17
|
+
* deleteFiles sends on a Windows agent -- extracted as a pure, exported
|
|
18
|
+
* function (apra-fleet-ot2z.15.6) so the paired live-PowerShell test
|
|
19
|
+
* (apra-fleet-ot2z.15.5) can execute the REAL script this module sends
|
|
20
|
+
* instead of hand-copying its shape, which would let the two drift apart
|
|
21
|
+
* silently. Same escapeWindowsArg quoting, same Set-Location then
|
|
22
|
+
* Remove-Item with -Force -ErrorAction SilentlyContinue, same
|
|
23
|
+
* wrapPowerShellEncoded wrapping as the pre-refactor inline version. */
|
|
24
|
+
export function buildWindowsDeleteFilesScript(folder, relativePaths) {
|
|
25
|
+
const files = relativePaths.map(p => `"${escapeWindowsArg(p)}"`).join(', ');
|
|
26
|
+
const psScript = `Set-Location "${escapeWindowsArg(folder)}"; Remove-Item ${files} -Force -ErrorAction SilentlyContinue`;
|
|
27
|
+
return wrapPowerShellEncoded(psScript);
|
|
28
|
+
}
|
|
15
29
|
class RemoteStrategy {
|
|
16
30
|
agent;
|
|
17
31
|
constructor(agent) {
|
|
@@ -32,10 +46,25 @@ class RemoteStrategy {
|
|
|
32
46
|
const agentOs = getAgentOS(this.agent);
|
|
33
47
|
const folder = this.agent.workFolder;
|
|
34
48
|
try {
|
|
49
|
+
// Confirmed shell-agnostic this pass (apra-fleet-7dir.5.2 audit): stays
|
|
50
|
+
// on agentOs alone, deliberately NOT branching on isPosixShell. The
|
|
51
|
+
// Windows branch is buildWindowsDeleteFilesScript, which is
|
|
52
|
+
// wrapPowerShellEncoded-wrapped -- a single base64 `powershell
|
|
53
|
+
// -EncodedCommand <blob>` string that is shell-agnostic AS A STRING, the
|
|
54
|
+
// same reasoning execute-command.ts's long_running Windows launch and
|
|
55
|
+
// monitor-task.ts's status/pid/log commands document -- so a gitbash
|
|
56
|
+
// member's bash.exe exec shell runs it exactly as correctly as a
|
|
57
|
+
// powershell5/pwsh7/unset member's default shell does; no re-tokenizing
|
|
58
|
+
// risk exists here to fix. Deliberately did NOT reroute gitbash to the
|
|
59
|
+
// POSIX `rm -f` branch below despite it being three lines away: that
|
|
60
|
+
// branch does `cd "<folder>"` assuming a POSIX-formatted path, and
|
|
61
|
+
// nothing here guarantees agent.workFolder for a Windows member is
|
|
62
|
+
// stored in POSIX form (`/c/Users/...`) rather than native Windows form
|
|
63
|
+
// (`C:\Users\...`) -- switching branches would trade a proven-safe path
|
|
64
|
+
// for an unverified one. Keep this comment if a future survey asks the
|
|
65
|
+
// same question again.
|
|
35
66
|
if (agentOs === 'windows') {
|
|
36
|
-
|
|
37
|
-
const psScript = `Set-Location "${escapeWindowsArg(folder)}"; Remove-Item ${files} -Force -ErrorAction SilentlyContinue`;
|
|
38
|
-
await this.execCommand(wrapPowerShellEncoded(psScript), 10000);
|
|
67
|
+
await this.execCommand(buildWindowsDeleteFilesScript(folder, relativePaths), 10000);
|
|
39
68
|
}
|
|
40
69
|
else {
|
|
41
70
|
const files = relativePaths.map(p => `"${escapeDoubleQuoted(p)}"`).join(' ');
|
|
@@ -59,7 +88,7 @@ class LocalStrategy {
|
|
|
59
88
|
async execCommand(command, timeoutMs = 30000, maxTotalMs, onPidCaptured, abortSignal) {
|
|
60
89
|
let pidExtracted = false;
|
|
61
90
|
const result = await new Promise((resolve, reject) => {
|
|
62
|
-
const cmds = getOsCommands(getAgentOS(this.agent));
|
|
91
|
+
const cmds = getOsCommands(getAgentOS(this.agent), getAgentShell(this.agent));
|
|
63
92
|
const { command: wrapped, env, shell } = cmds.cleanExec(command);
|
|
64
93
|
const child = spawn(wrapped, { shell: shell ?? true, cwd: this.agent.workFolder, env, windowsHide: true });
|
|
65
94
|
// child.kill() only signals the immediate spawned process (the shell
|
|
@@ -80,11 +109,18 @@ class LocalStrategy {
|
|
|
80
109
|
// already terminated the wrapper, and taskkill can't traverse from
|
|
81
110
|
// an already-dead PID, silently leaving descendants running.
|
|
82
111
|
try {
|
|
83
|
-
|
|
112
|
+
// Must run through the same shell cleanExec resolved (e.g. Git
|
|
113
|
+
// Bash's bash.exe for a gitbash member) -- execSync with no
|
|
114
|
+
// `shell` option falls back to cmd.exe on Windows, which cannot
|
|
115
|
+
// parse a gitbash-flavoured kill string like
|
|
116
|
+
// `taskkill //F //T //PID <n> >/dev/null 2>&1; true`
|
|
117
|
+
// (apra-fleet-7dir.4).
|
|
118
|
+
execSync(cmds.killPid(child.pid), shell ? { stdio: 'ignore', shell } : { stdio: 'ignore' });
|
|
84
119
|
}
|
|
85
120
|
catch { /* best-effort; process may already be dead */ }
|
|
86
121
|
}
|
|
87
122
|
let settled = false;
|
|
123
|
+
let exitDrainTimer;
|
|
88
124
|
function settle(fn) {
|
|
89
125
|
if (settled)
|
|
90
126
|
return;
|
|
@@ -92,6 +128,8 @@ class LocalStrategy {
|
|
|
92
128
|
clearTimeout(inactivityTimer);
|
|
93
129
|
if (maxTotalTimer)
|
|
94
130
|
clearTimeout(maxTotalTimer);
|
|
131
|
+
if (exitDrainTimer)
|
|
132
|
+
clearTimeout(exitDrainTimer);
|
|
95
133
|
fn();
|
|
96
134
|
}
|
|
97
135
|
// Rolling inactivity timer — resets on each stdout/stderr data event
|
|
@@ -171,7 +209,7 @@ class LocalStrategy {
|
|
|
171
209
|
stderrSpillStream.write(data);
|
|
172
210
|
}
|
|
173
211
|
});
|
|
174
|
-
|
|
212
|
+
const finalize = (code) => {
|
|
175
213
|
clearStoredPid(this.agent.id);
|
|
176
214
|
const stdoutTail = stdoutDecoder.end();
|
|
177
215
|
const stderrTail = stderrDecoder.end();
|
|
@@ -198,7 +236,80 @@ class LocalStrategy {
|
|
|
198
236
|
stderr = `[OUTPUT TRUNCATED — full stderr saved to ${stderrSpillPath}]\n${stderr}`;
|
|
199
237
|
}
|
|
200
238
|
settle(() => resolve({ stdout, stderr, code: code ?? 0 }));
|
|
201
|
-
}
|
|
239
|
+
};
|
|
240
|
+
child.on('close', (code) => finalize(code));
|
|
241
|
+
// apra-fleet-qe83.1.2 (READ SIDE of the fix; see src/services/exit-drain.ts
|
|
242
|
+
// for the full rationale and the spawn-side half). `close` only fires once
|
|
243
|
+
// EVERY holder of the child's stdio handles is gone -- on Windows a
|
|
244
|
+
// grandchild that inherited them (sandbox server, orphaned find.exe) keeps
|
|
245
|
+
// the pipe open long after the dispatched process itself exited, pinning the
|
|
246
|
+
// dispatch for as long as the grandchild lives. `exit` fires on the process
|
|
247
|
+
// exit itself, so on Windows we take that as completion, allow a short drain
|
|
248
|
+
// window for output still buffered in the pipe, then settle. The grandchild
|
|
249
|
+
// is deliberately NOT killed: the deploy phase's sandbox pair must outlive
|
|
250
|
+
// the dispatch that started it. POSIX keeps the strictly-more-complete
|
|
251
|
+
// `close` signal (the nohup path reaches EOF on its own).
|
|
252
|
+
if (completesOnProcessExit(getAgentOS(this.agent))) {
|
|
253
|
+
child.on('exit', (code) => {
|
|
254
|
+
if (settled || exitDrainTimer)
|
|
255
|
+
return;
|
|
256
|
+
exitDrainTimer = setTimeout(() => {
|
|
257
|
+
if (settled)
|
|
258
|
+
return;
|
|
259
|
+
// Invariant: settle the result before releasing the read ends.
|
|
260
|
+
// finalize() must run first so any output already buffered in the
|
|
261
|
+
// pipe (and captured by the data listeners above) is included in
|
|
262
|
+
// the resolved result; destroying/unref-ing the handles below is
|
|
263
|
+
// pure cleanup and must never race ahead of settling the promise.
|
|
264
|
+
finalize(code);
|
|
265
|
+
// Release OUR ends of the pipes so the still-open handles held by a
|
|
266
|
+
// surviving grandchild do not keep this process's event loop and fds
|
|
267
|
+
// alive. Destroying a read end cannot affect the grandchild.
|
|
268
|
+
try {
|
|
269
|
+
child.stdout?.destroy();
|
|
270
|
+
}
|
|
271
|
+
catch { /* best-effort */ }
|
|
272
|
+
try {
|
|
273
|
+
child.stderr?.destroy();
|
|
274
|
+
}
|
|
275
|
+
catch { /* best-effort */ }
|
|
276
|
+
try {
|
|
277
|
+
child.unref();
|
|
278
|
+
}
|
|
279
|
+
catch { /* best-effort */ }
|
|
280
|
+
}, exitDrainMs());
|
|
281
|
+
// apra-fleet-qe83.6 (VERIFIED: this unref-ed timer can NOT be the
|
|
282
|
+
// last live handle, so unref-ing it cannot strand the promise).
|
|
283
|
+
// An unref-ed timer does not hold the event loop open, so if it were
|
|
284
|
+
// ever the only live handle the process would exit before finalize()
|
|
285
|
+
// ran and this promise would never settle. It never is:
|
|
286
|
+
// - drain actually needed (a grandchild still holds the inherited
|
|
287
|
+
// stdio): child.stdout/child.stderr are open, flowing read
|
|
288
|
+
// handles -- they are exactly why the drain exists -- and each is
|
|
289
|
+
// a ref-ed handle. Measured standalone (not under a test runner,
|
|
290
|
+
// whose own handles would mask this) with stdout redirected to a
|
|
291
|
+
// file so the probe process had NO ref-ed stdio of its own:
|
|
292
|
+
// getActiveResourcesInfo() at arm time = [PipeWrap, PipeWrap,
|
|
293
|
+
// ProcessWrap]; the promise settled at 2638 ms.
|
|
294
|
+
// - drain not needed (nothing inherited the pipes): the pipes have
|
|
295
|
+
// already EOF-ed, so 'close' is queued and finalize() runs
|
|
296
|
+
// without this timer. Measured the same way: arm-time resources =
|
|
297
|
+
// [ProcessWrap] (ref-ed until 'close'), settled at 599 ms, well
|
|
298
|
+
// inside the 2000 ms window -- i.e. via 'close', not the timer.
|
|
299
|
+
// Caller paths enumerated by grepping every execCommand() call site
|
|
300
|
+
// (src/tools/*, src/providers/claude.ts, src/services/* incl.
|
|
301
|
+
// stall/*, orphan-recovery, preflight-check, relay-executor): all run
|
|
302
|
+
// inside the long-lived MCP server, and the one CLI caller
|
|
303
|
+
// (src/cli/watch.ts) holds a ref-ed setInterval for its watch loop --
|
|
304
|
+
// so every caller has additional live handles anyway.
|
|
305
|
+
// Residual risk: this rests on Node keeping child stdio read handles
|
|
306
|
+
// ref-ed while flowing. If a future caller ever spawns with
|
|
307
|
+
// stdio 'ignore'/'inherit' (no child.stdout/child.stderr objects) AND
|
|
308
|
+
// the process exit races 'close', the drain callback could be skipped
|
|
309
|
+
// -- the fix then is to re-ref for the window, not to widen it.
|
|
310
|
+
exitDrainTimer.unref();
|
|
311
|
+
});
|
|
312
|
+
}
|
|
202
313
|
child.on('error', (err) => {
|
|
203
314
|
clearStoredPid(this.agent.id);
|
|
204
315
|
settle(() => reject(err));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../../src/services/strategy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../../src/services/strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Token grammar: {{ optional_ws name optional_ws }}
|
|
2
|
-
// name must match [A-Za-z_][A-Za-z0-9_]* (no dots, so {{secure.NAME}}
|
|
2
|
+
// name must match [A-Za-z_][A-Za-z0-9_]* (no dots, so {{secret.NAME}} / legacy {{secure.NAME}} are never tokens here)
|
|
3
3
|
const TOKEN_RE = /\{\{\s*([A-Za-z_][A-Za-z0-9_]*)\s*\}\}/g;
|
|
4
4
|
// Key grammar enforced on substitutions map keys
|
|
5
5
|
const KEY_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
|
|
@@ -78,7 +78,7 @@ function buildKeyRejectionError(callerName, badKeys) {
|
|
|
78
78
|
msg += `Reserved or malformed keys (must match [A-Za-z_][A-Za-z0-9_]*):\n`;
|
|
79
79
|
for (const k of badKeys)
|
|
80
80
|
msg += ` - ${k}\n`;
|
|
81
|
-
msg += `\nSecrets must use {{
|
|
81
|
+
msg += `\nSecrets must use {{secret.NAME}} in execute_command -- never substitutions.`;
|
|
82
82
|
return msg;
|
|
83
83
|
}
|
|
84
84
|
function buildUnresolvedError(callerName, missing) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"substitution-engine.js","sourceRoot":"","sources":["../../src/services/substitution-engine.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"substitution-engine.js","sourceRoot":"","sources":["../../src/services/substitution-engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-registry.d.ts","sourceRoot":"","sources":["../../src/services/tool-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"tool-registry.d.ts","sourceRoot":"","sources":["../../src/services/tool-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAkPvE"}
|
|
@@ -19,6 +19,7 @@ export async function registerAllTools(server) {
|
|
|
19
19
|
const { setupGitAppSchema, setupGitApp } = await import('../tools/setup-git-app.js');
|
|
20
20
|
const { provisionVcsAuthSchema, provisionVcsAuth } = await import('../tools/provision-vcs-auth.js');
|
|
21
21
|
const { revokeVcsAuthSchema, revokeVcsAuth } = await import('../tools/revoke-vcs-auth.js');
|
|
22
|
+
const { vcsCredentialExecSchema, vcsCredentialExec } = await import('../tools/vcs-credential-exec.js');
|
|
22
23
|
const { fleetStatusSchema, fleetStatus } = await import('../tools/check-status.js');
|
|
23
24
|
const { memberDetailSchema, memberDetail } = await import('../tools/member-detail.js');
|
|
24
25
|
const { updateAgentCliSchema, updateAgentCli } = await import('../tools/update-agent-cli.js');
|
|
@@ -129,9 +130,10 @@ export async function registerAllTools(server) {
|
|
|
129
130
|
// Authentication & SSH
|
|
130
131
|
server.tool('provision_llm_auth', "Authenticate a fleet member so it can run prompts. Copies your current login session to the member, or deploys an API key if provided. Run this before execute_prompt if the member reports no authentication.", provisionAuthSchema.shape, wrapTool('provision_llm_auth', (input) => provisionAuth(input)));
|
|
131
132
|
server.tool('setup_ssh_key', 'Generate an SSH key pair and migrate a member from password to key-based authentication.', setupSSHKeySchema.shape, wrapTool('setup_ssh_key', (input) => setupSSHKey(input)));
|
|
132
|
-
server.tool('setup_git_app', "One-time setup: register a GitHub App for git token minting. Requires a GitHub App ID, private key (.pem) file path, and installation ID. The app must already be created
|
|
133
|
+
server.tool('setup_git_app', "One-time setup: register a GitHub App for git token minting. Requires a GitHub App ID, private key (.pem) file path, and installation ID. The app must already be created and installed, with the repository permissions each git_access level needs (see docs/github-app-setup.md; push+pr needs Metadata, Contents, Workflows, Pull requests, Actions) -- a mint requesting a permission the App lacks fails.", setupGitAppSchema.shape, wrapTool('setup_git_app', (input) => setupGitApp(input)));
|
|
133
134
|
server.tool('provision_vcs_auth', 'Set up git access credentials on a member. Supports GitHub, Bitbucket, and Azure DevOps. Tests connectivity after setup.', provisionVcsAuthSchema.shape, wrapTool('provision_vcs_auth', (input) => provisionVcsAuth(input)));
|
|
134
135
|
server.tool('revoke_vcs_auth', 'Remove VCS credentials from a member. Specify the provider (github, bitbucket, or azure-devops) to revoke.', revokeVcsAuthSchema.shape, wrapTool('revoke_vcs_auth', (input) => revokeVcsAuth(input)));
|
|
136
|
+
server.tool('vcs_credential_exec', 'Run a credential-requiring git/VCS command on a member WITHOUT ever learning the credential. Put one of two literal placeholders where the token belongs: {{vcs_token}}, referenced BARE (never inside your own quotes) -- the server substitutes it already escaped AND quoted for that member\'s shell; or {{vcs_token_inline}}, referenced INSIDE your own single quotes (e.g. an Authorization header value) -- the server substitutes it escaped for the interior of a single-quoted string, with no quotes of its own. Using {{vcs_token}} inside your own quotes double-escapes it; use {{vcs_token_inline}} there instead. Both may appear in the same command. The server dispatches the command and redacts the value from the returned stdout/stderr. Use this instead of reading a token back out of a credential helper.', vcsCredentialExecSchema.shape, wrapTool('vcs_credential_exec', (input) => vcsCredentialExec(input)));
|
|
135
137
|
// Status & Monitoring
|
|
136
138
|
server.tool('fleet_status', 'Get status of all fleet members. Use json format for structured data.', fleetStatusSchema.shape, wrapTool('fleet_status', (input) => fleetStatus(input)));
|
|
137
139
|
server.tool('member_detail', 'Get detailed status for one member: connectivity, AI version, authentication, active session, resources, and git branch.', memberDetailSchema.shape, wrapTool('member_detail', (input) => memberDetail(input)));
|
|
@@ -147,7 +149,7 @@ export async function registerAllTools(server) {
|
|
|
147
149
|
// Agent Lifecycle
|
|
148
150
|
server.tool('stop_prompt', 'Kill the active LLM process on a member. Always call TaskStop on the dispatching background agent after calling this.', stopPromptSchema.shape, wrapTool('stop_prompt', (input) => stopPrompt(input)));
|
|
149
151
|
// Credential Store
|
|
150
|
-
server.tool('credential_store_set', 'Collect a secret from the user out-of-band and store it. Returns a handle (sec://NAME) and scope. Use {{
|
|
152
|
+
server.tool('credential_store_set', 'Collect a secret from the user out-of-band and store it. Returns a handle (sec://NAME) and scope. Use {{secret.NAME}} tokens in execute_command to inject the value.', credentialStoreSetSchema.shape, wrapTool('credential_store_set', (input) => credentialStoreSet(input)));
|
|
151
153
|
server.tool('credential_store_list', 'List all stored credentials (names and metadata only — no values).', credentialStoreListSchema.shape, wrapTool('credential_store_list', () => credentialStoreList()));
|
|
152
154
|
server.tool('credential_store_delete', 'Delete a named credential from the store (both session and persistent tiers).', credentialStoreDeleteSchema.shape, wrapTool('credential_store_delete', (input) => credentialStoreDelete(input)));
|
|
153
155
|
server.tool('credential_store_update', 'Update metadata (members, TTL, network policy) on an existing credential without re-entering the secret.', credentialStoreUpdateSchema.shape, wrapTool('credential_store_update', (input) => credentialStoreUpdate(input)));
|
|
@@ -205,7 +207,7 @@ export async function registerAllTools(server) {
|
|
|
205
207
|
return JSON.stringify(await handleCodeTests(input, getActiveMemberId()));
|
|
206
208
|
}));
|
|
207
209
|
// --- Knowledge Bank ---
|
|
208
|
-
server.tool('kb_capture', 'Capture a learning, fact, or file summary into the knowledge bank. Confidence is capped at INFERRED: any CONFIRMED passed here is downgraded to INFERRED
|
|
210
|
+
server.tool('kb_capture', 'Capture a learning, fact, or file summary into the knowledge bank. Confidence is capped at INFERRED: any CONFIRMED passed here is downgraded to INFERRED, and a user-directive is stored UNVERIFIED as a pending proposal until a human approves it; confidence_clamped:true whenever the stored confidence differs from the requested one (default INFERRED). CONFIRMED is minted ONLY via kb_promote. Returns {id, audn_decision, confidence_clamped}. audn_decision: add=new entry, none=duplicate skipped, update=same-topic predecessor linked (refines; both entries stay live), flagged=contradiction flagged for review. Pass supersedes:<id> to retire that entry instead (only takes effect if AUDN independently matched it).', kbCaptureSchema.shape, wrapTool('kb_capture', (input) => kbCapture(input)));
|
|
209
211
|
server.tool('kb_invalidate', 'Mark context-cache entries stale for the given file paths. Call after modifying files to ensure the KB reflects the current state.', kbInvalidateSchema.shape, wrapTool('kb_invalidate', (input) => kbInvalidate(input)));
|
|
210
212
|
server.tool('kb_context', 'Check freshness of files against the knowledge bank. Returns {fresh, stale, missing} -- fresh files can be skipped, stale/missing files must be re-read.', kbContextSchema.shape, wrapTool('kb_context', (input) => kbContext(input)));
|
|
211
213
|
server.tool('kb_session_prime', 'Prime a session with KB context. Returns session_warm status, stale files needing re-read, top KB entries, and recommended GitNexus calls.', kbSessionPrimeSchema.shape, wrapTool('kb_session_prime', (input) => kbSessionPrime(input)));
|