webbee 0.3.26__tar.gz → 0.3.28__tar.gz

{webbee-0.3.26 → webbee-0.3.28}/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.3.28
+
+The Home screen scrolls now. When Home has more than fills the window — a tall
+stack of tabs, or command output — scroll it with the mouse wheel or
+PageUp/PageDown, like any other view. Output from a command run on Home (for
+example `/help`) shows inline at the bottom and the view jumps to it.
+
+## 0.3.27
+
+Home dashboard polish.
+
+- The Webbee Code logo is back at the top of Home.
+- Home now shows when your plan renews (or expires).
+- "Top up credits" opens the right billing page.
+- The new-tab mode you pick on Home is now honored no matter how you open
+  the tab — typing, the "+" button, and Ctrl+T all agree.
+
 ## 0.3.26
 
 The Home tab is now an interactive dashboard — a little website inside your

{webbee-0.3.26 → webbee-0.3.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webbee
-Version: 0.3.26
+Version: 0.3.28
 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.3.26 → webbee-0.3.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "webbee"
-version = "0.3.26"
+version = "0.3.28"
 description = "Webbee 🐝 — the Imperal Cloud coding agent in your terminal"
 readme = "README.md"
 license = "MIT"

webbee-0.3.28/src/webbee/__init__.py

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

{webbee-0.3.26 → webbee-0.3.28}/src/webbee/home_view.py

@@ -293,20 +293,24 @@ class HomeView:
 
     def __init__(self, *, slots, actions: "HomeActions",
                  data: "HomeData | None" = None, width: int = 100, out_pane=None):
-        from prompt_toolkit.layout.containers import HSplit, Window
+        from prompt_toolkit.layout.containers import Window
         from prompt_toolkit.layout.controls import FormattedTextControl
         self.slots = slots
         self.actions = actions
         self.data = data if data is not None else HomeData()
-        # An OutputPane below the dashboard is Home's command/output region:
-        # `_say` and slash-command output (e.g. /help, gated-action notes)
-        # print into its captured console so a command run while Home is
-        # active still shows an honest answer, and the dock's OutputPane spy +
-        # ticker (dump/reflow/scroll/flash/edge_tick/forward_mouse) keep
-        # working. The dock builds it via `tui.OutputPane` and passes it
-        # (spy-visible, created first = Home); a bare fallback covers direct
-        # unit use. `self.console` IS that pane's console — it drives both the
-        # command output AND the dashboard's column-width math.
+        # Home is ONE ordinary scrollable Window (NOT dont_extend_height, NOT
+        # an HSplit): when its content is taller than the viewport, prompt_
+        # toolkit's own Window mouse handler scrolls it on the wheel (content
+        # fragment handlers return NotImplemented for SCROLL, so it falls
+        # through to Window._mouse_handler), and pageup/pagedown route here via
+        # `scroll()`. `_say`/slash-command output is rendered INLINE at the
+        # bottom of the SAME scrollable content (see `_fragments`), so it
+        # scrolls with everything and never gets squeezed off a short terminal.
+        # `out_pane` (built via `tui.OutputPane` by the dock, created first =
+        # Home for the spy) stays purely as the CAPTURE backend: `_say` prints
+        # into its console and `dump()` reads it back; its own window is NOT in
+        # the layout. `self.console` IS that pane's console — it drives both the
+        # captured command output AND the dashboard's column-width math.
         if out_pane is None:
             from webbee.output_pane import OutputPane
             out_pane = OutputPane(width=width)
@@ -316,37 +320,53 @@ class HomeView:
         self._hover_id: "str | None" = None
         self._model: "HomeModel | None" = None
         self.control = FormattedTextControl(self._fragments, focusable=True, show_cursor=False)
-        self._dash = Window(content=self.control, wrap_lines=False,
-                            always_hide_cursor=True, dont_extend_height=True)
-        self.window = HSplit([self._dash, out_pane.window])
+        self.window = Window(content=self.control, wrap_lines=False, always_hide_cursor=True)
 
     # ---- OutputPane-compatible surface (ticker/layout duck-type) ----------
-    # All delegate to the composed output pane so the dock's ticker/layout
-    # drive Home's command-output region exactly as they do a session pane.
     def reflow(self, new_width: int) -> None:
+        # Keep the capture console's width in sync (drives the dashboard's
+        # column math) and repaint; the Window re-lays-out at the new size.
         self._out.reflow(new_width)
+        self._invalidate()
 
     def edge_tick(self) -> None:
-        self._out.edge_tick()
+        return None
 
     def flash(self) -> str:
         return self._out.flash()
 
     def scroll(self, delta: int) -> None:
-        self._out.scroll(delta)
+        # pageup/pagedown (tui routes here). Move the Window's own vertical
+        # scroll, clamped to the scrollable range; render_info is present once
+        # the window has been drawn at least one frame.
+        win = self.window
+        info = getattr(win, "render_info", None)
+        if info is None:
+            return
+        max_scroll = max(0, info.content_height - info.window_height)
+        win.vertical_scroll = min(max_scroll, max(0, win.vertical_scroll + delta))
+        self._invalidate()
 
     @property
     def _view_h(self) -> int:
-        return self._out._view_h
+        info = getattr(self.window, "render_info", None)
+        return info.window_height if info is not None else 20
 
     def forward_mouse(self, ev, clamp: str = "bottom") -> bool:
-        return self._out.forward_mouse(ev, clamp)
+        return False
 
     def dump(self) -> str:
         return self._out.dump()
 
     def notify(self) -> None:
-        self._out.notify()
+        # New captured output landed (a `_say` note / command reply). Reveal
+        # it: jump the scroll to the bottom (PT clamps on the next render) so
+        # the answer is visible, then repaint.
+        try:
+            self.window.vertical_scroll = 10 ** 7
+        except Exception:
+            pass
+        self._invalidate()
 
     def _invalidate(self) -> None:
         try:
@@ -445,10 +465,17 @@ class HomeView:
             nick = getattr(a, "nickname", "") or ""
             L.append([("class:home.value", f"  @{nick}" if nick else "  (no nickname)")])
             plan = getattr(a, "plan", "") or ""
+            status = getattr(a, "plan_status", "") or ""
             if plan:
-                status = getattr(a, "plan_status", "") or ""
                 tag = f" ({status})" if status and status != "active" else ""
                 L.append([("class:home.dim", f"  {plan} plan{tag}")])
+            renews = getattr(a, "plan_renews", "") or ""
+            if renews:
+                # `plan_renews` is the formatted subscription expires_at: an
+                # auto-renewing (active/trialing) plan RENEWS then, a
+                # cancelled/lapsing one EXPIRES then.
+                verb = "renews" if status in ("active", "trialing", "") else "expires"
+                L.append([("class:home.dim", f"  {verb} {renews}")])
             email = getattr(a, "email", "") or ""
             if email:
                 L.append([("class:home.dim", f"  {_mask_email(email)}")])
@@ -544,7 +571,21 @@ class HomeView:
                        "· Ctrl+T new tab · Alt+N switch")])
             return L
 
