Skip to content

Commit da5c017

Browse files
committed
Merge branch 'origin/main' into main
2 parents fd55ded + 9d1c6a6 commit da5c017

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.github/workflows/ci-wails-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- uses: actions/setup-go@v5
2929
with:
30-
go-version: "1.25"
30+
go-version-file: go.mod
3131

3232
- uses: actions/setup-node@v4
3333
with:
@@ -111,7 +111,7 @@ jobs:
111111

112112
- uses: actions/setup-go@v5
113113
with:
114-
go-version: "1.25"
114+
go-version-file: go.mod
115115

116116
- uses: actions/setup-node@v4
117117
with:
@@ -178,7 +178,7 @@ jobs:
178178

179179
- uses: actions/setup-go@v5
180180
with:
181-
go-version: "1.25"
181+
go-version-file: go.mod
182182

183183
- uses: actions/setup-node@v4
184184
with:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ARG VITE_COMMIT=unknown
2424
RUN VITE_COMMIT=${VITE_COMMIT} pnpm build
2525

2626
# Stage 2: Build backend
27-
FROM golang:1.25-alpine AS backend-builder
27+
FROM golang:1.26-alpine AS backend-builder
2828

2929
# Install build dependencies
3030
RUN apk add --no-cache git

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323

2424
require (
2525
cloud.google.com/go/compute/metadata v0.3.0 // indirect
26-
filippo.io/edwards25519 v1.1.0 // indirect
26+
filippo.io/edwards25519 v1.1.1 // indirect
2727
github.com/bep/debounce v1.2.1 // indirect
2828
github.com/bytedance/gopkg v0.1.3 // indirect
2929
github.com/bytedance/sonic/loader v0.5.0 // indirect
@@ -104,4 +104,4 @@ require (
104104
modernc.org/sqlite v1.23.1 // indirect
105105
)
106106

107-
replace github.com/router-for-me/CLIProxyAPI/v6 => github.com/awsl-project/CLIProxyAPI/v6 v6.0.0-20260216041831-0b08114d895a
107+
replace github.com/router-for-me/CLIProxyAPI/v6 => github.com/awsl-project/CLIProxyAPI/v6 v6.0.0-20260222041026-6abb0bf76228

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
22
cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
3-
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
4-
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
3+
filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw=
4+
filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
55
github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
66
github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
7-
github.com/awsl-project/CLIProxyAPI/v6 v6.0.0-20260216041831-0b08114d895a h1:cnDHdGP/kHBGEhJhMg6aPZVZdzWm8FAWgBF7rKQxaME=
8-
github.com/awsl-project/CLIProxyAPI/v6 v6.0.0-20260216041831-0b08114d895a/go.mod h1:XHeYPi5ymNzt7KwqDnVVisrZSKTVVbWbzHmmI+q5l4E=
7+
github.com/awsl-project/CLIProxyAPI/v6 v6.0.0-20260222041026-6abb0bf76228 h1:W318xErSulaHrg17oAqEsBOpv+AQZihVqbgo4pt7CDY=
8+
github.com/awsl-project/CLIProxyAPI/v6 v6.0.0-20260222041026-6abb0bf76228/go.mod h1:7z31hDX1LapETY/Riaxei+UI8/iHuWL0Mrgokp5rqYs=
99
github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY=
1010
github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
1111
github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=

internal/adapter/provider/cliproxyapi_antigravity/adapter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func (a *CLIProxyAPIAntigravityAdapter) executeStream(c *flow.Ctx, w http.Respon
196196
var streamErr error
197197
firstChunkSent := false
198198

199-
for chunk := range stream {
199+
for chunk := range stream.Chunks {
200200
if chunk.Err != nil {
201201
log.Printf("[CLIProxyAPI-Antigravity] stream chunk error: %v", chunk.Err)
202202
streamErr = chunk.Err

internal/adapter/provider/cliproxyapi_codex/adapter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ func (a *CLIProxyAPICodexAdapter) executeStream(c *flow.Ctx, w http.ResponseWrit
316316
var streamErr error
317317
firstChunkSent := false
318318

319-
for chunk := range stream {
319+
for chunk := range stream.Chunks {
320320
if chunk.Err != nil {
321321
log.Printf("[CLIProxyAPI-Codex] stream chunk error: %v", chunk.Err)
322322
streamErr = chunk.Err

0 commit comments

Comments
 (0)