Skip to content

Commit 0c1d094

Browse files
Merge upstream/main (auto-sync feat/copilot)
- 33130f1 fix: require antigravity project id - 809feb1 fix(antigravity): mask project_id in logs - bfdc0b3 fix: scope antigravity credits fallback gate - ad86830 fix codex context length stream errors - 7efc162 feat(docker): add cluster-specific docker-compose configuration for CLIProxyAPI - 0de0ad0 Add reasoning effort to usage events - ea25949 feat(models): add Gemini 3.5 Flash models to registry - de03949 feat(models): expand supported reasoning levels for Codex - fdffe49 feat(models): register Gemini 3.5 Flash with dynamic thinking levels - 0ec07e5 feat(models): add Gemini 3.5 Flash to registry with enhanced thinking capabilities - 1c632d1 fix(translator): skip empty text parts in Claude request conversion - f1ee883 Merge pull request router-for-me#3484 from yavon007/main - a726e37 feat(redis): enhance Redis protocol handling with subscription and queue operations - 42e9605 Merge pull request router-for-me#3254 from sususu98/fix/antigravity-project-id-onboard - 8b9ecff Merge pull request router-for-me#3382 from sususu98/dev - 48a1c88 Merge pull request router-for-me#3476 from sususu98/fix/codex-context-length-stream-errors-dev - 21fad9d Merge pull request router-for-me#3477 from router-for-me/cluster
2 parents 9b5379d + 21fad9d commit 0c1d094

36 files changed

Lines changed: 2478 additions & 209 deletions

.env.cluster.example

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Cluster JWT example.
2+
# After deploying https://github.com/router-for-me/CLIProxyAPIHome, get the JWT value with:
3+
# curl -sS -X POST "http://<home-host>:8327/v0/management/certificates/clients" -H "X-MANAGEMENT-KEY: <management-key>" | jq -r '.home_jwt'
4+
# Then paste it into HOME_JWT here or export it before starting Compose.
5+
HOME_JWT=your-home-jwt-here

docker-compose.cluster.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
services:
2+
cli-proxy-api:
3+
image: ${CLI_PROXY_IMAGE:-eceasy/cli-proxy-api:latest}
4+
pull_policy: always
5+
build:
6+
context: .
7+
dockerfile: Dockerfile
8+
args:
9+
VERSION: ${VERSION:-dev}
10+
COMMIT: ${COMMIT:-none}
11+
BUILD_DATE: ${BUILD_DATE:-unknown}
12+
container_name: cli-proxy-api-cluster
13+
environment:
14+
HOME_JWT: ${HOME_JWT:-}
15+
ports:
16+
- "8317:8317"
17+
volumes:
18+
- ./home:/root/.cli-proxy-api
19+
- ./logs:/CLIProxyAPI/logs
20+
command: >
21+
sh -eu -c '
22+
if [ -z "$$HOME_JWT" ]; then
23+
echo "HOME_JWT is required" >&2
24+
exit 1
25+
fi
26+
27+
exec ./CLIProxyAPI -home-jwt "$$HOME_JWT"
28+
'
29+
restart: unless-stopped

internal/api/handlers/management/auth_files.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2081,7 +2081,7 @@ func (h *Handler) RequestAntigravityToken(c *gin.Context) {
20812081
log.Warnf("antigravity: failed to fetch project ID: %v", errProject)
20822082
} else {
20832083
projectID = fetchedProjectID
2084-
log.Infof("antigravity: obtained project ID %s", projectID)
2084+
log.Infof("antigravity: obtained project ID %s", util.HideAPIKey(projectID))
20852085
}
20862086
}
20872087

@@ -2125,7 +2125,7 @@ func (h *Handler) RequestAntigravityToken(c *gin.Context) {
21252125
CompleteOAuthSessionsByProvider("antigravity")
21262126
fmt.Printf("Authentication successful! Token saved to %s\n", savedPath)
21272127
if projectID != "" {
2128-
fmt.Printf("Using GCP project: %s\n", projectID)
2128+
fmt.Printf("Using GCP project: %s\n", util.HideAPIKey(projectID))
21292129
}
21302130
fmt.Println("You can now use Antigravity services through this CLI")
21312131
}()

internal/api/protocol_multiplexer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (s *Server) routeMuxConnection(conn net.Conn, httpListener *muxListener) {
104104

105105
if isRedisRESPPrefix(prefix[0]) {
106106
_ = conn.SetReadDeadline(time.Time{})
107-
s.handleRedisConnection(conn)
107+
s.handleRedisConnection(conn, reader)
108108
return
109109
}
110110

0 commit comments

Comments
 (0)