dsh-windows-tray 1.0.2 → 1.0.4

package/launcher/dsh-lib.ps1

@@ -12,7 +12,7 @@ $URL     = "http://127.0.0.1:$PORT"
 $LOG_DIR = "$env:USERPROFILE\.dsh\logs"
 $WT      = "$env:LOCALAPPDATA\Microsoft\WindowsApps\wt.exe"
 $PWSH    = 'D:\Program Files (x86)\PowerShell-7.6.4\pwsh.exe'
-$TRAY_VERSION = '1.0.2'   # 托盘版本 (与 npm 包版本同步, 用于日志/排查)
+$TRAY_VERSION = '1.0.4'   # 托盘版本 (与 npm 包版本同步, 用于日志/排查)
 $TRAY_PKG     = 'dsh-windows-tray'   # npm 包名 (托盘自更新)
 $TRAY_SCRIPT = Join-Path $PSScriptRoot 'dsh-tray.ps1'
 
@@ -89,6 +89,13 @@ function Start-Tui {
         Write-Host "[tui] TUI 已在运行 (PID $($existing.ProcessId -join ',')), 不重复启动" -ForegroundColor Yellow
         return
     }
+    # 清理上次强杀残留的外壳 (node 已死但 pwsh -NoExit 窗口还在)
+    $stale = @(Get-TuiTree)
+    if ($stale.Count -gt 0) {
+        Write-Host '[tui] 清理上次残留的 TUI 外壳进程' -ForegroundColor DarkGray
+        foreach ($p in $stale) { & taskkill /PID $p.ProcessId /T /F 2>$null | Out-Null }
+        Start-Sleep -Milliseconds 500
+    }
     $cmdLine = "& '$DSH_CMD' --profile dsh-tui"
     if (Test-Path $WT) {
         $args = "new-tab --title `"DSH TUI`" pwsh -NoExit -Command `"$cmdLine`""
@@ -103,21 +110,53 @@ function Start-Tui {
     }
 }
 
