mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-09-19 00:03:30 +00:00
parent
0eee10a2ef
commit
1f31ae1450
5 changed files with 74 additions and 0 deletions
52
checkpoint.json
Normal file
52
checkpoint.json
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{
|
||||
"timestamp": "2026-03-19T15:20:42.523377Z",
|
||||
"current_node": "toolchain",
|
||||
"completed_nodes": [
|
||||
"start",
|
||||
"toolchain"
|
||||
],
|
||||
"node_retries": {
|
||||
"start": 1,
|
||||
"toolchain": 1
|
||||
},
|
||||
"context_values": {
|
||||
"command.output": "cargo 1.94.0 (85eff7c80 2026-01-15)\n",
|
||||
"failure_class": "",
|
||||
"thread.start.current_node": "toolchain",
|
||||
"internal.node_visit_count": 1,
|
||||
"failure_signature": "",
|
||||
"current.preamble": "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<String>` fields\n- Change `DaytonaSandbox` field from `clone_branch: Option<String>` to `clone_params: Option<GitCloneParams>`\n- Update `new()` signature: last param changes from `clone_branch: Option<String>` to `clone_params: Option<GitCloneParams>`\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\n",
|
||||
"outcome": "success",
|
||||
"internal.retry_count.start": 1,
|
||||
"internal.run_id": "01KM3AY9Z9FWFBDH954H4W16SG",
|
||||
"internal.retry_count.toolchain": 1,
|
||||
"graph.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<String>` fields\n- Change `DaytonaSandbox` field from `clone_branch: Option<String>` to `clone_params: Option<GitCloneParams>`\n- Update `new()` signature: last param changes from `clone_branch: Option<String>` to `clone_params: Option<GitCloneParams>`\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",
|
||||
"graph.rankdir": "LR",
|
||||
"graph.model_stylesheet": "\n * { backend: api; model: claude-opus-4-6;}\n ",
|
||||
"internal.fidelity": "compact",
|
||||
"current_node": "toolchain",
|
||||
"internal.thread_id": "start",
|
||||
"command.stderr": ""
|
||||
},
|
||||
"logs": [],
|
||||
"node_outcomes": {
|
||||
"start": {
|
||||
"status": "success",
|
||||
"duration_ms": 0
|
||||
},
|
||||
"toolchain": {
|
||||
"status": "success",
|
||||
"context_updates": {
|
||||
"command.output": "cargo 1.94.0 (85eff7c80 2026-01-15)\n",
|
||||
"command.stderr": ""
|
||||
},
|
||||
"notes": "Script completed: 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",
|
||||
"duration_ms": 129
|
||||
}
|
||||
},
|
||||
"next_node_id": "preflight_compile",
|
||||
"node_visits": {
|
||||
"toolchain": 1,
|
||||
"start": 1
|
||||
}
|
||||
}
|
||||
6
nodes/start/status.json
Normal file
6
nodes/start/status.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"status": "success",
|
||||
"notes": null,
|
||||
"failure_reason": null,
|
||||
"timestamp": "2026-03-19T15:20:42.385244+00:00"
|
||||
}
|
||||
5
nodes/toolchain/script_invocation.json
Normal file
5
nodes/toolchain/script_invocation.json
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"command": "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",
|
||||
"language": "shell",
|
||||
"timeout_ms": null
|
||||
}
|
||||
5
nodes/toolchain/script_timing.json
Normal file
5
nodes/toolchain/script_timing.json
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"duration_ms": 128,
|
||||
"exit_code": 0,
|
||||
"timed_out": false
|
||||
}
|
||||
6
nodes/toolchain/status.json
Normal file
6
nodes/toolchain/status.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"status": "success",
|
||||
"notes": "Script completed: 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",
|
||||
"failure_reason": null,
|
||||
"timestamp": "2026-03-19T15:20:42.523027+00:00"
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue