witbitz-code 1.6.8__tar.gz → 1.6.9__tar.gz

{witbitz_code-1.6.8/src/witbitz_code.egg-info → witbitz_code-1.6.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.6.8
+Version: 1.6.9
 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.8 → witbitz_code-1.6.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "witbitz-code"
-version = "1.6.8"
+version = "1.6.9"
 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.8 → witbitz_code-1.6.9}/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.8"
+__version__ = "1.6.9"

{witbitz_code-1.6.8 → witbitz_code-1.6.9}/src/witbitz_code/uninstall.py

@@ -302,11 +302,26 @@ def remove_opencode_program(info: dict) -> dict:
     return {"ok": False, "why": f"{info['path']} is still there", "said": said} if os.path.exists(info["path"]) else {"ok": True, "said": said}
 
 
+WINDOWS_REINSTALL = "irm https://app.witbitz.chat/code.ps1 | iex"
+
+
+def windows_installer_root() -> str:
+    """%LOCALAPPDATA%\\Witbitz — where the Windows installer (code.ps1) puts this program, OpenCode and the uninstaller."""
+    base = os.environ.get("LOCALAPPDATA") or ""
+    return (base.rstrip("\\/") + "\\Witbitz") if base else ""
+
+
 def pipx_install() -> dict:
-    """This package as pipx installed it → {"kind": "pipx", "venv"} (removable with `pipx uninstall`), else pip / other."""
+    """This package as pipx installed it → {"kind": "pipx", "venv"} (removable with `pipx uninstall`); as the Windows
+    installer (code.ps1) installed it → {"kind": "windows-installer"} (its own uninstaller removes the program, OpenCode
+    and the folder right after this — recognised by the flag it sets, or by where the program lives, so an uninstaller
+    written by an older install is covered too); else pip / other."""
     prefix = Path(sys.prefix)
     if (prefix / "pipx_metadata.json").exists():  # pipx writes it into every venv it makes, wherever PIPX_HOME is
         return {"kind": "pipx", "venv": str(prefix)}
+    root = windows_installer_root()
+    if os.environ.get("WITBITZ_INSTALLER") == "windows" or (root and str(sys.prefix).lower().startswith(root.lower() + "\\")):
+        return {"kind": "windows-installer"}
     return {"kind": "pip", "hint": f"{Path(sys.executable).name} -m pip uninstall witbitz-code"}
 
 
@@ -364,9 +379,12 @@ async def run_uninstall(d: Deps) -> dict:
     d.say(f"  • delete {d.code_dir} (the pairing secrets, files you attached in Code, the Auto-mode log)")
     if owned:
         d.say(f"  • remove what witbitz-code added to OpenCode ({len(owned)} item{'s' if len(owned) > 1 else ''}: the project-notes and progress plugins, the media and code tools)")
+    winst = pkg["kind"] == "windows-installer"
     if pkg["kind"] == "pipx":
         d.say("  • uninstall the witbitz-code program (pipx uninstall witbitz-code)")
-    d.say("It keeps OpenCode and your projects — and, unless you say so next, your keys, notes and sessions.\n")
+    if winst:
+        d.say("  • then the Windows uninstaller removes the program, OpenCode and the Witbitz folder")
+    d.say(("It keeps your projects" if winst else "It keeps OpenCode and your projects") + " — and, unless you say so next, your keys, notes and sessions.\n")
     if not d.yes and not d.ask("Continue? [y/N] ").strip().lower().startswith("y"):
         d.say("Nothing changed.")
         return {"done": False}
@@ -469,21 +487,22 @@ async def run_uninstall(d: Deps) -> dict:
         pkg_gone = bool(r.get("ok"))
         d.say("✓ Uninstalled the witbitz-code program" if pkg_gone else f"✖ Could not uninstall the program ({r.get('why')}) — run: pipx uninstall witbitz-code")
     d.say("")
