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

fix(mcp): preflight python module check and surface install errors

Browse source 
- Verify python -m module import in preflight with fix hints

- Pass env_schema defaults in health/sync; catch JSON install exceptions in UI

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-05-30 23:42:44 +08:00
parent 8787adc3cc
commit 4610989d72
5 changed files with 107 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
interfaces/admin/routes.py
View file

@ -36,6 +36,7 @@ from svc.config.passwords import load_expected_password
from svc.persistence.sqlite_store import SqliteStore
from svc.persistence.assistant_store import get_assistant_store
from runtime.agents.specialists import discover_specialist_ids, parse_agent_profile_bindings
from runtime.tools.mcp.env_config import mcp_runtime_for_row
from runtime.tools.mcp.installer import (
_safe_server_id,
detect_local_dependencies,
@ -130,10 +131,7 @@ def _mcp_health_and_sync_one(store: SqliteStore, row: dict[str, Any]) -> dict[st
detail = {"synced_tools": len(tools), "compat_mode": "bailian_webparser"}
store.set_mcp_server_health(server_id=sid, status="ok", detail=detail)
return {"server_id": sid, "ok": True, "health": detail, "tools_synced": len(tools)}
rt = McpProcessRuntime(
build_mcp_process_command(cmd, args, store=store),
timeout_s=float(row.get("timeout_s") or 30.0),
)
rt = mcp_runtime_for_row(row, store=store)
try:
health = rt.health()
health_ok = bool(health.get("ok"))
@ -3237,10 +3235,7 @@ def build_admin_router() -> APIRouter:
detail = {"ok": True, "status": "ok", "compat_mode": "bailian_webparser", "tools_count": 1}
store.set_mcp_server_health(server_id=server_id, status="ok", detail=detail)
return {"ok": True, "response": detail}
rt = McpProcessRuntime(
build_mcp_process_command(cmd, args, store=store),
timeout_s=float(row.get("timeout_s") or 30.0),
)
rt = mcp_runtime_for_row(row, store=store)
try:
response = rt.health()
ok = bool(response.get("ok"))
@ -3293,10 +3288,7 @@ def build_admin_router() -> APIRouter:
detail={"synced_tools": len(norm), "compat_mode": "bailian_webparser"},
)
return {"ok": True, "server_id": server_id, "tools": norm, "compat_mode": "bailian_webparser"}
rt = McpProcessRuntime(
build_mcp_process_command(cmd, args, store=store),
timeout_s=float(row.get("timeout_s") or 30.0),
)
rt = mcp_runtime_for_row(row, store=store)
try:
response = rt.tools_list()
items = response.get("tools") if isinstance(response, dict) else None

10
interfaces/admin/static/app.js
View file

@ -5014,6 +5014,8 @@ async function renderPlugins() {
class: "btn btn--primary",
text: "Install MCP",
onclick: async () => {
installStatus.textContent = "[install] running preflight...";
try {
const payload = {
source_type: sourceType.value,
source_ref: sourceRef.value.trim(),
@ -5063,6 +5065,9 @@ async function renderPlugins() {
installStatus.textContent = JSON.stringify(res);
markPrewarmReminder("mcp_installed");
router();
} catch (err) {
installStatus.textContent = `[install] failed: ${String((err && err.message) || err || "install_failed")}`;
}
},
});
const jsonInstallBtn = el("button", {
@ -5075,6 +5080,8 @@ async function renderPlugins() {
installStatus.textContent = "[json] empty payload";
return;
}
installStatus.textContent = "[json] installing...";
try {
let parsed;
try {
parsed = JSON.parse(raw);
@ -5237,6 +5244,9 @@ async function renderPlugins() {
}
markPrewarmReminder("mcp_batch_installed");
router();
} catch (err) {
installStatus.textContent = `[json] failed: ${String((err && err.message) || err || "install_failed")}`;
}
},
});
const cliInstallModal = el("div", { class: "session-monitor-modal", style: "display:none;" });