gemcode 0.4.24__tar.gz → 0.4.26__tar.gz

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

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

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

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

{gemcode-0.4.24 → 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.24 → gemcode-0.4.26}/src/gemcode/web/sse_adapter.py

@@ -489,17 +489,33 @@ def _inject_web_code_context(cfg: GemCodeConfig, prompt: str, req: dict[str, Any
         "or type @path — unless they mean the whole project (see below)."
       )
 
-  lines.extend(
-    [
-      'When the user says "this file", "the current one", or similar, use the active / @-referenced file above.',
-      'When they ask to analyze the whole codebase, project, repo, or "all files", start with `repo_map` and '
-      '`list_directory` on `.` — do not ask which file first.',
-      "**Web UI permissions** — shell and mutating tools pause for an **inline Yes/No card in the chat** "
-      "(above the composer). Do **not** tell the user to open a dialog, popup, terminal, or separate Approve button — "
-      "just wait; the UI card is the approval UI. After they tap Yes or No, continue automatically.",
-      "When Auto-approve / Super mode is on, tools run without asking — do not mention approvals.",
-    ]
+  # Permission mode for THIS turn (must match actual HITL / auto-approve behavior).
+  lines.append(
+    'When the user says "this file", "the current one", or similar, use the active / @-referenced file above.'
   )
+  lines.append(
+    'When they ask to analyze the whole codebase, project, repo, or "all files", start with `repo_map` and '
+    '`list_directory` on `.` — do not ask which file first.'
+  )
+  auto_on = bool(
+    getattr(cfg, "yes_to_all", False)
+    or getattr(cfg, "super_mode", False)
+    or not getattr(cfg, "_web_interactive_hitl", True)
+  )
+  if auto_on:
+    lines.append(
+      "**Web UI permissions — AUTO-APPROVE is ON for this turn.** "
+      "Shell and mutating tools run immediately with **no** Yes/No card. "
+      "Never mention Approve, Deny, approval prompts, dialogs, or waiting for the user — "
+      "just run tools and report what you did."
+    )
+  else:
+    lines.append(
+      "**Web UI permissions — interactive.** Shell and mutating tools pause for an "
+      "**inline Yes/No card in the chat** (also pinned above the composer). "
+      "Do **not** invent Approve/Deny dialog text or tell the user to open a popup — "
+      "wait silently; after they tap Yes or No the turn continues."
+    )
 
   if mode == "agents":
     lines.extend(
@@ -922,6 +938,7 @@ def _apply_web_permissions(cfg: GemCodeConfig, req: dict[str, Any]) -> None:
   }
   object.__setattr__(cfg, "_web_auto_approve", normalized)
 
+  # UI is source of truth for web chat — do not leave env GEMCODE_SUPER_MODE stuck on.
   super_mode = bool(perms.get("super_mode"))
   if super_mode:
     cfg.super_mode = True
@@ -931,6 +948,7 @@ def _apply_web_permissions(cfg: GemCodeConfig, req: dict[str, Any]) -> None:
     object.__setattr__(cfg, "_web_interactive_hitl", False)
     return
 
+  cfg.super_mode = False
   if all(normalized.values()):
     cfg.yes_to_all = True
     cfg.interactive_permission_ask = False
@@ -948,13 +966,33 @@ def _apply_web_permissions(cfg: GemCodeConfig, req: dict[str, Any]) -> None:
 
 
 def _configure_web_permissions(cfg: GemCodeConfig, req: dict[str, Any]) -> None:
-  """Web chat defaults to interactive Approve/Deny unless everything is auto-approved."""
+  """Web chat HITL follows the UI request, not process-level GEMCODE_SUPER_MODE.
+
+  Hosted tenant images historically set ``GEMCODE_SUPER_MODE=1`` so mesh/jobs are
+  unattended. That must not silently skip Yes/No cards when the user has
+  Auto-approve off in the web UI. Mesh workers still use
+  ``GEMCODE_MESH_WORKER_UNATTENDED`` independently.
+  """
   object.__setattr__(cfg, "_gemcode_web_sse", True)
-  _apply_web_permissions(cfg, req)
-  if not isinstance(req.get("permissions"), dict):
+
+  perms = req.get("permissions")
+  has_perms = isinstance(perms, dict)
+
+  # Clear env-applied super mode before applying the UI payload.
+  if not (has_perms and bool(perms.get("super_mode"))):
+    cfg.super_mode = False
     cfg.yes_to_all = False
     cfg.interactive_permission_ask = True
     object.__setattr__(cfg, "_web_interactive_hitl", True)
+
+  if has_perms:
+    _apply_web_permissions(cfg, req)
+  else:
+    cfg.super_mode = False
+    cfg.yes_to_all = False
+    cfg.interactive_permission_ask = True
+    object.__setattr__(cfg, "_web_interactive_hitl", True)
+
   _ensure_web_hitl(cfg)
   if os.environ.get("GEMCODE_WEB_YES_TO_ALL", "").lower() in ("1", "true", "yes", "on"):
     cfg.yes_to_all = True
@@ -963,8 +1001,9 @@ def _configure_web_permissions(cfg: GemCodeConfig, req: dict[str, Any]) -> None:
 
 
 def _ensure_web_hitl(cfg: GemCodeConfig) -> None:
-  """Web chat always uses the UI approval bridge when tools are not fully auto-approved."""
+  """Web chat uses the UI approval bridge when tools are not fully auto-approved."""
   if getattr(cfg, "yes_to_all", False) or getattr(cfg, "super_mode", False):
+    object.__setattr__(cfg, "_web_interactive_hitl", False)
     return
   cfg.interactive_permission_ask = True
   object.__setattr__(cfg, "_web_interactive_hitl", True)
@@ -1248,6 +1287,10 @@ async def run_adapter(req: dict[str, Any]) -> None:
           "model": model,
           "project_root": str(cfg.project_root),
           "workspace_mode": workspace_mode,
+          "hitl_interactive": bool(getattr(cfg, "_web_interactive_hitl", False)),
+          "auto_approve": bool(
+            getattr(cfg, "yes_to_all", False) or getattr(cfg, "super_mode", False)
+          ),
           **({"skill": resolved.skill_name} if resolved.skill_name else {}),
         }
       )

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

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

