witbitz-code 1.3.0__tar.gz → 1.3.2__tar.gz

{witbitz_code-1.3.0/src/witbitz_code.egg-info → witbitz_code-1.3.2}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "witbitz-code"
-version = "1.3.0"
+version = "1.3.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"

{witbitz_code-1.3.0 → witbitz_code-1.3.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.3.0"
+__version__ = "1.3.2"

{witbitz_code-1.3.0 → witbitz_code-1.3.2}/src/witbitz_code/account.py

@@ -73,13 +73,16 @@ async def publish_computer(*, call: ApiCall, idx: dict, computer_id: str, name:
 
 
 async def unpublish_computer(*, call: ApiCall, idx: dict, computer_id: str, now: float | None = None) -> dict:
-    """Tombstone this computer in the account's registry (its secret leaves the account). Nothing there → nothing written."""
+    """Tombstone this computer in the account's registry (its secret leaves the account). Written even when this doc does not
+    list it: an app that seals the list keeps it in 'xcomputers', which this tool cannot read (it holds no account key), and
+    an older app emptied this doc — so "not listed" here says nothing about the list the apps show (tools/opencode-pair.mjs
+    unpublishComputer). Only a tombstone already here is left alone."""
     now = _now_ms() if now is None else now
     rd = await read_doc(call, idx, COMPUTERS_DOC)
     if not rd["ok"]:
         return rd
     cur = norm_registry(rd["state"])["computers"].get(computer_id)
-    if not cur or cur.get("removed"):
+    if cur and cur.get("removed"):
         return {"ok": True, "noop": True}
     nxt = without_computer(rd["state"], computer_id, now)
     wr = await call(_write_body(idx, COMPUTERS_DOC, wrap_index_state({**nxt, "at": now}), "computer unpaired"))

{witbitz_code-1.3.0 → witbitz_code-1.3.2}/src/witbitz_code/cli.py

@@ -25,7 +25,7 @@ import httpx
 from . import __version__
 from . import pair as pair_cmd
 from . import pairings as pp
-from . import codekeys, codetools, confidential, keys, models, plugins, policy, uninstall as uninstall_mod, wizard
+from . import codekeys, codetools, confidential, keys, models, plugins, policy, uninstall as uninstall_mod, winconsole, wizard
 from ._js import to_number, truthy
 from .connector import pairings_for_port, start_connector
 from .payers import SessionPayers
@@ -263,13 +263,31 @@ async def _check_keys_every(live_keys: codekeys.LiveKeys, http: httpx.AsyncClien
 async def setup(args: list[str]) -> int:
     port_n = to_number(_flag(args, "--port", "4096"))
     port = int(port_n) if truthy(port_n) and port_n == port_n and float(port_n).is_integer() else 4096
+    from . import net  # noqa: PLC0415
+
+    client = net.new_client()
+
+    async def keys_state(p: dict) -> str:
+        entry = codekeys.for_computer(p.get("computerId") or "")
+        if not entry:
+            return "none"
+        try:
+            st = await codekeys.status(client, entry)
+        except Exception:  # noqa: BLE001 — offline: unknown, never a removal
+            return "unknown"
+        return "live" if st.get("live") is True else st.get("why") if st.get("why") in ("revoked", "paused") else "unknown"
+
     d = wizard.Deps(
         say=_err, ask=lambda q: keys.read_line(q), secret=lambda q: keys.read_line(q, hidden=True),
         port=port, port_explicit="--port" in args,
         pair=lambda p: pair_cmd.main(["--port", str(p)]),
+        keys_state=keys_state,
         is_listening=is_listening, serve_here=lambda p: serve(["--port", str(p)]),
     )
-    r = await wizard.run_setup(d)
+    try:
+        r = await wizard.run_setup(d)
+    finally:
+        await client.aclose()
     return r.get("served", 0) if not r.get("stopped") else 1
 
 
@@ -352,6 +370,7 @@ async def _main(argv: list[str]) -> int:
 
 
 def main(argv: list[str] | None = None) -> Any:
+    winconsole.prepare()  # Windows: UTF-8 when not a console, ANSI colours for the QR when it is (winconsole.py)
     try:
         code = asyncio.run(_main(sys.argv[1:] if argv is None else argv))
     except KeyboardInterrupt:

{witbitz_code-1.3.0 → witbitz_code-1.3.2}/src/witbitz_code/pair.py

@@ -205,7 +205,7 @@ async def _run(args: Args, call: Any, link_fn: LinkFn | None, out: Callable, err
                 ok = False
                 err(f"witbitz-code: ✖ {p.get('account')}: {r['why']} — kept the local pairing so you can retry")
                 continue
-            note = " (it was not listed)" if r.get("noop") else ""
+            note = " (it was already removed)" if r.get("noop") else ""
             out(f"witbitz-code: ✓ removed \"{p.get('name')}\" from {p.get('account')}{note} — every device drops it on its next sync")
             pp.write_pairings(pp.remove_pairings(pp.read_pairings(), p.get("account") or "")["doc"])
         out(f"witbitz-code: restart the connector ({START_HINT}) so it stops answering on the old channel.")

{witbitz_code-1.3.0 → witbitz_code-1.3.2}/src/witbitz_code/uninstall.py

@@ -323,7 +323,7 @@ async def run_uninstall(d: Deps) -> dict:
         except Exception as e:  # noqa: BLE001 — one account failing must not stop the rest
             r = {"ok": False, "why": str(e)}
         if r.get("ok"):
-            d.say(f"✓ Removed \"{p.get('name')}\" from {p.get('account') or 'your account'}{' (it was not listed)' if r.get('noop') else ''}")
+            d.say(f"✓ Removed \"{p.get('name')}\" from {p.get('account') or 'your account'}{' (it was already removed)' if r.get('noop') else ''}")
         else:
             d.say(f"✖ Could not remove \"{p.get('name')}\" from {p.get('account') or 'your account'} ({r.get('why')})")
             left.append(p)

witbitz_code-1.3.2/src/witbitz_code/winconsole.py

@@ -0,0 +1,60 @@
+"""Windows output, set up once before anything is printed (tests/test_winconsole.py).
+
+- Not a console (piped, redirected, captured by another program — an installer, a service log): Windows Python writes the
+  locale's code page, cp1252, and the first arrow or QR block crashed witbitz-code ("'charmap' codec can't encode
+  character '\\u2192'", measured on Windows 11 with 1.3.0). Such a stream is switched to UTF-8.
+- A console: the QR is drawn with ANSI colours (qr.render_ansi), which the console shows only once its virtual terminal
+  mode is on — Windows Terminal has it, an older console window prints the codes as text. It is turned on here.
+
+Off Windows, and wherever the console cannot say what it is, nothing changes.
+"""
+
+from __future__ import annotations
+
+import sys
+from typing import Any
+
+ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004
+STD_HANDLES = (-11, -12)  # stdout, stderr
+
+
+def _kernel32() -> Any:
+    import ctypes  # noqa: PLC0415 — Windows only
+
+    return ctypes.windll.kernel32  # type: ignore[attr-defined]
+
+
+def prepare(*, platform: str = sys.platform, streams: tuple = (), kernel32: Any = "auto") -> None:
+    if platform != "win32":
+        return
+    streams = streams or (sys.stdout, sys.stderr)
+    console = []
+    for i, s in enumerate(streams):
+        try:
+            tty = bool(s.isatty())
+        except (AttributeError, ValueError):
+            tty = False
+        if tty:
+            console.append(STD_HANDLES[i] if i < len(STD_HANDLES) else None)
+            continue
+        try:
+            s.reconfigure(encoding="utf-8", errors="replace")
+        except (AttributeError, ValueError):
+            pass
+    if not any(h is not None for h in console):
+        return
+    try:
+        import ctypes  # noqa: PLC0415
+
+        k = _kernel32() if kernel32 == "auto" else kernel32
+        if k is None:
+            return
+        for n in console:
+            if n is None:
+                continue
+            handle = k.GetStdHandle(n)
+            mode = ctypes.c_ulong()
+            if k.GetConsoleMode(handle, ctypes.byref(mode)):
+                k.SetConsoleMode(handle, mode.value | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
+    except Exception:  # noqa: BLE001 — an old console keeps the raw code line below the QR
+        pass

{witbitz_code-1.3.0 → witbitz_code-1.3.2}/src/witbitz_code/wizard.py

@@ -69,6 +69,10 @@ class Deps:
     pair: Callable[[int], Awaitable[Any]] = None  # type: ignore[assignment]
     move_pairing: Callable[[dict, int], None] = move_pairing
     code_keys: Callable[[dict], dict | None] = lambda p: codekeys.for_computer(p.get("computerId") or "")
+    # What the ACCOUNT says about a pairing's keys: "live" | "revoked" (the computer was removed — Remove in the app, an
+    # unpair) | "paused" | "unknown" (offline) | "none" (no keys here). The file on disk outlives a removal.
+    keys_state: Callable[[dict], Awaitable[str]] | None = None
+    forget_keys: Callable[[dict], Any] = lambda p: codekeys.forget(p.get("computerId") or "")
     is_listening: Callable[[int], Awaitable[bool]] = None  # type: ignore[assignment]
     serve_here: Callable[[int], Awaitable[int]] = None  # type: ignore[assignment]
     result: dict = field(default_factory=lambda: {"opencode": False, "paired": False, "keys": False, "running": ""})
@@ -120,6 +124,14 @@ async def run_setup(d: Deps) -> dict:
                 d.move_pairing(p, port)
                 everything = d.all_pairings()
     mine = on(everything, port)
+    # A pairing the account has let go of (the owner, 2026-10-08: reinstalled after a removal and "it does not present the
+    # QR code"): its keys come back revoked, so it is not a pairing any more — say so and scan again. Offline is not that.
+    gone = [p for p in mine if d.keys_state and d.code_keys(p) and await d.keys_state(p) == "revoked"]
+    for p in gone:
+        d.forget_keys(p)
+    if mine and len(gone) == len(mine):
+        d.say(f"   {named(gone)} was removed from your Witbitz account, so this computer pairs again.")
+        mine = []
     if not mine:
         d.say("   On your phone, open Spaces → Settings → Back up & recovery → Add a device, and scan the code below.\n")
         await d.pair(port)

{witbitz_code-1.3.0 → witbitz_code-1.3.2/src/witbitz_code.egg-info}/PKG-INFO

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

@@ -38,6 +38,7 @@ src/witbitz_code/seen.py
 src/witbitz_code/tinfoil_read.py
 src/witbitz_code/tools_probe.py
 src/witbitz_code/uninstall.py
+src/witbitz_code/winconsole.py
 src/witbitz_code/wizard.py
 src/witbitz_code.egg-info/PKG-INFO
 src/witbitz_code.egg-info/SOURCES.txt
@@ -68,4 +69,5 @@ tests/test_registry.py
 tests/test_relay_codec.py
 tests/test_setup.py
 tests/test_tools_probe.py
-tests/test_uninstall.py
+tests/test_uninstall.py
+tests/test_winconsole.py

{witbitz_code-1.3.0 → witbitz_code-1.3.2}/tests/test_pair_flows.py

@@ -70,6 +70,14 @@ def test_unpublish_tombstones_and_a_second_unpair_writes_nothing():
     assert run(acct.unpublish_computer(call=MockApi(read_status=500).call, idx=IDX, computer_id="x"))["ok"] is False
 
 
+def test_unpublish_writes_the_tombstone_into_a_doc_an_app_emptied():
+    # the list lives sealed ('xcomputers'), where this tool cannot read — "not listed" here must still remove it
+    api = MockApi(docs={"computers": {"v": 2, "moved": "sealed"}})
+    r = run(acct.unpublish_computer(call=api.call, idx=IDX, computer_id="cmp_desk_01", now=1000))
+    assert r["ok"] and not r.get("noop"), r
+    assert norm_registry(api.plain("computers"))["computers"]["cmp_desk_01"] == {"removed": True, "mod": 1000}
+
+
 def test_clear_legacy_direct_keeps_contacts_and_the_model():
     api = MockApi(docs={"index2": {"v": 2, "contacts": [{"kind": "person", "email": "dana@example.com"}],
                                    "code": {"base": "https://old.example", "pass": "p", "model": "m", "agent": "build", "mod": 50}}})

{witbitz_code-1.3.0 → witbitz_code-1.3.2}/tests/test_setup.py

@@ -167,3 +167,26 @@ def test_an_opencode_started_elsewhere_is_named():
     run(wizard.run_setup(f.deps()))
     assert any("started some other way" in line for line in f.said)
     assert any("close that OpenCode first" in line for line in f.said)
+
+
+def test_a_computer_removed_from_the_account_is_paired_again_and_shows_the_qr():
+    # the owner, 2026-10-08: reinstalled after the computer was removed and "it does not present the QR code" — its pairing
+    # and keys were still on disk, so setup said "✓ Paired" over keys the account had already taken back
+    f = Fake(pairings=[{"name": "desk", "account": "a@x.com", "opencodeUrl": "http://127.0.0.1:4096", "idx": {"room": "r"}, "computerId": "c"}], keyed={"c"})
+    asked = []
+    async def keys_state(p):
+        asked.append(p["computerId"])
+        return "live" if f.paired else "revoked"
+    r = run(wizard.run_setup(f.deps(keys_state=keys_state, forget_keys=lambda p: f._keyed.discard(p["computerId"]))))
+    assert f.paired == [4096] and r["paired"] and r["keys"] and f.served == [4096]
+    assert any('"desk" → a@x.com was removed from your Witbitz account' in line for line in f.said)
+    assert any("scan the code below" in line for line in f.said)
+    assert not any(line.startswith("   ✓ Paired") for line in f.said[:f.said.index(next(x for x in f.said if "was removed" in x))])
+
+
+def test_keys_that_cannot_be_checked_are_not_taken_for_a_removal():
+    f = Fake(pairings=[{"name": "desk", "opencodeUrl": "http://127.0.0.1:4096", "idx": {"room": "r"}, "computerId": "c"}], keyed={"c"})
+    async def keys_state(p):
+        return "unknown"
+    r = run(wizard.run_setup(f.deps(keys_state=keys_state, forget_keys=lambda p: f._keyed.discard(p["computerId"]))))
+    assert f.paired == [] and r["keys"] and f.served == [4096]

witbitz_code-1.3.2/tests/test_winconsole.py

@@ -0,0 +1,58 @@
+"""Windows output (the owner's Windows laptop, 2026-10-08; measured by the drawer/mention session on Windows 11 with 1.3.0):
+piped, redirected or captured, Windows Python writes cp1252 and `witbitz-code --help` died "'charmap' codec can't encode
+character '\\u2192'"; in a console window the QR is drawn with ANSI colours, which a console shows only once its virtual
+terminal mode is on."""
+
+import io
+
+from witbitz_code import winconsole
+
+
+def cp1252_stream(tty: bool) -> io.TextIOWrapper:
+    s = io.TextIOWrapper(io.BytesIO(), encoding="cp1252", errors="strict", write_through=True)
+    s.isatty = lambda: tty  # type: ignore[method-assign]
+    return s
+
+
+def test_a_redirected_stream_on_windows_writes_utf8_instead_of_crashing():
+    out = cp1252_stream(tty=False)
+    try:
+        out.write("→")
+        raise AssertionError("cp1252 should not encode an arrow")
+    except UnicodeEncodeError:
+        pass
+    winconsole.prepare(platform="win32", streams=(out,), kernel32=None)
+    out.write("pair → ▀")
+    out.flush()
+    assert out.buffer.getvalue().endswith("pair → ▀".encode("utf-8"))
+
+
+class FakeKernel32:
+    def __init__(self, mode=0x0003, ok=True):
+        self.mode, self.ok, self.set = mode, ok, []
+
+    def GetStdHandle(self, n):  # noqa: N802 — the Win32 name
+        return {-11: 7, -12: 8}[n]
+
+    def GetConsoleMode(self, handle, ref):  # noqa: N802
+        ref._obj.value = self.mode
+        return 1 if self.ok else 0
+
+    def SetConsoleMode(self, handle, mode):  # noqa: N802
+        self.set.append((handle, mode))
+        return 1
+
+
+def test_a_console_on_windows_gets_virtual_terminal_mode_so_the_qr_draws():
+    k = FakeKernel32()
+    winconsole.prepare(platform="win32", streams=(cp1252_stream(tty=True), cp1252_stream(tty=True)), kernel32=k)
+    assert k.set == [(7, 0x0003 | 0x0004), (8, 0x0003 | 0x0004)]
+
+
+def test_nothing_changes_off_windows_or_when_the_console_cannot_say():
+    s = cp1252_stream(tty=False)
+    winconsole.prepare(platform="linux", streams=(s,), kernel32=FakeKernel32())
+    assert s.encoding == "cp1252"
+    k = FakeKernel32(ok=False)
+    winconsole.prepare(platform="win32", streams=(cp1252_stream(tty=True),), kernel32=k)
+    assert k.set == []