remote-claude 0.1.1 → 0.1.3

package/init.sh

@@ -61,14 +61,74 @@ check_uv() {
     fi
 
     print_warning "未找到 uv，正在安装..."
-    curl -LsSf https://astral.sh/uv/install.sh | sh
-    # 重新加载 PATH
-    export PATH="$HOME/.local/bin:$PATH"
+
+    # 检测可用的 pip 命令
+    local PIP_CMD=""
+    if command -v pip3 &> /dev/null; then
+        PIP_CMD="pip3"
+    elif command -v pip &> /dev/null; then
+        PIP_CMD="pip"
+    fi
+
+    # 方式一：官方安装脚本（需访问 astral.sh/GitHub）
+    if curl -LsSf --connect-timeout 10 https://astral.sh/uv/install.sh | sh 2>/dev/null; then
+        export PATH="$HOME/.local/bin:$PATH"
+    fi
+
+    # 方式二：pip + PyPI（GitHub 访问受限时首选；国内镜像比 GitHub 稳定）
+    if ! command -v uv &> /dev/null && [[ -n "$PIP_CMD" ]]; then
+        print_warning "尝试 pip 安装 uv（官方 PyPI）..."
+        $PIP_CMD install uv --quiet 2>/dev/null && export PATH="$HOME/.local/bin:$PATH"
+    fi
+
+    # 方式三：pip + 国内镜像（清华 PyPI，适合无法访问 GitHub/pypi.org 的内网环境）
+    if ! command -v uv &> /dev/null && [[ -n "$PIP_CMD" ]]; then
+        print_warning "尝试 pip 安装 uv（清华镜像）..."
+        $PIP_CMD install uv --quiet \
+            -i https://pypi.tuna.tsinghua.edu.cn/simple/ \
+            --trusted-host pypi.tuna.tsinghua.edu.cn 2>/dev/null \
+            && export PATH="$HOME/.local/bin:$PATH"
+    fi
+
+    # 方式四：conda/mamba（适合已有 Anaconda/Miniconda 环境的机器）
+    if ! command -v uv &> /dev/null; then
+        if command -v mamba &> /dev/null; then
+            print_warning "尝试 mamba 安装 uv..."
+            mamba install -c conda-forge uv -y --quiet 2>/dev/null || true
+        elif command -v conda &> /dev/null; then
+            print_warning "尝试 conda 安装 uv..."
+            conda install -c conda-forge uv -y --quiet 2>/dev/null || true
+        fi
+    fi
+
+    # 方式五：brew（macOS 备用）
+    if ! command -v uv &> /dev/null && [[ "$OS" == "Darwin" ]] && command -v brew &> /dev/null; then
+        print_warning "尝试 brew install uv..."
+        brew install uv
+    fi
 
     if command -v uv &> /dev/null; then
         print_success "uv 安装成功"
+
+        # 确保 ~/.local/bin 写入 shell rc（uv 官方脚本可能写 .zprofile 而非 .zshrc）
+        local _RC
+        if [[ -n "$ZSH_VERSION" ]] || [[ "$(basename "$SHELL")" == "zsh" ]]; then
+            _RC="$HOME/.zshrc"
+        else
+            _RC="$HOME/.bashrc"
+        fi
+        if ! grep -qF "$HOME/.local/bin" "$_RC" 2>/dev/null; then
+            echo "" >> "$_RC"
+            echo "# uv" >> "$_RC"
+            echo 'export PATH="$HOME/.local/bin:$PATH"' >> "$_RC"
+            print_success "已将 \$HOME/.local/bin 写入 $_RC"
+        fi
     else
-        print_error "uv 安装失败，请手动安装: https://docs.astral.sh/uv/"
+        print_error "uv 安装失败，请手动安装，可选方式："
+        print_info "  pip3 install uv"
+        print_info "  pip3 install uv -i https://pypi.tuna.tsinghua.edu.cn/simple/"
+        print_info "  conda install -c conda-forge uv"
+        print_info "  详见: https://docs.astral.sh/uv/getting-started/installation/"
         exit 1
     fi
 }
