scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-10-10 03:30:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

checkpoint

Browse source 
⚒️ Generated with [Fabro](https://fabro.sh)
This commit is contained in:
Fabro 2026-03-16 01:01:09 -04:00
parent 8ec5ff52a7
commit 22d405fe94
6 changed files with 569 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
checkpoint.json
View file

File diff suppressed because one or more lines are too long

250
nodes/simplify_gemini/diff.patch Normal file
View file

@ -0,0 +1,250 @@
diff --git a/lib/crates/fabro-workflows/src/cli/run.rs b/lib/crates/fabro-workflows/src/cli/run.rs
index 4df34b9..806d1ae 100644
--- a/lib/crates/fabro-workflows/src/cli/run.rs
+++ b/lib/crates/fabro-workflows/src/cli/run.rs
@@ -803,20 +803,12 @@ pub async fn run_command(
// Register SandboxInitialized listener (must happen before emitter is wrapped in Arc)
{
- let sandbox_provider_name = match sandbox_provider {
- SandboxProvider::Local => "local",
- SandboxProvider::Docker => "docker",
- SandboxProvider::Daytona => "daytona",
- #[cfg(feature = "exedev")]
- SandboxProvider::Exe => "exe",
- SandboxProvider::Ssh => "ssh",
- };
let run_dir_for_listener = run_dir.clone();
let progress_for_listener = Arc::clone(&progress_ui);
let cwd_for_listener = cwd.to_string_lossy().to_string();
let ssh_data_host = ssh_config.as_ref().map(|c| c.destination.clone());
let deferred_sb = Arc::clone(&deferred_sandbox);
- let provider_name = sandbox_provider_name.to_string();
+ let provider = sandbox_provider; // Copy — captured by move closure
emitter.on_event(move |event| {
if let crate::event::WorkflowRunEvent::SandboxInitialized { working_directory } = event
{
@@ -835,21 +827,22 @@ pub async fn run_command(
}
});
+ let is_docker = provider == SandboxProvider::Docker;
let record = crate::sandbox_record::SandboxRecord {
- provider: provider_name.clone(),
+ provider: provider.to_string(),
working_directory: working_directory.clone(),
identifier: sandbox_info_opt,
- host_working_directory: if provider_name == "docker" {
+ host_working_directory: if is_docker {
Some(cwd_for_listener.clone())
} else {
None
},
- container_mount_point: if provider_name == "docker" {
+ container_mount_point: if is_docker {
Some(working_directory.clone())
} else {
None
},
- data_host: if provider_name == "ssh" {
+ data_host: if provider == SandboxProvider::Ssh {
ssh_data_host.clone()
} else {
None
diff --git a/lib/crates/fabro-workflows/src/engine.rs b/lib/crates/fabro-workflows/src/engine.rs
index 3dcefa2..f01f447 100644
--- a/lib/crates/fabro-workflows/src/engine.rs
+++ b/lib/crates/fabro-workflows/src/engine.rs
@@ -5671,24 +5671,12 @@ mod tests {
);
}
- #[tokio::test]
- async fn run_with_lifecycle_fires_sandbox_initialized_event() {
- let dir = tempfile::tempdir().unwrap();
- let g = simple_graph();
-
- let events = Arc::new(std::sync::Mutex::new(Vec::<WorkflowRunEvent>::new()));
- let events_clone = events.clone();
- let mut emitter = EventEmitter::new();
- emitter.on_event(move |event| {
- events_clone.lock().unwrap().push(event.clone());
- });
-
- let engine = WorkflowRunEngine::new(make_registry(), Arc::new(emitter), local_env());
- let config = RunConfig {
- run_dir: dir.path().to_path_buf(),
+ fn test_run_config(run_dir: &std::path::Path, run_id: &str) -> RunConfig {
+ RunConfig {
+ run_dir: run_dir.to_path_buf(),
cancel_token: None,
dry_run: false,
- run_id: "lifecycle-test".into(),
+ run_id: run_id.into(),
git_checkpoint_enabled: false,
host_repo_path: None,
base_sha: None,
@@ -5703,14 +5691,37 @@ mod tests {
pull_request_draft: false,
asset_globs: Vec::new(),
workflow_slug: None,
- };
- let lifecycle = LifecycleConfig {
- setup_commands: Vec::new(),
+ }
+ }
+
+ fn test_lifecycle(setup_commands: Vec<String>) -> LifecycleConfig {
+ LifecycleConfig {
+ setup_commands,
setup_command_timeout_ms: 300_000,
devcontainer_phases: Vec::new(),
- };
+ }
+ }
+
+ #[tokio::test]
+ async fn run_with_lifecycle_fires_sandbox_initialized_event() {
+ let dir = tempfile::tempdir().unwrap();
+ let g = simple_graph();
+
+ let events = Arc::new(std::sync::Mutex::new(Vec::<WorkflowRunEvent>::new()));
+ let events_clone = events.clone();
+ let mut emitter = EventEmitter::new();
+ emitter.on_event(move |event| {
+ events_clone.lock().unwrap().push(event.clone());
+ });
+
+ let engine = WorkflowRunEngine::new(make_registry(), Arc::new(emitter), local_env());
let (outcome, _) = engine
- .run_with_lifecycle(&g, config, lifecycle, None)
+ .run_with_lifecycle(
+ &g,
+ test_run_config(dir.path(), "lifecycle-test"),
+ test_lifecycle(Vec::new()),
+ None,
+ )
.await
.unwrap();
assert_eq!(outcome.status, StageStatus::Success);
@@ -5739,33 +5750,13 @@ mod tests {
});
let engine = WorkflowRunEngine::new(make_registry(), Arc::new(emitter), local_env());
- let config = RunConfig {
- run_dir: dir.path().to_path_buf(),
- cancel_token: None,
- dry_run: false,
- run_id: "setup-test".into(),
- git_checkpoint_enabled: false,
- host_repo_path: None,
- base_sha: None,
- run_branch: None,
- meta_branch: None,
- labels: HashMap::new(),
- checkpoint_exclude_globs: Vec::new(),
- github_app: None,
- git_author: crate::git::GitAuthor::default(),
- base_branch: None,
- pull_request_enabled: false,
- pull_request_draft: false,
- asset_globs: Vec::new(),
- workflow_slug: None,
- };
- let lifecycle = LifecycleConfig {
- setup_commands: vec!["echo hello".to_string()],
- setup_command_timeout_ms: 300_000,
- devcontainer_phases: Vec::new(),
- };
let (outcome, _) = engine
- .run_with_lifecycle(&g, config, lifecycle, None)
+ .run_with_lifecycle(
+ &g,
+ test_run_config(dir.path(), "setup-test"),
+ test_lifecycle(vec!["echo hello".to_string()]),
+ None,
+ )
.await
.unwrap();
assert_eq!(outcome.status, StageStatus::Success);
@@ -5788,32 +5779,14 @@ mod tests {
let engine =
WorkflowRunEngine::new(make_registry(), Arc::new(EventEmitter::new()), local_env());
- let config = RunConfig {
- run_dir: dir.path().to_path_buf(),
- cancel_token: None,
- dry_run: false,
- run_id: "setup-fail-test".into(),
- git_checkpoint_enabled: false,
- host_repo_path: None,
- base_sha: None,
- run_branch: None,
- meta_branch: None,
- labels: HashMap::new(),
- checkpoint_exclude_globs: Vec::new(),
- github_app: None,
- git_author: crate::git::GitAuthor::default(),
- base_branch: None,
- pull_request_enabled: false,
- pull_request_draft: false,
- asset_globs: Vec::new(),
- workflow_slug: None,
- };
- let lifecycle = LifecycleConfig {
- setup_commands: vec!["exit 1".to_string()],
- setup_command_timeout_ms: 300_000,
- devcontainer_phases: Vec::new(),
- };
- let result = engine.run_with_lifecycle(&g, config, lifecycle, None).await;
+ let result = engine
+ .run_with_lifecycle(
+ &g,
+ test_run_config(dir.path(), "setup-fail-test"),
+ test_lifecycle(vec!["exit 1".to_string()]),
+ None,
+ )
+ .await;
assert!(result.is_err());
let err = result.err().unwrap().to_string();
assert!(
@@ -5852,33 +5825,13 @@ mod tests {
});
let engine = WorkflowRunEngine::new(make_registry(), Arc::new(emitter), local_env());
- let config = RunConfig {
- run_dir: dir.path().to_path_buf(),
- cancel_token: None,
- dry_run: false,
- run_id: "order-test".into(),
- git_checkpoint_enabled: false,
- host_repo_path: None,
- base_sha: None,
- run_branch: None,
- meta_branch: None,
- labels: HashMap::new(),
- checkpoint_exclude_globs: Vec::new(),
- github_app: None,
- git_author: crate::git::GitAuthor::default(),
- base_branch: None,
- pull_request_enabled: false,
- pull_request_draft: false,
- asset_globs: Vec::new(),
- workflow_slug: None,
- };
- let lifecycle = LifecycleConfig {
- setup_commands: vec!["echo ok".to_string()],
- setup_command_timeout_ms: 300_000,
- devcontainer_phases: Vec::new(),
- };
engine
- .run_with_lifecycle(&g, config, lifecycle, None)
+ .run_with_lifecycle(
+ &g,
+ test_run_config(dir.path(), "order-test"),
+ test_lifecycle(vec!["echo ok".to_string()]),
+ None,
+ )
.await
.unwrap();

211
nodes/simplify_gpt/prompt.md Normal file
View file

@ -0,0 +1,211 @@
Goal: # Plan: Move sandbox lifecycle into the engine
## Context
`SandboxReady` and `SandboxCleanup` hook events are defined in `HookEvent` but never fired. They can't fire naturally because sandbox init/cleanup happens in `cli/run.rs` — outside the engine where all other hooks fire. The root cause is that `cli/run.rs` is a ~2000-line god function orchestrating everything: sandbox creation, init, setup commands, devcontainer lifecycle, engine construction, engine run, retro, PR creation, and cleanup. The engine receives an already-initialized sandbox and has no role in lifecycle management.
This refactor moves sandbox initialization and setup into the engine so `SandboxReady` fires naturally alongside `RunStart`. Cleanup stays callable from the CLI (the retro agent needs the sandbox alive after the graph completes) but fires through an engine method so `SandboxCleanup` also uses the hook infrastructure.
## Design
### Two new engine methods
**`run_with_lifecycle(graph, config, lifecycle, checkpoint?) -> Result<Outcome>`**
1. `sandbox.initialize()`
2. Fire `SandboxReady` hook (blocking — can abort run)
3. Emit `SandboxInitialized` event (CLI listener writes `sandbox.json`, updates progress UI)
4. Remote git setup if `sandbox.is_remote()` — produces `base_sha`, `run_branch`, `base_branch`, merged into `config`
5. Run setup commands inside sandbox
6. Run devcontainer lifecycle phases inside sandbox
7. Call existing `run_internal()` (unchanged — fires RunStart → graph → RunComplete)
8. Return outcome (sandbox still alive)
**`cleanup_sandbox(run_id, workflow_name, preserve) -> Result<()>`**
1. Fire `SandboxCleanup` hook (non-blocking)
2. If `!preserve`: call `sandbox.cleanup()`
Existing `run()` is unchanged — API server and integration tests keep using it with pre-initialized sandboxes.
### New config struct
```rust
// engine.rs
pub struct LifecycleConfig {
pub setup_commands: Vec<String>,
pub setup_command_timeout_ms: u64,
pub devcontainer_phases: Vec<(String, Vec<fabro_devcontainer::Command>)>,
}
```
`run_with_lifecycle` takes `config: RunConfig` by value (currently `&RunConfig`) so it can fill in remote git values. `run_internal` continues to take `&RunConfig`.
### CLI flow after refactor
```
sandbox = create_sandbox() // unchanged
sandbox = ReadBeforeWriteSandbox::new(sandbox) // moved before init (delegate_sandbox! delegates initialize)
engine = build_engine(sandbox, hook_runner, ...)
outcome = engine.run_with_lifecycle(graph, config, lifecycle)
// retro, conclusion, PR creation — sandbox still alive
engine.cleanup_sandbox(run_id, workflow_name, preserve)
```
Single scopeguard around the entire block that calls `engine.cleanup_sandbox()` on panic.
## Steps
### 1. `hook/types.rs` — Make `SandboxReady` blocking by default
- Add `Self::SandboxReady` to `is_blocking_by_default()` match arm (line 29-32)
- `SandboxCleanup` stays non-blocking (correct default)
### 2. `engine.rs` — Add `LifecycleConfig` struct and `run_with_lifecycle` method
- Define `LifecycleConfig` (setup_commands, setup_command_timeout_ms, devcontainer_phases)
- Add `pub async fn run_with_lifecycle(self, graph, config, lifecycle, checkpoint) -> Result<Outcome>` that:
- Calls `self.services.sandbox.initialize()`
- Fires `SandboxReady` hook via `self.run_hooks()`
- Emits `WorkflowRunEvent::SandboxInitialized { working_directory }` via emitter
- Calls remote git setup if `sandbox.is_remote()`, fills config.base_sha/run_branch/base_branch/git_checkpoint_enabled
- Runs setup commands via `sandbox.exec_command()`, emitting Setup* events
- Runs devcontainer lifecycle via `devcontainer_bridge::run_devcontainer_lifecycle()`
- Calls `self.run_internal()` (or `run_from_checkpoint` path)
- Returns outcome
### 3. `engine.rs` — Add `cleanup_sandbox` method
- `pub async fn cleanup_sandbox(&self, run_id, workflow_name, preserve) -> Result<(), String>`
- Fires `SandboxCleanup` hook
- If `!preserve`: calls `self.services.sandbox.cleanup()`
### 4. `engine.rs` — Move `setup_remote_git` from `cli/run.rs`
- Move the `setup_remote_git()` function (cli/run.rs line 1636-1679) into engine.rs
- It only uses `sandbox.exec_command()` and `run_id` — no CLI dependencies
### 5. `event.rs` — Add `SandboxInitialized` event variant
- Add `WorkflowRunEvent::SandboxInitialized { working_directory: String }` variant
- This replaces the inline sandbox.json writing in cli/run.rs
### 6. `cli/run.rs` — Register event listener for sandbox.json
- Before calling `run_with_lifecycle`, register a listener on the emitter for `SandboxInitialized`
- Listener captures the pre-built `SandboxRecord` template (all provider-specific fields filled, `working_directory` empty)
- On event: fill `working_directory` from event, call `record.save()`
- Also update progress UI `set_working_directory` in the same listener
### 7. `cli/run.rs` — Refactor `run_command` to use new engine methods
- Move `ReadBeforeWriteSandbox` wrapping to before engine construction (currently at line 966, after init — delegate_sandbox! macro delegates initialize so wrapping before init works)
- Move `HookRunner` creation earlier (before engine construction) — currently line 1222, move to ~line 800
- Remove: `sandbox.initialize()` (line 886), remote git setup (lines 982-996), setup commands (lines 1031-1072), devcontainer lifecycle (lines 1074-1091)
- Build `LifecycleConfig` from `setup_commands` and `devcontainer_config`
- Build `RunConfig` without remote git fields (leave base_sha/run_branch/base_branch as None for remote — engine fills them)
- Call `engine.run_with_lifecycle()` instead of `engine.run()`
- Replace cleanup section (lines 1587-1604) with `engine.cleanup_sandbox()`
- Replace two scopeguards with one that calls `engine.cleanup_sandbox()` on panic
- Remove `status_guard` for SandboxInitFailed — engine handles init errors
### 8. `cli/run.rs` — Refactor `run_from_branch` to use new engine methods
- Use `run_with_lifecycle` with empty `LifecycleConfig` (no setup commands, no devcontainer)
- Add `cleanup_sandbox()` call (currently no scopeguard — this is an improvement)
- This gives the resume path hooks for free (currently has zero hooks)
### 9. `docs/agents/hooks.mdx` — Update docs
- Remove any "reserved" annotations for `sandbox_ready` / `sandbox_cleanup`
- Note that `sandbox_ready` is blocking by default
## Files to modify
- `lib/crates/fabro-workflows/src/hook/types.rs` — SandboxReady blocking default
- `lib/crates/fabro-workflows/src/engine.rs` — LifecycleConfig, run_with_lifecycle, cleanup_sandbox, setup_remote_git
- `lib/crates/fabro-workflows/src/event.rs` — SandboxInitialized event variant
- `lib/crates/fabro-workflows/src/cli/run.rs` — major simplification of run_command and run_from_branch
- `docs/agents/hooks.mdx` — remove "reserved" annotations
## Files unchanged
- `lib/crates/fabro-workflows/src/handler/mod.rs` — EngineServices unchanged
- `lib/crates/fabro-workflows/src/hook/runner.rs` — handles any HookEvent generically
- `lib/crates/fabro-agent/src/sandbox.rs` — Sandbox trait unchanged
- `lib/crates/fabro-agent/src/read_before_write_sandbox.rs` — delegate_sandbox! already delegates initialize/cleanup
- All sandbox implementations — unchanged
## Verification
1. `cargo build --workspace` — compile check
2. `cargo test --workspace` — all existing tests pass (existing `run()` path unchanged)
3. `cargo clippy --workspace -- -D warnings` — no new warnings
4. Manual test: `fabro run` with a workflow that has `sandbox_ready` and `sandbox_cleanup` hooks configured — verify hooks fire
5. Manual test: `fabro run --sandbox daytona` — verify remote git setup still works through the engine
6. Manual test: `fabro run` with `--preserve-sandbox` — verify cleanup is skipped but SandboxCleanup hook still fires
## 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)
- **implement**: success
- Model: claude-opus-4-6, 172.3k tokens in / 48.5k out
- Files: /home/daytona/workspace/docs/agents/hooks.mdx, /home/daytona/workspace/lib/crates/fabro-workflows/src/cli/run.rs, /home/daytona/workspace/lib/crates/fabro-workflows/src/engine.rs, /home/daytona/workspace/lib/crates/fabro-workflows/src/event.rs, /home/daytona/workspace/lib/crates/fabro-workflows/src/hook/types.rs
- **simplify_opus**: success
- Model: claude-opus-4-6, 90.5k tokens in / 16.9k out
- Files: /home/daytona/workspace/lib/crates/fabro-workflows/src/cli/run.rs, /home/daytona/workspace/lib/crates/fabro-workflows/src/engine.rs
- **simplify_gemini**: success
- Model: claude-opus-4-6, 92.0k tokens in / 18.0k out
- Files: /home/daytona/workspace/lib/crates/fabro-workflows/src/cli/run.rs, /home/daytona/workspace/lib/crates/fabro-workflows/src/engine.rs
# Simplify: Code Review and Cleanup
Review all changed files for reuse, quality, and efficiency. Fix any issues found.
## Phase 1: Identify Changes
Run git diff (or git diff HEAD if there are staged changes) to see what changed. If there are no git changes, review the most recently modified files that the user mentioned or that you edited earlier in this conversation.
## Phase 2: Launch Three Review Agents in Parallel
Use the Agent tool to launch all three agents concurrently in a single message. Pass each agent the full diff so it has the complete context.
### Agent 1: Code Reuse Review
For each change:
1. Search for existing utilities and helpers that could replace newly written code. Use Grep to find similar patterns elsewhere in the codebase — common locations are utility directories, shared modules, and files adjacent to the changed ones.
2. Flag any new function that duplicates existing functionality. Suggest the existing function to use instead.
3. Flag any inline logic that could use an existing utility — hand-rolled string manipulation, manual path handling, custom environment checks, ad-hoc type guards, and similar patterns are common candidates.
Note: This is a greenfield app, so focus on maximizing simplicity and don't worry about changing things to achieve it.
### Agent 2: Code Quality Review
Review the same changes for hacky patterns:
1. Redundant state: state that duplicates existing state, cached values that could be derived, observers/effects that could be direct calls
2. Parameter sprawl: adding new parameters to a function instead of generalizing or restructuring existing ones
3. Copy-paste with slight variation: near-duplicate code blocks that should be unified with a shared abstraction
4. Leaky abstractions: exposing internal details that should be encapsulated, or breaking existing abstraction boundaries
5. Stringly-typed code: using raw strings where constants, enums (string unions), or branded types already exist in the codebase
Note: This is a greenfield app, so be aggressive in optimizing quality.
### Agent 3: Efficiency Review
Review the same changes for efficiency:
1. Unnecessary work: redundant computations, repeated file reads, duplicate network/API calls, N+1 patterns
2. Missed concurrency: independent operations run sequentially when they could run in parallel
3. Hot-path bloat: new blocking work added to startup or per-request/per-render hot paths
4. Unnecessary existence checks: pre-checking file/resource existence before operating (TOCTOU anti-pattern) — operate directly and handle the error
5. Memory: unbounded data structures, missing cleanup, event listener leaks
6. Overly broad operations: reading entire files when only a portion is needed, loading all items when filtering for one
## Phase 3: Fix Issues
Wait for all three agents to complete. Aggregate their findings and fix each issue directly. If a finding is a false positive or not worth addressing, note it and move on — do not argue with the finding, just skip it.
When done, briefly summarize what was fixed (or confirm the code was already clean).

5
nodes/simplify_gpt/provider_used.json Normal file
View file

@ -0,0 +1,5 @@
{
"mode": "agent",
"provider": "anthropic",
"model": "claude-opus-4-6"
}

19
nodes/simplify_gpt/response.md Normal file
View file

@ -0,0 +1,19 @@
All clean. Here's a summary of what was fixed:
## Summary of Changes
### Fixed Issues
1. **Eliminated `FinalizeConfig` struct (−52 lines)** — Changed `run_with_lifecycle` to take `config: &mut RunConfig` instead of consuming `config: RunConfig` by value. This means:
- The caller retains ownership of `RunConfig` and can read any fields mutated by remote git setup (e.g., `run_branch`, `base_sha`) directly after the call
- Deleted the entire `FinalizeConfig` struct, its `from_run_config()` and `from_run_config_owned()` constructors
- Renamed `write_finalize_commit_from(&FinalizeConfig)` back to `write_finalize_commit(&RunConfig)`
- Simplified all `match &engine_result { Ok((ref o, _)) => ... }` to `match &engine_result { Ok(ref o) => ... }`
- Eliminated all `finalize_config.field` references, using `config.field` directly
- The error path is now actually more correct: if remote git setup succeeded but a later step failed, the caller still sees the populated metadata branch fields (previously they were reset to `None` in `from_run_config_owned`)
2. **Eliminated duplicated `run_internal` calls in `run_with_lifecycle` (−12 lines)** — Step 7 was manually calling `run_internal` with identical logic to the existing `run()` and `run_from_checkpoint()` methods. Now it simply delegates to those existing public methods.
3. **Fixed misleading `_ssh_command` variable name** — The variable is used in the `tracing::info!` macro, so the leading underscore was incorrect. Changed to `ssh_command`.
**Net impact: −83 lines** (44 insertions, 127 deletions across the cleanup diff)

6
nodes/simplify_gpt/status.json Normal file
View file

@ -0,0 +1,6 @@
{
"status": "success",
"notes": "Stage completed: simplify_gpt",
"failure_reason": null,
"timestamp": "2026-03-16T05:01:09.791865+00:00"
}