sophhub 0.4.28 → 0.4.30

package/skills/online-bug-report/src/scripts/report_bug.py

@@ -15,19 +15,16 @@ from dataclasses import dataclass, field
 from datetime import datetime
 from pathlib import Path
 from typing import Any, Optional
-
+import sophnet_tools
 
 DEFAULT_TIMEOUT = 30
 DEFAULT_API_BASE_URL = "https://yagent.sophnet.com/api"
 DEFAULT_JWT_PATH = Path("/home/node/.openclaw/jwt.json")
 DEFAULT_OPENCLAW_BASE_PATH = Path("/home/node/.openclaw/.base.json")
-DEFAULT_SOURCE_LABEL = "虾友 DM"
+OSS_UPLOAD_TIMEOUT = 60
 
 CONFIG_ALIASES: dict[str, tuple[str, ...]] = {
     "dev_friend_id": ("dev_friend_id", "DEV_FRIEND_ID", "friend_id"),
-    "dev_friend_name": ("dev_friend_name", "DEV_FRIEND_NAME", "friend_name"),
-    "terminal_label": ("terminal_label", "TERMINAL_LABEL"),
-    "terminal_url": ("terminal_url", "TERMINAL_URL"),
     "session_url_template": (
         "session_url_template",
         "SESSION_URL_TEMPLATE",
@@ -39,10 +36,16 @@ CONFIG_ALIASES: dict[str, tuple[str, ...]] = {
         "OPENCLAW_BASE_URL",
         "sophclaw_base_url",
     ),
-    "default_model": ("default_model", "DEFAULT_MODEL", "llm", "model"),
 }
 
 
+def get_sessions_dir(agent_id: str) -> Path:
+    """根据 agentId 构造 sessions 目录路径。"""
+    if not agent_id.strip():
+        raise AppError("agent-id 不能为空")
+    return Path("/home/node/.openclaw/agents") / agent_id.strip() / "sessions"
+
+
 class AppError(RuntimeError):
     pass
 
@@ -161,12 +164,12 @@ class BugReport:
     sender_name: str
     user_description: str
     openclaw_base_url: Optional[str] = None
-    terminal_label: str = DEFAULT_SOURCE_LABEL
-    terminal_url: Optional[str] = None
     session_key: Optional[str] = None
     session_url: Optional[str] = None
-    context: Optional[str] = None
     model: Optional[str] = None
+    model_provider: Optional[str] = None
+    context_tokens: Optional[int] = None
+    total_tokens: Optional[int] = None
     oss_urls: list[str] = field(default_factory=list)
     reported_at: Optional[str] = None
 
@@ -185,44 +188,29 @@ def format_bug_message(report: BugReport) -> str:
     ts = report.reported_at or datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     lines = [
         f"【在线 Bug】{ts}",
-        "",
-        "▎发件人",
-        f"- 用户: {report.sender_name.strip()} ({report.sender_id.strip()})",
-        f"- 来源: {report.terminal_label.strip() or DEFAULT_SOURCE_LABEL}",
-        "",
-        "▎用户描述",
-        report.user_description.strip(),
-        "",
-        "▎环境",
+        f"▎发件人：{report.sender_name.strip()}",
+        f"▎ID: {report.sender_id.strip()}",
+        f"▎会话：{report.session_key.strip() if report.session_key else '（无）'}",
     ]
     if report.openclaw_base_url:
-        lines.append(f"- OpenClaw Base URL: {report.openclaw_base_url}")
-    else:
-        lines.append("- OpenClaw Base URL: （未配置）")
-    terminal_line = f"- 终端: {report.terminal_label.strip() or DEFAULT_SOURCE_LABEL}"
-    if report.terminal_url and report.terminal_url.strip():
-        terminal_line += f" ({report.terminal_url.strip()})"
-    lines.append(terminal_line)
+        lines.append(f"▎Base URL: {report.openclaw_base_url}")
     if report.model and report.model.strip():
-        lines.append(f"- 模型: {report.model.strip()}")
-    else:
-        lines.append("- 模型: （未知）")
-
-    lines.extend(["", "▎会话"])
-    if report.session_key and report.session_key.strip():
-        lines.append(f"- sessionKey: {report.session_key.strip()}")
-    else:
-        lines.append("- sessionKey: （无）")
-    if report.session_url and report.session_url.strip():
-        lines.append(f"- Session 链接: {report.session_url.strip()}")
-    if report.context and report.context.strip():
-        lines.extend(["- 近期上下文:", report.context.strip()])
+        model_line = report.model.strip()
+        if report.model_provider and report.model_provider.strip():
+            model_line = f"{report.model_provider.strip()}/{report.model.strip()}"
+        lines.append(f"▎模型: {model_line}")
+    if report.context_tokens is not None:
+        lines.append(f"▎上下文大小: {report.context_tokens}")
+    if report.total_tokens is not None:
+        lines.append(f"▎当前上下文占用: {report.total_tokens}")
 
-    lines.extend(["", "▎附件"])
     if report.oss_urls:
-        lines.extend(report.oss_urls)
-    else:
-        lines.append("（无）")
+        lines.append(f"▎附件：{report.oss_urls[0]}")
+        for u in report.oss_urls[1:]:
+            lines.append(f"    {u}")
+
+    lines.append(f"▎用户描述：")
+    lines.append(f"    {report.user_description.strip()}")
 
     return "\n".join(lines).rstrip() + "\n"
 
@@ -349,7 +337,7 @@ def load_friends(api_base: str, token: str, timeout: int) -> list[dict[str, Any]
     return out
 
 
-def find_nearest_agent_config(start_dir: Path | None = None) -> Path | None:
+def find_nearest_agent_config(start_dir: Optional[Path] = None) -> Optional[Path]:
     current = (start_dir or Path.cwd()).resolve()
     for candidate in [current, *current.parents]:
         config_path = candidate / ".config.json"
@@ -358,7 +346,7 @@ def find_nearest_agent_config(start_dir: Path | None = None) -> Path | None:
     return None
 
 
-def read_model_from_agent_config(config_path: Path | None = None) -> Optional[str]:
+def read_model_from_agent_config(config_path: Optional[Path] = None) -> Optional[str]:
     path = config_path or find_nearest_agent_config()
     if path is None:
         return None
@@ -375,39 +363,105 @@ def read_model_from_agent_config(config_path: Path | None = None) -> Optional[st
     return None
 
 
-def read_context_file(path: Optional[str]) -> Optional[str]:
-    if not path:
-        return None
-    file_path = Path(path).expanduser()
+def resolve_sender_from_jwt(jwt_path: Path = DEFAULT_JWT_PATH) -> tuple[str, str]:
+    """从 JWT payload 中解析 userId 和 name 作为 sender_id / sender_name。"""
+    data = load_json_file(jwt_path)
+    token = data.get("web_jwt")
+    if not isinstance(token, str) or not token.strip():
+        raise AppError(f"JWT 文件缺少有效 web_jwt: {jwt_path}")
+    token = token.strip()
+    if token.lower().startswith("bearer "):
+        token = token[7:].strip()
+    parts = token.split(".")
+    if len(parts) != 3:
+        raise AppError("web_jwt 不是有效的 JWT 格式")
+    payload_b64 = parts[1]
+    remainder = len(payload_b64) % 4
+    if remainder:
+        payload_b64 += "=" * (4 - remainder)
     try:
-        text = file_path.read_text(encoding="utf-8")
-    except OSError as exc:
-        raise AppError(f"无法读取 context 文件 {file_path}: {exc}") from exc
-    text = text.strip()
-    return text or None
+        raw = base64.urlsafe_b64decode(payload_b64.encode("ascii"))
+        payload = json.loads(raw)
+    except (ValueError, UnicodeDecodeError, json.JSONDecodeError) as exc:
+        raise AppError(f"JWT payload 解码失败: {exc}") from exc
+    user_id = payload.get("userId")
+    if user_id is None:
+        raise AppError("JWT payload 中未找到 userId 字段")
+    sender_id = str(int(user_id))
+    sender_name = str(payload.get("name") or "")
+    if not sender_name.strip():
+        sender_name = sender_id
+    return sender_id, sender_name
+
+
+def resolve_session_file(session_key: str, agent_id: str) -> tuple[Path, dict[str, Any]]:
+    """根据 sessionKey 查找 .jsonl 会话文件，同时返回 session 元信息。"""
+    if not session_key.strip():
+        raise AppError("session-key 不能为空")
+    if not agent_id.strip():
+        raise AppError("agent-id 不能为空")
+    sessions_dir = get_sessions_dir(agent_id)
+    sessions_json = sessions_dir / "sessions.json"
+    if not sessions_json.is_file():
+        raise AppError(f"sessions.json 不存在: {sessions_json}")
+    data = load_json_file(sessions_json)
+    session_entry = data.get(session_key.strip())
+    if not isinstance(session_entry, dict):
+        raise AppError(f"sessions.json 中未找到 sessionKey={session_key} 的记录")
+    session_file = Path(session_entry.get("sessionFile") or "")
+    if not session_file.is_file():
+        raise AppError(f"session 文件不存在: {session_file}")
+    meta = {
+        "modelProvider": session_entry.get("modelProvider"),
+        "model": session_entry.get("model"),
+        "contextTokens": session_entry.get("contextTokens"),
+        "totalTokens": session_entry.get("totalTokens"),
+    }
+    return session_file, meta
+
+
+def upload_session_to_oss(session_file: Path, timeout: int = OSS_UPLOAD_TIMEOUT) -> str:
+    """上传 session 文件到 OSS，返回签名下载 URL。"""
+    signed_url = sophnet_tools.upload_oss(str(session_file), timeout=timeout)
+    if not signed_url:
+        raise AppError("OSS 上传失败：未返回下载 URL")
+    return signed_url
 
 
 def build_report_from_args(args: argparse.Namespace) -> BugReport:
     cred = load_cred_file(args.cred_file)
 
+    # sender: 显式传入优先，否则从 JWT 自动解析
+    sender_id = (args.sender_id or "").strip()
+    sender_name = (args.sender_name or "").strip()
+    if not sender_id or not sender_name:
+        jwt_id, jwt_name = resolve_sender_from_jwt()
+        if not sender_id:
+            sender_id = jwt_id
+        if not sender_name:
+            sender_name = jwt_name
+
     openclaw_base = (
         (args.openclaw_base_url or "").strip()
         or cfg_pick(cred, "openclaw_base_url", "OPENCLAW_BASE_URL")
         or read_openclaw_base_url(Path(args.openclaw_base_path).expanduser())
     )
 
-    terminal_label = (
-        (args.terminal_label or "").strip()
-        or cfg_pick(cred, "terminal_label", "BUG_TERMINAL_LABEL")
-        or DEFAULT_SOURCE_LABEL
-    )
-    terminal_url = (
-        (args.terminal_url or "").strip()
-        or cfg_pick(cred, "terminal_url", "BUG_TERMINAL_URL")
-        or None
-    )
-
     session_key = (args.session_key or "").strip() or None
+    agent_id = (args.agent_id or "").strip() or None
+
+    # OSS URL: 显式传入优先，否则根据 session_key 自动上传
+    explicit_oss_urls = [normalize_http_url(u, field_name="oss-url") for u in (args.oss_url or [])]
+    session_meta: dict[str, Any] = {}
+    if explicit_oss_urls:
+        oss_urls = explicit_oss_urls
+    elif session_key and agent_id:
+        session_file, session_meta = resolve_session_file(session_key, agent_id)
+        oss_url = upload_session_to_oss(session_file)
+        oss_urls = [oss_url]
+    else:
+        oss_urls = []
+
     template = (args.session_url_template or "").strip() or cfg_pick(
         cred, "session_url_template", "BUG_SESSION_URL_TEMPLATE"
     )
@@ -419,33 +473,38 @@ def build_report_from_args(args: argparse.Namespace) -> BugReport:
         openclaw_base,
     )
 
-    context = (args.context or "").strip() or read_context_file(args.context_file)
-
-    oss_urls = [normalize_http_url(u, field_name="oss-url") for u in (args.oss_url or [])]
-
     model = (
         (args.model or "").strip()
+        or session_meta.get("model")
         or cfg_pick(cred, "default_model", "BUG_MODEL")
         or read_model_from_agent_config()
     ) or None
+    model_provider = (
+        session_meta.get("modelProvider")
+        or cfg_pick(cred, "model_provider")
+    ) or None
+
+    def _session_int(key: str) -> Optional[int]:
+        v = session_meta.get(key)
+        return int(v) if isinstance(v, (int, float)) else None
 
     return BugReport(
-        sender_id=args.sender_id,
-        sender_name=args.sender_name,
+        sender_id=sender_id,
+        sender_name=sender_name,
         user_description=args.description,
         openclaw_base_url=openclaw_base,
-        terminal_label=terminal_label,
-        terminal_url=terminal_url,
         session_key=session_key,
         session_url=session_url,
-        context=context,
         model=model,
+        model_provider=model_provider,
+        context_tokens=_session_int("contextTokens"),
+        total_tokens=_session_int("totalTokens"),
         oss_urls=oss_urls,
         reported_at=(args.reported_at or "").strip() or None,
     )
 
 
-def resolve_dev_friend(args: argparse.Namespace, cred: dict[str, Any]) -> tuple[int, str]:
+def resolve_dev_friend(args: argparse.Namespace, cred: dict[str, Any]) -> int:
     if args.friend_id is not None and args.friend_id > 0:
         friend_id = int(args.friend_id)
     else:
@@ -458,12 +517,52 @@ def resolve_dev_friend(args: argparse.Namespace, cred: dict[str, Any]) -> tuple[
             raise AppError(f"dev_friend_id 不是有效整数: {raw}") from exc
     if friend_id <= 0:
         raise AppError("friend-id 必须为正整数")
-    friend_name = (
-        (args.friend_name or "").strip()
-        or cfg_pick(cred, "dev_friend_name", "BUG_DEV_FRIEND_NAME")
-        or "研发值班"
+    return friend_id
+
+
+def request_friend(api_base: str, token: str, friend_id: int, timeout: int) -> dict[str, Any]:
+    """发起好友请求。"""
+    url = f"{api_base}/sys/openclaw/friend/request"
+    return request_json("POST", url, token, timeout, payload={"friendId": friend_id})
+
+
+def resolve_api_base(
+    args: argparse.Namespace,
+    cred: dict[str, Any],
+) -> str:
+    """从参数和凭证中解析 api_base_url，三处调用共用。"""
+    return normalize_http_url(
+        (args.api_base_url or "").strip()
+        or cfg_pick(cred, "api_base_url", "BUG_API_BASE_URL")
+        or DEFAULT_API_BASE_URL,
+        field_name="api-base-url",
     )
-    return friend_id, friend_name
+
+
+def cmd_ensure_friend(args: argparse.Namespace) -> int:
+    """ensure-friend 子命令：检查 dev_friend_id 是否已是好友，否则发起好友请求。
+
+    退出码: 0=已是好友, 2=刚发起好友请求, 1=异常
+    """
+    cred = load_cred_file(getattr(args, "cred_file", None), required=True)
+    friend_id = resolve_dev_friend(args, cred)
+    api_base = resolve_api_base(args, cred)
+    jwt_path = Path(args.jwt_path).expanduser()
+    token = read_bearer_token(jwt_path)
+    ensure_jwt_valid(token, jwt_path, args.allow_expired_jwt)
+
+    friends = load_friends(api_base, token, args.timeout)
+    friend_ids = {f.get("friendId") for f in friends}
+
+    if friend_id in friend_ids:
+        result = {"status": "already_friend", "friendId": friend_id}
+        print_json(result)
+        return 0
+
+    request_friend(api_base, token, friend_id, args.timeout)
+    result = {"status": "request_sent", "friendId": friend_id}
+    print_json(result)
+    return 2
 
 
 def add_report_args(parser: argparse.ArgumentParser) -> None:
@@ -472,10 +571,11 @@ def add_report_args(parser: argparse.ArgumentParser) -> None:
         "-c",
         help="凭证 JSON 路径（默认 src/secrets/bug-report.json）",
     )
-    parser.add_argument("--sender-id", required=True, help="发件人 ID（虾友/Bot senderId）")
-    parser.add_argument("--sender-name", required=True, help="发件人展示名")
+    parser.add_argument("--sender-id", default="", help="发件人 ID（默认从 JWT 自动解析）")
+    parser.add_argument("--sender-name", default="", help="发件人展示名（默认从 JWT 自动解析）")
     parser.add_argument("--description", required=True, help="用户 Bug 描述")
     parser.add_argument("--session-key", default="", help="当前会话 sessionKey")
+    parser.add_argument("--agent-id", default="", help="当前 Agent ID（用于定位 sessions 目录）")
     parser.add_argument(
         "--session-url",
         default="",
@@ -496,15 +596,10 @@ def add_report_args(parser: argparse.ArgumentParser) -> None:
         default=str(DEFAULT_OPENCLAW_BASE_PATH),
         help="base_url JSON 路径",
     )
-    parser.add_argument("--terminal-label", default="", help="终端名称，默认「虾友 DM」")
-    parser.add_argument("--terminal-url", default="", help="终端入口 URL（可选）")
-    parser.add_argument(
-        "--model",
+    parser.add_argument("--model",
         default="",
         help="用户/客服会话使用的模型（默认读凭证 default_model 或就近 .config.json 的 llm）",
     )
-    parser.add_argument("--context", default="", help="近期对话上下文（多行文本）")
-    parser.add_argument("--context-file", help="从文件读取近期上下文")
     parser.add_argument(
         "--oss-url",
         action="append",
@@ -524,7 +619,6 @@ def add_http_args(parser: argparse.ArgumentParser) -> None:
     parser.add_argument("--timeout", type=int, default=DEFAULT_TIMEOUT)
     parser.add_argument("--allow-expired-jwt", action="store_true")
     parser.add_argument("--friend-id", type=int, help="研发值班虾友 friendId")
-    parser.add_argument("--friend-name", default="", help="研发虾友展示名（日志用）")
 
 
 def build_parser() -> argparse.ArgumentParser:
@@ -540,6 +634,15 @@ def build_parser() -> argparse.ArgumentParser:
     add_http_args(p_send)
     p_send.add_argument("--json", action="store_true", help="JSON 输出")
 
+    p_ensure = sub.add_parser("ensure-friend", help="校验研发虾友是否为好友，否则发起好友请求")
+    p_ensure.add_argument(
+        "--cred-file",
+        "-c",
+        help="凭证 JSON 路径（默认 src/secrets/bug-report.json）",
+    )
+    add_http_args(p_ensure)
+    p_ensure.add_argument("--json", action="store_true", help="JSON 输出")
+
     p_friends = sub.add_parser("list-friends", help="列出虾友（配置 dev_friend_id 时用）")
     p_friends.add_argument(
         "--cred-file",
@@ -558,14 +661,12 @@ def main(argv: Optional[list[str]] = None) -> int:
         if getattr(args, "timeout", DEFAULT_TIMEOUT) <= 0:
             raise AppError("timeout 必须为正整数")
 
+        if args.command == "ensure-friend":
+            return cmd_ensure_friend(args)
+
         if args.command == "list-friends":
             cred = load_cred_file(getattr(args, "cred_file", None))
-            api_base = normalize_http_url(
-                (args.api_base_url or "").strip()
-                or cfg_pick(cred, "api_base_url", "BUG_API_BASE_URL")
-                or DEFAULT_API_BASE_URL,
-                field_name="api-base-url",
-            )
+            api_base = resolve_api_base(args, cred)
             token = read_bearer_token(Path(args.jwt_path).expanduser())
             ensure_jwt_valid(token, Path(args.jwt_path).expanduser(), args.allow_expired_jwt)
             friends = load_friends(api_base, token, args.timeout)
@@ -583,6 +684,9 @@ def main(argv: Optional[list[str]] = None) -> int:
                     "senderId": report.sender_id,
                     "senderName": report.sender_name,
                     "model": report.model,
+                    "modelProvider": report.model_provider,
+                    "contextTokens": report.context_tokens,
+                    "totalTokens": report.total_tokens,
                     "sessionKey": report.session_key,
                     "sessionUrl": report.session_url,
                     "ossUrls": report.oss_urls,
@@ -595,13 +699,8 @@ def main(argv: Optional[list[str]] = None) -> int:
             return 0
 
         cred = load_cred_file(args.cred_file, required=True)
-        friend_id, friend_name = resolve_dev_friend(args, cred)
-        api_base = normalize_http_url(
-            (args.api_base_url or "").strip()
-            or cfg_pick(cred, "api_base_url", "BUG_API_BASE_URL")
-            or DEFAULT_API_BASE_URL,
-            field_name="api-base-url",
-        )
+        friend_id = resolve_dev_friend(args, cred)
+        api_base = resolve_api_base(args, cred)
         jwt_path = Path(args.jwt_path).expanduser()
         token = read_bearer_token(jwt_path)
         ensure_jwt_valid(token, jwt_path, args.allow_expired_jwt)
@@ -609,7 +708,7 @@ def main(argv: Optional[list[str]] = None) -> int:
         sent = send_im_message(api_base, token, rid, message, args.timeout)
         result = {
             "success": True,
-            "friend": {"friendId": friend_id, "displayName": friend_name},
+            "friend": {"friendId": friend_id},
             "rid": rid,
             "messageId": sent.get("_id"),
             "message": message,
@@ -618,7 +717,7 @@ def main(argv: Optional[list[str]] = None) -> int:
             print_json(result)
         else:
             print("✅ Bug 工单已发送给研发虾友。")
-            print(f"收件人: {friend_name} (friendId={friend_id})")
+            print(f"收件人 friendId={friend_id}")
             if sent.get("_id"):
                 print(f"messageId: {sent.get('_id')}")
         return 0

package/skills/online-bug-report/src/secrets/bug-report.json

@@ -1,6 +1,3 @@
 {
-  "dev_friend_id": 55039,
-  "dev_friend_name": "用户2199",
-  "terminal_label": "虾友 DM",
-  "default_model": "Qwen3.5-122B-A10B"
+  "dev_friend_id": 23858
 }

package/skills/sophnet-image-ocr/skill.json

@@ -1,12 +1,24 @@
 {
   "name": "sophnet-image-ocr",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "types": [
     "builtin"
   ],
   "displayName": "",
-  "description": "",
+  "description": "Use when the user needs to extract text, tables, or structured content from images or PDF files. Supports local files and URLs via Sophnet OCR API.",
   "changelog": [
+    {
+      "version": "1.1.0",
+      "date": "2026-05-26",
+      "changes": [
+        "SKILL.md 精简优化（168行→69行），description 改为触发条件式",
+        "pymupdf 改为懒加载，首次 PDF 使用时从阿里云镜像自动安装，图片 OCR 不再受 pymupdf 下载超时影响",
+        "OCR 模型升级：PaddleOCR-VL-0.9B → PaddleOCR-VL-1.5",
+        "新增 design.md 设计文档和 references/api-details.md",
+        "删除 src/uv.lock",
+        "pyproject.toml 配置阿里云镜像源"
+      ]
+    },
     {
       "version": "1.0.0",
       "date": "2026-04-09",
@@ -16,5 +28,5 @@
     }
   ],
   "createdAt": "2026-04-09",
-  "updatedAt": "2026-04-09"
+  "updatedAt": "2026-05-26"
 }