dsh-windows-tray 1.0.4 → 1.0.6

package/install.ps1

@@ -56,6 +56,22 @@ if (-not $DshRoot) {
         (Join-Path $env:USERPROFILE 'dsh'),
         (Join-Path $env:LOCALAPPDATA 'dsh')
     )
+    # v1.0.5: 从运行中 node 进程命令行提取 bin.js 参数路径, 截断到 \node_modules\ 之前
+    # (自定义安装位置的机器: "<根>\node_modules\...\bin.js"; 候选一律经 Test-Path dsh.cmd 验证)
+    Get-CimInstance Win32_Process -Filter "Name='node.exe'" -ErrorAction SilentlyContinue |
+        ForEach-Object {
+            $binJs = $null
+            if ($_.CommandLine -match '"([^"]+bin\.js)"') { $binJs = $Matches[1] }
+            elseif ($_.CommandLine -match '(\S+bin\.js)') { $binJs = $Matches[1] }
+            if ($binJs) {
+                $idx = $binJs.IndexOf('\node_modules\')
+                if ($idx -lt 0) { $idx = $binJs.IndexOf('/node_modules/') }
+                if ($idx -gt 0) { $candidates += $binJs.Substring(0, $idx) }
+            }
+        }
+    # v1.0.5: dsh.cmd 在 PATH 上 (Get-Command 返回的是文件全路径, 取其目录)
+    $onPath = Get-Command dsh.cmd -ErrorAction SilentlyContinue
+    if ($onPath) { $candidates += Split-Path $onPath.Source -Parent }
     foreach ($c in $candidates) {
         $c = [System.IO.Path]::GetFullPath($c)
         if (Test-Path (Join-Path $c 'dsh.cmd')) { $DshRoot = $c; break }

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.4'   # 托盘版本 (与 npm 包版本同步, 用于日志/排查)
+$TRAY_VERSION = '1.0.6'   # 托盘版本 (与 npm 包版本同步, 用于日志/排查)
 $TRAY_PKG     = 'dsh-windows-tray'   # npm 包名 (托盘自更新)
 $TRAY_SCRIPT = Join-Path $PSScriptRoot 'dsh-tray.ps1'
 

package/launcher/dsh-update.ps1

@@ -1,6 +1,9 @@
 # dsh-update.ps1 —— 托盘自更新执行器 (由托盘菜单「更新到最新版」触发, 独立隐藏进程)
 # 流程: npm install -g 最新包 -> 运行新包 install.ps1 (重新部署+改写路径+快捷方式) -> 杀旧托盘 -> 起新托盘
 # 失败时旧托盘不受影响 (旧托盘在最后一步才被终止)
+# v1.0.5: 步骤输出落盘 (dsh-update-npm.log / dsh-update-deploy.log, 失败时尾部进 actions log —
+#         旧版 2>nul 吞报错, 日志只剩退出码无从排查); install.ps1 显式传本机适配值
+#         (-DshRoot/-Port/-NodePath/-PwshPath 取自点源的 dsh-lib, 自定义安装位置不再依赖探测)
 param(
     [int]$OldPid = 0
 )
@@ -25,6 +28,8 @@ function Find-NpmCmd {
 }
 
 # 隐藏执行 cmd /c (CreateNoWindow: 不弹黑窗), 可选超时
+# ⚠️ 调用必须空格分隔传参 (Run-HiddenCmd $cmd $timeout)——写成 ('cmd', timeout) 会把
+#    两者绑成数组并入命令行, 超时值被当成包名/脚本参数 (1.0.5 及以前自更新因此从未成功过)
 function Run-HiddenCmd([string]$cmdLine, [int]$timeoutMs = 0) {
     $psi = New-Object System.Diagnostics.ProcessStartInfo
     $psi.FileName = $env:ComSpec
@@ -65,10 +70,14 @@ if (-not $npm) {
     exit 1
 }
 
-# 1) 安装最新包 (全局)
-$code = Run-HiddenCmd ('/c ""' + $npm + '" install -g ' + $TRAY_PKG + ' 2>nul "', 180000)
+# 1) 安装最新包 (全局; 输出落盘, 失败可查因 — 旧版 2>nul 黑洞)
+$npmLog = Join-Path $LOG_DIR 'dsh-update-npm.log'
+Remove-Item $npmLog -Force -ErrorAction SilentlyContinue
+$installCmd = '/c ""' + $npm + '" install -g ' + $TRAY_PKG + ' >> "' + $npmLog + '" 2>&1 "'
+$code = Run-HiddenCmd $installCmd 180000
 if ($code -ne 0) {
-    Log "自更新失败: npm install 退出码 $code"
+    Log "自更新失败: npm install 退出码 $code (输出: $npmLog)"
+    Get-Content $npmLog -Tail 5 -ErrorAction SilentlyContinue | ForEach-Object { Log "  npm> $_" }
     Show-Balloon '自更新失败：npm install 出错，详见日志' 'Error'
     exit 1
 }
@@ -77,7 +86,8 @@ Log 'npm install -g 完成'
 # 2) 定位新包根目录
 $rootTmp = Join-Path $LOG_DIR 'tray-npm-root.txt'
 Remove-Item $rootTmp -Force -ErrorAction SilentlyContinue
-Run-HiddenCmd ('/c ""' + $npm + '" root -g > "' + $rootTmp + '" 2>nul "') | Out-Null
+$rootCmd = '/c ""' + $npm + '" root -g > "' + $rootTmp + '" 2>nul "'
+Run-HiddenCmd $rootCmd | Out-Null
 $globalRoot = ''
 if (Test-Path $rootTmp) {
     $globalRoot = (Get-Content $rootTmp -Raw).Trim()
@@ -90,10 +100,21 @@ if (-not (Test-Path $newInstall)) {
     exit 1
 }
 
-# 3) 运行新包 install.ps1 (重新部署 + 探测回填 + 快捷方式, 不启动托盘; -Auto=隐藏窗口非交互)
-$code = Run-HiddenCmd ('/c ""' + $PWSH + '" -NoProfile -ExecutionPolicy Bypass -File "' + $newInstall + '" -Auto -NoTrayStart 2>nul "', 120000)
+# 3) 运行新包 install.ps1 (重新部署 + 快捷方式, 不启动托盘; -Auto=隐藏窗口非交互)
+#    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
+$deployCmd = '/c ""' + $PWSH + '" -NoProfile -ExecutionPolicy Bypass -File "' + $newInstall + '" -Auto -NoTrayStart' +
+    ' -DshRoot "' + $dshRoot + '"' +
+    ' -Port ' + $PORT +
+    ' -NodePath "' + $NODE + '"' +
+    ' -PwshPath "' + $PWSH + '"' +
+    ' >> "' + $deployLog + '" 2>&1 "'
+$code = Run-HiddenCmd $deployCmd 120000
 if ($code -ne 0) {
-    Log "自更新失败: install.ps1 退出码 $code"
+    Log "自更新失败: install.ps1 退出码 $code (输出: $deployLog)"
+    Get-Content $deployLog -Tail 5 -ErrorAction SilentlyContinue | ForEach-Object { Log "  deploy> $_" }
     Show-Balloon '自更新失败：部署出错，详见日志' 'Error'
     exit 1
 }

package/package.json

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