webbee 0.5.4__tar.gz → 0.5.6__tar.gz

{webbee-0.5.4 → webbee-0.5.6}/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 0.5.6
+
+* **`pip install webbee` works on Python 3.7, 3.8 and 3.9** (macOS ships 3.9): webbee's dependencies need
+  3.10+, so on an older Python the install is light and the `webbee` command (`webbee/_launch.py`, standard
+  library only, 3.7 syntax) sets up the same release on its own Python 3.12 once with uv, then hands over.
+  It is the full webbee -- code index and search by meaning included. uv comes as a wheel on 3.8+; on 3.7
+  the launcher downloads uv's release build from GitHub and checks its published SHA-256. On 3.10+ nothing
+  changes. Checked on clean Python 3.7 (arm64, x86_64), 3.8, 3.9 (incl. macOS's own with pip 21) and 3.12.
+* **README**: one install section for every Python, and the errors people actually hit.
+
+## 0.5.5
+
+* **Installs on Python 3.10 again**: pip and pipx stopped with "conflicting dependencies / ResolutionImpossible"
+  because imperal-mcp up to 0.5.6 required Python 3.11 -- Ubuntu 22.04 and Pop!_OS 22.04 ship 3.10. webbee now
+  needs imperal-mcp >= 0.5.7, which runs on 3.10.
+* **`/exit` no longer hangs on Python 3.10**: the steer poller asked `Task.cancelling()` (3.11+) whether a
+  turn had swallowed its cancel; on 3.10 the call failed, the poller kept looping and the terminal never
+  closed. A submitted turn now runs as its own task the poller waits on, so the cancel always reaches the
+  poller -- one path for every Python.
+* **Python 3.10 is the stated floor** (was 3.9, which no dependency set could satisfy): an older Python now gets
+  pip's plain "requires a different Python" instead of a dependency conflict.
+* **README installs through uv first** (it brings its own Python) and lists the install errors people hit.
+
 ## 0.5.4
 
 * **Code search by meaning for repos synced before**: imperal-sdk >= 6.3.6 tells the code map this client

{webbee-0.5.4 → webbee-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: webbee
-Version: 0.5.4
+Version: 0.5.6
 Summary: Webbee 🐝 — the Imperal Cloud coding agent in your terminal
 Project-URL: Homepage, https://imperal.io
 Project-URL: Documentation, https://docs.imperal.io
@@ -17,6 +17,8 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -25,21 +27,22 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9
-Requires-Dist: asyncssh>=2.14
-Requires-Dist: httpx-sse>=0.4
-Requires-Dist: httpx>=0.27
-Requires-Dist: imperal-mcp>=0.5.0
-Requires-Dist: imperal-sdk>=6.3.6
-Requires-Dist: model2vec>=0.8.2; sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13'
-Requires-Dist: numpy>=2; sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13'
-Requires-Dist: prompt-toolkit>=3
-Requires-Dist: rich>=13.7
-Requires-Dist: tree-sitter-javascript>=0.23; sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13'
-Requires-Dist: tree-sitter-python>=0.23; sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13'
-Requires-Dist: tree-sitter-typescript>=0.23; sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13'
-Requires-Dist: tree-sitter>=0.23; sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13'
-Requires-Dist: watchfiles>=0.24; sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13'
+Requires-Python: >=3.7
+Requires-Dist: asyncssh>=2.14; python_version >= '3.10'
+Requires-Dist: httpx-sse>=0.4; python_version >= '3.10'
+Requires-Dist: httpx>=0.27; python_version >= '3.10'
+Requires-Dist: imperal-mcp>=0.5.7; python_version >= '3.10'
+Requires-Dist: imperal-sdk>=6.3.6; python_version >= '3.10'
+Requires-Dist: model2vec>=0.8.2; python_version >= '3.10' and (sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13')
+Requires-Dist: numpy>=2; python_version >= '3.10' and (sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13')
+Requires-Dist: prompt-toolkit>=3; python_version >= '3.10'
+Requires-Dist: rich>=13.7; python_version >= '3.10'
+Requires-Dist: tree-sitter-javascript>=0.23; python_version >= '3.10' and (sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13')
+Requires-Dist: tree-sitter-python>=0.23; python_version >= '3.10' and (sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13')
+Requires-Dist: tree-sitter-typescript>=0.23; python_version >= '3.10' and (sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13')
+Requires-Dist: tree-sitter>=0.23; python_version >= '3.10' and (sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13')
+Requires-Dist: uv>=0.4; python_version >= '3.8' and python_version < '3.10'
+Requires-Dist: watchfiles>=0.24; python_version >= '3.10' and (sys_platform != 'darwin' or platform_machine != 'x86_64' or python_version < '3.13')
 Provides-Extra: intel
 Provides-Extra: intel-embed
 Provides-Extra: intel-embed-faiss
@@ -79,21 +82,40 @@ Webbee is powered by **ICNLI** (*Infrastructure Contextual Natural Language Inte
 
 ## 📦 Installation
 
-Install easily using **pipx** (recommended) or **uv**:
-
 ```sh
 pipx install webbee
-# or with uv:
-uv tool install webbee
+# or:  uv tool install webbee
+# or:  pip install webbee        (inside a virtual environment)
 ```
 
-Or install in a Python virtual environment:
+No Python tools at hand? One line installs [uv](https://docs.astral.sh/uv/) (it brings its own Python) and webbee:
 
 ```sh
-python3 -m venv .venv && source .venv/bin/activate
-pip install webbee
+curl -LsSf https://raw.githubusercontent.com/imperalcloud/webbee-code/main/install.sh | sh
 ```
 
+Works with **any Python from 3.7**:
+
+- **Python 3.10 or newer** — webbee runs directly on it.
+- **Python 3.7 – 3.9** (macOS ships 3.9, Ubuntu 20.04 has 3.8) — the install is light, and the first
+  `webbee` command sets up the same release on its own Python 3.12, once (about 30–45 s, needs internet;
+  it fetches uv to do it). Every start after that is immediate, and it is the full webbee — code index
+  and search by meaning included. It lives in `~/.local/share/webbee/runtime`
+  (`%LOCALAPPDATA%\webbee\runtime` on Windows) and changes nothing else on your system.
+
+<details>
+<summary>Install problems</summary>
+
+| You see | Why | Do |
+|---------|-----|----|
+| `Cannot install webbee==… because these package versions have conflicting dependencies` / `ResolutionImpossible` | a webbee release older than 0.5.6 on Python below 3.10 | `pipx install "webbee>=0.5.6"` (or `pip install -U webbee`) |
+| `error: externally-managed-environment` | `pip install` into the system Python is blocked on Homebrew, Debian 12+, Ubuntu 23.04+ | `pipx install webbee` or `uv tool install webbee` |
+| `webbee: command not found` after install | the tool folder is not on `PATH` | `pipx ensurepath` (or `uv tool update-shell`), then open a new terminal |
+| `Could not set up webbee on Python 3.12` on the first start | Python 3.7–3.9 and no internet (or a proxy blocks github.com / pypi.org) | allow those hosts and start `webbee` again, or use the one-line installer above |
+| `No matching distribution found for webbee` | Python 3.6 or older | the one-line installer above — it brings its own Python |
+
+</details>
+
 ---
 
 ## 💡 Quick Start

{webbee-0.5.4 → webbee-0.5.6}/README.md

@@ -27,21 +27,40 @@ Webbee is powered by **ICNLI** (*Infrastructure Contextual Natural Language Inte
 
 ## 📦 Installation
 
-Install easily using **pipx** (recommended) or **uv**:
-
 ```sh
 pipx install webbee
-# or with uv:
-uv tool install webbee
+# or:  uv tool install webbee
+# or:  pip install webbee        (inside a virtual environment)
 ```
 
-Or install in a Python virtual environment:
+No Python tools at hand? One line installs [uv](https://docs.astral.sh/uv/) (it brings its own Python) and webbee:
 
 ```sh
-python3 -m venv .venv && source .venv/bin/activate
-pip install webbee
+curl -LsSf https://raw.githubusercontent.com/imperalcloud/webbee-code/main/install.sh | sh
 ```
 
+Works with **any Python from 3.7**:
+
+- **Python 3.10 or newer** — webbee runs directly on it.
+- **Python 3.7 – 3.9** (macOS ships 3.9, Ubuntu 20.04 has 3.8) — the install is light, and the first
+  `webbee` command sets up the same release on its own Python 3.12, once (about 30–45 s, needs internet;
+  it fetches uv to do it). Every start after that is immediate, and it is the full webbee — code index
+  and search by meaning included. It lives in `~/.local/share/webbee/runtime`
+  (`%LOCALAPPDATA%\webbee\runtime` on Windows) and changes nothing else on your system.
+
+<details>
+<summary>Install problems</summary>
+
+| You see | Why | Do |
+|---------|-----|----|
+| `Cannot install webbee==… because these package versions have conflicting dependencies` / `ResolutionImpossible` | a webbee release older than 0.5.6 on Python below 3.10 | `pipx install "webbee>=0.5.6"` (or `pip install -U webbee`) |
+| `error: externally-managed-environment` | `pip install` into the system Python is blocked on Homebrew, Debian 12+, Ubuntu 23.04+ | `pipx install webbee` or `uv tool install webbee` |
+| `webbee: command not found` after install | the tool folder is not on `PATH` | `pipx ensurepath` (or `uv tool update-shell`), then open a new terminal |
+| `Could not set up webbee on Python 3.12` on the first start | Python 3.7–3.9 and no internet (or a proxy blocks github.com / pypi.org) | allow those hosts and start `webbee` again, or use the one-line installer above |
+| `No matching distribution found for webbee` | Python 3.6 or older | the one-line installer above — it brings its own Python |
+
+</details>
+
 ---
 
 ## 💡 Quick Start

{webbee-0.5.4 → webbee-0.5.6}/pyproject.toml

@@ -1,20 +1,25 @@
 [project]
 name = "webbee"
-version = "0.5.4"
+version = "0.5.6"
 description = "Webbee 🐝 — the Imperal Cloud coding agent in your terminal"
 readme = "README.md"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
-requires-python = ">=3.9"
+requires-python = ">=3.7"
 authors = [{ name = "Valentin Scerbacov", email = "valentin@imperal.io" }, { name = "Imperal, Inc." }]
 dependencies = [
-    "imperal-mcp>=0.5.0",
-    "imperal-sdk>=6.3.6",
-    "asyncssh>=2.14",
-    "httpx>=0.27",
-    "httpx-sse>=0.4",
-    "rich>=13.7",
-    "prompt_toolkit>=3",
+    # Every dependency below needs Python 3.10+ (the MCP SDK, numpy 2, tree-sitter). On 3.7-3.9
+    # pip installs none of them, and the `webbee` command (webbee/_launch.py) runs this same
+    # release on a Python 3.12 it sets up once with uv -- `uv` comes as a wheel on 3.8+,
+    # 3.7 fetches it with uv's own installer.
+    'uv>=0.4; python_version >= "3.8" and python_version < "3.10"',
+    'imperal-mcp>=0.5.7; python_version >= "3.10"',
+    'imperal-sdk>=6.3.6; python_version >= "3.10"',
+    'asyncssh>=2.14; python_version >= "3.10"',
+    'httpx>=0.27; python_version >= "3.10"',
+    'httpx-sse>=0.4; python_version >= "3.10"',
+    'rich>=13.7; python_version >= "3.10"',
+    'prompt_toolkit>=3; python_version >= "3.10"',
     # --- code intelligence (CPC): the symbol/graph index is NOT optional ---
     # Without these the indexer silently yields 0 symbols (boot.py degrades to
     # intel=None), so repo_profile / graph_slice / search_code / impact_of_change
@@ -26,15 +31,15 @@ dependencies = [
     # macosx_x86_64 wheel is cp312, and numpy stops there too). On that one
     # platform the install stays green and intel fails soft to lexical+graph
     # or off, exactly as tests/test_intel_no_numpy.py guarantees.
-    'tree-sitter>=0.23; sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13"',
-    'tree-sitter-python>=0.23; sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13"',
-    'tree-sitter-typescript>=0.23; sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13"',
-    'tree-sitter-javascript>=0.23; sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13"',
-    'watchfiles>=0.24; sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13"',
+    'tree-sitter>=0.23; python_version >= "3.10" and (sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13")',
+    'tree-sitter-python>=0.23; python_version >= "3.10" and (sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13")',
+    'tree-sitter-typescript>=0.23; python_version >= "3.10" and (sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13")',
+    'tree-sitter-javascript>=0.23; python_version >= "3.10" and (sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13")',
+    'watchfiles>=0.24; python_version >= "3.10" and (sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13")',
     # Semantic arm: model2vec is pure-numpy (no ONNX toolchain), so it installs
     # wherever wheels exist -- same platform carve-out as above.
-    'model2vec>=0.8.2; sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13"',
-    'numpy>=2; sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13"',
+    'model2vec>=0.8.2; python_version >= "3.10" and (sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13")',
+    'numpy>=2; python_version >= "3.10" and (sys_platform != "darwin" or platform_machine != "x86_64" or python_version < "3.13")',
 ]
 keywords = ["webbee", "imperal", "icnli", "coding-agent", "ai-agent", "cli", "terminal", "llm"]
 classifiers = [
@@ -42,6 +47,8 @@ classifiers = [
     "Environment :: Console",
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -78,7 +85,7 @@ Issues = "https://github.com/imperalcloud/webbee-code/issues"
 Protocol = "https://icnli.org"
 
 [project.scripts]
-webbee = "webbee.cli:main"
+webbee = "webbee._launch:main"
 
 [build-system]
 requires = ["hatchling"]

webbee-0.5.6/src/webbee/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.6"

webbee-0.5.6/src/webbee/_launch.py

@@ -0,0 +1,204 @@
+"""The `webbee` command on any Python from 3.7.
+
+Webbee needs Python 3.10+ -- its dependencies do (the MCP SDK, numpy 2, tree-sitter). On
+3.10+ this hands straight to webbee.cli. On an older Python pip installs webbee without those
+dependencies, and this command runs the SAME webbee release on a Python 3.12 it sets up once
+with uv in its own folder: the person gets the whole agent, never a reduced one.
+
+Kept to Python 3.7 syntax and the standard library: it is the only module an old interpreter
+ever runs. imperal-mcp carries the same launcher (imperal_mcp/_launch.py)."""
+import hashlib
+import io
+import os
+import platform
+import shutil
+import subprocess
+import sys
+import tarfile
+import urllib.request
+import zipfile
+
+DIST = "webbee"
+ENTRY_MODULE, ENTRY_FUNC = "webbee.cli", "main"
+NATIVE = (3, 10)                 # the Python the dependencies need
+RUNTIME_PYTHON = "3.12"
+SPEC_ENV = "WEBBEE_RUNTIME_SPEC"     # what to install instead of DIST==version (tests, mirrors)
+HOME_ENV = "WEBBEE_RUNTIME_HOME"
+_WINDOWS = os.name == "nt"
+
+
+def _version():
+    from webbee import __version__
+    return __version__   # the light install on an old Python and its runtime are one release
+
+
+def _home():
+    if os.environ.get(HOME_ENV):
+        return os.environ[HOME_ENV]
+    if _WINDOWS:
+        base = os.environ.get("LOCALAPPDATA") or os.path.expanduser("~")
+    else:
+        base = os.environ.get("XDG_DATA_HOME") or os.path.join(os.path.expanduser("~"), ".local", "share")
+    return os.path.join(base, DIST, "runtime")
+
+
+def _say(msg):
+    sys.stderr.write(msg + "\n")
+    sys.stderr.flush()
+
+
+def _bin(prefix, name):
+    if _WINDOWS:
+        return os.path.join(prefix, "Scripts", name + ".exe")
+    return os.path.join(prefix, "bin", name)
+
+
+def _find_uv(home):
+    """uv from the pip-installed `uv` package (Python 3.8+), PATH, the usual install folders,
+    or our own earlier bootstrap -- else None."""
+    try:
+        import uv  # noqa: F401  -- the PyPI `uv` package ships the binary
+        found = uv.find_uv_bin()
+        if found and os.path.exists(found):
+            return found
+    except Exception:
+        pass
+    name = "uv.exe" if _WINDOWS else "uv"
+    candidates = [shutil.which("uv"), os.path.join(home, "uv", name)]
+    for d in (os.path.join("~", ".local", "bin"), os.path.join("~", ".cargo", "bin")):
+        candidates.append(os.path.join(os.path.expanduser(d), name))
+    for c in candidates:
+        if c and os.path.exists(c):
+            return c
+    return None
+
+
+UV_RELEASES = "https://github.com/astral-sh/uv/releases/latest/download/"
+
+
+def _uv_target():
+    """uv's release name for this machine, e.g. x86_64-unknown-linux-gnu."""
+    machine = platform.machine().lower()
+    arch = {"x86_64": "x86_64", "amd64": "x86_64", "aarch64": "aarch64", "arm64": "aarch64",
+            "i686": "i686", "i386": "i686", "armv7l": "armv7", "ppc64le": "powerpc64le",
+            "s390x": "s390x"}.get(machine)
+    if arch is None:
+        raise RuntimeError("no uv build for a %s machine" % machine)
+    if sys.platform == "darwin":
+        return arch + "-apple-darwin"
+    if _WINDOWS:
+        return arch + "-pc-windows-msvc"
+    libc = platform.libc_ver()[0]
+    if arch == "armv7":
+        return "armv7-unknown-linux-" + ("gnueabihf" if libc == "glibc" else "musleabihf")
+    return arch + "-unknown-linux-" + ("gnu" if libc == "glibc" else "musl")
+
+
+def _fetch(url):
+    req = urllib.request.Request(url, headers={"User-Agent": DIST + "-launcher"})
+    with urllib.request.urlopen(req, timeout=120) as r:
+        return r.read()
+
+
+def _install_uv(home):
+    """Python 3.7 has no `uv` wheel: download uv's release build for this machine from GitHub,
+    check it against the published SHA-256 and unpack it into our own folder. Standard library
+    only -- no curl, no installer script, no PATH or shell-profile changes."""
+    target = _uv_target()
+    archive = "uv-" + target + (".zip" if _WINDOWS else ".tar.gz")
+    _say("Fetching uv (it brings the Python %s %s runs on)..." % (RUNTIME_PYTHON, DIST))
+    data = _fetch(UV_RELEASES + archive)
+    expected = _fetch(UV_RELEASES + archive + ".sha256").decode().split()[0].lower()
+    if hashlib.sha256(data).hexdigest() != expected:
+        raise RuntimeError("uv download does not match its published SHA-256")
+    dest = os.path.join(home, "uv")
+    shutil.rmtree(dest, ignore_errors=True)
+    os.makedirs(dest)
+    name = "uv.exe" if _WINDOWS else "uv"
+    if _WINDOWS:
+        with zipfile.ZipFile(io.BytesIO(data)) as z:
+            member = next(m for m in z.namelist() if m.rsplit("/", 1)[-1] == name)
+            with open(os.path.join(dest, name), "wb") as f:
+                f.write(z.read(member))
+    else:
+        with tarfile.open(fileobj=io.BytesIO(data), mode="r:gz") as t:
+            member = next(m for m in t.getmembers() if m.isfile() and m.name.rsplit("/", 1)[-1] == name)
+            with open(os.path.join(dest, name), "wb") as f:
+                f.write(t.extractfile(member).read())
+        os.chmod(os.path.join(dest, name), 0o755)
+    return os.path.join(dest, name)
+
+
+class _Lock(object):
+    """One setup at a time when two terminals start webbee together."""
+
+    def __init__(self, path):
+        self.path, self.f = path, None
+
+    def __enter__(self):
+        self.f = open(self.path, "a+")
+        try:
+            if _WINDOWS:
+                import msvcrt
+                msvcrt.locking(self.f.fileno(), msvcrt.LK_LOCK, 1)
+            else:
+                import fcntl
+                fcntl.flock(self.f.fileno(), fcntl.LOCK_EX)
+        except Exception:
+            pass                         # no lock beats no start
+        return self
+
+    def __exit__(self, *exc):
+        self.f.close()
+
+
+def runtime(version):
+    """Path of the `DIST` command in a Python 3.12 environment holding this exact release;
+    set up on the first call, reused after."""
+    home = _home()
+    os.makedirs(home, exist_ok=True)
+    prefix = os.path.join(home, "py" + RUNTIME_PYTHON + "-" + version)
+    exe = _bin(prefix, DIST)
+    ready = os.path.join(prefix, ".ready")
+    if os.path.exists(ready) and os.path.exists(exe):
+        return exe
+    with _Lock(os.path.join(home, ".setup.lock")):
+        if os.path.exists(ready) and os.path.exists(exe):
+            return exe                   # the other terminal finished it meanwhile
+        _say("Python %d.%d is older than %s needs (%d.%d): setting up %s %s on Python %s "
+             "once, in %s ..." % (sys.version_info[0], sys.version_info[1], DIST, NATIVE[0], NATIVE[1],
+                                  DIST, version, RUNTIME_PYTHON, prefix))
+        uv = _find_uv(home) or _install_uv(home)
+        shutil.rmtree(prefix, ignore_errors=True)   # a half-made one from an interrupted setup
+        subprocess.check_call([uv, "venv", "--quiet", "--python", RUNTIME_PYTHON, prefix],
+                              stdout=sys.stderr)
+        spec = os.environ.get(SPEC_ENV) or "%s==%s" % (DIST, version)
+        subprocess.check_call([uv, "pip", "install", "--quiet", "--python", _bin(prefix, "python"), spec],
+                              stdout=sys.stderr)
+        if not os.path.exists(exe):
+            raise RuntimeError("%s is missing after the install" % exe)
+        open(ready, "w").close()
+        for name in os.listdir(home):    # earlier releases' environments
+            old = os.path.join(home, name)
+            if name.startswith("py") and old != prefix and os.path.isdir(old):
+                shutil.rmtree(old, ignore_errors=True)
+        _say("Done -- next starts are immediate.")
+    return exe
+
+
+def main():
+    if sys.version_info >= NATIVE:
+        import importlib
+        return getattr(importlib.import_module(ENTRY_MODULE), ENTRY_FUNC)()
+    try:
+        exe = runtime(_version())
+    except Exception as e:
+        _say("Could not set up %s on Python %s: %s\n"
+             "Install it with uv instead (it brings its own Python):\n"
+             "  curl -LsSf https://astral.sh/uv/install.sh | sh && uv tool install %s"
+             % (DIST, RUNTIME_PYTHON, e, DIST))
+        sys.exit(1)
+    argv = [exe] + sys.argv[1:]
+    if _WINDOWS:                         # no exec on Windows: run it and pass its exit code on
+        sys.exit(subprocess.call(argv))
+    os.execv(exe, argv)

{webbee-0.5.4 → webbee-0.5.6}/src/webbee/steer.py

@@ -75,13 +75,22 @@ def _consume_mode(payload, on_mode) -> bool:
     return True
 
 
-def _cancel_absorbed() -> bool:
-    """True when this task received a cancel that a submitted turn swallowed
-    (repl._run_turn treats CancelledError as a user interrupt). Without this
-    check the poller would sail past its own cancellation and asyncio.run's
-    shutdown would hang on a task that ignored it."""
-    task = asyncio.current_task()
-    return task is not None and task.cancelling() > 0
+async def _await_turn(coro) -> None:
+    """Run a submitted turn and wait for it, letting a cancel of THIS task end the
+    poller even when the turn swallows CancelledError (repl._run_turn treats it as
+    a user interrupt). The turn runs as its own task and the poller only waits on
+    it, so the cancel lands in the poller's wait, never inside the turn: without
+    that the poller would sail past its own cancellation and asyncio.run's
+    shutdown would hang on a task that ignored it. Works on every Python
+    (Task.cancelling() would need 3.11)."""
+    turn = asyncio.ensure_future(coro)
+    try:
+        await asyncio.wait({turn})
+    except asyncio.CancelledError:
+        turn.cancel()                    # the turn ends as a user interrupt would
+        await asyncio.wait({turn})
+        raise
+    turn.result()                        # a turn's own error reaches the poller as before
 
 
 async def poll_idle_steer(cfg, token_provider, *, workspace: str, is_busy,
@@ -251,9 +260,7 @@ async def poll_idle_steer(cfg, token_provider, *, workspace: str, is_busy,
                     if is_busy():
                         continue
                     last_active = now()  # an attach pickup = activity
-                    await attach_turn(attach)
-                    if _cancel_absorbed():
-                        raise asyncio.CancelledError
+                    await _await_turn(attach_turn(attach))
                     failures = 0
                     continue
             if not backlog:
@@ -266,10 +273,8 @@ async def poll_idle_steer(cfg, token_provider, *, workspace: str, is_busy,
                 backlog.appendleft(item)  # a local line won the race -- defer, don't drop
                 continue
             last_active = now()          # an item arrived = activity
-            await submit(text, str(item.get("surface") or "telegram"),
-                         str(item.get("iid") or ""))
-            if _cancel_absorbed():
-                raise asyncio.CancelledError
+            await _await_turn(submit(text, str(item.get("surface") or "telegram"),
+                                     str(item.get("iid") or "")))
         except asyncio.CancelledError:
             raise
         except Exception: