From ddd7e5c17e23cb648b8f6d81acab7d5b1b7bb206 Mon Sep 17 00:00:00 2001
From: yibo <yibo@yiboM5MacBook-Air.local>
Date: Sat, 17 Oct 2026 22:53:54 +0800
Subject: [PATCH] refactor(wechat-viewer): 聊天/doctor/重新生成改走 dsh，profile 管理下线；停用学习管线 cron

---
 CLAUDE.md                                                               |  2 +-
 device/crontab.txt                                                      |  3 +--
 device/pixelphone/digest/wechat-group-digest/scripts/gen_digest_html.py | 28 ++++++++++++++++++++++------
 device/wechat-viewer/app.py                                             | 47 ++++++++++++++++++++++++++---------------------
 4 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index c7d7bea..d8e0925 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -53,7 +53,7 @@ Pixel 上微信发送/跟踪的落地，纯设备内运行（不依赖 Mac）：
 | `~/.dsh/skills/` | 保留的 ~47 个 skill（**必须平铺**，dsh 不递归嵌套目录）；原 597 个 Hermes skill 仍在 `~/.hermes/skills/`，只待归档 |
 | `~/.dsh/profiles/{headless,web}/cordis.patch.yml` | 默认模型 `zai-coding/glm-5.3-flash`、persona（原 SOUL.md）、手机 MCP 接入 |
 | `/data/adb/service.d/{crond,dsh-web,wechat-reply-watcher}.sh` | Magisk 开机自启（Hermes gateway 相关脚本已挪到 `/data/adb/retired/`） |
-| Termux `crond`（`crontab -l`，见 `device/crontab.txt`） | 取代 Hermes cron：reply-sender 5min、viewer 看门狗 10min、学习管线、BOSS 简历 6h、gate-audit、**TGO 日报 01/02/03 点链**（`daily-digest.sh gen|img|send`）+ 每小时 TGO 预摘要 |
+| Termux `crond`（`crontab -l`，见 `device/crontab.txt`） | 取代 Hermes cron：reply-sender 5min、viewer 看门狗 10min、BOSS 简历 6h（**学习管线 cron 已于 2026-10-17 停用**：`learn-and-build` 产出写进 Hermes skill/memory，下线后无落点）、gate-audit、**TGO 日报 01/02/03 点链**（`daily-digest.sh gen|img|send`）+ 每小时 TGO 预摘要 |
 
 **微信自动回复引擎**：member（闲聊）走 `~/dsh/run-reply-member.sh`（无工具、`read-only`、人设取自 `~/pixelphone/SOUL.md`，对方是任意陌生人，输入不可信），admin（任务）走 `~/dsh/run-headless.sh`（全工具）；orchestrator 里已无 Hermes 分支。admin 读 `~/.dsh/skills/reply-task-executor`，手机 MCP 已放开；但 `WECHAT_REPLY_NO_DIRECT_SEND=1` 闸门仍会让 `wechat_hook_send.send_*` 直发被拒，**发送只能走 orchestrator**。不可信内容的任务（viewer 文章摘要）用 `--patch ~/dsh/patches/no-phone.yml` 关掉手机 MCP。
 
diff --git a/device/crontab.txt b/device/crontab.txt
index 14724e7..31fc02b 100644
--- a/device/crontab.txt
+++ b/device/crontab.txt
@@ -6,8 +6,6 @@ D=/data/data/com.termux/files/home/pixelphone/scripts
 L=/data/data/com.termux/files/home/pixelphone/cron-logs
 */5 * * * *   python3 $D/reply-sender.py >> $L/reply-sender.log 2>&1
 */10 * * * *  bash $D/wechat-viewer-watchdog.sh >> $L/viewer-watchdog.log 2>&1
-0 */2 * * *   bash $D/learn-pipeline-trigger.sh >> $L/learn-classify.log 2>&1
-0 * * * *     bash $D/learn-executor.sh >> $L/learn-executor.log 2>&1
 0 */6 * * *   bash $D/boss-resume.sh >> $L/boss-resume.log 2>&1
 0 6 * * *     bash $D/gate-audit-cron.sh >> $L/gate-audit.log 2>&1
 # TGO 日报链（取代 Hermes 调度器）：01 生成 / 02 出图 / 03 发送；失败下个整点重试(窗口内每 10 分钟)
@@ -18,3 +16,4 @@ L=/data/data/com.termux/files/home/pixelphone/cron-logs
 0 * * * *     pgrep -f tgo_summarize_batch >/dev/null || python3 $D/tgo_summarize_batch.py >> $L/tgo-summary.log 2>&1
 # 原图保存 A+B（旧调度器定频 02/06/10/14/18/22 点，放 :15 避开 02:00 出图；约30分钟接管屏幕，锁屏/微信未起自动跳过）
 15 2,6,10,14,18,22 * * * bash $D/orig-save.sh >> $L/orig-save.log 2>&1
+# 学习管线（learn-pipeline-trigger 每 2h / learn-executor 每小时）已于 2026-10-17 停用：learn-and-build 的产出写进 Hermes 的 skill/memory，Hermes 下线后无落点。恢复需先改 learn-and-build 的落点。
diff --git a/device/pixelphone/digest/wechat-group-digest/scripts/gen_digest_html.py b/device/pixelphone/digest/wechat-group-digest/scripts/gen_digest_html.py
index 4d47e35..fce14c2 100644
--- a/device/pixelphone/digest/wechat-group-digest/scripts/gen_digest_html.py
+++ b/device/pixelphone/digest/wechat-group-digest/scripts/gen_digest_html.py
@@ -309,6 +309,7 @@ def build_media_section(date: str, prof: dict = None) -> str:
         import html as _html
         parts.append('<div class="media-grid">')
         for m in imgs:
+            u = _url(m)
             # meta 行：发送人 · HH:MM · 群名（2026-10-08 用户要求补充显示）
             bits = []
             if (m.get("sender") or "").strip():
@@ -325,24 +326,39 @@ def build_media_section(date: str, prof: dict = None) -> str:
                         if cap else "")
             parts.append(
                 f'<div class="media-img-cell">'
-                f'<a href="{m["oss_url"]}" target="_blank" rel="noopener">'
-                f'<img src="{m["oss_url"]}" loading="lazy" alt="{m.get("title", "")}"></a>'
+                f'<a href="{u}" target="_blank" rel="noopener">'
+                f'<img src="{u}" loading="lazy" alt="{m.get("title", "")}"></a>'
                 f'{meta_html}{cap_html}</div>'
             )
         parts.append("</div>")
     if vids:
+        import html as _html
         parts.append('<div class="media-videos">')
         for m in vids:
-            parts.append(
-                f'<video controls preload="metadata" src="{m["oss_url"]}"></video>'
-            )
+            u = _url(m)
+            if u.lower().split("?")[0].endswith(".mp4"):
+                # 完整视频文件在本地/已上传：<video> 原生播放
+                p = m.get("poster_digest_url") or m.get("poster_url") or ""
+                poster_attr = f' poster="{p}"' if p else ""
+                parts.append(
+                    f'<video controls preload="metadata" src="{u}"{poster_attr}></video>'
+                )
+            else:
+                # 只有封面缩略图（视频文件未下载）：渲染成可点击封面，点开看大图
+                title = _html.escape(m.get("title") or "视频")
+                parts.append(
+                    f'<a class="media-vid-cell" href="{u}" target="_blank" rel="noopener" '
+                    f'title="查看视频封面（视频文件未下载到本机）">'
+                    f'<img src="{u}" loading="lazy" alt="{title}">'
+                    f'<span class="media-vid-badge">🎬 视频</span></a>'
+                )
         parts.append("</div>")
     if files:
         import html as _html
         parts.append('<ul class="media-files">')
         for m in files:
             title = _html.escape(m.get("title") or "文件")
-            url = _html.escape(m.get("oss_url") or "", quote=True)
+            url = _html.escape(_url(m), quote=True)
             # meta：发送人 · HH:MM · 大小 · 群名（sender/create_time 2026-10-08 新增）
             bits = [b for b in [
                 (m.get("sender") or "").strip() or None,
diff --git a/device/wechat-viewer/app.py b/device/wechat-viewer/app.py
index f936e86..6ff2c50 100644
--- a/device/wechat-viewer/app.py
+++ b/device/wechat-viewer/app.py
@@ -245,6 +245,15 @@ def _wechat_share_des(url: str) -> str:
         return ""
 
 
+def _dsh_chat_cmd(user_input: str) -> list[str]:
+    """聊天界面用：dsh headless（stdout=最终答案，reasoning 在 stderr）；关手机 MCP——对话内容不可信。
+    ponytail: 无多轮会话/无 profile 概念，每问一次起一个 dsh（~10s+）；要多轮可用 --session-id。"""
+    return [_DSH_BIN, "headless", "--patch", _DSH_NO_PHONE, user_input]
+
+
+_PROFILE_GONE = "Hermes profile 管理已随 Hermes 下线（dsh 无 profile 概念）"
+
+
 def _maybe_dsh(job_type: str, cmd: list[str]) -> list[str]:
     try:
         cfg = json.loads(_JOB_ENGINE_FILE.read_text())
@@ -4714,20 +4723,20 @@ def api_doctor():
         checks["cron"] = {"ok": False, "detail": str(e)[:100]}
         all_ok = False
 
-    # 7. Hermes CLI 可达性
+    # 7. dsh CLI 可达性
     try:
-        result = subprocess.run(["hermes", "--version"], capture_output=True,
-            text=True, timeout=10)
-        checks["hermes_cli"] = {"ok": result.returncode == 0,
+        result = subprocess.run([_DSH_BIN, "--version"], capture_output=True,
+            text=True, timeout=20)
+        checks["dsh_cli"] = {"ok": result.returncode == 0,
             "detail": result.stdout.strip()[:80] if result.returncode == 0
             else f"exit={result.returncode} {result.stderr[:80]}"}
         if result.returncode != 0:
             all_ok = False
     except FileNotFoundError:
-        checks["hermes_cli"] = {"ok": False, "detail": "hermes binary not found in PATH"}
+        checks["dsh_cli"] = {"ok": False, "detail": "dsh binary not found"}
         all_ok = False
     except Exception as e:
-        checks["hermes_cli"] = {"ok": False, "detail": str(e)[:100]}
+        checks["dsh_cli"] = {"ok": False, "detail": str(e)[:100]}
         all_ok = False
 
     # 8. 模型 API（快速连通性检查 — 仅检查配置文件，不打实际 API 调用）
@@ -5132,16 +5141,16 @@ def call_hermes(user_input: str, timeout: int = 120) -> str:
     """
     try:
         r = subprocess.run(
-            ["hermes", "chat", "-q", user_input, "-Q"],
+            _dsh_chat_cmd(user_input),
             capture_output=True, text=True,
             timeout=timeout,
             cwd="/data/data/com.termux/files/home"
         )
         ai_reply = (r.stdout or "").strip()
         if not ai_reply and r.stderr:
-            ai_reply = f"[Hermes 错误] {r.stderr[:200]}"
+            ai_reply = f"[dsh 错误] {r.stderr[-200:]}"
         elif not ai_reply:
-            ai_reply = "[Hermes 返回空回复]"
+            ai_reply = "[dsh 返回空回复]"
         return ai_reply
     except subprocess.TimeoutExpired:
         return "[Hermes:gate=TIMEOUT] 调用超时"
@@ -5167,10 +5176,7 @@ def call_hermes_stream(user_input: str, timeout: int = 120, profile: str = ""):
     from threading import Timer
     proc = None
     try:
-        cmd = ["hermes"]
-        if profile and profile != "default":
-            cmd.extend(["-p", profile])
-        cmd.extend(["chat", "-q", user_input, "-Q"])
+        cmd = _dsh_chat_cmd(user_input)  # profile 参数已无意义（dsh 无 profile），保留签名兼容调用方
         proc = subprocess.Popen(
             cmd,
             stdout=subprocess.PIPE, stderr=subprocess.PIPE,
@@ -5454,7 +5460,7 @@ def api_regenerate(conv_id):
 
         def generate():
             proc = subprocess.Popen(
-                ["hermes", "ask", hermes_input],
+                _dsh_chat_cmd(hermes_input),
                 stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True,
                 env={**os.environ, "NO_COLOR": "1"}
             )
@@ -6007,10 +6013,7 @@ def _scan_profiles():
         info = _scan_one(HERMES_HOME, "default")
         # Try to get description from hermes profile show
         try:
-            r = subprocess.run(
-                ["hermes", "profile", "show", "default"],
-                capture_output=True, text=True, timeout=10
-            )
+            r = subprocess.CompletedProcess([], 1, "", "")  # Hermes profile show 已下线
             if r.returncode == 0:
                 for line in r.stdout.splitlines():
                     if line.lower().startswith("model:"):
@@ -6131,7 +6134,8 @@ def api_profile_create():
         if target_dir.exists():
             return jsonify({"ok": False, "error": f"profile '{name}' already exists"}), 409
 
-        cmd = ["hermes", "profile", "create", name, "--no-skills"]
+        return jsonify({"ok": False, "error": _PROFILE_GONE}), 501
+        cmd = ["hermes", "profile", "create", name, "--no-skills"]  # 死代码，随 Hermes 清理时一并删
         if description:
             cmd.extend(["--description", description])
 
@@ -6171,7 +6175,8 @@ def api_profile_delete(name):
             # Maybe it's a hermes profile not in profiles/ dir
             pass
 
-        cmd = ["hermes", "profile", "delete", name, "-y"]
+        return jsonify({"ok": False, "error": _PROFILE_GONE}), 501
+        cmd = ["hermes", "profile", "delete", name, "-y"]  # 死代码
         r = subprocess.run(cmd, capture_output=True, text=True, timeout=30)
         if r.returncode != 0:
             return jsonify({"ok": False, "error": r.stderr.strip() or r.stdout.strip() or "delete failed"}), 500
@@ -6192,7 +6197,7 @@ def api_profile_chat(name):
         if not message:
             return jsonify({"ok": False, "error": "message is required"}), 400
 
-        cmd = ["hermes", "-p", name, "chat", "-q", message]
+        cmd = _dsh_chat_cmd(message)  # profile 无意义，统一走 dsh；name 仅用于展示
         r = subprocess.run(cmd, capture_output=True, text=True, timeout=60)
         if r.returncode != 0:
             err = r.stderr.strip() or r.stdout.strip() or "chat failed"
--
libgit2 0.21.4