gemcode 0.4.28__tar.gz → 0.4.30__tar.gz

{gemcode-0.4.28/src/gemcode.egg-info → gemcode-0.4.30}/PKG-INFO

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

{gemcode-0.4.28 → gemcode-0.4.30}/pyproject.toml

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

{gemcode-0.4.28 → gemcode-0.4.30}/src/gemcode/web/preview_api.py

@@ -157,14 +157,30 @@ def _cleanup_managed_servers() -> None:
 atexit.register(_cleanup_managed_servers)
 
 
+def _http_responds(port: int, request_path: str = "/", *, timeout: float = 1.0) -> bool:
+  try:
+    conn = HTTPConnection("127.0.0.1", port, timeout=timeout)
+    conn.request(
+      "GET",
+      request_path or "/",
+      headers={"User-Agent": "GemCode-Web-Preview/1.0", "Accept": "*/*"},
+    )
+    resp = conn.getresponse()
+    resp.read()
+    conn.close()
+    return True
+  except OSError:
+    return False
+
+
 def ensure_workspace_static_server(port: int, root: Path) -> tuple[bool, str | None]:
   """
-  Ensure something accepts TCP on ``127.0.0.1:port``.
+  Ensure something accepts HTTP on ``127.0.0.1:port``.
 
   If the port is free and eligible, start ``python -m http.server`` in ``root``.
   Returns (ok, note).
   """
