feat(routing): ordered backend candidates + real-probing doctor
- backends is now an ordered candidate list (first = preferred); channels report the backend actually serving via active_backend, surfaced in the doctor text report and --json - new agent_reach/probe.py really executes upstream commands and tells apart missing / broken (stale venv shebang after a system Python upgrade) / timeout, with a reinstall prescription for broken installs - all 13 channels migrated off which()-only checks: fixes bilibili false-positive "bili-cli 可用" on broken shims, misleading xiaohongshu "连接失败", rdt OSError crashing doctor, mcporter breakage masquerading as "未配置" - twitter: 15s probe + 1 retry (flaky 10s timeout), broken twitter-cli now falls back to bird instead of aborting the check - doctor survives per-channel exceptions; config supports per-channel backend override (<channel>_backend / <CHANNEL>_BACKEND env) - fix skill install/uninstall crash on symlinked skill dirs (the "[Errno None] None" warning from shutil.rmtree on a symlink) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Pnant
@@ -1,9 +1,8 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""Twitter/X — check if twitter-cli or bird CLI is available."""
|
||||
|
||||
import shutil
|
||||
import subprocess
|
||||
from .base import Channel
|
||||
from agent_reach.probe import probe_command
|
||||
|
||||
|
||||
class TwitterChannel(Channel):
|
||||
@@ -18,56 +17,98 @@ class TwitterChannel(Channel):
|
||||
return "x.com" in d or "twitter.com" in d
|
||||
|
||||
def check(self, config=None):
|
||||
# Prefer twitter-cli, fallback to bird/birdx
|
||||
twitter = shutil.which("twitter")
|
||||
bird = shutil.which("bird") or shutil.which("birdx")
|
||||
"""按 backends 顺序真实探测，第一个活着的后端即为 active_backend。"""
|
||||
self.active_backend = None
|
||||
failures = []
|
||||
|
||||
if twitter:
|
||||
return self._check_twitter_cli(twitter)
|
||||
elif bird:
|
||||
return self._check_bird(bird)
|
||||
else:
|
||||
for backend in self.ordered_backends(config):
|
||||
if backend == "twitter-cli":
|
||||
result = self._check_twitter_cli()
|
||||
elif backend == "bird CLI (legacy)":
|
||||
result = self._check_bird()
|
||||
else:
|
||||
continue
|
||||
|
||||
if result is None:
|
||||
continue # 未安装——继续尝试下一个后端
|
||||
|
||||
status, message = result
|
||||
if status in ("ok", "warn"):
|
||||
# 工具本身是活的（含已装但未登录的 warn）
|
||||
self.active_backend = backend
|
||||
return status, message
|
||||
# broken/timeout —— 记下处方，继续尝试下一个后端
|
||||
failures.append(message)
|
||||
|
||||
if failures:
|
||||
return "error", "\n".join(failures)
|
||||
return "warn", (
|
||||
"Twitter CLI 未安装。安装方式：\n"
|
||||
" pipx install twitter-cli\n"
|
||||
"或：\n"
|
||||
" uv tool install twitter-cli"
|
||||
)
|
||||
|
||||
def _check_twitter_cli(self):
|
||||
"""探测 twitter-cli。返回 None 表示未安装，否则返回 (status, message)。
|
||||
|
||||
`twitter status` 才是健康信号：已登录时输出 "ok: true"，
|
||||
未登录时以非零退出码输出 "not_authenticated"——工具本身是活的，
|
||||
所以 probe 的 error 状态也要看 output 内容再分类。
|
||||
"""
|
||||
probe = probe_command(
|
||||
"twitter", ["status"], timeout=15, retries=1, package="twitter-cli"
|
||||
)
|
||||
if probe.status == "missing":
|
||||
return None
|
||||
if probe.status == "broken":
|
||||
return "error", "twitter-cli 命令存在但无法执行。\n" + probe.hint
|
||||
if probe.status == "timeout":
|
||||
return "error", "twitter-cli 健康检查超时（已重试 1 次）。\n" + probe.hint
|
||||
|
||||
output = probe.output
|
||||
if "ok: true" in output:
|
||||
return "ok", (
|
||||
"twitter-cli 完整可用（搜索、读推文、时间线、长文/Article、"
|
||||
"用户查询、Thread）"
|
||||
)
|
||||
if "not_authenticated" in output:
|
||||
return "warn", (
|
||||
"Twitter CLI 未安装。安装方式：\n"
|
||||
" pipx install twitter-cli\n"
|
||||
"或：\n"
|
||||
" uv tool install twitter-cli"
|
||||
"twitter-cli 已安装但未认证。设置方式：\n"
|
||||
" export TWITTER_AUTH_TOKEN=\"xxx\"\n"
|
||||
" export TWITTER_CT0=\"yyy\"\n"
|
||||
"或确保已在浏览器中登录 x.com"
|
||||
)
|
||||
return "warn", (
|
||||
"twitter-cli 已安装但认证检查失败。运行：\n"
|
||||
" twitter -v status 查看详细信息"
|
||||
)
|
||||
|
||||
def _check_twitter_cli(self, binary: str):
|
||||
try:
|
||||
r = subprocess.run(
|
||||
[binary, "status"], capture_output=True,
|
||||
encoding="utf-8", errors="replace", timeout=10
|
||||
def _check_bird(self):
|
||||
"""探测 bird/birdx（legacy 回退）。返回 None 表示均未安装，否则返回 (status, message)。"""
|
||||
last_failure = None
|
||||
for cmd in ("bird", "birdx"):
|
||||
probe = probe_command(
|
||||
cmd, ["check"], timeout=15, retries=1, package="@steipete/bird"
|
||||
)
|
||||
output = (r.stdout or "") + (r.stderr or "")
|
||||
if r.returncode == 0 and "ok: true" in output:
|
||||
return "ok", (
|
||||
"twitter-cli 完整可用（搜索、读推文、时间线、长文/Article、"
|
||||
"用户查询、Thread）"
|
||||
if probe.status == "missing":
|
||||
continue
|
||||
if probe.status == "broken":
|
||||
last_failure = (
|
||||
"error",
|
||||
f"{cmd} 命令存在但无法执行（bird 是 npm 包，可用 "
|
||||
"npm install -g @steipete/bird 重装）。\n" + probe.hint,
|
||||
)
|
||||
if "not_authenticated" in output:
|
||||
return "warn", (
|
||||
"twitter-cli 已安装但未认证。设置方式：\n"
|
||||
" export TWITTER_AUTH_TOKEN=\"xxx\"\n"
|
||||
" export TWITTER_CT0=\"yyy\"\n"
|
||||
"或确保已在浏览器中登录 x.com"
|
||||
continue # bird 坏了再试 birdx
|
||||
if probe.status == "timeout":
|
||||
last_failure = (
|
||||
"error",
|
||||
f"{cmd} 健康检查超时（已重试 1 次）。\n" + probe.hint,
|
||||
)
|
||||
return "warn", (
|
||||
"twitter-cli 已安装但认证检查失败。运行：\n"
|
||||
" twitter -v status 查看详细信息"
|
||||
)
|
||||
except Exception:
|
||||
return "warn", "twitter-cli 已安装但连接失败"
|
||||
continue
|
||||
|
||||
def _check_bird(self, binary: str):
|
||||
try:
|
||||
r = subprocess.run(
|
||||
[binary, "check"], capture_output=True,
|
||||
encoding="utf-8", errors="replace", timeout=10
|
||||
)
|
||||
output = (r.stdout or "") + (r.stderr or "")
|
||||
if r.returncode == 0:
|
||||
output = probe.output
|
||||
if probe.ok:
|
||||
return "ok", "bird CLI 可用（读取、搜索推文，含长文/X Article）"
|
||||
if "Missing credentials" in output or "missing" in output.lower():
|
||||
return "warn", (
|
||||
@@ -78,5 +119,4 @@ class TwitterChannel(Channel):
|
||||
return "warn", (
|
||||
"bird CLI 已安装但认证检查失败。"
|
||||
)
|
||||
except Exception:
|
||||
return "warn", "bird CLI 已安装但连接失败"
|
||||
return last_failure
|
||||
|
||||
Reference in New Issue
Block a user