dsh-bili-watch 0.2.8 → 0.2.9

package/auto-trigger.js

@@ -0,0 +1,95 @@
+/**
+ * dsh-bili-watch —— 「用户只贴了一条视频链接」的识别器。
+ *
+ * 只做判定，不做 IO：不请求接口、不抽帧、不写盘。
+ * 判定口径见设计文档 T08 第一节：剥壳 → 命中恰好 1 条 → 残余为空。
+ */
+
+// 完整视频页：允许 ?p=2&t=30 与尾斜杠
+const RE_FULL = /https?:\/\/(?:www\.|m\.)?bilibili\.com\/video\/(BV[0-9A-Za-z]{10})(?:[/?#][^\s<>"'）)]*)?/gi
+// 短链：能识别，但 look.mjs 不能展开（tools/look.mjs:1249-1251），调用方要单独处理
+const RE_SHORT = /https?:\/\/b23\.tv\/[0-9A-Za-z]{5,12}(?:[/?#][^\s<>"'）)]*)?/gi
+// ?bvid=BV… 形态（tools/look.mjs:1254 支持）
+const RE_BVID_Q = /[?&]bvid=(BV[0-9A-Za-z]{10})/gi
+// 裸 BV 号：前后不许粘字母数字
+const RE_BARE = /(?<![0-9A-Za-z])BV[0-9A-Za-z]{10}(?![0-9A-Za-z])/g
+
+// 客户端包在用户文本外的壳；剥掉后剩下的才是用户真打的字
+const WRAPPERS = [
+  /<system-reminder[\s\S]*?<\/system-reminder>/gi,
+  /<attached_files>[\s\S]*?<\/attached_files>/gi,
+  /<user_query>/gi,
+  /<\/user_query>/gi,
+]
+const LINK_ANY = /bilibili\.com\/video\/|b23\.tv\/|BV[0-9A-Za-z]{10}/
+
+/** 剥壳；壳里若出现链接，记「引用」（引用不自动触发）。 */
+function stripWrappers(raw) {
+  let text = String(raw ?? '')
+  let quoted = false
+  for (const re of WRAPPERS) {
+    text = text.replace(re, (m) => {
+      if (LINK_ANY.test(m)) quoted = true
+      return ' '
+    })
+  }
+  const kept = []
+  for (const ln of text.split('\n')) {
+    if (/^\s*>/.test(ln)) {
+      if (LINK_ANY.test(ln)) quoted = true
+      continue
+    }
+    kept.push(ln)
+  }
+  return { text: kept.join('\n'), quoted }
+}
+
+/**
+ * 判定一条用户文本是否「只有一条视频链接」。
+ * @returns {{hit: false, why: string} | {hit: true, kind: 'full'|'short'|'bare', bv: string}}
+ */
+export function matchSingleVideoLink(raw) {
+  const { text, quoted } = stripWrappers(raw)
+  if (quoted) return { hit: false, why: '链接出现在引用/附件里' }
+  if (!text.trim()) return { hit: false, why: '空消息' }
+  if (/^\s*\//.test(text)) return { hit: false, why: '斜杠命令' }
+
+  const hits = []
+  let m
+  RE_FULL.lastIndex = 0
+  while ((m = RE_FULL.exec(text))) hits.push({ kind: 'full', bv: m[1], start: m.index, end: m.index + m[0].length })
+  RE_SHORT.lastIndex = 0
+  while ((m = RE_SHORT.exec(text))) hits.push({ kind: 'short', bv: '', start: m.index, end: m.index + m[0].length })
+  RE_BVID_Q.lastIndex = 0
+  while ((m = RE_BVID_Q.exec(text))) hits.push({ kind: 'full', bv: m[1], start: m.index, end: m.index + m[0].length })
+  RE_BARE.lastIndex = 0
+  while ((m = RE_BARE.exec(text))) hits.push({ kind: 'bare', bv: m[0], start: m.index, end: m.index + m[0].length })
+
+  // 区间去重：整条 URL 覆盖它内部的 BV 号，只算一个
+  hits.sort((a, b) => a.start - b.start || b.end - a.end)
+  const uniq = []
+  for (const x of hits) {
+    const last = uniq[uniq.length - 1]
+    if (last && x.start < last.end) continue
+    uniq.push(x)
+  }
+  if (uniq.length === 0) return { hit: false, why: '没有视频链接' }
+  if (uniq.length > 1) return { hit: false, why: `有 ${uniq.length} 个链接` }
+
+  const one = uniq[0]
+  // 承重墙：链接之外还剩字，就说明用户在说别的事
+  const residual = (text.slice(0, one.start) + text.slice(one.end))
+    .replace(/\s+/g, '')
+    .replace(/[。，、！？!?,.;；:：·…~～—\-"'“”‘’（）()【】\[\]]/g, '')
+  if (residual) return { hit: false, why: `链接外还有字：「${residual.slice(0, 20)}」` }
+
+  return { hit: true, kind: one.kind, bv: one.bv }
+}
+
+/** 从一条 UserMessage 里取纯文本（只认 text 块；有图片/文件块就不算「只贴了链接」）。 */
+export function textOfUserMessage(message) {
+  const blocks = Array.isArray(message?.content) ? message.content : []
+  if (blocks.some((b) => b && b.type !== 'text')) return { ok: false, text: '' }
+  const text = blocks.filter((b) => b && b.type === 'text').map((b) => b.text || '').join('\n')
+  return { ok: true, text }
+}

package/index.js

@@ -23,6 +23,17 @@ try {
   defineTool = null
 }
 import QRCode from 'qrcode'
+import { matchSingleVideoLink, textOfUserMessage } from './auto-trigger.js'
+// dsh-llm 同样是可选依赖：拿不到 createUserMessage 就只保留「工具描述」这一层，
+// 不能因为少一个提示能力让整个插件加载失败（同上方 defineTool 的处理方式）
+let createUserMessage = null
+let boundContextSummary = null
+try {
+  ({ createUserMessage, boundContextSummary } = await import('@deepseek-ai/dsh-llm'))
+} catch {
+  createUserMessage = null
+  boundContextSummary = null
+}
 
 const HERE = dirname(fileURLToPath(import.meta.url))
 const LOOK = join(HERE, 'tools', 'look.mjs')
@@ -46,7 +57,7 @@ const HF_HOME = [join(DEPS, '.hf-home'), join(PROJ, '.hf-home')]
 const SCRIPTS = join(HERE, 'scripts')
 const CACHE_CFG = join(DEPS, 'cache-config.json')
 const UI_CFG = join(DEPS, 'ui-config.json')
-const DEFAULT_UI_CFG = { hintDismissed: false, activationSeen: false, showInSettings: true }
+const DEFAULT_UI_CFG = { hintDismissed: false, activationSeen: false, showInSettings: true, autoHint: true }
 
 function uiCfg() {
   try {
@@ -81,7 +92,7 @@ const QR_POLL = (key) =>
 const SPI = 'https://api.bilibili.com/x/frontend/finger/spi'
 
 const name = 'dsh-bili-watch'
-const inject = ['commands', 'tools', 'webServer']
+const inject = ['commands', 'tools', 'webServer', 'agents']
 
 function runLook(args, { timeoutMs = 1_200_000 } = {}) {
   return new Promise((resolve) => {
@@ -584,6 +595,52 @@ function apply(ctx) {
     },
   })
 
+  // ①-b 单条链接软提示：只往消息流里加一条旁白，绝不替用户调用工具
+  //     开关落 deps/ui-config.json 的 autoHint（DEFAULT_UI_CFG 见上）
+  try {
+    if (createUserMessage && uiCfg().autoHint !== false) {
+      const hinted = new Map() // message.id → true，同一条消息只提示一次
+      const hint = (msg) => {
+        const { ok, text } = textOfUserMessage(msg)
+        if (!ok) return null
+        const r = matchSingleVideoLink(text)
+        if (!r.hit) return null
+        const line = r.kind === 'short'
+          // 短链：look.mjs 不能展开，只让用户展开
+          ? '[bili-watch] 这条消息只有一条 b23.tv 短链。本插件不能展开短链，先请用户把浏览器地址栏里的完整链接发过来；不要凭短链猜内容。'
+          : `[bili-watch] 这条消息只有一条 B 站视频链接（BV ${r.bv}）。要读内容就调 bili_watch（command=peek 最便宜）；用户没说要看时不要自己跑。`
+        return createUserMessage({
+          content: [{ type: 'text', text: line }],
+          source: { kind: name, form: 'notice', summary: boundContextSummary?.('检测到单条 B 站视频链接') ?? '检测到单条 B 站视频链接' },
+        })
+      }
+      ctx.on('agent/pre-step', async (payload, next) => {
+        const decision = await next()
+        try {
+          if (decision.kind !== 'enter' || payload.step !== 1) return decision
+          if (payload.signal?.aborted) return decision
+          const fresh = []
+          for (const msg of decision.messages) {
+            if (msg?.source?.kind !== 'user') continue
+            if (hinted.has(msg.id)) continue
+            const extra = hint(msg)
+            if (!extra) continue
+            hinted.set(msg.id, true)
+            fresh.push(extra)
+          }
+          if (!fresh.length) return decision
+          return { ...decision, messages: [...decision.messages, ...fresh] }
+        } catch (e) {
+          // 提示是旁白，出任何错都不许影响这一步
+          try { ctx.logger?.info?.(`[dsh-bili-watch] 自动提示跳过：${e?.message ?? e}`) } catch {}
+          return decision
+        }
+      })
+    }
+  } catch (e) {
+    try { ctx.logger?.info?.(`[dsh-bili-watch] pre-step 钩子没挂上：${e?.message ?? e}`) } catch {}
+  }
+
   // ② 同名工具：模型可调，需要看视频时自己来，不依赖用户敲命令
   //    必须用 defineTool 包一层：ctx.tools.register 收的是编译好的 tool 对象，
   //    直接传 options 会让发往模型的 parameters 变成 null（报 INVALID_REQUEST: schema must be type "object"）。
@@ -736,6 +793,7 @@ function apply(ctx) {
                 if (typeof body?.hintDismissed === 'boolean') patch.hintDismissed = body.hintDismissed
                 if (typeof body?.activationSeen === 'boolean') patch.activationSeen = body.activationSeen
                 if (typeof body?.showInSettings === 'boolean') patch.showInSettings = body.showInSettings
+                if (typeof body?.autoHint === 'boolean') patch.autoHint = body.autoHint
                 const next = writeUiCfg(patch)
                 return sendJson(res, 200, { ok: true, data: next })
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-bili-watch",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "private": false,
   "description": "Reads Bilibili (and generic URLs via yt-dlp) into text for DSH agents: search, hot, metadata, comments, danmaku, AI subtitles, local ASR, frame OCR.",
   "type": "module",
@@ -33,7 +33,8 @@
     "tools/",
     "scripts/",
     "deps/.gitkeep",
-    "deps/_bili-asr.py"
+    "deps/_bili-asr.py",
+    "auto-trigger.js"
   ],
   "keywords": [
     "bilibili",