@apralabs/apra-fleet 0.4.2 → 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 +38 -5
- package/dist/agents/backlog-groomer.md +25 -0
- package/dist/agents/ci-watcher.md +11 -0
- package/dist/agents/deployer.md +37 -2
- package/dist/agents/doer.md +36 -12
- package/dist/agents/harvester.md +11 -0
- package/dist/agents/integ-test-runner.md +11 -0
- package/dist/agents/kb-reconciler.md +9 -0
- package/dist/agents/plan-reviewer.md +110 -22
- package/dist/agents/planner.md +125 -37
- package/dist/agents/regression-test-runner.md +11 -0
- package/dist/agents/reviewer.md +13 -2
- package/dist/agents/schemas/plan-reviewer-output.json +37 -0
- 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 +28 -9
- 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 -34
- 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 +290 -23
- 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 +6 -2
- package/dist/cli/register-member.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/linux.d.ts +6 -0
- package/dist/os/linux.d.ts.map +1 -1
- package/dist/os/linux.js +35 -2
- package/dist/os/linux.js.map +1 -1
- package/dist/os/os-commands.d.ts +61 -2
- package/dist/os/os-commands.d.ts.map +1 -1
- package/dist/os/windows-gitbash.d.ts +5 -0
- package/dist/os/windows-gitbash.d.ts.map +1 -1
- package/dist/os/windows-gitbash.js +15 -0
- package/dist/os/windows-gitbash.js.map +1 -1
- package/dist/os/windows.d.ts +6 -0
- package/dist/os/windows.d.ts.map +1 -1
- package/dist/os/windows.js +46 -3
- package/dist/os/windows.js.map +1 -1
- package/dist/providers/agy.d.ts +115 -6
- package/dist/providers/agy.d.ts.map +1 -1
- package/dist/providers/agy.js +569 -53
- package/dist/providers/agy.js.map +1 -1
- package/dist/providers/claude.d.ts +81 -3
- package/dist/providers/claude.d.ts.map +1 -1
- package/dist/providers/claude.js +344 -10
- package/dist/providers/claude.js.map +1 -1
- package/dist/providers/codex.d.ts +4 -2
- package/dist/providers/codex.d.ts.map +1 -1
- package/dist/providers/codex.js +19 -2
- package/dist/providers/codex.js.map +1 -1
- package/dist/providers/copilot.d.ts +4 -2
- package/dist/providers/copilot.d.ts.map +1 -1
- package/dist/providers/copilot.js +20 -2
- package/dist/providers/copilot.js.map +1 -1
- package/dist/providers/none.d.ts +4 -2
- package/dist/providers/none.d.ts.map +1 -1
- package/dist/providers/none.js +17 -2
- package/dist/providers/none.js.map +1 -1
- package/dist/providers/opencode.d.ts +3 -1
- package/dist/providers/opencode.d.ts.map +1 -1
- package/dist/providers/opencode.js +22 -2
- package/dist/providers/opencode.js.map +1 -1
- package/dist/providers/provider.d.ts +201 -6
- package/dist/providers/provider.d.ts.map +1 -1
- package/dist/providers/provider.js +56 -0
- package/dist/providers/provider.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/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/credential-cleanup.d.ts.map +1 -1
- package/dist/services/credential-cleanup.js +35 -17
- 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/model-pricing.d.ts.map +1 -1
- package/dist/services/model-pricing.js +7 -3
- package/dist/services/model-pricing.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/ssh.d.ts.map +1 -1
- package/dist/services/ssh.js +58 -2
- package/dist/services/ssh.js.map +1 -1
- package/dist/services/stall/read-log-tail.d.ts.map +1 -1
- package/dist/services/stall/read-log-tail.js +20 -10
- 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/strategy.d.ts.map +1 -1
- package/dist/services/strategy.js +79 -2
- 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/vcs/azure-devops.d.ts +66 -1
- package/dist/services/vcs/azure-devops.d.ts.map +1 -1
- package/dist/services/vcs/azure-devops.js +192 -21
- package/dist/services/vcs/azure-devops.js.map +1 -1
- package/dist/services/vcs/types.d.ts +1 -1
- package/dist/skills/fleet-sprint-cli/SKILL.md +18 -0
- package/dist/skills/pm/SKILL.md +1 -1
- package/dist/skills/pm/cost.md +0 -3
- package/dist/skills/pm/fleet-addendum.md +2 -2
- 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 +2 -0
- package/dist/tools/check-status.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 +182 -34
- 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 +31 -20
- 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 +1196 -892
- 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 +1 -0
- 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 +17 -0
- 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 +61 -20
- package/dist/tools/member-reservation.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 +142 -54
- package/dist/tools/provision-auth.js.map +1 -1
- package/dist/tools/provision-vcs-auth.d.ts +91 -1
- package/dist/tools/provision-vcs-auth.d.ts.map +1 -1
- package/dist/tools/provision-vcs-auth.js +209 -49
- package/dist/tools/provision-vcs-auth.js.map +1 -1
- package/dist/tools/register-member.d.ts +12 -9
- package/dist/tools/register-member.d.ts.map +1 -1
- package/dist/tools/register-member.js +99 -12
- 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 +27 -2
- package/dist/tools/remove-member.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/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/update-member.d.ts +12 -9
- package/dist/tools/update-member.d.ts.map +1 -1
- package/dist/tools/update-member.js +43 -11
- 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 +13 -0
- package/dist/types.d.ts.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/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 +87 -1
- package/dist/utils/workspace-trust.js.map +1 -1
- package/dist/workflows/auto-sprint.js +176 -15
- package/package.json +6 -4
- package/packages/apra-fleet-client/src/client/api.mjs +319 -17
- 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 +25 -0
- package/packages/apra-fleet-se/apra-pm/agents/ci-watcher.md +11 -0
- package/packages/apra-fleet-se/apra-pm/agents/deployer.md +37 -2
- package/packages/apra-fleet-se/apra-pm/agents/doer.md +36 -12
- package/packages/apra-fleet-se/apra-pm/agents/harvester.md +11 -0
- package/packages/apra-fleet-se/apra-pm/agents/integ-test-runner.md +11 -0
- package/packages/apra-fleet-se/apra-pm/agents/kb-reconciler.md +9 -0
- package/packages/apra-fleet-se/apra-pm/agents/plan-reviewer.md +110 -22
- package/packages/apra-fleet-se/apra-pm/agents/planner.md +125 -37
- package/packages/apra-fleet-se/apra-pm/agents/regression-test-runner.md +11 -0
- package/packages/apra-fleet-se/apra-pm/agents/reviewer.md +13 -2
- package/packages/apra-fleet-se/apra-pm/agents/schemas/plan-reviewer-output.json +37 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/SKILL.md +1 -1
- package/packages/apra-fleet-se/apra-pm/skills/pm/cost.md +0 -3
- package/packages/apra-fleet-se/apra-pm/skills/pm/fleet-addendum.md +2 -2
- package/packages/apra-fleet-se/bin/cli.mjs +149 -1
- package/packages/apra-fleet-se/bin/serve.mjs +78 -4
- 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 +61 -14
- 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 +1 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-sync-redesign.md +276 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/escalate-to-llm-design.md +1 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/run-sprint-cycle-prelude-decision.md +215 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-literal-guard.mjs +56 -1
- package/packages/apra-fleet-se/fleet-sprint/dolt-sync.mjs +996 -32
- package/packages/apra-fleet-se/fleet-sprint/errors.mjs +267 -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 +1467 -9798
- package/packages/apra-fleet-se/fleet-sprint/se-posix.mjs +17 -12
- 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 +18 -0
- 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 +153 -19
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/azure-devops.mjs +71 -21
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/bitbucket.mjs +28 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/github.mjs +131 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/index.mjs +140 -16
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/shell-helpers.mjs +1 -0
- package/packages/apra-fleet-se/fleet-sprint/viewer-extensions.mjs +77 -2
- 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 +17 -6
- package/packages/apra-fleet-workflow/src/workflow/index.mjs +49 -7
- package/skills/fleet/SKILL.md +8 -8
- package/skills/fleet/auth-azdevops.md +14 -3
- package/skills/fleet/auth-bitbucket.md +2 -2
- package/skills/fleet/auth-github.md +5 -4
- package/skills/fleet/onboarding.md +3 -3
- package/skills/fleet/permissions.md +5 -1
- package/skills/fleet/profiles/node.json +1 -1
- package/skills/fleet/troubleshooting.md +3 -3
- package/version.json +1 -1
|
@@ -27,12 +27,41 @@ async function waitForSsh(host, port) {
|
|
|
27
27
|
' after ' + SSH_POLL_ATTEMPTS + ' attempts (' +
|
|
28
28
|
(SSH_POLL_ATTEMPTS * SSH_POLL_DELAY_MS / 1000) + 's)');
|
|
29
29
|
}
|
|
30
|
+
/**
|
|
31
|
+
* Decide whether a provisioning call failed, from its structured half when
|
|
32
|
+
* present and its prose only as a fallback.
|
|
33
|
+
*
|
|
34
|
+
* Both tools return `{ text, structuredContent }` and `structuredContent.ok`
|
|
35
|
+
* is the field to branch on -- it survives any future wording change. The
|
|
36
|
+
* guard mirrors provisionOutcome() in
|
|
37
|
+
* packages/apra-fleet-se/fleet-sprint/vcs-auth.mjs: a result that carries no
|
|
38
|
+
* structuredContent at all (a stale test double, or an older client shape)
|
|
39
|
+
* must fall back to the ASCII `[FAIL]` prose marker rather than throw a
|
|
40
|
+
* TypeError -- reProvisionAuth is best-effort, so a throw here would be
|
|
41
|
+
* swallowed by the catch below and silently report every provision as a
|
|
42
|
+
* hard failure.
|
|
43
|
+
*/
|
|
44
|
+
function provisionFailed(result) {
|
|
45
|
+
const structured = result?.structuredContent;
|
|
46
|
+
if (structured && typeof structured.ok === 'boolean')
|
|
47
|
+
return !structured.ok;
|
|
48
|
+
return /^\[FAIL\]/.test(provisionSummary(result));
|
|
49
|
+
}
|
|
50
|
+
/** First line of a provisioning result's prose, tolerant of a missing `text`. */
|
|
51
|
+
function provisionSummary(result) {
|
|
52
|
+
const text = result?.text;
|
|
53
|
+
return (typeof text === 'string' ? text : '').split('\n')[0].trim();
|
|
54
|
+
}
|
|
30
55
|
async function reProvisionAuth(agent) {
|
|
31
56
|
// F5: Re-provision Claude OAuth credentials from PM machine (best-effort)
|
|
32
57
|
try {
|
|
58
|
+
// apra-fleet-3swo.7.2: branch on the structured ok discriminator instead
|
|
59
|
+
// of testing whether the summary text starts with the success emoji --
|
|
60
|
+
// the tools no longer emit emoji at all, and `ok` is the field that
|
|
61
|
+
// survives any future wording change.
|
|
33
62
|
const result = await provisionAuth({ member_id: agent.id });
|
|
34
|
-
if (
|
|
35
|
-
log('provision_llm_auth warning for ' + agent.friendlyName + ': ' + result
|
|
63
|
+
if (provisionFailed(result)) {
|
|
64
|
+
log('provision_llm_auth warning for ' + agent.friendlyName + ': ' + provisionSummary(result));
|
|
36
65
|
}
|
|
37
66
|
}
|
|
38
67
|
catch (e) {
|
|
@@ -50,8 +79,8 @@ async function reProvisionAuth(agent) {
|
|
|
50
79
|
git_access: agent.gitAccess,
|
|
51
80
|
repos: agent.gitRepos,
|
|
52
81
|
});
|
|
53
|
-
if (
|
|
54
|
-
log('provision_vcs_auth warning for ' + agent.friendlyName + ': ' + result
|
|
82
|
+
if (provisionFailed(result)) {
|
|
83
|
+
log('provision_vcs_auth warning for ' + agent.friendlyName + ': ' + provisionSummary(result));
|
|
55
84
|
}
|
|
56
85
|
}
|
|
57
86
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/services/cloud/lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,UAAU,CAAC;AAE3B,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAE/B,SAAS,GAAG,CAAC,GAAW;IACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;AAChD,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAAY,EAAE,IAAY;IAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,MAAM,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,EAAE;YACvD,MAAM,MAAM,GAAG,GAAG,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjE,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QACH,IAAI,SAAS;YAAE,OAAO;QACtB,IAAI,CAAC,GAAG,iBAAiB,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CACb,mBAAmB,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI;QACvC,SAAS,GAAG,iBAAiB,GAAG,aAAa;QAC7C,CAAC,iBAAiB,GAAG,iBAAiB,GAAG,IAAI,CAAC,GAAG,IAAI,CACtD,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,KAAY;IACzC,0EAA0E;IAC1E,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/services/cloud/lifecycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-cleanup.d.ts","sourceRoot":"","sources":["../../src/services/credential-cleanup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"credential-cleanup.d.ts","sourceRoot":"","sources":["../../src/services/credential-cleanup.ts"],"names":[],"mappings":"AA4BA,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAiEnF;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAM7D;AAED,wBAAgB,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAE9E"}
|
|
@@ -5,7 +5,6 @@ import { getAgentOS, getAgentShell } from '../utils/agent-helpers.js';
|
|
|
5
5
|
import { githubProvider } from './vcs/github.js';
|
|
6
6
|
import { bitbucketProvider } from './vcs/bitbucket.js';
|
|
7
7
|
import { azureDevOpsProvider } from './vcs/azure-devops.js';
|
|
8
|
-
const DEFAULT_TTL_MS = 55 * 60 * 1000; // 55 minutes
|
|
9
8
|
// apra-fleet-5co8.5.1: setTimeout's delay is a signed 32-bit int internally;
|
|
10
9
|
// Node (and browsers) SILENTLY CLAMP an overflowing delay to ~1ms rather than
|
|
11
10
|
// running it after the full requested duration (see Node's lib/timers.js
|
|
@@ -24,22 +23,37 @@ const providers = {
|
|
|
24
23
|
};
|
|
25
24
|
export function scheduleCredentialCleanup(agentId, expiresAt) {
|
|
26
25
|
cancelCredentialCleanup(agentId);
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
26
|
+
// No known real expiry: do NOT fall back to a blind default-TTL
|
|
27
|
+
// self-destruct (a prior version used a hardcoded 55-minute
|
|
28
|
+
// DEFAULT_TTL_MS here, unrelated to the deployed credential's actual
|
|
29
|
+
// lifetime -- every PAT-mode deploy scheduled its own near-arbitrary
|
|
30
|
+
// self-revoke and looked like "tokens keep expiring too fast"). Skipping
|
|
31
|
+
// scheduling entirely trades that for a real tradeoff of its own: a
|
|
32
|
+
// credential deployed with no derivable expiry now lives on disk/in git
|
|
33
|
+
// config until something explicit revokes it (revoke_vcs_auth, or a later
|
|
34
|
+
// provision_vcs_auth call that supersedes it -- see the supersession-revoke
|
|
35
|
+
// in provision-vcs-auth.ts) -- it is NOT auto-revoked at all, and unlike the
|
|
36
|
+
// beyond-setTimeout-ceiling case below, checkVcsTokenExpiry has no warning
|
|
37
|
+
// to offer either: it is only called (provision-vcs-auth.ts) when an
|
|
38
|
+
// expiresAt actually exists, so a no-expiry credential gets no reactive
|
|
39
|
+
// backstop of any kind. This is a deliberate, real security-posture
|
|
40
|
+
// tradeoff (an indefinitely-live unrevoked credential vs. a blind
|
|
41
|
+
// self-destruct at an arbitrary time), not a resolved one.
|
|
42
|
+
if (!expiresAt)
|
|
43
|
+
return;
|
|
44
|
+
const expiresMs = new Date(expiresAt).getTime();
|
|
45
|
+
if (isNaN(expiresMs))
|
|
46
|
+
return;
|
|
47
|
+
const untilExpiry = expiresMs - Date.now();
|
|
48
|
+
if (untilExpiry > MAX_TIMEOUT_MS) {
|
|
49
|
+
// Beyond setTimeout's ceiling: do not schedule an auto-revoke that
|
|
50
|
+
// would silently fire near-immediately instead of at the real
|
|
51
|
+
// expiry. checkVcsTokenExpiry's day-scale warning (fired on the next
|
|
52
|
+
// provision/preflight check) and reactive AUTH_EXPIRED
|
|
53
|
+
// classification are the backstop for this horizon instead.
|
|
54
|
+
return;
|
|
42
55
|
}
|
|
56
|
+
const delayMs = Math.max(0, untilExpiry);
|
|
43
57
|
const timer = setTimeout(async () => {
|
|
44
58
|
cleanupTimers.delete(agentId);
|
|
45
59
|
try {
|
|
@@ -59,7 +73,11 @@ export function scheduleCredentialCleanup(agentId, expiresAt) {
|
|
|
59
73
|
const result = await strategy.execCommand(cmd, 15000);
|
|
60
74
|
return result.stdout;
|
|
61
75
|
};
|
|
62
|
-
|
|
76
|
+
// Revoke the SAME label/scopeUrl this deploy actually used (persisted
|
|
77
|
+
// by provision-vcs-auth.ts at deploy time) -- not an unlabeled/
|
|
78
|
+
// default-host guess, which can unset a different, still-valid
|
|
79
|
+
// credential's git-config entry and/or delete the wrong on-disk file.
|
|
80
|
+
await service.revoke(agent, cmds, exec, agent.vcsCredentialLabel, agent.vcsCredentialScopeUrl);
|
|
63
81
|
}
|
|
64
82
|
catch { /* silent — best-effort cleanup */ }
|
|
65
83
|
}, delayMs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-cleanup.js","sourceRoot":"","sources":["../../src/services/credential-cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D,
|
|
1
|
+
{"version":3,"file":"credential-cleanup.js","sourceRoot":"","sources":["../../src/services/credential-cleanup.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Windows dispatch completion: process exit, not pipe EOF.
|
|
3
|
+
*
|
|
4
|
+
* On Windows a grandchild started by the dispatched CLI (a sandbox server the
|
|
5
|
+
* deployer launched, a runaway `find.exe`, a test runner) inherits the
|
|
6
|
+
* dispatch's stdout/stderr handles. Those handles stay open for as long as the
|
|
7
|
+
* grandchild lives, so the exec side never sees EOF on the pipe even though
|
|
8
|
+
* the process we actually dispatched (claude.exe and its PowerShell wrapper)
|
|
9
|
+
* exited minutes ago. Node's `child.on('close')` and ssh2's channel `close`
|
|
10
|
+
* both wait for that EOF, which is why a deploy dispatch could sit "in flight"
|
|
11
|
+
* for 25-70 minutes after the LLM had finished.
|
|
12
|
+
*
|
|
13
|
+
* The chosen strategy is BOTH sides, documented at each change site:
|
|
14
|
+
* - spawn side: scripts/sandbox-deploy.mjs already starts the sandbox pair
|
|
15
|
+
* with `detached: true` and its own log-file fds (never the inherited
|
|
16
|
+
* pipe), so long-lived servers we start ourselves no longer pin it;
|
|
17
|
+
* - read side (this module): treat the dispatched process's EXIT as the
|
|
18
|
+
* completion signal on Windows, drain whatever the pipe already produced
|
|
19
|
+
* for a short grace window, then settle -- instead of waiting for an EOF
|
|
20
|
+
* that an arbitrary grandchild can withhold indefinitely. The grandchild
|
|
21
|
+
* is deliberately left running: the integ phase expects the sandbox pair
|
|
22
|
+
* to survive the dispatch that started it.
|
|
23
|
+
*
|
|
24
|
+
* The grace window exists so output still buffered in the pipe at exit time is
|
|
25
|
+
* collected before the promise settles (transcript / last-assistant-turn
|
|
26
|
+
* capture depends on it). POSIX is unchanged: there the `nohup`/subshell path
|
|
27
|
+
* already reaches EOF when the process exits, and `close` is the correct,
|
|
28
|
+
* strictly-more-complete signal.
|
|
29
|
+
*/
|
|
30
|
+
/** Grace window (ms) between the dispatched process exiting and settling. */
|
|
31
|
+
export declare const DEFAULT_EXIT_DRAIN_MS = 2000;
|
|
32
|
+
/**
|
|
33
|
+
* Resolved grace window. `FLEET_EXIT_DRAIN_MS` exists so tests (and an
|
|
34
|
+
* operator debugging a slow member) can shorten or lengthen the window; a
|
|
35
|
+
* missing or non-numeric value falls back to the default.
|
|
36
|
+
*/
|
|
37
|
+
export declare function exitDrainMs(): number;
|
|
38
|
+
/**
|
|
39
|
+
* Whether the exec side should complete on process exit rather than pipe EOF.
|
|
40
|
+
* Windows only -- this is a Windows handle-inheritance problem, and on POSIX
|
|
41
|
+
* settling early would be a behaviour change with no bug behind it.
|
|
42
|
+
*/
|
|
43
|
+
export declare function completesOnProcessExit(agentOs: string | undefined): boolean;
|
|
44
|
+
//# sourceMappingURL=exit-drain.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exit-drain.d.ts","sourceRoot":"","sources":["../../src/services/exit-drain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,6EAA6E;AAC7E,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C;;;;GAIG;AACH,wBAAgB,WAAW,IAAI,MAAM,CAKpC;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAE3E"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Windows dispatch completion: process exit, not pipe EOF.
|
|
3
|
+
*
|
|
4
|
+
* On Windows a grandchild started by the dispatched CLI (a sandbox server the
|
|
5
|
+
* deployer launched, a runaway `find.exe`, a test runner) inherits the
|
|
6
|
+
* dispatch's stdout/stderr handles. Those handles stay open for as long as the
|
|
7
|
+
* grandchild lives, so the exec side never sees EOF on the pipe even though
|
|
8
|
+
* the process we actually dispatched (claude.exe and its PowerShell wrapper)
|
|
9
|
+
* exited minutes ago. Node's `child.on('close')` and ssh2's channel `close`
|
|
10
|
+
* both wait for that EOF, which is why a deploy dispatch could sit "in flight"
|
|
11
|
+
* for 25-70 minutes after the LLM had finished.
|
|
12
|
+
*
|
|
13
|
+
* The chosen strategy is BOTH sides, documented at each change site:
|
|
14
|
+
* - spawn side: scripts/sandbox-deploy.mjs already starts the sandbox pair
|
|
15
|
+
* with `detached: true` and its own log-file fds (never the inherited
|
|
16
|
+
* pipe), so long-lived servers we start ourselves no longer pin it;
|
|
17
|
+
* - read side (this module): treat the dispatched process's EXIT as the
|
|
18
|
+
* completion signal on Windows, drain whatever the pipe already produced
|
|
19
|
+
* for a short grace window, then settle -- instead of waiting for an EOF
|
|
20
|
+
* that an arbitrary grandchild can withhold indefinitely. The grandchild
|
|
21
|
+
* is deliberately left running: the integ phase expects the sandbox pair
|
|
22
|
+
* to survive the dispatch that started it.
|
|
23
|
+
*
|
|
24
|
+
* The grace window exists so output still buffered in the pipe at exit time is
|
|
25
|
+
* collected before the promise settles (transcript / last-assistant-turn
|
|
26
|
+
* capture depends on it). POSIX is unchanged: there the `nohup`/subshell path
|
|
27
|
+
* already reaches EOF when the process exits, and `close` is the correct,
|
|
28
|
+
* strictly-more-complete signal.
|
|
29
|
+
*/
|
|
30
|
+
/** Grace window (ms) between the dispatched process exiting and settling. */
|
|
31
|
+
export const DEFAULT_EXIT_DRAIN_MS = 2000;
|
|
32
|
+
/**
|
|
33
|
+
* Resolved grace window. `FLEET_EXIT_DRAIN_MS` exists so tests (and an
|
|
34
|
+
* operator debugging a slow member) can shorten or lengthen the window; a
|
|
35
|
+
* missing or non-numeric value falls back to the default.
|
|
36
|
+
*/
|
|
37
|
+
export function exitDrainMs() {
|
|
38
|
+
const raw = process.env.FLEET_EXIT_DRAIN_MS;
|
|
39
|
+
if (raw === undefined || raw.trim() === '')
|
|
40
|
+
return DEFAULT_EXIT_DRAIN_MS;
|
|
41
|
+
const n = Number(raw);
|
|
42
|
+
return Number.isFinite(n) && n >= 0 ? n : DEFAULT_EXIT_DRAIN_MS;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Whether the exec side should complete on process exit rather than pipe EOF.
|
|
46
|
+
* Windows only -- this is a Windows handle-inheritance problem, and on POSIX
|
|
47
|
+
* settling early would be a behaviour change with no bug behind it.
|
|
48
|
+
*/
|
|
49
|
+
export function completesOnProcessExit(agentOs) {
|
|
50
|
+
return (agentOs ?? '').toLowerCase() === 'windows';
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=exit-drain.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exit-drain.js","sourceRoot":"","sources":["../../src/services/exit-drain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,6EAA6E;AAC7E,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAE1C;;;;GAIG;AACH,MAAM,UAAU,WAAW;IACzB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;IAC5C,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,qBAAqB,CAAC;IACzE,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC;AAClE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAA2B;IAChE,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,KAAK,SAAS,CAAC;AACrD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github-app.d.ts","sourceRoot":"","sources":["../../src/services/github-app.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAStD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAMtE;AAUD;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkB9E;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"github-app.d.ts","sourceRoot":"","sources":["../../src/services/github-app.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAStD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAMtE;AAUD;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkB9E;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgCpE;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,EAAE,EACf,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAgD/C"}
|
|
@@ -64,13 +64,26 @@ export function mapAccessLevel(level) {
|
|
|
64
64
|
// POST /access_tokens call 422s. Scoped to 'issues' and 'full' since those
|
|
65
65
|
// are the community/collaboration-oriented levels; 'read'/'push'/'push+pr'/
|
|
66
66
|
// 'admin' stay code-access-only.
|
|
67
|
+
//
|
|
68
|
+
// 'workflows' is likewise a fine-grained GitHub App permission (distinct
|
|
69
|
+
// from 'actions') that gates pushing changes to .github/workflows/**.
|
|
70
|
+
// Requesting it here only succeeds once the App's own permission set
|
|
71
|
+
// includes Workflows and the installation has accepted that grant --
|
|
72
|
+
// same constraint as 'discussions' above. Granted on 'push', 'push+pr',
|
|
73
|
+
// 'admin' and 'full' (any level that can push commits), since without it
|
|
74
|
+
// GitHub rejects any push touching workflow files with "refusing to allow
|
|
75
|
+
// a GitHub App to create or update workflow ... without workflows
|
|
76
|
+
// permission", regardless of git_access level.
|
|
77
|
+
//
|
|
78
|
+
// 'actions' on 'push+pr' lets the agent re-run failed CI jobs
|
|
79
|
+
// (gh run rerun --failed) on its own PRs.
|
|
67
80
|
const levels = {
|
|
68
81
|
read: { contents: 'read', metadata: 'read' },
|
|
69
|
-
push: { contents: 'write', metadata: 'read' },
|
|
70
|
-
'push+pr': { contents: 'write', pull_requests: 'write', metadata: 'read' },
|
|
71
|
-
admin: { contents: 'write', administration: 'write', actions: 'write', metadata: 'read' },
|
|
82
|
+
push: { contents: 'write', metadata: 'read', workflows: 'write' },
|
|
83
|
+
'push+pr': { contents: 'write', pull_requests: 'write', metadata: 'read', workflows: 'write', actions: 'write' },
|
|
84
|
+
admin: { contents: 'write', administration: 'write', actions: 'write', metadata: 'read', workflows: 'write' },
|
|
72
85
|
issues: { issues: 'write', pull_requests: 'write', discussions: 'write', metadata: 'read' },
|
|
73
|
-
full: { contents: 'write', administration: 'write', issues: 'write', pull_requests: 'write', actions: 'write', discussions: 'write', metadata: 'read' },
|
|
86
|
+
full: { contents: 'write', administration: 'write', issues: 'write', pull_requests: 'write', actions: 'write', discussions: 'write', metadata: 'read', workflows: 'write' },
|
|
74
87
|
};
|
|
75
88
|
return levels[level] ?? levels.read;
|
|
76
89
|
}
|
|
@@ -99,6 +112,21 @@ export async function mintGitToken(appId, privateKey, installationId, repos, per
|
|
|
99
112
|
});
|
|
100
113
|
const data = await res.json();
|
|
101
114
|
if (!res.ok) {
|
|
115
|
+
// GitHub returns 422 (not 403) when the installation token request asks
|
|
116
|
+
// for a permission the App's own permission set doesn't grant -- e.g.
|
|
117
|
+
// "The permission 'workflows' is not granted to this installation" or
|
|
118
|
+
// the generic "The permissions requested are not granted to this
|
|
119
|
+
// installation.". Surface an actionable, operator-facing referral naming
|
|
120
|
+
// the requested permission(s) and the App/installation involved, instead
|
|
121
|
+
// of the raw API text -- and do NOT retry with a reduced permission set;
|
|
122
|
+
// silently dropping permissions would mask the misconfiguration.
|
|
123
|
+
if (res.status === 422 && typeof data?.message === 'string' && /permission/i.test(data.message)) {
|
|
124
|
+
const requested = Object.keys(permissions).join(', ');
|
|
125
|
+
throw new Error(`GitHub App ${appId} (installation ${installationId}) is not granted one or more of the requested ` +
|
|
126
|
+
`permissions [${requested}]: ${data.message} An org admin must grant these permissions under the ` +
|
|
127
|
+
`App's settings (GitHub -> Settings -> Developer settings -> GitHub Apps -> [this app] -> Permissions & events), ` +
|
|
128
|
+
`then accept the resulting installation permission-update request, before this operation can succeed.`);
|
|
129
|
+
}
|
|
102
130
|
throw new Error(`Token mint failed (${res.status}): ${data?.message ?? 'unknown error'}`);
|
|
103
131
|
}
|
|
104
132
|
return { token: data.token, expiresAt: data.expires_at };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github-app.js","sourceRoot":"","sources":["../../src/services/github-app.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"github-app.js","sourceRoot":"","sources":["../../src/services/github-app.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ export interface HttpTransportHandle {
|
|
|
20
20
|
sessions: Map<string, Session>;
|
|
21
21
|
close(): Promise<void>;
|
|
22
22
|
}
|
|
23
|
+
export declare function isFetchBlockedPort(port: number): boolean;
|
|
23
24
|
export declare function createHttpTransport(options: HttpTransportOptions): Promise<HttpTransportHandle>;
|
|
24
25
|
export {};
|
|
25
26
|
//# sourceMappingURL=http-transport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-transport.d.ts","sourceRoot":"","sources":["../../src/services/http-transport.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAUnG,UAAU,OAAO;IACf,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,6BAA6B,CAAC;IACzC;;oEAEgE;IAChE,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;
|
|
1
|
+
{"version":3,"file":"http-transport.d.ts","sourceRoot":"","sources":["../../src/services/http-transport.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAUnG,UAAU,OAAO;IACf,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,6BAA6B,CAAC;IACzC;;oEAEgE;IAChE,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAyCD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD;AAkDD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAiVrG"}
|
|
@@ -26,7 +26,33 @@ function parseBody(req) {
|
|
|
26
26
|
req.on('error', reject);
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
|
-
|
|
29
|
+
// The WHATWG fetch spec refuses to connect to a fixed list of ports
|
|
30
|
+
// associated with other protocols (SMTP, IRC, etc.) -- see
|
|
31
|
+
// https://fetch.spec.whatwg.org/#block-bad-port. Node's built-in `fetch`
|
|
32
|
+
// (undici) enforces this, so StreamableHTTPClientTransport's `fetch()` call
|
|
33
|
+
// throws "TypeError: fetch failed" / "Error: bad port" if our server ever
|
|
34
|
+
// happens to be listening on one of these. This is normally impossible for
|
|
35
|
+
// an OS-assigned ephemeral port, since the ephemeral range is well above
|
|
36
|
+
// this list's highest entry (10080) -- EXCEPT on a host whose TCP dynamic
|
|
37
|
+
// port range has been widened/lowered to start below it (e.g. the legacy
|
|
38
|
+
// Windows default of starting at 1024), where `server.listen(0, ...)` can
|
|
39
|
+
// occasionally hand back one of these exact ports under load (more sockets
|
|
40
|
+
// open -> more of the range gets cycled through). See
|
|
41
|
+
// node_modules/undici/lib/web/fetch/constants.js `badPorts` for the
|
|
42
|
+
// upstream list this mirrors.
|
|
43
|
+
const FETCH_BLOCKED_PORTS = new Set([
|
|
44
|
+
1, 7, 9, 11, 13, 15, 17, 19, 20, 21, 22, 23, 25, 37, 42, 43, 53, 69, 77, 79,
|
|
45
|
+
87, 95, 101, 102, 103, 104, 109, 110, 111, 113, 115, 117, 119, 123, 135, 137,
|
|
46
|
+
139, 143, 161, 179, 389, 427, 465, 512, 513, 514, 515, 526, 530, 531, 532,
|
|
47
|
+
540, 548, 554, 556, 563, 587, 601, 636, 989, 990, 993, 995, 1719, 1720, 1723,
|
|
48
|
+
2049, 3659, 4045, 4190, 5060, 5061, 6000, 6566, 6665, 6666, 6667, 6668, 6669,
|
|
49
|
+
6679, 6697, 10080,
|
|
50
|
+
]);
|
|
51
|
+
export function isFetchBlockedPort(port) {
|
|
52
|
+
return FETCH_BLOCKED_PORTS.has(port);
|
|
53
|
+
}
|
|
54
|
+
const MAX_BLOCKED_PORT_RETRIES = 20;
|
|
55
|
+
function listenOncePort(server, port, host) {
|
|
30
56
|
return new Promise((resolve, reject) => {
|
|
31
57
|
server.listen(port, host, () => {
|
|
32
58
|
const addr = server.address();
|
|
@@ -35,6 +61,27 @@ function listenOnPort(server, port, host) {
|
|
|
35
61
|
server.once('error', reject);
|
|
36
62
|
});
|
|
37
63
|
}
|
|
64
|
+
/**
|
|
65
|
+
* Like listenOncePort, but when the caller asked for an OS-assigned port
|
|
66
|
+
* (port === 0) and the OS handed back one of fetch's blocked ports, close
|
|
67
|
+
* and retry rather than handing a dead-on-arrival port to callers that will
|
|
68
|
+
* `fetch()` it (apra-fleet-my-beads-db-27m.17). A caller-specified fixed
|
|
69
|
+
* port is returned as-is even if blocked -- that's a caller configuration
|
|
70
|
+
* choice, not something we can route around by retrying.
|
|
71
|
+
*/
|
|
72
|
+
async function listenOnPort(server, port, host) {
|
|
73
|
+
if (port !== 0) {
|
|
74
|
+
return listenOncePort(server, port, host);
|
|
75
|
+
}
|
|
76
|
+
let bound = await listenOncePort(server, 0, host);
|
|
77
|
+
for (let attempt = 0; isFetchBlockedPort(bound) && attempt < MAX_BLOCKED_PORT_RETRIES; attempt++) {
|
|
78
|
+
await new Promise((resolve, reject) => {
|
|
79
|
+
server.close((err) => (err ? reject(err) : resolve()));
|
|
80
|
+
});
|
|
81
|
+
bound = await listenOncePort(server, 0, host);
|
|
82
|
+
}
|
|
83
|
+
return bound;
|
|
84
|
+
}
|
|
38
85
|
function isInitializeRequest(body) {
|
|
39
86
|
if (!body)
|
|
40
87
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-transport.js","sourceRoot":"","sources":["../../src/services/http-transport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"http-transport.js","sourceRoot":"","sources":["../../src/services/http-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Result of reading FLEET_DIR/knowledge/config.json (the file src/tools/kb-setup.ts
|
|
3
|
+
* writes). Deliberately a standalone shape, NOT ProviderConfig from ./types.js --
|
|
4
|
+
* kb-providers.ts (owned by another lane) decides how/whether to consume this.
|
|
5
|
+
*/
|
|
6
|
+
export interface KbConfigResult {
|
|
7
|
+
provider: 'sqlite' | 'http';
|
|
8
|
+
url?: string;
|
|
9
|
+
token?: string;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* On-disk shape of FLEET_DIR/knowledge/config.json. One file, several owners:
|
|
13
|
+
* kb_setup writes provider/url/token_encrypted, kb_export reads bible.autoCommit.
|
|
14
|
+
* The index signature keeps keys this build does not know about, so a writer
|
|
15
|
+
* that merges into the file never drops another owner's settings.
|
|
16
|
+
*/
|
|
17
|
+
export interface KbConfigFile {
|
|
18
|
+
provider?: 'sqlite' | 'http';
|
|
19
|
+
url?: string;
|
|
20
|
+
token_encrypted?: string;
|
|
21
|
+
bible?: {
|
|
22
|
+
autoCommit?: boolean;
|
|
23
|
+
};
|
|
24
|
+
[key: string]: unknown;
|
|
25
|
+
}
|
|
26
|
+
export declare const KB_CONFIG_PATH: string;
|
|
27
|
+
/**
|
|
28
|
+
* Read the KB provider config kb_setup wrote (provider/url/token_encrypted). Nothing
|
|
29
|
+
* currently reads this file back -- this restores that capability as a pure reader with
|
|
30
|
+
* no side effects, so a later task can wire it into getKbProviders.
|
|
31
|
+
*
|
|
32
|
+
* - Absent file, or provider missing/"sqlite" -> { provider: 'sqlite' }, silently,
|
|
33
|
+
* without ever touching token_encrypted (a corrupt token must never break the
|
|
34
|
+
* stock sqlite path).
|
|
35
|
+
* - provider "http" -> decrypts token_encrypted and returns { provider: 'http', url, token }.
|
|
36
|
+
* Missing url, missing token_encrypted, or a decryption failure all throw a
|
|
37
|
+
* descriptive Error naming this config path and the failing key -- never a silent
|
|
38
|
+
* fallback to sqlite.
|
|
39
|
+
* - Malformed JSON throws an Error naming this config path.
|
|
40
|
+
*/
|
|
41
|
+
export declare function readKbConfigFromDisk(): KbConfigResult;
|
|
42
|
+
//# sourceMappingURL=kb-config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"kb-config.d.ts","sourceRoot":"","sources":["../../../src/services/knowledge/kb-config.ts"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACjC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,cAAc,QAAmD,CAAC;AAE/E;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,IAAI,cAAc,CA8CrD"}
|