mirror of
https://github.com/hansjone/oclaw.git
synced 2026-10-09 05:50:44 +08:00
oliver
ae44cbcad5
补充历史压缩与会话诊断链路，强化 tool pairing 与空响应兜底观测；完善 Admin MCP 导入/绑定与相关前端展示；新增 web_search_fast/web_fetch_clean 及多项测试与文档更新，并同步技能安装与角色绑定策略改进。 Made-with: Cursor
98 lines
2.8 KiB
Python
98 lines
2.8 KiB
Python
from __future__ import annotations
|
|
|
|
"""MCP 相关进程环境：默认 allowlist + 可选本地 env 文件（首选 `oclaw/_local/mcp_local.env`）。"""
|
|
|
|
import os
|
|
from pathlib import Path
|
|
|
|
from oclaw.platform.config.paths import PROJECT_ROOT, db_path
|
|
|
|
_DEFAULT_ALLOWLIST = (
|
|
"BRAVE_API_KEY,GOOGLE_OAUTH_CREDENTIALS,GOOGLE_CALENDAR_MCP_TOKEN_PATH,"
|
|
"GITHUB_PERSONAL_ACCESS_TOKEN,CONTEXT7_API_KEY,DASHSCOPE_API_KEY"
|
|
)
|
|
|
|
|
|
def mcp_env_allowlist_keys() -> list[str]:
|
|
raw = str(os.getenv("AIA_MCP_ENV_ALLOWLIST") or "").strip()
|
|
if not raw:
|
|
return [x.strip() for x in _DEFAULT_ALLOWLIST.split(",") if x.strip()]
|
|
return [x.strip() for x in raw.split(",") if x.strip()]
|
|
|
|
|
|
def _parse_env_file(path: Path) -> dict[str, str]:
|
|
out: dict[str, str] = {}
|
|
if not path.is_file():
|
|
return out
|
|
try:
|
|
raw = path.read_text(encoding="utf-8", errors="replace")
|
|
except OSError:
|
|
return out
|
|
for line in raw.splitlines():
|
|
line = line.strip()
|
|
if not line or line.startswith("#"):
|
|
continue
|
|
if "=" not in line:
|
|
continue
|
|
k, _, v = line.partition("=")
|
|
k = k.strip()
|
|
v = v.strip().strip('"').strip("'")
|
|
if k:
|
|
out[k] = _expand_env_value(v)
|
|
return out
|
|
|
|
|
|
def _expand_env_value(v: str) -> str:
|
|
s = v.strip()
|
|
if "${PROJECT_ROOT}" in s:
|
|
rel = s.split("${PROJECT_ROOT}", 1)[1].lstrip("/\\")
|
|
s = str((PROJECT_ROOT / rel).resolve())
|
|
return os.path.expandvars(s)
|
|
|
|
|
|
def _mcp_local_env_paths_in_load_order() -> list[Path]:
|
|
return [
|
|
Path(db_path()).resolve().parent / "mcp_local.env",
|
|
(PROJECT_ROOT / "_local" / "mcp_local.env").resolve(),
|
|
(PROJECT_ROOT.parent / "_local" / "mcp_local.env").resolve(),
|
|
]
|
|
|
|
|
|
def mcp_local_env_merged() -> dict[str, str]:
|
|
out: dict[str, str] = {}
|
|
for p in _mcp_local_env_paths_in_load_order():
|
|
if p.is_file():
|
|
out.update(_parse_env_file(p))
|
|
return out
|
|
|
|
|
|
def mcp_local_env_file_path() -> Path:
|
|
return (PROJECT_ROOT / "_local" / "mcp_local.env").resolve()
|
|
|
|
|
|
def gateway_mcp_env_extras() -> dict[str, str]:
|
|
extra: dict[str, str] = {}
|
|
has_aia = str(os.getenv("AIA_MCP_ENV_ALLOWLIST") or "").strip()
|
|
if not has_aia:
|
|
extra["AIA_MCP_ENV_ALLOWLIST"] = _DEFAULT_ALLOWLIST
|
|
file_vals = mcp_local_env_merged()
|
|
for k, v in file_vals.items():
|
|
if not v.strip():
|
|
continue
|
|
if not str(os.getenv(k) or "").strip():
|
|
extra[k] = v
|
|
return extra
|
|
|
|
|
|
def apply_gateway_mcp_env_to_os() -> None:
|
|
for k, v in gateway_mcp_env_extras().items():
|
|
os.environ[k] = v
|
|
|
|
|
|
__all__ = [
|
|
"apply_gateway_mcp_env_to_os",
|
|
"gateway_mcp_env_extras",
|
|
"mcp_env_allowlist_keys",
|
|
"mcp_local_env_file_path",
|
|
"mcp_local_env_merged",
|
|
]
|