-        lines = [[("class:home.header", " ◆ Home ")], [("", "")]]
+        # Header: the Webbee Code ASCII logo (bee-yellow), then a centered
+        # "◆ Home" — restored (it was on the pre-dashboard Home and Valentin
+        # wants it kept). The whole art block is centered by ONE offset (max
+        # line width) so its shape is preserved; degrades to left-aligned when
+        # the terminal is narrower than the art.
+        from webbee.banner_art import WEBBEE_CODE
+        art = WEBBEE_CODE.rstrip("\n").split("\n")
+        art_w = max((len(ln) for ln in art), default=0)
+        art_pad = max(0, (width - art_w) // 2)
+        lines = [[("", "")]]
+        for ln in art:
+            lines.append([("", " " * art_pad), ("class:home.header", ln)] if ln else [("", "")])
+        title_pad = max(0, (width - len("◆ Home")) // 2)
+        lines.append([("", " " * title_pad), ("class:home.header", "◆ Home")])
+        lines.append([("", "")])
         if two_column(width):
             colw = max(20, (width // 2) - 3)
             lines += _side_by_side(you_lines(), wallet_lines(), colw)
@@ -558,6 +599,17 @@ class HomeView:
         lines += [[("", "")]] + security_lines()
         lines += footer_lines()
 
+        # `_say` / slash-command output, captured in the backend pane, rendered
+        # INLINE at the very bottom of the same scrollable content (ANSI →
+        # fragments, styling preserved). `notify()` jumps the scroll here so a
+        # command's answer is visible; it scrolls with the rest of Home.
+        dump = self._out.dump()
+        if dump.strip():
+            from prompt_toolkit.formatted_text import ANSI, to_formatted_text
+            lines.append([("", "")])
+            lines.append([("class:home.header", " Output ")])
+            lines.append(list(to_formatted_text(ANSI(dump.rstrip("\n")))))
+
         out = []
         for ln in lines:
             out.extend(ln)

{webbee-0.3.26 → webbee-0.3.28}/src/webbee/repl.py

@@ -465,7 +465,7 @@ async def _isolate_workspace(workspace: str, resources: WorkspaceResources, *,
 async def _make_session_slot(cfg, token_provider, workspace, mode, *, resources: WorkspaceResources,
                              shared_client, agent_factory, intel_factory, shadow_factory,
                              first: bool, account=None, _with_replayed: bool = False,
-                             slot_id: "str | None" = None):
+                             slot_id: "str | None" = None, mode_pinned: bool = False):
     """Builds ONE dock tab's atomic {agent, sink, pane} triple (map §6 —
     created together, a sink must never point at another slot's pane/
     console). `shared_client` isn't consumed here yet — reserved for Task 3's
@@ -533,7 +533,12 @@ async def _make_session_slot(cfg, token_provider, workspace, mode, *, resources:
             return compute_repo_key(find_repo_root(workspace))
         repo_key_task = asyncio.ensure_future(asyncio.to_thread(_repo_key))
 
-    effective_mode = await asyncio.to_thread(load_mode, workspace) or mode
+    # `mode_pinned` = the caller's mode is an EXPLICIT user choice (Home's
+    # "new-tab mode" setting, threaded through _open_new_tab/_home_input) and
+    # MUST win over this repo's remembered mode — otherwise a new tab opened
+    # from Home silently ignores the mode you just picked. Only the boot
+    # first-tab (mode_pinned=False) resumes the per-repo remembered mode.
+    effective_mode = mode if mode_pinned else (await asyncio.to_thread(load_mode, workspace) or mode)
     width, _height = get_size(None)   # pre-app: same fallback tui.run_session's own sizing uses
     pane = tui.OutputPane(width=width)
     sink = RichSink(console=pane.console, on_output=pane.notify)
@@ -585,9 +590,11 @@ async def _home_input(text: str, *, slots: SlotManager, cfg, token_provider, mod
     """Home's Enter path (Task 6, wired into `tui.run_session` as
     `home_input=`): typing a task on Home opens a session tab in one motion
     — the SAME `_make_session_slot`/switch path the `/new` command uses
-    (always `first=False`, always the process's BASELINE `mode`, per the
-    replay landmine and the autopilot-never-inherited rule both documented
-    on the `new_tab` action above) — then runs the typed text as that NEW
+    (always `first=False`; the `mode` passed in is Home's explicit "new-tab
+    mode" setting and is PINNED — `mode_pinned=True` — so it wins over this
+    repo's remembered mode, exactly like the Ctrl+T / + / `/new` path, and a
+    new tab honors the mode you picked on Home instead of silently resuming a
+    stale per-repo default) — then runs the typed text as that NEW
     slot's own first turn, explicitly against `new_slot` (FIX1: `run_turn` --
     repl's `_run_turn` -- is slot-explicit now, never resolves
     `slots.active()` internally). FIX3: the turn is started through
@@ -616,7 +623,8 @@ async def _home_input(text: str, *, slots: SlotManager, cfg, token_provider, mod
     new_slot = await _make_session_slot(
         cfg, token_provider, ws, mode, resources=resources,
         shared_client=shared_client, agent_factory=agent_factory,
-        intel_factory=intel_factory, shadow_factory=shadow_factory, first=False)
+        intel_factory=intel_factory, shadow_factory=shadow_factory, first=False,
+        mode_pinned=True)
     idx = slots.add(new_slot)
     ui_hooks.get("switch", slots.switch)(idx)
     if spawn_poller is not None:
@@ -1194,7 +1202,7 @@ async def run_repl(cfg, mode: str = "default", *, once: bool = False, sink=None,
             cfg, token_provider, ws, state.get("new_tab_mode") or mode, resources=resources,
             shared_client=shared_client, agent_factory=agent_factory,
             intel_factory=intel_factory, shadow_factory=shadow_factory,
-            first=False)
+            first=False, mode_pinned=True)
         idx = slots.add(new_slot)
         ui_hooks.get("switch", slots.switch)(idx)
         _spawn_slot_poller(new_slot)
@@ -1256,7 +1264,7 @@ async def run_repl(cfg, mode: str = "default", *, once: bool = False, sink=None,
                     ui_hooks.get("switch", slots.switch)(idx)
 
                 def _home_top_up() -> None:
-                    url = urlopen.open_url(f"{cfg.panel_url}/billing")
+                    url = urlopen.open_url(f"{cfg.panel_url}/ext/billing")
                     home_view.data.notice = f"top up at {url}"
                     home_view.notify()
 

{webbee-0.3.26 → webbee-0.3.28}/tests/test_home.py

@@ -216,7 +216,7 @@ def test_home_input_creates_slot_switches_and_runs_first_turn():
     created = {}
 
     async def fake_make_session_slot(cfg, tp, ws, mode, *, resources, shared_client,
-                                      agent_factory, intel_factory, shadow_factory, first):
+                                      agent_factory, intel_factory, shadow_factory, first, mode_pinned=False):
         created["ws"] = ws
         created["first"] = first
         slot = _session_slot(workspace=ws, label="new")
@@ -268,7 +268,7 @@ def test_home_input_new_slot_sink_records_echo(monkeypatch):
     slots.add(_home_slot(workspace="/cwd"))
 
     async def fake_make_session_slot(cfg, tp, ws, mode, *, resources, shared_client,
-                                      agent_factory, intel_factory, shadow_factory, first):
+                                      agent_factory, intel_factory, shadow_factory, first, mode_pinned=False):
         s = _session_slot(workspace=ws)
         s.sink = _EchoSink()
         return s
