dsh-spectacles 1.0.0 → 1.1.2

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 人话版。每次发版都在这儿写一段：改了什么、为什么改、有没有坑。
 
+## 1.1.2 — 2026-11-09
+
+- 框选不再先抓一帧整屏当底图，只算坐标：铺一层半透明黑、你拖框，它记下「哪个窗口 + 相对它的哪一块」。选的时候不读任何像素。
+- 置顶抓取失败时不再硬出图。有些程序（提权运行的、自带保护的）不让被提到最前，这时候会明确报 `raise-failed`，而不是给你一张压着别人窗口的画面。
+- 补了两个关键词（`dsh-plugin`、`deepseek-harness`），这样插件市场的自动收录能扫到我们。
+
+## 1.1.0 — 2026-11-09
+
+- 抓取任何窗口时，会先把该窗口短暂置顶一下，再抓画面，然后立刻放回去。这样 GPU 绘制的窗口（游戏、播放器）也能抓到。抓的那一下屏幕上会闪一下。
+- 读不到时会明确报错，不会拿别的东西顶替。
+
 ## V1.0.0 — 2026-11-09
 
 **这是第一个我们认它是 V1 的版本。** 下面那些 1.0.0 / 1.0.1 / 1.1.0 / 1.1.1 都是试验期的编号，实际只到 0.5 的水平——留着当历史，不再对外提。

package/README.md

@@ -1,6 +1,6 @@
 # Spectacles · 砚明的金丝眼镜
 
-**V1** — one job: point at a window, read its text clearly. Nothing else is in here on purpose.
+**V1.1** — one job: point at a window, read its text clearly. Nothing else is in here on purpose.
 
 **Point at one window. Let the AI read it clearly.**
 
@@ -48,7 +48,13 @@ So the plugin does three things: **where to look, how much to enlarge, and when
 ## Install
 
 ```
-dsh plugin --profile desktop add github:yanming119/dsh-spectacles#1.0.0
+dsh plugin --profile desktop add dsh-spectacles
+```
+
+If you'd rather pin the source (no registry), this works too:
+
+```
+dsh plugin --profile desktop add github:yanming119/dsh-spectacles#1.1.0
 ```
 
 Restart DSH. A pill button labelled **戴上眼镜** (put on the glasses) appears in the bottom-right corner.
@@ -138,4 +144,4 @@ You don't choose — just speak plainly.
 
 *Spectacles* — in Chinese, 砚明的金丝眼镜 ("Yanming's gold-rimmed glasses"). Yanming is the AI assistant who lives on the author's machine; she's nearsighted, so she got a pair of glasses.
 
-Apache-2.0.
+Apache-2.0.

package/README.zh.md

@@ -1,6 +1,6 @@
 # 砚明的金丝眼镜 · Spectacles
 
-**V1 版** —— 只干一件事：指定一个窗口（或框住它里面的一块），把里面的字读清楚。别的都故意没放进来。
+**V1.1 版** —— 只干一件事：指定一个窗口（或框住它里面的一块），把里面的字读清楚。别的都故意没放进来。
 
 **指定一个窗口，让 AI 把里面的字看清楚。**
 
@@ -48,7 +48,13 @@ DSH 默认只能看你粘进去的东西。这个插件补的是中间那段：*
 ## 装
 
 ```
-dsh plugin --profile desktop add github:yanming119/dsh-spectacles#1.0.0
+dsh plugin --profile desktop add dsh-spectacles
+```
+
+不想走 npm 也行，直接钉源码：
+
+```
+dsh plugin --profile desktop add github:yanming119/dsh-spectacles#1.1.0
 ```
 
 装完重启 DSH，右下角会多出一个胶囊按钮「戴上眼镜」。
@@ -138,4 +144,4 @@ powershell -NoProfile -ExecutionPolicy Bypass -File scripts\selftest.ps1
 
 「砚明的金丝眼镜」——砚明是作者家里住在这台电脑上的 AI 助手，她近视，所以给她配了副眼镜。英文名 Spectacles。
 
-协议 Apache-2.0。
+协议 Apache-2.0。

package/index.js

@@ -179,16 +179,31 @@ function runPs(script, argv) {
   })
 }
 
+function captureHint(cap) {
+  if (!cap || cap.ok) return null
+  if (cap.error === 'printwindow-failed') {
+    return (
+      '这个窗口不吃「重画」这条请求（GPU 直绘的窗口都这样），所以抓不到它的画面。' +
+      '要么把它切到最前再让我看；要么允许临时置顶抓一帧（DSH_LOOK_RAISE=1，抓的那一下屏幕会闪一下）。'
+    )
+  }
+  return null
+}
+
 function runLook(args, via) {
   guardWindow('look', args)
   guardOut(args)
   const p = runLookRaw(args)
   return p.then((cap) => {
-    audit({ tool: 'look', window: args.window || null, crop: args.crop || null, via: via || null, region: (cap && cap.region) || null, png: (cap && cap.png) || null, ok: !!(cap && cap.ok) })
+    audit({ tool: 'look', window: args.window || null, crop: args.crop || null, via: via || null, source: (cap && cap.source) || null, region: (cap && cap.region) || null, png: (cap && cap.png) || null, ok: !!(cap && cap.ok) })
+    const hint = captureHint(cap)
+    if (hint) throw new Error(hint)
     return cap
   })
 }
 