+# TUI 进程树: 外壳 pwsh(-NoExit) → cmd(dsh.cmd) → node(bin.js), 三层命令行都含 dsh-tui
+# 按进程名白名单过滤, 防止误杀命令行里恰好含 dsh-tui 的其他程序 (如 WindowsTerminal.exe 本体)
+function Get-TuiTree {
+    Get-CimInstance Win32_Process -ErrorAction SilentlyContinue | Where-Object {
+        $_.ProcessId -ne $PID -and $_.CommandLine -and
+        $_.CommandLine -match 'dsh-tui' -and $_.Name -match '^(node|cmd|pwsh|powershell)\.exe$'
+    }
+}
+
+# 真正的 TUI 主进程 (node) —— 供状态显示 / 防重复启动
 function Get-TuiProcesses {
-    Get-CimInstance Win32_Process -Filter "Name='node.exe'" -ErrorAction SilentlyContinue |
-        Where-Object { $_.CommandLine -match 'dsh-tui' }
+    @(Get-TuiTree | Where-Object { $_.Name -eq 'node.exe' })
 }
 
 function Stop-Tui {
-    $tui = @(Get-TuiProcesses)
-    if ($tui.Count -eq 0) { Write-Host '[tui] TUI: 未在运行'; return }
-    foreach ($p in $tui) {
-        Write-Host "[tui] 停止 TUI 进程 $($p.ProcessId)"
-        & taskkill /PID $p.ProcessId /T /F 2>$null | Out-Null
+    $tree = @(Get-TuiTree)
+    if ($tree.Count -eq 0) { Write-Host '[tui] TUI: 未在运行'; return }
+    # 从树根整树终止 (根 = 父进程不在树中的进程, 即 pwsh -NoExit 外壳)。
+    # 只杀 node 会导致外壳与窗口残留, 终端停在 raw mode 刷乱码且关不掉
+    $ids = @($tree | ForEach-Object { $_.ProcessId })
+    $roots = @($tree | Where-Object { $ids -notcontains $_.ParentProcessId })
+    foreach ($r in $roots) {
+        Write-Host "[tui] 停止 TUI 进程树 (根 PID $($r.ProcessId) $($r.Name))"
+        & taskkill /PID $r.ProcessId /T /F 2>$null | Out-Null
+    }
+    for ($i = 0; $i -lt 5; $i++) {
+        Start-Sleep -Milliseconds 600
+        if (@(Get-TuiTree).Count -eq 0) { break }
+    }
+    if (@(Get-TuiTree).Count -gt 0) { Write-Host '[tui] TUI 进程未完全退出，请稍后重试' -ForegroundColor Red }
+    else {
+        # 收尾: 关闭专为 TUI 开的 Windows Terminal 窗口。
+        # 强杀外壳退出码非 0, WT 默认 closeOnExit=graceful 不自动关标签, 会留死面板;
+        # 仅当该 WT 已无任何存活子进程时才关 — 用户在窗口里另开的标签仍在, 此时不动
+        $wts = @(Get-CimInstance Win32_Process -Filter "Name='WindowsTerminal.exe'" -ErrorAction SilentlyContinue |
+            Where-Object { $_.CommandLine -and $_.CommandLine -match 'dsh-tui' })
+        foreach ($w in $wts) {
+            $kids = @(Get-CimInstance Win32_Process -ErrorAction SilentlyContinue | Where-Object { $_.ParentProcessId -eq $w.ProcessId })
+            if ($kids.Count -eq 0) {
+                Write-Host "[tui] 关闭 TUI 终端窗口 (PID $($w.ProcessId))"
+                & taskkill /PID $w.ProcessId /F 2>$null | Out-Null
+            } else {
+                Write-Host "[tui] 终端窗口 (PID $($w.ProcessId)) 还有其他标签页, 保留" -ForegroundColor DarkGray
+            }
+        }
+        Write-Host '[tui] TUI 已停止' -ForegroundColor Yellow
     }
-    Start-Sleep -Seconds 1
-    if (@(Get-TuiProcesses).Count -gt 0) { Write-Host '[tui] TUI 进程未完全退出，请稍后重试' -ForegroundColor Red }
-    else { Write-Host '[tui] TUI 已停止' -ForegroundColor Yellow }
 }
 
 function Show-Status {

package/launcher/dsh-menu.ps1

@@ -1,93 +1,93 @@
-# dsh (DeepSeek Harness) 启动器 —— 公司机部署 2026-08-14
-# 用法:
-#   交互菜单: 双击 dsh-menu.bat
-#   非交互:   dsh-menu.ps1 -Cmd start|stop|status
-# 坑: 不要在本脚本内对 Start-Process 用 -RedirectStandardOutput
-#     (父进程 stdout 被重定向时挂起, 见 LEARNED #53)
-param(
-    [string]$Cmd
-)
-$ErrorActionPreference = 'Stop'
-
-$DSH_CMD = 'D:\Program Files (x86)\dsh\dsh.cmd'
-$PORT    = 3080
-$URL     = 'http://127.0.0.1:3080'
-
-function Test-Port([int]$port) {
-    $client = New-Object System.Net.Sockets.TcpClient
-    try {
-        $async = $client.BeginConnect('127.0.0.1', $port, $null, $null)
-        if ($async.AsyncWaitHandle.WaitOne(500) -and $client.Connected) { return $true }
-        return $false
-    } catch { return $false }
-    finally { $client.Close() }
-}
-
-function Start-Dsh {
-    if (Test-Port $PORT) {
-        Write-Output "[dsh] 端口 $PORT 已监听, 服务已在运行, 不重复启动"
-        return
-    }
-    Start-Process -FilePath $DSH_CMD -ArgumentList 'web' -WindowStyle Hidden
-    Start-Sleep -Seconds 6
-    if (Test-Port $PORT) {
-        Write-Output "[dsh] 启动成功: $URL"
-    } else {
-        Start-Sleep -Seconds 5
-        if (Test-Port $PORT) {
-            Write-Output "[dsh] 启动成功: $URL"
-        } else {
-            Write-Output "[dsh] 启动失败: 端口 $PORT 未监听, 请手工运行 dsh web 查看报错"
-        }
-    }
-}
-
-function Stop-Dsh {
-    $pids = @((Get-NetTCPConnection -LocalPort $PORT -State Listen -ErrorAction SilentlyContinue).OwningProcess | Select-Object -Unique)
-    if ($pids.Count -eq 0) {
-        Write-Output '[dsh] 服务未在运行'
-        return
-    }
-    foreach ($p in $pids) {
-        Write-Output "[dsh] 停止进程 $p"
-        & taskkill /PID $p /T /F 2>$null | Out-Null
-    }
-    Start-Sleep -Seconds 2
-    if (Test-Port $PORT) { Write-Output '[dsh] 停止失败: 端口仍在监听' }
-    else { Write-Output '[dsh] 已停止' }
-}
-
-function Show-Status {
-    if (Test-Port $PORT) { Write-Output "[dsh] 运行中: $URL" }
-    else { Write-Output '[dsh] 未运行' }
-}
-
-# ---------- 非交互模式 ----------
-if ($Cmd) {
-    switch ($Cmd.ToLower()) {
-        'start'  { Start-Dsh }
-        'stop'   { Stop-Dsh }
-        'status' { Show-Status }
-        default  { Write-Output '用法: dsh-menu.ps1 -Cmd start|stop|status' }
-    }
-    exit
-}
-
-# ---------- 交互菜单 ----------
-while ($true) {
-    Write-Output ''
-    Write-Output '======== dsh 启动器 ========'
-    Show-Status
-    Write-Output '[1] 启动并打开浏览器'
-    Write-Output '[2] 停止'
-    Write-Output '[3] 状态'
-    Write-Output '[0] 退出'
-    $choice = Read-Host '请选择'
-    switch ($choice) {
-        '1' { Start-Dsh; Start-Process $URL; }
-        '2' { Stop-Dsh }
-        '3' { Show-Status }
-        '0' { exit }
-        default { Write-Output '无效选择' }
-    }
-}
+# dsh (DeepSeek Harness) 启动器 —— 公司机部署 2026-08-14
+# 用法:
+#   交互菜单: 双击 dsh-menu.bat
+#   非交互:   dsh-menu.ps1 -Cmd start|stop|status
+# 坑: 不要在本脚本内对 Start-Process 用 -RedirectStandardOutput
+#     (父进程 stdout 被重定向时挂起, 见 LEARNED #53)
+param(
+    [string]$Cmd
+)
+$ErrorActionPreference = 'Stop'
+
+$DSH_CMD = 'D:\Program Files (x86)\dsh\dsh.cmd'
+$PORT    = 3080
+$URL     = 'http://127.0.0.1:3080'
+
+function Test-Port([int]$port) {
+    $client = New-Object System.Net.Sockets.TcpClient
+    try {
+        $async = $client.BeginConnect('127.0.0.1', $port, $null, $null)
+        if ($async.AsyncWaitHandle.WaitOne(500) -and $client.Connected) { return $true }
+        return $false
+    } catch { return $false }
+    finally { $client.Close() }
+}
+
+function Start-Dsh {
+    if (Test-Port $PORT) {
+        Write-Output "[dsh] 端口 $PORT 已监听, 服务已在运行, 不重复启动"
+        return
+    }
+    Start-Process -FilePath $DSH_CMD -ArgumentList 'web' -WindowStyle Hidden
+    Start-Sleep -Seconds 6
+    if (Test-Port $PORT) {
+        Write-Output "[dsh] 启动成功: $URL"
+    } else {
+        Start-Sleep -Seconds 5
+        if (Test-Port $PORT) {
+            Write-Output "[dsh] 启动成功: $URL"
+        } else {
+            Write-Output "[dsh] 启动失败: 端口 $PORT 未监听, 请手工运行 dsh web 查看报错"
+        }
+    }
+}
+
+function Stop-Dsh {
+    $pids = @((Get-NetTCPConnection -LocalPort $PORT -State Listen -ErrorAction SilentlyContinue).OwningProcess | Select-Object -Unique)
+    if ($pids.Count -eq 0) {
+        Write-Output '[dsh] 服务未在运行'
+        return
+    }
+    foreach ($p in $pids) {
+        Write-Output "[dsh] 停止进程 $p"
+        & taskkill /PID $p /T /F 2>$null | Out-Null
+    }
+    Start-Sleep -Seconds 2
+    if (Test-Port $PORT) { Write-Output '[dsh] 停止失败: 端口仍在监听' }
+    else { Write-Output '[dsh] 已停止' }
+}
+
+function Show-Status {
+    if (Test-Port $PORT) { Write-Output "[dsh] 运行中: $URL" }
+    else { Write-Output '[dsh] 未运行' }
+}
+
+# ---------- 非交互模式 ----------
+if ($Cmd) {
+    switch ($Cmd.ToLower()) {
+        'start'  { Start-Dsh }
+        'stop'   { Stop-Dsh }
+        'status' { Show-Status }
+        default  { Write-Output '用法: dsh-menu.ps1 -Cmd start|stop|status' }
+    }
+    exit
+}
+
+# ---------- 交互菜单 ----------
+while ($true) {
+    Write-Output ''
+    Write-Output '======== dsh 启动器 ========'
+    Show-Status
+    Write-Output '[1] 启动并打开浏览器'
+    Write-Output '[2] 停止'
+    Write-Output '[3] 状态'
+    Write-Output '[0] 退出'
+    $choice = Read-Host '请选择'
+    switch ($choice) {
+        '1' { Start-Dsh; Start-Process $URL; }
+        '2' { Stop-Dsh }
+        '3' { Show-Status }
+        '0' { exit }
+        default { Write-Output '无效选择' }
+    }
+}

package/launcher/dsh-tray.bat

@@ -1,10 +1,10 @@
-@echo off
-chcp 65001 >nul
-rem DSH 系统托盘 - double click to start (blue whale = running, gray = stopped)
-rem prefer pwsh (PowerShell 7), fallback to powershell 5.1
-where pwsh >nul 2>nul
-if %errorlevel%==0 (
-  start "" pwsh -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "%~dp0dsh-tray.ps1"
-) else (
-  start "" powershell -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "%~dp0dsh-tray.ps1"
-)
+@echo off
+chcp 65001 >nul
+rem DSH 系统托盘 - double click to start (blue whale = running, gray = stopped)
+rem prefer pwsh (PowerShell 7), fallback to powershell 5.1
+where pwsh >nul 2>nul
+if %errorlevel%==0 (
+  start "" pwsh -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "%~dp0dsh-tray.ps1"
+) else (
+  start "" powershell -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "%~dp0dsh-tray.ps1"
+)