@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
|
@@ -1,47 +1,24 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { getProvider } from '../../providers/index.js';
|
|
2
|
+
import { encodeClaudeProjectDir } from '../../providers/provider.js';
|
|
3
|
+
export { encodeClaudeProjectDir };
|
|
3
4
|
/**
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
5
|
+
* apra-fleet issue #390: `homeDir` and `targetOs` describe the MEMBER's machine.
|
|
6
|
+
* - `homeDir === undefined` -> fall back to this process's home dir (correct
|
|
7
|
+
* for local members; the legacy behavior for everyone else).
|
|
8
|
+
* - `homeDir === null` -> the member's home dir could not be resolved; return
|
|
9
|
+
* null instead of fabricating a hub-home path on a remote machine.
|
|
10
|
+
* - `targetOs === undefined` -> join with this process's host convention.
|
|
9
11
|
*/
|
|
10
|
-
export function
|
|
11
|
-
|
|
12
|
+
export function resolveSessionLogDir(provider, workFolder, homeDir, targetOs) {
|
|
13
|
+
const adapter = getProvider(provider);
|
|
14
|
+
return adapter.resolveSessionLogDir(workFolder, homeDir, targetOs);
|
|
12
15
|
}
|
|
13
|
-
export function
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
if (provider === 'gemini') {
|
|
19
|
-
const projectName = basename(workFolder) || 'project';
|
|
20
|
-
return join(home, '.gemini', 'tmp', projectName, 'chats');
|
|
21
|
-
}
|
|
22
|
-
if (provider === 'agy') {
|
|
23
|
-
return join(home, '.gemini', 'antigravity-cli', 'brain');
|
|
24
|
-
}
|
|
25
|
-
return null;
|
|
26
|
-
}
|
|
27
|
-
export function resolveSessionLogPath(provider, sessionId, workFolder, homeDir) {
|
|
28
|
-
const home = homeDir ?? homedir();
|
|
29
|
-
if (provider === 'claude') {
|
|
30
|
-
// Claude: ~/.claude/projects/<project-path-encoded>/<sessionId>.jsonl
|
|
31
|
-
return join(home, '.claude', 'projects', encodeClaudeProjectDir(workFolder), `${sessionId}.jsonl`);
|
|
32
|
-
}
|
|
33
|
-
if (provider === 'gemini') {
|
|
34
|
-
// Gemini: ~/.gemini/tmp/<project>/chats/<sessionId>.jsonl
|
|
35
|
-
const projectName = workFolder.split(/[\\/]/).pop() ?? 'project';
|
|
36
|
-
return join(home, '.gemini', 'tmp', projectName, 'chats', `${sessionId}.jsonl`);
|
|
37
|
-
}
|
|
38
|
-
if (provider === 'agy') {
|
|
39
|
-
// AGY: ~/.gemini/antigravity-cli/brain/<sessionId>/.system_generated/logs/transcript.jsonl
|
|
40
|
-
return join(home, '.gemini', 'antigravity-cli', 'brain', sessionId, '.system_generated', 'logs', 'transcript.jsonl');
|
|
41
|
-
}
|
|
42
|
-
if (provider === 'codex' || provider === 'copilot') {
|
|
16
|
+
export function resolveSessionLogPath(provider, sessionId, workFolder, homeDir, targetOs) {
|
|
17
|
+
const adapter = getProvider(provider);
|
|
18
|
+
const resolved = adapter.resolveSessionLogPath(sessionId, workFolder, homeDir, targetOs);
|
|
19
|
+
if (!resolved) {
|
|
43
20
|
throw new Error(`Unsupported log polling for provider: ${provider}`);
|
|
44
21
|
}
|
|
45
|
-
|
|
22
|
+
return resolved;
|
|
46
23
|
}
|
|
47
24
|
//# sourceMappingURL=log-path-resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log-path-resolver.js","sourceRoot":"","sources":["../../../src/services/stall/log-path-resolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"log-path-resolver.js","sourceRoot":"","sources":["../../../src/services/stall/log-path-resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAElC;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAAqB,EACrB,UAAkB,EAClB,OAAuB,EACvB,QAAmB;IAEnB,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,OAAO,OAAO,CAAC,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,QAAqB,EACrB,SAAiB,EACjB,UAAkB,EAClB,OAAuB,EACvB,QAAmB;IAEnB,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACzF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,yCAAyC,QAAQ,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1,3 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Clamp the per-tick stall threshold into [baselineMs, MAX_STALL_THRESHOLD_MS].
|
|
3
|
+
*
|
|
4
|
+
* A pending tool_use's own declared `input.timeout` is a useful hint that a
|
|
5
|
+
* long-running call is legitimately in flight, but it is model-authored and
|
|
6
|
+
* must not be trusted as a raw control parameter:
|
|
7
|
+
*
|
|
8
|
+
* - FLOOR: a small (or seconds-denominated -- `timeout: 30`) value would
|
|
9
|
+
* otherwise push the effective threshold BELOW the generic baseline and
|
|
10
|
+
* make the watchdog fire earlier than it does with no declaration at all.
|
|
11
|
+
* The floor also neutralizes the seconds-vs-milliseconds unit ambiguity in
|
|
12
|
+
* `extractPendingToolTimeoutMs`.
|
|
13
|
+
* - CEILING: an enormous value would otherwise disable detection entirely.
|
|
14
|
+
*
|
|
15
|
+
* Non-finite / NaN / negative / null / undefined inputs all degrade to the
|
|
16
|
+
* baseline, which is the safe answer for an uninterpretable declaration.
|
|
17
|
+
*/
|
|
18
|
+
export declare function computeEffectiveThresholdMs(baselineMs: number, pendingToolTimeoutMs: number | null | undefined): number;
|
|
19
|
+
/** Which clamp (if any) was applied, for observability in the stall_detected log. */
|
|
20
|
+
export declare function describeClamp(baselineMs: number, pendingToolTimeoutMs: number | null | undefined, effectiveThresholdMs: number): 'floor' | 'ceiling' | null;
|
|
1
21
|
export interface StallEntry {
|
|
2
22
|
sessionId: string | null;
|
|
3
23
|
logFilePath: string | null;
|
|
@@ -7,7 +27,19 @@ export interface StallEntry {
|
|
|
7
27
|
memberId: string;
|
|
8
28
|
memberName: string;
|
|
9
29
|
provisional: boolean;
|
|
30
|
+
/** A genuine stall has been detected AND reported/killed -- suppresses
|
|
31
|
+
* re-reporting and re-killing. Reset when activity resumes. */
|
|
10
32
|
stallReported: boolean;
|
|
33
|
+
/**
|
|
34
|
+
* SF-19: separate latch for the "no activity signal is available for this
|
|
35
|
+
* member/provider" warning. It exists ONLY to keep that warning from
|
|
36
|
+
* repeating every tick, and must never be conflated with `stallReported`:
|
|
37
|
+
* a single transient no-signal tick (a flaky home-dir probe, a momentary
|
|
38
|
+
* network blip) previously set `stallReported: true`, which permanently
|
|
39
|
+
* disarmed the genuine-kill check below for the rest of the dispatch even
|
|
40
|
+
* once a real signal became available again.
|
|
41
|
+
*/
|
|
42
|
+
noSignalReported?: boolean;
|
|
11
43
|
onStall?: () => void;
|
|
12
44
|
}
|
|
13
45
|
export declare class StallDetector {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stall-detector.d.ts","sourceRoot":"","sources":["../../../src/services/stall/stall-detector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stall-detector.d.ts","sourceRoot":"","sources":["../../../src/services/stall/stall-detector.ts"],"names":[],"mappings":"AA+BA;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC9C,MAAM,CAaR;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAC3B,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAC/C,oBAAoB,EAAE,MAAM,GAC3B,OAAO,GAAG,SAAS,GAAG,IAAI,CAO5B;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,uBAAuB,EAAE,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB;oEACgE;IAChE,aAAa,EAAE,OAAO,CAAC;IACvB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,qBAAa,aAAa;IACxB,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAC7D,OAAO,CAAC,YAAY,CAA+B;IAEnD,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAQ9C,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI;IAS5D,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAK9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIlD,KAAK,IAAI,IAAI;IAWb,IAAI,IAAI,IAAI;IASN,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAsN7B;AAKD,wBAAgB,gBAAgB,IAAI,aAAa,CAKhD"}
|
|
@@ -1,10 +1,75 @@
|
|
|
1
1
|
import { updateAgent } from '../registry.js';
|
|
2
2
|
import { logLine, logWarn, LogScope } from '../../utils/log-helpers.js';
|
|
3
|
-
import { pollLogFile } from './stall-poller.js';
|
|
3
|
+
import { pollLogFile, pollDirectoryActivity } from './stall-poller.js';
|
|
4
4
|
import { toLocalISOString, fmtElapsed } from './time-utils.js';
|
|
5
5
|
import { writeStatusline } from '../statusline.js';
|
|
6
6
|
const DEFAULT_POLL_INTERVAL_MS = 30_000;
|
|
7
|
-
|
|
7
|
+
// apra-fleet: was 120_000. Raised to 150_000 -- Claude Code's own default
|
|
8
|
+
// Bash-tool timeout is also 120_000ms, so the old value collided with (and
|
|
9
|
+
// often lost to) that clock on any turn whose last tool_use declared no
|
|
10
|
+
// explicit timeout of its own. This is the "no declared timeout" fallback
|
|
11
|
+
// only; see TOOL_TIMEOUT_GRACE_MS below for the (usually much larger)
|
|
12
|
+
// effective threshold used when the pending tool_use DOES declare one.
|
|
13
|
+
const DEFAULT_STALL_THRESHOLD_MS = 150_000;
|
|
14
|
+
// apra-fleet: grace added on top of a pending tool_use's own declared
|
|
15
|
+
// `input.timeout` before treating it as stalled. Two real fleet-win-dev1
|
|
16
|
+
// stalls (apra-fleet-ivxi/u1qw/69pp) were killed while their last tool_use
|
|
17
|
+
// carried an explicit 600000ms/900000ms budget -- the fleet's watchdog must
|
|
18
|
+
// never fire before the tool's own timeout would have. The margin covers
|
|
19
|
+
// polling cadence (DEFAULT_POLL_INTERVAL_MS) plus time for Claude Code to
|
|
20
|
+
// write the resulting tool_result/error after its own timeout fires.
|
|
21
|
+
const TOOL_TIMEOUT_GRACE_MS = 60_000;
|
|
22
|
+
// apra-fleet PR#416 review (finding 4): hard ceiling on the effective stall
|
|
23
|
+
// threshold. Without it, a single absurd `input.timeout` in a tool_use block
|
|
24
|
+
// (the model writes that value into its own transcript, so it is untrusted
|
|
25
|
+
// input) disables stall detection for that entire duration -- a 86_400_000ms
|
|
26
|
+
// declaration would silence the watchdog for a day. 30 minutes sits
|
|
27
|
+
// comfortably above the largest real case that motivated the feature
|
|
28
|
+
// (900_000ms + grace = 960_000ms). Override with STALL_MAX_THRESHOLD_MS.
|
|
29
|
+
const MAX_STALL_THRESHOLD_MS = 1_800_000;
|
|
30
|
+
/**
|
|
31
|
+
* Clamp the per-tick stall threshold into [baselineMs, MAX_STALL_THRESHOLD_MS].
|
|
32
|
+
*
|
|
33
|
+
* A pending tool_use's own declared `input.timeout` is a useful hint that a
|
|
34
|
+
* long-running call is legitimately in flight, but it is model-authored and
|
|
35
|
+
* must not be trusted as a raw control parameter:
|
|
36
|
+
*
|
|
37
|
+
* - FLOOR: a small (or seconds-denominated -- `timeout: 30`) value would
|
|
38
|
+
* otherwise push the effective threshold BELOW the generic baseline and
|
|
39
|
+
* make the watchdog fire earlier than it does with no declaration at all.
|
|
40
|
+
* The floor also neutralizes the seconds-vs-milliseconds unit ambiguity in
|
|
41
|
+
* `extractPendingToolTimeoutMs`.
|
|
42
|
+
* - CEILING: an enormous value would otherwise disable detection entirely.
|
|
43
|
+
*
|
|
44
|
+
* Non-finite / NaN / negative / null / undefined inputs all degrade to the
|
|
45
|
+
* baseline, which is the safe answer for an uninterpretable declaration.
|
|
46
|
+
*/
|
|
47
|
+
export function computeEffectiveThresholdMs(baselineMs, pendingToolTimeoutMs) {
|
|
48
|
+
const maxMs = parseInt(process.env['STALL_MAX_THRESHOLD_MS'] ?? String(MAX_STALL_THRESHOLD_MS));
|
|
49
|
+
const ceilingMs = Number.isFinite(maxMs) ? maxMs : MAX_STALL_THRESHOLD_MS;
|
|
50
|
+
const base = Number.isFinite(baselineMs) ? baselineMs : DEFAULT_STALL_THRESHOLD_MS;
|
|
51
|
+
// No usable declaration -> the generic baseline stands untouched. (Note this
|
|
52
|
+
// is deliberately NOT `(pendingToolTimeoutMs ?? 0) + GRACE`: that form would
|
|
53
|
+
// silently raise the threshold to the grace period alone whenever the
|
|
54
|
+
// baseline is configured below it, changing behavior for the very common
|
|
55
|
+
// "no declared timeout" case.)
|
|
56
|
+
if (typeof pendingToolTimeoutMs !== 'number' || !Number.isFinite(pendingToolTimeoutMs)) {
|
|
57
|
+
return Math.min(base, ceilingMs);
|
|
58
|
+
}
|
|
59
|
+
return Math.min(Math.max(base, pendingToolTimeoutMs + TOOL_TIMEOUT_GRACE_MS), ceilingMs);
|
|
60
|
+
}
|
|
61
|
+
/** Which clamp (if any) was applied, for observability in the stall_detected log. */
|
|
62
|
+
export function describeClamp(baselineMs, pendingToolTimeoutMs, effectiveThresholdMs) {
|
|
63
|
+
// No usable declaration -> the baseline was used as-is; nothing was clamped.
|
|
64
|
+
if (typeof pendingToolTimeoutMs !== 'number' || !Number.isFinite(pendingToolTimeoutMs))
|
|
65
|
+
return null;
|
|
66
|
+
const raw = pendingToolTimeoutMs + TOOL_TIMEOUT_GRACE_MS;
|
|
67
|
+
if (effectiveThresholdMs < raw)
|
|
68
|
+
return 'ceiling';
|
|
69
|
+
if (effectiveThresholdMs > raw)
|
|
70
|
+
return 'floor';
|
|
71
|
+
return null;
|
|
72
|
+
}
|
|
8
73
|
export class StallDetector {
|
|
9
74
|
stallCheckList = new Map();
|
|
10
75
|
pollInterval = null;
|
|
@@ -60,8 +125,73 @@ export class StallDetector {
|
|
|
60
125
|
const stallThresholdMs = parseInt(process.env['STALL_THRESHOLD_MS'] ?? String(DEFAULT_STALL_THRESHOLD_MS));
|
|
61
126
|
for (const [memberId, entry] of this.stallCheckList.entries()) {
|
|
62
127
|
if (entry.provisional) {
|
|
63
|
-
// Provisional:
|
|
64
|
-
|
|
128
|
+
// Provisional: if logFilePath is available, check mtime; if logFilePath is null, poll directory activity
|
|
129
|
+
let signalAvailable = true;
|
|
130
|
+
// apra-fleet-ivxi.8: mirrors the non-provisional path's
|
|
131
|
+
// effectiveThresholdMs computation (below, line ~202) -- a
|
|
132
|
+
// provisional entry can carry a pending tool_use whose own declared
|
|
133
|
+
// timeout must override the generic baseline threshold too, or it
|
|
134
|
+
// can be killed mid-budget before ever leaving the provisional state.
|
|
135
|
+
let provisionalPendingToolTimeoutMs;
|
|
136
|
+
if (entry.logFilePath) {
|
|
137
|
+
try {
|
|
138
|
+
const pollResult = await pollLogFile(memberId, entry.logFilePath);
|
|
139
|
+
provisionalPendingToolTimeoutMs = pollResult.pendingToolTimeoutMs;
|
|
140
|
+
if (pollResult.mtimeMs && pollResult.mtimeMs > entry.lastActivityAt) {
|
|
141
|
+
entry.lastActivityAt = pollResult.mtimeMs;
|
|
142
|
+
entry.provisional = false;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
catch { /* best effort */ }
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
// apra-fleet issue #390 / apra-fleet-igoe: default to "a signal is
|
|
149
|
+
// available" so any unexpected failure of the poller itself keeps the
|
|
150
|
+
// pre-existing (kill-capable) behavior. Only an explicit
|
|
151
|
+
// signalAvailable:false -- the provider genuinely has no pollable log
|
|
152
|
+
// directory, or the member's home dir could not be resolved -- opts
|
|
153
|
+
// this entry out of the baseline-timeout kill below.
|
|
154
|
+
try {
|
|
155
|
+
const activity = await pollDirectoryActivity(memberId);
|
|
156
|
+
signalAvailable = activity?.signalAvailable !== false;
|
|
157
|
+
if (activity?.mtimeMs && activity.mtimeMs > entry.lastActivityAt) {
|
|
158
|
+
entry.lastActivityAt = activity.mtimeMs;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
catch { /* best effort */ }
|
|
162
|
+
}
|
|
163
|
+
// apra-fleet issue #390 / apra-fleet-igoe: with NO activity-signal
|
|
164
|
+
// mechanism at all, "we never saw progress" is the absence of evidence,
|
|
165
|
+
// not evidence of a stall -- lastActivityAt is simply frozen at dispatch
|
|
166
|
+
// start and crosses the threshold for every dispatch longer than it,
|
|
167
|
+
// healthy or not. Killing on that is a pure false positive (it fired for
|
|
168
|
+
// EVERY codex/copilot/none dispatch, local or remote, past 120s). Warn
|
|
169
|
+
// once instead; other ceilings (e.g. execute_prompt's max_total_s /
|
|
170
|
+
// timeout_s) still bound such a dispatch.
|
|
171
|
+
// SF-19: latch the warning on `noSignalReported`, NOT on
|
|
172
|
+
// `stallReported`. Using the latter meant one transient no-signal tick
|
|
173
|
+
// permanently suppressed the genuine-kill check further down, silently
|
|
174
|
+
// forfeiting real stall protection for the remainder of the dispatch.
|
|
175
|
+
if (!signalAvailable) {
|
|
176
|
+
if (now - entry.lastActivityAt > stallThresholdMs && !entry.noSignalReported) {
|
|
177
|
+
this.update(memberId, { noSignalReported: true });
|
|
178
|
+
logWarn('stall_no_signal', JSON.stringify({
|
|
179
|
+
memberId,
|
|
180
|
+
memberName: entry.memberName,
|
|
181
|
+
idleSecs: Math.floor((now - entry.lastActivityAt) / 1000),
|
|
182
|
+
note: 'no stall signal available for this member/provider -- not killing; relying on dispatch timeouts',
|
|
183
|
+
}));
|
|
184
|
+
}
|
|
185
|
+
writeStatusline(new Map([[memberId, `busy(${fmtElapsed(now - entry.lastActivityAt)})`]]));
|
|
186
|
+
continue;
|
|
187
|
+
}
|
|
188
|
+
// Baseline timeout check for provisional entries. Same override as
|
|
189
|
+
// the non-provisional path: a pending tool_use's own declared
|
|
190
|
+
// timeout, when present, replaces the generic baseline threshold for
|
|
191
|
+
// this tick's stall check.
|
|
192
|
+
// Clamped into [baseline, ceiling] -- see computeEffectiveThresholdMs.
|
|
193
|
+
const provisionalEffectiveThresholdMs = computeEffectiveThresholdMs(stallThresholdMs, provisionalPendingToolTimeoutMs);
|
|
194
|
+
if (now - entry.lastActivityAt > provisionalEffectiveThresholdMs && !entry.stallReported) {
|
|
65
195
|
const idleSecs = Math.floor((now - entry.lastActivityAt) / 1000);
|
|
66
196
|
scope.warn(JSON.stringify({
|
|
67
197
|
event: 'stall_detected',
|
|
@@ -69,6 +199,9 @@ export class StallDetector {
|
|
|
69
199
|
memberName: entry.memberName,
|
|
70
200
|
idleSecs,
|
|
71
201
|
provisional: true,
|
|
202
|
+
pendingToolTimeoutMs: provisionalPendingToolTimeoutMs ?? null,
|
|
203
|
+
effectiveThresholdMs: provisionalEffectiveThresholdMs,
|
|
204
|
+
clamped: describeClamp(stallThresholdMs, provisionalPendingToolTimeoutMs, provisionalEffectiveThresholdMs),
|
|
72
205
|
lastActivityAt: toLocalISOString(entry.lastActivityAt),
|
|
73
206
|
}));
|
|
74
207
|
writeStatusline(new Map([[memberId, 'unknown']]));
|
|
@@ -88,7 +221,14 @@ export class StallDetector {
|
|
|
88
221
|
logPath: entry.logFilePath,
|
|
89
222
|
lastActivityAt: entry.lastActivityAt,
|
|
90
223
|
}));
|
|
91
|
-
const { lastTimestamp, mtimeMs, error } = await pollLogFile(memberId, entry.logFilePath);
|
|
224
|
+
const { lastTimestamp, mtimeMs, error, pendingToolTimeoutMs } = await pollLogFile(memberId, entry.logFilePath);
|
|
225
|
+
// apra-fleet: a pending tool_use's own declared timeout, when present,
|
|
226
|
+
// overrides the generic idle threshold for THIS tick's stall check --
|
|
227
|
+
// it is a hard, model-declared budget for a call already known to be
|
|
228
|
+
// long-running (900000ms in one confirmed stall, 600000ms in another),
|
|
229
|
+
// and the fleet watchdog must not fire before that budget elapses.
|
|
230
|
+
// Clamped into [baseline, ceiling] -- see computeEffectiveThresholdMs.
|
|
231
|
+
const effectiveThresholdMs = computeEffectiveThresholdMs(stallThresholdMs, pendingToolTimeoutMs);
|
|
92
232
|
if (error) {
|
|
93
233
|
const newFailures = entry.consecutiveReadFailures + 1;
|
|
94
234
|
this.update(memberId, { consecutiveReadFailures: newFailures });
|
|
@@ -153,7 +293,7 @@ export class StallDetector {
|
|
|
153
293
|
consecutiveIdleCycles: newIdleCycles,
|
|
154
294
|
consecutiveReadFailures: 0,
|
|
155
295
|
});
|
|
156
|
-
if (now - entry.lastActivityAt >
|
|
296
|
+
if (now - entry.lastActivityAt > effectiveThresholdMs && !entry.stallReported) {
|
|
157
297
|
const idleSecs = Math.floor((now - entry.lastActivityAt) / 1000);
|
|
158
298
|
scope.warn(JSON.stringify({
|
|
159
299
|
event: 'stall_detected',
|
|
@@ -161,6 +301,9 @@ export class StallDetector {
|
|
|
161
301
|
memberName: entry.memberName,
|
|
162
302
|
idleSecs,
|
|
163
303
|
provisional: false,
|
|
304
|
+
pendingToolTimeoutMs: pendingToolTimeoutMs ?? null,
|
|
305
|
+
effectiveThresholdMs,
|
|
306
|
+
clamped: describeClamp(stallThresholdMs, pendingToolTimeoutMs, effectiveThresholdMs),
|
|
164
307
|
lastActivityAt: toLocalISOString(entry.lastActivityAt),
|
|
165
308
|
}));
|
|
166
309
|
writeStatusline(new Map([[memberId, 'unknown']]));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stall-detector.js","sourceRoot":"","sources":["../../../src/services/stall/stall-detector.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"stall-detector.js","sourceRoot":"","sources":["../../../src/services/stall/stall-detector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,wBAAwB,GAAG,MAAM,CAAC;AACxC,0EAA0E;AAC1E,2EAA2E;AAC3E,wEAAwE;AACxE,0EAA0E;AAC1E,sEAAsE;AACtE,uEAAuE;AACvE,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAC3C,sEAAsE;AACtE,yEAAyE;AACzE,2EAA2E;AAC3E,4EAA4E;AAC5E,yEAAyE;AACzE,0EAA0E;AAC1E,qEAAqE;AACrE,MAAM,qBAAqB,GAAG,MAAM,CAAC;AACrC,4EAA4E;AAC5E,6EAA6E;AAC7E,2EAA2E;AAC3E,6EAA6E;AAC7E,oEAAoE;AACpE,qEAAqE;AACrE,yEAAyE;AACzE,MAAM,sBAAsB,GAAG,SAAS,CAAC;AAEzC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,2BAA2B,CACzC,UAAkB,EAClB,oBAA+C;IAE/C,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAChG,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC;IAC1E,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,0BAA0B,CAAC;IACnF,6EAA6E;IAC7E,6EAA6E;IAC7E,sEAAsE;IACtE,yEAAyE;IACzE,+BAA+B;IAC/B,IAAI,OAAO,oBAAoB,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACvF,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,oBAAoB,GAAG,qBAAqB,CAAC,EAAE,SAAS,CAAC,CAAC;AAC3F,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,aAAa,CAC3B,UAAkB,EAClB,oBAA+C,EAC/C,oBAA4B;IAE5B,6EAA6E;IAC7E,IAAI,OAAO,oBAAoB,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC;QAAE,OAAO,IAAI,CAAC;IACpG,MAAM,GAAG,GAAG,oBAAoB,GAAG,qBAAqB,CAAC;IACzD,IAAI,oBAAoB,GAAG,GAAG;QAAE,OAAO,SAAS,CAAC;IACjD,IAAI,oBAAoB,GAAG,GAAG;QAAE,OAAO,OAAO,CAAC;IAC/C,OAAO,IAAI,CAAC;AACd,CAAC;AA4BD,MAAM,OAAO,aAAa;IACf,cAAc,GAA4B,IAAI,GAAG,EAAE,CAAC;IACrD,YAAY,GAA0B,IAAI,CAAC;IAEnD,GAAG,CAAC,QAAgB,EAAE,KAAiB;QACrC,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,OAAO,CAAC,gBAAgB,EAAE,yCAAyC,QAAQ,EAAE,CAAC,CAAC;QACjF,CAAC;QACD,OAAO,CAAC,WAAW,EAAE,UAAU,KAAK,CAAC,UAAU,gBAAgB,KAAK,CAAC,WAAW,UAAU,IAAI,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1H,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,QAAgB,EAAE,OAA4B;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,CAAC,gBAAgB,EAAE,+CAA+C,QAAQ,EAAE,CAAC,CAAC;YACrF,OAAO;QACT,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,CAAC,QAAgB;QACrB,OAAO,CAAC,cAAc,EAAE,YAAY,QAAQ,cAAc,IAAI,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1F,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,QAAQ,CAAC,QAAgB;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;YAC/B,OAAO,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;YAC7C,OAAO;QACT,CAAC;QACD,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACvG,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,EAAE,UAAU,CAAC,CAAC;QACrE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,OAAO,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;IACrD,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;YAC/B,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACjC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5B,OAAO,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO;QAE3C,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC;YAC3D,aAAa,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI;YACvC,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM;YAChF,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;SAClE,CAAC,CAAC,CAAC;QAEJ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC,CAAC;QAE3G,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9D,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;gBACtB,yGAAyG;gBACzG,IAAI,eAAe,GAAG,IAAI,CAAC;gBAC3B,wDAAwD;gBACxD,2DAA2D;gBAC3D,oEAAoE;gBACpE,kEAAkE;gBAClE,sEAAsE;gBACtE,IAAI,+BAA0D,CAAC;gBAC/D,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;oBACtB,IAAI,CAAC;wBACH,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;wBAClE,+BAA+B,GAAG,UAAU,CAAC,oBAAoB,CAAC;wBAClE,IAAI,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC;4BACpE,KAAK,CAAC,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC;4BAC1C,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;wBAC5B,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACN,mEAAmE;oBACnE,sEAAsE;oBACtE,yDAAyD;oBACzD,sEAAsE;oBACtE,oEAAoE;oBACpE,qDAAqD;oBACrD,IAAI,CAAC;wBACH,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,QAAQ,CAAC,CAAC;wBACvD,eAAe,GAAG,QAAQ,EAAE,eAAe,KAAK,KAAK,CAAC;wBACtD,IAAI,QAAQ,EAAE,OAAO,IAAI,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC;4BACjE,KAAK,CAAC,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC;wBAC1C,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;gBAC/B,CAAC;gBAED,mEAAmE;gBACnE,wEAAwE;gBACxE,yEAAyE;gBACzE,qEAAqE;gBACrE,yEAAyE;gBACzE,uEAAuE;gBACvE,oEAAoE;gBACpE,0CAA0C;gBAC1C,yDAAyD;gBACzD,uEAAuE;gBACvE,uEAAuE;gBACvE,sEAAsE;gBACtE,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,IAAI,GAAG,GAAG,KAAK,CAAC,cAAc,GAAG,gBAAgB,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;wBAC7E,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;wBAClD,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC;4BACxC,QAAQ;4BACR,UAAU,EAAE,KAAK,CAAC,UAAU;4BAC5B,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;4BACzD,IAAI,EAAE,iGAAiG;yBACxG,CAAC,CAAC,CAAC;oBACN,CAAC;oBACD,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,UAAU,CAAC,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC1F,SAAS;gBACX,CAAC;gBAED,mEAAmE;gBACnE,8DAA8D;gBAC9D,qEAAqE;gBACrE,2BAA2B;gBAC3B,uEAAuE;gBACvE,MAAM,+BAA+B,GAAG,2BAA2B,CACjE,gBAAgB,EAChB,+BAA+B,CAChC,CAAC;gBACF,IAAI,GAAG,GAAG,KAAK,CAAC,cAAc,GAAG,+BAA+B,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;oBACzF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;oBACjE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;wBACxB,KAAK,EAAE,gBAAgB;wBACvB,QAAQ;wBACR,UAAU,EAAE,KAAK,CAAC,UAAU;wBAC5B,QAAQ;wBACR,WAAW,EAAE,IAAI;wBACjB,oBAAoB,EAAE,+BAA+B,IAAI,IAAI;wBAC7D,oBAAoB,EAAE,+BAA+B;wBACrD,OAAO,EAAE,aAAa,CAAC,gBAAgB,EAAE,+BAA+B,EAAE,+BAA+B,CAAC;wBAC1G,cAAc,EAAE,gBAAgB,CAAC,KAAK,CAAC,cAAc,CAAC;qBACvD,CAAC,CAAC,CAAC;oBACJ,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;oBAClD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC/C,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpB,CAAC;qBAAM,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;oBAChC,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,UAAU,CAAC,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5F,CAAC;gBACD,SAAS;YACX,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,WAAW;gBAAE,SAAS;YAEjC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBACxB,KAAK,EAAE,YAAY;gBACnB,QAAQ;gBACR,OAAO,EAAE,KAAK,CAAC,WAAW;gBAC1B,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC,CAAC;YAEJ,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,oBAAoB,EAAE,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;YAE/G,uEAAuE;YACvE,sEAAsE;YACtE,qEAAqE;YACrE,uEAAuE;YACvE,mEAAmE;YACnE,uEAAuE;YACvE,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;YAEjG,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,WAAW,GAAG,KAAK,CAAC,uBAAuB,GAAG,CAAC,CAAC;gBACtD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,uBAAuB,EAAE,WAAW,EAAE,CAAC,CAAC;gBAChE,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;oBACrB,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;gBAC5G,CAAC;gBACD,sDAAsD;gBACtD,SAAS;YACX,CAAC;YAED,iEAAiE;YACjE,sEAAsE;YACtE,uEAAuE;YACvE,uEAAuE;YACvE,kEAAkE;YAClE,sEAAsE;YACtE,+BAA+B;YAC/B,MAAM,eAAe,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,CAAC,cAAc,CAAC;gBACnG,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,IAAI,CAAC;YAET,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;gBAC3B,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;oBAC7B,kEAAkE;oBAClE,iEAAiE;oBACjE,8DAA8D;oBAC9D,8DAA8D;oBAC9D,kEAAkE;oBAClE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;wBACpB,cAAc,EAAE,eAAe;wBAC/B,qBAAqB,EAAE,CAAC;wBACxB,uBAAuB,EAAE,CAAC;wBAC1B,aAAa,EAAE,KAAK;qBACrB,CAAC,CAAC;oBACH,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,UAAU,CAAC,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvF,CAAC;gBACD,mFAAmF;gBACnF,SAAS;YACX,CAAC;YAED,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,CAAC;YAC7C,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAChF,IAAI,iBAAiB,KAAK,IAAI,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;gBAC3D,0FAA0F;gBAC1F,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,EAAE,eAAe,IAAI,CAAC,CAAC,CAAC;gBAC1E,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACpB,cAAc,EAAE,UAAU;oBAC1B,qBAAqB,EAAE,CAAC;oBACxB,uBAAuB,EAAE,CAAC;oBAC1B,aAAa,EAAE,KAAK;iBACrB,CAAC,CAAC;gBACH,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;oBAC/B,WAAW,CAAC,QAAQ,EAAE,EAAE,iBAAiB,EAAE,aAAa,EAAE,CAAC,CAAC;gBAC9D,CAAC;gBACD,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,UAAU,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChF,SAAS;YACX,CAAC;YAED,uEAAuE;YACvE,iEAAiE;YACjE,mEAAmE;YACnE,sEAAsE;YACtE,4BAA4B;YAC5B,MAAM,aAAa,GAAG,KAAK,CAAC,qBAAqB,GAAG,CAAC,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACpB,qBAAqB,EAAE,aAAa;gBACpC,uBAAuB,EAAE,CAAC;aAC3B,CAAC,CAAC;YAEH,IAAI,GAAG,GAAG,KAAK,CAAC,cAAc,GAAG,oBAAoB,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;gBAC9E,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;gBACjE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;oBACxB,KAAK,EAAE,gBAAgB;oBACvB,QAAQ;oBACR,UAAU,EAAE,KAAK,CAAC,UAAU;oBAC5B,QAAQ;oBACR,WAAW,EAAE,KAAK;oBAClB,oBAAoB,EAAE,oBAAoB,IAAI,IAAI;oBAClD,oBAAoB;oBACpB,OAAO,EAAE,aAAa,CAAC,gBAAgB,EAAE,oBAAoB,EAAE,oBAAoB,CAAC;oBACpF,cAAc,EAAE,gBAAgB,CAAC,KAAK,CAAC,cAAc,CAAC;iBACvD,CAAC,CAAC,CAAC;gBACJ,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC/C,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YACpB,CAAC;iBAAM,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;gBAChC,kEAAkE;gBAClE,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,UAAU,CAAC,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5F,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,qBAAqB;AACrB,IAAI,QAAQ,GAAyB,IAAI,CAAC;AAE1C,MAAM,UAAU,gBAAgB;IAC9B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;IACjC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -17,6 +17,40 @@ export interface PollResult {
|
|
|
17
17
|
* permission error, etc.) -- treated the same as "no signal" by callers.
|
|
18
18
|
*/
|
|
19
19
|
mtimeMs?: number | null;
|
|
20
|
+
/**
|
|
21
|
+
* apra-fleet: when the tail's last entry is an assistant turn ending in an
|
|
22
|
+
* unresolved tool_use (no tool_result has been appended yet), that call's
|
|
23
|
+
* own declared `input.timeout` -- when present -- is a hard, model-declared
|
|
24
|
+
* budget for how long THIS specific call may legitimately run. Two real
|
|
25
|
+
* fleet-win-dev1 stalls (sprint apra-fleet-ivxi/u1qw/69pp) were killed by
|
|
26
|
+
* the fixed idle threshold while their pending tool_use carried an explicit
|
|
27
|
+
* timeout of 600000ms/900000ms -- both well inside their own declared
|
|
28
|
+
* budget. `null` when the last entry is not a pending tool_use, or the
|
|
29
|
+
* tool_use has no numeric `timeout` input. Claude-provider transcripts
|
|
30
|
+
* only -- see extractPendingToolTimeoutMs.
|
|
31
|
+
*/
|
|
32
|
+
pendingToolTimeoutMs?: number | null;
|
|
33
|
+
}
|
|
34
|
+
export interface DirectoryActivity {
|
|
35
|
+
/** Newest file mtime under the provider's log dir, or null when nothing could
|
|
36
|
+
* be read (directory absent, empty, or command failed). */
|
|
37
|
+
mtimeMs: number | null;
|
|
38
|
+
/**
|
|
39
|
+
* apra-fleet issue #390 / apra-fleet-igoe: whether this member+provider has a
|
|
40
|
+
* WORKING activity-signal mechanism at all.
|
|
41
|
+
*
|
|
42
|
+
* false means there is no log directory to poll -- either the provider has
|
|
43
|
+
* none (codex/copilot/none always) or the member's home directory could not
|
|
44
|
+
* be resolved. In that case a `mtimeMs: null` is NOT evidence of inactivity,
|
|
45
|
+
* it is the absence of evidence, and the stall detector must not treat it as
|
|
46
|
+
* a stall (that is precisely the false-kill this distinction exists to stop).
|
|
47
|
+
*/
|
|
48
|
+
signalAvailable: boolean;
|
|
20
49
|
}
|
|
50
|
+
/**
|
|
51
|
+
* Polling for directory-level file activity for provisional sessions where a
|
|
52
|
+
* specific session file is not yet known before spawn (e.g. AGY fresh turns).
|
|
53
|
+
*/
|
|
54
|
+
export declare function pollDirectoryActivity(memberId: string): Promise<DirectoryActivity>;
|
|
21
55
|
export declare function pollLogFile(memberId: string, logFilePath: string): Promise<PollResult>;
|
|
22
56
|
//# sourceMappingURL=stall-poller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stall-poller.d.ts","sourceRoot":"","sources":["../../../src/services/stall/stall-poller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stall-poller.d.ts","sourceRoot":"","sources":["../../../src/services/stall/stall-poller.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,UAAU;IACzB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;;;;;;;;;;OAWG;IACH,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;AAED,MAAM,WAAW,iBAAiB;IAChC;gEAC4D;IAC5D,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB;;;;;;;;;OASG;IACH,eAAe,EAAE,OAAO,CAAC;CAC1B;AASD;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA+ExF;AAqDD,wBAAsB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAmD5F"}
|
|
@@ -2,6 +2,95 @@ import { getAgent } from '../registry.js';
|
|
|
2
2
|
import { getStrategy } from '../strategy.js';
|
|
3
3
|
import { getAgentOS } from '../../utils/agent-helpers.js';
|
|
4
4
|
import { logLine, logWarn } from '../../utils/log-helpers.js';
|
|
5
|
+
import { getProvider } from '../../providers/index.js';
|
|
6
|
+
import { getMemberPathContext } from '../member-home.js';
|
|
7
|
+
import { escapeDoubleQuoted } from '../../os/os-commands.js';
|
|
8
|
+
const NO_SIGNAL = { mtimeMs: null, signalAvailable: false };
|
|
9
|
+
/** Throwaway home dir used only to ask "does this provider build a log dir at
|
|
10
|
+
* all?" without doing a member-side home-dir probe first. Never used to build
|
|
11
|
+
* a path that is actually read. */
|
|
12
|
+
const HOME_CAPABILITY_SENTINEL = '/__fleet_capability_probe__';
|
|
13
|
+
/**
|
|
14
|
+
* Polling for directory-level file activity for provisional sessions where a
|
|
15
|
+
* specific session file is not yet known before spawn (e.g. AGY fresh turns).
|
|
16
|
+
*/
|
|
17
|
+
export async function pollDirectoryActivity(memberId) {
|
|
18
|
+
const agent = getAgent(memberId);
|
|
19
|
+
if (!agent)
|
|
20
|
+
return NO_SIGNAL;
|
|
21
|
+
const provider = agent.llmProvider ?? 'claude';
|
|
22
|
+
const adapter = getProvider(provider);
|
|
23
|
+
const isWindows = getAgentOS(agent) === 'windows';
|
|
24
|
+
// Capability check FIRST, with a sentinel home dir: does this provider have a
|
|
25
|
+
// pollable log directory at all? codex/copilot/none return null for any home
|
|
26
|
+
// dir whatsoever. Asking here (a pure function call) means we never pay for a
|
|
27
|
+
// member-side home-dir probe whose answer could not be used.
|
|
28
|
+
if (adapter.resolveSessionLogDir(agent.workFolder, HOME_CAPABILITY_SENTINEL, isWindows ? 'windows' : 'linux') === null) {
|
|
29
|
+
return NO_SIGNAL;
|
|
30
|
+
}
|
|
31
|
+
// apra-fleet issue #390: the log dir lives on the MEMBER's machine, under the
|
|
32
|
+
// MEMBER's home dir, joined with the MEMBER's OS convention. Resolving it with
|
|
33
|
+
// this process's os.homedir()/path.join produced a directory that could not
|
|
34
|
+
// exist on any remote member, which is what made the provisional
|
|
35
|
+
// baseline-timeout check fire against perfectly healthy dispatches.
|
|
36
|
+
const { homeDir, targetOs, source } = await getMemberPathContext(agent);
|
|
37
|
+
const logDir = adapter.resolveSessionLogDir(agent.workFolder, homeDir, targetOs);
|
|
38
|
+
// homeDir === null lands here too: no honest path to poll, so report "no
|
|
39
|
+
// signal available" rather than polling a fabricated hub path.
|
|
40
|
+
if (!logDir)
|
|
41
|
+
return NO_SIGNAL;
|
|
42
|
+
// A home dir that came from the username FALLBACK (the probe failed) is a
|
|
43
|
+
// guess. We still poll it -- if the guess is right, full stall protection is
|
|
44
|
+
// preserved -- but a guessed directory that yields NOTHING is not evidence of
|
|
45
|
+
// a stall, it is an unverified path. Only an authoritative directory (local
|
|
46
|
+
// member, or a probed home dir) may report "signal available" on an empty
|
|
47
|
+
// result and thereby license a kill.
|
|
48
|
+
const authoritative = source === 'local' || source === 'probe';
|
|
49
|
+
const strategy = getStrategy(agent);
|
|
50
|
+
const escapedWinDir = logDir.replace(/'/g, "''");
|
|
51
|
+
const escapedPosixDir = escapeDoubleQuoted(logDir);
|
|
52
|
+
// apra-fleet: avoid any intermediate `$variable` in this one-liner -- on at
|
|
53
|
+
// least one Windows member (fleet-win-dev1), the SSH exec path silently
|
|
54
|
+
// strips bare `$name` tokens (e.g. `$i`) out of the command string before
|
|
55
|
+
// the nested `powershell -c` ever parses it, turning this into a parse
|
|
56
|
+
// error on every poll and killing the mtime-based stall signal.
|
|
57
|
+
//
|
|
58
|
+
// Two prior attempts at a $-free one-liner both hung (and leaked an
|
|
59
|
+
// unkillable remote powershell.exe -- `ssh.ts`'s killRemoteTree() is a
|
|
60
|
+
// no-op here, no FLEET_PID marker is ever emitted by this command):
|
|
61
|
+
// feeding a possibly-empty `Get-ChildItem -Depth ...` pipeline result
|
|
62
|
+
// straight into `[DateTimeOffset]::new(...)` or `Get-Date -Format o`.
|
|
63
|
+
// Live reproduction (Start-Job + Wait-Job -Timeout, isolating each
|
|
64
|
+
// pipeline stage) traced the hang specifically to `Get-ChildItem -Depth`
|
|
65
|
+
// against a NONEXISTENT path with errors suppressed -- not to anything
|
|
66
|
+
// downstream, and not to an existing-but-empty directory (`-Depth`
|
|
67
|
+
// against a real, empty dir returns instantly). A `Test-Path` guard
|
|
68
|
+
// (itself instant either way, verified live) skips `Get-ChildItem`
|
|
69
|
+
// entirely when the directory does not exist -- the common case here,
|
|
70
|
+
// since this polls the log dir before a session's first turn creates it.
|
|
71
|
+
// `Get-Date -Format o` as the terminal stage (rather than a constructor
|
|
72
|
+
// call) means a zero-object pipeline just produces no output, no error.
|
|
73
|
+
const cmd = isWindows
|
|
74
|
+
? `powershell -c "if (Test-Path -Path '${escapedWinDir}') { Get-ChildItem -Path '${escapedWinDir}' -Depth 5 -File -ErrorAction SilentlyContinue | Sort-Object LastWriteTimeUtc -Descending | Select-Object -First 1 -ExpandProperty LastWriteTimeUtc | Get-Date -Format o }"`
|
|
75
|
+
: `find "${escapedPosixDir}" -maxdepth 5 -type f -exec stat -c %Y {} + 2>/dev/null | sort -nr | head -n1`;
|
|
76
|
+
try {
|
|
77
|
+
const result = await strategy.execCommand(cmd, 5000);
|
|
78
|
+
const trimmed = result.stdout.trim();
|
|
79
|
+
if (!trimmed)
|
|
80
|
+
return { mtimeMs: null, signalAvailable: authoritative };
|
|
81
|
+
// Windows emits an ISO-8601 timestamp (`Get-Date -Format o`); POSIX
|
|
82
|
+
// emits whole seconds since epoch.
|
|
83
|
+
const ms = isWindows ? Date.parse(trimmed) : Number(trimmed) * 1000;
|
|
84
|
+
if (!Number.isFinite(ms) || ms <= 0)
|
|
85
|
+
return { mtimeMs: null, signalAvailable: authoritative };
|
|
86
|
+
// A guessed directory that actually produced an mtime IS verified: real
|
|
87
|
+
// files were found there, so from here on it is a genuine signal source.
|
|
88
|
+
return { mtimeMs: ms, signalAvailable: true };
|
|
89
|
+
}
|
|
90
|
+
catch {
|
|
91
|
+
return { mtimeMs: null, signalAvailable: authoritative };
|
|
92
|
+
}
|
|
93
|
+
}
|
|
5
94
|
/**
|
|
6
95
|
* apra-fleet-iuc.2: fetch the transcript file's own OS mtime, independent of
|
|
7
96
|
* (and in addition to) the content-based timestamp extraction below. Never
|
|
@@ -10,8 +99,10 @@ import { logLine, logWarn } from '../../utils/log-helpers.js';
|
|
|
10
99
|
* "confirmed no activity" (see stall-detector.ts's mtime cross-check).
|
|
11
100
|
*/
|
|
12
101
|
async function fetchMtimeMs(strategy, logFilePath, isWindows) {
|
|
102
|
+
// See the matching note in pollDirectoryActivity above: no intermediate
|
|
103
|
+
// `$variable` here either, for the same reason.
|
|
13
104
|
const cmd = isWindows
|
|
14
|
-
? `powershell -c "
|
|
105
|
+
? `powershell -c "[DateTimeOffset]::new((Get-Item -LiteralPath '${logFilePath}' -ErrorAction SilentlyContinue).LastWriteTimeUtc, [TimeSpan]::Zero).ToUnixTimeMilliseconds()"`
|
|
15
106
|
// GNU stat (`-c %Y`) first; BSD/macOS stat (`-f %m`) as a fallback -- both report whole seconds.
|
|
16
107
|
: `stat -c %Y "${logFilePath}" 2>/dev/null || stat -f %m "${logFilePath}" 2>/dev/null`;
|
|
17
108
|
try {
|
|
@@ -85,7 +176,8 @@ export async function pollLogFile(memberId, logFilePath) {
|
|
|
85
176
|
: provider === 'agy'
|
|
86
177
|
? extractAgyTimestamp(memberId, lines, result.stdout)
|
|
87
178
|
: extractClaudeTimestamp(memberId, lines, result.stdout);
|
|
88
|
-
|
|
179
|
+
const pendingToolTimeoutMs = extractPendingToolTimeoutMs(provider, lines);
|
|
180
|
+
return { ...extracted, mtimeMs, pendingToolTimeoutMs };
|
|
89
181
|
}
|
|
90
182
|
catch (err) {
|
|
91
183
|
const msg = err instanceof Error ? err.message : String(err);
|
|
@@ -170,6 +262,46 @@ function extractClaudeTimestamp(memberId, lines, rawTail = '') {
|
|
|
170
262
|
}
|
|
171
263
|
return { lastTimestamp: null };
|
|
172
264
|
}
|
|
265
|
+
/**
|
|
266
|
+
* apra-fleet: only the LAST line of the tail can be a genuinely unresolved
|
|
267
|
+
* tool_use -- this is a strict append-only JSONL log, so any tool_use
|
|
268
|
+
* appearing earlier in the tail already has its tool_result on a later line
|
|
269
|
+
* (this function would never reach it in a backward scan anyway). Read that
|
|
270
|
+
* one line directly rather than scanning: TAIL_LINES/TAIL_BYTES above already
|
|
271
|
+
* guarantee the final line is complete (the byte cap trims from the front),
|
|
272
|
+
* so no backward-scan-for-a-parseable-line fallback is needed here the way
|
|
273
|
+
* extractClaudeTimestamp needs one for the *first* usable entry.
|
|
274
|
+
*
|
|
275
|
+
* Claude-only by construction: the provider gate lives HERE, not in the
|
|
276
|
+
* caller, so pollLogFile's call site stays provider-agnostic and a future
|
|
277
|
+
* AGY/OpenCode/gemini transcript schema change can never accidentally start
|
|
278
|
+
* (or stop) feeding this function without an explicit case added below.
|
|
279
|
+
*/
|
|
280
|
+
function extractPendingToolTimeoutMs(provider, lines) {
|
|
281
|
+
if (provider !== 'claude')
|
|
282
|
+
return null;
|
|
283
|
+
if (lines.length === 0)
|
|
284
|
+
return null;
|
|
285
|
+
let parsed;
|
|
286
|
+
try {
|
|
287
|
+
parsed = JSON.parse(lines[lines.length - 1]);
|
|
288
|
+
}
|
|
289
|
+
catch {
|
|
290
|
+
return null;
|
|
291
|
+
}
|
|
292
|
+
if (parsed['type'] !== 'assistant')
|
|
293
|
+
return null;
|
|
294
|
+
const message = parsed['message'];
|
|
295
|
+
const content = message?.['content'];
|
|
296
|
+
if (!Array.isArray(content) || content.length === 0)
|
|
297
|
+
return null;
|
|
298
|
+
const lastBlock = content[content.length - 1];
|
|
299
|
+
if (lastBlock?.['type'] !== 'tool_use')
|
|
300
|
+
return null;
|
|
301
|
+
const input = lastBlock['input'];
|
|
302
|
+
const timeout = input?.['timeout'];
|
|
303
|
+
return typeof timeout === 'number' && Number.isFinite(timeout) && timeout > 0 ? timeout : null;
|
|
304
|
+
}
|
|
173
305
|
function extractGeminiTimestamp(memberId, lines) {
|
|
174
306
|
for (let i = lines.length - 1; i >= 0; i--) {
|
|
175
307
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stall-poller.js","sourceRoot":"","sources":["../../../src/services/stall/stall-poller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAsB,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"stall-poller.js","sourceRoot":"","sources":["../../../src/services/stall/stall-poller.ts"],"names":[],"mappings":"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"}
|