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

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "witbitz-code"
-version = "1.6.1"
+version = "1.6.2"
 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"
@@ -43,7 +43,7 @@ where = ["src"]
 
 # Our OpenCode plugins, installed by `serve` (plugins.py) — copies of tools/opencode-plugins, kept current by embed.mjs
 [tool.setuptools.package-data]
-witbitz_code = ["opencode_plugins/*", "confidential_models.json", "offered_models.json", "tools_catalog.json", "ui_static/*"]
+witbitz_code = ["opencode_plugins/*", "confidential_models.json", "offered_models.json", "tools_catalog.json", "ui_static/*", "icons/*"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]

{witbitz_code-1.6.1 → witbitz_code-1.6.2}/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.1"
+__version__ = "1.6.2"

{witbitz_code-1.6.1 → witbitz_code-1.6.2}/src/witbitz_code/wslstart.py

@@ -19,6 +19,7 @@ from __future__ import annotations
 import base64
 import getpass
 import os
+import re
 import shutil
 import subprocess
 import sys
@@ -50,6 +51,31 @@ def wsl_args(distro: str, user: str, cmd: list[str], verb: list[str] | None = No
     return _join(parts)
 
 
+_SAFE_DIR = re.compile(r"[A-Za-z0-9_./+:@-]+")
+
+
+def carried_path(path: str | None = None) -> str:
+    """This terminal's PATH for a start that runs the command directly — wsl.exe's `--` reads no ~/.bashrc, so a hidden copy
+    had only the system folders: no OpenCode (nvm's, ~/.opencode/bin), no witbitz-code (the owner, 2026-10-09: "OpenCode is
+    not installed" and "Start when I log in — not available"). Only plain folder names cross the Windows command line."""
+    parts = (os.environ.get("PATH", "") if path is None else path).split(":")
+    return ":".join(dict.fromkeys(p for p in parts if p and _SAFE_DIR.fullmatch(p) and ":" not in p))
+
+
+def wsl_command(exe: str, path: str | None = None) -> list[str]:
+    """[env, PATH=…, exe] — the command a hidden start runs, with this terminal's PATH."""
+    return ["env", "PATH=" + carried_path(path), exe]
+
+
+def this_program() -> str:
+    """witbitz-code on PATH, else the program running now (a hidden copy started before 1.6.2 had no ~/.local/bin)."""
+    exe = shutil.which("witbitz-code")
+    if exe:
+        return exe
+    argv0 = os.path.abspath(sys.argv[0]) if sys.argv and sys.argv[0] else ""
+    return argv0 if argv0 and os.path.basename(argv0) == "witbitz-code" and os.path.exists(argv0) else ""
+
+
 def headless_args(distro: str, user: str, cmd: list[str], verb: list[str]) -> str:
     """conhost.exe's arguments: no window, then wsl.exe with wsl_args."""
     return "--headless wsl.exe " + wsl_args(distro, user, cmd, verb)
@@ -59,11 +85,52 @@ def _q(s: str) -> str:  # a PowerShell single-quoted string
     return "'" + s.replace("'", "''") + "'"
 
 
-def enable_script(name: str, args: str, folder: str = STARTUP, target: str = WSL_EXE) -> str:
-    """`target` is a PowerShell expression (wsl.exe), or a path made one with _q (native Windows: the launcher)."""
+def enable_script(name: str, args: str, folder: str = STARTUP, target: str = WSL_EXE, icon: str = "") -> str:
+    """`target` is a PowerShell expression (wsl.exe), or a path made one with _q (native Windows: the launcher). `icon`: a
+    PowerShell expression for an .ico (else the target's own icon — a console window's, for conhost)."""
     return (f"$p = Join-Path ({folder}) {_q(name)}; $s = (New-Object -ComObject WScript.Shell).CreateShortcut($p); "
             f"$s.TargetPath = {target}; $s.Arguments = {_q(args)}; $s.WorkingDirectory = $env:USERPROFILE; $s.WindowStyle = 7; "
-            "$s.Description = 'Witbitz Code'; $s.Save(); 'ok'")
+            + (f"if (Test-Path ({icon})) {{ $s.IconLocation = ({icon}) + ',0' }}; " if icon else "")
+            + "$s.Description = 'Witbitz Code'; $s.Save(); 'ok'")
+
+
+# The shortcuts' icons (icons/ in this package; the owner, 2026-10-09: the WSL entry "has a terminal icon"). WSL's is
+# copied to a Windows folder of its own — not under %LOCALAPPDATA%\Witbitz, which the Windows copy's uninstall deletes.
+ICON_DIR = "(Join-Path $env:LOCALAPPDATA 'Witbitz-WSL')"
+WSL_ICON = f"(Join-Path {ICON_DIR} 'witbitz-code-wsl.ico')"
+
+
+def icon_file(name: str) -> str:
+    return os.path.join(os.path.dirname(os.path.abspath(__file__)), "icons", name)
+
+
+def linux_path(windows: str, run: Callable = subprocess.run) -> str:
+    """wslpath -u — '' when it cannot say."""
+    try:
+        r = run(["wslpath", "-u", windows], capture_output=True, text=True, timeout=10)
+        return (r.stdout or "").strip() if r.returncode == 0 else ""
+    except (OSError, subprocess.SubprocessError):
+        return ""
+
+
+def copy_icon(*, ps: Callable[[str], tuple[int, str]] | None = None, to_linux: Callable[[str], str] = linux_path,
+              src: str | None = None) -> bool:
+    """Put WSL's icon in its Windows folder, written from THIS side through /mnt/c (Windows could not read the
+    \\\\wsl.localhost path of the package on the owner's laptop: "does not exist"). → whether it is there now."""
+    src = src or icon_file("witbitz-code-wsl.ico")
+    code, out = (ps or run_ps)("$env:LOCALAPPDATA")
+    local = out.splitlines()[-1].strip() if code == 0 and out else ""
+    if not re.fullmatch(r"[A-Za-z]:\\[^\x00-\x1f]+", local):  # only a real Windows folder ("C:\Users\…\Local")
+        return False
+    dest_dir = to_linux(local)
+    if not dest_dir or not os.path.isabs(dest_dir) or not os.path.exists(src):
+        return False
+    try:
+        os.makedirs(os.path.join(dest_dir, "Witbitz-WSL"), exist_ok=True)
+        shutil.copyfile(src, os.path.join(dest_dir, "Witbitz-WSL", "witbitz-code-wsl.ico"))
+        return True
+    except OSError:
+        return False
 
 
 def state_script(name: str, folder: str = STARTUP) -> str:
