dsh-windows-tray 1.0.2 → 1.0.4

package/install.ps1

@@ -1,184 +1,228 @@
-# install.ps1 —— DSH 系统托盘 一键部署（便携包内运行）
-# 用法: pwsh -NoProfile -ExecutionPolicy Bypass -File .\install.ps1 [-DshRoot <目录>] [-PwshPath <路径>] [-NodePath <路径>] [-Port <端口>] [-DshHome <数据目录>] [-Auto] [-NoTrayStart] [-NoShortcuts]
-# 流程: 探测本机路径 -> 探测端口/数据目录并确认 -> 安装到 ~\.dsh\launcher -> 回填全部读取点(含端口两处+DSH_HOME) -> 创建快捷方式 -> 启动托盘
-# v1.0.2: 端口/数据目录实测探测 + 展示确认 + 回填全部读取点 + 自动创建日志目录 (修: param 默认值覆盖 lib 端口 / DSH_HOME 不设 / 日志目录缺失静默丢日志)
-param(
-    [string]$DshRoot,     # dsh 安装根目录 (含 dsh.cmd); 缺省自动探测
-    [string]$PwshPath,    # pwsh.exe 路径; 缺省自动探测
-    [string]$NodePath,    # node.exe 路径; 缺省自动探测
-    [int]$Port = 0,       # Web 端口; 0=从运行中的 web 进程命令行探测
-    [string]$DshHome,     # 数据目录 (含 settings.yaml); 空=自动探测
-    [switch]$Auto,        # 非交互: 直接采用探测值不确认 (自更新等隐藏窗口场景)
-    [switch]$NoTrayStart, # 部署后不自动启动托盘
-    [switch]$NoShortcuts  # 不创建快捷方式
-)
-$ErrorActionPreference = 'Stop'
-$pkgRoot = $PSScriptRoot
-$dst = Join-Path $env:USERPROFILE '.dsh\launcher'
-$logDir = Join-Path $env:USERPROFILE '.dsh\logs'
-
-Write-Host '== DSH 系统托盘 一键部署 ==' -ForegroundColor Cyan
-
-# ---- 探测: 实际 Web 端口 (从运行中的 web 进程命令行提取, 不写死默认值) ----
-function Find-WebPort {
-    $procs = @(Get-CimInstance Win32_Process -Filter "Name='node.exe'" -ErrorAction SilentlyContinue |
-        Where-Object { $_.CommandLine -match 'web' -and $_.CommandLine -match '--port' })
-    foreach ($p in $procs) {
-        if ($p.CommandLine -match '--port\s+(\d+)') { return [int]$Matches[1] }
-    }
-    return $null
-}
-
-# ---- 探测: 实际数据目录 (特征 = settings.yaml; 环境变量优先, 其次默认 ~\.dsh) ----
-function Find-DshHome {
-    if ($env:DSH_HOME -and (Test-Path (Join-Path $env:DSH_HOME 'settings.yaml'))) { return $env:DSH_HOME }
-    $def = Join-Path $env:USERPROFILE '.dsh'
-    if (Test-Path (Join-Path $def 'settings.yaml')) { return $def }
-    return $null
-}
-
-# ---- 交互确认 (Auto 或 stdin 不可用时直接采用探测值) ----
-function Confirm-Value([string]$label, [string]$current) {
-    if ($Auto) { return $current }
-    try {
-        $answer = Read-Host "$label [$current]"
-        if (-not [string]::IsNullOrWhiteSpace($answer)) { return $answer.Trim() }
-    } catch { }   # 非交互环境: Read-Host 失败 -> 采用探测值
-    return $current
-}
-
-# 1) 探测 dsh 安装根目录
-if (-not $DshRoot) {
-    $candidates = @(
-        (Join-Path $pkgRoot '..\..'),          # 包直接放在 dsh 安装根内: <根>\dist\dsh-tray-package\
-        'D:\Program Files (x86)\dsh',
-        'C:\Program Files\dsh',
-        (Join-Path $env:USERPROFILE 'dsh'),
-        (Join-Path $env:LOCALAPPDATA 'dsh')
-    )
-    foreach ($c in $candidates) {
-        $c = [System.IO.Path]::GetFullPath($c)
-        if (Test-Path (Join-Path $c 'dsh.cmd')) { $DshRoot = $c; break }
-    }
-}
-$dsdCmd = Join-Path $DshRoot 'dsh.cmd'
-if (-not (Test-Path $dsdCmd)) { throw "未找到 dsh 安装目录 (缺少 dsh.cmd: $dsdCmd)。请用 -DshRoot 指定。" }
-Write-Host "[1/7] dsh 根目录: $DshRoot" -ForegroundColor Green
-
-# 2) 探测 pwsh (PowerShell 7)
-if (-not $PwshPath) {
-    $cmd = Get-Command pwsh -ErrorAction SilentlyContinue
-    if ($cmd) { $PwshPath = $cmd.Source }
-    elseif (Test-Path 'C:\Program Files\PowerShell\7\pwsh.exe') { $PwshPath = 'C:\Program Files\PowerShell\7\pwsh.exe' }
-    elseif (Test-Path 'D:\Program Files (x86)\PowerShell-7.6.4\pwsh.exe') { $PwshPath = 'D:\Program Files (x86)\PowerShell-7.6.4\pwsh.exe' }
-}
-if (-not $PwshPath -or -not (Test-Path $PwshPath)) { throw "未找到 pwsh (PowerShell 7)。请用 -PwshPath 指定。" }
-# 版本校验: 托盘常驻进程依赖 PowerShell 7.x (5.1 只能降级运行)
-$pwshVer = & $PwshPath -NoProfile -Command '$PSVersionTable.PSVersion.ToString()' 2>$null
-if ($pwshVer -notmatch '^7\.') { throw "pwsh 必须是 PowerShell 7.x (检测到: $pwshVer)。请安装 PowerShell 7 或用 -PwshPath 指定。" }
-Write-Host "[2/7] pwsh: $PwshPath (v$pwshVer)" -ForegroundColor Green
-
-# 3) 探测 node
-if (-not $NodePath) {
-    $cmd = Get-Command node -ErrorAction SilentlyContinue
-    if ($cmd) { $NodePath = $cmd.Source }
-    elseif (Test-Path 'C:\Program Files\nodejs\node.exe') { $NodePath = 'C:\Program Files\nodejs\node.exe' }
-}
-if (-not $NodePath -or -not (Test-Path $NodePath)) { throw "未找到 node.exe。请用 -NodePath 指定。" }
-# 版本校验: 需要 ≥ 18 (dsh 本体运行要求)
-$nodeVer = & $NodePath -v 2>$null
-if ($nodeVer -notmatch '^v(\d+)\.') { throw "无法识别 node 版本 (检测到: $nodeVer)。请用 -NodePath 指定有效 node.exe。" }
-if ([int]$Matches[1] -lt 18) { throw "node 必须 ≥ 18 (检测到: $nodeVer)。请升级 Node.js 或用 -NodePath 指定。" }
-Write-Host "[3/7] node: $NodePath (v$($Matches[1]))" -ForegroundColor Green
-
-# 4) 探测 Web 端口 + 数据目录, 展示确认
-if ($Port -eq 0) {
-    $probed = Find-WebPort
-    if ($probed) { $Port = $probed }
-}
-if (-not $DshHome) {
-    $probed = Find-DshHome
-    if ($probed) { $DshHome = $probed }
-}
-if ($Port -eq 0) { $Port = 3088; Write-Host '警告: 未检测到运行中的 web 进程, 端口取包默认 3088 (如不符请用 -Port 指定)' -ForegroundColor Yellow }
-if (-not $DshHome) { $DshHome = Join-Path $env:USERPROFILE '.dsh'; Write-Host "警告: 未探测到数据目录 (无 settings.yaml), 取默认 $DshHome (如不符请用 -DshHome 指定)" -ForegroundColor Yellow }
-$Port = [int](Confirm-Value 'Web 端口' "$Port")
-$DshHome = Confirm-Value '数据目录' $DshHome
-Write-Host "[4/7] Web 端口: $Port ; 数据目录: $DshHome" -ForegroundColor Green
-
-# 5) 安装到 ~\.dsh\launcher
-New-Item -ItemType Directory -Force -Path $dst | Out-Null
-Copy-Item -Path (Join-Path $pkgRoot 'launcher\*') -Destination $dst -Recurse -Force
-Write-Host ('[5/7] 已安装到 ' + $dst) -ForegroundColor Green
-
-# 6) 回填全部读取点 + 自动创建日志目录
-$lib = Join-Path $dst 'dsh-lib.ps1'
-$tray = Join-Path $dst 'dsh-tray.ps1'
-$bin = Join-Path $DshRoot 'node_modules\@deepseek-ai\dsh\lib\bin.js'
-if (-not (Test-Path $bin)) { Write-Host "警告: 未找到 $bin (dsh 包结构可能不同), 请检查 dsh-lib.ps1 的 \$BIN" -ForegroundColor Yellow }
-$map = [ordered]@{
-    '$DSH_CMD = ' = "`$DSH_CMD = '$($DshRoot -replace "'", "''")\dsh.cmd'"
-    '$NODE    = ' = "`$NODE    = '$($NodePath -replace "'", "''")'"
-    '$BIN     = ' = "`$BIN     = '$($bin -replace "'", "''")'"
-    '$WORKDIR = ' = "`$WORKDIR = '$($DshRoot -replace "'", "''")'"
-    '$PORT    = ' = "`$PORT    = $Port"
-    '$PWSH    = ' = "`$PWSH    = '$($PwshPath -replace "'", "''")'"
-}
-$lines = Get-Content $lib
-for ($i = 0; $i -lt $lines.Count; $i++) {
-    foreach ($k in $map.Keys) {
-        if ($lines[$i].StartsWith($k)) { $lines[$i] = $map[$k]; break }
-    }
-}
-# DSH_HOME: 先清旧行, 非默认数据目录时写入 (默认 ~\.dsh 不设 = dsh 原生行为)
-$lines = @($lines | Where-Object { $_ -notmatch '^\$env:DSH_HOME\s*=' })
-$defaultHome = Join-Path $env:USERPROFILE '.dsh'
-if ($DshHome -ne $defaultHome) {
-    $lines = @($lines | ForEach-Object {
-        if ($_ -match '^\$WORKDIR') { $_; "`$env:DSH_HOME = '$($DshHome -replace "'", "''")'   # 数据目录 (install 回填)" }
-        else { $_ }
-    })
-}
-Set-Content -Path $lib -Value $lines -Encoding utf8
-# dsh-tray.ps1 param 默认值 (点源 lib 后 $PORT = $Port 会把 lib 改好的端口覆盖回去, 必须两处一致)
-# 注意: param 块是多行格式 (param( 换行 [int]$Port = …), 只匹配参数行本身
-$trayText = Get-Content $tray -Raw
-$trayText = $trayText -replace '\[int\]\$Port = \d+', "[int]`$Port = $Port"
-Set-Content -Path $tray -Value $trayText -Encoding utf8
-# 自动创建日志目录 (缺失时 Add-Content -ErrorAction SilentlyContinue 会静默丢日志, 零排查线索)
-New-Item -ItemType Directory -Force -Path $logDir | Out-Null
-Write-Host "[6/7] 已回填 (端口 $Port ×2处 + DSH_HOME) + 日志目录就绪" -ForegroundColor Green
-
-# 快捷方式: 开机自启 + 桌面
-if (-not $NoShortcuts) {
-    $ws = New-Object -ComObject WScript.Shell
-    $icon = Join-Path $dst 'icons\dsh-tray-running.ico,0'
-    $argsLine = '-NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "' + (Join-Path $dst 'dsh-tray.ps1') + '"'
-    foreach ($target in @(
-        @{ Dir = [Environment]::GetFolderPath('Startup'); Name = 'DSH 系统托盘.lnk'; Desc = 'DSH 系统托盘 - 鲸鱼图标=运行状态, 右键控制' },
-        @{ Dir = [Environment]::GetFolderPath('Desktop'); Name = 'DSH 系统托盘.lnk'; Desc = 'DSH 系统托盘 - 双击唤起' }
-    )) {
-        $lnk = $ws.CreateShortcut((Join-Path $target.Dir $target.Name))
-        $lnk.TargetPath = $PwshPath
-        $lnk.Arguments = $argsLine
-        $lnk.WorkingDirectory = $dst
-        $lnk.IconLocation = $icon
-        $lnk.WindowStyle = 7
-        $lnk.Description = $target.Desc
-        $lnk.Save()
-    }
-    Write-Host '快捷方式: 开机自启 + 桌面 已创建' -ForegroundColor Green
-}
-
-# 启动托盘
-if (-not $NoTrayStart) {
-    Start-Process -FilePath $PwshPath -ArgumentList @('-NoProfile', '-ExecutionPolicy', 'Bypass', '-WindowStyle', 'Hidden', '-File', (Join-Path $dst 'dsh-tray.ps1')) -WindowStyle Hidden
-    Write-Host '托盘已启动 (若图标在 ^ 溢出区, 拖到任务栏即可)' -ForegroundColor Green
-}
-
-Write-Host ''
-Write-Host '部署完成! 常用命令:' -ForegroundColor Cyan
-Write-Host "  手动唤起托盘: 桌面「DSH 系统托盘」/ 控制台选项 5"
-Write-Host '  取消自启:     删除启动文件夹里的「DSH 系统托盘.lnk」'
-Write-Host '  卸载:         删除快捷方式 + 删除 ~\.dsh\launcher'
-Write-Host "  验证:         $logDir\dsh-tray.log 首行「托盘启动 (…端口 $Port)」" -ForegroundColor Cyan
+# install.ps1 —— DSH 系统托盘 一键部署（便携包内运行）
+# 用法: pwsh -NoProfile -ExecutionPolicy Bypass -File .\install.ps1 [-DshRoot <目录>] [-PwshPath <路径>] [-NodePath <路径>] [-Port <端口>] [-DshHome <数据目录>] [-Auto] [-NoTrayStart] [-NoShortcuts]
+# 流程: 探测本机路径 -> 探测端口/数据目录并确认 -> 安装到 ~\.dsh\launcher -> 回填全部读取点(含端口两处+DSH_HOME) -> 创建快捷方式 -> 启动托盘
+# v1.0.2: 端口/数据目录实测探测 + 展示确认 + 回填全部读取点 + 自动创建日志目录 (修: param 默认值覆盖 lib 端口 / DSH_HOME 不设 / 日志目录缺失静默丢日志)
+# v1.0.3: 停止确认框枚举修复(DefaultButton2→Button2, Win11 .NET 崩溃框根因) + AUMID 通知身份(开始菜单快捷方式+预授权, 气泡不再显示为 PowerShell)
+param(
+    [string]$DshRoot,     # dsh 安装根目录 (含 dsh.cmd); 缺省自动探测
+    [string]$PwshPath,    # pwsh.exe 路径; 缺省自动探测
+    [string]$NodePath,    # node.exe 路径; 缺省自动探测
+    [int]$Port = 0,       # Web 端口; 0=从运行中的 web 进程命令行探测
+    [string]$DshHome,     # 数据目录 (含 settings.yaml); 空=自动探测
+    [switch]$Auto,        # 非交互: 直接采用探测值不确认 (自更新等隐藏窗口场景)
+    [switch]$NoTrayStart, # 部署后不自动启动托盘
+    [switch]$NoShortcuts  # 不创建快捷方式
+)
+$ErrorActionPreference = 'Stop'
+$pkgRoot = $PSScriptRoot
+$dst = Join-Path $env:USERPROFILE '.dsh\launcher'
+$logDir = Join-Path $env:USERPROFILE '.dsh\logs'
+
+Write-Host '== DSH 系统托盘 一键部署 ==' -ForegroundColor Cyan
+
+# ---- 探测: 实际 Web 端口 (从运行中的 web 进程命令行提取, 不写死默认值) ----
+function Find-WebPort {
+    $procs = @(Get-CimInstance Win32_Process -Filter "Name='node.exe'" -ErrorAction SilentlyContinue |
+        Where-Object { $_.CommandLine -match 'web' -and $_.CommandLine -match '--port' })
+    foreach ($p in $procs) {
+        if ($p.CommandLine -match '--port\s+(\d+)') { return [int]$Matches[1] }
+    }
+    return $null
+}
+
+# ---- 探测: 实际数据目录 (特征 = settings.yaml; 环境变量优先, 其次默认 ~\.dsh) ----
+function Find-DshHome {
+    if ($env:DSH_HOME -and (Test-Path (Join-Path $env:DSH_HOME 'settings.yaml'))) { return $env:DSH_HOME }
+    $def = Join-Path $env:USERPROFILE '.dsh'
+    if (Test-Path (Join-Path $def 'settings.yaml')) { return $def }
+    return $null
+}
+
+# ---- 交互确认 (Auto 或 stdin 不可用时直接采用探测值) ----
+function Confirm-Value([string]$label, [string]$current) {
+    if ($Auto) { return $current }
+    try {
+        $answer = Read-Host "$label [$current]"
+        if (-not [string]::IsNullOrWhiteSpace($answer)) { return $answer.Trim() }
+    } catch { }   # 非交互环境: Read-Host 失败 -> 采用探测值
+    return $current
+}
+
+# 1) 探测 dsh 安装根目录
+if (-not $DshRoot) {
+    $candidates = @(
+        (Join-Path $pkgRoot '..\..'),          # 包直接放在 dsh 安装根内: <根>\dist\dsh-tray-package\
+        (Join-Path $env:ProgramFiles 'dsh'),
+        (Join-Path $env:USERPROFILE 'dsh'),
+        (Join-Path $env:LOCALAPPDATA 'dsh')
+    )
+    foreach ($c in $candidates) {
+        $c = [System.IO.Path]::GetFullPath($c)
+        if (Test-Path (Join-Path $c 'dsh.cmd')) { $DshRoot = $c; break }
+    }
+}
+$dsdCmd = Join-Path $DshRoot 'dsh.cmd'
+if (-not (Test-Path $dsdCmd)) { throw "未找到 dsh 安装目录 (缺少 dsh.cmd: $dsdCmd)。请用 -DshRoot 指定。" }
+Write-Host "[1/7] dsh 根目录: $DshRoot" -ForegroundColor Green
+
+# 2) 探测 pwsh (PowerShell 7)
+if (-not $PwshPath) {
+    $cmd = Get-Command pwsh -ErrorAction SilentlyContinue
+    if ($cmd) { $PwshPath = $cmd.Source }
+    elseif (Test-Path (Join-Path $env:ProgramFiles 'PowerShell\7\pwsh.exe')) { $PwshPath = Join-Path $env:ProgramFiles 'PowerShell\7\pwsh.exe' }
+}
+if (-not $PwshPath -or -not (Test-Path $PwshPath)) { throw "未找到 pwsh (PowerShell 7)。请用 -PwshPath 指定。" }
+# 版本校验: 托盘常驻进程依赖 PowerShell 7.x (5.1 只能降级运行)
+$pwshVer = & $PwshPath -NoProfile -Command '$PSVersionTable.PSVersion.ToString()' 2>$null
+if ($pwshVer -notmatch '^7\.') { throw "pwsh 必须是 PowerShell 7.x (检测到: $pwshVer)。请安装 PowerShell 7 或用 -PwshPath 指定。" }
+Write-Host "[2/7] pwsh: $PwshPath (v$pwshVer)" -ForegroundColor Green
+
+# 3) 探测 node
+if (-not $NodePath) {
+    $cmd = Get-Command node -ErrorAction SilentlyContinue
+    if ($cmd) { $NodePath = $cmd.Source }
+    elseif (Test-Path 'C:\Program Files\nodejs\node.exe') { $NodePath = 'C:\Program Files\nodejs\node.exe' }
+}
+if (-not $NodePath -or -not (Test-Path $NodePath)) { throw "未找到 node.exe。请用 -NodePath 指定。" }
+# 版本校验: 需要 ≥ 18 (dsh 本体运行要求)
+$nodeVer = & $NodePath -v 2>$null
+if ($nodeVer -notmatch '^v(\d+)\.') { throw "无法识别 node 版本 (检测到: $nodeVer)。请用 -NodePath 指定有效 node.exe。" }
+if ([int]$Matches[1] -lt 18) { throw "node 必须 ≥ 18 (检测到: $nodeVer)。请升级 Node.js 或用 -NodePath 指定。" }
+Write-Host "[3/7] node: $NodePath (v$($Matches[1]))" -ForegroundColor Green
+
+# 4) 探测 Web 端口 + 数据目录, 展示确认
+if ($Port -eq 0) {
+    $probed = Find-WebPort
+    if ($probed) { $Port = $probed }
+}
+if (-not $DshHome) {
+    $probed = Find-DshHome
+    if ($probed) { $DshHome = $probed }
+}
+if ($Port -eq 0) { $Port = 3088; Write-Host '警告: 未检测到运行中的 web 进程, 端口取包默认 3088 (如不符请用 -Port 指定)' -ForegroundColor Yellow }
+if (-not $DshHome) { $DshHome = Join-Path $env:USERPROFILE '.dsh'; Write-Host "警告: 未探测到数据目录 (无 settings.yaml), 取默认 $DshHome (如不符请用 -DshHome 指定)" -ForegroundColor Yellow }
+$Port = [int](Confirm-Value 'Web 端口' "$Port")
+$DshHome = Confirm-Value '数据目录' $DshHome
+Write-Host "[4/7] Web 端口: $Port ; 数据目录: $DshHome" -ForegroundColor Green
+
+# 5) 安装到 ~\.dsh\launcher
+New-Item -ItemType Directory -Force -Path $dst | Out-Null
+Copy-Item -Path (Join-Path $pkgRoot 'launcher\*') -Destination $dst -Recurse -Force
+Write-Host ('[5/7] 已安装到 ' + $dst) -ForegroundColor Green
+
+# 6) 回填全部读取点 + 自动创建日志目录
+$lib = Join-Path $dst 'dsh-lib.ps1'
+$tray = Join-Path $dst 'dsh-tray.ps1'
+$bin = Join-Path $DshRoot 'node_modules\@deepseek-ai\dsh\lib\bin.js'
+if (-not (Test-Path $bin)) { Write-Host "警告: 未找到 $bin (dsh 包结构可能不同), 请检查 dsh-lib.ps1 的 \$BIN" -ForegroundColor Yellow }
+$map = [ordered]@{
+    '$DSH_CMD = ' = "`$DSH_CMD = '$($DshRoot -replace "'", "''")\dsh.cmd'"
+    '$NODE    = ' = "`$NODE    = '$($NodePath -replace "'", "''")'"
+    '$BIN     = ' = "`$BIN     = '$($bin -replace "'", "''")'"
+    '$WORKDIR = ' = "`$WORKDIR = '$($DshRoot -replace "'", "''")'"
+    '$PORT    = ' = "`$PORT    = $Port"
+    '$PWSH    = ' = "`$PWSH    = '$($PwshPath -replace "'", "''")'"
+}
+$lines = Get-Content $lib
+for ($i = 0; $i -lt $lines.Count; $i++) {
+    foreach ($k in $map.Keys) {
+        if ($lines[$i].StartsWith($k)) { $lines[$i] = $map[$k]; break }
+    }
+}
+# DSH_HOME: 先清旧行, 非默认数据目录时写入 (默认 ~\.dsh 不设 = dsh 原生行为)
+$lines = @($lines | Where-Object { $_ -notmatch '^\$env:DSH_HOME\s*=' })
+$defaultHome = Join-Path $env:USERPROFILE '.dsh'
+if ($DshHome -ne $defaultHome) {
+    $lines = @($lines | ForEach-Object {
+        if ($_ -match '^\$WORKDIR') { $_; "`$env:DSH_HOME = '$($DshHome -replace "'", "''")'   # 数据目录 (install 回填)" }
+        else { $_ }
+    })
+}
+Set-Content -Path $lib -Value $lines -Encoding utf8
+# dsh-tray.ps1 param 默认值 (点源 lib 后 $PORT = $Port 会把 lib 改好的端口覆盖回去, 必须两处一致)
+# 注意: param 块是多行格式 (param( 换行 [int]$Port = …), 只匹配参数行本身
+$trayText = Get-Content $tray -Raw
+$trayText = $trayText -replace '\[int\]\$Port = \d+', "[int]`$Port = $Port"
+Set-Content -Path $tray -Value $trayText -Encoding utf8
+# 自动创建日志目录 (缺失时 Add-Content -ErrorAction SilentlyContinue 会静默丢日志, 零排查线索)
+New-Item -ItemType Directory -Force -Path $logDir | Out-Null
+Write-Host "[6/7] 已回填 (端口 $Port ×2处 + DSH_HOME) + 日志目录就绪" -ForegroundColor Green
+
+# 快捷方式: 开机自启 + 桌面 + 开始菜单(通知身份)
+if (-not $NoShortcuts) {
+    $ws = New-Object -ComObject WScript.Shell
+    $icon = Join-Path $dst 'icons\dsh-tray-running.ico,0'
+    $argsLine = '-NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "' + (Join-Path $dst 'dsh-tray.ps1') + '"'
+    foreach ($target in @(
+        @{ Dir = [Environment]::GetFolderPath('Startup'); Name = 'DSH 系统托盘.lnk'; Desc = 'DSH 系统托盘 - 鲸鱼图标=运行状态, 右键控制' },
+        @{ Dir = [Environment]::GetFolderPath('Desktop'); Name = 'DSH 系统托盘.lnk'; Desc = 'DSH 系统托盘 - 双击唤起' },
+        @{ Dir = [Environment]::GetFolderPath('Programs'); Name = 'DSH 系统托盘.lnk'; Desc = 'DSH 系统托盘' }
+    )) {
+        $lnk = $ws.CreateShortcut((Join-Path $target.Dir $target.Name))
+        $lnk.TargetPath = $PwshPath
+        $lnk.Arguments = $argsLine
+        $lnk.WorkingDirectory = $dst
+        $lnk.IconLocation = $icon
+        $lnk.WindowStyle = 7
+        $lnk.Description = $target.Desc
+        $lnk.Save()
+        # v1.0.3: 给 .lnk 写 System.AppUserModel.ID —— 气泡通知归属「DSH 系统托盘」而非 PowerShell
+        if (-not ('DSH.Shortcut.Helper' -as [type])) {
+            Add-Type -TypeDefinition @'
+using System;
+using System.Runtime.InteropServices;
+namespace DSH.Shortcut {
+    [StructLayout(LayoutKind.Sequential)]
+    public struct PropertyKey {
+        public Guid fmtid; public uint pid;
+        public PropertyKey(Guid g, uint p) { fmtid = g; pid = p; }
+    }
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    public struct PropVariant {
+        public short vt; public short r1; public short r2; public short r3;
+        public IntPtr ptr; public int x1; public int x2;
+    }
+    [ComImport, Guid("886D8EEB-8CF2-4446-8D02-CDBA1DBDCF99"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IPropertyStore {
+        void GetCount(out uint c); void GetAt(uint i, out PropertyKey k);
+        void GetValue(ref PropertyKey k, out PropVariant v);
+        void SetValue(ref PropertyKey k, ref PropVariant v); void Commit();
+    }
+    public static class Helper {
+        [DllImport("shell32.dll", CharSet = CharSet.Unicode, PreserveSig = false)]
+        private static extern void SHGetPropertyStoreFromParsingName(string path, IntPtr zero, uint flags, ref Guid iid, [MarshalAs(UnmanagedType.Interface)] out IPropertyStore store);
+        public static void SetAumid(string lnkPath, string aumid) {
+            var key = new PropertyKey(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 5); // System.AppUserModel.ID
+            var pv = new PropVariant(); pv.vt = 31; pv.ptr = Marshal.StringToCoTaskMemUni(aumid); // VT_LPWSTR
+            try {
+                Guid iid = typeof(IPropertyStore).GUID; IPropertyStore store;
+                SHGetPropertyStoreFromParsingName(lnkPath, IntPtr.Zero, 2, ref iid, out store); // GPS_READWRITE
+                store.SetValue(ref key, ref pv); store.Commit();
+            } finally { Marshal.FreeCoTaskMem(pv.ptr); }
+        }
+    }
+}
+'@
+        }
+        [DSH.Shortcut.Helper]::SetAumid((Join-Path $target.Dir $target.Name), 'DSH.WindowsTray')
+    }
+    # v1.0.3: 预授权通知（Win11 升级会清应用通知授权, 提前放行 DSH.WindowsTray）
+    $nsKey = 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Notifications\Settings\DSH.WindowsTray'
+    New-Item -Path $nsKey -Force | Out-Null
+    Set-ItemProperty -Path $nsKey -Name 'Enabled' -Value 1 -Type DWord
+    Set-ItemProperty -Path $nsKey -Name 'ShowInActionCenter' -Value 1 -Type DWord
+    Write-Host '快捷方式: 开机自启 + 桌面 + 开始菜单 已创建 (AUMID=DSH.WindowsTray, 通知已预授权)' -ForegroundColor Green
+}
+
+# 启动托盘
+if (-not $NoTrayStart) {
+    Start-Process -FilePath $PwshPath -ArgumentList @('-NoProfile', '-ExecutionPolicy', 'Bypass', '-WindowStyle', 'Hidden', '-File', (Join-Path $dst 'dsh-tray.ps1')) -WindowStyle Hidden
+    Write-Host '托盘已启动 (若图标在 ^ 溢出区, 拖到任务栏即可)' -ForegroundColor Green
+}
+
+Write-Host ''
+Write-Host '部署完成! 常用命令:' -ForegroundColor Cyan
+Write-Host "  手动唤起托盘: 桌面「DSH 系统托盘」/ 控制台选项 5"
+Write-Host '  取消自启:     删除启动文件夹里的「DSH 系统托盘.lnk」'
+Write-Host '  卸载:         删除快捷方式 + 删除 ~\.dsh\launcher'
+Write-Host "  验证:         $logDir\dsh-tray.log 首行「托盘启动 (…端口 $Port)」" -ForegroundColor Cyan

package/launcher/dsh-actions.ps1

@@ -1,50 +1,50 @@
-# dsh-actions.ps1 —— 托盘菜单动作执行器 (由 dsh-tray.ps1 以独立隐藏进程拉起)
-# 用法: pwsh -NoProfile -File dsh-actions.ps1 -Action start|stop|restart|tui-start|tui-stop
-# 动作在独立进程执行, 托盘 UI 线程保持响应; 日志写入 ~/.dsh/logs/dsh-tray-actions.log
-param(
-    [Parameter(Mandatory = $true)]
-    [ValidateSet('start', 'stop', 'restart', 'tui-start', 'tui-stop')]
-    [string]$Action
-)
-$ErrorActionPreference = 'Stop'
-
-. (Join-Path $PSScriptRoot 'dsh-lib.ps1')
-
-$logFile = Join-Path $LOG_DIR 'dsh-tray-actions.log'
-function Log([string]$msg) {
-    $line = ('[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $msg)
-    Add-Content -Path $logFile -Value $line -ErrorAction SilentlyContinue
-}
-
-try {
-    switch ($Action) {
-        'start' {
-            Log '启动 DSH (来自系统托盘)'
-            Start-Dsh -OpenBrowser:$false
-            Log '启动动作完成'
-        }
-        'stop' {
-            Log '停止 DSH (来自系统托盘)'
-            Stop-Dsh
-            Log '停止动作完成'
-        }
-        'restart' {
-            Log '重启 DSH (来自系统托盘)'
-            Restart-Dsh
-            Log '重启动作完成'
-        }
-        'tui-start' {
-            Log '启动 TUI (来自系统托盘)'
-            Start-Tui
-            Log 'TUI 启动动作完成'
-        }
-        'tui-stop' {
-            Log '停止 TUI (来自系统托盘)'
-            Stop-Tui
-            Log 'TUI 停止动作完成'
-        }
-    }
-} catch {
-    Log ("动作 {0} 失败: {1}" -f $Action, $_.Exception.Message)
-    exit 1
-}
+# dsh-actions.ps1 —— 托盘菜单动作执行器 (由 dsh-tray.ps1 以独立隐藏进程拉起)
+# 用法: pwsh -NoProfile -File dsh-actions.ps1 -Action start|stop|restart|tui-start|tui-stop
+# 动作在独立进程执行, 托盘 UI 线程保持响应; 日志写入 ~/.dsh/logs/dsh-tray-actions.log
+param(
+    [Parameter(Mandatory = $true)]
+    [ValidateSet('start', 'stop', 'restart', 'tui-start', 'tui-stop')]
+    [string]$Action
+)
+$ErrorActionPreference = 'Stop'
+
+. (Join-Path $PSScriptRoot 'dsh-lib.ps1')
+
+$logFile = Join-Path $LOG_DIR 'dsh-tray-actions.log'
+function Log([string]$msg) {
+    $line = ('[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $msg)
+    Add-Content -Path $logFile -Value $line -ErrorAction SilentlyContinue
+}
+
+try {
+    switch ($Action) {
+        'start' {
+            Log '启动 DSH (来自系统托盘)'
+            Start-Dsh -OpenBrowser:$false
+            Log '启动动作完成'
+        }
+        'stop' {
+            Log '停止 DSH (来自系统托盘)'
+            Stop-Dsh
+            Log '停止动作完成'
+        }
+        'restart' {
+            Log '重启 DSH (来自系统托盘)'
+            Restart-Dsh
+            Log '重启动作完成'
+        }
+        'tui-start' {
+            Log '启动 TUI (来自系统托盘)'
+            Start-Tui
+            Log 'TUI 启动动作完成'
+        }
+        'tui-stop' {
+            Log '停止 TUI (来自系统托盘)'
+            Stop-Tui
+            Log 'TUI 停止动作完成'
+        }
+    }
+} catch {
+    Log ("动作 {0} 失败: {1}" -f $Action, $_.Exception.Message)
+    exit 1
+}

package/launcher/dsh-control.ps1

@@ -1,40 +1,40 @@
-# DSH 控制台 —— 启动/重启 Web + 启动 TUI + 状态查看 + 系统托盘
-# 部署：2026-08-26；双击桌面「DSH 控制台」或 dsh-control.bat
-# 坑：本脚本由用户独立窗口运行（非 web 子进程），杀/重启 web 安全（PITFALLS §12.2）
-# 2026-08-28: 启动/停止/重启/托盘逻辑抽到 dsh-lib.ps1（与系统托盘共享同一份代码）
-$ErrorActionPreference = 'Stop'
-chcp 65001 > $null
-
-. (Join-Path $PSScriptRoot 'dsh-lib.ps1')
-
-while ($true) {
-    Clear-Host
-    Write-Host ''
-    Write-Host '  ┌──────────────────────────────┐'
-    Write-Host '  │         DSH 控制台           │'
-    Write-Host '  ├──────────────────────────────┤'
-    Write-Host '  │  1) 启动 / 打开 Web (3088)   │'
-    Write-Host '  │  2) 重启 Web                 │'
-    Write-Host '  │  3) 启动 TUI（新终端窗口）   │'
-    Write-Host '  │  4) 查看状态                 │'
-    Write-Host '  │  5) 启动系统托盘             │'
-    Write-Host '  │  0) 退出                     │'
-    Write-Host '  └──────────────────────────────┘'
-    $c = Read-Host '  请选择'
-    switch ($c) {
-        '1' { Start-Dsh }
-        '2' { Restart-Dsh }
-        '3' { Start-Tui }
-        '4' { Show-Status }
-        '5' {
-            if (Ensure-DshTray) {
-                Write-Host '[tray] 系统托盘已在运行（蓝鲸=运行中 / 灰鲸=未运行，右键可控制）' -ForegroundColor Green
-            } else {
-                Write-Host '[tray] 系统托盘已启动（蓝鲸=运行中 / 灰鲸=未运行，右键可控制）' -ForegroundColor Green
-            }
-        }
-        '0' { Write-Host '  再见！'; break }
-        default { Write-Host "  无效选择: $c" -ForegroundColor Red }
-    }
-    if ($c -ne '0') { Write-Host ''; Read-Host '  按回车返回菜单' }
-}
+# DSH 控制台 —— 启动/重启 Web + 启动 TUI + 状态查看 + 系统托盘
+# 部署：2026-08-26；双击桌面「DSH 控制台」或 dsh-control.bat
+# 坑：本脚本由用户独立窗口运行（非 web 子进程），杀/重启 web 安全（PITFALLS §12.2）
+# 2026-08-28: 启动/停止/重启/托盘逻辑抽到 dsh-lib.ps1（与系统托盘共享同一份代码）
+$ErrorActionPreference = 'Stop'
+chcp 65001 > $null
+
+. (Join-Path $PSScriptRoot 'dsh-lib.ps1')
+
+while ($true) {
+    Clear-Host
+    Write-Host ''
+    Write-Host '  ┌──────────────────────────────┐'
+    Write-Host '  │         DSH 控制台           │'
+    Write-Host '  ├──────────────────────────────┤'
+    Write-Host '  │  1) 启动 / 打开 Web (3088)   │'
+    Write-Host '  │  2) 重启 Web                 │'
+    Write-Host '  │  3) 启动 TUI（新终端窗口）   │'
+    Write-Host '  │  4) 查看状态                 │'
+    Write-Host '  │  5) 启动系统托盘             │'
+    Write-Host '  │  0) 退出                     │'
+    Write-Host '  └──────────────────────────────┘'
+    $c = Read-Host '  请选择'
+    switch ($c) {
+        '1' { Start-Dsh }
+        '2' { Restart-Dsh }
+        '3' { Start-Tui }
+        '4' { Show-Status }
+        '5' {
+            if (Ensure-DshTray) {
+                Write-Host '[tray] 系统托盘已在运行（蓝鲸=运行中 / 灰鲸=未运行，右键可控制）' -ForegroundColor Green
+            } else {
+                Write-Host '[tray] 系统托盘已启动（蓝鲸=运行中 / 灰鲸=未运行，右键可控制）' -ForegroundColor Green
+            }
+        }
+        '0' { Write-Host '  再见！'; break }
+        default { Write-Host "  无效选择: $c" -ForegroundColor Red }
+    }
+    if ($c -ne '0') { Write-Host ''; Read-Host '  按回车返回菜单' }
+}