gemcode 0.3.108__tar.gz → 0.3.110__tar.gz

{gemcode-0.3.108/src/gemcode.egg-info → gemcode-0.3.110}/PKG-INFO

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

{gemcode-0.3.108 → gemcode-0.3.110}/pyproject.toml

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

{gemcode-0.3.108 → gemcode-0.3.110}/src/gemcode/kaira_daemon.py

@@ -94,6 +94,22 @@ def _fmt_tool_result(resp: object) -> str:
   return ""
 
 
+def _should_stream_to_terminal() -> bool:
+  """Stream live job output to the local terminal when interactive."""
+  try:
+    return bool(hasattr(sys.stdin, "isatty") and sys.stdin.isatty())
+  except Exception:
+    return False
+
+
+def _stream_print(s: str) -> None:
+  try:
+    sys.stdout.write(s)
+    sys.stdout.flush()
+  except Exception:
+    pass
+
+
 async def _broadcast_text_delta(
   *,
   ipc: KairaIpcServer,
@@ -402,6 +418,9 @@ class KairaDaemon:
     async def _stream_one_message(*, current_message: types.Content) -> tuple[list, str]:
       emitted_text = ""
       events: list = []
+      stream_live = _should_stream_to_terminal()
+      if stream_live:
+        _stream_print(f"\n[kaira {job.job_id}] started\n")
       async for ev in runner.run_async(
         user_id=self.user_id,
         session_id=job.session_id,
@@ -409,6 +428,28 @@ class KairaDaemon:
         **({"run_config": run_config} if run_config is not None else {}),
       ):
         events.append(ev)
+        # Live terminal streaming (independent of IPC).
+        if stream_live:
+          try:
+            from gemcode.web.sse_adapter import extract_text_from_event
+
+            txt_live = extract_text_from_event(ev)
+            if txt_live:
+              if txt_live.startswith(emitted_text):
+                delta_live = txt_live[len(emitted_text) :]
+              else:
+                # Fallback: find common prefix.
+                common = 0
+                max_common = min(len(txt_live), len(emitted_text))
+                while common < max_common and txt_live[common] == emitted_text[common]:
+                  common += 1
+                delta_live = txt_live[common:]
+              if delta_live:
+                _stream_print(delta_live)
+                emitted_text = txt_live
+          except Exception:
+            pass
+
         if self._ipc is None:
           continue
 
@@ -460,7 +501,7 @@ class KairaDaemon:
         except Exception:
           pass
 
-        # Text deltas
+        # Text deltas (IPC subscribers)
         try:
           from gemcode.web.sse_adapter import extract_text_from_event
 
@@ -602,8 +643,12 @@ class KairaDaemon:
         session_id=session_id,
       )
 
-  async def run_forever(self, *, session_id: str) -> None:
-    """Start the scheduler and keep running until stdin EOF/quit."""
+  async def run_forever(self, *, session_id: str, enable_stdin: bool = True) -> None:
+    """Start the scheduler and keep running until stopped.
+
+    When enable_stdin=False, Kaira runs headless (IPC-only) and does not read
+    from stdin. This mode is used when embedding Kaira inside the GemCode TUI.
+    """
 
     # Start IPC server for two-way control + event streaming.
     try:
@@ -623,11 +668,16 @@ class KairaDaemon:
       print(f"[kaira] ipc disabled: {e}", file=sys.stderr, flush=True)
 
     scheduler_task = asyncio.create_task(self._scheduler_loop())
-    stdin_task = asyncio.create_task(self._stdin_loop(session_id=session_id))
+    stdin_task = None
+    if enable_stdin:
+      stdin_task = asyncio.create_task(self._stdin_loop(session_id=session_id))
 
     # Wait for either scheduler to stop (shouldn't happen) or stdin loop to end.
+    wait_set = {scheduler_task}
+    if stdin_task is not None:
+      wait_set.add(stdin_task)
     done, pending = await asyncio.wait(
-      {scheduler_task, stdin_task},
+      wait_set,
       return_when=asyncio.FIRST_COMPLETED,
     )
     for p in pending:

{gemcode-0.3.108 → gemcode-0.3.110}/src/gemcode/repl_commands.py

@@ -378,6 +378,9 @@ def slash_help_lines() -> list[str]:
       "  /audit [N]            Tail of .gemcode/audit.log (default 40 lines)",
       "  /tools                List tool inventory for this config",
       "  /tools smoke          Declaration compile check only (failures listed)",