@@ -101,11 +168,12 @@ def startup_here() -> dict | None:
     """What the WSL shortcut would be — None off WSL, with no Windows PowerShell to write it, or no witbitz-code on PATH."""
     if not ports.on_wsl() or not (os.path.exists(POWERSHELL) or shutil.which("powershell.exe")):
         return None
-    exe = shutil.which("witbitz-code")
+    exe = this_program()
     if not exe:
         return None
     distro = os.environ.get("WSL_DISTRO_NAME", "")
-    return {"name": shortcut_name(distro), "args": headless_args(distro, getpass.getuser(), [exe], UI_QUIET), "target": CONHOST}
+    return {"name": shortcut_name(distro), "args": headless_args(distro, getpass.getuser(), wsl_command(exe), UI_QUIET), "target": CONHOST,
+            "icon": WSL_ICON}
 
 
 def menu_name(distro: str) -> str:
@@ -119,7 +187,7 @@ def launch_script(args: str) -> str:
 
 
 def launch_background(*, ps: Callable[[str], tuple[int, str]] = run_ps, which: Callable[[str], str | None] = shutil.which,
-                      on_wsl: Callable[[], bool] = ports.on_wsl) -> tuple[bool, str]:
+                      on_wsl: Callable[[], bool] = ports.on_wsl, copy: Callable[..., bool] | None = None) -> tuple[bool, str]:
     """WSL: start the page's manager with no window, held by a hidden wsl.exe on the Windows side, and let it open the
     page in the Windows browser — setup's hand-off (this terminal may then close). → (ok, why)."""
     if not on_wsl():
@@ -127,14 +195,16 @@ def launch_background(*, ps: Callable[[str], tuple[int, str]] = run_ps, which: C
     exe = which("witbitz-code")
     if not exe:
         return False, "witbitz-code is not on PATH"
+    copy = copy or copy_icon
     distro = os.environ.get("WSL_DISTRO_NAME", "")
-    args = headless_args(distro, getpass.getuser(), [exe], ["ui", "--hidden"])
+    args = headless_args(distro, getpass.getuser(), wsl_command(exe), ["ui", "--hidden"])
     # The Start-menu entry first (it opens this page again, starting it if it is not running), then the start itself.
-    menu = enable_script(menu_name(distro), args, folder=PROGRAMS, target=CONHOST)
+    icon = WSL_ICON if copy(ps=ps) else ""
+    menu = enable_script(menu_name(distro), args, folder=PROGRAMS, target=CONHOST, icon=icon)
     # A login start written by 1.4.0–1.5.x opens a minimized window: an existing one is rewritten to start hidden too.
-    quiet = headless_args(distro, getpass.getuser(), [exe], UI_QUIET)
+    quiet = headless_args(distro, getpass.getuser(), wsl_command(exe), UI_QUIET)
     login = (f"if (Test-Path (Join-Path ({STARTUP}) {_q(shortcut_name(distro))})) {{ "
-             f"{enable_script(shortcut_name(distro), quiet, target=CONHOST)} | Out-Null }}")
+             f"{enable_script(shortcut_name(distro), quiet, target=CONHOST, icon=icon)} | Out-Null }}")
     code, out = ps(f"try {{ {menu} | Out-Null; {login} }} catch {{ }}; {launch_script(args)}")
     ok = code == 0 and bool(out) and out.splitlines()[-1].strip() == "ok"
     return ok, "" if ok else ("Windows PowerShell could not be started" if code == -1 else f"Windows PowerShell answered {code}")
