Merge remote-tracking branch 'upstream/main' into feat/copilot

Author: conversun

.dockerignore

@@ -1,6 +1,6 @@
 # Git and GitHub folders
-.git/*
-.github/*
+.git
+.github
 
 # Docker and CI/CD related files
 docker-compose.yml
@@ -10,28 +10,32 @@ docker-compose.yml
 Dockerfile
 
 # Documentation and license
-docs/*
+docs
 README.md
 README_CN.md
 LICENSE
 
 # Runtime data folders (should be mounted as volumes)
-auths/*
-logs/*
-conv/*
+auths
+logs
+conv
 config.yaml
 
 # Development/editor
-bin/*
-.vscode/*
-.claude/*
-.codex/*
-.gemini/*
-.serena/*
-.agent/*
-.agents/*
-.opencode/*
-.idea/*
-.bmad/*
-_bmad/*
-_bmad-output/*
+bin
+.vscode
+.claude
+.codex
+.codex-worktrees
+.gemini
+.serena
+.agent
+.agents
+.antigravitycli
+.opencode
+.idea
+.junie
+.worktrees
+.bmad
+_bmad
+_bmad-output

.github/workflows/release.yaml

@@ -17,15 +17,21 @@ jobs:
   prepare-release:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          fetch-tags: true
       - name: Create release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -euo pipefail
           release_notes_file="$(mktemp)"
-          current_notes_file="$(mktemp)"
+          generated_notes_file="$(mktemp)"
+          changelog_entries_file="$(mktemp)"
+          changelog_notes_file="$(mktemp)"
           updated_notes_file="$(mktemp)"
-          trap 'rm -f "$release_notes_file" "$current_notes_file" "$updated_notes_file"' EXIT
+          trap 'rm -f "$release_notes_file" "$generated_notes_file" "$changelog_entries_file" "$changelog_notes_file" "$updated_notes_file"' EXIT
 
           cat > "$release_notes_file" <<'EOF'
           <!-- cliproxyapi-linux-release-assets:start -->
@@ -34,25 +40,56 @@ jobs:
           - `CLIProxyAPI_<version>_linux_<arch>.tar.gz` is the default Linux build. It supports dynamic library plugins and is built against a GLIBC 2.17 baseline.
           - `CLIProxyAPI_<version>_linux_<arch>_no-plugin.tar.gz` is the portable Linux build for musl-based or older systems such as OpenWrt. It does not support dynamic library plugins.
 
+          ## FreeBSD release assets
+
+          - `CLIProxyAPI_<version>_freebsd_aarch64_no-plugin.tar.gz` is the FreeBSD arm64 build. It is built without CGO and does not support dynamic library plugins.
+
           <!-- cliproxyapi-linux-release-assets:end -->
           EOF
 
-          if gh release view "$GITHUB_REF_NAME" >/dev/null 2>&1; then
-            gh release edit "$GITHUB_REF_NAME" --title "$GITHUB_REF_NAME"
+          git fetch --force --tags
+          previous_tag=""
+          if previous_tag_value="$(git describe --tags --abbrev=0 "${GITHUB_REF_NAME}^" 2>/dev/null)"; then
+            previous_tag="$previous_tag_value"
+            changelog_range="${previous_tag}..${GITHUB_REF_NAME}"
           else
-            gh release create "$GITHUB_REF_NAME" --title "$GITHUB_REF_NAME" --generate-notes
+            changelog_range="$GITHUB_REF_NAME"
+          fi
+
+          git log --reverse --pretty=format:'- %s (%h)' "$changelog_range" |
+            grep -Ev '^- (docs:|test:)' > "$changelog_entries_file" || true
+
+          gh api "repos/${GH_REPO}/releases/generate-notes" \
+            -f tag_name="$GITHUB_REF_NAME" \
+            --jq .body > "$generated_notes_file"
+          if [[ ! -s "$generated_notes_file" ]]; then
+            if [[ -n "$previous_tag" ]]; then
+              printf '**Full Changelog**: https://github.com/%s/compare/%s...%s\n' "$GH_REPO" "$previous_tag" "$GITHUB_REF_NAME" > "$generated_notes_file"
+            else
+              printf '**Full Changelog**: https://github.com/%s/commits/%s\n' "$GH_REPO" "$GITHUB_REF_NAME" > "$generated_notes_file"
+            fi
           fi
-          gh release view "$GITHUB_REF_NAME" --json body -q .body > "$current_notes_file"
+
+          {
+            if [[ -s "$changelog_entries_file" ]]; then
+              printf '## Changelog\n\n'
+              cat "$changelog_entries_file"
+              printf '\n\n'
+            fi
+            cat "$generated_notes_file"
+          } > "$changelog_notes_file"
+
           {
             cat "$release_notes_file"
             printf '\n'
-            awk '
-              /^<!-- cliproxyapi-linux-release-assets:start -->$/ { skip = 1; next }
-              /^<!-- cliproxyapi-linux-release-assets:end -->$/ { skip = 0; next }
-              !skip { print }
-            ' "$current_notes_file"
+            cat "$changelog_notes_file"
           } > "$updated_notes_file"
-          gh release edit "$GITHUB_REF_NAME" --notes-file "$updated_notes_file"
+
+          if gh release view "$GITHUB_REF_NAME" >/dev/null 2>&1; then
+            gh release edit "$GITHUB_REF_NAME" --title "$GITHUB_REF_NAME" --notes-file "$updated_notes_file"
+          else
+            gh release create "$GITHUB_REF_NAME" --title "$GITHUB_REF_NAME" --notes-file "$updated_notes_file"
+          fi
 
   build-hosted:
     name: build ${{ matrix.target }}
@@ -456,21 +493,28 @@ jobs:
           gh release upload "$GITHUB_REF_NAME" "$tmp_dir/checksums.txt" --clobber
 
   build-freebsd:
-    name: build freebsd-${{ matrix.goarch }}
+    name: build ${{ matrix.target }}
     needs: prepare-release
     runs-on: ubuntu-latest
     env:
-      TARGET: freebsd-${{ matrix.goarch }}
+      TARGET: ${{ matrix.target }}
       GOARCH: ${{ matrix.goarch }}
       ASSET_ARCH: ${{ matrix.asset_arch }}
+      ASSET_SUFFIX: ${{ matrix.asset_suffix }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - goarch: amd64
+          - target: freebsd-amd64
+            goarch: amd64
             asset_arch: amd64
-          - goarch: arm64
+            asset_suffix: ''
+            cgo_enabled: true
+          - target: freebsd-arm64-no-plugin
+            goarch: arm64
             asset_arch: aarch64
+            asset_suffix: _no-plugin
+            cgo_enabled: false
     steps:
       - uses: actions/checkout@v6
         with:
@@ -507,13 +551,19 @@ jobs:
           echo "release_version=$release_version" >> "$GITHUB_OUTPUT"
           echo "commit=$commit" >> "$GITHUB_OUTPUT"
           echo "build_date=$build_date" >> "$GITHUB_OUTPUT"
-      - name: Install FreeBSD cross-build dependencies
+      - name: Prepare FreeBSD output
+        shell: bash
         run: |
           set -euo pipefail
           rm -rf "dist/${TARGET}"
+      - name: Install FreeBSD cross-build dependencies
+        if: ${{ matrix.cgo_enabled }}
+        run: |
+          set -euo pipefail
           sudo apt-get update
           sudo apt-get install -y clang lld wget
-      - name: Build FreeBSD binary
+      - name: Build FreeBSD binary with CGO
+        if: ${{ matrix.cgo_enabled }}
         timeout-minutes: 45
         uses: go-cross/cgo-actions@v1
         with:
@@ -527,13 +577,22 @@ jobs:
             -X main.Version=${{ steps.metadata.outputs.release_version }}
             -X main.Commit=${{ steps.metadata.outputs.commit }}
             -X main.BuildDate=${{ steps.metadata.outputs.build_date }}
+      - name: Build FreeBSD no-plugin binary
+        if: ${{ !matrix.cgo_enabled }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          mkdir -p "dist/${TARGET}/bin"
+          CGO_ENABLED=0 GOOS=freebsd GOARCH="$GOARCH" go build -buildvcs=false \
+            -ldflags="-s -w -X main.Version=${RELEASE_VERSION} -X main.Commit=${COMMIT} -X main.BuildDate=${BUILD_DATE}" \
+            -o "dist/${TARGET}/bin/cli-proxy-api" ./cmd/server/
       - name: Package FreeBSD archive
         shell: bash
         run: |
           set -euo pipefail
 
           archive_dir="dist/${TARGET}/archive"
-          archive_name="CLIProxyAPI_${RELEASE_VERSION}_freebsd_${ASSET_ARCH}.tar.gz"
+          archive_name="CLIProxyAPI_${RELEASE_VERSION}_freebsd_${ASSET_ARCH}${ASSET_SUFFIX}.tar.gz"
           mkdir -p "$archive_dir"
 
           echo "Packaging ${archive_name}"
@@ -542,7 +601,7 @@ jobs:
           tar -C "$archive_dir" -czf "dist/$archive_name" cli-proxy-api LICENSE README.md README_CN.md config.example.yaml
       - uses: actions/upload-artifact@v4
         with:
-          name: freebsd-${{ matrix.goarch }}
+          name: ${{ matrix.target }}
           path: dist/CLIProxyAPI_*
           if-no-files-found: error
       - name: Upload release assets

.gitignore

@@ -41,6 +41,7 @@ GEMINI.md
 .gemini/*
 .serena/*
 .agent/*
+.agents
 .agents/*
 .opencode/*
 .idea/*

README.md

@@ -32,9 +32,7 @@ PackyCode provides special discounts for our software users: register using <a h
 </tr>
 <tr>
 <td width="180"><a href="https://coder.visioncoder.cn"><img src="./assets/visioncoder.png" alt="VisionCoder" width="150"></a></td>
-<td>Thanks to <b>VisionCoder</b> for supporting this project. <a href="https://coder.visioncoder.cn" target="_blank">VisionCoder Developer Platform</a> is a reliable and efficient API relay service provider, offering access to mainstream AI models such as Claude Code, Codex, and Gemini. It helps developers and teams integrate AI capabilities more easily and improve productivity.
-<p></p>
-VisionCoder is also offering our users a limited-time <a href="https://coder.visioncoder.cn" target="_blank">Token Plan</a> promotion: <b>buy 1 month and get 1 month free</b>.</td>
+<td>Thanks to VisionCoder for supporting this project. <a href="https://coder.visioncoder.cn">VisionCoder Developer Platform</a> is a reliable and efficient API relay service provider, offering access to mainstream AI models such as Claude Code, Codex, and Gemini. It helps developers and teams integrate AI capabilities more easily and improve productivity. Additionally, VisionCoder now offers retail channels for <b>Claude Max 200 and GPT Pro 200 premium accounts</b>, providing users with instant access to top-tier AI computing power and features.</td>
 </tr>
 <tr>
 <td width="180"><a href="https://apikey.fun/register?aff=CLIProxyAPI"><img src="./assets/apikey.png" alt="APIKEY.FUN" width="150"></a></td>
@@ -48,6 +46,10 @@ VisionCoder is also offering our users a limited-time <a href="https://coder.vis
 <td width="180"><a href="https://unity2.ai/register?source=cliproxyapi"><img src="./assets/unity2.jpg" alt="Unity2" width="150"></a></td>
 <td>Thanks to Unity2.ai for sponsoring this project! Unity2.ai is a high-performance AI model API relay platform for individual developers, teams, and enterprises. It has long served leading domestic enterprises, handles more than 30 billion token calls per day, and supports high concurrency at the 5000 RPM level. It supports balance billing, first top-up bonuses, bundled subscriptions, enterprise invoicing, and dedicated integration support. Register through <a href="https://unity2.ai/register?source=cliproxyapi">this link</a> to receive a $2 balance, then join the official group to get another $10 balance, for up to $12 in free credit.</td>
 </tr>
+<tr>
+<td width="180"><a href="https://catapi.ai/sign-up"><img src="./assets/catapi.png" alt="CatAPI" width="150"></a></td>
+<td>Cat API is an AI model aggregation platform built for individual developers and teams, integrating leading large language models into a single simple, stable, and easy-to-use entry point. It provides an API fully compatible with OpenAI, Claude, and Gemini that plugs seamlessly into mainstream AI IDEs and coding tools such as Claude Code, Cursor, Windsurf, Cline, Roo Code, Continue, Codex, and Trae, and features dedicated CN2 high-speed routing for low-latency, highly reliable access. <a href="https://catapi.ai/sign-up">Sign up</a> to claim 1$ in free credits.</td>
+</tr>
 </tbody>
 </table>
 
@@ -57,7 +59,6 @@ VisionCoder is also offering our users a limited-time <a href="https://coder.vis
 - OpenAI Codex support (GPT models) via OAuth login
 - Claude Code support via OAuth login
 - Grok Build support via OAuth login
-- Amp CLI and IDE extensions support with provider routing
 - Streaming, non-streaming, and WebSocket responses where supported
 - Function calling/tools support
 - Multimodal input support (text and images)
@@ -189,6 +190,10 @@ Multi-agent orchestration for AI coding assistants. Runs CLIProxyAPI as a local
 
 Windows desktop UI that manages CLIProxyAPI and Perplexity WebUI Scraper from a single interface, inspired by Quotio and VibeProxy. Connect OAuth providers (Claude, Gemini CLI, Codex, Kimi, Antigravity), custom API keys, and Perplexity session accounts, then point any coding agent at the local endpoint.
 
+### [Quotio Desktop](https://github.com/xiaocoss/quotio-desktop)
+
+Cross-platform (Tauri) port of Quotio for Windows, macOS and Linux. Manages a pool of AI accounts (Codex, Claude Code, GitHub Copilot, Gemini CLI, Antigravity, Kiro, Cursor, Trae, GLM) through CLIProxyAPI, with per-account 5-hour/weekly quota bars, Codex rate-limit reset credits with one-click reset, smart scheduling, usage statistics, and multi-instance Codex — no API keys needed.
+
 > [!NOTE]  
 > If you developed a project based on CLIProxyAPI, please open a PR to add it to this list.
 

README_CN.md

@@ -32,9 +32,7 @@ PackyCode 为本软件用户提供了特别优惠：使用<a href="https://www.p
 </tr>
 <tr>
 <td width="180"><a href="https://coder.visioncoder.cn"><img src="./assets/visioncoder.png" alt="VisionCoder" width="150"></a></td>
-<td>感谢 <b>VisionCoder</b> 对本项目的支持。<a href="https://coder.visioncoder.cn" target="_blank">VisionCoder 开发平台</a> 是一个可靠高效的 API 中继服务提供商，提供 Claude Code、Codex、Gemini 等主流 AI 模型，帮助开发者和团队更轻松地集成 AI 功能，提升工作效率。
-<p></p>
-VisionCoder 还为我们的用户提供 <a href="https://coder.visioncoder.cn" target="_blank">Token Plan</a> 限时活动：<b>购买 1 个月，赠送 1 个月</b>。</td>
+<td>感谢 VisionCoder 对本项目的支持。<a href="https://coder.visioncoder.cn">VisionCoder 开发平台</a> 是一个可靠高效的 API 中继服务提供商，提供 Claude Code、Codex、Gemini 等主流 AI 模型，帮助开发者和团队更轻松地集成 AI 功能，提升工作效率。此外，VisionCoder 还提供 <b>Claude Max 200 与 GPT Pro 200 高级成品号</b>的独家售卖渠道，助力体验全网顶配 AI 的算力与体验。</td>
 </tr>
 <tr>
 <td width="180"><a href="https://apikey.fun/register?aff=CLIProxyAPI"><img src="./assets/apikey.png" alt="APIKEY.FUN" width="150"></a></td>
@@ -48,6 +46,10 @@ VisionCoder 还为我们的用户提供 <a href="https://coder.visioncoder.cn" t
 <td width="180"><a href="https://unity2.ai/register?source=cliproxyapi"><img src="./assets/unity2.jpg" alt="Unity2" width="150"></a></td>
 <td>感谢 Unity2.ai 赞助了本项目！Unity2.ai 是面向个人开发者、团队和企业的高性能 AI 模型 API 中转平台，长期服务国内头部企业，日均承载超 300 亿 token 调用，支持 5000 RPM 级高并发。支持余额计费、首充赠额、组合订阅、企业开票和专属对接。通过<a href="https://unity2.ai/register?source=cliproxyapi">此链接</a>注册可领取 $2 余额，加入官方群再送 $10 余额，最高可领 $12 免费额度。</td>
 </tr>
+<tr>
+<td width="180"><a href="https://catapi.ai/sign-up"><img src="./assets/catapi.png" alt="CatAPI" width="150"></a></td>
+<td>Cat API 是一家面向个人开发者与团队的 AI 大模型聚合平台，致力于将主流大模型能力整合到一个简单、稳定、易用的入口中。平台提供完全兼容 OpenAI、Claude、Gemini 的 API，可无缝接入 Claude Code、Cursor、Windsurf、Cline、Roo Code、Continue、Codex、Trae 等主流 AI IDE 与编程工具，并主打 CN2 高速线路，为用户带来低延迟、高稳定的访问体验。<a href="https://catapi.ai/sign-up">注册</a>即可领取 1$ 的免费额度。</td>
+</tr>
 </tbody>
 </table>
 
@@ -186,6 +188,10 @@ Shadow AI 是一款专为受限环境设计的 AI 辅助工具。提供无窗口
 
 Windows 桌面 UI，通过单一界面管理 CLIProxyAPI 和 Perplexity WebUI Scraper，灵感来自 Quotio 和 VibeProxy。连接 OAuth 提供商（Claude、Gemini CLI、Codex、Kimi、Antigravity）、自定义 API 密钥和 Perplexity 会话账号，然后将任意编程智能体指向本地端点。
 
+### [Quotio Desktop](https://github.com/xiaocoss/quotio-desktop)
+
+Quotio 的跨平台（Tauri）移植版，支持 Windows / macOS / Linux。通过 CLIProxyAPI 管理多账号代理池（Codex、Claude Code、GitHub Copilot、Gemini CLI、Antigravity、Kiro、Cursor、Trae、GLM），提供每账号 5 小时 / 每周额度进度条、Codex 主动重置次数与一键重置、智能调度、用量统计及 Codex 多开实例，无需 API 密钥。
+
 > [!NOTE]  
 > 如果你开发了基于 CLIProxyAPI 的项目，请提交一个 PR（拉取请求）将其添加到此列表中。