-  if _port_open("127.0.0.1", port, timeout=0.35):
+  if _http_responds(port):
     return True, None
   if port not in STATIC_AUTOSTART_PORTS:
     return False, (
@@ -176,16 +192,16 @@ def ensure_workspace_static_server(port: int, root: Path) -> tuple[bool, str | N
     return False, f"Workspace root is not a directory: {root}"
 
   with _server_lock:
-    if _port_open("127.0.0.1", port, timeout=0.35):
+    if _http_responds(port):
       return True, None
     existing = _managed_servers.get(port)
     if existing is not None and existing.poll() is None:
-      for _ in range(25):
-        if _port_open("127.0.0.1", port, timeout=0.2):
+      for _ in range(40):
+        if _http_responds(port):
           return True, "managed"
         if existing.poll() is not None:
           break
-        time.sleep(0.08)
+        time.sleep(0.1)
     try:
       proc = subprocess.Popen(
         [
@@ -204,13 +220,13 @@ def ensure_workspace_static_server(port: int, root: Path) -> tuple[bool, str | N
     except OSError as exc:
       return False, f"Could not start static preview server: {exc}"
     _managed_servers[port] = proc
-    for _ in range(30):
-      if _port_open("127.0.0.1", port, timeout=0.2):
+    for _ in range(50):
+      if _http_responds(port):
         return True, "started"
       if proc.poll() is not None:
         _managed_servers.pop(port, None)
         return False, "Static preview server exited immediately (port may be busy)."
-      time.sleep(0.08)
+      time.sleep(0.1)
     return False, "Timed out waiting for static preview server."
 
 
@@ -299,13 +315,29 @@ def handle_preview_proxy(
     if root is not None:
       ok, note = ensure_workspace_static_server(port, root)
       if ok:
-        try:
-          time.sleep(0.05)
-          status, body, ctype, headers_list = _fetch()
-        except OSError as second_exc:
+        status = 0
+        body = b""
+        ctype = ""
+        headers_list = []
+        last_err: OSError | None = None
+        # Retry briefly — TCP can accept before http.server is ready to route paths.
+        for attempt in range(12):
+          try:
+            time.sleep(0.08 if attempt else 0.05)
+            status, body, ctype, headers_list = _fetch()
+            if status != 404:
+              break
+            # 404 right after start: file may not be visible yet; retry a few times.
+            if attempt < 8:
+              continue
+            break
+          except OSError as second_exc:
+            last_err = second_exc
+            continue
+        if last_err is not None and status == 0:
           msg = (
             f'{{"error":"Preview upstream unreachable after starting static server: '
-            f'{type(second_exc).__name__}: {second_exc}"}}'
+            f'{type(last_err).__name__}: {last_err}"}}'
           )
           return 502, msg.encode(), {"Content-Type": "application/json; charset=utf-8"}
       else:
@@ -315,6 +347,25 @@ def handle_preview_proxy(
     else:
       msg = f'{{"error":"Preview upstream unreachable: {type(first_exc).__name__}: {first_exc}"}}'
       return 502, msg.encode(), {"Content-Type": "application/json; charset=utf-8"}
+  else:
+    # Live server returned 404 — retry once after a short wait (startup race).
+    if status == 404 and root is not None:
+      for _ in range(6):
+        time.sleep(0.12)
+        try:
+          status, body, ctype, headers_list = _fetch()
+          if status != 404:
+            break
+        except OSError:
+          ok, _ = ensure_workspace_static_server(port, root)
+          if not ok:
+            break
+          try:
+            status, body, ctype, headers_list = _fetch()
+          except OSError:
+            break
+          if status != 404:
+            break
 
   headers: dict[str, str] = {}
   for key, value in headers_list:

{gemcode-0.4.28 → gemcode-0.4.30}/src/gemcode/web/sse_adapter.py

@@ -437,6 +437,8 @@ def _inject_web_code_context(cfg: GemCodeConfig, prompt: str, req: dict[str, Any
     "Use them proactively; never tell the user you cannot access their files.",
     f"Workspace root: `{root}`",
     "Tool paths are relative to this workspace root.",
+    "When the user asks to analyze the codebase / project / repo, stay **inside this workspace root only** — "
+    "do not walk up to parent directories or sibling folders outside this root.",
   ]
 
   active = req.get("active_file")
@@ -1125,15 +1127,21 @@ async def run_adapter(req: dict[str, Any]) -> None:
     raise ValueError(str(exc)) from exc
   if not root_path.is_dir():
     raise ValueError(f"project_root is not a directory: {root_path}")
-  project_root = str(root_path)
+  project_root = str(root_path.resolve())
   from gemcode.org import resolve_fleet_root
 
-  fleet_root = resolve_fleet_root(root_path.resolve())
-  cfg = GemCodeConfig(project_root=fleet_root)
+  # Fleet/org lives at the nearest ancestor with .gemcode/org.json (often the
+  # tenant PVC root). Tooling + "analyze codebase" must stay on the *selected*
+  # project folder the UI sent — do not widen to fleet_root.
+  project_path = root_path.resolve()
+  fleet_root = resolve_fleet_root(project_path)
+  cfg = GemCodeConfig(project_root=project_path)
 
   from gemcode.trust import ensure_hosted_workspace_trust
 
   ensure_hosted_workspace_trust(fleet_root)
+  if project_path != fleet_root:
+    ensure_hosted_workspace_trust(project_path)
 
   if req.get("session_id"):
     try:

{gemcode-0.4.28 → gemcode-0.4.30/src/gemcode.egg-info}/PKG-INFO

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

{gemcode-0.4.28 → gemcode-0.4.30}/src/gemcode.egg-info/SOURCES.txt

@@ -189,6 +189,7 @@ tests/test_output_styles_and_rules.py
 tests/test_paths.py
 tests/test_permissions.py
 tests/test_preview_proxy.py
+tests/test_project_folder_scope.py
 tests/test_prompt_suggestions.py
 tests/test_repl_commands.py
 tests/test_repl_slash.py

gemcode-0.4.30/tests/test_project_folder_scope.py

@@ -0,0 +1,33 @@
+"""Selected project folder must remain cfg.project_root (not fleet_root)."""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+from gemcode.org import resolve_fleet_root
+
+
+def test_resolve_fleet_root_walks_up_to_tenant(tmp_path: Path) -> None:
+  tenant = tmp_path / "workspace"
+  project = tenant / "final todo"
+  project.mkdir(parents=True)
+  (tenant / ".gemcode").mkdir()
+  (tenant / ".gemcode" / "org.json").write_text("{}", encoding="utf-8")
+
+  assert resolve_fleet_root(project).resolve() == tenant.resolve()
+  assert resolve_fleet_root(tenant).resolve() == tenant.resolve()
+
+
+def test_inject_context_scopes_to_project_folder(tmp_path: Path) -> None:
+  from gemcode.config import GemCodeConfig
+  from gemcode.web import sse_adapter
+
+  project = tmp_path / "my-app"
+  project.mkdir()
+  cfg = GemCodeConfig(project_root=project)
+  object.__setattr__(cfg, "_web_workspace_mode", "code")
+  object.__setattr__(cfg, "_web_interactive_hitl", True)
+  out = sse_adapter._inject_web_code_context(cfg, "analyze codebase", {})
+  assert str(project.resolve()) in out
+  assert "stay **inside this workspace root only**" in out