@hupan56/wlkj 3.3.0 → 3.3.2

package/templates/qoder/scripts/capability/caps/__init__.py

@@ -11,9 +11,9 @@ from .repo import RepoCap, NoOpRepoCap
 from .identity import IdentityCap, NoOpIdentityCap
 from .context import ContextCap, NoOpContextCap
 from .cron import CronCap, NoOpCronCap
-from .notify import NotifyCap, NoOpNotifyCap
+from .notify import NotifyCap, NoOpNotifyCap, WebhookNotifyCap, default_notify
 from .present import PresentCap, NoOpPresentCap
-from .sandbox import SandboxCap, NoOpSandboxCap
+from .sandbox import SandboxCap, NoOpSandboxCap, SubprocessSandboxCap, default_sandbox
 
 __all__ = [
     "MemoryCap", "NoOpMemoryCap",
@@ -21,7 +21,7 @@ __all__ = [
     "IdentityCap", "NoOpIdentityCap",
     "ContextCap", "NoOpContextCap",
     "CronCap", "NoOpCronCap",
-    "NotifyCap", "NoOpNotifyCap",
+    "NotifyCap", "NoOpNotifyCap", "WebhookNotifyCap", "default_notify",
     "PresentCap", "NoOpPresentCap",
-    "SandboxCap", "NoOpSandboxCap",
+    "SandboxCap", "NoOpSandboxCap", "SubprocessSandboxCap", "default_sandbox",
 ]

package/templates/qoder/scripts/capability/caps/notify.py

@@ -11,6 +11,9 @@ NotifyCap —— IM 通知能力契约。
 """
 from __future__ import annotations
 
+import json
+import os
+import urllib.request
 from typing import Protocol, runtime_checkable
 
 
@@ -39,3 +42,64 @@ class NoOpNotifyCap:
 
     def list_channels(self) -> list[dict]:
         return []
+
+
+class WebhookNotifyCap:
+    """真实通知 adapter（#17）：POST 消息到配置的 IM webhook（飞书/企业微信/钉钉）。
+
+    webhook 从 env WLKJ_NOTIFY_WEBHOOKS 解析：
+      "default=https://open.feishu.cn/...,review=https://..." 或 JSON '{"default":"..."}'
+    用 stdlib urllib（宿主脚本可能无 httpx/requests），POST 通用 text payload。
+    available 仅当至少配了一个 webhook，否则 False（优雅降级 NoOp，不谎报）。
+    """
+
+    def __init__(self) -> None:
+        self._channels: dict[str, str] = self._load()
+
+    def _load(self) -> dict[str, str]:
+        raw = os.environ.get("WLKJ_NOTIFY_WEBHOOKS", "").strip()
+        if not raw:
+            return {}
+        if raw.startswith("{"):  # JSON 形式
+            try:
+                d = json.loads(raw)
+                return {str(k): str(v) for k, v in d.items() if v}
+            except Exception:
+                return {}
+        out: dict[str, str] = {}
+        for pair in raw.split(","):
+            if "=" in pair:
+                k, v = pair.split("=", 1)
+                k, v = k.strip(), v.strip()
+                if v:
+                    out[k] = v
+        return out
+
+    @property
+    def available(self) -> bool:
+        return len(self._channels) > 0
+
+    def send(self, channel: str, message: str) -> bool:
+        url = self._channels.get(channel) or self._channels.get("default")
+        if not url:
+            return False
+        try:
+            # 通用 text payload（飞书 msg_type/content；钉钉/企微也兼容 text 字段）
+            payload = json.dumps({"msg_type": "text", "content": {"text": message}}).encode("utf-8")
+            req = urllib.request.Request(url, data=payload,
+                                         headers={"Content-Type": "application/json"})
+            with urllib.request.urlopen(req, timeout=5) as r:
+                return getattr(r, "status", 200) == 200
+        except Exception:
+            return False  # IM 不可达不阻塞工作流
+
+    def list_channels(self) -> list[dict]:
+        return [{"channel": k, "configured": bool(v)} for k, v in self._channels.items()]
+
+
+def default_notify() -> NotifyCap:
+    """工厂：配了 webhook→WebhookNotifyCap；否则 NoOpNotifyCap。"""
+    cap = WebhookNotifyCap()
+    if cap.available:
+        return cap  # type: ignore[return-value]
+    return NoOpNotifyCap()  # type: ignore[return-value]

package/templates/qoder/scripts/capability/caps/sandbox.py

@@ -13,6 +13,8 @@ SandboxCap —— 安全执行能力契约。
 """
 from __future__ import annotations
 
+import os
+import subprocess
 from typing import Protocol, runtime_checkable
 
 
@@ -41,3 +43,39 @@ class NoOpSandboxCap:
 
     def approval_mode(self) -> str:
         return "suggest"
+
+
+class SubprocessSandboxCap:
+    """真实沙箱 adapter（#17）：子进程执行 + 超时强杀 + stdout/stderr/returncode 捕获。
+
+    无 docker 时的进程级隔离（超时强杀 + 输出捕获 + cwd 隔离），全平台可用。
+    docker 容器级隔离（FS/网络限制）后续可加 DockerSandboxCap，工厂按 env 切换。
+    available=True（subprocess 全平台可用）。
+    """
+
+    available = True
+
+    def run(self, command: str, cwd: str | None = None, timeout: int = 60) -> dict:
+        try:
+            # errors='replace' 健壮化：Windows 命令常输出 GBK 中文，UTF-8 解码会崩；
+            # replace 不崩（个别字符显示?），比 exec_error 丢全部输出好。
+            p = subprocess.run(command, shell=True, cwd=cwd, timeout=timeout,
+                               capture_output=True, text=True, errors="replace")
+            return {"ok": p.returncode == 0, "stdout": p.stdout,
+                    "stderr": p.stderr, "returncode": p.returncode}
+        except subprocess.TimeoutExpired:
+            return {"ok": False, "reason": "timeout(%ds)" % timeout, "returncode": -1}
+        except Exception as e:  # 命令不存在 / 权限 等
+            return {"ok": False, "reason": "exec_error: %s" % str(e)[:200], "returncode": -1}
+
+    def approval_mode(self) -> str:
+        return os.environ.get("WLKJ_APPROVAL_MODE", "suggest")
+
+
+def default_sandbox() -> SandboxCap:
+    """工厂：env WLKJ_SANDBOX=off→NoOp；docker(占位)→Subprocess 兜底；默认 Subprocess。"""
+    mode = os.environ.get("WLKJ_SANDBOX", "subprocess").lower()
+    if mode == "off":
+        return NoOpSandboxCap()  # type: ignore[return-value]
+    # docker 模式暂未实现容器隔离，先兜底 Subprocess（避免谎报容器级安全）
+    return SubprocessSandboxCap()  # type: ignore[return-value]

package/templates/qoder/scripts/capability/present_html.py

@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+"""present_html.py — 富展示 HTML 统一入口（cap.present 双轨）。
+
+模式（抄 usability_score.py --html）：
+  1. QoderWork（cap.present.available）→ cap.present.widget(html) 嵌入对话流
+  2. 降级 → 落盘 workspace/members/{dev}/journal/{name}-{ts}.html
+  3. 最终兜底 → stdout
+
+所有命令的富展示（impact/coverage/feature/report 看板）统一调 present(html, name)，
+不在各自脚本重复 widget+落盘逻辑。复用点：caps/present.py PresentCap + adapters/qw.py QwPresentCap。
+"""
+import os
+import sys
+from pathlib import Path
+
+
+def _resolve_repo(repo_root=None):
+    if repo_root:
+        return Path(repo_root)
+    env = os.environ.get("QODER_REPO") or os.environ.get("WLKJ_REPO")
+    if env:
+        return Path(env)
+    p = Path(__file__).resolve()
+    for parent in p.parents:
+        if (parent / ".qoder").is_dir() or (parent / "packages").is_dir():
+            return parent
+    return p.parent
+
+
+def _read_dev(repo):
+    f = repo / ".qoder" / ".developer"
+    if f.is_file():
+        for line in f.read_text(encoding="utf-8").splitlines():
+            if "name=" in line:
+                return line.split("name=", 1)[1].strip().split()[0]
+    return os.environ.get("QODER_DEV", "") or "shared"
+
+
+def present(html, name="dashboard", repo_root=None, dev=None):
+    """展示 HTML：QoderWork 嵌入对话；降级落盘 journal；兜底 stdout。返回 (sinked, path)。"""
+    repo = _resolve_repo(repo_root)
+    # 1. QoderWork widget（富宿主嵌入对话流）
+    try:
+        scripts_dir = str(repo / ".qoder" / "scripts")
+        if scripts_dir not in sys.path:
+            sys.path.insert(0, scripts_dir)
+        from capability.registry import resolve
+        cap = resolve()
+        if getattr(cap.present, "available", False):
+            if cap.present.widget(html):
+                return True, None
+    except Exception:
+        pass
+    # 2. 降级落盘
+    try:
+        out_dev = dev or _read_dev(repo)
+        out = repo / "workspace" / "members" / out_dev / "journal"
+        out.mkdir(parents=True, exist_ok=True)
+        from datetime import datetime
+        import re
+        safe_name = re.sub(r'[\\/:*?"<>|]', "_", name)  # Windows 非法字符清洗
+        fp = out / ("%s-%s.html" % (safe_name, datetime.now().strftime("%Y%m%d-%H%M%S")))
+        fp.write_text(html, encoding="utf-8")
+        print("[HTML] 已落盘: %s" % fp)
+        return False, str(fp)
+    except Exception:
+        print(html)
+        return False, None

package/templates/qoder/scripts/capability/registry.py

@@ -196,7 +196,9 @@ def _resolve_cron(host: str):
 
 
 def _resolve_notify(host: str):
-    return NoOpNotifyCap()
+    """L2 通知 —— 配了 WLKJ_NOTIFY_WEBHOOKS→WebhookNotifyCap(飞书/企微/钉钉);否则 NoOp 降级。"""
+    from .caps.notify import default_notify
+    return default_notify()
 
 
 def _resolve_present(host: str):
@@ -211,7 +213,9 @@ def _resolve_present(host: str):
 
 
 def _resolve_sandbox(host: str):
-    return NoOpSandboxCap()
+    """L2 安全执行 —— env WLKJ_SANDBOX≠off→SubprocessSandboxCap(进程级隔离+超时);off→NoOp。"""
+    from .caps.sandbox import default_sandbox
+    return default_sandbox()
 
 
 def _resolve_mcp(host: str):