mirror of
https://github.com/claude-code-best/claude-code.git
synced 2026-06-18 14:25:51 +00:00
feat: harden autonomy lifecycle, OOM bounds, and provider-boundary finalization
This PR consolidates a coordinated batch of fixes around autonomy run/flow lifecycle, scheduled task deduplication, provider-boundary state finalization, and matching memory-bound treatments for adjacent long-running subsystems (REPL fullscreen scrollback, skill-search/skill-learning runtime activation). All changes were developed and reviewed together because they touched the same lifecycle invariants and were uncovered by the same long-running session reproductions.
## Lifecycle correctness
- Queued autonomy prompts are not injected unless the persisted run was successfully claimed; queued run claiming is now terminal-safe so a once-consumed/cancelled/failed run can not slip back into `queued`.
- Autonomy run/flow finalization happens on completion, provider error, generator close, and cancellation — not just the happy path. New `src/__tests__/queryAutonomyProviderBoundary.test.ts` covers these provider-boundary transitions.
- `requestManagedAutonomyFlowCancel` and `resumeManagedAutonomyFlowPrompt` carry `rootDir` and `currentDir` explicitly across detached async boundaries (proactive-tick, cron, daemon restart) instead of inferring from process state.
- Active runs/flows are protected from janitor pruning so a running step can not be garbage-collected mid-flight (`src/utils/autonomyAuthority.ts`).
- Heartbeat parser now ignores fenced code blocks; the two-phase commit window for autonomy state transitions is documented in `docs/internals/autonomy-jira.md`.
## Ownership and dedup
- `src/utils/autonomyRuns.ts`: ownership stamping (run id + rootDir carried end-to-end), source-based dedup against active runs.
- `src/hooks/useScheduledTasks.ts`: scheduled ticks deduplicate against runs already active on the same source label.
- `src/utils/processUserInput/processSlashCommand.tsx`: forked slash commands now thread the autonomy `runId` so completion finalizers can find the originating run for deferred completion.
- New `src/utils/autonomyQueueLifecycle.ts` and tests collect the queue-side lifecycle invariants in one place.
## Memory bounds (related, same review pass)
- `src/screens/REPL.tsx`: caps fullscreen scrollback after the compact boundary and updates trailing progress rows in place. Long-running fullscreen sessions could otherwise retain thousands of post-compaction messages and duplicate progress rows, keeping Ink trees alive long after their useful context had moved on.
- `src/services/skillSearch/*` and `src/services/skillLearning/*`: runtime activation is strictly opt-in via existing env toggles; session caches are capped so long-running processes can not grow them forever. Build presence is preserved so operators can still discover and opt into the slash commands.
## CI / test contract
- `tests/integration/dependency-overrides.test.ts`: smoke test no longer drives Mermaid's browser renderer; it validates the package-resolution contract directly so CI does not regress on unrelated browser timing.
- New `tests/integration/autonomy-lifecycle-user-flow.test.ts`: end-to-end CLI subprocess flow exercising `status --deep`, `flows`, `flow <id>`, `flow resume`, `flow cancel` against persisted state.
- `src/entrypoints/cli.tsx`: `claude autonomy …` routes through an entrypoint fast path that reuses the slash-command formatter without booting the full interactive CLI. Stdout is flushed before forced exit so coverage subprocesses do not terminate with empty stdout.
- `packages/builtin-tools/src/tools/RemoteTriggerTool/__tests__/RemoteTriggerTool.test.ts`: stabilized to prevent audit flake under coverage.
## Tests added
- `src/__tests__/queryAutonomyProviderBoundary.test.ts`
- `src/hooks/__tests__/useScheduledTasks.test.ts`
- `src/utils/__tests__/autonomyAuthority.test.ts`
- `src/utils/__tests__/autonomyFlows.test.ts` (extended)
- `src/utils/__tests__/autonomyPersistence.test.ts` (extended)
- `src/utils/__tests__/autonomyQueueLifecycle.test.ts`
- `src/utils/__tests__/autonomyRuns.test.ts` (extended)
- `src/utils/processUserInput/__tests__/processSlashCommand.test.ts`
- `tests/integration/autonomy-lifecycle-user-flow.test.ts`
## Docs
- `docs/agent/sur-loop-scheduled-oom.md`: System Understanding Report covering the scheduled/loop OOM problem, the call graphs investigated, and the lifecycle invariants this PR establishes.
- `docs/agent/sur-skill-overflow-bugs.md`: SUR for the related skill-overflow context.
- `docs/internals/autonomy-jira.md`: documents the two-phase commit window and ownership stamping invariants.
- `docs/memory-leak-audit.md`: audit notes covering the REPL/scrollback and skill-search bounds.
## Invariants this PR establishes
1. Queued autonomy prompts are not injected unless the persisted run was successfully claimed.
2. Terminal run/flow states are terminal — completion, failure, and cancellation all finalize state regardless of which provider/error path triggered them.
3. Autonomy run/flow `rootDir` is carried explicitly across detached async boundaries instead of inferred from a shared singleton.
4. State-only CLI subcommands (`autonomy status|runs|flows|flow …`) bypass full interactive bootstrap so they do not hold unrelated handles open.
5. REPL fullscreen scrollback and skill-search/skill-learning session caches are explicitly bounded.
## Validation
```bash
bun run typecheck
CI=true GITHUB_ACTIONS=true bun test # 3996 pass / 0 fail across 305 files
bun test src/__tests__/queryAutonomyProviderBoundary.test.ts \
src/hooks/__tests__/useScheduledTasks.test.ts \
src/utils/__tests__/autonomy{Runs,Flows,Authority,QueueLifecycle,Persistence}.test.ts \
src/utils/processUserInput/__tests__/processSlashCommand.test.ts \
tests/integration/autonomy-lifecycle-user-flow.test.ts
```
## Origin
This PR is the consolidated, upstream-targeted version of two fork-side review PRs (fix/loop-scheduled-autonomy-oom and fix/autonomy-lifecycle). The fork-side review history is preserved at https://github.com/amDosion/claude-code-bast/pull/7 . The fork's own internal `chore: keep fork current with upstream` sync commits and the `docs: update contributors` automation are intentionally not included in this PR.
The autonomy CLI handler `rootDir` threading that the fork added (78f64d8a, 98d04ddb) is intentionally omitted here because upstream `a2cfaf91` (fix: 修复 RemoteTriggerTool 和 autonomy 测试的全量运行失败) already performed the equivalent change with an additional `currentDir` option. Keeping the upstream version avoids regressing that improvement.
This commit is contained in:
@@ -126,6 +126,14 @@ describe('listAutonomyFlows', () => {
|
||||
runCount: 0,
|
||||
ownerKey: DEFAULT_AUTONOMY_OWNER_KEY,
|
||||
currentDir: tempDir,
|
||||
boundary: [
|
||||
' src/utils/** ',
|
||||
'/absolute/not-allowed',
|
||||
'src\\windows',
|
||||
'../outside',
|
||||
'src/utils/**',
|
||||
'docs/*.md',
|
||||
],
|
||||
stateJson: {
|
||||
currentStepIndex: 0,
|
||||
steps: [
|
||||
@@ -147,6 +155,7 @@ describe('listAutonomyFlows', () => {
|
||||
expect(flows).toHaveLength(1)
|
||||
expect(flows[0]?.flowId).toBe('flow-1')
|
||||
expect(flows[0]?.syncMode).toBe('managed')
|
||||
expect(flows[0]?.boundary).toEqual(['src/utils/**', 'docs/*.md'])
|
||||
expect(flows[0]?.stateJson?.steps).toHaveLength(1)
|
||||
})
|
||||
|
||||
@@ -191,6 +200,64 @@ describe('listAutonomyFlows', () => {
|
||||
const flows = await listAutonomyFlows(tempDir)
|
||||
expect(flows).toEqual([])
|
||||
})
|
||||
|
||||
test('persistence pruning keeps active flows ahead of recent terminal history', async () => {
|
||||
const flows: AutonomyFlowRecord[] = [
|
||||
{
|
||||
flowId: 'old-active',
|
||||
flowKey: 'managed:scheduled-task:old-active',
|
||||
syncMode: 'managed',
|
||||
ownerKey: DEFAULT_AUTONOMY_OWNER_KEY,
|
||||
revision: 1,
|
||||
trigger: 'scheduled-task',
|
||||
status: 'queued',
|
||||
goal: 'old active',
|
||||
rootDir: tempDir,
|
||||
currentDir: tempDir,
|
||||
runCount: 0,
|
||||
createdAt: 1,
|
||||
updatedAt: 1,
|
||||
},
|
||||
...Array.from({ length: 100 }, (_, index) => ({
|
||||
flowId: `history-${index}`,
|
||||
flowKey: `managed:scheduled-task:history-${index}`,
|
||||
syncMode: 'managed' as const,
|
||||
ownerKey: DEFAULT_AUTONOMY_OWNER_KEY,
|
||||
revision: 1,
|
||||
trigger: 'scheduled-task' as const,
|
||||
status: 'succeeded' as const,
|
||||
goal: `history ${index}`,
|
||||
rootDir: tempDir,
|
||||
currentDir: tempDir,
|
||||
runCount: 1,
|
||||
createdAt: 1_000 + index,
|
||||
updatedAt: 1_000 + index,
|
||||
endedAt: 2_000 + index,
|
||||
})),
|
||||
]
|
||||
const flowsPath = resolveAutonomyFlowsPath(tempDir)
|
||||
await mkdir(join(tempDir, AUTONOMY_DIR), { recursive: true })
|
||||
await writeFile(
|
||||
flowsPath,
|
||||
`${JSON.stringify({ flows }, null, 2)}\n`,
|
||||
'utf-8',
|
||||
)
|
||||
|
||||
await startManagedAutonomyFlow({
|
||||
trigger: 'scheduled-task',
|
||||
goal: 'fresh active',
|
||||
steps: TWO_STEPS,
|
||||
rootDir: tempDir,
|
||||
currentDir: tempDir,
|
||||
sourceId: 'fresh-active',
|
||||
nowMs: 9_999,
|
||||
})
|
||||
|
||||
const persisted = await listAutonomyFlows(tempDir)
|
||||
expect(persisted).toHaveLength(100)
|
||||
expect(persisted.some(flow => flow.flowId === 'old-active')).toBe(true)
|
||||
expect(persisted.some(flow => flow.flowId === 'history-0')).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('startManagedAutonomyFlow', () => {
|
||||
@@ -225,6 +292,49 @@ describe('startManagedAutonomyFlow', () => {
|
||||
expect(result!.nextStep!.step.name).toBe('gather')
|
||||
})
|
||||
|
||||
test('normalizes and preserves boundary across completed flow restarts', async () => {
|
||||
const first = await startManagedAutonomyFlow({
|
||||
trigger: 'scheduled-task',
|
||||
goal: 'Scoped flow',
|
||||
steps: [{ name: 'only', prompt: 'Do it' }],
|
||||
rootDir: tempDir,
|
||||
sourceId: 'scoped-src',
|
||||
boundary: [' src/utils/** ', 'src\\bad', '/absolute', 'docs/*.md'],
|
||||
nowMs: 1000,
|
||||
})
|
||||
const flowId = first!.flow.flowId
|
||||
|
||||
expect(first!.flow.boundary).toEqual(['src/utils/**', 'docs/*.md'])
|
||||
|
||||
await queueManagedAutonomyFlowStepRun({
|
||||
flowId,
|
||||
stepId: first!.nextStep!.step.stepId,
|
||||
stepIndex: 0,
|
||||
runId: 'run-1',
|
||||
rootDir: tempDir,
|
||||
nowMs: 2000,
|
||||
})
|
||||
await markManagedAutonomyFlowStepCompleted({
|
||||
flowId,
|
||||
runId: 'run-1',
|
||||
rootDir: tempDir,
|
||||
nowMs: 3000,
|
||||
})
|
||||
|
||||
const restarted = await startManagedAutonomyFlow({
|
||||
trigger: 'scheduled-task',
|
||||
goal: 'Scoped flow',
|
||||
steps: [{ name: 'only', prompt: 'Do it again' }],
|
||||
rootDir: tempDir,
|
||||
sourceId: 'scoped-src',
|
||||
nowMs: 4000,
|
||||
})
|
||||
|
||||
expect(restarted!.started).toBe(true)
|
||||
expect(restarted!.flow.flowId).toBe(flowId)
|
||||
expect(restarted!.flow.boundary).toEqual(['src/utils/**', 'docs/*.md'])
|
||||
})
|
||||
|
||||
test('sets status=waiting when first step has waitFor', async () => {
|
||||
const result = await startManagedAutonomyFlow({
|
||||
trigger: 'scheduled-task',
|
||||
|
||||
Reference in New Issue
Block a user