gemcode 0.4.25__tar.gz → 0.4.26__tar.gz

{gemcode-0.4.25/src/gemcode.egg-info → gemcode-0.4.26}/PKG-INFO

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

{gemcode-0.4.25 → gemcode-0.4.26}/pyproject.toml

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

{gemcode-0.4.25 → gemcode-0.4.26}/src/gemcode/web/hitl_bridge.py

@@ -1,4 +1,10 @@
-"""File-based HITL approval bridge for web chat (subprocess-safe)."""
+"""File-based HITL approval bridge for web chat (subprocess-safe).
+
+Chat SSE runs in a ``gemcode.web.sse_adapter`` subprocess while
+``POST /api/chat/approve`` is handled by the parent ``gemcode serve`` process.
+In-memory waiter sets therefore cannot detect “live” approvals across that
+boundary — use ``*.waiting`` marker files on the shared approval dir instead.
+"""
 
 from __future__ import annotations
 
@@ -17,22 +23,64 @@ def _approval_dir() -> Path:
   return Path.home() / ".gemcode" / "web_approvals"
 _DEFAULT_TIMEOUT_S = float(os.environ.get("GEMCODE_WEB_HITL_TIMEOUT_S", "3600"))
 _POLL_INTERVAL_S = 0.25
-# approval_ids currently blocked in wait_for_web_approval (same process)
+# Same-process hints only (parent server never shares these with sse_adapter).
 _active_waiters: set[str] = set()
-# emitted to the UI but wait_for_web_approval not started yet (preflight)
 _pending_approval_ids: set[str] = set()
 
 
+def _safe_id(approval_id: str) -> str:
+  return "".join(c if c.isalnum() or c in "-_:" else "_" for c in approval_id)
+
+
+def _approval_path(approval_id: str) -> Path:
+  return _approval_dir() / f"{_safe_id(approval_id)}.json"
+
+
+def _waiting_path(approval_id: str) -> Path:
+  """Marker written by the SSE subprocess while an approval is expected/active."""
+  return _approval_dir() / f"{_safe_id(approval_id)}.waiting"
+
+
+def _is_live_approval(approval_id: str) -> bool:
+  """True if a chat turn is still waiting for this approval (cross-process safe)."""
+  aid = (approval_id or "").strip()
+  if not aid:
+    return False
+  if aid in _active_waiters or aid in _pending_approval_ids:
+    return True
+  try:
+    path = _waiting_path(aid)
+    if not path.is_file():
+      return False
+    # Heartbeats refresh mtime; stale markers mean the SSE subprocess died.
+    age_s = time.time() - path.stat().st_mtime
+    return age_s < 90.0
+  except OSError:
+    return False
+
+
 def register_pending_approval(approval_id: str) -> None:
   """Mark an approval as expected so early UI clicks are not reported as late."""
   aid = (approval_id or "").strip()
-  if aid:
-    _pending_approval_ids.add(aid)
+  if not aid:
+    return
+  _pending_approval_ids.add(aid)
+  _touch_waiting(aid)
 
 
-def _approval_path(approval_id: str) -> Path:
-  safe = "".join(c if c.isalnum() or c in "-_:" else "_" for c in approval_id)
-  return _approval_dir() / f"{safe}.json"
+def _touch_waiting(approval_id: str) -> None:
+  try:
+    _approval_dir().mkdir(parents=True, exist_ok=True)
+    _waiting_path(approval_id).write_text(f"{time.time():.3f}\n", encoding="utf-8")
+  except OSError:
+    pass
+
+
+def _clear_waiting_marker(approval_id: str) -> None:
+  try:
+    _waiting_path(approval_id).unlink(missing_ok=True)
+  except OSError:
+    pass
 
 
 def _read_approval_file(path: Path) -> bool | None:
@@ -60,14 +108,16 @@ def resolve_web_approval(approval_id: str, *, confirmed: bool) -> dict[str, Any]
     return {"ok": False, "error": "approval_id is required"}
   _approval_dir().mkdir(parents=True, exist_ok=True)
   path = _approval_path(approval_id)
+  # Detect live wait BEFORE writing; marker is owned by the SSE subprocess.
+  live = _is_live_approval(approval_id)
   payload = {"confirmed": bool(confirmed), "resolved_ms": int(time.time() * 1000)}
   path.write_text(json.dumps(payload), encoding="utf-8")
-  late = approval_id not in _active_waiters and approval_id not in _pending_approval_ids
   return {
     "ok": True,
     "approval_id": approval_id,
     "confirmed": bool(confirmed),
-    "late": late,
+    # late = no waiter — UI may start a recovery turn. Never true while SSE waits.
+    "late": not live,
   }
 
 
