portacode 1.4.17.dev9__py3-none-any.whl → 1.4.17.dev11__py3-none-any.whl

portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.17.dev9'
-__version_tuple__ = version_tuple = (1, 4, 17, 'dev9')
+__version__ = version = '1.4.17.dev11'
+__version_tuple__ = version_tuple = (1, 4, 17, 'dev11')
 
 __commit_id__ = commit_id = None

portacode/connection/handlers/proxmox_infra.py

@@ -1438,6 +1438,15 @@ def _su_command(user: str, command: str) -> str:
     return f"su - {user} -s /bin/sh -c {shlex.quote(command)}"
 
 
+def _resolve_portacode_cli_path(vmid: int, user: str) -> str:
+    """Resolve the full path to the portacode CLI inside the container."""
+    res = _run_pct(vmid, _su_command(user, "command -v portacode"))
+    path = (res.get("stdout") or "").strip()
+    if path:
+        return path
+    return "portacode"
+
+
 def _run_pct_check(vmid: int, cmd: str) -> Dict[str, Any]:
     res = _run_pct(vmid, cmd)
     if res["returncode"] != 0:
@@ -2240,7 +2249,11 @@ class CreateProxmoxContainerHandler(SyncHandler):
                         on_behalf_of_device=device_id,
                     )
 
-                    cmd = _su_command(payload_local["username"], "sudo -S portacode service install")
+                    cli_path = _resolve_portacode_cli_path(vmid, payload_local["username"])
+                    cmd = _su_command(
+                        payload_local["username"],
+                        f"sudo -S {shlex.quote(cli_path)} service install",
+                    )
                     res = _run_pct(vmid, cmd, input_text=payload_local["password"] + "\n")
 
                     if res["returncode"] != 0:
@@ -2403,7 +2416,8 @@ class StartPortacodeServiceHandler(SyncHandler):
             on_behalf_of_device=on_behalf_of_device,
         )
 
-        cmd = _su_command(user, "sudo -S portacode service install")
+        cli_path = _resolve_portacode_cli_path(vmid, user)
+        cmd = _su_command(user, f"sudo -S {shlex.quote(cli_path)} service install")
         res = _run_pct(vmid, cmd, input_text=password + "\n")
 
         if res["returncode"] != 0:

portacode/service.py

@@ -209,6 +209,7 @@ class _OpenRCService:
 
     def __init__(self) -> None:
         self.init_path = Path("/etc/init.d") / self.NAME
+        self.wrapper_path = Path("/usr/local/share/portacode/connect_service.sh")
         self.user = os.environ.get("SUDO_USER") or os.environ.get("USER") or os.getlogin()
         try:
             self.home = Path(pwd.getpwnam(self.user).pw_dir)
@@ -224,18 +225,16 @@ class _OpenRCService:
         return subprocess.run(cmd, text=True, capture_output=True)
 
     def _write_init_script(self) -> None:
+        self._write_wrapper_script()
         script = textwrap.dedent(f"""
             #!/sbin/openrc-run
             description="Portacode persistent connection"
 
-            command="{self.python}"
-            command_args="-m portacode connect --non-interactive"
+            command="{self.wrapper_path}"
             command_user="{self.user}"
             command_background="yes"
             pidfile="/run/portacode.pid"
             directory="{self.home}"
-            output_log="{self.log_path}"
-            error_log="{self.log_path}"
 
             depend() {{
                 need net
@@ -243,6 +242,10 @@ class _OpenRCService:
 
             start_pre() {{
                 checkpath --directory --mode 0755 /var/log/portacode
+                checkpath --directory --mode 0755 /usr/local/share/portacode
+                touch "{self.log_path}"
+                chown {self.user} "{self.log_path}"
+                chown {self.user} /var/log/portacode
             }}
         """).lstrip()
 
@@ -258,6 +261,25 @@ class _OpenRCService:
             tmp_path.unlink()
         except Exception:
             pass
+    
+    def _write_wrapper_script(self) -> None:
+        script = textwrap.dedent(f"""
+            #!/bin/sh
+            cd "{self.home}"
+            exec "{self.python}" -m portacode connect --non-interactive >> "{self.log_path}" 2>&1
+        """).lstrip()
+        tmp_path = Path(tempfile.gettempdir()) / f"portacode-wrapper-{os.getpid()}"
+        tmp_path.write_text(script)
+        if os.geteuid() != 0:
+            self._run("install", "-m", "755", str(tmp_path), str(self.wrapper_path))
+        else:
+            self.wrapper_path.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copyfile(tmp_path, self.wrapper_path)
+            self.wrapper_path.chmod(0o755)
+        try:
+            tmp_path.unlink()
+        except Exception:
+            pass
 
     def install(self) -> None:
         self._write_init_script()

{portacode-1.4.17.dev9.dist-info → portacode-1.4.17.dev11.dist-info}/METADATA

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

{portacode-1.4.17.dev9.dist-info → portacode-1.4.17.dev11.dist-info}/RECORD

@@ -1,13 +1,13 @@
 portacode/README.md,sha256=4dKtpvR8LNgZPVz37GmkQCMWIr_u25Ao63iW56s7Ke4,775
 portacode/__init__.py,sha256=oB3sV1wXr-um-RXio73UG8E5Xx6cF2ZVJveqjNmC-vQ,1086
 portacode/__main__.py,sha256=jmHTGC1hzmo9iKJLv-SSYe9BSIbPPZ2IOpecI03PlTs,296
