@zmainer/dsh-wx-bridge 1.0.16 → 1.1.1

package/lib/kernel/outbox.mjs

@@ -0,0 +1,42 @@
+/**
+ * outbox.mjs — 主动推送的「信箱」纯函数层（无 IO，可离线自测）
+ *
+ * 设计：任何进程（手机通道会话里的 agent、桌面会话、定时任务）只做一件事——
+ * 往 <dataDir>/outbox/ 里丢一个 JSON 文件；桥每 5 秒扫一次，替它发到微信。
+ * 这样推送不依赖网络、不依赖 RPC，也不需要调用方知道 iLink 协议。
+ * 投递结果用文件位置表达：成功 → outbox/sent/，失败 → outbox/failed/（附原因）。
+ */
+
+/** 单条推送允许携带的字段（其余字段忽略）。 */
+export function normalizePushEntry(obj) {
+  const text = String((obj && obj.text) || '').trim()
+  if (!text) throw new Error('empty text')
+  return {
+    text: text.slice(0, 4000),
+    to: String((obj && obj.to) || '').trim(),
+    at: String((obj && obj.at) || new Date().toISOString()),
+    source: String((obj && obj.source) || '').trim(),
+  }
+}
+
+/** 解析一个 outbox 文件的内容（坏 JSON / 空文本都要给出可读原因）。 */
+export function parsePushEntry(raw) {
+  let obj
+  try { obj = JSON.parse(String(raw || '')) } catch (e) { return { error: 'bad-json: ' + String(e?.message ?? e) } }
+  try { return { entry: normalizePushEntry(obj) } } catch (e) { return { error: String(e?.message ?? e) } }
+}
+
+/**
+ * 收件人：显式指定 > 最近发过消息的人 > state 里的默认人 > 唯一已登记的人。
+ * **只在已登记白名单里选**：推送不能成为绕过准入的后门；无人可选时返回 ''（调用方判失败）。
+ */
+export function pickRecipient(entry, ctx = {}) {
+  const allowed = Array.isArray(ctx.allowedUsers) ? ctx.allowedUsers.filter(Boolean) : []
+  if (!allowed.length) return ''
+  const want = String(entry?.to || '').trim()
+  if (want && allowed.includes(want)) return want
+  for (const cand of [ctx.defaultPeer, ctx.lastPeer]) {
+    if (cand && allowed.includes(cand)) return cand
+  }
+  return allowed.length === 1 ? allowed[0] : ''
+}

package/lib/kernel/wxpush.mjs

