gemcode 0.3.1__tar.gz → 0.3.2__tar.gz

{gemcode-0.3.1/src/gemcode.egg-info → gemcode-0.3.2}/PKG-INFO

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

{gemcode-0.3.1 → gemcode-0.3.2}/pyproject.toml

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

{gemcode-0.3.1 → gemcode-0.3.2}/src/gemcode/agent.py

@@ -74,7 +74,7 @@ You operate only inside the user's project directory (current working directory)
 - **`run_command` rules (critical):**
   - `command` must be a **single executable basename** (e.g. `npm`, `npx`, `mkdir`) — **not** `bash`, `sh`, or `cd foo && ...`.
   - Pass argv as `args` (list). To run a command **inside** a subfolder (e.g. Next app in `testing/`), set **`cwd_subdir`** to that relative path (e.g. `"testing"`) and run `npm run dev` there — **never** simulate `cd` with `bash`.
-  - **Scaffolding** (`create-next-app`, etc.): many CLIs require non-interactive mode — pass **`extra_env`** like `{"CI": "1"}` and/or flags supported by that tool (`--yes` where documented).
+  - **Scaffolding** (`create-next-app`, etc.): many CLIs require non-interactive mode — pass **`extra_env_keys`** / **`extra_env_values`** as parallel lists (e.g. `["CI"]` and `["1"]`) and/or flags supported by that tool (`--yes` where documented).
   - **Dev servers** (`npm run dev`, `vite`, etc.) run until stopped: use **`background=True`** so the process detaches; otherwise the tool may time out. You cannot open a *new OS terminal window* from here—background start is the supported way to keep running.
 - **Parallelize:** when you need several **independent** reads or searches (no output from one is required to form the next call), issue them together in one turn so the user gets answers faster. When step B depends on step A's result, run **sequentially**.
 - **Deletion:** use `delete_file` for a single file under the project root; reserve `rm` via `run_command` for unusual cases.

{gemcode-0.3.1 → gemcode-0.3.2}/src/gemcode/tool_prompt_manifest.py

@@ -120,7 +120,7 @@ You may call tools as follows:
   Notes:
   - Prefer `python -m pip ...` (or `python3 -m pip ...`) so installs stay in the active virtualenv.
   - Do not assume sudo/system package manager access.
-  - `run_command` supports `cwd_subdir` (relative path under the project) instead of `cd`/`bash`; use `extra_env` (e.g. CI=1) for non-interactive installers; use `background=true` for long-running dev servers.
+  - `run_command` supports `cwd_subdir` (relative path under the project) instead of `cd`/`bash`; use parallel `extra_env_keys` / `extra_env_values` (e.g. ["CI"] and ["1"]) for non-interactive installers; use `background=true` for long-running dev servers.
 
 Optional capability tools:
 - Deep research built-ins are {'ON' if deep_research_on else 'OFF'}.

{gemcode-0.3.1 → gemcode-0.3.2}/src/gemcode/tools/shell.py

@@ -7,7 +7,6 @@ import re
 import shutil
 import subprocess
 from pathlib import Path
-from typing import Any
 
 from google.adk.tools.tool_context import ToolContext
 
@@ -18,12 +17,12 @@ from gemcode.tools.shell_gate import consume_confirmed_shell_if_matches
 from gemcode.trust import is_trusted_root
 
 
-def _merge_child_env(extra: dict[str, Any] | None) -> dict[str, str]:
-  """Merge a small set of env vars into os.environ for the child (e.g. CI=1)."""
+def _merge_child_env(keys: list[str], values: list[str]) -> dict[str, str]:
+  """Merge parallel key/value lists into os.environ (Gemini API rejects dict-typed tool params)."""
   out = {**os.environ}
-  if not extra:
+  if not keys and not values:
     return out
-  for k, v in extra.items():
+  for k, v in zip(keys, values):
     if not isinstance(k, str) or not isinstance(v, str):
       continue
     if not re.match(r"^[A-Za-z_][A-Za-z0-9_]*$", k):
@@ -45,7 +44,8 @@ def make_run_command(cfg: GemCodeConfig):
     tool_context: ToolContext | None = None,
     cwd_subdir: str = ".",
     background: bool = False,
-    extra_env: dict[str, str] | None = None,
+    extra_env_keys: list[str] | None = None,
+    extra_env_values: list[str] | None = None,
   ) -> dict:
     """
     Run an allowlisted executable with arguments.
@@ -57,8 +57,9 @@ def make_run_command(cfg: GemCodeConfig):
     For long-running servers (e.g. `npm run dev`), set `background=True` to start
     a detached process and return its PID (non-interactive; no TTY for the child).
 
-    Optional `extra_env` merges env vars for the child (e.g. {"CI": "1"} for
-    non-interactive scaffolding tools).
+    Optional `extra_env_keys` / `extra_env_values` are parallel lists (same length)
+    merged into the child environment (e.g. keys ["CI"], values ["1"] for
+    non-interactive scaffolding tools). Omit both to use the default environment.
     """
     if not trusted:
       return {"error": "Project folder is not trusted. Re-run GemCode and approve folder trust."}
@@ -111,7 +112,17 @@ def make_run_command(cfg: GemCodeConfig):
           )
       }
 
-    child_env = _merge_child_env(extra_env)
+    ek = list(extra_env_keys or [])
+    ev = list(extra_env_values or [])
+    if len(ek) != len(ev):
+      return {
+          "error": (
+              "extra_env_keys and extra_env_values must be parallel lists of the same length "
+              "(one value per key)."
+          ),
+      }
+
+    child_env = _merge_child_env(ek, ev)
 
     if background:
       try:

{gemcode-0.3.1 → gemcode-0.3.2/src/gemcode.egg-info}/PKG-INFO

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

{gemcode-0.3.1 → gemcode-0.3.2}/tests/test_tools.py

@@ -118,6 +118,24 @@ def test_run_command_background_returns_pid(tmp_path: Path, monkeypatch) -> None
   assert isinstance(out.get("pid"), int)
 
 
+def test_run_command_extra_env_merges(tmp_path: Path, monkeypatch) -> None:
+  monkeypatch.setenv("GEMCODE_HOME", str(tmp_path / ".gemstate"))
+  trust_root(tmp_path, trusted=True)
+  cfg = GemCodeConfig(project_root=tmp_path)
+  run_command = make_run_command(cfg)
+  ctx = MagicMock()
+  ctx.state = {HITL_STICKY_SESSION_KEY: True}
+  out = run_command(
+      "python3",
+      ["-c", "import os; print(os.environ.get('GEMCODE_TEST_EXTRA', ''))"],
+      extra_env_keys=["GEMCODE_TEST_EXTRA"],
+      extra_env_values=["ok"],
+      tool_context=ctx,
+  )
+  assert out.get("exit_code") == 0
+  assert "ok" in (out.get("stdout") or "")
+
+
 def test_delete_file(tmp_path: Path, monkeypatch) -> None:
   monkeypatch.setenv("GEMCODE_HOME", str(tmp_path / ".gemstate"))
   trust_root(tmp_path, trusted=True)