hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-10 03:53:16 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat(mcp): pass all mcp_local.env keys to subprocess; allowlist supplements host-only

Browse source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-05-12 18:51:07 +08:00
parent 48d5e468e6
commit 274a9b8ddd
7 changed files with 44 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
runtime/tools/mcp/runtime.py
View file

@ -25,14 +25,26 @@ class McpProcessRuntime:
def _build_runtime_env(env_allowlist: list[str] | None) -> dict[str, str] | None:
if env_allowlist is None:
return None
from oclaw.runtime.operations.mcp_env import mcp_local_env_merged
keep_keys = {"PATH", "PATHEXT", "SYSTEMROOT", "WINDIR", "COMSPEC", "TEMP", "TMP", "HOME", "USERPROFILE", "APPDATA", "LOCALAPPDATA", "PROGRAMDATA", "PROGRAMFILES", "PROGRAMFILES(X86)", "SYSTEMDRIVE"}
env: dict[str, str] = {}
for k in keep_keys:
if k in os.environ:
env[k] = os.environ[k]
# Keys declared in mcp_local.env (any merged path): treat as MCP-scoped; always pass
# through when non-empty (values come from os.environ after gateway merge, else file literal).
for k, v in mcp_local_env_merged().items():
if not str(v or "").strip():
continue
live = str(os.environ.get(k, "") or "").strip()
if live:
env[k] = os.environ[k]
else:
env[k] = str(v).strip()
for k in env_allowlist:
key = str(k or "").strip()
if key and key in os.environ:
if key and key in os.environ and str(os.environ[key] or "").strip():
env[key] = os.environ[key]
return env