@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,6 +1,7 @@
|
|
|
1
1
|
import type { ProviderAdapter, PromptOptions, ParsedResponse, RegisterMcpEndpointOptions, RegisterMcpEndpointResult, WorkspaceTrustExecFn, EnsureWorkspaceTrustedResult, SessionIdStrategy, TargetOS } from './provider.js';
|
|
2
2
|
import type { LlmProvider, SSHExecResult } from '../types.js';
|
|
3
3
|
import type { PromptErrorCategory } from '../utils/prompt-errors.js';
|
|
4
|
+
import type { MemberShell } from '../os/os-commands.js';
|
|
4
5
|
export declare class OpenCodeProvider implements ProviderAdapter {
|
|
5
6
|
readonly name: LlmProvider;
|
|
6
7
|
readonly processName = "opencode";
|
|
@@ -9,7 +10,7 @@ export declare class OpenCodeProvider implements ProviderAdapter {
|
|
|
9
10
|
readonly instructionFileName = "AGENTS.md";
|
|
10
11
|
cliCommand(args: string): string;
|
|
11
12
|
versionCommand(): string;
|
|
12
|
-
installCommand(os: 'linux' | 'macos' | 'windows'): string;
|
|
13
|
+
installCommand(os: 'linux' | 'macos' | 'windows', _shell?: MemberShell): string;
|
|
13
14
|
updateCommand(): string;
|
|
14
15
|
skipPermissionsFlag(): string;
|
|
15
16
|
permissionModeAutoFlag(): string | null;
|
|
@@ -47,6 +48,6 @@ export declare class OpenCodeProvider implements ProviderAdapter {
|
|
|
47
48
|
authEnvVarForToken(_token: string): string;
|
|
48
49
|
wrapWindowsPrompt(setupCmd: string, filePath: string, argList: string, _sessionId?: string, _model?: string): string;
|
|
49
50
|
registerMcpEndpoint(opts: RegisterMcpEndpointOptions): Promise<RegisterMcpEndpointResult>;
|
|
50
|
-
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows'): Promise<EnsureWorkspaceTrustedResult>;
|
|
51
|
+
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows', _shell?: MemberShell): Promise<EnsureWorkspaceTrustedResult>;
|
|
51
52
|
}
|
|
52
53
|
//# sourceMappingURL=opencode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../src/providers/opencode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE5N,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../src/providers/opencode.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,10 @@ export class OpenCodeProvider {
|
|
|
18
18
|
versionCommand() {
|
|
19
19
|
return 'opencode --version 2>&1';
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
// `shell` is intentionally unused: no windows branch exists here -- `npm
|
|
22
|
+
// install -g` runs unchanged from any shell (apra-fleet-7dir.2.7: named
|
|
23
|
+
// here as an adapter needing no per-shell variant, not skipped silently).
|
|
24
|
+
installCommand(os, _shell) {
|
|
22
25
|
if (os === 'linux') {
|
|
23
26
|
return 'curl -fsSL https://opencode.ai/install | bash';
|
|
24
27
|
}
|
|
@@ -267,7 +270,7 @@ export class OpenCodeProvider {
|
|
|
267
270
|
detail: `merged apra-fleet-member into ${configFile} (mcp.apra-fleet-member, remote+bearer-auth headers)`,
|
|
268
271
|
};
|
|
269
272
|
}
|
|
270
|
-
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs) {
|
|
273
|
+
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs, _shell) {
|
|
271
274
|
// apra-fleet-eft.40 provider trust matrix: OpenCode has a first-run trust/onboarding
|
|
272
275
|
// gate too (docs/opencode-exploration.md:92-97), but it is ALREADY handled via the
|
|
273
276
|
// validated --dangerously-skip-permissions flag on `opencode run` (same doc, checklist
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../src/providers/opencode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../src/providers/opencode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { LlmProvider } from '../types.js';
|
|
2
2
|
import type { SSHExecResult } from '../types.js';
|
|
3
3
|
import type { PromptErrorCategory } from '../utils/prompt-errors.js';
|
|
4
|
+
import type { MemberShell } from '../os/os-commands.js';
|
|
4
5
|
export type { LlmProvider };
|
|
5
6
|
/** The OS of the machine a resolved path will be USED on (the member's own
|
|
6
7
|
* machine), which is NOT necessarily the OS this hub process runs on. */
|
|
@@ -12,7 +13,7 @@ export type TargetOS = 'linux' | 'macos' | 'windows';
|
|
|
12
13
|
* Providers previously built member-side log paths with the default `path`
|
|
13
14
|
* module, so a Windows hub produced backslash-joined paths for a Linux member
|
|
14
15
|
* (and vice versa) -- a path that can never exist on the member, which silently
|
|
15
|
-
* disables stall detection (Claude
|
|
16
|
+
* disables stall detection (Claude) or manufactures a false-positive
|
|
16
17
|
* stall kill (AGY/OpenCode).
|
|
17
18
|
*
|
|
18
19
|
* `targetOs === undefined` deliberately keeps the legacy host-convention
|
|
@@ -42,7 +43,7 @@ export type SessionIdStrategy = {
|
|
|
42
43
|
export declare function encodeClaudeProjectDir(workFolder: string): string;
|
|
43
44
|
/**
|
|
44
45
|
* Build a `--resume <id>` flag with session ID sanitization and quoting.
|
|
45
|
-
* Shared by providers that pass session IDs on the command line (Claude
|
|
46
|
+
* Shared by providers that pass session IDs on the command line (Claude).
|
|
46
47
|
* @param sessionId - The raw session ID (will be sanitized)
|
|
47
48
|
* @param fallback - Value to return when sessionId is absent (default: '')
|
|
48
49
|
*/
|
|
@@ -119,7 +120,12 @@ export interface ProviderAdapter {
|
|
|
119
120
|
readonly instructionFileName: string;
|
|
120
121
|
cliCommand(args: string): string;
|
|
121
122
|
versionCommand(): string;
|
|
122
|
-
|
|
123
|
+
/** `shell` is the member's registered shell (only meaningful for
|
|
124
|
+
* `os === 'windows'`). A gitbash Windows member gets a bash-invokable
|
|
125
|
+
* install string; every other combination -- including a Windows member
|
|
126
|
+
* with no shell recorded, or pwsh7/powershell5 -- resolves exactly as it
|
|
127
|
+
* did before the shell parameter existed (apra-fleet-7dir.2.7). */
|
|
128
|
+
installCommand(os: 'linux' | 'macos' | 'windows', shell?: MemberShell): string;
|
|
123
129
|
updateCommand(): string;
|
|
124
130
|
buildPromptCommand(opts: PromptOptions): string;
|
|
125
131
|
skipPermissionsFlag(): string;
|
|
@@ -177,7 +183,7 @@ export interface ProviderAdapter {
|
|
|
177
183
|
* Default: passthrough (return content unchanged). */
|
|
178
184
|
transformAgent(content: string, relPath: string): string;
|
|
179
185
|
/** Returns the CLI flag/prefix for activating a named agent.
|
|
180
|
-
* Claude/AGY: '--agent "name"'.
|
|
186
|
+
* Claude/AGY: '--agent "name"'. Others: ''. */
|
|
181
187
|
agentNameFlag(agentName: string): string;
|
|
182
188
|
classifyError(output: string): PromptErrorCategory;
|
|
183
189
|
/** Returns the config file path(s) for this provider's permission config (relative to repo root).
|
|
@@ -202,7 +208,7 @@ export interface ProviderAdapter {
|
|
|
202
208
|
/** JSON output flag for the CLI (e.g. --output-format json, --json, --format json) */
|
|
203
209
|
jsonOutputFlag(): string;
|
|
204
210
|
/** Args for headless invocation with a safe literal prompt string.
|
|
205
|
-
* Returns e.g. `-p "LITERAL"` for Claude/
|
|
211
|
+
* Returns e.g. `-p "LITERAL"` for Claude/AGY/Copilot or `exec "LITERAL"` for Codex. */
|
|
206
212
|
headlessInvocation(promptLiteral: string): string;
|
|
207
213
|
/** Register (or update) this member's apra-fleet MCP endpoint using the provider's own
|
|
208
214
|
* native mechanism (CLI verb, e.g. Claude's `claude mcp add`; or config-file merge, e.g.
|
|
@@ -234,7 +240,10 @@ export interface ProviderAdapter {
|
|
|
234
240
|
* `execCommand` is the delivery channel (same one compose_permissions' deliverConfigFile
|
|
235
241
|
* uses), so this works uniformly for local and remote (SSH) members. Non-Claude
|
|
236
242
|
* providers no-op -- see each implementation's rationale comment (apra-fleet-eft.40
|
|
237
|
-
* provider trust matrix). Callers should log distinctly on `seeded: true` vs `false`.
|
|
238
|
-
|
|
243
|
+
* provider trust matrix). Callers should log distinctly on `seeded: true` vs `false`.
|
|
244
|
+
* `shell` is the member's REGISTERED shell and is only meaningful when `agentOs` is
|
|
245
|
+
* 'windows': a member registered as Git-for-Windows bash needs POSIX command strings,
|
|
246
|
+
* because the PowerShell ones are handed straight to bash.exe and fail (apra-fleet-7dir.2.8). */
|
|
247
|
+
ensureWorkspaceTrusted(workFolder: string, execCommand: WorkspaceTrustExecFn, agentOs?: 'linux' | 'macos' | 'windows', shell?: MemberShell): Promise<EnsureWorkspaceTrustedResult>;
|
|
239
248
|
}
|
|
240
249
|
//# sourceMappingURL=provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/providers/provider.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/providers/provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { sanitizeSessionId } from '../os/os-commands.js';
|
|
|
8
8
|
* Providers previously built member-side log paths with the default `path`
|
|
9
9
|
* module, so a Windows hub produced backslash-joined paths for a Linux member
|
|
10
10
|
* (and vice versa) -- a path that can never exist on the member, which silently
|
|
11
|
-
* disables stall detection (Claude
|
|
11
|
+
* disables stall detection (Claude) or manufactures a false-positive
|
|
12
12
|
* stall kill (AGY/OpenCode).
|
|
13
13
|
*
|
|
14
14
|
* `targetOs === undefined` deliberately keeps the legacy host-convention
|
|
@@ -45,7 +45,7 @@ export function encodeClaudeProjectDir(workFolder) {
|
|
|
45
45
|
}
|
|
46
46
|
/**
|
|
47
47
|
* Build a `--resume <id>` flag with session ID sanitization and quoting.
|
|
48
|
-
* Shared by providers that pass session IDs on the command line (Claude
|
|
48
|
+
* Shared by providers that pass session IDs on the command line (Claude).
|
|
49
49
|
* @param sessionId - The raw session ID (will be sanitized)
|
|
50
50
|
* @param fallback - Value to return when sessionId is absent (default: '')
|
|
51
51
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/providers/provider.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/providers/provider.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AASzD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,SAAS,CAAC,QAA8B,EAAE,GAAG,QAAkB;IAC7E,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IAChE,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IAC1D,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;AACtC,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,cAAc,CAAC,OAAkC;IAC/D,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAClC,OAAO,OAAO,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;AACjC,CAAC;AAMD,MAAM,UAAU,sBAAsB,CAAC,UAAkB;IACvD,OAAO,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;AAClD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,SAA6B,EAAE,QAAQ,GAAG,EAAE;IAC1E,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,aAAa,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC;IACtD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,OAAO,iBAAiB,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC;AAC1D,CAAC;AA2BD,8EAA8E;AAC9E,2EAA2E;AAC3E,+EAA+E;AAC/E,4EAA4E;AAC5E,uDAAuD;AACvD,MAAM,UAAU,kBAAkB,CAAC,MAAyC;IAC1E,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC1B,OAAO,MAAM,CAAC,cAAc,KAAK,WAAW,IAAI,MAAM,CAAC,OAAO,KAAK,iBAAiB,CAAC;AACvF,CAAC"}
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import { createHash } from 'node:crypto';
|
|
12
12
|
import { getOsCommands } from '../os/index.js';
|
|
13
|
-
import { getAgentOS } from '../utils/agent-helpers.js';
|
|
13
|
+
import { getAgentOS, getAgentShell } from '../utils/agent-helpers.js';
|
|
14
14
|
import { getStrategy } from './strategy.js';
|
|
15
15
|
import { uploadContentToHome } from './sftp.js';
|
|
16
16
|
import { loadAgentAssets } from '../cli/install.js';
|
|
@@ -53,7 +53,7 @@ const HASH_LINE_RE = /^([0-9a-fA-F]{64})\s+\*?(.+)$/;
|
|
|
53
53
|
* successful probe that yields an empty map.
|
|
54
54
|
*/
|
|
55
55
|
export async function probeRemoteAgentHashes(agent, dir) {
|
|
56
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
56
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
57
57
|
const strategy = getStrategy(agent);
|
|
58
58
|
let result;
|
|
59
59
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-provisioner.js","sourceRoot":"","sources":["../../src/services/agent-provisioner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-provisioner.js","sourceRoot":"","sources":["../../src/services/agent-provisioner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getStrategy } from '../strategy.js';
|
|
2
2
|
import { getOsCommands } from '../../os/index.js';
|
|
3
|
-
import { getAgentOS } from '../../utils/agent-helpers.js';
|
|
3
|
+
import { getAgentOS, getAgentShell } from '../../utils/agent-helpers.js';
|
|
4
4
|
const ACTIVITY_TIMEOUT_MS = 5000;
|
|
5
5
|
/**
|
|
6
6
|
* Check whether a fleet member is actively doing work.
|
|
@@ -22,7 +22,7 @@ export async function checkMemberActivity(agent) {
|
|
|
22
22
|
catch {
|
|
23
23
|
return 'unknown';
|
|
24
24
|
}
|
|
25
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
25
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
26
26
|
// GPU check — exit 2 (or any non-zero) means nvidia-smi unavailable, skip gracefully
|
|
27
27
|
try {
|
|
28
28
|
const gpuResult = await strategy.execCommand(cmds.gpuProcessCheck(), ACTIVITY_TIMEOUT_MS);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../../src/services/cloud/activity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../../src/services/cloud/activity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAIzE,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAEjC;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAAY;IACpD,IAAI,QAAQ,CAAC;IACb,IAAI,CAAC;QACH,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpE,qFAAqF;IACrF,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,mBAAmB,CAAC,CAAC;QAC1F,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,MAAM;YAAE,OAAO,UAAU,CAAC;QAClF,wFAAwF;IAC1F,CAAC;IAAC,MAAM,CAAC;QACP,wEAAwE;IAC1E,CAAC;IAED,qEAAqE;IACrE,yFAAyF;IACzF,IAAI,KAAK,CAAC,KAAK,EAAE,eAAe,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;YAC/F,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,MAAM;gBAAE,OAAO,cAAc,CAAC;YACtF,+EAA+E;QACjF,CAAC;QAAC,MAAM,CAAC;YACP,yFAAyF;QAC3F,CAAC;IACH,CAAC;IAED,gBAAgB;IAChB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,CACvC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAAC,EACxC,mBAAmB,CACpB,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACpC,IAAI,MAAM,KAAK,YAAY,IAAI,MAAM,KAAK,YAAY;YAAE,OAAO,cAAc,CAAC;IAChF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC,CAAC,0CAA0C;IAC9D,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-admission.d.ts","sourceRoot":"","sources":["../../src/services/context-admission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,MAAM,MAAM,iBAAiB,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEhD;;2CAE2C;AAC3C,eAAO,MAAM,0BAA0B,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAIxE,CAAC;AAEF;;2DAE2D;AAC3D,eAAO,MAAM,4BAA4B,QAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"context-admission.d.ts","sourceRoot":"","sources":["../../src/services/context-admission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,MAAM,MAAM,iBAAiB,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEhD;;2CAE2C;AAC3C,eAAO,MAAM,0BAA0B,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAIxE,CAAC;AAEF;;2DAE2D;AAC3D,eAAO,MAAM,4BAA4B,QAAS,CAAC;AAqCnD;;;yEAGyE;AACzE,wBAAgB,aAAa,IAAI,SAAS,GAAG,MAAM,CAElD;AAED,4EAA4E;AAC5E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAKxF;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,qBAAqB,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAI/I;AASD;;mBAEmB;AACnB,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAO9H;AAED;2DAC2D;AAC3D,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAI5E;AAED,iEAAiE;AACjE,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,sBAAsB,CAAC;IAC/B;;;yBAGqB;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,QAAQ,EAAE,WAAW,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,sBAAsB,CA+BzB"}
|
|
@@ -14,15 +14,17 @@ export const DEFAULT_SAFETY_MARGIN_TOKENS = 20_000;
|
|
|
14
14
|
/**
|
|
15
15
|
* Known context windows (tokens) per provider, sourced from
|
|
16
16
|
* docs/provider-matrix.md's "Context window" row (2026-07 snapshot):
|
|
17
|
-
* Claude 200K (Sonnet)/1M (Opus 4.7),
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
21
|
-
* `contextAdmission.contextWindows`.
|
|
17
|
+
* Claude 200K (Sonnet)/1M (Opus 4.7), Codex 192K, Copilot 64K, AGY 1M.
|
|
18
|
+
* `opencode`/`none` have no published figure in that survey -- default to
|
|
19
|
+
* Codex's documented 192K as a conservative (not optimistic) fallback
|
|
20
|
+
* rather than inventing a number. Overridable via config.json's
|
|
21
|
+
* `contextAdmission.contextWindows`. Partial (rather than an exhaustive
|
|
22
|
+
* Record<LlmProvider, number>) so an unlisted provider falls through to the
|
|
23
|
+
* codex-default lookup below instead of requiring every LlmProvider member
|
|
24
|
+
* to carry an entry here.
|
|
22
25
|
*/
|
|
23
26
|
const DEFAULT_PROVIDER_WINDOW_TOKENS = {
|
|
24
27
|
claude: 200_000,
|
|
25
|
-
gemini: 1_000_000,
|
|
26
28
|
codex: 192_000,
|
|
27
29
|
copilot: 64_000,
|
|
28
30
|
agy: 1_000_000,
|
|
@@ -54,7 +56,7 @@ export function contextWindowTokens(provider, resolvedModel) {
|
|
|
54
56
|
return overrides[provider];
|
|
55
57
|
if (provider === 'claude' && CLAUDE_OPUS_MODEL_RE.test(resolvedModel))
|
|
56
58
|
return 1_000_000;
|
|
57
|
-
return DEFAULT_PROVIDER_WINDOW_TOKENS[provider] ?? DEFAULT_PROVIDER_WINDOW_TOKENS.codex;
|
|
59
|
+
return DEFAULT_PROVIDER_WINDOW_TOKENS[provider] ?? DEFAULT_PROVIDER_WINDOW_TOKENS.codex ?? 192_000;
|
|
58
60
|
}
|
|
59
61
|
/**
|
|
60
62
|
* Resolves a dispatch's declared context demand: an explicit token count wins
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-admission.js","sourceRoot":"","sources":["../../src/services/context-admission.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAyBlD;;2CAE2C;AAC3C,MAAM,CAAC,MAAM,0BAA0B,GAAsC;IAC3E,CAAC,EAAE,KAAK;IACR,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,MAAM;CACV,CAAC;AAEF;;2DAE2D;AAC3D,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC;AAEnD
|
|
1
|
+
{"version":3,"file":"context-admission.js","sourceRoot":"","sources":["../../src/services/context-admission.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-cleanup.d.ts","sourceRoot":"","sources":["../../src/services/credential-cleanup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"credential-cleanup.d.ts","sourceRoot":"","sources":["../../src/services/credential-cleanup.ts"],"names":[],"mappings":"AA8BA,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CA8CnF;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAM7D;AAED,wBAAgB,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAE9E"}
|
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
import { getAllAgents } from './registry.js';
|
|
2
2
|
import { getStrategy } from './strategy.js';
|
|
3
3
|
import { getOsCommands } from '../os/index.js';
|
|
4
|
-
import { getAgentOS } from '../utils/agent-helpers.js';
|
|
4
|
+
import { getAgentOS, getAgentShell } from '../utils/agent-helpers.js';
|
|
5
5
|
import { githubProvider } from './vcs/github.js';
|
|
6
6
|
import { bitbucketProvider } from './vcs/bitbucket.js';
|
|
7
7
|
import { azureDevOpsProvider } from './vcs/azure-devops.js';
|
|
8
8
|
const DEFAULT_TTL_MS = 55 * 60 * 1000; // 55 minutes
|
|
9
|
+
// apra-fleet-5co8.5.1: setTimeout's delay is a signed 32-bit int internally;
|
|
10
|
+
// Node (and browsers) SILENTLY CLAMP an overflowing delay to ~1ms rather than
|
|
11
|
+
// running it after the full requested duration (see Node's lib/timers.js
|
|
12
|
+
// `timeoutInfo` overflow handling / the Node TimeoutOverflowWarning). A
|
|
13
|
+
// long-lived Azure DevOps PAT (skills/fleet/auth-azdevops.md recommends 90
|
|
14
|
+
// days, i.e. ~7.8e9 ms) blows well past this ceiling -- scheduling a raw
|
|
15
|
+
// setTimeout for it would auto-revoke the credential we just deployed
|
|
16
|
+
// almost immediately, the exact opposite of "warn, never delete" this task
|
|
17
|
+
// was scoped to.
|
|
18
|
+
const MAX_TIMEOUT_MS = 2 ** 31 - 1; // ~24.8 days
|
|
9
19
|
const cleanupTimers = new Map();
|
|
10
20
|
const providers = {
|
|
11
21
|
github: githubProvider,
|
|
@@ -18,7 +28,16 @@ export function scheduleCredentialCleanup(agentId, expiresAt) {
|
|
|
18
28
|
if (expiresAt) {
|
|
19
29
|
const expiresMs = new Date(expiresAt).getTime();
|
|
20
30
|
if (!isNaN(expiresMs)) {
|
|
21
|
-
|
|
31
|
+
const untilExpiry = expiresMs - Date.now();
|
|
32
|
+
if (untilExpiry > MAX_TIMEOUT_MS) {
|
|
33
|
+
// Beyond setTimeout's ceiling: do not schedule an auto-revoke that
|
|
34
|
+
// would silently fire near-immediately instead of at the real
|
|
35
|
+
// expiry. checkVcsTokenExpiry's day-scale warning (fired on the next
|
|
36
|
+
// provision/preflight check) and reactive AUTH_EXPIRED
|
|
37
|
+
// classification are the backstop for this horizon instead.
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
delayMs = Math.max(0, untilExpiry);
|
|
22
41
|
}
|
|
23
42
|
}
|
|
24
43
|
const timer = setTimeout(async () => {
|
|
@@ -35,7 +54,7 @@ export function scheduleCredentialCleanup(agentId, expiresAt) {
|
|
|
35
54
|
const conn = await strategy.testConnection();
|
|
36
55
|
if (!conn.ok)
|
|
37
56
|
return;
|
|
38
|
-
const cmds = getOsCommands(getAgentOS(agent));
|
|
57
|
+
const cmds = getOsCommands(getAgentOS(agent), getAgentShell(agent));
|
|
39
58
|
const exec = async (cmd) => {
|
|
40
59
|
const result = await strategy.execCommand(cmd, 15000);
|
|
41
60
|
return result.stdout;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-cleanup.js","sourceRoot":"","sources":["../../src/services/credential-cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"credential-cleanup.js","sourceRoot":"","sources":["../../src/services/credential-cleanup.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ export declare function getCachedMemberPathContext(agent: Agent): MemberPathCont
|
|
|
61
61
|
* Before this, `getMemberPathContext` (the only probing resolver) had exactly
|
|
62
62
|
* ONE caller: `pollDirectoryActivity`, which runs solely for provisional
|
|
63
63
|
* dispatches with a null logFilePath -- i.e. AGY/OpenCode fresh turns. Claude
|
|
64
|
-
*
|
|
64
|
+
* sessions are caller-minted, so their stall entries always carry a
|
|
65
65
|
* logFilePath and never reach it. Their cache therefore stayed empty forever,
|
|
66
66
|
* and the synchronous dispatch-path resolver (`getCachedMemberPathContext`,
|
|
67
67
|
* used by execute_prompt to name the transcript file) permanently fell back to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"member-home.d.ts","sourceRoot":"","sources":["../../src/services/member-home.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"member-home.d.ts","sourceRoot":"","sources":["../../src/services/member-home.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AA0EzD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAKnG;AAED;qDACqD;AACrD,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,OAAO,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAEhF,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC/B,MAAM,EAAE,aAAa,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAc3E;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAgBnF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAW1E;AAMD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAkBxD;AAED;2CAC2C;AAC3C,wBAAgB,uBAAuB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAQ/D;AAED,iFAAiF;AACjF,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAE1E"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* wrong user (hub `alice` vs member `bella`), and the resulting path can never
|
|
9
9
|
* exist on the member:
|
|
10
10
|
*
|
|
11
|
-
* - Claude
|
|
11
|
+
* - Claude: the stall poller reads a path that is never created, so
|
|
12
12
|
* `lastTimestamp` is always null, which the detector treats as "log not
|
|
13
13
|
* written yet -- do not count a stall cycle". Stall detection silently goes
|
|
14
14
|
* inert for that member.
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
*/
|
|
26
26
|
import os from 'node:os';
|
|
27
27
|
import { getStrategy } from './strategy.js';
|
|
28
|
-
import { getAgentOS } from '../utils/agent-helpers.js';
|
|
28
|
+
import { getAgentOS, getAgentShell, isPosixShell } from '../utils/agent-helpers.js';
|
|
29
29
|
import { logWarn } from '../utils/log-helpers.js';
|
|
30
30
|
import { getProvider } from '../providers/index.js';
|
|
31
31
|
import { wrapPowerShellEncoded } from '../os/windows.js';
|
|
@@ -50,22 +50,25 @@ const PROBE_TIMEOUT_MS = 10_000;
|
|
|
50
50
|
* - POSIX: `printf '%s'` rather than `echo` -- no trailing newline, no shell
|
|
51
51
|
* builtin escape-interpretation differences between sh/bash/dash.
|
|
52
52
|
*/
|
|
53
|
-
function probeCommandFor(targetOs) {
|
|
54
|
-
return targetOs
|
|
55
|
-
?
|
|
56
|
-
: '
|
|
53
|
+
function probeCommandFor(targetOs, shell) {
|
|
54
|
+
return isPosixShell(targetOs, shell)
|
|
55
|
+
? 'printf \'%s\' "$HOME"'
|
|
56
|
+
: wrapPowerShellEncoded('[Console]::Out.Write($env:USERPROFILE)');
|
|
57
57
|
}
|
|
58
58
|
/** Absolute POSIX path, Windows drive path, or UNC share. Anything else is
|
|
59
|
-
* shell noise (banner text, an error message), not a home directory.
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
* shell noise (banner text, an error message), not a home directory. A
|
|
60
|
+
* gitbash member's $HOME is itself a POSIX-style path (e.g. /c/Users/name),
|
|
61
|
+
* so it is checked the same way as a non-Windows member. */
|
|
62
|
+
function looksAbsolute(candidate, targetOs, shell) {
|
|
63
|
+
if (targetOs === 'windows' && !isPosixShell(targetOs, shell))
|
|
62
64
|
return /^([A-Za-z]:[\\/]|\\\\)/.test(candidate);
|
|
63
65
|
return candidate.startsWith('/');
|
|
64
66
|
}
|
|
65
67
|
async function probeHomeDir(agent) {
|
|
66
68
|
const targetOs = getAgentOS(agent);
|
|
69
|
+
const shell = getAgentShell(agent);
|
|
67
70
|
try {
|
|
68
|
-
const result = await getStrategy(agent).execCommand(probeCommandFor(targetOs), PROBE_TIMEOUT_MS);
|
|
71
|
+
const result = await getStrategy(agent).execCommand(probeCommandFor(targetOs, shell), PROBE_TIMEOUT_MS);
|
|
69
72
|
if (result.code !== 0) {
|
|
70
73
|
logWarn('member_home_probe', `home dir probe failed for ${agent.friendlyName}: code=${result.code} stderr=${result.stderr.trim()}`);
|
|
71
74
|
return null;
|
|
@@ -77,7 +80,7 @@ async function probeHomeDir(agent) {
|
|
|
77
80
|
.map(l => l.trim())
|
|
78
81
|
.filter(Boolean)
|
|
79
82
|
.pop();
|
|
80
|
-
if (!candidate || !looksAbsolute(candidate, targetOs)) {
|
|
83
|
+
if (!candidate || !looksAbsolute(candidate, targetOs, shell)) {
|
|
81
84
|
logWarn('member_home_probe', `home dir probe for ${agent.friendlyName} returned a non-path value; ignoring`);
|
|
82
85
|
return null;
|
|
83
86
|
}
|
|
@@ -196,7 +199,7 @@ const HOME_CAPABILITY_SENTINEL = '/__fleet_capability_probe__';
|
|
|
196
199
|
* Before this, `getMemberPathContext` (the only probing resolver) had exactly
|
|
197
200
|
* ONE caller: `pollDirectoryActivity`, which runs solely for provisional
|
|
198
201
|
* dispatches with a null logFilePath -- i.e. AGY/OpenCode fresh turns. Claude
|
|
199
|
-
*
|
|
202
|
+
* sessions are caller-minted, so their stall entries always carry a
|
|
200
203
|
* logFilePath and never reach it. Their cache therefore stayed empty forever,
|
|
201
204
|
* and the synchronous dispatch-path resolver (`getCachedMemberPathContext`,
|
|
202
205
|
* used by execute_prompt to name the transcript file) permanently fell back to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"member-home.js","sourceRoot":"","sources":["../../src/services/member-home.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AAGzB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"member-home.js","sourceRoot":"","sources":["../../src/services/member-home.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-pricing.d.ts","sourceRoot":"","sources":["../../src/services/model-pricing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,UAAU,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;CAC5B,CAAC;
|
|
1
|
+
{"version":3,"file":"model-pricing.d.ts","sourceRoot":"","sources":["../../src/services/model-pricing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,UAAU,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;CAC5B,CAAC;AA0FF;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,GAAG,kBAAkB,CAQjG"}
|
|
@@ -19,11 +19,6 @@ const PROVIDER_MODEL_PRICING = {
|
|
|
19
19
|
'gemini-3.5-flash': { prompt: 0.35, completion: 1.05 },
|
|
20
20
|
'claude-sonnet-4.6': { prompt: 3.00, completion: 15.00 },
|
|
21
21
|
},
|
|
22
|
-
gemini: {
|
|
23
|
-
'gemini-3.5-flash-lite': { prompt: 0.10, completion: 0.40 },
|
|
24
|
-
'gemini-3.5-flash': { prompt: 0.35, completion: 1.05 },
|
|
25
|
-
'gemini-3.1-pro-preview': { prompt: 3.50, completion: 10.50 },
|
|
26
|
-
},
|
|
27
22
|
codex: {
|
|
28
23
|
'gpt-5.4-mini': { prompt: 0.25, completion: 2.00 },
|
|
29
24
|
'gpt-5.4': { prompt: 5.00, completion: 15.00 },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-pricing.js","sourceRoot":"","sources":["../../src/services/model-pricing.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAcpD;;;;;;;;GAQG;AACH,MAAM,sBAAsB,GAAyF;IACnH,MAAM,EAAE;QACN,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QACzC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QAC3C,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE;KAC3C;IACD,GAAG,EAAE;QACH,uBAAuB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QAC3D,kBAAkB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QACtD,mBAAmB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;KACzD;IACD,
|
|
1
|
+
{"version":3,"file":"model-pricing.js","sourceRoot":"","sources":["../../src/services/model-pricing.ts"],"names":[],"mappings":"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"}
|