@@ -303,7 +303,7 @@ def test_home_input_dock_path_echoes_exactly_once():
     slots.add(_home_slot(workspace="/cwd"))
 
     async def fake_make_session_slot(cfg, tp, ws, mode, *, resources, shared_client,
-                                      agent_factory, intel_factory, shadow_factory, first):
+                                      agent_factory, intel_factory, shadow_factory, first, mode_pinned=False):
         s = _session_slot(workspace=ws)
         s.sink = _EchoSink()
         return s
@@ -381,7 +381,7 @@ def test_home_input_uses_new_tab_mode_when_provided():
     seen = {}
 
     async def fake_make_session_slot(cfg, tp, ws, mode, *, resources, shared_client,
-                                     agent_factory, intel_factory, shadow_factory, first):
+                                     agent_factory, intel_factory, shadow_factory, first, mode_pinned=False):
         seen["mode"] = mode
         s = _session_slot(workspace=ws)
         class _E:

{webbee-0.3.26 → webbee-0.3.28}/tests/test_home_view.py

@@ -279,3 +279,39 @@ def test_outputpane_compat_surface_delegates_to_output_pane():
     # _say prints into HomeView.console (the output pane) and is dump()-visible
     hv.console.print("hello-from-say")
     assert "hello-from-say" in hv.dump()
