Merge branch 'main' into dev

.github/workflows/release.yml

@@ -4,6 +4,23 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
+    inputs:
+      version_type:
+        description: 'Release type'
+        required: true
+        default: 'patch'
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+          - beta
+          - rc
+      prerelease_number:
+        description: 'Beta/RC number (only for beta/rc types)'
+        required: false
+        default: '1'
 
 permissions:
   contents: write
@@ -12,8 +29,10 @@ permissions:
 jobs:
   release-pipeline:
     runs-on: ubuntu-latest
-    # 跳过由GitHub Actions创建的提交,避免死循环
-    if: github.event.pusher.name != 'github-actions[bot]' && !contains(github.event.head_commit.message, '[skip ci]')
+    # 跳过由GitHub Actions创建的提交,避免死循环 (仅对push事件生效)
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      (github.event.pusher.name != 'github-actions[bot]' && !contains(github.event.head_commit.message, '[skip ci]'))
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
@@ -77,7 +96,7 @@ jobs:
           fi
 
       - name: Get current version
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         id: get_version
         run: |
           # 获取最新的tag版本
@@ -104,48 +123,83 @@ jobs:
           echo "current_version=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Calculate next version
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         id: next_version
+        env:
+          VERSION_TYPE: ${{ github.event.inputs.version_type || 'patch' }}
+          PRERELEASE_NUM: ${{ github.event.inputs.prerelease_number || '1' }}
         run: |
           VERSION="${{ steps.get_version.outputs.current_version }}"
 
+          # 移除可能存在的 prerelease 后缀以获取基础版本
+          BASE_VERSION=$(echo "$VERSION" | sed 's/-.*$//')
+
           # 分割版本号
-          IFS='.' read -r -a version_parts <<< "$VERSION"
+          IFS='.' read -r -a version_parts <<< "$BASE_VERSION"
           MAJOR="${version_parts[0]:-0}"
           MINOR="${version_parts[1]:-0}"
           PATCH="${version_parts[2]:-0}"
 
-          # 默认递增patch版本
-          NEW_PATCH=$((PATCH + 1))
-          NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
+          echo "Base version: $MAJOR.$MINOR.$PATCH"
+          echo "Version type: $VERSION_TYPE"
+
+          case "$VERSION_TYPE" in
+            major)
+              NEW_VERSION="$((MAJOR + 1)).0.0"
+              IS_PRERELEASE=false
+              ;;
+            minor)
+              NEW_VERSION="${MAJOR}.$((MINOR + 1)).0"
+              IS_PRERELEASE=false
+              ;;
+            patch)
+              NEW_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))"
+              IS_PRERELEASE=false
+              ;;
+            beta)
+              NEW_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))-beta.${PRERELEASE_NUM}"
+              IS_PRERELEASE=true
+              ;;
+            rc)
+              NEW_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))-rc.${PRERELEASE_NUM}"
+              IS_PRERELEASE=true
+              ;;
+            *)
+              # 默认 patch
+              NEW_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))"
+              IS_PRERELEASE=false
+              ;;
+          esac
 
           echo "New version: $NEW_VERSION"
+          echo "Is prerelease: $IS_PRERELEASE"
           echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
           echo "new_tag=v$NEW_VERSION" >> $GITHUB_OUTPUT
+          echo "is_prerelease=$IS_PRERELEASE" >> $GITHUB_OUTPUT
 
       - name: Update VERSION file
-        if: steps.check.outputs.needs_bump == 'true'
+        if: (steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch') && steps.next_version.outputs.is_prerelease != 'true'
         run: |
           echo "${{ steps.next_version.outputs.new_version }}" > VERSION
 
       - name: Setup Node.js for formatting
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         uses: actions/setup-node@v4
         with:
           node-version: "20"
 
       - name: Setup Bun
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         uses: oven-sh/setup-bun@v2
 
       - name: Install dependencies and format code
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         run: |
           bun install
           bun run format
 
       - name: Commit VERSION and formatted code
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         run: |
           # 配置git
           git config user.name "github-actions[bot]"
@@ -166,7 +220,7 @@ jobs:
           fi
 
       - name: Create and push tag
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         run: |
           NEW_TAG="${{ steps.next_version.outputs.new_tag }}"
           git tag -a "$NEW_TAG" -m "Release $NEW_TAG"
@@ -174,36 +228,36 @@ jobs:
 
       - name: Prepare image names
         id: image_names
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         run: |
           GHCR_IMAGE=$(echo "ghcr.io/${{ github.repository_owner }}/claude-code-hub" | tr '[:upper:]' '[:lower:]')
 
           echo "ghcr_image=${GHCR_IMAGE}" >> "$GITHUB_OUTPUT"
 
       - name: Create GitHub Release
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.next_version.outputs.new_tag }}
           name: Release ${{ steps.next_version.outputs.new_version }}
           body: |
-            ## 🐳 Docker 镜像
+            ## Docker
 
             ```bash
             docker pull ${{ steps.image_names.outputs.ghcr_image }}:${{ steps.next_version.outputs.new_tag }}
-            docker pull ${{ steps.image_names.outputs.ghcr_image }}:latest
+            ${{ steps.next_version.outputs.is_prerelease != 'true' && format('docker pull {0}:latest', steps.image_names.outputs.ghcr_image) || '' }}
             ```
 
             ---
 
-            📝 详细更新日志将由 Claude 自动生成...
+            Release notes will be auto-generated...
           draft: false
-          prerelease: false
+          prerelease: ${{ steps.next_version.outputs.is_prerelease == 'true' }}
           generate_release_notes: false
 