@@ -81,14 +131,18 @@ async def wait_for_web_approval(
   """Block until the user approves/denies or timeout (deny on timeout)."""
   _approval_dir().mkdir(parents=True, exist_ok=True)
   path = _approval_path(approval_id)
+  register_pending_approval(approval_id)
 
   # User may have approved before we started waiting (preflight UI is immediate).
   existing = _read_approval_file(path)
   if existing is not None:
+    _pending_approval_ids.discard(approval_id)
+    _clear_waiting_marker(approval_id)
     return existing
 
   _pending_approval_ids.discard(approval_id)
   _active_waiters.add(approval_id)
+  _touch_waiting(approval_id)
   try:
     deadline = time.monotonic() + max(1.0, timeout_s)
     next_hb = time.monotonic()
@@ -98,17 +152,20 @@ async def wait_for_web_approval(
         if result is not None:
           return result
       now = time.monotonic()
-      if heartbeat is not None and now >= next_hb:
-        try:
-          heartbeat()
-        except Exception:
-          pass
+      if now >= next_hb:
+        _touch_waiting(approval_id)
+        if heartbeat is not None:
+          try:
+            heartbeat()
+          except Exception:
+            pass
         next_hb = now + max(5.0, heartbeat_s)
       await asyncio.sleep(_POLL_INTERVAL_S)
     return False
   finally:
     _active_waiters.discard(approval_id)
     _pending_approval_ids.discard(approval_id)
+    _clear_waiting_marker(approval_id)
 
 
 def new_approval_id(session_id: str, fc_id: str | None) -> str:

{gemcode-0.4.25 → gemcode-0.4.26/src/gemcode.egg-info}/PKG-INFO

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

{gemcode-0.4.25 → gemcode-0.4.26}/src/gemcode.egg-info/SOURCES.txt

@@ -174,6 +174,7 @@ tests/test_files_api.py
 tests/test_fleet_reports.py
 tests/test_habit_chains.py
 tests/test_habit_runs.py
+tests/test_hitl_bridge_cross_process.py
 tests/test_hosted_tenant.py
 tests/test_ide_stdio_attachments.py
 tests/test_interactive_permission_ask.py

gemcode-0.4.26/tests/test_hitl_bridge_cross_process.py

@@ -0,0 +1,53 @@
+"""Cross-process HITL late detection (parent approve vs sse_adapter wait)."""
+
+from __future__ import annotations
+
+import asyncio
+from pathlib import Path
+
+from gemcode.web import hitl_bridge
+
+
+def test_resolve_not_late_when_waiting_marker_exists(tmp_path: Path, monkeypatch) -> None:
+  monkeypatch.setenv("GEMCODE_HOSTED_TENANT_ROOT", str(tmp_path))
+  aid = "sess:tool1"
+  hitl_bridge.register_pending_approval(aid)
+  assert (tmp_path / ".gemcode" / "web_approvals" / "sess:tool1.waiting").is_file()
+
+  # Simulate parent process: clear in-memory sets (as if another process).
+  hitl_bridge._pending_approval_ids.clear()
+  hitl_bridge._active_waiters.clear()
+
+  out = hitl_bridge.resolve_web_approval(aid, confirmed=True)
+  assert out["ok"] is True
+  assert out["late"] is False
+
+
+def test_resolve_late_when_no_waiter(tmp_path: Path, monkeypatch) -> None:
+  monkeypatch.setenv("GEMCODE_HOSTED_TENANT_ROOT", str(tmp_path))
+  hitl_bridge._pending_approval_ids.clear()
+  hitl_bridge._active_waiters.clear()
+  out = hitl_bridge.resolve_web_approval("sess:orphan", confirmed=True)
+  assert out["ok"] is True
+  assert out["late"] is True
+
+
+def test_wait_picks_up_parent_resolve(tmp_path: Path, monkeypatch) -> None:
+  monkeypatch.setenv("GEMCODE_HOSTED_TENANT_ROOT", str(tmp_path))
+  aid = "sess:bash1"
+
+  async def _run() -> bool:
+    async def approve_soon() -> None:
+      await asyncio.sleep(0.35)
+      # Parent server process has empty in-memory waiter sets.
+      hitl_bridge._pending_approval_ids.clear()
+      hitl_bridge._active_waiters.clear()
+      out = hitl_bridge.resolve_web_approval(aid, confirmed=True)
+      assert out["late"] is False  # *.waiting marker from waiter process
+
+    task = asyncio.create_task(approve_soon())
+    confirmed = await hitl_bridge.wait_for_web_approval(aid, timeout_s=5.0)
+    await task
+    return confirmed
+
+  assert asyncio.run(_run()) is True