-    if pairs:
+    winst = pkg["kind"] == "windows-installer"
+    if pairs and not winst:  # the Windows uninstaller stops whatever still runs from its folder
         d.say("If witbitz-code serve is still running in a terminal window, close that window (Ctrl-C).")
     if left:
         d.say(f"Your phone may still list {', '.join(chr(34) + str(p.get('name')) + chr(34) for p in left)}: open Code → Settings → Remove there"
               " — that also cancels its coding keys.")
-    if pkg["kind"] != "pipx":
+    if pkg["kind"] not in ("pipx", "windows-installer"):
         d.say(f"To remove the program itself: {pkg.get('hint')}")
     if oc_gone:
         tail = "" if remove_sessions else f"\nOpenCode's own data stays: {sessions['dir']} (sessions, saved logins) and its settings in ~/.config/opencode — delete those folders to remove everything."
         d.say(f"witbitz-code and OpenCode are removed. Open a new terminal window so it forgets the old PATH.{tail}")
-    elif oc["kind"] != "none":
+    elif oc["kind"] != "none" and not winst:
         d.say(f"witbitz-code is removed. OpenCode is still installed — to remove it too: {oc.get('hint')}")
     else:
         d.say("witbitz-code is removed.")
-    d.say("To start again: pipx install witbitz-code, then witbitz-code setup.")
+    d.say(f"To install again: {WINDOWS_REINSTALL}" if winst else "To start again: pipx install witbitz-code, then witbitz-code setup.")
     return {"done": True, "left": len(left), "package": pkg_gone}
 
 

{witbitz_code-1.6.8 → witbitz_code-1.6.9/src/witbitz_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.6.8
+Version: 1.6.9
 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.8 → witbitz_code-1.6.9}/tests/test_uninstall.py

@@ -210,3 +210,28 @@ 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"}]
+
+
+# THE WINDOWS INSTALLER (code.ps1) — the owner, 2026-10-11, Settings → Apps → Witbitz Code → Uninstall printed pip/pipx advice:
+# "To remove the program itself: python.exe -m pip uninstall witbitz-code", "OpenCode is still installed … remove it the
+# way it was installed", "To start again: pipx install witbitz-code". That uninstaller removes the program, OpenCode (in
+# %LOCALAPPDATA%\Witbitz\bin) and the folder right after this, and stops anything still running from it.
+def test_under_the_windows_installer_the_summary_says_what_that_uninstaller_does_not_pip_or_pipx_advice():
+    f = Fake(answers=["y"], pairs=[PAIR], oc="installer", pkg="windows-installer")
+    r = run(un.run_uninstall(f.deps(yes=True)))
+    said = "\n".join(f.said)
+    assert r["done"]
+    for wrong in ("pip uninstall", "pipx", "OpenCode is still installed", "still running in a terminal window"):
+        assert wrong not in said, f"{wrong!r} does not apply to the Windows installer:\n{said}"
+    assert "irm https://app.witbitz.chat/code.ps1 | iex" in said, said
+    assert ("package",) not in f.done, "the Windows uninstaller removes the program itself"
+
+
+def test_the_windows_installer_is_recognised_by_where_the_program_lives_even_from_an_older_uninstaller(monkeypatch):
+    monkeypatch.delenv("WITBITZ_INSTALLER", raising=False)
+    monkeypatch.setenv("LOCALAPPDATA", r"C:\Users\shter\AppData\Local")
+    monkeypatch.setattr(un.sys, "prefix", r"C:\Users\shter\AppData\Local\Witbitz\venv")
+    assert un.pipx_install()["kind"] == "windows-installer"
+    monkeypatch.setattr(un.sys, "prefix", "/home/a/.local/pipx/venvs/witbitz-code")
+    monkeypatch.setenv("WITBITZ_INSTALLER", "windows")
+    assert un.pipx_install()["kind"] == "windows-installer", "or by the flag the new uninstaller sets"