fix: 线程解析按 home×provider 穷尽回退（共享 home + sub2api）
生产实测：app-server 按进程 provider 过滤 thread/list， 不带 sub2api 注入看不到 sub2api 下建的 thread；本地 worker 又用共享 home 而非租户 home。旧解析只查租户 home + 缺省 provider，本地任务一律 404。 修法（只改服务端，不动派发）：_run_host_cli 支持顶层 --model-provider；_list_task_threads 按 home（租户→共享， 共享取 host-config-host.json 的 codex_home）× provider （缺省→sub2api，仅配了 SUB2API_BASE_URL 时）穷尽，首个 非空即停；_resolve_task_thread 把 provider 带给后续的 thread-read/rename/archive CLI；_task_thread_read 改用 解析出的 home + provider（此前误用租户 home）。 三套件：cloud 957 OK（4 跳过）、host 91 OK、deploy 29 OK。 新测试 9 个。未动派发：本地改租户 home 会丢共享 home 里的 skills，另案处理。
This commit is contained in:
host committed
1 parent
86eb43f1ca
commit
613ff4e7c4
3 files changed
+386
-26
No files matched your search
+103
-26
@@ -315,13 +315,18 @@ def _host_py_path():
|
||||
return os.path.join(os.path.dirname(here), "host.py")
|
||||
|
||||
|
||||
def _run_host_cli(argv, codex_home, timeout=60):
|
||||
def _run_host_cli(argv, codex_home, timeout=60, model_provider=None):
|
||||
"""调 host.py CLI 子命令，返回 (ok, result_or_error)。
|
||||
|
||||
ok 为 True 时 result 是 stdout 解析出的 JSON 对象；ok 为
|
||||
False 时 result 是可直接放进 502 error 字段的错误文本
|
||||
（CLI 自带的 error 原样透传，解析失败/缺文件/超时则给
|
||||
明确的服务端错误，绝不把 stderr 或原始 key 混进响应）。
|
||||
model_provider 是 host.py 顶层参数，必须放在子命令之前：
|
||||
app-server 按进程配置的 provider 过滤 thread/list，不带
|
||||
注入时 sub2api 下建的 thread 在列表里根本看不到（见
|
||||
_list_task_threads 的 provider 重试），只在解析处传，
|
||||
绝不由调用方把 provider 拼进 argv（子命令解析器不认）。
|
||||
"""
|
||||
host_py = _host_py_path()
|
||||
if not host_py or not os.path.isfile(host_py):
|
||||
@@ -329,6 +334,8 @@ def _run_host_cli(argv, codex_home, timeout=60):
|
||||
cmd = [sys.executable, host_py]
|
||||
if codex_home:
|
||||
cmd += ["--codex-home", codex_home]
|
||||
if model_provider:
|
||||
cmd += ["--model-provider", model_provider]
|
||||
cmd += list(argv)
|
||||
try:
|
||||
proc = subprocess.run(cmd, capture_output=True, text=True,
|
||||
@@ -376,6 +383,34 @@ def _tenant_codex_home(server, project_id):
|
||||
return os.path.join(_tenants_root_for(server), safe, "codex-home")
|
||||
|
||||
|
||||
def _local_worker_codex_home():
|
||||
"""本地 worker 的共享 codex-home（兜底解析源）。
|
||||
|
||||
本地 worker 按 host-config-host.json 跑，codex_home 是该
|
||||
配置里的共享目录，不在租户 home 里；服务端主解析先查
|
||||
租户 home，空时才查这里——只读该配置文件的 codex_home
|
||||
一个键，文件不存在、解析失败或键为空时回 None（调用方
|
||||
跳过该候选，不因此 502）。相对路径按配置文件所在目录
|
||||
解析（与 host.py 的 _resolve_path 同规则）。
|
||||
"""
|
||||
try:
|
||||
cfg_path = os.path.join(
|
||||
os.path.dirname(_host_py_path()), "host-config-host.json")
|
||||
with open(cfg_path, encoding="utf-8") as f:
|
||||
cfg = json.load(f)
|
||||
home = cfg.get("codex_home") if isinstance(cfg, dict) else None
|
||||
if not home or not isinstance(home, str):
|
||||
return None
|
||||
home = home.strip()
|
||||
if not home:
|
||||
return None
|
||||
if not os.path.isabs(home):
|
||||
home = os.path.join(os.path.dirname(cfg_path), home)
|
||||
return home
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def _tenant_work_dir(server, project_id):
|
||||
"""项目对应的租户工作目录：tenants_root/<安全项目名>/work，
|
||||
skills/list 的 cwds 过滤用它（不传 cwd 时 app-server 会
|
||||
@@ -4209,36 +4244,74 @@ class CloudControlPlaneHandler(BaseHTTPRequestHandler):
|
||||
|
||||
def _list_task_threads(self, task):
|
||||
"""对任务调 thread-list：返回 (threads, codex_home, cwd,
|
||||
err)，err 为 (status, msg) 或 None。cwd 过滤用任务
|
||||
worktree（见 _thread_worktree_for_task）；codex-home
|
||||
用租户 home（见 _tenant_codex_home）。"""
|
||||
err, provider)，err 为 (status, msg) 或 None。cwd 过滤
|
||||
用任务 worktree（见 _thread_worktree_for_task）。
|
||||
|
||||
候选按序穷尽，首个非空即停（thread 操作不是热路径，
|
||||
多次 CLI 调用可接受）：
|
||||
- home：租户 home（见 _tenant_codex_home）优先，本地
|
||||
worker 共享 home（见 _local_worker_codex_home）兜底
|
||||
——本地派发至今仍用共享 home，旧 thread 全在那里，
|
||||
只查租户 home 永远解析不到；
|
||||
- provider：缺省（配置 provider）优先，sub2api 次之
|
||||
——app-server 按进程 provider 过滤列表，不带注入时
|
||||
sub2api 下建的 thread 在列表里不存在；未配
|
||||
SUB2API_BASE_URL 时跳过次选（host.py 会 loud fail，
|
||||
不能把配置缺失变成 502）。
|
||||
任一候选成功返回空列表时不再继续（空就是空）；全部
|
||||
候选都报错（host.py 本身不可用）时回首个错误 502。"""
|
||||
codex_home = _tenant_codex_home(self.server,
|
||||
task["project_id"])
|
||||
if codex_home is None:
|
||||
return None, None, None, (
|
||||
502, "cannot resolve tenant codex-home")
|
||||
502, "cannot resolve tenant codex-home"), None
|
||||
cwd = _thread_worktree_for_task(self.server, task)
|
||||
ok, result = _run_host_cli(["thread-list", "--cwd", cwd],
|
||||
codex_home)
|
||||
if not ok:
|
||||
return None, None, None, (502, result)
|
||||
threads = _extract_thread_list(result)
|
||||
if threads is None:
|
||||
return None, None, None, (
|
||||
502, "host.py thread-list output has no thread list")
|
||||
return threads, codex_home, cwd, None
|
||||
homes = [codex_home]
|
||||
shared = _local_worker_codex_home()
|
||||
if shared and shared != codex_home:
|
||||
homes.append(shared)
|
||||
providers = [None]
|
||||
if os.environ.get("SUB2API_BASE_URL", "").strip():
|
||||
providers.append("sub2api")
|
||||
first_error = None
|
||||
any_success = False
|
||||
for home in homes:
|
||||
for provider in providers:
|
||||
ok, result = _run_host_cli(
|
||||
["thread-list", "--cwd", cwd], home,
|
||||
model_provider=provider)
|
||||
if not ok:
|
||||
if first_error is None:
|
||||
first_error = result
|
||||
continue
|
||||
threads = _extract_thread_list(result)
|
||||
if threads is None:
|
||||
if first_error is None:
|
||||
first_error = ("host.py thread-list output has"
|
||||
" no thread list")
|
||||
continue
|
||||
any_success = True
|
||||
if threads:
|
||||
return threads, home, cwd, None, provider
|
||||
if not any_success and first_error is not None:
|
||||
return None, None, None, (502, first_error), None
|
||||
return [], codex_home, cwd, None, None
|
||||
|
||||
def _resolve_task_thread(self, task):
|
||||
"""单线程端点的解析：thread-list 后按 _pick_latest_thread
|
||||
取最新一个非 archived。返回 (thread, codex_home, cwd,
|
||||
err)；零个 thread 时 err 为 (404, "thread not found")。"""
|
||||
threads, codex_home, cwd, err = self._list_task_threads(task)
|
||||
err, provider)；零个 thread 时 err 为 (404, "thread not
|
||||
found")。provider 必须原样带给后续的 thread-read /
|
||||
rename / archive CLI——同一 thread 在另一 provider
|
||||
进程里同样看不到，丢了它改操作会 502。"""
|
||||
threads, codex_home, cwd, err, provider = \
|
||||
self._list_task_threads(task)
|
||||
if err is not None:
|
||||
return None, None, None, err
|
||||
return None, None, None, err, None
|
||||
thread = _pick_latest_thread(threads)
|
||||
if thread is None:
|
||||
return None, None, None, (404, "thread not found")
|
||||
return thread, codex_home, cwd, None
|
||||
return None, None, None, (404, "thread not found"), None
|
||||
return thread, codex_home, cwd, None, provider
|
||||
|
||||
def _task_threads(self, user_id, task_id):
|
||||
"""GET /tasks/{id}/threads：thread/list 原样返回列表。
|
||||
@@ -4253,7 +4326,7 @@ class CloudControlPlaneHandler(BaseHTTPRequestHandler):
|
||||
if guard is not None:
|
||||
self._send_json(guard[0], {"error": guard[1]})
|
||||
return
|
||||
threads, _home, cwd, err = self._list_task_threads(task)
|
||||
threads, _home, cwd, err, _provider = self._list_task_threads(task)
|
||||
if err is not None:
|
||||
self._send_json(err[0], {"error": err[1]})
|
||||
return
|
||||
@@ -4273,7 +4346,8 @@ class CloudControlPlaneHandler(BaseHTTPRequestHandler):
|
||||
if guard is not None:
|
||||
self._send_json(guard[0], {"error": guard[1]})
|
||||
return
|
||||
thread, codex_home, cwd, err = self._resolve_task_thread(task)
|
||||
thread, codex_home, cwd, err, provider = \
|
||||
self._resolve_task_thread(task)
|
||||
if err is not None:
|
||||
self._send_json(err[0], {"error": err[1]})
|
||||
return
|
||||
@@ -4281,7 +4355,8 @@ class CloudControlPlaneHandler(BaseHTTPRequestHandler):
|
||||
include_turns = (query.get("include_turns") or ["0"])[0]
|
||||
if include_turns == "1":
|
||||
argv.append("--include-turns")
|
||||
ok, result = _run_host_cli(argv, codex_home)
|
||||
ok, result = _run_host_cli(argv, codex_home,
|
||||
model_provider=provider)
|
||||
if not ok:
|
||||
self._send_json(502, {"error": result})
|
||||
return
|
||||
@@ -4312,13 +4387,14 @@ class CloudControlPlaneHandler(BaseHTTPRequestHandler):
|
||||
"error": "thread ops require a terminal task",
|
||||
"status": task["status"]})
|
||||
return
|
||||
thread, codex_home, _cwd, err = self._resolve_task_thread(task)
|
||||
thread, codex_home, _cwd, err, provider = \
|
||||
self._resolve_task_thread(task)
|
||||
if err is not None:
|
||||
self._send_json(err[0], {"error": err[1]})
|
||||
return
|
||||
ok, result = _run_host_cli(
|
||||
list(argv) + ["--thread-id", thread["id"]],
|
||||
codex_home, timeout=timeout)
|
||||
codex_home, timeout=timeout, model_provider=provider)
|
||||
if not ok:
|
||||
self._send_json(502, {"error": result})
|
||||
return
|
||||
@@ -4567,14 +4643,15 @@ class CloudControlPlaneHandler(BaseHTTPRequestHandler):
|
||||
if guard is not None:
|
||||
note = guard[1]
|
||||
else:
|
||||
resolved, _home, _cwd, rerr = self._resolve_task_thread(task)
|
||||
resolved, _home, _cwd, rerr, provider = \
|
||||
self._resolve_task_thread(task)
|
||||
if rerr is not None:
|
||||
note = rerr[1]
|
||||
else:
|
||||
thread_id = resolved.get("id")
|
||||
ok, result = _run_host_cli(
|
||||
["thread-read", "--thread-id", thread_id],
|
||||
_tenant_codex_home(self.server, task["project_id"]))
|
||||
_home, model_provider=provider)
|
||||
if not ok:
|
||||
note = result
|
||||
else:
|
||||
|
||||
Reference in new issue
Block a user