dsh-project-deck 0.1.0 → 0.1.3

package/README.md

@@ -1,5 +1,7 @@
 # dsh-project-deck
 
+[![npm](https://img.shields.io/npm/v/dsh-project-deck.svg)](https://www.npmjs.com/package/dsh-project-deck)
+
 **把你的仓库、目录和半途项目，变成一块看得见进度的甲板。**
 A project deck for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness)：项目注册表 + 可视化面板 + 定时微信播报 + 自动发现 + 多机扫描。
 
@@ -29,11 +31,12 @@ python3 backend/deck demo          # 生成 4 个假项目，起面板
 
 ```bash
 # 1. 后端（CLI + 面板 + 定时器）
-./install.sh          # 装到 ~/.project-deck，macOS 下注册 launchd
+git clone https://github.com/peng456/dsh-project-deck && cd dsh-project-deck && ./install.sh
 
-# 2. DSH 插件
-dsh plugin --profile desktop add github:peng456/dsh-project-deck
-# 或 Desktop → 插件 → 安装 github:peng456/dsh-project-deck
+# 2. DSH 插件（npm 或 GitHub 二选一）
+dsh plugin --profile desktop add dsh-project-deck
+# dsh plugin --profile desktop add github:peng456/dsh-project-deck
+# 或 Desktop → 插件 → 搜索/安装 dsh-project-deck
 ```
 
 重启 DSH 后左下角出现 📋，**可以拖到页面任意位置**，位置会被记住；点开就是面板。
@@ -64,6 +67,33 @@ deck demo                 # 演示环境
 无变化：官网改版、基础设施、…
 ```
 
+## 通知渠道（可选，默认 wxpush）
+
+播报通过 `report.delivery` 选择发送器，**不带任何内置账号**：
+
+```jsonc
+"report": {
+  "enabled": true,
+  "image": false,                          // 附图仅 wxpush 通道支持
+  "delivery": {
+    "type": "wxpush",                      // wxpush | serverchan | webhook | command
+    "url": "http://127.0.0.1:9098",        // wxpush
+    "key": "",                             // ServerChan SendKey
+    "webhook": "",                         // 任意 webhook（企业微信机器人等）
+    "command": ""                          // 自写脚本：stdin 收文本，退出码 0 = 成功
+  }
+}
+```
+
+| 类型 | 依赖 | 说明 |
+|---|---|---|
+| `wxpush` | 本机 wxpush 服务 | 支持文字 + 看板图；token 过期时会入队等恢复 |
+| `serverchan` | ServerChan SendKey | 纯 HTTP，无 token 过期问题 |
+| `webhook` | 任意 URL | 发 `{"msgtype":"text","text":{"content":...}}`，兼容企业微信机器人 |
+| `command` | 你的脚本 | 最灵活，退出码判定 |
+
+`deck status` 会显示当前通道与连通状态；通道不通时播报不会堆积（附图除外，会有限重试）。
+
 ## 配置（`~/.project-deck/config.json`）
 
 | key | 默认 | 说明 |
@@ -75,6 +105,18 @@ deck demo                 # 演示环境
 | `schedule.quiet` | 00:30–06:30 | 安静时段，不播报不扫描 |
 | `panel.allowLanRead` | true | 允许手机通过局域网看面板（只读） |
 
+## 自主推进（可选）
+
+每个项目可设 `off` / `assist` / `auto`：`assist` 只给选项和推荐，`auto` 会自己查事实、自己选方案、做可逆的事，把 push/删除/发布这类不可逆动作放进审批队列等你一句话。
+
+```bash
+deck autonomy my-app auto
+deck approvals            # 等你拍板
+deck decisions            # 我替你做过的决定
+```
+
+规则写在 [docs/AUTONOMY.md](docs/AUTONOMY.md)。
+
 ## 多机扫描
 
 节点只读上报，不传文件内容：

package/backend/deck

@@ -174,6 +174,190 @@ def session_activity(root):
     return latest
 
 
+def autonomy_of(p):
+    a = p.get('autonomy') or {}
+    mode = a.get('mode', 'off')
+    if mode not in AUTONOMY_MODES:
+        mode = 'off'
+    return {'mode': mode, 'maxPerDay': int(a.get('maxPerDay', 3)),
+            'day': a.get('day', ''), 'actionsToday': int(a.get('actionsToday', 0))}
+
+
+def _today():
+    return datetime.now().strftime('%Y-%m-%d')
+
+
+def can_act(p):
+    a = autonomy_of(p)
+    if a['mode'] == 'off':
+        return False, 'off'
+    if a['day'] != _today():
+        return a['mode'] != 'off', 'new-day'
+    if a['actionsToday'] >= a['maxPerDay']:
+        return False, f"预算用尽（{a['actionsToday']}/{a['maxPerDay']}）"
+    return True, 'ok'
+
+
+def bump_actions(pid):
+    reg = load_json(REGISTRY, {'projects': []})
+    for p in reg['projects']:
+        if p['id'] == pid:
+            a = autonomy_of(p)
+            if a['day'] != _today():
+                a['day'] = _today(); a['actionsToday'] = 0
+            a['actionsToday'] += 1
+            p['autonomy'] = a
+    save_json(REGISTRY, reg)
+
+
+def record_decision(pid, question, options, choice, why, reversible=True, mode=None):
+    entry = {'at': time.time(), 'project': pid, 'question': question,
+             'options': options, 'choice': choice, 'why': why,
+             'reversible': bool(reversible), 'mode': mode or ''}
+    with open(DECISIONS, 'a') as f:
+        f.write(json.dumps(entry, ensure_ascii=False) + '\n')
+    log(f'[autonomy] decision {pid}: {choice} ({question[:40]})')
+    return entry
+
+
+def load_approvals():
+    return load_json(APPROVALS, {'items': []})
+
+
+def add_approval(pid, question, options, recommend='', irreversible=True):
+    d = load_approvals()
+    item = {'id': 'ap-' + secrets.token_hex(4), 'project': pid, 'question': question,
+            'options': options, 'recommend': recommend, 'irreversible': bool(irreversible),
+            'createdAt': time.time(), 'status': 'pending'}
+    d.setdefault('items', []).append(item)
+    save_json(APPROVALS, d)
+    log(f'[autonomy] approval {item["id"]} {pid}: {question[:50]}')
+    return item
+
+
+def resolve_approval(aid, decision, choice='', why=''):
+    d = load_approvals()
+    for it in d.get('items', []):
+        if it['id'] == aid and it['status'] == 'pending':
+            it['status'] = 'approved' if decision == 'approve' else 'rejected'
+            it['resolvedAt'] = time.time()
+            it['humanChoice'] = choice or it.get('recommend', '')
+            if why:
+                it['note'] = why
+            save_json(APPROVALS, d)
+            record_decision(it['project'], it['question'], it.get('options', []),
+                            it['humanChoice'] if decision == 'approve' else 'rejected',
+                            'human: ' + (why or decision), True, 'human')
+            return it
+    return None
+
+
+def cmd_autonomy(argv):
+    if not argv:
+        reg = load_json(REGISTRY, {'projects': []})
+        rows = [(p['id'], autonomy_of(p)) for p in reg['projects']]
+        for pid, a in rows:
+            print(f"{pid:22} {a['mode']:7} 今日 {a['actionsToday']}/{a['maxPerDay']}")
+        return 0
+    pid = argv[0]
+    reg = load_json(REGISTRY, {'projects': []})
+    proj = next((p for p in reg['projects'] if p['id'] == pid), None)
+    if not proj:
+        print('项目不存在'); return 1
+    if len(argv) < 2:
+        a = autonomy_of(proj); print(f"{pid}: {a['mode']} 今日 {a['actionsToday']}/{a['maxPerDay']}"); return 0
+    mode = argv[1]
+    if mode not in AUTONOMY_MODES:
+        print('模式只能是 off / assist / auto'); return 1
+    a = autonomy_of(proj)
+    a['mode'] = mode
+    if '--max' in argv:
+        try: a['maxPerDay'] = int(argv[argv.index('--max') + 1])
+        except (IndexError, ValueError): pass
+    proj['autonomy'] = a
+    save_json(REGISTRY, reg)
+    print(f"{pid}: 自主模式 → {mode}（每日上限 {a['maxPerDay']}）")
+    return 0
+
+
+def cmd_decide(argv):
+    if not argv:
+        print('用法: deck decide <id> --question Q --options A|B|C --choice B --why "..." [--irreversible]')
+        return 1
+    pid = argv[0]
+    opts = {}
+    i = 1
+    while i < len(argv):
+        if argv[i].startswith('--') and i + 1 < len(argv):
+            opts[argv[i][2:]] = argv[i + 1]; i += 2
+        else: i += 1
+    q = opts.get('question', ''); choice = opts.get('choice', '')
+    if not q or not choice:
+        print('缺少 --question / --choice'); return 1
+    record_decision(pid, q, opts.get('options', ''), choice, opts.get('why', ''),
+                    not ('irreversible' in opts or '--irreversible' in argv))
+    bump_actions(pid)
+    print('已记录决策')
+    return 0
+
+
+def cmd_ask(argv):
+    if not argv:
+        print('用法: deck ask <id> --question Q --options A,B [--recommend A]')
+        return 1
+    pid = argv[0]; opts = {}
+    i = 1
+    while i < len(argv):
+        if argv[i].startswith('--') and i + 1 < len(argv):
+            opts[argv[i][2:]] = argv[i + 1]; i += 2
+        else: i += 1
+    q = opts.get('question', '')
+    if not q: print('缺少 --question'); return 1
+    it = add_approval(pid, q, opts.get('options', ''), opts.get('recommend', ''))
+    print('已加入审批队列:', it['id'])
+    return 0
+
+
+def cmd_approvals(argv):
+    d = load_approvals()
+    pend = [x for x in d.get('items', []) if x.get('status') == 'pending']
+    if not argv:
+        if not pend: print('没有待批事项'); return 0
+        for x in pend:
+            age = rel_time(x['createdAt'])
+            print(f"{x['id']}  {x['project']:18} {age:8}  {x['question'][:60]}")
+            if x.get('options'): print('      选项:', x['options'], '| 推荐:', x.get('recommend') or '-')
+        return 0
+    if argv[0] in ('--approve', '--reject') and len(argv) > 1:
+        aid = argv[1]
+        choice = ''
+        if '--choice' in argv: choice = argv[argv.index('--choice') + 1]
+        why = ''
+        if '--why' in argv: why = argv[argv.index('--why') + 1]
+        it = resolve_approval(aid, 'approve' if argv[0] == '--approve' else 'reject', choice, why)
+        print('已处理' if it else '找不到该待批项')
+        return 0
+    print('用法: deck approvals [--approve ID [--choice X] | --reject ID [--why "..."]]')
+    return 1
+
+
+def cmd_decisions(argv):
+    limit = 20
+    if '--limit' in argv:
+        try: limit = int(argv[argv.index('--limit') + 1])
+        except (IndexError, ValueError): pass
+    if not os.path.exists(DECISIONS):
+        print('还没有决策记录'); return 0
+    rows = []
+    for line in open(DECISIONS):
+        try: rows.append(json.loads(line))
+        except json.JSONDecodeError: pass
+    for r in rows[-limit:]:
+        flag = '' if r.get('reversible', True) else ' [不可逆]'
+        print(f"{datetime.fromtimestamp(r['at']):%m-%d %H:%M}  {r['project']:18} {r['choice']}{flag}  ← {r['question'][:50]}")
+    return 0
+
+
 def in_quiet(cfg, ts=None):
     q = (cfg.get('schedule') or {}).get('quiet') or {}
     start, end = q.get('from'), q.get('to')
@@ -412,6 +596,21 @@ def build_report(cfg):
         if added or cands:
             lines.append('')
 
+    # 等你拍板 + 自主推进概览
+    pend = [x for x in load_approvals().get('items', []) if x.get('status') == 'pending']
+    if pend:
+        lines.append(f'**等你拍板**：{len(pend)} 项')
+        for x in pend[:3]:
+            opts = f"（{x['options']}，推荐 {x.get('recommend') or '-'}）" if x.get('options') else ''
+            lines.append(f"- {x['project']}：{x['question'][:50]}{opts}")
+        lines.append('')
+    modes = {'auto': 0, 'assist': 0, 'off': 0}
+    for p in projects:
+        modes[autonomy_of(p)['mode']] = modes.get(autonomy_of(p)['mode'], 0) + 1
+    if modes['auto'] or modes['assist']:
+        lines.append(f"自主推进：auto {modes['auto']} · assist {modes['assist']} · off {modes['off']}")
+        lines.append('')
+
     # 节点离线提醒（超过 3 天没上报）
     try:
         off = []
@@ -455,6 +654,9 @@ def build_report(cfg):
 WS_STORE = os.path.join(HOME, '.dsh', 'storages', 'workspace.json')
 SCAN_STATE = os.path.join(BASE, 'scan-state.json')
 SCAN_IGNORE = os.path.join(BASE, 'scan-ignore.json')
+DECISIONS = os.path.join(BASE, 'decisions.jsonl')
+APPROVALS = os.path.join(BASE, 'approvals.json')
+AUTONOMY_MODES = ('off', 'assist', 'auto')
 NODES = os.path.join(BASE, 'nodes.json')
 NODE_SNAPS = os.path.join(BASE, 'nodes')
 
@@ -815,6 +1017,97 @@ def cmd_scan(argv):
 
 
 # ── 发送 ────────────────────────────────────────────────────
+def delivery_cfg(cfg=None):
+    cfg = cfg or load_json(CONFIG, {})
+    d = (cfg.get('report') or {}).get('delivery') or {}
+    return {
+        'type': (d.get('type') or 'wxpush').lower(),
+        'url': (d.get('url') or 'http://127.0.0.1:9098').rstrip('/'),
+        'key': d.get('key') or '',
+        'webhook': d.get('webhook') or '',
+        'command': d.get('command') or '',
+    }
+
+
+def _http_json(url, payload, timeout=20, headers=None):
+    body = json.dumps(payload, ensure_ascii=False).encode()
+    req = urllib.request.Request(url, data=body,
+                                 headers={'Content-Type': 'application/json', **(headers or {})})
+    with urllib.request.urlopen(req, timeout=timeout) as r:
+        return r.status, json.loads(r.read().decode() or '{}')
+
+
+def delivery_send(text):
+    """按 report.delivery.type 发送一条文本。返回 (0|2|3, 说明)。"""
+    d = delivery_cfg()
+    t = d['type']
+    try:
+        if t == 'wxpush':
+            if not d['url']:
+                return 3, 'wxpush url 未配置'
+            code, body = _http_json(d['url'] + '/send', {'message': text})
+            if code == 200:
+                return 0, '已送达（wxpush）'
+            if code == 202:
+                return 2, '已入队（wxpush 未接通）'
+            return 3, f'wxpush HTTP {code}'
+        if t == 'serverchan':
+            if not d['key']:
+                return 2, 'ServerChan key 未配置'
+            url = f"https://sctapi.ftqq.com/{d['key']}.send"
+            import urllib.parse
+            data = urllib.parse.urlencode({'title': '项目播报', 'desp': text}).encode()
+            req = urllib.request.Request(url, data=data)
+            with urllib.request.urlopen(req, timeout=20) as r:
+                j = json.loads(r.read().decode() or '{}')
+            if j.get('code') in (0, '0'):
+                return 0, '已送达（ServerChan）'
+            return 3, f"ServerChan 返回 {str(j)[:120]}"
+        if t == 'webhook':
+            if not d['webhook']:
+                return 2, 'webhook 未配置'
+            code, body = _http_json(d['webhook'], {
+                'msgtype': 'text', 'text': {'content': text}, 'message': text})
+            return (0, '已送达（webhook）') if code in (200, 204) else (3, f'webhook HTTP {code}')
+        if t == 'command':
+            if not d['command']:
+                return 2, 'command 未配置'
+            r = subprocess.run(d['command'], shell=True, input=text, capture_output=True, text=True, timeout=60)
+            if r.returncode == 0:
+                return 0, '已送达（command）'
+            return 3, f"command 退出码 {r.returncode}: {(r.stderr or r.stdout)[:120]}"
+        return 3, f'未知 delivery.type: {t}'
+    except Exception as e:
+        return 3, f'{t} 发送失败: {e}'
+
+
+def delivery_status():
+    """给面板/status 用：返回 {ok, stale, detail, pending}。"""
+    d = delivery_cfg()
+    out = {'type': d['type'], 'ok': False, 'detail': '', 'pending': 0}
+    try:
+        if d['type'] == 'wxpush':
+            with urllib.request.urlopen(d['url'] + '/health', timeout=5) as r:
+                j = json.loads(r.read().decode() or '{}')
+            out['ok'] = bool(j.get('ready') or j.get('authorized'))
+            out['pending'] = int((j.get('outbox') or {}).get('pending') or 0)
+            out['detail'] = 'wxpush 已接通' if out['ok'] else ('wxpush 未接通：需要扫码授权或给 bot 发消息刷新')
+            if j.get('token_dead'):
+                out['detail'] = 'wxpush 登录态已失效：需要重新扫码'
+        elif d['type'] == 'serverchan':
+            out['ok'] = bool(d['key'])
+            out['detail'] = 'ServerChan 已配置' if out['ok'] else 'ServerChan key 未配置'
+        elif d['type'] == 'webhook':
+            out['ok'] = bool(d['webhook'])
+            out['detail'] = 'webhook 已配置' if out['ok'] else 'webhook 未配置'
+        elif d['type'] == 'command':
+            out['ok'] = bool(d['command'])
+            out['detail'] = f"command: {d['command']}" if out['ok'] else 'command 未配置'
+    except Exception as e:
+        out['detail'] = f'{d["type"]} 不可达: {e}'
+    return out
+
+
 def channel_state():
     return load_json(CHANNEL_STATE, {'stale': False, 'fails': 0})
 
@@ -852,15 +1145,12 @@ def mark_channel(ok, err=''):
 
 
 def send_wechat(text):
-    if not os.path.exists(WXSEND):
-        return 3, 'wxsend 不存在'
-    r = subprocess.run([WXSEND], input=text, capture_output=True, text=True, timeout=30)
-    msg = (r.stdout or r.stderr).strip()
-    if r.returncode == 0:
+    code, msg = delivery_send(text)
+    if code == 0:
         mark_channel(True)
-    elif r.returncode == 2:
-        mark_channel(False, msg.splitlines()[0] if msg else 'queued')
-    return r.returncode, msg
+    elif code == 2:
+        mark_channel(False, msg[:120])
+    return code, msg
 
 
 def refresh_local_node(cfg=None):
@@ -930,6 +1220,8 @@ def do_report_with_image(cfg, quiet=False, force=None):
     """播报（文字）+ 可选附图；force=True/False 覆盖 config，None 跟随 config。"""
     code, text, msg = do_report(cfg, quiet)
     want = cfg.get('report', {}).get('image') if force is None else force
+    if delivery_cfg(cfg)['type'] != 'wxpush':
+        want = False
     if code == 0 and want:
         try:
             png = render_image(cfg)
@@ -1001,6 +1293,8 @@ def flush_pending_image():
     p = load_json(PENDING_IMG, None)
     if not p:
         return False
+    if delivery_cfg()['type'] != 'wxpush':
+        return False
     if channel_stale():
         return False
     # 失败后 2 分钟内不重复尝试，避免空转
@@ -1376,6 +1670,9 @@ def cmd_status():
     print(f"周期播报: {'开启' if r.get('enabled', True) else '关闭'}，每 {r.get('intervalHours', 4)} 小时，"
           f"版式 {r.get('format', 'markdown')}，{'附图' if r.get('image') else '不附图'}")
     print(f"守护进程: {'运行中 pid ' + str(pid) if pid else '未运行'}")
+    pend_count = len([x for x in load_approvals().get('items', []) if x.get('status') == 'pending'])
+    if pend_count:
+        print(f"待批事项: {pend_count} 个")
     sc = load_json(SCAN_STATE, {})
     if sc.get('lastRun'):
         print(f"自动发现: 上次扫描 {datetime.fromtimestamp(sc['lastRun']):%m-%d %H:%M}"
@@ -1392,7 +1689,8 @@ def cmd_status():
         nxt += 1800
     print(f"下次播报: {datetime.fromtimestamp(nxt):%Y-%m-%d %H:%M}")
     wx = subprocess.run([WXSEND, '--status'], capture_output=True, text=True)
-    print('微信通道: ' + ('✅ 可发送' if wx.returncode == 0 else '⚠️ 未接通（播报会排队，授权后补发）'))
+    st = delivery_status()
+    print(f"通知渠道: {st['type']} · " + ('✅ ' if st['ok'] else '⚠️ ') + st['detail'])
     return 0 if pid else 1
 
 
@@ -1529,6 +1827,16 @@ def main():
         st['last_run'] = time.time()
         save_json(STATE, st)
         return code
+    if cmd == 'autonomy':
+        return cmd_autonomy(rest)
+    if cmd == 'decide':
+        return cmd_decide(rest)
+    if cmd == 'ask':
+        return cmd_ask(rest)
+    if cmd == 'approvals':
+        return cmd_approvals(rest)
+    if cmd == 'decisions':
+        return cmd_decisions(rest)
     if cmd == 'demo':
         return cmd_demo(rest)
     if cmd == 'panel':

package/backend/panel.html

@@ -155,6 +155,13 @@
     </label>
     <label>每 <input type="number" id="interval" min="0.1" max="720" step="0.5" style="width:78px"> 小时播报一次</label>
     <button onclick="applyInterval()">应用</button>
+    <label style="margin-left:6px">图标位置
+      <select onchange="setFabPos(this.value)" style="padding:5px 8px">
+        <option value="">默认</option><option value="right-bottom">右下</option>
+        <option value="left-bottom">左下</option><option value="right-top">右上</option>
+        <option value="center-right">右侧居中</option>
+      </select>
+    </label>
     <label style="margin-left:6px">版式
       <select id="format" onchange="setConfig({format:this.value})" style="padding:5px 8px">
         <option value="markdown">Markdown</option>
@@ -186,6 +193,11 @@
     <span class="hint" id="filterHint"></span>
   </div>
 
+  <div id="approvalsBox" style="display:none">
+    <h2>等你拍板 <span class="hint" id="apCount"></span></h2>
+    <div class="history" id="approvalsList"></div>
+  </div>
+
   <div class="grid" id="grid"></div>
 
   <details class="add">
@@ -341,6 +353,44 @@ function render(){
   if (!scanFormLoaded && S.config.scan) { loadConfigIntoForm(); }
   renderHistory();
   renderNodes();
+  renderApprovals();
+}
+
+function renderApprovals(){
+  const box = $('approvalsBox');
+  if (!box) return;
+  const items = S.approvals || [];
+  box.style.display = items.length ? 'block' : 'none';
+  if (!items.length) return;
+  $('apCount').textContent = items.length + ' 项';
+  $('approvalsList').innerHTML = items.map(x => `
+    <div class="hist">
+      <div class="top">
+        <span><span class="chip teal">${esc(x.project)}</span> ${esc(relText(x.createdAt))}</span>
+        <span style="display:flex;gap:6px">
+          <button style="font-size:11px;padding:2px 9px" onclick="resolveAp('${esc(x.id)}','approve','${esc(x.recommend || '')}')">采纳${x.recommend ? '推荐 ' + esc(x.recommend) : ''}</button>
+          <button class="danger" style="font-size:11px;padding:2px 9px" onclick="resolveAp('${esc(x.id)}','reject','')">拒绝</button>
+        </span>
+      </div>
+      <div style="margin-top:6px;color:#cfd9e3;font-size:12.5px">${esc(x.question)}</div>
+      ${x.options ? `<div class="hint" style="margin-top:4px">选项：${esc(x.options)}${x.recommend ? ' · 推荐 ' + esc(x.recommend) : ''}</div>` : ''}
+    </div>`).join('');
+}
+
+async function setAutonomy(id, mode){
+  try{
+    const r = await api('/api/autonomy', {project: id, mode});
+    S = r.state; render();
+    toast('自主模式 → ' + mode);
+  }catch(e){ toast('设置失败：' + e.message, true); }
+}
+
+async function resolveAp(id, action, choice){
+  try{
+    const r = await api('/api/approval', {id, action, choice});
+    S = r.state; render();
+    toast(action === 'approve' ? '已采纳' : '已拒绝');
+  }catch(e){ toast('处理失败：' + e.message, true); }
 }
 
 function renderNodes(){
@@ -381,6 +431,8 @@ function cardHtml(p){
   const board = p.board && p.board.total ? `<span class="chip">看板 ${p.board.total}</span>` : '<span class="chip">无看板</span>';
   const git = p.git ? `<span class="chip">git ${esc(p.git.sha)}${p.git.dirty ? ' <b style="color:var(--warn)">+' + p.git.dirty + '</b>' : ''}</span>` : '';
   const missing = p.exists ? '' : '<span class="chip bad">目录缺失</span>';
+  const aut = (p.autonomy && p.autonomy.mode) || 'off';
+  const autChip = `<span class="chip ${aut === 'auto' ? 'teal' : (aut === 'assist' ? 'warn' : '')}">🤖 ${aut}</span>`;
   const next = p.next || '<span style="color:var(--muted)">（未登记进展）</span>';
   return `<div class="card ${st}" id="card-${esc(p.id)}">
     <div class="cardhead">
@@ -389,13 +441,16 @@ function cardHtml(p){
       <button class="enter" onclick="enterProject('${esc(p.id)}')"
         title="${p.sessions && p.sessions.length ? '进入该项目最近一次会话' : '该项目还没有会话，点击新建一个'}">💬 进入会话</button>
     </div>
-    <div class="chips">${kind}${statusChip(p)}${mem}${board}${git}${missing}</div>
+    <div class="chips">${kind}${statusChip(p)}${autChip}${mem}${board}${git}${missing}</div>
     <div class="next">下一步：${esc(p.next || '（未登记进展）')}</div>
     <div class="row"><span class="k">最近活动</span><span class="v">${esc(p.activityText)}</span></div>
     <div class="row"><span class="k">根目录</span><span class="v">${esc(p.root)}</span></div>
     ${p.note ? `<div class="row"><span class="k">说明</span><span class="v">${esc(p.note)}</span></div>` : ''}
     <footer>
       <button onclick="openDetail('${esc(p.id)}')" title="项目详情（会话列表 / git / 看板 / STATE）">详情</button>
+      <select onchange="setAutonomy('${esc(p.id)}', this.value)" title="自主推进模式" style="font-size:12px;padding:5px 8px">
+        ${['off','assist','auto'].map(m => `<option value="${m}" ${aut===m?'selected':''}>🤖 ${m}</option>`).join('')}
+      </select>
       <select onchange="setStatus('${esc(p.id)}', this.value)" style="font-size:12px;padding:5px 8px">
         ${['active','paused','blocked','archived'].map(s => `<option value="${s}" ${p.status===s?'selected':''}>${statusName(s)}</option>`).join('')}
       </select>
@@ -526,6 +581,13 @@ function sendToPlugin(payload){
   };
 }
 
+function setFabPos(pos){
+  if (!inPluginFrame()) { toast('请在 DSH 内嵌面板里使用（浏览器打开时无效）', true); return; }
+  window.parent.postMessage({ type: 'deck:set-fab-pos', pos }, '*');
+  if (!pos) { toast('已重置为默认位置'); return; }
+  toast('图标位置已切换');
+}
+
 function openDeepLink(hash){
   const base = (S && S.config && S.config.web) || 'http://127.0.0.1:43120';
   const url = base.replace(/\/+$/, '') + '/#' + hash;

package/backend/panel.py

@@ -48,12 +48,10 @@ P = load_deck()
 
 # ── 数据汇总 ────────────────────────────────────────────────
 def wechat_state():
-    try:
-        r = subprocess.run([P.WXSEND, '--status'], capture_output=True, text=True, timeout=10)
-        ok = r.returncode == 0
-        return {'ok': ok, 'raw': r.stdout.strip(), 'code': r.returncode}
-    except (OSError, subprocess.SubprocessError):
-        return {'ok': False, 'raw': 'wxsend 不可用', 'code': 3}
+    st = P.delivery_status()
+    return {'ok': bool(st.get('ok')), 'raw': st.get('detail', ''),
+            'code': 0 if st.get('ok') else 2, 'type': st.get('type'),
+            'pending': st.get('pending', 0)}
 
 
 def project_view(p):
@@ -68,6 +66,7 @@ def project_view(p):
         'exists': info['exists'], 'memory': info['memory'],
         'activity': info['activity'], 'activityText': P.rel_time(info['activity']),
         'git': info['git'], 'board': info['board'],
+        'autonomy': P.autonomy_of(p),
         'sessions': project_sessions(p.get('root', ''), p.get('sessions') or []),
         'boundSessions': p.get('sessions') or [],
     }
@@ -120,6 +119,8 @@ def snapshot():
         'projects': projects,
         'history': history,
         'nodes': nodes_view(),
+        'approvals': [x for x in P.load_approvals().get('items', []) if x.get('status') == 'pending'],
+        'decisions': decisions_view(10),
     }
 
 
