Possible solution for unit run inconsistencies

juju/unit.py

@@ -1,6 +1,8 @@
 import logging
 
 import pyrfc3339
+import shlex
+from subprocess import CompletedProcess
 
 from juju.errors import JujuAPIError, JujuError
 
@@ -11,6 +13,18 @@
 log = logging.getLogger(__name__)
 
 
+def _wrapped_run_response(command:str, action):
+    """Wrap API results into a consistent CompletedProcess added to the action."""
+    results = action.results 
+    action.completed = CompletedProcess(
+        args=shlex.split(command),
+        returncode=int(results.get("Code") or results.get("return-code")),
+        stdout=str(results.get("Stdout") or results.get("stdout") or ""),
+        stderr=str(results.get("Stderr") or results.get("stderr") or ""),
+    )
+    return action
+
+
 class Unit(model.ModelEntity):
     @property
     def agent_status(self):
@@ -212,7 +226,9 @@ async def run(self, command, timeout=None):
             units=[self.name],
         )
         the_action = res.results[0] if self.connection.is_using_old_client else res.actions[0]
-        return await self.model.wait_for_action(the_action.action.tag)
+        action = await self.model.wait_for_action(the_action.action.tag)
+        await action.wait()
+        return _wrapped_run_response(command, action)
 
     async def run_action(self, action_name, **params):
         """Run an action on this unit.