+      "  /mcp                  MCP status (reads .gemcode/mcp.json; shows loaded toolsets)",
+      "  /mcp list             List configured MCP servers",
+      "  /mcp reload           Rebuild runner to reload MCP toolsets",
       "  /eval [llm]           Run tools_smoke (+ pytest if tests/ exist); optional LLM goldens",
       "  /autotune init <tag>  Git branch autotune/<tag> for experiment tracking",
       "  /autotune eval [llm]  Eval + append .gemcode/evals/autotune_ledger.jsonl",

{gemcode-0.3.108 → gemcode-0.3.110}/src/gemcode/repl_slash.py

@@ -1245,6 +1245,97 @@ async def process_repl_slash(
     out()
     return ReplSlashResult(skip_model_turn=True)
 
+  # ── /mcp (Model Context Protocol toolsets) ────────────────────────────────
+  if name == "mcp":
+    args_m = (sc.args or "").strip()
+    sub = (args_m.split()[0].strip().lower() if args_m else "status")
+    mcp_path = cfg.project_root / ".gemcode" / "mcp.json"
+
+    if sub in ("help", "?"):
+      out("Usage:")
+      out("  /mcp                 Show MCP config + loaded toolsets (same as /mcp status)")
+      out("  /mcp status          Show MCP config + loaded toolsets")
+      out("  /mcp list            List configured servers from .gemcode/mcp.json")
+      out("  /mcp reload          Rebuild runner to reload MCP toolsets from disk")
+      out()
+      out("Config:")
+      out(f"  {mcp_path}")
+      out()
+      return ReplSlashResult(skip_model_turn=True)
+
+    if sub in ("reload", "refresh"):
+      out("MCP: runner will rebuild on the next turn (reload .gemcode/mcp.json).")
+      out()
+      return ReplSlashResult(skip_model_turn=True, force_rebuild_runner=True)
+
+    # Read config if present.
+    servers: list[dict] = []
+    parse_error: str | None = None
+    if mcp_path.is_file():
+      try:
+        import json
+
+        data = json.loads(mcp_path.read_text(encoding="utf-8"))
+        servers = list(data.get("servers") or [])
+      except Exception as e:
+        parse_error = str(e)
+
+    # Inspect currently loaded toolsets (best-effort; depends on how caller wired extra_tools).
+    loaded_prefixes: list[str] = []
+    loaded_count = 0
+    try:
+      from google.adk.tools.mcp_tool.mcp_toolset import McpToolset  # type: ignore
+
+      for t in list(extra_tools or []):
+        if isinstance(t, McpToolset):
+          loaded_count += 1
+          try:
+            p = getattr(t, "tool_name_prefix", None)
+            if isinstance(p, str) and p and p not in loaded_prefixes:
+              loaded_prefixes.append(p)
+          except Exception:
+            pass
+    except Exception:
+      # MCP extras not installed or ADK missing MCP toolset types.
+      pass
+
+    if sub in ("list", "ls"):
+      out(f"mcp.json: {mcp_path} ({'exists' if mcp_path.is_file() else 'missing'})")
+      if parse_error:
+        out(f"error: {parse_error}")
+        out()
+        return ReplSlashResult(skip_model_turn=True)
+      if not servers:
+        out("(no servers configured)")
+        out()
+        return ReplSlashResult(skip_model_turn=True)
+      out("Servers:")
+      for s in servers[:200]:
+        try:
+          nm = (s.get("name") or "mcp").strip()
+          kind = "stdio" if "stdio" in s else ("http" if "http" in s else ("sse" if "sse" in s else "?"))
+          out(f"  - {nm} ({kind})")
+        except Exception:
+          continue
+      if len(servers) > 200:
+        out(f"  … (+{len(servers) - 200} more)")
+      out()
+      return ReplSlashResult(skip_model_turn=True)
+
+    # Default: status.
+    out("MCP:")
+    out(f"  mcp.json: {mcp_path} ({'exists' if mcp_path.is_file() else 'missing'})")
+    if parse_error:
+      out(f"  parse_error: {parse_error}")
+    out(f"  configured_servers: {len(servers)}")
+    suffix = f"  (prefixes: {', '.join(sorted(loaded_prefixes))})" if loaded_prefixes else ""
+    out(f"  loaded_toolsets:    {loaded_count}{suffix}")
+    out()
+    if not mcp_path.is_file():
+      out("Tip: create .gemcode/mcp.json to enable MCP toolsets for this project.")
+      out()
+    return ReplSlashResult(skip_model_turn=True)
+
   if name == "tools":
     args_t = (sc.args or "").strip().lower()
     if args_t in ("smoke", "decl", "declarations"):

{gemcode-0.3.108 → gemcode-0.3.110}/src/gemcode/session_runtime.py

@@ -31,6 +31,63 @@ from gemcode.plugins.terminal_hooks_plugin import GemCodeTerminalHooksPlugin
 from gemcode.plugins.tool_recovery_plugin import GemCodeReflectAndRetryToolPlugin
 
 
+# ---------------------------------------------------------------------------
+# ADK: Gemini context cache — quiet "stale delete" failures
+# ---------------------------------------------------------------------------
+
+
+def _gemini_cache_delete_already_gone(exc: BaseException) -> bool:
+  """True when delete failed only because the cache entry is already gone.
+
+  The Gemini API often returns ``403 PERMISSION_DENIED`` with a body like
+  ``CachedContent not found`` after TTL expiry or server-side eviction. ADK's
+  default cleanup logs that as WARNING every time — noisy and usually harmless.
+  """
+  msg = str(exc).lower()
+  if "cachedcontent not found" in msg:
+    return True
+  if "not found" in msg and "cached" in msg:
+    return True
+  code = getattr(exc, "code", None)
+  if code == 404:
+    return True
+  status = (getattr(exc, "status", None) or "").upper()
+  if code == 403 and status == "PERMISSION_DENIED" and ("cachedcontent" in msg or "cached content" in msg):
+    return True
+  return False
+
+
+def _patch_gemini_adk_cache_cleanup() -> None:
+  """Downgrade benign cache-delete failures to DEBUG (see ``_gemini_cache_delete_already_gone``)."""
+  try:
+    from google.adk.models import gemini_context_cache_manager as gccm
+  except Exception:
+    return
+  if getattr(gccm.GeminiContextCacheManager, "_gemcode_cleanup_patch", False):
+    return
+
+  async def _cleanup(self, cache_name: str) -> None:
+    gccm.logger.debug("Attempting to delete cache: %s", cache_name)
+    try:
+      await self.genai_client.aio.caches.delete(name=cache_name)
+      gccm.logger.info("Cache cleaned up: %s", cache_name)
+    except BaseException as e:
+      if _gemini_cache_delete_already_gone(e):
+        gccm.logger.debug(
+            "Cache delete no-op (already expired or gone): %s — %s",
+            cache_name,
+            e,
+        )
+        return
+      gccm.logger.warning("Failed to cleanup cache %s: %s", cache_name, e)
+
+  gccm.GeminiContextCacheManager.cleanup_cache = _cleanup  # type: ignore[method-assign]
+  gccm.GeminiContextCacheManager._gemcode_cleanup_patch = True
+
+
+_patch_gemini_adk_cache_cleanup()
+
+
 # ---------------------------------------------------------------------------
 # ADK App-level feature helpers
 # ---------------------------------------------------------------------------
@@ -417,9 +474,12 @@ def create_runner(cfg: GemCodeConfig, extra_tools: list | None = None) -> Runner
     import sys
 
     prompt_afc = os.environ.get("GEMCODE_AFC_PROMPT", "1").strip().lower() in ("1", "true", "yes", "on")
+    afc_default = (os.environ.get("GEMCODE_AFC_DEFAULT") or "").strip().lower()
     if prompt_afc and hasattr(sys.stdin, "isatty") and sys.stdin.isatty():
       tools_list = list(merged_extra_tools or [])
       noncallable = [t for t in tools_list if not callable(t)]
+      if noncallable and getattr(cfg, "_afc_choice", None) not in ("all", "callables") and afc_default in ("all", "callables"):
+        object.__setattr__(cfg, "_afc_choice", afc_default)
       if noncallable and getattr(cfg, "_afc_choice", None) not in ("all", "callables"):
         print(
           "\n[gemcode] AFC compatibility\n"

{gemcode-0.3.108 → gemcode-0.3.110}/src/gemcode/tui/scrollback.py

@@ -279,6 +279,50 @@ async def run_gemcode_scrollback_tui(
       get_cfg=lambda: cfg,
   )
 
+  # ── Optional: embed Kaira daemon in this TUI ─────────────────────────────
+  # This enables continuous background automation without requiring a second
+  # terminal. The TUI will also auto-subscribe to IPC events (below) so job
+  # output appears inline.
+  _embedded_kaira_task: list = [None]  # asyncio.Task | None
+
+  def _embed_kaira_enabled() -> bool:
+    return os.environ.get("GEMCODE_TUI_WITH_KAIRA", "0").strip().lower() in (
+      "1",
+      "true",
+      "yes",
+      "on",
+    )
+
+  async def _start_embedded_kaira() -> None:
+    if not _embed_kaira_enabled():
+      return
+    # Avoid starting if a socket already exists (external daemon running).
+    sock = os.environ.get("GEMCODE_KAIRA_SOCKET") or str(cfg.project_root / _KAIRA_SOCKET_DEFAULT)
+    try:
+      from pathlib import Path as _Path
+
+      if _Path(sock).exists():
+        return
+    except Exception:
+      pass
+    try:
+      from gemcode.kaira_daemon import KairaDaemon
+
+      # Use this TUI's session id as the default session for stdin-less jobs.
+      daemon = KairaDaemon(cfg=cfg, concurrency=2, default_priority=0)
+      # Run headless: IPC-only. Jobs are enqueued via IPC (monitor scripts, org tools, etc.).
+      await daemon.run_forever(session_id=session_id, enable_stdin=False)
+    except asyncio.CancelledError:
+      return
+    except Exception:
+      return
+
+  try:
+    if _embed_kaira_enabled():
+      _embedded_kaira_task[0] = asyncio.create_task(_start_embedded_kaira())
+  except Exception:
+    _embedded_kaira_task[0] = None
+
   # ── Kaira auto-connect (IPC subscribe) ───────────────────────────────────
   # If a Kaira daemon is running for this project, subscribe to its updates and
   # surface them in the same terminal UI. Also handle permission requests by
@@ -765,6 +809,12 @@ async def run_gemcode_scrollback_tui(
             t.cancel()
         except Exception:
           pass
+        try:
+          t2 = _embedded_kaira_task[0]
+          if t2 is not None:
+            t2.cancel()
+        except Exception:
+          pass
         try:
           from gemcode.hooks import run_session_stop_hook
           run_session_stop_hook(cfg.project_root, model=getattr(cfg, "model", "") or "")
@@ -781,6 +831,12 @@ async def run_gemcode_scrollback_tui(
             t.cancel()
         except Exception:
           pass
+        try:
+          t2 = _embedded_kaira_task[0]
+          if t2 is not None:
+            t2.cancel()
+        except Exception:
+          pass
         from gemcode.hooks import run_session_stop_hook
         run_session_stop_hook(cfg.project_root, model=getattr(cfg, "model", "") or "")
       except Exception:

{gemcode-0.3.108 → gemcode-0.3.110/src/gemcode.egg-info}/PKG-INFO

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

{gemcode-0.3.108 → gemcode-0.3.110}/src/gemcode.egg-info/SOURCES.txt

@@ -149,6 +149,7 @@ tests/test_permissions.py
 tests/test_prompt_suggestions.py
 tests/test_repl_commands.py
 tests/test_repl_slash.py
+tests/test_session_runtime_cache.py
 tests/test_skills.py
 tests/test_slash_commands.py
 tests/test_slash_completion_registry.py

gemcode-0.3.110/tests/test_session_runtime_cache.py

@@ -0,0 +1,39 @@
+"""Tests for Gemini context-cache cleanup heuristics (session_runtime)."""
+
+from __future__ import annotations
+
+import pytest
+
+from gemcode.session_runtime import _gemini_cache_delete_already_gone
+
+
+def test_cache_delete_harmless_user_reported_403() -> None:
+  pytest.importorskip("google.genai.errors")
+  from google.genai.errors import ClientError
+
+  exc = ClientError(
+    403,
+    {"error": {"message": "CachedContent not found (or permission denied)", "status": "PERMISSION_DENIED"}},
+    None,
+  )
+  assert _gemini_cache_delete_already_gone(exc) is True
+
+
+def test_cache_delete_not_harmless_other_403() -> None:
+  pytest.importorskip("google.genai.errors")
+  from google.genai.errors import ClientError
+
+  exc = ClientError(
+    403,
+    {"error": {"message": "Permission denied on billing account", "status": "PERMISSION_DENIED"}},
+    None,
+  )
+  assert _gemini_cache_delete_already_gone(exc) is False
+
+
+def test_cache_delete_harmless_404() -> None:
+  pytest.importorskip("google.genai.errors")
+  from google.genai.errors import ClientError
+
+  exc = ClientError(404, {"error": {"message": "Not found", "status": "NOT_FOUND"}}, None)
+  assert _gemini_cache_delete_already_gone(exc) is True