portacode 1.4.15.dev26__tar.gz → 1.4.16.dev0__tar.gz

{portacode-1.4.15.dev26 → portacode-1.4.16.dev0}/PKG-INFO

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

{portacode-1.4.15.dev26 → portacode-1.4.16.dev0}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.15.dev26'
-__version_tuple__ = version_tuple = (1, 4, 15, 'dev26')
+__version__ = version = '1.4.16.dev0'
+__version_tuple__ = version_tuple = (1, 4, 16, 'dev0')
 
 __commit_id__ = commit_id = None

{portacode-1.4.15.dev26 → portacode-1.4.16.dev0}/portacode/connection/handlers/project_state/manager.py

@@ -21,6 +21,24 @@ from .git_manager import GitManager
 from .file_system_watcher import FileSystemWatcher
 from ....logging_categories import get_categorized_logger, LogCategory
 
+def _deterministic_file_tab_id(file_path: str) -> str:
+    try:
+        resolved = os.path.abspath(file_path)
+        mtime = int(Path(resolved).stat().st_mtime)
+    except OSError:
+        mtime = "unknown"
+        resolved = os.path.abspath(file_path)
+    return f"{resolved}:{mtime}"
+
+def _deterministic_diff_tab_id(
+    file_path: str,
+    from_ref: str,
+    to_ref: str,
+    from_hash: Optional[str],
+    to_hash: Optional[str]
+) -> str:
+    return f"diff:{os.path.abspath(file_path)}:{from_ref}:{to_ref}:{from_hash or ''}:{to_hash or ''}"
+
 logger = get_categorized_logger(__name__)
 
 # Global singleton instance
@@ -657,10 +675,10 @@ class ProjectStateManager:
         # Create new file tab using tab factory
         from ..tab_factory import get_tab_factory
         tab_factory = get_tab_factory()
-        
+
         try:
             logger.info(f"About to create tab for file: {file_path}")
-            new_tab = await tab_factory.create_file_tab(file_path)
+            new_tab = await tab_factory.create_file_tab(file_path, tab_id=_deterministic_file_tab_id(file_path))
             logger.info(f"Tab created successfully, adding to project state")
             project_state.open_tabs[tab_key] = new_tab
             if set_active:
@@ -842,7 +860,11 @@ class ProjectStateManager:
             diff_title = f"{os.path.basename(file_path)} ({' '.join(title_parts)})"
             
             diff_tab = await tab_factory.create_diff_tab_with_title(
-                file_path, original_content, modified_content, diff_title, 
+                file_path,
+                original_content,
+                modified_content,
+                diff_title,
+                tab_id=_deterministic_diff_tab_id(file_path, from_ref, to_ref, from_hash, to_hash),
                 diff_details=diff_details
             )
             

{portacode-1.4.15.dev26 → portacode-1.4.16.dev0}/portacode/connection/handlers/proxmox_infra.py

@@ -410,6 +410,7 @@ def _build_managed_containers_summary(records: List[Dict[str, Any]]) -> Dict[str
         containers.append(
             {
                 "vmid": str(_as_int(record.get("vmid"))) if record.get("vmid") is not None else None,
+                "device_id": record.get("device_id"),
                 "hostname": record.get("hostname"),
                 "template": record.get("template"),
                 "storage": record.get("storage"),
@@ -876,12 +877,17 @@ def _parse_ctid(message: Dict[str, Any]) -> int:
 
 
 def _ensure_container_managed(
-    proxmox: Any, node: str, vmid: int
+    proxmox: Any, node: str, vmid: int, *, device_id: Optional[str] = None
 ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
     record = _read_container_record(vmid)
     ct_cfg = proxmox.nodes(node).lxc(str(vmid)).config.get()
     if not ct_cfg or MANAGED_MARKER not in (ct_cfg.get("description") or ""):
         raise RuntimeError(f"Container {vmid} is not managed by Portacode.")
+    record_device_id = record.get("device_id")
+    if device_id and str(record_device_id or "") != str(device_id):
+        raise RuntimeError(
+            f"Container {vmid} is managed for device {record_device_id!r}, not {device_id!r}."
+        )
     return record, ct_cfg
 
 
@@ -1835,10 +1841,13 @@ class StartProxmoxContainerHandler(SyncHandler):
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
         vmid = _parse_ctid(message)
+        on_behalf_of_device = (message.get("on_behalf_of_device") or "").strip()
+        if not on_behalf_of_device:
+            raise ValueError("on_behalf_of_device is required for start_proxmox_container")
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
-        _ensure_container_managed(proxmox, node, vmid)
+        _ensure_container_managed(proxmox, node, vmid, device_id=on_behalf_of_device)
 
         status, elapsed = _start_container(proxmox, node, vmid)
         _update_container_record(vmid, {"status": "running"})
@@ -1853,6 +1862,7 @@ class StartProxmoxContainerHandler(SyncHandler):
             "details": {"exitstatus": status.get("exitstatus")},
             "status": status.get("status"),
             "infra": infra,
+            "on_behalf_of_device": on_behalf_of_device,
         }
 
 
@@ -1865,10 +1875,13 @@ class StopProxmoxContainerHandler(SyncHandler):
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
         vmid = _parse_ctid(message)
+        on_behalf_of_device = (message.get("on_behalf_of_device") or "").strip()
+        if not on_behalf_of_device:
+            raise ValueError("on_behalf_of_device is required for stop_proxmox_container")
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
-        _ensure_container_managed(proxmox, node, vmid)
+        _ensure_container_managed(proxmox, node, vmid, device_id=on_behalf_of_device)
 
         status, elapsed = _stop_container(proxmox, node, vmid)
         final_status = status.get("status") or "stopped"
@@ -1889,6 +1902,7 @@ class StopProxmoxContainerHandler(SyncHandler):
             "details": {"exitstatus": status.get("exitstatus")},
             "status": final_status,
             "infra": infra,
+            "on_behalf_of_device": on_behalf_of_device,
         }
 
 
@@ -1901,10 +1915,13 @@ class RemoveProxmoxContainerHandler(SyncHandler):
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
         vmid = _parse_ctid(message)
+        on_behalf_of_device = (message.get("on_behalf_of_device") or "").strip()
+        if not on_behalf_of_device:
+            raise ValueError("on_behalf_of_device is required for remove_proxmox_container")
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
-        _ensure_container_managed(proxmox, node, vmid)
+        _ensure_container_managed(proxmox, node, vmid, device_id=on_behalf_of_device)
 
         stop_status, stop_elapsed = _stop_container(proxmox, node, vmid)
         delete_status, delete_elapsed = _delete_container(proxmox, node, vmid)
@@ -1916,6 +1933,7 @@ class RemoveProxmoxContainerHandler(SyncHandler):
             "action": "remove",
             "success": True,
             "ctid": str(vmid),
+            "on_behalf_of_device": on_behalf_of_device,
             "message": f"Deleted container {vmid} in {delete_elapsed:.1f}s.",
             "details": {
                 "stop_exitstatus": stop_status.get("exitstatus"),

{portacode-1.4.15.dev26 → portacode-1.4.16.dev0}/portacode/connection/terminal.py

@@ -685,6 +685,7 @@ class TerminalManager:
                 try:
                     # Initialize project state
                     project_state = await manager.initialize_project_state(session_name, project_folder_path)
+                    await self._restore_tabs_from_session_metadata(manager, project_state, session)
                     
                     # Send initial project state to the client
                     initial_state_payload = {
@@ -710,6 +711,85 @@ class TerminalManager:
                     
         except Exception as exc:
             logger.exception("terminal_manager: Error initializing project states for new sessions: %s", exc)
+
+    async def _restore_tabs_from_session_metadata(self, manager, project_state, session):
+        """Restore open tabs/active tab from client session metadata if available."""
+        if not session or not project_state:
+            return
+
+        descriptors = session.get("open_tabs") or []
+        if not descriptors:
+            return
+
+        session_id = project_state.client_session_id
+        logger.info("terminal_manager: 🧭 Restoring %d tabs from metadata for session %s", len(descriptors), session_id)
+
+        for descriptor in descriptors:
+            parsed = self._parse_tab_descriptor(descriptor)
+            if not parsed:
+                continue
+
+            tab_type = parsed.get("tab_type")
+            file_path = parsed.get("file_path")
+            metadata = parsed.get("metadata", {})
+
+            if tab_type == "file" and file_path:
+                try:
+                    await manager.open_file(session_id, file_path, set_active=False)
+                except Exception as exc:
+                    logger.warning("terminal_manager: Failed to restore file tab %s for session %s: %s", file_path, session_id, exc)
+                continue
+
+            if tab_type == "diff" and file_path:
+                from_ref = metadata.get("from") or metadata.get("from_ref")
+                to_ref = metadata.get("to") or metadata.get("to_ref")
+                if not from_ref or not to_ref:
+                    logger.warning("terminal_manager: Skipping diff tab %s for session %s because from/to references are missing", file_path, session_id)
+                    continue
+                from_hash = metadata.get("from_hash") or metadata.get("fromHash")
+                to_hash = metadata.get("to_hash") or metadata.get("toHash")
+                try:
+                    await manager.open_diff_tab(session_id, file_path, from_ref, to_ref, from_hash=from_hash, to_hash=to_hash)
+                except Exception as exc:
+                    logger.warning("terminal_manager: Failed to restore diff tab %s for session %s: %s", file_path, session_id, exc)
+                continue
+
+            logger.debug("terminal_manager: Unknown tab descriptor ignored for session %s: %s", session_id, descriptor)
+
+        active_index = session.get("active_tab")
+        try:
+            active_index_int = int(active_index) if active_index is not None else None
+        except (TypeError, ValueError):
+            active_index_int = None
+
+        if active_index_int is not None and active_index_int >= 0:
+            current_tabs = list(project_state.open_tabs.values())
+            if 0 <= active_index_int < len(current_tabs):
+                try:
+                    await manager.set_active_tab(session_id, current_tabs[active_index_int].tab_id)
+                except Exception as exc:
+                    logger.warning("terminal_manager: Failed to set active tab for session %s: %s", session_id, exc)
+            else:
+                logger.debug("terminal_manager: Active tab index %s out of range for session %s", active_index_int, session_id)
+
+    def _parse_tab_descriptor(self, descriptor: str) -> Optional[Dict[str, Any]]:
+        """Parse a URL-friendly tab descriptor string."""
+        if not descriptor:
+            return None
+
+        try:
+            parts = descriptor.split("|")
+            tab_type = parts[0] if parts else None
+            file_path = parts[1] if len(parts) > 1 else None
+            metadata = {}
+            for part in parts[2:]:
+                if "=" in part:
+                    key, value = part.split("=", 1)
+                    metadata[key] = value
+            return {"tab_type": tab_type, "file_path": file_path, "metadata": metadata}
+        except Exception as exc:
+            logger.warning("terminal_manager: Failed to parse tab descriptor '%s': %s", descriptor, exc)
+            return None
     
     async def _send_targeted_terminal_list(self, message: Dict[str, Any], target_sessions: List[str]) -> None:
         """Send terminal_list command to specific client sessions.

{portacode-1.4.15.dev26 → portacode-1.4.16.dev0}/portacode.egg-info/PKG-INFO

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