dsh-windows-tray 1.0.7 → 1.0.9

package/launcher/dsh-lib.ps1

@@ -12,7 +12,7 @@ $URL     = "http://127.0.0.1:$PORT"
 $LOG_DIR = Join-Path (Join-Path $env:USERPROFILE '.dsh\logs') 'dsh-windows-tray'   # 本插件专属日志目录 (logs\<插件名>\, 边界规则见 release-standards §3.1)
 $WT      = "$env:LOCALAPPDATA\Microsoft\WindowsApps\wt.exe"
 $PWSH    = 'D:\Program Files (x86)\PowerShell-7.6.4\pwsh.exe'
-$TRAY_VERSION = '1.0.7'   # 托盘版本 (与 npm 包版本同步, 用于日志/排查)
+$TRAY_VERSION = '1.0.9'   # 托盘版本 (与 npm 包版本同步, 用于日志/排查)
 $TRAY_PKG     = 'dsh-windows-tray'   # npm 包名 (托盘自更新)
 $TRAY_SCRIPT = Join-Path $PSScriptRoot 'dsh-tray.ps1'
 
@@ -85,7 +85,7 @@ function Start-Dsh {
     if ($pids.Count -gt 0) {
         Write-Host "[dsh] 已在运行: $URL (PID $($pids -join ','))" -ForegroundColor Green
         if ($trayStarted) { Write-Host '[tray] 系统托盘已自动启动（右键可控制 DSH）' -ForegroundColor DarkGray }
-        if ($OpenBrowser) { Start-Process $URL }
+        if ($OpenBrowser) { Open-DshWeb }
         return
     }
     Write-Host "[dsh] 启动中 (端口 $PORT)..."
@@ -102,7 +102,7 @@ function Start-Dsh {
         Write-Host "[dsh] 启动成功: $URL" -ForegroundColor Green
         if ($trayStarted) { Write-Host '[tray] 系统托盘已自动启动（右键可控制 DSH）' -ForegroundColor DarkGray }
         Start-Sleep -Seconds 2
-        if ($OpenBrowser) { Start-Process $URL }
+        if ($OpenBrowser) { Open-DshWeb }
     } else {
         Write-Host "[dsh] 启动失败: 12 秒内端口 $PORT 未监听" -ForegroundColor Red
         Write-Host "[dsh] 错误日志: $err（末尾 10 行）"
@@ -207,6 +207,53 @@ function Stop-Tui {
     }
 }
 
+# ---- 打开 Web UI: 智能复用已有标签页 (UIA), 任何失败降级为新开 (最坏=旧行为) ----
+$WEB_TITLE_PREFIX = 'DeepSeek Harness'   # dsh web 页面 <title> 前缀 (标题可能带 Edge 的 睡眠/内存 后缀)
+$BROWSER_PROGID_MAP = @{ 'MSEdgeHTM' = 'msedge'; 'ChromeHTML' = 'chrome' }   # Chromium ProgId → 进程名; 查不到=降级新开
+
+function Open-DshWeb {
+    param([string]$Url = $URL)
+    try {
+        $progId = (Get-ItemProperty 'HKCU:\SOFTWARE\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice' -ErrorAction Stop).ProgId
+        $procName = $BROWSER_PROGID_MAP[$progId]
+        if (-not $procName) { throw "非 Chromium 默认浏览器: $progId" }
+        Add-Type -AssemblyName UIAutomationClient -ErrorAction SilentlyContinue
+        Add-Type -AssemblyName UIAutomationTypes -ErrorAction SilentlyContinue
+        if (-not ('DSH.Win32FG' -as [type])) {
+            Add-Type -TypeDefinition @'
+namespace DSH {
+    using System;
+    using System.Runtime.InteropServices;
+    public static class Win32FG {
+        [DllImport("user32.dll")] public static extern bool SetForegroundWindow(IntPtr hWnd);
+        [DllImport("user32.dll")] public static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+    }
+}
+'@
+        }
+        $root = [System.Windows.Automation.AutomationElement]::RootElement
+        $winCond = New-Object System.Windows.Automation.PropertyCondition([System.Windows.Automation.AutomationElement]::ClassNameProperty, 'Chrome_WidgetWin_1')
+        foreach ($win in $root.FindAll('Children', $winCond)) {
+            if ((Get-Process -Id $win.Current.ProcessId -ErrorAction SilentlyContinue).ProcessName -ne $procName) { continue }
+            $tabCond = New-Object System.Windows.Automation.PropertyCondition([System.Windows.Automation.AutomationElement]::ControlTypeProperty, [System.Windows.Automation.ControlType]::TabItem)
+            foreach ($tab in $win.FindAll('Descendants', $tabCond)) {
+                if (-not ($tab.Current.Name -like "$WEB_TITLE_PREFIX*")) { continue }
+                # 命中已打开的 DSH Web 标签页: 切换过去并激活窗口
+                ([System.Windows.Automation.SelectionItemPattern]$tab.GetCurrentPattern([System.Windows.Automation.SelectionItemPattern]::Pattern)).Select()
+                $hwnd = [IntPtr]$win.Current.NativeWindowHandle
+                [DSH.Win32FG]::ShowWindow($hwnd, 9) | Out-Null   # SW_RESTORE: 最小化也恢复
+                [DSH.Win32FG]::SetForegroundWindow($hwnd) | Out-Null
+                Write-Host "[web] 已切换到已打开的 DSH Web 标签页" -ForegroundColor Green
+                return
+            }
+        }
+        Write-Host "[web] 未发现已打开的 Web 标签页, 新开" -ForegroundColor DarkGray
+    } catch {
+        Write-Host "[web] 切换检测不可用($($_.Exception.Message)), 新开" -ForegroundColor DarkGray
+    }
+    Start-Process $Url
+}
+
 function Show-Status {
     $pids = @(Get-WebPid)
     if ($pids.Count -gt 0) {

package/launcher/dsh-tray.ps1

@@ -195,7 +195,7 @@ $menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator)) | Out-Null
 
 # ---- Web UI 子菜单 ----
 $itemDsh = New-SubMenu 'Web UI'
-$itemOpen    = New-MenuItem '打开 Web UI'  { try { Start-Process $URL } catch { Log "打开 Web 失败: $($_.Exception.Message)" } }
+$itemOpen    = New-MenuItem '打开 Web UI'  { try { Open-DshWeb } catch { Log "打开 Web 失败: $($_.Exception.Message)" } }
 $itemStart   = New-MenuItem '启动 Web UI'  { Invoke-DshAction 'start' }
 $itemStop    = New-MenuItem '停止 Web UI'  {
     $r = [System.Windows.Forms.MessageBox]::Show('确定停止 Web UI 服务？Web 界面与当前会话将关闭。', 'DSH 系统托盘', 'YesNo', 'Question', 'Button2')
@@ -336,7 +336,7 @@ $notify.Text = "DSH 托盘 · 检测中 (端口 $PORT)"
 $notify.ContextMenuStrip = $menu
 $notify.Visible = $true
 $notify.add_DoubleClick({
-    if (Test-Port $PORT) { Start-Process $URL } else { Show-Balloon 'DSH' 'Web UI 未运行，右键选择「启动 Web UI」' }
+    if (Test-Port $PORT) { Open-DshWeb } else { Show-Balloon 'DSH' 'Web UI 未运行，右键选择「启动 Web UI」' }
 })
 
 function Show-Balloon([string]$title, [string]$text) {

package/launcher/dsh-update.ps1

@@ -119,14 +119,15 @@ if (-not (Test-Path $newInstall)) {
 }
 
 # 3) 运行新包 install.ps1 (重新部署 + 快捷方式, 不启动托盘; -Auto=隐藏窗口非交互)
-#    v1.0.7: 改 Run-HiddenPwsh — install.ps1 输出含中文, cmd >> 会写 GBK 回读乱码; Out-File 统一 UTF-8
+#    v1.0.8: 改用全流合并 *>&1 — 2>&1 捕不到 Write-Host 信息流, 中文经隐形控制台编码变 '?';
+#    $InformationPreference='Continue' 让信息流进管道, Out-File 统一 UTF-8
 #    v1.0.5: 显式传本机适配值 (取自点源的 dsh-lib, install 不必重新探测; 自定义安装位置必需)
 $dshRoot = Split-Path $DSH_CMD -Parent
 $deployLog = Join-Path $LOG_DIR 'dsh-update-deploy.log'
 Remove-Item $deployLog -Force -ErrorAction SilentlyContinue
-$deployPwsh = '-ExecutionPolicy Bypass -Command "$ErrorActionPreference=''Continue''; try { & ''' + $newInstall + ''' -Auto -NoTrayStart' +
+$deployPwsh = '-ExecutionPolicy Bypass -Command "$InformationPreference=''Continue''; $ErrorActionPreference=''Continue''; try { & ''' + $newInstall + ''' -Auto -NoTrayStart' +
     ' -DshRoot ''' + $dshRoot + ''' -Port ' + $PORT +
-    ' -NodePath ''' + $NODE + ''' -PwshPath ''' + $PWSH + ''' 2>&1 |' +
+    ' -NodePath ''' + $NODE + ''' -PwshPath ''' + $PWSH + ''' *>&1 |' +
     ' Out-File -FilePath ''' + $deployLog + ''' -Encoding utf8 } catch {' +
     ' $_ | Out-File -FilePath ''' + $deployLog + ''' -Append -Encoding utf8; exit 1 }; exit 0'
 $code = Run-HiddenPwsh $PWSH $deployPwsh 120000

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-windows-tray",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "DSH (DeepSeek Harness) Windows 系统托盘: 蓝/灰鲸鱼状态图标 + Web/TUI 一键启停控制。纯 PowerShell + WinForms, 零依赖。",
   "license": "MIT",
   "author": "jankin_lv",