@@ -616,6 +617,41 @@ def bind_session(payload):
     return snapshot()
 
 
+def set_autonomy(project, mode, max_per_day=None):
+    if mode not in ('off', 'assist', 'auto'):
+        raise ValueError('mode 只能是 off / assist / auto')
+    reg = P.load_json(P.REGISTRY, {'projects': []})
+    proj = next((x for x in reg['projects'] if x['id'] == project), None)
+    if not proj:
+        raise ValueError('项目不存在')
+    a = P.autonomy_of(proj)
+    a['mode'] = mode
+    if max_per_day is not None:
+        a['maxPerDay'] = int(max_per_day)
+    proj['autonomy'] = a
+    P.save_json(P.REGISTRY, reg)
+    P.log(f'[panel] autonomy {project} -> {mode}')
+    return snapshot()
+
+
+def resolve_approval(approval_id, action, choice=''):
+    it = P.resolve_approval(approval_id, action, choice)
+    if not it:
+        raise ValueError('待批项不存在或已处理')
+    return {'item': it, 'state': snapshot()}
+
+
+def decisions_view(limit=20):
+    rows = []
+    if os.path.exists(P.DECISIONS):
+        for line in open(P.DECISIONS):
+            try:
+                rows.append(json.loads(line))
+            except json.JSONDecodeError:
+                continue
+    return rows[-limit:][::-1]
+
+
 def ignore_candidate(path, days):
     if not path:
         raise ValueError('缺少 path')
