webbee 0.7.6__tar.gz → 0.7.8__tar.gz

{webbee-0.7.6 → webbee-0.7.8}/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.7.8
+
+* The webbee beside the shell's imperal-mcp (its code tools) follows webbee's releases. Live: webbee 0.7.7 was out,
+  imperal-mcp had no new release, and its environment kept webbee 0.7.6 because only imperal-mcp's version was
+  compared.
+
+## 0.7.7
+
+* `pipx reinstall webbee` brings the newest release for real (live check of 0.7.6: it still gave 0.7.5).
+  * imperal-mcp is installed beside webbee without its code extra. The extra requires webbee, and on a reinstall
+    pipx (uv backend) took that webbee from PyPI over the git one while PyPI's index still showed the release before.
+    webbee's own dependencies already bring what the extra holds.
+  * An install recorded with that extra is moved once onto the corrected record.
+
 ## 0.7.6
 
 * **Always the newest release, from git** (06.11: `pipx reinstall webbee` put back 0.6.7 while 0.7.5 was out).

{webbee-0.7.6 → webbee-0.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: webbee
-Version: 0.7.6
+Version: 0.7.8
 Summary: Webbee 🐝 — the Imperal Cloud coding agent in your terminal
 Project-URL: Homepage, https://imperal.io
 Project-URL: Documentation, https://docs.imperal.io

{webbee-0.7.6 → webbee-0.7.8}/install.sh

@@ -16,7 +16,7 @@ GH="https://github.com/imperalcloud"
 if command -v git >/dev/null 2>&1; then
   echo "Installing webbee (newest release, from git)…"
   uv tool install --force --refresh \
-    --with "imperal-mcp[code] @ git+$GH/imperal-mcp.git@stable" \
+    --with "imperal-mcp @ git+$GH/imperal-mcp.git@stable" \
     --with "imperal-sdk[universal-index] @ git+$GH/imperal-sdk.git@stable" \
     "webbee @ git+$GH/webbee-code.git@stable"
 else

{webbee-0.7.6 → webbee-0.7.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "webbee"
-version = "0.7.6"
+version = "0.7.8"
 description = "Webbee 🐝 — the Imperal Cloud coding agent in your terminal"
 readme = "README.md"
 license = "GPL-3.0-or-later"

webbee-0.7.8/src/webbee/__init__.py

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

{webbee-0.7.6 → webbee-0.7.8}/src/webbee/autoupdate.py

@@ -35,12 +35,18 @@ REPOS = {DIST: "https://github.com/imperalcloud/webbee-code.git",
 NAMES = {DIST: DIST, MCP: MCP_SPEC, SDK: SDK_SPEC}   # each with the extras its install needs
 
 
-def git_spec(dist: str, ref: str = STABLE) -> str:
+def git_spec(dist: str, ref: str = STABLE, extras: bool = True) -> str:
     """``dist`` (with its extras) from its repository at ``ref`` -- the ``stable`` branch unless a tag is named."""
-    return f"{NAMES[dist]} @ git+{REPOS[dist]}@{ref}"
+    return f"{NAMES[dist] if extras else dist} @ git+{REPOS[dist]}@{ref}"
 
 
 MCP_GIT_SPEC = git_spec(MCP)
+# imperal-mcp beside webbee goes WITHOUT its code extra: the extra requires webbee, and pipx (uv backend) installed
+# that webbee from PyPI over the git one on a reinstall (live 2026-11-06: stable 0.7.6, `pipx reinstall` gave PyPI's
+# 0.7.5). webbee's own dependencies already hold what the extra brings (tree-sitter, the sdk's index).
+MCP_BESIDE_WEBBEE = git_spec(MCP, extras=False)
+WEBBEE_ENV_SPECS = (git_spec(DIST), MCP_BESIDE_WEBBEE, git_spec(SDK))     # webbee's own environment
+MCP_ENV_SPECS = (MCP_GIT_SPEC, git_spec(SDK), git_spec(DIST))             # the shell's imperal-mcp
 PYPI = "https://pypi.org/pypi/{}/json"
 OFF_ENV = "WEBBEE_NO_AUTOUPDATE"           # 1: never upgrade at the start (CI, a pinned setup)
 DONE_ENV = "WEBBEE_UPGRADED"               # set on the restart after a self-upgrade: never twice in a row
@@ -124,9 +130,11 @@ def stable_version(dist: str, git, run=subprocess.run):
         return None
 
 
-def on_stable(tool: str, prefix: str, dists) -> bool:
+def on_stable(tool: str, prefix: str, specs) -> bool:
     """What pipx / uv will install again for the environment at ``prefix`` (``pipx reinstall``, ``pipx upgrade``,
-    ``uv tool upgrade``) names each of ``dists`` by its repository's stable branch. Plain pip keeps no such record."""
+    ``uv tool upgrade``) is ``specs``, each by its repository's stable branch. pipx: each spec exactly as given (an
+    imperal-mcp recorded beside webbee WITH its code extra pulled webbee from PyPI on a reinstall); uv resolves the
+    record as one set, so its repository and branch suffice. Plain pip keeps no such record."""
     try:
         if tool == "pipx":
             import json
@@ -134,11 +142,12 @@ def on_stable(tool: str, prefix: str, dists) -> bool:
                 meta = json.load(f)
             recorded = [str((meta.get("main_package") or {}).get("package_or_url") or "")]
             recorded += [str((p or {}).get("package_or_url") or "") for p in (meta.get("injected_packages") or {}).values()]
-            return all(any(f"git+{REPOS[d]}@{STABLE}" in s for s in recorded) for d in dists)
+            return all(s in recorded for s in specs)
         if tool == "uv":
             with open(os.path.join(prefix, "uv-receipt.toml"), encoding="utf-8") as f:
                 receipt = f.read()
-            return all(f'git = "{REPOS[d]}?rev={STABLE}"' in receipt for d in dists)
+            urls = [s.split(" @ git+", 1)[-1].rsplit("@", 1)[0] for s in specs]
+            return all(f'git = "{u}?rev={STABLE}"' in receipt for u in urls)
     except Exception:
         return False
     return True
@@ -201,7 +210,7 @@ def self_command(version: str, prefix: str = sys.prefix, executable: str = sys.e
     beside it; ``record``: pipx writes its record anew (see ``_git_install``)."""
     light = env.get(LIGHT_ENV)
     if source == "git" and not light:
-        return _git_install(tool_of(prefix), git_spec(DIST, ref), [git_spec(MCP), git_spec(SDK)], uv, pipx,
+        return _git_install(tool_of(prefix), git_spec(DIST, ref), [MCP_BESIDE_WEBBEE, git_spec(SDK)], uv, pipx,
                             executable, DIST, record)
     spec = _spec(DIST, DIST, version, wheel)
     if light:                               # an old Python runs this release through its light install
@@ -234,16 +243,17 @@ def mcp_installed(which=safe_which, run=subprocess.run) -> dict:
     real = os.path.realpath(exe)
     py = os.path.join(os.path.dirname(real), "python.exe" if _WINDOWS else "python")
     out = {"tool": tool_of(real), "python": py, "prefix": os.path.dirname(os.path.dirname(real)), "version": "",
-           "code": False}
+           "code": False, "webbee": ""}
     # asked twice when it says "no code extra": a reinstall is never made on one odd answer (live 2026-10-25: right after
     # another install the first answer said no webbee, the next ones yes)
     for _ in range(2):
         try:
             got = run([py, "-c", _NO_CWD + "import importlib.metadata as m, importlib.util as u; "
-                                 "print(m.version('imperal-mcp'), u.find_spec('webbee') is not None)"],
+                                 "w = u.find_spec('webbee') is not None; "
+                                 "print(m.version('imperal-mcp'), w, m.version('webbee') if w else '')"],
                       capture_output=True, text=True, timeout=20)