@@ -0,0 +1,63 @@
+#!/usr/bin/env node
+/**
+ * wxpush.mjs — 主动推送 CLI（桥开机时会把它复制到 <dataDir>/wxpush.mjs）
+ *
+ * 用法（任何进程都能跑：手机通道会话里的 agent、桌面会话、定时任务）：
+ *   node wxpush.mjs "要推送到微信的话"
+ *   node wxpush.mjs --text "带换行的
+ *   多行文本"  --to <peerId>  --data-dir <桥的数据目录>
+ *   echo "来自管道的文本" | node wxpush.mjs --stdin
+ *
+ * 它只做一件事：把一条 JSON 丢进 <dataDir>/outbox/，桥轮询时替它发出去。
+ * 零依赖、零网络：没有微信凭据 / 桥没在跑时也只是排队，不会报错给你。
+ */
+import { mkdirSync, writeFileSync } from 'node:fs'
+import { join, resolve } from 'node:path'
+import { homedir } from 'node:os'
+import { randomUUID } from 'node:crypto'
+
+const args = process.argv.slice(2)
+const argOf = (name, def = '') => { const i = args.indexOf(name); return i >= 0 && args[i + 1] !== undefined ? args[i + 1] : def }
+
+function positionalText() {
+  const skip = new Set()
+  for (const key of ['--text', '--to', '--data-dir', '--source']) {
+    const i = args.indexOf(key)
+    if (i >= 0) { skip.add(i); skip.add(i + 1) }
+  }
+  return args.filter((a, i) => !skip.has(i) && !a.startsWith('--')).join(' ').trim()
+}
+
+async function readStdin() {
+  if (process.stdin.isTTY) return ''
+  let out = ''
+  try {
+    for await (const chunk of process.stdin) out += chunk
+  } catch { return '' }
+  return out.trim()
+}
+
+const text = (argOf('--text') || (args.includes('--stdin') ? await readStdin() : '') || positionalText()).trim()
+if (!text) {
+  console.error('[wxpush] 没有内容：用法 node wxpush.mjs "要推送的话"（或 --text / --stdin）')
+  process.exit(2)
+}
+
+const dataDir = resolve(argOf('--data-dir') || process.env.WXBRIDGE_DATA || process.env.BRIDGE_DATA
+  || join(process.env.DSH_HOME || join(homedir(), '.dsh'), 'wxbridge'))
+const outbox = join(dataDir, 'outbox')
+const entry = {
+  text: text.slice(0, 4000),
+  to: argOf('--to'),
+  at: new Date().toISOString(),
+  source: argOf('--source') || 'wxpush',
+}
+try {
+  mkdirSync(outbox, { recursive: true })
+  const file = join(outbox, Date.now() + '-' + randomUUID().slice(0, 8) + '.json')
+  writeFileSync(file, JSON.stringify(entry, null, 2))
+  console.log('[wxpush] 已排队：' + file)
+} catch (e) {
+  console.error('[wxpush] 写入失败：' + String(e?.message ?? e))
+  process.exit(1)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zmainer/dsh-wx-bridge",
-  "version": "1.0.16",
+  "version": "1.1.1",
   "type": "module",
   "main": "./lib/index.js",
   "dsh": {
@@ -27,7 +27,7 @@
     "README.md",
     "package.json"
   ],
-  "description": "DSH plugin: connect WeChat (official iLink/ClawBot) to DeepSeek Harness — settings page with live bridge status, QR device pairing, and the bundled bridge + keeper kernel.",
+  "description": "DSH plugin: connect WeChat (official iLink/ClawBot) to DeepSeek Harness — settings page with live bridge status, QR device pairing, in-WeChat tool approvals, proactive push, and the bundled bridge + keeper kernel.",
   "license": "MIT",
   "keywords": [
     "deepseek-harness",
@@ -36,5 +36,17 @@
     "weixin",
     "ilink",
     "clawbot"
-  ]
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhy5/dsh-wx-bridge.git"
+  },
+  "homepage": "https://github.com/zhy5/dsh-wx-bridge#readme",
+  "bugs": {
+    "url": "https://github.com/zhy5/dsh-wx-bridge/issues"
+  },
+  "author": "zmainer",
+  "engines": {
+    "node": ">=22.19.0"
+  }
 }

package/src/client.js

@@ -116,6 +116,8 @@ function Panel() {
   const [presets, setPresets] = R.useState([])
   const [presetSel, setPresetSel] = R.useState('')
   const [allowlist, setAllowlist] = R.useState('strict')
+  const [approval, setApproval] = R.useState('ask')
+  const [pushText, setPushText] = R.useState('')
   const [presetState, setPresetState] = R.useState(null)
   useWxStyle()
 
@@ -145,9 +147,43 @@ function Panel() {
       .then((r) => r.json())
       .then((d) => { if (alive) setPair(d) })
       .catch(() => {})
+    fetch('/wxbridge/approval', { cache: 'no-store' })
+      .then((r) => r.json())
+      .then((d) => { if (alive && d && typeof d.approval === 'string') setApproval(d.approval) })
+      .catch(() => {})
     return () => { alive = false }
   }, [])
 
+  const saveApproval = async (mode) => {
+    setBusy('approval')
+    try {
+      const r = await fetch('/wxbridge/approval', {
+        method: 'POST', headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ mode }),
+      })
+      const d = await r.json()
+      if (typeof d.approval === 'string') setApproval(d.approval)
+      setNote(d.ok
+        ? ('审批策略已切到 ' + mode + '：' + (d.note || ''))
+        : ('切换失败：' + (d.error || '未知错误')))
+    } catch (e) { setNote('切换失败：' + String(e && e.message ? e.message : e)) } finally { setBusy('') }
+  }
+
+  const sendPush = async () => {
+    const text = String(pushText || '').trim()
+    if (!text) { setNote('先写一条要推送的内容。'); return }
+    setBusy('push')
+    try {
+      const r = await fetch('/wxbridge/push', {
+        method: 'POST', headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ text }),
+      })
+      const d = await r.json()
+      setNote(d.ok ? ('已排队推送：' + (d.note || '')) : ('推送失败：' + (d.error || '未知错误')))
+      if (d.ok) setPushText('')
+    } catch (e) { setNote('推送失败：' + String(e && e.message ? e.message : e)) } finally { setBusy('') }
+  }
+
   const loadPresets = () => fetch('/wxbridge/presets', { cache: 'no-store' })
     .then((r) => r.json())
     .then((d) => { setPresetState(d); setPresets(d.presets || []); setPresetSel(typeof d.selected === 'string' ? d.selected : '') })
