From cee77d7bc838491672fc166dd451ffc73e2e37a8 Mon Sep 17 00:00:00 2001
From: Kristian Hartikainen <kristian@ekarobotics.com>
Date: Sun, 22 Jun 2025 13:57:20 -0400
Subject: [PATCH 1/2] Fix `_get_important_outputs`

---
 xmanager/xm_local/packaging/bazel_tools.py | 35 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/xmanager/xm_local/packaging/bazel_tools.py b/xmanager/xm_local/packaging/bazel_tools.py
index 3049523..ce9f43c 100644
--- a/xmanager/xm_local/packaging/bazel_tools.py
+++ b/xmanager/xm_local/packaging/bazel_tools.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 """Bazel tools for local packaging."""
 
+import collections
 import functools
 import itertools
 import os
@@ -32,13 +33,37 @@
 def _get_important_outputs(
     events: Sequence[bes_pb2.BuildEvent], labels: Sequence[str]
 ) -> List[List[bes_pb2.File]]:
-  label_to_output: Dict[str, List[bes_pb2.File]] = {}
+  named_sets = {}
+  for event in events:
+    if event.id.HasField('named_set'):
+      named_sets[event.id.named_set.id] = event.named_set_of_files
+
+  label_to_output =  collections.defaultdict(list)
   for event in events:
     if event.id.HasField('target_completed'):
-      # Note that we ignore `event.id.target_completed.aspect`.
-      label_to_output[event.id.target_completed.label] = list(
-          event.completed.important_output
-      )
+      label = event.id.target_completed.label
+
+      # Start with whatever is in important_output (may be empty).
+      outputs = list(event.completed.important_output)
+
+      # Collect from output_group.file_sets references
+      for group in event.completed.output_group:
+        for file_set in group.file_sets:
+          queue = collections.deque([file_set.id])
+          visited = set()
+          while queue:
+            current = queue.popleft()
+            if current in visited:
+              continue
+            visited.add(current)
+            ns = named_sets.get(current)
+            if ns:
+              outputs.extend(ns.files)
+              for nested in ns.file_sets:
+                queue.append(nested.id)
+
+      label_to_output[label] = outputs
+
   return [label_to_output[label] for label in labels]
 
 

From a31c5560da918b1673441b54841919a67a8cdbb3 Mon Sep 17 00:00:00 2001
From: Kristian Hartikainen <kristian@ekarobotics.com>
Date: Mon, 7 Jul 2025 13:51:47 +0300
Subject: [PATCH 2/2] Filter out non-binary output files in
 `_get_important_outputs`

---
 xmanager/xm_local/packaging/bazel_tools.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/xmanager/xm_local/packaging/bazel_tools.py b/xmanager/xm_local/packaging/bazel_tools.py
index ce9f43c..f854705 100644
--- a/xmanager/xm_local/packaging/bazel_tools.py
+++ b/xmanager/xm_local/packaging/bazel_tools.py
@@ -38,6 +38,14 @@ def _get_important_outputs(
     if event.id.HasField('named_set'):
       named_sets[event.id.named_set.id] = event.named_set_of_files
 
+  # TODO(hartikainen): Is this the right way to get the binary directory? See usage
+  # below.
+  bindir = (
+      next(e for e in events if e.id.HasField("configuration"))
+      .configuration
+      .make_variable['BINDIR']
+  )
+
   label_to_output =  collections.defaultdict(list)
   for event in events:
     if event.id.HasField('target_completed'):
@@ -56,10 +64,16 @@ def _get_important_outputs(
             if current in visited:
               continue
             visited.add(current)
-            ns = named_sets.get(current)
-            if ns:
-              outputs.extend(ns.files)
-              for nested in ns.file_sets:
+            named_set = named_sets.get(current)
+            if named_set:
+              # TODO(hartikainen): Check this logic.
+              # NOTE(hartikainen): Only gather binary outputs. `py_binary` targets, for
+              # example, include more than one file in the output group (one for the
+              # binary and at least one for the source code), but I think we only care
+              # for the binary.
+              binary_outputs = [file for file in named_set.files if bindir in file.uri]
+              outputs.extend(binary_outputs)
+              for nested in named_set.file_sets:
                 queue.append(nested.id)
 
       label_to_output[label] = outputs