@apralabs/apra-fleet 0.4.0 → 0.4.1
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 +145 -7
- package/dist/agents/backlog-groomer.md +17 -1
- package/dist/agents/ci-watcher.md +13 -1
- package/dist/agents/deployer.md +15 -3
- package/dist/agents/doer.md +35 -1
- package/dist/agents/harvester.md +22 -3
- package/dist/agents/integ-test-runner.md +18 -2
- package/dist/agents/kb-reconciler.md +216 -0
- package/dist/agents/plan-reviewer.md +14 -1
- package/dist/agents/planner.md +88 -5
- package/dist/agents/regression-test-runner.md +19 -1
- package/dist/agents/reviewer.md +104 -3
- package/dist/agents/schemas/doer-output.json +63 -3
- package/dist/agents/schemas/harvester-output.json +59 -2
- package/dist/agents/schemas/integ-test-runner-output.json +2 -2
- package/dist/agents/schemas/kb-reconciler-output.json +87 -0
- package/dist/agents/schemas/planner-output.json +65 -0
- package/dist/agents/schemas/reviewer-output.json +105 -8
- package/dist/cli/install.d.ts +1 -0
- package/dist/cli/install.d.ts.map +1 -1
- package/dist/cli/install.js +136 -5
- package/dist/cli/install.js.map +1 -1
- package/dist/cli/join.js +1 -1
- package/dist/cli/join.js.map +1 -1
- package/dist/cli/kb-commit.d.ts +12 -0
- package/dist/cli/kb-commit.d.ts.map +1 -0
- package/dist/cli/kb-commit.js +53 -0
- package/dist/cli/kb-commit.js.map +1 -0
- package/dist/cli/kb-directives.d.ts +17 -0
- package/dist/cli/kb-directives.d.ts.map +1 -0
- package/dist/cli/kb-directives.js +146 -0
- package/dist/cli/kb-directives.js.map +1 -0
- package/dist/cli/kb-import.d.ts +13 -0
- package/dist/cli/kb-import.d.ts.map +1 -0
- package/dist/cli/kb-import.js +56 -0
- package/dist/cli/kb-import.js.map +1 -0
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +11 -0
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/watch.d.ts +53 -4
- package/dist/cli/watch.d.ts.map +1 -1
- package/dist/cli/watch.js +118 -17
- package/dist/cli/watch.js.map +1 -1
- package/dist/commands/kb-server.d.ts +8 -0
- package/dist/commands/kb-server.d.ts.map +1 -0
- package/dist/commands/kb-server.js +221 -0
- package/dist/commands/kb-server.js.map +1 -0
- package/dist/index.js +77 -2
- package/dist/index.js.map +1 -1
- package/dist/os/linux.d.ts +1 -0
- package/dist/os/linux.d.ts.map +1 -1
- package/dist/os/linux.js +18 -1
- package/dist/os/linux.js.map +1 -1
- package/dist/os/os-commands.d.ts +5 -0
- package/dist/os/os-commands.d.ts.map +1 -1
- package/dist/os/windows.d.ts +35 -0
- package/dist/os/windows.d.ts.map +1 -1
- package/dist/os/windows.js +67 -31
- package/dist/os/windows.js.map +1 -1
- package/dist/providers/agy.d.ts +12 -1
- package/dist/providers/agy.d.ts.map +1 -1
- package/dist/providers/agy.js +134 -9
- package/dist/providers/agy.js.map +1 -1
- package/dist/providers/claude.d.ts +11 -1
- package/dist/providers/claude.d.ts.map +1 -1
- package/dist/providers/claude.js +47 -19
- package/dist/providers/claude.js.map +1 -1
- package/dist/providers/codex.d.ts +11 -1
- package/dist/providers/codex.d.ts.map +1 -1
- package/dist/providers/codex.js +29 -6
- package/dist/providers/codex.js.map +1 -1
- package/dist/providers/copilot.d.ts +11 -1
- package/dist/providers/copilot.d.ts.map +1 -1
- package/dist/providers/copilot.js +26 -6
- package/dist/providers/copilot.js.map +1 -1
- package/dist/providers/email/headers.d.ts +15 -0
- package/dist/providers/email/headers.d.ts.map +1 -0
- package/dist/providers/email/headers.js +42 -0
- package/dist/providers/email/headers.js.map +1 -0
- package/dist/providers/email/index.d.ts +18 -0
- package/dist/providers/email/index.d.ts.map +1 -0
- package/dist/providers/email/index.js +60 -0
- package/dist/providers/email/index.js.map +1 -0
- package/dist/providers/email/provider.d.ts +49 -0
- package/dist/providers/email/provider.d.ts.map +1 -0
- package/dist/providers/email/provider.js +2 -0
- package/dist/providers/email/provider.js.map +1 -0
- package/dist/providers/email/sendgrid.d.ts +12 -0
- package/dist/providers/email/sendgrid.d.ts.map +1 -0
- package/dist/providers/email/sendgrid.js +67 -0
- package/dist/providers/email/sendgrid.js.map +1 -0
- package/dist/providers/email/smtp.d.ts +65 -0
- package/dist/providers/email/smtp.d.ts.map +1 -0
- package/dist/providers/email/smtp.js +373 -0
- package/dist/providers/email/smtp.js.map +1 -0
- package/dist/providers/gemini.d.ts +11 -1
- package/dist/providers/gemini.d.ts.map +1 -1
- package/dist/providers/gemini.js +38 -4
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/none.d.ts +11 -1
- package/dist/providers/none.d.ts.map +1 -1
- package/dist/providers/none.js +21 -0
- package/dist/providers/none.js.map +1 -1
- package/dist/providers/opencode.d.ts +11 -1
- package/dist/providers/opencode.d.ts.map +1 -1
- package/dist/providers/opencode.js +55 -4
- package/dist/providers/opencode.js.map +1 -1
- package/dist/providers/provider.d.ts +77 -0
- package/dist/providers/provider.d.ts.map +1 -1
- package/dist/providers/provider.js +44 -0
- package/dist/providers/provider.js.map +1 -1
- package/dist/services/agent-provisioner.d.ts.map +1 -1
- package/dist/services/agent-provisioner.js +3 -6
- package/dist/services/agent-provisioner.js.map +1 -1
- package/dist/services/cloud/lifecycle.d.ts.map +1 -1
- package/dist/services/cloud/lifecycle.js +3 -0
- package/dist/services/cloud/lifecycle.js.map +1 -1
- package/dist/services/cloud/task-wrapper.d.ts +18 -0
- package/dist/services/cloud/task-wrapper.d.ts.map +1 -1
- package/dist/services/cloud/task-wrapper.js +157 -0
- package/dist/services/cloud/task-wrapper.js.map +1 -1
- package/dist/services/github-app.d.ts.map +1 -1
- package/dist/services/github-app.js +11 -2
- package/dist/services/github-app.js.map +1 -1
- package/dist/services/knowledge/audn.d.ts +37 -0
- package/dist/services/knowledge/audn.d.ts.map +1 -0
- package/dist/services/knowledge/audn.js +219 -0
- package/dist/services/knowledge/audn.js.map +1 -0
- package/dist/services/knowledge/file-hash.d.ts +11 -0
- package/dist/services/knowledge/file-hash.d.ts.map +1 -0
- package/dist/services/knowledge/file-hash.js +123 -0
- package/dist/services/knowledge/file-hash.js.map +1 -0
- package/dist/services/knowledge/http-provider.d.ts +46 -0
- package/dist/services/knowledge/http-provider.d.ts.map +1 -0
- package/dist/services/knowledge/http-provider.js +254 -0
- package/dist/services/knowledge/http-provider.js.map +1 -0
- package/dist/services/knowledge/kb-providers.d.ts +15 -0
- package/dist/services/knowledge/kb-providers.d.ts.map +1 -0
- package/dist/services/knowledge/kb-providers.js +92 -0
- package/dist/services/knowledge/kb-providers.js.map +1 -0
- package/dist/services/knowledge/kb-scope-input.d.ts +5 -0
- package/dist/services/knowledge/kb-scope-input.d.ts.map +1 -0
- package/dist/services/knowledge/kb-scope-input.js +11 -0
- package/dist/services/knowledge/kb-scope-input.js.map +1 -0
- package/dist/services/knowledge/kb-service.d.ts +3 -0
- package/dist/services/knowledge/kb-service.d.ts.map +1 -0
- package/dist/services/knowledge/kb-service.js +2 -0
- package/dist/services/knowledge/kb-service.js.map +1 -0
- package/dist/services/knowledge/path-validation.d.ts +2 -0
- package/dist/services/knowledge/path-validation.d.ts.map +1 -0
- package/dist/services/knowledge/path-validation.js +13 -0
- package/dist/services/knowledge/path-validation.js.map +1 -0
- package/dist/services/knowledge/pre-init.d.ts +14 -0
- package/dist/services/knowledge/pre-init.d.ts.map +1 -0
- package/dist/services/knowledge/pre-init.js +147 -0
- package/dist/services/knowledge/pre-init.js.map +1 -0
- package/dist/services/knowledge/project-slug.d.ts +2 -0
- package/dist/services/knowledge/project-slug.d.ts.map +1 -0
- package/dist/services/knowledge/project-slug.js +49 -0
- package/dist/services/knowledge/project-slug.js.map +1 -0
- package/dist/services/knowledge/sqlite-provider.d.ts +147 -0
- package/dist/services/knowledge/sqlite-provider.d.ts.map +1 -0
- package/dist/services/knowledge/sqlite-provider.js +1646 -0
- package/dist/services/knowledge/sqlite-provider.js.map +1 -0
- package/dist/services/knowledge/types.d.ts +163 -0
- package/dist/services/knowledge/types.d.ts.map +1 -0
- package/dist/services/knowledge/types.js +9 -0
- package/dist/services/knowledge/types.js.map +1 -0
- package/dist/services/member-home.d.ts +89 -0
- package/dist/services/member-home.d.ts.map +1 -0
- package/dist/services/member-home.js +256 -0
- package/dist/services/member-home.js.map +1 -0
- package/dist/services/member-remote-url.d.ts +34 -0
- package/dist/services/member-remote-url.d.ts.map +1 -0
- package/dist/services/member-remote-url.js +39 -0
- package/dist/services/member-remote-url.js.map +1 -0
- package/dist/services/orphan-recovery.d.ts +5 -2
- package/dist/services/orphan-recovery.d.ts.map +1 -1
- package/dist/services/orphan-recovery.js +19 -8
- package/dist/services/orphan-recovery.js.map +1 -1
- package/dist/services/preflight-check.d.ts +56 -0
- package/dist/services/preflight-check.d.ts.map +1 -0
- package/dist/services/preflight-check.js +277 -0
- package/dist/services/preflight-check.js.map +1 -0
- package/dist/services/stall/log-path-resolver.d.ts +11 -8
- package/dist/services/stall/log-path-resolver.d.ts.map +1 -1
- package/dist/services/stall/log-path-resolver.js +17 -40
- package/dist/services/stall/log-path-resolver.js.map +1 -1
- package/dist/services/stall/stall-detector.d.ts +32 -0
- package/dist/services/stall/stall-detector.d.ts.map +1 -1
- package/dist/services/stall/stall-detector.js +149 -6
- package/dist/services/stall/stall-detector.js.map +1 -1
- package/dist/services/stall/stall-poller.d.ts +34 -0
- package/dist/services/stall/stall-poller.d.ts.map +1 -1
- package/dist/services/stall/stall-poller.js +134 -2
- package/dist/services/stall/stall-poller.js.map +1 -1
- package/dist/services/strategy.d.ts.map +1 -1
- package/dist/services/strategy.js +2 -2
- package/dist/services/strategy.js.map +1 -1
- package/dist/services/tool-registry.d.ts.map +1 -1
- package/dist/services/tool-registry.js +87 -1
- package/dist/services/tool-registry.js.map +1 -1
- package/dist/services/vcs/github.d.ts.map +1 -1
- package/dist/services/vcs/github.js +32 -1
- package/dist/services/vcs/github.js.map +1 -1
- package/dist/services/version-check.d.ts +22 -0
- package/dist/services/version-check.d.ts.map +1 -0
- package/dist/services/version-check.js +103 -0
- package/dist/services/version-check.js.map +1 -0
- package/dist/skills/fleet-sprint-cli/SKILL.md +13 -2
- package/dist/skills/pm/beads.md +6 -0
- package/dist/skills/pm/fleet-addendum.md +6 -0
- package/dist/skills/pm/index.md +56 -0
- package/dist/skills/pm/kb-reconcile.md +132 -0
- package/dist/skills/pm/kb-review.md +109 -0
- package/dist/tools/check-status.d.ts +47 -0
- package/dist/tools/check-status.d.ts.map +1 -1
- package/dist/tools/check-status.js +242 -0
- package/dist/tools/check-status.js.map +1 -1
- package/dist/tools/child-id-allocator.d.ts +2 -2
- package/dist/tools/code-intelligence-codebase-memory.d.ts +11 -0
- package/dist/tools/code-intelligence-codebase-memory.d.ts.map +1 -0
- package/dist/tools/code-intelligence-codebase-memory.js +270 -0
- package/dist/tools/code-intelligence-codebase-memory.js.map +1 -0
- package/dist/tools/code-intelligence-freshness.d.ts +2 -0
- package/dist/tools/code-intelligence-freshness.d.ts.map +1 -0
- package/dist/tools/code-intelligence-freshness.js +26 -0
- package/dist/tools/code-intelligence-freshness.js.map +1 -0
- package/dist/tools/code-intelligence-gitnexus.d.ts +14 -0
- package/dist/tools/code-intelligence-gitnexus.d.ts.map +1 -0
- package/dist/tools/code-intelligence-gitnexus.js +475 -0
- package/dist/tools/code-intelligence-gitnexus.js.map +1 -0
- package/dist/tools/code-intelligence-kb-enrich.d.ts +2 -0
- package/dist/tools/code-intelligence-kb-enrich.d.ts.map +1 -0
- package/dist/tools/code-intelligence-kb-enrich.js +65 -0
- package/dist/tools/code-intelligence-kb-enrich.js.map +1 -0
- package/dist/tools/code-intelligence-reindex.d.ts +7 -0
- package/dist/tools/code-intelligence-reindex.d.ts.map +1 -0
- package/dist/tools/code-intelligence-reindex.js +106 -0
- package/dist/tools/code-intelligence-reindex.js.map +1 -0
- package/dist/tools/code-intelligence-telemetry.d.ts +5 -0
- package/dist/tools/code-intelligence-telemetry.d.ts.map +1 -0
- package/dist/tools/code-intelligence-telemetry.js +52 -0
- package/dist/tools/code-intelligence-telemetry.js.map +1 -0
- package/dist/tools/code-intelligence-tests.d.ts +2 -0
- package/dist/tools/code-intelligence-tests.d.ts.map +1 -0
- package/dist/tools/code-intelligence-tests.js +24 -0
- package/dist/tools/code-intelligence-tests.js.map +1 -0
- package/dist/tools/code-intelligence.d.ts +114 -0
- package/dist/tools/code-intelligence.d.ts.map +1 -0
- package/dist/tools/code-intelligence.js +124 -0
- package/dist/tools/code-intelligence.js.map +1 -0
- package/dist/tools/compose-permissions.d.ts +26 -0
- package/dist/tools/compose-permissions.d.ts.map +1 -1
- package/dist/tools/compose-permissions.js +244 -33
- package/dist/tools/compose-permissions.js.map +1 -1
- package/dist/tools/execute-command.d.ts +2 -0
- package/dist/tools/execute-command.d.ts.map +1 -1
- package/dist/tools/execute-command.js +86 -16
- package/dist/tools/execute-command.js.map +1 -1
- package/dist/tools/execute-prompt.d.ts +13 -1
- package/dist/tools/execute-prompt.d.ts.map +1 -1
- package/dist/tools/execute-prompt.js +257 -45
- package/dist/tools/execute-prompt.js.map +1 -1
- package/dist/tools/kb-capture.d.ts +53 -0
- package/dist/tools/kb-capture.d.ts.map +1 -0
- package/dist/tools/kb-capture.js +130 -0
- package/dist/tools/kb-capture.js.map +1 -0
- package/dist/tools/kb-context.d.ts +17 -0
- package/dist/tools/kb-context.d.ts.map +1 -0
- package/dist/tools/kb-context.js +29 -0
- package/dist/tools/kb-context.js.map +1 -0
- package/dist/tools/kb-export.d.ts +19 -0
- package/dist/tools/kb-export.d.ts.map +1 -0
- package/dist/tools/kb-export.js +344 -0
- package/dist/tools/kb-export.js.map +1 -0
- package/dist/tools/kb-feedback.d.ts +23 -0
- package/dist/tools/kb-feedback.d.ts.map +1 -0
- package/dist/tools/kb-feedback.js +43 -0
- package/dist/tools/kb-feedback.js.map +1 -0
- package/dist/tools/kb-freshness-sweep.d.ts +14 -0
- package/dist/tools/kb-freshness-sweep.d.ts.map +1 -0
- package/dist/tools/kb-freshness-sweep.js +29 -0
- package/dist/tools/kb-freshness-sweep.js.map +1 -0
- package/dist/tools/kb-harvest.d.ts +20 -0
- package/dist/tools/kb-harvest.d.ts.map +1 -0
- package/dist/tools/kb-harvest.js +143 -0
- package/dist/tools/kb-harvest.js.map +1 -0
- package/dist/tools/kb-import.d.ts +44 -0
- package/dist/tools/kb-import.d.ts.map +1 -0
- package/dist/tools/kb-import.js +239 -0
- package/dist/tools/kb-import.js.map +1 -0
- package/dist/tools/kb-invalidate.d.ts +19 -0
- package/dist/tools/kb-invalidate.d.ts.map +1 -0
- package/dist/tools/kb-invalidate.js +34 -0
- package/dist/tools/kb-invalidate.js.map +1 -0
- package/dist/tools/kb-list.d.ts +32 -0
- package/dist/tools/kb-list.d.ts.map +1 -0
- package/dist/tools/kb-list.js +43 -0
- package/dist/tools/kb-list.js.map +1 -0
- package/dist/tools/kb-promote.d.ts +20 -0
- package/dist/tools/kb-promote.d.ts.map +1 -0
- package/dist/tools/kb-promote.js +20 -0
- package/dist/tools/kb-promote.js.map +1 -0
- package/dist/tools/kb-query.d.ts +35 -0
- package/dist/tools/kb-query.d.ts.map +1 -0
- package/dist/tools/kb-query.js +111 -0
- package/dist/tools/kb-query.js.map +1 -0
- package/dist/tools/kb-reconcile-prefilter.d.ts +14 -0
- package/dist/tools/kb-reconcile-prefilter.d.ts.map +1 -0
- package/dist/tools/kb-reconcile-prefilter.js +26 -0
- package/dist/tools/kb-reconcile-prefilter.js.map +1 -0
- package/dist/tools/kb-resolve-contradiction.d.ts +23 -0
- package/dist/tools/kb-resolve-contradiction.d.ts.map +1 -0
- package/dist/tools/kb-resolve-contradiction.js +37 -0
- package/dist/tools/kb-resolve-contradiction.js.map +1 -0
- package/dist/tools/kb-session-prime.d.ts +26 -0
- package/dist/tools/kb-session-prime.d.ts.map +1 -0
- package/dist/tools/kb-session-prime.js +392 -0
- package/dist/tools/kb-session-prime.js.map +1 -0
- package/dist/tools/kb-setup.d.ts +20 -0
- package/dist/tools/kb-setup.d.ts.map +1 -0
- package/dist/tools/kb-setup.js +49 -0
- package/dist/tools/kb-setup.js.map +1 -0
- package/dist/tools/kb-stats.d.ts +20 -0
- package/dist/tools/kb-stats.d.ts.map +1 -0
- package/dist/tools/kb-stats.js +115 -0
- package/dist/tools/kb-stats.js.map +1 -0
- package/dist/tools/member-detail.d.ts.map +1 -1
- package/dist/tools/member-detail.js +8 -0
- package/dist/tools/member-detail.js.map +1 -1
- package/dist/tools/monitor-task.d.ts.map +1 -1
- package/dist/tools/monitor-task.js +21 -3
- package/dist/tools/monitor-task.js.map +1 -1
- package/dist/tools/provision-auth.d.ts.map +1 -1
- package/dist/tools/provision-auth.js +10 -3
- package/dist/tools/provision-auth.js.map +1 -1
- package/dist/tools/register-member.d.ts +3 -0
- package/dist/tools/register-member.d.ts.map +1 -1
- package/dist/tools/register-member.js +30 -1
- 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 +17 -3
- package/dist/tools/remove-member.js.map +1 -1
- package/dist/tools/report-status.d.ts.map +1 -1
- package/dist/tools/report-status.js +2 -1
- package/dist/tools/report-status.js.map +1 -1
- package/dist/tools/send-email.d.ts +69 -0
- package/dist/tools/send-email.d.ts.map +1 -0
- package/dist/tools/send-email.js +177 -0
- package/dist/tools/send-email.js.map +1 -0
- package/dist/tools/setup-ssh-key.d.ts.map +1 -1
- package/dist/tools/setup-ssh-key.js +2 -0
- package/dist/tools/setup-ssh-key.js.map +1 -1
- package/dist/tools/update-member.d.ts +3 -0
- package/dist/tools/update-member.d.ts.map +1 -1
- package/dist/tools/update-member.js +25 -1
- package/dist/tools/update-member.js.map +1 -1
- package/dist/types.d.ts +1 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/prompt-errors.js +1 -1
- package/dist/utils/prompt-errors.js.map +1 -1
- package/dist/utils/session-caller.d.ts +28 -0
- package/dist/utils/session-caller.d.ts.map +1 -0
- package/dist/utils/session-caller.js +24 -0
- package/dist/utils/session-caller.js.map +1 -0
- package/dist/utils/work-folder-validation.d.ts +39 -0
- package/dist/utils/work-folder-validation.d.ts.map +1 -0
- package/dist/utils/work-folder-validation.js +60 -0
- package/dist/utils/work-folder-validation.js.map +1 -0
- package/dist/workflows/auto-sprint.js +546 -6
- package/package.json +7 -4
- package/packages/apra-fleet-client/src/client/api.mjs +118 -4
- package/packages/apra-fleet-se/apra-pm/agents/backlog-groomer.md +17 -1
- package/packages/apra-fleet-se/apra-pm/agents/ci-watcher.md +13 -1
- package/packages/apra-fleet-se/apra-pm/agents/deployer.md +15 -3
- package/packages/apra-fleet-se/apra-pm/agents/doer.md +35 -1
- package/packages/apra-fleet-se/apra-pm/agents/harvester.md +22 -3
- package/packages/apra-fleet-se/apra-pm/agents/integ-test-runner.md +18 -2
- package/packages/apra-fleet-se/apra-pm/agents/kb-reconciler.md +216 -0
- package/packages/apra-fleet-se/apra-pm/agents/plan-reviewer.md +14 -1
- package/packages/apra-fleet-se/apra-pm/agents/planner.md +88 -5
- package/packages/apra-fleet-se/apra-pm/agents/regression-test-runner.md +19 -1
- package/packages/apra-fleet-se/apra-pm/agents/reviewer.md +104 -3
- package/packages/apra-fleet-se/apra-pm/agents/schemas/doer-output.json +63 -3
- package/packages/apra-fleet-se/apra-pm/agents/schemas/harvester-output.json +59 -2
- package/packages/apra-fleet-se/apra-pm/agents/schemas/integ-test-runner-output.json +2 -2
- package/packages/apra-fleet-se/apra-pm/agents/schemas/kb-reconciler-output.json +87 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/planner-output.json +65 -0
- package/packages/apra-fleet-se/apra-pm/agents/schemas/reviewer-output.json +105 -8
- package/packages/apra-fleet-se/apra-pm/skills/pm/beads.md +6 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/fleet-addendum.md +6 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/index.md +56 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/kb-reconcile.md +132 -0
- package/packages/apra-fleet-se/apra-pm/skills/pm/kb-review.md +109 -0
- package/packages/apra-fleet-se/bin/cli.mjs +7 -0
- package/packages/apra-fleet-se/bin/serve.mjs +14 -2
- package/packages/apra-fleet-se/fleet-sprint/contracts.mjs +31 -5
- package/packages/apra-fleet-se/fleet-sprint/docs/README.md +1 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/coach-role-design.md +23 -151
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-manual-recovery-verified.md +256 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-sync-redesign.md +1482 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/escalate-to-llm-design.md +908 -0
- package/packages/apra-fleet-se/fleet-sprint/docs/shared-orchestrator-reservation-design.md +399 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-settle.mjs +972 -0
- package/packages/apra-fleet-se/fleet-sprint/dolt-sync.mjs +167 -101
- package/packages/apra-fleet-se/fleet-sprint/errors.mjs +50 -6
- package/packages/apra-fleet-se/fleet-sprint/runner.js +1416 -116
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-sprint-cli/SKILL.md +13 -2
- package/packages/apra-fleet-se/fleet-sprint/skills/fleet-supervisor/SKILL.md +350 -0
- package/packages/apra-fleet-se/fleet-sprint/sprint-progress.mjs +101 -0
- package/packages/apra-fleet-se/fleet-sprint/vcs-providers/github.mjs +30 -17
- package/packages/apra-fleet-se/fleet-sprint/viewer-extensions.mjs +62 -2
- package/packages/apra-fleet-se/package.json +1 -0
- package/packages/apra-fleet-workflow/src/viewer/index.mjs +127 -13
- package/packages/apra-fleet-workflow/src/viewer/run-title.mjs +60 -0
- package/packages/apra-fleet-workflow/src/workflow/index.mjs +8 -4
- package/skills/fleet/knowledge-agent.md +66 -0
- package/skills/fleet/permissions.md +28 -4
- package/skills/fleet/profiles/base-dev.json +10 -1
- package/skills/fleet/profiles/base-reviewer.json +8 -1
- package/skills/fleet/profiles/tag-kb-reconciler.json +20 -0
- package/version.json +1 -1
- package/packages/apra-fleet-se/fleet-sprint/docs/dolt-tier2-runbook.md +0 -127
- package/packages/apra-fleet-se/fleet-sprint/dolt-recovery-path-b.mjs +0 -339
- package/packages/apra-fleet-se/fleet-sprint/dolt-recovery-tier2.mjs +0 -360
- package/packages/apra-fleet-se/fleet-sprint/dolt-recovery.mjs +0 -363
|
@@ -12,7 +12,7 @@ import { getProvider } from '../providers/index.js';
|
|
|
12
12
|
import { seedWorkspaceTrust } from '../utils/workspace-trust.js';
|
|
13
13
|
export const composePermissionsSchema = z.object({
|
|
14
14
|
...memberIdentifier,
|
|
15
|
-
role: z.enum(['doer', 'reviewer']).optional().describe('Role determines base profile (doer = broad build/test, reviewer = read + feedback + test). Provide at least one of role or tags.'),
|
|
15
|
+
role: z.enum(['doer', 'reviewer']).optional().describe('Role determines base profile (doer = broad build/test, reviewer = read + feedback + test). The hard-rejected NEVER_AUTO_GRANT patterns are wildcard-matched (not exact-matched) against a normalized form of each request and cover sudo/su/doas, `bash -c`/`sh -c`/eval, env/printenv, nc/nmap, `chmod 777`, any catch-all such as Bash(*), and any payload containing a shell-chaining metacharacter (| ; && backtick $(). Provide at least one of role or tags.'),
|
|
16
16
|
tags: z.array(z.string()).optional().describe('Member tags. Include "doer" or "reviewer" to set the primary mode (default doer); other tags (e.g. "gpu", "devops") load tag-<name>.json profiles and merge additively. When both role and tags are given, tags wins.'),
|
|
17
17
|
project_folder: z.string().optional().describe('Local project folder containing permissions.json ledger. Omit to skip ledger merge.'),
|
|
18
18
|
grant: z.array(z.string()).optional().describe('Reactive mode: additional permissions to grant (e.g. ["Bash(docker:*)", "Bash(docker-compose:*)"]). Appended to current permissions and re-delivered.'),
|
|
@@ -40,11 +40,89 @@ const CO_OCCURRENCE = {
|
|
|
40
40
|
'Bash(pip:*)': ['Bash(pip3:*)'],
|
|
41
41
|
'Bash(python:*)': ['Bash(python3:*)'],
|
|
42
42
|
};
|
|
43
|
-
// Never auto-grant - require user escalation
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
43
|
+
// Never auto-grant - require user escalation.
|
|
44
|
+
//
|
|
45
|
+
// apra-fleet PR#416 review (finding 3): this was previously a seven-entry Set
|
|
46
|
+
// checked with exact string equality, so `Bash(sudo *)`, `Bash(sudo:*) `
|
|
47
|
+
// (trailing space), `Bash(bash -c *)`, `Bash(sh -c *)`, `Bash(*)` and
|
|
48
|
+
// `Bash(curl *|sh)` all sailed straight through -- i.e. arbitrary code
|
|
49
|
+
// execution was one whitespace character away from being auto-grantable.
|
|
50
|
+
// These are now wildcard *patterns* matched against a normalized form of the
|
|
51
|
+
// requested permission. A denylist can never be complete (`Bash(perl -e *)`,
|
|
52
|
+
// `Bash(node -e *)`, `Bash(make *)` remain arbitrary-execution in practice);
|
|
53
|
+
// it is the unconditional floor that applies to EVERY caller of this tool.
|
|
54
|
+
const NEVER_AUTO_GRANT_PATTERNS = [
|
|
55
|
+
'Bash(sudo*)',
|
|
56
|
+
'Bash(su *)',
|
|
57
|
+
'Bash(doas*)',
|
|
58
|
+
'Bash(*bash -c*)',
|
|
59
|
+
'Bash(*sh -c*)',
|
|
60
|
+
'Bash(*eval*)',
|
|
61
|
+
'Bash(chmod 777*)',
|
|
62
|
+
'Bash(env*)',
|
|
63
|
+
'Bash(printenv*)',
|
|
64
|
+
'Bash(nc*)',
|
|
65
|
+
'Bash(nmap*)',
|
|
66
|
+
];
|
|
67
|
+
// Shell metacharacters that turn a single approved command into an arbitrary
|
|
68
|
+
// command chain. A grant payload containing any of these is rejected
|
|
69
|
+
// structurally, regardless of which command it names.
|
|
70
|
+
const SHELL_CHAINING_METACHARS = ['|', ';', '&&', '`', '$('];
|
|
71
|
+
/** Escapes a string for literal use inside a RegExp, except '*' which callers
|
|
72
|
+
* handle separately as the wildcard token. */
|
|
73
|
+
function escapeRegExpExceptStar(s) {
|
|
74
|
+
return s.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
|
|
75
|
+
}
|
|
76
|
+
/** Matches `permission` against `pattern`, treating '*' in the pattern as a
|
|
77
|
+
* wildcard (matches any run of characters, including none) rather than a
|
|
78
|
+
* literal character. Falls back to exact equality for a wildcard-free
|
|
79
|
+
* pattern. */
|
|
80
|
+
function matchesDenyPattern(pattern, permission) {
|
|
81
|
+
const regex = new RegExp(`^${pattern.split('*').map(escapeRegExpExceptStar).join('.*')}$`);
|
|
82
|
+
return regex.test(permission);
|
|
83
|
+
}
|
|
84
|
+
/** Splits `Tool(payload)` into its parts; returns null for a bare tool name. */
|
|
85
|
+
function splitPermission(permission) {
|
|
86
|
+
const m = /^([A-Za-z_][A-Za-z0-9_-]*)\((.*)\)$/.exec(permission.trim());
|
|
87
|
+
if (!m)
|
|
88
|
+
return null;
|
|
89
|
+
return { tool: m[1], payload: m[2] };
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* Canonical form used for denylist matching only (never for storage or
|
|
93
|
+
* delivery). Trims, collapses internal whitespace, and treats the ':' that
|
|
94
|
+
* separates the command token from its argument pattern as equivalent to a
|
|
95
|
+
* space, so `Bash(sudo:*)` and `Bash(sudo *)` are the same request.
|
|
96
|
+
*/
|
|
97
|
+
export function normalizePermission(permission) {
|
|
98
|
+
const s = permission.trim().replace(/\s+/g, ' ');
|
|
99
|
+
const parts = splitPermission(s);
|
|
100
|
+
if (!parts)
|
|
101
|
+
return s;
|
|
102
|
+
const payload = parts.payload.replace(':', ' ').replace(/\s+/g, ' ').trim();
|
|
103
|
+
return `${parts.tool}(${payload})`;
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* True when the requested permission must never be granted without explicit
|
|
107
|
+
* user escalation. Three independent rules, any of which rejects:
|
|
108
|
+
* 1. catch-all: a payload that is nothing but wildcards/whitespace -- e.g.
|
|
109
|
+
* `Bash(*)` -- which is not "a wider grant", it is unrestricted execution.
|
|
110
|
+
* 2. shell chaining: the payload contains |, ;, &&, a backtick, or $( .
|
|
111
|
+
* 3. pattern match against NEVER_AUTO_GRANT_PATTERNS.
|
|
112
|
+
*/
|
|
113
|
+
export function isNeverAutoGrant(permission) {
|
|
114
|
+
const normalized = normalizePermission(permission);
|
|
115
|
+
const parts = splitPermission(normalized);
|
|
116
|
+
const payload = parts?.payload ?? '';
|
|
117
|
+
// 1. Catch-all grant (Bash(*), Bash( ** ), ...).
|
|
118
|
+
if (parts && payload.replace(/[*\s]/g, '') === '')
|
|
119
|
+
return true;
|
|
120
|
+
// 2. Shell chaining metacharacters anywhere in the payload.
|
|
121
|
+
if (SHELL_CHAINING_METACHARS.some(meta => payload.includes(meta)))
|
|
122
|
+
return true;
|
|
123
|
+
// 3. Explicit deny patterns (wildcard-aware).
|
|
124
|
+
return NEVER_AUTO_GRANT_PATTERNS.some(pattern => matchesDenyPattern(pattern, normalized));
|
|
125
|
+
}
|
|
48
126
|
function findProfilesDir() {
|
|
49
127
|
// Installed: ~/.claude/skills/fleet/profiles/ (new location after skill split)
|
|
50
128
|
const installedFleet = path.join(os.homedir(), '.claude', 'skills', 'fleet', 'profiles');
|
|
@@ -94,6 +172,9 @@ async function detectStacks(agent, projectSubdir) {
|
|
|
94
172
|
const checkDir = projectSubdir
|
|
95
173
|
? `${agent.workFolder}/${projectSubdir}`.replace(/\\/g, '/')
|
|
96
174
|
: agent.workFolder.replace(/\\/g, '/');
|
|
175
|
+
// TODO: unbranched POSIX && / || / 2>/dev/null -- same defect class as
|
|
176
|
+
// orphan-recovery.ts's pid-alive/file-read commands (apra-fleet review,
|
|
177
|
+
// fix/cross-shell-home-var). Not yet OS-branched for Windows members.
|
|
97
178
|
const result = await strategy.execCommand(`cd "${checkDir}" 2>/dev/null && ls ${markers} 2>/dev/null || true`, 10000);
|
|
98
179
|
const found = new Set();
|
|
99
180
|
for (const line of result.stdout.split('\n')) {
|
|
@@ -102,6 +183,7 @@ async function detectStacks(agent, projectSubdir) {
|
|
|
102
183
|
found.add(STACK_MAP[file]);
|
|
103
184
|
}
|
|
104
185
|
// .sln/.csproj need glob - check separately
|
|
186
|
+
// TODO: same unbranched-POSIX defect class as above -- not yet OS-branched.
|
|
105
187
|
const dotnetCheck = await strategy.execCommand(`cd "${checkDir}" 2>/dev/null && ls *.sln *.csproj 2>/dev/null || true`, 5000);
|
|
106
188
|
if (dotnetCheck.stdout.trim())
|
|
107
189
|
found.add('dotnet');
|
|
@@ -194,22 +276,92 @@ export function deepMerge(target, source) {
|
|
|
194
276
|
}
|
|
195
277
|
return result;
|
|
196
278
|
}
|
|
279
|
+
/** Raised by deliverConfigFile when a config write does not verifiably land on
|
|
280
|
+
* the member (nonzero mkdir/write exit, or a read-back that does not match the
|
|
281
|
+
* intended content). Carries the target path so the caller can surface exactly
|
|
282
|
+
* which delivery failed. See apra-fleet-k4sc: the previous code discarded the
|
|
283
|
+
* exit code and never read the file back, so a failed write was reported as a
|
|
284
|
+
* successful grant (a silent no-op). */
|
|
285
|
+
export class ConfigDeliveryError extends Error {
|
|
286
|
+
filePath;
|
|
287
|
+
constructor(filePath, message) {
|
|
288
|
+
super(message);
|
|
289
|
+
this.filePath = filePath;
|
|
290
|
+
this.name = 'ConfigDeliveryError';
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
/** Short, single-line excerpt of a command's stderr for error messages. */
|
|
294
|
+
function stderrExcerpt(stderr) {
|
|
295
|
+
const s = (stderr ?? '').replace(/\s+/g, ' ').trim();
|
|
296
|
+
return s ? `: ${s.slice(0, 300)}` : '';
|
|
297
|
+
}
|
|
298
|
+
/** Order-independent structural serialization used to compare a read-back JSON
|
|
299
|
+
* document against the intended merged content (keys sorted recursively). */
|
|
300
|
+
function stableStringify(value) {
|
|
301
|
+
if (Array.isArray(value)) {
|
|
302
|
+
return `[${value.map(stableStringify).join(',')}]`;
|
|
303
|
+
}
|
|
304
|
+
if (isPlainObject(value)) {
|
|
305
|
+
return `{${Object.keys(value)
|
|
306
|
+
.sort()
|
|
307
|
+
.map(k => `${JSON.stringify(k)}:${stableStringify(value[k])}`)
|
|
308
|
+
.join(',')}}`;
|
|
309
|
+
}
|
|
310
|
+
return JSON.stringify(value) ?? 'null';
|
|
311
|
+
}
|
|
197
312
|
/** Deliver a single config file to the member.
|
|
198
313
|
* Creates parent directory and writes the content (JSON object or TOML string).
|
|
199
314
|
* JSON object content is deep-merged into whatever the file already
|
|
200
315
|
* contains remotely, rather than overwriting it wholesale -- other tools
|
|
201
|
-
* (e.g. register_member's mcpServers entry) may share the same file.
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
316
|
+
* (e.g. register_member's mcpServers entry) may share the same file.
|
|
317
|
+
*
|
|
318
|
+
* Every remote step is verified so a failed write can never be reported as a
|
|
319
|
+
* successful grant (apra-fleet-k4sc):
|
|
320
|
+
* 1. mkdir and write exit codes are inspected; a nonzero code throws a
|
|
321
|
+
* ConfigDeliveryError carrying the command's exit code and stderr excerpt.
|
|
322
|
+
* 2. After writing, the file is read back (cat on POSIX, Get-Content -Raw on
|
|
323
|
+
* Windows) and the intended content is confirmed to have landed -- for JSON
|
|
324
|
+
* the parsed document must structurally match the merged content; for a
|
|
325
|
+
* TOML/string payload the expected text must be present. A mismatch (empty
|
|
326
|
+
* file, wrong path, quoting fault, etc.) throws a ConfigDeliveryError. */
|
|
327
|
+
/** Join a work-folder-relative config path onto the member's absolute work
|
|
328
|
+
* folder, OS-appropriately. `strategy.execCommand` issues a raw shell/SSH
|
|
329
|
+
* exec with no cwd guarantee (LocalStrategy spawns with cwd=workFolder, but
|
|
330
|
+
* RemoteStrategy's ssh2 client.exec() defaults to the SSH user's home
|
|
331
|
+
* directory, not workFolder) -- so every command deliverConfigFile issues
|
|
332
|
+
* must use an absolute path, never a bare relative one. See apra-fleet
|
|
333
|
+
* incident: compose_permissions reported a verified grant while writing to
|
|
334
|
+
* ~/.claude/settings.local.json on a remote member instead of
|
|
335
|
+
* <workFolder>/.claude/settings.local.json -- the read-back verification
|
|
336
|
+
* passed because it re-read the same (wrong) relative path it had just
|
|
337
|
+
* written, so the mismatch was invisible to that check alone. */
|
|
338
|
+
function resolveRemotePath(workFolder, relPath, isWindows) {
|
|
339
|
+
if (isWindows) {
|
|
340
|
+
const base = workFolder.replace(/[\\/]+$/, '').replace(/\//g, '\\');
|
|
341
|
+
return `${base}\\${relPath.replace(/\//g, '\\')}`;
|
|
342
|
+
}
|
|
343
|
+
const base = workFolder.replace(/\/+$/, '');
|
|
344
|
+
return `${base}/${relPath}`;
|
|
345
|
+
}
|
|
346
|
+
async function deliverConfigFile(strategy, agentOs, workFolder, filePath, content) {
|
|
347
|
+
const isWindows = agentOs === 'windows';
|
|
348
|
+
const absPath = resolveRemotePath(workFolder, filePath, isWindows);
|
|
349
|
+
const winPath = absPath.replace(/\//g, '\\');
|
|
350
|
+
const dir = isWindows
|
|
351
|
+
? winPath.split('\\').slice(0, -1).join('\\')
|
|
352
|
+
: absPath.split('/').slice(0, -1).join('/');
|
|
353
|
+
const mkdirCmd = isWindows
|
|
354
|
+
? `New-Item -ItemType Directory -Force "${dir}"`
|
|
355
|
+
: `mkdir -p "${dir}"`;
|
|
356
|
+
const mkdirResult = await strategy.execCommand(mkdirCmd, 5000);
|
|
357
|
+
if (mkdirResult.code !== 0) {
|
|
358
|
+
throw new ConfigDeliveryError(absPath, `could not create parent directory "${dir}" (exit ${mkdirResult.code})${stderrExcerpt(mkdirResult.stderr)}`);
|
|
359
|
+
}
|
|
360
|
+
const readCmd = isWindows
|
|
361
|
+
? `Get-Content -Raw "${winPath}" -ErrorAction SilentlyContinue`
|
|
362
|
+
: `cat "${absPath}" 2>/dev/null || true`;
|
|
208
363
|
let mergedContent = content;
|
|
209
364
|
if (isPlainObject(content)) {
|
|
210
|
-
const readCmd = agentOs === 'windows'
|
|
211
|
-
? `Get-Content -Raw "${filePath.replace(/\//g, '\\')}" -ErrorAction SilentlyContinue`
|
|
212
|
-
: `cat ${filePath} 2>/dev/null || true`;
|
|
213
365
|
const readResult = await strategy.execCommand(readCmd, 5000);
|
|
214
366
|
let existing = {};
|
|
215
367
|
try {
|
|
@@ -225,10 +377,39 @@ async function deliverConfigFile(strategy, agentOs, filePath, content) {
|
|
|
225
377
|
const contentStr = typeof mergedContent === 'string'
|
|
226
378
|
? mergedContent
|
|
227
379
|
: JSON.stringify(mergedContent, null, 2);
|
|
228
|
-
const writeCmd =
|
|
229
|
-
? `[System.IO.File]::WriteAllText("${
|
|
230
|
-
: `cat > ${
|
|
231
|
-
await strategy.execCommand(writeCmd, 5000);
|
|
380
|
+
const writeCmd = isWindows
|
|
381
|
+
? `[System.IO.File]::WriteAllText("${winPath}", '${contentStr.replace(/'/g, "''")}', (New-Object System.Text.UTF8Encoding($false)))`
|
|
382
|
+
: `cat > "${absPath}" << 'FLEET_PERMS_EOF'\n${contentStr}\nFLEET_PERMS_EOF`;
|
|
383
|
+
const writeResult = await strategy.execCommand(writeCmd, 5000);
|
|
384
|
+
if (writeResult.code !== 0) {
|
|
385
|
+
throw new ConfigDeliveryError(absPath, `write command failed (exit ${writeResult.code})${stderrExcerpt(writeResult.stderr)}`);
|
|
386
|
+
}
|
|
387
|
+
// Read the file back and confirm the intended content actually landed. This
|
|
388
|
+
// catches the silent no-op class of failure that a nonzero exit code alone
|
|
389
|
+
// would miss (e.g. a write that "succeeds" but resolves to the wrong path, or
|
|
390
|
+
// a PowerShell quoting fault that writes nothing).
|
|
391
|
+
const verifyResult = await strategy.execCommand(readCmd, 5000);
|
|
392
|
+
const readBack = verifyResult.stdout.trim();
|
|
393
|
+
if (!readBack) {
|
|
394
|
+
throw new ConfigDeliveryError(absPath, `read-back verification failed: file is empty or missing after a write that reported success`);
|
|
395
|
+
}
|
|
396
|
+
if (typeof mergedContent === 'string') {
|
|
397
|
+
if (!readBack.includes(contentStr.trim())) {
|
|
398
|
+
throw new ConfigDeliveryError(absPath, `read-back verification failed: expected content is not present on disk`);
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
else {
|
|
402
|
+
let parsed;
|
|
403
|
+
try {
|
|
404
|
+
parsed = JSON.parse(readBack);
|
|
405
|
+
}
|
|
406
|
+
catch {
|
|
407
|
+
throw new ConfigDeliveryError(absPath, `read-back verification failed: file on disk is not valid JSON`);
|
|
408
|
+
}
|
|
409
|
+
if (stableStringify(parsed) !== stableStringify(mergedContent)) {
|
|
410
|
+
throw new ConfigDeliveryError(absPath, `read-back verification failed: merged permissions did not land on disk`);
|
|
411
|
+
}
|
|
412
|
+
}
|
|
232
413
|
}
|
|
233
414
|
export async function composePermissions(input) {
|
|
234
415
|
const agentOrError = resolveMember(input.member_id, input.member_name);
|
|
@@ -247,7 +428,7 @@ export async function composePermissions(input) {
|
|
|
247
428
|
const ledger = input.project_folder ? loadLedger(input.project_folder) : { stacks: [], granted: [] };
|
|
248
429
|
// Reactive grant mode
|
|
249
430
|
if (input.grant?.length) {
|
|
250
|
-
const blocked = input.grant.filter(p =>
|
|
431
|
+
const blocked = input.grant.filter(p => isNeverAutoGrant(p));
|
|
251
432
|
if (blocked.length) {
|
|
252
433
|
return `❌ Cannot auto-grant dangerous permissions: ${blocked.join(', ')}. Escalate to user.`;
|
|
253
434
|
}
|
|
@@ -259,8 +440,18 @@ export async function composePermissions(input) {
|
|
|
259
440
|
}
|
|
260
441
|
let allow;
|
|
261
442
|
if (provider.name === 'claude') {
|
|
262
|
-
// Claude: read existing allow list and merge
|
|
263
|
-
|
|
443
|
+
// Claude: read existing allow list and merge. Must read the SAME absolute
|
|
444
|
+
// path deliverConfigFile will write below -- deepMerge overwrites arrays
|
|
445
|
+
// wholesale (see deepMerge doc comment), so an `allow` computed from the
|
|
446
|
+
// wrong file here would silently discard every pre-existing grant in the
|
|
447
|
+
// real settings.local.json once the write lands at the correct path.
|
|
448
|
+
const isWindowsAgent = (agent.os ?? 'linux') === 'windows';
|
|
449
|
+
const absSettingsPath = resolveRemotePath(agent.workFolder, '.claude/settings.local.json', isWindowsAgent);
|
|
450
|
+
// TODO: unbranched POSIX `2>/dev/null || echo` -- same defect class as
|
|
451
|
+
// orphan-recovery.ts's pid-alive/file-read commands. Not yet OS-branched.
|
|
452
|
+
const readResult = isWindowsAgent
|
|
453
|
+
? await strategy.execCommand(`Get-Content -Raw "${absSettingsPath.replace(/\//g, '\\')}" -ErrorAction SilentlyContinue`, 5000)
|
|
454
|
+
: await strategy.execCommand(`cat "${absSettingsPath}" 2>/dev/null || echo "{}"`, 5000);
|
|
264
455
|
let current;
|
|
265
456
|
try {
|
|
266
457
|
current = JSON.parse(readResult.stdout.trim());
|
|
@@ -279,10 +470,20 @@ export async function composePermissions(input) {
|
|
|
279
470
|
}
|
|
280
471
|
const configs = provider.composePermissionConfig(mode, allow);
|
|
281
472
|
const paths = provider.permissionConfigPaths();
|
|
282
|
-
|
|
283
|
-
|
|
473
|
+
try {
|
|
474
|
+
for (let i = 0; i < paths.length; i++) {
|
|
475
|
+
await deliverConfigFile(strategy, agent.os ?? 'linux', agent.workFolder, paths[i], configs[i]);
|
|
476
|
+
}
|
|
477
|
+
}
|
|
478
|
+
catch (e) {
|
|
479
|
+
if (e instanceof ConfigDeliveryError) {
|
|
480
|
+
// Delivery did not verifiably land -- surface the failure and do NOT
|
|
481
|
+
// touch the ledger or report a successful grant (apra-fleet-k4sc).
|
|
482
|
+
return `❌ Failed to persist permissions to ${e.filePath} on "${agent.friendlyName}" (${provider.name}): ${e.message}`;
|
|
483
|
+
}
|
|
484
|
+
throw e;
|
|
284
485
|
}
|
|
285
|
-
// Update ledger
|
|
486
|
+
// Update ledger (only reached when every config file verifiably landed)
|
|
286
487
|
if (input.project_folder) {
|
|
287
488
|
const reason = input.grant_reason ?? 'granted mid-sprint';
|
|
288
489
|
const date = new Date().toISOString().slice(0, 10);
|
|
@@ -302,18 +503,28 @@ export async function composePermissions(input) {
|
|
|
302
503
|
// Proactive compose mode
|
|
303
504
|
const projectSubdir = input.project_folder ? path.basename(input.project_folder) : undefined;
|
|
304
505
|
const stacks = await detectStacks(agent, projectSubdir);
|
|
305
|
-
// Update ledger stacks
|
|
306
|
-
if (input.project_folder) {
|
|
307
|
-
ledger.stacks = stacks;
|
|
308
|
-
saveLedger(input.project_folder, ledger);
|
|
309
|
-
}
|
|
310
506
|
const allow = input.tags?.length
|
|
311
507
|
? composeFromTags(profilesDir, mode, input.tags, stacks, ledger)
|
|
312
508
|
: compose(profilesDir, mode, stacks, ledger);
|
|
313
509
|
const configs = provider.composePermissionConfig(mode, allow);
|
|
314
510
|
const paths = provider.permissionConfigPaths();
|
|
315
|
-
|
|
316
|
-
|
|
511
|
+
try {
|
|
512
|
+
for (let i = 0; i < paths.length; i++) {
|
|
513
|
+
await deliverConfigFile(strategy, agent.os ?? 'linux', agent.workFolder, paths[i], configs[i]);
|
|
514
|
+
}
|
|
515
|
+
}
|
|
516
|
+
catch (e) {
|
|
517
|
+
if (e instanceof ConfigDeliveryError) {
|
|
518
|
+
// Delivery did not verifiably land -- surface the failure and do NOT
|
|
519
|
+
// update the ledger stacks or report success (apra-fleet-k4sc).
|
|
520
|
+
return `❌ Failed to persist permissions to ${e.filePath} on "${agent.friendlyName}" (${provider.name}): ${e.message}`;
|
|
521
|
+
}
|
|
522
|
+
throw e;
|
|
523
|
+
}
|
|
524
|
+
// Update ledger stacks (only reached when every config file verifiably landed)
|
|
525
|
+
if (input.project_folder) {
|
|
526
|
+
ledger.stacks = stacks;
|
|
527
|
+
saveLedger(input.project_folder, ledger);
|
|
317
528
|
}
|
|
318
529
|
// apra-fleet-eft.40.2: self-healing -- repair workspace trust on EVERY
|
|
319
530
|
// compose_permissions run (a member registered before this fix, or one whose
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose-permissions.js","sourceRoot":"","sources":["../../src/tools/compose-permissions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compose-permissions.js","sourceRoot":"","sources":["../../src/tools/compose-permissions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-command.d.ts","sourceRoot":"","sources":["../../src/tools/execute-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"execute-command.d.ts","sourceRoot":"","sources":["../../src/tools/execute-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAmBxB,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAK9C;AAED,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQ/B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAyFvE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;CAC9C;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,oBAAoB,CAAC,CAqPpH"}
|
|
@@ -7,13 +7,15 @@ import { memberIdentifier, resolveMember } from '../utils/resolve-member.js';
|
|
|
7
7
|
import { buildAuthEnvPrefix } from '../utils/auth-env.js';
|
|
8
8
|
import { writeStatusline } from '../services/statusline.js';
|
|
9
9
|
import { ensureCloudReady } from '../services/cloud/lifecycle.js';
|
|
10
|
-
import { generateTaskWrapper } from '../services/cloud/task-wrapper.js';
|
|
11
|
-
import { escapeShellArg, escapePowerShellArg } from '../utils/shell-escape.js';
|
|
10
|
+
import { generateTaskWrapper, generateTaskWrapperWindows } from '../services/cloud/task-wrapper.js';
|
|
11
|
+
import { escapeShellArg, escapePowerShellArg, escapeWindowsArg } from '../utils/shell-escape.js';
|
|
12
|
+
import { wrapPowerShellEncoded } from '../os/windows.js';
|
|
12
13
|
import { credentialResolve, registerTaskCredentials } from '../services/credential-store.js';
|
|
13
14
|
import { collectOobConfirm } from '../services/auth-socket.js';
|
|
14
15
|
import { LogScope, maskSecrets, truncateForLog, logLine } from '../utils/log-helpers.js';
|
|
15
16
|
import { getLogPreviewChars } from '../services/user-config.js';
|
|
16
17
|
import { tryKillPid } from '../utils/pid-helpers.js';
|
|
18
|
+
import { preflightCheck } from '../services/preflight-check.js';
|
|
17
19
|
export function resolveTilde(p) {
|
|
18
20
|
if (p === '~' || p.startsWith('~/')) {
|
|
19
21
|
return p.replace('~', os.homedir());
|
|
@@ -109,6 +111,33 @@ export async function executeCommand(input, extra) {
|
|
|
109
111
|
catch (err) {
|
|
110
112
|
return `Failed to execute command on "${agentOrError.friendlyName}": ${err.message}`;
|
|
111
113
|
}
|
|
114
|
+
// Pre-dispatch connectivity check (apra-fleet preflight-check): verify the
|
|
115
|
+
// member is reachable before attempting the command. Skips LLM auth check
|
|
116
|
+
// since execute_command runs shell commands, not LLM prompts.
|
|
117
|
+
if (agent.agentType !== 'local') {
|
|
118
|
+
const preflight = await preflightCheck(agent, { skipAuth: true });
|
|
119
|
+
if (!preflight.ok) {
|
|
120
|
+
// Reuse the same preflight.code-to-reason mapping execute-prompt.ts uses,
|
|
121
|
+
// so errors.mjs's classifiers (isNonRetryableDispatchError,
|
|
122
|
+
// isAuthDispatchError, INFRA_DISPATCH_REASONS) recognize execute_command
|
|
123
|
+
// preflight failures the same way they recognize execute_prompt ones,
|
|
124
|
+
// instead of falling through unclassified as the generic 'preflight_failed'.
|
|
125
|
+
const preflightReason = preflight.code === 'offline' ? 'preflight_offline'
|
|
126
|
+
: preflight.code === 'auth_expired' ? 'preflight_auth_expired'
|
|
127
|
+
: preflight.code === 'auth_missing' ? 'preflight_auth_missing'
|
|
128
|
+
: 'preflight_offline';
|
|
129
|
+
return {
|
|
130
|
+
text: `[FAIL] Pre-dispatch check failed for "${agent.friendlyName}": ${preflight.reason}`,
|
|
131
|
+
structuredContent: {
|
|
132
|
+
isError: true,
|
|
133
|
+
reason: preflightReason,
|
|
134
|
+
exitCode: -1,
|
|
135
|
+
stdout: '',
|
|
136
|
+
stderr: preflight.reason ?? 'preflight check failed',
|
|
137
|
+
},
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
}
|
|
112
141
|
const strategy = getStrategy(agent);
|
|
113
142
|
const scope = new LogScope('execute_command', truncateForLog(maskSecrets(input.command), getLogPreviewChars()), agent);
|
|
114
143
|
const onPidCaptured = (pid) => scope.info(`pid=${pid}`);
|
|
@@ -168,24 +197,65 @@ export async function executeCommand(input, extra) {
|
|
|
168
197
|
// -- Long-running background task path --
|
|
169
198
|
if (input.long_running) {
|
|
170
199
|
const agentOsVal = getAgentOS(agent);
|
|
171
|
-
const longRunningOsWarning = agentOsVal !== 'linux'
|
|
200
|
+
const longRunningOsWarning = (agentOsVal !== 'linux' && agentOsVal !== 'windows')
|
|
172
201
|
? `Note: Long-running tasks use a bash wrapper script designed for Linux. The member's OS is ${agentOsVal}, which may not support this feature.\n`
|
|
173
202
|
: '';
|
|
174
203
|
const taskId = 'task-' + Date.now().toString(36);
|
|
175
204
|
registerTaskCredentials(taskId, credentials);
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
205
|
+
let launchCmd;
|
|
206
|
+
if (agentOsVal === 'windows') {
|
|
207
|
+
// Detached spawn via WMI (Invoke-CimMethod Win32_Process.Create): the
|
|
208
|
+
// process is created under the WMI provider host's own session
|
|
209
|
+
// (session 0), independent of the SSH session's job object -- a plain
|
|
210
|
+
// background launch dies with the SSH channel on Windows (verified
|
|
211
|
+
// live), so `nohup ... &`'s POSIX equivalent does not exist here.
|
|
212
|
+
const wrapperScript = generateTaskWrapperWindows({
|
|
213
|
+
taskId,
|
|
214
|
+
command: resolvedCommand,
|
|
215
|
+
restartCommand: resolvedRestartCommand,
|
|
216
|
+
maxRetries: input.max_retries ?? 3,
|
|
217
|
+
activityIntervalSec: 300,
|
|
218
|
+
});
|
|
219
|
+
const scriptB64 = Buffer.from(wrapperScript, 'utf-8').toString('base64');
|
|
220
|
+
const taskDir = `$env:USERPROFILE\\.fleet-tasks\\${taskId}`;
|
|
221
|
+
const runPs1 = `${taskDir}\\run.ps1`;
|
|
222
|
+
const psCommandLine = `powershell -NoProfile -ExecutionPolicy Bypass -File "${runPs1}"`;
|
|
223
|
+
launchCmd = wrapPowerShellEncoded([
|
|
224
|
+
`New-Item -Path "${taskDir}" -ItemType Directory -Force | Out-Null`,
|
|
225
|
+
`[IO.File]::WriteAllBytes("${runPs1}", [Convert]::FromBase64String('${scriptB64}'))`,
|
|
226
|
+
`$result = Invoke-CimMethod -ClassName Win32_Process -MethodName Create -Arguments @{ CommandLine = "${escapeWindowsArg(psCommandLine)}"; CurrentDirectory = "${escapeWindowsArg(folder)}" }`,
|
|
227
|
+
`if ($result.ReturnValue -ne 0) { Write-Error "Win32_Process.Create failed with code $($result.ReturnValue)"; exit 1 }`,
|
|
228
|
+
// Deliberately NOT the FLEET_PID: marker -- that label is matched by
|
|
229
|
+
// ssh.ts's onPidCaptured regex, which arms killRemoteTree() to
|
|
230
|
+
// taskkill this PID on inactivity/max-total/abort. $result.ProcessId
|
|
231
|
+
// here is the detached run.ps1 task process itself (WMI-spawned to
|
|
232
|
+
// survive SSH channel teardown), NOT the short-lived launcher/SSH
|
|
233
|
+
// command process -- the process killRemoteTree exists to reap. If
|
|
234
|
+
// this launch channel stalls after this line but before it closes,
|
|
235
|
+
// matching FLEET_PID would kill the very task detachment protects.
|
|
236
|
+
// The task's real PID is durably recorded in task.pid inside its own
|
|
237
|
+
// task dir (written by the wrapper script itself; see
|
|
238
|
+
// generateTaskWrapperWindows in task-wrapper.ts) and read from there
|
|
239
|
+
// by monitor_task -- nothing reads this value off this channel, so
|
|
240
|
+
// it exists solely as human-readable launch confirmation.
|
|
241
|
+
`Write-Output "TASK_PID:$($result.ProcessId)"`,
|
|
242
|
+
].join('; '));
|
|
243
|
+
}
|
|
244
|
+
else {
|
|
245
|
+
const wrapperScript = generateTaskWrapper({
|
|
246
|
+
taskId,
|
|
247
|
+
command: resolvedCommand,
|
|
248
|
+
restartCommand: resolvedRestartCommand,
|
|
249
|
+
maxRetries: input.max_retries ?? 3,
|
|
250
|
+
activityIntervalSec: 300,
|
|
251
|
+
});
|
|
252
|
+
const scriptB64 = Buffer.from(wrapperScript).toString('base64');
|
|
253
|
+
// Create task dir, decode + write wrapper script, chmod, launch with nohup
|
|
254
|
+
launchCmd = cmds.wrapInWorkFolder(folder, `mkdir -p ~/.fleet-tasks/${taskId} && ` +
|
|
255
|
+
`printf '%s' '${scriptB64}' | base64 -d > ~/.fleet-tasks/${taskId}/run.sh && ` +
|
|
256
|
+
`chmod +x ~/.fleet-tasks/${taskId}/run.sh && ` +
|
|
257
|
+
`nohup bash ~/.fleet-tasks/${taskId}/run.sh > /dev/null 2>&1 & echo $!`);
|
|
258
|
+
}
|
|
189
259
|
writeStatusline(new Map([[agent.id, 'busy']]));
|
|
190
260
|
try {
|
|
191
261
|
const launchResult = await strategy.execCommand(launchCmd, input.timeout_s * 1000, undefined, onPidCaptured);
|