@@ -445,6 +481,51 @@ function Panel() {
         R.createElement('span', { style: dim }, '当前：' + allowlist + '（改完会写入 config.json 并重启桥，立即生效）')),
     ),
 
+    R.createElement('div', { style: { marginTop: '14px', paddingTop: '12px', borderTop: subtle } },
+      R.createElement('div', { style: { display: 'flex', alignItems: 'center', gap: '6px', marginBottom: '6px' } },
+        wxBubbles(16, WX, skin.dark ? '#0d1220' : '#ffffff', 'transparent'),
+        R.createElement('span', { style: { fontSize: '13px', fontWeight: 600 } }, '审批策略'),
+        R.createElement('span', { style: { fontSize: '11px', color: dim.color } }, '（需要审批的操作怎么答）')),
+      R.createElement('select', {
+        value: approval, onChange: (e) => setApproval(e.target.value),
+        style: { ...skin.control, width: '100%', boxSizing: 'border-box', padding: '7px 10px', borderRadius: '8px', fontSize: '12px' },
+      }, [
+        R.createElement('option', { key: 'ask', value: 'ask', style: skin.option }, 'ask（默认）· 把审批卡推到微信，等你回「批准 / 拒绝」，120 秒未回按拒绝'),
+        R.createElement('option', { key: 'allow', value: 'allow', style: skin.option }, 'allow · 自动批准，不打扰你（旧行为）'),
+        R.createElement('option', { key: 'reject', value: 'reject', style: skin.option }, 'reject · 一律拒绝（需要审批的操作会失败）'),
+      ]),
+      R.createElement('div', { style: { marginTop: '8px', display: 'flex', alignItems: 'center' } },
+        R.createElement('button', {
+          className: 'wxbridge-btn', onClick: () => saveApproval(approval), disabled: !!busy,
+          style: {
+            marginRight: '10px', padding: '6px 14px', borderRadius: '999px', fontSize: '12px', fontWeight: 500,
+            cursor: busy ? 'default' : 'pointer', border: '1px solid ' + WX, background: WX, color: '#fff',
+          },
+        }, busy === 'approval' ? '处理中…' : '保存审批策略'),
+        R.createElement('span', { style: dim },
+          '当前：' + approval + '（保存在 config.json 的 acp.permPolicy；改了立即生效，不必重启）' +
+          (approval === 'ask' ? ' · 只有把通道权限预设收紧（acp.permPreset）才会真的产生审批卡' : ''))),
+    ),
+    R.createElement('div', { style: { marginTop: '14px', paddingTop: '12px', borderTop: subtle } },
+      R.createElement('div', { style: { display: 'flex', alignItems: 'center', gap: '6px', marginBottom: '6px' } },
+        wxBubbles(16, WX, skin.dark ? '#0d1220' : '#ffffff', 'transparent'),
+        R.createElement('span', { style: { fontSize: '13px', fontWeight: 600 } }, '主动推送'),
+        R.createElement('span', { style: { fontSize: '11px', color: dim.color } }, '（试一下能不能推到你手机）')),
+      R.createElement('input', {
+        value: pushText, onChange: (e) => setPushText(e.target.value), placeholder: '要推到微信的一句话（例如：测试推送）',
+        style: { ...skin.control, width: '100%', boxSizing: 'border-box', padding: '7px 10px', borderRadius: '8px', fontSize: '12px' },
+      }),
+      R.createElement('div', { style: { marginTop: '8px', display: 'flex', alignItems: 'center' } },
+        R.createElement('button', {
+          className: 'wxbridge-btn', onClick: () => sendPush(), disabled: !!busy,
+          style: {
+            marginRight: '10px', padding: '6px 14px', borderRadius: '999px', fontSize: '12px', fontWeight: 500,
+            cursor: busy ? 'default' : 'pointer', border: '1px solid ' + WX, background: WX, color: '#fff',
+          },
+        }, busy === 'push' ? '发送中…' : '发一条测试推送'),
+        R.createElement('span', { style: dim }, '桥每 5 秒取件；结果在数据目录的 outbox/sent、outbox/failed')),
+    ),
+
     note ? R.createElement('pre', { style: { margin: '10px 0 0 0', padding: '9px 11px', borderRadius: '10px', background: mutedBg, border: subtle, fontSize: '11px', overflow: 'auto', maxHeight: '160px' } }, note) : null,
 
     // ── 操作日志 ───────────────────────────────────────────────────