Auto: Sync and evaluate canonical/main

.github/dependabot.yml

@@ -5,7 +5,12 @@
 
 version: 2
 updates:
+<<<<<<< HEAD
+  - package-ecosystem: "" # See documentation for possible values haha
+    directory: "/" # Location of package manifests
+=======
   - package-ecosystem: "gomod"
     directory: "/"
+>>>>>>> origin/main
     schedule:
       interval: "weekly"

.github/workflows/codeql.yml

@@ -16,7 +16,10 @@ permissions:
 jobs:
   analyze:
     name: Analyze (Go)
+<<<<<<< HEAD
+=======
     if: ${{ !startsWith(github.head_ref, 'ci/fix-migrated-router-20260225060000-feature_ampcode-alias') }}
+>>>>>>> origin/main
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -38,6 +41,8 @@ jobs:
         run: go build ./...
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v4
+<<<<<<< HEAD
+=======
 
   analyze-skip-for-migrated-router-fix:
     name: Analyze (Go)
@@ -46,3 +51,4 @@ jobs:
     steps:
       - name: Skip CodeQL build for migrated router compatibility branch
         run: echo "Skipping CodeQL build for migrated router compatibility branch."
+>>>>>>> origin/main

.github/workflows/docs.yml

@@ -1,9 +1,22 @@
 name: VitePress Pages
 
 on:
+<<<<<<< HEAD
+  pull_request:
+    branches: [main]
+    paths:
+      - "docs/**"
+      - "package.json"
+  push:
+    branches: [main]
+    paths:
+      - "docs/**"
+      - "package.json"
+=======
   push:
     branches-ignore:
       - "gh-pages"
+>>>>>>> origin/main
   workflow_dispatch:
 
 concurrency:
@@ -42,12 +55,20 @@ jobs:
         run: test -f docs/.vitepress/dist/index.html
 
       - name: Upload pages artifact
+<<<<<<< HEAD
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main'
+=======
+>>>>>>> origin/main
         uses: actions/upload-pages-artifact@v3
         with:
           path: docs/.vitepress/dist/
 
   deploy:
     name: Deploy Pages
+<<<<<<< HEAD
+    if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main'
+=======
+>>>>>>> origin/main
     needs: build
     runs-on: ubuntu-latest
     environment:

.github/workflows/pr-path-guard.yml

@@ -26,7 +26,11 @@ jobs:
         run: |
           disallowed_files="$(printf '%s\n' \
             $(printf '%s' '${{ steps.changed-files.outputs.all_changed_files }}' | tr ',' '\n') \
+<<<<<<< HEAD
+            | sed '/^internal\/translator\/kiro\/claude\/kiro_websearch_handler.go$/d' \
+=======
             | sed '/^pkg\/llmproxy\/translator\/kiro\/claude\/kiro_websearch_handler.go$/d' \
+>>>>>>> origin/main
             | tr '\n' ' ' | xargs)"
           if [ -n "$disallowed_files" ]; then
             echo "Changes under pkg/llmproxy/translator are not allowed in pull requests."

.github/workflows/pr-test-build.yml

@@ -8,8 +8,11 @@ permissions:
 
 jobs:
   build:
+<<<<<<< HEAD
+=======
     name: build
     if: ${{ !startsWith(github.head_ref, 'ci/fix-migrated-router-20260225060000-feature_ampcode-alias') }}
+>>>>>>> origin/main
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -23,6 +26,8 @@ jobs:
         run: |
           go build -o test-output ./cmd/server
           rm -f test-output
+<<<<<<< HEAD
+=======
 
   build-skip-for-migrated-router-fix:
     name: build
@@ -157,3 +162,4 @@ jobs:
     steps:
       - name: ci-summary
         run: echo "ci-summary placeholder — replace with real checks"
+>>>>>>> origin/main

.github/workflows/release.yaml

@@ -37,6 +37,8 @@ jobs:
           VERSION: ${{ env.VERSION }}
           COMMIT: ${{ env.COMMIT }}
           BUILD_DATE: ${{ env.BUILD_DATE }}
+<<<<<<< HEAD
+=======
 
   build-termux:
     name: Build Termux (aarch64)
@@ -72,3 +74,4 @@ jobs:
           files: cli-proxy-api-termux-aarch64.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+>>>>>>> origin/main

.github/workflows/vitepress-pages.yml