-      # 自动清理旧的tags和releases(保持最近50个)
+      # 自清理旧的tags和releases(保持最近50个) - 仅清理正式版本
       - name: Cleanup old tags and releases
-        if: steps.check.outputs.needs_bump == 'true'
+        if: (steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch') && steps.next_version.outputs.is_prerelease != 'true'
         continue-on-error: true
         env:
           TAGS_TO_KEEP: 50
@@ -304,15 +358,15 @@ jobs:
 
       # Docker构建步骤
       - name: Set up QEMU
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         uses: docker/setup-buildx-action@v3
 
       - name: Log in to GitHub Container Registry
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -320,7 +374,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        if: steps.check.outputs.needs_bump == 'true'
+        if: steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch'
         uses: docker/build-push-action@v6
         with:
           context: .
@@ -331,7 +385,7 @@ jobs:
             APP_VERSION=${{ steps.next_version.outputs.new_version }}
           tags: |
             ${{ steps.image_names.outputs.ghcr_image }}:${{ steps.next_version.outputs.new_tag }}
-            ${{ steps.image_names.outputs.ghcr_image }}:latest
+            ${{ steps.next_version.outputs.is_prerelease != 'true' && format('{0}:latest', steps.image_names.outputs.ghcr_image) || '' }}
             ${{ steps.image_names.outputs.ghcr_image }}:${{ steps.next_version.outputs.new_version }}
           labels: |
             org.opencontainers.image.version=${{ steps.next_version.outputs.new_version }}
@@ -340,9 +394,9 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      # 同步 main 分支到 dev 分支 (rebase dev onto main)
+      # 同步 main 分支到 dev 分支 (rebase dev onto main) - 仅正式版本触发
       - name: Sync main to dev branch
-        if: steps.check.outputs.needs_bump == 'true'
+        if: (steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch') && steps.next_version.outputs.is_prerelease != 'true'
         id: sync_dev
         continue-on-error: true
         env:
@@ -420,7 +474,7 @@ jobs:
 
       # 如果同步失败(冲突)，触发 autofix workflow
       - name: Trigger autofix for sync conflicts
-        if: steps.check.outputs.needs_bump == 'true' && steps.sync_dev.outputs.sync_status == 'conflict'
+        if: (steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch') && steps.sync_dev.outputs.sync_status == 'conflict'
         env:
           GH_TOKEN: ${{ secrets.GH_PAT || secrets.GITHUB_TOKEN }}
         run: |
@@ -439,9 +493,9 @@ jobs:
             exit 1
           fi
 
-      # 同步结果汇总
+      # 同步结果汇总 - 仅正式版本显示
       - name: Sync summary
-        if: steps.check.outputs.needs_bump == 'true' && always()
+        if: (steps.check.outputs.needs_bump == 'true' || github.event_name == 'workflow_dispatch') && steps.next_version.outputs.is_prerelease != 'true' && always()
         run: |
           echo "=========================================="
           echo "Dev Branch Sync Summary"

CHANGELOG.md

@@ -4,6 +4,49 @@
 
 ---
 
+## [v0.3.42](https://github.com/ding113/claude-code-hub/releases/tag/v0.3.42) - 2026-01-07
+
+### 新增
+
+- Session 详情页重设计，改进布局和用户体验 (f52a2651)
+- 供应商级别参数覆写审计功能，支持 Codex reasoning/text/parallel_tool_calls 覆写 (#557, #536)
+- 供应商查询缓存功能，支持缓存开关配置，默认启用 (#554, #556) [@hank9999](https://github.com/hank9999)
+- Gemini 非流式错误规则 (#547) [@Kevin Cui](https://github.com/kevin-cui-tw)
+- Anthropic Warmup 请求拦截功能 (#525)
+- tool_use missing tool_result 错误规则 (#550, #551)
+- Codex reasoning effort mismatch 错误规则 (#544)
+
+### 优化
+
+- 供应商保存异步架构重构，提升保存性能 (54bada89)
+- 拆分 unified-edit-dialog 为专用对话框组件，改善代码结构 (#539) [@NieiR](https://github.com/NieiR)
+- Session Messages 提升内容阈值并支持导出完整请求 (#537)
+- 管理后台 UI 改进 (#538) [@miraserver](https://github.com/miraserver)
+
+### 修复
+
+- 修复 SessionStats 组件日期类型问题 (57ac4d6d)
+- 修复 CodeDisplay 组件缺少 className prop (c622705b)
+- 修复 /v1/responses 和 /v1/chat/completions 未使用 GuardPipeline 的问题 (#552)
+- 修复添加新供应商后列表未刷新的问题 (#546) [@NieiR](https://github.com/NieiR)
+- 补齐 system_settings 缺失列 (17014402)
+- 修复供应商总限额编辑、生效和重置逻辑 (#535)
+- 修复 Key 清除到期时间使用空字符串传参问题 (#534)
+- 修复 my-usage 今日统计与只读 API 自助查询 (#532)
+- 修复清除用户/Key 到期时间后保存不生效的问题 (#533)
+- 修复用户限额未设置时 Key 限额仍生效的问题 (#531)
+- 修复供应商搜索框重复清除按钮 (af17948d)
+- 修复 CodeRabbit webhook 反馈问题 (#527)
+
+### 其他
+
+- 为 available-models 工具函数添加单元测试 (#528) [@NieiR](https://github.com/NieiR)
+- 更新使用文档中 Codex 模型配置 (#545)
+- 更新 AGENT 指导文档 (cc32b47b)
+- 重新生成 blocked_by 索引迁移 (3250f210)
+
+---
+
 ## [v0.3.41](https://github.com/ding113/claude-code-hub/releases/tag/v0.3.41) - 2026-01-03
 
 ### 新增