@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
|
@@ -17,9 +17,9 @@ export declare const updateMemberSchema: z.ZodObject<{
|
|
|
17
17
|
cloud_idle_timeout_min: z.ZodOptional<z.ZodNumber>;
|
|
18
18
|
cloud_activity_command: z.ZodOptional<z.ZodString>;
|
|
19
19
|
llm_provider: z.ZodOptional<z.ZodEnum<["claude", "codex", "copilot", "agy", "opencode"]>>;
|
|
20
|
-
model_cheap: z.ZodOptional<z.ZodEnum<["gpt-oss-120b", "gpt-120", "gemini-3.
|
|
21
|
-
model_standard: z.ZodOptional<z.ZodEnum<["gemini-3.
|
|
22
|
-
model_premium: z.ZodOptional<z.ZodEnum<["sonnet", "opus", "gpt-oss-120b"]>>;
|
|
20
|
+
model_cheap: z.ZodOptional<z.ZodEnum<["gpt-oss-120b", "gpt-120", "gemini-3.8-flash-low", "haiku", "gpt-5.4-mini"]>>;
|
|
21
|
+
model_standard: z.ZodOptional<z.ZodEnum<["gemini-3.8-flash-high", "gemini-3.8-flash-medium", "gemini-3.1-pro-low", "gpt-oss-120b", "gpt-120", "sonnet", "gpt-5.4"]>>;
|
|
22
|
+
model_premium: z.ZodOptional<z.ZodEnum<["sonnet", "opus", "gemini-3.1-pro-high", "claude-opus-4-6-thinking", "gpt-oss-120b"]>>;
|
|
23
23
|
model_tiers: z.ZodOptional<z.ZodObject<{
|
|
24
24
|
cheap: z.ZodOptional<z.ZodString>;
|
|
25
25
|
standard: z.ZodOptional<z.ZodString>;
|
|
@@ -39,6 +39,7 @@ export declare const updateMemberSchema: z.ZodObject<{
|
|
|
39
39
|
code_intel_provider: z.ZodOptional<z.ZodEnum<["codebase-memory", "gitnexus", "none"]>>;
|
|
40
40
|
unreservable: z.ZodOptional<z.ZodBoolean>;
|
|
41
41
|
shell: z.ZodOptional<z.ZodEnum<["gitbash", "pwsh7", "powershell5"]>>;
|
|
42
|
+
vcs_provider: z.ZodOptional<z.ZodEnum<["github", "bitbucket", "azure-devops", "none"]>>;
|
|
42
43
|
member_id: z.ZodOptional<z.ZodString>;
|
|
43
44
|
member_name: z.ZodOptional<z.ZodString>;
|
|
44
45
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -60,14 +61,15 @@ export declare const updateMemberSchema: z.ZodObject<{
|
|
|
60
61
|
key_path?: string | undefined;
|
|
61
62
|
git_access?: "read" | "push" | "admin" | "issues" | "full" | undefined;
|
|
62
63
|
git_repos?: string[] | undefined;
|
|
64
|
+
vcs_provider?: "none" | "github" | "bitbucket" | "azure-devops" | undefined;
|
|
63
65
|
cloud_region?: string | undefined;
|
|
64
66
|
cloud_profile?: string | undefined;
|
|
65
67
|
cloud_idle_timeout_min?: number | undefined;
|
|
66
68
|
cloud_activity_command?: string | undefined;
|
|
67
69
|
llm_provider?: "claude" | "codex" | "copilot" | "agy" | "opencode" | undefined;
|
|
68
|
-
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.
|
|
69
|
-
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.
|
|
70
|
-
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" | undefined;
|
|
70
|
+
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.8-flash-low" | "haiku" | "gpt-5.4-mini" | undefined;
|
|
71
|
+
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.8-flash-high" | "gemini-3.8-flash-medium" | "gemini-3.1-pro-low" | "sonnet" | "gpt-5.4" | undefined;
|
|
72
|
+
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" | "gemini-3.1-pro-high" | "claude-opus-4-6-thinking" | undefined;
|
|
71
73
|
model_tiers?: {
|
|
72
74
|
cheap?: string | undefined;
|
|
73
75
|
standard?: string | undefined;
|
|
@@ -94,14 +96,15 @@ export declare const updateMemberSchema: z.ZodObject<{
|
|
|
94
96
|
key_path?: string | undefined;
|
|
95
97
|
git_access?: "read" | "push" | "admin" | "issues" | "full" | undefined;
|
|
96
98
|
git_repos?: string[] | undefined;
|
|
99
|
+
vcs_provider?: "none" | "github" | "bitbucket" | "azure-devops" | undefined;
|
|
97
100
|
cloud_region?: string | undefined;
|
|
98
101
|
cloud_profile?: string | undefined;
|
|
99
102
|
cloud_idle_timeout_min?: number | undefined;
|
|
100
103
|
cloud_activity_command?: string | undefined;
|
|
101
104
|
llm_provider?: "claude" | "codex" | "copilot" | "agy" | "opencode" | undefined;
|
|
102
|
-
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.
|
|
103
|
-
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.
|
|
104
|
-
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" | undefined;
|
|
105
|
+
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.8-flash-low" | "haiku" | "gpt-5.4-mini" | undefined;
|
|
106
|
+
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.8-flash-high" | "gemini-3.8-flash-medium" | "gemini-3.1-pro-low" | "sonnet" | "gpt-5.4" | undefined;
|
|
107
|
+
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" | "gemini-3.1-pro-high" | "claude-opus-4-6-thinking" | undefined;
|
|
105
108
|
model_tiers?: {
|
|
106
109
|
cheap?: string | undefined;
|
|
107
110
|
standard?: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-member.d.ts","sourceRoot":"","sources":["../../src/tools/update-member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"update-member.d.ts","sourceRoot":"","sources":["../../src/tools/update-member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAoBxB,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsD7B,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,CAqR5E"}
|
|
@@ -6,13 +6,15 @@ import { collectOobPassword } from '../services/auth-socket.js';
|
|
|
6
6
|
import { credentialResolve } from '../services/credential-store.js';
|
|
7
7
|
import { isValidIcon, resolveIcon, DEFAULT_ICON } from '../services/icons.js';
|
|
8
8
|
import { writeStatusline } from '../services/statusline.js';
|
|
9
|
-
import { logLine } from '../utils/log-helpers.js';
|
|
9
|
+
import { logLine, logWarn } from '../utils/log-helpers.js';
|
|
10
|
+
import { findSecretTokens, legacyTokenWarning } from '../services/secret-token.js';
|
|
10
11
|
import { invalidatePreflightCache } from '../services/preflight-check.js';
|
|
11
12
|
import { CURATED_CHEAP_MODELS, CURATED_STANDARD_MODELS, CURATED_PREMIUM_MODELS } from '../cli/config.js';
|
|
12
13
|
import { validateOpenCodeModelTiers } from '../utils/opencode-model-validation.js';
|
|
13
14
|
import { provisionAgents, remoteAgentsDir } from '../services/agent-provisioner.js';
|
|
14
15
|
import { getStrategy } from '../services/strategy.js';
|
|
15
16
|
import { seedWorkspaceTrust } from '../utils/workspace-trust.js';
|
|
17
|
+
import { ensureAgyProject } from '../services/agy-project.js';
|
|
16
18
|
import { isFullyQualifiedPath, workFolderNotAbsoluteError } from '../utils/work-folder-validation.js';
|
|
17
19
|
export const updateMemberSchema = z.object({
|
|
18
20
|
...memberIdentifier,
|
|
@@ -28,8 +30,8 @@ export const updateMemberSchema = z.object({
|
|
|
28
30
|
port: z.number().optional().describe('New SSH port (remote members only)'),
|
|
29
31
|
username: z.string().optional().describe('New SSH username (remote members only)'),
|
|
30
32
|
auth_type: z.enum(['password', 'key']).optional().describe('New auth method (remote members only)'),
|
|
31
|
-
password: z.string().optional().describe('New SSH password. Omit for
|
|
32
|
-
rotate_password: z.boolean().optional().describe('Trigger
|
|
33
|
+
password: z.string().optional().describe('New 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.'),
|
|
34
|
+
rotate_password: z.boolean().optional().describe('Trigger out-of-band password re-entry for a member already using password auth. '
|
|
33
35
|
+ 'A password prompt will open in a separate terminal window. Ignored if auth_type is not password.'),
|
|
34
36
|
key_path: z.string().optional().describe('Path to SSH private key. Used for both regular SSH connections and cloud instance lifecycle.'),
|
|
35
37
|
work_folder: z.string()
|
|
@@ -62,6 +64,7 @@ export const updateMemberSchema = z.object({
|
|
|
62
64
|
code_intel_provider: z.enum(['codebase-memory', 'gitnexus', 'none']).optional().describe('Change the code-intelligence provider for this member.'),
|
|
63
65
|
unreservable: z.boolean().optional().describe('Mark this member as never exclusively reservable, so it can be shared by more than one sprint at once (e.g. a member filling fleet-sprint\'s shared "orchestrator" role). reserve/release/force_release become no-op successes and overlap guards skip it.'),
|
|
64
66
|
shell: z.enum(['gitbash', 'pwsh7', 'powershell5']).optional().describe('Override the probed Windows shell for this member (gitbash, pwsh7, or powershell5). Windows members only -- ignored for non-windows members.'),
|
|
67
|
+
vcs_provider: z.enum(['github', 'bitbucket', 'azure-devops', 'none']).optional().describe('Directly set (override) this member\'s VCS provider -- an explicit operator value, never auto-detected. Use this to correct a wrong auto-detect from register_member, or to set the provider for a member with no credentials to provision (so provision_vcs_auth is not required just to record it). Pass "none" to clear it, declaring the member deliberately has no VCS provider.'),
|
|
65
68
|
});
|
|
66
69
|
export async function updateMember(input) {
|
|
67
70
|
const existingOrError = resolveMember(input.member_id, input.member_name);
|
|
@@ -113,16 +116,14 @@ export async function updateMember(input) {
|
|
|
113
116
|
if (resolvedIcon !== undefined && !isValidIcon(resolvedIcon)) {
|
|
114
117
|
return `❌ Invalid icon "${input.icon}". Use a named alias (e.g., blue-circle, red-square, green-square) or a valid emoji.`;
|
|
115
118
|
}
|
|
116
|
-
// Resolve {{secure.NAME}} tokens in password field
|
|
119
|
+
// Resolve {{secret.NAME}} / legacy {{secure.NAME}} tokens in password field
|
|
117
120
|
let resolvedPassword = input.password;
|
|
121
|
+
let passwordLegacyNames = [];
|
|
118
122
|
if (resolvedPassword) {
|
|
119
|
-
const
|
|
120
|
-
let match;
|
|
123
|
+
const tokens = findSecretTokens(resolvedPassword);
|
|
121
124
|
let resolved = resolvedPassword;
|
|
122
|
-
const tokenNames = new Set();
|
|
123
|
-
|
|
124
|
-
tokenNames.add(match[1]);
|
|
125
|
-
}
|
|
125
|
+
const tokenNames = new Set(tokens.map((t) => t.name));
|
|
126
|
+
passwordLegacyNames = tokens.filter((t) => t.legacy).map((t) => t.name);
|
|
126
127
|
for (const name of tokenNames) {
|
|
127
128
|
const entry = credentialResolve(name, existing.friendlyName);
|
|
128
129
|
if (!entry)
|
|
@@ -131,9 +132,13 @@ export async function updateMember(input) {
|
|
|
131
132
|
return `❌ ${entry.denied} Member was NOT updated.`;
|
|
132
133
|
if ('expired' in entry)
|
|
133
134
|
return `❌ ${entry.expired} Member was NOT updated.`;
|
|
134
|
-
resolved = resolved.replaceAll(`{{
|
|
135
|
+
resolved = resolved.replaceAll(`{{secret.${name}}}`, entry.plaintext);
|
|
136
|
+
resolved = resolved.replaceAll(`{{secure.${name}}}`, entry.plaintext); // legacy spelling
|
|
135
137
|
}
|
|
136
138
|
resolvedPassword = resolved;
|
|
139
|
+
if (passwordLegacyNames.length > 0) {
|
|
140
|
+
logWarn('update_member', legacyTokenWarning(passwordLegacyNames), { id: existing.id, friendlyName: existing.friendlyName });
|
|
141
|
+
}
|
|
137
142
|
}
|
|
138
143
|
// Out-of-band password collection:
|
|
139
144
|
// - switchingToPassword: changing from key → password auth without inline password
|
|
@@ -149,6 +154,8 @@ export async function updateMember(input) {
|
|
|
149
154
|
}
|
|
150
155
|
const updates = {};
|
|
151
156
|
const warnings = [];
|
|
157
|
+
if (passwordLegacyNames.length > 0)
|
|
158
|
+
warnings.push(legacyTokenWarning(passwordLegacyNames));
|
|
152
159
|
// --- model_tiers normalization ---
|
|
153
160
|
if (input.model_tiers !== undefined) {
|
|
154
161
|
const values = Object.values(input.model_tiers).filter(Boolean);
|
|
@@ -195,6 +202,12 @@ export async function updateMember(input) {
|
|
|
195
202
|
updates.unreservable = input.unreservable;
|
|
196
203
|
if (input.shell !== undefined)
|
|
197
204
|
updates.shell = input.shell;
|
|
205
|
+
// Explicit operator override -- never auto-detected (that only happens in
|
|
206
|
+
// register_member). 'none' clears vcsProvider, matching how register_member
|
|
207
|
+
// records it (Agent.vcsProvider has no 'none' member -- see src/types.ts).
|
|
208
|
+
if (input.vcs_provider !== undefined) {
|
|
209
|
+
updates.vcsProvider = input.vcs_provider === 'none' ? undefined : input.vcs_provider;
|
|
210
|
+
}
|
|
198
211
|
if (input.model_cheap !== undefined)
|
|
199
212
|
updates.modelCheap = input.model_cheap;
|
|
200
213
|
if (input.model_standard !== undefined)
|
|
@@ -246,6 +259,19 @@ export async function updateMember(input) {
|
|
|
246
259
|
warnings.push(`Warning: cloud fields (${passedCloudFields.join(', ')}) are ignored for non-cloud members.`);
|
|
247
260
|
}
|
|
248
261
|
}
|
|
262
|
+
// Switching a member TO agy: create (or re-verify) its own agy project
|
|
263
|
+
// before recording the switch, so an agy member always has a bindable
|
|
264
|
+
// --project id. Evaluated on the resulting member (new host/folder/shell).
|
|
265
|
+
if (input.llm_provider === 'agy' && (existing.llmProvider ?? 'claude') !== 'agy') {
|
|
266
|
+
const preview = { ...existing, ...updates };
|
|
267
|
+
try {
|
|
268
|
+
const ensured = await ensureAgyProject(preview, { persist: false });
|
|
269
|
+
updates.agyProjectId = ensured.projectId;
|
|
270
|
+
}
|
|
271
|
+
catch (e) {
|
|
272
|
+
return `ERROR: could not create the agy project for "${existing.friendlyName}": ${e?.message ?? String(e)}\nMember was NOT updated.`;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
249
275
|
const updated = updateInRegistry(existing.id, updates);
|
|
250
276
|
if (!updated) {
|
|
251
277
|
return `Failed to update member "${existing.id}".`;
|
|
@@ -301,6 +327,12 @@ export async function updateMember(input) {
|
|
|
301
327
|
result += ` Auth: ${updated.authType}\n`;
|
|
302
328
|
}
|
|
303
329
|
result += ` Provider: ${updated.llmProvider ?? 'claude'}\n`;
|
|
330
|
+
if (updated.llmProvider === 'agy' && updated.agyProjectId) {
|
|
331
|
+
result += ` AGY project: ${updated.agyProjectId}\n`;
|
|
332
|
+
}
|
|
333
|
+
if (input.vcs_provider !== undefined) {
|
|
334
|
+
result += ` VCS Provider: ${updated.vcsProvider ?? 'none'}\n`;
|
|
335
|
+
}
|
|
304
336
|
if (updated.modelCheap)
|
|
305
337
|
result += ` Model Cheap: ${updated.modelCheap}\n`;
|
|
306
338
|
if (updated.modelStandard)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-member.js","sourceRoot":"","sources":["../../src/tools/update-member.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"update-member.js","sourceRoot":"","sources":["../../src/tools/update-member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAEtG,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,GAAG,gBAAgB;IACnB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;SACtB,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;SACd,KAAK,CAAC,mBAAmB,EAAE,sDAAsD,CAAC;SAClF,QAAQ,EAAE;SACV,QAAQ,CAAC,mBAAmB,CAAC;IAChC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;SACb,KAAK,CAAC,cAAc,EAAE,kDAAkD,CAAC;SACzE,QAAQ,EAAE;SACV,QAAQ,CAAC,gCAAgC,CAAC;IAC7C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,oCAAoC,CAAC;IAC1E,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wCAAwC,CAAC;IAClF,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,uCAAuC,CAAC;IACnG,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,oMAAoM,CAAC;IAC9O,eAAe,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAC9C,kFAAkF;UAChF,kGAAkG,CACrG;IACD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8FAA8F,CAAC;IACxI,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;SACpB,KAAK,CAAC,cAAc,EAAE,yDAAyD,CAAC;SAChF,QAAQ,EAAE;SACV,QAAQ,CAAC,4QAA4Q,CAAC;IACzR,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,kCAAkC,CAAC;IACvH,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wEAAwE,CAAC;IAC5H,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,iKAAiK,CAAC;IACvM,eAAe;IACf,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IACjF,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IACrE,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wCAAwC,CAAC;IAChG,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wGAAwG,CAAC;IAChK,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,0CAA0C,CAAC;IACvI,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,2BAA2B,CAAC;IAC1F,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8BAA8B,CAAC;IACnG,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC;IAChG,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;QACpB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC5B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC/B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAC/B,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,kJAAkJ,CAAC;IAC1K,UAAU,EAAE,CAAC,CAAC,UAAU,CACtB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAChC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CACvC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,0KAA0K,CAAC;IACjM,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sFAAsF,CAAC;IACxI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,yCAAyC,CAAC,CAAC;SACzE,GAAG,CAAC,EAAE,EAAE,6BAA6B,CAAC;SACtC,QAAQ,EAAE;SACV,QAAQ,CAAC,yIAAyI,CAAC;IACtJ,mBAAmB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wDAAwD,CAAC;IAClJ,YAAY,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,4PAA4P,CAAC;IAC3S,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8IAA8I,CAAC;IACtN,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,uXAAuX,CAAC;CACnd,CAAC,CAAC;AAIH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAwB;IACzD,MAAM,eAAe,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1E,IAAI,OAAO,eAAe,KAAK,QAAQ;QAAE,OAAO,eAAe,CAAC;IAChE,MAAM,QAAQ,GAAG,eAAwB,CAAC;IAE1C,2FAA2F;IAC3F,iFAAiF;IACjF,4FAA4F;IAC5F,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC;IAC7E,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC;IAC7E,MAAM,aAAa,GAAG,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,KAAK,CAAC,WAAW,KAAK,QAAQ,CAAC,UAAU,CAAC;IAEnG,wEAAwE;IACxE,0EAA0E;IAC1E,mEAAmE;IACnE,gFAAgF;IAChF,oEAAoE;IACpE,2EAA2E;IAC3E,wEAAwE;IACxE,IAAI,QAAQ,CAAC,SAAS,KAAK,OAAO,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;QAClH,OAAO,0BAA0B,CAAC,KAAK,CAAC,WAAW,EAAE,yBAAyB,CAAC,CAAC;IAClF,CAAC;IAED,mEAAmE;IACnE,4EAA4E;IAC5E,4EAA4E;IAC5E,4EAA4E;IAC5E,0EAA0E;IAC1E,oBAAoB;IACpB,MAAM,qBAAqB,GAAG,KAAK,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,IAAI,KAAK,CAAC;IACnF,MAAM,oBAAoB,GAAG,KAAK,CAAC,YAAY,IAAI,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC;IACpF,IAAI,qBAAqB,IAAI,oBAAoB,KAAK,MAAM,EAAE,CAAC;QAC7D,OAAO,mKAAmK,CAAC;IAC7K,CAAC;IAED,MAAM,oBAAoB,GAAG,QAAQ,CAAC,SAAS,KAAK,QAAQ;QAC1D,CAAC,CAAC,CAAC,WAAW,IAAI,WAAW,IAAI,aAAa,CAAC;QAC/C,CAAC,CAAC,aAAa,CAAC;IAElB,IAAI,oBAAoB,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC;QAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC;QAC5C,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,IAAI,QAAQ,CAAC,UAAU,CAAC;QAC3D,IAAI,kBAAkB,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;YACrF,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,OAAO,IAAI,OAAO,EAAE,CAAC;YAC7F,OAAO,yCAAyC,SAAS,QAAQ,KAAK,oBAAoB,CAAC;QAC7F,CAAC;IACH,CAAC;IAED,oEAAoE;IACpE,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEpF,4BAA4B;IAC5B,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7D,OAAO,mBAAmB,KAAK,CAAC,IAAI,sFAAsF,CAAC;IAC7H,CAAC;IAED,4EAA4E;IAC5E,IAAI,gBAAgB,GAAG,KAAK,CAAC,QAAQ,CAAC;IACtC,IAAI,mBAAmB,GAAa,EAAE,CAAC;IACvC,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QAClD,IAAI,QAAQ,GAAG,gBAAgB,CAAC;QAChC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxE,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;YAC7D,IAAI,CAAC,KAAK;gBAAE,OAAO,iBAAiB,IAAI,sEAAsE,CAAC;YAC/G,IAAI,QAAQ,IAAI,KAAK;gBAAE,OAAO,KAAK,KAAK,CAAC,MAAM,0BAA0B,CAAC;YAC1E,IAAI,SAAS,IAAI,KAAK;gBAAE,OAAO,KAAK,KAAK,CAAC,OAAO,0BAA0B,CAAC;YAC5E,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,YAAY,IAAI,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;YACtE,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,YAAY,IAAI,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB;QAC3F,CAAC;QACD,gBAAgB,GAAG,QAAQ,CAAC;QAC5B,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;QAC9H,CAAC;IACH,CAAC;IAED,mCAAmC;IACnC,mFAAmF;IACnF,uFAAuF;IACvF,IAAI,oBAAwC,CAAC;IAC7C,MAAM,mBAAmB,GAAG,KAAK,CAAC,SAAS,KAAK,UAAU,IAAI,QAAQ,CAAC,QAAQ,KAAK,UAAU,CAAC;IAC/F,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,IAAI,QAAQ,CAAC,QAAQ,KAAK,UAAU,CAAC;IACrF,IAAI,CAAC,mBAAmB,IAAI,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,IAAI,QAAQ,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;QACtG,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAC7E,IAAI,UAAU,IAAI,GAAG;YAAE,OAAO,GAAG,CAAC,QAAQ,IAAI,iCAAiC,CAAC;QAChF,oBAAoB,GAAG,GAAG,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC;QAAE,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAE3F,oCAAoC;IACpC,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,OAAO,CAAa,CAAC;QAC5E,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,yGAAyG,CAAC;QACnH,CAAC;QACD,IAAI,oBAA6E,CAAC;QAClF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,oBAAoB,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QACvF,CAAC;aAAM,CAAC;YACN,oBAAoB,GAAG,EAAE,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,QAAQ,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;YACpF,IAAI,CAAC,oBAAoB,CAAC,KAAK;gBAAE,oBAAoB,CAAC,KAAK,GAAG,QAAQ,CAAC;YACvE,IAAI,CAAC,oBAAoB,CAAC,QAAQ;gBAAE,oBAAoB,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC7E,IAAI,CAAC,oBAAoB,CAAC,OAAO;gBAAE,oBAAoB,CAAC,OAAO,GAAG,oBAAoB,CAAC,QAAQ,CAAC;QAClG,CAAC;QACD,OAAO,CAAC,UAAU,GAAG,oBAAoB,CAAC;QAE1C,iEAAiE;QACjE,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,MAAM,iBAAiB,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,CAAC;YACnF,IAAI,iBAAiB,KAAK,UAAU,EAAE,CAAC;gBACrC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,0BAA0B,CACjE,QAAQ,EACR,OAAO,CAAC,UAAqE,CAC9E,CAAC;gBACF,QAAQ,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,YAAY;QAAE,OAAO,CAAC,IAAI,GAAG,YAAY,CAAC;IAC9C,IAAI,KAAK,CAAC,aAAa;QAAE,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC;IACpE,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS;QAAE,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC;IAC/E,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;IACxF,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;IAC9F,IAAI,KAAK,CAAC,mBAAmB,KAAK,SAAS;QAAE,OAAO,CAAC,iBAAiB,GAAG,KAAK,CAAC,mBAAmB,CAAC;IACnG,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS;QAAE,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;IAChF,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;QAAE,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAC3D,0EAA0E;IAC1E,4EAA4E;IAC5E,2EAA2E;IAC3E,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACrC,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC;IACvF,CAAC;IACD,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS;QAAE,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;IAC5E,IAAI,KAAK,CAAC,cAAc,KAAK,SAAS;QAAE,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC,cAAc,CAAC;IACrF,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS;QAAE,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC;IAClF,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC;IACjH,IAAI,KAAK,CAAC,IAAI;QAAE,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAC1C,IAAI,KAAK,CAAC,IAAI;QAAE,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAC1C,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IACtD,IAAI,KAAK,CAAC,SAAS;QAAE,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC;IACxD,IAAI,oBAAoB,EAAE,CAAC;QACzB,OAAO,CAAC,iBAAiB,GAAG,oBAAoB,CAAC;IACnD,CAAC;SAAM,IAAI,gBAAgB,EAAE,CAAC;QAC5B,OAAO,CAAC,iBAAiB,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC;IACrD,IAAI,KAAK,CAAC,WAAW;QAAE,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;IAC9D,IAAI,KAAK,CAAC,UAAU;QAAE,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC;IAC3D,IAAI,KAAK,CAAC,SAAS;QAAE,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC;IAExD,wDAAwD;IACxD,MAAM,WAAW,GAAG,CAAC,cAAc,EAAE,eAAe,EAAE,wBAAwB,EAAE,wBAAwB,CAAU,CAAC;IACnH,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;IAE1E,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACnB,MAAM,YAAY,GAAG,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;YAC3C,IAAI,KAAK,CAAC,YAAY;gBAAE,YAAY,CAAC,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC;YACjE,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS;gBAAE,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC,aAAa,IAAI,SAAS,CAAC;YAC/F,IAAI,KAAK,CAAC,sBAAsB;gBAAE,YAAY,CAAC,cAAc,GAAG,KAAK,CAAC,sBAAsB,CAAC;YAC7F,IAAI,KAAK,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;gBAC/C,YAAY,CAAC,eAAe,GAAG,KAAK,CAAC,sBAAsB,IAAI,SAAS,CAAC;YAC3E,CAAC;YACD,OAAO,CAAC,KAAK,GAAG,YAAY,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,0BAA0B,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QAC9G,CAAC;IACH,CAAC;IAED,uEAAuE;IACvE,sEAAsE;IACtE,2EAA2E;IAC3E,IAAI,KAAK,CAAC,YAAY,KAAK,KAAK,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,KAAK,KAAK,EAAE,CAAC;QACjF,MAAM,OAAO,GAAU,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,EAAE,CAAC;QACnD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YACpE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;QAC3C,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,OAAO,gDAAgD,QAAQ,CAAC,YAAY,MAAM,CAAC,EAAE,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,2BAA2B,CAAC;QACvI,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,4BAA4B,QAAQ,CAAC,EAAE,IAAI,CAAC;IACrD,CAAC;IACD,OAAO,CAAC,eAAe,EAAE,MAAM,OAAO,CAAC,EAAE,SAAS,OAAO,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IACnF,eAAe,EAAE,CAAC;IAElB,4EAA4E;IAC5E,MAAM,eAAe,GAAG,WAAW,IAAI,WAAW;QAChD,KAAK,CAAC,QAAQ,KAAK,SAAS;QAC5B,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,gBAAgB,KAAK,SAAS;QAC/D,oBAAoB,KAAK,SAAS,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS;QAClE,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC;IACnC,IAAI,eAAe,EAAE,CAAC;QACpB,wBAAwB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,2DAA2D;IAC3D,iFAAiF;IACjF,iFAAiF;IACjF,gFAAgF;IAChF,gFAAgF;IAChF,4EAA4E;IAC5E,IAAI,oBAAgG,CAAC;IACrG,IAAI,OAAO,CAAC,SAAS,KAAK,QAAQ,IAAI,eAAe,CAAC,OAAO,CAAC,WAAW,IAAI,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;QAChG,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,QAAQ,CAAC,IAAI,CAAC,6DAA6D,IAAI,CAAC,KAAK,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAClH,CAAC;aAAM,CAAC;YACN,oBAAoB,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;YACtD,IAAI,oBAAoB,CAAC,OAAO;gBAAE,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAE9E,+EAA+E;YAC/E,0EAA0E;YAC1E,wEAAwE;YACxE,MAAM,kBAAkB,CAAC,OAAO,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;SAAM,IAAI,OAAO,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC1C,wFAAwF;QACxF,MAAM,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,MAAM,GAAG,aAAa,OAAO,CAAC,YAAY,gBAAgB,CAAC;IAC/D,MAAM,IAAI,cAAc,OAAO,CAAC,IAAI,IAAI,YAAY,IAAI,CAAC;IACzD,MAAM,IAAI,cAAc,OAAO,CAAC,EAAE,IAAI,CAAC;IACvC,MAAM,IAAI,cAAc,OAAO,CAAC,YAAY,IAAI,CAAC;IACjD,MAAM,IAAI,cAAc,OAAO,CAAC,SAAS,IAAI,CAAC;IAC9C,IAAI,OAAO,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;QACnC,MAAM,IAAI,cAAc,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC;IAC3D,CAAC;IACD,MAAM,IAAI,cAAc,OAAO,CAAC,UAAU,IAAI,CAAC;IAC/C,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,cAAc,OAAO,CAAC,QAAQ,IAAI,CAAC;IAC/C,CAAC;IACD,MAAM,IAAI,eAAe,OAAO,CAAC,WAAW,IAAI,QAAQ,IAAI,CAAC;IAC7D,IAAI,OAAO,CAAC,WAAW,KAAK,KAAK,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QAC1D,MAAM,IAAI,kBAAkB,OAAO,CAAC,YAAY,IAAI,CAAC;IACvD,CAAC;IACD,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACrC,MAAM,IAAI,mBAAmB,OAAO,CAAC,WAAW,IAAI,MAAM,IAAI,CAAC;IACjE,CAAC;IACD,IAAI,OAAO,CAAC,UAAU;QAAE,MAAM,IAAI,kBAAkB,OAAO,CAAC,UAAU,IAAI,CAAC;IAC3E,IAAI,OAAO,CAAC,aAAa;QAAE,MAAM,IAAI,qBAAqB,OAAO,CAAC,aAAa,IAAI,CAAC;IACpF,IAAI,OAAO,CAAC,YAAY;QAAE,MAAM,IAAI,oBAAoB,OAAO,CAAC,YAAY,IAAI,CAAC;IACjF,IAAI,oBAAoB,EAAE,CAAC;QACzB,IAAI,oBAAoB,CAAC,aAAa,EAAE,CAAC;YACvC,MAAM,IAAI,uBAAuB,oBAAoB,CAAC,aAAa,KAAK,CAAC;QAC3E,CAAC;aAAM,IAAI,oBAAoB,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,cAAc,oBAAoB,CAAC,MAAM,CAAC,MAAM,wBAAwB,CAAC;QACrF,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,yBAAyB,CAAC;QACtC,CAAC;IACH,CAAC;IACD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;QAC9B,MAAM,IAAI,wBAAwB,EAAE,CAAC,KAAK,IAAI,GAAG,aAAa,EAAE,CAAC,QAAQ,IAAI,GAAG,YAAY,EAAE,CAAC,OAAO,IAAI,GAAG,IAAI,CAAC;IACpH,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,IAAI,CAAC;QACf,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC;QACxB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
/**
|
|
3
|
+
* Server-side VCS credential handoff (apra-fleet-3swo.7.3).
|
|
4
|
+
*
|
|
5
|
+
* BEFORE: the only way an orchestrator-side caller could run a
|
|
6
|
+
* credential-requiring git/VCS command was to first LEARN the token --
|
|
7
|
+
* fleet-sprint's readMemberVcsCredentialToken dispatches the deployed
|
|
8
|
+
* git-credential-helper as a member command and parses `password=<token>` out
|
|
9
|
+
* of the captured stdout. Even dispatched with silent:true, the plaintext
|
|
10
|
+
* still round-trips through a command result the orchestrator reads.
|
|
11
|
+
*
|
|
12
|
+
* NOW: the caller sends the command it already builds (VCSModule's
|
|
13
|
+
* buildCreatePrCommand and friends) with a literal placeholder where the
|
|
14
|
+
* token belongs -- `{{vcs_token}}` for a bare reference or
|
|
15
|
+
* `{{vcs_token_inline}}` for one sitting inside the caller's own single
|
|
16
|
+
* quotes (apra-fleet-3swo.7.16; see VCS_TOKEN_INLINE_PLACEHOLDER below) --
|
|
17
|
+
* and the SERVER performs the whole handoff inside this one call:
|
|
18
|
+
*
|
|
19
|
+
* 1. runs the member's deployed credential helper through
|
|
20
|
+
* strategy.execCommand -- that output is consumed in-process and is
|
|
21
|
+
* NEVER part of this tool's result;
|
|
22
|
+
* 2. substitutes whichever placeholder(s) are present with the token,
|
|
23
|
+
* escaped for the member's OWN shell (the same isPosixShell branch
|
|
24
|
+
* execute_command uses for {{secret.NAME}}) -- `{{vcs_token}}` gets the
|
|
25
|
+
* fully-quoted form, `{{vcs_token_inline}}` gets the bare interior
|
|
26
|
+
* escaping with no quotes of its own;
|
|
27
|
+
* 3. dispatches the substituted command;
|
|
28
|
+
* 4. redacts any occurrence of the token from stdout/stderr before
|
|
29
|
+
* returning, the same defence execute-command.ts's redactOutput applies.
|
|
30
|
+
*
|
|
31
|
+
* The plaintext token therefore appears in no field of any result an
|
|
32
|
+
* orchestrator-side caller can read. readMemberVcsCredentialToken is
|
|
33
|
+
* deliberately left in place; retiring it is a separate task.
|
|
34
|
+
*/
|
|
35
|
+
/**
|
|
36
|
+
* Reference this one BARE (never inside your own quotes): the substituted
|
|
37
|
+
* value arrives ALREADY shell-escaped for the member's shell (quotes
|
|
38
|
+
* included), exactly like execute_command's {{secret.NAME}} tokens --
|
|
39
|
+
* wrapping it in the caller's own quotes double-escapes it and surfaces as a
|
|
40
|
+
* false 401 / invalid-token error.
|
|
41
|
+
*/
|
|
42
|
+
export declare const VCS_TOKEN_PLACEHOLDER = "{{vcs_token}}";
|
|
43
|
+
/**
|
|
44
|
+
* Reference this one INSIDE your own single quotes (e.g.
|
|
45
|
+
* `'Authorization: Bearer {{vcs_token_inline}}'`): the substituted value is
|
|
46
|
+
* escaped for the INTERIOR of a single-quoted string in the member's shell
|
|
47
|
+
* dialect and carries no quotes of its own, for callers (like VCSModule's
|
|
48
|
+
* provider command builders) that must interpolate the token into a larger
|
|
49
|
+
* already-quoted value rather than reference it as a free-standing word.
|
|
50
|
+
* Using `{{vcs_token}}` in that position double-escapes it the same way
|
|
51
|
+
* wrapping it in extra quotes would; use this placeholder there instead.
|
|
52
|
+
*
|
|
53
|
+
* Whether a given occurrence really sits inside the caller's open quotes is
|
|
54
|
+
* not reliably decidable from the command string alone, so this tool does
|
|
55
|
+
* not attempt to validate placement -- a heuristic here would produce false
|
|
56
|
+
* refusals. The contract is documented, not enforced (apra-fleet-3swo.7.16).
|
|
57
|
+
*/
|
|
58
|
+
export declare const VCS_TOKEN_INLINE_PLACEHOLDER = "{{vcs_token_inline}}";
|
|
59
|
+
export declare const vcsCredentialExecSchema: z.ZodObject<{
|
|
60
|
+
command: z.ZodString;
|
|
61
|
+
label: z.ZodOptional<z.ZodString>;
|
|
62
|
+
timeout_s: z.ZodOptional<z.ZodNumber>;
|
|
63
|
+
member_id: z.ZodOptional<z.ZodString>;
|
|
64
|
+
member_name: z.ZodOptional<z.ZodString>;
|
|
65
|
+
}, "strip", z.ZodTypeAny, {
|
|
66
|
+
command: string;
|
|
67
|
+
member_id?: string | undefined;
|
|
68
|
+
member_name?: string | undefined;
|
|
69
|
+
label?: string | undefined;
|
|
70
|
+
timeout_s?: number | undefined;
|
|
71
|
+
}, {
|
|
72
|
+
command: string;
|
|
73
|
+
member_id?: string | undefined;
|
|
74
|
+
member_name?: string | undefined;
|
|
75
|
+
label?: string | undefined;
|
|
76
|
+
timeout_s?: number | undefined;
|
|
77
|
+
}>;
|
|
78
|
+
export type VcsCredentialExecInput = z.infer<typeof vcsCredentialExecSchema>;
|
|
79
|
+
export type VcsCredentialExecReason =
|
|
80
|
+
/** The command ran (inspect exitCode for its own success). */
|
|
81
|
+
'ok'
|
|
82
|
+
/** No member matched member_id/member_name. */
|
|
83
|
+
| 'member_not_found'
|
|
84
|
+
/** `command` contained neither {{vcs_token}} nor {{vcs_token_inline}}. */
|
|
85
|
+
| 'placeholder_missing'
|
|
86
|
+
/** This member's OS/shell has no credential-read implementation. */
|
|
87
|
+
| 'unsupported_member_os'
|
|
88
|
+
/** Running the credential helper on the member failed. */
|
|
89
|
+
| 'credential_read_failed'
|
|
90
|
+
/** The helper ran but printed no usable password= line. */
|
|
91
|
+
| 'credential_empty'
|
|
92
|
+
/** Dispatching the credential-requiring command threw. */
|
|
93
|
+
| 'dispatch_failed';
|
|
94
|
+
interface VcsCredentialExecFields {
|
|
95
|
+
/** True when the credential-requiring command was dispatched. Read exitCode for its outcome. */
|
|
96
|
+
ok: boolean;
|
|
97
|
+
/** Machine-readable outcome code. Branch on this, never on `text`. */
|
|
98
|
+
reason: VcsCredentialExecReason;
|
|
99
|
+
/** Exit code of the dispatched command, or null when it never ran. */
|
|
100
|
+
exitCode: number | null;
|
|
101
|
+
/** Command stdout with every occurrence of the credential redacted. */
|
|
102
|
+
stdout: string;
|
|
103
|
+
/** Command stderr with every occurrence of the credential redacted. */
|
|
104
|
+
stderr: string;
|
|
105
|
+
/**
|
|
106
|
+
* How many times the credential had to be redacted out of stdout+stderr.
|
|
107
|
+
* Normally 0; a nonzero count means the dispatched command echoed its own
|
|
108
|
+
* credential back and the redaction earned its keep.
|
|
109
|
+
*/
|
|
110
|
+
tokenRedactions: number;
|
|
111
|
+
/** Credential label used, or null for the unlabelled helper. */
|
|
112
|
+
credentialLabel: string | null;
|
|
113
|
+
/** Registry id of the resolved member, or null. */
|
|
114
|
+
memberId: string | null;
|
|
115
|
+
/** Friendly name of the resolved member, or null. */
|
|
116
|
+
memberName: string | null;
|
|
117
|
+
}
|
|
118
|
+
export interface VcsCredentialExecStructured extends VcsCredentialExecFields {
|
|
119
|
+
[key: string]: unknown;
|
|
120
|
+
}
|
|
121
|
+
export interface VcsCredentialExecResult {
|
|
122
|
+
text: string;
|
|
123
|
+
structuredContent: VcsCredentialExecStructured;
|
|
124
|
+
}
|
|
125
|
+
export declare function vcsCredentialExec(input: VcsCredentialExecInput): Promise<VcsCredentialExecResult>;
|
|
126
|
+
export {};
|
|
127
|
+
//# sourceMappingURL=vcs-credential-exec.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vcs-credential-exec.d.ts","sourceRoot":"","sources":["../../src/tools/vcs-credential-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,kBAAkB,CAAC;AAErD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,4BAA4B,yBAAyB,CAAC;AAEnE,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;EAmBlC,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAE7E,MAAM,MAAM,uBAAuB;AACjC,8DAA8D;AAC5D,IAAI;AACN,+CAA+C;GAC7C,kBAAkB;AACpB,0EAA0E;GACxE,qBAAqB;AACvB,oEAAoE;GAClE,uBAAuB;AACzB,0DAA0D;GACxD,wBAAwB;AAC1B,2DAA2D;GACzD,kBAAkB;AACpB,0DAA0D;GACxD,iBAAiB,CAAC;AAEtB,UAAU,uBAAuB;IAC/B,gGAAgG;IAChG,EAAE,EAAE,OAAO,CAAC;IACZ,sEAAsE;IACtE,MAAM,EAAE,uBAAuB,CAAC;IAChC,sEAAsE;IACtE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,uEAAuE;IACvE,MAAM,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB,gEAAgE;IAChE,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,mDAAmD;IACnD,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,qDAAqD;IACrD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,2BAA4B,SAAQ,uBAAuB;IAC1E,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,2BAA2B,CAAC;CAChD;AA+BD,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAuHvG"}
|
|
@@ -0,0 +1,197 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { getStrategy } from '../services/strategy.js';
|
|
3
|
+
import { getOsCommands } from '../os/index.js';
|
|
4
|
+
import { getAgentOS, getAgentShell, isPosixShell } from '../utils/agent-helpers.js';
|
|
5
|
+
import { memberIdentifier, resolveMember } from '../utils/resolve-member.js';
|
|
6
|
+
import { escapeShellArg, escapePowerShellArg, escapeShellArgInner, escapePowerShellArgInner } from '../utils/shell-escape.js';
|
|
7
|
+
import { logLine } from '../utils/log-helpers.js';
|
|
8
|
+
/**
|
|
9
|
+
* Server-side VCS credential handoff (apra-fleet-3swo.7.3).
|
|
10
|
+
*
|
|
11
|
+
* BEFORE: the only way an orchestrator-side caller could run a
|
|
12
|
+
* credential-requiring git/VCS command was to first LEARN the token --
|
|
13
|
+
* fleet-sprint's readMemberVcsCredentialToken dispatches the deployed
|
|
14
|
+
* git-credential-helper as a member command and parses `password=<token>` out
|
|
15
|
+
* of the captured stdout. Even dispatched with silent:true, the plaintext
|
|
16
|
+
* still round-trips through a command result the orchestrator reads.
|
|
17
|
+
*
|
|
18
|
+
* NOW: the caller sends the command it already builds (VCSModule's
|
|
19
|
+
* buildCreatePrCommand and friends) with a literal placeholder where the
|
|
20
|
+
* token belongs -- `{{vcs_token}}` for a bare reference or
|
|
21
|
+
* `{{vcs_token_inline}}` for one sitting inside the caller's own single
|
|
22
|
+
* quotes (apra-fleet-3swo.7.16; see VCS_TOKEN_INLINE_PLACEHOLDER below) --
|
|
23
|
+
* and the SERVER performs the whole handoff inside this one call:
|
|
24
|
+
*
|
|
25
|
+
* 1. runs the member's deployed credential helper through
|
|
26
|
+
* strategy.execCommand -- that output is consumed in-process and is
|
|
27
|
+
* NEVER part of this tool's result;
|
|
28
|
+
* 2. substitutes whichever placeholder(s) are present with the token,
|
|
29
|
+
* escaped for the member's OWN shell (the same isPosixShell branch
|
|
30
|
+
* execute_command uses for {{secret.NAME}}) -- `{{vcs_token}}` gets the
|
|
31
|
+
* fully-quoted form, `{{vcs_token_inline}}` gets the bare interior
|
|
32
|
+
* escaping with no quotes of its own;
|
|
33
|
+
* 3. dispatches the substituted command;
|
|
34
|
+
* 4. redacts any occurrence of the token from stdout/stderr before
|
|
35
|
+
* returning, the same defence execute-command.ts's redactOutput applies.
|
|
36
|
+
*
|
|
37
|
+
* The plaintext token therefore appears in no field of any result an
|
|
38
|
+
* orchestrator-side caller can read. readMemberVcsCredentialToken is
|
|
39
|
+
* deliberately left in place; retiring it is a separate task.
|
|
40
|
+
*/
|
|
41
|
+
/**
|
|
42
|
+
* Reference this one BARE (never inside your own quotes): the substituted
|
|
43
|
+
* value arrives ALREADY shell-escaped for the member's shell (quotes
|
|
44
|
+
* included), exactly like execute_command's {{secret.NAME}} tokens --
|
|
45
|
+
* wrapping it in the caller's own quotes double-escapes it and surfaces as a
|
|
46
|
+
* false 401 / invalid-token error.
|
|
47
|
+
*/
|
|
48
|
+
export const VCS_TOKEN_PLACEHOLDER = '{{vcs_token}}';
|
|
49
|
+
/**
|
|
50
|
+
* Reference this one INSIDE your own single quotes (e.g.
|
|
51
|
+
* `'Authorization: Bearer {{vcs_token_inline}}'`): the substituted value is
|
|
52
|
+
* escaped for the INTERIOR of a single-quoted string in the member's shell
|
|
53
|
+
* dialect and carries no quotes of its own, for callers (like VCSModule's
|
|
54
|
+
* provider command builders) that must interpolate the token into a larger
|
|
55
|
+
* already-quoted value rather than reference it as a free-standing word.
|
|
56
|
+
* Using `{{vcs_token}}` in that position double-escapes it the same way
|
|
57
|
+
* wrapping it in extra quotes would; use this placeholder there instead.
|
|
58
|
+
*
|
|
59
|
+
* Whether a given occurrence really sits inside the caller's open quotes is
|
|
60
|
+
* not reliably decidable from the command string alone, so this tool does
|
|
61
|
+
* not attempt to validate placement -- a heuristic here would produce false
|
|
62
|
+
* refusals. The contract is documented, not enforced (apra-fleet-3swo.7.16).
|
|
63
|
+
*/
|
|
64
|
+
export const VCS_TOKEN_INLINE_PLACEHOLDER = '{{vcs_token_inline}}';
|
|
65
|
+
export const vcsCredentialExecSchema = z.object({
|
|
66
|
+
...memberIdentifier,
|
|
67
|
+
command: z.string().min(1).describe('The credential-requiring command to run on the member. MUST contain at least one of two '
|
|
68
|
+
+ 'placeholders where the credential belongs: {{vcs_token}}, referenced BARE (never inside your '
|
|
69
|
+
+ 'own quotes) -- the server substitutes it with the value already escaped AND quoted for the '
|
|
70
|
+
+ 'member\'s shell; or {{vcs_token_inline}}, referenced INSIDE your own single quotes -- the '
|
|
71
|
+
+ 'server substitutes it with the value escaped for the interior of a single-quoted string, with '
|
|
72
|
+
+ 'no quotes of its own (use this one when the token must be interpolated into a larger quoted '
|
|
73
|
+
+ 'value, e.g. an Authorization header). Both may appear in the same command. '
|
|
74
|
+
+ 'The plaintext credential never leaves the server and never appears in this tool\'s result.'),
|
|
75
|
+
label: z.string().regex(/^[a-zA-Z0-9._-]{1,64}$/).optional().describe('Credential label the helper was deployed under by provision_vcs_auth (defaults to the '
|
|
76
|
+
+ 'provider name there, e.g. "github" or "azure-devops"). Omit to use the unlabelled helper.'),
|
|
77
|
+
timeout_s: z.number().int().positive().max(600).optional().describe('Timeout in seconds for the credential-requiring command (default: 120).'),
|
|
78
|
+
});
|
|
79
|
+
const REDACTION = '[REDACTED:vcs_token]';
|
|
80
|
+
function execResult(text, fields) {
|
|
81
|
+
return {
|
|
82
|
+
text,
|
|
83
|
+
structuredContent: {
|
|
84
|
+
ok: fields.ok ?? fields.reason === 'ok',
|
|
85
|
+
reason: fields.reason,
|
|
86
|
+
exitCode: fields.exitCode ?? null,
|
|
87
|
+
stdout: fields.stdout ?? '',
|
|
88
|
+
stderr: fields.stderr ?? '',
|
|
89
|
+
tokenRedactions: fields.tokenRedactions ?? 0,
|
|
90
|
+
credentialLabel: fields.credentialLabel ?? null,
|
|
91
|
+
memberId: fields.memberId ?? null,
|
|
92
|
+
memberName: fields.memberName ?? null,
|
|
93
|
+
},
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
/** Replace every occurrence of `secret` in `output`, and report how many. */
|
|
97
|
+
function redactToken(output, secret) {
|
|
98
|
+
if (!secret)
|
|
99
|
+
return { text: output, count: 0 };
|
|
100
|
+
const parts = output.split(secret);
|
|
101
|
+
return { text: parts.join(REDACTION), count: parts.length - 1 };
|
|
102
|
+
}
|
|
103
|
+
export async function vcsCredentialExec(input) {
|
|
104
|
+
const agentOrError = resolveMember(input.member_id, input.member_name);
|
|
105
|
+
if (typeof agentOrError === 'string') {
|
|
106
|
+
return execResult(agentOrError, {
|
|
107
|
+
reason: 'member_not_found',
|
|
108
|
+
memberId: input.member_id ?? null,
|
|
109
|
+
memberName: input.member_name ?? null,
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
const agent = agentOrError;
|
|
113
|
+
const who = { memberId: agent.id, memberName: agent.friendlyName, credentialLabel: input.label ?? null };
|
|
114
|
+
// Refusing a command with neither placeholder is what keeps this tool a
|
|
115
|
+
// credential handoff rather than a second, unguarded execute_command.
|
|
116
|
+
const hasBare = input.command.includes(VCS_TOKEN_PLACEHOLDER);
|
|
117
|
+
const hasInline = input.command.includes(VCS_TOKEN_INLINE_PLACEHOLDER);
|
|
118
|
+
if (!hasBare && !hasInline) {
|
|
119
|
+
return execResult(`[FAIL] command must contain ${VCS_TOKEN_PLACEHOLDER} or ${VCS_TOKEN_INLINE_PLACEHOLDER} -- use execute_command for a command that needs no credential.`, { ...who, reason: 'placeholder_missing' });
|
|
120
|
+
}
|
|
121
|
+
const agentOs = getAgentOS(agent);
|
|
122
|
+
const agentShell = getAgentShell(agent);
|
|
123
|
+
const cmds = getOsCommands(agentOs, agentShell);
|
|
124
|
+
const strategy = getStrategy(agent);
|
|
125
|
+
// A member OS/shell with no credential-read implementation is a HARD
|
|
126
|
+
// failure with a surfaced error, never an advisory warning that lets the
|
|
127
|
+
// caller proceed credential-less.
|
|
128
|
+
let read;
|
|
129
|
+
try {
|
|
130
|
+
read = cmds.gitCredentialHelperRead(input.label);
|
|
131
|
+
}
|
|
132
|
+
catch (err) {
|
|
133
|
+
return execResult(`[FAIL] Cannot read a VCS credential on "${agent.friendlyName}" (os=${agentOs} shell=${agentShell ?? 'default'}): ${err.message}`, { ...who, reason: 'unsupported_member_os' });
|
|
134
|
+
}
|
|
135
|
+
// STEP 1 -- read the credential SERVER-SIDE. This result is consumed
|
|
136
|
+
// in-process and is never placed in the payload returned below.
|
|
137
|
+
let token = '';
|
|
138
|
+
try {
|
|
139
|
+
const readRes = await strategy.execCommand(read.command, 15000);
|
|
140
|
+
if (readRes.code !== 0) {
|
|
141
|
+
return execResult(`[FAIL] Failed to read the VCS credential for "${agent.friendlyName}" from '${read.path}' (exit ${readRes.code}).`, { ...who, reason: 'credential_read_failed', exitCode: readRes.code });
|
|
142
|
+
}
|
|
143
|
+
const m = /^password=(.*)$/m.exec(readRes.stdout || '');
|
|
144
|
+
token = m ? m[1].trim() : '';
|
|
145
|
+
}
|
|
146
|
+
catch (err) {
|
|
147
|
+
return execResult(`[FAIL] Failed to read the VCS credential for "${agent.friendlyName}" from '${read.path}': ${err.message}`, { ...who, reason: 'credential_read_failed' });
|
|
148
|
+
}
|
|
149
|
+
if (!token) {
|
|
150
|
+
return execResult(`[FAIL] The VCS credential for "${agent.friendlyName}" was empty or unreadable (expected a 'password=' line from '${read.path}'). Re-run provision_vcs_auth.`, { ...who, reason: 'credential_empty' });
|
|
151
|
+
}
|
|
152
|
+
// STEP 2 -- substitute, escaped for the member's OWN shell. A Windows
|
|
153
|
+
// member registered with shell=gitbash runs bash, so it needs POSIX
|
|
154
|
+
// escaping even though its OS is windows; isPosixShell owns that decision
|
|
155
|
+
// for every consumer. The bare placeholder gets the fully-quoted form; the
|
|
156
|
+
// inline placeholder gets the SAME dialect's interior-only escaping, with
|
|
157
|
+
// no wrapping quotes of its own, so it composes inside the caller's
|
|
158
|
+
// already-open single quotes instead of double-escaping.
|
|
159
|
+
const posix = isPosixShell(agentOs, agentShell);
|
|
160
|
+
const escaped = posix ? escapeShellArg(token) : escapePowerShellArg(token);
|
|
161
|
+
const escapedInline = posix ? escapeShellArgInner(token) : escapePowerShellArgInner(token);
|
|
162
|
+
const finalCommand = input.command
|
|
163
|
+
.replaceAll(VCS_TOKEN_PLACEHOLDER, escaped)
|
|
164
|
+
.replaceAll(VCS_TOKEN_INLINE_PLACEHOLDER, escapedInline);
|
|
165
|
+
// STEP 3 -- dispatch. Only the log-safe form (placeholder still in place) is
|
|
166
|
+
// ever logged; `finalCommand` is never written anywhere.
|
|
167
|
+
logLine('vcs_credential_exec', `label=${input.label ?? '(default)'} command=${input.command.slice(0, 120)}`, agent);
|
|
168
|
+
let code;
|
|
169
|
+
let stdout;
|
|
170
|
+
let stderr;
|
|
171
|
+
try {
|
|
172
|
+
const res = await strategy.execCommand(finalCommand, (input.timeout_s ?? 120) * 1000);
|
|
173
|
+
code = res.code;
|
|
174
|
+
stdout = res.stdout ?? '';
|
|
175
|
+
stderr = res.stderr ?? '';
|
|
176
|
+
}
|
|
177
|
+
catch (err) {
|
|
178
|
+
// The thrown message can quote the command that failed, so it is redacted
|
|
179
|
+
// on the same footing as stdout/stderr.
|
|
180
|
+
const redactedErr = redactToken(String(err?.message ?? err), token);
|
|
181
|
+
return execResult(`[FAIL] Command dispatch failed on "${agent.friendlyName}": ${redactedErr.text}`, { ...who, reason: 'dispatch_failed', stderr: redactedErr.text, tokenRedactions: redactedErr.count });
|
|
182
|
+
}
|
|
183
|
+
// STEP 4 -- defence in depth: the command itself may echo the credential
|
|
184
|
+
// back (a curl -v, a git error quoting the remote URL), so scrub both
|
|
185
|
+
// streams before anything is returned.
|
|
186
|
+
const outRedacted = redactToken(stdout, token);
|
|
187
|
+
const errRedacted = redactToken(stderr, token);
|
|
188
|
+
return execResult(`[OK] Ran credential-requiring command on "${agent.friendlyName}" (exit ${code}).`, {
|
|
189
|
+
...who,
|
|
190
|
+
reason: 'ok',
|
|
191
|
+
exitCode: code,
|
|
192
|
+
stdout: outRedacted.text,
|
|
193
|
+
stderr: errRedacted.text,
|
|
194
|
+
tokenRedactions: outRedacted.count + errRedacted.count,
|
|
195
|
+
});
|
|
196
|
+
}
|
|
197
|
+
//# sourceMappingURL=vcs-credential-exec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vcs-credential-exec.js","sourceRoot":"","sources":["../../src/tools/vcs-credential-exec.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -33,7 +33,20 @@ export interface Agent {
|
|
|
33
33
|
gitRepos?: string[];
|
|
34
34
|
vcsProvider?: 'github' | 'bitbucket' | 'azure-devops';
|
|
35
35
|
vcsTokenExpiresAt?: string;
|
|
36
|
+
/** The label/scopeUrl actually used for the LAST provision_vcs_auth deploy
|
|
37
|
+
* on this agent. scheduleCredentialCleanup's timer reads these back so the
|
|
38
|
+
* eventual revoke targets the exact same credential-helper file/config-key
|
|
39
|
+
* pair the deploy wrote, instead of guessing at unlabeled/default-host
|
|
40
|
+
* values that may belong to a different, still-valid credential. */
|
|
41
|
+
vcsCredentialLabel?: string;
|
|
42
|
+
vcsCredentialScopeUrl?: string;
|
|
36
43
|
llmProvider?: LlmProvider;
|
|
44
|
+
/** AGY only: id of the member's own agy project (~/.gemini/config/projects/<id>.json),
|
|
45
|
+
* created by `agy --new-project` and passed as `--project <id>` on every dispatch.
|
|
46
|
+
* compose_permissions writes the member's grants into that file. Absent for
|
|
47
|
+
* members registered before project binding; provisioned on their next
|
|
48
|
+
* compose_permissions or execute_prompt. */
|
|
49
|
+
agyProjectId?: string;
|
|
37
50
|
modelCheap?: string;
|
|
38
51
|
modelStandard?: string;
|
|
39
52
|
modelPremium?: string;
|