@apralabs/apra-fleet 0.3.6 → 0.4.0
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 +245 -257
- package/dist/agents/backlog-groomer.md +287 -0
- package/dist/agents/deployer.md +52 -11
- package/dist/agents/doer.md +32 -7
- package/dist/agents/integ-test-runner.md +151 -61
- package/dist/agents/plan-reviewer.md +74 -17
- package/dist/agents/planner.md +94 -14
- package/dist/agents/regression-test-runner.md +216 -0
- package/dist/agents/reviewer.md +21 -6
- package/dist/agents/schemas/backlog-groomer-input.json +35 -0
- package/dist/agents/schemas/backlog-groomer-output.json +164 -0
- package/dist/agents/schemas/integ-test-runner-output.json +34 -0
- package/dist/agents/schemas/regression-test-runner-input.json +15 -0
- package/dist/agents/schemas/regression-test-runner-output.json +50 -0
- package/dist/agents/schemas/reviewer-output.json +4 -0
- package/dist/cli/agent-transform.d.ts +1 -0
- package/dist/cli/agent-transform.d.ts.map +1 -1
- package/dist/cli/agent-transform.js +77 -0
- package/dist/cli/agent-transform.js.map +1 -1
- package/dist/cli/auth.d.ts +3 -0
- package/dist/cli/auth.d.ts.map +1 -1
- package/dist/cli/auth.js +181 -5
- package/dist/cli/auth.js.map +1 -1
- package/dist/cli/config.d.ts +5 -1
- package/dist/cli/config.d.ts.map +1 -1
- package/dist/cli/config.js +7 -1
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/dolt-install.d.ts +91 -0
- package/dist/cli/dolt-install.d.ts.map +1 -0
- package/dist/cli/dolt-install.js +334 -0
- package/dist/cli/dolt-install.js.map +1 -0
- package/dist/cli/install-guard.d.ts +29 -0
- package/dist/cli/install-guard.d.ts.map +1 -0
- package/dist/cli/install-guard.js +153 -0
- package/dist/cli/install-guard.js.map +1 -0
- package/dist/cli/install.d.ts +44 -3
- package/dist/cli/install.d.ts.map +1 -1
- package/dist/cli/install.js +604 -108
- package/dist/cli/install.js.map +1 -1
- package/dist/cli/join.d.ts +12 -0
- package/dist/cli/join.d.ts.map +1 -0
- package/dist/cli/join.js +87 -0
- package/dist/cli/join.js.map +1 -0
- package/dist/cli/register-member.d.ts +2 -0
- package/dist/cli/register-member.d.ts.map +1 -0
- package/dist/cli/register-member.js +193 -0
- package/dist/cli/register-member.js.map +1 -0
- package/dist/cli/restart.d.ts +2 -0
- package/dist/cli/restart.d.ts.map +1 -0
- package/dist/cli/restart.js +7 -0
- package/dist/cli/restart.js.map +1 -0
- package/dist/cli/spoke.d.ts +35 -0
- package/dist/cli/spoke.d.ts.map +1 -0
- package/dist/cli/spoke.js +212 -0
- package/dist/cli/spoke.js.map +1 -0
- package/dist/cli/start.d.ts +2 -0
- package/dist/cli/start.d.ts.map +1 -0
- package/dist/cli/start.js +92 -0
- package/dist/cli/start.js.map +1 -0
- package/dist/cli/status.d.ts +2 -0
- package/dist/cli/status.d.ts.map +1 -0
- package/dist/cli/status.js +83 -0
- package/dist/cli/status.js.map +1 -0
- package/dist/cli/stop.d.ts +2 -0
- package/dist/cli/stop.d.ts.map +1 -0
- package/dist/cli/stop.js +51 -0
- package/dist/cli/stop.js.map +1 -0
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +109 -9
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/update.d.ts.map +1 -1
- package/dist/cli/update.js +10 -1
- package/dist/cli/update.js.map +1 -1
- package/dist/cli/workflow-assets.d.ts +37 -0
- package/dist/cli/workflow-assets.d.ts.map +1 -0
- package/dist/cli/workflow-assets.js +144 -0
- package/dist/cli/workflow-assets.js.map +1 -0
- package/dist/cli/workflow.d.ts +75 -0
- package/dist/cli/workflow.d.ts.map +1 -0
- package/dist/cli/workflow.js +397 -0
- package/dist/cli/workflow.js.map +1 -0
- package/dist/hub-service/activity.d.ts +30 -0
- package/dist/hub-service/activity.d.ts.map +1 -0
- package/dist/hub-service/activity.js +20 -0
- package/dist/hub-service/activity.js.map +1 -0
- package/dist/hub-service/audit-log.d.ts +19 -0
- package/dist/hub-service/audit-log.d.ts.map +1 -0
- package/dist/hub-service/audit-log.js +13 -0
- package/dist/hub-service/audit-log.js.map +1 -0
- package/dist/hub-service/db/pool.d.ts +19 -0
- package/dist/hub-service/db/pool.d.ts.map +1 -0
- package/dist/hub-service/db/pool.js +53 -0
- package/dist/hub-service/db/pool.js.map +1 -0
- package/dist/hub-service/enrollment.d.ts +29 -0
- package/dist/hub-service/enrollment.d.ts.map +1 -0
- package/dist/hub-service/enrollment.js +48 -0
- package/dist/hub-service/enrollment.js.map +1 -0
- package/dist/hub-service/envelope-routes.d.ts +46 -0
- package/dist/hub-service/envelope-routes.d.ts.map +1 -0
- package/dist/hub-service/envelope-routes.js +94 -0
- package/dist/hub-service/envelope-routes.js.map +1 -0
- package/dist/hub-service/handlers/installers.d.ts +14 -0
- package/dist/hub-service/handlers/installers.d.ts.map +1 -0
- package/dist/hub-service/handlers/installers.js +8 -0
- package/dist/hub-service/handlers/installers.js.map +1 -0
- package/dist/hub-service/http-server.d.ts +31 -0
- package/dist/hub-service/http-server.d.ts.map +1 -0
- package/dist/hub-service/http-server.js +711 -0
- package/dist/hub-service/http-server.js.map +1 -0
- package/dist/hub-service/hub-jwt.d.ts +30 -0
- package/dist/hub-service/hub-jwt.d.ts.map +1 -0
- package/dist/hub-service/hub-jwt.js +105 -0
- package/dist/hub-service/hub-jwt.js.map +1 -0
- package/dist/hub-service/jwt-revocation.d.ts +20 -0
- package/dist/hub-service/jwt-revocation.d.ts.map +1 -0
- package/dist/hub-service/jwt-revocation.js +18 -0
- package/dist/hub-service/jwt-revocation.js.map +1 -0
- package/dist/hub-service/machines.d.ts +16 -0
- package/dist/hub-service/machines.d.ts.map +1 -0
- package/dist/hub-service/machines.js +14 -0
- package/dist/hub-service/machines.js.map +1 -0
- package/dist/hub-service/main.d.ts +3 -0
- package/dist/hub-service/main.d.ts.map +1 -0
- package/dist/hub-service/main.js +64 -0
- package/dist/hub-service/main.js.map +1 -0
- package/dist/hub-service/member-tokens.d.ts +11 -0
- package/dist/hub-service/member-tokens.d.ts.map +1 -0
- package/dist/hub-service/member-tokens.js +49 -0
- package/dist/hub-service/member-tokens.js.map +1 -0
- package/dist/hub-service/member-view.d.ts +20 -0
- package/dist/hub-service/member-view.d.ts.map +1 -0
- package/dist/hub-service/member-view.js +76 -0
- package/dist/hub-service/member-view.js.map +1 -0
- package/dist/hub-service/members.d.ts +44 -0
- package/dist/hub-service/members.d.ts.map +1 -0
- package/dist/hub-service/members.js +25 -0
- package/dist/hub-service/members.js.map +1 -0
- package/dist/hub-service/presence.d.ts +40 -0
- package/dist/hub-service/presence.d.ts.map +1 -0
- package/dist/hub-service/presence.js +44 -0
- package/dist/hub-service/presence.js.map +1 -0
- package/dist/hub-service/project-view.d.ts +12 -0
- package/dist/hub-service/project-view.d.ts.map +1 -0
- package/dist/hub-service/project-view.js +34 -0
- package/dist/hub-service/project-view.js.map +1 -0
- package/dist/hub-service/projects.d.ts +48 -0
- package/dist/hub-service/projects.d.ts.map +1 -0
- package/dist/hub-service/projects.js +80 -0
- package/dist/hub-service/projects.js.map +1 -0
- package/dist/hub-service/relay-queue.d.ts +115 -0
- package/dist/hub-service/relay-queue.d.ts.map +1 -0
- package/dist/hub-service/relay-queue.js +148 -0
- package/dist/hub-service/relay-queue.js.map +1 -0
- package/dist/hub-service/session-jwt.d.ts +10 -0
- package/dist/hub-service/session-jwt.d.ts.map +1 -0
- package/dist/hub-service/session-jwt.js +69 -0
- package/dist/hub-service/session-jwt.js.map +1 -0
- package/dist/hub-service/usage.d.ts +40 -0
- package/dist/hub-service/usage.d.ts.map +1 -0
- package/dist/hub-service/usage.js +25 -0
- package/dist/hub-service/usage.js.map +1 -0
- package/dist/hub-service/users.d.ts +56 -0
- package/dist/hub-service/users.d.ts.map +1 -0
- package/dist/hub-service/users.js +72 -0
- package/dist/hub-service/users.js.map +1 -0
- package/dist/hub-service/workspaces.d.ts +20 -0
- package/dist/hub-service/workspaces.d.ts.map +1 -0
- package/dist/hub-service/workspaces.js +10 -0
- package/dist/hub-service/workspaces.js.map +1 -0
- package/dist/index.js +179 -132
- package/dist/index.js.map +1 -1
- package/dist/os/linux.d.ts +13 -0
- package/dist/os/linux.d.ts.map +1 -1
- package/dist/os/linux.js +62 -3
- package/dist/os/linux.js.map +1 -1
- package/dist/os/os-commands.d.ts +10 -0
- package/dist/os/os-commands.d.ts.map +1 -1
- package/dist/os/windows.d.ts +1 -0
- package/dist/os/windows.d.ts.map +1 -1
- package/dist/os/windows.js +21 -1
- package/dist/os/windows.js.map +1 -1
- package/dist/paths.d.ts +23 -0
- package/dist/paths.d.ts.map +1 -1
- package/dist/paths.js +29 -0
- package/dist/paths.js.map +1 -1
- package/dist/providers/agy.d.ts +9 -2
- package/dist/providers/agy.d.ts.map +1 -1
- package/dist/providers/agy.js +127 -14
- package/dist/providers/agy.js.map +1 -1
- package/dist/providers/claude.d.ts +6 -2
- package/dist/providers/claude.d.ts.map +1 -1
- package/dist/providers/claude.js +248 -9
- 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 +7 -0
- 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 +8 -1
- package/dist/providers/copilot.js.map +1 -1
- package/dist/providers/gemini.d.ts +3 -2
- package/dist/providers/gemini.d.ts.map +1 -1
- package/dist/providers/gemini.js +11 -1
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/index.d.ts +1 -0
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +3 -0
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/none.d.ts +51 -0
- package/dist/providers/none.d.ts.map +1 -0
- package/dist/providers/none.js +103 -0
- package/dist/providers/none.js.map +1 -0
- package/dist/providers/opencode.d.ts +4 -2
- package/dist/providers/opencode.d.ts.map +1 -1
- package/dist/providers/opencode.js +49 -0
- package/dist/providers/opencode.js.map +1 -1
- package/dist/providers/provider.d.ts +79 -1
- package/dist/providers/provider.d.ts.map +1 -1
- package/dist/providers/provider.js +10 -0
- package/dist/providers/provider.js.map +1 -1
- package/dist/services/agent-provisioner.d.ts +3 -3
- package/dist/services/agent-provisioner.d.ts.map +1 -1
- package/dist/services/agent-provisioner.js +12 -5
- package/dist/services/agent-provisioner.js.map +1 -1
- package/dist/services/auth-socket.d.ts.map +1 -1
- package/dist/services/auth-socket.js +2 -0
- package/dist/services/auth-socket.js.map +1 -1
- package/dist/services/budget-awareness.d.ts +130 -0
- package/dist/services/budget-awareness.d.ts.map +1 -0
- package/dist/services/budget-awareness.js +129 -0
- package/dist/services/budget-awareness.js.map +1 -0
- package/dist/services/cloud-sync.d.ts +35 -0
- package/dist/services/cloud-sync.d.ts.map +1 -0
- package/dist/services/cloud-sync.js +90 -0
- package/dist/services/cloud-sync.js.map +1 -0
- package/dist/services/context-admission.d.ts +82 -0
- package/dist/services/context-admission.d.ts.map +1 -0
- package/dist/services/context-admission.js +136 -0
- package/dist/services/context-admission.js.map +1 -0
- package/dist/services/event-bus.d.ts +27 -0
- package/dist/services/event-bus.d.ts.map +1 -0
- package/dist/services/event-bus.js +20 -0
- package/dist/services/event-bus.js.map +1 -0
- package/dist/services/file-chunker.d.ts +38 -0
- package/dist/services/file-chunker.d.ts.map +1 -0
- package/dist/services/file-chunker.js +63 -0
- package/dist/services/file-chunker.js.map +1 -0
- package/dist/services/file-transfer-relay.d.ts +55 -0
- package/dist/services/file-transfer-relay.d.ts.map +1 -0
- package/dist/services/file-transfer-relay.js +115 -0
- package/dist/services/file-transfer-relay.js.map +1 -0
- package/dist/services/github-app.d.ts.map +1 -1
- package/dist/services/github-app.js +1 -0
- package/dist/services/github-app.js.map +1 -1
- package/dist/services/http-transport.d.ts +25 -0
- package/dist/services/http-transport.d.ts.map +1 -0
- package/dist/services/http-transport.js +371 -0
- package/dist/services/http-transport.js.map +1 -0
- package/dist/services/hub-client.d.ts +69 -0
- package/dist/services/hub-client.d.ts.map +1 -0
- package/dist/services/hub-client.js +217 -0
- package/dist/services/hub-client.js.map +1 -0
- package/dist/services/jwt.d.ts +17 -0
- package/dist/services/jwt.d.ts.map +1 -0
- package/dist/services/jwt.js +70 -0
- package/dist/services/jwt.js.map +1 -0
- package/dist/services/known-sessions.d.ts +8 -0
- package/dist/services/known-sessions.d.ts.map +1 -0
- package/dist/services/known-sessions.js +40 -0
- package/dist/services/known-sessions.js.map +1 -0
- package/dist/services/model-pricing.d.ts +36 -0
- package/dist/services/model-pricing.d.ts.map +1 -0
- package/dist/services/model-pricing.js +108 -0
- package/dist/services/model-pricing.js.map +1 -0
- package/dist/services/orphan-recovery.d.ts +56 -0
- package/dist/services/orphan-recovery.d.ts.map +1 -0
- package/dist/services/orphan-recovery.js +111 -0
- package/dist/services/orphan-recovery.js.map +1 -0
- package/dist/services/pending-responses.d.ts +23 -0
- package/dist/services/pending-responses.d.ts.map +1 -0
- package/dist/services/pending-responses.js +52 -0
- package/dist/services/pending-responses.js.map +1 -0
- package/dist/services/registry.d.ts +4 -1
- package/dist/services/registry.d.ts.map +1 -1
- package/dist/services/registry.js +3 -0
- package/dist/services/registry.js.map +1 -1
- package/dist/services/relay-context.d.ts +23 -0
- package/dist/services/relay-context.d.ts.map +1 -0
- package/dist/services/relay-context.js +8 -0
- package/dist/services/relay-context.js.map +1 -0
- package/dist/services/relay-executor.d.ts +68 -0
- package/dist/services/relay-executor.d.ts.map +1 -0
- package/dist/services/relay-executor.js +70 -0
- package/dist/services/relay-executor.js.map +1 -0
- package/dist/services/relay-request.d.ts +65 -0
- package/dist/services/relay-request.d.ts.map +1 -0
- package/dist/services/relay-request.js +129 -0
- package/dist/services/relay-request.js.map +1 -0
- package/dist/services/relay-strategy.d.ts +19 -0
- package/dist/services/relay-strategy.d.ts.map +1 -0
- package/dist/services/relay-strategy.js +111 -0
- package/dist/services/relay-strategy.js.map +1 -0
- package/dist/services/service-manager/index.d.ts +5 -0
- package/dist/services/service-manager/index.d.ts.map +1 -0
- package/dist/services/service-manager/index.js +66 -0
- package/dist/services/service-manager/index.js.map +1 -0
- package/dist/services/service-manager/linux.d.ts +10 -0
- package/dist/services/service-manager/linux.d.ts.map +1 -0
- package/dist/services/service-manager/linux.js +97 -0
- package/dist/services/service-manager/linux.js.map +1 -0
- package/dist/services/service-manager/macos.d.ts +10 -0
- package/dist/services/service-manager/macos.d.ts.map +1 -0
- package/dist/services/service-manager/macos.js +94 -0
- package/dist/services/service-manager/macos.js.map +1 -0
- package/dist/services/service-manager/types.d.ts +18 -0
- package/dist/services/service-manager/types.d.ts.map +1 -0
- package/dist/services/service-manager/types.js +5 -0
- package/dist/services/service-manager/types.js.map +1 -0
- package/dist/services/service-manager/windows.d.ts +10 -0
- package/dist/services/service-manager/windows.d.ts.map +1 -0
- package/dist/services/service-manager/windows.js +73 -0
- package/dist/services/service-manager/windows.js.map +1 -0
- package/dist/services/session-registry.d.ts +70 -0
- package/dist/services/session-registry.d.ts.map +1 -0
- package/dist/services/session-registry.js +91 -0
- package/dist/services/session-registry.js.map +1 -0
- package/dist/services/singleton.d.ts +15 -0
- package/dist/services/singleton.d.ts.map +1 -0
- package/dist/services/singleton.js +98 -0
- package/dist/services/singleton.js.map +1 -0
- package/dist/services/sprint-coordination.d.ts +168 -0
- package/dist/services/sprint-coordination.d.ts.map +1 -0
- package/dist/services/sprint-coordination.js +564 -0
- package/dist/services/sprint-coordination.js.map +1 -0
- package/dist/services/ssh.d.ts.map +1 -1
- package/dist/services/ssh.js +70 -3
- package/dist/services/ssh.js.map +1 -1
- package/dist/services/stall/log-path-resolver.d.ts.map +1 -1
- package/dist/services/stall/log-path-resolver.js +8 -1
- package/dist/services/stall/log-path-resolver.js.map +1 -1
- package/dist/services/stall/stall-detector.d.ts.map +1 -1
- package/dist/services/stall/stall-detector.js +39 -7
- package/dist/services/stall/stall-detector.js.map +1 -1
- package/dist/services/stall/stall-poller.d.ts +16 -0
- package/dist/services/stall/stall-poller.d.ts.map +1 -1
- package/dist/services/stall/stall-poller.js +136 -18
- package/dist/services/stall/stall-poller.js.map +1 -1
- package/dist/services/strategy.d.ts.map +1 -1
- package/dist/services/strategy.js +55 -5
- package/dist/services/strategy.js.map +1 -1
- package/dist/services/substitution-engine.d.ts +20 -0
- package/dist/services/substitution-engine.d.ts.map +1 -0
- package/dist/services/substitution-engine.js +92 -0
- package/dist/services/substitution-engine.js.map +1 -0
- package/dist/services/task-cleanup.d.ts.map +1 -1
- package/dist/services/task-cleanup.js +1 -9
- package/dist/services/task-cleanup.js.map +1 -1
- package/dist/services/token-issuer.d.ts +47 -0
- package/dist/services/token-issuer.d.ts.map +1 -0
- package/dist/services/token-issuer.js +63 -0
- package/dist/services/token-issuer.js.map +1 -0
- package/dist/services/tool-registry.d.ts +3 -0
- package/dist/services/tool-registry.d.ts.map +1 -0
- package/dist/services/tool-registry.js +139 -0
- package/dist/services/tool-registry.js.map +1 -0
- package/dist/services/user-config.d.ts +14 -0
- package/dist/services/user-config.d.ts.map +1 -1
- package/dist/services/user-config.js +55 -0
- package/dist/services/user-config.js.map +1 -1
- package/dist/services/vcs/types.d.ts +44 -0
- package/dist/services/vcs/types.d.ts.map +1 -1
- package/dist/skills/fleet-sprint-cli/SKILL.md +103 -0
- package/dist/skills/pm/cost.md +3 -0
- package/dist/skills/pm/doer-reviewer-loop.md +3 -0
- package/dist/tools/check-status.d.ts.map +1 -1
- package/dist/tools/check-status.js +8 -2
- package/dist/tools/check-status.js.map +1 -1
- package/dist/tools/child-id-allocator.d.ts +45 -0
- package/dist/tools/child-id-allocator.d.ts.map +1 -0
- package/dist/tools/child-id-allocator.js +62 -0
- package/dist/tools/child-id-allocator.js.map +1 -0
- package/dist/tools/cloud-control.d.ts +2 -2
- package/dist/tools/compose-permissions.d.ts +12 -4
- package/dist/tools/compose-permissions.d.ts.map +1 -1
- package/dist/tools/compose-permissions.js +55 -4
- package/dist/tools/compose-permissions.js.map +1 -1
- package/dist/tools/dolt-push-mutex.d.ts +44 -0
- package/dist/tools/dolt-push-mutex.d.ts.map +1 -0
- package/dist/tools/dolt-push-mutex.js +83 -0
- package/dist/tools/dolt-push-mutex.js.map +1 -0
- package/dist/tools/execute-command.d.ts +11 -1
- package/dist/tools/execute-command.d.ts.map +1 -1
- package/dist/tools/execute-command.js +22 -5
- package/dist/tools/execute-command.js.map +1 -1
- package/dist/tools/execute-prompt.d.ts +72 -12
- package/dist/tools/execute-prompt.d.ts.map +1 -1
- package/dist/tools/execute-prompt.js +962 -71
- package/dist/tools/execute-prompt.js.map +1 -1
- package/dist/tools/get-member-model-pricing.d.ts +21 -0
- package/dist/tools/get-member-model-pricing.d.ts.map +1 -0
- package/dist/tools/get-member-model-pricing.js +29 -0
- package/dist/tools/get-member-model-pricing.js.map +1 -0
- package/dist/tools/list-members.d.ts.map +1 -1
- package/dist/tools/list-members.js +39 -7
- package/dist/tools/list-members.js.map +1 -1
- package/dist/tools/member-detail.d.ts +1 -1
- package/dist/tools/member-detail.d.ts.map +1 -1
- package/dist/tools/member-detail.js +8 -2
- package/dist/tools/member-detail.js.map +1 -1
- package/dist/tools/member-reservation.d.ts +29 -0
- package/dist/tools/member-reservation.d.ts.map +1 -0
- package/dist/tools/member-reservation.js +71 -0
- package/dist/tools/member-reservation.js.map +1 -0
- package/dist/tools/provision-vcs-auth.d.ts +7 -7
- package/dist/tools/provision-vcs-auth.js +1 -1
- package/dist/tools/provision-vcs-auth.js.map +1 -1
- package/dist/tools/register-member.d.ts +17 -5
- package/dist/tools/register-member.d.ts.map +1 -1
- package/dist/tools/register-member.js +144 -5
- package/dist/tools/register-member.js.map +1 -1
- package/dist/tools/remove-member.d.ts +1 -1
- package/dist/tools/report-status.d.ts +33 -0
- package/dist/tools/report-status.d.ts.map +1 -0
- package/dist/tools/report-status.js +44 -0
- package/dist/tools/report-status.js.map +1 -0
- package/dist/tools/respond-to-message.d.ts +21 -0
- package/dist/tools/respond-to-message.d.ts.map +1 -0
- package/dist/tools/respond-to-message.js +23 -0
- package/dist/tools/respond-to-message.js.map +1 -0
- package/dist/tools/send-files.d.ts +3 -0
- package/dist/tools/send-files.d.ts.map +1 -1
- package/dist/tools/send-files.js +88 -8
- package/dist/tools/send-files.js.map +1 -1
- package/dist/tools/send-message.d.ts +27 -0
- package/dist/tools/send-message.d.ts.map +1 -0
- package/dist/tools/send-message.js +46 -0
- package/dist/tools/send-message.js.map +1 -0
- 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 +19 -0
- package/dist/tools/shutdown-server.js.map +1 -1
- package/dist/tools/update-member.d.ts +8 -8
- package/dist/tools/update-member.d.ts.map +1 -1
- package/dist/tools/update-member.js +11 -1
- package/dist/tools/update-member.js.map +1 -1
- package/dist/types.d.ts +15 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/agent-helpers.d.ts +2 -1
- package/dist/utils/agent-helpers.d.ts.map +1 -1
- package/dist/utils/agent-helpers.js +7 -2
- package/dist/utils/agent-helpers.js.map +1 -1
- package/dist/utils/pid-helpers.d.ts +15 -0
- package/dist/utils/pid-helpers.d.ts.map +1 -1
- package/dist/utils/pid-helpers.js +23 -0
- package/dist/utils/pid-helpers.js.map +1 -1
- package/dist/utils/process-utils.d.ts +3 -0
- package/dist/utils/process-utils.d.ts.map +1 -0
- package/dist/utils/process-utils.js +42 -0
- package/dist/utils/process-utils.js.map +1 -0
- package/dist/utils/prompt-errors.d.ts +2 -1
- package/dist/utils/prompt-errors.d.ts.map +1 -1
- package/dist/utils/prompt-errors.js +13 -3
- package/dist/utils/prompt-errors.js.map +1 -1
- package/dist/utils/workspace-trust.d.ts +24 -0
- package/dist/utils/workspace-trust.d.ts.map +1 -0
- package/dist/utils/workspace-trust.js +35 -0
- package/dist/utils/workspace-trust.js.map +1 -0
- package/dist/workflows/auto-sprint.js +450 -87
- package/package.json +35 -7
- package/packages/apra-fleet-client/package.json +26 -0
- package/packages/apra-fleet-client/src/client/api.mjs +396 -0
- package/packages/apra-fleet-client/src/client/client.mjs +146 -0
- package/packages/apra-fleet-client/src/client/errors.mjs +71 -0
- package/packages/apra-fleet-client/src/client/factory.mjs +65 -0
- package/packages/apra-fleet-client/src/client/server-resolution.mjs +265 -0
- package/packages/apra-fleet-client/src/client/transport.mjs +327 -0
- package/packages/apra-fleet-se/apra-pm/agents/backlog-groomer.md +287 -0
- package/packages/apra-fleet-se/apra-pm/agents/ci-watcher.md +89 -0
- package/packages/apra-fleet-se/apra-pm/agents/deployer.md +139 -0
- package/packages/apra-fleet-se/apra-pm/agents/doer.md +225 -0
- package/packages/apra-fleet-se/apra-pm/agents/harvester.md +169 -0
- package/packages/apra-fleet-se/apra-pm/agents/integ-test-runner.md +316 -0
- package/packages/apra-fleet-se/apra-pm/agents/plan-reviewer.md +188 -0
- package/packages/apra-fleet-se/apra-pm/agents/planner.md +239 -0
- package/packages/apra-fleet-se/apra-pm/agents/regression-test-runner.md +216 -0
- package/packages/apra-fleet-se/apra-pm/agents/reviewer.md +174 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/backlog-groomer-input.json +35 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/backlog-groomer-output.json +164 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/ci-watcher-input.json +26 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/ci-watcher-output.json +18 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/deployer-input.json +19 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/deployer-output.json +17 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/doer-input.json +25 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/doer-output.json +22 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/harvester-input.json +31 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/harvester-output.json +18 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/integ-test-runner-input.json +20 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/integ-test-runner-output.json +61 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/plan-reviewer-input.json +15 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/plan-reviewer-output.json +30 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/regression-test-runner-input.json +15 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/regression-test-runner-output.json +50 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/reviewer-input.json +25 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/reviewer-output.json +38 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/SKILL.md +402 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/beads.md +142 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/cost.md +157 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/doer-reviewer-loop.md +300 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/fleet-addendum.md +121 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/simple-sprint.md +65 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/sprint.md +327 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/worktrees.md +92 -0
- package/packages/apra-fleet-se/apra-pm/version.json +3 -0
- package/packages/apra-fleet-se/bin/cli.mjs +857 -0
- package/packages/apra-fleet-se/bin/serve.mjs +383 -0
- package/packages/apra-fleet-se/fleet-sprint/conflict-ladder.mjs +178 -0
- package/packages/apra-fleet-se/fleet-sprint/contracts.mjs +914 -0
- package/packages/apra-fleet-se/fleet-sprint/dispatch-safety-guard.mjs +177 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/README.md +191 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/coach-role-design.md +151 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-tier2-runbook.md +127 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/fleet-sprint-diagram.md +94 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/stabilization-log.md +1125 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-literal-guard.mjs +72 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-recovery-path-b.mjs +339 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-recovery-tier2.mjs +360 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-recovery.mjs +363 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-sync.mjs +1244 -0
- package/packages/apra-fleet-se/fleet-sprint/errors.mjs +572 -0
- package/packages/apra-fleet-se/fleet-sprint/full-db-fetch-guard.mjs +118 -0
- package/packages/apra-fleet-se/fleet-sprint/runner.js +9447 -0
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-sprint-cli/SKILL.md +103 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-lock.mjs +140 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-module.mjs +435 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/azure-devops.mjs +68 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/bitbucket.mjs +53 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/dolt.mjs +146 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/generic-git.mjs +176 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/github.mjs +222 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/index.mjs +218 -0
- package/packages/apra-fleet-se/fleet-sprint/viewer-extensions.mjs +882 -0
- package/packages/apra-fleet-se/package.json +28 -0
- package/packages/apra-fleet-se/workflow.json +1 -0
- package/packages/apra-fleet-workflow/package.json +30 -0
- package/packages/apra-fleet-workflow/src/viewer/command-output-cap.mjs +112 -0
- package/packages/apra-fleet-workflow/src/viewer/debounced-writer.mjs +153 -0
- package/packages/apra-fleet-workflow/src/viewer/html-utils.mjs +31 -0
- package/packages/apra-fleet-workflow/src/viewer/index.mjs +1325 -0
- package/packages/apra-fleet-workflow/src/viewer/lean-state.mjs +237 -0
- package/packages/apra-fleet-workflow/src/viewer/run-state-paths.mjs +130 -0
- package/packages/apra-fleet-workflow/src/viewer/sprint-state-paths.mjs +29 -0
- package/packages/apra-fleet-workflow/src/workflow/engine.mjs +200 -0
- package/packages/apra-fleet-workflow/src/workflow/errors.mjs +146 -0
- package/packages/apra-fleet-workflow/src/workflow/index.mjs +1723 -0
- package/packages/apra-fleet-workflow/src/workflow/journal.mjs +291 -0
- package/packages/apra-fleet-workflow/src/workflow/pricing.mjs +99 -0
- package/packages/apra-fleet-workflow/src/workflow/vetting.mjs +111 -0
- package/scripts/agy-transcript-reader.js +1 -0
- package/scripts/fleet-statusline.sh +17 -13
- package/skills/fleet/SKILL.md +37 -2
- package/skills/fleet/beads.md +14 -7
- package/skills/fleet/permissions.md +50 -0
- package/skills/fleet/profiles/base-dev.json +1 -0
- package/skills/fleet/profiles/base-reviewer.json +1 -0
- package/skills/fleet/profiles/node.json +2 -2
- package/version.json +1 -1
- package/scripts/agy-settings-merge.js +0 -27
- /package/{dist → packages/apra-fleet-se/apra-pm}/agents/_shared/GRAPH-SEMANTICS.md +0 -0
package/dist/providers/claude.js
CHANGED
|
@@ -1,6 +1,30 @@
|
|
|
1
|
+
import { execFile } from 'node:child_process';
|
|
2
|
+
import { promisify } from 'node:util';
|
|
1
3
|
import { buildResumeFlag, buildSessionIdFlag } from './provider.js';
|
|
2
4
|
import { classifyPromptError } from '../utils/prompt-errors.js';
|
|
3
5
|
import { escapeDoubleQuoted } from '../os/os-commands.js';
|
|
6
|
+
const execFileAsync = promisify(execFile);
|
|
7
|
+
// apra-fleet-iuc.1 / apra-fleet-ekm: reliable max_turns detection in the CLI
|
|
8
|
+
// transcript. A max_turns-terminated session must ALWAYS classify as max_turns,
|
|
9
|
+
// but the Claude Code CLI signals it INCONSISTENTLY across versions/streams:
|
|
10
|
+
// - the `type:result` event's `subtype` is `error_max_turns`, and/or
|
|
11
|
+
// - that same event carries `terminal_reason: "max_turns"`, and/or
|
|
12
|
+
// - a distinct transcript event of `type: "max_turns_reached"` is emitted
|
|
13
|
+
// (with no result-event terminal_reason at all).
|
|
14
|
+
// The old parser recorded ONLY `terminal_reason`, so a transcript that carried
|
|
15
|
+
// the signal solely via `subtype`/the standalone event was silently missed --
|
|
16
|
+
// the ekm forensics show one such session run to a 38.5-min hard timeout + cold
|
|
17
|
+
// restart because it was never classified. Detect ANY of these signals on ANY
|
|
18
|
+
// transcript event so the result the parser returns always normalizes to
|
|
19
|
+
// terminalReason 'max_turns' when the session was turn-limit terminated.
|
|
20
|
+
export function isMaxTurnsSignal(obj) {
|
|
21
|
+
if (!obj || typeof obj !== 'object')
|
|
22
|
+
return false;
|
|
23
|
+
return (obj.terminal_reason === 'max_turns' ||
|
|
24
|
+
obj.subtype === 'error_max_turns' ||
|
|
25
|
+
obj.type === 'max_turns_reached' ||
|
|
26
|
+
obj.stop_reason === 'max_turns');
|
|
27
|
+
}
|
|
4
28
|
export class ClaudeProvider {
|
|
5
29
|
name = 'claude';
|
|
6
30
|
processName = 'claude';
|
|
@@ -23,14 +47,18 @@ export class ClaudeProvider {
|
|
|
23
47
|
return 'claude update';
|
|
24
48
|
}
|
|
25
49
|
buildPromptCommand(opts) {
|
|
26
|
-
const { folder, promptFile, sessionId, resuming, unattended, model, maxTurns, inv } = opts;
|
|
50
|
+
const { folder, promptFile, sessionId, resuming, unattended, model, maxTurns, inv, agentName } = opts;
|
|
27
51
|
const escapedFolder = escapeDoubleQuoted(folder);
|
|
28
52
|
const turns = maxTurns ?? 50;
|
|
29
53
|
let instruction = `Your task is described in ${promptFile} in the current directory. Read that file first, then execute the task.`;
|
|
30
54
|
if (inv) {
|
|
31
55
|
instruction = `[${inv}] ${instruction}`;
|
|
32
56
|
}
|
|
33
|
-
let cmd = `cd "${escapedFolder}" && claude
|
|
57
|
+
let cmd = `cd "${escapedFolder}" && claude`;
|
|
58
|
+
if (agentName) {
|
|
59
|
+
cmd += ` --agent "${escapeDoubleQuoted(agentName)}"`;
|
|
60
|
+
}
|
|
61
|
+
cmd += ` -p "${instruction}" --output-format json --max-turns ${turns}`;
|
|
34
62
|
if (resuming && sessionId) {
|
|
35
63
|
cmd += ` ${buildResumeFlag(sessionId)}`;
|
|
36
64
|
}
|
|
@@ -43,6 +71,18 @@ export class ClaudeProvider {
|
|
|
43
71
|
else if (unattended === 'dangerous') {
|
|
44
72
|
cmd += ' --dangerously-skip-permissions';
|
|
45
73
|
}
|
|
74
|
+
else {
|
|
75
|
+
// apra-fleet-eft.65.1: interactive-session parity for the work folder.
|
|
76
|
+
// A headless `-p` dispatch cannot present a permission prompt, so with no
|
|
77
|
+
// permission-mode flag the CLI HARD-BLOCKS Edit/Write of a brand-new file
|
|
78
|
+
// in its own work folder -- even though an interactive session in the same
|
|
79
|
+
// trusted workspace would simply accept it. `acceptEdits` auto-approves
|
|
80
|
+
// file-edit tools (Edit/Write/MultiEdit/NotebookEdit) for the working
|
|
81
|
+
// directory only; it does NOT auto-approve Bash, network, or edits outside
|
|
82
|
+
// the workspace, so this restores work-folder Edit/Write parity without
|
|
83
|
+
// broadening the permission model (unlike --dangerously-skip-permissions).
|
|
84
|
+
cmd += ` ${this.workspaceEditPermissionFlag()}`;
|
|
85
|
+
}
|
|
46
86
|
if (model) {
|
|
47
87
|
cmd += ` --model "${escapeDoubleQuoted(model)}"`;
|
|
48
88
|
}
|
|
@@ -54,58 +94,123 @@ export class ClaudeProvider {
|
|
|
54
94
|
permissionModeAutoFlag() {
|
|
55
95
|
return '--permission-mode auto';
|
|
56
96
|
}
|
|
97
|
+
workspaceEditPermissionFlag() {
|
|
98
|
+
// apra-fleet-eft.65.1: grants Edit/Write parity for the dispatched agent's
|
|
99
|
+
// own work folder in a headless dispatch (which cannot show a trust/permission
|
|
100
|
+
// prompt) WITHOUT the broad --dangerously-skip-permissions bypass.
|
|
101
|
+
return '--permission-mode acceptEdits';
|
|
102
|
+
}
|
|
57
103
|
parseResponse(result) {
|
|
58
104
|
const raw = result.stdout.trim();
|
|
59
105
|
const extractUsage = (u) => u && typeof u.input_tokens === 'number' && typeof u.output_tokens === 'number'
|
|
60
106
|
? { input_tokens: u.input_tokens, output_tokens: u.output_tokens }
|
|
61
107
|
: undefined;
|
|
62
|
-
|
|
108
|
+
// apra-fleet-eft.28.6: first non-blank string wins. Used so an EMPTY
|
|
109
|
+
// (present-but-blank) result field on the `type:result` event falls back to
|
|
110
|
+
// the assistant text we harvested from the stream, instead of being kept as
|
|
111
|
+
// '' (a plain `obj.result ?? ...` keeps '' because it is not nullish).
|
|
112
|
+
const firstNonEmpty = (...candidates) => {
|
|
113
|
+
for (const c of candidates) {
|
|
114
|
+
if (typeof c === 'string' && c.trim() !== '')
|
|
115
|
+
return c;
|
|
116
|
+
}
|
|
117
|
+
return undefined;
|
|
118
|
+
};
|
|
119
|
+
// apra-fleet-eft.28.6: the assistant's reply text carried by a
|
|
120
|
+
// `type:assistant` stream event (message.content[] text blocks). Real
|
|
121
|
+
// capture (member 'trust-probe', eft.28 NEW EVIDENCE): the final
|
|
122
|
+
// `type:result` event's own `result` field came back empty even though the
|
|
123
|
+
// assistant reply -- including tool output -- was fully present in these
|
|
124
|
+
// preceding events. Harvesting it here lets the server recover the reply
|
|
125
|
+
// instead of dropping it and mislabelling the dispatch empty_response.
|
|
126
|
+
const assistantTextOf = (obj) => {
|
|
127
|
+
const content = obj?.message?.content;
|
|
128
|
+
if (obj?.type !== 'assistant' || !Array.isArray(content))
|
|
129
|
+
return '';
|
|
130
|
+
return content
|
|
131
|
+
.filter((c) => c?.type === 'text' && typeof c.text === 'string')
|
|
132
|
+
.map((c) => c.text)
|
|
133
|
+
.join('');
|
|
134
|
+
};
|
|
135
|
+
const fromEvent = (obj, assistantFallback, maxTurnsSeen) => {
|
|
63
136
|
if (obj.type !== 'result')
|
|
64
137
|
return null;
|
|
138
|
+
// Normalize terminalReason to 'max_turns' whenever the transcript carried
|
|
139
|
+
// the turn-limit signal via ANY channel (this event's terminal_reason,
|
|
140
|
+
// this or a preceding event's subtype/standalone max_turns_reached event)
|
|
141
|
+
// so downstream classification (execute-prompt) is version-independent.
|
|
142
|
+
const maxTurns = maxTurnsSeen || isMaxTurnsSignal(obj);
|
|
65
143
|
return {
|
|
66
|
-
|
|
144
|
+
// Prefer the event's own result text; only when it is missing OR blank
|
|
145
|
+
// do we substitute the harvested assistant text. The final `?? raw`
|
|
146
|
+
// preserves the pre-existing behavior for a result event with no result
|
|
147
|
+
// field at all and no recoverable assistant text.
|
|
148
|
+
result: firstNonEmpty(obj.result, obj.response, assistantFallback) ?? obj.result ?? obj.response ?? raw,
|
|
67
149
|
sessionId: obj.session_id,
|
|
68
150
|
isError: obj.is_error === true || obj.subtype === 'error' || result.code !== 0,
|
|
69
151
|
raw,
|
|
70
152
|
usage: extractUsage(obj.usage),
|
|
153
|
+
subtype: obj.subtype,
|
|
154
|
+
terminalReason: obj.terminal_reason ?? (maxTurns ? 'max_turns' : undefined),
|
|
71
155
|
};
|
|
72
156
|
};
|
|
73
157
|
try {
|
|
74
158
|
const parsed = JSON.parse(raw);
|
|
75
159
|
if (Array.isArray(parsed)) {
|
|
76
160
|
// JSON array of events (some Claude Code versions collect JSONL into an array)
|
|
161
|
+
let assistantText = '';
|
|
162
|
+
let maxTurnsSeen = false;
|
|
77
163
|
for (const obj of parsed) {
|
|
78
|
-
|
|
164
|
+
assistantText += assistantTextOf(obj);
|
|
165
|
+
maxTurnsSeen = maxTurnsSeen || isMaxTurnsSignal(obj);
|
|
166
|
+
const r = fromEvent(obj, assistantText, maxTurnsSeen);
|
|
79
167
|
if (r)
|
|
80
168
|
return r;
|
|
81
169
|
}
|
|
82
170
|
}
|
|
83
171
|
else {
|
|
84
172
|
// Single object - old Claude Code format
|
|
173
|
+
const maxTurns = isMaxTurnsSignal(parsed);
|
|
85
174
|
return {
|
|
86
175
|
result: parsed.result ?? parsed.response ?? raw,
|
|
87
176
|
sessionId: parsed.session_id,
|
|
88
177
|
isError: parsed.is_error === true || result.code !== 0,
|
|
89
178
|
raw,
|
|
90
179
|
usage: extractUsage(parsed.usage),
|
|
180
|
+
subtype: parsed.subtype,
|
|
181
|
+
terminalReason: parsed.terminal_reason ?? (maxTurns ? 'max_turns' : undefined),
|
|
91
182
|
};
|
|
92
183
|
}
|
|
93
184
|
}
|
|
94
185
|
catch { /* not valid JSON - try line-by-line JSONL below */ }
|
|
95
186
|
// JSONL format (Claude Code 2.1.113+): one JSON object per line
|
|
187
|
+
let assistantText = '';
|
|
188
|
+
let maxTurnsSeen = false;
|
|
96
189
|
for (const line of raw.split('\n')) {
|
|
97
190
|
const trimmed = line.trim();
|
|
98
191
|
if (!trimmed)
|
|
99
192
|
continue;
|
|
100
193
|
try {
|
|
101
|
-
const
|
|
194
|
+
const obj = JSON.parse(trimmed);
|
|
195
|
+
assistantText += assistantTextOf(obj);
|
|
196
|
+
maxTurnsSeen = maxTurnsSeen || isMaxTurnsSignal(obj);
|
|
197
|
+
const r = fromEvent(obj, assistantText, maxTurnsSeen);
|
|
102
198
|
if (r)
|
|
103
199
|
return r;
|
|
104
200
|
}
|
|
105
201
|
catch { /* skip non-JSON lines */ }
|
|
106
202
|
}
|
|
107
|
-
// Fallback: plain text output
|
|
108
|
-
|
|
203
|
+
// Fallback: plain text output. A stream that emitted a standalone
|
|
204
|
+
// max_turns_reached event but no terminating `type:result` event still
|
|
205
|
+
// reaches here -- preserve the turn-limit signal so it is never lost.
|
|
206
|
+
return {
|
|
207
|
+
result: raw,
|
|
208
|
+
sessionId: undefined,
|
|
209
|
+
isError: result.code !== 0,
|
|
210
|
+
raw,
|
|
211
|
+
usage: undefined,
|
|
212
|
+
terminalReason: maxTurnsSeen ? 'max_turns' : undefined,
|
|
213
|
+
};
|
|
109
214
|
}
|
|
110
215
|
supportsResume() {
|
|
111
216
|
return true;
|
|
@@ -132,7 +237,7 @@ export class ClaudeProvider {
|
|
|
132
237
|
modelForTier(tier) {
|
|
133
238
|
if (tier === 'cheap')
|
|
134
239
|
return 'haiku';
|
|
135
|
-
if (tier === '
|
|
240
|
+
if (tier === 'standard')
|
|
136
241
|
return 'sonnet';
|
|
137
242
|
return 'opus';
|
|
138
243
|
}
|
|
@@ -178,5 +283,139 @@ export class ClaudeProvider {
|
|
|
178
283
|
headlessInvocation(promptLiteral) {
|
|
179
284
|
return `-p "${promptLiteral}"`;
|
|
180
285
|
}
|
|
286
|
+
async registerMcpEndpoint(opts) {
|
|
287
|
+
// Live-verified (apra-fleet-2xs.5, docs/member-onboarding-journey.md 3a): `claude
|
|
288
|
+
// mcp add` is Claude's own native registration mechanism -- it writes .mcp.json
|
|
289
|
+
// (project scope) or the user-scope config itself, round-tripping the bearer
|
|
290
|
+
// header intact. Shelling out here (rather than hand-writing .mcp.json) means
|
|
291
|
+
// future changes to Claude Code's config format are Anthropic's problem, not
|
|
292
|
+
// ours, and it composes correctly with whatever the user does afterward via the
|
|
293
|
+
// same CLI.
|
|
294
|
+
const args = [
|
|
295
|
+
'mcp', 'add',
|
|
296
|
+
'--transport', 'http',
|
|
297
|
+
'--scope', opts.scope,
|
|
298
|
+
'apra-fleet-member',
|
|
299
|
+
opts.url,
|
|
300
|
+
'--header', `Authorization: Bearer ${opts.token}`,
|
|
301
|
+
];
|
|
302
|
+
await execFileAsync('claude', args, { cwd: opts.workFolder });
|
|
303
|
+
return {
|
|
304
|
+
mechanism: 'cli-verb',
|
|
305
|
+
detail: `claude mcp add --transport http --scope ${opts.scope} apra-fleet-member <url> (cwd=${opts.workFolder})`,
|
|
306
|
+
};
|
|
307
|
+
}
|
|
308
|
+
async ensureWorkspaceTrusted(workFolder, execCommand, agentOs = 'linux') {
|
|
309
|
+
// apra-fleet-eft.40: Claude gates project-scoped permissions.allow entries on
|
|
310
|
+
// projects[<key>].hasTrustDialogAccepted in the member-side ~/.claude.json -- an
|
|
311
|
+
// untrusted workspace silently DROPS them (not merely a cosmetic warning), degrading
|
|
312
|
+
// unattended dispatches. There is no surgical --skip-trust equivalent for Claude
|
|
313
|
+
// (only the overbroad --dangerously-skip-permissions), so seeding this flag directly
|
|
314
|
+
// is the only viable fix.
|
|
315
|
+
//
|
|
316
|
+
// Live-verified format ground truth (apra-fleet-eft.40 notes, real ~/.claude.json):
|
|
317
|
+
// project keys are ABSOLUTE PATHS WITH FORWARD SLASHES even on Windows. Normalize so
|
|
318
|
+
// a folder passed with backslashes, or with a trailing slash, still hits the SAME
|
|
319
|
+
// entry -- that is also what makes re-running this idempotent.
|
|
320
|
+
const key = workFolder.replace(/\\/g, '/').replace(/\/+$/, '');
|
|
321
|
+
const isWindows = agentOs === 'windows';
|
|
322
|
+
const homeFile = isWindows ? '$env:USERPROFILE\\.claude.json' : '$HOME/.claude.json';
|
|
323
|
+
const tmpFile = isWindows ? '$env:USERPROFILE\\.claude.json.fleet-trust-tmp' : '$HOME/.claude.json.fleet-trust-tmp';
|
|
324
|
+
// apra-fleet-9oo: the project's .mcp.json lives in the MEMBER's work folder, not on
|
|
325
|
+
// the orchestrator host, so it must be read through the same execCommand channel --
|
|
326
|
+
// never local node:fs. It rides along in the SAME read command as ~/.claude.json:
|
|
327
|
+
// one round-trip, and (crucially) the already-satisfied case still costs exactly one
|
|
328
|
+
// exec, so the "no write when nothing to do" contract is observable as before.
|
|
329
|
+
const mcpFile = `${key}/.mcp.json`;
|
|
330
|
+
const SPLIT = '---FLEET_MCP_SPLIT---';
|
|
331
|
+
const readCmd = isWindows
|
|
332
|
+
? `Get-Content -Raw "${homeFile}" -ErrorAction SilentlyContinue; Write-Output "${SPLIT}"; Get-Content -Raw "${mcpFile}" -ErrorAction SilentlyContinue`
|
|
333
|
+
: `cat "${homeFile}" 2>/dev/null || true; echo "${SPLIT}"; cat "${mcpFile}" 2>/dev/null || true`;
|
|
334
|
+
const readResult = await execCommand(readCmd, 10000);
|
|
335
|
+
// Substring split (not line-split): if ~/.claude.json has no trailing newline the
|
|
336
|
+
// marker glues onto its closing brace, and only a substring split separates cleanly.
|
|
337
|
+
// No marker at all -> treat the whole payload as ~/.claude.json with no .mcp.json.
|
|
338
|
+
const rawStdout = readResult.stdout;
|
|
339
|
+
const splitIdx = rawStdout.indexOf(SPLIT);
|
|
340
|
+
const homeRaw = (splitIdx === -1 ? rawStdout : rawStdout.slice(0, splitIdx)).trim();
|
|
341
|
+
const mcpRaw = (splitIdx === -1 ? '' : rawStdout.slice(splitIdx + SPLIT.length)).trim();
|
|
342
|
+
let existing = {};
|
|
343
|
+
try {
|
|
344
|
+
const parsed = JSON.parse(homeRaw);
|
|
345
|
+
if (parsed && typeof parsed === 'object' && !Array.isArray(parsed))
|
|
346
|
+
existing = parsed;
|
|
347
|
+
}
|
|
348
|
+
catch {
|
|
349
|
+
// File missing, empty, or not JSON -- a member that has never run Claude
|
|
350
|
+
// interactively has no ~/.claude.json at all yet. Start from an empty object.
|
|
351
|
+
}
|
|
352
|
+
// A missing / unparseable / server-less .mcp.json is NOT an error: seed nothing
|
|
353
|
+
// extra and fall through to the pre-existing trust-only behaviour.
|
|
354
|
+
let declaredServers = [];
|
|
355
|
+
try {
|
|
356
|
+
const mcpParsed = JSON.parse(mcpRaw);
|
|
357
|
+
const servers = mcpParsed?.mcpServers;
|
|
358
|
+
if (servers && typeof servers === 'object' && !Array.isArray(servers)) {
|
|
359
|
+
declaredServers = Object.keys(servers);
|
|
360
|
+
}
|
|
361
|
+
}
|
|
362
|
+
catch {
|
|
363
|
+
// no .mcp.json (or garbage in it) -- trust-only path.
|
|
364
|
+
}
|
|
365
|
+
const rawProjects = existing.projects;
|
|
366
|
+
const projects = (rawProjects && typeof rawProjects === 'object' && !Array.isArray(rawProjects))
|
|
367
|
+
? rawProjects
|
|
368
|
+
: {};
|
|
369
|
+
const rawEntry = projects[key];
|
|
370
|
+
const existingEntry = (rawEntry && typeof rawEntry === 'object' && !Array.isArray(rawEntry))
|
|
371
|
+
? rawEntry
|
|
372
|
+
: {};
|
|
373
|
+
// apra-fleet-9oo: trust and MCP-server enablement are computed INDEPENDENTLY, because
|
|
374
|
+
// an already-trusted member (hasTrustDialogAccepted true) can still be missing its
|
|
375
|
+
// enabledMcpjsonServers entries -- the old unconditional early return here is exactly
|
|
376
|
+
// why members never got project MCP servers auto-approved. Short-circuit only when
|
|
377
|
+
// BOTH are already satisfied.
|
|
378
|
+
const trustNeeded = existingEntry.hasTrustDialogAccepted !== true;
|
|
379
|
+
const enabled = Array.isArray(existingEntry.enabledMcpjsonServers)
|
|
380
|
+
? existingEntry.enabledMcpjsonServers.filter((n) => typeof n === 'string')
|
|
381
|
+
: [];
|
|
382
|
+
const disabled = Array.isArray(existingEntry.disabledMcpjsonServers)
|
|
383
|
+
? existingEntry.disabledMcpjsonServers.filter((n) => typeof n === 'string')
|
|
384
|
+
: [];
|
|
385
|
+
// Union-merge, deny wins: keep every existing entry in its existing order, append
|
|
386
|
+
// only names that are missing (in .mcp.json declaration order, so re-runs are
|
|
387
|
+
// byte-identical), and NEVER add a name a human explicitly disabled.
|
|
388
|
+
const serversToAdd = declaredServers.filter(n => !enabled.includes(n) && !disabled.includes(n));
|
|
389
|
+
if (!trustNeeded && serversToAdd.length === 0) {
|
|
390
|
+
console.error(`[claude] workspace trust: already present for "${key}"`);
|
|
391
|
+
return { seeded: false, detail: `already trusted: ${key}`, mcpServersSeeded: [] };
|
|
392
|
+
}
|
|
393
|
+
// MERGE: preserve every sibling field already on the project entry (history,
|
|
394
|
+
// allowedTools, etc.) and every other project's entry in the file -- never replace
|
|
395
|
+
// the entry, or the file, wholesale. Note enabledMcpjsonServers is only written when
|
|
396
|
+
// something is actually being added -- an absent array is never "tidied" into [].
|
|
397
|
+
const mergedEntry = { ...existingEntry, hasTrustDialogAccepted: true };
|
|
398
|
+
if (serversToAdd.length > 0)
|
|
399
|
+
mergedEntry.enabledMcpjsonServers = [...enabled, ...serversToAdd];
|
|
400
|
+
const mergedProjects = { ...projects, [key]: mergedEntry };
|
|
401
|
+
const merged = { ...existing, projects: mergedProjects };
|
|
402
|
+
const contentStr = JSON.stringify(merged, null, 2);
|
|
403
|
+
// ATOMIC write: stage the full merged content in a temp file, then rename over the
|
|
404
|
+
// real file in one filesystem operation -- a crash or concurrent read mid-write can
|
|
405
|
+
// never observe a partially-written ~/.claude.json.
|
|
406
|
+
const writeCmd = isWindows
|
|
407
|
+
? `[System.IO.File]::WriteAllText("${tmpFile}", '${contentStr.replace(/'/g, "''")}', (New-Object System.Text.UTF8Encoding($false))); Move-Item -Force "${tmpFile}" "${homeFile}"`
|
|
408
|
+
: `cat > "${tmpFile}" << 'FLEET_TRUST_EOF'\n${contentStr}\nFLEET_TRUST_EOF\nmv "${tmpFile}" "${homeFile}"`;
|
|
409
|
+
await execCommand(writeCmd, 10000);
|
|
410
|
+
const mcpNote = serversToAdd.length > 0 ? `; enabled MCP servers: ${serversToAdd.join(', ')}` : '';
|
|
411
|
+
// eft.40.1 requires logging distinctly when trust is SEEDED vs already present --
|
|
412
|
+
// `detail` already encodes that distinction, so log it verbatim rather than
|
|
413
|
+
// hard-coding "seeded" for the already-trusted/servers-only case.
|
|
414
|
+
const detail = trustNeeded
|
|
415
|
+
? `seeded trust: ${key}${mcpNote}`
|
|
416
|
+
: `already trusted: ${key}${mcpNote}`;
|
|
417
|
+
console.error(`[claude] workspace trust: ${detail}`);
|
|
418
|
+
return { seeded: trustNeeded, detail, mcpServersSeeded: serversToAdd };
|
|
419
|
+
}
|
|
181
420
|
}
|
|
182
421
|
//# sourceMappingURL=claude.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../src/providers/claude.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../src/providers/claude.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ProviderAdapter, PromptOptions, ParsedResponse } from './provider.js';
|
|
1
|
+
import type { ProviderAdapter, PromptOptions, ParsedResponse, WorkspaceTrustExecFn, EnsureWorkspaceTrustedResult } from './provider.js';
|
|
2
2
|
import type { LlmProvider, SSHExecResult } from '../types.js';
|
|
3
3
|
import type { PromptErrorCategory } from '../utils/prompt-errors.js';
|
|
4
4
|
export declare class CodexProvider implements ProviderAdapter {
|
|
@@ -23,7 +23,7 @@ export declare class CodexProvider implements ProviderAdapter {
|
|
|
23
23
|
supportsMaxTurns(): boolean;
|
|
24
24
|
resumeFlag(_sessionId?: string): string;
|
|
25
25
|
modelTiers(): Record<'cheap' | 'standard' | 'premium', string>;
|
|
26
|
-
modelForTier(tier: 'cheap' | '
|
|
26
|
+
modelForTier(tier: 'cheap' | 'standard' | 'premium'): string;
|
|
27
27
|
modelFlag(model: string): string;
|
|
28
28
|
classifyError(output: string): PromptErrorCategory;
|
|
29
29
|
permissionConfigPaths(): string[];
|
|
@@ -40,5 +40,6 @@ export declare class CodexProvider implements ProviderAdapter {
|
|
|
40
40
|
wrapWindowsPrompt(setupCmd: string, filePath: string, argList: string, _sessionId?: string, _model?: string): string;
|
|
41
41
|
jsonOutputFlag(): string;
|
|
42
42
|
headlessInvocation(promptLiteral: string): string;
|
|
43
|
+
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows'): Promise<EnsureWorkspaceTrustedResult>;
|
|
43
44
|
}
|
|
44
45
|
//# sourceMappingURL=codex.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/providers/codex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/providers/codex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AACxI,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAMrE,qBAAa,aAAc,YAAW,eAAe;IACnD,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAW;IACrC,QAAQ,CAAC,WAAW,WAAW;IAC/B,QAAQ,CAAC,UAAU,oBAAoB;IACvC,QAAQ,CAAC,cAAc,eAAe;IACtC,QAAQ,CAAC,mBAAmB,eAAe;IAE3C,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,cAAc,IAAI,MAAM;IAIxB,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM;IAOzD,aAAa,IAAI,MAAM;IAIvB,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM;IAsB/C,mBAAmB,IAAI,MAAM;IAI7B,sBAAsB,IAAI,MAAM,GAAG,IAAI;IAIvC;;;OAGG;IACH,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,cAAc;IAiCpD,cAAc,IAAI,OAAO;IAIzB,gBAAgB,IAAI,OAAO;IAI3B,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;IAK5D,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIhC,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB;IAalD,qBAAqB,IAAI,MAAM,EAAE;IAIjC,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE,MAAM,GAAE,MAAM,EAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IAelH,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,GAAG,OAAO,CAAC,4BAA4B,CAAC;CAOvK"}
|
package/dist/providers/codex.js
CHANGED
|
@@ -169,5 +169,12 @@ export class CodexProvider {
|
|
|
169
169
|
headlessInvocation(promptLiteral) {
|
|
170
170
|
return `exec "${promptLiteral}"`;
|
|
171
171
|
}
|
|
172
|
+
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs) {
|
|
173
|
+
// apra-fleet-eft.40 was scoped to the Claude workspace-trust gate (see the
|
|
174
|
+
// provider-trust-matrix note on the parent bug); Codex was not part of that
|
|
175
|
+
// investigation and no equivalent per-project trust gate is known. No-op until a
|
|
176
|
+
// Codex-specific gate is live-verified.
|
|
177
|
+
return { seeded: false, detail: 'codex: no known per-project trust gate' };
|
|
178
|
+
}
|
|
172
179
|
}
|
|
173
180
|
//# sourceMappingURL=codex.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../src/providers/codex.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../src/providers/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ProviderAdapter, PromptOptions, ParsedResponse } from './provider.js';
|
|
1
|
+
import type { ProviderAdapter, PromptOptions, ParsedResponse, WorkspaceTrustExecFn, EnsureWorkspaceTrustedResult } from './provider.js';
|
|
2
2
|
import type { LlmProvider, SSHExecResult } from '../types.js';
|
|
3
3
|
import type { PromptErrorCategory } from '../utils/prompt-errors.js';
|
|
4
4
|
export declare class CopilotProvider implements ProviderAdapter {
|
|
@@ -19,7 +19,7 @@ export declare class CopilotProvider implements ProviderAdapter {
|
|
|
19
19
|
supportsMaxTurns(): boolean;
|
|
20
20
|
resumeFlag(_sessionId?: string): string;
|
|
21
21
|
modelTiers(): Record<'cheap' | 'standard' | 'premium', string>;
|
|
22
|
-
modelForTier(tier: 'cheap' | '
|
|
22
|
+
modelForTier(tier: 'cheap' | 'standard' | 'premium'): string;
|
|
23
23
|
modelFlag(model: string): string;
|
|
24
24
|
classifyError(output: string): PromptErrorCategory;
|
|
25
25
|
permissionConfigPaths(): string[];
|
|
@@ -36,5 +36,6 @@ export declare class CopilotProvider implements ProviderAdapter {
|
|
|
36
36
|
wrapWindowsPrompt(setupCmd: string, filePath: string, argList: string, _sessionId?: string, _model?: string): string;
|
|
37
37
|
jsonOutputFlag(): string;
|
|
38
38
|
headlessInvocation(promptLiteral: string): string;
|
|
39
|
+
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows'): Promise<EnsureWorkspaceTrustedResult>;
|
|
39
40
|
}
|
|
40
41
|
//# 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,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,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AACxI,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAOrE,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;IAIxB,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM;IAUzD,aAAa,IAAI,MAAM;IAIvB,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM;IAuB/C,mBAAmB,IAAI,MAAM;IAI7B,sBAAsB,IAAI,MAAM,GAAG,IAAI;IAKvC,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,cAAc;IAsBpD,cAAc,IAAI,OAAO;IAIzB,gBAAgB,IAAI,OAAO;IAI3B,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,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,GAAG,OAAO,CAAC,4BAA4B,CAAC;CAOvK"}
|
|
@@ -98,7 +98,7 @@ export class CopilotProvider {
|
|
|
98
98
|
modelForTier(tier) {
|
|
99
99
|
if (tier === 'cheap')
|
|
100
100
|
return 'claude-haiku-4-5';
|
|
101
|
-
if (tier === '
|
|
101
|
+
if (tier === 'standard')
|
|
102
102
|
return 'claude-sonnet-4-5';
|
|
103
103
|
return 'claude-opus-4-5';
|
|
104
104
|
}
|
|
@@ -168,5 +168,12 @@ export class CopilotProvider {
|
|
|
168
168
|
headlessInvocation(promptLiteral) {
|
|
169
169
|
return `-p "${promptLiteral}"`;
|
|
170
170
|
}
|
|
171
|
+
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs) {
|
|
172
|
+
// apra-fleet-eft.40 was scoped to the Claude workspace-trust gate (see the
|
|
173
|
+
// provider-trust-matrix note on the parent bug); Copilot was not part of that
|
|
174
|
+
// investigation and no equivalent per-project trust gate is known. No-op until a
|
|
175
|
+
// Copilot-specific gate is live-verified.
|
|
176
|
+
return { seeded: false, detail: 'copilot: no known per-project trust gate' };
|
|
177
|
+
}
|
|
171
178
|
}
|
|
172
179
|
//# sourceMappingURL=copilot.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot.js","sourceRoot":"","sources":["../../src/providers/copilot.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"copilot.js","sourceRoot":"","sources":["../../src/providers/copilot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ProviderAdapter, PromptOptions, ParsedResponse } from './provider.js';
|
|
1
|
+
import type { ProviderAdapter, PromptOptions, ParsedResponse, WorkspaceTrustExecFn, EnsureWorkspaceTrustedResult } from './provider.js';
|
|
2
2
|
import type { LlmProvider, SSHExecResult } from '../types.js';
|
|
3
3
|
import type { PromptErrorCategory } from '../utils/prompt-errors.js';
|
|
4
4
|
export declare function getAllowedMcpServers(): string;
|
|
@@ -20,7 +20,7 @@ export declare class GeminiProvider implements ProviderAdapter {
|
|
|
20
20
|
supportsMaxTurns(): boolean;
|
|
21
21
|
resumeFlag(sessionId?: string, resuming?: boolean): string;
|
|
22
22
|
modelTiers(): Record<'cheap' | 'standard' | 'premium', string>;
|
|
23
|
-
modelForTier(tier: 'cheap' | '
|
|
23
|
+
modelForTier(tier: 'cheap' | 'standard' | 'premium'): string;
|
|
24
24
|
modelFlag(model: string): string;
|
|
25
25
|
classifyError(output: string): PromptErrorCategory;
|
|
26
26
|
permissionConfigPaths(): string[];
|
|
@@ -37,5 +37,6 @@ export declare class GeminiProvider implements ProviderAdapter {
|
|
|
37
37
|
wrapWindowsPrompt(setupCmd: string, filePath: string, argList: string, _sessionId?: string, _model?: string): string;
|
|
38
38
|
jsonOutputFlag(): string;
|
|
39
39
|
headlessInvocation(promptLiteral: string): string;
|
|
40
|
+
ensureWorkspaceTrusted(_workFolder: string, _execCommand: WorkspaceTrustExecFn, _agentOs?: 'linux' | 'macos' | 'windows'): Promise<EnsureWorkspaceTrustedResult>;
|
|
40
41
|
}
|
|
41
42
|
//# sourceMappingURL=gemini.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAExI,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAGrE,wBAAgB,oBAAoB,IAAI,MAAM,CAc7C;AAYD,qBAAa,cAAe,YAAW,eAAe;IACpD,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAY;IACtC,QAAQ,CAAC,WAAW,YAAY;IAChC,QAAQ,CAAC,UAAU,oBAAoB;IACvC,QAAQ,CAAC,cAAc,gBAAgB;IACvC,QAAQ,CAAC,mBAAmB,eAAe;IAE3C,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,cAAc,IAAI,MAAM;IAIxB,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM;IAIzD,aAAa,IAAI,MAAM;IAIvB,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM;IA0B/C,mBAAmB,IAAI,MAAM;IAI7B,sBAAsB,IAAI,MAAM,GAAG,IAAI;IAIvC,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,cAAc;IAuBpD,cAAc,IAAI,OAAO;IAIzB,gBAAgB,IAAI,OAAO;IAI3B,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM;IAK1D,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,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB;IAclD,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;IAiBjH,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;IAO/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,GAAG,OAAO,CAAC,4BAA4B,CAAC;CAMvK"}
|
package/dist/providers/gemini.js
CHANGED
|
@@ -48,12 +48,16 @@ export class GeminiProvider {
|
|
|
48
48
|
return 'npm update -g @google/gemini-cli';
|
|
49
49
|
}
|
|
50
50
|
buildPromptCommand(opts) {
|
|
51
|
-
const { folder, promptFile, sessionId, resuming, unattended, model, inv } = opts;
|
|
51
|
+
const { folder, promptFile, sessionId, resuming, unattended, model, inv, agentName } = opts;
|
|
52
52
|
const escapedFolder = escapeDoubleQuoted(folder);
|
|
53
53
|
let instruction = `Your task is described in ${promptFile} in the current directory. Read that file first, then execute the task.`;
|
|
54
54
|
if (inv) {
|
|
55
55
|
instruction = `[${inv}] ${instruction}`;
|
|
56
56
|
}
|
|
57
|
+
// Gemini activates a subagent via @<name> prepended to the prompt on EVERY dispatch.
|
|
58
|
+
if (agentName) {
|
|
59
|
+
instruction = `@${agentName} ${instruction}`;
|
|
60
|
+
}
|
|
57
61
|
let cmd = `cd "${escapedFolder}" && gemini -p "${instruction}" --output-format json --allowed-mcp-server-names "${getAllowedMcpServers()}"`;
|
|
58
62
|
if (resuming && sessionId) {
|
|
59
63
|
cmd += ` ${buildResumeFlag(sessionId)}`;
|
|
@@ -188,5 +192,11 @@ export class GeminiProvider {
|
|
|
188
192
|
headlessInvocation(promptLiteral) {
|
|
189
193
|
return `--skip-trust -p "${promptLiteral}"`;
|
|
190
194
|
}
|
|
195
|
+
async ensureWorkspaceTrusted(_workFolder, _execCommand, _agentOs) {
|
|
196
|
+
// apra-fleet-eft.40 provider trust matrix: Gemini has a workspace-trust gate too, but
|
|
197
|
+
// it is ALREADY handled per-dispatch via --skip-trust in headlessInvocation() above --
|
|
198
|
+
// no settings-file seeding is needed or correct here.
|
|
199
|
+
return { seeded: false, detail: 'gemini: trust gate already bypassed per-dispatch via --skip-trust' };
|
|
200
|
+
}
|
|
191
201
|
}
|
|
192
202
|
//# sourceMappingURL=gemini.js.map
|