@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
|
@@ -14,7 +14,8 @@ import { writeStatusline } from '../services/statusline.js';
|
|
|
14
14
|
import { awsProvider } from '../services/cloud/aws.js';
|
|
15
15
|
import { collectOobPassword, collectOobApiKey } from '../services/auth-socket.js';
|
|
16
16
|
import { classifySshError } from '../utils/ssh-error-messages.js';
|
|
17
|
-
import { logLine } from '../utils/log-helpers.js';
|
|
17
|
+
import { logLine, logWarn } from '../utils/log-helpers.js';
|
|
18
|
+
import { findSecretTokens, legacyTokenWarning } from '../services/secret-token.js';
|
|
18
19
|
import { CURATED_CHEAP_MODELS, CURATED_STANDARD_MODELS, CURATED_PREMIUM_MODELS } from '../cli/config.js';
|
|
19
20
|
import { writeAgyWorkspaceOverlays } from '../cli/install.js';
|
|
20
21
|
import { validateOpenCodeModelTiers } from '../utils/opencode-model-validation.js';
|
|
@@ -24,6 +25,8 @@ import { seedWorkspaceTrust } from '../utils/workspace-trust.js';
|
|
|
24
25
|
import { composePermissions } from './compose-permissions.js';
|
|
25
26
|
import { isFullyQualifiedPath, workFolderNotAbsoluteError } from '../utils/work-folder-validation.js';
|
|
26
27
|
import { getMemberHomeDir } from '../services/member-home.js';
|
|
28
|
+
import { ensureAgyProject } from '../services/agy-project.js';
|
|
29
|
+
import { detectVcsProviderFromRemoteUrl } from '../utils/vcs-provider-detect.js';
|
|
27
30
|
export const registerMemberSchema = z.object({
|
|
28
31
|
friendly_name: z.string()
|
|
29
32
|
.min(1).max(64)
|
|
@@ -34,11 +37,12 @@ export const registerMemberSchema = z.object({
|
|
|
34
37
|
port: z.number().default(22).describe('SSH port (default: 22, remote members only)'),
|
|
35
38
|
username: z.string().optional().describe('SSH username (required for remote members). Spaces are allowed (e.g. "tester tester" on Windows) — passed directly to SSH, never shell-interpolated.'),
|
|
36
39
|
auth_type: z.enum(['password', 'key']).optional().describe('Authentication method (required for non-cloud remote members; cloud members default to "key")'),
|
|
37
|
-
password: z.string().optional().describe('SSH password. Omit for
|
|
40
|
+
password: z.string().optional().describe('SSH password. Omit for out-of-band entry — a password prompt will open in a separate terminal window. Supports {{secret.NAME}} token — value is resolved from the credential store before use.'),
|
|
38
41
|
key_path: z.string().optional().describe('Path to SSH private key. Used for both regular SSH connections and cloud instance lifecycle.'),
|
|
39
42
|
work_folder: z.string().regex(/^[^<>\n\r]+$/, 'work_folder must not contain angle brackets or newlines').describe('Working directory on the target machine. For remote members, must be a fully-qualified/absolute path (e.g. "/home/bella/repo" or "C:\\Users\\bella\\repo") -- "~" and relative paths are rejected, since they are never resolved for a remote member.'),
|
|
40
43
|
git_access: z.enum(['read', 'push', 'admin', 'issues', 'full']).optional().describe('Git access level for this member'),
|
|
41
44
|
git_repos: z.array(z.string()).optional().describe('Git repositories this member can access (e.g. ["Apra-Labs/ApraPipes"])'),
|
|
45
|
+
vcs_provider: z.enum(['github', 'bitbucket', 'azure-devops', 'none']).optional().describe('VCS provider this member pushes to and opens pull requests against. Omit to auto-detect it from the member\'s git "origin" remote; pass "none" to record that this member deliberately has no VCS provider (suppresses the auto-detect warning). A member with no VCS provider CANNOT push or open a PR.'),
|
|
42
46
|
// Cloud fields
|
|
43
47
|
cloud_provider: z.enum(['aws'], {
|
|
44
48
|
errorMap: () => ({ message: "Only 'aws' is supported as a cloud provider. GCP and Azure support is planned." }),
|
|
@@ -123,16 +127,14 @@ export async function registerMember(input) {
|
|
|
123
127
|
if (!isLocal && !isFullyQualifiedPath(input.work_folder)) {
|
|
124
128
|
return workFolderNotAbsoluteError(input.work_folder, 'Member was NOT registered.');
|
|
125
129
|
}
|
|
126
|
-
// Resolve {{secure.NAME}} tokens in password field
|
|
130
|
+
// Resolve {{secret.NAME}} / legacy {{secure.NAME}} tokens in password field
|
|
127
131
|
let resolvedPassword = input.password;
|
|
132
|
+
let passwordLegacyNames = [];
|
|
128
133
|
if (resolvedPassword) {
|
|
129
|
-
const
|
|
130
|
-
let match;
|
|
134
|
+
const tokens = findSecretTokens(resolvedPassword);
|
|
131
135
|
let resolved = resolvedPassword;
|
|
132
|
-
const tokenNames = new Set();
|
|
133
|
-
|
|
134
|
-
tokenNames.add(match[1]);
|
|
135
|
-
}
|
|
136
|
+
const tokenNames = new Set(tokens.map((t) => t.name));
|
|
137
|
+
passwordLegacyNames = tokens.filter((t) => t.legacy).map((t) => t.name);
|
|
136
138
|
for (const name of tokenNames) {
|
|
137
139
|
const entry = credentialResolve(name, input.friendly_name);
|
|
138
140
|
if (entry && 'denied' in entry)
|
|
@@ -140,7 +142,8 @@ export async function registerMember(input) {
|
|
|
140
142
|
if (entry && 'expired' in entry)
|
|
141
143
|
return `❌ ${entry.expired} Member was NOT registered.`;
|
|
142
144
|
if (entry) {
|
|
143
|
-
resolved = resolved.replaceAll(`{{
|
|
145
|
+
resolved = resolved.replaceAll(`{{secret.${name}}}`, entry.plaintext);
|
|
146
|
+
resolved = resolved.replaceAll(`{{secure.${name}}}`, entry.plaintext); // legacy spelling
|
|
144
147
|
continue;
|
|
145
148
|
}
|
|
146
149
|
// Credential not found — auto-create via OOB
|
|
@@ -151,9 +154,14 @@ export async function registerMember(input) {
|
|
|
151
154
|
return `❌ No credential received for "${name}". Member was NOT registered.`;
|
|
152
155
|
const plaintext = decryptPassword(oob.password);
|
|
153
156
|
credentialSet(name, plaintext, !!oob.persist, 'deny');
|
|
154
|
-
resolved = resolved.replaceAll(`{{
|
|
157
|
+
resolved = resolved.replaceAll(`{{secret.${name}}}`, plaintext);
|
|
158
|
+
resolved = resolved.replaceAll(`{{secure.${name}}}`, plaintext); // legacy spelling
|
|
155
159
|
}
|
|
156
160
|
resolvedPassword = resolved;
|
|
161
|
+
if (passwordLegacyNames.length > 0) {
|
|
162
|
+
logWarn('register_member', legacyTokenWarning(passwordLegacyNames), { id: input.friendly_name, friendlyName: input.friendly_name });
|
|
163
|
+
warnings.push(legacyTokenWarning(passwordLegacyNames));
|
|
164
|
+
}
|
|
157
165
|
}
|
|
158
166
|
// Out-of-band password collection for remote password auth without inline password
|
|
159
167
|
let preEncryptedPassword;
|
|
@@ -257,6 +265,11 @@ export async function registerMember(input) {
|
|
|
257
265
|
createdAt: new Date().toISOString(),
|
|
258
266
|
gitAccess: input.git_access,
|
|
259
267
|
gitRepos: input.git_repos,
|
|
268
|
+
// apra-fleet-5oo: an explicitly-supplied provider always wins and is never
|
|
269
|
+
// probed for. 'none' is an explicit "this member has no VCS provider"
|
|
270
|
+
// declaration -- it is NOT an Agent.vcsProvider value (src/types.ts), so it
|
|
271
|
+
// is recorded as absent here and only suppresses the warning below.
|
|
272
|
+
vcsProvider: (input.vcs_provider && input.vcs_provider !== 'none') ? input.vcs_provider : undefined,
|
|
260
273
|
cloud: cloudConfig,
|
|
261
274
|
llmProvider: input.llm_provider ?? 'claude',
|
|
262
275
|
modelCheap: input.model_cheap,
|
|
@@ -275,6 +288,10 @@ export async function registerMember(input) {
|
|
|
275
288
|
let claudeVersion;
|
|
276
289
|
let connResult = { ok: true };
|
|
277
290
|
let agentProvisionResult;
|
|
291
|
+
// apra-fleet-5oo: true only when the provider below was resolved by probing
|
|
292
|
+
// the member's own git remote (never when the caller supplied it), so the
|
|
293
|
+
// result line can say where the value came from.
|
|
294
|
+
let vcsProviderAutoDetected = false;
|
|
278
295
|
if (!skipSshOps) {
|
|
279
296
|
const strategy = getStrategy(tempAgent);
|
|
280
297
|
// Step 1: Test connectivity
|
|
@@ -358,7 +375,58 @@ export async function registerMember(input) {
|
|
|
358
375
|
}).catch(() => { warnings.push(`Could not create folder "${input.work_folder}"`); })
|
|
359
376
|
: strategy.execCommand(cmds.mkdir(input.work_folder), 10000)
|
|
360
377
|
.catch(() => { warnings.push(`Could not create folder "${input.work_folder}"`); });
|
|
361
|
-
|
|
378
|
+
// Step 3b: best-effort VCS-provider detection (apra-fleet-5oo).
|
|
379
|
+
//
|
|
380
|
+
// Registration could previously mint a fully dispatch-capable member with
|
|
381
|
+
// Agent.vcsProvider left unset -- nothing here ever asked for or detected
|
|
382
|
+
// it -- and the gap only surfaced hours later, mid-sprint, when
|
|
383
|
+
// fleet-sprint's VCSModule.resolveProvider() threw "member has no
|
|
384
|
+
// registered VCS provider" on the member's first push/PR.
|
|
385
|
+
//
|
|
386
|
+
// Modelled on the Windows shell probe above (shouldProbeShell /
|
|
387
|
+
// probeWindowsShell) in both spirit and failure behavior: an explicit
|
|
388
|
+
// operator value skips the probe entirely, and the probe itself NEVER
|
|
389
|
+
// fails registration -- a work folder with no git repo in it yet is the
|
|
390
|
+
// common "register before clone" case, not an error. It degrades to a
|
|
391
|
+
// loud warning below instead.
|
|
392
|
+
//
|
|
393
|
+
// Runs INSIDE the Promise.all below rather than after it: the probe is
|
|
394
|
+
// independent of the CLI/auth/mkdir checks, so sequencing it behind them
|
|
395
|
+
// would add a whole extra SSH round trip to every registration for no
|
|
396
|
+
// ordering reason. Racing mkdirCheck is harmless in particular: a folder
|
|
397
|
+
// mkdir had to CREATE cannot contain a git repo, so the probe's answer is
|
|
398
|
+
// the same ("no remote") whichever of the two lands first.
|
|
399
|
+
const vcsProviderCheck = input.vcs_provider
|
|
400
|
+
? Promise.resolve()
|
|
401
|
+
: strategy.execCommand(cmds.gitRemoteOrigin(input.work_folder), 15000)
|
|
402
|
+
.then(remoteRes => {
|
|
403
|
+
// Take stdout regardless of exit code: both OS builders swallow
|
|
404
|
+
// the failure ("|| true" / "try {} catch {}") so an absent repo
|
|
405
|
+
// yields empty output rather than a non-zero code, and stderr is
|
|
406
|
+
// never a URL.
|
|
407
|
+
const remoteUrl = String(remoteRes.stdout ?? '').trim().split(/\r?\n/)[0].trim();
|
|
408
|
+
const detected = detectVcsProviderFromRemoteUrl(remoteUrl);
|
|
409
|
+
if (detected) {
|
|
410
|
+
tempAgent.vcsProvider = detected;
|
|
411
|
+
vcsProviderAutoDetected = true;
|
|
412
|
+
}
|
|
413
|
+
})
|
|
414
|
+
.catch(() => { });
|
|
415
|
+
await Promise.all([versionCheck, authCheck, mkdirCheck, vcsProviderCheck]);
|
|
416
|
+
// AGY: create the member's own agy project (`agy --new-project`) and bind
|
|
417
|
+
// it by id; every dispatch passes --project <id> and compose_permissions
|
|
418
|
+
// writes the member's grants into that project's file. Without it agy
|
|
419
|
+
// runs under the machine-wide default-cli-project. Refused registration
|
|
420
|
+
// rather than a member that cannot be bound. Needs the work folder, so it
|
|
421
|
+
// runs after mkdirCheck.
|
|
422
|
+
if (connResult.ok && providerName === 'agy') {
|
|
423
|
+
try {
|
|
424
|
+
await ensureAgyProject(tempAgent, { persist: false });
|
|
425
|
+
}
|
|
426
|
+
catch (e) {
|
|
427
|
+
return `ERROR: could not create the agy project for "${input.friendly_name}": ${e?.message ?? String(e)}\nMember was NOT registered.`;
|
|
428
|
+
}
|
|
429
|
+
}
|
|
362
430
|
// --- Provision role-agent definition files (planner.md, doer.md, ...) ---
|
|
363
431
|
// Remote members have their own home dir and never receive these via install() --
|
|
364
432
|
// only when connectivity is confirmed do we attempt the probe/push round trip.
|
|
@@ -386,6 +454,16 @@ export async function registerMember(input) {
|
|
|
386
454
|
warnings.push('Workspace trust not seeded -- run update_member after the instance starts.');
|
|
387
455
|
}
|
|
388
456
|
}
|
|
457
|
+
// apra-fleet-5oo: registration must never silently produce a dispatch-capable
|
|
458
|
+
// member that cannot push or open a PR. Registration is NOT refused (that
|
|
459
|
+
// would break the common "register the member, then clone into its work
|
|
460
|
+
// folder" flow), but the gap is surfaced HERE, loudly, at registration time
|
|
461
|
+
// rather than reactively hours into an unattended sprint. A member with
|
|
462
|
+
// llm_provider 'none' never dispatches an agent and never pushes, so it is
|
|
463
|
+
// exempt; so is an explicit vcs_provider (including 'none').
|
|
464
|
+
if (!tempAgent.vcsProvider && !input.vcs_provider && (input.llm_provider ?? 'claude') !== 'none') {
|
|
465
|
+
warnings.push('VCS provider could not be determined (no git remote found, or vcs_provider not supplied) -- this member will be UNABLE to push or open a PR until provisioned. Run provision_vcs_auth with an explicit provider (github/bitbucket/azure-devops) -- it requires the provider, it does not detect one, and sets vcsProvider as a side effect of provisioning credentials. Or run update_member with vcs_provider set to record the provider directly, without provisioning credentials. Re-registering this member is NOT a remedy -- the same folder path is rejected as a duplicate registration.');
|
|
466
|
+
}
|
|
389
467
|
// OS support warning for cloud members: cloud features are designed for Linux
|
|
390
468
|
if (isCloud && tempAgent.os !== 'linux') {
|
|
391
469
|
const osLabel = tempAgent.os ?? 'unknown';
|
|
@@ -537,6 +615,15 @@ export async function registerMember(input) {
|
|
|
537
615
|
result += ` OS: ${detectedOS}\n`;
|
|
538
616
|
result += ` Folder: ${tempAgent.workFolder}\n`;
|
|
539
617
|
result += ` Provider: ${tempAgent.llmProvider ?? 'claude'}\n`;
|
|
618
|
+
if (tempAgent.llmProvider === 'agy' && tempAgent.agyProjectId) {
|
|
619
|
+
result += ` AGY project: ${tempAgent.agyProjectId}\n`;
|
|
620
|
+
}
|
|
621
|
+
if (tempAgent.vcsProvider) {
|
|
622
|
+
result += ` VCS Provider: ${tempAgent.vcsProvider}${vcsProviderAutoDetected ? ' (auto-detected from origin)' : ''}\n`;
|
|
623
|
+
}
|
|
624
|
+
else if (input.vcs_provider === 'none') {
|
|
625
|
+
result += ` VCS Provider: none (declared explicitly -- this member cannot push or open a PR)\n`;
|
|
626
|
+
}
|
|
540
627
|
if (tempAgent.category) {
|
|
541
628
|
result += ` Category: ${tempAgent.category}\n`;
|
|
542
629
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-member.js","sourceRoot":"","sources":["../../src/tools/register-member.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"register-member.js","sourceRoot":"","sources":["../../src/tools/register-member.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-member.d.ts","sourceRoot":"","sources":["../../src/tools/remove-member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"remove-member.d.ts","sourceRoot":"","sources":["../../src/tools/remove-member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA4BxB,eAAO,MAAM,kBAAkB;;;;;;;;;;;;EAG7B,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEnE,wBAAsB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAyI5E"}
|
|
@@ -11,6 +11,7 @@ import { removeKnownHost } from '../services/known-hosts.js';
|
|
|
11
11
|
import { writeStatusline, readMemberStatus } from '../services/statusline.js';
|
|
12
12
|
import { cancelCredentialCleanup } from '../services/credential-cleanup.js';
|
|
13
13
|
import { getStallDetector } from '../services/stall/index.js';
|
|
14
|
+
import { removeAgyProject } from '../services/agy-project.js';
|
|
14
15
|
import { githubProvider } from '../services/vcs/github.js';
|
|
15
16
|
import { bitbucketProvider } from '../services/vcs/bitbucket.js';
|
|
16
17
|
import { azureDevOpsProvider } from '../services/vcs/azure-devops.js';
|
|
@@ -60,11 +61,16 @@ export async function removeMember(input) {
|
|
|
60
61
|
for (const cmd of cmds.unsetEnv(provider.authEnvVar)) {
|
|
61
62
|
await strategy.execCommand(cmd, 10000).catch(() => { });
|
|
62
63
|
}
|
|
63
|
-
// VCS auth revoke: remove git credential helper if a VCS provider is configured
|
|
64
|
+
// VCS auth revoke: remove git credential helper if a VCS provider is configured.
|
|
65
|
+
// Must pass the SAME label/scopeUrl persisted at provision time (see
|
|
66
|
+
// credential-cleanup.ts) -- omitting them targets the unlabeled/
|
|
67
|
+
// default-host credential-helper file/config-key pair instead of the
|
|
68
|
+
// one actually deployed, leaving the real token file orphaned,
|
|
69
|
+
// unrevoked, on a machine that is being decommissioned.
|
|
64
70
|
if (agent.vcsProvider) {
|
|
65
71
|
const vcsService = vcsProviders[agent.vcsProvider];
|
|
66
72
|
if (vcsService) {
|
|
67
|
-
await vcsService.revoke(agent, cmds, exec).catch(() => { });
|
|
73
|
+
await vcsService.revoke(agent, cmds, exec, agent.vcsCredentialLabel, agent.vcsCredentialScopeUrl).catch(() => { });
|
|
68
74
|
}
|
|
69
75
|
}
|
|
70
76
|
// SSH key removal: remove fleet public key from remote authorized_keys
|
|
@@ -101,6 +107,25 @@ export async function removeMember(input) {
|
|
|
101
107
|
warnings.push('Could not connect to member — auth credentials may still be present');
|
|
102
108
|
}
|
|
103
109
|
}
|
|
110
|
+
// Best-effort: delete the member's agy project file (and a legacy
|
|
111
|
+
// fleet-<id>.json, if present) so its permission grants don't linger on
|
|
112
|
+
// its machine (docs/agy-provider.md section 1). Skipped
|
|
113
|
+
// entirely when another registered member still shares the id -- deleting
|
|
114
|
+
// it would strip that other member's grants too.
|
|
115
|
+
if (agent.llmProvider === 'agy' && agent.agyProjectId) {
|
|
116
|
+
const sharedProject = getAllAgents().some(a => a.id !== agent.id && a.agyProjectId === agent.agyProjectId);
|
|
117
|
+
if (!sharedProject) {
|
|
118
|
+
try {
|
|
119
|
+
const result = await removeAgyProject(agent, (cmd, timeoutMs) => strategy.execCommand(cmd, timeoutMs));
|
|
120
|
+
if (result.errors.length > 0) {
|
|
121
|
+
warnings.push(`Could not fully remove agy project file for "${agent.friendlyName}": ${result.errors.join('; ')}`);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
catch (err) {
|
|
125
|
+
warnings.push(`Could not remove agy project file for "${agent.friendlyName}": ${err instanceof Error ? err.message : String(err)}`);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
104
129
|
strategy.close();
|
|
105
130
|
// Clean up local key files only if no other member shares this key
|
|
106
131
|
if (agent.keyPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-member.js","sourceRoot":"","sources":["../../src/tools/remove-member.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"remove-member.js","sourceRoot":"","sources":["../../src/tools/remove-member.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,11 +27,11 @@ export declare const sendEmailSchema: z.ZodObject<{
|
|
|
27
27
|
}>, "many">>;
|
|
28
28
|
}, "strip", z.ZodTypeAny, {
|
|
29
29
|
body: string;
|
|
30
|
+
secure: boolean;
|
|
30
31
|
from: string;
|
|
31
32
|
to: string | string[];
|
|
32
33
|
provider: "sendgrid" | "smtp";
|
|
33
34
|
subject: string;
|
|
34
|
-
secure: boolean;
|
|
35
35
|
host?: string | undefined;
|
|
36
36
|
port?: number | undefined;
|
|
37
37
|
user?: string | undefined;
|
|
@@ -51,6 +51,7 @@ export declare const sendEmailSchema: z.ZodObject<{
|
|
|
51
51
|
host?: string | undefined;
|
|
52
52
|
port?: number | undefined;
|
|
53
53
|
user?: string | undefined;
|
|
54
|
+
secure?: boolean | undefined;
|
|
54
55
|
provider?: "sendgrid" | "smtp" | undefined;
|
|
55
56
|
cc?: string[] | undefined;
|
|
56
57
|
bcc?: string[] | undefined;
|
|
@@ -60,7 +61,6 @@ export declare const sendEmailSchema: z.ZodObject<{
|
|
|
60
61
|
contentType?: string | undefined;
|
|
61
62
|
}[] | undefined;
|
|
62
63
|
html?: string | undefined;
|
|
63
|
-
secure?: boolean | undefined;
|
|
64
64
|
}>;
|
|
65
65
|
export type SendEmailInput = z.infer<typeof sendEmailSchema>;
|
|
66
66
|
export declare function sendEmail(input: SendEmailInput, extra?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-git-app.d.ts","sourceRoot":"","sources":["../../src/tools/setup-git-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAaxB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;EAI5B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEjE,wBAAsB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"setup-git-app.d.ts","sourceRoot":"","sources":["../../src/tools/setup-git-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAaxB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;EAI5B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEjE,wBAAsB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqE1E"}
|
|
@@ -8,26 +8,29 @@ import { setGitHubApp } from '../services/git-config.js';
|
|
|
8
8
|
import { enforceOwnerOnly } from '../utils/file-permissions.js';
|
|
9
9
|
import { credentialResolve } from '../services/credential-store.js';
|
|
10
10
|
import { FLEET_DIR } from '../paths.js';
|
|
11
|
+
import { findSecretTokens, legacyTokenWarning } from '../services/secret-token.js';
|
|
11
12
|
const STORED_KEY_PATH = path.join(FLEET_DIR, 'github-app.pem');
|
|
12
|
-
const TOKEN_RE = /\{\{secure\.([a-zA-Z0-9_-]{1,64})\}\}/;
|
|
13
13
|
export const setupGitAppSchema = z.object({
|
|
14
14
|
app_id: z.string().regex(/^\d+$/, 'App ID must be numeric').describe('The GitHub App ID (numeric string)'),
|
|
15
|
-
private_key_path: z.string().describe('Path to the GitHub App private key (.pem) file. Supports {{
|
|
15
|
+
private_key_path: z.string().describe('Path to the GitHub App private key (.pem) file. Supports {{secret.NAME}} token — if the resolved value starts with -----BEGIN it is treated as PEM key content directly (no file needed).'),
|
|
16
16
|
installation_id: z.number().describe('The GitHub App installation ID for your organization'),
|
|
17
17
|
});
|
|
18
18
|
export async function setupGitApp(input) {
|
|
19
|
-
// Resolve {{secure.NAME}} token in private_key_path if present
|
|
19
|
+
// Resolve {{secret.NAME}} / legacy {{secure.NAME}} token in private_key_path if present
|
|
20
20
|
let keyPath = input.private_key_path;
|
|
21
21
|
let tempKeyPath;
|
|
22
|
-
|
|
22
|
+
let legacyWarning;
|
|
23
|
+
const [tokenMatch] = findSecretTokens(input.private_key_path);
|
|
23
24
|
if (tokenMatch) {
|
|
24
|
-
const entry = credentialResolve(tokenMatch
|
|
25
|
+
const entry = credentialResolve(tokenMatch.name, '*');
|
|
25
26
|
if (!entry)
|
|
26
|
-
return `❌ Credential "${tokenMatch
|
|
27
|
+
return `❌ Credential "${tokenMatch.name}" not found. Run credential_store_set first.`;
|
|
27
28
|
if ('denied' in entry)
|
|
28
29
|
return `❌ ${entry.denied}`;
|
|
29
30
|
if ('expired' in entry)
|
|
30
31
|
return `❌ ${entry.expired}`;
|
|
32
|
+
if (tokenMatch.legacy)
|
|
33
|
+
legacyWarning = legacyTokenWarning([tokenMatch.name]);
|
|
31
34
|
const resolved = entry.plaintext;
|
|
32
35
|
if (resolved.startsWith('-----BEGIN')) {
|
|
33
36
|
tempKeyPath = path.join(os.tmpdir(), `apra-fleet-gitapp-${crypto.randomBytes(8).toString('hex')}.pem`);
|
|
@@ -75,7 +78,8 @@ export async function setupGitApp(input) {
|
|
|
75
78
|
+ ` App: ${result.appName} (ID: ${input.app_id})\n`
|
|
76
79
|
+ ` Org: ${result.orgName}\n`
|
|
77
80
|
+ ` Installation: ${input.installation_id}\n`
|
|
78
|
-
+ ` Private key stored: ${STORED_KEY_PATH}
|
|
81
|
+
+ ` Private key stored: ${STORED_KEY_PATH}`
|
|
82
|
+
+ (legacyWarning ? `\n${legacyWarning}` : '');
|
|
79
83
|
}
|
|
80
84
|
finally {
|
|
81
85
|
if (tempKeyPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-git-app.js","sourceRoot":"","sources":["../../src/tools/setup-git-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"setup-git-app.js","sourceRoot":"","sources":["../../src/tools/setup-git-app.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,7 @@ import { z } from 'zod';
|
|
|
2
2
|
import type { HttpTransportHandle } from '../services/http-transport.js';
|
|
3
3
|
export declare const shutdownServerSchema: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
|
|
4
4
|
export declare function setHttpHandle(handle: HttpTransportHandle): void;
|
|
5
|
+
export declare function scheduleProcessExit(delayMs?: number): void;
|
|
6
|
+
export declare function cancelScheduledExit(): void;
|
|
5
7
|
export declare function shutdownServer(): Promise<string>;
|
|
6
8
|
//# sourceMappingURL=shutdown-server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shutdown-server.d.ts","sourceRoot":"","sources":["../../src/tools/shutdown-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,eAAO,MAAM,oBAAoB,gDAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"shutdown-server.d.ts","sourceRoot":"","sources":["../../src/tools/shutdown-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,eAAO,MAAM,oBAAoB,gDAAe,CAAC;AAYjD,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAE/D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,SAAM,GAAG,IAAI,CAQvD;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAK1C;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CActD"}
|
|
@@ -4,9 +4,31 @@ import { closeAllConnections } from '../services/ssh.js';
|
|
|
4
4
|
import { SERVER_INFO_PATH } from '../paths.js';
|
|
5
5
|
export const shutdownServerSchema = z.object({});
|
|
6
6
|
let httpHandle = null;
|
|
7
|
+
// Tracked so a test (or any other caller that needs to tear down cleanly
|
|
8
|
+
// before the deferred exit fires) can cancel it via cancelScheduledExit().
|
|
9
|
+
// Without this, under load a test run can outlive the 100ms delay: the timer
|
|
10
|
+
// fires after the owning test file has finished and its process.exit spy has
|
|
11
|
+
// been restored, so it calls the REAL process.exit and vitest reports an
|
|
12
|
+
// uncaught exception even though every assertion passed.
|
|
13
|
+
let pendingExitTimer;
|
|
7
14
|
export function setHttpHandle(handle) {
|
|
8
15
|
httpHandle = handle;
|
|
9
16
|
}
|
|
17
|
+
export function scheduleProcessExit(delayMs = 100) {
|
|
18
|
+
if (pendingExitTimer) {
|
|
19
|
+
clearTimeout(pendingExitTimer);
|
|
20
|
+
}
|
|
21
|
+
pendingExitTimer = setTimeout(() => {
|
|
22
|
+
pendingExitTimer = undefined;
|
|
23
|
+
process.exit(0);
|
|
24
|
+
}, delayMs);
|
|
25
|
+
}
|
|
26
|
+
export function cancelScheduledExit() {
|
|
27
|
+
if (pendingExitTimer) {
|
|
28
|
+
clearTimeout(pendingExitTimer);
|
|
29
|
+
pendingExitTimer = undefined;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
10
32
|
export async function shutdownServer() {
|
|
11
33
|
if (httpHandle) {
|
|
12
34
|
// Close the transport BEFORE deleting the singleton pointer, not after --
|
|
@@ -22,7 +44,7 @@ export async function shutdownServer() {
|
|
|
22
44
|
catch { }
|
|
23
45
|
}
|
|
24
46
|
closeAllConnections();
|
|
25
|
-
|
|
47
|
+
scheduleProcessExit();
|
|
26
48
|
return 'Server shutting down. Run /mcp to start a fresh instance.';
|
|
27
49
|
}
|
|
28
50
|
//# sourceMappingURL=shutdown-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shutdown-server.js","sourceRoot":"","sources":["../../src/tools/shutdown-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAEjD,IAAI,UAAU,GAA+B,IAAI,CAAC;AAElD,MAAM,UAAU,aAAa,CAAC,MAA2B;IACvD,UAAU,GAAG,MAAM,CAAC;AACtB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,UAAU,EAAE,CAAC;QACf,0EAA0E;QAC1E,mEAAmE;QACnE,kEAAkE;QAClE,qEAAqE;QACrE,wEAAwE;QACxE,sEAAsE;QACtE,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC;YAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACnD,CAAC;IACD,mBAAmB,EAAE,CAAC;IACtB,
|
|
1
|
+
{"version":3,"file":"shutdown-server.js","sourceRoot":"","sources":["../../src/tools/shutdown-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAEjD,IAAI,UAAU,GAA+B,IAAI,CAAC;AAElD,yEAAyE;AACzE,2EAA2E;AAC3E,6EAA6E;AAC7E,6EAA6E;AAC7E,yEAAyE;AACzE,yDAAyD;AACzD,IAAI,gBAA4C,CAAC;AAEjD,MAAM,UAAU,aAAa,CAAC,MAA2B;IACvD,UAAU,GAAG,MAAM,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAO,GAAG,GAAG;IAC/C,IAAI,gBAAgB,EAAE,CAAC;QACrB,YAAY,CAAC,gBAAgB,CAAC,CAAC;IACjC,CAAC;IACD,gBAAgB,GAAG,UAAU,CAAC,GAAG,EAAE;QACjC,gBAAgB,GAAG,SAAS,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,EAAE,OAAO,CAAC,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,IAAI,gBAAgB,EAAE,CAAC;QACrB,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAC/B,gBAAgB,GAAG,SAAS,CAAC;IAC/B,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,UAAU,EAAE,CAAC;QACf,0EAA0E;QAC1E,mEAAmE;QACnE,kEAAkE;QAClE,qEAAqE;QACrE,wEAAwE;QACxE,sEAAsE;QACtE,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC;YAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACnD,CAAC;IACD,mBAAmB,EAAE,CAAC;IACtB,mBAAmB,EAAE,CAAC;IACtB,OAAO,2DAA2D,CAAC;AACrE,CAAC"}
|