webbee 0.4.2__tar.gz → 0.4.3__tar.gz

{webbee-0.4.2 → webbee-0.4.3}/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 0.4.3
+
+**Webbee v0.4.3: Non-Blocking Voice STT, Cross-Event-Loop Token Bridge, Dynamic Composer Geometry & Config Hardening.**
+
+This release makes voice notes truly seamless by decoupling modal teardown from transcription (zero TUI freezes), adds a thread-safe cross-event-loop token bridge for worker-thread file reading across Python 3.6 - 3.14+, accurately aligns multi-line composer wrap bounds to prevent prompt overflow, and eliminates filesystem path hardcoding.
+
+### Highlights & New Capabilities
+
+* **Non-Blocking Background Voice STT (`webbee.modals`)**:
+  - The voice recording dialog now dismisses immediately upon clicking `[▶ Send]`, releasing the UI modal lock with zero delay.
+  - Displays a clean transient status note (`🎙️ transcribing voice note…`) in the output pane while background audio decoding executes.
+  - Audio transcription via `/v1/voice/stt` runs asynchronously in a worker thread and safely schedules its result back to prompt_toolkit via `loop.call_soon_threadsafe`.
+
+* **Cross-Event-Loop Token Bridge for Native File Reads (`webbee.session`, `webbee.native_read`)**:
+  - Resolved `RuntimeError: Task attached to a different loop` when background worker threads invoke `read_native` with the session client.
+  - Implemented an `asyncio.run_coroutine_threadsafe` bridge for token provider acquisition across thread boundaries.
+  - Universal `_run_sync` helper supporting Python 3.6 through 3.14+ seamlessly.
+
+* **Accurate Composer Geometry & Proactive Wrap Calculation (`webbee.tui`)**:
+  - Refactored `input_rows` to strictly account for `BeforeInput` prefix buttons (`📎 🎤 ⋮ ❯ `, 16 display columns) and line continuation gutters (`┊ `, 2 display columns).
+  - Uses true display-cell widths (`get_cwidth` / `wcwidth`) for Unicode and emojis, ensuring the multi-line input box dynamically grows the exact moment text reaches the frame border rather than hiding behind a 2-4 word scroll lag.
+
+* **Configuration & Credential Storage Hardening (`webbee.config`)**:
+  - Added dedicated `voice_dir` and `credentials_file` configuration hooks to `Config` with environment overrides (`IMPERAL_VOICE_DIR`, `IMPERAL_CREDENTIALS_FILE`).
+  - Removed hardcoded filesystem paths across modals and voice components, respecting session configuration and OS cache directories.
+
 ## 0.4.2
 
 **Webbee v0.4.2: Universal `shell` Action Across Windows/macOS/Linux, Interactive TUI Modals, Cloud Voice STT & Complete Hover Engine.**

