@ziniao-open/cli 0.1.0-beta.89 → 0.1.0-beta.91

package/README.md

@@ -28,7 +28,7 @@ Windows PowerShell 执行：
 ziniao-cli doctor fix-path
 ```
 
-脚本只探测 `ziniao.app` / `ziniao` 的安装目录；它会在 AppCache `cli` 目录缺少 CLI 或文件内容发生变化时，从紫鸟安装目录的 `envkit/cli` 同步最新文件，并注册当前用户 PATH。找不到源文件时只提示并继续，不阻断 PATH 配置。若安装目录无法自动探测，可设置 `ZINIAO_INSTALL_DIR`；若 AppCache 位置不同，可设置 `ZINIAO_APP_CACHE_DIR`。
+脚本只探测 `ziniao.app` / `ziniao` 的安装目录；Windows 会优先查询卸载注册表中 `DisplayIcon` 包含 `ziniao.exe` 的条目，再从本体目录的 `resources/app.asar.unpacked/envkit/cli` 查找 CLI。Windows 使用 `%APPDATA%\ziniaobrowser\cli`，macOS/Linux 使用 `~/.local/bin`，在目标目录缺少 CLI 或文件内容发生变化时同步最新文件，并注册当前用户 PATH。找不到源文件时只提示并继续，不阻断 PATH 配置。若安装目录无法自动探测，可设置 `ZINIAO_INSTALL_DIR`；若目标位置不同，可设置 `ZINIAO_APP_CACHE_DIR`。
 
 安装时会自动下载当前平台对应的预编译二进制（支持 macOS / Linux / Windows × amd64 / arm64），并做 SHA-256 校验。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ziniao-open/cli",
-  "version": "0.1.0-beta.89",
+  "version": "0.1.0-beta.91",
   "description": "紫鸟开放平台命令行工具，为开发者和 AI Agent 提供统一的接口调用入口。",
   "license": "UNLICENSED",
   "bin": {

package/scripts/setup-ziniao-cli.ps1

@@ -23,48 +23,66 @@ switch ($arch.ToLowerInvariant()) {
 
 $sourceName = "ziniao.exe"
 $sourceRelative = Join-Path "envkit\cli\win32\$archDir" $sourceName
-$homeDir = [Environment]::GetFolderPath("UserProfile")
-
-function Get-FirstExistingDirectory([string[]]$Candidates) {
-  foreach ($candidate in $Candidates) {
-    if ($candidate -and (Test-Path -LiteralPath $candidate -PathType Container)) { return $candidate }
-  }
-  return $null
-}
+$resourceRoot = "resources\app.asar.unpacked"
 
 $sourcePath = $null
+$checkedSourcePaths = @()
 if ($env:ZINIAO_CLI_SOURCE -and (Test-Path -LiteralPath $env:ZINIAO_CLI_SOURCE -PathType Leaf)) {
   $sourcePath = $env:ZINIAO_CLI_SOURCE
 }
 if (-not $sourcePath -and $env:ZINIAO_INSTALL_DIR) {
-  $candidate = Join-Path $env:ZINIAO_INSTALL_DIR $sourceRelative
-  if (Test-Path -LiteralPath $candidate -PathType Leaf) { $sourcePath = $candidate }
+  $candidate = Join-Path $env:ZINIAO_INSTALL_DIR "$resourceRoot\$sourceRelative"
+  $checkedSourcePaths += $candidate
+  if (Test-Path -LiteralPath $candidate -PathType Leaf) {
+    $sourcePath = $candidate
+  }
 }
 if (-not $sourcePath) {
-  $installRoots = @(
-    (Join-Path $env:LOCALAPPDATA "Programs\ziniao\resources\app.asar.unpacked"),
-    (Join-Path $env:ProgramFiles "Ziniao\resources\app.asar.unpacked"),
-    (Join-Path $env:APPDATA "ziniao\resources\app.asar.unpacked")
+  $uninstallKeys = @(
+    "HKCU:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*",
+    "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*",
+    "HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*"
   )
-  foreach ($root in $installRoots) {
-    $candidate = Join-Path $root $sourceRelative
-    if (Test-Path -LiteralPath $candidate -PathType Leaf) { $sourcePath = $candidate; break }
+  $uninstallEntries = Get-ItemProperty $uninstallKeys -ErrorAction SilentlyContinue |
+    Where-Object { $_.DisplayIcon -and $_.DisplayIcon -match "ziniao\.exe" }
+  foreach ($entry in $uninstallEntries) {
+    $displayIcon = ([string]$entry.DisplayIcon).Trim()
+    if ($displayIcon -match '^\s*"([^"]+\.exe)"') {
+      $executablePath = $matches[1]
+    } elseif ($displayIcon -match '^\s*(.*?\.exe)(?:,\d+)?(?:\s|$)') {
+      $executablePath = $matches[1]
+    } else {
+      continue
+    }
+    $installDir = Split-Path -Parent $executablePath
+    $candidate = Join-Path $installDir "$resourceRoot\$sourceRelative"
+    $checkedSourcePaths += $candidate
+    if (Test-Path -LiteralPath $candidate -PathType Leaf) {
+      $sourcePath = $candidate
+      Write-Log "Found the Ziniao installation from the uninstall registry: $installDir"
+      break
+    }
   }
 }
 if ($env:ZINIAO_APP_CACHE_DIR) {
-  $targetDir = Join-Path $env:ZINIAO_APP_CACHE_DIR "cli"
+  $appCacheDir = $env:ZINIAO_APP_CACHE_DIR
 } else {
-  $targetDir = Join-Path $env:APPDATA "ziniaobrowser\cli"
+  # The Windows GUI installs its CLI under %APPDATA%\ziniaobrowser\cli.
+  $appCacheDir = Join-Path $env:APPDATA "ziniaobrowser"
 }
 
+$targetDir = Join-Path $appCacheDir "cli"
 $targetPath = Join-Path $targetDir $sourceName
 New-Item -ItemType Directory -Path $targetDir -Force | Out-Null
 
 if (-not $sourcePath) {
+  foreach ($checkedPath in ($checkedSourcePaths | Select-Object -Unique)) {
+    Write-Log "Checked CLI source path: $checkedPath"
+  }
   if (Test-Path -LiteralPath $targetPath -PathType Leaf) {
-    Write-Log "Desktop CLI source not found; keeping existing AppCache CLI: $targetPath"
+    Write-Log "CLI source was not found in the install directory; keeping the existing AppCache CLI: $targetPath"
   } else {
-    Write-Log "WARN: ${sourceName} was not found in the desktop installation; skipping copy. Set `$env:ZINIAO_INSTALL_DIR or `$env:ZINIAO_CLI_SOURCE."
+    Write-Log "WARN: ${sourceName} was not found in the install directory; skipping copy. Set `$env:ZINIAO_INSTALL_DIR or `$env:ZINIAO_CLI_SOURCE to override."
   }
 } else {
   $needsCopy = -not (Test-Path -LiteralPath $targetPath -PathType Leaf)
@@ -73,32 +91,39 @@ if (-not $sourcePath) {
   }
   if ($needsCopy) {
     Copy-Item -LiteralPath $sourcePath -Destination $targetPath -Force
-    Write-Log "Synchronized CLI: $sourcePath -> $targetPath"
+    Write-Log "Synced CLI: $sourcePath -> $targetPath"
   } else {
-    Write-Log "AppCache CLI is already up to date: $targetPath"
+    Write-Log "AppCache CLI is up to date: $targetPath"
   }
 }
 
 function Install-PathShim {
   if (-not (Test-Path -LiteralPath $targetPath -PathType Leaf)) { return }
+  $windowsAppsDir = Join-Path $env:LOCALAPPDATA "Microsoft\WindowsApps"
   foreach ($pathEntry in @($env:Path -split ";" | Where-Object { $_ })) {
-    if ($pathEntry.TrimEnd('\') -ieq $targetDir.TrimEnd('\')) {
-      $script:shimInstalled = $true
-      Write-Log "Current PATH already contains the AppCache CLI directory: $targetDir"
+    $normalizedPath = $pathEntry.TrimEnd('\')
+    if ($normalizedPath -ieq $windowsAppsDir.TrimEnd('\') -and (Test-Path -LiteralPath $windowsAppsDir -PathType Container)) {
+      $shimPath = Join-Path $windowsAppsDir $sourceName
+      if (-not (Test-Path -LiteralPath $shimPath)) {
+        try {
+          Copy-Item -LiteralPath $targetPath -Destination $shimPath -ErrorAction Stop
+          $script:shimInstalled = $true
+          Write-Log "Created the CLI shim in WindowsApps: $shimPath"
+        } catch {
+          Write-Log "WARN: Could not create the CLI shim in WindowsApps: $($_.Exception.Message)"
+        }
+      } else {
+        Write-Log "WindowsApps already contains a file named $sourceName; leaving it unchanged"
+      }
       return
     }
-    $shimPath = Join-Path $pathEntry $sourceName
-    if (Test-Path -LiteralPath $shimPath -PathType Leaf) { continue }
-    try {
-      Copy-Item -LiteralPath $targetPath -Destination $shimPath -Force -ErrorAction Stop
+    if ($normalizedPath -ieq $targetDir.TrimEnd('\')) {
       $script:shimInstalled = $true
-      Write-Log "Created a CLI shim in an existing PATH directory: $shimPath"
+      Write-Log "The current PATH already contains the AppCache CLI directory: $targetDir"
       return
-    } catch {
-      continue
     }
   }
-  Write-Log "WARN: No writable existing PATH directory was found; the ziniao command is not immediately available."
+  Write-Log "The AppCache CLI directory is not on the current PATH; no shim was created in another directory."
 }
 
 $shimInstalled = $false
@@ -116,10 +141,10 @@ if (-not ($currentEntries | Where-Object { $_.TrimEnd('\') -ieq $targetDir.TrimE
   $env:Path = "$targetDir;$env:Path"
 }
 if ($shimInstalled) {
-  Write-Log "CLI is already available through the current PATH; no PowerShell refresh is required."
+  Write-Log "The CLI is already available on the current PATH; this PowerShell session needs no PATH refresh"
 } elseif ($isDotSourced) {
-  Write-Log "Refreshed the current PowerShell PATH."
+  Write-Log "The current PowerShell PATH was refreshed"
 } else {
-  Write-Log "Refreshed this process PATH; dot-source the script or open a new terminal to refresh the parent PowerShell."
+  Write-Log "The current process PATH was refreshed; dot-source this script in the parent PowerShell or reopen the terminal"
 }
-Write-Log "Verify with: Get-Command ziniao"
+Write-Log "Verification command: Get-Command ziniao"

package/scripts/setup-ziniao-cli.sh

@@ -83,26 +83,15 @@ find_source() {
 }
 
 if [ -n "${ZINIAO_APP_CACHE_DIR:-}" ]; then
-  app_cache_dir="$ZINIAO_APP_CACHE_DIR"
+  target_dir="$ZINIAO_APP_CACHE_DIR/cli"
 else
-  app_data_dir="$(first_existing_dir \
-    "$home_dir/Library/Application Support/ziniao" \
-    "$home_dir/.config/ziniao" \
-    "$home_dir/.local/share/ziniao" \
-    2>/dev/null || true)"
-  if [ -z "$app_data_dir" ]; then
-    case "$platform_dir" in
-      darwin) app_data_dir="$home_dir/Library/Application Support/ziniao" ;;
-      *) app_data_dir="$home_dir/.config/ziniao" ;;
-    esac
-  fi
-  app_cache_dir="$app_data_dir/app-cache"
+  # The macOS/Linux GUI reads the CLI from the user's local bin directory.
+  target_dir="$home_dir/.local/bin"
 fi
 
-target_dir="$app_cache_dir/cli"
 source_path="$(find_source || true)"
-mkdir -p "$target_dir"
 target_path="$target_dir/$source_name"
+mkdir -p "$target_dir"
 if [ -z "$source_path" ]; then
   if [ -f "$target_path" ]; then
     log "未找到安装目录中的 CLI 源文件，保留现有 AppCache CLI: $target_path"
@@ -120,36 +109,15 @@ fi
 shim_installed=0
 install_path_shim() {
   [ -f "$target_path" ] || return 0
-  old_ifs="$IFS"
-  IFS=:
-  for path_entry in ${PATH:-}; do
-    [ -d "$path_entry" ] || continue
-    [ -w "$path_entry" ] || continue
-    if [ "$path_entry" = "$target_dir" ]; then
+  case ":${PATH:-}:" in
+    *:"$target_dir":*)
       shim_installed=1
       log "当前 PATH 已包含 AppCache CLI 目录: $target_dir"
-      IFS="$old_ifs"
-      return 0
-    fi
-    shim_path="$path_entry/$source_name"
-    if [ -e "$shim_path" ] || [ -L "$shim_path" ]; then
-      if [ -L "$shim_path" ] && [ "$(readlink "$shim_path" 2>/dev/null || true)" = "$target_path" ]; then
-        log "现有 PATH 已包含 CLI shim: $shim_path"
-        shim_installed=1
-        IFS="$old_ifs"
-        return 0
-      fi
-      continue
-    fi
-    if ln -s "$target_path" "$shim_path" 2>/dev/null; then
-      log "已在现有 PATH 中创建 CLI shim: $shim_path"
-      shim_installed=1
-      IFS="$old_ifs"
-      return 0
-    fi
-  done
-  IFS="$old_ifs"
-  log "WARN: 没有可写的现有 PATH 目录，无法立即提供 ziniao 命令。"
+      ;;
+    *)
+      log "AppCache CLI 目录不在当前 PATH 中；不会在其他目录创建 shim: $target_dir"
+      ;;
+  esac
 }
 
 install_path_shim