-portacode/_version.py,sha256=vNmWumwOSakJSXsv8x_EdHyiL23srCSUrbOcexyXbKc,719
+portacode/_version.py,sha256=Lg3L_Yd907oy5QaxmgSlo_Rw45Rv_u8XLVUuKTmx3Gg,721
 portacode/cli.py,sha256=mGLKoZ-T2FBF7IA9wUq0zyG0X9__-A1ao7gajjcVRH8,21828
 portacode/data.py,sha256=5-s291bv8J354myaHm1Y7CQZTZyRzMU3TGe5U4hb-FA,1591
 portacode/keypair.py,sha256=0OO4vHDcF1XMxCDqce61xFTlFwlTcmqe5HyGsXFEt7s,5838
 portacode/logging_categories.py,sha256=9m-BYrjyHh1vjZYBQT4JhAh6b_oYUhIWayO-noH1cSE,5063
 portacode/pairing.py,sha256=OzSuc0GhrknrDrny4aBU6IUnmKzRDTtocuDpyaVnyrs,3116
-portacode/service.py,sha256=RkXWeTDT0t3rJ3szt_qlKR2P_SXIMUcFSl70BfIJpjo,20651
+portacode/service.py,sha256=8dX9bmJ97r8UuM4PJMICQ_D8kWpMPRIdTgPJfsOKmrM,21617
 portacode/connection/README.md,sha256=f9rbuIEKa7cTm9C98rCiBbEtbiIXQU11esGSNhSMiJg,883
 portacode/connection/__init__.py,sha256=atqcVGkViIEd7pRa6cP2do07RJOM0UWpbnz5zXjGktU,250
 portacode/connection/client.py,sha256=jtLb9_YufqPkzi9t8VQH3iz_JEMisbtY6a8L9U5weiU,14181
@@ -22,7 +22,7 @@ portacode/connection/handlers/diff_handlers.py,sha256=iYTIRCcpEQ03vIPKZCsMTE5aZb
 portacode/connection/handlers/file_handlers.py,sha256=nAJH8nXnX07xxD28ngLpgIUzcTuRwZBNpEGEKdRqohw,39507
 portacode/connection/handlers/project_aware_file_handlers.py,sha256=AqgMnDqX2893T2NsrvUSCwjN5VKj4Pb2TN0S_SuboOE,9803
 portacode/connection/handlers/project_state_handlers.py,sha256=v6ZefGW9i7n1aZLq2jOGumJIjYb6aHlPI4m1jkYewm8,1686
-portacode/connection/handlers/proxmox_infra.py,sha256=dxn6m7buw_GHbhkhWX6J7gDpqCpXmmBxfqSb-6aQiPg,98542
+portacode/connection/handlers/proxmox_infra.py,sha256=6Av5QeNQGh38U0kRzoB4ZICmSrRaWLT3YXHoAqUisv4,99102
 portacode/connection/handlers/registry.py,sha256=qXGE60sYEWg6ZtVQzFcZ5YI2XWR6lMgw4hAL9x5qR1I,6181
 portacode/connection/handlers/session.py,sha256=uNGfiO_1B9-_yjJKkpvmbiJhIl6b-UXlT86UTfd6WYE,42219
 portacode/connection/handlers/system_handlers.py,sha256=fr12QpOr_Z8KYGUU-AYrTQwRPAcrLK85hvj3SEq1Kw8,14757
@@ -65,7 +65,7 @@ portacode/utils/__init__.py,sha256=NgBlWTuNJESfIYJzP_3adI1yJQJR0XJLRpSdVNaBAN0,3
 portacode/utils/diff_apply.py,sha256=4Oi7ft3VUCKmiUE4VM-OeqO7Gk6H7PF3WnN4WHXtjxI,15157
 portacode/utils/diff_renderer.py,sha256=S76StnQ2DLfsz4Gg0m07UwPfRp8270PuzbNaQq-rmYk,13850
 portacode/utils/ntp_clock.py,sha256=VqCnWCTehCufE43W23oB-WUdAZGeCcLxkmIOPwInYHc,2499
-portacode-1.4.17.dev9.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.4.17.dev11.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
 test_modules/README.md,sha256=Do_agkm9WhSzueXjRAkV_xEj6Emy5zB3N3VKY5Roce8,9274
 test_modules/__init__.py,sha256=1LcbHodIHsB0g-g4NGjSn6AMuCoGbymvXPYLOb6Z7F0,53
 test_modules/test_device_online.py,sha256=QtYq0Dq9vME8Gp2O4fGSheqVf8LUtpsSKosXXk56gGM,1654
@@ -91,8 +91,8 @@ testing_framework/core/playwright_manager.py,sha256=Tw46qwxIhOFkS48C2IWIQHHNpEe-
 testing_framework/core/runner.py,sha256=j2QwNJmAxVBmJvcbVS7DgPJUKPNzqfLmt_4NNdaKmZU,19297
 testing_framework/core/shared_cli_manager.py,sha256=BESSNtyQb7BOlaOvZmm04T8Uezjms4KCBs2MzTxvzYQ,8790
 testing_framework/core/test_discovery.py,sha256=2FZ9fJ8Dp5dloA-fkgXoJ_gCMC_nYPBnA3Hs2xlagzM,4928
-portacode-1.4.17.dev9.dist-info/METADATA,sha256=unCc_gEcNxw9Xt0mzn9Q7uPd9ENflwl8_o_LBb_uH4E,13051
-portacode-1.4.17.dev9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-portacode-1.4.17.dev9.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
-portacode-1.4.17.dev9.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
-portacode-1.4.17.dev9.dist-info/RECORD,,
+portacode-1.4.17.dev11.dist-info/METADATA,sha256=qpoxNNnCxvUgnxqz8EyYsPLpSa6TQIC9YeHhTC-DGH0,13052
+portacode-1.4.17.dev11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+portacode-1.4.17.dev11.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.4.17.dev11.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.4.17.dev11.dist-info/RECORD,,