diff --git a/proto/BUILD b/proto/BUILD
index 776e1f783249..5f5a54cd3022 100644
--- a/proto/BUILD
+++ b/proto/BUILD
@@ -20,7 +20,7 @@ create_proto_visibility_group()
 java_import(
     name = "proto_deps",
     jars = [":repackaged_proto_deps"],
-    visibility = PLUGIN_PACKAGES_VISIBILITY,
+    visibility = PLUGIN_PACKAGES_VISIBILITY + ["//third_party/bazel/src/test/java/com/google/devtools/build/lib/bazel/commands:__pkg__"],
 )
 
 proto_library(
diff --git a/third_party/bazel/src/main/protobuf/failure_details.proto b/third_party/bazel/src/main/protobuf/failure_details.proto
index c8a872147653..54091ef95939 100644
--- a/third_party/bazel/src/main/protobuf/failure_details.proto
+++ b/third_party/bazel/src/main/protobuf/failure_details.proto
@@ -147,6 +147,7 @@ message FailureDetail {
     StarlarkLoading starlark_loading = 179;
     ExternalDeps external_deps = 181;
     DiffAwareness diff_awareness = 182;
+    ModqueryCommand modquery_command = 183;
   }
 
   reserved 102; // For internal use
@@ -1274,3 +1275,14 @@ message DiffAwareness {
 
   Code code = 1;
 }
+
+message ModqueryCommand {
+  enum Code {
+    MODQUERY_COMMAND_UNKNOWN = 0 [(metadata) = { exit_code: 37 }];
+    MISSING_ARGUMENTS = 1 [(metadata) = { exit_code: 2 }];
+    TOO_MANY_ARGUMENTS = 2 [(metadata) = { exit_code: 2 }];
+    INVALID_ARGUMENTS = 3 [(metadata) = { exit_code: 2 }];
+  }
+
+  Code code = 1;
+}