@ziniao-open/cli 0.1.0-beta.93 → 0.1.0-beta.97

package/README.md

@@ -28,7 +28,16 @@ Windows PowerShell 执行：
 ziniao-cli doctor fix-path
 ```
 
+遍历当前 PATH 并清理正式目录之外的 `ziniao.exe` 文件（默认只预览）：
+
+```powershell
+& "$(npm root -g)\@ziniao-open\cli\scripts\remove-ziniao-cli-shims.ps1"
+& "$(npm root -g)\@ziniao-open\cli\scripts\remove-ziniao-cli-shims.ps1" -Apply
+```
+
 脚本只探测 `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`。
+Windows 同时会把找到的紫鸟本体绝对路径写入 `%APPDATA%\ziniaobrowser\gui-path`，供 CLI 定位桌面客户端。
+macOS/Linux 也会在找到桌面本体时写入对应的 `gui-path`（macOS 为 `~/Library/Application Support/ziniao/gui-path`，Linux 为 `${XDG_CONFIG_HOME:-~/.config}/ziniao/gui-path`）。
 
 安装时会自动下载当前平台对应的预编译二进制（支持 macOS / Linux / Windows × amd64 / arm64），并做 SHA-256 校验。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ziniao-open/cli",
-  "version": "0.1.0-beta.93",
+  "version": "0.1.0-beta.97",
   "description": "紫鸟开放平台命令行工具，为开发者和 AI Agent 提供统一的接口调用入口。",
   "license": "UNLICENSED",
   "bin": {
@@ -14,7 +14,8 @@
     "scripts/install.js",
     "scripts/run.js",
     "scripts/setup-ziniao-cli.sh",
-    "scripts/setup-ziniao-cli.ps1"
+    "scripts/setup-ziniao-cli.ps1",
+    "scripts/remove-ziniao-cli-shims.ps1"
   ],
   "engines": {
     "node": ">=18"

package/scripts/remove-ziniao-cli-shims.ps1

@@ -0,0 +1,43 @@
+# Find and optionally remove ziniao.exe shims created in PATH directories.
+# Run without -Apply first to preview the files that would be removed.
+
+[CmdletBinding(SupportsShouldProcess)]
+param(
+  [switch]$Apply
+)
+
+$ErrorActionPreference = "Stop"
+
+function Write-Log([string]$Message) {
+  Write-Output "[ziniao-cli-shims] $Message"
+}
+
+$targetDir = Join-Path $env:APPDATA "ziniaobrowser\cli"
+$candidates = @()
+foreach ($pathEntry in @($env:Path -split ";" | Where-Object { $_ })) {
+  $directory = $pathEntry.TrimEnd('\')
+  if (-not $directory -or $directory -ieq $targetDir.TrimEnd('\')) { continue }
+  $shimPath = Join-Path $directory "ziniao.exe"
+  if (-not (Test-Path -LiteralPath $shimPath -PathType Leaf)) { continue }
+  $candidates += $shimPath
+}
+
+if (-not $candidates) {
+  Write-Log "No ziniao.exe shims found in PATH directories."
+  exit 0
+}
+
+foreach ($candidate in ($candidates | Select-Object -Unique)) {
+  if (-not $Apply) {
+    Write-Log "Would remove: $candidate"
+    continue
+  }
+  if ($PSCmdlet.ShouldProcess($candidate, "Remove CLI shim")) {
+    Remove-Item -LiteralPath $candidate -Force
+    Write-Log "Removed: $candidate"
+  }
+}
+
+if (-not $Apply) {
+  Write-Log "Preview only. Re-run with -Apply to remove these files."
+}

package/scripts/setup-ziniao-cli.ps1

@@ -26,6 +26,7 @@ $sourceRelative = Join-Path "envkit\cli\win32\$archDir" $sourceName
 $resourceRoot = "resources\app.asar.unpacked"
 
 $sourcePath = $null
+$guiExecutablePath = $null
 $checkedSourcePaths = @()
 if ($env:ZINIAO_CLI_SOURCE -and (Test-Path -LiteralPath $env:ZINIAO_CLI_SOURCE -PathType Leaf)) {
   $sourcePath = $env:ZINIAO_CLI_SOURCE
@@ -54,6 +55,8 @@ if (-not $sourcePath) {
     } else {
       continue
     }
+    if (-not (Test-Path -LiteralPath $executablePath -PathType Leaf)) { continue }
+    $guiExecutablePath = $executablePath
     $installDir = Split-Path -Parent $executablePath
     $candidate = Join-Path $installDir "$resourceRoot\$sourceRelative"
     $checkedSourcePaths += $candidate
@@ -75,6 +78,32 @@ $targetDir = Join-Path $appCacheDir "cli"
 $targetPath = Join-Path $targetDir $sourceName
 New-Item -ItemType Directory -Path $targetDir -Force | Out-Null
 
+if ($guiExecutablePath) {
+  $guiPathFile = Join-Path $env:APPDATA "ziniaobrowser\gui-path"
+  try {
+    New-Item -ItemType Directory -Path (Split-Path -Parent $guiPathFile) -Force | Out-Null
+    [System.IO.File]::WriteAllText(
+      $guiPathFile,
+      "$guiExecutablePath$([Environment]::NewLine)",
+      [System.Text.Encoding]::ASCII
+    )
+    Write-Log "Wrote GUI path hint: $guiPathFile"
+  } catch {
+    Write-Log "WARN: Could not write GUI path hint: $($_.Exception.Message)"
+  }
+}
+
+function Get-FileSha256([string]$Path) {
+  $sha256 = [System.Security.Cryptography.SHA256]::Create()
+  $stream = [System.IO.File]::OpenRead($Path)
+  try {
+    return ([BitConverter]::ToString($sha256.ComputeHash($stream))).Replace("-", "")
+  } finally {
+    $stream.Dispose()
+    $sha256.Dispose()
+  }
+}
+
 if (-not $sourcePath) {
   foreach ($checkedPath in ($checkedSourcePaths | Select-Object -Unique)) {
     Write-Log "Checked CLI source path: $checkedPath"
@@ -87,7 +116,7 @@ if (-not $sourcePath) {
 } else {
   $needsCopy = -not (Test-Path -LiteralPath $targetPath -PathType Leaf)
   if (-not $needsCopy) {
-    $needsCopy = (Get-FileHash -LiteralPath $sourcePath -Algorithm SHA256).Hash -ne (Get-FileHash -LiteralPath $targetPath -Algorithm SHA256).Hash
+    $needsCopy = (Get-FileSha256 $sourcePath) -ne (Get-FileSha256 $targetPath)
   }
   if ($needsCopy) {
     Copy-Item -LiteralPath $sourcePath -Destination $targetPath -Force

package/scripts/setup-ziniao-cli.sh

@@ -82,6 +82,30 @@ find_source() {
   return 1
 }
 
+find_gui_executable() {
+  case "$platform_dir" in
+    darwin)
+      for candidate in \
+        "/Applications/ziniao.app/Contents/MacOS/ziniaobrowser" \
+        "/Applications/ziniao.app/Contents/MacOS/ziniao" \
+        "$home_dir/Applications/ziniao.app/Contents/MacOS/ziniaobrowser" \
+        "$home_dir/Applications/ziniao.app/Contents/MacOS/ziniao"; do
+        [ -f "$candidate" ] && { printf '%s\n' "$candidate"; return 0; }
+      done
+      ;;
+    linux)
+      for candidate in \
+        "/opt/ziniao/ziniaobrowser" \
+        "/opt/ziniao/ziniao" \
+        "/usr/lib/ziniaobrowser/ziniaobrowser" \
+        "/usr/lib/ziniaobrowser/ziniao"; do
+        [ -f "$candidate" ] && { printf '%s\n' "$candidate"; return 0; }
+      done
+      ;;
+  esac
+  return 1
+}
+
 if [ -n "${ZINIAO_APP_CACHE_DIR:-}" ]; then
   target_dir="$ZINIAO_APP_CACHE_DIR/cli"
 else
@@ -90,8 +114,24 @@ else
 fi
 
 source_path="$(find_source || true)"
+gui_executable_path="$(find_gui_executable || true)"
 target_path="$target_dir/$source_name"
 mkdir -p "$target_dir"
+
+if [ -n "$gui_executable_path" ]; then
+  case "$platform_dir" in
+    darwin) gui_path_file="$home_dir/Library/Application Support/ziniao/gui-path" ;;
+    *)
+      xdg_config_home="${XDG_CONFIG_HOME:-$home_dir/.config}"
+      gui_path_file="$xdg_config_home/ziniao/gui-path"
+      ;;
+  esac
+  if mkdir -p "$(dirname "$gui_path_file")" && printf '%s\n' "$gui_executable_path" > "$gui_path_file"; then
+    log "已写入 GUI 路径提示: $gui_path_file"
+  else
+    log "WARN: 无法写入 GUI 路径提示: $gui_path_file"
+  fi
+fi
 if [ -z "$source_path" ]; then
   if [ -f "$target_path" ]; then
     log "未找到安装目录中的 CLI 源文件，保留现有 AppCache CLI: $target_path"