witbitz-code 1.6.0__tar.gz → 1.6.1__tar.gz

{witbitz_code-1.6.0/src/witbitz_code.egg-info → witbitz_code-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.6.0
+Version: 1.6.1
 Summary: Reach OpenCode on this computer from the Witbitz Spaces Code section, through an end-to-end sealed relay.
 Author: Witbitz
 License-Expression: MIT

{witbitz_code-1.6.0 → witbitz_code-1.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "witbitz-code"
-version = "1.6.0"
+version = "1.6.1"
 description = "Reach OpenCode on this computer from the Witbitz Spaces Code section, through an end-to-end sealed relay."
 readme = "README.md"
 requires-python = ">=3.10"

{witbitz_code-1.6.0 → witbitz_code-1.6.1}/src/witbitz_code/__init__.py

@@ -4,4 +4,4 @@ The Python implementation of tools/witbitz-code.mjs (docs/opencode-relay.md phas
 vectors and cross-implementation tests.
 """
 
-__version__ = "1.6.0"
+__version__ = "1.6.1"

{witbitz_code-1.6.0 → witbitz_code-1.6.1}/src/witbitz_code/uninstall.py

@@ -23,7 +23,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any
 
-from . import keys, plugins
+from . import keys, plugins, ports
 from . import pairings as pp
 from .wizard import find_opencode
 
@@ -138,6 +138,8 @@ def opencode_holders(data_dir: str) -> list[dict]:
                 cmd = ""
             hits.append({"pid": int(p), "cmd": cmd})
         return hits
+    if sys.platform == "win32":  # no /proc, no lsof: every opencode.exe of this user's (the owner, 2026-10-09: the background
+        return win_opencode_processes()  # copy's OpenCode held opencode.db and the delete died "WinError 32")
     files = [os.path.join(data_dir, f) for f in ("opencode.db", "opencode.db-wal", "opencode.db-shm") if os.path.exists(os.path.join(data_dir, f))]
     if not files or not shutil.which("lsof"):
         return hits
@@ -150,6 +152,55 @@ def opencode_holders(data_dir: str) -> list[dict]:
     return hits
 
 
+def win_opencode_processes(*, run: Callable[[list[str]], str] | None = None, user: str | None = None) -> list[dict]:
+    """Windows: this user's opencode.exe processes (tasklist, one CSV row each)."""
+    run = run or ports._run_text
+    user = os.environ.get("USERNAME", "") if user is None else user
+    hits = []
+    for line in run(["tasklist", "/V", "/FO", "CSV", "/NH", "/FI", "IMAGENAME eq opencode.exe"]).splitlines():
+        row = ports.parse_tasklist_row(line)
+        if row and (not user or row["user"].rsplit("\\", 1)[-1].lower() == user.lower()):
+            hits.append({"pid": row["pid"], "cmd": row["image"]})
+    return hits
+
+
+def running_witbitz(*, lock: Path | None = None, pairings: Callable[[], list] | None = None,
+                    owners: Callable[[int], list] | None = None, alive: Callable[[int], bool] | None = None) -> list[dict]:
+    """What runs witbitz-code here now: the page's manager (its ui.json names it — in the background it has no window to
+    close) and whatever holds each paired OpenCode port or its model proxy's (port + 100): a serve, its OpenCode."""
+    lock = lock or pp.pairings_path().parent / "ui.json"
+    pairings = pairings or (lambda: pp.load_pairings(log=lambda _m: None))
+    owners = owners or ports.port_owners
+    alive = alive or _alive
+    found: list[dict] = []
+    try:
+        pid = json.loads(lock.read_text(encoding="utf-8")).get("pid")
+        if isinstance(pid, int) and pid != os.getpid() and alive(pid):
+            found.append({"pid": pid, "cmd": "the Witbitz Code page"})
+    except (OSError, ValueError, AttributeError):
+        pass
+    for p in pairings():
+        tail = str(p.get("opencodeUrl") or "").rsplit(":", 1)[-1].rstrip("/")
+        port = int(tail) if tail.isdigit() else 0
+        for q in ([port, port + 100] if port else []):
+            for o in owners(q):
+                if o["pid"] != os.getpid() and all(o["pid"] != x["pid"] for x in found):
+                    found.append({"pid": int(o["pid"]), "cmd": str(o.get("cmd") or "")[:70]})
+    return found
+
+
+def _alive(pid: int) -> bool:
+    if sys.platform == "win32":
+        return _win_alive(pid)
+    try:
+        os.kill(pid, 0)
+        return True
+    except ProcessLookupError:
+        return False
+    except PermissionError:
+        return False  # another user's: not ours
+
+
 def _win_alive(pid: int) -> bool:
     """Windows: is `pid` still running? (OpenProcess + GetExitCodeProcess; access denied = another user's, still running.)"""
     import ctypes  # noqa: PLC0415 — Windows only
@@ -287,6 +338,7 @@ class Deps:
     sessions: Callable[[], dict] = None  # type: ignore[assignment]
     delete_sessions: Callable[[], None] = None  # type: ignore[assignment]
     opencode_processes: Callable[[], list] = lambda: opencode_holders(str(keys.auth_path().parent))
+    running: Callable[[], list] = running_witbitz
     stop_process: Callable[[int], bool] = stop_process
     opencode: Callable[[], dict] = opencode_here
     remove_opencode_program: Callable[[dict], dict] = remove_opencode_program
@@ -332,6 +384,12 @@ async def run_uninstall(d: Deps) -> dict:
     how = {"installer": "from OpenCode's installer, in ~/.opencode", "npm": "with npm", "brew": "with Homebrew"}.get(oc["kind"])
     remove_oc = ask(d.remove_opencode, f"Also remove OpenCode itself (installed {how})? [y/N] ") if oc["kind"] not in ("none", "other") else False
 
+    # The running witbitz-code first — the page's manager in the background, a serve, their OpenCode: it holds the files
+    # about to go (Windows refuses to delete an open file) and would keep answering the phone. Continue already said yes.
+    for p in d.running():
+        d.say(f"✓ Stopped the running witbitz-code: {p['cmd'] or 'a program'} (process {p['pid']})" if d.stop_process(p["pid"])
+              else f"✖ Could not stop {p['cmd'] or 'a program'} (process {p['pid']}) — close it, then run uninstall again")
+
     # Sessions: an OpenCode that has its database open would write it back — never delete under it.
     while remove_sessions:
         procs = d.opencode_processes()
@@ -376,8 +434,11 @@ async def run_uninstall(d: Deps) -> dict:
         d.remove_path(notes["root"])
         d.say(f"✓ Deleted {notes['root']}")
     if remove_sessions:
-        d.delete_sessions()
-        d.say(f"✓ Deleted the OpenCode sessions in {sessions['dir']} (provider logins kept)")
+        stuck = d.delete_sessions() or []
+        if stuck:
+            d.say(f"✖ Could not delete {', '.join(stuck[:4])} in {sessions['dir']} — another program still has it open; close OpenCode and delete it yourself")
+        else:
+            d.say(f"✓ Deleted the OpenCode sessions in {sessions['dir']} (provider logins kept)")
     oc_gone = False
     if remove_oc:
         try:
@@ -454,12 +515,18 @@ def sessions_info() -> dict:
     return {"dir": str(d), "exists": exists}
 
 
-def delete_sessions() -> None:
+def delete_sessions() -> list[str]:
+    """→ the names that could not be deleted (Windows: a file another program still has open), never a crash."""
     d = keys.auth_path().parent
+    left = []
     for f in d.iterdir():
         if f.name == "auth.json":
             continue
-        shutil.rmtree(f, ignore_errors=True) if f.is_dir() and not f.is_symlink() else f.unlink(missing_ok=True)
+        try:
+            shutil.rmtree(f, ignore_errors=True) if f.is_dir() and not f.is_symlink() else f.unlink(missing_ok=True)
+        except OSError:
+            left.append(f.name)
+    return left
 
 
 def saved_keys() -> list[str]:

{witbitz_code-1.6.0 → witbitz_code-1.6.1/src/witbitz_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.6.0
+Version: 1.6.1
 Summary: Reach OpenCode on this computer from the Witbitz Spaces Code section, through an end-to-end sealed relay.
 Author: Witbitz
 License-Expression: MIT

{witbitz_code-1.6.0 → witbitz_code-1.6.1}/tests/test_uninstall.py

@@ -72,7 +72,7 @@ class Fake:
             remove_opencode_program=lambda info: self.done.append(("opencode",)) or {"ok": True, "said": []},
             package=lambda: {"kind": self._pkg, "hint": "python3 -m pip uninstall witbitz-code"},
             remove_package=lambda info: self.done.append(("package",)) or {"ok": True},
-            **{"login_start": lambda: None, "menu_remove": lambda: False, **over})  # never this machine's Windows Startup folder or Start menu
+            **{"login_start": lambda: None, "menu_remove": lambda: False, "running": lambda: [], **over})  # never this machine's Windows Startup folder or Start menu
 
 
 PAIR = {"name": "desk", "account": "a@x.com", "idx": {"room": "r"}, "computerId": "c"}
@@ -174,3 +174,39 @@ def test_on_wsl_the_windows_startup_shortcut_setup_made_goes_too():
     assert gone == ["Witbitz Code (WSL UbuntuD).lnk", "menu"]
     assert any('Removed "Witbitz Code (WSL UbuntuD)" from the Start menu' in line for line in f.said)
     assert any('Removed the Windows Startup shortcut "Witbitz Code (WSL UbuntuD)"' in line for line in f.said)
+
+
+def test_the_running_witbitz_code_is_stopped_before_anything_is_deleted():
+    """The owner, 2026-10-09 (Windows): the background copy's OpenCode held opencode.db and the delete died WinError 32."""
+    f = Fake(pairs=[PAIR], sessions=True, answers=["y", "y"])
+    run(un.run_uninstall(f.deps(running=lambda: [{"pid": 8420, "cmd": "the Witbitz Code page"}, {"pid": 19228, "cmd": "opencode.exe"}])))
+    stops = [i for i, x in enumerate(f.done) if x[0] == "stop"]
+    assert [f.done[i] for i in stops] == [("stop", 8420), ("stop", 19228)]
+    assert stops[-1] < f.done.index(("sessions",)) and stops[-1] < f.done.index(("rm", "/h/.witbitz/code"))
+    assert any("Stopped the running witbitz-code: the Witbitz Code page (process 8420)" in line for line in f.said)
+
+
+def test_a_session_file_still_open_is_said_not_a_crash():
+    f = Fake(sessions=True, answers=["y", "y"])
+    d = f.deps()
+    d.delete_sessions = lambda: ["opencode.db"]
+    r = run(un.run_uninstall(d))
+    assert r.get("done") is not False
+    assert any("Could not delete opencode.db" in line for line in f.said)
+
+
+def test_what_runs_witbitz_code_is_the_page_s_manager_and_the_paired_ports_owners(tmp_path):
+    lock = tmp_path / "ui.json"
+    lock.write_text('{"port": 4290, "token": "t", "pid": 8420}')
+    owners = {4097: [{"pid": 19228, "cmd": "opencode.exe"}], 4197: [{"pid": 8420, "cmd": "python.exe"}]}
+    got = un.running_witbitz(lock=lock, pairings=lambda: [{"opencodeUrl": "http://127.0.0.1:4097"}],
+                             owners=lambda q: owners.get(q, []), alive=lambda pid: pid == 8420)
+    assert got == [{"pid": 8420, "cmd": "the Witbitz Code page"}, {"pid": 19228, "cmd": "opencode.exe"}]
+    lock.write_text('{"pid": 8420}')
+    assert un.running_witbitz(lock=lock, pairings=lambda: [], owners=lambda q: [], alive=lambda pid: False) == []
+
+
+def test_windows_finds_opencode_by_name():
+    out = '"opencode.exe","19228","Console","1","95,000 K","Running","ALONASUS\\shter","0:00:03","N/A"\n' \
+          '"opencode.exe","555","Console","1","1 K","Running","OTHER\\bob","0:00:01","N/A"\n'
+    assert un.win_opencode_processes(run=lambda argv: out, user="shter") == [{"pid": 19228, "cmd": "opencode.exe"}]