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

Deduplicate CheckpointSaved hook, use idiomatic bsha.clone()

Browse source 
Move the identical CheckpointSaved hook block from both git and non-git
checkpoint branches to a single block after the if/else. Replace
bsha.to_string() with bsha.clone() for &String → String conversion.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bryan Helmkamp 2026-03-15 14:50:42 -04:00
parent a8f6dbb7fd
commit 7249fbaf54
No known key found for this signature in database
2 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/crates/fabro-workflows/src/engine.rs
View file

@ -1947,17 +1947,6 @@ impl WorkflowRunEngine {
git_commit_sha: Some(sha.clone()),
});
// CheckpointSaved hook (non-blocking)
{
let mut hook_ctx = HookContext::new(
HookEvent::CheckpointSaved,
run_id.clone(),
graph.name.clone(),
);
hook_ctx.node_id = Some(node.id.clone());
let _ = self.run_hooks(&hook_ctx, hook_work_dir.as_deref()).await;
}
self.services.emitter.emit(&WorkflowRunEvent::GitCommit {
node_id: Some(node.id.clone()),
sha: sha.clone(),
@ -2057,17 +2046,18 @@ impl WorkflowRunEngine {
status: outcome.status.to_string(),
git_commit_sha: None,
});
}
// CheckpointSaved hook (non-blocking)
{
let mut hook_ctx = HookContext::new(
HookEvent::CheckpointSaved,
run_id.clone(),
graph.name.clone(),
);
hook_ctx.node_id = Some(node.id.clone());
let _ = self.run_hooks(&hook_ctx, hook_work_dir.as_deref()).await;
}
// CheckpointSaved hook (non-blocking) — fires for both git and non-git paths.
// The Err arm above returns early, so this only runs on success.
{
let mut hook_ctx = HookContext::new(
HookEvent::CheckpointSaved,
run_id.clone(),
graph.name.clone(),
);
hook_ctx.node_id = Some(node.id.clone());
let _ = self.run_hooks(&hook_ctx, hook_work_dir.as_deref()).await;
}
// Step 7: Follow selected edge (or direct jump)

8
lib/crates/fabro-workflows/src/handler/parallel.rs
View file

@ -331,7 +331,7 @@ impl Handler for ParallelHandler {
}
services.emitter.emit(&WorkflowRunEvent::GitBranch {
branch: branch_name.clone(),
sha: bsha.to_string(),
sha: bsha.clone(),
});
if !crate::engine::git_replace_worktree(
&*services.sandbox,
@ -358,9 +358,9 @@ impl Handler for ParallelHandler {
"failed to reset worktree {wt_path_str}"
)));
}
services.emitter.emit(&WorkflowRunEvent::GitReset {
sha: bsha.to_string(),
});
services
.emitter
.emit(&WorkflowRunEvent::GitReset { sha: bsha.clone() });
branch_context.set(keys::INTERNAL_WORK_DIR, serde_json::json!(&wt_path_str));