portacode 1.4.44.dev1__tar.gz → 1.4.44.dev2__tar.gz

{portacode-1.4.44.dev1 → portacode-1.4.44.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.44.dev1
+Version: 1.4.44.dev2
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-1.4.44.dev1 → portacode-1.4.44.dev2}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.44.dev1'
-__version_tuple__ = version_tuple = (1, 4, 44, 'dev1')
+__version__ = version = '1.4.44.dev2'
+__version_tuple__ = version_tuple = (1, 4, 44, 'dev2')
 
 __commit_id__ = commit_id = None

{portacode-1.4.44.dev1 → portacode-1.4.44.dev2}/portacode/connection/handlers/runtime_user.py

@@ -5,7 +5,6 @@ import pwd
 import shlex
 import stat
 from pathlib import Path
-from posixpath import basename
 from typing import Iterable, List, Optional
 
 DEFAULT_RUNTIME_USER_ENV = "PORTACODE_DEFAULT_RUNTIME_USER"
@@ -41,23 +40,16 @@ def wrap_shell_command(command: str, user: str, shell: str = "/bin/sh") -> str:
     if not should_switch_user(user):
         return command
     shell_path = _resolve_shell_for_user(user, shell)
-    user_home = get_runtime_user_home({"username": user})
-    shell_command = _wrap_command_for_shell_rc(command, user_home, shell_path)
-    quoted_shell = shlex.quote(shell_path)
-    quoted_home = shlex.quote(user_home)
     quoted_user = shlex.quote(user)
-    return (
-        f"sudo -H -u {quoted_user} -- "
-        f"env HOME={quoted_home} USER={quoted_user} LOGNAME={quoted_user} SHELL={quoted_shell} "
-        f"{quoted_shell} -lc {shlex.quote(shell_command)}"
-    )
+    quoted_shell = shlex.quote(shell_path)
+    return f"sudo -H -i -u {quoted_user} -- {quoted_shell} -lc {shlex.quote(command)}"
 
 
 def wrap_argv_for_user(argv: Iterable[str], user: str) -> List[str]:
     argv_list = list(argv)
     if not should_switch_user(user):
         return argv_list
-    return ["sudo", "-H", "-u", user, "--", *argv_list]
+    return ["sudo", "-H", "-i", "-u", user, "--", *argv_list]
 
 
 def ensure_parent_dirs(path: str | Path, owner_user: Optional[str] = None) -> None:
@@ -150,22 +142,3 @@ def _resolve_shell_for_user(user: str, shell: str) -> str:
     if candidate:
         return candidate
     return shell or "/bin/sh"
-
-
-def _wrap_command_for_shell_rc(command: str, user_home: str, shell_path: str) -> str:
-    shell_name = basename(shell_path or "")
-    if shell_name == "bash":
-        return (
-            f'if [ -f {shlex.quote(user_home)}/.bash_profile ]; then . {shlex.quote(user_home)}/.bash_profile; '
-            f'elif [ -f {shlex.quote(user_home)}/.bash_login ]; then . {shlex.quote(user_home)}/.bash_login; '
-            f'elif [ -f {shlex.quote(user_home)}/.profile ]; then . {shlex.quote(user_home)}/.profile; fi; '
-            f'if [ -f {shlex.quote(user_home)}/.bashrc ]; then . {shlex.quote(user_home)}/.bashrc; fi; '
-            f'{command}'
-        )
-    if shell_name == "zsh":
-        return (
-            f'if [ -f {shlex.quote(user_home)}/.zprofile ]; then . {shlex.quote(user_home)}/.zprofile; fi; '
-            f'if [ -f {shlex.quote(user_home)}/.zshrc ]; then . {shlex.quote(user_home)}/.zshrc; fi; '
-            f'{command}'
-        )
-    return command

{portacode-1.4.44.dev1 → portacode-1.4.44.dev2}/portacode/connection/handlers/test_runtime_user.py

@@ -46,7 +46,5 @@ class RuntimeUserTests(TestCase):
 
         wrapped = wrap_shell_command("openclaw status", "meena")
 
-        self.assertIn("sudo -H -u meena -- env HOME=/home/meena USER=meena LOGNAME=meena SHELL=/bin/bash /bin/bash -lc", wrapped)
-        self.assertIn(". /home/meena/.bash_profile", wrapped)
-        self.assertIn(". /home/meena/.bashrc", wrapped)
+        self.assertIn("sudo -H -i -u meena -- /bin/bash -lc", wrapped)
         self.assertIn("openclaw status", wrapped)

{portacode-1.4.44.dev1 → portacode-1.4.44.dev2}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.44.dev1
+Version: 1.4.44.dev2
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian