datex-studio-cli 0.4.3__tar.gz → 0.4.4__tar.gz

{datex_studio_cli-0.4.3 → datex_studio_cli-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datex-studio-cli
-Version: 0.4.3
+Version: 0.4.4
 Summary: CLI for Datex Studio low-code platform, designed for LLM-based AI agents
 Project-URL: Homepage, https://github.com/datex/datex-studio-cli
 Project-URL: Documentation, https://github.com/datex/datex-studio-cli

{datex_studio_cli-0.4.3 → datex_studio_cli-0.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "datex-studio-cli"
-version = "0.4.3"
+version = "0.4.4"
 description = "CLI for Datex Studio low-code platform, designed for LLM-based AI agents"
 readme = "README.md"
 license = "MIT"

{datex_studio_cli-0.4.3 → datex_studio_cli-0.4.4}/src/dxs/__init__.py

@@ -1,4 +1,4 @@
 """Datex Studio CLI - Command-line interface for Datex Studio platform."""
 
-__version__ = "0.4.3"
+__version__ = "0.4.4"
 __app_name__ = "dxs"

{datex_studio_cli-0.4.3 → datex_studio_cli-0.4.4}/src/dxs/utils/update_check.py

@@ -15,9 +15,12 @@ from __future__ import annotations
 
 import json
 import os
+import platform
 import re
 import shlex
+import subprocess
 import sys
+import tempfile
 import threading
 import time
 from pathlib import Path
@@ -146,16 +149,29 @@ def detect_upgrade_command() -> str:
 
 
 def _run_upgrade(command: str) -> int:
-    """Replace this process with the upgrade command.
-
-    Using ``os.execvp`` is intentional: it tears down the running ``dxs``
-    process before the upgrade tool (uv/pipx/pip) starts rewriting the venv,
-    avoiding "file in use" conflicts where the upgrader can't replace the
-    binary or package files while ``dxs`` is still running.
-
-    On success this function does not return — the process image is replaced.
-    Returns 1 only when exec itself fails to start.
+    """Hand off to the upgrade command, tearing down this process first.
+
+    POSIX uses ``os.execvp``, which truly replaces the process image and
+    frees all file handles before the upgrader (uv/pipx/pip) starts rewriting
+    the venv.
+
+    Windows is different: ``os.execvp`` there spawns a child and exits, but
+    Windows holds an exclusive image-file lock on the running ``dxs.exe``
+    launcher (e.g. ``~/.local/bin/dxs.exe``) until the launcher process fully
+    terminates — uv races ahead and fails to overwrite the entry-point shim
+    with "os error 32: file in use". So on Windows we write a small batch
+    helper that waits briefly for the launcher to exit, then runs the
+    upgrade in a fresh console window, and we exit immediately to release
+    the lock.
+
+    On success this function does not return. Returns 1 only when the
+    upgrade fails to start.
     """
+    command = command.strip()
+    if not command:
+        click.echo("Upgrade command was empty.", err=True)
+        return 1
+
     click.echo(f"Running: {command}", err=True)
     try:
         sys.stdout.flush()
@@ -163,10 +179,10 @@ def _run_upgrade(command: str) -> int:
     except Exception:  # noqa: BLE001
         pass
 
+    if platform.system() == "Windows":
+        return _spawn_windows_upgrade(command)
+
     args = shlex.split(command)
-    if not args:
-        click.echo("Upgrade command was empty.", err=True)
-        return 1
     try:
         os.execvp(args[0], args)
     except OSError as e:
@@ -175,6 +191,62 @@ def _run_upgrade(command: str) -> int:
     return 1  # unreachable on success
 
 
+def _spawn_windows_upgrade(command: str) -> int:
+    """Spawn the upgrade in a new console window detached from this process.
+
+    Writes a temporary ``.cmd`` file that waits ~3 seconds for ``dxs.exe`` to
+    fully terminate (releasing Windows' image-file lock on the launcher),
+    then runs the upgrade with one short retry if the first attempt still
+    hits a file-in-use error. The current process exits immediately so the
+    lock is released as quickly as possible.
+    """
+    script = (
+        "@echo off\r\n"
+        "echo Waiting for dxs to exit so its files can be replaced...\r\n"
+        # ping -n N sleeps roughly (N-1) seconds; portable across all
+        # Windows versions where `timeout` may not be available.
+        "ping -n 4 127.0.0.1 > nul\r\n"
+        f"echo Running: {command}\r\n"
+        f"{command}\r\n"
+        "if %ERRORLEVEL% NEQ 0 (\r\n"
+        "  echo.\r\n"
+        "  echo First attempt failed; waiting and retrying once...\r\n"
+        "  ping -n 6 127.0.0.1 > nul\r\n"
+        f"  {command}\r\n"
+        ")\r\n"
+        "echo.\r\n"
+        "if %ERRORLEVEL% NEQ 0 (echo Upgrade failed.) else (echo Upgrade complete.)\r\n"
+        "echo.\r\n"
+        "pause\r\n"
+    )
+
+    try:
+        fd, script_path = tempfile.mkstemp(prefix="dxs-upgrade-", suffix=".cmd")
+        with os.fdopen(fd, "w", newline="") as f:
+            f.write(script)
+    except OSError as e:
+        click.echo(f"Failed to write upgrade helper script: {e}", err=True)
+        return 1
+
+    click.echo(
+        "Spawning the upgrade in a new console window so dxs can exit and release its files.",
+        err=True,
+    )
+
+    CREATE_NEW_CONSOLE = 0x00000010
+    try:
+        subprocess.Popen(
+            ["cmd.exe", "/c", script_path],
+            creationflags=CREATE_NEW_CONSOLE,
+            close_fds=True,
+        )
+    except OSError as e:
+        click.echo(f"Failed to spawn upgrade: {e}", err=True)
+        return 1
+
+    sys.exit(0)
+
+
 def _interactive() -> bool:
     """True only when stdin, stderr, and stdout are all attached to a TTY.
 
@@ -231,8 +303,8 @@ def maybe_show_update_notice(skip: bool = False) -> None:
                 err=True,
             )
             exit_code = _run_upgrade(upgrade_cmd)
-            # _run_upgrade only returns when exec failed to start.
-            click.echo(f"  Upgrade exited with code {exit_code}.", err=True)
+            # _run_upgrade only returns when the upgrade failed to start.
+            click.echo(f"  Upgrade failed to start (code {exit_code}).", err=True)
     except (click.Abort, EOFError):
         click.echo("", err=True)
         return