@@ -721,6 +757,7 @@ class Handler(http.server.BaseHTTPRequestHandler):
         self.send_response(status)
         self.send_header('Content-Type', 'application/json; charset=utf-8')
         self.send_header('Content-Length', str(len(body)))
+        self.send_header('Access-Control-Allow-Origin', '*')
         self.end_headers()
         self.wfile.write(body)
 
@@ -764,6 +801,10 @@ class Handler(http.server.BaseHTTPRequestHandler):
             if not proj:
                 return self._json({'ok': False, 'error': '项目不存在'}, 404)
             return self._json({'ok': True, 'id': pid, 'sessions': project_sessions(proj.get('root', ''), 20)})
+        if path == '/api/decisions':
+            return self._json({'ok': True, 'decisions': decisions_view(30)})
+        if path == '/api/approvals':
+            return self._json({'ok': True, 'items': [x for x in P.load_approvals().get('items', []) if x.get('status') == 'pending']})
         if path == '/api/nodes':
             return self._json({'ok': True, 'nodes': nodes_view()})
         if path == '/api/node/scanner.ps1':
@@ -850,6 +891,10 @@ class Handler(http.server.BaseHTTPRequestHandler):
             return self._json({'ok': False, 'error': '请求体不是合法 JSON'}, 400)
 
         try:
