gemcode 0.4.24__tar.gz → 0.4.25__tar.gz

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

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

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

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

{gemcode-0.4.24 → gemcode-0.4.25}/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.25/src/gemcode.egg-info}/PKG-INFO

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

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

@@ -201,6 +201,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.25/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