tako-cli 0.2.5 → 0.2.8

package/install.sh

@@ -34,51 +34,21 @@ error() {
 
 # 检测用户所在地区
 detect_region() {
-    # Fast path: locale/timezone heuristic (instant, no network)
-    local lang="${LANG:-}${LC_ALL:-}${LANGUAGE:-}"
-    if echo "$lang" | grep -qi '^zh_CN'; then
-        REGION="cn"
-        info "检测到中文环境，使用国内镜像"
-        return 0
-    fi
-
-    # Check timezone (CST or Asia/Shanghai variants)
-    local tz="${TZ:-}"
-    if [ -z "$tz" ]; then
-        tz=$(date +%Z 2>/dev/null || echo "")
-    fi
-    case "$tz" in
-        CST|Asia/Shanghai|Asia/Chongqing|Asia/Urumqi|Asia/Harbin)
-            REGION="cn"
-            info "检测到中国时区，使用国内镜像"
-            return 0
-            ;;
-    esac
-
-    # Slow path: IP-based detection (with --max-time to cap total request time)
     info "检测网络环境..."
 
     local country=""
-    country=$(curl -s --connect-timeout 2 --max-time 3 "http://ip-api.com/line/?fields=countryCode" 2>/dev/null || echo "")
+    country=$(curl -s --connect-timeout 2 "http://ip-api.com/line/?fields=countryCode" 2>/dev/null || echo "")
 
     if [ -z "$country" ]; then
-        country=$(curl -s --connect-timeout 2 --max-time 3 "https://ipinfo.io/country" 2>/dev/null || echo "")
-    fi
-
-    if [ -z "$country" ]; then
-        country=$(curl -s --connect-timeout 2 --max-time 3 "https://api.ip.sb/geoip" 2>/dev/null | grep -o '"country_code":"[^"]*"' | head -1 | cut -d'"' -f4 || echo "")
+        country=$(curl -s --connect-timeout 2 "https://ipinfo.io/country" 2>/dev/null || echo "")
     fi
 
     if [ "$country" = "CN" ]; then
         REGION="cn"
         info "检测到中国大陆网络，使用国内镜像"
-    elif [ -n "$country" ]; then
+    else
         REGION="global"
         info "使用国际源"
-    else
-        # 所有检测都失败，默认使用国内镜像（保守策略，与 TS 代码一致）
-        REGION="cn"
-        info "网络检测超时，默认使用国内镜像"
     fi
 }
 
@@ -118,68 +88,6 @@ install_dependencies() {
     fi
 }
 
