diff --git a/auto-setup.ps1 b/auto-setup.ps1 index 7543b79..adebbfc 100644 --- a/auto-setup.ps1 +++ b/auto-setup.ps1 @@ -16,7 +16,7 @@ param( $ErrorActionPreference = "Stop" # ─── 版本号 (每次更新递增, build.ps1 自动读取) ────── -$BWVersion = "1.8.0" +$BWVersion = "1.9.0" # ─── B4: 单实例保护 (防止双击两次导致竞态) ───────── $mutexCreated = $false @@ -1413,10 +1413,15 @@ if ($allOK -and $env:ANTHROPIC_API_KEY) { $splash.Close() $splash.Dispose() - # 启动 Bookworm — 带品牌标题的 PowerShell 窗口 + # 启动 Bookworm — 通过桌面快捷方式的 bat (含自动 git pull) if (-not $SkipLaunch) { - $launchCmd = "title Bookworm Smart Assistant v$BWVersion && cd /d `"$BootDir`" && claude --dangerously-skip-permissions" - Start-Process -FilePath "cmd.exe" -ArgumentList "/k", $launchCmd + $startBat = Join-Path $BootDir "启动Bookworm.bat" + if (Test-Path $startBat) { + Start-Process -FilePath $startBat -WorkingDirectory $BootDir + } else { + $launchCmd = "title Bookworm Smart Assistant v$BWVersion && cd /d `"$BootDir`" && claude --dangerously-skip-permissions" + Start-Process -FilePath "cmd.exe" -ArgumentList "/k", $launchCmd + } } } else { diff --git a/启动Bookworm.bat b/启动Bookworm.bat index 03e1f84..77fd831 100644 --- a/启动Bookworm.bat +++ b/启动Bookworm.bat @@ -6,6 +6,11 @@ cd /d "%~dp0" set NO_PROXY=bww.letcareme.com,code.letcareme.com,letcareme.com,localhost,127.0.0.1 set no_proxy=%NO_PROXY% +:: 静默自动更新 (bookworm-boot + .claude 配置, 失败不阻断启动) +echo [..] 检查更新... +git pull --rebase >nul 2>nul +git -C "%USERPROFILE%\.claude" pull --rebase >nul 2>nul + :: 优先 pwsh7: 新窗口启动 claude, 先从注册表缓存加载凭证 (DPAPI 解密) where pwsh >nul 2>nul if %errorlevel% equ 0 ( diff --git a/更新并启动Bookworm.bat b/更新并启动Bookworm.bat index 5ec6531..0157332 100644 --- a/更新并启动Bookworm.bat +++ b/更新并启动Bookworm.bat @@ -6,6 +6,11 @@ cd /d "%~dp0" set NO_PROXY=bww.letcareme.com,code.letcareme.com,letcareme.com,localhost,127.0.0.1 set no_proxy=%NO_PROXY% +:: 静默自动更新 (bookworm-boot + .claude 配置) +echo [..] 同步更新... +git pull --rebase >nul 2>nul +git -C "%USERPROFILE%\.claude" pull --rebase >nul 2>nul + :: 检测 pwsh7 可用性 where pwsh >nul 2>nul if %errorlevel% equ 0 (