witbitz-code 1.3.0__py3-none-any.whl → 1.3.2__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → witbitz_code-1.3.2.dist-info}/METADATA

@@ -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.dist-info → witbitz_code-1.3.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-witbitz_code/__init__.py,sha256=1DVDBN_h6k6evWPdXIAumnBUic5RgCrQScZFB_02CwQ,290
+witbitz_code/__init__.py,sha256=nSbrwMc3vKJUmM8eFTRh1MhmY14_4BdYS2cGhoyaWTs,290
 witbitz_code/__main__.py,sha256=bYt9eEaoRQWdejEHFD8REx9jxVEdZptECFsV7F49Ink,30
 witbitz_code/_js.py,sha256=56cKC97SfM1UZAcOGzGnL-SgIB4SfdAlqVDXX3Vi-N0,11458
-witbitz_code/account.py,sha256=JoCbG1H-qK0hrh2PyNTFYoPpaHukuB8zfD_xaE6lsjA,6133
+witbitz_code/account.py,sha256=m_tEqkN31oEaFJQ5r1fAtl6_IE1D5IApOIJreoEGvxo,6451
 witbitz_code/asks.py,sha256=PuuM_WItEim4gKyn4tY9uEo3u_ejmcmwcJAYk2cziYs,5703
 witbitz_code/attachments.py,sha256=1IxpI0YOTl-8x8AtPXwmXYMuxU5qip0ggoBo1I7rAS4,12409
 witbitz_code/auto.py,sha256=lHwCzGOgQd42WUQTCCF4a-otEXaGQ9H4QDdPOJh1wtI,27609
 witbitz_code/auto_runner.py,sha256=PU3HP6CGFoOU4RcHVWBL5BNH1dUErKCTA8x5XAVeO1w,26521
-witbitz_code/cli.py,sha256=u-oqfcyK_9CFublNJNAdliE5AanT3woDudlMRSVQbww,18289
+witbitz_code/cli.py,sha256=6dPQ1VegsFY9RhZo6hIHt7gi9jI8UQIFhKlkDKRAJvs,19029
 witbitz_code/codekeys.py,sha256=N-U9TJkXl318yNH8qvu1JLZmFruFSqCuxvDhVjyu2ck,13842
 witbitz_code/codetools.py,sha256=MAZ3CkeHhHgaNa1Mi_nmL7eIC-uOroskdnSSVgomkCI,6758
 witbitz_code/compress.py,sha256=ghZf_HTmYyHOwJDxDgJumr-7hIeohwio_SIMrzs1jtM,759
@@ -23,7 +23,7 @@ witbitz_code/models.py,sha256=v9RdoNj0iBXI7vstQ-M6tjRakPV4_S867OPtcZTI974,4046
 witbitz_code/net.py,sha256=YnqhwZPer4RADTtNIGdp02NXzI5v45fq9XsWOr-yLns,2062
 witbitz_code/offered_models.json,sha256=YJVQQfNOrrIDU5KQwzb5jMwrgmH_MD2sH7lJaMsubtg,838
 witbitz_code/outputs.py,sha256=Sibj4Gb6yNEgBQdM7DDlOXbZS93Wo0CxHz7Llzgmyvs,5808
-witbitz_code/pair.py,sha256=2FPTRV-SdCk7r0V_FA8iSduR7crwkFRv7aaMZd328WQ,13401
+witbitz_code/pair.py,sha256=OoXLpnVy_M0bAcAmmVmzAqcik9_rlby2HO84uFgiAxE,13406
 witbitz_code/pairings.py,sha256=tb9A3jfa4AHmJUsuApJGUPNlI4T8oX7oQry17BP0xcQ,9808
 witbitz_code/payers.py,sha256=0bxyAY6kjWBWnUEcZT0b-14oDTrAfYnJoTDJjfamK5c,4948
 witbitz_code/plugins.py,sha256=c4soyUM-VSwcLSmvey2aEYNfuu8J6jrsZtAAv4YzS6I,6679