-            version, code = (str(got.stdout or "").split() + ["", ""])[:2]
-            out.update(version=version, code=code == "True")
+            version, code, webbee = (str(got.stdout or "").split() + ["", "", ""])[:3]
+            out.update(version=version, code=code == "True", webbee=webbee)
         except Exception:
             pass
         if out["code"] or not out["version"]:
@@ -251,14 +261,19 @@ def mcp_installed(which=safe_which, run=subprocess.run) -> dict:
     return out
 
 
-def mcp_command(inst: dict, newest, uv, pipx, wheel=None, source: str = "pypi"):
+def mcp_command(inst: dict, newest, uv, pipx, wheel=None, source: str = "pypi", webbee_newest=None):
     """The one command that makes the shell's imperal-mcp the newest with its code extra -- by the tool that installed
     it (uv, else pipx, for a new install) -- or None when it already is, or nothing can do it. ``source`` "git": from
     the stable branches, imperal-sdk and webbee beside it, and an install recorded by a version is moved onto the
-    branch even when its version is the newest (what ``pipx reinstall`` / ``uv tool upgrade`` would put back)."""
+    branch even when its version is the newest (what ``pipx reinstall`` / ``uv tool upgrade`` would put back). The
+    webbee beside it (its code tools) follows webbee's own releases: one newer than it holds upgrades the environment
+    too (live 2026-11-06: webbee 0.7.7 out, imperal-mcp unchanged, its environment kept webbee 0.7.6)."""
     git = source == "git"
-    recorded = bool(inst) and on_stable(inst.get("tool") or "", inst.get("prefix") or "", (MCP, SDK, DIST))
-    if inst and inst.get("version") and inst.get("version") == newest and inst.get("code") and (recorded or not git):
+    recorded = bool(inst) and on_stable(inst.get("tool") or "", inst.get("prefix") or "", MCP_ENV_SPECS)
+    behind = git and bool(inst) and bool(inst.get("webbee")) and bool(webbee_newest) \
+        and _ver(inst.get("webbee")) < _ver(webbee_newest)
+    if inst and inst.get("version") and inst.get("version") == newest and inst.get("code") and (recorded or not git) \
+            and not behind:
         return None
     if inst and not inst.get("version"):
         return None                         # it did not answer: a working install is never replaced blind
@@ -471,7 +486,7 @@ def upgrade_before_start(argv, current: str, say=print, fetch=latest, which=safe
         git = None if light else which("git")     # 3.7's pip builds no package from source: the light install stays on PyPI
         newest, source = _newest(DIST, git, fetch, stable)
         tool = tool_of(prefix)
-        recorded = source != "git" or on_stable(tool, prefix, (DIST, MCP, SDK))
+        recorded = source != "git" or on_stable(tool, prefix, WEBBEE_ENV_SPECS)
         # the same release recorded by a version: moved onto the branch (what pipx/uv would put back on a reinstall)
         if newest and (_ver(newest) > _ver(current) or (not recorded and _ver(newest) == _ver(current))) \
                 and not env.get(DONE_ENV):
@@ -503,9 +518,13 @@ def upgrade_before_start(argv, current: str, say=print, fetch=latest, which=safe
                     say(f"🐝 webbee could not update itself -- run: {_show(cmd)}")
         mcp_newest, mcp_source = _newest(MCP, git, fetch, stable)
         inst = mcp_installed(which, run)
-        cmd = mcp_command(inst, mcp_newest, uv, pipx, wheel, source=mcp_source)
+        cmd = mcp_command(inst, mcp_newest, uv, pipx, wheel, source=mcp_source,
+                          webbee_newest=newest if source == "git" else None)
         if cmd:
-            what = (f"imperal-mcp {inst.get('version') or '?'} -> {mcp_newest or 'source'}" if inst
+            what = (f"imperal-mcp {inst.get('version') or '?'} -> {mcp_newest or 'source'}"
+                    + (f", webbee beside it {inst.get('webbee')} -> {newest}"
+                       if source == "git" and inst.get("webbee") and _ver(inst.get("webbee")) < _ver(newest) else "")
+                    if inst
                     else f"imperal-mcp {mcp_newest or 'from source'}") + (" (git, stable)" if mcp_source == "git" else "")
             say(f"🐝 updating {what} ...")
             if _run(cmd, run):

{webbee-0.7.6 → webbee-0.7.8}/tests/test_autoupdate.py

@@ -304,6 +304,7 @@ def test_an_upgrader_that_dies_during_the_wait_is_taken_over(tmp_path):
 # ── owner 2026-11-06: always the newest, from git. Live: `pipx reinstall webbee` put back 0.6.7 while 0.7.5 was out --
 #    pipx had recorded 0.6.7's wheel address and reinstalls its record; the record is now the stable branch ──
 WB, MCP_G, SDK_G = au.git_spec(au.DIST), au.git_spec(au.MCP), au.git_spec(au.SDK)
+MCP_W = au.MCP_BESIDE_WEBBEE              # beside webbee: no code extra (it would pull webbee from PyPI)
 H_OLD, H_NEW, H_TAG = "a" * 40, "b" * 40, "c" * 40
 
 
@@ -332,6 +333,7 @@ def test_the_spec_is_the_branch_never_a_version():
     assert MCP_G == "imperal-mcp[code] @ git+https://github.com/imperalcloud/imperal-mcp.git@stable"
     assert SDK_G == "imperal-sdk[universal-index] @ git+https://github.com/imperalcloud/imperal-sdk.git@stable"
     assert au.MCP_GIT_SPEC == MCP_G
+    assert MCP_W == "imperal-mcp @ git+https://github.com/imperalcloud/imperal-mcp.git@stable"
 
 
 def _pipx_venv(tmp_path, main, injected=()):
@@ -346,36 +348,38 @@ def _pipx_venv(tmp_path, main, injected=()):
 
 def test_what_pipx_and_uv_recorded_is_read(tmp_path):
     pinned = _pipx_venv(tmp_path / "a", "webbee @ https://files.pythonhosted.org/x/webbee-0.6.7-py3-none-any.whl")
-    assert not au.on_stable("pipx", pinned, ("webbee",))
-    good = _pipx_venv(tmp_path / "b", WB, (MCP_G, SDK_G))
-    assert au.on_stable("pipx", good, ("webbee", "imperal-mcp", "imperal-sdk"))
+    assert not au.on_stable("pipx", pinned, (WB,))
+    good = _pipx_venv(tmp_path / "b", WB, (MCP_W, SDK_G))
+    assert au.on_stable("pipx", good, au.WEBBEE_ENV_SPECS)
+    coded = _pipx_venv(tmp_path / "d", WB, (MCP_G, SDK_G))                   # mcp WITH its code extra beside webbee
+    assert not au.on_stable("pipx", coded, au.WEBBEE_ENV_SPECS)
     half = _pipx_venv(tmp_path / "c", WB)                                     # its packages still from PyPI
-    assert not au.on_stable("pipx", half, ("webbee", "imperal-mcp"))
+    assert not au.on_stable("pipx", half, au.WEBBEE_ENV_SPECS)
     uv = tmp_path / "uv" / "tools" / "imperal-mcp"
     uv.mkdir(parents=True)
     (uv / "uv-receipt.toml").write_text('[tool]\nrequirements = [{ name = "imperal-mcp", extras = ["code"], '
                                         'specifier = "==0.9.5" }]\n')
-    assert not au.on_stable("uv", str(uv), ("imperal-mcp",))
+    assert not au.on_stable("uv", str(uv), (MCP_G,))
     (uv / "uv-receipt.toml").write_text(
         '[tool]\nrequirements = [\n'
         '    { name = "imperal-mcp", extras = ["code"], git = "https://github.com/imperalcloud/imperal-mcp.git?rev=stable" },\n'
         '    { name = "imperal-sdk", extras = ["universal-index"], git = "https://github.com/imperalcloud/imperal-sdk.git?rev=stable" },\n'
         '    { name = "webbee", git = "https://github.com/imperalcloud/webbee-code.git?rev=stable" },\n]\n')
-    assert au.on_stable("uv", str(uv), ("imperal-mcp", "imperal-sdk", "webbee"))
-    assert not au.on_stable("pipx", str(tmp_path / "missing"), ("webbee",))   # unreadable: moved, never assumed
-    assert au.on_stable("pip", "/venv", ("webbee",))                          # plain pip keeps no record
+    assert au.on_stable("uv", str(uv), au.MCP_ENV_SPECS)
+    assert not au.on_stable("pipx", str(tmp_path / "missing"), (WB,))   # unreadable: moved, never assumed
+    assert au.on_stable("pip", "/venv", (WB,))                          # plain pip keeps no record
 
 
 def test_from_git_each_tool_installs_and_records_the_branch():
     uv = au.self_command("0.7.5", prefix="/u/.local/share/uv/tools/webbee", env={}, uv="/bin/uv", source="git")
-    assert uv == ["/bin/uv", "tool", "install", "--force", "--refresh", "--with", MCP_G, "--with", SDK_G, WB]
+    assert uv == ["/bin/uv", "tool", "install", "--force", "--refresh", "--with", MCP_W, "--with", SDK_G, WB]
     px = au.self_command("0.7.5", prefix="/h/.local/pipx/venvs/webbee", env={}, pipx="/bin/pipx", source="git")
-    assert px == [["/bin/pipx", "install", "--force", WB], ["/bin/pipx", "inject", "--force", "webbee", MCP_G, SDK_G]]
+    assert px == [["/bin/pipx", "install", "--force", WB], ["/bin/pipx", "inject", "--force", "webbee", MCP_W, SDK_G]]
     kept = au.self_command("0.7.5", prefix="/h/.local/pipx/venvs/webbee", env={}, pipx="/bin/pipx", source="git",
                            record=False)                                    # already on the branch: its own record
     assert kept == ["/bin/pipx", "upgrade", "--include-injected", "webbee"]
     pip = au.self_command("0.7.5", prefix="/v", executable="/v/bin/python", env={}, source="git")
-    assert pip == ["/v/bin/python", "-m", "pip", "install", "--upgrade", "--no-cache-dir", WB, MCP_G, SDK_G]
+    assert pip == ["/v/bin/python", "-m", "pip", "install", "--upgrade", "--no-cache-dir", WB, MCP_W, SDK_G]
     light = au.self_command("0.7.5", env={au.LIGHT_ENV: "/usr/bin/python3.7"}, source="git", wheel=None)
     assert light[-1] == "webbee==0.7.5"                                     # 3.7 builds nothing from source: PyPI
 
@@ -389,12 +393,12 @@ def test_the_same_release_recorded_by_a_version_is_moved_onto_the_branch(tmp_pat
                             execv=lambda p, a: execd.append(a), lock_path=lambda: str(tmp_path / "upgrade.lock"),
                             stable=lambda d, git: stable(d), prefix=venv)
     assert ["/bin/pipx", "install", "--force", WB] in run.calls
-    assert ["/bin/pipx", "inject", "--force", "webbee", MCP_G, SDK_G] in run.calls
+    assert ["/bin/pipx", "inject", "--force", "webbee", MCP_W, SDK_G] in run.calls
     assert execd and any("onto its release branch" in s for s in said)
 
 
 def test_on_the_branch_and_newest_nothing_is_installed(tmp_path, monkeypatch):
-    venv = _pipx_venv(tmp_path, WB, (MCP_G, SDK_G))
+    venv = _pipx_venv(tmp_path, WB, (MCP_W, SDK_G))
     exe = tmp_path / "pipx" / "venvs" / "imperal-mcp" / "bin" / "imperal-mcp"
     exe.parent.mkdir(parents=True)
     exe.write_text("")
@@ -411,7 +415,7 @@ def test_on_the_branch_and_newest_nothing_is_installed(tmp_path, monkeypatch):
 
 
 def test_a_newer_release_on_the_branch_is_taken_by_the_install_s_own_record(tmp_path):
-    venv = _pipx_venv(tmp_path, WB, (MCP_G, SDK_G))
+    venv = _pipx_venv(tmp_path, WB, (MCP_W, SDK_G))
     run, execd = _Run(), []
     au.upgrade_before_start([], "0.7.4", say=lambda m: None, fetch=lambda d: 1 / 0, wheel=None,
                             which=_which({"pipx": "/bin/pipx", "git": "/bin/git"}), run=run, env={},
@@ -457,7 +461,7 @@ def test_the_steps_of_one_install_stop_at_the_first_that_fails():
 
 def test_a_git_release_that_does_not_import_is_put_back_by_its_own_tag(tmp_path, monkeypatch):
     _checks(monkeypatch, [False, False, True])
-    venv = _pipx_venv(tmp_path, WB, (MCP_G, SDK_G))
+    venv = _pipx_venv(tmp_path, WB, (MCP_W, SDK_G))
     run, said = _Run(), []
     au.upgrade_before_start([], "0.7.4", say=said.append, fetch=lambda d: 1 / 0, wheel=None,
                             which=_which({"pipx": "/bin/pipx", "git": "/bin/git"}), run=run, env={},
@@ -465,3 +469,21 @@ def test_a_git_release_that_does_not_import_is_put_back_by_its_own_tag(tmp_path,
                             stable=lambda d, git: "0.7.5", prefix=venv)
     assert ["/bin/pipx", "install", "--force", au.git_spec("webbee", "v0.7.4")] in run.calls
     assert any("put 0.7.4 back" in s for s in said)
+
+
+def test_the_webbee_beside_imperal_mcp_follows_webbee_s_releases(tmp_path):
+    uv = tmp_path / "uv" / "tools" / "imperal-mcp"
+    uv.mkdir(parents=True)
+    (uv / "uv-receipt.toml").write_text("".join(
+        f'{{ name = "x", git = "{u}?rev=stable" }}\n' for u in au.REPOS.values()))
+    inst = {"tool": "uv", "python": str(uv / "bin" / "python"), "prefix": str(uv), "version": "0.9.5", "code": True,
+            "webbee": "0.7.6"}
+    assert au.mcp_command(inst, "0.9.5", "/bin/uv", None, source="git", webbee_newest="0.7.6") is None
+    assert au.mcp_command(inst, "0.9.5", "/bin/uv", None, source="git", webbee_newest="0.7.7") == [
+        "/bin/uv", "tool", "install", "--force", "--refresh", "--with", SDK_G, "--with", WB, MCP_G]
+    run = _Run(stdout="0.9.5 True 0.7.6")
+    exe = uv / "bin" / "imperal-mcp"
+    exe.parent.mkdir()
+    exe.write_text("")
+    got = au.mcp_installed(which=lambda n: str(exe), run=run)
+    assert got["webbee"] == "0.7.6" and got["code"] is True

{webbee-0.7.6 → webbee-0.7.8}/tests/test_packaging.py

@@ -35,7 +35,7 @@ def test_install_script_is_posix_and_uses_uv():
     # must be the plain form.
     # 2026-11-06: always the newest release, from git -- the three packages by their stable branch (never a version,
     # so `uv tool upgrade` and a second run bring the newest); without git the plain form from PyPI
-    for spec in ('"webbee @ git+$GH/webbee-code.git@stable"', '"imperal-mcp[code] @ git+$GH/imperal-mcp.git@stable"',
+    for spec in ('"webbee @ git+$GH/webbee-code.git@stable"', '"imperal-mcp @ git+$GH/imperal-mcp.git@stable"',
                  '"imperal-sdk[universal-index] @ git+$GH/imperal-sdk.git@stable"'):
         assert spec in txt
     assert 'uv tool install --force --refresh "webbee"' in txt

webbee-0.7.6/src/webbee/__init__.py

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