@apralabs/apra-fleet 0.4.1 → 0.4.2
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 +16 -8
- package/dist/agents/backlog-groomer.md +17 -21
- package/dist/agents/ci-watcher.md +3 -0
- package/dist/agents/deployer.md +22 -44
- package/dist/agents/doer.md +131 -132
- package/dist/agents/harvester.md +20 -32
- package/dist/agents/integ-test-runner.md +81 -113
- package/dist/agents/kb-reconciler.md +31 -42
- package/dist/agents/plan-reviewer.md +32 -44
- package/dist/agents/planner.md +51 -63
- package/dist/agents/regression-test-runner.md +65 -80
- package/dist/agents/reviewer.md +56 -83
- package/dist/agents/schemas/integ-test-runner-output.json +1 -1
- package/dist/agents/schemas/regression-test-runner-output.json +4 -17
- package/dist/cli/auth.d.ts.map +1 -1
- package/dist/cli/auth.js +1 -2
- package/dist/cli/auth.js.map +1 -1
- package/dist/cli/config.d.ts +3 -3
- package/dist/cli/config.d.ts.map +1 -1
- package/dist/cli/config.js +4 -13
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/install.d.ts.map +1 -1
- package/dist/cli/install.js +5 -39
- package/dist/cli/install.js.map +1 -1
- package/dist/cli/register-member.js +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/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.js +1 -1
- package/dist/os/linux.js.map +1 -1
- package/dist/os/os-commands.d.ts +7 -0
- 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 +93 -0
- package/dist/os/windows-gitbash.d.ts.map +1 -0
- package/dist/os/windows-gitbash.js +244 -0
- package/dist/os/windows-gitbash.js.map +1 -0
- package/dist/os/windows.d.ts.map +1 -1
- package/dist/os/windows.js +27 -5
- package/dist/os/windows.js.map +1 -1
- package/dist/providers/agy.d.ts +3 -2
- package/dist/providers/agy.d.ts.map +1 -1
- package/dist/providers/agy.js +11 -2
- package/dist/providers/agy.js.map +1 -1
- package/dist/providers/claude.d.ts +3 -2
- package/dist/providers/claude.d.ts.map +1 -1
- package/dist/providers/claude.js +22 -3
- package/dist/providers/claude.js.map +1 -1
- package/dist/providers/codex.d.ts +3 -2
- package/dist/providers/codex.d.ts.map +1 -1
- package/dist/providers/codex.js +5 -2
- package/dist/providers/codex.js.map +1 -1
- package/dist/providers/copilot.d.ts +3 -2
- package/dist/providers/copilot.d.ts.map +1 -1
- package/dist/providers/copilot.js +7 -2
- 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 +3 -2
- package/dist/providers/none.d.ts.map +1 -1
- package/dist/providers/none.js +5 -2
- package/dist/providers/none.js.map +1 -1
- package/dist/providers/opencode.d.ts +3 -2
- package/dist/providers/opencode.d.ts.map +1 -1
- package/dist/providers/opencode.js +5 -2
- package/dist/providers/opencode.js.map +1 -1
- package/dist/providers/provider.d.ts +16 -7
- package/dist/providers/provider.d.ts.map +1 -1
- package/dist/providers/provider.js +2 -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/cloud/activity.js +2 -2
- package/dist/services/cloud/activity.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 +22 -3
- package/dist/services/credential-cleanup.js.map +1 -1
- 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 +0 -5
- 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/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.js +2 -2
- 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 +6 -5
- package/dist/services/stall/read-log-tail.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 +40 -6
- package/dist/services/strategy.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 +1 -1
- package/dist/services/vcs/azure-devops.d.ts.map +1 -1
- package/dist/services/vcs/azure-devops.js +105 -10
- 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 +2 -1
- package/dist/skills/pm/SKILL.md +0 -1
- package/dist/skills/pm/cost.md +0 -1
- package/dist/skills/pm/fleet-addendum.md +0 -1
- package/dist/tools/check-status.js +3 -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.map +1 -1
- package/dist/tools/compose-permissions.js +37 -24
- package/dist/tools/compose-permissions.js.map +1 -1
- package/dist/tools/execute-command.d.ts.map +1 -1
- package/dist/tools/execute-command.js +28 -12
- package/dist/tools/execute-command.js.map +1 -1
- package/dist/tools/execute-prompt.d.ts.map +1 -1
- package/dist/tools/execute-prompt.js +55 -18
- package/dist/tools/execute-prompt.js.map +1 -1
- package/dist/tools/list-members.d.ts.map +1 -1
- package/dist/tools/list-members.js +6 -2
- package/dist/tools/list-members.js.map +1 -1
- package/dist/tools/member-detail.d.ts.map +1 -1
- package/dist/tools/member-detail.js +5 -3
- package/dist/tools/member-detail.js.map +1 -1
- package/dist/tools/member-reservation.d.ts.map +1 -1
- package/dist/tools/member-reservation.js +13 -1
- 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.js +5 -5
- package/dist/tools/provision-auth.js.map +1 -1
- package/dist/tools/provision-vcs-auth.d.ts +5 -2
- package/dist/tools/provision-vcs-auth.d.ts.map +1 -1
- package/dist/tools/provision-vcs-auth.js +58 -52
- package/dist/tools/provision-vcs-auth.js.map +1 -1
- package/dist/tools/register-member.d.ts +18 -12
- package/dist/tools/register-member.d.ts.map +1 -1
- package/dist/tools/register-member.js +42 -4
- package/dist/tools/register-member.js.map +1 -1
- package/dist/tools/remove-member.js +2 -2
- 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/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/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 +18 -12
- package/dist/tools/update-member.d.ts.map +1 -1
- package/dist/tools/update-member.js +18 -1
- package/dist/tools/update-member.js.map +1 -1
- package/dist/types.d.ts +11 -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/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/workspace-trust.d.ts.map +1 -1
- package/dist/utils/workspace-trust.js +5 -1
- package/dist/utils/workspace-trust.js.map +1 -1
- package/dist/workflows/auto-sprint.js +4 -17
- package/package.json +2 -2
- package/packages/apra-fleet-client/src/client/api.mjs +92 -3
- package/packages/apra-fleet-se/apra-pm/agents/backlog-groomer.md +17 -21
- package/packages/apra-fleet-se/apra-pm/agents/ci-watcher.md +3 -0
- package/packages/apra-fleet-se/apra-pm/agents/deployer.md +22 -44
- package/packages/apra-fleet-se/apra-pm/agents/doer.md +131 -132
- package/packages/apra-fleet-se/apra-pm/agents/harvester.md +20 -32
- package/packages/apra-fleet-se/apra-pm/agents/integ-test-runner.md +81 -113
- package/packages/apra-fleet-se/apra-pm/agents/kb-reconciler.md +31 -42
- package/packages/apra-fleet-se/apra-pm/agents/plan-reviewer.md +32 -44
- package/packages/apra-fleet-se/apra-pm/agents/planner.md +51 -63
- package/packages/apra-fleet-se/apra-pm/agents/regression-test-runner.md +65 -80
- package/packages/apra-fleet-se/apra-pm/agents/reviewer.md +56 -83
- 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/regression-test-runner-output.json +4 -17
- package/packages/apra-fleet-se/apra-pm/skills/pm/SKILL.md +0 -1
- package/packages/apra-fleet-se/apra-pm/skills/pm/cost.md +0 -1
- package/packages/apra-fleet-se/apra-pm/skills/pm/fleet-addendum.md +0 -1
- package/packages/apra-fleet-se/bin/cli.mjs +132 -3
- package/packages/apra-fleet-se/bin/serve.mjs +36 -1
- package/packages/apra-fleet-se/fleet-sprint/contracts.mjs +151 -33
- package/packages/apra-fleet-se/fleet-sprint/docs/README.md +22 -7
- 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 +9 -4
- package/packages/apra-fleet-se/fleet-sprint/docs/escalate-to-llm-design.md +2 -2
- 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-settle.mjs +275 -99
- package/packages/apra-fleet-se/fleet-sprint/dolt-sync.mjs +67 -16
- package/packages/apra-fleet-se/fleet-sprint/errors.mjs +41 -0
- package/packages/apra-fleet-se/fleet-sprint/runner.js +1140 -209
- package/packages/apra-fleet-se/fleet-sprint/se-os-commands.mjs +134 -0
- package/packages/apra-fleet-se/fleet-sprint/se-posix.mjs +154 -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/skills/fleet-sprint-cli/SKILL.md +2 -1
- package/packages/apra-fleet-se/fleet-sprint/vcs-module.mjs +51 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/azure-devops.mjs +657 -12
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/dolt.mjs +33 -4
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/github.mjs +60 -43
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/index.mjs +205 -2
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/shell-helpers.mjs +164 -0
- package/packages/apra-fleet-se/fleet-sprint/viewer-extensions.mjs +92 -37
- package/packages/apra-fleet-workflow/src/viewer/index.mjs +167 -1
- package/packages/apra-fleet-workflow/src/workflow/index.mjs +435 -31
- package/skills/fleet/SKILL.md +20 -9
- package/skills/fleet/auth-azdevops.md +44 -5
- package/skills/fleet/auth-bitbucket.md +3 -3
- package/skills/fleet/auth-github.md +2 -2
- package/skills/fleet/beads-conflict-resolution.md +141 -0
- package/skills/fleet/beads.md +16 -12
- package/skills/fleet/onboarding.md +4 -4
- package/skills/fleet/permissions.md +6 -6
- package/skills/fleet/skill-matrix.md +1 -1
- package/skills/fleet/troubleshooting.md +2 -1
- package/version.json +1 -1
- package/dist/providers/gemini.d.ts +0 -52
- package/dist/providers/gemini.d.ts.map +0 -1
- package/dist/providers/gemini.js +0 -236
- package/dist/providers/gemini.js.map +0 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/coach-role-design.md +0 -23
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor-task.d.ts","sourceRoot":"","sources":["../../src/tools/monitor-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;EAM5B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEjE,wBAAsB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"monitor-task.d.ts","sourceRoot":"","sources":["../../src/tools/monitor-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;EAM5B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEjE,wBAAsB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsH1E"}
|
|
@@ -2,7 +2,7 @@ import { z } from 'zod';
|
|
|
2
2
|
import { getStrategy } from '../services/strategy.js';
|
|
3
3
|
import { getOsCommands } from '../os/index.js';
|
|
4
4
|
import { wrapPowerShellEncoded } from '../os/windows.js';
|
|
5
|
-
import { getAgentOS } from '../utils/agent-helpers.js';
|
|
5
|
+
import { getAgentOS, getAgentShell } from '../utils/agent-helpers.js';
|
|
6
6
|
import { memberIdentifier, resolveMember } from '../utils/resolve-member.js';
|
|
7
7
|
import { ensureCloudReady } from '../services/cloud/lifecycle.js';
|
|
8
8
|
import { awsProvider } from '../services/cloud/aws.js';
|
|
@@ -27,7 +27,7 @@ export async function monitorTask(input) {
|
|
|
27
27
|
return `Cannot connect to "${agentOrError.friendlyName}": ${err.message}`;
|
|
28
28
|
}
|
|
29
29
|
const strategy = getStrategy(agent);
|
|
30
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
30
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
31
31
|
const isWindows = getAgentOS(agent) === 'windows';
|
|
32
32
|
// POSIX (linux/darwin) task dir/commands are byte-identical to before this
|
|
33
33
|
// change. Windows members now get a real task dir too: execute-command.ts's
|
|
@@ -35,6 +35,21 @@ export async function monitorTask(input) {
|
|
|
35
35
|
// same $env:USERPROFILE\.fleet-tasks\<taskId> path and launches it detached
|
|
36
36
|
// via Invoke-CimMethod Win32_Process.Create, so these commands read the
|
|
37
37
|
// same status.json/task.pid/task.log shape that script writes.
|
|
38
|
+
//
|
|
39
|
+
// Shell-agnostic by construction (apra-fleet-7dir.5.2 audit): statusCmd,
|
|
40
|
+
// pidCmd and logCmd below branch on `isWindows` alone -- getAgentShell(agent)
|
|
41
|
+
// is intentionally NOT consulted -- because each Windows branch is already
|
|
42
|
+
// wrapped in wrapPowerShellEncoded, which base64-encodes the whole script
|
|
43
|
+
// into a single `powershell -EncodedCommand <blob>` string. That string is
|
|
44
|
+
// shell-agnostic AS A STRING: whatever shell actually runs it on the member
|
|
45
|
+
// (cmd.exe, PowerShell, or bash.exe for a gitbash member) just execs the
|
|
46
|
+
// literal powershell.exe binary with an opaque base64 argument -- nothing is
|
|
47
|
+
// left for that outer shell to re-tokenize or corrupt, the same reasoning
|
|
48
|
+
// execute-command.ts's long_running Windows launch documents for why it does
|
|
49
|
+
// not branch on isPosixShell either. A gitbash member therefore gets the
|
|
50
|
+
// exact same statusCmd/pidCmd/logCmd string as a powershell5/pwsh7/unset
|
|
51
|
+
// Windows member; only true POSIX members (linux/darwin) get a different,
|
|
52
|
+
// byte-identical-to-before string.
|
|
38
53
|
const taskDir = `~/.fleet-tasks/${input.task_id}`;
|
|
39
54
|
const winTaskDir = `$env:USERPROFILE\\.fleet-tasks\\${input.task_id}`;
|
|
40
55
|
const statusCmd = isWindows
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor-task.js","sourceRoot":"","sources":["../../src/tools/monitor-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"monitor-task.js","sourceRoot":"","sources":["../../src/tools/monitor-task.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { getStrategy } from '../services/strategy.js';
|
|
|
5
5
|
import { getOsCommands } from '../os/index.js';
|
|
6
6
|
import { getProvider } from '../providers/index.js';
|
|
7
7
|
import { escapeDoubleQuoted } from '../utils/shell-escape.js';
|
|
8
|
-
import { getAgentOS, touchAgent } from '../utils/agent-helpers.js';
|
|
8
|
+
import { getAgentOS, getAgentShell, touchAgent } from '../utils/agent-helpers.js';
|
|
9
9
|
import { memberIdentifier, resolveMember } from '../utils/resolve-member.js';
|
|
10
10
|
import { validateCredentials, credentialStatusNote } from '../utils/credential-validation.js';
|
|
11
11
|
import { credentialResolve } from '../services/credential-store.js';
|
|
@@ -25,7 +25,7 @@ export const provisionAuthSchema = z.object({
|
|
|
25
25
|
* Claude-only: other providers use a version check for verification.
|
|
26
26
|
*/
|
|
27
27
|
async function verifyWithClaudePrompt(agent, envPrefix) {
|
|
28
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
28
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
29
29
|
const provider = getProvider('claude');
|
|
30
30
|
const strategy = getStrategy(agent);
|
|
31
31
|
const escapedFolder = escapeDoubleQuoted(agent.workFolder);
|
|
@@ -44,7 +44,7 @@ async function verifyWithClaudePrompt(agent, envPrefix) {
|
|
|
44
44
|
* Used to verify non-Claude providers after API key provisioning.
|
|
45
45
|
*/
|
|
46
46
|
async function verifyWithVersion(agent, provider, envPrefix) {
|
|
47
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
47
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
48
48
|
const strategy = getStrategy(agent);
|
|
49
49
|
const prefix = envPrefix ? `${envPrefix} ` : '';
|
|
50
50
|
const cmd = `${prefix}${cmds.agentVersion(provider)}`;
|
|
@@ -60,7 +60,7 @@ async function verifyWithVersion(agent, provider, envPrefix) {
|
|
|
60
60
|
// Flow A: Copy OAuth credentials using the provider interface
|
|
61
61
|
// ---------------------------------------------------------------------------
|
|
62
62
|
async function provisionOAuthCopy(agent, provider) {
|
|
63
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
63
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
64
64
|
const strategy = getStrategy(agent);
|
|
65
65
|
const credentialFiles = provider.oauthCredentialFiles();
|
|
66
66
|
if (!credentialFiles || credentialFiles.length === 0) {
|
|
@@ -139,7 +139,7 @@ async function provisionOAuthCopy(agent, provider) {
|
|
|
139
139
|
// Flow B — API Key Override (all providers)
|
|
140
140
|
// ---------------------------------------------------------------------------
|
|
141
141
|
async function provisionApiKey(agent, apiKey, provider) {
|
|
142
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
142
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
143
143
|
const strategy = getStrategy(agent);
|
|
144
144
|
const envVarName = provider.authEnvVarForToken(apiKey);
|
|
145
145
|
const commands = cmds.setEnv(envVarName, apiKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision-auth.js","sourceRoot":"","sources":["../../src/tools/provision-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,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,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"provision-auth.js","sourceRoot":"","sources":["../../src/tools/provision-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export declare const provisionVcsAuthSchema: z.ZodObject<{
|
|
|
12
12
|
workspace: z.ZodOptional<z.ZodString>;
|
|
13
13
|
org_url: z.ZodOptional<z.ZodString>;
|
|
14
14
|
pat: z.ZodOptional<z.ZodString>;
|
|
15
|
+
pat_expires_at: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
|
|
15
16
|
member_id: z.ZodOptional<z.ZodString>;
|
|
16
17
|
member_name: z.ZodOptional<z.ZodString>;
|
|
17
18
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -21,14 +22,15 @@ export declare const provisionVcsAuthSchema: z.ZodObject<{
|
|
|
21
22
|
git_access?: "read" | "push" | "push+pr" | "admin" | "issues" | "full" | undefined;
|
|
22
23
|
token?: string | undefined;
|
|
23
24
|
pat?: string | undefined;
|
|
25
|
+
api_token?: string | undefined;
|
|
24
26
|
repos?: string[] | undefined;
|
|
25
27
|
workspace?: string | undefined;
|
|
26
28
|
email?: string | undefined;
|
|
27
29
|
label?: string | undefined;
|
|
28
30
|
scope_url?: string | undefined;
|
|
29
31
|
github_mode?: "github-app" | "pat" | undefined;
|
|
30
|
-
api_token?: string | undefined;
|
|
31
32
|
org_url?: string | undefined;
|
|
33
|
+
pat_expires_at?: string | undefined;
|
|
32
34
|
}, {
|
|
33
35
|
provider: "github" | "bitbucket" | "azure-devops";
|
|
34
36
|
member_id?: string | undefined;
|
|
@@ -36,14 +38,15 @@ export declare const provisionVcsAuthSchema: z.ZodObject<{
|
|
|
36
38
|
git_access?: "read" | "push" | "push+pr" | "admin" | "issues" | "full" | undefined;
|
|
37
39
|
token?: string | undefined;
|
|
38
40
|
pat?: string | undefined;
|
|
41
|
+
api_token?: string | undefined;
|
|
39
42
|
repos?: string[] | undefined;
|
|
40
43
|
workspace?: string | undefined;
|
|
41
44
|
email?: string | undefined;
|
|
42
45
|
label?: string | undefined;
|
|
43
46
|
scope_url?: string | undefined;
|
|
44
47
|
github_mode?: "github-app" | "pat" | undefined;
|
|
45
|
-
api_token?: string | undefined;
|
|
46
48
|
org_url?: string | undefined;
|
|
49
|
+
pat_expires_at?: string | undefined;
|
|
47
50
|
}>;
|
|
48
51
|
export type ProvisionVcsAuthInput = z.infer<typeof provisionVcsAuthSchema>;
|
|
49
52
|
export declare function provisionVcsAuth(input: ProvisionVcsAuthInput): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision-vcs-auth.d.ts","sourceRoot":"","sources":["../../src/tools/provision-vcs-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA0CxB,eAAO,MAAM,sBAAsB
|
|
1
|
+
{"version":3,"file":"provision-vcs-auth.d.ts","sourceRoot":"","sources":["../../src/tools/provision-vcs-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA0CxB,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuCjC,CAAC;AAEH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE3E,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2HpF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { getStrategy } from '../services/strategy.js';
|
|
3
3
|
import { getOsCommands } from '../os/index.js';
|
|
4
|
-
import { getAgentOS, touchAgent, checkVcsTokenExpiry } from '../utils/agent-helpers.js';
|
|
4
|
+
import { getAgentOS, getAgentShell, touchAgent, checkVcsTokenExpiry } from '../utils/agent-helpers.js';
|
|
5
5
|
import { memberIdentifier, resolveMember } from '../utils/resolve-member.js';
|
|
6
6
|
import { updateAgent } from '../services/registry.js';
|
|
7
7
|
import { credentialResolve } from '../services/credential-store.js';
|
|
@@ -55,32 +55,26 @@ export const provisionVcsAuthSchema = z.object({
|
|
|
55
55
|
// Azure DevOps fields
|
|
56
56
|
org_url: z.string().optional().describe('Azure DevOps organization URL (e.g. https://dev.azure.com/myorg)'),
|
|
57
57
|
pat: z.string().optional().describe('Azure DevOps personal access token. Supports {{secure.NAME}} token — value is resolved from the credential store before use.'),
|
|
58
|
+
// apra-fleet-5co8.5.1: OPTIONAL, caller-supplied -- Azure DevOps exposes no
|
|
59
|
+
// API to query a PAT's expiry back, so this must come from the operator
|
|
60
|
+
// (the date they picked in the "Set expiration" step when creating the
|
|
61
|
+
// PAT; see skills/fleet/auth-azdevops.md). Deliberately NOT the
|
|
62
|
+
// credential-store's own TTL (credential_store_set ttl_seconds): that
|
|
63
|
+
// mechanism DELETES the stored secret on a resolve past its TTL, which is
|
|
64
|
+
// why e.g. the fleet-e2e-ado store entry is set up with no store-side TTL
|
|
65
|
+
// at all -- conflating the two would silently start deleting a credential
|
|
66
|
+
// whose PAT is merely nearing expiry, not gone. This field only ever flows
|
|
67
|
+
// into deploy metadata to warn/cleanup, never to delete a stored secret.
|
|
68
|
+
// A malformed value here is NOT harmless: it is truthy, so it reaches
|
|
69
|
+
// vcsTokenExpiresAt verbatim, makes every checkVcsTokenExpiry comparison
|
|
70
|
+
// NaN (silencing the warning entirely) and makes scheduleCredentialCleanup
|
|
71
|
+
// fall back to its 55-minute DEFAULT_TTL_MS -- i.e. it would auto-revoke the
|
|
72
|
+
// PAT that was just deployed. Rejected at the schema boundary so no caller
|
|
73
|
+
// can construct that state.
|
|
74
|
+
pat_expires_at: z.string().refine((v) => !Number.isNaN(Date.parse(v)), {
|
|
75
|
+
message: 'pat_expires_at must be a parseable date/time (ISO 8601, e.g. 2027-08-20T00:00:00Z)',
|
|
76
|
+
}).optional().describe('ISO 8601 date/time the Azure DevOps PAT expires, as chosen when creating the token. Propagated to the member registry so provisioning can warn when the PAT is nearing expiry.'),
|
|
58
77
|
});
|
|
59
|
-
function buildCredentials(input) {
|
|
60
|
-
switch (input.provider) {
|
|
61
|
-
case 'github': {
|
|
62
|
-
const mode = input.github_mode ?? 'github-app';
|
|
63
|
-
if (mode === 'pat') {
|
|
64
|
-
if (!input.token)
|
|
65
|
-
return 'GitHub PAT mode requires "token" field.';
|
|
66
|
-
return { type: 'pat', token: input.token };
|
|
67
|
-
}
|
|
68
|
-
return { type: 'github-app', git_access: input.git_access, repos: input.repos };
|
|
69
|
-
}
|
|
70
|
-
case 'bitbucket': {
|
|
71
|
-
if (!input.email || !input.api_token || !input.workspace) {
|
|
72
|
-
return 'Bitbucket requires "email", "api_token", and "workspace" fields.';
|
|
73
|
-
}
|
|
74
|
-
return { email: input.email, api_token: input.api_token, workspace: input.workspace };
|
|
75
|
-
}
|
|
76
|
-
case 'azure-devops': {
|
|
77
|
-
const azPat = input.pat ?? input.token;
|
|
78
|
-
if (!input.org_url || !azPat)
|
|
79
|
-
return 'Azure DevOps requires "org_url" and "pat" (or "token") fields.';
|
|
80
|
-
return { org_url: input.org_url, pat: azPat };
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
78
|
export async function provisionVcsAuth(input) {
|
|
85
79
|
const agentOrError = resolveMember(input.member_id, input.member_name);
|
|
86
80
|
if (typeof agentOrError === 'string')
|
|
@@ -97,32 +91,29 @@ export async function provisionVcsAuth(input) {
|
|
|
97
91
|
resolvedInput[field] = r.resolved;
|
|
98
92
|
}
|
|
99
93
|
}
|
|
100
|
-
// OOB fallback for absent credential
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
if (resolvedInput.provider === 'bitbucket' && resolvedInput.api_token === undefined) {
|
|
110
|
-
const oob = await collectOobApiKey(agent.friendlyName, 'provision_vcs_auth', {
|
|
111
|
-
prompt: `Enter Bitbucket API token for ${agent.friendlyName}`,
|
|
112
|
-
});
|
|
113
|
-
if ('fallback' in oob)
|
|
114
|
-
return oob.fallback ?? 'Error: OOB operation cancelled.';
|
|
115
|
-
resolvedInput.api_token = decryptPassword(oob.password);
|
|
116
|
-
}
|
|
117
|
-
if (resolvedInput.provider === 'azure-devops' && resolvedInput.pat === undefined && resolvedInput.token === undefined) {
|
|
94
|
+
// OOB fallback for an absent credential field, dispatched through the
|
|
95
|
+
// resolved provider (apra-fleet-5co8.3.2). The provider owns which field its
|
|
96
|
+
// secret lives in, when it counts as missing and what the operator is asked
|
|
97
|
+
// -- no provider name and no auth-mode knowledge is left at this call site.
|
|
98
|
+
// Order is unchanged: {{secure.NAME}} resolution first, then OOB collection
|
|
99
|
+
// (an OOB-collected secret is deliberately NOT re-run through
|
|
100
|
+
// resolveSecureField), then credential assembly.
|
|
101
|
+
const missing = service.missingCredential;
|
|
102
|
+
if (missing && missing.isMissing(resolvedInput)) {
|
|
118
103
|
const oob = await collectOobApiKey(agent.friendlyName, 'provision_vcs_auth', {
|
|
119
|
-
prompt:
|
|
104
|
+
prompt: missing.promptFor(agent.friendlyName),
|
|
120
105
|
});
|
|
121
106
|
if ('fallback' in oob)
|
|
122
107
|
return oob.fallback ?? 'Error: OOB operation cancelled.';
|
|
123
|
-
resolvedInput.
|
|
108
|
+
resolvedInput[missing.field] = decryptPassword(oob.password);
|
|
124
109
|
}
|
|
125
|
-
|
|
110
|
+
// buildCredentials is still optional on VcsProviderService while the seam is
|
|
111
|
+
// being adopted; every provider registered above implements it, so an absent
|
|
112
|
+
// implementation is a wiring bug, reported rather than silently deploying
|
|
113
|
+
// undefined credentials.
|
|
114
|
+
const creds = service.buildCredentials
|
|
115
|
+
? service.buildCredentials(resolvedInput)
|
|
116
|
+
: `Provider "${input.provider}" does not support credential assembly.`;
|
|
126
117
|
if (typeof creds === 'string')
|
|
127
118
|
return `❌ ${creds}`;
|
|
128
119
|
const label = input.label ?? input.provider;
|
|
@@ -134,7 +125,7 @@ export async function provisionVcsAuth(input) {
|
|
|
134
125
|
const conn = await strategy.testConnection();
|
|
135
126
|
if (!conn.ok)
|
|
136
127
|
return `❌ Member "${agent.friendlyName}" is offline: ${conn.error}`;
|
|
137
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
128
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
138
129
|
const exec = async (cmd) => {
|
|
139
130
|
const result = await strategy.execCommand(cmd, 15000);
|
|
140
131
|
if (result.code !== 0 && result.stderr)
|
|
@@ -165,7 +156,7 @@ export async function provisionVcsAuth(input) {
|
|
|
165
156
|
// Best-effort connectivity test
|
|
166
157
|
let connectivity;
|
|
167
158
|
try {
|
|
168
|
-
connectivity = await service.testConnectivity(agent, exec);
|
|
159
|
+
connectivity = await service.testConnectivity(agent, exec, scopeUrl);
|
|
169
160
|
}
|
|
170
161
|
catch {
|
|
171
162
|
connectivity = { success: false, message: 'connectivity test threw' };
|
|
@@ -175,13 +166,28 @@ export async function provisionVcsAuth(input) {
|
|
|
175
166
|
const meta = deployResult.metadata
|
|
176
167
|
? Object.entries(deployResult.metadata).map(([k, v]) => ` ${k}: ${v}`).join('\n')
|
|
177
168
|
: '';
|
|
178
|
-
// Check if the just-deployed token is already near expiry
|
|
169
|
+
// Check if the just-deployed token is already near expiry. `agent` was
|
|
170
|
+
// resolved before the updateAgent() call above, so its own vcsProvider may
|
|
171
|
+
// still be stale/absent (e.g. a member's first-ever azure-devops
|
|
172
|
+
// provision) -- pass input.provider explicitly rather than relying on
|
|
173
|
+
// `agent.vcsProvider` reflecting the write that just happened.
|
|
179
174
|
const expiryWarning = deployResult.metadata?.expiresAt
|
|
180
|
-
? checkVcsTokenExpiry({ ...agent, vcsTokenExpiresAt: deployResult.metadata.expiresAt })
|
|
175
|
+
? checkVcsTokenExpiry({ ...agent, vcsProvider: input.provider, vcsTokenExpiresAt: deployResult.metadata.expiresAt })
|
|
181
176
|
: null;
|
|
177
|
+
// apra-fleet-5co8.43: a skipped connectivity check must never read as a
|
|
178
|
+
// verified credential just because `success` is also true on that result
|
|
179
|
+
// -- branch on the machine-detectable `skipped` field (never string-match
|
|
180
|
+
// `message`), kept generic here (no provider special-casing) since
|
|
181
|
+
// `skipped` lives on the shared VcsDeployResult contract every provider's
|
|
182
|
+
// testConnectivity() returns.
|
|
183
|
+
const verificationLine = connectivity.skipped
|
|
184
|
+
? `⏭️ Skipped: ${connectivity.message}`
|
|
185
|
+
: connectivity.success
|
|
186
|
+
? connectivity.message
|
|
187
|
+
: `⚠️ ${connectivity.message}`;
|
|
182
188
|
return `✅ ${deployResult.message} on "${agent.friendlyName}"\n`
|
|
183
189
|
+ (meta ? meta + '\n' : '')
|
|
184
|
-
+ ` Verification: ${
|
|
190
|
+
+ ` Verification: ${verificationLine}`
|
|
185
191
|
+ (expiryWarning ? `\n ${expiryWarning}` : '');
|
|
186
192
|
}
|
|
187
193
|
//# sourceMappingURL=provision-vcs-auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision-vcs-auth.js","sourceRoot":"","sources":["../../src/tools/provision-vcs-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"provision-vcs-auth.js","sourceRoot":"","sources":["../../src/tools/provision-vcs-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,10 +20,10 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
20
20
|
cloud_profile: z.ZodOptional<z.ZodString>;
|
|
21
21
|
cloud_idle_timeout_min: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
|
|
22
22
|
cloud_activity_command: z.ZodOptional<z.ZodString>;
|
|
23
|
-
llm_provider: z.ZodDefault<z.ZodOptional<z.ZodEnum<["claude", "
|
|
24
|
-
model_cheap: z.ZodOptional<z.ZodEnum<["gpt-oss-120b", "gpt-120", "gemini-3.5-flash-lite", "
|
|
25
|
-
model_standard: z.ZodOptional<z.ZodEnum<["gemini-3.5-flash", "gpt-oss-120b", "gpt-120", "sonnet", "
|
|
26
|
-
model_premium: z.ZodOptional<z.ZodEnum<["sonnet", "opus", "gpt-oss-120b"
|
|
23
|
+
llm_provider: z.ZodDefault<z.ZodOptional<z.ZodEnum<["claude", "codex", "copilot", "agy", "opencode", "none"]>>>;
|
|
24
|
+
model_cheap: z.ZodOptional<z.ZodEnum<["gpt-oss-120b", "gpt-120", "gemini-3.5-flash-lite", "haiku", "gpt-5.4-mini"]>>;
|
|
25
|
+
model_standard: z.ZodOptional<z.ZodEnum<["gemini-3.5-flash", "gpt-oss-120b", "gpt-120", "sonnet", "gpt-5.4"]>>;
|
|
26
|
+
model_premium: z.ZodOptional<z.ZodEnum<["sonnet", "opus", "gpt-oss-120b"]>>;
|
|
27
27
|
unattended: z.ZodOptional<z.ZodEffects<z.ZodEnum<["false", "auto", "dangerous"]>, "auto" | "dangerous" | "false", unknown>>;
|
|
28
28
|
category: z.ZodOptional<z.ZodString>;
|
|
29
29
|
tags: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
@@ -41,6 +41,8 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
41
41
|
premium?: string | undefined;
|
|
42
42
|
}>>;
|
|
43
43
|
code_intel_provider: z.ZodOptional<z.ZodEnum<["codebase-memory", "gitnexus", "none"]>>;
|
|
44
|
+
unreservable: z.ZodOptional<z.ZodBoolean>;
|
|
45
|
+
shell: z.ZodOptional<z.ZodEnum<["gitbash", "pwsh7", "powershell5"]>>;
|
|
44
46
|
}, "strip", z.ZodTypeAny, {
|
|
45
47
|
work_folder: string;
|
|
46
48
|
port: number;
|
|
@@ -48,13 +50,15 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
48
50
|
member_type: "local" | "remote";
|
|
49
51
|
cloud_region: string;
|
|
50
52
|
cloud_idle_timeout_min: number;
|
|
51
|
-
llm_provider: "claude" | "
|
|
53
|
+
llm_provider: "claude" | "codex" | "copilot" | "agy" | "opencode" | "none";
|
|
52
54
|
password?: string | undefined;
|
|
53
55
|
host?: string | undefined;
|
|
54
56
|
username?: string | undefined;
|
|
57
|
+
shell?: "gitbash" | "pwsh7" | "powershell5" | undefined;
|
|
55
58
|
unattended?: "auto" | "dangerous" | "false" | undefined;
|
|
56
59
|
category?: string | undefined;
|
|
57
60
|
tags?: string[] | undefined;
|
|
61
|
+
unreservable?: boolean | undefined;
|
|
58
62
|
auth_type?: "password" | "key" | undefined;
|
|
59
63
|
key_path?: string | undefined;
|
|
60
64
|
git_access?: "read" | "push" | "admin" | "issues" | "full" | undefined;
|
|
@@ -63,9 +67,9 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
63
67
|
cloud_instance_id?: string | undefined;
|
|
64
68
|
cloud_profile?: string | undefined;
|
|
65
69
|
cloud_activity_command?: string | undefined;
|
|
66
|
-
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash-lite" | "
|
|
67
|
-
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash" | "sonnet" | "
|
|
68
|
-
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" |
|
|
70
|
+
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash-lite" | "haiku" | "gpt-5.4-mini" | undefined;
|
|
71
|
+
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash" | "sonnet" | "gpt-5.4" | undefined;
|
|
72
|
+
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" | undefined;
|
|
69
73
|
model_tiers?: {
|
|
70
74
|
cheap?: string | undefined;
|
|
71
75
|
standard?: string | undefined;
|
|
@@ -79,9 +83,11 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
79
83
|
host?: string | undefined;
|
|
80
84
|
port?: number | undefined;
|
|
81
85
|
username?: string | undefined;
|
|
86
|
+
shell?: "gitbash" | "pwsh7" | "powershell5" | undefined;
|
|
82
87
|
unattended?: unknown;
|
|
83
88
|
category?: string | undefined;
|
|
84
89
|
tags?: string[] | undefined;
|
|
90
|
+
unreservable?: boolean | undefined;
|
|
85
91
|
member_type?: "local" | "remote" | undefined;
|
|
86
92
|
auth_type?: "password" | "key" | undefined;
|
|
87
93
|
key_path?: string | undefined;
|
|
@@ -93,10 +99,10 @@ export declare const registerMemberSchema: z.ZodObject<{
|
|
|
93
99
|
cloud_profile?: string | undefined;
|
|
94
100
|
cloud_idle_timeout_min?: number | undefined;
|
|
95
101
|
cloud_activity_command?: string | undefined;
|
|
96
|
-
llm_provider?: "claude" | "
|
|
97
|
-
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash-lite" | "
|
|
98
|
-
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash" | "sonnet" | "
|
|
99
|
-
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" |
|
|
102
|
+
llm_provider?: "claude" | "codex" | "copilot" | "agy" | "opencode" | "none" | undefined;
|
|
103
|
+
model_cheap?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash-lite" | "haiku" | "gpt-5.4-mini" | undefined;
|
|
104
|
+
model_standard?: "gpt-oss-120b" | "gpt-120" | "gemini-3.5-flash" | "sonnet" | "gpt-5.4" | undefined;
|
|
105
|
+
model_premium?: "gpt-oss-120b" | "sonnet" | "opus" | undefined;
|
|
100
106
|
model_tiers?: {
|
|
101
107
|
cheap?: string | undefined;
|
|
102
108
|
standard?: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-member.d.ts","sourceRoot":"","sources":["../../src/tools/register-member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"register-member.d.ts","sourceRoot":"","sources":["../../src/tools/register-member.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAQxB,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAapD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAOhE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6C/B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAkBvE,MAAM,WAAW,wBAAwB;IACvC,oBAAoB,EAAE,OAAO,oBAAoB,CAAC;IAClD,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,WAAW,EAAE,OAAO,WAAW,CAAC;CACjC;AAKD,oGAAoG;AACpG,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,OAAO,CAAC,wBAAwB,CAAC,GAAG,IAAI,CAEhG;AAED,uEAAuE;AACvE,wBAAgB,+BAA+B,IAAI,IAAI,CAEtD;AAWD,wBAAsB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAwfhF"}
|
|
@@ -4,6 +4,7 @@ import { v4 as uuid } from 'uuid';
|
|
|
4
4
|
import { encryptPassword, decryptPassword } from '../utils/crypto.js';
|
|
5
5
|
import { detectOS } from '../utils/platform.js';
|
|
6
6
|
import { getOsCommands } from '../os/index.js';
|
|
7
|
+
import { shouldProbeShell, probeWindowsShell } from '../services/shell-probe.js';
|
|
7
8
|
import { getProvider } from '../providers/index.js';
|
|
8
9
|
import { addAgent, getAllAgents, hasDuplicateFolder } from '../services/registry.js';
|
|
9
10
|
import { credentialResolve, credentialSet } from '../services/credential-store.js';
|
|
@@ -47,7 +48,7 @@ export const registerMemberSchema = z.object({
|
|
|
47
48
|
cloud_profile: z.string().optional().describe('AWS CLI profile name (e.g. "apra")'),
|
|
48
49
|
cloud_idle_timeout_min: z.number().min(1, 'cloud_idle_timeout_min must be at least 1 minute').max(1440, 'cloud_idle_timeout_min must be at most 1440 minutes (24 hours)').optional().default(30).describe('Minutes of inactivity before auto-stop (default: 30)'),
|
|
49
50
|
cloud_activity_command: z.string().min(1).optional().describe('Custom shell command for workload detection. Must output "busy" or "idle" on stdout. Checked after GPU, before process check. Useful for CPU-intensive tasks, downloads, or any non-GPU workload.'),
|
|
50
|
-
llm_provider: z.enum(['claude', '
|
|
51
|
+
llm_provider: z.enum(['claude', 'codex', 'copilot', 'agy', 'opencode', 'none']).optional().default('claude').describe('LLM provider for this member (default: "claude"). Determines which CLI is used for execute_prompt, provision_llm_auth, and update_llm_cli. Use "none" for a plain command executor with no LLM at all -- execute_prompt is rejected for these members; use execute_command instead.'),
|
|
51
52
|
model_cheap: z.enum(CURATED_CHEAP_MODELS).optional().describe('Custom cheap model choice from a curated list'),
|
|
52
53
|
model_standard: z.enum(CURATED_STANDARD_MODELS).optional().describe('Custom standard model choice from a curated list'),
|
|
53
54
|
model_premium: z.enum(CURATED_PREMIUM_MODELS).optional().describe('Custom premium model choice from a curated list'),
|
|
@@ -63,6 +64,8 @@ export const registerMemberSchema = z.object({
|
|
|
63
64
|
premium: z.string().optional(),
|
|
64
65
|
}).optional().describe('Per-member model tier map. Keys: cheap, standard, premium. Values: model IDs (e.g. "ollama/qwen3-coder:30b"). A single model fills all tiers. At least one model recommended for opencode members.'),
|
|
65
66
|
code_intel_provider: z.enum(['codebase-memory', 'gitnexus', 'none']).optional().describe('Code-intelligence provider for this member (default: fleet-wide config).'),
|
|
67
|
+
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. Default: false.'),
|
|
68
|
+
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.'),
|
|
66
69
|
});
|
|
67
70
|
const realInteractiveBootstrapDeps = { checkRunningInstance, spawn, getProvider };
|
|
68
71
|
let interactiveBootstrapDeps = realInteractiveBootstrapDeps;
|
|
@@ -103,6 +106,16 @@ export async function registerMember(input) {
|
|
|
103
106
|
if (!input.auth_type)
|
|
104
107
|
return '❌ "auth_type" is required for remote members. Member was NOT registered.';
|
|
105
108
|
}
|
|
109
|
+
// unreservable is reserved for members that never receive a real agent
|
|
110
|
+
// dispatch (e.g. a beads-only fleet-sprint orchestrator shared across
|
|
111
|
+
// concurrent sprints). Without this constraint, an ordinary dispatch
|
|
112
|
+
// member flagged unreservable would let two sprints dispatch to it
|
|
113
|
+
// concurrently -- interleaving prompts into one working tree -- and any
|
|
114
|
+
// member with update_member access could self-escalate past the
|
|
115
|
+
// exclusivity guard entirely.
|
|
116
|
+
if (input.unreservable && (input.llm_provider ?? 'claude') !== 'none') {
|
|
117
|
+
return '❌ "unreservable" requires llm_provider: "none" -- it is reserved for plain command-executor members that never receive an agent dispatch. Member was NOT registered.';
|
|
118
|
+
}
|
|
106
119
|
// SF-17: a remote member's work_folder is used verbatim on the MEMBER's
|
|
107
120
|
// machine -- `~` and relative paths are never resolved for it (by design; see
|
|
108
121
|
// work-folder-validation.ts). Reject them here so the caller supplies a
|
|
@@ -254,6 +267,8 @@ export async function registerMember(input) {
|
|
|
254
267
|
category: input.category,
|
|
255
268
|
tags: input.tags,
|
|
256
269
|
codeIntelProvider: input.code_intel_provider,
|
|
270
|
+
unreservable: input.unreservable ?? false,
|
|
271
|
+
shell: input.shell,
|
|
257
272
|
};
|
|
258
273
|
// --- SSH-dependent steps (skipped for stopped cloud instances) ---
|
|
259
274
|
let detectedOS = isCloud ? 'linux' : undefined;
|
|
@@ -298,7 +313,27 @@ export async function registerMember(input) {
|
|
|
298
313
|
detectedOS = 'linux';
|
|
299
314
|
}
|
|
300
315
|
tempAgent.os = detectedOS;
|
|
301
|
-
|
|
316
|
+
// Step 2b: probe which Windows shell this member actually has (gitbash /
|
|
317
|
+
// pwsh7 / powershell5). Windows-only, and skipped entirely when the
|
|
318
|
+
// operator supplied `shell` explicitly -- an explicit value always wins
|
|
319
|
+
// (apra-fleet-7dir.1.3). Never fails registration: probeWindowsShell
|
|
320
|
+
// degrades to powershell5 with a warning.
|
|
321
|
+
if (shouldProbeShell(detectedOS, tempAgent.shell)) {
|
|
322
|
+
// A remote member's raw command strings are handed straight to its own
|
|
323
|
+
// sshd DefaultShell (see shell-probe.ts's isProvenRemoteBashChannel doc
|
|
324
|
+
// comment) -- a Git-bash binary being installed there proves nothing
|
|
325
|
+
// about that, unlike a local member where LocalStrategy spawns the
|
|
326
|
+
// resolved bash.exe path directly.
|
|
327
|
+
const probeTransport = tempAgent.agentType === 'local' ? 'local' : 'ssh';
|
|
328
|
+
const probe = await probeWindowsShell((command, timeoutMs) => strategy.execCommand(command, timeoutMs), probeTransport);
|
|
329
|
+
tempAgent.shell = probe.shell;
|
|
330
|
+
if (probe.warning)
|
|
331
|
+
warnings.push(probe.warning);
|
|
332
|
+
}
|
|
333
|
+
// The registration-time probes below must speak the SAME shell the member
|
|
334
|
+
// was just registered with, so pass it -- a gitbash member gets bash
|
|
335
|
+
// strings, every other value resolves exactly as before.
|
|
336
|
+
const cmds = getOsCommands(detectedOS, tempAgent.shell);
|
|
302
337
|
const provider = getProvider(input.llm_provider ?? 'claude');
|
|
303
338
|
const providerName = provider.name;
|
|
304
339
|
// No-LLM members (apra-fleet-us9.14) have no CLI to verify or authenticate --
|
|
@@ -366,8 +401,8 @@ export async function registerMember(input) {
|
|
|
366
401
|
//
|
|
367
402
|
// Every provider's transcript path is built under the MEMBER's home dir
|
|
368
403
|
// (issue #390). Only pollDirectoryActivity ever probed it, and that runs
|
|
369
|
-
// exclusively for provisional (AGY/OpenCode) dispatches -- so for Claude
|
|
370
|
-
//
|
|
404
|
+
// exclusively for provisional (AGY/OpenCode) dispatches -- so for Claude
|
|
405
|
+
// members, whose entries always carry a caller-minted logFilePath, the
|
|
371
406
|
// cache was never populated and the synchronous dispatch path
|
|
372
407
|
// (getCachedMemberPathContext) permanently used the username-convention
|
|
373
408
|
// GUESS. A member with a relocated or domain-suffixed home then got a
|
|
@@ -508,6 +543,9 @@ export async function registerMember(input) {
|
|
|
508
543
|
if (tempAgent.tags && tempAgent.tags.length > 0) {
|
|
509
544
|
result += ` Tags: ${tempAgent.tags.join(', ')}\n`;
|
|
510
545
|
}
|
|
546
|
+
if (tempAgent.unreservable) {
|
|
547
|
+
result += ` Unreservable: true (shared -- never exclusively reserved)\n`;
|
|
548
|
+
}
|
|
511
549
|
if (tempAgent.modelCheap)
|
|
512
550
|
result += ` Model Cheap: ${tempAgent.modelCheap}\n`;
|
|
513
551
|
if (tempAgent.modelStandard)
|