{gemcode-0.4.24 → 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
@@ -201,6 +202,7 @@ tests/test_token_budget.py
 tests/test_tool_context_circulation.py
 tests/test_tools.py
 tests/test_tools_inspector.py
+tests/test_web_permissions_hitl.py
 tests/test_web_server.py
 tests/test_web_sse_adapter.py
 tests/test_workspace_hints.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

gemcode-0.4.26/tests/test_web_permissions_hitl.py

@@ -0,0 +1,71 @@
+"""Web UI permissions must override process-level GEMCODE_SUPER_MODE."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+from gemcode.config import GemCodeConfig, apply_super_mode
+from gemcode.web import sse_adapter
+
+
+def test_web_permissions_clear_env_super_mode(tmp_path: Path, monkeypatch) -> None:
+  monkeypatch.setenv("GEMCODE_SUPER_MODE", "1")
+  cfg = GemCodeConfig(project_root=tmp_path)
+  assert cfg.super_mode is True
+  apply_super_mode(cfg)
+  assert cfg.yes_to_all is True
+
+  sse_adapter._configure_web_permissions(
+    cfg,
+    {
+      "permissions": {
+        "super_mode": False,
+        "auto_approve": {
+          "bash": False,
+          "file_read": False,
+          "file_write": False,
+          "web_search": False,
+        },
+      }
+    },
+  )
+  assert cfg.super_mode is False
+  assert cfg.yes_to_all is False
+  assert getattr(cfg, "_web_interactive_hitl") is True
+
+
+def test_web_permissions_ui_super_mode_on(tmp_path: Path, monkeypatch) -> None:
+  monkeypatch.delenv("GEMCODE_SUPER_MODE", raising=False)
+  cfg = GemCodeConfig(project_root=tmp_path)
+  cfg.super_mode = False
+  cfg.yes_to_all = False
+
+  sse_adapter._configure_web_permissions(
+    cfg,
+    {"permissions": {"super_mode": True, "auto_approve": {}}},
+  )
+  assert cfg.super_mode is True
+  assert cfg.yes_to_all is True
+  assert getattr(cfg, "_web_interactive_hitl") is False
+
+
+def test_inject_web_context_auto_approve_copy(tmp_path: Path) -> None:
+  cfg = GemCodeConfig(project_root=tmp_path)
+  cfg.yes_to_all = True
+  object.__setattr__(cfg, "_web_workspace_mode", "code")
+  object.__setattr__(cfg, "_web_interactive_hitl", False)
+  out = sse_adapter._inject_web_code_context(cfg, "hello", {})
+  assert "AUTO-APPROVE is ON" in out
+  assert "Never mention Approve" in out
+  assert "inline Yes/No card" not in out
+
+
+def test_inject_web_context_interactive_copy(tmp_path: Path) -> None:
+  cfg = GemCodeConfig(project_root=tmp_path)
+  cfg.super_mode = False
+  cfg.yes_to_all = False
+  object.__setattr__(cfg, "_web_workspace_mode", "code")
+  object.__setattr__(cfg, "_web_interactive_hitl", True)
+  out = sse_adapter._inject_web_code_context(cfg, "hello", {})
+  assert "inline Yes/No card" in out
+  assert "AUTO-APPROVE is ON" not in out