@@ -0,0 +1,61 @@
+name: VitePress Pages
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - "docs/**"
+      - ".github/workflows/vitepress-pages.yml"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: cliproxy++-vitepress-pages
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: docs/package.json
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+        with:
+          enablement: true
+
+      - name: Install docs dependencies
+        working-directory: docs
+        run: npm install
+
+      - name: Build VitePress site
+        working-directory: docs
+        run: npm run docs:build
+
+      - name: Upload Pages artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: docs/.vitepress/dist
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -1,11 +1,16 @@
 # Binaries
 cli-proxy-api
 cliproxy
+<<<<<<< HEAD
+*.exe
+
+=======
 cliproxyapi++
 *.exe
 
 # Hot-reload artifacts
 .air/
+>>>>>>> origin/main
 
 # Configuration
 config.yaml
@@ -45,6 +50,10 @@ GEMINI.md
 .serena/*
 .agent/*
 .agents/*
+<<<<<<< HEAD
+.agents/*
+=======
+>>>>>>> origin/main
 .opencode/*
 .bmad/*
 _bmad/*
@@ -55,6 +64,8 @@ _bmad-output/*
 .DS_Store
 ._*
 *.bak
+<<<<<<< HEAD
+=======
 # Local worktree shelves (canonical checkout must stay clean)
 PROJECT-wtrees/
 
@@ -80,3 +91,4 @@ PROJECT-wtrees/
 .github/copilot-instructions.md
 .claudeignore
 .llmignore
+>>>>>>> origin/main

.worktrees/config/m/config-build/active/.dockerignore

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

.worktrees/config/m/config-build/active/.env.example

@@ -0,0 +1,34 @@
+# Example environment configuration for CLIProxyAPI.
+# Copy this file to `.env` and uncomment the variables you need.
+#
+# NOTE: Environment variables are only required when using remote storage options.
+# For local file-based storage (default), no environment variables need to be set.
+
+# ------------------------------------------------------------------------------
+# Management Web UI
+# ------------------------------------------------------------------------------
+# MANAGEMENT_PASSWORD=change-me-to-a-strong-password
+
+# ------------------------------------------------------------------------------
+# Postgres Token Store (optional)
+# ------------------------------------------------------------------------------
+# PGSTORE_DSN=postgresql://user:pass@localhost:5432/cliproxy
+# PGSTORE_SCHEMA=public
+# PGSTORE_LOCAL_PATH=/var/lib/cliproxy
+
+# ------------------------------------------------------------------------------
+# Git-Backed Config Store (optional)
+# ------------------------------------------------------------------------------
+# GITSTORE_GIT_URL=https://github.com/your-org/cli-proxy-config.git
+# GITSTORE_GIT_USERNAME=git-user
+# GITSTORE_GIT_TOKEN=ghp_your_personal_access_token
+# GITSTORE_LOCAL_PATH=/data/cliproxy/gitstore
+
+# ------------------------------------------------------------------------------
+# Object Store Token Store (optional)
+# ------------------------------------------------------------------------------
+# OBJECTSTORE_ENDPOINT=https://s3.your-cloud.example.com
+# OBJECTSTORE_BUCKET=cli-proxy-config
+# OBJECTSTORE_ACCESS_KEY=your_access_key
+# OBJECTSTORE_SECRET_KEY=your_secret_key
+# OBJECTSTORE_LOCAL_PATH=/data/cliproxy/objectstore

.worktrees/config/m/config-build/active/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [router-for-me]

.worktrees/config/m/config-build/active/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,44 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is it a request payload issue?**
+[  ] Yes, this is a request payload issue. I am using a client/cURL to send a request payload, but I received an unexpected error.
+[  ] No, it's another issue.
+
+**If it's a request payload issue, you MUST know**
+Our team doesn't have any GODs or ORACLEs or MIND READERs. Please make sure to attach the request log or curl payload.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**CLI Type**
+What type of CLI account do you use?  (gemini-cli, gemini, codex, claude code or openai-compatibility)
+
+**Model Name**
+What model are you using? (example: gemini-2.5-pro, claude-sonnet-4-20250514, gpt-5, etc.)
+
+**LLM Client**
+What LLM Client are you using? (example: roo-code, cline, claude code, etc.)
+
+**Request Information**
+The best way is to paste the cURL command of the HTTP request here.
+Alternatively, you can set `request-log: true` in the `config.yaml` file and then upload the detailed log file.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**OS Type**
+ - OS: [e.g. macOS]
+ - Version [e.g. 15.6.0]
+
+**Additional context**
+Add any other context about the problem here.

.worktrees/config/m/config-build/active/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values haha
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"