@ziniao-open/cli 0.1.0-beta.76 → 0.1.0-beta.82

package/README.md

@@ -10,6 +10,26 @@
 npm install -g @ziniao-open/cli
 ```
 
+紫鸟客户端自带的 `ziniao` CLI 需要同步到 AppCache 并加入 PATH。执行 `npm install -g @ziniao-open/cli` 时会自动尝试同步；安装紫鸟客户端后，也可以手动执行以下命令：
+
+```bash
+source "$(npm root -g)/@ziniao-open/cli/scripts/setup-ziniao-cli.sh"
+```
+
+Windows PowerShell 执行：
+
+```powershell
+. "$(npm root -g)\@ziniao-open\cli\scripts\setup-ziniao-cli.ps1"
+```
+
+也可以在安装后手动修复：
+
+```bash
+ziniao-cli doctor fix-path
+```
+
+脚本只探测 `ziniao.app` / `ziniao` 的安装目录；它会在 AppCache `cli` 目录缺少 CLI 或文件内容发生变化时，从紫鸟安装目录的 `envkit/cli` 同步最新文件，并注册当前用户 PATH。找不到源文件时只提示并继续，不阻断 PATH 配置。若安装目录无法自动探测，可设置 `ZINIAO_INSTALL_DIR`；若 AppCache 位置不同，可设置 `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.76",
+  "version": "0.1.0-beta.82",
   "description": "紫鸟开放平台命令行工具，为开发者和 AI Agent 提供统一的接口调用入口。",
   "license": "UNLICENSED",
   "bin": {
@@ -12,7 +12,9 @@
   },
   "files": [
     "scripts/install.js",
-    "scripts/run.js"
+    "scripts/run.js",
+    "scripts/setup-ziniao-cli.sh",
+    "scripts/setup-ziniao-cli.ps1"
   ],
   "engines": {
     "node": ">=18"

package/scripts/install.js

@@ -197,6 +197,31 @@ function findBinaryIn(dir, name) {
   return null;
 }
 
+function runDesktopCliSetup() {
+  const scriptName = IS_WIN ? "setup-ziniao-cli.ps1" : "setup-ziniao-cli.sh";
+  const scriptPath = join(__dirname, scriptName);
+  if (!existsSync(scriptPath)) {
+    warn(`desktop CLI PATH setup script is missing: ${scriptPath}`);
+    return;
+  }
+
+  const result = IS_WIN
+    ? spawnSync("powershell.exe", [
+        "-NoProfile",
+        "-NonInteractive",
+        "-ExecutionPolicy",
+        "Bypass",
+        "-File",
+        scriptPath,
+      ], { stdio: "inherit" })
+    : spawnSync("sh", [scriptPath], { stdio: "inherit" });
+  if (result.error) {
+    warn(`desktop CLI PATH setup skipped: ${result.error.message}`);
+  } else if (result.status !== 0) {
+    warn(`desktop CLI PATH setup exited with code ${result.status}`);
+  }
+}
+
 async function downloadAndInstall() {
   const version = PKG.version;
   if (!DOWNLOAD_BASE) {
@@ -266,18 +291,16 @@ async function main() {
   if (PKG.version === "0.0.0") {
     warn("package.json version is 0.0.0; skipping binary install (developer mode).");
     warn("Set ZINIAO_CLI_BINARY=/path/to/binary or run `make build` to use a local build.");
-    return;
-  }
-
-  if (existsSync(TARGET_PATH)) {
+  } else if (existsSync(TARGET_PATH)) {
     makeExecutable(TARGET_PATH);
     log(`binary already present at ${TARGET_PATH}, skipping download`);
-    return;
+  } else if (copyFromEnv()) {
+    // Local binary installed.
+  } else {
+    await downloadAndInstall();
   }
 
-  if (copyFromEnv()) return;
-
-  await downloadAndInstall();
+  runDesktopCliSetup();
 }
 
 main().catch((err) => fail(err.stack || err.message || String(err)));

package/scripts/setup-ziniao-cli.ps1

@@ -0,0 +1,131 @@
+# Synchronize the Ziniao desktop CLI into the per-user AppCache and register
+# that directory in the current user's PATH.
+#
+# Use `. .\scripts\setup-ziniao-cli.ps1` to refresh the current PowerShell.
+# A normal invocation persists PATH but cannot modify its parent PowerShell.
+
+$ErrorActionPreference = "Stop"
+$isDotSourced = $MyInvocation.InvocationName -eq "."
+
+function Write-Log([string]$Message) {
+  Write-Output "[ziniao-cli-path] $Message"
+}
+
+$arch = if ([Environment]::Is64BitOperatingSystem) {
+  if ($env:PROCESSOR_ARCHITEW6432) { $env:PROCESSOR_ARCHITEW6432 } else { $env:PROCESSOR_ARCHITECTURE }
+} else { $env:PROCESSOR_ARCHITECTURE }
+switch ($arch.ToLowerInvariant()) {
+  "amd64" { $archDir = "x64" }
+  "x86_64" { $archDir = "x64" }
+  "arm64" { $archDir = "arm64" }
+  default { throw "不支持的 CPU 架构: $arch" }
+}
+
+$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
+}
+
+$sourcePath = $null
+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 }
+}
+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")
+  )
+  foreach ($root in $installRoots) {
+    $candidate = Join-Path $root $sourceRelative
+    if (Test-Path -LiteralPath $candidate -PathType Leaf) { $sourcePath = $candidate; break }
+  }
+}
+if ($env:ZINIAO_APP_CACHE_DIR) {
+  $appCacheDir = $env:ZINIAO_APP_CACHE_DIR
+} else {
+  $appCacheDir = Get-FirstExistingDirectory @(
+    (Join-Path $env:APPDATA "ziniao"),
+    (Join-Path $env:LOCALAPPDATA "ziniao")
+  )
+  if (-not $appCacheDir) { $appCacheDir = Join-Path $env:APPDATA "ziniao" }
+  $appCacheDir = Join-Path $appCacheDir "app-cache"
+}
+
+$targetDir = Join-Path $appCacheDir "cli"
+$targetPath = Join-Path $targetDir $sourceName
+New-Item -ItemType Directory -Path $targetDir -Force | Out-Null
+
+if (-not $sourcePath) {
+  if (Test-Path -LiteralPath $targetPath -PathType Leaf) {
+    Write-Log "未找到安装目录中的 CLI 源文件，保留现有 AppCache CLI: $targetPath"
+  } else {
+    Write-Log "WARN: 未找到安装目录中的 ${sourceName}，跳过复制；可设置 `$env:ZINIAO_INSTALL_DIR 或 `$env:ZINIAO_CLI_SOURCE。"
+  }
+} 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
+  }
+  if ($needsCopy) {
+    Copy-Item -LiteralPath $sourcePath -Destination $targetPath -Force
+    Write-Log "已同步 CLI: $sourcePath -> $targetPath"
+  } else {
+    Write-Log "AppCache CLI 已是最新: $targetPath"
+  }
+}
+
+function Install-PathShim {
+  if (-not (Test-Path -LiteralPath $targetPath -PathType Leaf)) { return }
+  foreach ($pathEntry in @($env:Path -split ";" | Where-Object { $_ })) {
+    if ($pathEntry.TrimEnd('\') -ieq $targetDir.TrimEnd('\')) {
+      $script:shimInstalled = $true
+      Write-Log "当前 PATH 已包含 AppCache CLI 目录: $targetDir"
+      return
+    }
+    $shimPath = Join-Path $pathEntry $sourceName
+    if (Test-Path -LiteralPath $shimPath -PathType Leaf) { continue }
+    try {
+      Copy-Item -LiteralPath $targetPath -Destination $shimPath -Force -ErrorAction Stop
+      $script:shimInstalled = $true
+      Write-Log "已在现有 PATH 中创建 CLI shim: $shimPath"
+      return
+    } catch {
+      continue
+    }
+  }
+  Write-Log "WARN: 没有可写的现有 PATH 目录，无法立即提供 ziniao 命令。"
+}
+
+$shimInstalled = $false
+Install-PathShim
+
+$userPath = [Environment]::GetEnvironmentVariable("Path", "User")
+$entries = @($userPath -split ";" | Where-Object { $_ })
+if (-not ($entries | Where-Object { $_.TrimEnd('\') -ieq $targetDir.TrimEnd('\') })) {
+  [Environment]::SetEnvironmentVariable("Path", (($entries + $targetDir) -join ";"), "User")
+  Write-Log "已写入用户 PATH: $targetDir"
+}
+
+$currentEntries = @($env:Path -split ";" | Where-Object { $_ })
+if (-not ($currentEntries | Where-Object { $_.TrimEnd('\') -ieq $targetDir.TrimEnd('\') })) {
+  $env:Path = "$targetDir;$env:Path"
+}
+if ($shimInstalled) {
+  Write-Log "CLI 已位于当前 PATH，当前 PowerShell 无需刷新 PATH"
+} elseif ($isDotSourced) {
+  Write-Log "当前 PowerShell PATH 已刷新"
+} else {
+  Write-Log "当前进程 PATH 已刷新；父级 PowerShell 请执行 dot-source 或重新打开 terminal"
+}
+Write-Log "验证命令: Get-Command ziniao"

package/scripts/setup-ziniao-cli.sh

@@ -0,0 +1,189 @@
+#!/bin/sh
+# Synchronize the Ziniao desktop CLI into the per-user AppCache and register
+# that directory in the current user's shell PATH.
+#
+# Use `source scripts/setup-ziniao-cli.sh` when the current shell should be
+# refreshed immediately. A normal execution can persist PATH but cannot modify
+# its parent shell.
+
+log() { printf '%s\n' "[ziniao-cli-path] $*"; }
+fail() { printf '%s\n' "[ziniao-cli-path] ERROR: $*" >&2; return 1 2>/dev/null || exit 1; }
+
+is_sourced=0
+if [ -n "${BASH_VERSION:-}" ]; then
+  [ "${BASH_SOURCE[0]:-$0}" != "$0" ] && is_sourced=1
+elif [ -n "${ZSH_EVAL_CONTEXT:-}" ]; then
+  case "$ZSH_EVAL_CONTEXT" in
+    *:file) is_sourced=1 ;;
+  esac
+fi
+
+if [ "$is_sourced" -eq 0 ]; then
+  set -eu
+fi
+
+platform="$(uname -s 2>/dev/null || printf 'unknown')"
+machine="$(uname -m 2>/dev/null || printf 'unknown')"
+
+case "$platform" in
+  Darwin) platform_dir="darwin"; source_name="ziniao"; ;;
+  Linux) platform_dir="linux"; source_name="ziniao"; ;;
+  MINGW*|MSYS*|CYGWIN*)
+    fail "检测到 Windows shell，请改用 PowerShell: scripts/setup-ziniao-cli.ps1"
+    return 1 2>/dev/null || exit 1
+    ;;
+  *) fail "不支持的操作系统: $platform"; return 1 2>/dev/null || exit 1 ;;
+esac
+
+case "$machine" in
+  arm64|aarch64) arch_dir="arm64" ;;
+  x86_64|amd64) arch_dir="x64" ;;
+  *) fail "不支持的 CPU 架构: $machine"; return 1 2>/dev/null || exit 1 ;;
+esac
+
+home_dir="${HOME:?无法确定当前用户 HOME}"
+
+first_existing_dir() {
+  for candidate in "$@"; do
+    if [ -d "$candidate" ]; then
+      printf '%s\n' "$candidate"
+      return 0
+    fi
+  done
+  return 1
+}
+
+find_source() {
+  source_rel="envkit/cli/$platform_dir/$arch_dir/$source_name"
+  if [ -n "${ZINIAO_CLI_SOURCE:-}" ] && [ -f "$ZINIAO_CLI_SOURCE" ]; then
+    printf '%s\n' "$ZINIAO_CLI_SOURCE"
+    return 0
+  fi
+
+  if [ -n "${ZINIAO_INSTALL_DIR:-}" ]; then
+    candidate="$ZINIAO_INSTALL_DIR/$source_rel"
+    if [ -f "$candidate" ]; then
+      printf '%s\n' "$candidate"
+      return 0
+    fi
+  fi
+
+  for install_root in \
+    "/Applications/ziniao.app/Contents/Resources/app.asar.unpacked" \
+    "$home_dir/Applications/ziniao.app/Contents/Resources/app.asar.unpacked" \
+    "$home_dir/Library/Application Support/ziniao/app.asar.unpacked" \
+    "/opt/ziniao/resources/app.asar.unpacked"; do
+    candidate="$install_root/$source_rel"
+    if [ -f "$candidate" ]; then
+      printf '%s\n' "$candidate"
+      return 0
+    fi
+  done
+  return 1
+}
+
+if [ -n "${ZINIAO_APP_CACHE_DIR:-}" ]; then
+  app_cache_dir="$ZINIAO_APP_CACHE_DIR"
+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"
+fi
+
+target_dir="$app_cache_dir/cli"
+source_path="$(find_source || true)"
+mkdir -p "$target_dir"
+target_path="$target_dir/$source_name"
+if [ -z "$source_path" ]; then
+  if [ -f "$target_path" ]; then
+    log "未找到安装目录中的 CLI 源文件，保留现有 AppCache CLI: $target_path"
+  else
+    log "WARN: 未找到安装目录中的 ${source_name}，跳过复制；可设置 ZINIAO_INSTALL_DIR 或 ZINIAO_CLI_SOURCE。"
+  fi
+elif [ ! -f "$target_path" ] || ! cmp -s "$source_path" "$target_path"; then
+  cp "$source_path" "$target_path"
+  chmod 755 "$target_path"
+  log "已同步 CLI: $source_path -> $target_path"
+else
+  log "AppCache CLI 已是最新: $target_path"
+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
+      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 命令。"
+}
+
+install_path_shim
+
+export PATH="$target_dir${PATH:+:$PATH}"
+
+profile=""
+case "${SHELL:-}" in
+  */zsh) profile="$home_dir/.zshrc" ;;
+  */bash) profile="$home_dir/.bashrc" ;;
+esac
+if [ -z "$profile" ]; then
+  case "$platform_dir" in
+    darwin) profile="$home_dir/.zshrc" ;;
+    *) profile="$home_dir/.profile" ;;
+  esac
+fi
+
+marker="# ziniao-cli: AppCache CLI PATH"
+path_line="export PATH=\"$target_dir:\$PATH\""
+if ! grep -Fqx "$marker" "$profile" 2>/dev/null; then
+  mkdir -p "$(dirname "$profile")"
+  printf '\n%s\n' "$marker" >> "$profile"
+  log "已写入 shell 配置: $profile"
+fi
+if ! grep -Fqx "$path_line" "$profile" 2>/dev/null; then
+  printf '%s\n' "$path_line" >> "$profile"
+fi
+
+if [ "$shim_installed" -eq 1 ]; then
+  log "CLI 已位于当前 PATH，当前 terminal 无需刷新 PATH"
+elif [ "$is_sourced" -eq 1 ]; then
+  log "当前 shell PATH 已刷新"
+else
+  log "当前进程 PATH 已刷新；父级 terminal 请执行: source \"$profile\""
+fi
+log "验证命令: command -v $source_name"