+
+
+def test_you_tile_shows_plan_renews_when_active():
+    data = HomeData(account=Account(signed_in=True, nickname="v", plan="pro",
+                                    plan_status="active", plan_renews="Aug 3"))
+    hv, _ = _view(data=data)
+    text = "".join(f[1] for f in hv._fragments())
+    assert "renews Aug 3" in text
+
+
+def test_you_tile_shows_expires_when_not_active():
+    data = HomeData(account=Account(signed_in=True, nickname="v", plan="pro",
+                                    plan_status="canceled", plan_renews="Aug 3"))
+    hv, _ = _view(data=data)
+    text = "".join(f[1] for f in hv._fragments())
+    assert "expires Aug 3" in text
+
+
+def test_home_renders_webbee_code_logo_and_title():
+    hv, _ = _view()
+    text = "".join(f[1] for f in hv._fragments())
+    assert "_____" in text        # a slice of the WEBBEE_CODE ascii banner
+    assert "◆ Home" in text
+
+
+def test_captured_output_renders_inline_and_notify_reveals_it():
+    # Home is one scrollable window; _say/command output is captured in the
+    # backend pane and rendered INLINE at the bottom, and notify() jumps the
+    # scroll to reveal it.
+    hv, _ = _view()
+    hv.console.print("hello-inline-output")
+    text = "".join(f[1] for f in hv._fragments())
+    assert "hello-inline-output" in text
+    assert "Output" in text
+    hv.notify()
+    assert hv.window.vertical_scroll >= 10 ** 6