+const RAISE = String(process.env.DSH_LOOK_RAISE || '') !== '0'
+
 function runLookRaw(args) {
   if (args.window) {
     const argv = ['-Window', String(args.window)]
@@ -196,6 +211,8 @@ function runLookRaw(args) {
     if (typeof args.scale === 'number' && args.scale > 0) argv.push('-Scale', String(args.scale))
     if (args.image === true) argv.push('-Image')
     if (args.out) argv.push('-Out', String(args.out))
+    // 这个窗口不吃 PrintWindow（GPU 直绘）时，临时把它提到最上层、从屏幕抓它那一块、立刻还原。
+    if (RAISE) argv.push('-Raise')
     return runPs(WIN_SCRIPT, argv)
   }
   const argv = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-spectacles",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "description": "Point at one window and let the agent read it clearly. Window scoped screen reading for DeepSeek Harness: look (numbers first), read_text (OCR), see (crop + zoom handed to the host vision).",
   "license": "Apache-2.0",
   "type": "module",
@@ -26,7 +26,9 @@
   ],
   "keywords": [
     "deepseek",
+    "deepseek-harness",
     "dsh",
+    "dsh-plugin",
     "plugin",
     "vision",
     "look",

package/scripts/look-region.ps1

@@ -31,19 +31,15 @@ public class Rg {
 
 $vs = [System.Windows.Forms.SystemInformation]::VirtualScreen
 
-# 先冻一帧屏：遮罩下面是这张定格，选框里露出原图，框外压暗 —— 不动就能选得准
-$bg = New-Object System.Drawing.Bitmap $vs.Width, $vs.Height
-$g0 = [System.Drawing.Graphics]::FromImage($bg)
-$g0.CopyFromScreen($vs.Left, $vs.Top, 0, 0, (New-Object System.Drawing.Size $vs.Width, $vs.Height))
-$g0.Dispose()
-
-$script:bg = $bg
+# 不抓屏幕：这层遮罩只是一块半透明的、能透过它看见下面东西的玻璃，
+# 用来接你的拖动、记下矩形坐标。框选本身不产生任何画面内容。
+$script:W = $vs.Width
+$script:H = $vs.Height
 $script:sel = $null
 $script:dragging = $false
 $script:done = $false
 $script:cancelled = $false
 $script:start = $null
-$script:dim = New-Object System.Drawing.SolidBrush ([System.Drawing.Color]::FromArgb(120, 0, 0, 0))
 $script:pen = New-Object System.Drawing.Pen ([System.Drawing.Color]::FromArgb(255, 0, 205, 120)), 2
 $script:penDot = New-Object System.Drawing.Pen ([System.Drawing.Color]::FromArgb(200, 255, 255, 255)), 1
 $script:font = New-Object System.Drawing.Font 'Microsoft YaHei UI', 12, ([System.Drawing.FontStyle]::Bold)
@@ -59,13 +55,14 @@ $form.ShowInTaskbar = $false
 $form.Cursor = [System.Windows.Forms.Cursors]::Cross
 $form.KeyPreview = $true
 $form.BackColor = [System.Drawing.Color]::Black
+$form.Opacity = 0.22
 try { $form.GetType().GetProperty('DoubleBuffered', 'Instance,NonPublic').SetValue($form, $true) } catch {}
 
 function Draw-Tag($g, $text, $x, $y) {
   $sz = $g.MeasureString($text, $script:font)
   $w = [int]$sz.Width + 16; $h = [int]$sz.Height + 8
-  $bx = [Math]::Max(0, [Math]::Min($x, $script:bg.Width - $w))
-  $by = [Math]::Max(0, [Math]::Min($y, $script:bg.Height - $h))
+  $bx = [Math]::Max(0, [Math]::Min($x, $script:W - $w))
+  $by = [Math]::Max(0, [Math]::Min($y, $script:H - $h))
   $g.FillRectangle($script:brBox, $bx, $by, $w, $h)
   $g.DrawString($text, $script:font, $script:brText, ($bx + 8), ($by + 4))
 }
@@ -73,19 +70,12 @@ function Draw-Tag($g, $text, $x, $y) {
 $form.Add_Paint({
     param($s, $e)
     $g = $e.Graphics
-    $g.DrawImageUnscaled($script:bg, 0, 0)
     $r = $script:sel
     if ($r -and $r.Width -gt 0 -and $r.Height -gt 0) {
-      $W = $script:bg.Width; $H = $script:bg.Height
-      $g.FillRectangle($script:dim, 0, 0, $W, [Math]::Max(0, $r.Top))
-      $g.FillRectangle($script:dim, 0, $r.Bottom, $W, [Math]::Max(0, $H - $r.Bottom))
-      $g.FillRectangle($script:dim, 0, $r.Top, [Math]::Max(0, $r.Left), $r.Height)
-      $g.FillRectangle($script:dim, $r.Right, $r.Top, [Math]::Max(0, $W - $r.Right), $r.Height)
       $g.DrawRectangle($script:pen, $r)
       Draw-Tag $g ("{0} x {1}" -f $r.Width, $r.Height) ($r.Left + 6) ($r.Top + 6)
     }
     else {
-      $g.FillRectangle($script:dim, 0, 0, $script:bg.Width, $script:bg.Height)
       Draw-Tag $g '拖一个框；Esc 取消' 40 40
     }
   })

package/scripts/look2.ps1

@@ -3,6 +3,7 @@
   [string]$Crop = "",
   [double]$Scale = 1.0,
   [switch]$Image,
+  [switch]$Raise,
   [switch]$List,
   [string]$Out = "",
   [string]$SaveDir = ""
@@ -28,6 +29,7 @@ public class W2 {
   [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr h, out uint pid);
   [DllImport("user32.dll")] public static extern int GetWindowLong(IntPtr h, int idx);
   [DllImport("user32.dll")] public static extern bool PrintWindow(IntPtr h, IntPtr hdc, uint flags);
+  [DllImport("user32.dll", SetLastError = true)] public static extern bool SetWindowPos(IntPtr h, IntPtr after, int x, int y, int cx, int cy, uint flags);
 
   public struct RECT { public int Left, Top, Right, Bottom; }
 
@@ -117,7 +119,36 @@ $hdc = $g.GetHdc()
 $ok = [W2]::PrintWindow($w.H, $hdc, 2)
 $g.ReleaseHdc($hdc)
 $g.Dispose()
-if (-not $ok) { @{ ok = $false; error = "PrintWindow failed" } | ConvertTo-Json -Compress; exit 1 }
+$source = 'printwindow'
+if (-not $ok) {
+  if (-not $Raise) {
+    @{ ok = $false; error = 'printwindow-failed' } | ConvertTo-Json -Compress
+    exit 1
+  }
+  # 这个窗口不吃「重画」这条请求（GPU 直绘常见）。临时把它提到最上层，从屏幕抓它那一块，再立刻还原。
+  # 不抢焦点（NOACTIVATE）、不移动、不改大小。
+  $exBefore = [W2]::GetWindowLong($w.H, -20)
+  $wasTop = (($exBefore -band 0x0008) -ne 0)
+  $raised = [W2]::SetWindowPos($w.H, [IntPtr](-1), 0, 0, 0, 0, (0x0002 -bor 0x0001 -bor 0x0010))
+  if (-not $raised) {
+    # 置顶被拒（有些游戏/带反截屏保护的程序会拒绝 SetWindowPos）。这时屏幕那块是别的窗口，抓了就是错图，宁可报错。
+    $werr = [System.Runtime.InteropServices.Marshal]::GetLastWin32Error()
+    @{ ok = $false; error = 'raise-failed'; win32Error = $werr; hint = '这个窗口不让被提到最前，此时抓屏会抓到压在上面的窗口，所以没有出图' } | ConvertTo-Json -Compress
+    exit 1
+  }
+  try {
+    Start-Sleep -Milliseconds 90
+    $g2 = [System.Drawing.Graphics]::FromImage($full)
+    $sz = New-Object System.Drawing.Size ([int]$ww), ([int]$wh)
+    $g2.CopyFromScreen([int]$w.L, [int]$w.T, 0, 0, $sz)
+    $g2.Dispose()
+    $source = 'screen-raised'
+  } finally {
+    if (-not $wasTop) {
+      [W2]::SetWindowPos($w.H, [IntPtr](-2), 0, 0, 0, 0, (0x0002 -bor 0x0001 -bor 0x0010)) | Out-Null
+    }
+  }
+}
 
 # 可选区域裁剪（相对窗口左上角）
 $rect = New-Object System.Drawing.Rectangle 0, 0, $ww, $wh
@@ -198,7 +229,7 @@ $avg = "#{0:X2}{1:X2}{2:X2}" -f [int]($sumR / $n), [int]($sumG / $n), [int]($sum
 $res = [ordered]@{
   ok        = $true
   when      = (Get-Date -Format 'yyyy-MM-dd HH:mm:ss.fff')
-  source    = 'printwindow'
+  source    = $source
   window    = [ordered]@{ hwnd = [int64]$w.H; title = $w.Title; pid = $w.Pid; rect = @($w.L, $w.T, $ww, $wh) }
   region    = @($rect.X, $rect.Y, $rect.Width, $rect.Height)
   avgColor  = $avg