@@ -34,15 +34,16 @@ witbitz_code/relay.py,sha256=9pHVrqQj0c4kGGPmckHZLsIchdLtexC5zGUjm3IwWWg,34626
 witbitz_code/seen.py,sha256=ltMM6RgOu9b2mdpGOgTKWGWME_gLHUs1UxJiY7n_AyI,2182
 witbitz_code/tinfoil_read.py,sha256=xfgKhdYMGt5GW2GFqjR2ffnMXN57JKz9Nm5wGP2qDbA,6519
 witbitz_code/tools_probe.py,sha256=fELe69rzJwpB0omek9twRHN3OOolky3wrKVXFk28VFg,3404
-witbitz_code/uninstall.py,sha256=0rwH57Z2s0iymvZU2gVPTFQE9kBsldJuRFln9hNQRtQ,22240
-witbitz_code/wizard.py,sha256=3fKRHxQ3MnQq0WreMaHSX4I5NDfHGOsfxIRBj4VFSmg,8296
+witbitz_code/uninstall.py,sha256=sv8bOfnnsiaDafeVKYZh9J5Rhcobr_Ut5LBg5ClunoQ,22245
+witbitz_code/winconsole.py,sha256=Yr5ikHj7OS4O9W_PMFzSMdC7lXXmb5Yr532oeL1wkdI,2278
+witbitz_code/wizard.py,sha256=EV4CnGLMJHnMEBQwRUjzIWdWc0iaITA8MWmTA017MC0,9242
 witbitz_code/opencode_plugins/notes-init.md,sha256=7SkhvxSFhKY0W1EZv4DIk34RzbpxoQbqub3f7DJs9c0,768
 witbitz_code/opencode_plugins/witbitz-media-server.mjs,sha256=M-wEUBlDASM89txnCyYLMUYci6Ss5du14fmEx27TZvo,75529
 witbitz_code/opencode_plugins/witbitz-notes.js,sha256=M8V0WZiJdPE78hcjHT3oo1aybbD513rMWlxbcDBOdzg,26661
 witbitz_code/opencode_plugins/witbitz-progress.js,sha256=6J9B71eZqhXpWoCLm-hSBSrlTfflCmHnWHp9yhEItbQ,10349
-witbitz_code-1.3.0.dist-info/licenses/LICENSE,sha256=tAdpEnopN3C7_Mtwt4FpOt54tdJcytanMIPmfjWQyX8,1064
-witbitz_code-1.3.0.dist-info/METADATA,sha256=S0HnydkjR8T8m1kuPk-l3uEbZNFdlGC64l1Ttp01CmM,11710
-witbitz_code-1.3.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-witbitz_code-1.3.0.dist-info/entry_points.txt,sha256=rjZTJptXZoB2fSJowQBgbsNiiTfsmJGXEwJNIYJHbu4,55
-witbitz_code-1.3.0.dist-info/top_level.txt,sha256=_Q9iBQXeIhv110W9Do9iSt_V4RRTbWIFBIjEhN_hq94,13
-witbitz_code-1.3.0.dist-info/RECORD,,
+witbitz_code-1.3.2.dist-info/licenses/LICENSE,sha256=tAdpEnopN3C7_Mtwt4FpOt54tdJcytanMIPmfjWQyX8,1064
+witbitz_code-1.3.2.dist-info/METADATA,sha256=9GNh26oNkaM-5Hi9nWSljHcNaaM_JW3ihIqVMOUoOxA,11710
+witbitz_code-1.3.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+witbitz_code-1.3.2.dist-info/entry_points.txt,sha256=rjZTJptXZoB2fSJowQBgbsNiiTfsmJGXEwJNIYJHbu4,55
+witbitz_code-1.3.2.dist-info/top_level.txt,sha256=_Q9iBQXeIhv110W9Do9iSt_V4RRTbWIFBIjEhN_hq94,13
+witbitz_code-1.3.2.dist-info/RECORD,,