johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(dep): ensure cycle detection runs in daemon mode for --blocks flag

Browse Source 
The daemon code path was returning early after adding the dependency,
skipping the cycle detection that runs for direct mode. Restructure
so both paths share the cycle detection and output code.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
beads/crew/emma
2026-01-04 11:15:32 -08:00
committed by Steve Yegge
parent 44626262e2
commit 426f67db41
1 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
cmd/bd/dep.go
View File

@@ -120,7 +120,7 @@ Examples:
FatalErrorRespectJSON("cannot add dependency: %s is already a child of %s. Children inherit dependency on parent completion via hierarchy. Adding an explicit dependency would create a deadlock", fromID, toID) FatalErrorRespectJSON("cannot add dependency: %s is already a child of %s. Children inherit dependency on parent completion via hierarchy. Adding an explicit dependency would create a deadlock", fromID, toID)
} }
// If daemon is running, use RPC // Add the dependency via daemon or direct mode
if daemonClient != nil { if daemonClient != nil {
depArgs := &rpc.DepAddArgs{ depArgs := &rpc.DepAddArgs{
FromID: fromID, FromID: fromID,
@@ -128,36 +128,27 @@ Examples:
DepType: depType, DepType: depType,
} }
resp, err := daemonClient.AddDependency(depArgs) _, err := daemonClient.AddDependency(depArgs)
if err != nil { if err != nil {
FatalErrorRespectJSON("%v", err) FatalErrorRespectJSON("%v", err)
} }
} else {
if jsonOutput { // Direct mode
fmt.Println(string(resp.Data)) dep := &types.Dependency{
return IssueID: fromID,
DependsOnID: toID,
Type: types.DependencyType(depType),
} }
fmt.Printf("%s Added dependency: %s blocks %s\n", if err := store.AddDependency(ctx, dep, actor); err != nil {
ui.RenderPass("✓"), blockerID, blocksID) FatalErrorRespectJSON("%v", err)
return }
// Schedule auto-flush
markDirtyAndScheduleFlush()
} }
// Direct mode // Check for cycles after adding dependency (both daemon and direct mode)
dep := &types.Dependency{
IssueID: fromID,
DependsOnID: toID,
Type: types.DependencyType(depType),
}
if err := store.AddDependency(ctx, dep, actor); err != nil {
FatalErrorRespectJSON("%v", err)
}
// Schedule auto-flush
markDirtyAndScheduleFlush()
// Check for cycles after adding dependency
cycles, err := store.DetectCycles(ctx) cycles, err := store.DetectCycles(ctx)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "Warning: Failed to check for cycles: %v\n", err) fmt.Fprintf(os.Stderr, "Warning: Failed to check for cycles: %v\n", err)
@@ -183,10 +174,10 @@ Examples:
if jsonOutput { if jsonOutput {
outputJSON(map[string]interface{}{ outputJSON(map[string]interface{}{
"status": "added", "status": "added",
"blocker_id": toID, "blocker_id": toID,
"blocked_id": fromID, "blocked_id": fromID,
"type": depType, "type": depType,
}) })
return return
} }