@@ -148,7 +218,8 @@ def windows_startup_spec(env: dict | None = None, which: Callable[[str], str | N
     env = os.environ if env is None else env
     pyw = os.path.join(os.path.dirname(executable or sys.executable), "pythonw.exe")
     if exists(pyw):
-        return {"name": "Witbitz Code.lnk", "args": _join(["-m", "witbitz_code", *WIN_QUIET]), "target": _q(pyw)}
+        return {"name": "Witbitz Code.lnk", "args": _join(["-m", "witbitz_code", *WIN_QUIET]), "target": _q(pyw),
+                "icon": _q(icon_file("witbitz-code.ico"))}
     launcher = os.path.join(env.get("LOCALAPPDATA", ""), "Witbitz", "Witbitz Code.cmd")
     if env.get("LOCALAPPDATA") and exists(launcher):
         return {"name": "Witbitz Code.lnk", "args": "--no-browser", "target": _q(launcher)}
@@ -171,7 +242,7 @@ def startup_state(spec: dict, *, ps: Callable[[str], tuple[int, str]] = run_ps)
 
 
 def startup_enable(spec: dict, *, ps: Callable[[str], tuple[int, str]] = run_ps) -> tuple[bool, str]:
-    code, out = ps(enable_script(spec["name"], spec["args"], target=spec.get("target", WSL_EXE)))
+    code, out = ps(enable_script(spec["name"], spec["args"], target=spec.get("target", WSL_EXE), icon=spec.get("icon", "")))
     ok = code == 0 and out.splitlines()[-1].strip() == "ok" if out else False
     return ok, "" if ok else (f"Windows PowerShell answered {code}" if code != -1 else "Windows PowerShell could not be started")
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.6.1
+Version: 1.6.2
 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.1 → witbitz_code-1.6.2}/src/witbitz_code.egg-info/SOURCES.txt

@@ -56,6 +56,8 @@ src/witbitz_code.egg-info/dependency_links.txt
 src/witbitz_code.egg-info/entry_points.txt
 src/witbitz_code.egg-info/requires.txt
 src/witbitz_code.egg-info/top_level.txt
+src/witbitz_code/icons/witbitz-code-wsl.ico
+src/witbitz_code/icons/witbitz-code.ico
 src/witbitz_code/opencode_plugins/notes-init.md
 src/witbitz_code/opencode_plugins/witbitz-media-server.mjs
 src/witbitz_code/opencode_plugins/witbitz-notes.js

{witbitz_code-1.6.1 → witbitz_code-1.6.2}/tests/test_wslstart.py

@@ -47,7 +47,8 @@ def test_the_windows_login_start_runs_pythonw_in_the_background_when_it_is_there
     exe = r"C:\Users\a\AppData\Local\Witbitz\tools\witbitz-code\Scripts\python.exe"
     pyw = __import__("os").path.join(__import__("os").path.dirname(exe), "pythonw.exe")
     spec = ws.windows_startup_spec(env={"LOCALAPPDATA": r"C:\Users\a\AppData\Local"}, exists=lambda p: p == pyw, executable=exe)
-    assert spec == {"name": "Witbitz Code.lnk", "args": "-m witbitz_code ui --no-browser", "target": "'" + pyw + "'"}
+    assert {k: spec[k] for k in ("name", "args", "target")} == {"name": "Witbitz Code.lnk", "args": "-m witbitz_code ui --no-browser", "target": "'" + pyw + "'"}
+    assert spec["icon"].endswith("witbitz-code.ico'"), "the robot, not the launcher's icon"
     launcher_only = ws.windows_startup_spec(env={"LOCALAPPDATA": "L"}, exists=lambda p: p.endswith("Witbitz Code.cmd"), executable=exe)
     assert launcher_only["args"] == "--no-browser" and launcher_only["target"].endswith("Witbitz Code.cmd'")
 
@@ -56,12 +57,46 @@ def test_wsl_runs_headless_held_by_a_hidden_wsl_exe():
     from witbitz_code import wslstart as ws
     seen = []
     ok, why = ws.launch_background(ps=lambda script: seen.append(script) or (0, "ok"), which=lambda n: "/home/a/.local/bin/witbitz-code",
-                                   on_wsl=lambda: True)
+                                   on_wsl=lambda: True, copy=lambda ps: False)
     assert ok and why == ""
     assert "GetFolderPath('Programs')" in seen[0] and "'Witbitz Code (WSL " in seen[0], "its own Start-menu entry"
     assert seen[0].index("Programs") < seen[0].index("Start-Process"), "the entry is written before the start"
     assert "if (Test-Path (Join-Path ([Environment]::GetFolderPath('Startup'))" in seen[0], "an older login start is rewritten hidden"
