siluzan-tso-cli 1.1.17-beta.1 → 1.1.17-beta.2

package/README.md

@@ -51,7 +51,7 @@ siluzan-tso init -d /path/to/skills  # 写入自定义目录
 siluzan-tso init --force             # 强制覆盖已存在文件
 ```
 
-> **注意**：当前为测试版（1.1.17-beta.1），供内部测试使用。正式发布后安装命令将改为 `npm install -g siluzan-tso-cli`。
+> **注意**：当前为测试版（1.1.17-beta.2），供内部测试使用。正式发布后安装命令将改为 `npm install -g siluzan-tso-cli`。
 
 | 助手                    | 建议 `--ai`                          |
 | ----------------------- | ------------------------------------ |

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.17-beta.1",
-  "publishedAt": 1778229807646
+  "version": "1.1.17-beta.2",
+  "publishedAt": 1778231004836
 }

package/dist/skill/scripts/install.ps1

@@ -14,8 +14,10 @@ $INSTALL_CMD = 'npm install -g siluzan-tso-cli@beta'
 $WEB_BASE    = 'https://www-ci.siluzan.com'
 
 # -- Constants ----------------------------------------------------------------
-$NODE_MAJOR_MIN = 18
-$NPM_MIRROR     = 'https://registry.npmmirror.com'
+$NODE_MAJOR_MIN    = 18
+$NPM_MIRROR        = 'https://registry.npmmirror.com'
+# Git for Windows installer (mirrored on Siluzan CDN; bump version here when needed)
+$GIT_INSTALLER_URL = 'https://staticpn.siluzan.com/assets/git/Git-2.54.0-64-bit.exe'
 
 # -- Helpers ------------------------------------------------------------------
 function Write-Info  { param([string]$Msg) Write-Host "[OK] $Msg" -ForegroundColor Green }
@@ -80,6 +82,85 @@ function Install-NodeFallback {
     throw 'Node.js is required'
 }
 
+# -- Git for Windows ----------------------------------------------------------
+# Some agent clients (Cursor / Claude Code / etc.) have known quirks running
+# PowerShell or cmd commands. We install Git for Windows ahead of time so the
+# user always has a Git Bash fallback to run the equivalent bash installer
+# (`bash <(curl -fsSL .../install.sh)`) when the PowerShell channel misbehaves.
+function Test-GitInstalled {
+    return $null -ne (Get-Command git -ErrorAction SilentlyContinue)
+}
+
+function Test-IsAdmin {
+    try {
+        $id = [Security.Principal.WindowsIdentity]::GetCurrent()
+        $principal = New-Object Security.Principal.WindowsPrincipal($id)
+        return $principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
+    } catch {
+        return $false
+    }
+}
+
+function Install-Git {
+    $tmpFile = Join-Path $env:TEMP 'siluzan-git-installer.exe'
+
+    Write-Info "Downloading Git for Windows: $GIT_INSTALLER_URL"
+    try {
+        $prevProgress = $ProgressPreference
+        $ProgressPreference = 'SilentlyContinue'
+        Invoke-WebRequest -Uri $GIT_INSTALLER_URL -OutFile $tmpFile -UseBasicParsing
+        $ProgressPreference = $prevProgress
+    } catch {
+        Write-Warn "Git installer download failed: $($_.Exception.Message)"
+        return $false
+    }
+
+    if (-not (Test-Path $tmpFile)) {
+        Write-Warn 'Git installer file not found after download'
+        return $false
+    }
+
+    # Inno Setup silent flags. When not admin we point /DIR to %LOCALAPPDATA% so
+    # the installer doesn't try to write to Program Files (which would trigger UAC
+    # or just fail). The installer auto-detects ALLUSERS vs CURRENTUSER mode based
+    # on whether the current process is elevated, so we don't pass /CURRENTUSER
+    # explicitly (not all Git for Windows builds accept that flag).
+    $installArgs = @('/VERYSILENT', '/NORESTART', '/NOCANCEL', '/SP-', '/CLOSEAPPLICATIONS', '/RESTARTAPPLICATIONS')
+    if (Test-IsAdmin) {
+        Write-Info 'Installing Git for Windows system-wide (admin detected)...'
+    } else {
+        $userDir = Join-Path $env:LOCALAPPDATA 'Programs\Git'
+        Write-Info "Installing Git for Windows for current user: $userDir"
+        $installArgs += @("/DIR=$userDir")
+    }
+
+    try {
+        Start-Process -FilePath $tmpFile -ArgumentList $installArgs -Wait -NoNewWindow
+    } catch {
+        Write-Warn "Git installer launch failed: $($_.Exception.Message)"
+        Remove-Item $tmpFile -ErrorAction SilentlyContinue
+        return $false
+    }
+    Remove-Item $tmpFile -ErrorAction SilentlyContinue
+
+    Refresh-Path
+    if (-not (Test-GitInstalled)) {
+        # 安装器有时不会立刻刷新 PATH，按已知路径手动补一次
+        $candidates = @(
+            (Join-Path $env:LOCALAPPDATA 'Programs\Git\cmd'),
+            (Join-Path $env:ProgramFiles 'Git\cmd')
+        )
+        foreach ($p in $candidates) {
+            if (Test-Path (Join-Path $p 'git.exe')) {
+                $env:Path = "$p;$env:Path"
+                break
+            }
+        }
+    }
+
+    return Test-GitInstalled
+}
+
 # -- Main ---------------------------------------------------------------------
 function Main {
     Write-Host ''
@@ -87,10 +168,6 @@ function Main {
     Write-Host "|  $SKILL_LABEL -- Install                    |" -ForegroundColor White
     Write-Host '+---------------------------------------------+' -ForegroundColor White
     Write-Host ''
-    Write-Warn 'Windows note: some agent clients may fail when running PowerShell/cmd commands.'
-    Write-Host '  If this install fails unexpectedly, install Git for Windows and rerun the Bash installer in Git Bash:' -ForegroundColor DarkGray
-    Write-Host '  https://git-scm.com/download/win' -ForegroundColor DarkGray
-    Write-Host ''
 
     # Step 1: Environment check
     Write-Step 'Step 1/4: Environment check'
@@ -123,6 +200,23 @@ function Main {
     }
     Write-Info 'npm ready'
 
+    # Git for Windows: pre-install as a Bash fallback path for agent clients
+    # whose PowerShell/cmd channel is unreliable. Failure here is non-fatal.
+    if (Test-GitInstalled) {
+        Write-Info 'Git for Windows already installed (Git Bash fallback ready)'
+    } else {
+        Write-Warn 'Git for Windows not found, installing as Bash fallback for agent clients...'
+        $gitOk = $false
+        try { $gitOk = Install-Git } catch { Write-Warn "Git install error: $($_.Exception.Message)" }
+        if ($gitOk) {
+            Write-Info 'Git for Windows installed (Git Bash fallback ready)'
+        } else {
+            Write-Warn 'Git for Windows install was skipped or failed; CLI install will continue.'
+            Write-Host '  If your agent later fails to run PowerShell commands, install Git manually:' -ForegroundColor DarkGray
+            Write-Host "  $GIT_INSTALLER_URL" -ForegroundColor DarkGray
+        }
+    }
+
     $currentRegistry = ''
     try { $currentRegistry = (npm config get registry 2>$null).Trim() } catch {}
     if ($currentRegistry -ne $NPM_MIRROR -and $currentRegistry -ne "$NPM_MIRROR/") {
@@ -164,6 +258,11 @@ function Main {
     Write-Host ''
     Write-Host "  Update CLI & Skill files: $CLI_BIN update"
     Write-Host ''
+    if (Test-GitInstalled) {
+        Write-Host '  Tip: if your agent client has trouble running PowerShell/cmd commands later,' -ForegroundColor DarkGray
+        Write-Host '       open Git Bash and re-run the equivalent bash installer instead.' -ForegroundColor DarkGray
+        Write-Host ''
+    }
     Write-Info "Need help? Visit $WEB_BASE"
     Write-Host ''
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "siluzan-tso-cli",
-  "version": "1.1.17-beta.1",
+  "version": "1.1.17-beta.2",
   "description": "Siluzan 广告账户管理 CLI — 查询账户、余额、消耗数据，管理绑定关系与充值。",
   "keywords": [
     "ad-account",