@@ -83,8 +143,19 @@ check_tmux() {
     install_tmux() {
         if [[ "$OS" == "Darwin" ]]; then
             if ! command -v brew &> /dev/null; then
-                print_error "未找到 Homebrew，请先安装: https://brew.sh"
-                exit 1
+                print_warning "未找到 Homebrew，正在自动安装..."
+                /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+                # 将 Homebrew 加入 PATH（Apple Silicon / Intel 路径不同）
+                if [[ -x "/opt/homebrew/bin/brew" ]]; then
+                    eval "$(/opt/homebrew/bin/brew shellenv)"
+                elif [[ -x "/usr/local/bin/brew" ]]; then
+                    eval "$(/usr/local/bin/brew shellenv)"
+                fi
+                if ! command -v brew &> /dev/null; then
+                    print_error "Homebrew 安装失败，请手动安装后重试: https://brew.sh"
+                    exit 1
+                fi
+                print_success "Homebrew 安装成功"
             fi
             brew install tmux
         elif [[ "$OS" == "Linux" ]]; then
@@ -92,9 +163,16 @@ check_tmux() {
                 sudo apt-get update && sudo apt-get install -y tmux
             elif command -v yum &> /dev/null; then
                 sudo yum install -y tmux
+            elif command -v pacman &> /dev/null; then
+                sudo pacman -Sy --noconfirm tmux
+            elif command -v apk &> /dev/null; then
+                sudo apk add --no-cache tmux
+            elif command -v zypper &> /dev/null; then
+                sudo zypper install -y tmux
             else
-                print_error "无法自动安装 tmux，请手动安装 3.6 或更高版本"
-                exit 1
+                print_warning "无法识别包管理器，尝试从源码编译 tmux..."
+                install_tmux_from_source
+                return
             fi
         fi
         print_success "tmux 安装成功"
@@ -107,7 +185,9 @@ check_tmux() {
         print_warning "包管理器版本不满足要求，尝试从源码编译 tmux ${TMUX_VERSION_TAG}..."
 
         # 安装编译依赖
-        if command -v apt-get &> /dev/null; then
+        if [[ "$OS" == "Darwin" ]]; then
+            brew install libevent ncurses pkg-config bison 2>/dev/null || true
+        elif command -v apt-get &> /dev/null; then
             sudo apt-get install -y build-essential libevent-dev libncurses5-dev libncursesw5-dev bison pkg-config
         elif command -v yum &> /dev/null; then
             sudo yum groupinstall -y "Development Tools"
@@ -148,11 +228,22 @@ check_tmux() {
             sudo make -C "$SRC_DIR" install
         else
             make -C "$SRC_DIR" install
-            # 若 $HOME/.local/bin 不在 PATH 中，提示用户
+            # 若 $HOME/.local/bin 不在 PATH 中，自动写入 shell 配置
             if [[ ":$PATH:" != *":$HOME/.local/bin:"* ]]; then
-                print_warning "tmux 已安装到 $HOME/.local/bin，请将其加入 PATH："
-                print_warning "  echo 'export PATH=\"\$HOME/.local/bin:\$PATH\"' >> ~/.bashrc && source ~/.bashrc"
-                WARNINGS+=("tmux 安装在 \$HOME/.local/bin，请将其加入 PATH 后重新运行 init.sh")
+                export PATH="$HOME/.local/bin:$PATH"
+                local _RC
+                if [[ "$(basename "$SHELL")" == "zsh" ]]; then
+                    _RC="$HOME/.zshrc"
+                else
+                    _RC="$HOME/.bashrc"
+                fi
+                local _PATH_LINE='export PATH="$HOME/.local/bin:$PATH"'
+                if ! grep -qF "$HOME/.local/bin" "$_RC" 2>/dev/null; then
+                    echo "" >> "$_RC"
+                    echo "# remote-claude: tmux 路径" >> "$_RC"
+                    echo "$_PATH_LINE" >> "$_RC"
+                    print_success "已自动将 \$HOME/.local/bin 加入 PATH（写入 $_RC）"
+                fi
             fi
         fi
 
@@ -181,18 +272,13 @@ check_tmux() {
         else
             print_warning "$TMUX_VERSION 版本过低，需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR} 或更高，正在升级..."
             install_tmux
-            # 升级后再次验证
+            # 升级后再次验证，版本仍不满足则走源码编译（跨平台）
             if ! check_version; then
-                if [[ "$OS" == "Linux" ]]; then
-                    install_tmux_from_source
-                    if ! check_version; then
-                        print_warning "源码编译安装后版本仍不满足要求（$(tmux -V)），请手动安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
-                        WARNINGS+=("tmux 版本不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+，请手动升级")
-                    else
-                        print_success "tmux 已升级至 $(tmux -V)"
-                    fi
+                install_tmux_from_source
+                if check_version; then
+                    print_success "tmux 已升级至 $(tmux -V)"
                 else
-                    print_warning "升级后版本仍不满足要求（$(tmux -V)），请手动安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
+                    print_warning "源码编译后版本仍不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
                     WARNINGS+=("tmux 版本不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+，请手动升级")
                 fi
             else
@@ -203,14 +289,9 @@ check_tmux() {
         print_warning "未找到 tmux，正在安装..."
         install_tmux
         if ! check_version; then
-            if [[ "$OS" == "Linux" ]]; then
-                install_tmux_from_source
-                if ! check_version; then
-                    print_warning "源码编译安装后版本仍不满足要求（$(tmux -V)），请手动安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
-                    WARNINGS+=("tmux 版本不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+，请手动升级")
-                fi
-            else
-                print_warning "安装的版本不满足要求（$(tmux -V)），请手动安装 tmux ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
+            install_tmux_from_source
+            if ! check_version; then
+                print_warning "源码编译后版本仍不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+"
                 WARNINGS+=("tmux 版本不满足要求（$(tmux -V)），需要 ${REQUIRED_MAJOR}.${REQUIRED_MINOR}+，请手动升级")
             fi
         fi
@@ -354,9 +435,21 @@ configure_shell() {
             BIN_DIR="$HOME/.local/bin"
         else
             BIN_DIR="$HOME/.local/bin"
-            print_warning "cla/cl/remote-claude 将安装到 $BIN_DIR，但该目录不在 PATH 中"
-            print_info "请将以下行添加到 shell 配置文件（~/.zshrc 或 ~/.bashrc）："
-            echo "  export PATH=\"\$HOME/.local/bin:\$PATH\""
+            # 自动写入 PATH 到 shell 配置文件
+            export PATH="$BIN_DIR:$PATH"
+            local _RC
+            if [[ -n "$ZSH_VERSION" ]] || [[ "$(basename "$SHELL")" == "zsh" ]]; then
+                _RC="$HOME/.zshrc"
+            else
+                _RC="$HOME/.bashrc"
+            fi
+            local _PATH_LINE='export PATH="$HOME/.local/bin:$PATH"'
+            if ! grep -qF "$HOME/.local/bin" "$_RC" 2>/dev/null; then
+                echo "" >> "$_RC"
+                echo "# remote-claude: 快捷命令路径" >> "$_RC"
+                echo "$_PATH_LINE" >> "$_RC"
+                print_success "已自动将 \$HOME/.local/bin 加入 PATH（写入 $_RC）"
+            fi
         fi
         mkdir -p "$BIN_DIR"
         ln -sf "$SCRIPT_DIR/bin/cla"          "$BIN_DIR/cla"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remote-claude",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "双端共享 Claude CLI 工具",
   "bin": {
     "remote-claude": "bin/remote-claude",