-    assert "conhost.exe" in seen[0] and "'--headless wsl.exe " in seen[0] and "-- /home/a/.local/bin/witbitz-code ui --hidden'" in seen[0]
+    assert "conhost.exe" in seen[0] and "'--headless wsl.exe " in seen[0] and " /home/a/.local/bin/witbitz-code ui --hidden'" in seen[0] and "-- env PATH=" in seen[0]
     assert ws.launch_background(ps=lambda s: (0, "ok"), on_wsl=lambda: False) == (False, "not in WSL")
-    assert ws.launch_background(ps=lambda s: (1, ""), which=lambda n: "/w", on_wsl=lambda: True) == (False, "Windows PowerShell answered 1")
+    assert ws.launch_background(ps=lambda s: (1, ""), which=lambda n: "/w", on_wsl=lambda: True, copy=lambda ps: False) == (False, "Windows PowerShell answered 1")
     assert ws.headless_args("UbuntuD", "u", ["/w"], ws.UI_QUIET) == "--headless wsl.exe -d UbuntuD -u u --cd ~ -- /w ui --no-browser --hidden"
+
+
+def test_a_hidden_start_carries_this_terminal_s_path():
+    """wsl.exe -- reads no ~/.bashrc: the hidden copy found no OpenCode (nvm's) and no witbitz-code (the owner, 2026-10-09)."""
+    from witbitz_code import wslstart as ws
+    path = "/home/u/.nvm/versions/node/v24.3.0/bin:/home/u/.local/bin:/usr/bin:/mnt/c/Program Files/Git/cmd:/mnt/c/WINDOWS/system32:/usr/bin::/x;rm"
+    assert ws.carried_path(path) == "/home/u/.nvm/versions/node/v24.3.0/bin:/home/u/.local/bin:/usr/bin:/mnt/c/WINDOWS/system32"
+    assert ws.wsl_command("/home/u/.local/bin/witbitz-code", path)[:2] == ["env", "PATH=" + ws.carried_path(path)]
+
+
+def test_the_shortcuts_carry_witbitz_icons_and_wsl_copies_its_own_to_windows(monkeypatch):
+    """The owner, 2026-10-09: the WSL entry "has a terminal icon" (conhost's)."""
+    import os
+    from witbitz_code import wslstart as ws
+    assert os.path.getsize(ws.icon_file("witbitz-code.ico")) > 1000 and os.path.getsize(ws.icon_file("witbitz-code-wsl.ico")) > 1000
+    s = ws.enable_script("x.lnk", "-a", icon=ws.WSL_ICON)
+    assert "if (Test-Path ((Join-Path (Join-Path $env:LOCALAPPDATA 'Witbitz-WSL') 'witbitz-code-wsl.ico')))" in s and "IconLocation" in s
+    assert "IconLocation" not in ws.enable_script("x.lnk", "-a"), "no icon asked → the script is as before (Node parity)"
+    seen = []
+    ws.launch_background(ps=lambda script: seen.append(script) or (0, "ok"), which=lambda n: "/w", on_wsl=lambda: True, copy=lambda ps: True)
+    assert "IconLocation" in seen[0] and "Witbitz-WSL" in seen[0]
+    seen.clear()
+    ws.launch_background(ps=lambda script: seen.append(script) or (0, "ok"), which=lambda n: "/w", on_wsl=lambda: True, copy=lambda ps: False)
+    assert "IconLocation" not in seen[0], "no icon copied → the shortcut keeps its own icon"
+
+
+def test_the_icon_is_written_into_windows_local_app_data_from_this_side(tmp_path):
+    from witbitz_code import wslstart as ws
+    win = tmp_path / "Local"
+    win.mkdir()
+    ok = ws.copy_icon(ps=lambda s: (0, "C:\\Users\\a\\AppData\\Local"), to_linux=lambda p: str(win) if p.endswith("Local") else "")
+    assert ok and (win / "Witbitz-WSL" / "witbitz-code-wsl.ico").read_bytes() == open(ws.icon_file("witbitz-code-wsl.ico"), "rb").read()
+    assert ws.copy_icon(ps=lambda s: (-1, ""), to_linux=lambda p: str(win)) is False
+    assert ws.copy_icon(ps=lambda s: (0, "ok"), to_linux=lambda p: "ok") is False, "not a Windows folder: never written"