{webbee-0.3.26 → webbee-0.3.28}/tests/test_repl.py

@@ -1881,6 +1881,33 @@ def test_make_session_slot_uses_remembered_mode_over_process_baseline(monkeypatc
     assert captured["mode"] == "plan"   # the agent itself is built with it too
 
 
+def test_make_session_slot_mode_pinned_beats_remembered_mode(monkeypatch):
+    # W5 fix: a new tab opened from Home carries the user's EXPLICIT "new-tab
+    # mode" (mode_pinned=True) which must win over this repo's remembered
+    # mode. Before this, load_mode silently overrode the picked mode —
+    # inconsistently by target repo — so Ctrl+T opened with the wrong mode
+    # while typing on Home happened to keep it. This is the shared chokepoint
+    # both _open_new_tab (Ctrl+T / + / /new) and _home_input (typing) use.
+    import webbee.mode_store as MS
+    monkeypatch.setattr(MS, "load_mode", lambda ws: "plan")
+    captured = {}
+
+    def agent_factory(c, tp, ws, m):
+        captured["mode"] = m
+        return FakeAgent()
+
+    async def _drive():
+        return await _make_session_slot(
+            _mk_cfg(), _noop_token_provider, os.getcwd(), "autopilot",
+            resources=WorkspaceResources(), shared_client=None,
+            agent_factory=agent_factory, intel_factory=lambda cfg, ws: _NoopIntel(),
+            shadow_factory=lambda cfg, ws: None, first=False, mode_pinned=True)
+
+    slot = asyncio.run(_drive())
+    assert slot.mode == "autopilot"        # pinned explicit choice beats remembered "plan"
+    assert captured["mode"] == "autopilot"
+
+
 def test_make_session_slot_falls_back_to_baseline_when_nothing_remembered(monkeypatch):
     import webbee.mode_store as MS
     monkeypatch.setattr(MS, "load_mode", lambda ws: None)

{webbee-0.3.26 → webbee-0.3.28}/tests/test_tui.py

@@ -3979,7 +3979,7 @@ def test_home_input_first_turn_task_is_visible_and_esc_cancels_it():
                                    user_echo=lambda t: None)
 
         async def fake_make_session_slot(cfg, tp, ws, mode, *, resources, shared_client,
-                                          agent_factory, intel_factory, shadow_factory, first):
+                                          agent_factory, intel_factory, shadow_factory, first, mode_pinned=False):
             return SessionSlot(kind="session", workspace=ws, label="new",
                                pane=tui.OutputPane(width=80), sink=new_sink, agent=None)
 

webbee-0.3.26/src/webbee/__init__.py

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