gemcode 0.3.50__tar.gz → 0.3.52__tar.gz

{gemcode-0.3.50/src/gemcode.egg-info → gemcode-0.3.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemcode
-Version: 0.3.50
+Version: 0.3.52
 Summary: Local-first coding agent on Google Gemini + ADK
 Author: GemCode Contributors
 License:                                  Apache License

{gemcode-0.3.50 → gemcode-0.3.52}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gemcode"
-version = "0.3.50"
+version = "0.3.52"
 description = "Local-first coding agent on Google Gemini + ADK"
 readme = "README.md"
 requires-python = ">=3.11"

{gemcode-0.3.50 → gemcode-0.3.52}/src/gemcode/session_runtime.py

@@ -30,76 +30,109 @@ def session_db_path(cfg: GemCodeConfig) -> Path:
   return cfg.project_root / ".gemcode" / "sessions.sqlite"
 
 
-class _SafeComputerUseToolset:
+def _make_safe_computer_toolset(computer):
   """
-  Drop-in wrapper around ComputerUseToolset that catches Playwright startup
-  failures (e.g. missing browser binary) and disables computer-use gracefully
-  for the current session instead of crashing every turn with an unhandled error.
-
-  When the underlying toolset fails for the *first* time a one-time warning is
-  printed to stderr so the user knows they need to run ``playwright install``.
-  Subsequent calls are silently no-ops so the session keeps working without
-  browser tools — the agent can still use all other tools normally.
-  """
-
-  def __init__(self, computer) -> None:
-    try:
-      from google.adk.tools.computer_use.computer_use_toolset import ComputerUseToolset
-      self._inner = ComputerUseToolset(computer=computer)
-    except Exception:
-      self._inner = None
-    self._broken = False
-    self._warned = False
-
-  def _warn_once(self, error: Exception) -> None:
-    if self._warned:
-      return
-    self._warned = True
-    import sys
-    msg = str(error)
-    if "playwright install" in msg.lower() or "executable doesn't exist" in msg.lower():
-      print(
-        "\n[gemcode] Browser (computer-use) is unavailable — Playwright browsers are not installed.\n"
-        "  Run:  playwright install chromium\n"
-        "  Then restart GemCode with /computer on (or --computer flag).\n"
-        "  Continuing without browser tools for this session.\n",
-        file=sys.stderr,
-      )
-    else:
-      print(
-        f"\n[gemcode] Browser (computer-use) failed to start: {msg!s:.200}\n"
-        "  Continuing without browser tools for this session.\n",
-        file=sys.stderr,
-      )
+  Build a BaseToolset-compatible wrapper around ComputerUseToolset that catches
+  Playwright startup failures gracefully instead of crashing LlmAgent validation.
 
-  # ── ADK toolset protocol ────────────────────────────────────────────────────
+  Must be a proper BaseToolset subclass (not a plain class) because ADK's Pydantic
+  model for LlmAgent validates each entry in `tools` against BaseTool | BaseToolset.
+  Returns a real BaseToolset subclass instance, or None if BaseToolset is unavailable.
+  """
+  try:
+    from google.adk.tools.base_toolset import BaseToolset
+  except ImportError:
+    return None
 
-  async def process_llm_request(self, *, tool_context, llm_request) -> None:
-    if self._broken or self._inner is None:
-      return
-    try:
-      await self._inner.process_llm_request(
-          tool_context=tool_context, llm_request=llm_request
-      )
-    except Exception as exc:
-      self._broken = True
-      self._warn_once(exc)
-
-  async def get_tools(self, readonly_context=None):
-    if self._broken or self._inner is None:
-      return []
-    try:
-      return await self._inner.get_tools(readonly_context)
-    except Exception as exc:
-      self._broken = True
-      self._warn_once(exc)
-      return []
-
-  def __getattr__(self, name: str):
-    """Proxy all other attribute accesses to the inner toolset."""
-    if self._inner is not None:
-      return getattr(self._inner, name)
-    raise AttributeError(name)
+  class _SafeComputerUseToolset(BaseToolset):
+    """Wraps ComputerUseToolset; degrades to a no-op if Playwright is missing."""
+
+    def __init__(self) -> None:
+      try:
+        from google.adk.tools.computer_use.computer_use_toolset import ComputerUseToolset
+        self._inner = ComputerUseToolset(computer=computer)
+      except Exception:
+        self._inner = None
+      self._broken = False
+      self._warned = False
+
+    def _warn_once(self, error: Exception) -> None:
+      if self._warned:
+        return
+      self._warned = True
+      import sys
+      msg = str(error)
+      if "playwright install" in msg.lower() or "executable doesn't exist" in msg.lower():
+        print(
+          "\n[gemcode] Browser (computer-use) is unavailable — Playwright browsers are not installed.\n"
+          "  Run:  playwright install chromium\n"
+          "  Then restart GemCode with /computer on (or --computer flag).\n"
+          "  Continuing without browser tools for this session.\n",
+          file=sys.stderr,
+        )
+      else:
+        print(
+          f"\n[gemcode] Browser (computer-use) failed to start: {msg!s:.200}\n"
+          "  Continuing without browser tools for this session.\n",
+          file=sys.stderr,
+        )
+
+    # ── BaseToolset required attribute ──────────────────────────────────────
+    @property
+    def tool_name_prefix(self) -> str:
+      if self._inner is not None:
+        try:
+          return self._inner.tool_name_prefix
+        except Exception:
+          pass
+      return ""
+
+    # ── Core protocol methods ────────────────────────────────────────────────
+
+    async def process_llm_request(self, *, tool_context, llm_request) -> None:
+      if self._broken or self._inner is None:
+        return
+      try:
+        await self._inner.process_llm_request(
+            tool_context=tool_context, llm_request=llm_request
+        )
+      except Exception as exc:
+        if not self._broken:
+          self._broken = True
+          self._warn_once(exc)
+
+    async def get_tools(self, readonly_context=None):
+      if self._broken or self._inner is None:
+        return []
+      try:
+        return await self._inner.get_tools(readonly_context)
+      except Exception as exc:
+        if not self._broken:
+          self._broken = True
+          self._warn_once(exc)
+        return []
+
+    async def close(self) -> None:
+      if self._inner is not None:
+        try:
+          await self._inner.close()
+        except Exception:
+          pass
+
+    def __getattr__(self, name: str):
+      """Proxy any other BaseToolset attributes ADK needs to the inner toolset."""
+      # Guard against infinite recursion for our own private attrs.
+      if name.startswith("_"):
+        raise AttributeError(name)
+      inner = object.__getattribute__(self, "_inner")
+      if inner is not None:
+        try:
+          return getattr(inner, name)
+        except AttributeError:
+          pass
+      raise AttributeError(f"'_SafeComputerUseToolset' has no attribute '{name}'")
+
+  return _SafeComputerUseToolset()
 
 
 def _build_artifact_service(cfg: GemCodeConfig):
@@ -158,15 +191,15 @@ def create_runner(cfg: GemCodeConfig, extra_tools: list | None = None) -> Runner
     viewport_w = int(os.environ.get("GEMCODE_BROWSER_WIDTH", "1280"))
     viewport_h = int(os.environ.get("GEMCODE_BROWSER_HEIGHT", "720"))
     from gemcode.computer_use.browser_computer import BrowserComputer
-    from google.adk.tools.computer_use.computer_use_toolset import ComputerUseToolset
 
     computer = BrowserComputer(
       headless=headless,
       viewport_size=(viewport_w, viewport_h),
     )
-    computer_toolset = _SafeComputerUseToolset(computer=computer)
+    computer_toolset = _make_safe_computer_toolset(computer)
     merged_extra_tools = list(merged_extra_tools or [])
-    merged_extra_tools.append(computer_toolset)
+    if computer_toolset is not None:
+      merged_extra_tools.append(computer_toolset)
 
     # Standalone read-only browser tools (browser_screenshot, browser_get_text, etc.)
     from gemcode.tools.browser import build_browser_inspection_tools

{gemcode-0.3.50 → gemcode-0.3.52}/src/gemcode/tui/input_handler.py

@@ -184,8 +184,18 @@ class GemCodeInputHandler:
             """Ctrl+C clears current line (like a real shell)."""
             event.app.current_buffer.reset()
 
-        # Rows reserved for the / command popup. Too high (e.g. 20) leaves a huge
-        # empty band above the prompt; 10–12 is enough for most slash lists.
+        @kb.add("enter")
+        def _submit(event):
+            """Enter always submits — even in multiline mode (for pasted code)."""
+            event.current_buffer.validate_and_handle()
+
+        @kb.add("escape", "enter", eager=True)
+        @kb.add("c-j")  # Ctrl+J = manual newline inside a message
+        def _newline(event):
+            """Meta+Enter or Ctrl+J inserts a real newline without submitting."""
+            event.current_buffer.insert_text("\n")
+
+        # Rows reserved for the / command popup.
         try:
             _menu_rows = int(os.environ.get("GEMCODE_TUI_RESERVE_MENU_LINES", "12"))
         except ValueError:
@@ -202,8 +212,12 @@ class GemCodeInputHandler:
             mouse_support=False,
             complete_in_thread=True,
             reserve_space_for_menu=_menu_rows,
-            # Single-column popup with description column (like VS Code)
             complete_style="COLUMN",
+            # Multiline=True so pasted code (with \n) lands in the buffer
+            # as one block rather than submitting line-by-line.
+            # Our Enter binding above overrides the default "add newline"
+            # behaviour so single-line prompts work exactly as before.
+            multiline=True,
         )
 
     def is_interactive(self) -> bool:

{gemcode-0.3.50 → gemcode-0.3.52/src/gemcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemcode
-Version: 0.3.50
+Version: 0.3.52
 Summary: Local-first coding agent on Google Gemini + ADK
 Author: GemCode Contributors
 License:                                  Apache License