@apralabs/apra-fleet 0.4.1 → 0.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +53 -12
- package/dist/agents/backlog-groomer.md +42 -21
- package/dist/agents/ci-watcher.md +14 -0
- package/dist/agents/deployer.md +59 -46
- package/dist/agents/doer.md +157 -134
- package/dist/agents/harvester.md +31 -32
- package/dist/agents/integ-test-runner.md +92 -113
- package/dist/agents/kb-reconciler.md +40 -42
- package/dist/agents/plan-reviewer.md +139 -63
- package/dist/agents/planner.md +176 -100
- package/dist/agents/regression-test-runner.md +77 -81
- package/dist/agents/reviewer.md +69 -85
- package/dist/agents/schemas/integ-test-runner-output.json +1 -1
- package/dist/agents/schemas/plan-reviewer-output.json +37 -0
- package/dist/agents/schemas/regression-test-runner-output.json +4 -17
- package/dist/cli/agent-transform.d.ts +83 -2
- package/dist/cli/agent-transform.d.ts.map +1 -1
- package/dist/cli/agent-transform.js +266 -21
- package/dist/cli/agent-transform.js.map +1 -1
- package/dist/cli/auth.d.ts.map +1 -1
- package/dist/cli/auth.js +29 -11
- package/dist/cli/auth.js.map +1 -1
- package/dist/cli/config.d.ts +7 -5
- package/dist/cli/config.d.ts.map +1 -1
- package/dist/cli/config.js +44 -43
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/install.d.ts +33 -0
- package/dist/cli/install.d.ts.map +1 -1
- package/dist/cli/install.js +294 -61
- package/dist/cli/install.js.map +1 -1
- package/dist/cli/kb-directives.d.ts.map +1 -1
- package/dist/cli/kb-directives.js +2 -1
- package/dist/cli/kb-directives.js.map +1 -1
- package/dist/cli/register-member.d.ts.map +1 -1
- package/dist/cli/register-member.js +7 -3
- package/dist/cli/register-member.js.map +1 -1
- package/dist/cli/start.d.ts.map +1 -1
- package/dist/cli/start.js +7 -0
- package/dist/cli/start.js.map +1 -1
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +5 -3
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/watch.d.ts +26 -3
- package/dist/cli/watch.d.ts.map +1 -1
- package/dist/cli/watch.js +41 -9
- package/dist/cli/watch.js.map +1 -1
- package/dist/commands/kb-server.d.ts +3 -0
- package/dist/commands/kb-server.d.ts.map +1 -1
- package/dist/commands/kb-server.js +43 -3
- package/dist/commands/kb-server.js.map +1 -1
- package/dist/index.js +3 -3
- package/dist/os/git-bash-candidates.d.ts +35 -0
- package/dist/os/git-bash-candidates.d.ts.map +1 -0
- package/dist/os/git-bash-candidates.js +46 -0
- package/dist/os/git-bash-candidates.js.map +1 -0
- package/dist/os/index.d.ts +13 -4
- package/dist/os/index.d.ts.map +1 -1
- package/dist/os/index.js +17 -2
- package/dist/os/index.js.map +1 -1
- package/dist/os/linux.d.ts +6 -0
- package/dist/os/linux.d.ts.map +1 -1
- package/dist/os/linux.js +36 -3
- package/dist/os/linux.js.map +1 -1
- package/dist/os/os-commands.d.ts +68 -2
- package/dist/os/os-commands.d.ts.map +1 -1
- package/dist/os/os-commands.js.map +1 -1
- package/dist/os/windows-gitbash.d.ts +98 -0
- package/dist/os/windows-gitbash.d.ts.map +1 -0
- package/dist/os/windows-gitbash.js +259 -0
- package/dist/os/windows-gitbash.js.map +1 -0
- package/dist/os/windows.d.ts +6 -0
- package/dist/os/windows.d.ts.map +1 -1
- package/dist/os/windows.js +73 -8
- package/dist/os/windows.js.map +1 -1
- package/dist/providers/agy.d.ts +118 -8
- package/dist/providers/agy.d.ts.map +1 -1
- package/dist/providers/agy.js +580 -55
- package/dist/providers/agy.js.map +1 -1
- package/dist/providers/claude.d.ts +83 -4
- package/dist/providers/claude.d.ts.map +1 -1
- package/dist/providers/claude.js +365 -12
- package/dist/providers/claude.js.map +1 -1
- package/dist/providers/codex.d.ts +7 -4
- package/dist/providers/codex.d.ts.map +1 -1
- package/dist/providers/codex.js +24 -4
- package/dist/providers/codex.js.map +1 -1
- package/dist/providers/copilot.d.ts +7 -4
- package/dist/providers/copilot.d.ts.map +1 -1
- package/dist/providers/copilot.js +27 -4
- package/dist/providers/copilot.js.map +1 -1
- package/dist/providers/index.d.ts +0 -1
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +0 -3
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/none.d.ts +7 -4
- package/dist/providers/none.d.ts.map +1 -1
- package/dist/providers/none.js +22 -4
- package/dist/providers/none.js.map +1 -1
- package/dist/providers/opencode.d.ts +6 -3
- package/dist/providers/opencode.d.ts.map +1 -1
- package/dist/providers/opencode.js +27 -4
- package/dist/providers/opencode.js.map +1 -1
- package/dist/providers/provider.d.ts +215 -11
- package/dist/providers/provider.d.ts.map +1 -1
- package/dist/providers/provider.js +58 -2
- package/dist/providers/provider.js.map +1 -1
- package/dist/services/agent-provisioner.js +2 -2
- package/dist/services/agent-provisioner.js.map +1 -1
- package/dist/services/agy-project.d.ts +102 -0
- package/dist/services/agy-project.d.ts.map +1 -0
- package/dist/services/agy-project.js +356 -0
- package/dist/services/agy-project.js.map +1 -0
- package/dist/services/auth-socket.js +4 -4
- package/dist/services/auth-web.js +1 -1
- package/dist/services/cloud/activity.js +2 -2
- package/dist/services/cloud/activity.js.map +1 -1
- package/dist/services/cloud/lifecycle.d.ts.map +1 -1
- package/dist/services/cloud/lifecycle.js +33 -4
- package/dist/services/cloud/lifecycle.js.map +1 -1
- package/dist/services/context-admission.d.ts.map +1 -1
- package/dist/services/context-admission.js +9 -7
- package/dist/services/context-admission.js.map +1 -1
- package/dist/services/credential-cleanup.d.ts.map +1 -1
- package/dist/services/credential-cleanup.js +47 -10
- package/dist/services/credential-cleanup.js.map +1 -1
- package/dist/services/exit-drain.d.ts +44 -0
- package/dist/services/exit-drain.d.ts.map +1 -0
- package/dist/services/exit-drain.js +52 -0
- package/dist/services/exit-drain.js.map +1 -0
- package/dist/services/github-app.d.ts.map +1 -1
- package/dist/services/github-app.js +32 -4
- package/dist/services/github-app.js.map +1 -1
- package/dist/services/http-transport.d.ts +1 -0
- package/dist/services/http-transport.d.ts.map +1 -1
- package/dist/services/http-transport.js +48 -1
- package/dist/services/http-transport.js.map +1 -1
- package/dist/services/knowledge/kb-config.d.ts +42 -0
- package/dist/services/knowledge/kb-config.d.ts.map +1 -0
- package/dist/services/knowledge/kb-config.js +54 -0
- package/dist/services/knowledge/kb-config.js.map +1 -0
- package/dist/services/knowledge/kb-providers.d.ts +7 -1
- package/dist/services/knowledge/kb-providers.d.ts.map +1 -1
- package/dist/services/knowledge/kb-providers.js +191 -17
- package/dist/services/knowledge/kb-providers.js.map +1 -1
- package/dist/services/knowledge/require-sqlite-project.d.ts +32 -0
- package/dist/services/knowledge/require-sqlite-project.d.ts.map +1 -0
- package/dist/services/knowledge/require-sqlite-project.js +38 -0
- package/dist/services/knowledge/require-sqlite-project.js.map +1 -0
- package/dist/services/member-home.d.ts +1 -1
- package/dist/services/member-home.d.ts.map +1 -1
- package/dist/services/member-home.js +15 -12
- package/dist/services/member-home.js.map +1 -1
- package/dist/services/model-pricing.d.ts.map +1 -1
- package/dist/services/model-pricing.js +7 -8
- package/dist/services/model-pricing.js.map +1 -1
- package/dist/services/orphan-recovery.d.ts +6 -3
- package/dist/services/orphan-recovery.d.ts.map +1 -1
- package/dist/services/orphan-recovery.js +17 -14
- package/dist/services/orphan-recovery.js.map +1 -1
- package/dist/services/preflight-check.js +2 -2
- package/dist/services/preflight-check.js.map +1 -1
- package/dist/services/secret-token.d.ts +38 -0
- package/dist/services/secret-token.d.ts.map +1 -0
- package/dist/services/secret-token.js +51 -0
- package/dist/services/secret-token.js.map +1 -0
- package/dist/services/service-manager/types.d.ts +3 -1
- package/dist/services/service-manager/types.d.ts.map +1 -1
- package/dist/services/service-manager/windows.d.ts +14 -2
- package/dist/services/service-manager/windows.d.ts.map +1 -1
- package/dist/services/service-manager/windows.js +65 -7
- package/dist/services/service-manager/windows.js.map +1 -1
- package/dist/services/shell-probe.d.ts +131 -0
- package/dist/services/shell-probe.d.ts.map +1 -0
- package/dist/services/shell-probe.js +210 -0
- package/dist/services/shell-probe.js.map +1 -0
- package/dist/services/singleton.d.ts +2 -0
- package/dist/services/singleton.d.ts.map +1 -1
- package/dist/services/singleton.js +1 -1
- package/dist/services/singleton.js.map +1 -1
- package/dist/services/ssh.d.ts.map +1 -1
- package/dist/services/ssh.js +60 -4
- package/dist/services/ssh.js.map +1 -1
- package/dist/services/stall/find-log-file.d.ts.map +1 -1
- package/dist/services/stall/find-log-file.js +22 -16
- package/dist/services/stall/find-log-file.js.map +1 -1
- package/dist/services/stall/read-log-tail.d.ts.map +1 -1
- package/dist/services/stall/read-log-tail.js +26 -15
- package/dist/services/stall/read-log-tail.js.map +1 -1
- package/dist/services/stall/stall-detector.d.ts +53 -4
- package/dist/services/stall/stall-detector.d.ts.map +1 -1
- package/dist/services/stall/stall-detector.js +212 -34
- package/dist/services/stall/stall-detector.js.map +1 -1
- package/dist/services/stall/stall-poller.d.ts.map +1 -1
- package/dist/services/stall/stall-poller.js +35 -42
- package/dist/services/stall/stall-poller.js.map +1 -1
- package/dist/services/strategy.d.ts +9 -0
- package/dist/services/strategy.d.ts.map +1 -1
- package/dist/services/strategy.js +119 -8
- package/dist/services/strategy.js.map +1 -1
- package/dist/services/substitution-engine.js +2 -2
- package/dist/services/substitution-engine.js.map +1 -1
- package/dist/services/tool-registry.d.ts.map +1 -1
- package/dist/services/tool-registry.js +5 -3
- package/dist/services/tool-registry.js.map +1 -1
- package/dist/services/user-config.js +1 -1
- package/dist/services/user-config.js.map +1 -1
- package/dist/services/vcs/azure-devops.d.ts +67 -2
- package/dist/services/vcs/azure-devops.d.ts.map +1 -1
- package/dist/services/vcs/azure-devops.js +281 -15
- package/dist/services/vcs/azure-devops.js.map +1 -1
- package/dist/services/vcs/bitbucket.d.ts.map +1 -1
- package/dist/services/vcs/bitbucket.js +16 -0
- package/dist/services/vcs/bitbucket.js.map +1 -1
- package/dist/services/vcs/github.d.ts.map +1 -1
- package/dist/services/vcs/github.js +24 -0
- package/dist/services/vcs/github.js.map +1 -1
- package/dist/services/vcs/types.d.ts +123 -2
- package/dist/services/vcs/types.d.ts.map +1 -1
- package/dist/skills/fleet-sprint-cli/SKILL.md +20 -1
- package/dist/skills/pm/SKILL.md +1 -2
- package/dist/skills/pm/cost.md +0 -4
- package/dist/skills/pm/fleet-addendum.md +2 -3
- package/dist/tools/check-status.d.ts +7 -4
- package/dist/tools/check-status.d.ts.map +1 -1
- package/dist/tools/check-status.js +5 -3
- package/dist/tools/check-status.js.map +1 -1
- package/dist/tools/cloud-control.js +2 -2
- package/dist/tools/cloud-control.js.map +1 -1
- package/dist/tools/compose-permissions.d.ts +6 -0
- package/dist/tools/compose-permissions.d.ts.map +1 -1
- package/dist/tools/compose-permissions.js +211 -50
- package/dist/tools/compose-permissions.js.map +1 -1
- package/dist/tools/credential-store-set.js +1 -1
- package/dist/tools/execute-command.d.ts.map +1 -1
- package/dist/tools/execute-command.js +56 -29
- package/dist/tools/execute-command.js.map +1 -1
- package/dist/tools/execute-prompt.d.ts +15 -2
- package/dist/tools/execute-prompt.d.ts.map +1 -1
- package/dist/tools/execute-prompt.js +1214 -873
- package/dist/tools/execute-prompt.js.map +1 -1
- package/dist/tools/kb-capture.d.ts +2 -2
- package/dist/tools/kb-capture.d.ts.map +1 -1
- package/dist/tools/kb-capture.js +29 -5
- package/dist/tools/kb-capture.js.map +1 -1
- package/dist/tools/kb-export.d.ts +2 -2
- package/dist/tools/kb-export.d.ts.map +1 -1
- package/dist/tools/kb-export.js +3 -28
- package/dist/tools/kb-export.js.map +1 -1
- package/dist/tools/kb-feedback.d.ts.map +1 -1
- package/dist/tools/kb-feedback.js +3 -1
- package/dist/tools/kb-feedback.js.map +1 -1
- package/dist/tools/kb-freshness-sweep.d.ts.map +1 -1
- package/dist/tools/kb-freshness-sweep.js +3 -1
- package/dist/tools/kb-freshness-sweep.js.map +1 -1
- package/dist/tools/kb-import.d.ts.map +1 -1
- package/dist/tools/kb-import.js +2 -1
- package/dist/tools/kb-import.js.map +1 -1
- package/dist/tools/kb-list.d.ts.map +1 -1
- package/dist/tools/kb-list.js +3 -1
- package/dist/tools/kb-list.js.map +1 -1
- package/dist/tools/kb-query.d.ts +2 -2
- package/dist/tools/kb-reconcile-prefilter.d.ts.map +1 -1
- package/dist/tools/kb-reconcile-prefilter.js +3 -1
- package/dist/tools/kb-reconcile-prefilter.js.map +1 -1
- package/dist/tools/kb-resolve-contradiction.d.ts.map +1 -1
- package/dist/tools/kb-resolve-contradiction.js +3 -1
- package/dist/tools/kb-resolve-contradiction.js.map +1 -1
- package/dist/tools/kb-setup.d.ts.map +1 -1
- package/dist/tools/kb-setup.js +125 -20
- package/dist/tools/kb-setup.js.map +1 -1
- package/dist/tools/kb-stats.d.ts.map +1 -1
- package/dist/tools/kb-stats.js +64 -43
- package/dist/tools/kb-stats.js.map +1 -1
- package/dist/tools/list-members.d.ts +2 -2
- package/dist/tools/list-members.d.ts.map +1 -1
- package/dist/tools/list-members.js +7 -2
- package/dist/tools/list-members.js.map +1 -1
- package/dist/tools/member-detail.d.ts +2 -2
- package/dist/tools/member-detail.d.ts.map +1 -1
- package/dist/tools/member-detail.js +22 -3
- package/dist/tools/member-detail.js.map +1 -1
- package/dist/tools/member-reservation.d.ts +58 -1
- package/dist/tools/member-reservation.d.ts.map +1 -1
- package/dist/tools/member-reservation.js +71 -18
- package/dist/tools/member-reservation.js.map +1 -1
- package/dist/tools/monitor-task.d.ts.map +1 -1
- package/dist/tools/monitor-task.js +17 -2
- package/dist/tools/monitor-task.js.map +1 -1
- package/dist/tools/provision-auth.d.ts +80 -1
- package/dist/tools/provision-auth.d.ts.map +1 -1
- package/dist/tools/provision-auth.js +147 -59
- package/dist/tools/provision-auth.js.map +1 -1
- package/dist/tools/provision-vcs-auth.d.ts +96 -3
- package/dist/tools/provision-vcs-auth.d.ts.map +1 -1
- package/dist/tools/provision-vcs-auth.js +254 -88
- package/dist/tools/provision-vcs-auth.js.map +1 -1
- package/dist/tools/register-member.d.ts +21 -12
- package/dist/tools/register-member.d.ts.map +1 -1
- package/dist/tools/register-member.js +141 -16
- package/dist/tools/register-member.js.map +1 -1
- package/dist/tools/remove-member.d.ts.map +1 -1
- package/dist/tools/remove-member.js +29 -4
- package/dist/tools/remove-member.js.map +1 -1
- package/dist/tools/revoke-vcs-auth.js +2 -2
- package/dist/tools/revoke-vcs-auth.js.map +1 -1
- package/dist/tools/send-email.d.ts +2 -2
- package/dist/tools/setup-git-app.d.ts.map +1 -1
- package/dist/tools/setup-git-app.js +11 -7
- package/dist/tools/setup-git-app.js.map +1 -1
- package/dist/tools/setup-ssh-key.d.ts.map +1 -1
- package/dist/tools/setup-ssh-key.js +2 -1
- package/dist/tools/setup-ssh-key.js.map +1 -1
- package/dist/tools/shutdown-server.d.ts +2 -0
- package/dist/tools/shutdown-server.d.ts.map +1 -1
- package/dist/tools/shutdown-server.js +23 -1
- package/dist/tools/shutdown-server.js.map +1 -1
- package/dist/tools/stop-prompt.js +2 -2
- package/dist/tools/stop-prompt.js.map +1 -1
- package/dist/tools/update-agent-cli.js +2 -2
- package/dist/tools/update-agent-cli.js.map +1 -1
- package/dist/tools/update-member.d.ts +21 -12
- package/dist/tools/update-member.d.ts.map +1 -1
- package/dist/tools/update-member.js +61 -12
- package/dist/tools/update-member.js.map +1 -1
- package/dist/tools/vcs-credential-exec.d.ts +127 -0
- package/dist/tools/vcs-credential-exec.d.ts.map +1 -0
- package/dist/tools/vcs-credential-exec.js +197 -0
- package/dist/tools/vcs-credential-exec.js.map +1 -0
- package/dist/types.d.ts +24 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/agent-helpers.d.ts +36 -0
- package/dist/utils/agent-helpers.d.ts.map +1 -1
- package/dist/utils/agent-helpers.js +39 -1
- package/dist/utils/agent-helpers.js.map +1 -1
- package/dist/utils/log-helpers.d.ts.map +1 -1
- package/dist/utils/log-helpers.js +2 -2
- package/dist/utils/log-helpers.js.map +1 -1
- package/dist/utils/platform.d.ts +7 -0
- package/dist/utils/platform.d.ts.map +1 -1
- package/dist/utils/platform.js +11 -1
- package/dist/utils/platform.js.map +1 -1
- package/dist/utils/prompt-errors.d.ts.map +1 -1
- package/dist/utils/prompt-errors.js +7 -1
- package/dist/utils/prompt-errors.js.map +1 -1
- package/dist/utils/shell-escape.d.ts +16 -0
- package/dist/utils/shell-escape.d.ts.map +1 -1
- package/dist/utils/shell-escape.js +22 -2
- package/dist/utils/shell-escape.js.map +1 -1
- package/dist/utils/vcs-provider-detect.d.ts +65 -0
- package/dist/utils/vcs-provider-detect.d.ts.map +1 -0
- package/dist/utils/vcs-provider-detect.js +109 -0
- package/dist/utils/vcs-provider-detect.js.map +1 -0
- package/dist/utils/workspace-trust.d.ts +20 -17
- package/dist/utils/workspace-trust.d.ts.map +1 -1
- package/dist/utils/workspace-trust.js +91 -1
- package/dist/utils/workspace-trust.js.map +1 -1
- package/dist/workflows/auto-sprint.js +180 -32
- package/package.json +7 -5
- package/packages/apra-fleet-client/src/client/api.mjs +403 -12
- package/packages/apra-fleet-client/src/client/errors.mjs +6 -2
- package/packages/apra-fleet-se/apra-pm/agents/_shared/GRAPH-SEMANTICS.md +10 -2
- package/packages/apra-fleet-se/apra-pm/agents/backlog-groomer.md +42 -21
- package/packages/apra-fleet-se/apra-pm/agents/ci-watcher.md +14 -0
- package/packages/apra-fleet-se/apra-pm/agents/deployer.md +59 -46
- package/packages/apra-fleet-se/apra-pm/agents/doer.md +157 -134
- package/packages/apra-fleet-se/apra-pm/agents/harvester.md +31 -32
- package/packages/apra-fleet-se/apra-pm/agents/integ-test-runner.md +92 -113
- package/packages/apra-fleet-se/apra-pm/agents/kb-reconciler.md +40 -42
- package/packages/apra-fleet-se/apra-pm/agents/plan-reviewer.md +139 -63
- package/packages/apra-fleet-se/apra-pm/agents/planner.md +176 -100
- package/packages/apra-fleet-se/apra-pm/agents/regression-test-runner.md +77 -81
- package/packages/apra-fleet-se/apra-pm/agents/reviewer.md +69 -85
- package/packages/apra-fleet-se/apra-pm/agents/schemas/integ-test-runner-output.json +1 -1
- package/packages/apra-fleet-se/apra-pm/agents/schemas/plan-reviewer-output.json +37 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/regression-test-runner-output.json +4 -17
- package/packages/apra-fleet-se/apra-pm/skills/pm/SKILL.md +1 -2
- package/packages/apra-fleet-se/apra-pm/skills/pm/cost.md +0 -4
- package/packages/apra-fleet-se/apra-pm/skills/pm/fleet-addendum.md +2 -3
- package/packages/apra-fleet-se/bin/cli.mjs +280 -3
- package/packages/apra-fleet-se/bin/serve.mjs +114 -5
- package/packages/apra-fleet-se/fleet-sprint/abort.mjs +481 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-children.mjs +491 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-identity-check.mjs +282 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-identity.mjs +208 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-scope.mjs +638 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-transitions.mjs +301 -0
- package/packages/apra-fleet-se/fleet-sprint/branch-ensure.mjs +96 -0
- package/packages/apra-fleet-se/fleet-sprint/conflict-ladder.mjs +8 -0
- package/packages/apra-fleet-se/fleet-sprint/contracts.mjs +199 -34
- package/packages/apra-fleet-se/fleet-sprint/coordination.mjs +516 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-failure.mjs +184 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-role.mjs +1121 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-safety-guard.mjs +216 -4
- package/packages/apra-fleet-se/fleet-sprint/docs/README.md +23 -8
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-manual-recovery-verified.md +10 -8
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-sync-redesign.md +285 -4
- package/packages/apra-fleet-se/fleet-sprint/docs/escalate-to-llm-design.md +3 -3
- package/packages/apra-fleet-se/fleet-sprint/docs/run-sprint-cycle-prelude-decision.md +215 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/shared-orchestrator-reservation-design.md +12 -12
- package/packages/apra-fleet-se/fleet-sprint/docs/stabilization-log.md +14 -4
- package/packages/apra-fleet-se/fleet-sprint/dolt-literal-guard.mjs +56 -1
- package/packages/apra-fleet-se/fleet-sprint/dolt-settle.mjs +275 -99
- package/packages/apra-fleet-se/fleet-sprint/dolt-sync.mjs +1054 -39
- package/packages/apra-fleet-se/fleet-sprint/errors.mjs +308 -0
- package/packages/apra-fleet-se/fleet-sprint/explicit-id-create-guard.mjs +501 -0
- package/packages/apra-fleet-se/fleet-sprint/fatal-diagnostics.mjs +134 -0
- package/packages/apra-fleet-se/fleet-sprint/full-db-fetch-guard.mjs +102 -0
- package/packages/apra-fleet-se/fleet-sprint/git-sync.mjs +556 -0
- package/packages/apra-fleet-se/fleet-sprint/git-topology.mjs +495 -0
- package/packages/apra-fleet-se/fleet-sprint/guarded-modules.mjs +564 -0
- package/packages/apra-fleet-se/fleet-sprint/inline-ladder-guard.mjs +216 -0
- package/packages/apra-fleet-se/fleet-sprint/kb.mjs +728 -0
- package/packages/apra-fleet-se/fleet-sprint/mcp-result.mjs +75 -0
- package/packages/apra-fleet-se/fleet-sprint/member-provisioning.mjs +252 -0
- package/packages/apra-fleet-se/fleet-sprint/member-sync.mjs +581 -0
- package/packages/apra-fleet-se/fleet-sprint/member-target.mjs +93 -0
- package/packages/apra-fleet-se/fleet-sprint/newtask-text.mjs +266 -0
- package/packages/apra-fleet-se/fleet-sprint/parent-notes-staleness.mjs +201 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/deploy.mjs +136 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/develop.mjs +822 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/ensure-sprint-branch.mjs +294 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/final-review.mjs +403 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/harvest.mjs +180 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/integ-test.mjs +358 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/plan.mjs +390 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/publish-pr.mjs +323 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/re-review.mjs +232 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/regression-test.mjs +174 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/replan.mjs +197 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/review.mjs +305 -0
- package/packages/apra-fleet-se/fleet-sprint/prompts.mjs +559 -0
- package/packages/apra-fleet-se/fleet-sprint/role-policies.mjs +1416 -0
- package/packages/apra-fleet-se/fleet-sprint/round-session.mjs +100 -0
- package/packages/apra-fleet-se/fleet-sprint/runner.js +1672 -9072
- package/packages/apra-fleet-se/fleet-sprint/se-os-commands.mjs +134 -0
- package/packages/apra-fleet-se/fleet-sprint/se-posix.mjs +159 -0
- package/packages/apra-fleet-se/fleet-sprint/se-windows-gitbash.mjs +97 -0
- package/packages/apra-fleet-se/fleet-sprint/se-windows.mjs +143 -0
- package/packages/apra-fleet-se/fleet-sprint/shell-command-guard.mjs +304 -0
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-sprint-cli/SKILL.md +20 -1
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-supervisor/SKILL.md +21 -2
- package/packages/apra-fleet-se/fleet-sprint/sprint-args.mjs +454 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-report.mjs +239 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-state.mjs +163 -0
- package/packages/apra-fleet-se/fleet-sprint/unbracketed-push-guard.mjs +234 -0
- package/packages/apra-fleet-se/fleet-sprint/usage-limit-controller.mjs +211 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-auth.mjs +1279 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-module.mjs +204 -19
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/azure-devops.mjs +707 -12
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/bitbucket.mjs +28 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/dolt.mjs +33 -4
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/github.mjs +191 -43
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/index.mjs +333 -6
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/shell-helpers.mjs +165 -0
- package/packages/apra-fleet-se/fleet-sprint/viewer-extensions.mjs +167 -37
- package/packages/apra-fleet-se/fleet-sprint/worklists.mjs +559 -0
- package/packages/apra-fleet-se/package.json +1 -1
- package/packages/apra-fleet-workflow/src/viewer/index.mjs +178 -1
- package/packages/apra-fleet-workflow/src/workflow/index.mjs +478 -32
- package/skills/fleet/SKILL.md +27 -16
- package/skills/fleet/auth-azdevops.md +57 -7
- package/skills/fleet/auth-bitbucket.md +5 -5
- package/skills/fleet/auth-github.md +7 -6
- package/skills/fleet/beads-conflict-resolution.md +141 -0
- package/skills/fleet/beads.md +16 -12
- package/skills/fleet/onboarding.md +6 -6
- package/skills/fleet/permissions.md +11 -7
- package/skills/fleet/profiles/node.json +1 -1
- package/skills/fleet/skill-matrix.md +1 -1
- package/skills/fleet/troubleshooting.md +4 -3
- package/version.json +1 -1
- package/dist/providers/gemini.d.ts +0 -52
- package/dist/providers/gemini.d.ts.map +0 -1
- package/dist/providers/gemini.js +0 -236
- package/dist/providers/gemini.js.map +0 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/coach-role-design.md +0 -23
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ssh-key.d.ts","sourceRoot":"","sources":["../../src/tools/setup-ssh-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"setup-ssh-key.d.ts","sourceRoot":"","sources":["../../src/tools/setup-ssh-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAcxB,eAAO,MAAM,iBAAiB;;;;;;;;;EAE5B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAoCjE,wBAAsB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAkF1E"}
|
|
@@ -7,6 +7,7 @@ import { getStrategy } from '../services/strategy.js';
|
|
|
7
7
|
import { testAuthConnection } from '../services/ssh.js';
|
|
8
8
|
import { memberIdentifier, resolveMember } from '../utils/resolve-member.js';
|
|
9
9
|
import { getOsCommands } from '../os/index.js';
|
|
10
|
+
import { getAgentOS, getAgentShell } from '../utils/agent-helpers.js';
|
|
10
11
|
import { logLine } from '../utils/log-helpers.js';
|
|
11
12
|
import { invalidatePreflightCache } from '../services/preflight-check.js';
|
|
12
13
|
export const setupSSHKeySchema = z.object({
|
|
@@ -74,7 +75,7 @@ export async function setupSSHKey(input) {
|
|
|
74
75
|
fs.writeFileSync(privateKeyPath, privateKey, { mode: 0o600 });
|
|
75
76
|
fs.writeFileSync(publicKeyPath, opensshPubKey, { mode: 0o644 });
|
|
76
77
|
// Step 2: Deploy public key to remote using OS-specific commands
|
|
77
|
-
const cmds = getOsCommands(agent
|
|
78
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
78
79
|
const deployCommands = cmds.deploySSHPublicKey(opensshPubKey);
|
|
79
80
|
for (const cmd of deployCommands) {
|
|
80
81
|
const result = await strategy.execCommand(cmd, 10000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ssh-key.js","sourceRoot":"","sources":["../../src/tools/setup-ssh-key.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"setup-ssh-key.js","sourceRoot":"","sources":["../../src/tools/setup-ssh-key.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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { memberIdentifier, resolveMember } from '../utils/resolve-member.js';
|
|
3
|
-
import { getStoredPid, getAgentOS } from '../utils/agent-helpers.js';
|
|
3
|
+
import { getStoredPid, getAgentOS, getAgentShell } from '../utils/agent-helpers.js';
|
|
4
4
|
import { getStrategy } from '../services/strategy.js';
|
|
5
5
|
import { getOsCommands } from '../os/index.js';
|
|
6
6
|
import { tryKillPid } from '../utils/pid-helpers.js';
|
|
@@ -18,7 +18,7 @@ export async function stopPrompt(input) {
|
|
|
18
18
|
return agentOrError;
|
|
19
19
|
const agent = agentOrError;
|
|
20
20
|
const strategy = getStrategy(agent);
|
|
21
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
21
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
22
22
|
const pid = getStoredPid(agent.id);
|
|
23
23
|
cancelPendingAuth(agent.friendlyName);
|
|
24
24
|
await tryKillPid(agent, strategy, cmds);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop-prompt.js","sourceRoot":"","sources":["../../src/tools/stop-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"stop-prompt.js","sourceRoot":"","sources":["../../src/tools/stop-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,GAAG,gBAAgB;CACpB,CAAC,CAAC;AAIH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,KAAsB;IACrD,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IACvE,IAAI,OAAO,YAAY,KAAK,QAAQ;QAAE,OAAO,YAAY,CAAC;IAC1D,MAAM,KAAK,GAAG,YAAY,CAAC;IAE3B,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpE,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEnC,iBAAiB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACtC,MAAM,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IACxC,gBAAgB,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEpC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,uEAAuE;QACvE,0EAA0E;QAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;QACnC,OAAO,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;YAC7D,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,gFAAgF;IAChF,8DAA8D;IAC9D,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAChC,eAAe,EAAE,CAAC;IAElB,OAAO,CAAC,aAAa,EAAE,OAAO,GAAG,IAAI,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;IAEtD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,aAAa,KAAK,CAAC,YAAY,yBAAyB,GAAG,IAAI,CAAC;IACzE,CAAC;IACD,OAAO,aAAa,KAAK,CAAC,YAAY,4CAA4C,CAAC;AACrF,CAAC"}
|
|
@@ -3,14 +3,14 @@ import { getAllAgents } from '../services/registry.js';
|
|
|
3
3
|
import { getStrategy } from '../services/strategy.js';
|
|
4
4
|
import { getOsCommands } from '../os/index.js';
|
|
5
5
|
import { getProvider } from '../providers/index.js';
|
|
6
|
-
import { getAgentOS } from '../utils/agent-helpers.js';
|
|
6
|
+
import { getAgentOS, getAgentShell } from '../utils/agent-helpers.js';
|
|
7
7
|
import { memberIdentifier, resolveMember } from '../utils/resolve-member.js';
|
|
8
8
|
export const updateAgentCliSchema = z.object({
|
|
9
9
|
...memberIdentifier,
|
|
10
10
|
install_if_missing: z.boolean().default(false).describe('Install the LLM agent CLI on the member if not already installed (default: false)'),
|
|
11
11
|
});
|
|
12
12
|
async function updateSingleAgent(agent, installIfMissing) {
|
|
13
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
13
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
14
14
|
const provider = getProvider(agent.llmProvider);
|
|
15
15
|
const strategy = getStrategy(agent);
|
|
16
16
|
const result = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-agent-cli.js","sourceRoot":"","sources":["../../src/tools/update-agent-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"update-agent-cli.js","sourceRoot":"","sources":["../../src/tools/update-agent-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,10 @@ export declare const updateMemberSchema: z.ZodObject<{
|
|
|
16
16
|
cloud_profile: z.ZodOptional<z.ZodString>;
|
|
17
17
|
cloud_idle_timeout_min: z.ZodOptional<z.ZodNumber>;
|
|
18
18
|
cloud_activity_command: z.ZodOptional<z.ZodString>;
|
|
19
|
-
llm_provider: z.ZodOptional<z.ZodEnum<["claude", "
|
|
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", "
|
|
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.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>;
|
|
@@ -37,6 +37,9 @@ export declare const updateMemberSchema: z.ZodObject<{
|
|
|
37
37
|
category: z.ZodOptional<z.ZodString>;
|
|
38
38
|
tags: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
39
39
|
code_intel_provider: z.ZodOptional<z.ZodEnum<["codebase-memory", "gitnexus", "none"]>>;
|
|
40
|
+
unreservable: z.ZodOptional<z.ZodBoolean>;
|
|
41
|
+
shell: z.ZodOptional<z.ZodEnum<["gitbash", "pwsh7", "powershell5"]>>;
|
|
42
|
+
vcs_provider: z.ZodOptional<z.ZodEnum<["github", "bitbucket", "azure-devops", "none"]>>;
|
|
40
43
|
member_id: z.ZodOptional<z.ZodString>;
|
|
41
44
|
member_name: z.ZodOptional<z.ZodString>;
|
|
42
45
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -46,24 +49,27 @@ export declare const updateMemberSchema: z.ZodObject<{
|
|
|
46
49
|
host?: string | undefined;
|
|
47
50
|
port?: number | undefined;
|
|
48
51
|
username?: string | undefined;
|
|
52
|
+
shell?: "gitbash" | "pwsh7" | "powershell5" | undefined;
|
|
49
53
|
unattended?: "auto" | "dangerous" | "false" | undefined;
|
|
50
54
|
icon?: string | undefined;
|
|
51
55
|
category?: string | undefined;
|
|
52
56
|
tags?: string[] | undefined;
|
|
57
|
+
unreservable?: boolean | undefined;
|
|
53
58
|
member_name?: string | undefined;
|
|
54
59
|
friendly_name?: string | undefined;
|
|
55
60
|
auth_type?: "password" | "key" | undefined;
|
|
56
61
|
key_path?: string | undefined;
|
|
57
62
|
git_access?: "read" | "push" | "admin" | "issues" | "full" | undefined;
|
|
58
63
|
git_repos?: string[] | undefined;
|
|
64
|
+
vcs_provider?: "none" | "github" | "bitbucket" | "azure-devops" | undefined;
|
|
59
65
|
cloud_region?: string | undefined;
|
|
60
66
|
cloud_profile?: string | undefined;
|
|
61
67
|
cloud_idle_timeout_min?: number | undefined;
|
|
62
68
|
cloud_activity_command?: string | undefined;
|
|
63
|
-
llm_provider?: "claude" | "
|
|
64
|
-
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.
|
|
65
|
-
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.
|
|
66
|
-
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" | "gemini-3.1-pro-
|
|
69
|
+
llm_provider?: "claude" | "codex" | "copilot" | "agy" | "opencode" | 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;
|
|
67
73
|
model_tiers?: {
|
|
68
74
|
cheap?: string | undefined;
|
|
69
75
|
standard?: string | undefined;
|
|
@@ -78,24 +84,27 @@ export declare const updateMemberSchema: z.ZodObject<{
|
|
|
78
84
|
host?: string | undefined;
|
|
79
85
|
port?: number | undefined;
|
|
80
86
|
username?: string | undefined;
|
|
87
|
+
shell?: "gitbash" | "pwsh7" | "powershell5" | undefined;
|
|
81
88
|
unattended?: unknown;
|
|
82
89
|
icon?: string | undefined;
|
|
83
90
|
category?: string | undefined;
|
|
84
91
|
tags?: string[] | undefined;
|
|
92
|
+
unreservable?: boolean | undefined;
|
|
85
93
|
member_name?: string | undefined;
|
|
86
94
|
friendly_name?: string | undefined;
|
|
87
95
|
auth_type?: "password" | "key" | undefined;
|
|
88
96
|
key_path?: string | undefined;
|
|
89
97
|
git_access?: "read" | "push" | "admin" | "issues" | "full" | undefined;
|
|
90
98
|
git_repos?: string[] | undefined;
|
|
99
|
+
vcs_provider?: "none" | "github" | "bitbucket" | "azure-devops" | undefined;
|
|
91
100
|
cloud_region?: string | undefined;
|
|
92
101
|
cloud_profile?: string | undefined;
|
|
93
102
|
cloud_idle_timeout_min?: number | undefined;
|
|
94
103
|
cloud_activity_command?: string | undefined;
|
|
95
|
-
llm_provider?: "claude" | "
|
|
96
|
-
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.
|
|
97
|
-
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.
|
|
98
|
-
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" | "gemini-3.1-pro-
|
|
104
|
+
llm_provider?: "claude" | "codex" | "copilot" | "agy" | "opencode" | 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;
|
|
99
108
|
model_tiers?: {
|
|
100
109
|
cheap?: string | undefined;
|
|
101
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()
|
|
@@ -44,7 +46,7 @@ export const updateMemberSchema = z.object({
|
|
|
44
46
|
cloud_profile: z.string().optional().describe('AWS CLI profile name'),
|
|
45
47
|
cloud_idle_timeout_min: z.number().optional().describe('Minutes of inactivity before auto-stop'),
|
|
46
48
|
cloud_activity_command: z.string().optional().describe('Custom shell command for workload detection. Must output "busy" or "idle". Pass empty string to clear.'),
|
|
47
|
-
llm_provider: z.enum(['claude', '
|
|
49
|
+
llm_provider: z.enum(['claude', 'codex', 'copilot', 'agy', 'opencode']).optional().describe('Change the LLM provider for this member.'),
|
|
48
50
|
model_cheap: z.enum(CURATED_CHEAP_MODELS).optional().describe('Change custom cheap model'),
|
|
49
51
|
model_standard: z.enum(CURATED_STANDARD_MODELS).optional().describe('Change custom standard model'),
|
|
50
52
|
model_premium: z.enum(CURATED_PREMIUM_MODELS).optional().describe('Change custom premium model'),
|
|
@@ -60,6 +62,9 @@ export const updateMemberSchema = z.object({
|
|
|
60
62
|
.optional()
|
|
61
63
|
.describe('Free-form labels for this member (max 10 tags, each max 64 chars). Empty array clears all tags; non-empty array replaces existing tags.'),
|
|
62
64
|
code_intel_provider: z.enum(['codebase-memory', 'gitnexus', 'none']).optional().describe('Change the code-intelligence provider for this member.'),
|
|
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.'),
|
|
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.'),
|
|
63
68
|
});
|
|
64
69
|
export async function updateMember(input) {
|
|
65
70
|
const existingOrError = resolveMember(input.member_id, input.member_name);
|
|
@@ -82,6 +87,17 @@ export async function updateMember(input) {
|
|
|
82
87
|
if (existing.agentType !== 'local' && input.work_folder !== undefined && !isFullyQualifiedPath(input.work_folder)) {
|
|
83
88
|
return workFolderNotAbsoluteError(input.work_folder, 'Member was NOT updated.');
|
|
84
89
|
}
|
|
90
|
+
// Same constraint as register_member: unreservable is reserved for
|
|
91
|
+
// llm_provider: 'none' members. Evaluate the RESULTING state (this update's
|
|
92
|
+
// values where given, else the existing row's), not just this call's inputs
|
|
93
|
+
// in isolation -- either "set unreservable while already claude/codex/etc."
|
|
94
|
+
// or "switch llm_provider away from none while already unreservable" must
|
|
95
|
+
// both be rejected.
|
|
96
|
+
const resultingUnreservable = input.unreservable ?? existing.unreservable ?? false;
|
|
97
|
+
const resultingLlmProvider = input.llm_provider ?? existing.llmProvider ?? 'claude';
|
|
98
|
+
if (resultingUnreservable && resultingLlmProvider !== 'none') {
|
|
99
|
+
return '❌ "unreservable" requires llm_provider: "none" -- it is reserved for plain command-executor members that never receive an agent dispatch. Member was NOT updated.';
|
|
100
|
+
}
|
|
85
101
|
const needsUniquenessCheck = existing.agentType === 'remote'
|
|
86
102
|
? (hostChanged || portChanged || folderChanged)
|
|
87
103
|
: folderChanged;
|
|
@@ -100,16 +116,14 @@ export async function updateMember(input) {
|
|
|
100
116
|
if (resolvedIcon !== undefined && !isValidIcon(resolvedIcon)) {
|
|
101
117
|
return `❌ Invalid icon "${input.icon}". Use a named alias (e.g., blue-circle, red-square, green-square) or a valid emoji.`;
|
|
102
118
|
}
|
|
103
|
-
// Resolve {{secure.NAME}} tokens in password field
|
|
119
|
+
// Resolve {{secret.NAME}} / legacy {{secure.NAME}} tokens in password field
|
|
104
120
|
let resolvedPassword = input.password;
|
|
121
|
+
let passwordLegacyNames = [];
|
|
105
122
|
if (resolvedPassword) {
|
|
106
|
-
const
|
|
107
|
-
let match;
|
|
123
|
+
const tokens = findSecretTokens(resolvedPassword);
|
|
108
124
|
let resolved = resolvedPassword;
|
|
109
|
-
const tokenNames = new Set();
|
|
110
|
-
|
|
111
|
-
tokenNames.add(match[1]);
|
|
112
|
-
}
|
|
125
|
+
const tokenNames = new Set(tokens.map((t) => t.name));
|
|
126
|
+
passwordLegacyNames = tokens.filter((t) => t.legacy).map((t) => t.name);
|
|
113
127
|
for (const name of tokenNames) {
|
|
114
128
|
const entry = credentialResolve(name, existing.friendlyName);
|
|
115
129
|
if (!entry)
|
|
@@ -118,9 +132,13 @@ export async function updateMember(input) {
|
|
|
118
132
|
return `❌ ${entry.denied} Member was NOT updated.`;
|
|
119
133
|
if ('expired' in entry)
|
|
120
134
|
return `❌ ${entry.expired} Member was NOT updated.`;
|
|
121
|
-
resolved = resolved.replaceAll(`{{
|
|
135
|
+
resolved = resolved.replaceAll(`{{secret.${name}}}`, entry.plaintext);
|
|
136
|
+
resolved = resolved.replaceAll(`{{secure.${name}}}`, entry.plaintext); // legacy spelling
|
|
122
137
|
}
|
|
123
138
|
resolvedPassword = resolved;
|
|
139
|
+
if (passwordLegacyNames.length > 0) {
|
|
140
|
+
logWarn('update_member', legacyTokenWarning(passwordLegacyNames), { id: existing.id, friendlyName: existing.friendlyName });
|
|
141
|
+
}
|
|
124
142
|
}
|
|
125
143
|
// Out-of-band password collection:
|
|
126
144
|
// - switchingToPassword: changing from key → password auth without inline password
|
|
@@ -136,6 +154,8 @@ export async function updateMember(input) {
|
|
|
136
154
|
}
|
|
137
155
|
const updates = {};
|
|
138
156
|
const warnings = [];
|
|
157
|
+
if (passwordLegacyNames.length > 0)
|
|
158
|
+
warnings.push(legacyTokenWarning(passwordLegacyNames));
|
|
139
159
|
// --- model_tiers normalization ---
|
|
140
160
|
if (input.model_tiers !== undefined) {
|
|
141
161
|
const values = Object.values(input.model_tiers).filter(Boolean);
|
|
@@ -178,6 +198,16 @@ export async function updateMember(input) {
|
|
|
178
198
|
updates.tags = input.tags.length === 0 ? undefined : input.tags;
|
|
179
199
|
if (input.code_intel_provider !== undefined)
|
|
180
200
|
updates.codeIntelProvider = input.code_intel_provider;
|
|
201
|
+
if (input.unreservable !== undefined)
|
|
202
|
+
updates.unreservable = input.unreservable;
|
|
203
|
+
if (input.shell !== undefined)
|
|
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
|
+
}
|
|
181
211
|
if (input.model_cheap !== undefined)
|
|
182
212
|
updates.modelCheap = input.model_cheap;
|
|
183
213
|
if (input.model_standard !== undefined)
|
|
@@ -229,6 +259,19 @@ export async function updateMember(input) {
|
|
|
229
259
|
warnings.push(`Warning: cloud fields (${passedCloudFields.join(', ')}) are ignored for non-cloud members.`);
|
|
230
260
|
}
|
|
231
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
|
+
}
|
|
232
275
|
const updated = updateInRegistry(existing.id, updates);
|
|
233
276
|
if (!updated) {
|
|
234
277
|
return `Failed to update member "${existing.id}".`;
|
|
@@ -284,6 +327,12 @@ export async function updateMember(input) {
|
|
|
284
327
|
result += ` Auth: ${updated.authType}\n`;
|
|
285
328
|
}
|
|
286
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
|
+
}
|
|
287
336
|
if (updated.modelCheap)
|
|
288
337
|
result += ` Model Cheap: ${updated.modelCheap}\n`;
|
|
289
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":"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"}
|