dsh-windows-tray 1.0.13 → 1.0.14

package/launcher/dsh-actions.ps1

@@ -1,9 +1,9 @@
 # dsh-actions.ps1 —— 托盘菜单动作执行器 (由 dsh-tray.ps1 以独立隐藏进程拉起)
-# 用法: pwsh -NoProfile -File dsh-actions.ps1 -Action start|stop|restart|tui-start|tui-stop
+# 用法: pwsh -NoProfile -File dsh-actions.ps1 -Action start|stop|restart|tui-start|tui-stop|backup
 # 动作在独立进程执行, 托盘 UI 线程保持响应; 日志写入 ~/.dsh/logs/dsh-tray-actions.log
 param(
     [Parameter(Mandatory = $true)]
-    [ValidateSet('start', 'stop', 'restart', 'tui-start', 'tui-stop')]
+    [ValidateSet('start', 'stop', 'restart', 'tui-start', 'tui-stop', 'backup')]
     [string]$Action
 )
 $ErrorActionPreference = 'Stop'
@@ -20,29 +20,68 @@ try {
     switch ($Action) {
         'start' {
             Log '启动 DSH (来自系统托盘)'
-            Start-Dsh -OpenBrowser:$false
+            if (-not (Start-Dsh -OpenBrowser:$false)) { Log '启动动作失败：12 秒内端口未监听（详见 web-menu.err.log）'; exit 1 }
             Log '启动动作完成'
         }
         'stop' {
             Log '停止 DSH (来自系统托盘)'
-            Stop-Dsh
+            if (-not (Stop-Dsh)) { Log '停止动作失败：端口未释放'; exit 1 }
             Log '停止动作完成'
         }
         'restart' {
             Log '重启 DSH (来自系统托盘)'
-            Restart-Dsh
+            if (-not (Restart-Dsh)) { Log '重启动作失败：12 秒内端口未监听（详见 web-menu.err.log）'; exit 1 }
             Log '重启动作完成'
         }
         'tui-start' {
             Log '启动 TUI (来自系统托盘)'
-            Start-Tui
+            if (-not (Start-Tui)) { Log 'TUI 启动动作失败：主进程 6 秒内未出现（看 TUI 窗口报错）'; exit 1 }
             Log 'TUI 启动动作完成'
         }
         'tui-stop' {
             Log '停止 TUI (来自系统托盘)'
-            Stop-Tui
+            if (-not (Stop-Tui)) { Log 'TUI 停止动作失败：进程未完全退出'; exit 1 }
             Log 'TUI 停止动作完成'
         }
+        'backup' {
+            # M2: 人工触发一次备份（用户裁定：只做可见性 + 人工触发，不做空窗告警/自动补跑）
+            Log '立即备份（来自系统托盘）'
+            # 功能开关准入（**必须在 $needInit 之前**，否则 OFF 档会先跑 init 建库；方案定稿 §4-4）
+            #   exit 4 = 约定的"未启用"码（区别于 exit 3 = 已启用但缺引擎）；已实测：库零变化
+            if (-not $script:BackupEnabled) {
+                Log '备份未启用（本机默认关闭；启用：plugins\dsh-windows-tray\install.ps1 -EnableBackup）'
+                exit 4
+            }
+            # 引擎在 **DSH_HOME**\tools（install.ps1 部署位），不是安装根 ~\.dsh\tools——非默认数据目录机器
+            # （DSH_HOME=D:\dsh 等）写死 USERPROFILE 会"备份引擎不存在"（2026-09-22 LJS 实测）
+            $dshHome = if ($env:DSH_HOME) { $env:DSH_HOME } else { Join-Path $env:USERPROFILE '.dsh' }
+            $tool = Join-Path $dshHome 'tools\dsh-backup.mjs'
+            # 引擎不在位 ⇒ **明说"未就绪 + 怎么补"**，不许裸失败。托盘不耦合引擎（本 npm 包只含 UI/动作），
+            #   别人只装本包时走这条；exit=3 = 约定的"未就绪"码，托盘据此显示"未就绪"而不是"失败"。
+            if (-not (Test-Path -LiteralPath $tool)) {
+                Log "备份未就绪：缺引擎 $tool（两步部署第二步 = personal-docs\dsh\config\install.ps1）"
+                Log '备份未就绪：详见托盘 README「前置依赖」'
+                exit 3
+            }
+            # 首跑自动建库（兑现菜单文案"首次「立即备份」会自动挑盘建库"；2026-09-22 LJS 实测：action 直接调
+            # backup ⇒ 无库机器 exit=1"先跑 init"）。库未就绪（未配置 / key-salt 缺失）⇒ 先 init：引擎自动探测
+            # 盘位、生成口令文件、记入 backup-store.txt；多库/空间不足时引擎**报错让人决定**（不猜），经日志可见。
+            $needInit = (-not $BACKUP_STORE) -or -not (Test-Path -LiteralPath (Join-Path $BACKUP_STORE 'key-salt'))
+            if ($needInit) {
+                Log '备份库未就绪 ⇒ 先 init（引擎自动挑盘建库）'
+                $iout = (& $NODE $tool init 2>&1 | Out-String).Trim()
+                Log ("init: exit={0} :: {1}" -f $LASTEXITCODE, ($iout -replace "`r?`n", ' | '))
+                if ($LASTEXITCODE -ne 0) { throw "备份库 init 退出码 $LASTEXITCODE" }
+            }
+            foreach ($obj in @('data', 'runtime', 'vault')) {
+                # --strict-empty：扫描到 0 文件也算失败（证伪 F-04：托盘这条路径按退出码判结果，不该拿 0 冒充"对象是空的"）
+                $out = (& $NODE $tool backup $obj --strict-empty 2>&1 | Out-String).Trim()
+                $code = $LASTEXITCODE
+                Log ("backup {0}: exit={1} :: {2}" -f $obj, $code, ($out -replace "`r?`n", ' | '))
+                if ($code -ne 0) { throw "backup $obj 退出码 $code" }
+            }
+            Log '备份动作完成'
+        }
     }
 } catch {
     Log ("动作 {0} 失败: {1}" -f $Action, $_.Exception.Message)

package/launcher/dsh-boot.ps1

@@ -1,56 +1,57 @@
-# dsh-boot.ps1 -- DSH (DeepSeek Harness) logon autostart: bring up dsh web silently.
-#
-# Used by the Startup shortcut "DeepSeek Harness (dsh).lnk":
-#   pwsh.exe -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File <this file>
-#
-# Why this file exists instead of calling dsh-menu.ps1 -Cmd start:
-#   dsh-menu.ps1 starts node WITHOUT redirecting stdout, so the dsh 0.1.2+ launch token
-#   never lands in logs\dsh-windows-tray\web-menu.out.log. The tray parses that file to
-#   open an ALREADY authorized Web UI tab; without it the tray falls back to the naked
-#   URL and the user gets the "authentication required" page after every boot.
-#   Routing through dsh-lib.ps1's Start-Dsh = the exact path the tray menu uses
-#   (hidden node, correct working dir, redirected logs, idempotent tray ensure).
-#
-# ASCII-ONLY ON PURPOSE: this file must stay parseable by Windows PowerShell 5.1 as well
-# as pwsh 7. A no-BOM UTF-8 file with non-ASCII text is silently mis-parsed by 5.1
-# (ParserError) -- that failure mode already cost one machine its autostart
-# (see personal-docs dsh/docs/install-ledger.md, 2026-09-10 entry). Do not add non-ASCII here.
-#
-# Contract / boundaries:
-#   - exits 0 when web is up (started here or already running); exits 1 on any failure
-#   - every outcome is appended to dsh-boot.log (in the tray log dir once dsh-lib loads,
-#     else %TEMP%) -- hidden window means the log is the only diagnostic channel
-#   - idempotent: safe to run next to the tray's own autostart shortcut (dsh-lib reuses
-#     the existing listener; dsh-tray.ps1 is mutex-guarded)
-
-$ErrorActionPreference = 'Stop'
-$script:LogPath = Join-Path $env:TEMP 'dsh-boot.log'
-
-function Write-BootLog([string]$Message) {
-    try {
-        Add-Content -LiteralPath $script:LogPath -Value ('[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $Message) -ErrorAction SilentlyContinue
-    } catch { }
-}
-
-try {
-    $lib = Join-Path $PSScriptRoot 'dsh-lib.ps1'
-    if (-not (Test-Path -LiteralPath $lib)) { throw "dsh-lib.ps1 not found next to dsh-boot.ps1: $lib" }
-    . $lib
-    if ($LOG_DIR) { $script:LogPath = Join-Path $LOG_DIR 'dsh-boot.log' }
-
-    Write-BootLog ('boot begin (pid {0})' -f $PID)
-    $before = @(Get-WebPid)
-    Start-Dsh -OpenBrowser:$false
-    $after = @(Get-WebPid)
-    if ($after.Count -gt 0) {
-        $how = 'started'
-        if ($before.Count -gt 0) { $how = 'already running' }
-        Write-BootLog ('boot ok ({0}), web pid: {1}' -f $how, ($after -join ','))
-    } else {
-        Write-BootLog ('boot FAILED: port {0} not listening after start (see web-menu.err.log)' -f $PORT)
-        exit 1
-    }
-} catch {
-    Write-BootLog ('boot FAILED: ' + $_.Exception.Message)
-    exit 1
-}
+# dsh-boot.ps1 -- DSH (DeepSeek Harness) logon autostart: bring up dsh web silently.
+#
+# Used by the Startup shortcut "DeepSeek Harness (dsh).lnk":
+#   pwsh.exe -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File <this file>
+#
+# Why this file exists instead of calling dsh-menu.ps1 -Cmd start:
+#   dsh-menu.ps1 starts node WITHOUT redirecting stdout, so the dsh 0.1.2+ launch token
+#   never lands in logs\dsh-windows-tray\web-menu.out.log. The tray parses that file to
+#   open an ALREADY authorized Web UI tab; without it the tray falls back to the naked
+#   URL and the user gets the "authentication required" page after every boot.
+#   Routing through dsh-lib.ps1's Start-Dsh = the exact path the tray menu uses
+#   (hidden node, correct working dir, redirected logs, idempotent tray ensure).
+#
+# ASCII-ONLY ON PURPOSE: this file must stay parseable by Windows PowerShell 5.1 as well
+# as pwsh 7. A no-BOM UTF-8 file with non-ASCII text is silently mis-parsed by 5.1
+# (ParserError) -- that failure mode already cost one machine its autostart
+# (see personal-docs dsh/docs/install-ledger.md, 2026-09-10 entry). Do not add non-ASCII here.
+#
+# Contract / boundaries:
+#   - exits 0 when web is up (started here or already running); exits 1 on any failure
+#   - every outcome is appended to dsh-boot.log (in the tray log dir once dsh-lib loads,
+#     else %TEMP%) -- hidden window means the log is the only diagnostic channel
+#   - idempotent: safe to run next to the tray's own autostart shortcut (dsh-lib reuses
+#     the existing listener; dsh-tray.ps1 is mutex-guarded)
+
+$ErrorActionPreference = 'Stop'
+$script:LogPath = Join-Path $env:TEMP 'dsh-boot.log'
+
+function Write-BootLog([string]$Message) {
+    try {
+        Add-Content -LiteralPath $script:LogPath -Value ('[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $Message) -ErrorAction SilentlyContinue
+    } catch { }
+}
+
+try {
+    $lib = Join-Path $PSScriptRoot 'dsh-lib.ps1'
+    if (-not (Test-Path -LiteralPath $lib)) { throw "dsh-lib.ps1 not found next to dsh-boot.ps1: $lib" }
+    . $lib
+    if ($LOG_DIR) { $script:LogPath = Join-Path $LOG_DIR 'dsh-boot.log' }
+
+    Write-BootLog ('boot begin (pid {0})' -f $PID)
+    # R2-P2#1: listening port != dsh web; verify identity (bin.js) before calling "already running"
+    $before = @(Get-WebPid | Where-Object { Test-WebIdentity $_ })
+    Start-Dsh -OpenBrowser:$false
+    $after = @(Get-WebPid | Where-Object { Test-WebIdentity $_ })
+    if ($after.Count -gt 0) {
+        $how = 'started'
+        if ($before.Count -gt 0) { $how = 'already running' }
+        Write-BootLog ('boot ok ({0}), web pid: {1}' -f $how, ($after -join ','))
+    } else {
+        Write-BootLog ('boot FAILED: port {0} not listening after start (see web-menu.err.log)' -f $PORT)
+        exit 1
+    }
+} catch {
+    Write-BootLog ('boot FAILED: ' + $_.Exception.Message)
+    exit 1
+}