profile: also honor action cwd

In all presentations of actions to the user, we use output paths
relative to the root of the action directory. Therefore, we should
do the same in the profile. However, when noting the completion of
an action, we get paths as in the wire protocol, i.e., relative to
the working directory of the action. Therefore, rebase appropriately.

1 files changed, 14 insertions, 3 deletions

diff --git a/src/buildtool/profile/profile.cpp b/src/buildtool/profile/profile.cpp
index 4655ccf4..bc0560cf 100644
--- a/src/buildtool/profile/profile.cpp
+++ b/src/buildtool/profile/profile.cpp
@@ -20,6 +20,7 @@
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/common/cli.hpp"
 #include "src/utils/cpp/expected.hpp"
+#include "src/utils/cpp/path_rebase.hpp"
 
 void Profile::Write(int exit_code) {
     if (not actions_.empty()) {
@@ -96,7 +97,8 @@ void Profile::SetCLI(CommandLineArguments const& cli) {
 }
 
 void Profile::NoteActionCompleted(std::string const& id,
-                                  IExecutionResponse::Ptr const& response) {
+                                  IExecutionResponse::Ptr const& response,
+                                  std::string const& cwd) {
     std::unique_lock lock{mutex_};
     auto artifacts = response->Artifacts();
     std::optional<std::string> out = std::nullopt;
@@ -131,8 +133,17 @@ void Profile::NoteActionCompleted(std::string const& id,
             .err = err,
             .artifacts = std::unordered_map<std::string, std::string>(
                 (*artifacts)->size())};
-        for (auto const& [k, v] : **artifacts) {
-            actions_[id].artifacts.emplace(k, v.digest.hash());
+        if (cwd.empty()) {
+            // the typical case of empty cwd, avoid unnecessary calls
+            for (auto const& [k, v] : **artifacts) {
+                actions_[id].artifacts.emplace(k, v.digest.hash());
+            }
+        }
+        else {
+            for (auto const& [k, v] : **artifacts) {
+                actions_[id].artifacts.emplace(
+                    RebasePathStringRelativeTo(cwd, k), v.digest.hash());
+            }
         }
     }
 }