claude-nb 0.5.1 → 0.5.44

package/bin/cnb

@@ -10,7 +10,23 @@ else
     B='' D='' G='' C='' Y='' N=''
 fi
 
-# ---- Export project root so all subprocesses can find .claudes/ ----
+# ---- Version update check (non-blocking, shown only at interactive startup) ----
+_CACHE="$HOME/.cnb/latest-version"
+_check_update() {
+    mkdir -p "$HOME/.cnb"
+    if [ ! -f "$_CACHE" ] || [ "$(find "$_CACHE" -mmin +60 2>/dev/null)" ]; then
+        (npm view claude-nb version 2>/dev/null > "$_CACHE.tmp" && mv "$_CACHE.tmp" "$_CACHE" || rm -f "$_CACHE.tmp") &
+    fi
+    if [ -f "$_CACHE" ]; then
+        _LATEST=$(cat "$_CACHE" 2>/dev/null | tr -d '[:space:]')
+        _LOCAL=$(echo "$VERSION" | sed 's/-dev$//')
+        if [ -n "$_LATEST" ] && [ "$_LOCAL" != "$_LATEST" ]; then
+            printf "${Y}⬆ cnb v${_LATEST} 已发布，当前 v${VERSION}。运行 pip install --upgrade claude-nb 更新。${N}\n"
+        fi
+    fi
+}
+
+# ---- Export project root so all subprocesses can find .cnb/ ----
 export CNB_PROJECT="${CNB_PROJECT:-$(pwd)}"
 
 # ---- Subcommands (exact match, always first) ----
@@ -23,6 +39,7 @@ if [ $# -gt 0 ]; then
         dispatcher) shift; exec "$CLAUDES_HOME/bin/dispatcher" "$@" ;;
         watchdog)   shift; exec "$CLAUDES_HOME/bin/dispatcher-watchdog" "$@" ;;
         doctor)     shift; exec "$CLAUDES_HOME/bin/doctor" "$@" ;;
+        shutdown)   shift; exec "$CLAUDES_HOME/bin/shutdown" "$@" ;;
         logs)
             shift
             if [ $# -eq 0 ]; then
@@ -68,7 +85,67 @@ print(' '.join(names))
                 echo "OK 团队已启动: $_NAMES"
             fi
             exit 0 ;;
+        projects)
+            shift
+            if [ $# -eq 0 ]; then
+                echo "用法: cnb projects <list|cleanup>" >&2; exit 1
+            fi
+            subcmd="$1"; shift
+            case "$subcmd" in
+                list)
+                    python3 -c "
+import sys; sys.path.insert(0, '$CLAUDES_HOME')
+from lib.global_registry import list_projects
+projects = list_projects()
+if not projects:
+    print('没有已注册的项目')
+else:
+    for p in projects:
+        print(f\"  {p['name']:20s} {p['path']}  (最后活跃: {p.get('last_active', '未知')})\")
+" ;;
+                cleanup)
+                    python3 -c "
+import sys; sys.path.insert(0, '$CLAUDES_HOME')
+from lib.global_registry import cleanup
+removed = cleanup()
+if not removed:
+    print('没有需要清理的项目')
+else:
+    for p in removed:
+        print(f'  已移除: {p}')
+    print(f'OK 清理了 {len(removed)} 个失效项目')
+" ;;
+                *)
+                    echo "用法: cnb projects <list|cleanup>" >&2; exit 1 ;;
+            esac
+            exit 0 ;;
         ui)         shift; exec "$CLAUDES_HOME/bin/board" tui ;;
