@silicaclaw/cli 1.0.0-beta.10 → 1.0.0-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silicaclaw/cli",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.12",
   "private": false,
   "publishConfig": {
     "access": "public"

package/scripts/quickstart.sh

@@ -47,6 +47,50 @@ run_cmd_may_fail() {
   return $code
 }
 
+first_writable_path_dir() {
+  local path_value="${PATH:-}"
+  local old_ifs="$IFS"
+  IFS=':'
+  for d in $path_value; do
+    if [ -n "$d" ] && [ -d "$d" ] && [ -w "$d" ] && [ -x "$d" ]; then
+      printf '%s' "$d"
+      IFS="$old_ifs"
+      return 0
+    fi
+  done
+  IFS="$old_ifs"
+  return 1
+}
+
+install_command_shim() {
+  local bindir="$1"
+  local script_path="$WORK_DIR/scripts/silicaclaw-cli.mjs"
+  local target="$bindir/silicaclaw"
+  if [ ! -f "$script_path" ]; then
+    echo "未找到 CLI 脚本: $script_path"
+    return 1
+  fi
+  cat >"$target" <<EOF
+#!/usr/bin/env bash
+set -euo pipefail
+exec node "$script_path" "\$@"
+EOF
+  chmod +x "$target"
+  return 0
+}
+
+default_system_bin_dir() {
+  if [ -d "/usr/local/bin" ]; then
+    printf '/usr/local/bin'
+    return 0
+  fi
+  if [ -d "/opt/homebrew/bin" ]; then
+    printf '/opt/homebrew/bin'
+    return 0
+  fi
+  printf '/usr/local/bin'
+}
+
 ask_yes_no() {
   local prompt="$1"
   local default="${2:-Y}"
@@ -172,23 +216,48 @@ fi
 title "安装系统命令（silicaclaw）"
 if command -v silicaclaw >/dev/null 2>&1; then
   echo "已检测到系统命令: $(command -v silicaclaw)"
-  echo "跳过全局安装。"
+  echo "跳过命令安装。"
 else
-  echo "为了获得生产体验（可直接运行 silicaclaw ...），建议安装全局命令。"
-  if ask_yes_no "是否现在安装全局命令 @silicaclaw/cli@beta？" "Y"; then
-    if run_cmd_may_fail "npm_config_cache=\"$WORK_DIR/.npm-cache\" npm i -g @silicaclaw/cli@beta"; then
-      echo "全局命令安装成功。"
-    else
-      echo "普通权限安装失败（常见于 macOS /usr/local 权限）。"
-      if ask_yes_no "是否使用 sudo 重试安装全局命令？" "Y"; then
-        run_cmd "npm_config_cache=\"$WORK_DIR/.npm-cache\" sudo npm i -g @silicaclaw/cli@beta"
-        echo "全局命令安装成功。"
+  echo "将尝试无 sudo 安装 silicaclaw 命令到 PATH 中可写目录。"
+  BIN_DIR="$(first_writable_path_dir || true)"
+  INSTALLED=0
+  if [ -n "${BIN_DIR:-}" ]; then
+    if install_command_shim "$BIN_DIR"; then
+      echo "命令已安装: $BIN_DIR/silicaclaw"
+      hash -r || true
+      if command -v silicaclaw >/dev/null 2>&1; then
+        echo "验证成功: $(command -v silicaclaw)"
+        INSTALLED=1
       else
-        echo "已跳过全局安装。你仍可使用: npx @silicaclaw/cli@beta <command>"
+        echo "命令已写入，但当前 shell 未立即识别。请新开终端后运行 silicaclaw。"
       fi
+    else
+      echo "命令安装失败。可继续使用: npx @silicaclaw/cli@beta <command>"
     fi
   else
-    echo "已跳过全局安装。你仍可使用: npx @silicaclaw/cli@beta <command>"
+    echo "当前 PATH 中没有可写目录，无法无 sudo 安装系统命令。"
+  fi
+
+  if [ "$INSTALLED" != "1" ]; then
+    SYS_BIN_DIR="$(default_system_bin_dir)"
+    echo "为保证开箱即用体验，建议安装到系统目录: $SYS_BIN_DIR/silicaclaw"
+    if ask_yes_no "是否使用 sudo 安装系统命令？" "Y"; then
+      run_cmd "sudo mkdir -p \"$SYS_BIN_DIR\""
+      run_cmd "sudo tee \"$SYS_BIN_DIR/silicaclaw\" >/dev/null <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+exec node \"$WORK_DIR/scripts/silicaclaw-cli.mjs\" \"\$@\"
+EOF"
+      run_cmd "sudo chmod +x \"$SYS_BIN_DIR/silicaclaw\""
+      hash -r || true
+      if command -v silicaclaw >/dev/null 2>&1; then
+        echo "验证成功: $(command -v silicaclaw)"
+      else
+        echo "安装完成，但当前 shell 未刷新。请新开终端后运行 silicaclaw。"
+      fi
+    else
+      echo "已跳过 sudo 安装。你仍可使用: npx @silicaclaw/cli@beta <command>"
+    fi
   fi
 fi