From 0eee10a2ef6894706daf114188b2c3591cf60cb0 Mon Sep 17 00:00:00 2001 From: Fabro Date: Thu, 19 Mar 2026 11:20:42 -0400 Subject: [PATCH] init run MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ⚒️ Generated with [Fabro](https://fabro.sh) --- graph.fabro | 38 ++++++++++++++++++++++++++++++++++++++ manifest.json | 13 +++++++++++++ sandbox.json | 5 +++++ 3 files changed, 56 insertions(+) create mode 100644 graph.fabro create mode 100644 manifest.json create mode 100644 sandbox.json diff --git a/graph.fabro b/graph.fabro new file mode 100644 index 000000000..afc9d2279 --- /dev/null +++ b/graph.fabro @@ -0,0 +1,38 @@ +digraph ImplementAndSimplify { + graph [ + goal="Implement and simplify", + model_stylesheet=" + * { backend: api; model: claude-opus-4-6;} + " + ] + rankdir=LR + + start [shape=Mdiamond, label="Start"] + exit [shape=Msquare, label="Exit"] + + toolchain [label="Toolchain", shape=parallelogram, 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", max_retries=0] + preflight_compile [label="Preflight Compile", shape=parallelogram, script="cargo check -q --workspace 2>&1", max_retries=0] + preflight_lint [label="Preflight Lint", shape=parallelogram, script="cargo clippy -q --workspace -- -D warnings 2>&1", max_retries=0] + fix_lints [label="Fix Lints", prompt="The preflight lint step failed. Read the build output from context and fix all clippy lint warnings.", max_visits=3] + implement [label="Implement", prompt="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."] + simplify_opus [label="Simplify (Opus)", prompt="@prompts/simplify.md"] + simplify_gemini [label="Simplify (Gemini)", prompt="@prompts/simplify.md", model="gemini-3.1-pro-preview-customtools"] + simplify_gpt [label="Simplify (GPT-54)", prompt="@prompts/simplify.md", model="gpt-54"] + verify [label="Verify", shape=parallelogram, script="cargo clippy -q --workspace -- -D warnings 2>&1 && cargo nextest run --cargo-quiet --workspace --status-level fail 2>&1", goal_gate=true, retry_target="fixup"] + fixup [label="Fixup", prompt="The verify step failed. Read the build output from context and fix all clippy lint warnings and test failures.", max_visits=3] + fmt [label="Format", shape=parallelogram, script="cargo fmt --all 2>&1", max_retries=0] + + start -> toolchain + toolchain -> preflight_compile [condition="outcome=success"] + toolchain -> exit + preflight_compile -> preflight_lint [condition="outcome=success"] + preflight_compile -> exit + preflight_lint -> implement [condition="outcome=success"] + preflight_lint -> fix_lints + fix_lints -> preflight_lint + implement -> simplify_opus -> simplify_gemini -> simplify_gpt -> verify + verify -> fmt [condition="outcome=success"] + verify -> fixup + fixup -> verify + fmt -> exit +} diff --git a/manifest.json b/manifest.json new file mode 100644 index 000000000..3ae0dbd93 --- /dev/null +++ b/manifest.json @@ -0,0 +1,13 @@ +{ + "run_id": "01KM3AY9Z9FWFBDH954H4W16SG", + "workflow_name": "ImplementAndSimplify", + "goal": "# Fix: DaytonaSandbox concurrent test failures from `set_current_dir` poisoning\n\n## Context\n\nTwo Daytona integration tests (`daytona_computer_use_browser_screenshot` and `daytona_playwright_mcp_sandbox_transport`) call `std::env::set_current_dir(tmp.path())` to make `detect_repo_info()` fail so the sandbox skips cloning. Since `set_current_dir` is **process-global**, any concurrent test calling `initialize()` sees the changed cwd, causing `detect_repo_info` to fail and the sandbox to get an empty directory with no git repo. This makes `git rev-parse HEAD` return exit code 128.\n\nThe fix follows the existing `ExeSandbox`/`SshSandbox` pattern: move clone params out of `initialize()` and into the constructor so callers control whether cloning happens.\n\n## Changes\n\n### 1. `lib/crates/fabro-daytona/src/lib.rs` — Core refactor\n\n- Add a `GitCloneParams` struct with `url: String` and `branch: Option` fields\n- Change `DaytonaSandbox` field from `clone_branch: Option` to `clone_params: Option`\n- Update `new()` signature: last param changes from `clone_branch: Option` to `clone_params: Option`\n- Update `reconnect()` (line 84): `clone_params: None`\n- Refactor `initialize()`:\n - Remove `let cwd = std::env::current_dir()` (line 392)\n - Replace `match detect_repo_info(&cwd)` (line 448) with `if let Some(ref params) = self.clone_params`\n - `Some` arm: use `params.url` / `params.branch` directly (already HTTPS, no `ssh_url_to_https` needed inside initialize)\n - `None` arm: create empty working directory (existing `Err` arm logic, lines 607-618)\n - Remove `self.clone_branch.clone().or(detected_branch)` merge — caller provides the final branch\n\n### 2. `lib/crates/fabro-cli/src/commands/run.rs` — Production callers\n\n- **Line 1017** (main `run` path): Construct `GitCloneParams` from `origin_url` and `detected_base_branch` (already extracted at line 557):\n ```rust\n let clone_params = origin_url.as_ref().map(|url| fabro_daytona::GitCloneParams {\n url: fabro_github::ssh_url_to_https(url),\n branch: detected_base_branch.clone(),\n });\n ```\n Pass `clone_params` as the last arg to `DaytonaSandbox::new()`\n\n- **Line 2133** (doctor path): Currently passes `None` for `clone_branch`. Under the new API, `None` for `clone_params` means \"skip clone\" — same behavior, just update the type. No logic change needed.\n\n### 3. `lib/crates/fabro-workflows/tests/daytona_integration.rs` — Test fixes\n\n- **`create_env_with_github_app`** (line 30): Detect repo and build `GitCloneParams` before calling `new()`:\n ```rust\n let cwd = std::env::current_dir().unwrap();\n let clone_params = fabro_daytona::detect_repo_info(&cwd)\n .ok()\n .map(|(url, branch)| fabro_daytona::GitCloneParams {\n url: fabro_github::ssh_url_to_https(&url),\n branch,\n });\n DaytonaSandbox::new(DaytonaConfig::default(), github_app, None, clone_params)\n ```\n This preserves cloning for all tests that use `create_env()`/`create_env_with_github_app()`.\n\n- **`daytona_snapshot_sandbox`** (line 252) and **`run_daytona_cli_test`** (line 927): Currently pass `None` as `clone_branch`. Under new API, `None` for `clone_params` = skip clone. These tests don't need repo contents (snapshot checks `rg --version`, CLI tests install tools independently). No logic change needed.\n\n- **`daytona_computer_use_browser_screenshot`** (line 1855-1857): Remove `tempfile::tempdir()` and `set_current_dir()`. Already passes `None` as last arg → skip clone.\n\n- **`daytona_playwright_mcp_sandbox_transport`** (line 2015-2017): Same — remove `tempfile::tempdir()` and `set_current_dir()`.\n\n## Verification\n\n1. `cargo build --workspace` — confirms all callers updated (compiler catches type mismatch)\n2. `cargo test -p fabro-workflows --test daytona_integration -- --ignored --test-threads=4` — the previously-failing git tests should pass with concurrent execution\n3. Specifically verify the 5 previously-failing tests pass: `daytona_full_lifecycle`, `daytona_git_checkpoint_remote_emits_events`, `daytona_git_checkpoint_with_shadow_branch`, `daytona_git_push_run_branch_to_origin`, `daytona_parallel_git_branching_e2e`\n", + "start_time": "2026-03-19T15:20:42.380504Z", + "node_count": 13, + "edge_count": 16, + "run_branch": "fabro/run/01KM3AY9Z9FWFBDH954H4W16SG", + "base_sha": "a5273e17a3aa92767039a542eaacf579ccb84779", + "base_branch": "main", + "workflow_slug": "implement", + "host_repo_path": "/Users/bhelmkamp/p/fabro-sh/fabro" +} \ No newline at end of file diff --git a/sandbox.json b/sandbox.json new file mode 100644 index 000000000..cec008d34 --- /dev/null +++ b/sandbox.json @@ -0,0 +1,5 @@ +{ + "provider": "daytona", + "working_directory": "/home/daytona/workspace", + "identifier": "fabro-01KM3AY9Z9FWFBDH954H4W16SG" +} \ No newline at end of file