+        usage)
+            shift
+            python3 -c "
+import sys; sys.path.insert(0, '$CLAUDES_HOME')
+from pathlib import Path
+from lib.token_usage import cmd_usage
+cmd_usage(Path('$CNB_PROJECT'), sys.argv[1:])
+" "$@"
+            exit 0 ;;
+        leaderboard)
+            echo "${B}${G}◆ 贡献排行榜${N}"
+            echo ""
+            git -C "$CNB_PROJECT" log --format='%aN%n%(trailers:key=Co-Authored-By,valueonly,separator=%x0A)' \
+                | sed '/^$/d' | sed 's/^ *//' | sed 's/ *<[^>]*>//g' \
+                | sort | uniq -c | sort -rn \
+                | awk -v b="$B" -v n="$N" -v g="$G" -v y="$Y" '{
+                    rank++
+                    if (rank == 1) medal = "🥇"
+                    else if (rank == 2) medal = "🥈"
+                    else if (rank == 3) medal = "🥉"
+                    else medal = "  "
+                    name = ""
+                    for (i = 2; i <= NF; i++) name = name (i > 2 ? " " : "") $i
+                    printf "  %s %s%-20s%s %s%d commits%s\n", medal, b, name, n, g, $1, n
+                }'
+            exit 0 ;;
         version|--version|-v) echo "cnb v${VERSION}"; exit 0 ;;
         help|--help|-h)
             printf "${B}${G}◆ cnb${N} ${D}v${VERSION}${N}\n"
@@ -84,6 +161,10 @@ print(' '.join(names))
             printf "  cnb logs <name>       查看某个同学的消息历史\n"
             printf "  cnb exec <name> \"msg\" 给某个同学发指令\n"
             printf "  cnb stop <name>       停止某个同学\n"
+            printf "  cnb projects list     列出所有已注册的项目\n"
+            printf "  cnb projects cleanup  清理已失效的项目\n"
+            printf "  cnb usage             token 用量统计\n"
+            printf "  cnb leaderboard       贡献排行榜\n"
             printf "  cnb doctor            健康检查\n\n"
             printf "  cnb board [...]       底层消息/任务命令\n"
             printf "  cnb swarm [...]       管理后台同学\n"
@@ -93,23 +174,27 @@ fi
 
 # ---- Helper: start dispatcher if not already running ----
 _start_dispatcher() {
-    local pidfile="$CNB_PROJECT/.claudes/dispatcher.pid"
+    local pidfile="$CNB_PROJECT/$_CFG_DIR/dispatcher.pid"
     if [ -f "$pidfile" ] && kill -0 "$(cat "$pidfile")" 2>/dev/null; then
         return
     fi
-    mkdir -p "$CNB_PROJECT/.claudes/logs"
-    "$CLAUDES_HOME/bin/dispatcher" >> "$CNB_PROJECT/.claudes/logs/dispatcher.log" 2>&1 &
+    mkdir -p "$CNB_PROJECT/$_CFG_DIR/logs"
+    "$CLAUDES_HOME/bin/dispatcher" >> "$CNB_PROJECT/$_CFG_DIR/logs/dispatcher.log" 2>&1 &
     echo $! > "$pidfile"
     disown
 }
 
 # ---- Compose mode: reuse existing team from config.toml ----
-if [ -f .claudes/config.toml ] && [ -f .claudes/board.db ]; then
-    _EXISTING=$(grep '^sessions' .claudes/config.toml | sed 's/sessions = \[//;s/\]//;s/"//g;s/,/ /g;s/  */ /g' | xargs)
+# Detect config dir: prefer .cnb/, fall back to .claudes/
+_CFG_DIR=".cnb"
+[ ! -f ".cnb/config.toml" ] && [ -f ".claudes/config.toml" ] && _CFG_DIR=".claudes"
+
+if [ -f "$_CFG_DIR/config.toml" ] && [ -f "$_CFG_DIR/board.db" ]; then
+    _EXISTING=$(grep '^sessions' "$_CFG_DIR/config.toml" | sed 's/sessions = \[//;s/\]//;s/"//g;s/,/ /g;s/  */ /g' | xargs)
     if [ -n "$_EXISTING" ]; then
         ME=$(echo "$_EXISTING" | cut -d' ' -f1)
         WORKERS=$(echo "$_EXISTING" | cut -d' ' -f2-)
-        LABEL=$(grep '^prefix' .claudes/config.toml | cut -d'"' -f2)
+        LABEL=$(grep '^prefix' "$_CFG_DIR/config.toml" | cut -d'"' -f2)
         _NUM=$(echo "$WORKERS" | wc -w | tr -d ' ')
         "$CLAUDES_HOME/bin/swarm" start $WORKERS >/dev/null 2>&1 &
         disown