-# 从 npmmirror 直接下载安装 Bun（国内专用，不依赖 bun.sh 和 GitHub）
-install_bun_from_npmmirror() {
-    local mirror="https://registry.npmmirror.com/-/binary/bun"
-
-    # 检测平台和架构
-    local os arch target
-    os=$(uname -s | tr '[:upper:]' '[:lower:]')
-    arch=$(uname -m)
-
-    case "$os" in
-        linux)  os="linux" ;;
-        darwin) os="darwin" ;;
-        *)      error "不支持的操作系统: $os" ;;
-    esac
-
-    case "$arch" in
-        x86_64|amd64)   arch="x64" ;;
-        aarch64|arm64)  arch="aarch64" ;;
-        *)              error "不支持的架构: $arch" ;;
-    esac
-
-    # Alpine Linux 使用 musl 版本
-    target="bun-${os}-${arch}"
-    if [ "$os" = "linux" ] && [ -f /etc/alpine-release ]; then
-        target="${target}-musl"
-    fi
-
-    # 获取最新版本号
-    info "正在获取最新版本..."
-    local latest_version
-    latest_version=$(curl -s --connect-timeout 5 "$mirror/" 2>/dev/null \
-        | grep -o '"name":"bun-v[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/"' \
-        | sed 's/"name":"bun-v//;s/\/"//' \
-        | sort -t. -k1,1rn -k2,2rn -k3,3rn \
-        | head -1)
-
-    if [ -z "$latest_version" ]; then
-        error "无法获取 Bun 最新版本号"
-    fi
-
-    # 补回前缀
-    latest_version="bun-v${latest_version}"
-
-    local download_url="${mirror}/${latest_version}/${target}.zip"
-    local zip_file="/tmp/bun-install-$$.zip"
-
-    info "下载 Bun (${latest_version}) from npmmirror..."
-    curl --fail --location --progress-bar --output "$zip_file" "$download_url" || \
-        error "下载失败: $download_url"
-
-    # 解压到目标目录
-    local bin_dir="$TAKO_BUN_DIR/bin"
-    mkdir -p "$bin_dir"
-
-    unzip -oq "$zip_file" -d /tmp/bun-install-$$ || error "解压失败"
-    mv "/tmp/bun-install-$$/${target}/bun" "$bin_dir/bun"
-    chmod +x "$bin_dir/bun"
-
-    # 清理临时文件
-    rm -rf "$zip_file" "/tmp/bun-install-$$"
-}
-
 # 安装 Tako 专属 Bun
 install_bun() {
     # 检查是否已安装
@@ -193,15 +101,20 @@ install_bun() {
 
     mkdir -p "$TAKO_BUN_DIR"
 
+    # 设置环境变量确保 bun 安装到正确位置
+    export BUN_INSTALL="$TAKO_BUN_DIR"
+
+    # 国内用户使用镜像
     if [ "$REGION" = "cn" ]; then
-        # 国内用户：直接从 npmmirror 下载二进制，完全不经过 bun.sh/GitHub
-        install_bun_from_npmmirror
-    else
-        # 海外用户：使用官方安装脚本
-        export BUN_INSTALL="$TAKO_BUN_DIR"
-        curl -fsSL https://bun.sh/install | bash
+        export BUN_INSTALL_MIRROR="https://registry.npmmirror.com/-/binary/bun"
     fi
 
+    # 执行 bun 安装脚本
+    curl -fsSL https://bun.sh/install | bash
+
+    # 清理环境变量
+    unset BUN_INSTALL_MIRROR
+
     if [ ! -x "$TAKO_BUN_DIR/bin/bun" ]; then
         error "Bun 安装失败，请检查网络连接"
     fi

package/package.json

@@ -1,78 +1,44 @@
 {
   "name": "tako-cli",
-  "version": "0.2.5",
-  "description": "Tako CLI - AI coding tools launcher with agentic coding support",
-  "author": "Tako Team",
-  "license": "AGPL-3.0-only",
+  "version": "0.2.8",
+  "description": "Tako CLI - AI coding tools launcher",
   "type": "module",
+  "bin": {
+    "tako": "./dist/index.js"
+  },
   "files": [
-    "dist/",
     "install.sh",
-    "install.ps1"
+    "install.ps1",
+    "dist"
   ],
-  "imports": {
-    "#embedded-assets": {
-      "bun": "./src/runtime/embeddedAssets.bun.ts",
-      "default": "./src/runtime/embeddedAssets.stub.ts"
-    }
-  },
   "scripts": {
-    "typecheck": "tsc --noEmit",
-    "build:web": "cd ../hub/web && bun install && bun run build",
     "build": "bun run scripts/build.ts",
     "bump": "bun scripts/bump.ts",
     "test": "bun test",
     "test:unit": "bun test tests/unit.*.test.ts",
     "test:integration": "bun test tests/integration.*.test.ts",
     "test:platform": "bun test tests/platform.*.test.ts",
-    "test:pre-release": "bun test tests/pre-release.test.ts tests/unit.token-env-alias.test.ts tests/integration.spawn-env.test.ts tests/unit.codex-api-key-resolution.test.ts",
+    "test:pre-release": "bun test tests/pre-release.test.ts",
     "test:e2e": "bash scripts/test-install.sh",
-    "test:lifecycle": "bash ../../scripts/test-cli-lifecycle.sh",
-    "release": "bun run test:pre-release && bun scripts/bump.ts patch && npm publish --registry https://registry.npmjs.org && cd ../desktop-bundles && bun run release && cd ../cli && ./scripts/sync-gitee.sh",
-    "prepublishOnly": "bun run build:web && bun run build",
-    "dev": "bun src/index.ts"
-  },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.25.1",
-    "@openpanel/sdk": "^1.0.4",
-    "axios": "^1.13.2",
-    "chalk": "^5.6.2",
-    "cross-spawn": "^7.0.6",
-    "fastify": "^5.6.2",
-    "fastify-type-provider-zod": "6.1.0",
-    "ink": "^6.6.0",
-    "ps-list": "^9.0.0",
-    "react": "^19.2.3",
-    "socket.io-client": "^4.8.3",
-    "tar": "^7.5.2",
-    "yaml": "^2.8.2",
-    "zod": "^4.2.1"
+    "test:watch": "bun test --watch",
+    "test:coverage": "bun test --coverage",
+    "release": "bun run test:pre-release && bun scripts/bump.ts patch && npm publish --registry https://registry.npmjs.org && ./scripts/sync-gitee.sh",
+    "prepublishOnly": "bun run build"
   },
   "devDependencies": {
-    "@tako/installer": "workspace:*",
-    "@tako/protocol": "workspace:*",
-    "tako-hub": "workspace:*",
     "@clack/prompts": "^0.7.0",
-    "@types/cross-spawn": "^6.0.6",
-    "@types/node": ">=25",
-    "@types/ps-list": "^6.2.1",
-    "@types/react": "^19.2.7",
-    "bun-types": "latest",
-    "dotenv": "^17.2.3",
-    "typescript": "^5",
-    "vitest": "^4.0.16"
-  },
-  "resolutions": {
-    "whatwg-url": "14.2.0",
-    "parse-path": "7.0.3",
-    "@types/parse-path": "7.0.3"
+    "bun-types": "latest"
   },
   "keywords": [
     "cli",
     "ai",
     "claude",
-    "codex",
-    "gemini",
-    "agentic-coding"
-  ]
+    "codex"
+  ],
+  "license": "UNLICENSED",
+  "dependencies": {
+    "@openpanel/sdk": "^1.0.4",
+    "qrcode-terminal": "^0.12.0",
+    "smol-toml": "^1.3.1"
+  }
 }