{webbee-0.4.2 → webbee-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: webbee
-Version: 0.4.2
+Version: 0.4.3
 Summary: Webbee 🐝 — the Imperal Cloud coding agent in your terminal
 Project-URL: Homepage, https://imperal.io
 Project-URL: Documentation, https://docs.imperal.io
@@ -51,7 +51,7 @@ Description-Content-Type: text/markdown
 # Webbee 🐝 — The Open-Source ICNLI Coding Agent
 
 [![PyPI](https://img.shields.io/pypi/v/webbee)](https://pypi.org/project/webbee/)
-[![Python](https://img.shields.io/pypi/pyversions/webbee)](https://pypi.org/project/webbee/)
+[![Python](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-3776ab?logo=python&logoColor=white)](https://pypi.org/project/webbee/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](LICENSE)
 [![Docs](https://img.shields.io/badge/docs-imperal.io-00afd7)](https://docs.imperal.io)
 
@@ -92,8 +92,6 @@ python3 -m venv .venv && source .venv/bin/activate
 pip install webbee
 ```
 
-> **Note**: Python 3.11+ is required.
-
 ---
 
 ## 💡 Quick Start

{webbee-0.4.2 → webbee-0.4.3}/README.md

@@ -1,7 +1,7 @@
 # Webbee 🐝 — The Open-Source ICNLI Coding Agent
 
 [![PyPI](https://img.shields.io/pypi/v/webbee)](https://pypi.org/project/webbee/)
-[![Python](https://img.shields.io/pypi/pyversions/webbee)](https://pypi.org/project/webbee/)
+[![Python](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-3776ab?logo=python&logoColor=white)](https://pypi.org/project/webbee/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](LICENSE)
 [![Docs](https://img.shields.io/badge/docs-imperal.io-00afd7)](https://docs.imperal.io)
 
@@ -42,8 +42,6 @@ python3 -m venv .venv && source .venv/bin/activate
 pip install webbee
 ```
 
-> **Note**: Python 3.11+ is required.
-
 ---
 
 ## 💡 Quick Start

{webbee-0.4.2 → webbee-0.4.3}/pyproject.toml

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

webbee-0.4.3/src/webbee/__init__.py

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

{webbee-0.4.2 → webbee-0.4.3}/src/webbee/config.py

@@ -7,6 +7,8 @@ class Config:
     panel_url: str
     intel_enabled: bool = True   # off switch for the on-disk index/watcher (env IMPERAL_INTEL=false)
     cache_dir: str = ""          # "" -> IntelService's own default (~/.cache/webbee/intel)
+    voice_dir: str = ""          # "" -> ~/.webbee/voice
+    credentials_file: str = ""   # "" -> ~/.imperal/credentials.json
 
     @classmethod
     def from_env(cls) -> "Config":
@@ -15,4 +17,6 @@ class Config:
             panel_url=os.environ.get("IMPERAL_PANEL_URL", "https://panel.imperal.io").rstrip("/"),
             intel_enabled=os.environ.get("IMPERAL_INTEL", "true") != "false",
             cache_dir=os.environ.get("IMPERAL_INTEL_CACHE_DIR", ""),
+            voice_dir=os.environ.get("IMPERAL_VOICE_DIR", ""),
+            credentials_file=os.environ.get("IMPERAL_CREDENTIALS_FILE", ""),
         )

{webbee-0.4.2 → webbee-0.4.3}/src/webbee/modals.py

@@ -237,7 +237,7 @@ def get_system_audio_capture_args(output_path: str) -> List[str]:
     return ["ffmpeg", "-y", "-i", "default", output_path]
 
 
-def transcribe_audio_file(audio_path: str) -> str:
+def transcribe_audio_file(audio_path: str, api_url: str = "", token: str = "") -> str:
     """Transcribe audio file via Imperal Cloud System Voice STT endpoint (/v1/voice/stt).
 
     Works on ANY OS (macOS, Linux, Windows) seamlessly without local dependencies.
@@ -249,16 +249,25 @@ def transcribe_audio_file(audio_path: str) -> str:
     try:
         import json, urllib.request, urllib.error, uuid
 
-        cred_path = os.path.expanduser("~/.imperal/credentials.json")
-        token = ""
-        if os.path.exists(cred_path):
+        if not token:
             try:
-                data = json.load(open(cred_path))
-                token = data.get("access_token", "")
+                from webbee.config import Config
+                cfg = Config.from_env()
+                cred_path = getattr(cfg, "credentials_file", "") or os.path.expanduser("~/.imperal/credentials.json")
+                if os.path.exists(cred_path):
+                    data = json.load(open(cred_path))
+                    token = data.get("access_token", "")
             except Exception:
                 pass
 
-        api_url = os.environ.get("IMPERAL_API_URL", "https://auth.imperal.io").rstrip("/")
+        if not api_url:
+            try:
+                from webbee.config import Config
+                api_url = Config.from_env().api_url
+            except Exception:
+                api_url = os.environ.get("IMPERAL_API_URL", "https://auth.imperal.io")
+
+        api_url = api_url.rstrip("/")
         url = f"{api_url}/v1/voice/stt"
 
         with open(audio_path, "rb") as f:
@@ -367,10 +376,22 @@ def create_mic_dialog(
     on_transcribe: Callable[[str], None],
     on_send_direct: Callable[[str], None],
     on_close: Callable[[], None],
+    *,
+    api_url: str = "",
+    token: str = "",
+    voice_dir: str = "",
+    on_status: Optional[Callable[[str], None]] = None,
 ) -> Dialog:
     """Create Voice Recording (STT) dialog matching standard modal design with exactly 2 buttons: [▶ Send] and [✕ Cancel]."""
+    import threading
     start_time = time.time()
-    voice_dir = os.path.expanduser("~/.webbee/voice")
+    if not voice_dir:
+        try:
+            from webbee.config import Config
+            cfg = Config.from_env()
+            voice_dir = getattr(cfg, "voice_dir", "") or os.path.expanduser("~/.webbee/voice")
+        except Exception:
+            voice_dir = os.path.expanduser("~/.webbee/voice")
     os.makedirs(voice_dir, exist_ok=True)
     voice_filename = f"voice_{int(time.time())}.wav"
     voice_path = os.path.join(voice_dir, voice_filename)
@@ -410,13 +431,55 @@ def create_mic_dialog(
     def _handle_send():
         rec_seconds = _stop_rec()
         on_close()
-        # Direct STT via Imperal Cloud STT: transcribe audio into plain text instruction
-        text = transcribe_audio_file(voice_path)
-        if text and text.strip() and text.strip().lower() not in ("you", "thank you", "silence", "."):
-            on_send_direct(text.strip())
-        else:
-            # If STT returns empty or silence, send informative turn
-            on_send_direct(f"🎙️ [Voice note: {rec_seconds}s audio — {text.strip() if text else 'audio recorded'}]")
+
+        if on_status is not None:
+            try:
+                on_status("🎙️ transcribing voice note…")
+            except Exception:
+                pass
+
+        def _worker():
+            try:
+                text = transcribe_audio_file(voice_path, api_url=api_url, token=token)
+                def _apply():
+                    if on_status is not None:
+                        try:
+                            on_status("")
+                        except Exception:
+                            pass
+                    if text and text.strip() and text.strip().lower() not in ("you", "thank you", "silence", "."):
+                        on_send_direct(text.strip())
+                    else:
+                        desc = text.strip() if text else "audio recorded"
+                        on_send_direct(f"🎙️ [Voice note: {rec_seconds}s audio — {desc}]")
+
+                app = get_app_or_none()
+                if app is not None and hasattr(app, "loop") and app.loop is not None and app.loop.is_running():
+                    app.loop.call_soon_threadsafe(_apply)
+                else:
+                    _apply()
+            except Exception:
+                app = get_app_or_none()
+                def _fail():
+                    if on_status is not None:
+                        try:
+                            on_status("")
+                        except Exception:
+                            pass
+                    on_send_direct(f"🎙️ [Voice note: {rec_seconds}s audio — transcription unavailable]")
+                if app is not None and hasattr(app, "loop") and app.loop is not None and app.loop.is_running():
+                    app.loop.call_soon_threadsafe(_fail)
+                else:
+                    _fail()
+            finally:
+                try:
+                    if os.path.exists(voice_path):
+                        os.remove(voice_path)
+                except Exception:
+                    pass
+
+        t = threading.Thread(target=_worker, daemon=True)
+        t.start()
 
     def _handle_cancel():
         _stop_rec()

{webbee-0.4.2 → webbee-0.4.3}/src/webbee/native_read.py

@@ -184,9 +184,9 @@ async def read_native_async(client, abs_path: str, rel: str, *,
     if size > MAX_UPLOAD_BYTES:
         return {"ok": False, "native": True, "kind": kind,
                 "content": (f"⟦ {rel} · {human_size(size)} · {kind} ⟧\n"
-                            f"Too large to read inline (limit {human_size(MAX_UPLOAD_BYTES)}). "
-                            f"Upload it in the panel's File Reader and read it by file_id, "
-                            f"or point me at a smaller export.")}
+                            f"File size exceeds inline buffer limit ({human_size(MAX_UPLOAD_BYTES)}). "
+                            f"To prevent memory bloat and payload limits, use windowed reading with offset/limit, "
+                            f"inspect metadata via shell, or upload in the panel's File Reader to read by file_id.")}
 
     with open(abs_path, "rb") as f:
         data = f.read()
@@ -253,13 +253,33 @@ def _shape(item: dict, *, rel: str, kind: str, size: int, file_id: str,
             "truncated": has_more, "total_chars": total}
 
 
+def _run_sync(coro):
+    """Run a coroutine to completion synchronously in a worker thread.
+
+    Fully compatible across Python 3.6 - 3.14+:
+      * Python 3.7 - 3.14+: uses standard asyncio.run().
+      * Python 3.6 fallback: creates a new event loop and runs until complete.
+    """
+    if hasattr(asyncio, "run"):
+        return asyncio.run(coro)
+    loop = asyncio.new_event_loop()
+    try:
+        asyncio.set_event_loop(loop)
+        return loop.run_until_complete(coro)
+    finally:
+        try:
+            loop.close()
+        finally:
+            asyncio.set_event_loop(None)
+
+
 def read_native(client_factory, abs_path: str, rel: str, *,
                 offset: int = 0, limit: int = 0) -> dict:
     """Synchronous entry point for LocalToolExecutor (which runs in a worker
     thread, never on the event loop -- so a fresh loop here is safe and cannot
     deadlock the REPL).
 
-    ``client_factory`` is a zero-arg callable returning an ImperalClient; it is
+    client_factory is a zero-arg callable returning an ImperalClient; it is
     a factory (not a client) so a plain local run with no cloud reach simply
     has none, and this whole path degrades to one honest sentence.
     """
@@ -275,8 +295,8 @@ def read_native(client_factory, abs_path: str, rel: str, *,
             f"which this session cannot reach right now.")}
     try:
         client = client_factory()
-        return asyncio.run(read_native_async(client, abs_path, rel,
-                                             offset=offset, limit=limit))
+        return _run_sync(read_native_async(client, abs_path, rel,
+                                           offset=offset, limit=limit))
     except Exception as e:  # noqa: BLE001 -- a read must never crash the turn
         return {"ok": False, "native": True, "kind": kind, "content": (
             f"⟦ {rel} · {human_size(size)} · {kind} ⟧\n"

{webbee-0.4.2 → webbee-0.4.3}/src/webbee/session.py

@@ -132,13 +132,41 @@ class AgentSession:
         its own event loop, so the client must be built there, not shared from
         here. Returns None when this session has no cloud config -- the read
         then degrades to one honest sentence instead of a crash.
+
+        Threadsafe Loop-Bridge (Python 3.6 - 3.14+):
+        token_provider is bound to the main event loop's lock. We bridge it across
+        thread boundaries via asyncio.run_coroutine_threadsafe so worker event loops
+        never raise RuntimeError: Lock is bound to a different event loop.
         """
         cfg, token_provider = self.cfg, self.token_provider
         if cfg is None or token_provider is None:
             return None
 
+        import asyncio
+
+        try:
+            main_loop = asyncio.get_running_loop()
+        except RuntimeError:
+            try:
+                main_loop = asyncio.get_event_loop()
+            except RuntimeError:
+                main_loop = None
+
         def _make():
             from imperal_mcp.client import ImperalClient
+
+            if main_loop is not None and main_loop.is_running():
+                async def _bridged_token_provider() -> str:
+                    try:
+                        current_loop = asyncio.get_running_loop()
+                    except RuntimeError:
+                        current_loop = None
+                    if current_loop is main_loop:
+                        return await token_provider()
+                    fut = asyncio.run_coroutine_threadsafe(token_provider(), main_loop)
+                    return await asyncio.wrap_future(fut)
+                return ImperalClient(cfg, _bridged_token_provider)
+
             return ImperalClient(cfg, token_provider)
 
         return _make

{webbee-0.4.2 → webbee-0.4.3}/src/webbee/tui.py

@@ -266,20 +266,30 @@ def enable_csi_u_newline() -> bool:
     return True
 
 
-def input_rows(text: str, cols: int, cap: int) -> int:
+def input_rows(text: str, cols: int, cap: int, prompt_cols: int = 0, cont_cols: int = 0) -> int:
     """PURE row-wrap estimator behind `_input_height` (module-level so tests
     drive it directly with an injected size, mirroring repl._gate_busy).
-    Same wrap math as before the W2 proportional-sizing pass: `cols` is the
-    usable wrap width (frame + prompt already subtracted by the caller,
-    floored at 10 so a tiny/misreported width never collapses every line to
-    1-char rows); `cap` bounds growth (was: hardcoded 10, now the caller's
-    live `sizing.input_height_cap(rows)` — the box may grow to at most a
-    PROPORTION of the screen, not a fixed character count)."""
+    Accounts for prompt prefix width (BeforeInput buttons/gutter), continuation
+    prefix width, explicit newlines, and true display-cell widths (CWidth / Unicode).
+    Floored at 10 so a tiny/misreported width never collapses lines; `cap` bounds
+    growth proportionally to screen height."""
     if not text:
         return 1
     cols = max(10, cols)
-    rows = sum(max(1, -(-len(ln) // cols)) for ln in text.split("\n"))
-    return min(cap, max(1, rows))
+    from prompt_toolkit.utils import get_cwidth
+    total_rows = 0
+    for idx, ln in enumerate(text.split("\n")):
+        ln_w = sum(get_cwidth(c) for c in ln)
+        p_cols = prompt_cols if idx == 0 else 0
+        usable_first = max(10, cols - p_cols)
+        usable_cont = max(10, cols - cont_cols)
+        if ln_w <= usable_first:
+            total_rows += 1
+        else:
+            rem = ln_w - usable_first
+            cont = -(-rem // usable_cont)
+            total_rows += 1 + cont
+    return min(cap, max(1, total_rows))
 
 
 def next_mode(mode: str) -> str:
@@ -1896,7 +1906,7 @@ async def run_session(*, slots, on_line, on_cycle, on_tier_cycle=None,
         cols, rows = sizing.get_size(get_app_or_none())
         ri = getattr(input_win, "render_info", None)
         width = getattr(ri, "window_width", None) if ri is not None else None
-        return input_rows(buf.text, width or (cols - 4), sizing.input_height_cap(rows))
+        return input_rows(buf.text, width or (cols - 4), sizing.input_height_cap(rows), prompt_cols=16, cont_cols=2)
 
     _prompt_hover = {"target": None}
 
@@ -2007,8 +2017,20 @@ async def run_session(*, slots, on_line, on_cycle, on_tier_cycle=None,
                 slot.draft_cursor = 0
                 if t.strip():
                     _start_turn(t)
+        pane = _pane()
+        def _mic_status(msg: str):
+            if pane is not None and hasattr(pane, "flash_note"):
+                pane.flash_note(msg, secs=10.0 if msg else 0.0)
+            from prompt_toolkit.application import get_app_or_none
+            app = get_app_or_none()
+            if app is not None:
+                app.invalidate()
+
         _set_modal_active(create_mic_dialog(
-            on_transcribe=_transcribe, on_send_direct=_send_direct, on_close=_close_modal
+            on_transcribe=_transcribe,
+            on_send_direct=_send_direct,
+            on_close=_close_modal,
+            on_status=_mic_status,
         ))
         return None
 

webbee-0.4.3/tests/test_cross_loop_token.py

@@ -0,0 +1,54 @@
+import asyncio
+import sys
+import threading
+import types
+import pytest
+from webbee.session import AgentSession
+
+class FakeCfg:
+    api_url = "https://api.imperal.io"
+
+try:
+    import imperal_mcp.client
+except ImportError:
+    if "imperal_mcp" not in sys.modules:
+        pkg = types.ModuleType("imperal_mcp")
+        sys.modules["imperal_mcp"] = pkg
+    if "imperal_mcp.client" not in sys.modules:
+        m = types.ModuleType("imperal_mcp.client")
+        class FakeImperalClient:
+            def __init__(self, cfg, token_provider=None):
+                self.cfg = cfg
+                self._token_provider = token_provider
+        m.ImperalClient = FakeImperalClient
+        sys.modules["imperal_mcp.client"] = m
+        sys.modules["imperal_mcp"].client = m
+
+@pytest.mark.asyncio
+async def test_bridge_cross_loop():
+    main_loop = asyncio.get_running_loop()
+    main_lock = asyncio.Lock()
+    await main_lock.acquire()
+
+    async def mock_token_provider():
+        async with main_lock:
+            return "jwt-token-verified"
+
+    session = AgentSession(FakeCfg(), mock_token_provider, ".")
+    factory = session._file_client_factory()
+    assert factory is not None
+
+    def worker():
+        async def work():
+            client = factory()
+            token = await client._token_provider()
+            return token
+        return asyncio.run(work())
+
+    t = threading.Thread(target=worker)
+    t.start()
+    await asyncio.sleep(0.05)
+    main_lock.release()
+    while t.is_alive():
+        await asyncio.sleep(0.01)
+    t.join()

{webbee-0.4.2 → webbee-0.4.3}/tests/test_tui.py

@@ -1800,6 +1800,21 @@ def test_input_rows_floors_a_tiny_or_zero_width():
     assert input_rows("x" * 30, 0, 10) == 3             # cols floored at 10 -> ceil(30/10)
 
 
+def test_input_rows_accounts_for_prompt_prefix_and_cwidth():
+    """Guarantees that input_rows accurately accounts for BeforeInput prompt buttons
+    (16 columns) and continuation prefix (2 columns) as well as wide characters,
+    preventing composer text from overflowing 2-4 words before growing."""
+    from webbee.tui import input_rows
+    # Inside 78-col frame, prompt takes 16 cols -> line 1 usable width is 62 cols.
+    # 60 chars fit on line 1 -> 1 row
+    assert input_rows("a" * 60, 78, 10, prompt_cols=16, cont_cols=2) == 1
+    # 65 chars overflow line 1 by 3 chars -> wraps to 2 rows
+    assert input_rows("a" * 65, 78, 10, prompt_cols=16, cont_cols=2) == 2
+    # Unicode / wide characters (e.g. 35 emojis with display width 2 each = 70 cols)
+    assert input_rows("🐝" * 30, 78, 10, prompt_cols=16, cont_cols=2) == 1  # 60 cols
+    assert input_rows("🐝" * 35, 78, 10, prompt_cols=16, cont_cols=2) == 2  # 70 cols
+
+
 # ── P5g: Esc/Ctrl-C stop the SERVER turn, not just the local task ────────────
 # Previously Ctrl-C only cancelled the local asyncio task while the cloud
 # brain kept running server-side; Esc did nothing while busy. Both key

webbee-0.4.2/src/webbee/__init__.py

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