From afa50d5c73d8397bc657ae270741aa91cd165054 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 12:31:46 +0300
Subject: [PATCH 01/23] feat(channel): add OpenAIAdminKey field to
 ChannelOtherSettings

---
 dto/channel_settings.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dto/channel_settings.go b/dto/channel_settings.go
index b6a1ab9f713..4aa4f53e2cc 100644
--- a/dto/channel_settings.go
+++ b/dto/channel_settings.go
@@ -35,6 +35,7 @@ type ChannelOtherSettings struct {
 	DisableStore                          bool          `json:"disable_store,omitempty"`             // 是否禁用 store 透传（默认允许透传，禁用后可能导致 Codex 无法使用）
 	AllowIncludeObfuscation               bool          `json:"allow_include_obfuscation,omitempty"` // 是否允许 stream_options.include_obfuscation 透传（默认过滤以避免关闭流混淆保护）
 	AwsKeyType                            AwsKeyType    `json:"aws_key_type,omitempty"`
+	OpenAIAdminKey                        string        `json:"openai_admin_key,omitempty"`
 	UpstreamModelUpdateCheckEnabled       bool          `json:"upstream_model_update_check_enabled,omitempty"`        // 是否检测上游模型更新
 	UpstreamModelUpdateAutoSyncEnabled    bool          `json:"upstream_model_update_auto_sync_enabled,omitempty"`    // 是否自动同步上游模型更新
 	UpstreamModelUpdateLastCheckTime      int64         `json:"upstream_model_update_last_check_time,omitempty"`      // 上次检测时间

From 5bdcc593cd2cd47c96af7cfaf01970c719dce584 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 12:33:00 +0300
Subject: [PATCH 02/23] test(channel): add scaffolding for channel_billing
 tests

---
 controller/channel_billing_test.go | 42 ++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 controller/channel_billing_test.go

diff --git a/controller/channel_billing_test.go b/controller/channel_billing_test.go
new file mode 100644
index 00000000000..86f2b55d761
--- /dev/null
+++ b/controller/channel_billing_test.go
@@ -0,0 +1,42 @@
+package controller
+
+import (
+	"testing"
+	"time"
+
+	"github.com/QuantumNous/new-api/common"
+	"github.com/QuantumNous/new-api/constant"
+	"github.com/QuantumNous/new-api/dto"
+	"github.com/QuantumNous/new-api/model"
+
+	"github.com/stretchr/testify/require"
+)
+
+// buildOpenAIChannelWithAdminKey creates an in-memory OpenAI channel pointing at the given baseURL.
+// adminKey is stored inside ChannelOtherSettings.OpenAIAdminKey. If empty, the field is omitted.
+func buildOpenAIChannelWithAdminKey(t *testing.T, baseURL, adminKey string) *model.Channel {
+	t.Helper()
+	settings := dto.ChannelOtherSettings{}
+	if adminKey != "" {
+		settings.OpenAIAdminKey = adminKey
+	}
+	encoded, err := common.Marshal(settings)
+	require.NoError(t, err)
+	bURL := baseURL
+	ch := &model.Channel{
+		Type:          constant.ChannelTypeOpenAI,
+		Key:           "sk-fake-inference-key",
+		Status:        1,
+		Name:          "test-openai",
+		BaseURL:       &bURL,
+		OtherSettings: string(encoded),
+	}
+	require.NoError(t, model.DB.Create(ch).Error)
+	return ch
+}
+
+// firstDayOfCurrentMonthUTC returns the Unix timestamp of the 1st day of the current month at 00:00 UTC.
+func firstDayOfCurrentMonthUTC() int64 {
+	now := time.Now().UTC()
+	return time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.UTC).Unix()
+}

From f5a6d7674d3cd980da7eb007e03929439fa560f2 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 12:42:09 +0300
Subject: [PATCH 03/23] feat(channel): implement OpenAI balance via
 /v1/organization/costs

---
 controller/channel-billing.go      | 86 ++++++++++++++++++++++++++++++
 controller/channel_billing_test.go | 46 ++++++++++++++++
 2 files changed, 132 insertions(+)

diff --git a/controller/channel-billing.go b/controller/channel-billing.go
index 751ee3600ac..76b56ecf784 100644
--- a/controller/channel-billing.go
+++ b/controller/channel-billing.go
@@ -6,7 +6,9 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/QuantumNous/new-api/common"
@@ -356,6 +358,90 @@ func updateChannelMoonshotBalance(channel *model.Channel) (float64, error) {
 	return availableBalanceUsd, nil
 }
 
+// Costs API response structures (https://platform.openai.com/docs/api-reference/usage/costs)
+
+type openAICostsResponse struct {
+	Object   string             `json:"object"`
+	Data     []openAICostBucket `json:"data"`
+	HasMore  bool               `json:"has_more"`
+	NextPage string             `json:"next_page"`
+}
+
+type openAICostBucket struct {
+	Object    string             `json:"object"`
+	StartTime int64              `json:"start_time"`
+	EndTime   int64              `json:"end_time"`
+	Results   []openAICostResult `json:"results"`
+}
+
+type openAICostResult struct {
+	Object string           `json:"object"`
+	Amount openAICostAmount `json:"amount"`
+}
+
+type openAICostAmount struct {
+	Value    float64 `json:"value"`
+	Currency string  `json:"currency"`
+}
+
+// updateChannelOpenAIBalance fetches month-to-date OpenAI usage via the Costs API and writes
+// it into channel.Balance. Requires an admin-scoped key (sk-admin-...) stored in
+// channel.other_settings.openai_admin_key. The legacy /v1/dashboard/billing endpoints were
+// deprecated by OpenAI; this function is their replacement.
+func updateChannelOpenAIBalance(channel *model.Channel) (float64, error) {
+	settings := channel.GetOtherSettings()
+	adminKey := strings.TrimSpace(settings.OpenAIAdminKey)
+	if adminKey == "" {
+		return 0, errors.New("openai admin key is not set; configure channel.other_settings.openai_admin_key")
+	}
+
+	baseURL := channel.GetBaseURL()
+	if baseURL == "" {
+		baseURL = constant.ChannelBaseURLs[channel.Type]
+	}
+
+	now := time.Now().UTC()
+	start := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.UTC).Unix()
+	end := now.Unix()
+
+	var total float64
+	pageToken := ""
+	for {
+		query := url.Values{}
+		query.Set("start_time", strconv.FormatInt(start, 10))
+		query.Set("end_time", strconv.FormatInt(end, 10))
+		query.Set("limit", "31")
+		if pageToken != "" {
+			query.Set("page_token", pageToken)
+		}
+		fullURL := fmt.Sprintf("%s/v1/organization/costs?%s", baseURL, query.Encode())
+
+		body, err := GetResponseBody("GET", fullURL, channel, GetAuthHeader(adminKey))
+		if err != nil {
+			return 0, fmt.Errorf("fetch openai usage: %w", err)
+		}
+
+		var resp openAICostsResponse
+		if err := common.Unmarshal(body, &resp); err != nil {
+			return 0, fmt.Errorf("parse openai usage: %w", err)
+		}
+
+		for _, bucket := range resp.Data {
+			for _, result := range bucket.Results {
+				total += result.Amount.Value
+			}
+		}
+
+		if !resp.HasMore || resp.NextPage == "" {
+			break
+		}
+		pageToken = resp.NextPage
+	}
+
+	channel.UpdateBalance(total)
+	return total, nil
+}
+
 func updateChannelBalance(channel *model.Channel) (float64, error) {
 	baseURL := constant.ChannelBaseURLs[channel.Type]
 	if channel.GetBaseURL() == "" {
diff --git a/controller/channel_billing_test.go b/controller/channel_billing_test.go
index 86f2b55d761..90ba3733093 100644
--- a/controller/channel_billing_test.go
+++ b/controller/channel_billing_test.go
@@ -1,6 +1,11 @@
 package controller
 
 import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strconv"
 	"testing"
 	"time"
 
@@ -16,6 +21,7 @@ import (
 // adminKey is stored inside ChannelOtherSettings.OpenAIAdminKey. If empty, the field is omitted.
 func buildOpenAIChannelWithAdminKey(t *testing.T, baseURL, adminKey string) *model.Channel {
 	t.Helper()
+	require.NoError(t, model.DB.AutoMigrate(&model.Channel{}))
 	settings := dto.ChannelOtherSettings{}
 	if adminKey != "" {
 		settings.OpenAIAdminKey = adminKey
@@ -40,3 +46,43 @@ func firstDayOfCurrentMonthUTC() int64 {
 	now := time.Now().UTC()
 	return time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.UTC).Unix()
 }
+
+func TestUpdateChannelOpenAIBalance_SingleBucket(t *testing.T) {
+	_ = openTokenControllerTestDB(t)
+
+	var capturedAuth string
+	var capturedQuery url.Values
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		capturedAuth = r.Header.Get("Authorization")
+		capturedQuery = r.URL.Query()
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = fmt.Fprint(w, `{
+			"object": "page",
+			"data": [
+				{
+					"object": "bucket",
+					"start_time": 1747008000,
+					"end_time": 1747094400,
+					"results": [
+						{"object": "organization.costs.result", "amount": {"value": 10.5, "currency": "usd"}}
+					]
+				}
+			],
+			"has_more": false,
+			"next_page": ""
+		}`)
+	}))
+	defer ts.Close()
+
+	ch := buildOpenAIChannelWithAdminKey(t, ts.URL, "sk-admin-test")
+
+	balance, err := updateChannelOpenAIBalance(ch)
+	require.NoError(t, err)
+	require.InDelta(t, 10.5, balance, 0.001)
+	require.Equal(t, "Bearer sk-admin-test", capturedAuth)
+	require.Equal(t, strconv.FormatInt(firstDayOfCurrentMonthUTC(), 10), capturedQuery.Get("start_time"))
+
+	var fresh model.Channel
+	require.NoError(t, model.DB.First(&fresh, ch.Id).Error)
+	require.InDelta(t, 10.5, fresh.Balance, 0.001)
+}

From aced4d657d89b92ca7c94c21ad873a2d96fc14b5 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 13:12:03 +0300
Subject: [PATCH 04/23] fix(channel): use 'page' param and add pagination
 iteration cap

---
 controller/channel-billing.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/controller/channel-billing.go b/controller/channel-billing.go
index 76b56ecf784..754fc00d4f6 100644
--- a/controller/channel-billing.go
+++ b/controller/channel-billing.go
@@ -360,6 +360,8 @@ func updateChannelMoonshotBalance(channel *model.Channel) (float64, error) {
 
 // Costs API response structures (https://platform.openai.com/docs/api-reference/usage/costs)
 
+const openAICostsMaxPages = 50 // safety cap for pagination; daily buckets over a month never exceed this
+
 type openAICostsResponse struct {
 	Object   string             `json:"object"`
 	Data     []openAICostBucket `json:"data"`
@@ -406,13 +408,14 @@ func updateChannelOpenAIBalance(channel *model.Channel) (float64, error) {
 
 	var total float64
 	pageToken := ""
-	for {
+	exhausted := true
+	for iter := 0; iter < openAICostsMaxPages; iter++ {
 		query := url.Values{}
 		query.Set("start_time", strconv.FormatInt(start, 10))
 		query.Set("end_time", strconv.FormatInt(end, 10))
 		query.Set("limit", "31")
 		if pageToken != "" {
-			query.Set("page_token", pageToken)
+			query.Set("page", pageToken)
 		}
 		fullURL := fmt.Sprintf("%s/v1/organization/costs?%s", baseURL, query.Encode())
 
@@ -433,10 +436,14 @@ func updateChannelOpenAIBalance(channel *model.Channel) (float64, error) {
 		}
 
 		if !resp.HasMore || resp.NextPage == "" {
+			exhausted = false
 			break
 		}
 		pageToken = resp.NextPage
 	}
+	if exhausted {
+		return total, fmt.Errorf("openai costs pagination did not terminate after %d pages", openAICostsMaxPages)
+	}
 
 	channel.UpdateBalance(total)
 	return total, nil

From b02cd1f8975087f27b4d1e2444f625336ff2a3ff Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 13:13:44 +0300
Subject: [PATCH 05/23] test(channel): cover paginated Costs API response

---
 controller/channel_billing_test.go | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/controller/channel_billing_test.go b/controller/channel_billing_test.go
index 90ba3733093..262195b0e59 100644
--- a/controller/channel_billing_test.go
+++ b/controller/channel_billing_test.go
@@ -86,3 +86,41 @@ func TestUpdateChannelOpenAIBalance_SingleBucket(t *testing.T) {
 	require.NoError(t, model.DB.First(&fresh, ch.Id).Error)
 	require.InDelta(t, 10.5, fresh.Balance, 0.001)
 }
+
+func TestUpdateChannelOpenAIBalance_Pagination(t *testing.T) {
+	_ = openTokenControllerTestDB(t)
+
+	callCount := 0
+	var capturedTokenOnSecondCall string
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		callCount++
+		w.Header().Set("Content-Type", "application/json")
+		if callCount == 1 {
+			_, _ = fmt.Fprint(w, `{
+				"object": "page",
+				"data": [{"object": "bucket","start_time": 1747008000,"end_time": 1747094400,
+					"results": [{"object": "organization.costs.result","amount": {"value": 5.0,"currency": "usd"}}]}],
+				"has_more": true,
+				"next_page": "page-token-2"
+			}`)
+			return
+		}
+		capturedTokenOnSecondCall = r.URL.Query().Get("page")
+		_, _ = fmt.Fprint(w, `{
+			"object": "page",
+			"data": [{"object": "bucket","start_time": 1747094400,"end_time": 1747180800,
+				"results": [{"object": "organization.costs.result","amount": {"value": 7.25,"currency": "usd"}}]}],
+			"has_more": false,
+			"next_page": ""
+		}`)
+	}))
+	defer ts.Close()
+
+	ch := buildOpenAIChannelWithAdminKey(t, ts.URL, "sk-admin-test")
+
+	balance, err := updateChannelOpenAIBalance(ch)
+	require.NoError(t, err)
+	require.Equal(t, 2, callCount)
+	require.Equal(t, "page-token-2", capturedTokenOnSecondCall)
+	require.InDelta(t, 12.25, balance, 0.001)
+}

From 4278d40c9512b1b33bf3da9e7d4943ddc7fac8b4 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 13:14:02 +0300
Subject: [PATCH 06/23] test(channel): empty admin key returns explicit error

---
 controller/channel_billing_test.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/controller/channel_billing_test.go b/controller/channel_billing_test.go
index 262195b0e59..c06920e1d6b 100644
--- a/controller/channel_billing_test.go
+++ b/controller/channel_billing_test.go
@@ -124,3 +124,17 @@ func TestUpdateChannelOpenAIBalance_Pagination(t *testing.T) {
 	require.Equal(t, "page-token-2", capturedTokenOnSecondCall)
 	require.InDelta(t, 12.25, balance, 0.001)
 }
+
+func TestUpdateChannelOpenAIBalance_NoAdminKey(t *testing.T) {
+	_ = openTokenControllerTestDB(t)
+	ch := buildOpenAIChannelWithAdminKey(t, "http://unused", "")
+
+	balance, err := updateChannelOpenAIBalance(ch)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "openai admin key is not set")
+	require.Equal(t, float64(0), balance)
+
+	var fresh model.Channel
+	require.NoError(t, model.DB.First(&fresh, ch.Id).Error)
+	require.Equal(t, float64(0), fresh.Balance)
+}

From 8140ab3fd4d542ddfa5e26e1779e9d8e217bd48c Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 13:14:23 +0300
Subject: [PATCH 07/23] test(channel): surface upstream 403 errors verbatim

---
 controller/channel_billing_test.go | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/controller/channel_billing_test.go b/controller/channel_billing_test.go
index c06920e1d6b..86f2b960a57 100644
--- a/controller/channel_billing_test.go
+++ b/controller/channel_billing_test.go
@@ -138,3 +138,24 @@ func TestUpdateChannelOpenAIBalance_NoAdminKey(t *testing.T) {
 	require.NoError(t, model.DB.First(&fresh, ch.Id).Error)
 	require.Equal(t, float64(0), fresh.Balance)
 }
+
+func TestUpdateChannelOpenAIBalance_Upstream403(t *testing.T) {
+	_ = openTokenControllerTestDB(t)
+
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusForbidden)
+		_, _ = fmt.Fprint(w, `{"error":{"message":"missing scope","type":"insufficient_permissions"}}`)
+	}))
+	defer ts.Close()
+
+	ch := buildOpenAIChannelWithAdminKey(t, ts.URL, "sk-admin-test")
+
+	balance, err := updateChannelOpenAIBalance(ch)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "status code: 403")
+	require.Equal(t, float64(0), balance)
+
+	var fresh model.Channel
+	require.NoError(t, model.DB.First(&fresh, ch.Id).Error)
+	require.Equal(t, float64(0), fresh.Balance)
+}

From 9e6e80293d5a0cbd59d82131c3f66366f288e347 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 13:14:46 +0300
Subject: [PATCH 08/23] test(channel): wrap unmarshal failures with context

---
 controller/channel_billing_test.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/controller/channel_billing_test.go b/controller/channel_billing_test.go
index 86f2b960a57..c0670efd733 100644
--- a/controller/channel_billing_test.go
+++ b/controller/channel_billing_test.go
@@ -159,3 +159,20 @@ func TestUpdateChannelOpenAIBalance_Upstream403(t *testing.T) {
 	require.NoError(t, model.DB.First(&fresh, ch.Id).Error)
 	require.Equal(t, float64(0), fresh.Balance)
 }
+
+func TestUpdateChannelOpenAIBalance_BadJSON(t *testing.T) {
+	_ = openTokenControllerTestDB(t)
+
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = fmt.Fprint(w, `not-json-garbage`)
+	}))
+	defer ts.Close()
+
+	ch := buildOpenAIChannelWithAdminKey(t, ts.URL, "sk-admin-test")
+
+	balance, err := updateChannelOpenAIBalance(ch)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "parse openai usage")
+	require.Equal(t, float64(0), balance)
+}

From fa3f7a1061126f472ef4a6242eca83d2ea2ef25a Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 13:15:07 +0300
Subject: [PATCH 09/23] test(channel): assert Costs API query has correct
 start_time

---
 controller/channel_billing_test.go | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/controller/channel_billing_test.go b/controller/channel_billing_test.go
index c0670efd733..5544e5ad276 100644
--- a/controller/channel_billing_test.go
+++ b/controller/channel_billing_test.go
@@ -176,3 +176,32 @@ func TestUpdateChannelOpenAIBalance_BadJSON(t *testing.T) {
 	require.Contains(t, err.Error(), "parse openai usage")
 	require.Equal(t, float64(0), balance)
 }
+
+func TestUpdateChannelOpenAIBalance_StartTimeIsFirstOfMonthUTC(t *testing.T) {
+	_ = openTokenControllerTestDB(t)
+
+	var got url.Values
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		got = r.URL.Query()
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = fmt.Fprint(w, `{"object":"page","data":[],"has_more":false,"next_page":""}`)
+	}))
+	defer ts.Close()
+
+	ch := buildOpenAIChannelWithAdminKey(t, ts.URL, "sk-admin-test")
+	_, err := updateChannelOpenAIBalance(ch)
+	require.NoError(t, err)
+
+	now := time.Now().UTC()
+	wantStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.UTC).Unix()
+	require.Equal(t, strconv.FormatInt(wantStart, 10), got.Get("start_time"))
+
+	endStr := got.Get("end_time")
+	require.NotEmpty(t, endStr)
+	endParsed, err := strconv.ParseInt(endStr, 10, 64)
+	require.NoError(t, err)
+	require.GreaterOrEqual(t, endParsed, wantStart)
+	require.LessOrEqual(t, endParsed-now.Unix(), int64(5))
+
+	require.Equal(t, "31", got.Get("limit"))
+}

From 27502b6d1cfca9399056dc74016f9ee6d94796cd Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 13:16:38 +0300
Subject: [PATCH 10/23] feat(channel): route OpenAI balance refresh to
 admin-key path

---
 controller/channel-billing.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/controller/channel-billing.go b/controller/channel-billing.go
index 754fc00d4f6..f010ca730ac 100644
--- a/controller/channel-billing.go
+++ b/controller/channel-billing.go
@@ -456,9 +456,7 @@ func updateChannelBalance(channel *model.Channel) (float64, error) {
 	}
 	switch channel.Type {
 	case constant.ChannelTypeOpenAI:
-		if channel.GetBaseURL() != "" {
-			baseURL = channel.GetBaseURL()
-		}
+		return updateChannelOpenAIBalance(channel)
 	case constant.ChannelTypeAzure:
 		return 0, errors.New("尚未实现")
 	case constant.ChannelTypeCustom:

From 8eb8dad911d788b32be9b9e2024758f104444071 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 13:20:21 +0300
Subject: [PATCH 11/23] feat(channel-form): wire openai_admin_key through form
 schema

---
 .../src/features/channels/lib/channel-form.ts        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/web/default/src/features/channels/lib/channel-form.ts b/web/default/src/features/channels/lib/channel-form.ts
index 03db2f2355f..af55f2b5ad0 100644
--- a/web/default/src/features/channels/lib/channel-form.ts
+++ b/web/default/src/features/channels/lib/channel-form.ts
@@ -66,6 +66,7 @@ export const channelFormSchema = z.object({
   vertex_key_type: z.enum(['json', 'api_key']).optional(), // Vertex AI specific
   aws_key_type: z.enum(['ak_sk', 'api_key']).optional(), // AWS specific
   azure_responses_version: z.string().optional(), // Azure specific
+  openai_admin_key: z.string().optional(), // OpenAI specific: admin key for usage statistics
   // Field passthrough controls (stored in settings JSON)
   allow_service_tier: z.boolean().optional(), // OpenAI/Anthropic
   disable_store: z.boolean().optional(), // OpenAI only
@@ -124,6 +125,7 @@ export const CHANNEL_FORM_DEFAULT_VALUES: ChannelFormValues = {
   vertex_key_type: 'json',
   aws_key_type: 'ak_sk',
   azure_responses_version: '',
+  openai_admin_key: '',
   // Field passthrough controls
   allow_service_tier: false,
   disable_store: false,
@@ -177,6 +179,7 @@ export function transformChannelToFormDefaults(
   // Parse type-specific settings from settings field
   let vertexKeyType: 'json' | 'api_key' = 'json'
   let azureResponsesVersion = ''
+  let openaiAdminKey = ''
   let isEnterpriseAccount = false
   let awsKeyType: 'ak_sk' | 'api_key' = 'ak_sk'
   let allowServiceTier = false
@@ -195,6 +198,7 @@ export function transformChannelToFormDefaults(
       const parsed = JSON.parse(channel.settings)
       vertexKeyType = parsed.vertex_key_type || 'json'
       azureResponsesVersion = parsed.azure_responses_version || ''
+      openaiAdminKey = parsed.openai_admin_key || ''
       isEnterpriseAccount = parsed.openrouter_enterprise === true
       awsKeyType = parsed.aws_key_type || 'ak_sk'
       allowServiceTier = parsed.allow_service_tier === true
@@ -251,6 +255,7 @@ export function transformChannelToFormDefaults(
     is_enterprise_account: isEnterpriseAccount,
     vertex_key_type: vertexKeyType,
     azure_responses_version: azureResponsesVersion,
+    openai_admin_key: openaiAdminKey,
     aws_key_type: awsKeyType,
     allow_service_tier: allowServiceTier,
     disable_store: disableStore,
@@ -310,6 +315,13 @@ function buildSettingsJSON(formData: ChannelFormValues): string {
     delete settingsObj.azure_responses_version
   }
 
+  // Add openai_admin_key for OpenAI channels (type 1)
+  if (formData.type === 1 && formData.openai_admin_key) {
+    settingsObj.openai_admin_key = formData.openai_admin_key
+  } else if ('openai_admin_key' in settingsObj) {
+    delete settingsObj.openai_admin_key
+  }
+
   // Add enterprise account setting for OpenRouter (type 20)
   if (formData.type === 20) {
     settingsObj.openrouter_enterprise = formData.is_enterprise_account === true

From 1f785258f5f32e262599841903a3417102e34a09 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 13:20:38 +0300
Subject: [PATCH 12/23] feat(channel): add OpenAI Admin Key field to mutate
 drawer

---
 .../drawers/channel-mutate-drawer.tsx         | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx b/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx
index 39a6e1527b5..4c7045e7525 100644
--- a/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx
+++ b/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx
@@ -2005,6 +2005,30 @@ export function ChannelMutateDrawer({
                   }}
                 />
 
+                {currentType === 1 && (
+                  <FormField
+                    control={form.control}
+                    name='openai_admin_key'
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>{t('OpenAI Admin Key')}</FormLabel>
+                        <FormControl>
+                          <Textarea
+                            placeholder='sk-admin-...'
+                            rows={2}
+                            {...field}
+                          />
+                        </FormControl>
+                        <FormDescription>
+                          {t(
+                            'Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.'
+                          )}
+                        </FormDescription>
+                      </FormItem>
+                    )}
+                  />
+                )}
+
                 {currentType === 57 && (
                   <div className='bg-muted/20 space-y-3 rounded-lg border p-4'>
                     <div className='flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between'>

From 06b621221da32edc52095c4878c201bcdff77d8e Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 13:32:58 +0300
Subject: [PATCH 13/23] i18n(channel): add OpenAI Admin Key field translations

---
 web/default/src/i18n/locales/_reports/_sync-report.json    | 4 ++--
 web/default/src/i18n/locales/_reports/ja.untranslated.json | 2 ++
 web/default/src/i18n/locales/_reports/ru.untranslated.json | 1 +
 web/default/src/i18n/locales/en.json                       | 2 ++
 web/default/src/i18n/locales/fr.json                       | 2 ++
 web/default/src/i18n/locales/ja.json                       | 2 ++
 web/default/src/i18n/locales/ru.json                       | 2 ++
 web/default/src/i18n/locales/vi.json                       | 2 ++
 web/default/src/i18n/locales/zh.json                       | 2 ++
 9 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/web/default/src/i18n/locales/_reports/_sync-report.json b/web/default/src/i18n/locales/_reports/_sync-report.json
index 771b6f6550a..fd34f1df8a4 100644
--- a/web/default/src/i18n/locales/_reports/_sync-report.json
+++ b/web/default/src/i18n/locales/_reports/_sync-report.json
@@ -17,13 +17,13 @@
       "file": "ja.json",
       "missingCount": 0,
       "extrasCount": 0,
-      "untranslatedCount": 120
+      "untranslatedCount": 122
     },
     "ru": {
       "file": "ru.json",
       "missingCount": 0,
       "extrasCount": 0,
-      "untranslatedCount": 135
+      "untranslatedCount": 136
     },
     "vi": {
       "file": "vi.json",
diff --git a/web/default/src/i18n/locales/_reports/ja.untranslated.json b/web/default/src/i18n/locales/_reports/ja.untranslated.json
index b6d34b23ff9..9b74c84eb5b 100644
--- a/web/default/src/i18n/locales/_reports/ja.untranslated.json
+++ b/web/default/src/i18n/locales/_reports/ja.untranslated.json
@@ -4,6 +4,7 @@
   "/status/": "/status/",
   "/your/endpoint": "/your/endpoint",
   "acknowledge the related legal risks": "acknowledge the related legal risks",
+  "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.": "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.",
   "AIGC2D": "AIGC2D",
   "Alipay": "Alipay",
   "Anthropic": "Anthropic",
@@ -78,6 +79,7 @@
   "OhMyGPT": "OhMyGPT",
   "Ollama": "Ollama",
   "OpenAI": "OpenAI",
+  "OpenAI Admin Key": "OpenAI Admin Key",
   "OpenAIMax": "OpenAIMax",
   "OpenRouter": "OpenRouter",
   "operation and charging behavior": "operation and charging behavior",
diff --git a/web/default/src/i18n/locales/_reports/ru.untranslated.json b/web/default/src/i18n/locales/_reports/ru.untranslated.json
index fa683ab7587..e281c97c1fb 100644
--- a/web/default/src/i18n/locales/_reports/ru.untranslated.json
+++ b/web/default/src/i18n/locales/_reports/ru.untranslated.json
@@ -89,6 +89,7 @@
   "OhMyGPT": "OhMyGPT",
   "Ollama": "Ollama",
   "OpenAI": "OpenAI",
+  "OpenAI Admin Key": "OpenAI Admin Key",
   "OpenAIMax": "OpenAIMax",
   "OpenRouter": "OpenRouter",
   "operation and charging behavior": "operation and charging behavior",
diff --git a/web/default/src/i18n/locales/en.json b/web/default/src/i18n/locales/en.json
index 1560b01992d..8efc57fb26c 100644
--- a/web/default/src/i18n/locales/en.json
+++ b/web/default/src/i18n/locales/en.json
@@ -207,6 +207,7 @@
     "Admin": "Admin",
     "Admin access required": "Admin access required",
     "Admin area": "Admin area",
+    "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.": "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.",
     "Admin notes (only visible to admins)": "Admin notes (only visible to admins)",
     "Admin Only": "Admin Only",
     "Administer user accounts and roles.": "Administer user accounts and roles.",
@@ -2728,6 +2729,7 @@
     "Open theme settings": "Open theme settings",
     "Open weights": "Open weights",
     "OpenAI": "OpenAI",
+    "OpenAI Admin Key": "OpenAI Admin Key",
     "OpenAI Compatible": "OpenAI Compatible",
     "OpenAI Organization": "OpenAI Organization",
     "OpenAI Organization ID (optional)": "OpenAI Organization ID (optional)",
diff --git a/web/default/src/i18n/locales/fr.json b/web/default/src/i18n/locales/fr.json
index 8b555700a15..94f4d7ce27b 100644
--- a/web/default/src/i18n/locales/fr.json
+++ b/web/default/src/i18n/locales/fr.json
@@ -207,6 +207,7 @@
     "Admin": "Administrateur",
     "Admin access required": "Accès administrateur requis",
     "Admin area": "Espace administrateur",
+    "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.": "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.",
     "Admin notes (only visible to admins)": "Notes d'administration (visibles uniquement par les administrateurs)",
     "Admin Only": "Administrateur uniquement",
     "Administer user accounts and roles.": "Gérer les comptes d'utilisateurs et les rôles.",
@@ -2728,6 +2729,7 @@
     "Open theme settings": "Ouvrir les paramètres du thème",
     "Open weights": "Poids ouverts",
     "OpenAI": "OpenAI",
+    "OpenAI Admin Key": "OpenAI Admin Key",
     "OpenAI Compatible": "Compatible OpenAI",
     "OpenAI Organization": "Organisation OpenAI",
     "OpenAI Organization ID (optional)": "Identifiant d'organisation OpenAI (optionnel)",
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index 778867e9428..3db16148f8e 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -207,6 +207,7 @@
     "Admin": "管理者",
     "Admin access required": "管理者アクセスが必要です",
     "Admin area": "管理者エリア",
+    "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.": "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.",
     "Admin notes (only visible to admins)": "管理者メモ (管理者のみに表示)",
     "Admin Only": "管理者のみ",
     "Administer user accounts and roles.": "ユーザーアカウントとロールを管理します。",
@@ -2728,6 +2729,7 @@
     "Open theme settings": "テーマ設定を開く",
     "Open weights": "公開ウェイト",
     "OpenAI": "OpenAI",
+    "OpenAI Admin Key": "OpenAI Admin Key",
     "OpenAI Compatible": "OpenAI互換",
     "OpenAI Organization": "OpenAI組織",
     "OpenAI Organization ID (optional)": "OpenAI 組織 ID (オプション)",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index 88ae65b0718..7e74c385553 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -207,6 +207,7 @@
     "Admin": "Администратор",
     "Admin access required": "Требуется доступ администратора",
     "Admin area": "Область администратора",
+    "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.": "Ключ admin OpenAI (sk-admin-...) для получения статистики использования. Для инференса не используется.",
     "Admin notes (only visible to admins)": "Заметки администратора (видны только администраторам)",
     "Admin Only": "Только для администраторов",
     "Administer user accounts and roles.": "Управление учетными записями пользователей и ролями.",
@@ -2728,6 +2729,7 @@
     "Open theme settings": "Открыть настройки темы",
     "Open weights": "Открытые веса",
     "OpenAI": "OpenAI",
+    "OpenAI Admin Key": "OpenAI Admin Key",
     "OpenAI Compatible": "Совместимо с OpenAI",
     "OpenAI Organization": "Организация OpenAI",
     "OpenAI Organization ID (optional)": "Идентификатор организации OpenAI (необязательно)",
diff --git a/web/default/src/i18n/locales/vi.json b/web/default/src/i18n/locales/vi.json
index 5e2e32001b2..c9a268dbe7e 100644
--- a/web/default/src/i18n/locales/vi.json
+++ b/web/default/src/i18n/locales/vi.json
@@ -207,6 +207,7 @@
     "Admin": "Quản trị viên",
     "Admin access required": "Yêu cầu quyền truy cập Admin",
     "Admin area": "Khu vực quản trị",
+    "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.": "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.",
     "Admin notes (only visible to admins)": "Ghi chú của quản trị viên (chỉ hiển thị với quản trị viên)",
     "Admin Only": "Chỉ dành cho quản trị viên",
     "Administer user accounts and roles.": "Quản lý tài khoản người dùng và vai trò.",
@@ -2728,6 +2729,7 @@
     "Open theme settings": "Mở cài đặt giao diện",
     "Open weights": "Trọng số mở",
     "OpenAI": "OpenAI",
+    "OpenAI Admin Key": "OpenAI Admin Key",
     "OpenAI Compatible": "Tương thích OpenAI",
     "OpenAI Organization": "Tổ chức OpenAI",
     "OpenAI Organization ID (optional)": "ID Tổ chức OpenAI (tùy chọn)",
diff --git a/web/default/src/i18n/locales/zh.json b/web/default/src/i18n/locales/zh.json
index 6da35355a92..522275ac87c 100644
--- a/web/default/src/i18n/locales/zh.json
+++ b/web/default/src/i18n/locales/zh.json
@@ -207,6 +207,7 @@
     "Admin": "管理员",
     "Admin access required": "需要管理员权限",
     "Admin area": "管理员区域",
+    "Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.": "管理员密钥（sk-admin-...）用于获取使用量统计。不用于推理请求。",
     "Admin notes (only visible to admins)": "管理员备注（仅管理员可见）",
     "Admin Only": "仅限管理员",
     "Administer user accounts and roles.": "管理用户账户和角色。",
@@ -2728,6 +2729,7 @@
     "Open theme settings": "打开主题设置",
     "Open weights": "开放权重",
     "OpenAI": "OpenAI",
+    "OpenAI Admin Key": "OpenAI 管理员密钥",
     "OpenAI Compatible": "兼容 OpenAI",
     "OpenAI Organization": "OpenAI 组织",
     "OpenAI Organization ID (optional)": "OpenAI 组织 ID（可选）",

From a2de9958abbec025071df96ae322b42782d999da Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 21:04:19 +0300
Subject: [PATCH 14/23] feat(channel): mask OpenAIAdminKey in Clean() and
 channel responses

Add Channel.Clean() that zeroes both Key and the OpenAIAdminKey nested in
OtherSettings, and extend the controller's clearChannelInfo helper with the
same OtherSettings stripping so every GET/Search/List/Update response path
already calling it benefits automatically. Previously editing channel id=1
returned the raw admin key in the JSON body, populating the form textarea
in plain text.

Adds a test asserting Channel.Clean() zeros OpenAIAdminKey.
---
 controller/channel.go              |  7 +++++++
 controller/channel_billing_test.go | 24 ++++++++++++++++++++++++
 model/channel.go                   | 14 ++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/controller/channel.go b/controller/channel.go
index 217351703fc..852a8c567b5 100644
--- a/controller/channel.go
+++ b/controller/channel.go
@@ -67,6 +67,13 @@ func clearChannelInfo(channel *model.Channel) {
 		channel.ChannelInfo.MultiKeyDisabledReason = nil
 		channel.ChannelInfo.MultiKeyDisabledTime = nil
 	}
+	// Strip secrets embedded in OtherSettings JSON (e.g. OpenAIAdminKey) before serializing
+	// the channel back to API clients. The inference Key column is already cleared either via
+	// gorm Omit("key") at the query layer or by explicit channel.Key = "" in the caller.
+	if other := channel.GetOtherSettings(); other.OpenAIAdminKey != "" {
+		other.OpenAIAdminKey = ""
+		channel.SetOtherSettings(other)
+	}
 }
 
 func applyChannelStatusFilter(query *gorm.DB, statusFilter int) *gorm.DB {
diff --git a/controller/channel_billing_test.go b/controller/channel_billing_test.go
index 5544e5ad276..3cca15406fe 100644
--- a/controller/channel_billing_test.go
+++ b/controller/channel_billing_test.go
@@ -205,3 +205,27 @@ func TestUpdateChannelOpenAIBalance_StartTimeIsFirstOfMonthUTC(t *testing.T) {
 
 	require.Equal(t, "31", got.Get("limit"))
 }
+
+// TestChannelClean_RemovesOpenAIAdminKey verifies that Channel.Clean zeroes out the inference
+// Key column AND the OpenAIAdminKey nested in OtherSettings JSON. This is the core masking
+// guarantee that prevents the admin key from being exposed in GET /api/channel/<id> responses
+// or in the channel list / search payloads.
+func TestChannelClean_RemovesOpenAIAdminKey(t *testing.T) {
+	_ = openTokenControllerTestDB(t)
+	settingsBytes, err := common.Marshal(dto.ChannelOtherSettings{OpenAIAdminKey: "sk-admin-secret"})
+	require.NoError(t, err)
+	bURL := "http://x"
+	ch := &model.Channel{
+		Type:          constant.ChannelTypeOpenAI,
+		Key:           "sk-secret",
+		Status:        1,
+		BaseURL:       &bURL,
+		OtherSettings: string(settingsBytes),
+	}
+
+	ch.Clean()
+
+	require.Equal(t, "", ch.Key, "inference key must be masked")
+	other := ch.GetOtherSettings()
+	require.Equal(t, "", other.OpenAIAdminKey, "openai admin key must be stripped from OtherSettings")
+}
diff --git a/model/channel.go b/model/channel.go
index 3e6d1866a09..6ab9c4fdd83 100644
--- a/model/channel.go
+++ b/model/channel.go
@@ -961,6 +961,20 @@ func (channel *Channel) SetOtherSettings(setting dto.ChannelOtherSettings) {
 	channel.OtherSettings = string(settingBytes)
 }
 
+// Clean strips sensitive fields from the channel so it is safe to serialize back to API clients.
+// Currently masks the inference Key and the OpenAIAdminKey nested in OtherSettings.
+// Callers should invoke Clean (or controller-layer helpers that wrap it) before JSON-encoding
+// a channel in any response that is not an explicit "reveal secret" endpoint.
+func (channel *Channel) Clean() {
+	channel.Key = ""
+	// Also strip admin keys from other_settings JSON so they're never exposed in API responses.
+	other := channel.GetOtherSettings()
+	if other.OpenAIAdminKey != "" {
+		other.OpenAIAdminKey = ""
+		channel.SetOtherSettings(other)
+	}
+}
+
 func (channel *Channel) GetParamOverride() map[string]interface{} {
 	paramOverride := make(map[string]interface{})
 	if channel.ParamOverride != nil && *channel.ParamOverride != "" {

From d969c8726e8ffa910af8dbbd709573380d25fd81 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 21:05:08 +0300
Subject: [PATCH 15/23] fix(channel): preserve openai_admin_key on update when
 payload is empty

Mirror the inference-key behavior for OpenAIAdminKey nested in OtherSettings:
when a PUT /api/channel payload sends an empty admin_key inside settings,
copy the existing value from the DB row before invoking GORM's struct-based
Updates(channel). Without this merge, editing a channel with a masked form
field would clobber the stored admin key with an empty string, breaking
the OpenAI balance refresh on subsequent runs.
---
 controller/channel.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/controller/channel.go b/controller/channel.go
index 852a8c567b5..db49f584cca 100644
--- a/controller/channel.go
+++ b/controller/channel.go
@@ -896,6 +896,19 @@ func UpdateChannel(c *gin.Context) {
 	// Always copy the original ChannelInfo so that fields like IsMultiKey and MultiKeySize are retained.
 	channel.ChannelInfo = originChannel.ChannelInfo
 
+	// Preserve secrets embedded in OtherSettings when the client sends an empty value.
+	// The form masks OpenAIAdminKey on edit (the GET endpoint never returns it), so an empty
+	// admin_key in the PUT payload means "keep existing", not "clear". Without this merge,
+	// gorm's struct-based Updates(channel) would overwrite settings JSON wholesale.
+	incomingOther := channel.GetOtherSettings()
+	if incomingOther.OpenAIAdminKey == "" {
+		originOther := originChannel.GetOtherSettings()
+		if originOther.OpenAIAdminKey != "" {
+			incomingOther.OpenAIAdminKey = originOther.OpenAIAdminKey
+			channel.SetOtherSettings(incomingOther)
+		}
+	}
+
 	// If the request explicitly specifies a new MultiKeyMode, apply it on top of the original info.
 	if channel.MultiKeyMode != nil && *channel.MultiKeyMode != "" {
 		channel.ChannelInfo.MultiKeyMode = constant.MultiKeyMode(*channel.MultiKeyMode)

From 7d4a65bedb7c2e5c887d9ef9825c3793c9808d5e Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 21:05:32 +0300
Subject: [PATCH 16/23] feat(channel-form): treat empty openai_admin_key as
 'keep existing'

Stop loading openai_admin_key from the channel response into the edit form
(the backend now masks it anyway), and stop deleting it from settings JSON
on save when the field is blank. Empty input now means 'preserve' rather
than 'clear', matching how the main inference key field already behaves.

Also adds an isEditing-aware placeholder ('Leave empty to keep existing
admin key') on the OpenAI Admin Key textarea so users understand the
masked-state UX.
---
 .../drawers/channel-mutate-drawer.tsx         | 39 +++++++++++--------
 .../src/features/channels/lib/channel-form.ts | 20 ++++++++--
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx b/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx
index 4c7045e7525..ddee2cf1624 100644
--- a/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx
+++ b/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx
@@ -2009,23 +2009,28 @@ export function ChannelMutateDrawer({
                   <FormField
                     control={form.control}
                     name='openai_admin_key'
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>{t('OpenAI Admin Key')}</FormLabel>
-                        <FormControl>
-                          <Textarea
-                            placeholder='sk-admin-...'
-                            rows={2}
-                            {...field}
-                          />
-                        </FormControl>
-                        <FormDescription>
-                          {t(
-                            'Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.'
-                          )}
-                        </FormDescription>
-                      </FormItem>
-                    )}
+                    render={({ field }) => {
+                      const adminKeyPlaceholder = isEditing
+                        ? t('Leave empty to keep existing admin key')
+                        : 'sk-admin-...'
+                      return (
+                        <FormItem>
+                          <FormLabel>{t('OpenAI Admin Key')}</FormLabel>
+                          <FormControl>
+                            <Textarea
+                              placeholder={adminKeyPlaceholder}
+                              rows={2}
+                              {...field}
+                            />
+                          </FormControl>
+                          <FormDescription>
+                            {t(
+                              'Admin key (sk-admin-...) used for fetching usage statistics. Not used for inference.'
+                            )}
+                          </FormDescription>
+                        </FormItem>
+                      )
+                    }}
                   />
                 )}
 
diff --git a/web/default/src/features/channels/lib/channel-form.ts b/web/default/src/features/channels/lib/channel-form.ts
index af55f2b5ad0..33ebdad8364 100644
--- a/web/default/src/features/channels/lib/channel-form.ts
+++ b/web/default/src/features/channels/lib/channel-form.ts
@@ -198,7 +198,10 @@ export function transformChannelToFormDefaults(
       const parsed = JSON.parse(channel.settings)
       vertexKeyType = parsed.vertex_key_type || 'json'
       azureResponsesVersion = parsed.azure_responses_version || ''
-      openaiAdminKey = parsed.openai_admin_key || ''
+      // openai_admin_key is intentionally NOT loaded from the channel response — the
+      // backend masks it on read for security, and the field must start empty in edit
+      // mode so the user can leave it blank to preserve the existing value.
+      openaiAdminKey = ''
       isEnterpriseAccount = parsed.openrouter_enterprise === true
       awsKeyType = parsed.aws_key_type || 'ak_sk'
       allowServiceTier = parsed.allow_service_tier === true
@@ -315,9 +318,18 @@ function buildSettingsJSON(formData: ChannelFormValues): string {
     delete settingsObj.azure_responses_version
   }
 
-  // Add openai_admin_key for OpenAI channels (type 1)
-  if (formData.type === 1 && formData.openai_admin_key) {
-    settingsObj.openai_admin_key = formData.openai_admin_key
+  // Add openai_admin_key for OpenAI channels (type 1).
+  // Empty value means "keep existing" — backend preserves the stored admin key when the
+  // payload omits it, mirroring the behavior of the main inference `key` field. Do NOT
+  // delete the field on empty here; let the backend reconcile.
+  if (formData.type === 1) {
+    if (formData.openai_admin_key) {
+      settingsObj.openai_admin_key = formData.openai_admin_key
+    } else {
+      // Strip any masked/empty value carried over from the parsed `settings` field so we
+      // don't send a stray empty string; backend will copy the existing value from DB.
+      delete settingsObj.openai_admin_key
+    }
   } else if ('openai_admin_key' in settingsObj) {
     delete settingsObj.openai_admin_key
   }

From baa9ee57ebc87f62b0d7dc815d1f65251610076f Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 21:05:47 +0300
Subject: [PATCH 17/23] i18n(channel): add 'Leave empty to keep existing admin
 key'

Add the new placeholder string for the OpenAI Admin Key textarea in edit
mode across all six frontend locales (en/zh/ru translated, fr/ja/vi fall
back to English source).
---
 web/default/src/i18n/locales/en.json | 1 +
 web/default/src/i18n/locales/fr.json | 1 +
 web/default/src/i18n/locales/ja.json | 1 +
 web/default/src/i18n/locales/ru.json | 1 +
 web/default/src/i18n/locales/vi.json | 1 +
 web/default/src/i18n/locales/zh.json | 1 +
 6 files changed, 6 insertions(+)

diff --git a/web/default/src/i18n/locales/en.json b/web/default/src/i18n/locales/en.json
index 8efc57fb26c..ff0e936954f 100644
--- a/web/default/src/i18n/locales/en.json
+++ b/web/default/src/i18n/locales/en.json
@@ -2161,6 +2161,7 @@
     "Leave empty to disable the agreement requirement. Supports Markdown, HTML, or a full URL to redirect users.": "Leave empty to disable the agreement requirement. Supports Markdown, HTML, or a full URL to redirect users.",
     "Leave empty to disable the privacy policy requirement. Supports Markdown, HTML, or a full URL to redirect users.": "Leave empty to disable the privacy policy requirement. Supports Markdown, HTML, or a full URL to redirect users.",
     "Leave empty to disband the tag": "Leave empty to disband the tag",
+    "Leave empty to keep existing admin key": "Leave empty to keep existing admin key",
     "Leave empty to keep existing key": "Leave empty to keep existing key",
     "Leave empty to keep unchanged": "Leave empty to keep unchanged",
     "Leave empty to use account email": "Leave empty to use account email",
diff --git a/web/default/src/i18n/locales/fr.json b/web/default/src/i18n/locales/fr.json
index 94f4d7ce27b..0e6d1bd8ca3 100644
--- a/web/default/src/i18n/locales/fr.json
+++ b/web/default/src/i18n/locales/fr.json
@@ -2161,6 +2161,7 @@
     "Leave empty to disable the agreement requirement. Supports Markdown, HTML, or a full URL to redirect users.": "Laissez vide pour désactiver l'exigence d'accord. Prend en charge Markdown, HTML ou une URL complète pour rediriger les utilisateurs.",
     "Leave empty to disable the privacy policy requirement. Supports Markdown, HTML, or a full URL to redirect users.": "Laissez vide pour désactiver l'exigence de politique de confidentialité. Prend en charge Markdown, HTML ou une URL complète pour rediriger les utilisateurs.",
     "Leave empty to disband the tag": "Laissez vide pour dissoudre l'étiquette",
+    "Leave empty to keep existing admin key": "Leave empty to keep existing admin key",
     "Leave empty to keep existing key": "Laissez vide pour conserver la clé existante",
     "Leave empty to keep unchanged": "Laissez vide pour conserver inchangé",
     "Leave empty to use account email": "Laissez vide pour utiliser l'e-mail du compte",
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index 3db16148f8e..652d33db5be 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -2161,6 +2161,7 @@
     "Leave empty to disable the agreement requirement. Supports Markdown, HTML, or a full URL to redirect users.": "利用規約の要件を無効にするには空のままにしてください。Markdown、HTML、またはユーザーをリダイレクトするための完全なURLをサポートします。",
     "Leave empty to disable the privacy policy requirement. Supports Markdown, HTML, or a full URL to redirect users.": "プライバシーポリシーの要件を無効にするには空のままにしてください。Markdown、HTML、またはユーザーをリダイレクトするための完全なURLをサポートします。",
     "Leave empty to disband the tag": "タグを解散するには空のままにしてください",
+    "Leave empty to keep existing admin key": "Leave empty to keep existing admin key",
     "Leave empty to keep existing key": "空欄のままにすると既存のキーを保持します",
     "Leave empty to keep unchanged": "変更しない場合は空欄のまま",
     "Leave empty to use account email": "アカウントのメールアドレスを使用するには空のままにしてください",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index 7e74c385553..7e9a8317273 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -2161,6 +2161,7 @@
     "Leave empty to disable the agreement requirement. Supports Markdown, HTML, or a full URL to redirect users.": "Оставьте пустым, чтобы отключить требование соглашения. Поддерживает Markdown, HTML или полный URL для перенаправления пользователей.",
     "Leave empty to disable the privacy policy requirement. Supports Markdown, HTML, or a full URL to redirect users.": "Оставьте пустым, чтобы отключить требование политики конфиденциальности. Поддерживает Markdown, HTML или полный URL для перенаправления пользователей.",
     "Leave empty to disband the tag": "Оставьте пустым, чтобы удалить тег",
+    "Leave empty to keep existing admin key": "Оставьте пустым, чтобы сохранить текущий admin key",
     "Leave empty to keep existing key": "Оставьте пустым, чтобы сохранить существующий ключ",
     "Leave empty to keep unchanged": "Оставьте пустым, чтобы сохранить без изменений",
     "Leave empty to use account email": "Оставьте пустым, чтобы использовать электронную почту учетной записи",
diff --git a/web/default/src/i18n/locales/vi.json b/web/default/src/i18n/locales/vi.json
index c9a268dbe7e..51132f98662 100644
--- a/web/default/src/i18n/locales/vi.json
+++ b/web/default/src/i18n/locales/vi.json
@@ -2161,6 +2161,7 @@
     "Leave empty to disable the agreement requirement. Supports Markdown, HTML, or a full URL to redirect users.": "Để trống để tắt yêu cầu đồng ý. Hỗ trợ Markdown, HTML hoặc một URL đầy đủ để chuyển hướng người dùng.",
     "Leave empty to disable the privacy policy requirement. Supports Markdown, HTML, or a full URL to redirect users.": "Để trống để vô hiệu hóa yêu cầu chính sách bảo mật. Hỗ trợ Markdown, HTML hoặc một URL đầy đủ để chuyển hướng người dùng.",
     "Leave empty to disband the tag": "Để trống để giải tán thẻ",
+    "Leave empty to keep existing admin key": "Leave empty to keep existing admin key",
     "Leave empty to keep existing key": "Để trống để giữ khóa hiện có",
     "Leave empty to keep unchanged": "Để trống để giữ nguyên",
     "Leave empty to use account email": "Để trống để sử dụng email tài khoản",
diff --git a/web/default/src/i18n/locales/zh.json b/web/default/src/i18n/locales/zh.json
index 522275ac87c..7c3a81b1e39 100644
--- a/web/default/src/i18n/locales/zh.json
+++ b/web/default/src/i18n/locales/zh.json
@@ -2161,6 +2161,7 @@
     "Leave empty to disable the agreement requirement. Supports Markdown, HTML, or a full URL to redirect users.": "留空以禁用协议要求。支持 Markdown、HTML 或用于重定向用户的完整 URL。",
     "Leave empty to disable the privacy policy requirement. Supports Markdown, HTML, or a full URL to redirect users.": "留空以禁用隐私政策要求。支持 Markdown、HTML 或用于重定向用户的完整 URL。",
     "Leave empty to disband the tag": "留空以解散标签",
+    "Leave empty to keep existing admin key": "留空以保留现有管理员密钥",
     "Leave empty to keep existing key": "留空以保留现有密钥",
     "Leave empty to keep unchanged": "留空以保持不变",
     "Leave empty to use account email": "留空以使用账户邮箱",

From 524a07b47a41b340b7b6f4b42c1ffc9c5b9f0a77 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 21:20:30 +0300
Subject: [PATCH 18/23] feat(channel): add OpenAI prepaid fields to DTO

Introduce OpenAIPrepaidAmount and OpenAIPrepaidSince on ChannelOtherSettings
so admins can declare a prepaid USD top-up plus its start timestamp. These
will be consumed by the balance refresh path to compute remaining prepaid
balance instead of month-to-date spend.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 dto/channel_settings.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dto/channel_settings.go b/dto/channel_settings.go
index 4aa4f53e2cc..ecbdadeb6f9 100644
--- a/dto/channel_settings.go
+++ b/dto/channel_settings.go
@@ -36,6 +36,8 @@ type ChannelOtherSettings struct {
 	AllowIncludeObfuscation               bool          `json:"allow_include_obfuscation,omitempty"` // 是否允许 stream_options.include_obfuscation 透传（默认过滤以避免关闭流混淆保护）
 	AwsKeyType                            AwsKeyType    `json:"aws_key_type,omitempty"`
 	OpenAIAdminKey                        string        `json:"openai_admin_key,omitempty"`
+	OpenAIPrepaidAmount                   float64       `json:"openai_prepaid_amount,omitempty"`
+	OpenAIPrepaidSince                    int64         `json:"openai_prepaid_since,omitempty"`
 	UpstreamModelUpdateCheckEnabled       bool          `json:"upstream_model_update_check_enabled,omitempty"`        // 是否检测上游模型更新
 	UpstreamModelUpdateAutoSyncEnabled    bool          `json:"upstream_model_update_auto_sync_enabled,omitempty"`    // 是否自动同步上游模型更新
 	UpstreamModelUpdateLastCheckTime      int64         `json:"upstream_model_update_last_check_time,omitempty"`      // 上次检测时间

From 6ea0bae821ed8ca4fa4f4701839874fb05edd139 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 21:20:37 +0300
Subject: [PATCH 19/23] feat(channel): compute remaining balance when prepaid
 is configured

When both OpenAIPrepaidAmount and OpenAIPrepaidSince are set on the channel,
sum Costs API buckets from the prepaid-since timestamp through now and
return prepaid_amount - total_costs (clamped to 0) as the balance. When
either field is unset, fall back to the existing month-to-date spend
behavior to preserve backward compatibility.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 controller/channel-billing.go | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/controller/channel-billing.go b/controller/channel-billing.go
index f010ca730ac..a978241808c 100644
--- a/controller/channel-billing.go
+++ b/controller/channel-billing.go
@@ -386,10 +386,17 @@ type openAICostAmount struct {
 	Currency string  `json:"currency"`
 }
 
-// updateChannelOpenAIBalance fetches month-to-date OpenAI usage via the Costs API and writes
-// it into channel.Balance. Requires an admin-scoped key (sk-admin-...) stored in
+// updateChannelOpenAIBalance fetches OpenAI usage via the Costs API and writes a balance
+// value into channel.Balance. Requires an admin-scoped key (sk-admin-...) stored in
 // channel.other_settings.openai_admin_key. The legacy /v1/dashboard/billing endpoints were
 // deprecated by OpenAI; this function is their replacement.
+//
+// Two modes are supported:
+//   - Prepaid remaining: if both OpenAIPrepaidAmount > 0 and OpenAIPrepaidSince > 0 are set,
+//     costs are summed from OpenAIPrepaidSince to now, and the returned balance is
+//     OpenAIPrepaidAmount - total_costs (clamped to 0).
+//   - Month-to-date spend (fallback): otherwise, costs are summed from the 1st of the current
+//     UTC month to now and returned as-is.
 func updateChannelOpenAIBalance(channel *model.Channel) (float64, error) {
 	settings := channel.GetOtherSettings()
 	adminKey := strings.TrimSpace(settings.OpenAIAdminKey)
@@ -403,7 +410,13 @@ func updateChannelOpenAIBalance(channel *model.Channel) (float64, error) {
 	}
 
 	now := time.Now().UTC()
-	start := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.UTC).Unix()
+	prepaidMode := settings.OpenAIPrepaidAmount > 0 && settings.OpenAIPrepaidSince > 0
+	var start int64
+	if prepaidMode {
+		start = settings.OpenAIPrepaidSince
+	} else {
+		start = time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.UTC).Unix()
+	}
 	end := now.Unix()
 
 	var total float64
@@ -445,8 +458,16 @@ func updateChannelOpenAIBalance(channel *model.Channel) (float64, error) {
 		return total, fmt.Errorf("openai costs pagination did not terminate after %d pages", openAICostsMaxPages)
 	}
 
-	channel.UpdateBalance(total)
-	return total, nil
+	balance := total
+	if prepaidMode {
+		balance = settings.OpenAIPrepaidAmount - total
+		if balance < 0 {
+			balance = 0
+		}
+	}
+
+	channel.UpdateBalance(balance)
+	return balance, nil
 }
 
 func updateChannelBalance(channel *model.Channel) (float64, error) {

From 3f887a4d8e8502eac6999e50b0e215273ee2effd Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 21:20:54 +0300
Subject: [PATCH 20/23] test(channel): cover prepaid remaining, exhausted, and
 fallback paths

Add three tests for updateChannelOpenAIBalance covering the new prepaid
semantics: remaining balance computation when both fields are set, clamping
to zero when costs exceed the prepaid amount, and falling back to the
month-to-date spend path when only one of the two prepaid fields is set.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 controller/channel_billing_test.go | 107 +++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/controller/channel_billing_test.go b/controller/channel_billing_test.go
index 3cca15406fe..ee5e47df872 100644
--- a/controller/channel_billing_test.go
+++ b/controller/channel_billing_test.go
@@ -206,6 +206,113 @@ func TestUpdateChannelOpenAIBalance_StartTimeIsFirstOfMonthUTC(t *testing.T) {
 	require.Equal(t, "31", got.Get("limit"))
 }
 
+func TestUpdateChannelOpenAIBalance_PrepaidRemaining(t *testing.T) {
+	_ = openTokenControllerTestDB(t)
+
+	var capturedQuery url.Values
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		capturedQuery = r.URL.Query()
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = fmt.Fprint(w, `{
+            "object": "page",
+            "data": [{"object": "bucket","start_time": 0,"end_time": 0,
+                "results": [{"object": "organization.costs.result","amount": {"value": 3.25,"currency": "usd"}}]}],
+            "has_more": false,
+            "next_page": ""
+        }`)
+	}))
+	defer ts.Close()
+
+	settings := dto.ChannelOtherSettings{
+		OpenAIAdminKey:      "sk-admin-test",
+		OpenAIPrepaidAmount: 20.0,
+		OpenAIPrepaidSince:  1700000000,
+	}
+	require.NoError(t, model.DB.AutoMigrate(&model.Channel{}))
+	encoded, _ := common.Marshal(settings)
+	bURL := ts.URL
+	ch := &model.Channel{
+		Type: constant.ChannelTypeOpenAI, Key: "sk-fake",
+		Status: 1, Name: "test", BaseURL: &bURL,
+		OtherSettings: string(encoded),
+	}
+	require.NoError(t, model.DB.Create(ch).Error)
+
+	balance, err := updateChannelOpenAIBalance(ch)
+	require.NoError(t, err)
+	require.InDelta(t, 16.75, balance, 0.001) // 20.0 - 3.25 remaining
+	require.Equal(t, "1700000000", capturedQuery.Get("start_time"))
+}
+
+func TestUpdateChannelOpenAIBalance_PrepaidExhausted(t *testing.T) {
+	_ = openTokenControllerTestDB(t)
+
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = fmt.Fprint(w, `{
+            "object": "page",
+            "data": [{"object": "bucket","start_time": 0,"end_time": 0,
+                "results": [{"object": "organization.costs.result","amount": {"value": 25.0,"currency": "usd"}}]}],
+            "has_more": false,
+            "next_page": ""
+        }`)
+	}))
+	defer ts.Close()
+
+	settings := dto.ChannelOtherSettings{
+		OpenAIAdminKey: "sk-admin-test", OpenAIPrepaidAmount: 20.0, OpenAIPrepaidSince: 1700000000,
+	}
+	require.NoError(t, model.DB.AutoMigrate(&model.Channel{}))
+	encoded, _ := common.Marshal(settings)
+	bURL := ts.URL
+	ch := &model.Channel{
+		Type: constant.ChannelTypeOpenAI, Key: "sk-fake",
+		Status: 1, Name: "test", BaseURL: &bURL,
+		OtherSettings: string(encoded),
+	}
+	require.NoError(t, model.DB.Create(ch).Error)
+
+	balance, err := updateChannelOpenAIBalance(ch)
+	require.NoError(t, err)
+	require.Equal(t, float64(0), balance) // cost > prepaid: clamp to 0
+}
+
+func TestUpdateChannelOpenAIBalance_PrepaidPartialUnsetFallsBackToMTD(t *testing.T) {
+	_ = openTokenControllerTestDB(t)
+
+	var capturedQuery url.Values
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		capturedQuery = r.URL.Query()
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = fmt.Fprint(w, `{
+            "object": "page",
+            "data": [],
+            "has_more": false,
+            "next_page": ""
+        }`)
+	}))
+	defer ts.Close()
+
+	// Only prepaid_amount set, NOT prepaid_since — should fall back to MTD
+	settings := dto.ChannelOtherSettings{
+		OpenAIAdminKey: "sk-admin-test", OpenAIPrepaidAmount: 20.0, // OpenAIPrepaidSince: 0 (unset)
+	}
+	require.NoError(t, model.DB.AutoMigrate(&model.Channel{}))
+	encoded, _ := common.Marshal(settings)
+	bURL := ts.URL
+	ch := &model.Channel{
+		Type: constant.ChannelTypeOpenAI, Key: "sk-fake",
+		Status: 1, Name: "test", BaseURL: &bURL,
+		OtherSettings: string(encoded),
+	}
+	require.NoError(t, model.DB.Create(ch).Error)
+
+	_, err := updateChannelOpenAIBalance(ch)
+	require.NoError(t, err)
+	// start_time should be 1st of current month UTC (fallback path)
+	require.Equal(t, strconv.FormatInt(firstDayOfCurrentMonthUTC(), 10), capturedQuery.Get("start_time"))
+}
+
 // TestChannelClean_RemovesOpenAIAdminKey verifies that Channel.Clean zeroes out the inference
 // Key column AND the OpenAIAdminKey nested in OtherSettings JSON. This is the core masking
 // guarantee that prevents the admin key from being exposed in GET /api/channel/<id> responses

From 021953d7522e545989ada8feebb5b98740e6cb67 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 21:29:43 +0300
Subject: [PATCH 21/23] feat(channel-form): expose prepaid_amount +
 prepaid_since in UI

Add two numeric inputs to the channel mutate drawer, gated to OpenAI
(type 1), that bind to openai_prepaid_amount and openai_prepaid_since on
the channel form. The schema, defaults, transformer and settings JSON
builder are updated to round-trip the values through the API.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../drawers/channel-mutate-drawer.tsx         | 53 +++++++++++++++++++
 .../src/features/channels/lib/channel-form.ts | 28 ++++++++++
 2 files changed, 81 insertions(+)

diff --git a/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx b/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx
index ddee2cf1624..0aa5da5ac2a 100644
--- a/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx
+++ b/web/default/src/features/channels/components/drawers/channel-mutate-drawer.tsx
@@ -2034,6 +2034,59 @@ export function ChannelMutateDrawer({
                   />
                 )}
 
+                {currentType === 1 && (
+                  <FormField
+                    control={form.control}
+                    name='openai_prepaid_amount'
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>
+                          {t('OpenAI Prepaid Amount (USD)')}
+                        </FormLabel>
+                        <FormControl>
+                          <Input
+                            type='number'
+                            step='0.01'
+                            placeholder='20.00'
+                            {...field}
+                          />
+                        </FormControl>
+                        <FormDescription>
+                          {t(
+                            'Total USD prepaid into the OpenAI account. Used together with "Prepaid since" to compute remaining balance.'
+                          )}
+                        </FormDescription>
+                      </FormItem>
+                    )}
+                  />
+                )}
+
+                {currentType === 1 && (
+                  <FormField
+                    control={form.control}
+                    name='openai_prepaid_since'
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>
+                          {t('OpenAI Prepaid Since (Unix timestamp)')}
+                        </FormLabel>
+                        <FormControl>
+                          <Input
+                            type='number'
+                            placeholder='1700000000'
+                            {...field}
+                          />
+                        </FormControl>
+                        <FormDescription>
+                          {t(
+                            'Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.'
+                          )}
+                        </FormDescription>
+                      </FormItem>
+                    )}
+                  />
+                )}
+
                 {currentType === 57 && (
                   <div className='bg-muted/20 space-y-3 rounded-lg border p-4'>
                     <div className='flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between'>
diff --git a/web/default/src/features/channels/lib/channel-form.ts b/web/default/src/features/channels/lib/channel-form.ts
index 33ebdad8364..f0270476cff 100644
--- a/web/default/src/features/channels/lib/channel-form.ts
+++ b/web/default/src/features/channels/lib/channel-form.ts
@@ -67,6 +67,8 @@ export const channelFormSchema = z.object({
   aws_key_type: z.enum(['ak_sk', 'api_key']).optional(), // AWS specific
   azure_responses_version: z.string().optional(), // Azure specific
   openai_admin_key: z.string().optional(), // OpenAI specific: admin key for usage statistics
+  openai_prepaid_amount: z.coerce.number().min(0).optional(),
+  openai_prepaid_since: z.coerce.number().min(0).optional(),
   // Field passthrough controls (stored in settings JSON)
   allow_service_tier: z.boolean().optional(), // OpenAI/Anthropic
   disable_store: z.boolean().optional(), // OpenAI only
@@ -126,6 +128,8 @@ export const CHANNEL_FORM_DEFAULT_VALUES: ChannelFormValues = {
   aws_key_type: 'ak_sk',
   azure_responses_version: '',
   openai_admin_key: '',
+  openai_prepaid_amount: 0,
+  openai_prepaid_since: 0,
   // Field passthrough controls
   allow_service_tier: false,
   disable_store: false,
@@ -180,6 +184,8 @@ export function transformChannelToFormDefaults(
   let vertexKeyType: 'json' | 'api_key' = 'json'
   let azureResponsesVersion = ''
   let openaiAdminKey = ''
+  let openaiPrepaidAmount = 0
+  let openaiPrepaidSince = 0
   let isEnterpriseAccount = false
   let awsKeyType: 'ak_sk' | 'api_key' = 'ak_sk'
   let allowServiceTier = false
@@ -202,6 +208,10 @@ export function transformChannelToFormDefaults(
       // backend masks it on read for security, and the field must start empty in edit
       // mode so the user can leave it blank to preserve the existing value.
       openaiAdminKey = ''
+      // openai_prepaid_amount and openai_prepaid_since are NOT masked by the backend,
+      // so they're safe to round-trip through edit mode.
+      openaiPrepaidAmount = parsed.openai_prepaid_amount ?? 0
+      openaiPrepaidSince = parsed.openai_prepaid_since ?? 0
       isEnterpriseAccount = parsed.openrouter_enterprise === true
       awsKeyType = parsed.aws_key_type || 'ak_sk'
       allowServiceTier = parsed.allow_service_tier === true
@@ -259,6 +269,8 @@ export function transformChannelToFormDefaults(
     vertex_key_type: vertexKeyType,
     azure_responses_version: azureResponsesVersion,
     openai_admin_key: openaiAdminKey,
+    openai_prepaid_amount: openaiPrepaidAmount,
+    openai_prepaid_since: openaiPrepaidSince,
     aws_key_type: awsKeyType,
     allow_service_tier: allowServiceTier,
     disable_store: disableStore,
@@ -330,8 +342,24 @@ function buildSettingsJSON(formData: ChannelFormValues): string {
       // don't send a stray empty string; backend will copy the existing value from DB.
       delete settingsObj.openai_admin_key
     }
+    if ((formData.openai_prepaid_amount ?? 0) > 0) {
+      settingsObj.openai_prepaid_amount = formData.openai_prepaid_amount
+    } else {
+      delete settingsObj.openai_prepaid_amount
+    }
+    if ((formData.openai_prepaid_since ?? 0) > 0) {
+      settingsObj.openai_prepaid_since = formData.openai_prepaid_since
+    } else {
+      delete settingsObj.openai_prepaid_since
+    }
   } else if ('openai_admin_key' in settingsObj) {
     delete settingsObj.openai_admin_key
+    if ('openai_prepaid_amount' in settingsObj) {
+      delete settingsObj.openai_prepaid_amount
+    }
+    if ('openai_prepaid_since' in settingsObj) {
+      delete settingsObj.openai_prepaid_since
+    }
   }
 
   // Add enterprise account setting for OpenRouter (type 20)

From d2ef10054111bdb4d6674fd72e29b78406713fb5 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 21:29:59 +0300
Subject: [PATCH 22/23] i18n(channel): add OpenAI prepaid field translations

Add label and help-text strings for the new OpenAI prepaid amount and
prepaid-since timestamp inputs across all 6 locales. Russian and Chinese
get full translations; French, Japanese and Vietnamese fall back to the
English source, in line with prior conventions for channel-specific UI.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 web/default/src/i18n/locales/_reports/_sync-report.json    | 6 +++---
 web/default/src/i18n/locales/_reports/fr.untranslated.json | 3 +++
 web/default/src/i18n/locales/_reports/ja.untranslated.json | 5 +++++
 web/default/src/i18n/locales/_reports/vi.untranslated.json | 3 +++
 web/default/src/i18n/locales/en.json                       | 4 ++++
 web/default/src/i18n/locales/fr.json                       | 4 ++++
 web/default/src/i18n/locales/ja.json                       | 4 ++++
 web/default/src/i18n/locales/ru.json                       | 4 ++++
 web/default/src/i18n/locales/vi.json                       | 4 ++++
 web/default/src/i18n/locales/zh.json                       | 4 ++++
 10 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/web/default/src/i18n/locales/_reports/_sync-report.json b/web/default/src/i18n/locales/_reports/_sync-report.json
index fd34f1df8a4..7a9f7096440 100644
--- a/web/default/src/i18n/locales/_reports/_sync-report.json
+++ b/web/default/src/i18n/locales/_reports/_sync-report.json
@@ -11,13 +11,13 @@
       "file": "fr.json",
       "missingCount": 0,
       "extrasCount": 0,
-      "untranslatedCount": 21
+      "untranslatedCount": 24
     },
     "ja": {
       "file": "ja.json",
       "missingCount": 0,
       "extrasCount": 0,
-      "untranslatedCount": 122
+      "untranslatedCount": 127
     },
     "ru": {
       "file": "ru.json",
@@ -29,7 +29,7 @@
       "file": "vi.json",
       "missingCount": 0,
       "extrasCount": 0,
-      "untranslatedCount": 23
+      "untranslatedCount": 26
     },
     "zh": {
       "file": "zh.json",
diff --git a/web/default/src/i18n/locales/_reports/fr.untranslated.json b/web/default/src/i18n/locales/_reports/fr.untranslated.json
index ee15fa5f08f..ba3f91bb73a 100644
--- a/web/default/src/i18n/locales/_reports/fr.untranslated.json
+++ b/web/default/src/i18n/locales/_reports/fr.untranslated.json
@@ -6,6 +6,7 @@
   "I have read and understood the above compliance reminder": "I have read and understood the above compliance reminder",
   "I have read and understood the above compliance reminder, acknowledge the related legal risks, and confirm that I bear legal responsibility arising from deployment, operation, and charging behavior.": "I have read and understood the above compliance reminder, acknowledge the related legal risks, and confirm that I bear legal responsibility arising from deployment, operation, and charging behavior.",
   "If you provide generative AI services to the public in mainland China, you will fulfill legal obligations including filing, security assessment, content safety, complaint handling, generated content labeling, log retention, and personal information protection.": "If you provide generative AI services to the public in mainland China, you will fulfill legal obligations including filing, security assessment, content safety, complaint handling, generated content labeling, log retention, and personal information protection.",
+  "Leave empty to keep existing admin key": "Leave empty to keep existing admin key",
   "operation and charging behavior": "operation and charging behavior",
   "Payment, redemption codes, subscription plans, and invitation rewards are locked until the root administrator confirms the compliance terms.": "Payment, redemption codes, subscription plans, and invitation rewards are locked until the root administrator confirms the compliance terms.",
   "Please type the following text to confirm:": "Please type the following text to confirm:",
@@ -14,7 +15,9 @@
   "Subscription plan creation and changes are locked until the administrator confirms compliance terms in Payment Gateway settings.": "Subscription plan creation and changes are locked until the administrator confirms compliance terms in Payment Gateway settings.",
   "The entered text does not match the required text.": "The entered text does not match the required text.",
   "This confirmation unlocks payment, redemption code, subscription plan, and invitation reward features. Please read the statements carefully.": "This confirmation unlocks payment, redemption code, subscription plan, and invitation reward features. Please read the statements carefully.",
+  "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.": "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.",
   "Type the confirmation text here": "Type the confirmation text here",
+  "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.": "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.",
   "You commit not to use this system to implement, assist with, or indirectly implement acts that violate applicable laws and regulations, regulatory requirements, platform rules, public interests, or the lawful rights and interests of third parties.": "You commit not to use this system to implement, assist with, or indirectly implement acts that violate applicable laws and regulations, regulatory requirements, platform rules, public interests, or the lawful rights and interests of third parties.",
   "You commit to using upstream APIs, accounts, keys, quotas, and service capabilities only within the scope of lawful authorization obtained from upstream service providers, model service providers, or relevant rights holders, and will not conduct unauthorized resale, trafficking, distribution, or other non-compliant commercialization.": "You commit to using upstream APIs, accounts, keys, quotas, and service capabilities only within the scope of lawful authorization obtained from upstream service providers, model service providers, or relevant rights holders, and will not conduct unauthorized resale, trafficking, distribution, or other non-compliant commercialization.",
   "You have legally obtained authorization for the connected model APIs, accounts, keys, and quotas.": "You have legally obtained authorization for the connected model APIs, accounts, keys, and quotas.",
diff --git a/web/default/src/i18n/locales/_reports/ja.untranslated.json b/web/default/src/i18n/locales/_reports/ja.untranslated.json
index 9b74c84eb5b..39d81af2f3a 100644
--- a/web/default/src/i18n/locales/_reports/ja.untranslated.json
+++ b/web/default/src/i18n/locales/_reports/ja.untranslated.json
@@ -63,6 +63,7 @@
   "If you provide generative AI services to the public in mainland China, you will fulfill legal obligations including filing, security assessment, content safety, complaint handling, generated content labeling, log retention, and personal information protection.": "If you provide generative AI services to the public in mainland China, you will fulfill legal obligations including filing, security assessment, content safety, complaint handling, generated content labeling, log retention, and personal information protection.",
   "Jimeng": "Jimeng",
   "JustSong": "JustSong",
+  "Leave empty to keep existing admin key": "Leave empty to keep existing admin key",
   "LingYiWanWu": "LingYiWanWu",
   "LinuxDO": "LinuxDO",
   "Midjourney": "Midjourney",
@@ -80,6 +81,8 @@
   "Ollama": "Ollama",
   "OpenAI": "OpenAI",
   "OpenAI Admin Key": "OpenAI Admin Key",
+  "OpenAI Prepaid Amount (USD)": "OpenAI Prepaid Amount (USD)",
+  "OpenAI Prepaid Since (Unix timestamp)": "OpenAI Prepaid Since (Unix timestamp)",
   "OpenAIMax": "OpenAIMax",
   "OpenRouter": "OpenRouter",
   "operation and charging behavior": "operation and charging behavior",
@@ -104,10 +107,12 @@
   "The entered text does not match the required text.": "The entered text does not match the required text.",
   "This confirmation unlocks payment, redemption code, subscription plan, and invitation reward features. Please read the statements carefully.": "This confirmation unlocks payment, redemption code, subscription plan, and invitation reward features. Please read the statements carefully.",
   "Token prices": "Token prices",
+  "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.": "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.",
   "TTFT P50": "TTFT P50",
   "TTFT P95": "TTFT P95",
   "TTFT P99": "TTFT P99",
   "Type the confirmation text here": "Type the confirmation text here",
+  "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.": "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.",
   "Vertex AI": "Vertex AI",
   "VolcEngine": "VolcEngine",
   "Webhook URL": "Webhook URL",
diff --git a/web/default/src/i18n/locales/_reports/vi.untranslated.json b/web/default/src/i18n/locales/_reports/vi.untranslated.json
index 48dce390e60..70ae0c2e2b3 100644
--- a/web/default/src/i18n/locales/_reports/vi.untranslated.json
+++ b/web/default/src/i18n/locales/_reports/vi.untranslated.json
@@ -7,6 +7,7 @@
   "I have read and understood the above compliance reminder": "I have read and understood the above compliance reminder",
   "I have read and understood the above compliance reminder, acknowledge the related legal risks, and confirm that I bear legal responsibility arising from deployment, operation, and charging behavior.": "I have read and understood the above compliance reminder, acknowledge the related legal risks, and confirm that I bear legal responsibility arising from deployment, operation, and charging behavior.",
   "If you provide generative AI services to the public in mainland China, you will fulfill legal obligations including filing, security assessment, content safety, complaint handling, generated content labeling, log retention, and personal information protection.": "If you provide generative AI services to the public in mainland China, you will fulfill legal obligations including filing, security assessment, content safety, complaint handling, generated content labeling, log retention, and personal information protection.",
+  "Leave empty to keep existing admin key": "Leave empty to keep existing admin key",
   "operation and charging behavior": "operation and charging behavior",
   "Payment, redemption codes, subscription plans, and invitation rewards are locked until the root administrator confirms the compliance terms.": "Payment, redemption codes, subscription plans, and invitation rewards are locked until the root administrator confirms the compliance terms.",
   "Please type the following text to confirm:": "Please type the following text to confirm:",
@@ -16,7 +17,9 @@
   "Subscription plan creation and changes are locked until the administrator confirms compliance terms in Payment Gateway settings.": "Subscription plan creation and changes are locked until the administrator confirms compliance terms in Payment Gateway settings.",
   "The entered text does not match the required text.": "The entered text does not match the required text.",
   "This confirmation unlocks payment, redemption code, subscription plan, and invitation reward features. Please read the statements carefully.": "This confirmation unlocks payment, redemption code, subscription plan, and invitation reward features. Please read the statements carefully.",
+  "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.": "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.",
   "Type the confirmation text here": "Type the confirmation text here",
+  "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.": "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.",
   "You commit not to use this system to implement, assist with, or indirectly implement acts that violate applicable laws and regulations, regulatory requirements, platform rules, public interests, or the lawful rights and interests of third parties.": "You commit not to use this system to implement, assist with, or indirectly implement acts that violate applicable laws and regulations, regulatory requirements, platform rules, public interests, or the lawful rights and interests of third parties.",
   "You commit to using upstream APIs, accounts, keys, quotas, and service capabilities only within the scope of lawful authorization obtained from upstream service providers, model service providers, or relevant rights holders, and will not conduct unauthorized resale, trafficking, distribution, or other non-compliant commercialization.": "You commit to using upstream APIs, accounts, keys, quotas, and service capabilities only within the scope of lawful authorization obtained from upstream service providers, model service providers, or relevant rights holders, and will not conduct unauthorized resale, trafficking, distribution, or other non-compliant commercialization.",
   "You have legally obtained authorization for the connected model APIs, accounts, keys, and quotas.": "You have legally obtained authorization for the connected model APIs, accounts, keys, and quotas.",
diff --git a/web/default/src/i18n/locales/en.json b/web/default/src/i18n/locales/en.json
index ff0e936954f..f054fb4133f 100644
--- a/web/default/src/i18n/locales/en.json
+++ b/web/default/src/i18n/locales/en.json
@@ -2732,6 +2732,8 @@
     "OpenAI": "OpenAI",
     "OpenAI Admin Key": "OpenAI Admin Key",
     "OpenAI Compatible": "OpenAI Compatible",
+    "OpenAI Prepaid Amount (USD)": "OpenAI Prepaid Amount (USD)",
+    "OpenAI Prepaid Since (Unix timestamp)": "OpenAI Prepaid Since (Unix timestamp)",
     "OpenAI Organization": "OpenAI Organization",
     "OpenAI Organization ID (optional)": "OpenAI Organization ID (optional)",
     "OpenAI, Anthropic, etc.": "OpenAI, Anthropic, etc.",
@@ -4064,6 +4066,7 @@
     "Total requests made": "Total requests made",
     "Total tokens": "Total tokens",
     "Total Tokens": "Total Tokens",
+    "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.": "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.",
     "Total Usage": "Total Usage",
     "Total:": "Total:",
     "TPM": "TPM",
@@ -4139,6 +4142,7 @@
     "Unit price (USD)": "Unit price (USD)",
     "Unit price must be greater than 0": "Unit price must be greater than 0",
     "Units per USD": "Units per USD",
+    "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.": "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.",
     "Unknown": "Unknown",
     "Unknown version": "Unknown version",
     "Unlimited": "Unlimited",
diff --git a/web/default/src/i18n/locales/fr.json b/web/default/src/i18n/locales/fr.json
index 0e6d1bd8ca3..96c1058df43 100644
--- a/web/default/src/i18n/locales/fr.json
+++ b/web/default/src/i18n/locales/fr.json
@@ -2732,6 +2732,8 @@
     "OpenAI": "OpenAI",
     "OpenAI Admin Key": "OpenAI Admin Key",
     "OpenAI Compatible": "Compatible OpenAI",
+    "OpenAI Prepaid Amount (USD)": "OpenAI Prepaid Amount (USD)",
+    "OpenAI Prepaid Since (Unix timestamp)": "OpenAI Prepaid Since (Unix timestamp)",
     "OpenAI Organization": "Organisation OpenAI",
     "OpenAI Organization ID (optional)": "Identifiant d'organisation OpenAI (optionnel)",
     "OpenAI, Anthropic, etc.": "OpenAI, Anthropic, etc.",
@@ -4064,6 +4066,7 @@
     "Total requests made": "Requêtes totales effectuées",
     "Total tokens": "Jetons totaux",
     "Total Tokens": "Jetons totaux",
+    "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.": "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.",
     "Total Usage": "Utilisation totale",
     "Total:": "Total :",
     "TPM": "TPM",
@@ -4139,6 +4142,7 @@
     "Unit price (USD)": "Prix unitaire (USD)",
     "Unit price must be greater than 0": "Le prix unitaire doit être supérieur à 0",
     "Units per USD": "Unités par USD",
+    "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.": "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.",
     "Unknown": "Inconnu",
     "Unknown version": "Version inconnue",
     "Unlimited": "Illimité",
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index 652d33db5be..2678ebb59e7 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -2732,6 +2732,8 @@
     "OpenAI": "OpenAI",
     "OpenAI Admin Key": "OpenAI Admin Key",
     "OpenAI Compatible": "OpenAI互換",
+    "OpenAI Prepaid Amount (USD)": "OpenAI Prepaid Amount (USD)",
+    "OpenAI Prepaid Since (Unix timestamp)": "OpenAI Prepaid Since (Unix timestamp)",
     "OpenAI Organization": "OpenAI組織",
     "OpenAI Organization ID (optional)": "OpenAI 組織 ID (オプション)",
     "OpenAI, Anthropic, etc.": "OpenAI、Anthropicなど",
@@ -4064,6 +4066,7 @@
     "Total requests made": "合計リクエスト数",
     "Total tokens": "合計トークン",
     "Total Tokens": "合計トークン",
+    "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.": "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.",
     "Total Usage": "総使用量",
     "Total:": "合計:",
     "TPM": "TPM",
@@ -4139,6 +4142,7 @@
     "Unit price (USD)": "単価 (USD)",
     "Unit price must be greater than 0": "単価は 0 より大きい必要があります",
     "Units per USD": "USDあたりのユニット数",
+    "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.": "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.",
     "Unknown": "不明",
     "Unknown version": "不明なバージョン",
     "Unlimited": "無制限",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index 7e9a8317273..4c564cf495c 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -2732,6 +2732,8 @@
     "OpenAI": "OpenAI",
     "OpenAI Admin Key": "OpenAI Admin Key",
     "OpenAI Compatible": "Совместимо с OpenAI",
+    "OpenAI Prepaid Amount (USD)": "Сумма prepaid OpenAI (USD)",
+    "OpenAI Prepaid Since (Unix timestamp)": "OpenAI prepaid с (Unix timestamp)",
     "OpenAI Organization": "Организация OpenAI",
     "OpenAI Organization ID (optional)": "Идентификатор организации OpenAI (необязательно)",
     "OpenAI, Anthropic, etc.": "OpenAI, Anthropic и т.д.",
@@ -4064,6 +4066,7 @@
     "Total requests made": "Всего сделанных запросов",
     "Total tokens": "Всего токенов",
     "Total Tokens": "Всего токенов",
+    "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.": "Общая сумма pre-paid на счёте OpenAI в USD. Вместе с \"Prepaid since\" используется для расчёта остатка.",
     "Total Usage": "Общее использование",
     "Total:": "Всего:",
     "TPM": "TPM",
@@ -4139,6 +4142,7 @@
     "Unit price (USD)": "Цена за единицу (USD)",
     "Unit price must be greater than 0": "Цена за единицу должна быть больше 0",
     "Units per USD": "Единиц за USD",
+    "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.": "Unix timestamp начала prepaid-периода. Если 0 — показывается расход с начала месяца.",
     "Unknown": "Неизвестно",
     "Unknown version": "Неизвестная версия",
     "Unlimited": "Без ограничений",
diff --git a/web/default/src/i18n/locales/vi.json b/web/default/src/i18n/locales/vi.json
index 51132f98662..ddc6fb06e50 100644
--- a/web/default/src/i18n/locales/vi.json
+++ b/web/default/src/i18n/locales/vi.json
@@ -2732,6 +2732,8 @@
     "OpenAI": "OpenAI",
     "OpenAI Admin Key": "OpenAI Admin Key",
     "OpenAI Compatible": "Tương thích OpenAI",
+    "OpenAI Prepaid Amount (USD)": "OpenAI Prepaid Amount (USD)",
+    "OpenAI Prepaid Since (Unix timestamp)": "OpenAI Prepaid Since (Unix timestamp)",
     "OpenAI Organization": "Tổ chức OpenAI",
     "OpenAI Organization ID (optional)": "ID Tổ chức OpenAI (tùy chọn)",
     "OpenAI, Anthropic, etc.": "OpenAI, Anthropic, v.v.",
@@ -4064,6 +4066,7 @@
     "Total requests made": "Tổng lượt yêu cầu",
     "Total tokens": "Tổng số token",
     "Total Tokens": "Tổng số token",
+    "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.": "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.",
     "Total Usage": "Tổng Mức Sử dụng",
     "Total:": "Tổng cộng:",
     "TPM": "TPM",
@@ -4139,6 +4142,7 @@
     "Unit price (USD)": "Đơn giá (USD)",
     "Unit price must be greater than 0": "Đơn giá phải lớn hơn 0",
     "Units per USD": "Đơn vị trên USD",
+    "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.": "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.",
     "Unknown": "Không rõ",
     "Unknown version": "Phiên bản không xác định",
     "Unlimited": "Không giới hạn",
diff --git a/web/default/src/i18n/locales/zh.json b/web/default/src/i18n/locales/zh.json
index 7c3a81b1e39..1355b044fe6 100644
--- a/web/default/src/i18n/locales/zh.json
+++ b/web/default/src/i18n/locales/zh.json
@@ -2732,6 +2732,8 @@
     "OpenAI": "OpenAI",
     "OpenAI Admin Key": "OpenAI 管理员密钥",
     "OpenAI Compatible": "兼容 OpenAI",
+    "OpenAI Prepaid Amount (USD)": "OpenAI 预付金额 (USD)",
+    "OpenAI Prepaid Since (Unix timestamp)": "OpenAI 预付起始 (Unix 时间戳)",
     "OpenAI Organization": "OpenAI 组织",
     "OpenAI Organization ID (optional)": "OpenAI 组织 ID（可选）",
     "OpenAI, Anthropic, etc.": "OpenAI、Anthropic 等",
@@ -4064,6 +4066,7 @@
     "Total requests made": "总请求数",
     "Total tokens": "总 Token",
     "Total Tokens": "总 Token 数",
+    "Total USD prepaid into the OpenAI account. Used together with \"Prepaid since\" to compute remaining balance.": "OpenAI 账户的预付金额总额（美元），与\"预付起始时间\"结合用于计算剩余余额。",
     "Total Usage": "总用量",
     "Total:": "总计：",
     "TPM": "TPM",
@@ -4139,6 +4142,7 @@
     "Unit price (USD)": "单价 (USD)",
     "Unit price must be greater than 0": "单价必须大于 0",
     "Units per USD": "每 USD 单位数",
+    "Unix timestamp when the prepaid period started. If 0, balance shows month-to-date spend instead.": "预付期开始的 Unix 时间戳。如果为 0，则显示本月累计支出。",
     "Unknown": "未知",
     "Unknown version": "未知版本",
     "Unlimited": "无限制",

From 0702b5e2e5626a3b81675ec79da998869f3999e0 Mon Sep 17 00:00:00 2001
From: Anatoly Lapkov <a.lapkov@gmail.com>
Date: Wed, 20 May 2026 21:40:48 +0300
Subject: [PATCH 23/23] fix(channel-form): align prepaid field defaults with
 schema type

---
 web/default/src/features/channels/lib/channel-form.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/default/src/features/channels/lib/channel-form.ts b/web/default/src/features/channels/lib/channel-form.ts
index f0270476cff..d1798b9864a 100644
--- a/web/default/src/features/channels/lib/channel-form.ts
+++ b/web/default/src/features/channels/lib/channel-form.ts
@@ -67,8 +67,8 @@ export const channelFormSchema = z.object({
   aws_key_type: z.enum(['ak_sk', 'api_key']).optional(), // AWS specific
   azure_responses_version: z.string().optional(), // Azure specific
   openai_admin_key: z.string().optional(), // OpenAI specific: admin key for usage statistics
-  openai_prepaid_amount: z.coerce.number().min(0).optional(),
-  openai_prepaid_since: z.coerce.number().min(0).optional(),
+  openai_prepaid_amount: z.number().min(0),
+  openai_prepaid_since: z.number().int().min(0),
   // Field passthrough controls (stored in settings JSON)
   allow_service_tier: z.boolean().optional(), // OpenAI/Anthropic
   disable_store: z.boolean().optional(), // OpenAI only