@apralabs/apra-fleet 0.4.1 → 0.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +53 -12
- package/dist/agents/backlog-groomer.md +42 -21
- package/dist/agents/ci-watcher.md +14 -0
- package/dist/agents/deployer.md +59 -46
- package/dist/agents/doer.md +157 -134
- package/dist/agents/harvester.md +31 -32
- package/dist/agents/integ-test-runner.md +92 -113
- package/dist/agents/kb-reconciler.md +40 -42
- package/dist/agents/plan-reviewer.md +139 -63
- package/dist/agents/planner.md +176 -100
- package/dist/agents/regression-test-runner.md +77 -81
- package/dist/agents/reviewer.md +69 -85
- package/dist/agents/schemas/integ-test-runner-output.json +1 -1
- package/dist/agents/schemas/plan-reviewer-output.json +37 -0
- package/dist/agents/schemas/regression-test-runner-output.json +4 -17
- package/dist/cli/agent-transform.d.ts +83 -2
- package/dist/cli/agent-transform.d.ts.map +1 -1
- package/dist/cli/agent-transform.js +266 -21
- package/dist/cli/agent-transform.js.map +1 -1
- package/dist/cli/auth.d.ts.map +1 -1
- package/dist/cli/auth.js +29 -11
- package/dist/cli/auth.js.map +1 -1
- package/dist/cli/config.d.ts +7 -5
- package/dist/cli/config.d.ts.map +1 -1
- package/dist/cli/config.js +44 -43
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/install.d.ts +33 -0
- package/dist/cli/install.d.ts.map +1 -1
- package/dist/cli/install.js +294 -61
- package/dist/cli/install.js.map +1 -1
- package/dist/cli/kb-directives.d.ts.map +1 -1
- package/dist/cli/kb-directives.js +2 -1
- package/dist/cli/kb-directives.js.map +1 -1
- package/dist/cli/register-member.d.ts.map +1 -1
- package/dist/cli/register-member.js +7 -3
- package/dist/cli/register-member.js.map +1 -1
- package/dist/cli/start.d.ts.map +1 -1
- package/dist/cli/start.js +7 -0
- package/dist/cli/start.js.map +1 -1
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +5 -3
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/watch.d.ts +26 -3
- package/dist/cli/watch.d.ts.map +1 -1
- package/dist/cli/watch.js +41 -9
- package/dist/cli/watch.js.map +1 -1
- package/dist/commands/kb-server.d.ts +3 -0
- package/dist/commands/kb-server.d.ts.map +1 -1
- package/dist/commands/kb-server.js +43 -3
- package/dist/commands/kb-server.js.map +1 -1
- package/dist/index.js +3 -3
- package/dist/os/git-bash-candidates.d.ts +35 -0
- package/dist/os/git-bash-candidates.d.ts.map +1 -0
- package/dist/os/git-bash-candidates.js +46 -0
- package/dist/os/git-bash-candidates.js.map +1 -0
- package/dist/os/index.d.ts +13 -4
- package/dist/os/index.d.ts.map +1 -1
- package/dist/os/index.js +17 -2
- package/dist/os/index.js.map +1 -1
- package/dist/os/linux.d.ts +6 -0
- package/dist/os/linux.d.ts.map +1 -1
- package/dist/os/linux.js +36 -3
- package/dist/os/linux.js.map +1 -1
- package/dist/os/os-commands.d.ts +68 -2
- package/dist/os/os-commands.d.ts.map +1 -1
- package/dist/os/os-commands.js.map +1 -1
- package/dist/os/windows-gitbash.d.ts +98 -0
- package/dist/os/windows-gitbash.d.ts.map +1 -0
- package/dist/os/windows-gitbash.js +259 -0
- package/dist/os/windows-gitbash.js.map +1 -0
- package/dist/os/windows.d.ts +6 -0
- package/dist/os/windows.d.ts.map +1 -1
- package/dist/os/windows.js +73 -8
- package/dist/os/windows.js.map +1 -1
- package/dist/providers/agy.d.ts +118 -8
- package/dist/providers/agy.d.ts.map +1 -1
- package/dist/providers/agy.js +580 -55
- package/dist/providers/agy.js.map +1 -1
- package/dist/providers/claude.d.ts +83 -4
- package/dist/providers/claude.d.ts.map +1 -1
- package/dist/providers/claude.js +365 -12
- package/dist/providers/claude.js.map +1 -1
- package/dist/providers/codex.d.ts +7 -4
- package/dist/providers/codex.d.ts.map +1 -1
- package/dist/providers/codex.js +24 -4
- package/dist/providers/codex.js.map +1 -1
- package/dist/providers/copilot.d.ts +7 -4
- package/dist/providers/copilot.d.ts.map +1 -1
- package/dist/providers/copilot.js +27 -4
- package/dist/providers/copilot.js.map +1 -1
- package/dist/providers/index.d.ts +0 -1
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +0 -3
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/none.d.ts +7 -4
- package/dist/providers/none.d.ts.map +1 -1
- package/dist/providers/none.js +22 -4
- package/dist/providers/none.js.map +1 -1
- package/dist/providers/opencode.d.ts +6 -3
- package/dist/providers/opencode.d.ts.map +1 -1
- package/dist/providers/opencode.js +27 -4
- package/dist/providers/opencode.js.map +1 -1
- package/dist/providers/provider.d.ts +215 -11
- package/dist/providers/provider.d.ts.map +1 -1
- package/dist/providers/provider.js +58 -2
- package/dist/providers/provider.js.map +1 -1
- package/dist/services/agent-provisioner.js +2 -2
- package/dist/services/agent-provisioner.js.map +1 -1
- package/dist/services/agy-project.d.ts +102 -0
- package/dist/services/agy-project.d.ts.map +1 -0
- package/dist/services/agy-project.js +356 -0
- package/dist/services/agy-project.js.map +1 -0
- package/dist/services/auth-socket.js +4 -4
- package/dist/services/auth-web.js +1 -1
- package/dist/services/cloud/activity.js +2 -2
- package/dist/services/cloud/activity.js.map +1 -1
- package/dist/services/cloud/lifecycle.d.ts.map +1 -1
- package/dist/services/cloud/lifecycle.js +33 -4
- package/dist/services/cloud/lifecycle.js.map +1 -1
- package/dist/services/context-admission.d.ts.map +1 -1
- package/dist/services/context-admission.js +9 -7
- package/dist/services/context-admission.js.map +1 -1
- package/dist/services/credential-cleanup.d.ts.map +1 -1
- package/dist/services/credential-cleanup.js +47 -10
- package/dist/services/credential-cleanup.js.map +1 -1
- package/dist/services/exit-drain.d.ts +44 -0
- package/dist/services/exit-drain.d.ts.map +1 -0
- package/dist/services/exit-drain.js +52 -0
- package/dist/services/exit-drain.js.map +1 -0
- package/dist/services/github-app.d.ts.map +1 -1
- package/dist/services/github-app.js +32 -4
- package/dist/services/github-app.js.map +1 -1
- package/dist/services/http-transport.d.ts +1 -0
- package/dist/services/http-transport.d.ts.map +1 -1
- package/dist/services/http-transport.js +48 -1
- package/dist/services/http-transport.js.map +1 -1
- package/dist/services/knowledge/kb-config.d.ts +42 -0
- package/dist/services/knowledge/kb-config.d.ts.map +1 -0
- package/dist/services/knowledge/kb-config.js +54 -0
- package/dist/services/knowledge/kb-config.js.map +1 -0
- package/dist/services/knowledge/kb-providers.d.ts +7 -1
- package/dist/services/knowledge/kb-providers.d.ts.map +1 -1
- package/dist/services/knowledge/kb-providers.js +191 -17
- package/dist/services/knowledge/kb-providers.js.map +1 -1
- package/dist/services/knowledge/require-sqlite-project.d.ts +32 -0
- package/dist/services/knowledge/require-sqlite-project.d.ts.map +1 -0
- package/dist/services/knowledge/require-sqlite-project.js +38 -0
- package/dist/services/knowledge/require-sqlite-project.js.map +1 -0
- package/dist/services/member-home.d.ts +1 -1
- package/dist/services/member-home.d.ts.map +1 -1
- package/dist/services/member-home.js +15 -12
- package/dist/services/member-home.js.map +1 -1
- package/dist/services/model-pricing.d.ts.map +1 -1
- package/dist/services/model-pricing.js +7 -8
- package/dist/services/model-pricing.js.map +1 -1
- package/dist/services/orphan-recovery.d.ts +6 -3
- package/dist/services/orphan-recovery.d.ts.map +1 -1
- package/dist/services/orphan-recovery.js +17 -14
- package/dist/services/orphan-recovery.js.map +1 -1
- package/dist/services/preflight-check.js +2 -2
- package/dist/services/preflight-check.js.map +1 -1
- package/dist/services/secret-token.d.ts +38 -0
- package/dist/services/secret-token.d.ts.map +1 -0
- package/dist/services/secret-token.js +51 -0
- package/dist/services/secret-token.js.map +1 -0
- package/dist/services/service-manager/types.d.ts +3 -1
- package/dist/services/service-manager/types.d.ts.map +1 -1
- package/dist/services/service-manager/windows.d.ts +14 -2
- package/dist/services/service-manager/windows.d.ts.map +1 -1
- package/dist/services/service-manager/windows.js +65 -7
- package/dist/services/service-manager/windows.js.map +1 -1
- package/dist/services/shell-probe.d.ts +131 -0
- package/dist/services/shell-probe.d.ts.map +1 -0
- package/dist/services/shell-probe.js +210 -0
- package/dist/services/shell-probe.js.map +1 -0
- package/dist/services/singleton.d.ts +2 -0
- package/dist/services/singleton.d.ts.map +1 -1
- package/dist/services/singleton.js +1 -1
- package/dist/services/singleton.js.map +1 -1
- package/dist/services/ssh.d.ts.map +1 -1
- package/dist/services/ssh.js +60 -4
- package/dist/services/ssh.js.map +1 -1
- package/dist/services/stall/find-log-file.d.ts.map +1 -1
- package/dist/services/stall/find-log-file.js +22 -16
- package/dist/services/stall/find-log-file.js.map +1 -1
- package/dist/services/stall/read-log-tail.d.ts.map +1 -1
- package/dist/services/stall/read-log-tail.js +26 -15
- package/dist/services/stall/read-log-tail.js.map +1 -1
- package/dist/services/stall/stall-detector.d.ts +53 -4
- package/dist/services/stall/stall-detector.d.ts.map +1 -1
- package/dist/services/stall/stall-detector.js +212 -34
- package/dist/services/stall/stall-detector.js.map +1 -1
- package/dist/services/stall/stall-poller.d.ts.map +1 -1
- package/dist/services/stall/stall-poller.js +35 -42
- package/dist/services/stall/stall-poller.js.map +1 -1
- package/dist/services/strategy.d.ts +9 -0
- package/dist/services/strategy.d.ts.map +1 -1
- package/dist/services/strategy.js +119 -8
- package/dist/services/strategy.js.map +1 -1
- package/dist/services/substitution-engine.js +2 -2
- package/dist/services/substitution-engine.js.map +1 -1
- package/dist/services/tool-registry.d.ts.map +1 -1
- package/dist/services/tool-registry.js +5 -3
- package/dist/services/tool-registry.js.map +1 -1
- package/dist/services/user-config.js +1 -1
- package/dist/services/user-config.js.map +1 -1
- package/dist/services/vcs/azure-devops.d.ts +67 -2
- package/dist/services/vcs/azure-devops.d.ts.map +1 -1
- package/dist/services/vcs/azure-devops.js +281 -15
- package/dist/services/vcs/azure-devops.js.map +1 -1
- package/dist/services/vcs/bitbucket.d.ts.map +1 -1
- package/dist/services/vcs/bitbucket.js +16 -0
- package/dist/services/vcs/bitbucket.js.map +1 -1
- package/dist/services/vcs/github.d.ts.map +1 -1
- package/dist/services/vcs/github.js +24 -0
- package/dist/services/vcs/github.js.map +1 -1
- package/dist/services/vcs/types.d.ts +123 -2
- package/dist/services/vcs/types.d.ts.map +1 -1
- package/dist/skills/fleet-sprint-cli/SKILL.md +20 -1
- package/dist/skills/pm/SKILL.md +1 -2
- package/dist/skills/pm/cost.md +0 -4
- package/dist/skills/pm/fleet-addendum.md +2 -3
- package/dist/tools/check-status.d.ts +7 -4
- package/dist/tools/check-status.d.ts.map +1 -1
- package/dist/tools/check-status.js +5 -3
- package/dist/tools/check-status.js.map +1 -1
- package/dist/tools/cloud-control.js +2 -2
- package/dist/tools/cloud-control.js.map +1 -1
- package/dist/tools/compose-permissions.d.ts +6 -0
- package/dist/tools/compose-permissions.d.ts.map +1 -1
- package/dist/tools/compose-permissions.js +211 -50
- package/dist/tools/compose-permissions.js.map +1 -1
- package/dist/tools/credential-store-set.js +1 -1
- package/dist/tools/execute-command.d.ts.map +1 -1
- package/dist/tools/execute-command.js +56 -29
- package/dist/tools/execute-command.js.map +1 -1
- package/dist/tools/execute-prompt.d.ts +15 -2
- package/dist/tools/execute-prompt.d.ts.map +1 -1
- package/dist/tools/execute-prompt.js +1214 -873
- package/dist/tools/execute-prompt.js.map +1 -1
- package/dist/tools/kb-capture.d.ts +2 -2
- package/dist/tools/kb-capture.d.ts.map +1 -1
- package/dist/tools/kb-capture.js +29 -5
- package/dist/tools/kb-capture.js.map +1 -1
- package/dist/tools/kb-export.d.ts +2 -2
- package/dist/tools/kb-export.d.ts.map +1 -1
- package/dist/tools/kb-export.js +3 -28
- package/dist/tools/kb-export.js.map +1 -1
- package/dist/tools/kb-feedback.d.ts.map +1 -1
- package/dist/tools/kb-feedback.js +3 -1
- package/dist/tools/kb-feedback.js.map +1 -1
- package/dist/tools/kb-freshness-sweep.d.ts.map +1 -1
- package/dist/tools/kb-freshness-sweep.js +3 -1
- package/dist/tools/kb-freshness-sweep.js.map +1 -1
- package/dist/tools/kb-import.d.ts.map +1 -1
- package/dist/tools/kb-import.js +2 -1
- package/dist/tools/kb-import.js.map +1 -1
- package/dist/tools/kb-list.d.ts.map +1 -1
- package/dist/tools/kb-list.js +3 -1
- package/dist/tools/kb-list.js.map +1 -1
- package/dist/tools/kb-query.d.ts +2 -2
- package/dist/tools/kb-reconcile-prefilter.d.ts.map +1 -1
- package/dist/tools/kb-reconcile-prefilter.js +3 -1
- package/dist/tools/kb-reconcile-prefilter.js.map +1 -1
- package/dist/tools/kb-resolve-contradiction.d.ts.map +1 -1
- package/dist/tools/kb-resolve-contradiction.js +3 -1
- package/dist/tools/kb-resolve-contradiction.js.map +1 -1
- package/dist/tools/kb-setup.d.ts.map +1 -1
- package/dist/tools/kb-setup.js +125 -20
- package/dist/tools/kb-setup.js.map +1 -1
- package/dist/tools/kb-stats.d.ts.map +1 -1
- package/dist/tools/kb-stats.js +64 -43
- package/dist/tools/kb-stats.js.map +1 -1
- package/dist/tools/list-members.d.ts +2 -2
- package/dist/tools/list-members.d.ts.map +1 -1
- package/dist/tools/list-members.js +7 -2
- package/dist/tools/list-members.js.map +1 -1
- package/dist/tools/member-detail.d.ts +2 -2
- package/dist/tools/member-detail.d.ts.map +1 -1
- package/dist/tools/member-detail.js +22 -3
- package/dist/tools/member-detail.js.map +1 -1
- package/dist/tools/member-reservation.d.ts +58 -1
- package/dist/tools/member-reservation.d.ts.map +1 -1
- package/dist/tools/member-reservation.js +71 -18
- package/dist/tools/member-reservation.js.map +1 -1
- package/dist/tools/monitor-task.d.ts.map +1 -1
- package/dist/tools/monitor-task.js +17 -2
- package/dist/tools/monitor-task.js.map +1 -1
- package/dist/tools/provision-auth.d.ts +80 -1
- package/dist/tools/provision-auth.d.ts.map +1 -1
- package/dist/tools/provision-auth.js +147 -59
- package/dist/tools/provision-auth.js.map +1 -1
- package/dist/tools/provision-vcs-auth.d.ts +96 -3
- package/dist/tools/provision-vcs-auth.d.ts.map +1 -1
- package/dist/tools/provision-vcs-auth.js +254 -88
- package/dist/tools/provision-vcs-auth.js.map +1 -1
- package/dist/tools/register-member.d.ts +21 -12
- package/dist/tools/register-member.d.ts.map +1 -1
- package/dist/tools/register-member.js +141 -16
- package/dist/tools/register-member.js.map +1 -1
- package/dist/tools/remove-member.d.ts.map +1 -1
- package/dist/tools/remove-member.js +29 -4
- package/dist/tools/remove-member.js.map +1 -1
- package/dist/tools/revoke-vcs-auth.js +2 -2
- package/dist/tools/revoke-vcs-auth.js.map +1 -1
- package/dist/tools/send-email.d.ts +2 -2
- package/dist/tools/setup-git-app.d.ts.map +1 -1
- package/dist/tools/setup-git-app.js +11 -7
- package/dist/tools/setup-git-app.js.map +1 -1
- package/dist/tools/setup-ssh-key.d.ts.map +1 -1
- package/dist/tools/setup-ssh-key.js +2 -1
- package/dist/tools/setup-ssh-key.js.map +1 -1
- package/dist/tools/shutdown-server.d.ts +2 -0
- package/dist/tools/shutdown-server.d.ts.map +1 -1
- package/dist/tools/shutdown-server.js +23 -1
- package/dist/tools/shutdown-server.js.map +1 -1
- package/dist/tools/stop-prompt.js +2 -2
- package/dist/tools/stop-prompt.js.map +1 -1
- package/dist/tools/update-agent-cli.js +2 -2
- package/dist/tools/update-agent-cli.js.map +1 -1
- package/dist/tools/update-member.d.ts +21 -12
- package/dist/tools/update-member.d.ts.map +1 -1
- package/dist/tools/update-member.js +61 -12
- package/dist/tools/update-member.js.map +1 -1
- package/dist/tools/vcs-credential-exec.d.ts +127 -0
- package/dist/tools/vcs-credential-exec.d.ts.map +1 -0
- package/dist/tools/vcs-credential-exec.js +197 -0
- package/dist/tools/vcs-credential-exec.js.map +1 -0
- package/dist/types.d.ts +24 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/agent-helpers.d.ts +36 -0
- package/dist/utils/agent-helpers.d.ts.map +1 -1
- package/dist/utils/agent-helpers.js +39 -1
- package/dist/utils/agent-helpers.js.map +1 -1
- package/dist/utils/log-helpers.d.ts.map +1 -1
- package/dist/utils/log-helpers.js +2 -2
- package/dist/utils/log-helpers.js.map +1 -1
- package/dist/utils/platform.d.ts +7 -0
- package/dist/utils/platform.d.ts.map +1 -1
- package/dist/utils/platform.js +11 -1
- package/dist/utils/platform.js.map +1 -1
- package/dist/utils/prompt-errors.d.ts.map +1 -1
- package/dist/utils/prompt-errors.js +7 -1
- package/dist/utils/prompt-errors.js.map +1 -1
- package/dist/utils/shell-escape.d.ts +16 -0
- package/dist/utils/shell-escape.d.ts.map +1 -1
- package/dist/utils/shell-escape.js +22 -2
- package/dist/utils/shell-escape.js.map +1 -1
- package/dist/utils/vcs-provider-detect.d.ts +65 -0
- package/dist/utils/vcs-provider-detect.d.ts.map +1 -0
- package/dist/utils/vcs-provider-detect.js +109 -0
- package/dist/utils/vcs-provider-detect.js.map +1 -0
- package/dist/utils/workspace-trust.d.ts +20 -17
- package/dist/utils/workspace-trust.d.ts.map +1 -1
- package/dist/utils/workspace-trust.js +91 -1
- package/dist/utils/workspace-trust.js.map +1 -1
- package/dist/workflows/auto-sprint.js +180 -32
- package/package.json +7 -5
- package/packages/apra-fleet-client/src/client/api.mjs +403 -12
- package/packages/apra-fleet-client/src/client/errors.mjs +6 -2
- package/packages/apra-fleet-se/apra-pm/agents/_shared/GRAPH-SEMANTICS.md +10 -2
- package/packages/apra-fleet-se/apra-pm/agents/backlog-groomer.md +42 -21
- package/packages/apra-fleet-se/apra-pm/agents/ci-watcher.md +14 -0
- package/packages/apra-fleet-se/apra-pm/agents/deployer.md +59 -46
- package/packages/apra-fleet-se/apra-pm/agents/doer.md +157 -134
- package/packages/apra-fleet-se/apra-pm/agents/harvester.md +31 -32
- package/packages/apra-fleet-se/apra-pm/agents/integ-test-runner.md +92 -113
- package/packages/apra-fleet-se/apra-pm/agents/kb-reconciler.md +40 -42
- package/packages/apra-fleet-se/apra-pm/agents/plan-reviewer.md +139 -63
- package/packages/apra-fleet-se/apra-pm/agents/planner.md +176 -100
- package/packages/apra-fleet-se/apra-pm/agents/regression-test-runner.md +77 -81
- package/packages/apra-fleet-se/apra-pm/agents/reviewer.md +69 -85
- package/packages/apra-fleet-se/apra-pm/agents/schemas/integ-test-runner-output.json +1 -1
- package/packages/apra-fleet-se/apra-pm/agents/schemas/plan-reviewer-output.json +37 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/regression-test-runner-output.json +4 -17
- package/packages/apra-fleet-se/apra-pm/skills/pm/SKILL.md +1 -2
- package/packages/apra-fleet-se/apra-pm/skills/pm/cost.md +0 -4
- package/packages/apra-fleet-se/apra-pm/skills/pm/fleet-addendum.md +2 -3
- package/packages/apra-fleet-se/bin/cli.mjs +280 -3
- package/packages/apra-fleet-se/bin/serve.mjs +114 -5
- package/packages/apra-fleet-se/fleet-sprint/abort.mjs +481 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-children.mjs +491 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-identity-check.mjs +282 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-identity.mjs +208 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-scope.mjs +638 -0
- package/packages/apra-fleet-se/fleet-sprint/beads-transitions.mjs +301 -0
- package/packages/apra-fleet-se/fleet-sprint/branch-ensure.mjs +96 -0
- package/packages/apra-fleet-se/fleet-sprint/conflict-ladder.mjs +8 -0
- package/packages/apra-fleet-se/fleet-sprint/contracts.mjs +199 -34
- package/packages/apra-fleet-se/fleet-sprint/coordination.mjs +516 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-failure.mjs +184 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-role.mjs +1121 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-safety-guard.mjs +216 -4
- package/packages/apra-fleet-se/fleet-sprint/docs/README.md +23 -8
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-manual-recovery-verified.md +10 -8
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-sync-redesign.md +285 -4
- package/packages/apra-fleet-se/fleet-sprint/docs/escalate-to-llm-design.md +3 -3
- package/packages/apra-fleet-se/fleet-sprint/docs/run-sprint-cycle-prelude-decision.md +215 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/shared-orchestrator-reservation-design.md +12 -12
- package/packages/apra-fleet-se/fleet-sprint/docs/stabilization-log.md +14 -4
- package/packages/apra-fleet-se/fleet-sprint/dolt-literal-guard.mjs +56 -1
- package/packages/apra-fleet-se/fleet-sprint/dolt-settle.mjs +275 -99
- package/packages/apra-fleet-se/fleet-sprint/dolt-sync.mjs +1054 -39
- package/packages/apra-fleet-se/fleet-sprint/errors.mjs +308 -0
- package/packages/apra-fleet-se/fleet-sprint/explicit-id-create-guard.mjs +501 -0
- package/packages/apra-fleet-se/fleet-sprint/fatal-diagnostics.mjs +134 -0
- package/packages/apra-fleet-se/fleet-sprint/full-db-fetch-guard.mjs +102 -0
- package/packages/apra-fleet-se/fleet-sprint/git-sync.mjs +556 -0
- package/packages/apra-fleet-se/fleet-sprint/git-topology.mjs +495 -0
- package/packages/apra-fleet-se/fleet-sprint/guarded-modules.mjs +564 -0
- package/packages/apra-fleet-se/fleet-sprint/inline-ladder-guard.mjs +216 -0
- package/packages/apra-fleet-se/fleet-sprint/kb.mjs +728 -0
- package/packages/apra-fleet-se/fleet-sprint/mcp-result.mjs +75 -0
- package/packages/apra-fleet-se/fleet-sprint/member-provisioning.mjs +252 -0
- package/packages/apra-fleet-se/fleet-sprint/member-sync.mjs +581 -0
- package/packages/apra-fleet-se/fleet-sprint/member-target.mjs +93 -0
- package/packages/apra-fleet-se/fleet-sprint/newtask-text.mjs +266 -0
- package/packages/apra-fleet-se/fleet-sprint/parent-notes-staleness.mjs +201 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/deploy.mjs +136 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/develop.mjs +822 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/ensure-sprint-branch.mjs +294 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/final-review.mjs +403 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/harvest.mjs +180 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/integ-test.mjs +358 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/plan.mjs +390 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/publish-pr.mjs +323 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/re-review.mjs +232 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/regression-test.mjs +174 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/replan.mjs +197 -0
- package/packages/apra-fleet-se/fleet-sprint/phases/review.mjs +305 -0
- package/packages/apra-fleet-se/fleet-sprint/prompts.mjs +559 -0
- package/packages/apra-fleet-se/fleet-sprint/role-policies.mjs +1416 -0
- package/packages/apra-fleet-se/fleet-sprint/round-session.mjs +100 -0
- package/packages/apra-fleet-se/fleet-sprint/runner.js +1672 -9072
- package/packages/apra-fleet-se/fleet-sprint/se-os-commands.mjs +134 -0
- package/packages/apra-fleet-se/fleet-sprint/se-posix.mjs +159 -0
- package/packages/apra-fleet-se/fleet-sprint/se-windows-gitbash.mjs +97 -0
- package/packages/apra-fleet-se/fleet-sprint/se-windows.mjs +143 -0
- package/packages/apra-fleet-se/fleet-sprint/shell-command-guard.mjs +304 -0
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-sprint-cli/SKILL.md +20 -1
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-supervisor/SKILL.md +21 -2
- package/packages/apra-fleet-se/fleet-sprint/sprint-args.mjs +454 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-report.mjs +239 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-state.mjs +163 -0
- package/packages/apra-fleet-se/fleet-sprint/unbracketed-push-guard.mjs +234 -0
- package/packages/apra-fleet-se/fleet-sprint/usage-limit-controller.mjs +211 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-auth.mjs +1279 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-module.mjs +204 -19
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/azure-devops.mjs +707 -12
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/bitbucket.mjs +28 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/dolt.mjs +33 -4
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/github.mjs +191 -43
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/index.mjs +333 -6
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/shell-helpers.mjs +165 -0
- package/packages/apra-fleet-se/fleet-sprint/viewer-extensions.mjs +167 -37
- package/packages/apra-fleet-se/fleet-sprint/worklists.mjs +559 -0
- package/packages/apra-fleet-se/package.json +1 -1
- package/packages/apra-fleet-workflow/src/viewer/index.mjs +178 -1
- package/packages/apra-fleet-workflow/src/workflow/index.mjs +478 -32
- package/skills/fleet/SKILL.md +27 -16
- package/skills/fleet/auth-azdevops.md +57 -7
- package/skills/fleet/auth-bitbucket.md +5 -5
- package/skills/fleet/auth-github.md +7 -6
- package/skills/fleet/beads-conflict-resolution.md +141 -0
- package/skills/fleet/beads.md +16 -12
- package/skills/fleet/onboarding.md +6 -6
- package/skills/fleet/permissions.md +11 -7
- package/skills/fleet/profiles/node.json +1 -1
- package/skills/fleet/skill-matrix.md +1 -1
- package/skills/fleet/troubleshooting.md +4 -3
- package/version.json +1 -1
- package/dist/providers/gemini.d.ts +0 -52
- package/dist/providers/gemini.d.ts.map +0 -1
- package/dist/providers/gemini.js +0 -236
- package/dist/providers/gemini.js.map +0 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/coach-role-design.md +0 -23
package/dist/providers/codex.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { defaultUsageLimitSignal } from './provider.js';
|
|
1
2
|
import { escapeDoubleQuoted } from '../os/os-commands.js';
|
|
3
|
+
import { transformAgentForClaude } from '../cli/agent-transform.js';
|
|
2
4
|
// Known exception: Codex CLI cannot take a caller-supplied session ID.
|
|
3
5
|
// It uses a positional 'resume' keyword; session discovery relies on the mtime-scan
|
|
4
6
|
// fallback in find-log-file.ts. This is intentionally not changed by the session-id fix.
|
|
@@ -14,7 +16,10 @@ export class CodexProvider {
|
|
|
14
16
|
versionCommand() {
|
|
15
17
|
return 'codex --version 2>&1';
|
|
16
18
|
}
|
|
17
|
-
|
|
19
|
+
// `shell` is intentionally unused: no windows branch exists here -- `npm
|
|
20
|
+
// install -g` runs unchanged from any shell (apra-fleet-7dir.2.7: named
|
|
21
|
+
// here as an adapter needing no per-shell variant, not skipped silently).
|
|
22
|
+
installCommand(os, _shell) {
|
|
18
23
|
if (os === 'macos') {
|
|
19
24
|
return 'brew install --cask codex';
|
|
20
25
|
}
|
|
@@ -91,6 +96,11 @@ export class CodexProvider {
|
|
|
91
96
|
usage: undefined,
|
|
92
97
|
};
|
|
93
98
|
}
|
|
99
|
+
// apra-fleet-hzeb.1: Codex has no distinct usage-limit event surface, so key off
|
|
100
|
+
// the raw output using the shared quota detector (guessed resume window).
|
|
101
|
+
detectUsageLimit(result, parsed) {
|
|
102
|
+
return defaultUsageLimitSignal(result.stderr || result.stdout || parsed.result);
|
|
103
|
+
}
|
|
94
104
|
supportsResume() {
|
|
95
105
|
return true;
|
|
96
106
|
}
|
|
@@ -100,6 +110,15 @@ export class CodexProvider {
|
|
|
100
110
|
sessionIdStrategy() {
|
|
101
111
|
return { type: 'provider-minted' };
|
|
102
112
|
}
|
|
113
|
+
// apra-fleet-25yl.2.1: LOAD-BEARING. resolveSessionLogDir() below returns
|
|
114
|
+
// null, so the StallDetector has no log to poll for a Codex dispatch and the
|
|
115
|
+
// exec-level rolling timer is Codex's ONLY stall signal. Decoupling it here
|
|
116
|
+
// would not "relax" stall detection for Codex, it would remove it. Do not
|
|
117
|
+
// flip this to 'total_ceiling' without first giving Codex a pollable
|
|
118
|
+
// transcript path.
|
|
119
|
+
execTimeoutSource() {
|
|
120
|
+
return 'inactivity_timeout';
|
|
121
|
+
}
|
|
103
122
|
resolveSessionLogPath(_sessionId, _workFolder, _homeDir, _targetOs) {
|
|
104
123
|
return '';
|
|
105
124
|
}
|
|
@@ -128,8 +147,9 @@ export class CodexProvider {
|
|
|
128
147
|
const rel = `.codex/agents/${agentName}.md`;
|
|
129
148
|
return { project: rel, home: rel };
|
|
130
149
|
}
|
|
131
|
-
transformAgent(content,
|
|
132
|
-
|
|
150
|
+
transformAgent(content, relPath) {
|
|
151
|
+
// Same resolver the local install uses for this provider, so remote == local.
|
|
152
|
+
return transformAgentForClaude(content, relPath);
|
|
133
153
|
}
|
|
134
154
|
agentNameFlag(_agentName) {
|
|
135
155
|
return '';
|
|
@@ -192,7 +212,7 @@ export class CodexProvider {
|
|
|
192
212
|
headlessInvocation(promptLiteral) {
|
|
193
213
|
return `exec "${promptLiteral}"`;
|
|
194
214
|
}
|
|
195
|
-
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs) {
|
|
215
|
+
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs, _shell) {
|
|
196
216
|
// apra-fleet-eft.40 was scoped to the Claude workspace-trust gate (see the
|
|
197
217
|
// provider-trust-matrix note on the parent bug); Codex was not part of that
|
|
198
218
|
// investigation and no equivalent per-project trust gate is known. No-op until a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../src/providers/codex.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../src/providers/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import type { ProviderAdapter, PromptOptions, ParsedResponse, WorkspaceTrustExecFn, EnsureWorkspaceTrustedResult, SessionIdStrategy, TargetOS } from './provider.js';
|
|
1
|
+
import type { ProviderAdapter, PromptOptions, ParsedResponse, UsageLimitSignal, WorkspaceTrustExecFn, EnsureWorkspaceTrustedResult, SessionIdStrategy, ExecTimeoutSource, 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 CopilotProvider implements ProviderAdapter {
|
|
5
6
|
readonly name: LlmProvider;
|
|
6
7
|
readonly processName = "copilot";
|
|
@@ -9,16 +10,18 @@ export declare class CopilotProvider implements ProviderAdapter {
|
|
|
9
10
|
readonly instructionFileName = "COPILOT.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
|
buildPromptCommand(opts: PromptOptions): string;
|
|
15
16
|
skipPermissionsFlag(): string;
|
|
16
17
|
permissionModeAutoFlag(): string | null;
|
|
17
18
|
resolvePermissionFlag(unattended: false | 'auto' | 'dangerous' | undefined): string;
|
|
18
19
|
parseResponse(result: SSHExecResult): ParsedResponse;
|
|
20
|
+
detectUsageLimit(result: SSHExecResult, parsed: ParsedResponse): UsageLimitSignal | null;
|
|
19
21
|
supportsResume(): boolean;
|
|
20
22
|
supportsMaxTurns(): boolean;
|
|
21
23
|
sessionIdStrategy(): SessionIdStrategy;
|
|
24
|
+
execTimeoutSource(): ExecTimeoutSource;
|
|
22
25
|
resolveSessionLogPath(_sessionId: string, _workFolder: string, _homeDir?: string | null, _targetOs?: TargetOS): string;
|
|
23
26
|
resolveSessionLogDir(_workFolder: string, _homeDir?: string | null, _targetOs?: TargetOS): string | null;
|
|
24
27
|
resumeFlag(_sessionId?: string): string;
|
|
@@ -29,7 +32,7 @@ export declare class CopilotProvider implements ProviderAdapter {
|
|
|
29
32
|
project: string;
|
|
30
33
|
home: string;
|
|
31
34
|
};
|
|
32
|
-
transformAgent(content: string,
|
|
35
|
+
transformAgent(content: string, relPath: string): string;
|
|
33
36
|
agentNameFlag(_agentName: string): string;
|
|
34
37
|
classifyError(output: string): PromptErrorCategory;
|
|
35
38
|
permissionConfigPaths(): string[];
|
|
@@ -46,6 +49,6 @@ export declare class CopilotProvider implements ProviderAdapter {
|
|
|
46
49
|
wrapWindowsPrompt(setupCmd: string, filePath: string, argList: string, _sessionId?: string, _model?: string): string;
|
|
47
50
|
jsonOutputFlag(): string;
|
|
48
51
|
headlessInvocation(promptLiteral: string): string;
|
|
49
|
-
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows'): Promise<EnsureWorkspaceTrustedResult>;
|
|
52
|
+
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows', _shell?: MemberShell): Promise<EnsureWorkspaceTrustedResult>;
|
|
50
53
|
}
|
|
51
54
|
//# sourceMappingURL=copilot.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot.d.ts","sourceRoot":"","sources":["../../src/providers/copilot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"copilot.d.ts","sourceRoot":"","sources":["../../src/providers/copilot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE1M,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAOxD,qBAAa,eAAgB,YAAW,eAAe;IACrD,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAa;IACvC,QAAQ,CAAC,WAAW,aAAa;IACjC,QAAQ,CAAC,UAAU,0BAA0B;IAC7C,QAAQ,CAAC,cAAc,iBAAiB;IACxC,QAAQ,CAAC,mBAAmB,gBAAgB;IAE5C,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,cAAc,IAAI,MAAM;IASxB,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,MAAM;IAU/E,aAAa,IAAI,MAAM;IAIvB,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM;IAmB/C,mBAAmB,IAAI,MAAM;IAI7B,sBAAsB,IAAI,MAAM,GAAG,IAAI;IAKvC,qBAAqB,CAAC,UAAU,EAAE,KAAK,GAAG,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM;IAOnF,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,cAAc;IAwBpD,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,GAAG,gBAAgB,GAAG,IAAI;IAIxF,cAAc,IAAI,OAAO;IAIzB,gBAAgB,IAAI,OAAO;IAI3B,iBAAiB,IAAI,iBAAiB;IAWtC,iBAAiB,IAAI,iBAAiB;IAItC,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAG,MAAM;IAItH,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI;IAIxG,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAIvC,UAAU,IAAI,MAAM,CAAC,OAAO,GAAG,UAAU,GAAG,SAAS,EAAE,MAAM,CAAC;IAQ9D,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,GAAG,MAAM;IAM5D,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIhC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IAKtE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;IAKxD,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAIzC,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB;IAalD,qBAAqB,IAAI,MAAM,EAAE;IAIjC,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE,KAAK,GAAE,MAAM,EAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IAmBjH,iBAAiB,IAAI,OAAO;IAI5B,cAAc,IAAI,OAAO;IAIzB,oBAAoB,IAAI,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI;IAI/E,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIpD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAM1C,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAMpH,cAAc,IAAI,MAAM;IAIxB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAI3C,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,4BAA4B,CAAC;CAO7L"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { defaultUsageLimitSignal } from './provider.js';
|
|
1
2
|
import { escapeDoubleQuoted } from '../os/os-commands.js';
|
|
2
3
|
import { logWarn } from '../utils/log-helpers.js';
|
|
4
|
+
import { transformAgentForClaude } from '../cli/agent-transform.js';
|
|
3
5
|
// Known exception: Copilot CLI cannot take a caller-supplied session ID.
|
|
4
6
|
// It uses --continue (no ID); session discovery relies on the mtime-scan fallback
|
|
5
7
|
// in find-log-file.ts. This is intentionally not changed by the session-id fix.
|
|
@@ -15,7 +17,12 @@ export class CopilotProvider {
|
|
|
15
17
|
versionCommand() {
|
|
16
18
|
return 'copilot --version 2>&1';
|
|
17
19
|
}
|
|
18
|
-
|
|
20
|
+
// `shell` is intentionally unused: `winget install ...` is a plain exe
|
|
21
|
+
// invocation with no PowerShell-only syntax, so it runs unchanged whether
|
|
22
|
+
// the member's registered shell is gitbash or PowerShell
|
|
23
|
+
// (apra-fleet-7dir.2.7 -- named here as a windows-branch adapter that needs
|
|
24
|
+
// no per-shell variant, not skipped silently).
|
|
25
|
+
installCommand(os, _shell) {
|
|
19
26
|
if (os === 'macos') {
|
|
20
27
|
return 'brew install --cask copilot';
|
|
21
28
|
}
|
|
@@ -80,6 +87,11 @@ export class CopilotProvider {
|
|
|
80
87
|
};
|
|
81
88
|
}
|
|
82
89
|
}
|
|
90
|
+
// apra-fleet-hzeb.1: Copilot has no distinct usage-limit event surface, so key off
|
|
91
|
+
// the raw output using the shared quota detector (guessed resume window).
|
|
92
|
+
detectUsageLimit(result, parsed) {
|
|
93
|
+
return defaultUsageLimitSignal(result.stderr || result.stdout || parsed.result);
|
|
94
|
+
}
|
|
83
95
|
supportsResume() {
|
|
84
96
|
return true;
|
|
85
97
|
}
|
|
@@ -89,6 +101,16 @@ export class CopilotProvider {
|
|
|
89
101
|
sessionIdStrategy() {
|
|
90
102
|
return { type: 'provider-minted' };
|
|
91
103
|
}
|
|
104
|
+
// apra-fleet-25yl.2.1: 'inactivity_timeout' here means PRESERVE CURRENT
|
|
105
|
+
// BEHAVIOUR, not "the exec channel is a proven mid-turn signal for Copilot".
|
|
106
|
+
// Copilot was deliberately left out of scope for the per-provider decoupling:
|
|
107
|
+
// resolveSessionLogDir() below returns null, so it has no file-side signal
|
|
108
|
+
// either way, and that gap is tracked as its own separate work item. Changing
|
|
109
|
+
// this value is a behaviour change for Copilot -- do it there, not casually
|
|
110
|
+
// here.
|
|
111
|
+
execTimeoutSource() {
|
|
112
|
+
return 'inactivity_timeout';
|
|
113
|
+
}
|
|
92
114
|
resolveSessionLogPath(_sessionId, _workFolder, _homeDir, _targetOs) {
|
|
93
115
|
return '';
|
|
94
116
|
}
|
|
@@ -119,8 +141,9 @@ export class CopilotProvider {
|
|
|
119
141
|
const rel = `.copilot/agents/${agentName}.md`;
|
|
120
142
|
return { project: rel, home: rel };
|
|
121
143
|
}
|
|
122
|
-
transformAgent(content,
|
|
123
|
-
|
|
144
|
+
transformAgent(content, relPath) {
|
|
145
|
+
// Same resolver the local install uses for this provider, so remote == local.
|
|
146
|
+
return transformAgentForClaude(content, relPath);
|
|
124
147
|
}
|
|
125
148
|
agentNameFlag(_agentName) {
|
|
126
149
|
return '';
|
|
@@ -188,7 +211,7 @@ export class CopilotProvider {
|
|
|
188
211
|
headlessInvocation(promptLiteral) {
|
|
189
212
|
return `-p "${promptLiteral}"`;
|
|
190
213
|
}
|
|
191
|
-
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs) {
|
|
214
|
+
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs, _shell) {
|
|
192
215
|
// apra-fleet-eft.40 was scoped to the Claude workspace-trust gate (see the
|
|
193
216
|
// provider-trust-matrix note on the parent bug); Copilot was not part of that
|
|
194
217
|
// investigation and no equivalent per-project trust gate is known. No-op until a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot.js","sourceRoot":"","sources":["../../src/providers/copilot.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"copilot.js","sourceRoot":"","sources":["../../src/providers/copilot.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import type { ProviderAdapter } from './provider.js';
|
|
|
3
3
|
export declare function getProvider(llmProvider?: LlmProvider | null): ProviderAdapter;
|
|
4
4
|
export type { ProviderAdapter, PromptOptions, ParsedResponse } from './provider.js';
|
|
5
5
|
export { ClaudeProvider } from './claude.js';
|
|
6
|
-
export { GeminiProvider } from './gemini.js';
|
|
7
6
|
export { CodexProvider } from './codex.js';
|
|
8
7
|
export { CopilotProvider } from './copilot.js';
|
|
9
8
|
export { AgyProvider } from './agy.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAiBrD,wBAAgB,WAAW,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,eAAe,CAS7E;AAED,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC"}
|
package/dist/providers/index.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { ClaudeProvider } from './claude.js';
|
|
2
|
-
import { GeminiProvider } from './gemini.js';
|
|
3
2
|
import { CodexProvider } from './codex.js';
|
|
4
3
|
import { CopilotProvider } from './copilot.js';
|
|
5
4
|
import { AgyProvider } from './agy.js';
|
|
@@ -7,7 +6,6 @@ import { OpenCodeProvider } from './opencode.js';
|
|
|
7
6
|
import { NoneProvider } from './none.js';
|
|
8
7
|
const providers = {
|
|
9
8
|
claude: new ClaudeProvider(),
|
|
10
|
-
gemini: new GeminiProvider(),
|
|
11
9
|
codex: new CodexProvider(),
|
|
12
10
|
copilot: new CopilotProvider(),
|
|
13
11
|
agy: new AgyProvider(),
|
|
@@ -24,7 +22,6 @@ export function getProvider(llmProvider) {
|
|
|
24
22
|
return adapter;
|
|
25
23
|
}
|
|
26
24
|
export { ClaudeProvider } from './claude.js';
|
|
27
|
-
export { GeminiProvider } from './gemini.js';
|
|
28
25
|
export { CodexProvider } from './codex.js';
|
|
29
26
|
export { CopilotProvider } from './copilot.js';
|
|
30
27
|
export { AgyProvider } from './agy.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,SAAS,GAAyC;IACtD,MAAM,EAAE,IAAI,cAAc,EAAE;IAC5B,KAAK,EAAE,IAAI,aAAa,EAAE;IAC1B,OAAO,EAAE,IAAI,eAAe,EAAE;IAC9B,GAAG,EAAE,IAAI,WAAW,EAAE;IACtB,QAAQ,EAAE,IAAI,gBAAgB,EAAE;IAChC,IAAI,EAAE,IAAI,YAAY,EAAE;CACzB,CAAC;AAEF,MAAM,UAAU,WAAW,CAAC,WAAgC;IAC1D,IAAI,CAAC,WAAW;QAAE,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,SAAS,CACjB,yBAAyB,WAAW,iBAAiB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACzF,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAGD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC"}
|
package/dist/providers/none.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import type { ProviderAdapter, PromptOptions, ParsedResponse, WorkspaceTrustExecFn, EnsureWorkspaceTrustedResult, SessionIdStrategy, TargetOS } from './provider.js';
|
|
1
|
+
import type { ProviderAdapter, PromptOptions, ParsedResponse, UsageLimitSignal, WorkspaceTrustExecFn, EnsureWorkspaceTrustedResult, SessionIdStrategy, ExecTimeoutSource, 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
|
/**
|
|
5
6
|
* Null-object provider for no-LLM members (apra-fleet-us9.14): a plain
|
|
6
7
|
* command executor with no CLI, no auth, no prompt/model concept at all.
|
|
@@ -19,16 +20,18 @@ export declare class NoneProvider implements ProviderAdapter {
|
|
|
19
20
|
readonly instructionFileName = "";
|
|
20
21
|
cliCommand(_args: string): string;
|
|
21
22
|
versionCommand(): string;
|
|
22
|
-
installCommand(_os: 'linux' | 'macos' | 'windows'): string;
|
|
23
|
+
installCommand(_os: 'linux' | 'macos' | 'windows', _shell?: MemberShell): string;
|
|
23
24
|
updateCommand(): string;
|
|
24
25
|
buildPromptCommand(_opts: PromptOptions): string;
|
|
25
26
|
skipPermissionsFlag(): string;
|
|
26
27
|
permissionModeAutoFlag(): string | null;
|
|
27
28
|
resolvePermissionFlag(_unattended: false | 'auto' | 'dangerous' | undefined): string;
|
|
28
29
|
parseResponse(_result: SSHExecResult): ParsedResponse;
|
|
30
|
+
detectUsageLimit(_result: SSHExecResult, _parsed: ParsedResponse): UsageLimitSignal | null;
|
|
29
31
|
supportsResume(): boolean;
|
|
30
32
|
supportsMaxTurns(): boolean;
|
|
31
33
|
sessionIdStrategy(): SessionIdStrategy;
|
|
34
|
+
execTimeoutSource(): ExecTimeoutSource;
|
|
32
35
|
resolveSessionLogPath(_sessionId: string, _workFolder: string, _homeDir?: string | null, _targetOs?: TargetOS): string;
|
|
33
36
|
resolveSessionLogDir(_workFolder: string, _homeDir?: string | null, _targetOs?: TargetOS): string | null;
|
|
34
37
|
resumeFlag(_sessionId?: string, _resuming?: boolean): string;
|
|
@@ -39,7 +42,7 @@ export declare class NoneProvider implements ProviderAdapter {
|
|
|
39
42
|
project: string;
|
|
40
43
|
home: string;
|
|
41
44
|
};
|
|
42
|
-
transformAgent(content: string,
|
|
45
|
+
transformAgent(content: string, relPath: string): string;
|
|
43
46
|
agentNameFlag(_agentName: string): string;
|
|
44
47
|
classifyError(_output: string): PromptErrorCategory;
|
|
45
48
|
permissionConfigPaths(): string[];
|
|
@@ -56,6 +59,6 @@ export declare class NoneProvider implements ProviderAdapter {
|
|
|
56
59
|
wrapWindowsPrompt(_setupCmd: string, _filePath: string, _argList: string, _sessionId?: string, _model?: string): string;
|
|
57
60
|
jsonOutputFlag(): string;
|
|
58
61
|
headlessInvocation(_promptLiteral: string): string;
|
|
59
|
-
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows'): Promise<EnsureWorkspaceTrustedResult>;
|
|
62
|
+
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows', _shell?: MemberShell): Promise<EnsureWorkspaceTrustedResult>;
|
|
60
63
|
}
|
|
61
64
|
//# sourceMappingURL=none.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"none.d.ts","sourceRoot":"","sources":["../../src/providers/none.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"none.d.ts","sourceRoot":"","sources":["../../src/providers/none.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC1M,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAKxD;;;;;;;;;GASG;AACH,qBAAa,YAAa,YAAW,eAAe;IAClD,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAU;IACpC,QAAQ,CAAC,WAAW,MAAM;IAC1B,QAAQ,CAAC,UAAU,MAAM;IACzB,QAAQ,CAAC,cAAc,MAAM;IAC7B,QAAQ,CAAC,mBAAmB,MAAM;IAElC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIjC,cAAc,IAAI,MAAM;IAOxB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,MAAM;IAIhF,aAAa,IAAI,MAAM;IAIvB,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM;IAIhD,mBAAmB,IAAI,MAAM;IAI7B,sBAAsB,IAAI,MAAM,GAAG,IAAI;IAIvC,qBAAqB,CAAC,WAAW,EAAE,KAAK,GAAG,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM;IAIpF,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,cAAc;IAQrD,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,GAAG,gBAAgB,GAAG,IAAI;IAI1F,cAAc,IAAI,OAAO;IAIzB,gBAAgB,IAAI,OAAO;IAI3B,iBAAiB,IAAI,iBAAiB;IAOtC,iBAAiB,IAAI,iBAAiB;IAItC,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAG,MAAM;IAItH,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI;IAIxG,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM;IAI5D,UAAU,IAAI,MAAM,CAAC,OAAO,GAAG,UAAU,GAAG,SAAS,EAAE,MAAM,CAAC;IAI9D,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,GAAG,MAAM;IAI7D,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAIjC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IAItE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;IAKxD,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAIzC,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB;IAInD,qBAAqB,IAAI,MAAM,EAAE;IAIjC,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IAI/G,iBAAiB,IAAI,OAAO;IAI5B,cAAc,IAAI,OAAO;IAIzB,oBAAoB,IAAI,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI;IAI/E,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIpD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAI1C,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAIvH,cAAc,IAAI,MAAM;IAIxB,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAI5C,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,4BAA4B,CAAC;CAM7L"}
|
package/dist/providers/none.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { transformAgentForClaude } from '../cli/agent-transform.js';
|
|
1
2
|
const NO_LLM_ERROR = 'This member has no LLM provider (llm_provider: "none") -- it is a plain command executor. Use execute_command instead of execute_prompt.';
|
|
2
3
|
/**
|
|
3
4
|
* Null-object provider for no-LLM members (apra-fleet-us9.14): a plain
|
|
@@ -21,7 +22,10 @@ export class NoneProvider {
|
|
|
21
22
|
versionCommand() {
|
|
22
23
|
throw new Error(NO_LLM_ERROR);
|
|
23
24
|
}
|
|
24
|
-
|
|
25
|
+
// Still refuses by design (apra-fleet-7dir.2.7): the widened signature
|
|
26
|
+
// gains no new behavior here -- there is no install path for a
|
|
27
|
+
// no-LLM member regardless of shell.
|
|
28
|
+
installCommand(_os, _shell) {
|
|
25
29
|
throw new Error(NO_LLM_ERROR);
|
|
26
30
|
}
|
|
27
31
|
updateCommand() {
|
|
@@ -42,6 +46,13 @@ export class NoneProvider {
|
|
|
42
46
|
parseResponse(_result) {
|
|
43
47
|
throw new Error(NO_LLM_ERROR);
|
|
44
48
|
}
|
|
49
|
+
// No-LLM members never run a prompt, so there is no usage/quota limit concept.
|
|
50
|
+
// Unlike the throwing methods above, detectUsageLimit is reachable from call
|
|
51
|
+
// sites that iterate all members regardless of provider, so it returns null
|
|
52
|
+
// rather than throwing.
|
|
53
|
+
detectUsageLimit(_result, _parsed) {
|
|
54
|
+
return null;
|
|
55
|
+
}
|
|
45
56
|
supportsResume() {
|
|
46
57
|
return false;
|
|
47
58
|
}
|
|
@@ -51,6 +62,12 @@ export class NoneProvider {
|
|
|
51
62
|
sessionIdStrategy() {
|
|
52
63
|
return { type: 'provider-minted' };
|
|
53
64
|
}
|
|
65
|
+
// apra-fleet-25yl.2.1: the no-LLM member runs plain commands, which do stream
|
|
66
|
+
// on the exec channel -- so the caller's timeout_s IS a meaningful inactivity
|
|
67
|
+
// deadline here, and this also keeps its behaviour unchanged.
|
|
68
|
+
execTimeoutSource() {
|
|
69
|
+
return 'inactivity_timeout';
|
|
70
|
+
}
|
|
54
71
|
resolveSessionLogPath(_sessionId, _workFolder, _homeDir, _targetOs) {
|
|
55
72
|
return '';
|
|
56
73
|
}
|
|
@@ -72,8 +89,9 @@ export class NoneProvider {
|
|
|
72
89
|
agentDirectories(agentName) {
|
|
73
90
|
throw new Error('none provider has no agent directories');
|
|
74
91
|
}
|
|
75
|
-
transformAgent(content,
|
|
76
|
-
|
|
92
|
+
transformAgent(content, relPath) {
|
|
93
|
+
// Same resolver the local install uses for this provider, so remote == local.
|
|
94
|
+
return transformAgentForClaude(content, relPath);
|
|
77
95
|
}
|
|
78
96
|
agentNameFlag(_agentName) {
|
|
79
97
|
return '';
|
|
@@ -114,7 +132,7 @@ export class NoneProvider {
|
|
|
114
132
|
headlessInvocation(_promptLiteral) {
|
|
115
133
|
throw new Error(NO_LLM_ERROR);
|
|
116
134
|
}
|
|
117
|
-
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs) {
|
|
135
|
+
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs, _shell) {
|
|
118
136
|
// No-LLM members have no CLI and no trust concept whatsoever. No-op (unlike other
|
|
119
137
|
// methods on this class, this one is reachable from call sites that iterate all
|
|
120
138
|
// members regardless of provider, so it returns a plain no-op rather than throwing).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"none.js","sourceRoot":"","sources":["../../src/providers/none.ts"],"names":[],"mappings":"AAIA,MAAM,YAAY,GAAG,0IAA0I,CAAC;AAEhK;;;;;;;;;GASG;AACH,MAAM,OAAO,YAAY;IACd,IAAI,GAAgB,MAAM,CAAC;IAC3B,WAAW,GAAG,EAAE,CAAC;IACjB,UAAU,GAAG,EAAE,CAAC;IAChB,cAAc,GAAG,EAAE,CAAC;IACpB,mBAAmB,GAAG,EAAE,CAAC;IAElC,UAAU,CAAC,KAAa;QACtB,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,cAAc;QACZ,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,cAAc,CAAC,GAAkC;
|
|
1
|
+
{"version":3,"file":"none.js","sourceRoot":"","sources":["../../src/providers/none.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,YAAY,GAAG,0IAA0I,CAAC;AAEhK;;;;;;;;;GASG;AACH,MAAM,OAAO,YAAY;IACd,IAAI,GAAgB,MAAM,CAAC;IAC3B,WAAW,GAAG,EAAE,CAAC;IACjB,UAAU,GAAG,EAAE,CAAC;IAChB,cAAc,GAAG,EAAE,CAAC;IACpB,mBAAmB,GAAG,EAAE,CAAC;IAElC,UAAU,CAAC,KAAa;QACtB,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,cAAc;QACZ,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,uEAAuE;IACvE,+DAA+D;IAC/D,qCAAqC;IACrC,cAAc,CAAC,GAAkC,EAAE,MAAoB;QACrE,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,aAAa;QACX,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,kBAAkB,CAAC,KAAoB;QACrC,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,mBAAmB;QACjB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,sBAAsB;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qBAAqB,CAAC,WAAqD;QACzE,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,aAAa,CAAC,OAAsB;QAClC,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,+EAA+E;IAC/E,6EAA6E;IAC7E,4EAA4E;IAC5E,wBAAwB;IACxB,gBAAgB,CAAC,OAAsB,EAAE,OAAuB;QAC9D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,gBAAgB;QACd,OAAO,KAAK,CAAC;IACf,CAAC;IAED,iBAAiB;QACf,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;IACrC,CAAC;IAED,8EAA8E;IAC9E,8EAA8E;IAC9E,8DAA8D;IAC9D,iBAAiB;QACf,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,qBAAqB,CAAC,UAAkB,EAAE,WAAmB,EAAE,QAAwB,EAAE,SAAoB;QAC3G,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,oBAAoB,CAAC,WAAmB,EAAE,QAAwB,EAAE,SAAoB;QACtF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,UAAmB,EAAE,SAAmB;QACjD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,UAAU;QACR,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAClD,CAAC;IAED,YAAY,CAAC,KAAuC;QAClD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,gBAAgB,CAAC,SAAiB;QAChC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,cAAc,CAAC,OAAe,EAAE,OAAe;QAC7C,8EAA8E;QAC9E,OAAO,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,aAAa,CAAC,UAAkB;QAC9B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,aAAa,CAAC,OAAe;QAC3B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,qBAAqB;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,uBAAuB,CAAC,KAA0B,EAAE,MAAiB;QACnE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,iBAAiB;QACf,OAAO,KAAK,CAAC;IACf,CAAC;IAED,cAAc;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,oBAAoB;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,mBAAmB;QACjB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,kBAAkB,CAAC,MAAc;QAC/B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,iBAAiB,CAAC,SAAiB,EAAE,SAAiB,EAAE,QAAgB,EAAE,UAAmB,EAAE,MAAe;QAC5G,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,cAAc;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,kBAAkB,CAAC,cAAsB;QACvC,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,WAAmB,EAAE,YAAkC,EAAE,QAAwC,EAAE,MAAoB;QAClJ,kFAAkF;QAClF,gFAAgF;QAChF,qFAAqF;QACrF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,yCAAyC,EAAE,CAAC;IAC9E,CAAC;CACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import type { ProviderAdapter, PromptOptions, ParsedResponse, RegisterMcpEndpointOptions, RegisterMcpEndpointResult, WorkspaceTrustExecFn, EnsureWorkspaceTrustedResult, SessionIdStrategy, TargetOS } from './provider.js';
|
|
1
|
+
import type { ProviderAdapter, PromptOptions, ParsedResponse, UsageLimitSignal, RegisterMcpEndpointOptions, RegisterMcpEndpointResult, WorkspaceTrustExecFn, EnsureWorkspaceTrustedResult, SessionIdStrategy, ExecTimeoutSource, 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;
|
|
@@ -24,12 +25,14 @@ export declare class OpenCodeProvider implements ProviderAdapter {
|
|
|
24
25
|
transformAgent(content: string, relPath: string): string;
|
|
25
26
|
agentNameFlag(_agentName: string): string;
|
|
26
27
|
classifyError(output: string): PromptErrorCategory;
|
|
28
|
+
detectUsageLimit(result: SSHExecResult, parsed: ParsedResponse): UsageLimitSignal | null;
|
|
27
29
|
headlessInvocation(promptLiteral: string): string;
|
|
28
30
|
jsonOutputFlag(): string;
|
|
29
31
|
buildPromptCommand(opts: PromptOptions): string;
|
|
30
32
|
supportsResume(): boolean;
|
|
31
33
|
supportsMaxTurns(): boolean;
|
|
32
34
|
sessionIdStrategy(): SessionIdStrategy;
|
|
35
|
+
execTimeoutSource(): ExecTimeoutSource;
|
|
33
36
|
resolveSessionLogPath(_sessionId: string, _workFolder: string, _homeDir?: string | null, _targetOs?: TargetOS): string;
|
|
34
37
|
resolveSessionLogDir(_workFolder: string, homeDir?: string | null, targetOs?: TargetOS): string | null;
|
|
35
38
|
resumeFlag(sessionId?: string, resuming?: boolean): string;
|
|
@@ -47,6 +50,6 @@ export declare class OpenCodeProvider implements ProviderAdapter {
|
|
|
47
50
|
authEnvVarForToken(_token: string): string;
|
|
48
51
|
wrapWindowsPrompt(setupCmd: string, filePath: string, argList: string, _sessionId?: string, _model?: string): string;
|
|
49
52
|
registerMcpEndpoint(opts: RegisterMcpEndpointOptions): Promise<RegisterMcpEndpointResult>;
|
|
50
|
-
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows'): Promise<EnsureWorkspaceTrustedResult>;
|
|
53
|
+
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows', _shell?: MemberShell): Promise<EnsureWorkspaceTrustedResult>;
|
|
51
54
|
}
|
|
52
55
|
//# 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;
|
|
1
|
+
{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../src/providers/opencode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { joinForOS, resolveHomeDir } from './provider.js';
|
|
1
|
+
import { joinForOS, resolveHomeDir, defaultUsageLimitSignal } from './provider.js';
|
|
2
2
|
import { escapeDoubleQuoted } from '../os/os-commands.js';
|
|
3
3
|
import { logWarn } from '../utils/log-helpers.js';
|
|
4
4
|
import { sanitizeSessionId } from '../os/os-commands.js';
|
|
@@ -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
|
}
|
|
@@ -78,10 +81,18 @@ export class OpenCodeProvider {
|
|
|
78
81
|
return 'server';
|
|
79
82
|
if (/timeout|ETIMEDOUT/i.test(output))
|
|
80
83
|
return 'server';
|
|
81
|
-
|
|
84
|
+
// apra-fleet-hzeb.1: widened to the shared overloaded/quota set (previously
|
|
85
|
+
// lacked 529, quota/usage/credit-limit, resource_exhausted) so opencode
|
|
86
|
+
// quota exhaustion classifies consistently with the other adapters.
|
|
87
|
+
if (/\b429\b|\b529\b|overloaded|rate limit|quota exceeded|resource_exhausted|credit limit|usage limit/i.test(output))
|
|
82
88
|
return 'overloaded';
|
|
83
89
|
return 'unknown';
|
|
84
90
|
}
|
|
91
|
+
// apra-fleet-hzeb.1: OpenCode has no distinct usage-limit event surface, so key off
|
|
92
|
+
// the raw output using the shared quota detector (guessed resume window).
|
|
93
|
+
detectUsageLimit(result, parsed) {
|
|
94
|
+
return defaultUsageLimitSignal(result.stderr || result.stdout || parsed.result);
|
|
95
|
+
}
|
|
85
96
|
headlessInvocation(promptLiteral) {
|
|
86
97
|
return `run "${promptLiteral}"`;
|
|
87
98
|
}
|
|
@@ -119,6 +130,18 @@ export class OpenCodeProvider {
|
|
|
119
130
|
sessionIdStrategy() {
|
|
120
131
|
return { type: 'provider-minted' };
|
|
121
132
|
}
|
|
133
|
+
// apra-fleet-25yl.2.1: keep BOTH signals armed for OpenCode, with OR
|
|
134
|
+
// semantics -- either the exec channel advancing or the log-directory mtime
|
|
135
|
+
// advancing means not-stalled. resolveSessionLogPath() below returns '' while
|
|
136
|
+
// resolveSessionLogDir() returns a real directory, so OpenCode's file-side
|
|
137
|
+
// signal is coarse directory polling only; keeping the exec-level timer as
|
|
138
|
+
// well is the conservative default. Narrowing this to one mechanism (i.e.
|
|
139
|
+
// flipping to 'total_ceiling') requires a separate LIVE responsiveness check
|
|
140
|
+
// of what OpenCode actually emits mid-turn -- it was deliberately not
|
|
141
|
+
// attempted here, so do not flip it on reasoning alone.
|
|
142
|
+
execTimeoutSource() {
|
|
143
|
+
return 'inactivity_timeout';
|
|
144
|
+
}
|
|
122
145
|
resolveSessionLogPath(_sessionId, _workFolder, _homeDir, _targetOs) {
|
|
123
146
|
return '';
|
|
124
147
|
}
|
|
@@ -267,7 +290,7 @@ export class OpenCodeProvider {
|
|
|
267
290
|
detail: `merged apra-fleet-member into ${configFile} (mcp.apra-fleet-member, remote+bearer-auth headers)`,
|
|
268
291
|
};
|
|
269
292
|
}
|
|
270
|
-
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs) {
|
|
293
|
+
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs, _shell) {
|
|
271
294
|
// apra-fleet-eft.40 provider trust matrix: OpenCode has a first-run trust/onboarding
|
|
272
295
|
// gate too (docs/opencode-exploration.md:92-97), but it is ALREADY handled via the
|
|
273
296
|
// 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;
|
|
1
|
+
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../src/providers/opencode.ts"],"names":[],"mappings":"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"}
|