diff --git a/cmd/bd/daemon_event_loop.go b/cmd/bd/daemon_event_loop.go
index da7f3c02..7db5cab1 100644
--- a/cmd/bd/daemon_event_loop.go
+++ b/cmd/bd/daemon_event_loop.go
@@ -167,7 +167,7 @@ func runEventDrivenLoop(
 // checkDaemonHealth performs periodic health validation.
 // Separate from sync operations - just validates state.
 func checkDaemonHealth(ctx context.Context, store storage.Storage, log daemonLogger) {
-	// TODO: Add health checks:
+	// TODO(bd-gqo): Add health checks:
 	// - Database integrity check
 	// - Disk space check
 	// - Memory usage check
diff --git a/cmd/bd/duplicates.go b/cmd/bd/duplicates.go
index b3730200..702b2c39 100644
--- a/cmd/bd/duplicates.go
+++ b/cmd/bd/duplicates.go
@@ -92,7 +92,7 @@ Example:
 			
 			if autoMerge || dryRun {
 				if !dryRun {
-					// TODO: Call performMerge when implemented
+					// TODO(bd-hdt): Call performMerge when implemented
 					fmt.Fprintf(os.Stderr, "Auto-merge not yet fully implemented. Use suggested commands instead.\n")
 				}
 			}
diff --git a/cmd/bd/reopen.go b/cmd/bd/reopen.go
index 026db1f4..cd368b96 100644
--- a/cmd/bd/reopen.go
+++ b/cmd/bd/reopen.go
@@ -58,7 +58,7 @@ This is more explicit than 'bd update --status open' and emits a Reopened event.
 					fmt.Fprintf(os.Stderr, "Error reopening %s: %v\n", id, err)
 					continue
 				}
-				// TODO: Add reason as a comment once RPC supports AddComment
+				// TODO(bd-r46): Add reason as a comment once RPC supports AddComment
 				if reason != "" {
 					fmt.Fprintf(os.Stderr, "Warning: reason not supported in daemon mode yet\n")
 				}