+            if path == '/api/autonomy':
+                return self._json({'ok': True, 'state': set_autonomy(payload.get('project'), payload.get('mode'), payload.get('maxPerDay'))})
+            if path == '/api/approval':
+                return self._json({'ok': True, **resolve_approval(payload.get('id'), payload.get('action'), payload.get('choice') or '')})
             if path == '/api/scan/ignore':
                 return self._json({'ok': True, **ignore_candidate(payload.get('path'), payload.get('days', 7))})
             if path == '/api/bind':

package/lib/client.js

@@ -94,14 +94,19 @@ window.__ModuleLoader__.load({
     }
 
     const css = `
-.deck-fab{position:fixed;left:16px;bottom:18px;z-index:120;display:flex;align-items:center;justify-content:center;
+.deck-fab{position:fixed;right:18px;bottom:112px;left:auto;z-index:120;position:fixed;pointer-events:auto;touch-action:none;cursor:grab;user-select:none;display:flex;align-items:center;justify-content:center;
   width:46px;height:46px;border-radius:50%;border:1px solid rgba(53,208,186,.45);cursor:pointer;
   background:linear-gradient(180deg,#12303a,#0f1e1d);color:#7ce7da;font-size:20px;line-height:1;
   box-shadow:0 10px 24px rgba(0,0,0,.35),0 2px 6px rgba(0,0,0,.2);transition:filter .12s,transform .12s;
   font-family:system-ui,-apple-system,"PingFang SC",sans-serif;padding:0}
 .deck-fab:hover{filter:brightness(1.12);transform:translateY(-1px)}
+.deck-fab:active{cursor:grabbing}
+.deck-fab svg{display:block}
+.deck-fab .deck-badge{position:absolute;top:-4px;right:-4px;min-width:16px;height:16px;padding:0 4px;border-radius:9px;
+  background:#ef5b5b;color:#fff;font-size:10px;line-height:16px;text-align:center;font-weight:700;box-shadow:0 0 0 2px #0b0f14}
+.deck-fab.ai-on{box-shadow:0 0 0 2px rgba(53,208,186,.55),0 10px 24px rgba(0,0,0,.35)}
 .deck-fab:active{transform:translateY(0)}
-.deck-mask{position:fixed;inset:0;z-index:130;background:rgba(4,8,12,.62);display:flex;align-items:center;justify-content:center;padding:24px}
+.deck-mask{position:fixed;inset:0;z-index:130;background:rgba(4,8,12,.62);display:flex;align-items:center;justify-content:center;padding:24px;pointer-events:auto}
 .deck-box{width:min(1180px,94vw);height:min(860px,88vh);background:#0b0f14;border:1px solid #1f2a37;border-radius:14px;
   display:flex;flex-direction:column;overflow:hidden;box-shadow:0 24px 60px rgba(0,0,0,.45)}
 .deck-head{display:flex;align-items:center;gap:10px;padding:10px 14px;border-bottom:1px solid #1f2a37;
@@ -132,72 +137,94 @@ window.__ModuleLoader__.load({
       const [pos, setPos] = React.useState(() => {
         try { const v = JSON.parse(localStorage.getItem('deck-fab-pos') || 'null'); return v && typeof v.x === 'number' ? v : null } catch { return null }
       })
-      const drag = React.useRef(null)
-      const moved = React.useRef(false)
+      const [summary, setSummary] = React.useState({ auto: 0, assist: 0, pending: 0 })
+      React.useEffect(() => {
+        let alive = true
+        const load = () => {
+          fetch('http://127.0.0.1:9199/api/state', { cache: 'no-store' })
+            .then((r) => r.json())
+            .then((d) => {
+              if (!alive) return
+              const ps = d.projects || []
+              setSummary({
+                auto: ps.filter((p) => p.autonomy && p.autonomy.mode === 'auto').length,
+                assist: ps.filter((p) => p.autonomy && p.autonomy.mode === 'assist').length,
+                pending: (d.approvals || []).length,
+              })
+            })
+            .catch(() => {})
+        }
+        load()
+        const t = setInterval(load, 60000)
+        return () => { alive = false; clearInterval(t) }
+      }, [])
+
+      const dragState = React.useRef(null)
+      const movedRef = React.useRef(false)
 
       const clamp = (x, y) => ({
         x: Math.max(6, Math.min(x, window.innerWidth - 54)),
         y: Math.max(6, Math.min(y, window.innerHeight - 54)),
       })
 
-      const onPointerDown = (e) => {
-        drag.current = { dx: e.clientX - (pos ? pos.x : 16), dy: e.clientY - (pos ? pos.y : window.innerHeight - 64) }
-        moved.current = false
-        e.currentTarget.setPointerCapture(e.pointerId)
-      }
-      const onPointerMove = (e) => {
-        if (!drag.current) return
-        const nx = e.clientX - drag.current.dx
-        const ny = e.clientY - drag.current.dy
-        if (Math.abs(nx - (pos ? pos.x : 16)) > 4 || !pos) moved.current = true
-        setPos(clamp(nx, ny))
-      }
-      const onPointerUp = (e) => {
-        if (!drag.current) return
-        drag.current = null
-        try { e.currentTarget.releasePointerCapture(e.pointerId) } catch {}
-        setPos((cur) => {
-          if (cur) { try { localStorage.setItem('deck-fab-pos', JSON.stringify(cur)) } catch {} }
-          return cur
-        })
+      // 用 window 级监听，避免指针移出按钮就丢事件（之前只能按住按钮原地挪）
+      React.useEffect(() => {
+        const onMove = (e) => {
+          const d = dragState.current
+          if (!d) return
+          if (!d.moved && (Math.abs(e.clientX - d.sx) > 3 || Math.abs(e.clientY - d.sy) > 3)) d.moved = true
+          setPos(clamp(e.clientX - d.dx, e.clientY - d.dy))
+        }
+        const onUp = () => {
+          const d = dragState.current
+          if (!d) return
+          dragState.current = null
+          movedRef.current = d.moved
+          setPos((cur) => { if (cur) { try { localStorage.setItem('deck-fab-pos', JSON.stringify(cur)) } catch {} } return cur })
+        }
+        window.addEventListener('pointermove', onMove, true)
+        window.addEventListener('pointerup', onUp, true)
+        window.addEventListener('mousemove', onMove, true)
+        window.addEventListener('mouseup', onUp, true)
+        return () => {
+          window.removeEventListener('pointermove', onMove, true)
+          window.removeEventListener('pointerup', onUp, true)
+          window.removeEventListener('mousemove', onMove, true)
+          window.removeEventListener('mouseup', onUp, true)
+        }
+      }, [])
+
+      const fabStyle = pos ? { left: pos.x + 'px', top: pos.y + 'px', right: 'auto', bottom: 'auto' } : undefined
+
+      const onDragStart = (e) => {
+        const r = e.currentTarget.getBoundingClientRect()
+        dragState.current = { dx: e.clientX - r.left, dy: e.clientY - r.top, sx: e.clientX, sy: e.clientY, moved: false }
+        movedRef.current = false
+        if (!pos) setPos({ x: r.left, y: r.top })
+        if (e.preventDefault) e.preventDefault()
       }
-      const fabStyle = pos
-        ? { left: pos.x + 'px', top: pos.y + 'px', bottom: 'auto', right: 'auto' }
-        : undefined
 
-      // 面板（iframe，127.0.0.1:9199）点「最近会话」时 postMessage 过来，在这里跳到对应会话
+      // 面板里也能改图标位置（拖拽失效时的兜底）
       React.useEffect(() => {
-        const onMessage = (e) => {
+        const onPos = (e) => {
           if (e.origin !== PANEL) return
-          const data = e.data || {}
-          if (data.type === 'dsh-project-deck:open-project') {
-            openProjectWith(appCtx, { root: String(data.root || ''), sessionId: data.sessionId ? String(data.sessionId) : null })
-              .then((ok) => {
-                console.log('[dsh-project-deck] open-project', data.project, 'ok=', ok)
-                try {
-                  const frame = document.querySelector('iframe.deck-frame')
-                  if (frame && frame.contentWindow) {
-                    frame.contentWindow.postMessage({ type: 'dsh-project-deck:open-result', ok, project: data.project }, PANEL)
-                  }
-                } catch (err) { /* 忽略 */ }
-                if (ok) setOpen(false)
-              })
-            return
+          const d = e.data || {}
+          if (d.type !== 'deck:set-fab-pos') return
+          const W = window.innerWidth, H = window.innerHeight
+          const spots = {
+            'right-bottom': { x: W - 60, y: H - 160 },
+            'left-bottom': { x: 16, y: H - 160 },
+            'right-top': { x: W - 60, y: 84 },
+            'center-right': { x: W - 60, y: Math.round(H / 2) },
+            default: { x: W - 60, y: H - 160 },
           }
-          if (data.type !== 'dsh-project-deck:open-session' || !data.sessionId) return
-          const ok = openSessionWith(appCtx, String(data.sessionId))
-          console.log('[dsh-project-deck] open-session request', data.sessionId, 'ok=', ok)
-          try {
-            const frame = document.querySelector('iframe.deck-frame')
-            if (frame && frame.contentWindow) {
-              frame.contentWindow.postMessage({ type: 'dsh-project-deck:open-result', ok, sessionId: data.sessionId }, PANEL)
-            }
-          } catch (e) { console.warn('[dsh-project-deck] 回传结果失败', e) }
-          if (ok) setOpen(false)
+          const next = spots[d.pos] || spots.default
+          setPos(clamp(next.x, next.y))
+          try { localStorage.setItem('deck-fab-pos', JSON.stringify(clamp(next.x, next.y))) } catch {}
         }
-        window.addEventListener('message', onMessage)
-        return () => window.removeEventListener('message', onMessage)
-      }, [appCtx])
+        window.addEventListener('message', onPos)
+        return () => window.removeEventListener('message', onPos)
+      }, [])
 
       React.useEffect(() => {
         if (!open) return undefined
@@ -210,10 +237,33 @@ window.__ModuleLoader__.load({
 
       return h(React.Fragment, null,
         h('button', {
-          className: 'deck-fab',
-          title: '项目甲板 Project Deck（项目 / 播报 / 节点）',
-          onClick: openPanel,
-        }, '\u{1F4CB}'),
+          className: 'deck-fab' + (summary.auto > 0 ? ' ai-on' : ''),
+          style: fabStyle,
+          title: '项目甲板 · AI 项目管理与自动推进（可拖动 v4）'
+            + (summary.auto ? `｜auto ${summary.auto}` : '')
+            + (summary.pending ? `｜待你拍板 ${summary.pending}` : ''),
+          onPointerDown: onDragStart,
+          onMouseDown: onDragStart,
+          onClick: () => { if (!movedRef.current) openPanel(); movedRef.current = false },
+          onDragStart: (e) => e.preventDefault(),
+        },
+          h('svg', { width: 26, height: 26, viewBox: '0 0 24 24', fill: 'none', stroke: '#7ce7da', strokeWidth: 1.5, strokeLinecap: 'round', strokeLinejoin: 'round' },
+            // 左：AI 机器人
+            h('rect', { x: 1.6, y: 8.2, width: 8.2, height: 7.2, rx: 2.2 }),
+            h('path', { d: 'M5.7 8.2V6.2' }),
+            h('circle', { cx: 5.7, cy: 5, r: 1.05, fill: '#7ce7da', stroke: 'none' }),
+            h('circle', { cx: 4.1, cy: 11.5, r: 0.9, fill: '#7ce7da', stroke: 'none' }),
+            h('circle', { cx: 7.3, cy: 11.5, r: 0.9, fill: '#7ce7da', stroke: 'none' }),
+            h('path', { d: 'M4.5 13.7h2.4' }),
+            // 右：待办清单（两条已完成）
+            h('rect', { x: 11.8, y: 4.6, width: 10.4, height: 14.8, rx: 2.6 }),
+            h('path', { d: 'M13.9 9.4l1.1 1.1 1.9-2.1' }),
+            h('path', { d: 'M18.1 9.9h2.3' }),
+            h('path', { d: 'M13.9 14l1.1 1.1 1.9-2.1' }),
+            h('path', { d: 'M18.1 14.5h2.3' }),
+          ),
+          summary.pending > 0 ? h('span', { className: 'deck-badge' }, String(summary.pending)) : null,
+        ),
         open
           ? h('div', { className: 'deck-mask', onClick: (e) => { if (e.target === e.currentTarget) setOpen(false) } },
               h('div', { className: 'deck-box' },
@@ -242,6 +292,24 @@ window.__ModuleLoader__.load({
       )
     }
 
+    // 崩溃兜底：任何渲染错误都不让图标凭空消失
+    class Boundary extends React.Component {
+      constructor(props) { super(props); this.state = { err: null } }
+      static getDerivedStateFromError(err) { return { err } }
+      render() {
+        if (this.state.err) {
+          return h('div', {
+            title: String(this.state.err && this.state.err.message || this.state.err),
+            style: { position: 'fixed', right: 12, bottom: 100, zIndex: 121, background: '#2a1518',
+                     color: '#ffb3b3', padding: '5px 9px', borderRadius: 8, fontSize: 11,
+                     border: '1px solid #4a2226', cursor: 'pointer', pointerEvents: 'auto' },
+            onClick: () => this.setState({ err: null }),
+          }, '项目甲板加载失败（点我重试）')
+        }
+        return this.props.children
+      }
+    }
+
     exports.name = 'dsh-project-deck'
     exports.inject = ['slots']
     exports.apply = function apply(ctx) {
@@ -289,7 +357,7 @@ window.__ModuleLoader__.load({
 
       slots.inject('shell.overlay', () => slots.register(
         { name: 'shell.overlay', id: 'deck-panel', order: 6, label: '项目甲板' },
-        (props) => h(Panel, Object.assign({}, props, { appCtx: ctx })),
+        (props) => h(Boundary, null, h(Panel, Object.assign({}, props, { appCtx: ctx }))),
       ))
       console.log('[dsh-project-deck] client ready')
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-project-deck",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "DeepSeek Harness plugin: a project deck for your repos — registry, dashboard, scheduled WeChat reports, auto-discovery, multi-node scanning.",
   "type": "module",
   "main": "./lib/index.js",
@@ -44,7 +44,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/peng456/dsh-project-deck"
+    "url": "git+https://github.com/peng456/dsh-project-deck.git"
   },
   "author": "peng456",
   "homepage": "https://github.com/peng456/dsh-project-deck#readme",