@@ -160,7 +245,7 @@ else
     ME=$(echo "$ALL_NAMES" | cut -d' ' -f1)
     WORKERS=$(echo "$ALL_NAMES" | cut -d' ' -f2-)
 
-    printf "${D}初始化 .claudes/ ...${N}\n"
+    printf "${D}初始化 .cnb/ ...${N}\n"
     "$CLAUDES_HOME/bin/init" $ALL_NAMES >/dev/null 2>&1
     "$CLAUDES_HOME/bin/swarm" start $WORKERS >/dev/null 2>&1 &
     disown
@@ -173,7 +258,7 @@ mkdir -p "$CMD_DIR"
 grep -qx 'commands/cnb-*' .claude/.gitignore 2>/dev/null || echo 'commands/cnb-*' >> .claude/.gitignore 2>/dev/null || true
 BOARD="$CLAUDES_HOME/bin/board"
 SWARM="$CLAUDES_HOME/bin/swarm"
-_PREFIX=$(grep '^prefix' .claudes/config.toml 2>/dev/null | cut -d'"' -f2)
+_PREFIX=$(grep '^prefix' "$_CFG_DIR/config.toml" 2>/dev/null | cut -d'"' -f2)
 cat > "$CMD_DIR/cnb-watch.md"     <<EOF
 看某个同学在干什么。解析 \$ARGUMENTS 拿到名字。
 运行 \`tmux capture-pane -t ${_PREFIX}-<名字> -p -S -30 2>/dev/null | tail -20\`，用简洁的话告诉用户这个同学在做什么、进展到哪了。
@@ -209,6 +294,7 @@ fi
 
 # ---- Banner + launch ----
 clear
+_check_update
 printf "${B}${G}◆ cnb${N} ${D}v${VERSION}${N}\n"
 printf "${D}  「${LABEL}」你是 ${ME}，同学: ${WORKERS}${N}\n\n"
 

package/bin/configure-godaddy-pages-dns

@@ -0,0 +1,203 @@
+#!/usr/bin/env python3
+"""Configure GoDaddy DNS records for the cnb GitHub Pages site."""
+
+from __future__ import annotations
+
+import argparse
+import json
+import os
+import re
+import sys
+import urllib.error
+import urllib.parse
+import urllib.request
+from pathlib import Path
+from typing import Any
+
+GITHUB_PAGES_A = [
+    "185.199.108.153",
+    "185.199.109.153",
+    "185.199.110.153",
+    "185.199.111.153",
+]
+
+GITHUB_PAGES_AAAA = [
+    "2606:50c0:8000::153",
+    "2606:50c0:8001::153",
+    "2606:50c0:8002::153",
+    "2606:50c0:8003::153",
+]
+
+DEFAULT_DOMAIN = "c-n-b.space"
+DEFAULT_PROFILE = "godaddy-no"
+DEFAULT_GODADDY_BASE = "https://api.godaddy.com"
+DEFAULT_WWW_TARGET = "apollozhangongithub.github.io"
+DEFAULT_TTL = 600
+
+
+class ConfigError(RuntimeError):
+    """Raised when a required GoDaddy profile cannot be loaded."""
+
+
+def _profile_prefix(profile: str) -> str:
+    normalized = re.sub(r"[^A-Za-z0-9]+", "_", profile).strip("_").upper()
+    if not normalized:
+        normalized = "DEFAULT"
+    if normalized.startswith("GODADDY_"):
+        return normalized
+    return f"GODADDY_{normalized}"
+
+
+def _load_profile_file(path: Path, profile: str) -> dict[str, Any]:
+    if not path.exists():
+        return {}
+    data = json.loads(path.read_text(encoding="utf-8"))
+    profiles = data.get("profiles", data)
+    value = profiles.get(profile, {})
+    if not isinstance(value, dict):
+        raise ConfigError(f"profile {profile!r} in {path} must be an object")
+    return value
+
+
+def load_profile(profile: str, config_path: Path | None = None) -> dict[str, str]:
+    prefix = _profile_prefix(profile)
+    paths = []
+    if config_path is not None:
+        paths.append(config_path)
+    env_config = os.environ.get("CNB_GODADDY_PROFILES")
+    if env_config:
+        paths.append(Path(env_config).expanduser())
+    paths.append(Path("~/.config/cnb/godaddy-profiles.json").expanduser())
+
+    file_profile: dict[str, Any] = {}
+    for path in paths:
+        file_profile.update(_load_profile_file(path, profile))
+
+    def get_value(key: str, default: str = "") -> str:
+        env_key = f"{prefix}_{key.upper()}"
+        return os.environ.get(env_key) or os.environ.get(f"GODADDY_{key.upper()}") or str(file_profile.get(key, default))
+
+    api_key = get_value("api_key")
+    api_sec = get_value("api_" + "secret")
+    if not api_key or not api_sec:
+        raise ConfigError(
+            "missing GoDaddy credentials for profile "
+            f"{profile!r}; set {prefix}_API_KEY/{prefix}_API_SECRET, "
+            "or add the profile to ~/.config/cnb/godaddy-profiles.json"
+        )
+
+    return {
+        "api_key": api_key,
+        "api_secret": api_sec,
+        "api_base": get_value("api_base", DEFAULT_GODADDY_BASE).rstrip("/"),
+    }
+
+
+def request_json(
+    *,
+    method: str,
+    base_url: str,
+    path: str,
+    api_key: str,
+    api_sec: str,
+    body: Any | None = None,
+) -> Any:
+    url = f"{base_url}{path}"
+    headers = {
+        "Accept": "application/json",
+        "Authorization": f"sso-key {api_key}:{api_sec}",
+    }
+    data = None
+    if body is not None:
+        headers["Content-Type"] = "application/json"
+        data = json.dumps(body, separators=(",", ":")).encode("utf-8")
+    request = urllib.request.Request(url, data=data, headers=headers, method=method)
+    try:
+        with urllib.request.urlopen(request, timeout=30) as response:
+            payload = response.read().decode("utf-8")
+            return json.loads(payload) if payload else None
+    except urllib.error.HTTPError as err:
+        payload = err.read().decode("utf-8", errors="replace")
+        raise RuntimeError(f"GoDaddy API {method} {path} failed: HTTP {err.code} {payload}") from err
+
+
+def record_path(domain: str, record_type: str, name: str) -> str:
+    return "/v1/domains/{}/records/{}/{}".format(
+        urllib.parse.quote(domain, safe=""),
+        urllib.parse.quote(record_type, safe=""),
+        urllib.parse.quote(name, safe=""),
+    )
+
+
+def put_records(args: argparse.Namespace, profile: dict[str, str], record_type: str, name: str, values: list[str]) -> None:
+    body = [{"data": value, "ttl": args.ttl} for value in values]
+    path = record_path(args.domain, record_type, name)
+    if args.dry_run:
+        print(f"DRY-RUN PUT {path} {json.dumps(body, ensure_ascii=False)}")
+        return
+    request_json(
+        method="PUT",
+        base_url=profile["api_base"],
+        path=path,
+        api_key=profile["api_key"],
+        api_sec=profile["api_secret"],
+        body=body,
+    )
+    print(f"OK {record_type} {name} -> {', '.join(values)}")
+
+
+def delete_records(args: argparse.Namespace, profile: dict[str, str], record_type: str, name: str) -> None:
+    path = record_path(args.domain, record_type, name)
+    if args.dry_run:
+        print(f"DRY-RUN DELETE {path}")
+        return
+    try:
+        request_json(
+            method="DELETE",
+            base_url=profile["api_base"],
+            path=path,
+            api_key=profile["api_key"],
+            api_sec=profile["api_secret"],
+        )
+        print(f"OK deleted {record_type} {name}")
+    except RuntimeError as err:
+        if "HTTP 404" not in str(err):
+            raise
+        print(f"OK no existing {record_type} {name}")
+
+
+def main(argv: list[str] | None = None) -> int:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--domain", default=DEFAULT_DOMAIN)
+    parser.add_argument("--profile", default=os.environ.get("GODADDY_PROFILE", DEFAULT_PROFILE))
+    parser.add_argument("--config", type=Path, help="Path to a GoDaddy profile JSON file")
+    parser.add_argument("--ttl", type=int, default=int(os.environ.get("GODADDY_TTL", DEFAULT_TTL)))
+    parser.add_argument("--www-target", default=DEFAULT_WWW_TARGET)
+    parser.add_argument("--dry-run", action="store_true")
+    args = parser.parse_args(argv)
+
+    try:
+        profile = load_profile(args.profile, args.config)
+    except ConfigError as err:
+        if not args.dry_run:
+            print(f"ERROR {err}", file=sys.stderr)
+            return 2
+        print(f"WARN {err}; using placeholder credentials for dry-run", file=sys.stderr)
+        profile = {
+            "api_key": "dry-run",
+            "api_secret": "dry-run",
+            "api_base": DEFAULT_GODADDY_BASE,
+        }
+
+    print(f"Using GoDaddy profile {args.profile!r} for {args.domain}")
+    delete_records(args, profile, "CNAME", "@")
+    delete_records(args, profile, "A", "www")
+    delete_records(args, profile, "AAAA", "www")
+    put_records(args, profile, "A", "@", GITHUB_PAGES_A)
+    put_records(args, profile, "AAAA", "@", GITHUB_PAGES_AAAA)
+    put_records(args, profile, "CNAME", "www", [args.www_target])
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

package/bin/doctor

@@ -269,6 +269,53 @@ def check_sessions(env: ClaudesEnv) -> bool:
     return True
 
 
+# ---------------------------------------------------------------------------
+# Global registry checks
+# ---------------------------------------------------------------------------
+
+
+def check_global_registry() -> bool:
+    """Check global project registry for stale projects and expired credentials."""
+    try:
+        from lib.global_registry import list_projects
+
+        ok = True
+
+        # Check projects
+        projects = list_projects()
+        if projects:
+            _ok(f"已注册 {len(projects)} 个项目")
+        else:
+            _warn("全局注册表为空 (运行 cnb init 注册当前项目)")
+
+        # Check for stale projects (without removing)
+        stale = []
+        for p in projects:
+            if not Path(p.get("path", "")).exists():
+                stale.append(p.get("path", ""))
+        if stale:
+            _warn(f"{len(stale)} 个项目路径已失效 (运行 cnb projects cleanup 清理)")
+            ok = False
+        elif projects:
+            _ok("所有项目路径有效")
+
+        # Check credentials for expired ones
+        from lib.global_registry import _read_credentials
+
+        creds = _read_credentials()
+        expired = [name for name, info in creds.items() if isinstance(info, dict) and info.get("status") == "expired"]
+        if expired:
+            _warn(f"过期凭证: {', '.join(expired)}")
+            ok = False
+        elif creds:
+            _ok(f"{len(creds)} 个凭证状态正常")
+
+        return ok
+    except Exception as e:
+        _warn(f"全局注册表检查失败: {e}")
+        return True  # non-fatal
+
+
 # ---------------------------------------------------------------------------
 # Main
 # ---------------------------------------------------------------------------
@@ -312,9 +359,13 @@ def main() -> None:
     print("\n── Sessions ──")
     sess_ok = check_sessions(env)
 
+    # ── Global Registry ──
+    print("\n── Global Registry ──")
+    reg_ok = check_global_registry()
+
     # ── Result ──
     print()
-    all_ok = all([env_ok, cfg_ok, db_ok, sess_ok])
+    all_ok = all([env_ok, cfg_ok, db_ok, sess_ok, reg_ok])
     if all_ok:
         print("✓ All checks passed.")
     else:

package/bin/init

@@ -117,7 +117,8 @@ def _update_claude_md(project_dir: Path, snippet: str) -> None:
 def _hook_command(claudes_home: Path) -> str:
     return (
         'if [ -n "$CLAUDE_SESSION_NAME" ] && [ -n "$CNB_PROJECT" ]; then '
-        "BOARD=$(grep '^claudes_home' \"$CNB_PROJECT/.claudes/config.toml\" 2>/dev/null "
+        'CFG="$CNB_PROJECT/.cnb/config.toml"; [ ! -f "$CFG" ] && CFG="$CNB_PROJECT/.claudes/config.toml"; '
+        "BOARD=$(grep '^claudes_home' \"$CFG\" 2>/dev/null "
         "| cut -d'\"' -f2)/bin/board; "
         '[ -x "$BOARD" ] && $BOARD --as $CLAUDE_SESSION_NAME pulse 2>/dev/null; fi'
     )
@@ -160,6 +161,28 @@ def _update_settings(project_dir: Path, claudes_home: Path) -> None:
     settings_path.write_text(json.dumps(settings, indent=2, ensure_ascii=False) + "\n")
 
 
+def _install_pre_commit_hook(project_dir: Path, claudes_home: Path) -> None:
+    """Install bin/secret-scan as a git pre-commit hook if git repo exists."""
+    git_dir = project_dir / ".git"
+    if not git_dir.is_dir():
+        return
+    hooks_dir = git_dir / "hooks"
+    hooks_dir.mkdir(exist_ok=True)
+    hook_path = hooks_dir / "pre-commit"
+    secret_scan = claudes_home / "bin" / "secret-scan"
+    if not secret_scan.exists():
+        return
+    if hook_path.exists():
+        content = hook_path.read_text()
+        if "secret-scan" in content:
+            return
+        content = content.rstrip("\n") + f"\n\n# cnb: block sensitive files\n{secret_scan}\n"
+        hook_path.write_text(content)
+    else:
+        hook_path.write_text(f"#!/bin/sh\n{secret_scan}\n")
+    hook_path.chmod(0o755)
+
+
 DEFAULT_SESSIONS = ["s1", "s2", "s3"]
 
 
@@ -204,9 +227,14 @@ def main() -> None:
     else:
         sessions = list(DEFAULT_SESSIONS)
     project_dir = Path.cwd()
-    claudes_dir = project_dir / ".claudes"
+    claudes_dir = project_dir / ".cnb"
     claudes_home = CLAUDES_HOME
 
+    # Also accept existing .claudes/ projects
+    legacy_dir = project_dir / ".claudes"
+    if not claudes_dir.exists() and legacy_dir.exists():
+        claudes_dir = legacy_dir
+
     if (claudes_dir / "board.db").exists():
         print(f"Already initialized: {claudes_dir}")
         sys.exit(0)
@@ -264,9 +292,12 @@ def main() -> None:
         print(f"Applied {applied} schema migration(s).")
 
     # .gitignore for generated stuff
-    gitignore_content = "board.db\nboard.db-shm\nboard.db-wal\nlogs/\ndispatcher.pid\n"
+    gitignore_content = "board.db\nboard.db-shm\nboard.db-wal\nlogs/\ndispatcher.pid\nkeys/\n"
     (claudes_dir / ".gitignore").write_text(gitignore_content)
 
+    # Install pre-commit hook for secret scanning
+    _install_pre_commit_hook(project_dir, claudes_home)
+
     # Update .claude/settings.json (merge hooks if exists, create if not)
     _update_settings(project_dir, claudes_home)
 
@@ -274,6 +305,36 @@ def main() -> None:
     snippet = _claude_md_snippet(sessions, claudes_home, personas)
     _update_claude_md(project_dir, snippet)
 
+    # Register in global project registry
+    try:
+        from lib.global_registry import register_project
+
+        register_project(project_dir, project_dir.name)
+    except Exception:
+        pass  # non-fatal — registry is optional
+
+    # Generate encryption keypairs for all sessions (Issue #22)
+    try:
+        from lib.board_mailbox import _load_pubkeys, _save_pubkeys
+        from lib.crypto import generate_keypair, public_key_to_hex, save_keypair
+
+        keys_dir = claudes_dir / "keys"
+        pubkeys = _load_pubkeys()
+        gen_count = 0
+        for s in sessions:
+            n = s.lower()
+            if (keys_dir / f"{n}.pem").exists():
+                continue
+            private, public = generate_keypair()
+            save_keypair(keys_dir, n, private, public)
+            pubkeys[n] = public_key_to_hex(public)
+            gen_count += 1
+        if gen_count:
+            _save_pubkeys(pubkeys)
+            print(f"Generated {gen_count} encryption keypair(s).")
+    except ImportError:
+        pass  # cryptography not installed — skip keygen
+
     sessions_str = " ".join(sessions)
     print(f"Initialized cnb (sessions: {sessions_str})")
 

package/bin/notify

@@ -6,6 +6,7 @@ Usage:
   notify subscriptions [member]   Show subscriptions for member (or all)
   notify test <member> <type>     Send a test notification
   notify digest [--send]          Generate daily digest (--send to deliver)
+  notify weekly [--send]          Generate weekly report (--send to deliver)
   notify log [--limit N]          Show recent notification log
 """
 
@@ -17,8 +18,9 @@ sys.path.insert(0, str(CLAUDES_HOME))
 
 from lib.board_db import BoardDB
 from lib.common import ClaudesEnv
-from lib.digest import generate_daily_digest
+from lib.digest import generate_daily_digest, generate_weekly_report
 from lib.notification_config import BUILTIN_DEFAULTS, NOTIFICATION_TYPES, load
+from lib.notification_delivery import deliver_external
 
 
 def _env() -> ClaudesEnv:
@@ -74,11 +76,13 @@ def cmd_subscriptions(member: str | None = None) -> None:
             raise SystemExit(1)
         board = BoardDB(db_path)
         sessions = board.query("SELECT name FROM sessions ORDER BY name")
-        if not sessions:
+        names = [row[0] for row in (sessions or [])]
+        if config.human:
+            names.append("human")
+        if not names:
             print("无会话")
             return
-        for row in sessions:
-            name = row[0]
+        for name in names:
             subs = [t for t in NOTIFICATION_TYPES if config.is_subscribed(name, t)]
             channel = config.channel_for(name)
             subs_str = ", ".join(subs) if subs else "无"
@@ -152,7 +156,54 @@ def cmd_digest(send: bool = False) -> None:
                 except Exception:
                     print(f"ERROR: 发送到 {member} 失败")
             else:
-                print(f"  {member}: 通道 {channel} 尚未实现")
+                result = deliver_external(config, member, channel, "daily-digest", digest, "manual-digest")
+                if result.delivered:
+                    sent += 1
+                print(f"  {member}: {result.detail}")
+        print(f"\nOK 已发送到 {sent}/{len(subscribers)} 订阅者")
+
+
+def cmd_weekly(send: bool = False) -> None:
+    env = _env()
+    db_path = Path(env.claudes_dir) / "board.db"
+    if not db_path.exists():
+        print("ERROR: board.db 不存在")
+        raise SystemExit(1)
+
+    board = BoardDB(db_path)
+    report = generate_weekly_report(board)
+    print(report)
+
+    if send:
+        config = load(_config_path(env))
+        sessions = board.query("SELECT name FROM sessions ORDER BY name")
+        members = [r[0] for r in (sessions or [])]
+        subscribers = config.subscribers_for("weekly-report", members)
+        if not subscribers:
+            print("\n无订阅者")
+            return
+
+        import subprocess
+
+        board_sh = str(CLAUDES_HOME / "bin" / "board")
+        sent = 0
+        for member in subscribers:
+            channel = config.channel_for(member)
+            if channel == "board-inbox":
+                try:
+                    subprocess.run(
+                        [board_sh, "--as", "dispatcher", "send", member, report],
+                        capture_output=True,
+                        timeout=10,
+                    )
+                    sent += 1
+                except Exception:
+                    print(f"ERROR: 发送到 {member} 失败")
+            else:
+                result = deliver_external(config, member, channel, "weekly-report", report, "manual-weekly")
+                if result.delivered:
+                    sent += 1
+                print(f"  {member}: {result.detail}")
         print(f"\nOK 已发送到 {sent}/{len(subscribers)} 订阅者")
 
 
@@ -204,6 +255,9 @@ def main() -> None:
     elif cmd == "digest":
         send = "--send" in args
         cmd_digest(send=send)
+    elif cmd == "weekly":
+        send = "--send" in args
+        cmd_weekly(send=send)
     elif cmd == "log":
         limit = 20
         if "--limit" in args: