feat: websearch MCP worker wiring + egress (public SearXNG route)

Worker --websearch-mcp (default off) seeds tenant codex-home with
websearch MCP on _tenant_dirs (container path); old tenants merge
on next task. Autoscaler unit gains the flag. Tinyproxy filter
adds Perplexity/Exa/Tavily/Brave/DuckDuckGo + exact
searx.diante.me (no diante.me wildcard, control plane stays out).
Tests: test_websearch_worker 4 + websearch_mcp 12 + tenant 7 = 23 OK.
Not pushed, not merged, not deployed; SearXNG host/DNS/nginx and
tinyproxy reload are host steps.
This commit is contained in:
host committed 2026-10-28 17:26:31 +08:00
1 parent 075908fe58
commit b72a2abae4
6 files changed
+209 -14

No files matched your search

+30 -1
View File
@@ -152,6 +152,7 @@ from cloud.peer_messages import deliver_peer_message as _deliver_peer_message
from cloud.peer_messages import peer_message_prefix as _peer_prefix
from cloud.peer_messages import row_get as _row_get
from cloud.sub2api import ensure_user_gateway_key as _ensure_sub2api_key
from cloud.websearch import ensure_codex_home_websearch as _ensure_websearch_mcp
from cloud.sub2api import gateway_name as _gateway_name
from cloud.sub2api import gateway_origin as _gateway_origin
from cloud.sub2api import list_gateway_models as _list_gateway_models
@@ -371,6 +372,7 @@ class Worker:
tenant_isolation=False, tenants_root=None,
tenant_template_home=None, tenant_template_repo=None,
egress_proxy_port=0, claim_executor_only=False,
websearch_mcp=False,
host_name=None, pr_jobs_only=False,
upload_dir=None,
digest_interval_seconds=3600,
@@ -506,6 +508,13 @@ class Worker:
# 容器的 NULL 任务(那些任务在宿主上跑就丢了 Docker
# 外层,违背“按任务二选一”的路由意图)。
self.claim_executor_only = bool(claim_executor_only)
# 网页搜索 MCP:默认关(老行为:租户 codex-home 只有
# 模板 config.toml)。开启后 _tenant_dirs 在播种 config
# 之后调用 websearch 的播种助手,把 websearch.py /
# websearch_mcp.py 拷进租户 codex-home 并追加
# [mcp_servers.websearch](容器内路径,见 _tenant_dirs)。
# 老租户下一次任务自动合并,已有 section 不重写。
self.websearch_mcp = bool(websearch_mcp)
# HA 阶段 1:本 worker 所在主机名。认领任务时写进
# tasks.worktree_host,/pr 据此判断 worktree 在哪台主机。
# 容器内 worker 的 socket.gethostname() 是容器名、不是宿主名,
@@ -1788,6 +1797,19 @@ class Worker:
" 会让 codex 去 api.openai.com 且无 auth,拒绝"
" 派发)" % template)
shutil.copyfile(template, home_config)
if self.websearch_mcp:
# Docker 租户任务的 codex-home 会原样挂载进容器,
# 所以这里写容器内路径;宿主侧脚本文件由播种助手
# 从运行中代码的 cloud/ 目录拷过来(生产即
# /opt/codex-app-server/cloud/)。播种失败直接
# 抛错、任务不派发——静默无搜索比 loud 失败更糟,
# 尤其对已宣传“有搜索”的任务。
_ensure_websearch_mcp(
dirs["codex_home"],
command_args=[
"python3",
"/var/lib/codex-app-server/codex-home/"
"websearch_mcp.py"])
if not os.path.exists(os.path.join(dirs["test_repo"], ".git")) \
and not os.path.exists(dirs["test_repo"] + "/sample.py"):
# 目标为空目录(刚 mkdir 出来的)才播种;已有内容
@@ -4415,6 +4437,12 @@ def main(argv=None):
" executor 为 NULL 的任务。宿主级沙箱"
" worker 必须开,否则它会抢走本该进"
" Docker 容器的 NULL 任务")
parser.add_argument("--websearch-mcp", action="store_true",
help="租户 codex-home 自动播种网页搜索 MCP:"
"_tenant_dirs 在播种 config.toml 后追加"
" [mcp_servers.websearch] 并拷入"
" websearch.py / websearch_mcp.py;"
"默认关,老租户不受影响")
parser.add_argument("--task-timeout", type=float, default=1800,
help="每任务截止时间(秒,默认 1800);0 表示不限时"
"(与 host --turn-timeout 0 同约定,worker 级"
@@ -4470,7 +4498,8 @@ def main(argv=None):
tenant_template_home=args.tenant_template_home,
tenant_template_repo=args.tenant_template_repo,
egress_proxy_port=args.egress_proxy_port,
claim_executor_only=args.claim_executor_only)
claim_executor_only=args.claim_executor_only,
websearch_mcp=args.websearch_mcp)
# CLI 启动清理兜底(常驻与单次都做):清掉上一轮残留容器。
worker.cleanup_stale_containers()
# CLI 起 worker 前先建表/迁移:全新库直接起循环不应因缺表而炸。