diff --git a/cmd/bd/dep.go b/cmd/bd/dep.go index e28136ab4..157cfb077 100644 --- a/cmd/bd/dep.go +++ b/cmd/bd/dep.go @@ -1157,10 +1157,6 @@ var depRemoveCmd = &cobra.Command{ // for a genuine removal, matching bd dep add's edge event and the // proxied bd dep remove path. // - // The role's Removed verdict is not printed, for the reason the proxied - // route gives: `bd dep remove` has always confirmed the same way whether - // or not an edge was there, and reporting the difference now would - // change what every existing script reads. editor, err := fromStore.DependencyEditor() if err != nil { return HandleErrorRespectJSON("%v", err) @@ -1169,11 +1165,12 @@ var depRemoveCmd = &cobra.Command{ if err != nil { return HandleErrorRespectJSON("%v", err) } - if _, err := editor.RemoveDependency(opsCtx, issueops.RemoveDependencyRequest{ + result, err := editor.RemoveDependency(opsCtx, issueops.RemoveDependencyRequest{ Actor: actor, IssueID: fullFromID, DependsOnID: fullToID, - }); err != nil { + }) + if err != nil { return HandleErrorRespectJSON("%v", err) } @@ -1185,12 +1182,22 @@ var depRemoveCmd = &cobra.Command{ } if jsonOutput { + status := "removed" + if !result.Removed { + status = "not_found" + } return outputJSON(map[string]interface{}{ - "status": "removed", + "status": status, + "removed": result.Removed, "issue_id": fullFromID, "depends_on_id": fullToID, }) } + if !result.Removed { + fmt.Printf("No dependency found: %s → %s\n", + formatFeedbackIDParen(fullFromID, lookupTitle(fullFromID)), formatFeedbackIDParen(fullToID, lookupTitle(fullToID))) + return nil + } fmt.Printf("%s Removed dependency: %s → %s\n", ui.RenderPass("✓"), formatFeedbackIDParen(fullFromID, lookupTitle(fullFromID)), formatFeedbackIDParen(fullToID, lookupTitle(fullToID))) diff --git a/cmd/bd/dep_embedded_test.go b/cmd/bd/dep_embedded_test.go index b196334b6..0ded1f234 100644 --- a/cmd/bd/dep_embedded_test.go +++ b/cmd/bd/dep_embedded_test.go @@ -282,6 +282,22 @@ func TestEmbeddedDep(t *testing.T) { if m["status"] != "removed" { t.Errorf("expected status=removed, got %v", m["status"]) } + if m["removed"] != true { + t.Errorf("expected removed=true, got %v", m["removed"]) + } + }) + + t.Run("remove_missing_edge_reports_noop", func(t *testing.T) { + r1 := bdCreate(t, bd, dir, "Missing edge A", "--type", "task") + r2 := bdCreate(t, bd, dir, "Missing edge B", "--type", "task") + out := bdDep(t, bd, dir, "remove", r1.ID, r2.ID) + if !strings.Contains(out, "No dependency found") || strings.Contains(out, "✓") { + t.Errorf("missing edge should report a no-op, got: %s", out) + } + m := bdDepJSON(t, bd, dir, "remove", r1.ID, r2.ID) + if m["status"] != "not_found" || m["removed"] != false { + t.Errorf("missing edge JSON = %v, want status=not_found removed=false", m) + } }) // ===== dep list ===== diff --git a/cmd/bd/dep_proxied_integration_test.go b/cmd/bd/dep_proxied_integration_test.go index d104d5c38..df0a41546 100644 --- a/cmd/bd/dep_proxied_integration_test.go +++ b/cmd/bd/dep_proxied_integration_test.go @@ -423,6 +423,24 @@ func TestProxiedServerDep2(t *testing.T) { if m["status"] != "removed" { t.Errorf("expected status=removed, got %v", m["status"]) } + if m["removed"] != true { + t.Errorf("expected removed=true, got %v", m["removed"]) + } + }) + + t.Run("missing_edge_reports_noop", func(t *testing.T) { + t.Parallel() + p := newSharedProxiedProject(t, bd, "dpr4") + a := bdProxiedCreate(t, bd, p.dir, "Missing edge A", "--type", "task") + b := bdProxiedCreate(t, bd, p.dir, "Missing edge B", "--type", "task") + out := bdProxiedDep(t, bd, p.dir, "remove", a.ID, b.ID) + if !strings.Contains(out, "No dependency found") || strings.Contains(out, "✓") { + t.Errorf("missing edge should report a no-op, got: %s", out) + } + m := bdProxiedDepJSON(t, bd, p.dir, "remove", a.ID, b.ID) + if m["status"] != "not_found" || m["removed"] != false { + t.Errorf("missing edge JSON = %v, want status=not_found removed=false", m) + } }) }) diff --git a/cmd/bd/dep_proxied_server.go b/cmd/bd/dep_proxied_server.go index bd7b39440..62adda44d 100644 --- a/cmd/bd/dep_proxied_server.go +++ b/cmd/bd/dep_proxied_server.go @@ -345,26 +345,35 @@ func runDepRemoveProxiedServer(_ *cobra.Command, ctx context.Context, args []str if err != nil { return HandleErrorRespectJSON("%v", err) } - // The role's Removed verdict is not printed. `bd dep remove` has always - // confirmed the same way whether or not an edge was there, and reporting - // the difference now would change what every existing script reads. - if _, err := editor.RemoveDependency(ctx, issueops.RemoveDependencyRequest{ + result, err := editor.RemoveDependency(ctx, issueops.RemoveDependencyRequest{ Actor: actor, IssueID: fromID, DependsOnID: toID, - }); err != nil { + }) + if err != nil { return HandleErrorRespectJSON("%v", err) } res := depEdgeFeedback(ctx, fromID, toID, false) if jsonOutput { + status := "removed" + if !result.Removed { + status = "not_found" + } _ = outputJSON(map[string]interface{}{ - "status": "removed", + "status": status, + "removed": result.Removed, "issue_id": fromID, "depends_on_id": toID, }) return nil } + if !result.Removed { + fmt.Printf("No dependency found: %s → %s\n", + formatFeedbackIDParen(fromID, res.fromTitle), + formatFeedbackIDParen(toID, res.toTitle)) + return nil + } fmt.Printf("%s Removed dependency: %s → %s\n", ui.RenderPass("✓"),