mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-10-10 03:30:59 +00:00
Fabro
parent
ce0fc41bcb
commit
9c881fca29
5 changed files with 135 additions and 7 deletions
|
|
@ -1,13 +1,15 @@
|
|||
{
|
||||
"timestamp": "2026-03-20T01:02:40.871840Z",
|
||||
"current_node": "preflight_lint",
|
||||
"timestamp": "2026-03-20T01:09:20.986280Z",
|
||||
"current_node": "implement",
|
||||
"completed_nodes": [
|
||||
"start",
|
||||
"toolchain",
|
||||
"preflight_compile",
|
||||
"preflight_lint"
|
||||
"preflight_lint",
|
||||
"implement"
|
||||
],
|
||||
"node_retries": {
|
||||
"implement": 1,
|
||||
"preflight_lint": 1,
|
||||
"start": 1,
|
||||
"preflight_compile": 1,
|
||||
|
|
@ -15,24 +17,29 @@
|
|||
},
|
||||
"context_values": {
|
||||
"internal.retry_count.preflight_compile": 1,
|
||||
"internal.thread_id": "preflight_compile",
|
||||
"thread.preflight_lint.current_node": "implement",
|
||||
"internal.thread_id": "preflight_lint",
|
||||
"internal.node_visit_count": 1,
|
||||
"outcome": "success",
|
||||
"failure_signature": "",
|
||||
"command.output": "",
|
||||
"last_stage": "implement",
|
||||
"internal.retry_count.start": 1,
|
||||
"internal.retry_count.implement": 1,
|
||||
"last_response": "Both changes look correct:\n\n1. **Inside `execute_with_retry`** (line 1080): `StageStarted` is now emitted at the top of the `for attempt in 1..=policy.max_attempts` loop, using the loop variable `atte",
|
||||
"internal.run_id": "01KM4C5NR7A6KVFNK6DDE3FP4R",
|
||||
"thread.preflight_compile.current_node": "preflight_lint",
|
||||
"failure_class": "",
|
||||
"graph.model_stylesheet": "\n * { backend: api; model: claude-opus-4-6;}\n ",
|
||||
"thread.toolchain.current_node": "preflight_compile",
|
||||
"current.preamble": "Goal: # Emit `StageStarted` on retry attempts\n\n## Context\n\nWhen a stage fails with a transient error and is retried, the CLI progress UI freezes because:\n\n1. `StageFailed` calls `finish_stage()`, removing the stage from `active_stages`\n2. The retry loop in the engine (`continue` at line 1198) re-enters handler execution **without emitting `StageStarted`**\n3. All subsequent agent events for the retry attempt silently drop (no matching entry in `active_stages`)\n\nThe `StageStarted` event already has `attempt` and `max_attempts` fields, so emitting it per-attempt is the intended design — it just wasn't wired up.\n\n## Changes\n\n### 1. Engine: emit `StageStarted` at the top of the retry loop\n\n**File:** `lib/crates/fabro-workflows/src/engine.rs`\n\nMove the `StageStarted` emission from before the loop (line 1852) to inside the loop, right after `for attempt in 1..=policy.max_attempts {` (line 1079). This way every attempt — including retries — emits the event with the correct `attempt` number.\n\nThe existing emission at line 1852 gets replaced, not duplicated. The `attempt` value comes directly from the loop variable (converted via `usize::try_from`).\n\n### 2. Engine: move StageStart hook inside the loop (or keep it outside)\n\nThe `StageStart` hook block (lines 1862-1895) currently runs once before the loop. It should stay outside — hooks shouldn't re-fire on retries. Only the `StageStarted` event emission moves inside.\n\n### 3. UI: no changes needed\n\n`on_stage_started` in `run_progress.rs` already handles being called for the same `node_id` — it inserts a fresh `ActiveStage` into the map, creating a new spinner. The `StageFailed` handler correctly finishes the old spinner. The natural event sequence becomes:\n\n```\nStageStarted (attempt 1) → spinner created\nStageFailed (will_retry) → spinner finished with ✗\nStageStarted (attempt 2) → new spinner created\nAgent events → attach to new spinner\nStageCompleted (attempt 2) → spinner finished with ✓\n```\n\n## Verification\n\n1. `cargo test -p fabro-workflows` — existing tests pass\n2. `cargo clippy --workspace -- -D warnings` — no warnings\n3. Manual: run a workflow that hits a transient LLM error (or mock one) and verify the CLI shows the retry spinner with tool calls\n\n\n## Completed stages\n- **toolchain**: success\n - Script: `command -v cargo >/dev/null || { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && sudo ln -sf $HOME/.cargo/bin/* /usr/local/bin/; }; cargo --version 2>&1`\n - Stdout:\n ```\n cargo 1.94.0 (85eff7c80 2026-01-15)\n ```\n - Stderr: (empty)\n- **preflight_compile**: success\n - Script: `cargo check -q --workspace 2>&1`\n - Stdout: (empty)\n - Stderr: (empty)\n",
|
||||
"current.preamble": "Goal: # Emit `StageStarted` on retry attempts\n\n## Context\n\nWhen a stage fails with a transient error and is retried, the CLI progress UI freezes because:\n\n1. `StageFailed` calls `finish_stage()`, removing the stage from `active_stages`\n2. The retry loop in the engine (`continue` at line 1198) re-enters handler execution **without emitting `StageStarted`**\n3. All subsequent agent events for the retry attempt silently drop (no matching entry in `active_stages`)\n\nThe `StageStarted` event already has `attempt` and `max_attempts` fields, so emitting it per-attempt is the intended design — it just wasn't wired up.\n\n## Changes\n\n### 1. Engine: emit `StageStarted` at the top of the retry loop\n\n**File:** `lib/crates/fabro-workflows/src/engine.rs`\n\nMove the `StageStarted` emission from before the loop (line 1852) to inside the loop, right after `for attempt in 1..=policy.max_attempts {` (line 1079). This way every attempt — including retries — emits the event with the correct `attempt` number.\n\nThe existing emission at line 1852 gets replaced, not duplicated. The `attempt` value comes directly from the loop variable (converted via `usize::try_from`).\n\n### 2. Engine: move StageStart hook inside the loop (or keep it outside)\n\nThe `StageStart` hook block (lines 1862-1895) currently runs once before the loop. It should stay outside — hooks shouldn't re-fire on retries. Only the `StageStarted` event emission moves inside.\n\n### 3. UI: no changes needed\n\n`on_stage_started` in `run_progress.rs` already handles being called for the same `node_id` — it inserts a fresh `ActiveStage` into the map, creating a new spinner. The `StageFailed` handler correctly finishes the old spinner. The natural event sequence becomes:\n\n```\nStageStarted (attempt 1) → spinner created\nStageFailed (will_retry) → spinner finished with ✗\nStageStarted (attempt 2) → new spinner created\nAgent events → attach to new spinner\nStageCompleted (attempt 2) → spinner finished with ✓\n```\n\n## Verification\n\n1. `cargo test -p fabro-workflows` — existing tests pass\n2. `cargo clippy --workspace -- -D warnings` — no warnings\n3. Manual: run a workflow that hits a transient LLM error (or mock one) and verify the CLI shows the retry spinner with tool calls\n\n\n## Completed stages\n- **toolchain**: success\n - Script: `command -v cargo >/dev/null || { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && sudo ln -sf $HOME/.cargo/bin/* /usr/local/bin/; }; cargo --version 2>&1`\n - Stdout:\n ```\n cargo 1.94.0 (85eff7c80 2026-01-15)\n ```\n - Stderr: (empty)\n- **preflight_compile**: success\n - Script: `cargo check -q --workspace 2>&1`\n - Stdout: (empty)\n - Stderr: (empty)\n- **preflight_lint**: success\n - Script: `cargo clippy -q --workspace -- -D warnings 2>&1`\n - Stdout: (empty)\n - Stderr: (empty)\n",
|
||||
"graph.goal": "# Emit `StageStarted` on retry attempts\n\n## Context\n\nWhen a stage fails with a transient error and is retried, the CLI progress UI freezes because:\n\n1. `StageFailed` calls `finish_stage()`, removing the stage from `active_stages`\n2. The retry loop in the engine (`continue` at line 1198) re-enters handler execution **without emitting `StageStarted`**\n3. All subsequent agent events for the retry attempt silently drop (no matching entry in `active_stages`)\n\nThe `StageStarted` event already has `attempt` and `max_attempts` fields, so emitting it per-attempt is the intended design — it just wasn't wired up.\n\n## Changes\n\n### 1. Engine: emit `StageStarted` at the top of the retry loop\n\n**File:** `lib/crates/fabro-workflows/src/engine.rs`\n\nMove the `StageStarted` emission from before the loop (line 1852) to inside the loop, right after `for attempt in 1..=policy.max_attempts {` (line 1079). This way every attempt — including retries — emits the event with the correct `attempt` number.\n\nThe existing emission at line 1852 gets replaced, not duplicated. The `attempt` value comes directly from the loop variable (converted via `usize::try_from`).\n\n### 2. Engine: move StageStart hook inside the loop (or keep it outside)\n\nThe `StageStart` hook block (lines 1862-1895) currently runs once before the loop. It should stay outside — hooks shouldn't re-fire on retries. Only the `StageStarted` event emission moves inside.\n\n### 3. UI: no changes needed\n\n`on_stage_started` in `run_progress.rs` already handles being called for the same `node_id` — it inserts a fresh `ActiveStage` into the map, creating a new spinner. The `StageFailed` handler correctly finishes the old spinner. The natural event sequence becomes:\n\n```\nStageStarted (attempt 1) → spinner created\nStageFailed (will_retry) → spinner finished with ✗\nStageStarted (attempt 2) → new spinner created\nAgent events → attach to new spinner\nStageCompleted (attempt 2) → spinner finished with ✓\n```\n\n## Verification\n\n1. `cargo test -p fabro-workflows` — existing tests pass\n2. `cargo clippy --workspace -- -D warnings` — no warnings\n3. Manual: run a workflow that hits a transient LLM error (or mock one) and verify the CLI shows the retry spinner with tool calls\n",
|
||||
"internal.retry_count.toolchain": 1,
|
||||
"command.stderr": "",
|
||||
"response.implement": "Both changes look correct:\n\n1. **Inside `execute_with_retry`** (line 1080): `StageStarted` is now emitted at the top of the `for attempt in 1..=policy.max_attempts` loop, using the loop variable `attempt` for the correct attempt number.\n\n2. **In `run_inner`** (line 1862): The old `StageStarted` emission that was before the loop has been removed. The `StageStart` hook remains outside the loop as specified.\n\nLet me do a final summary of the changes:\n\n## Summary\n\n**Problem:** When a stage fails with a transient error and is retried, the CLI progress UI freezes because `StageFailed` removes the stage from `active_stages`, but no `StageStarted` event is emitted for the retry attempt, so subsequent agent events silently drop.\n\n**Fix:** Two edits in `lib/crates/fabro-workflows/src/engine.rs`:\n\n1. **Added `StageStarted` emission inside the retry loop** (in `execute_with_retry`): Moved the event emission to the top of the `for attempt in 1..=policy.max_attempts` loop so every attempt — including retries — emits `StageStarted` with the correct `attempt` number.\n\n2. **Removed the old `StageStarted` emission before the loop** (in `run_inner`): The pre-loop emission with hardcoded `attempt: 1` was removed since it's now handled inside the retry loop. The `StageStart` hook remains outside the loop (hooks shouldn't re-fire on retries).\n\n**New test:** `retry_emits_stage_started_per_attempt` — Creates a handler (`FailOnceThenSucceedHandler`) that returns a retryable error on the first call and succeeds on the second, then verifies that `StageStarted` is emitted twice with `attempt: 1` and `attempt: 2`.\n\n**Verification:**\n- ✅ `cargo test -p fabro-workflows --lib` — all 867 tests pass\n- ✅ `cargo clippy --workspace -- -D warnings` — no warnings",
|
||||
"thread.start.current_node": "toolchain",
|
||||
"internal.retry_count.preflight_lint": 1,
|
||||
"current_node": "preflight_lint",
|
||||
"current_node": "implement",
|
||||
"graph.rankdir": "LR",
|
||||
"internal.fidelity": "compact"
|
||||
},
|
||||
|
|
@ -60,6 +67,28 @@
|
|||
"status": "success",
|
||||
"duration_ms": 0
|
||||
},
|
||||
"implement": {
|
||||
"status": "success",
|
||||
"context_updates": {
|
||||
"last_stage": "implement",
|
||||
"last_response": "Both changes look correct:\n\n1. **Inside `execute_with_retry`** (line 1080): `StageStarted` is now emitted at the top of the `for attempt in 1..=policy.max_attempts` loop, using the loop variable `atte",
|
||||
"response.implement": "Both changes look correct:\n\n1. **Inside `execute_with_retry`** (line 1080): `StageStarted` is now emitted at the top of the `for attempt in 1..=policy.max_attempts` loop, using the loop variable `attempt` for the correct attempt number.\n\n2. **In `run_inner`** (line 1862): The old `StageStarted` emission that was before the loop has been removed. The `StageStart` hook remains outside the loop as specified.\n\nLet me do a final summary of the changes:\n\n## Summary\n\n**Problem:** When a stage fails with a transient error and is retried, the CLI progress UI freezes because `StageFailed` removes the stage from `active_stages`, but no `StageStarted` event is emitted for the retry attempt, so subsequent agent events silently drop.\n\n**Fix:** Two edits in `lib/crates/fabro-workflows/src/engine.rs`:\n\n1. **Added `StageStarted` emission inside the retry loop** (in `execute_with_retry`): Moved the event emission to the top of the `for attempt in 1..=policy.max_attempts` loop so every attempt — including retries — emits `StageStarted` with the correct `attempt` number.\n\n2. **Removed the old `StageStarted` emission before the loop** (in `run_inner`): The pre-loop emission with hardcoded `attempt: 1` was removed since it's now handled inside the retry loop. The `StageStart` hook remains outside the loop (hooks shouldn't re-fire on retries).\n\n**New test:** `retry_emits_stage_started_per_attempt` — Creates a handler (`FailOnceThenSucceedHandler`) that returns a retryable error on the first call and succeeds on the second, then verifies that `StageStarted` is emitted twice with `attempt: 1` and `attempt: 2`.\n\n**Verification:**\n- ✅ `cargo test -p fabro-workflows --lib` — all 867 tests pass\n- ✅ `cargo clippy --workspace -- -D warnings` — no warnings"
|
||||
},
|
||||
"notes": "Stage completed: implement",
|
||||
"usage": {
|
||||
"model": "claude-opus-4-6",
|
||||
"input_tokens": 42190,
|
||||
"output_tokens": 12138,
|
||||
"cache_read_tokens": 2004760,
|
||||
"cache_write_tokens": 49528,
|
||||
"reasoning_tokens": 205,
|
||||
"cost": 1.5432000000000001
|
||||
},
|
||||
"files_touched": [
|
||||
"/home/daytona/workspace/lib/crates/fabro-workflows/src/engine.rs"
|
||||
],
|
||||
"duration_ms": 398042
|
||||
},
|
||||
"toolchain": {
|
||||
"status": "success",
|
||||
"context_updates": {
|
||||
|
|
@ -70,9 +99,10 @@
|
|||
"duration_ms": 147
|
||||
}
|
||||
},
|
||||
"next_node_id": "implement",
|
||||
"next_node_id": "simplify_opus",
|
||||
"node_visits": {
|
||||
"preflight_lint": 1,
|
||||
"implement": 1,
|
||||
"toolchain": 1,
|
||||
"start": 1,
|
||||
"preflight_compile": 1
|
||||
|
|
|
|||
64
nodes/implement/prompt.md
Normal file
64
nodes/implement/prompt.md
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
Goal: # Emit `StageStarted` on retry attempts
|
||||
|
||||
## Context
|
||||
|
||||
When a stage fails with a transient error and is retried, the CLI progress UI freezes because:
|
||||
|
||||
1. `StageFailed` calls `finish_stage()`, removing the stage from `active_stages`
|
||||
2. The retry loop in the engine (`continue` at line 1198) re-enters handler execution **without emitting `StageStarted`**
|
||||
3. All subsequent agent events for the retry attempt silently drop (no matching entry in `active_stages`)
|
||||
|
||||
The `StageStarted` event already has `attempt` and `max_attempts` fields, so emitting it per-attempt is the intended design — it just wasn't wired up.
|
||||
|
||||
## Changes
|
||||
|
||||
### 1. Engine: emit `StageStarted` at the top of the retry loop
|
||||
|
||||
**File:** `lib/crates/fabro-workflows/src/engine.rs`
|
||||
|
||||
Move the `StageStarted` emission from before the loop (line 1852) to inside the loop, right after `for attempt in 1..=policy.max_attempts {` (line 1079). This way every attempt — including retries — emits the event with the correct `attempt` number.
|
||||
|
||||
The existing emission at line 1852 gets replaced, not duplicated. The `attempt` value comes directly from the loop variable (converted via `usize::try_from`).
|
||||
|
||||
### 2. Engine: move StageStart hook inside the loop (or keep it outside)
|
||||
|
||||
The `StageStart` hook block (lines 1862-1895) currently runs once before the loop. It should stay outside — hooks shouldn't re-fire on retries. Only the `StageStarted` event emission moves inside.
|
||||
|
||||
### 3. UI: no changes needed
|
||||
|
||||
`on_stage_started` in `run_progress.rs` already handles being called for the same `node_id` — it inserts a fresh `ActiveStage` into the map, creating a new spinner. The `StageFailed` handler correctly finishes the old spinner. The natural event sequence becomes:
|
||||
|
||||
```
|
||||
StageStarted (attempt 1) → spinner created
|
||||
StageFailed (will_retry) → spinner finished with ✗
|
||||
StageStarted (attempt 2) → new spinner created
|
||||
Agent events → attach to new spinner
|
||||
StageCompleted (attempt 2) → spinner finished with ✓
|
||||
```
|
||||
|
||||
## Verification
|
||||
|
||||
1. `cargo test -p fabro-workflows` — existing tests pass
|
||||
2. `cargo clippy --workspace -- -D warnings` — no warnings
|
||||
3. Manual: run a workflow that hits a transient LLM error (or mock one) and verify the CLI shows the retry spinner with tool calls
|
||||
|
||||
|
||||
## Completed stages
|
||||
- **toolchain**: success
|
||||
- Script: `command -v cargo >/dev/null || { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && sudo ln -sf $HOME/.cargo/bin/* /usr/local/bin/; }; cargo --version 2>&1`
|
||||
- Stdout:
|
||||
```
|
||||
cargo 1.94.0 (85eff7c80 2026-01-15)
|
||||
```
|
||||
- Stderr: (empty)
|
||||
- **preflight_compile**: success
|
||||
- Script: `cargo check -q --workspace 2>&1`
|
||||
- Stdout: (empty)
|
||||
- Stderr: (empty)
|
||||
- **preflight_lint**: success
|
||||
- Script: `cargo clippy -q --workspace -- -D warnings 2>&1`
|
||||
- Stdout: (empty)
|
||||
- Stderr: (empty)
|
||||
|
||||
|
||||
Read the plan file referenced in the goal and implement every step. Make all the code changes described in the plan. Use red/green TDD.
|
||||
5
nodes/implement/provider_used.json
Normal file
5
nodes/implement/provider_used.json
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"mode": "agent",
|
||||
"provider": "anthropic",
|
||||
"model": "claude-opus-4-6"
|
||||
}
|
||||
23
nodes/implement/response.md
Normal file
23
nodes/implement/response.md
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
Both changes look correct:
|
||||
|
||||
1. **Inside `execute_with_retry`** (line 1080): `StageStarted` is now emitted at the top of the `for attempt in 1..=policy.max_attempts` loop, using the loop variable `attempt` for the correct attempt number.
|
||||
|
||||
2. **In `run_inner`** (line 1862): The old `StageStarted` emission that was before the loop has been removed. The `StageStart` hook remains outside the loop as specified.
|
||||
|
||||
Let me do a final summary of the changes:
|
||||
|
||||
## Summary
|
||||
|
||||
**Problem:** When a stage fails with a transient error and is retried, the CLI progress UI freezes because `StageFailed` removes the stage from `active_stages`, but no `StageStarted` event is emitted for the retry attempt, so subsequent agent events silently drop.
|
||||
|
||||
**Fix:** Two edits in `lib/crates/fabro-workflows/src/engine.rs`:
|
||||
|
||||
1. **Added `StageStarted` emission inside the retry loop** (in `execute_with_retry`): Moved the event emission to the top of the `for attempt in 1..=policy.max_attempts` loop so every attempt — including retries — emits `StageStarted` with the correct `attempt` number.
|
||||
|
||||
2. **Removed the old `StageStarted` emission before the loop** (in `run_inner`): The pre-loop emission with hardcoded `attempt: 1` was removed since it's now handled inside the retry loop. The `StageStart` hook remains outside the loop (hooks shouldn't re-fire on retries).
|
||||
|
||||
**New test:** `retry_emits_stage_started_per_attempt` — Creates a handler (`FailOnceThenSucceedHandler`) that returns a retryable error on the first call and succeeds on the second, then verifies that `StageStarted` is emitted twice with `attempt: 1` and `attempt: 2`.
|
||||
|
||||
**Verification:**
|
||||
- ✅ `cargo test -p fabro-workflows --lib` — all 867 tests pass
|
||||
- ✅ `cargo clippy --workspace -- -D warnings` — no warnings
|
||||
6
nodes/implement/status.json
Normal file
6
nodes/implement/status.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"status": "success",
|
||||
"notes": "Stage completed: implement",
|
||||
"failure_reason": null,
|
||||
"timestamp": "2026-03-20T01:09:20.986154+00:00"
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue