From cb5f53d68502f674b8d3483cd84fc330f296dc1c Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 11:55:34 +0800
Subject: [PATCH 01/20] fix

---
 controller/relay.go                           |   3 +
 controller/relay_stream_error.go              |  27 ++
 controller/relay_stream_error_test.go         |  74 ++++
 relay/channel/openai/chat_stream.go           | 210 ++++++++++
 relay/channel/openai/chat_stream_test.go      | 309 ++++++++++++++
 relay/channel/openai/relay-openai.go          |   4 +
 relay/chat_stream_billing_test.go             | 172 ++++++++
 relay/compatible_handler.go                   |   7 +
 service/quota.go                              |  12 +-
 service/text_quota.go                         |  24 +-
 service/tiered_settle_test.go                 |  29 ++
 .../components/dynamic-pricing-breakdown.tsx  |  20 +-
 .../pricing/components/model-details.tsx      |   8 +-
 .../src/features/pricing/lib/billing-expr.ts  | 113 +++++-
 .../src/features/pricing/lib/price.test.ts    |  82 ++++
 web/default/src/features/pricing/lib/price.ts |  12 +-
 .../features/pricing/lib/tier-expr.test.ts    | 248 +++++++++++-
 .../src/features/pricing/lib/tier-expr.ts     | 349 +++++++++++++---
 .../models/task-rate-card-settings.tsx        | 153 ++++++-
 .../models/tiered-billing-settings.tsx        | 135 ++++++-
 .../tiered-pricing-editor.runtime.test.tsx    | 378 +++++++++++++++++-
 .../models/tiered-pricing-editor.tsx          |  14 +-
 .../models/tiered-pricing-fields.tsx          |  12 +-
 .../models/tiered-pricing-visual-editor.tsx   | 357 +++++++++++++----
 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 +
 30 files changed, 2593 insertions(+), 183 deletions(-)
 create mode 100644 controller/relay_stream_error.go
 create mode 100644 controller/relay_stream_error_test.go
 create mode 100644 relay/channel/openai/chat_stream.go
 create mode 100644 relay/channel/openai/chat_stream_test.go
 create mode 100644 relay/chat_stream_billing_test.go
 create mode 100644 web/default/src/features/pricing/lib/price.test.ts

diff --git a/controller/relay.go b/controller/relay.go
index 039b1ec1..e631d474 100644
--- a/controller/relay.go
+++ b/controller/relay.go
@@ -166,6 +166,9 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 		if maxAPIError != nil {
 			logger.LogError(c, fmt.Sprintf("relay error: %s", common.LocalLogPreview(maxAPIError.Error())))
 			maxAPIError.SetMessage(common.MessageWithRequestId(maxAPIError.Error(), requestId))
+			if writeStartedStreamError(c, relayFormat, maxAPIError) {
+				return
+			}
 			switch relayFormat {
 			case types.RelayFormatOpenAIRealtime:
 				helper.WssError(c, ws, maxAPIError.ToOpenAIError())
diff --git a/controller/relay_stream_error.go b/controller/relay_stream_error.go
new file mode 100644
index 00000000..d127bd77
--- /dev/null
+++ b/controller/relay_stream_error.go
@@ -0,0 +1,27 @@
+package controller
+
+import (
+	"strings"
+
+	"github.com/MAX-API-Next/MAX-API/relay/helper"
+	"github.com/MAX-API-Next/MAX-API/types"
+	"github.com/gin-gonic/gin"
+)
+
+// Once SSE is committed, a JSON response cannot change the HTTP status and
+// would corrupt event framing. The controller remains the single error writer.
+func writeStartedStreamError(c *gin.Context, format types.RelayFormat, apiErr *types.MaxAPIError) bool {
+	if format != types.RelayFormatOpenAI || !strings.HasPrefix(c.Writer.Header().Get("Content-Type"), "text/event-stream") {
+		return false
+	}
+	if !c.Writer.Written() {
+		// The scanner prepares SSE headers before receiving any output. Let
+		// Gin's ordinary error responder select application/json if no bytes
+		// were committed; otherwise clients would parse raw JSON as SSE.
+		c.Writer.Header().Del("Content-Type")
+		return false
+	}
+	_ = helper.ObjectData(c, gin.H{"error": apiErr.ToOpenAIError()})
+	helper.Done(c)
+	return true
+}
diff --git a/controller/relay_stream_error_test.go b/controller/relay_stream_error_test.go
new file mode 100644
index 00000000..7c252442
--- /dev/null
+++ b/controller/relay_stream_error_test.go
@@ -0,0 +1,74 @@
+package controller
+
+import (
+	"errors"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/MAX-API-Next/MAX-API/common"
+	"github.com/MAX-API-Next/MAX-API/relay/channel/openai"
+	relaycommon "github.com/MAX-API-Next/MAX-API/relay/common"
+	relayconstant "github.com/MAX-API-Next/MAX-API/relay/constant"
+	"github.com/MAX-API-Next/MAX-API/relay/helper"
+	"github.com/MAX-API-Next/MAX-API/setting/operation_setting"
+	"github.com/MAX-API-Next/MAX-API/types"
+	"github.com/gin-gonic/gin"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNativeChatErrorReachesControllerRetryPolicy(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	oldFlag, oldTimes, oldRanges := common.EmptyCompletionRetryEnabled, common.RetryTimes, operation_setting.AutomaticRetryStatusCodeRanges
+	common.EmptyCompletionRetryEnabled, common.RetryTimes = true, 2
+	operation_setting.AutomaticRetryStatusCodeRanges = []operation_setting.StatusCodeRange{{Start: 502, End: 502}}
+	t.Cleanup(func() {
+		common.EmptyCompletionRetryEnabled, common.RetryTimes, operation_setting.AutomaticRetryStatusCodeRanges = oldFlag, oldTimes, oldRanges
+	})
+	c, _ := gin.CreateTestContext(httptest.NewRecorder())
+	c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
+	info := &relaycommon.RelayInfo{RelayMode: relayconstant.RelayModeChatCompletions, RelayFormat: types.RelayFormatOpenAI, DisablePing: true, ChannelMeta: &relaycommon.ChannelMeta{UpstreamModelName: "gpt-test"}}
+	_, apiErr := openai.OaiStreamHandler(c, info, &http.Response{StatusCode: 200, Body: io.NopCloser(strings.NewReader("data: {\"choices\":[{\"delta\":{\"role\":\"assistant\"}}]}\n\ndata: {\"error\":{\"message\":\"overloaded\",\"type\":\"upstream_error\"}}\n\n"))})
+	require.NotNil(t, apiErr)
+	require.True(t, shouldRetry(c, apiErr, 1))
+	require.False(t, shouldRetry(c, apiErr, 0))
+	operation_setting.AutomaticRetryStatusCodeRanges = nil
+	require.False(t, shouldRetry(c, apiErr, 1))
+	operation_setting.AutomaticRetryStatusCodeRanges = []operation_setting.StatusCodeRange{{Start: 502, End: 502}}
+	c.Set("specific_channel_id", 1)
+	require.False(t, shouldRetry(c, apiErr, 1))
+}
+
+func TestStartedChatStreamErrorUsesSSEFraming(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	recorder := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(recorder)
+	c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
+	apiErr := types.NewOpenAIError(errors.New("overloaded"), types.ErrorCodeBadResponse, 502)
+	require.False(t, writeStartedStreamError(c, types.RelayFormatOpenAI, apiErr))
+	helper.SetEventStreamHeaders(c)
+	require.NoError(t, helper.StringData(c, `{"choices":[{"delta":{"content":"hello"}}]}`))
+	require.True(t, writeStartedStreamError(c, types.RelayFormatOpenAI, apiErr))
+	require.Equal(t, http.StatusOK, recorder.Code)
+	frames := strings.Split(strings.TrimSpace(recorder.Body.String()), "\n\n")
+	require.Len(t, frames, 3)
+	require.True(t, strings.HasPrefix(frames[1], "data: "))
+	require.Contains(t, frames[1], "overloaded")
+	require.Equal(t, "data: [DONE]", frames[2])
+}
+
+func TestNativeChatUnstartedErrorUsesJSONStatusAndContentType(t *testing.T) {
+	recorder := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(recorder)
+	c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
+	apiErr := types.NewOpenAIError(errors.New("overloaded"), types.ErrorCodeBadResponse, http.StatusBadGateway)
+	helper.SetEventStreamHeaders(c)
+	require.False(t, writeStartedStreamError(c, types.RelayFormatOpenAI, apiErr))
+	c.JSON(apiErr.StatusCode, gin.H{"error": apiErr.ToOpenAIError()})
+	require.Equal(t, http.StatusBadGateway, recorder.Code)
+	require.Contains(t, recorder.Header().Get("Content-Type"), "application/json")
+	require.Contains(t, recorder.Body.String(), "overloaded")
+	require.NotContains(t, recorder.Body.String(), "data:")
+}
diff --git a/relay/channel/openai/chat_stream.go b/relay/channel/openai/chat_stream.go
new file mode 100644
index 00000000..531f24e9
--- /dev/null
+++ b/relay/channel/openai/chat_stream.go
@@ -0,0 +1,210 @@
+package openai
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+
+	"github.com/MAX-API-Next/MAX-API/common"
+	"github.com/MAX-API-Next/MAX-API/dto"
+	relaycommon "github.com/MAX-API-Next/MAX-API/relay/common"
+	"github.com/MAX-API-Next/MAX-API/relay/helper"
+	"github.com/MAX-API-Next/MAX-API/service"
+	"github.com/MAX-API-Next/MAX-API/types"
+	"github.com/gin-gonic/gin"
+)
+
+const (
+	maxPendingChatStreamEvents = 32
+	maxPendingChatStreamBytes  = 64 << 10
+)
+
+// Keep the raw delta fields for the visibility decision. The forwarding path
+// still owns formatting; unknown provider payloads must not become empty just
+// because the typed Chat DTO does not yet describe them.
+type chatStreamFrame struct {
+	Error   json.RawMessage `json:"error"`
+	Usage   *dto.Usage      `json:"usage"`
+	Choices []struct {
+		Delta        map[string]any `json:"delta"`
+		FinishReason string         `json:"finish_reason"`
+	} `json:"choices"`
+}
+
+func chatStreamValueHasPayload(value any) bool {
+	switch value := value.(type) {
+	case nil:
+		return false
+	case string:
+		return strings.TrimSpace(value) != ""
+	case []any:
+		return len(value) > 0
+	case map[string]any:
+		return len(value) > 0
+	default:
+		// Be conservative with provider extensions: never silently replay an
+		// output whose semantics we cannot classify.
+		return true
+	}
+}
+
+func (frame *chatStreamFrame) hasPayload() bool {
+	for _, choice := range frame.Choices {
+		if choice.FinishReason == "content_filter" {
+			return true
+		}
+		for key, value := range choice.Delta {
+			if key != "role" && chatStreamValueHasPayload(value) {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+func (frame *chatStreamFrame) upstreamError() *types.MaxAPIError {
+	if len(frame.Error) == 0 || strings.TrimSpace(string(frame.Error)) == "null" {
+		return nil
+	}
+	var upstream types.OpenAIError
+	if err := common.Unmarshal(frame.Error, &upstream); err != nil {
+		// Some compatible providers send a string instead of an error object.
+		_ = common.Unmarshal(frame.Error, &upstream.Message)
+	}
+	if strings.TrimSpace(upstream.Message) == "" {
+		upstream.Message = "upstream returned a stream error"
+	}
+	if upstream.Type == "" {
+		upstream.Type = "upstream_error"
+	}
+	return types.WithOpenAIError(upstream, http.StatusBadGateway)
+}
+
+// A failed attempt with no payload returns nil usage and can reach the retry
+// policy. A partial response returns usage AND a SkipRetry error; TextHelper
+// settles that usage before returning the terminal error to the controller.
+func oaiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*dto.Usage, *types.MaxAPIError) {
+	if info.RetryIndex > 0 && !c.Writer.Written() {
+		info.StreamStatus = nil
+		info.SendResponseCount, info.ReceivedResponseCount = 0, 0
+		info.ThinkingContentInfo = relaycommon.ThinkingContentInfo{IsFirstThinkingContent: true}
+	}
+	usage := &dto.Usage{}
+	containUsage, hasPayload := false, false
+	var text strings.Builder
+	var toolCount int
+	var lastData string
+	var streamErr *types.MaxAPIError
+	pending := make([]string, 0, 4)
+	pendingBytes := 0
+	buffering := shouldRetryEmptyCompletion(c, info)
+	observer := newOpenAIStreamToolCallObserver(info)
+
+	send := func(data string) bool {
+		if err := HandleStreamFormat(c, info, data, info.ChannelSetting.ForceFormat, info.ChannelSetting.ThinkingToContent); err != nil {
+			streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusBadGateway, types.ErrOptionWithSkipRetry())
+			return false
+		}
+		return true
+	}
+	flushPending := func() bool {
+		buffering = false
+		for _, data := range pending {
+			if !send(data) {
+				return false
+			}
+		}
+		pending = nil
+		pendingBytes = 0
+		return true
+	}
+
+	helper.StreamScannerHandler(c, resp, info, func(data string, sr *helper.StreamResult) {
+		var frame chatStreamFrame
+		if err := common.UnmarshalJsonStr(data, &frame); err != nil {
+			streamErr = types.NewOpenAIError(fmt.Errorf("invalid upstream chat stream: %w", err), types.ErrorCodeBadResponseBody, http.StatusBadGateway)
+			sr.Stop(streamErr)
+			return
+		}
+		// Inspect the current error before releasing any preceding role frame.
+		if streamErr = frame.upstreamError(); streamErr != nil {
+			sr.Stop(streamErr)
+			return
+		}
+		lastData = data
+		if frame.Usage != nil {
+			usage, containUsage = frame.Usage, true
+		}
+		visible := frame.hasPayload()
+		hasPayload = hasPayload || visible
+		observeOpenAIStreamToolCalls(observer, data)
+		if err := processTokenData(info.RelayMode, data, &text, &toolCount); err != nil {
+			sr.Error(err)
+		}
+		if !info.ShouldIncludeUsage && frame.Usage != nil && len(frame.Choices) == 0 {
+			return
+		}
+		if buffering {
+			if visible || !shouldRetryEmptyCompletion(c, info) || len(pending) >= maxPendingChatStreamEvents || pendingBytes+len(data) > maxPendingChatStreamBytes {
+				if !flushPending() {
+					sr.Stop(streamErr)
+					return
+				}
+			} else {
+				pending = append(pending, data)
+				pendingBytes += len(data)
+				return
+			}
+		}
+		if !send(data) {
+			sr.Stop(streamErr)
+		}
+	})
+
+	// The scanner has joined its workers, so a concurrent ping/write cannot
+	// race the final retry decision. Cancellation is never an empty completion.
+	if c.Request.Context().Err() != nil {
+		streamErr = types.NewOpenAIError(c.Request.Context().Err(), types.ErrorCodeBadResponse, http.StatusBadGateway, types.ErrOptionWithSkipRetry())
+	} else if streamErr == nil && !info.StreamStatus.IsNormalEnd() {
+		streamErr = types.NewOpenAIError(fmt.Errorf("upstream chat stream ended: %s", info.StreamStatus.Summary()), types.ErrorCodeBadResponse, http.StatusBadGateway)
+	}
+	if streamErr != nil {
+		if c.Writer.Written() || hasPayload {
+			types.ErrOptionWithSkipRetry()(streamErr)
+		}
+		if !hasPayload {
+			return nil, streamErr
+		}
+	} else if !hasPayload {
+		willRetry := shouldRetryEmptyCompletion(c, info)
+		recordEmptyCompletion(c, info, usage, "empty_chat_stream_output", nil, willRetry)
+		if willRetry {
+			return nil, newEmptyCompletionRetryError()
+		}
+	}
+
+	if !containUsage {
+		usage = service.ResponseText2Usage(c, text.String(), info.UpstreamModelName, info.GetEstimatePromptTokens())
+		usage.CompletionTokens += toolCount * 7
+		usage.TotalTokens = usage.PromptTokens + usage.CompletionTokens
+	}
+	applyUsagePostProcessing(info, usage, common.StringToByteSlice(lastData))
+	if service.ResponseAuditEnabled() {
+		service.SetRelayResponseAuditContent(info, text.String())
+	}
+	if streamErr != nil {
+		return usage, streamErr
+	}
+	if !flushPending() {
+		return usage, streamErr
+	}
+	if hasPayload {
+		recordEmptyCompletionRetrySuccess(c, info, usage)
+	}
+
+	var metadata dto.ChatCompletionsStreamResponse
+	_ = common.UnmarshalJsonStr(lastData, &metadata)
+	HandleFinalResponse(c, info, lastData, metadata.Id, metadata.Created, metadata.Model, metadata.GetSystemFingerprint(), usage, containUsage)
+	return usage, nil
+}
diff --git a/relay/channel/openai/chat_stream_test.go b/relay/channel/openai/chat_stream_test.go
new file mode 100644
index 00000000..0ad3aa30
--- /dev/null
+++ b/relay/channel/openai/chat_stream_test.go
@@ -0,0 +1,309 @@
+package openai
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/MAX-API-Next/MAX-API/common"
+	"github.com/MAX-API-Next/MAX-API/constant"
+	"github.com/MAX-API-Next/MAX-API/dto"
+	relaycommon "github.com/MAX-API-Next/MAX-API/relay/common"
+	relayconstant "github.com/MAX-API-Next/MAX-API/relay/constant"
+	"github.com/MAX-API-Next/MAX-API/setting/operation_setting"
+	"github.com/MAX-API-Next/MAX-API/types"
+	"github.com/gin-gonic/gin"
+	"github.com/stretchr/testify/require"
+)
+
+const chatRoleFrame = `{"id":"resp_test","object":"chat.completion.chunk","model":"gpt-test","choices":[{"index":0,"delta":{"role":"assistant"},"finish_reason":null}]}`
+const chatOverloadFrame = `{"error":{"message":"Our servers are currently overloaded. Please try again later.","type":"upstream_error"}}`
+const chatUsageFrame = `{"id":"","object":"chat.completion.chunk","choices":[],"usage":{"prompt_tokens":38,"completion_tokens":0,"total_tokens":38}}`
+
+func newChatStreamTest(t *testing.T) (*gin.Context, *httptest.ResponseRecorder, *relaycommon.RelayInfo) {
+	t.Helper()
+	gin.SetMode(gin.TestMode)
+	oldEnabled, oldRetries := common.EmptyCompletionRetryEnabled, common.RetryTimes
+	common.EmptyCompletionRetryEnabled, common.RetryTimes = true, 2
+	t.Cleanup(func() { common.EmptyCompletionRetryEnabled, common.RetryTimes = oldEnabled, oldRetries })
+	recorder := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(recorder)
+	c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
+	info := &relaycommon.RelayInfo{
+		RelayMode: relayconstant.RelayModeChatCompletions, RelayFormat: types.RelayFormatOpenAI,
+		DisablePing: true, IsStream: true, ShouldIncludeUsage: true,
+		ChannelMeta: &relaycommon.ChannelMeta{UpstreamModelName: "gpt-test"},
+	}
+	info.SetEstimatePromptTokens(38)
+	return c, recorder, info
+}
+
+func replayChatStream(c *gin.Context, info *relaycommon.RelayInfo, frames ...string) (*dto.Usage, *types.MaxAPIError) {
+	resp := &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(strings.NewReader("data: " + strings.Join(frames, "\n\ndata: ") + "\n\n"))}
+	return OaiStreamHandler(c, info, resp)
+}
+
+func TestNativeChatStreamOverloadBeforeOutput(t *testing.T) {
+	for _, force := range []bool{false, true} {
+		for _, role := range []bool{false, true} {
+			t.Run(fmt.Sprintf("force=%t/role=%t", force, role), func(t *testing.T) {
+				c, recorder, info := newChatStreamTest(t)
+				info.ChannelSetting.ForceFormat = force
+				frames := []string{chatOverloadFrame, chatUsageFrame, "[DONE]"}
+				if role {
+					frames = append([]string{chatRoleFrame}, frames...)
+				}
+				usage, apiErr := replayChatStream(c, info, frames...)
+				require.NotNil(t, apiErr)
+				require.Nil(t, usage)
+				require.Equal(t, http.StatusBadGateway, apiErr.StatusCode)
+				require.Equal(t, "upstream_error", apiErr.ToOpenAIError().Type)
+				require.Contains(t, apiErr.Error(), "overloaded")
+				require.False(t, types.IsSkipRetryError(apiErr))
+				require.False(t, c.Writer.Written())
+				require.Empty(t, recorder.Body.String())
+			})
+		}
+	}
+}
+
+func TestNativeChatStreamEmptyRetriesOnceBeforeWriting(t *testing.T) {
+	for _, done := range []bool{false, true} {
+		t.Run(map[bool]string{false: "eof", true: "done"}[done], func(t *testing.T) {
+			c, recorder, info := newChatStreamTest(t)
+			frames := []string{chatRoleFrame, chatUsageFrame}
+			if done {
+				frames = append(frames, "[DONE]")
+			}
+			usage, apiErr := replayChatStream(c, info, frames...)
+			require.NotNil(t, apiErr)
+			require.Equal(t, types.ErrorCodeEmptyCompletion, apiErr.GetErrorCode())
+			require.Nil(t, usage)
+			require.Empty(t, recorder.Body.String())
+			info.RetryIndex++
+			usage, apiErr = replayChatStream(c, info, frames...)
+			require.Nil(t, apiErr)
+			require.Equal(t, 38, usage.PromptTokens)
+			require.Equal(t, 1, emptyCompletionRetryCount(c))
+			require.Equal(t, "empty_again", emptyCompletionInfo(c)["empty_retry_result"])
+		})
+	}
+}
+
+func TestNativeChatStreamPreservesNonTextAndZeroUsageOutput(t *testing.T) {
+	for name, delta := range map[string]string{
+		"text": `{"content":"hello"}`, "reasoning": `{"reasoning_content":"thinking"}`,
+		"refusal": `{"refusal":"cannot comply"}`, "audio": `{"audio":{"data":"YWJj"}}`,
+		"image":       `{"content":[{"type":"image_url","image_url":{"url":"test-image"}}]}`,
+		"tool":        `{"tool_calls":[{"index":0,"id":"call_1","type":"function","function":{"name":"lookup","arguments":"{}"}}]}`,
+		"legacy_tool": `{"function_call":{"name":"lookup","arguments":"{}"}}`,
+	} {
+		t.Run(name, func(t *testing.T) {
+			c, recorder, info := newChatStreamTest(t)
+			frame := `{"choices":[{"index":0,"delta":` + delta + `,"finish_reason":null}]}`
+			usage, apiErr := replayChatStream(c, info, chatRoleFrame, frame, chatUsageFrame, "[DONE]")
+			require.Nil(t, apiErr)
+			require.Equal(t, 38, usage.PromptTokens)
+			require.Contains(t, recorder.Body.String(), frame)
+			require.Equal(t, 0, emptyCompletionRetryCount(c))
+		})
+	}
+}
+
+func TestNativeChatStreamPartialFailureReturnsUsageWithoutRetry(t *testing.T) {
+	c, recorder, info := newChatStreamTest(t)
+	text := `{"choices":[{"index":0,"delta":{"content":"hello"},"finish_reason":null}]}`
+	usage, apiErr := replayChatStream(c, info, chatRoleFrame, text, chatUsageFrame, chatOverloadFrame, "[DONE]")
+	require.NotNil(t, apiErr)
+	require.True(t, types.IsSkipRetryError(apiErr))
+	require.NotNil(t, usage, "partial output must still reach the existing settlement path")
+	require.Equal(t, 38, usage.PromptTokens)
+	require.Contains(t, recorder.Body.String(), "hello")
+	require.NotContains(t, recorder.Body.String(), "[DONE]", "outer error responder owns terminal framing")
+}
+
+func TestNativeChatStreamEmptyGuards(t *testing.T) {
+	for _, guard := range []string{"disabled", "exhausted", "specific", "written"} {
+		t.Run(guard, func(t *testing.T) {
+			c, _, info := newChatStreamTest(t)
+			switch guard {
+			case "disabled":
+				common.EmptyCompletionRetryEnabled = false
+			case "exhausted":
+				info.RetryIndex = common.RetryTimes
+			case "specific":
+				c.Set("specific_channel_id", 1)
+			case "written":
+				_, _ = c.Writer.WriteString(": ping\n\n")
+			}
+			_, apiErr := replayChatStream(c, info, chatRoleFrame, chatUsageFrame, "[DONE]")
+			require.Nil(t, apiErr)
+			require.Zero(t, emptyCompletionRetryCount(c))
+		})
+	}
+}
+
+func TestNativeChatStreamCancellationDoesNotTriggerEmptyRetry(t *testing.T) {
+	c, _, info := newChatStreamTest(t)
+	ctx, cancel := context.WithCancel(c.Request.Context())
+	c.Request = c.Request.WithContext(ctx)
+	cancel()
+	_, apiErr := replayChatStream(c, info, chatRoleFrame)
+	require.NotNil(t, apiErr)
+	require.True(t, types.IsSkipRetryError(apiErr))
+	require.Zero(t, emptyCompletionRetryCount(c))
+}
+
+func TestNativeChatStreamSuccessfulRetryRecordsWinningUsage(t *testing.T) {
+	c, _, info := newChatStreamTest(t)
+	_, apiErr := replayChatStream(c, info, chatRoleFrame, chatUsageFrame, "[DONE]")
+	require.NotNil(t, apiErr)
+	info.RetryIndex++
+	usage, apiErr := replayChatStream(c, info, `{"choices":[{"delta":{"content":"hello"}}],"usage":{"prompt_tokens":10,"completion_tokens":2,"total_tokens":12}}`, "[DONE]")
+	require.Nil(t, apiErr)
+	require.Equal(t, 12, usage.TotalTokens)
+	require.Equal(t, "success", emptyCompletionInfo(c)["empty_retry_result"])
+	require.False(t, info.StreamStatus.HasErrors(), "failed-attempt status must not contaminate successful attempt")
+	_, ok := c.Get(string(constant.ContextKeyEmptyCompletionInfo))
+	require.True(t, ok)
+}
+
+func TestNativeChatStreamBufferLimitsCloseRetryWindow(t *testing.T) {
+	for _, limit := range []string{"events", "bytes"} {
+		t.Run(limit, func(t *testing.T) {
+			c, recorder, info := newChatStreamTest(t)
+			frames := make([]string, maxPendingChatStreamEvents+1)
+			for i := range frames {
+				frames[i] = chatRoleFrame
+			}
+			if limit == "bytes" {
+				frames = []string{`{"padding":"` + strings.Repeat("x", maxPendingChatStreamBytes) + `","choices":[{"delta":{"role":"assistant"}}]}`}
+			}
+			_, apiErr := replayChatStream(c, info, append(frames, chatOverloadFrame)...)
+			require.NotNil(t, apiErr)
+			require.True(t, types.IsSkipRetryError(apiErr))
+			require.NotEmpty(t, recorder.Body.String())
+		})
+	}
+}
+
+type observedChatWriter struct {
+	gin.ResponseWriter
+	wrote chan struct{}
+}
+
+func (w *observedChatWriter) Write(data []byte) (int, error) {
+	n, err := w.ResponseWriter.Write(data)
+	select {
+	case w.wrote <- struct{}{}:
+	default:
+	}
+	return n, err
+}
+func (w *observedChatWriter) WriteString(data string) (int, error) { return w.Write([]byte(data)) }
+
+func TestNativeChatStreamFlushesFirstPayloadWithoutWaitingForAnotherFrame(t *testing.T) {
+	c, recorder, info := newChatStreamTest(t)
+	wrote := make(chan struct{}, 1)
+	c.Writer = &observedChatWriter{ResponseWriter: c.Writer, wrote: wrote}
+	r, w := io.Pipe()
+	defer r.Close()
+	defer w.Close()
+	producer := make(chan error, 1)
+	go func() {
+		_, err := io.WriteString(w, "data: {\"choices\":[{\"delta\":{\"content\":\"first\"}}]}\n\n")
+		if err == nil {
+			select {
+			case <-wrote:
+			case <-time.After(3 * time.Second):
+				err = fmt.Errorf("first payload was not flushed")
+			}
+		}
+		producer <- err
+		_ = w.Close()
+	}()
+	_, apiErr := OaiStreamHandler(c, info, &http.Response{StatusCode: 200, Body: r})
+	require.NoError(t, <-producer)
+	require.Nil(t, apiErr)
+	require.Contains(t, recorder.Body.String(), "first")
+}
+
+func TestNativeChatStreamPingNeverAllowsRetryAfterCommit(t *testing.T) {
+	c, _, info := newChatStreamTest(t)
+	info.DisablePing = false
+	settings := operation_setting.GetGeneralSetting()
+	oldEnabled, oldSeconds := settings.PingIntervalEnabled, settings.PingIntervalSeconds
+	settings.PingIntervalEnabled, settings.PingIntervalSeconds = true, 1
+	t.Cleanup(func() { settings.PingIntervalEnabled, settings.PingIntervalSeconds = oldEnabled, oldSeconds })
+	wrote := make(chan struct{}, 1)
+	c.Writer = &observedChatWriter{ResponseWriter: c.Writer, wrote: wrote}
+	r, w := io.Pipe()
+	defer r.Close()
+	defer w.Close()
+	producer := make(chan error, 1)
+	go func() {
+		_, err := io.WriteString(w, "data: "+chatRoleFrame+"\n\n")
+		if err == nil {
+			select {
+			case <-wrote:
+			case <-time.After(3 * time.Second):
+				err = fmt.Errorf("expected ping")
+			}
+		}
+		if err == nil {
+			_, err = io.WriteString(w, "data: "+chatOverloadFrame+"\n\n")
+		}
+		producer <- err
+		_ = w.Close()
+	}()
+	_, apiErr := OaiStreamHandler(c, info, &http.Response{StatusCode: 200, Body: r})
+	require.NoError(t, <-producer)
+	require.NotNil(t, apiErr)
+	require.True(t, types.IsSkipRetryError(apiErr))
+}
+
+func TestNativeChatStreamErrorSemanticsIndependentOfEmptySwitch(t *testing.T) {
+	c, recorder, info := newChatStreamTest(t)
+	common.EmptyCompletionRetryEnabled = false
+	_, apiErr := replayChatStream(c, info, `{"error":{"message":"message-only failure","code":"server_error"}}`)
+	require.NotNil(t, apiErr)
+	require.Equal(t, types.ErrorCode("server_error"), apiErr.GetErrorCode())
+	require.Contains(t, apiErr.Error(), "message-only failure")
+	require.Empty(t, recorder.Body.String())
+}
+
+func TestNativeChatStreamEmptyOrMalformedFrames(t *testing.T) {
+	for name, frames := range map[string][]string{
+		"no_frames":     {"[DONE]"},
+		"role_only_eof": {chatRoleFrame},
+		"usage_only":    {chatUsageFrame, "[DONE]"},
+		"whitespace":    {`{"choices":[{"delta":{"content":" ","reasoning_content":"\n"}}]}`, "[DONE]"},
+		"malformed":     {chatRoleFrame, `{"choices":`},
+	} {
+		t.Run(name, func(t *testing.T) {
+			c, recorder, info := newChatStreamTest(t)
+			usage, apiErr := replayChatStream(c, info, frames...)
+			require.NotNil(t, apiErr)
+			require.Nil(t, usage)
+			require.Empty(t, recorder.Body.String())
+			if name == "malformed" {
+				require.Equal(t, types.ErrorCodeBadResponseBody, apiErr.GetErrorCode())
+			} else {
+				require.Equal(t, types.ErrorCodeEmptyCompletion, apiErr.GetErrorCode())
+			}
+		})
+	}
+}
+
+func TestNativeChatStreamContentFilterIsNotRetried(t *testing.T) {
+	c, recorder, info := newChatStreamTest(t)
+	_, apiErr := replayChatStream(c, info, `{"choices":[{"delta":{},"finish_reason":"content_filter"}]}`, chatUsageFrame, "[DONE]")
+	require.Nil(t, apiErr)
+	require.Contains(t, recorder.Body.String(), "content_filter")
+	require.Zero(t, emptyCompletionRetryCount(c))
+}
diff --git a/relay/channel/openai/relay-openai.go b/relay/channel/openai/relay-openai.go
index 156923ea..1076b588 100644
--- a/relay/channel/openai/relay-openai.go
+++ b/relay/channel/openai/relay-openai.go
@@ -13,6 +13,7 @@ import (
 	"github.com/MAX-API-Next/MAX-API/logger"
 	"github.com/MAX-API-Next/MAX-API/relay/channel/openrouter"
 	relaycommon "github.com/MAX-API-Next/MAX-API/relay/common"
+	relayconstant "github.com/MAX-API-Next/MAX-API/relay/constant"
 	"github.com/MAX-API-Next/MAX-API/relay/helper"
 	"github.com/MAX-API-Next/MAX-API/service"
 
@@ -111,6 +112,9 @@ func OaiStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Re
 	}
 
 	defer service.CloseResponseBodyGracefully(resp)
+	if info.RelayMode == relayconstant.RelayModeChatCompletions && info.RelayFormat == types.RelayFormatOpenAI {
+		return oaiChatStreamHandler(c, info, resp)
+	}
 
 	model := info.UpstreamModelName
 	var responseId string
diff --git a/relay/chat_stream_billing_test.go b/relay/chat_stream_billing_test.go
new file mode 100644
index 00000000..cf18bdb6
--- /dev/null
+++ b/relay/chat_stream_billing_test.go
@@ -0,0 +1,172 @@
+package relay
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"sync/atomic"
+	"testing"
+	"time"
+
+	"github.com/MAX-API-Next/MAX-API/common"
+	"github.com/MAX-API-Next/MAX-API/constant"
+	"github.com/MAX-API-Next/MAX-API/dto"
+	"github.com/MAX-API-Next/MAX-API/model"
+	perfmetrics "github.com/MAX-API-Next/MAX-API/pkg/perf_metrics"
+	relaycommon "github.com/MAX-API-Next/MAX-API/relay/common"
+	relayconstant "github.com/MAX-API-Next/MAX-API/relay/constant"
+	"github.com/MAX-API-Next/MAX-API/service"
+	"github.com/MAX-API-Next/MAX-API/setting/config"
+	"github.com/MAX-API-Next/MAX-API/setting/perf_metrics_setting"
+	"github.com/MAX-API-Next/MAX-API/types"
+	"github.com/gin-gonic/gin"
+	"github.com/glebarez/sqlite"
+	"github.com/stretchr/testify/require"
+	"gorm.io/gorm"
+)
+
+type chatStreamBillingRecorder struct {
+	quotas  []int
+	effects []*model.BillingSettlementEffect
+	refunds int
+}
+
+var chatStreamMetricSequence atomic.Uint64
+
+func (b *chatStreamBillingRecorder) Settle(int) error { panic("expected settlement with effect") }
+func (b *chatStreamBillingRecorder) SettleWithEffect(quota int, effect *model.BillingSettlementEffect) error {
+	b.quotas = append(b.quotas, quota)
+	b.effects = append(b.effects, effect)
+	return nil
+}
+func (b *chatStreamBillingRecorder) Refund(*gin.Context) {
+	if b.NeedsRefund() {
+		b.refunds++
+	}
+}
+func (b *chatStreamBillingRecorder) NeedsRefund() bool        { return len(b.quotas) == 0 && b.refunds == 0 }
+func (b *chatStreamBillingRecorder) GetPreConsumedQuota() int { return 100 }
+func (b *chatStreamBillingRecorder) Reserve(int) error        { return nil }
+
+func TestNativeChatRelayBillingAcrossAttempts(t *testing.T) {
+	for _, failure := range []string{"overload", "empty", "partial", "all_failed"} {
+		t.Run(failure, func(t *testing.T) {
+			gin.SetMode(gin.TestMode)
+			service.InitHttpClient()
+			oldFlag, oldTimes := common.EmptyCompletionRetryEnabled, common.RetryTimes
+			common.EmptyCompletionRetryEnabled, common.RetryTimes = true, 2
+			t.Cleanup(func() { common.EmptyCompletionRetryEnabled, common.RetryTimes = oldFlag, oldTimes })
+			var calls atomic.Int32
+			upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				attempt := calls.Add(1)
+				w.Header().Set("Content-Type", "text/event-stream")
+				frames := []string{`{"choices":[{"delta":{"role":"assistant"}}]}`}
+				if (attempt > 1 && failure != "all_failed") || failure == "partial" {
+					frames = append(frames, `{"choices":[{"delta":{"content":"hello"}}],"usage":{"prompt_tokens":10,"completion_tokens":2,"total_tokens":12}}`)
+				}
+				if (attempt == 1 && failure != "empty") || failure == "all_failed" {
+					frames = append(frames, `{"error":{"message":"overloaded","type":"upstream_error"}}`)
+				} else if attempt == 1 {
+					frames = append(frames, `{"choices":[],"usage":{"prompt_tokens":38,"completion_tokens":0,"total_tokens":38}}`)
+				}
+				_, _ = w.Write([]byte("data: " + strings.Join(append(frames, "[DONE]"), "\n\ndata: ") + "\n\n"))
+			}))
+			t.Cleanup(upstream.Close)
+			recorder := httptest.NewRecorder()
+			c, _ := gin.CreateTestContext(recorder)
+			c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
+			c.Set(string(constant.ContextKeyChannelType), constant.ChannelTypeOpenAI)
+			c.Set(string(constant.ContextKeyChannelBaseUrl), upstream.URL)
+			c.Set(string(constant.ContextKeyChannelKey), "synthetic-test-key")
+			c.Set(string(constant.ContextKeyOriginalModel), "gpt-test")
+			billing := &chatStreamBillingRecorder{}
+			info := &relaycommon.RelayInfo{
+				RelayMode: relayconstant.RelayModeChatCompletions, RelayFormat: types.RelayFormatOpenAI,
+				OriginModelName: "gpt-test", StartTime: time.Now(), IsStream: true, DisablePing: true,
+				RequestId: "chat-test-" + failure, Billing: billing,
+				UserQuota: 1000, UserSetting: dto.UserSetting{QuotaWarningThreshold: 1},
+				PriceData: types.PriceData{ModelRatio: 1, CompletionRatio: 1, GroupRatioInfo: types.GroupRatioInfo{GroupRatio: 1}},
+				Request:   &dto.GeneralOpenAIRequest{Model: "gpt-test", Stream: common.GetPointer(true)},
+			}
+			apiErr := TextHelper(c, info)
+			require.NotNil(t, apiErr)
+			if failure == "partial" {
+				require.True(t, types.IsSkipRetryError(apiErr))
+				require.Equal(t, []int{12}, billing.quotas)
+				service.HandleFailedBilling(c, info, apiErr)
+				require.Zero(t, billing.refunds)
+			} else {
+				require.Empty(t, billing.quotas, "failed attempt must not settle or project usage")
+				require.False(t, c.Writer.Written())
+				info.RetryIndex++
+				apiErr = TextHelper(c, info)
+				if failure == "all_failed" {
+					require.NotNil(t, apiErr)
+					service.HandleFailedBilling(c, info, apiErr)
+					service.HandleFailedBilling(c, info, apiErr)
+					require.Equal(t, 1, billing.refunds)
+					require.Empty(t, billing.quotas)
+				} else {
+					require.Nil(t, apiErr)
+					require.Equal(t, []int{12}, billing.quotas, "only winning attempt usage may settle")
+					require.Len(t, billing.effects, 1)
+					require.Equal(t, 1, strings.Count(recorder.Body.String(), "hello"))
+					require.NotContains(t, recorder.Body.String(), "overloaded")
+				}
+			}
+		})
+	}
+}
+
+func TestNativeChatPartialBillingDoesNotRecordSuccess(t *testing.T) {
+	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
+	require.NoError(t, err)
+	require.NoError(t, db.AutoMigrate(&model.PerfMetric{}, &model.PerfMetricFlushReceipt{}))
+	previousDB, previousRedis := model.DB, common.RedisEnabled
+	setting := config.GlobalConfig.Get("perf_metrics_setting").(*perf_metrics_setting.PerfMetricsSetting)
+	previousSetting := *setting
+	model.DB, common.RedisEnabled, setting.Enabled = db, false, true
+	t.Cleanup(func() {
+		model.DB, common.RedisEnabled = previousDB, previousRedis
+		*setting = previousSetting
+		sqlDB, _ := db.DB()
+		_ = sqlDB.Close()
+	})
+	c, _ := gin.CreateTestContext(httptest.NewRecorder())
+	c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
+	billing := &chatStreamBillingRecorder{}
+	info := &relaycommon.RelayInfo{
+		OriginModelName: fmt.Sprintf("partial-metric-%d", chatStreamMetricSequence.Add(1)),
+		StartTime:       time.Now(), IsStream: true, Billing: billing,
+		UserQuota: 1000, UserSetting: dto.UserSetting{QuotaWarningThreshold: 1},
+		ChannelMeta: &relaycommon.ChannelMeta{},
+		PriceData:   types.PriceData{ModelRatio: 1, CompletionRatio: 1, GroupRatioInfo: types.GroupRatioInfo{GroupRatio: 1}},
+	}
+	service.PostPartialConsumeQuota(c, info, &dto.Usage{PromptTokens: 10, CompletionTokens: 2, TotalTokens: 12})
+	require.Equal(t, []int{12}, billing.quotas)
+	// The controller records the terminal failure once. The settlement entry
+	// point must not enqueue an additional successful sample for this request.
+	perfmetrics.RecordRelaySample(info, false, 0)
+	// Observe the full window on the test goroutine. Never's worker may outlive
+	// its timeout and query the restored/closed DB during cleanup.
+	deadline := time.Now().Add(200 * time.Millisecond)
+	for {
+		result, queryErr := perfmetrics.QuerySummaryAll(1, nil)
+		require.NoError(t, queryErr)
+		found := false
+		for _, summary := range result.Models {
+			if summary.ModelName == info.OriginModelName {
+				found = true
+				require.EqualValues(t, 1, summary.RequestCount)
+				require.Zero(t, summary.SuccessRate)
+				break
+			}
+		}
+		require.True(t, found, "missing failure metric")
+		if !time.Now().Before(deadline) {
+			break
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+}
diff --git a/relay/compatible_handler.go b/relay/compatible_handler.go
index f0504ac2..c60ccd68 100644
--- a/relay/compatible_handler.go
+++ b/relay/compatible_handler.go
@@ -214,6 +214,13 @@ func TextHelper(c *gin.Context, info *relaycommon.RelayInfo) (maxAPIError *types
 
 	usage, maxApiErr := adaptor.DoResponse(c, httpResp, info)
 	if maxApiErr != nil {
+		// A native Chat stream can fail after delivering billable output.
+		// Its handler returns partial usage only with SkipRetry: preserve the
+		// existing settlement path rather than refunding a consumed response.
+		if partial, ok := usage.(*dto.Usage); ok && partial != nil && types.IsSkipRetryError(maxApiErr) &&
+			info.IsStream && info.RelayMode == relayconstant.RelayModeChatCompletions && info.RelayFormat == types.RelayFormatOpenAI {
+			service.PostPartialConsumeQuota(c, info, partial)
+		}
 		// reset status code 重置状态码
 		service.ResetStatusCode(maxApiErr, statusCodeMappingStr)
 		return maxApiErr
diff --git a/service/quota.go b/service/quota.go
index 13d92af7..334c0ae1 100644
--- a/service/quota.go
+++ b/service/quota.go
@@ -286,6 +286,10 @@ func CalcOpenRouterCacheCreateTokens(usage dto.Usage, priceData types.PriceData)
 }
 
 func PostAudioConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usage *dto.Usage, extraContent string) {
+	postAudioConsumeQuota(ctx, relayInfo, usage, extraContent, true)
+}
+
+func postAudioConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usage *dto.Usage, extraContent string, recordSuccess bool) {
 	relayInfo.CommitToolUsageAttempt()
 
 	var tieredUsedVars map[string]bool
@@ -404,9 +408,11 @@ func PostAudioConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, u
 		Group:            relayInfo.UsingGroup,
 		Other:            other,
 	})
-	gopool.Go(func() {
-		perfmetrics.RecordRelaySample(relayInfo, true, int64(usage.CompletionTokens))
-	})
+	if recordSuccess {
+		gopool.Go(func() {
+			perfmetrics.RecordRelaySample(relayInfo, true, int64(usage.CompletionTokens))
+		})
+	}
 }
 
 func PreConsumeTokenQuota(relayInfo *relaycommon.RelayInfo, quota int) error {
diff --git a/service/text_quota.go b/service/text_quota.go
index b24c256f..88e7aae2 100644
--- a/service/text_quota.go
+++ b/service/text_quota.go
@@ -15,6 +15,7 @@ import (
 	relaycommon "github.com/MAX-API-Next/MAX-API/relay/common"
 	relayconstant "github.com/MAX-API-Next/MAX-API/relay/constant"
 	"github.com/MAX-API-Next/MAX-API/setting/operation_setting"
+	"github.com/MAX-API-Next/MAX-API/setting/ratio_setting"
 	"github.com/MAX-API-Next/MAX-API/types"
 
 	"github.com/bytedance/gopkg/util/gopool"
@@ -413,6 +414,21 @@ func streamFallbackQuota(relayInfo *relaycommon.RelayInfo, quota int) (int, bool
 }
 
 func PostTextConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usage *dto.Usage, extraContent []string) {
+	postTextConsumeQuota(ctx, relayInfo, usage, extraContent, true)
+}
+
+// PostPartialConsumeQuota settles delivered usage without recording a successful
+// request. The controller owns the terminal error and its failure metric.
+func PostPartialConsumeQuota(ctx *gin.Context, info *relaycommon.RelayInfo, usage *dto.Usage) {
+	if (usage.CompletionTokenDetails.AudioTokens > 0 || usage.PromptTokensDetails.AudioTokens > 0) &&
+		(ratio_setting.ContainsAudioRatio(info.OriginModelName) || ratio_setting.ContainsAudioCompletionRatio(info.OriginModelName)) {
+		postAudioConsumeQuota(ctx, info, usage, "partial upstream response", false)
+	} else {
+		postTextConsumeQuota(ctx, info, usage, []string{"partial upstream response"}, false)
+	}
+}
+
+func postTextConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usage *dto.Usage, extraContent []string, recordSuccess bool) {
 	relayInfo.CommitToolUsageAttempt()
 	originUsage := usage
 	billingUsage := effectiveBillingUsage(usage)
@@ -583,7 +599,9 @@ func PostTextConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, us
 		Group:            relayInfo.UsingGroup,
 		Other:            other,
 	})
-	gopool.Go(func() {
-		perfmetrics.RecordRelaySample(relayInfo, true, int64(summary.CompletionTokens))
-	})
+	if recordSuccess {
+		gopool.Go(func() {
+			perfmetrics.RecordRelaySample(relayInfo, true, int64(summary.CompletionTokens))
+		})
+	}
 }
diff --git a/service/tiered_settle_test.go b/service/tiered_settle_test.go
index 8084f443..f2618749 100644
--- a/service/tiered_settle_test.go
+++ b/service/tiered_settle_test.go
@@ -31,6 +31,35 @@ const probeExpr = `param("service_tier") == "fast" ? tier("fast", p * 4 + c * 20
 
 const testQuotaPerUnit = 500_000.0
 
+func TestVisualZeroPriceContractKeepsNormalizationAndQuota(t *testing.T) {
+	for _, variable := range []string{"cr", "cc", "cc1h", "img", "img_o", "ai", "ao"} {
+		expr := `tier("base", p * 3 + c * 15 + ` + variable + ` * 0)`
+		require.True(t, billingexpr.UsedVars(expr)[variable], "zero coefficient must not remove %s from the normalization contract", variable)
+	}
+	usage := &dto.Usage{PromptTokens: 1000, CompletionTokens: 100, TotalTokens: 1100}
+	usage.PromptTokensDetails.CachedTokens = 800
+	usage.CompletionTokenDetails.ImageTokens = 80
+	for _, tc := range []struct {
+		expr  string
+		p, c  float64
+		quota int
+	}{
+		{`tier("base", p * 3 + c * 15)`, 1000, 100, 2250},
+		{`tier("base", p * 3 + c * 15 + cr * 0)`, 200, 100, 1050},
+		{`tier("base", p * 3 + c * 15 + cr * 0 + img_o * 0)`, 200, 20, 450},
+		{`len < 2000 ? tier("base", p * 3 + c * 15 + cr * 0 + img_o * 0) : tier("other", p * 6 + c * 30)`, 200, 20, 450},
+	} {
+		t.Run(tc.expr, func(t *testing.T) {
+			params := BuildTieredTokenParams(usage, false, billingexpr.UsedVars(tc.expr))
+			require.Equal(t, tc.p, params.P)
+			require.Equal(t, tc.c, params.C)
+			ok, quota, _ := TryTieredSettle(makeRelayInfo(tc.expr, 1, 1000, 100), params)
+			require.True(t, ok)
+			require.Equal(t, tc.quota, quota)
+		})
+	}
+}
+
 func makeSnapshot(expr string, groupRatio float64, estPrompt, estCompletion int) *billingexpr.BillingSnapshot {
 	return &billingexpr.BillingSnapshot{
 		BillingMode:               "tiered_expr",
diff --git a/web/default/src/features/pricing/components/dynamic-pricing-breakdown.tsx b/web/default/src/features/pricing/components/dynamic-pricing-breakdown.tsx
index fc429649..9be00aa5 100644
--- a/web/default/src/features/pricing/components/dynamic-pricing-breakdown.tsx
+++ b/web/default/src/features/pricing/components/dynamic-pricing-breakdown.tsx
@@ -103,6 +103,10 @@ function formatConditionSummary(
 ): string {
   return conditions
     .map((c) => {
+      if (['hour', 'minute', 'weekday', 'month', 'day'].includes(c.var)) {
+        const timeLabel = TIME_FUNC_LABELS[c.var] || c.var
+        return `${t(timeLabel)} ${OP_LABELS[c.op] || c.op} ${c.value} (${c.timezone || 'UTC'})`
+      }
       const varLabel = t(VAR_LABELS[c.var] || c.var)
       const hint = formatTokenHint(c.value)
       return `${varLabel} ${OP_LABELS[c.op] || c.op} ${hint || c.value}`
@@ -111,6 +115,18 @@ function formatConditionSummary(
     .join(' && ')
 }
 
+function formatTierConditionSummary(
+  tier: Pick<ParsedTier, 'conditions' | 'conditionGroups'>,
+  t: (key: string) => string
+): string {
+  if (tier.conditionGroups && tier.conditionGroups.length > 1) {
+    return tier.conditionGroups
+      .map((group) => `(${formatConditionSummary(group, t)})`)
+      .join(' || ')
+  }
+  return formatConditionSummary(tier.conditions, t)
+}
+
 function describeCondition(
   cond: RequestCondition,
   t: (key: string) => string
@@ -250,7 +266,7 @@ export function DynamicPricingBreakdown({
           </div>
           <div className='space-y-1.5 sm:hidden'>
             {tiers.map((tier, i) => {
-              const condSummary = formatConditionSummary(tier.conditions, t)
+              const condSummary = formatTierConditionSummary(tier, t)
               const isMatched =
                 matchedTierLabel != null &&
                 matchedTierLabel !== '' &&
@@ -326,7 +342,7 @@ export function DynamicPricingBreakdown({
               </TableHeader>
               <TableBody>
                 {tiers.map((tier, i) => {
-                  const condSummary = formatConditionSummary(tier.conditions, t)
+                  const condSummary = formatTierConditionSummary(tier, t)
                   const isMatched =
                     normalizedMatchedTierLabel !== '' &&
                     normalizeTierLabel(tier.label) ===
diff --git a/web/default/src/features/pricing/components/model-details.tsx b/web/default/src/features/pricing/components/model-details.tsx
index f22e68c3..1eb7313b 100644
--- a/web/default/src/features/pricing/components/model-details.tsx
+++ b/web/default/src/features/pricing/components/model-details.tsx
@@ -522,7 +522,7 @@ function PriceSection(props: {
               {t('Default quantity')}
             </div>
             <div className='text-foreground mt-1 font-mono text-base font-semibold tabular-nums'>
-              {card.default_quantity || 1}
+              {card.default_quantity ?? 1}
               <span className='text-muted-foreground/40 ml-1 text-xs font-normal'>
                 {t(card.unit || 'unit')}
               </span>
@@ -1028,7 +1028,7 @@ function GroupPricingSection(props: {
             </TableHeader>
             <TableBody>
               {availableGroups.map((group) => {
-                const ratio = props.groupRatio[group] || 1
+                const ratio = props.groupRatio[group] ?? 1
                 return (
                   <TableRow key={group}>
                     <TableCell className='py-2.5'>
@@ -1122,7 +1122,7 @@ function GroupPricingSection(props: {
         />
         <div className='space-y-3'>
           {availableGroups.map((group) => {
-            const ratio = props.groupRatio[group] || 1
+            const ratio = props.groupRatio[group] ?? 1
             return (
               <div key={group} className='overflow-hidden rounded-lg border'>
                 <div className='bg-muted/20 flex items-center justify-between gap-3 border-b px-3 py-2'>
@@ -1232,7 +1232,7 @@ function GroupPricingSection(props: {
           </TableHeader>
           <TableBody>
             {availableGroups.map((group) => {
-              const ratio = props.groupRatio[group] || 1
+              const ratio = props.groupRatio[group] ?? 1
               return (
                 <TableRow key={group}>
                   <TableCell className='py-2.5'>
diff --git a/web/default/src/features/pricing/lib/billing-expr.ts b/web/default/src/features/pricing/lib/billing-expr.ts
index 3cd4dc76..37f2f964 100644
--- a/web/default/src/features/pricing/lib/billing-expr.ts
+++ b/web/default/src/features/pricing/lib/billing-expr.ts
@@ -229,14 +229,16 @@ export type RequestRuleGroup = {
 }
 
 export type TierCondition = {
-  var: 'p' | 'c' | 'len'
+  var: 'p' | 'c' | 'len' | 'hour' | 'minute' | 'weekday' | 'month' | 'day'
   op: '<' | '<=' | '>' | '>='
   value: number
+  timezone?: string
 }
 
 export type ParsedTier = {
   label: string
   conditions: TierCondition[]
+  conditionGroups?: TierCondition[][]
   [field: string]: unknown
 }
 
@@ -269,33 +271,100 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
   if (!exprStr) return []
   try {
     const { body } = stripExprVersion(exprStr)
-    const condGroup =
-      `((?:(?:p|c|len)\\s*(?:<|<=|>|>=)\\s*[\\d.eE+]+)` +
-      `(?:\\s*&&\\s*(?:p|c|len)\\s*(?:<|<=|>|>=)\\s*[\\d.eE+]+)*)`
-    const tierRe = new RegExp(
-      `(?:${condGroup}\\s*\\?\\s*)?tier\\("([^"]*)",\\s*([^)]+)\\)`,
-      'g'
-    )
+    const splitTopLevelColon = (source: string): string[] => {
+      const parts: string[] = []
+      let start = 0
+      let depth = 0
+      let quote = ''
+      let escaped = false
+      for (let index = 0; index < source.length; index += 1) {
+        const char = source[index]
+        if (quote) {
+          if (escaped) escaped = false
+          else if (char === '\\') escaped = true
+          else if (char === quote) quote = ''
+          continue
+        }
+        if (char === '"' || char === "'") {
+          quote = char
+          continue
+        }
+        if (char === '(') depth += 1
+        else if (char === ')') depth = Math.max(0, depth - 1)
+        else if (char === ':' && depth === 0) {
+          parts.push(source.slice(start, index).trim())
+          start = index + 1
+        }
+      }
+      parts.push(source.slice(start).trim())
+      return parts.filter(Boolean)
+    }
+    const tierRe = /^tier\("([^"]*)",\s*([\s\S]+)\)$/
     const tiers: ParsedTier[] = []
-    let m
-    while ((m = tierRe.exec(body)) !== null) {
-      const condStr = m[1] || ''
-      const conditions: TierCondition[] = []
-      if (condStr) {
-        for (const cp of condStr.split(/\s*&&\s*/)) {
-          const cm = cp.trim().match(/^(p|c|len)\s*(<|<=|>|>=)\s*([\d.eE+]+)$/)
+    for (const branch of splitTopLevelColon(body)) {
+      const parts = branch.match(/^(.*?)\s*\?\s*(tier\("[^"]*",[\s\S]+\))$/)
+      const condStr = parts?.[1]?.trim() || ''
+      const tierMatch = tierRe.exec(parts?.[2] || branch)
+      if (!tierMatch) continue
+      const conditionGroups: TierCondition[][] = []
+      const splitLogical = (source: string, operator: '&&' | '||') => {
+        const parts: string[] = []
+        let start = 0
+        let depth = 0
+        for (let index = 0; index < source.length; index += 1) {
+          if (source[index] === '(') depth += 1
+          else if (source[index] === ')') depth = Math.max(0, depth - 1)
+          if (depth === 0 && source.startsWith(operator, index)) {
+            parts.push(source.slice(start, index).trim())
+            start = index + operator.length
+            index += operator.length - 1
+          }
+        }
+        parts.push(source.slice(start).trim())
+        return parts.filter(Boolean)
+      }
+      const unwrap = (source: string) => {
+        let value = source.trim()
+        while (value.startsWith('(') && value.endsWith(')')) {
+          let depth = 0
+          let closesAtEnd = false
+          for (let index = 0; index < value.length; index += 1) {
+            if (value[index] === '(') depth += 1
+            else if (value[index] === ')') depth -= 1
+            if (depth === 0) {
+              closesAtEnd = index === value.length - 1
+              break
+            }
+          }
+          if (!closesAtEnd) break
+          value = value.slice(1, -1).trim()
+        }
+        return value
+      }
+      for (const group of splitLogical(condStr, '||')) {
+        const groupConditions: TierCondition[] = []
+        for (const cp of splitLogical(unwrap(group), '&&')) {
+          if (cp.trim() === 'true') continue
+          const cm = cp
+            .trim()
+            .match(
+              /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("([^"\\]+)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
+            )
           if (cm) {
-            conditions.push({
-              var: cm[1] as TierCondition['var'],
-              op: cm[2] as TierCondition['op'],
-              value: Number(cm[3]),
+            groupConditions.push({
+              var: (cm[1] || cm[2]) as TierCondition['var'],
+              op: cm[4] as TierCondition['op'],
+              value: Number(cm[5]),
+              ...(cm[2] ? { timezone: cm[3] } : {}),
             })
           }
         }
+        if (groupConditions.length > 0) conditionGroups.push(groupConditions)
       }
-      const tier = parseTierBody(m[3]) as ParsedTier
-      tier.label = m[2]
-      tier.conditions = conditions
+      const tier = parseTierBody(tierMatch[2]) as ParsedTier
+      tier.label = tierMatch[1]
+      tier.conditions = conditionGroups.flat()
+      if (conditionGroups.length > 1) tier.conditionGroups = conditionGroups
       tiers.push(tier)
     }
     return tiers
diff --git a/web/default/src/features/pricing/lib/price.test.ts b/web/default/src/features/pricing/lib/price.test.ts
new file mode 100644
index 00000000..eed5d963
--- /dev/null
+++ b/web/default/src/features/pricing/lib/price.test.ts
@@ -0,0 +1,82 @@
+/*
+Copyright (C) 2023-2026 MAX-API-Next
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+*/
+import assert from 'node:assert/strict'
+import { describe, test } from 'node:test'
+import type { PricingModel } from '../types'
+import {
+  formatFixedPrice,
+  formatGroupPrice,
+  formatTaskRateCardRange,
+} from './price'
+
+function modelWithRateCard(
+  min: number | undefined,
+  max: number | undefined
+): PricingModel {
+  return {
+    id: 1,
+    model_name: 'example-task',
+    quota_type: 1,
+    model_ratio: 0,
+    completion_ratio: 0,
+    enable_groups: [],
+    task_rate_card: {
+      unit: 'second',
+      min_unit_price: min as number,
+      max_unit_price: max as number,
+      rows: [],
+    },
+  }
+}
+
+describe('task rate-card display prices', () => {
+  test('keeps an explicit zero price visible', () => {
+    assert.match(formatTaskRateCardRange(modelWithRateCard(0, 0)), /0/)
+  })
+
+  test('does not turn an omitted price into a misleading zero', () => {
+    assert.equal(
+      formatTaskRateCardRange(modelWithRateCard(undefined, undefined)),
+      '-'
+    )
+  })
+
+  test('keeps explicit zero group ratios for token and per-request prices', () => {
+    const model = { ...modelWithRateCard(1, 1), model_price: 4 }
+    const free = { free: 0 }
+    const fixed = formatFixedPrice(model, 'free', false, 1, 1, free)
+    const token = formatGroupPrice(
+      { ...model, quota_type: 0, model_ratio: 3 },
+      'free',
+      'input',
+      'M',
+      false,
+      1,
+      1,
+      free
+    )
+    assert.equal(
+      fixed,
+      formatFixedPrice({ ...model, model_price: 0 }, 'base', false, 1, 1, {})
+    )
+    assert.equal(
+      token,
+      formatGroupPrice(
+        { ...model, quota_type: 0, model_ratio: 0 },
+        'base',
+        'input',
+        'M',
+        false,
+        1,
+        1,
+        {}
+      )
+    )
+  })
+})
diff --git a/web/default/src/features/pricing/lib/price.ts b/web/default/src/features/pricing/lib/price.ts
index 2ccc0620..056bcbe9 100644
--- a/web/default/src/features/pricing/lib/price.ts
+++ b/web/default/src/features/pricing/lib/price.ts
@@ -211,7 +211,7 @@ export function formatGroupPrice(
     return '-'
   }
 
-  const ratio = groupRatio[group] || 1
+  const ratio = groupRatio[group] ?? 1
   let priceInUSD = calculateTokenPrice(model, type, ratio)
 
   priceInUSD = applyRechargeRate(
@@ -244,7 +244,7 @@ export function formatFixedPrice(
     return '-'
   }
 
-  const ratio = groupRatio[group] || 1
+  const ratio = groupRatio[group] ?? 1
   let priceInUSD = (model.model_price || 0) * ratio
 
   priceInUSD = applyRechargeRate(
@@ -336,8 +336,12 @@ export function formatTaskRateCardRange(
   const groupRatio = model.group_ratio || {}
   const multiplier =
     groupRatioMultiplier ?? getMinGroupRatio(enableGroups, groupRatio)
-  const minPrice = Number(card.min_unit_price ?? 0)
-  const maxPrice = Number(card.max_unit_price ?? minPrice)
+  const minPrice = Number(card.min_unit_price)
+  // Keep an explicitly configured zero price visible, but do not render a
+  // misleading $0 when the backend omitted the rate-card bounds entirely.
+  if (!Number.isFinite(minPrice)) return '-'
+  const rawMaxPrice = Number(card.max_unit_price)
+  const maxPrice = Number.isFinite(rawMaxPrice) ? rawMaxPrice : minPrice
   const minFormatted = formatTaskRateCardUnitPrice(
     minPrice,
     showWithRecharge,
diff --git a/web/default/src/features/pricing/lib/tier-expr.test.ts b/web/default/src/features/pricing/lib/tier-expr.test.ts
index 991ddcf1..b6a545f9 100644
--- a/web/default/src/features/pricing/lib/tier-expr.test.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.test.ts
@@ -18,7 +18,15 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 */
 import assert from 'node:assert/strict'
 import { describe, test } from 'node:test'
-import { evalExprLocally, type ExtraTokenValues } from './tier-expr'
+import { BILLING_CACHE_VAR_MAP, parseTiersFromExpr } from './billing-expr'
+import {
+  evalExprLocally,
+  generateExprFromVisualConfig,
+  normalizeVisualTier,
+  createDefaultVisualConfig,
+  tryParseVisualConfig,
+  type ExtraTokenValues,
+} from './tier-expr'
 
 const emptyExtraTokens: ExtraTokenValues = {
   cacheReadTokens: 0,
@@ -30,6 +38,100 @@ const emptyExtraTokens: ExtraTokenValues = {
   audioOutputTokens: 0,
 }
 
+describe('visual optional price presence', () => {
+  for (const { field, exprVar } of BILLING_CACHE_VAR_MAP) {
+    test(`preserves absent, zero and positive ${exprVar} prices through normalization and round trips`, () => {
+      const absent = normalizeVisualTier({
+        input_unit_cost: 3,
+        output_unit_cost: 15,
+      })
+      assert.equal(absent[field], undefined)
+      assert.doesNotMatch(
+        generateExprFromVisualConfig({ tiers: [absent] }),
+        new RegExp(`\\b${exprVar} \\*`)
+      )
+      for (const price of [0, 0.25]) {
+        const source = `tier("base", p * 3 + c * 15 + ${exprVar} * ${price})`
+        const parsed = tryParseVisualConfig(source)
+        assert.ok(parsed)
+        assert.equal(parsed.tiers[0][field], price)
+        assert.equal(generateExprFromVisualConfig(parsed), source)
+        assert.deepEqual(
+          tryParseVisualConfig(generateExprFromVisualConfig(parsed)),
+          parsed
+        )
+        const multi = `len < 100 ? ${source} : tier("other", p * 6 + c * 30)`
+        const multiParsed = tryParseVisualConfig(multi)
+        assert.ok(multiParsed)
+        assert.equal(multiParsed.tiers[1][field], undefined)
+        assert.equal(generateExprFromVisualConfig(multiParsed), multi)
+      }
+    })
+  }
+
+  test('does not create zero-priced subcategories in default tiers', () => {
+    assert.equal(
+      generateExprFromVisualConfig(createDefaultVisualConfig()),
+      'tier("base", p * 0 + c * 0)'
+    )
+  })
+
+  test('accepts equivalent numeric spellings when switching to visual mode', () => {
+    for (const source of [
+      'tier("base", p * 3.0 + c * 15.0)',
+      'tier("base", p * 3e0 + c * 1.5e1)',
+    ]) {
+      const parsed = tryParseVisualConfig(source)
+      assert.ok(parsed)
+      assert.equal(parsed.tiers[0].input_unit_cost, 3)
+      assert.equal(parsed.tiers[0].output_unit_cost, 15)
+    }
+  })
+
+  test('preserves numeric spellings and zero presence in every optional category', () => {
+    for (const { field, exprVar } of BILLING_CACHE_VAR_MAP) {
+      for (const zero of ['0.0', '0e0']) {
+        const source = `tier("base 3.0", p * 3.0 + c * 1.5e1 + ${exprVar} * ${zero})`
+        for (const expression of [
+          source,
+          `len < 1e2 ? ${source} : tier("other", p * .5 + c * 2.0)`,
+        ]) {
+          const parsed = tryParseVisualConfig(expression)
+          assert.ok(parsed, expression)
+          assert.equal(parsed.tiers[0].label, 'base 3.0')
+          assert.equal(parsed.tiers[0][field], 0)
+          assert.equal(parsed.tiers[0].input_unit_cost, 3)
+          assert.equal(parsed.tiers[0].output_unit_cost, 15)
+          assert.deepEqual(
+            tryParseVisualConfig(generateExprFromVisualConfig(parsed)),
+            parsed
+          )
+        }
+      }
+    }
+  })
+
+  test('still rejects lossy or malformed visual conversions', () => {
+    for (const source of [
+      'tier("base", p * 1+2 + c * 15)',
+      'tier("base", p * 1e999 + c * 15)',
+      'tier("base", p * 1e-999 + c * 15)',
+      'len < 9007199254740993 ? tier("base", p * 3 + c * 15) : tier("other", p * 6 + c * 30)',
+      'tier("base", p * 3 + c * 15 + max(cr, 1))',
+      'hour("Asia/Shanghai") > 99 ? tier("base", p * 3 + c * 15) : tier("other", p * 6 + c * 30)',
+      'len < 100 && c == 5 ? tier("base", p * 3 + c * 15) : tier("other", p * 6 + c * 30)',
+    ])
+      assert.equal(tryParseVisualConfig(source), null, source)
+  })
+
+  test('keeps every zero-priced subcategory referenced in the billing contract', () => {
+    const source = `tier("base", p * 3 + c * 15${BILLING_CACHE_VAR_MAP.map(({ exprVar }) => ` + ${exprVar} * 0`).join('')})`
+    const parsed = tryParseVisualConfig(source)
+    assert.ok(parsed)
+    assert.equal(generateExprFromVisualConfig(parsed), source)
+  })
+})
+
 describe('evalExprLocally', () => {
   test('evaluates backend-style ternaries and logical operators', () => {
     const result = evalExprLocally(
@@ -106,3 +208,147 @@ describe('evalExprLocally', () => {
     assert.ok(result.error)
   })
 })
+
+describe('visual tier conditions', () => {
+  test('supports time conditions without requiring a second tier', () => {
+    const expr = generateExprFromVisualConfig({
+      tiers: [
+        {
+          label: 'business-hours',
+          conditions: [
+            { var: 'hour', timezone: 'Asia/Shanghai', op: '>=', value: 9 },
+          ],
+          input_unit_cost: 1,
+          output_unit_cost: 2,
+          cache_mode: 'generic',
+        },
+      ],
+    })
+    assert.match(expr, /hour\("Asia\/Shanghai"\) >= 9/)
+    assert.match(expr, /: tier\("business-hours_fallback", p \* 1 \+ c \* 2\)$/)
+    const parsed = tryParseVisualConfig(expr)
+    assert.equal(parsed?.tiers[0].conditions[0].var, 'hour')
+    assert.equal(parsed?.tiers[0].conditions[0].timezone, 'Asia/Shanghai')
+  })
+
+  test('keeps time conditions visible in pricing breakdown parsing', () => {
+    const tiers = parseTiersFromExpr(
+      'hour("Asia/Shanghai") >= 9 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
+    )
+    assert.equal(tiers[0]?.conditions[0]?.var, 'hour')
+    assert.equal(tiers[0]?.conditions[0]?.timezone, 'Asia/Shanghai')
+  })
+
+  test('parses OR condition groups for pricing breakdowns', () => {
+    const tiers = parseTiersFromExpr(
+      '(len < 200000 && hour("Asia/Shanghai") >= 9) || (weekday("Asia/Shanghai") <= 5 && month("Asia/Shanghai") >= 1) ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
+    )
+    assert.equal(tiers[0]?.conditions.length, 4)
+    assert.equal(tiers[0]?.conditions[1]?.var, 'hour')
+    assert.equal(tiers[0]?.conditions[3]?.var, 'month')
+  })
+
+  test('round-trips an explicit unconditional non-final tier', () => {
+    const expr =
+      'true ? tier("primary", p * 2 + c * 4) : tier("fallback", p * 1 + c * 2)'
+    const parsed = tryParseVisualConfig(expr)
+    assert.ok(parsed)
+    assert.equal(parsed.tiers.length, 2)
+    assert.equal(parsed.tiers[0].conditions.length, 0)
+    assert.equal(generateExprFromVisualConfig(parsed), expr)
+    assert.deepEqual(evalExprLocally(expr, 10, 2, emptyExtraTokens), {
+      cost: 28,
+      matchedTier: 'primary',
+      error: null,
+    })
+  })
+
+  test('normalizes time condition values to their calendar ranges', () => {
+    const tier = normalizeVisualTier({
+      conditions: [
+        { var: 'month', op: '<=', value: 200000 },
+        { var: 'weekday', op: '>=', value: -3 },
+      ],
+    })
+    assert.equal(tier.conditions[0].value, 12)
+    assert.equal(tier.conditions[1].value, 0)
+  })
+
+  test('generates more than two conditions without truncation', () => {
+    const expr = generateExprFromVisualConfig({
+      tiers: [
+        {
+          label: 'multi',
+          conditions: [
+            { var: 'len', op: '<', value: 200000 },
+            { var: 'hour', op: '>=', value: 9 },
+            { var: 'weekday', op: '<=', value: 5 },
+          ],
+          input_unit_cost: 1,
+          output_unit_cost: 2,
+          cache_mode: 'generic',
+        },
+      ],
+    })
+    assert.match(
+      expr,
+      /len < 200000 && hour\("Asia\/Shanghai"\) >= 9 && weekday\("Asia\/Shanghai"\) <= 5/
+    )
+  })
+
+  test('round-trips OR condition groups with AND members', () => {
+    const expr = generateExprFromVisualConfig({
+      tiers: [
+        {
+          label: 'multi-group',
+          conditions: [],
+          conditionGroups: [
+            {
+              conditions: [
+                { var: 'len', op: '<', value: 200000 },
+                {
+                  var: 'hour',
+                  op: '>=',
+                  value: 9,
+                  timezone: 'Asia/Shanghai',
+                },
+              ],
+            },
+            {
+              conditions: [
+                {
+                  var: 'weekday',
+                  op: '<=',
+                  value: 5,
+                  timezone: 'Asia/Shanghai',
+                },
+                {
+                  var: 'month',
+                  op: '>=',
+                  value: 1,
+                  timezone: 'Asia/Shanghai',
+                },
+              ],
+            },
+          ],
+          input_unit_cost: 1,
+          output_unit_cost: 2,
+          cache_mode: 'generic',
+        },
+      ],
+    })
+    assert.match(expr, /\) \|\| \(/)
+    const parsed = tryParseVisualConfig(expr)
+    assert.equal(parsed?.tiers[0].conditionGroups?.length, 2)
+    assert.equal(parsed?.tiers[0].conditionGroups?.[0].conditions.length, 2)
+    assert.equal(parsed?.tiers[0].conditionGroups?.[1].conditions.length, 2)
+    assert.equal(generateExprFromVisualConfig(parsed!), expr)
+  })
+
+  test('resets invalid time values when normalizing a condition', () => {
+    const tier = normalizeVisualTier({
+      conditions: [{ var: 'month', op: '<=', value: 200000 }],
+    })
+    assert.equal(tier.conditions[0].value, 12)
+  })
+})
diff --git a/web/default/src/features/pricing/lib/tier-expr.ts b/web/default/src/features/pricing/lib/tier-expr.ts
index 3cfae499..dc462f62 100644
--- a/web/default/src/features/pricing/lib/tier-expr.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.ts
@@ -24,14 +24,54 @@ export const CACHE_MODE_GENERIC = 'generic'
 export type CacheMode = typeof CACHE_MODE_TIMED | typeof CACHE_MODE_GENERIC
 
 export type TierConditionInput = {
-  var: 'p' | 'c' | 'len'
+  var: 'p' | 'c' | 'len' | 'hour' | 'minute' | 'weekday' | 'month' | 'day'
   op: '<' | '<=' | '>' | '>='
   value: number | string
+  timezone?: string
+}
+
+export type TierConditionGroup = {
+  conditions: TierConditionInput[]
+}
+
+export const TIME_CONDITION_BOUNDS: Record<
+  Extract<
+    TierConditionInput['var'],
+    'hour' | 'minute' | 'weekday' | 'month' | 'day'
+  >,
+  { min: number; max: number; defaultValue: number }
+> = {
+  hour: { min: 0, max: 23, defaultValue: 9 },
+  minute: { min: 0, max: 59, defaultValue: 0 },
+  weekday: { min: 0, max: 6, defaultValue: 1 },
+  month: { min: 1, max: 12, defaultValue: 1 },
+  day: { min: 1, max: 31, defaultValue: 1 },
+}
+
+export function getTierConditionBounds(variable: TierConditionInput['var']) {
+  return TIME_CONDITION_BOUNDS[variable as keyof typeof TIME_CONDITION_BOUNDS]
+}
+
+export function normalizeTierCondition(
+  condition: TierConditionInput
+): TierConditionInput {
+  const bounds = getTierConditionBounds(condition.var)
+  if (!bounds) return condition
+  const numericValue = Number(condition.value)
+  const value = Number.isFinite(numericValue)
+    ? Math.min(bounds.max, Math.max(bounds.min, numericValue))
+    : bounds.defaultValue
+  return {
+    ...condition,
+    value,
+    timezone: condition.timezone || 'Asia/Shanghai',
+  }
 }
 
 export type VisualTier = {
   label: string
   conditions: TierConditionInput[]
+  conditionGroups?: TierConditionGroup[]
   input_unit_cost: number
   output_unit_cost: number
   cache_mode: CacheMode
@@ -45,6 +85,18 @@ export type VisualTier = {
   [field: string]: unknown
 }
 
+export function getTierConditionGroups(
+  tier: Pick<VisualTier, 'conditions' | 'conditionGroups'>
+): TierConditionGroup[] {
+  if (Array.isArray(tier.conditionGroups) && tier.conditionGroups.length > 0) {
+    const groups = tier.conditionGroups.filter((group) =>
+      Array.isArray(group.conditions)
+    )
+    if (groups.length > 0) return groups
+  }
+  return tier.conditions.length > 0 ? [{ conditions: tier.conditions }] : []
+}
+
 export type VisualConfig = {
   tiers: VisualTier[]
 }
@@ -54,7 +106,7 @@ export function getTierCacheMode(
 ): CacheMode {
   if (tier?.cache_mode === CACHE_MODE_TIMED) return CACHE_MODE_TIMED
   if (tier?.cache_mode === CACHE_MODE_GENERIC) return CACHE_MODE_GENERIC
-  return Number(tier?.cache_create_1h_unit_cost) > 0
+  return tier?.cache_create_1h_unit_cost != null
     ? CACHE_MODE_TIMED
     : CACHE_MODE_GENERIC
 }
@@ -67,15 +119,31 @@ export function normalizeVisualTier(
     input_unit_cost: Number(tier.input_unit_cost) || 0,
     output_unit_cost: Number(tier.output_unit_cost) || 0,
     cache_mode: getTierCacheMode(tier),
-    conditions: Array.isArray(tier.conditions) ? tier.conditions : [],
     ...tier,
-    cache_read_unit_cost: Number(tier.cache_read_unit_cost) || 0,
-    cache_create_unit_cost: Number(tier.cache_create_unit_cost) || 0,
-    cache_create_1h_unit_cost: Number(tier.cache_create_1h_unit_cost) || 0,
-    image_unit_cost: Number(tier.image_unit_cost) || 0,
-    image_output_unit_cost: Number(tier.image_output_unit_cost) || 0,
-    audio_input_unit_cost: Number(tier.audio_input_unit_cost) || 0,
-    audio_output_unit_cost: Number(tier.audio_output_unit_cost) || 0,
+    conditions: Array.isArray(tier.conditions)
+      ? tier.conditions.map((condition) => normalizeTierCondition(condition))
+      : [],
+    ...(Array.isArray(tier.conditionGroups)
+      ? {
+          conditionGroups: tier.conditionGroups
+            .filter((group) => Array.isArray(group.conditions))
+            .map((group) => ({
+              conditions: group.conditions.map((condition) =>
+                normalizeTierCondition(condition)
+              ),
+            })),
+        }
+      : {}),
+    // Presence is part of the billing contract: an omitted subcategory stays
+    // in p/c, while an explicit zero excludes it and prices it for free.
+    ...Object.fromEntries(
+      BILLING_CACHE_VAR_MAP.map(({ field }) => [
+        field,
+        tier[field] == null || tier[field] === ''
+          ? undefined
+          : Number(tier[field]),
+      ])
+    ),
   }
 }
 
@@ -109,10 +177,109 @@ function buildConditionStr(conditions: TierConditionInput[]): string {
   if (!conditions || conditions.length === 0) return ''
   return conditions
     .filter((c) => c.var && c.op && c.value != null && c.value !== '')
-    .map((c) => `${c.var} ${c.op} ${c.value}`)
+    .map((c) => {
+      const lhs = ['hour', 'minute', 'weekday', 'month', 'day'].includes(c.var)
+        ? `${c.var}("${String(c.timezone || 'Asia/Shanghai').replace(/"/g, '\\"')}")`
+        : c.var
+      return `${lhs} ${c.op} ${c.value}`
+    })
     .join(' && ')
 }
 
+function splitTopLevelLogical(source: string, operator: '&&' | '||'): string[] {
+  const parts: string[] = []
+  let start = 0
+  let depth = 0
+  let quote = ''
+  let escaped = false
+  for (let index = 0; index < source.length; index += 1) {
+    const char = source[index]
+    if (quote) {
+      if (escaped) escaped = false
+      else if (char === '\\') escaped = true
+      else if (char === quote) quote = ''
+      continue
+    }
+    if (char === '"' || char === "'") {
+      quote = char
+      continue
+    }
+    if (char === '(') depth += 1
+    else if (char === ')') depth = Math.max(0, depth - 1)
+    if (depth === 0 && source.startsWith(operator, index)) {
+      parts.push(source.slice(start, index).trim())
+      start = index + operator.length
+      index += operator.length - 1
+    }
+  }
+  parts.push(source.slice(start).trim())
+  return parts.filter(Boolean)
+}
+
+function unwrapConditionParens(source: string): string {
+  let value = source.trim()
+  while (value.startsWith('(') && value.endsWith(')')) {
+    let depth = 0
+    let quote = ''
+    let closesAtEnd = false
+    let escaped = false
+    for (let index = 0; index < value.length; index += 1) {
+      const char = value[index]
+      if (quote) {
+        if (escaped) escaped = false
+        else if (char === '\\') escaped = true
+        else if (char === quote) quote = ''
+        continue
+      }
+      if (char === '"' || char === "'") {
+        quote = char
+        continue
+      }
+      if (char === '(') depth += 1
+      else if (char === ')') depth -= 1
+      if (depth === 0) {
+        closesAtEnd = index === value.length - 1
+        break
+      }
+    }
+    if (!closesAtEnd) break
+    value = value.slice(1, -1).trim()
+  }
+  return value
+}
+
+function parseTierConditionGroups(conditionStr: string): TierConditionGroup[] {
+  if (!conditionStr || conditionStr.trim() === 'true') return []
+  const atomPattern =
+    /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("([^"\\]+)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
+  return splitTopLevelLogical(conditionStr, '||')
+    .map((groupStr) => unwrapConditionParens(groupStr))
+    .map((groupStr) => {
+      const conditions: TierConditionInput[] = []
+      for (const atom of splitTopLevelLogical(groupStr, '&&')) {
+        const match = atom.trim().match(atomPattern)
+        if (!match) continue
+        conditions.push({
+          var: (match[1] || match[2]) as TierConditionInput['var'],
+          op: match[4] as TierConditionInput['op'],
+          value: Number(match[5]),
+          ...(match[2] ? { timezone: match[3] } : {}),
+        })
+      }
+      return { conditions }
+    })
+    .filter((group) => group.conditions.length > 0)
+}
+
+function buildConditionExpr(tier: VisualTier): string {
+  const groups = getTierConditionGroups(tier)
+    .map((group) => buildConditionStr(group.conditions))
+    .filter(Boolean)
+  if (groups.length === 0) return ''
+  if (groups.length === 1) return groups[0]
+  return groups.map((group) => `(${group})`).join(' || ')
+}
+
 function buildTierBodyExpr(tier: VisualTier): string {
   const parts: string[] = []
   const ic = Number(tier.input_unit_cost) || 0
@@ -120,8 +287,10 @@ function buildTierBodyExpr(tier: VisualTier): string {
   parts.push(`p * ${ic}`)
   parts.push(`c * ${oc}`)
   for (const cv of BILLING_CACHE_VAR_MAP) {
-    const v = Number((tier as Record<string, unknown>)[cv.field]) || 0
-    if (v !== 0) parts.push(`${cv.exprVar} * ${v}`)
+    const value = tier[cv.field]
+    if (value != null && value !== '') {
+      parts.push(`${cv.exprVar} * ${Number(value)}`)
+    }
   }
   return parts.join(' + ')
 }
@@ -138,9 +307,9 @@ export function generateExprFromVisualConfig(
     const tier = tiers[0]
     const label = tier.label || 'default'
     const body = `tier("${label}", ${buildTierBodyExpr(tier)})`
-    const cond = buildConditionStr(tier.conditions)
+    const cond = buildConditionExpr(tier)
     if (cond) {
-      return `${cond} ? ${body} : p * 0 + c * 0`
+      return `${cond} ? ${body} : tier("${label}_fallback", ${buildTierBodyExpr(tier)})`
     }
     return body
   }
@@ -150,17 +319,80 @@ export function generateExprFromVisualConfig(
     const tier = tiers[i]
     const label = tier.label || `tier_${i + 1}`
     const body = `tier("${label}", ${buildTierBodyExpr(tier)})`
-    const cond = buildConditionStr(tier.conditions)
+    const cond = buildConditionExpr(tier)
 
-    if (i < tiers.length - 1 && cond) {
+    if (cond) {
       parts.push(`${cond} ? ${body}`)
     } else {
-      parts.push(body)
+      // An unconditional non-final tier is an intentional always-match
+      // branch, such as after removing its last condition.
+      parts.push(i < tiers.length - 1 ? `true ? ${body}` : body)
     }
   }
+  const last = tiers[tiers.length - 1]
+  if (buildConditionExpr(last)) {
+    parts.push(
+      `tier("${last.label || 'fallback'}_fallback", ${buildTierBodyExpr(last)})`
+    )
+  }
   return parts.join(' : ')
 }
 
+// Compare the visual subset without changing quoted labels or accepting
+// integer rounding/underflow as a harmless spelling difference.
+function canonicalizeExprForComparison(source: string): string {
+  let result = ''
+  let quote = ''
+  let escaped = false
+  let index = 0
+
+  while (index < source.length) {
+    const char = source[index]
+    if (quote) {
+      result += char
+      if (escaped) escaped = false
+      else if (char === '\\') escaped = true
+      else if (char === quote) quote = ''
+      index += 1
+      continue
+    }
+    if (char === '"' || char === "'") {
+      quote = char
+      result += char
+      index += 1
+      continue
+    }
+    if (/\s/.test(char)) {
+      index += 1
+      continue
+    }
+
+    const previous = source[index - 1]
+    const isNumberStart =
+      /[0-9.]/.test(char) &&
+      !/[A-Za-z0-9_.]/.test(previous || '') &&
+      (/[0-9]/.test(char) || /[0-9]/.test(source[index + 1] || ''))
+    if (isNumberStart) {
+      const match = source
+        .slice(index)
+        .match(/^(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/)
+      if (match) {
+        const numeric = Number(match[0])
+        const safeNumber =
+          Number.isFinite(numeric) &&
+          (!Number.isInteger(numeric) || Number.isSafeInteger(numeric)) &&
+          (numeric !== 0 || !/[1-9]/.test(match[0].split(/[eE]/)[0]))
+        result += safeNumber ? String(numeric) : match[0]
+        index += match[0].length
+        continue
+      }
+    }
+    result += char
+    index += 1
+  }
+  return result
+}
+
 export function tryParseVisualConfig(
   exprStr: string | null | undefined
 ): VisualConfig | null {
@@ -189,44 +421,64 @@ export function tryParseVisualConfig(
         const val = simple[4 + i]
         if (val != null) tier[cv.field] = Number(val)
       })
-      return normalizeVisualConfig({
+      const config = normalizeVisualConfig({
         tiers: [normalizeVisualTier(tier as Partial<VisualTier>)],
       })
+      // Like the multi-tier parser, refuse a lossy visual conversion.
+      return canonicalizeExprForComparison(
+        generateExprFromVisualConfig(config)
+      ) === canonicalizeExprForComparison(body)
+        ? config
+        : null
     }
 
-    const condGroup =
-      `((?:(?:p|c|len)\\s*(?:<|<=|>|>=)\\s*[\\d.eE+]+)` +
-      `(?:\\s*&&\\s*(?:p|c|len)\\s*(?:<|<=|>|>=)\\s*[\\d.eE+]+)*)`
-    const tierRe = new RegExp(
-      `(?:${condGroup}\\s*\\?\\s*)?tier\\("([^"]*)",\\s*${bodyPat}\\)`,
-      'g'
-    )
-    const tiers: VisualTier[] = []
-    let match: RegExpExecArray | null
-    while ((match = tierRe.exec(body)) !== null) {
-      const condStr = match[1] || ''
-      const conditions: TierConditionInput[] = []
-      if (condStr) {
-        for (const cp of condStr.split(/\s*&&\s*/)) {
-          const cm = cp.trim().match(/^(p|c|len)\s*(<|<=|>|>=)\s*([\d.eE+]+)$/)
-          if (cm) {
-            conditions.push({
-              var: cm[1] as TierConditionInput['var'],
-              op: cm[2] as TierConditionInput['op'],
-              value: Number(cm[3]),
-            })
-          }
+    const splitTopLevelColon = (source: string): string[] => {
+      const parts: string[] = []
+      let start = 0
+      let depth = 0
+      let quote = ''
+      let escaped = false
+      for (let index = 0; index < source.length; index += 1) {
+        const char = source[index]
+        if (quote) {
+          if (escaped) escaped = false
+          else if (char === '\\') escaped = true
+          else if (char === quote) quote = ''
+          continue
+        }
+        if (char === '"' || char === "'") {
+          quote = char
+          continue
+        }
+        if (char === '(') depth += 1
+        else if (char === ')') depth = Math.max(0, depth - 1)
+        else if (char === ':' && depth === 0) {
+          parts.push(source.slice(start, index).trim())
+          start = index + 1
         }
       }
+      parts.push(source.slice(start).trim())
+      return parts.filter(Boolean)
+    }
+    const tierRe = new RegExp(`^tier\\("([^"]*)",\\s*${bodyPat}\\)$`)
+    const tiers: VisualTier[] = []
+    for (const branch of splitTopLevelColon(body)) {
+      const parts = branch.match(/^(.*?)\s*\?\s*(tier\("[^"]*",[\s\S]+\))$/)
+      const condStr = parts?.[1]?.trim() || ''
+      const tierSource = parts?.[2] || branch
+      const match = tierRe.exec(tierSource)
+      if (!match) continue
+      const conditionGroups = parseTierConditionGroups(condStr)
+      const conditions = conditionGroups[0]?.conditions ?? []
       const tier: Record<string, unknown> = {
         conditions,
-        input_unit_cost: Number(match[3]),
-        output_unit_cost: Number(match[4]),
-        label: match[2],
+        ...(conditionGroups.length > 1 ? { conditionGroups } : {}),
+        input_unit_cost: Number(match[2]),
+        output_unit_cost: Number(match[3]),
+        label: match[1],
       }
-      const m = match
       BILLING_CACHE_VAR_MAP.forEach((cv, i) => {
-        const val = m[5 + i]
+        const val = match[4 + i]
         if (val != null) tier[cv.field] = Number(val)
       })
       tiers.push(normalizeVisualTier(tier as Partial<VisualTier>))
@@ -235,7 +487,10 @@ export function tryParseVisualConfig(
 
     const cfg = normalizeVisualConfig({ tiers })
     const regenerated = generateExprFromVisualConfig(cfg)
-    if (regenerated.replace(/\s+/g, '') !== body.replace(/\s+/g, '')) {
+    if (
+      canonicalizeExprForComparison(regenerated) !==
+      canonicalizeExprForComparison(body)
+    ) {
       return null
     }
     return cfg
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
index 350e2c9a..cfd6d639 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
@@ -18,18 +18,21 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 */
 import {
   memo,
+  type ChangeEvent,
   type ReactElement,
   useCallback,
   useEffect,
   useId,
   useMemo,
+  useRef,
   useState,
 } from 'react'
-import { FileJson } from 'lucide-react'
+import { Download, FileJson, Search, Upload } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 import { toast } from 'sonner'
 import { Alert, AlertDescription } from '@/components/ui/alert'
 import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
 import { Textarea } from '@/components/ui/textarea'
 import { CopyButton } from '@/components/copy-button'
 import { SettingsPageActionsPortal } from '../components/settings-page-context'
@@ -152,6 +155,16 @@ const MINIMAX_RATE_CARD_EXAMPLE = JSON.stringify(
   2
 )
 
+function downloadJson(filename: string, value: string) {
+  const blob = new Blob([value], { type: 'application/json;charset=utf-8' })
+  const url = URL.createObjectURL(blob)
+  const anchor = document.createElement('a')
+  anchor.href = url
+  anchor.download = filename
+  anchor.click()
+  setTimeout(() => URL.revokeObjectURL(url), 0)
+}
+
 type TaskRateCardSettingsProps = {
   defaultValue: string
 }
@@ -162,6 +175,7 @@ type VendorSummary = {
   modelCount: number
   rowCount: number
   models: string[]
+  modelRows: Record<string, number>
 }
 
 type BillingExampleSectionProps = {
@@ -292,11 +306,13 @@ function buildVendorSummary(value: string): VendorSummary[] {
       modelCount: 0,
       rowCount: 0,
       models: [],
+      modelRows: {},
     }
 
     group.modelCount += 1
     group.rowCount += rows
     group.models.push(model)
+    group.modelRows[model] = rows
     groups.set(vendor, group)
   }
 
@@ -311,7 +327,36 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
   const currentRateCardHeadingId = useId()
   const [text, setText] = useState('')
   const [error, setError] = useState('')
+  const [search, setSearch] = useState('')
+  const [vendorFilter, setVendorFilter] = useState('all')
+  const fileInputRef = useRef<HTMLInputElement>(null)
+  const initialText = useMemo(
+    () => formatJsonForTextarea(defaultValue || '{}'),
+    [defaultValue]
+  )
   const vendorSummary = useMemo(() => buildVendorSummary(text), [text])
+  const filteredVendorSummary = useMemo(() => {
+    const query = search.trim().toLowerCase()
+    return vendorSummary
+      .filter((vendor) => vendorFilter === 'all' || vendor.key === vendorFilter)
+      .map((vendor) => {
+        if (!query) return vendor
+        return {
+          ...vendor,
+          modelCount: vendor.models.filter((model) =>
+            model.toLowerCase().includes(query)
+          ).length,
+          rowCount: vendor.models
+            .filter((model) => model.toLowerCase().includes(query))
+            .reduce((sum, model) => sum + (vendor.modelRows[model] ?? 0), 0),
+          models: vendor.models.filter((model) =>
+            model.toLowerCase().includes(query)
+          ),
+        }
+      })
+      .filter((vendor) => !query || vendor.models.length > 0)
+  }, [search, vendorFilter, vendorSummary])
+  const isDirty = text !== initialText
 
   useEffect(() => {
     setText(formatJsonForTextarea(defaultValue || '{}'))
@@ -352,6 +397,30 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
     handleUseExample(MINIMAX_RATE_CARD_EXAMPLE)
   }, [handleUseExample])
 
+  const handleImport = useCallback(
+    async (event: ChangeEvent<HTMLInputElement>) => {
+      const file = event.target.files?.[0]
+      event.target.value = ''
+      if (!file) return
+
+      try {
+        const imported = formatJsonForTextarea(await file.text())
+        const parsed = JSON.parse(imported || '{}') as unknown
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+          throw new Error(t('JSON must be an object'))
+        }
+        setText(imported || '{}')
+        setError('')
+        toast.success(t('JSON imported. Review prices before saving.'))
+      } catch (err) {
+        const message = err instanceof Error ? err.message : t('Invalid JSON')
+        setError(message)
+        toast.error(message)
+      }
+    },
+    [t]
+  )
+
   const handleSave = useCallback(async () => {
     if (error) {
       toast.error(error)
@@ -406,9 +475,47 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
               </span>
             ))}
         </div>
-        {vendorSummary.length > 0 ? (
-          <div className='grid gap-3 md:grid-cols-2 xl:grid-cols-4'>
+        <div className='flex flex-wrap items-center gap-2'>
+          <div className='relative min-w-56 flex-1 sm:max-w-sm'>
+            <Search className='text-muted-foreground pointer-events-none absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2' />
+            <Input
+              value={search}
+              onChange={(event) => setSearch(event.target.value)}
+              placeholder={t('Search model name...')}
+              aria-label={t('Search model name...')}
+              className='pl-9'
+            />
+          </div>
+          <div className='flex flex-wrap gap-1'>
+            <Button
+              type='button'
+              size='sm'
+              variant={vendorFilter === 'all' ? 'secondary' : 'ghost'}
+              onClick={() => setVendorFilter('all')}
+            >
+              {t('All')}
+            </Button>
             {vendorSummary.map((vendor) => (
+              <Button
+                key={vendor.key}
+                type='button'
+                size='sm'
+                variant={vendorFilter === vendor.key ? 'secondary' : 'ghost'}
+                onClick={() => setVendorFilter(vendor.key)}
+              >
+                {t(vendor.label)}
+              </Button>
+            ))}
+          </div>
+          {isDirty && (
+            <span className='text-muted-foreground text-xs'>
+              {t('Unsaved changes')}
+            </span>
+          )}
+        </div>
+        {filteredVendorSummary.length > 0 ? (
+          <div className='grid gap-3 md:grid-cols-2 xl:grid-cols-4'>
+            {filteredVendorSummary.map((vendor) => (
               <div
                 key={vendor.key}
                 className='bg-background rounded-md border p-3'
@@ -451,7 +558,9 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
           </div>
         ) : (
           <div className='text-muted-foreground rounded-md border border-dashed p-3 text-sm'>
-            {t('No task rate cards configured yet.')}
+            {vendorSummary.length > 0
+              ? t('No matching task rate cards.')
+              : t('No task rate cards configured yet.')}
           </div>
         )}
       </section>
@@ -473,9 +582,39 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
       />
 
       <section className='space-y-2'>
-        <h3 id={currentRateCardHeadingId} className='text-sm font-medium'>
-          {t('Current rate card JSON')}
-        </h3>
+        <div className='flex flex-wrap items-center justify-between gap-2'>
+          <h3 id={currentRateCardHeadingId} className='text-sm font-medium'>
+            {t('Current rate card JSON')}
+          </h3>
+          <div className='flex flex-wrap items-center gap-2'>
+            <Button
+              type='button'
+              variant='outline'
+              size='sm'
+              onClick={() => downloadJson('task-rate-cards.json', text || '{}')}
+              disabled={Boolean(error)}
+            >
+              <Download className='mr-2 h-4 w-4' />
+              {t('Download')}
+            </Button>
+            <Button
+              type='button'
+              variant='outline'
+              size='sm'
+              onClick={() => fileInputRef.current?.click()}
+            >
+              <Upload className='mr-2 h-4 w-4' />
+              {t('Upload file')}
+            </Button>
+            <input
+              ref={fileInputRef}
+              type='file'
+              accept='application/json,.json'
+              className='hidden'
+              onChange={handleImport}
+            />
+          </div>
+        </div>
         <Textarea
           aria-labelledby={currentRateCardHeadingId}
           rows={18}
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 668dcee3..797f96b4 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -16,13 +16,28 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API/issues
 */
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import {
+  type ChangeEvent,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
 import { useMutation, useQueryClient } from '@tanstack/react-query'
-import { Braces, Check, WandSparkles } from 'lucide-react'
+import {
+  Braces,
+  Check,
+  Download,
+  Search,
+  Upload,
+  WandSparkles,
+} from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 import { toast } from 'sonner'
 import { Alert, AlertDescription } from '@/components/ui/alert'
 import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
 import { Textarea } from '@/components/ui/textarea'
 import { updateTieredBillingConfig } from '../api'
 import { SettingsForm } from '../components/settings-form-layout'
@@ -108,11 +123,23 @@ function validateUnifiedConfig(value: string) {
   return normalized
 }
 
+function downloadJson(filename: string, value: string) {
+  const blob = new Blob([value], { type: 'application/json;charset=utf-8' })
+  const url = URL.createObjectURL(blob)
+  const anchor = document.createElement('a')
+  anchor.href = url
+  anchor.download = filename
+  anchor.click()
+  setTimeout(() => URL.revokeObjectURL(url), 0)
+}
+
 export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   const { t } = useTranslation()
   const queryClient = useQueryClient()
   const [text, setText] = useState('')
   const [error, setError] = useState('')
+  const [search, setSearch] = useState('')
+  const fileInputRef = useRef<HTMLInputElement>(null)
 
   const initialText = useMemo(() => {
     return JSON.stringify(
@@ -123,6 +150,8 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   }, [props.billingExpr, props.billingMode])
 
   useEffect(() => {
+    // The editor must reset when the server-provided model selection changes.
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     setText(initialText)
     setError('')
   }, [initialText])
@@ -141,6 +170,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
       toast.error(err.message || t('Failed to save tiered billing config'))
     },
   })
+  const { mutateAsync } = mutation
 
   const handleFormat = useCallback(() => {
     try {
@@ -168,8 +198,8 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
       return
     }
 
-    await mutation.mutateAsync({ config })
-  }, [mutation, t, text])
+    await mutateAsync({ config })
+  }, [mutateAsync, t, text])
 
   const enabledCount = useMemo(() => {
     try {
@@ -180,6 +210,44 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
     }
   }, [text])
 
+  const configuredModels = useMemo(() => {
+    try {
+      return Object.keys(validateUnifiedConfig(text || '{}'))
+    } catch {
+      return []
+    }
+  }, [text])
+
+  const filteredModels = useMemo(() => {
+    const query = search.trim().toLowerCase()
+    if (!query) return configuredModels
+    return configuredModels.filter((model) =>
+      model.toLowerCase().includes(query)
+    )
+  }, [configuredModels, search])
+
+  const isDirty = text !== initialText
+
+  const handleImport = useCallback(
+    async (event: ChangeEvent<HTMLInputElement>) => {
+      const file = event.target.files?.[0]
+      event.target.value = ''
+      if (!file) return
+
+      try {
+        const imported = formatJsonForTextarea(await file.text())
+        validateUnifiedConfig(imported || '{}')
+        setText(imported || '{}')
+        setError('')
+      } catch (err) {
+        const message = err instanceof Error ? err.message : t('Invalid JSON')
+        setError(message)
+        toast.error(message)
+      }
+    },
+    [t]
+  )
+
   return (
     <SettingsForm>
       <SettingsPageActionsPortal>
@@ -200,11 +268,37 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
         >
           {mutation.isPending ? t('Saving...') : t('Save tiered billing')}
         </Button>
+        <Button
+          type='button'
+          variant='outline'
+          size='sm'
+          onClick={() => downloadJson('tiered-billing.json', text || '{}')}
+          disabled={Boolean(error)}
+        >
+          <Download className='mr-2 h-4 w-4' />
+          {t('Download')}
+        </Button>
+        <Button
+          type='button'
+          variant='outline'
+          size='sm'
+          onClick={() => fileInputRef.current?.click()}
+        >
+          <Upload className='mr-2 h-4 w-4' />
+          {t('Upload file')}
+        </Button>
+        <input
+          ref={fileInputRef}
+          type='file'
+          accept='application/json,.json'
+          className='hidden'
+          onChange={handleImport}
+        />
       </SettingsPageActionsPortal>
 
       <div className='space-y-4'>
         <div className='flex flex-wrap items-start justify-between gap-3'>
-          <div className='space-y-1'>
+          <div className='min-w-0 space-y-1'>
             <h3 className='text-base font-medium'>
               {t('Tiered billing JSON')}
             </h3>
@@ -220,6 +314,24 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
           </Button>
         </div>
 
+        <div className='flex flex-wrap items-center gap-2'>
+          <div className='relative min-w-56 flex-1 sm:max-w-sm'>
+            <Search className='text-muted-foreground pointer-events-none absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2' />
+            <Input
+              value={search}
+              onChange={(event) => setSearch(event.target.value)}
+              placeholder={t('Search model name...')}
+              aria-label={t('Search model name...')}
+              className='pl-9'
+            />
+          </div>
+          {isDirty && (
+            <span className='text-muted-foreground text-xs'>
+              {t('Unsaved changes')}
+            </span>
+          )}
+        </div>
+
         <Alert>
           <Check className='h-4 w-4' />
           <AlertDescription>
@@ -235,6 +347,19 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
           </Alert>
         )}
 
+        {search.trim() && filteredModels.length > 0 && (
+          <div className='flex flex-wrap gap-1.5' aria-label={t('Search')}>
+            {filteredModels.map((model) => (
+              <span
+                key={model}
+                className='bg-muted text-muted-foreground rounded-md px-2 py-1 font-mono text-xs'
+              >
+                {model}
+              </span>
+            ))}
+          </div>
+        )}
+
         <Textarea
           value={text}
           onChange={(event) => {
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
index 424d9adb..b7180a7b 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
@@ -16,20 +16,24 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API/issues
 */
-import { act } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { fireEvent, within } from '@testing-library/react'
+import { act, useState } from 'react'
+import type { Root } from 'react-dom/client'
 import { createInstance } from 'i18next'
 import { JSDOM } from 'jsdom'
 import assert from 'node:assert/strict'
 import { after, before, describe, test } from 'node:test'
 import { I18nextProvider } from 'react-i18next'
-import {
-  ModelPricingEditorPanel,
-  type ModelRatioData,
-} from './model-pricing-sheet'
-import { ModelRatioVisualEditor } from './model-ratio-visual-editor'
-import { TieredPricingEditor } from './tiered-pricing-editor'
+import { BILLING_EXTRA_VARS } from '@/features/pricing/lib/billing-expr'
+import type { ModelRatioData } from './model-pricing-sheet'
+
+// Load DOM-dependent modules after installing JSDOM so Base UI selects use
+// their browser lifecycle, including option registration and keyboard input.
+let createRoot: typeof import('react-dom/client').createRoot
+let fireEvent: typeof import('@testing-library/react').fireEvent
+let within: typeof import('@testing-library/react').within
+let ModelPricingEditorPanel: typeof import('./model-pricing-sheet').ModelPricingEditorPanel
+let ModelRatioVisualEditor: typeof import('./model-ratio-visual-editor').ModelRatioVisualEditor
+let TieredPricingEditor: typeof import('./tiered-pricing-editor').TieredPricingEditor
 
 const dom = new JSDOM('<!doctype html><html><body></body></html>', {
   url: 'http://localhost/',
@@ -122,6 +126,244 @@ const modelB: ModelRatioData = {
   requestRuleExpr: '',
 }
 
+describe('optional zero prices in the actual editor', () => {
+  for (const source of [
+    'tier("base", p * 3.0 + c * 15.0 + cr * 0.0)',
+    'tier("base", p * 3e0 + c * 1.5e1 + cr * 0e0)',
+    'tier("custom", max(p, 1) * 3 + c * 15)',
+  ]) {
+    test(`preserves prices on mount and mode changes: ${source}`, async () => {
+      const container = createContainer()
+      const root = createRoot(container)
+      const supported = !source.includes('max(')
+      const expected = supported
+        ? 'tier("base", p * 3 + c * 15 + cr * 0)'
+        : source
+      let saved = source
+      function ControlledEditor() {
+        const [expression, setExpression] = useState(source)
+        return (
+          <TieredPricingEditor
+            billingExpr={expression}
+            requestRuleExpr=''
+            onBillingExprChange={(next) => {
+              saved = next
+              setExpression(next)
+            }}
+            onRequestRuleExprChange={() => undefined}
+          />
+        )
+      }
+      const selectMode = async (name: string) => {
+        await act(async () => {
+          fireEvent.keyDown(within(container).getAllByRole('combobox')[0], {
+            key: 'ArrowDown',
+          })
+        })
+        const option = await within(dom.window.document.body).findByRole(
+          'option',
+          { name }
+        )
+        await act(async () => {
+          fireEvent.pointerDown(option, { pointerType: 'mouse' })
+          fireEvent.click(option)
+        })
+      }
+      try {
+        await act(async () =>
+          root.render(
+            <I18nextProvider i18n={i18n}>
+              <ControlledEditor />
+            </I18nextProvider>
+          )
+        )
+        assert.equal(saved, expected)
+        if (supported) await selectMode('Expression editor')
+        await selectMode('Visual editor')
+        assert.equal(saved, expected)
+        if (supported) {
+          assert.equal(getInputValueByLabel(container, 'Input price'), '3')
+          assert.equal(getInputValueByLabel(container, 'Output price'), '15')
+          assert.equal(getInputValueByLabel(container, 'Cache read price'), '0')
+        } else {
+          assert.equal(
+            (
+              within(container).getByPlaceholderText(
+                'tier("base", p * 3 + c * 15)'
+              ) as HTMLTextAreaElement
+            ).value,
+            source
+          )
+        }
+      } finally {
+        await unmount(root, container)
+      }
+    })
+  }
+
+  test('keeps zero prices when switching between visual and expression modes', async () => {
+    const container = createContainer()
+    const root = createRoot(container)
+    const source =
+      'tier("base", p * 3 + c * 15 + cr * 0 + cc1h * 0 + img_o * 0)'
+    const changes: string[] = []
+    try {
+      await act(async () => {
+        root.render(
+          <I18nextProvider i18n={i18n}>
+            <TieredPricingEditor
+              billingExpr={source}
+              requestRuleExpr=''
+              onBillingExprChange={(next) => changes.push(next)}
+              onRequestRuleExprChange={() => undefined}
+            />
+          </I18nextProvider>
+        )
+      })
+      const editor = within(container)
+      const page = within(dom.window.document.body)
+      await act(async () => {
+        fireEvent.keyDown(editor.getAllByRole('combobox')[0], {
+          key: 'ArrowDown',
+        })
+      })
+      await act(async () => {
+        const option = await page.findByRole('option', {
+          name: 'Expression editor',
+        })
+        fireEvent.pointerDown(option, { pointerType: 'mouse' })
+        fireEvent.click(option)
+      })
+      const expression = editor.getByPlaceholderText(
+        'tier("base", p * 3 + c * 15)'
+      ) as HTMLTextAreaElement
+      assert.equal(expression.value, source)
+      await act(async () => {
+        fireEvent.keyDown(editor.getAllByRole('combobox')[0], {
+          key: 'ArrowDown',
+        })
+      })
+      await act(async () => {
+        const option = await page.findByRole('option', {
+          name: 'Visual editor',
+        })
+        fireEvent.pointerDown(option, { pointerType: 'mouse' })
+        fireEvent.click(option)
+      })
+      assert.equal(getInputValueByLabel(container, 'Cache read price'), '0')
+      assert.equal(
+        getInputValueByLabel(container, 'Cache create (1h) price'),
+        '0'
+      )
+      assert.equal(getInputValueByLabel(container, 'Image output price'), '0')
+      assert.ok(changes.every((value) => value === source))
+    } finally {
+      await unmount(root, container)
+    }
+  })
+
+  for (const variable of BILLING_EXTRA_VARS) {
+    test(`keeps ${variable.key}=0 on mount, unrelated edit and remount`, async () => {
+      const container = createContainer()
+      const root = createRoot(container)
+      let saved = `tier("base", p * 3 + c * 15 + ${variable.key} * 0)`
+      const renderEditor = (key: string) => (
+        <I18nextProvider i18n={i18n}>
+          <TieredPricingEditor
+            key={key}
+            billingExpr={saved}
+            requestRuleExpr=''
+            onBillingExprChange={(next) => {
+              saved = next
+            }}
+            onRequestRuleExprChange={() => undefined}
+          />
+        </I18nextProvider>
+      )
+      try {
+        await act(async () => root.render(renderEditor('first')))
+        assert.ok(saved.includes(`${variable.key} * 0`))
+        assert.equal(getInputValueByLabel(container, variable.label), '0')
+        const input = within(container).getByLabelText(
+          'Input price'
+        ) as HTMLInputElement
+        await act(async () => {
+          fireEvent.blur(input, { target: { value: '4' } })
+        })
+        assert.ok(saved.includes('p * 4'))
+        assert.ok(saved.includes(`${variable.key} * 0`))
+        await act(async () => root.render(renderEditor('remount')))
+        assert.equal(getInputValueByLabel(container, variable.label), '0')
+        assert.ok(saved.includes(`${variable.key} * 0`))
+      } finally {
+        await unmount(root, container)
+      }
+    })
+  }
+
+  test('distinguishes blank, zero and positive prices and preserves them when adding a tier', async () => {
+    const container = createContainer()
+    const root = createRoot(container)
+    let saved = 'tier("base", p * 3 + c * 15)'
+    function ControlledEditor() {
+      const [expression, setExpression] = useState(saved)
+      return (
+        <TieredPricingEditor
+          billingExpr={expression}
+          requestRuleExpr=''
+          onBillingExprChange={(next) => {
+            saved = next
+            setExpression(next)
+          }}
+          onRequestRuleExprChange={() => undefined}
+        />
+      )
+    }
+    try {
+      await act(async () =>
+        root.render(
+          <I18nextProvider i18n={i18n}>
+            <ControlledEditor />
+          </I18nextProvider>
+        )
+      )
+      const editor = within(container)
+      const cache = editor.getByLabelText(
+        'Cache read price'
+      ) as HTMLInputElement
+      assert.equal(cache.value, '')
+      await act(async () => {
+        fireEvent.blur(cache, { target: { value: '0' } })
+      })
+      assert.ok(saved.includes('cr * 0'))
+      await act(async () => {
+        fireEvent.blur(cache, { target: { value: '0.25' } })
+      })
+      assert.ok(saved.includes('cr * 0.25'))
+      await act(async () => {
+        fireEvent.blur(cache, { target: { value: '' } })
+      })
+      assert.equal(cache.value, '')
+      assert.ok(!saved.includes('cr *'))
+      await act(async () => {
+        fireEvent.blur(cache, { target: { value: '0' } })
+      })
+      await act(async () => {
+        fireEvent.click(editor.getByRole('button', { name: 'Add tier' }))
+      })
+      assert.equal((saved.match(/cr \* 0/g) || []).length, 2)
+      for (const name of ['cc', 'cc1h', 'img', 'img_o', 'ai', 'ao']) {
+        assert.ok(
+          !saved.includes(`${name} *`),
+          `unexpected default price ${name}`
+        )
+      }
+    } finally {
+      await unmount(root, container)
+    }
+  })
+})
+
 before(async () => {
   await i18n.init({
     lng: 'en',
@@ -163,6 +405,11 @@ before(async () => {
   setGlobal('ResizeObserver', ResizeObserverStub)
   setGlobal('localStorage', window.localStorage)
   setGlobal('IS_REACT_ACT_ENVIRONMENT', true)
+  ;({ createRoot } = await import('react-dom/client'))
+  ;({ fireEvent, within } = await import('@testing-library/react/pure'))
+  ;({ ModelPricingEditorPanel } = await import('./model-pricing-sheet'))
+  ;({ ModelRatioVisualEditor } = await import('./model-ratio-visual-editor'))
+  ;({ TieredPricingEditor } = await import('./tiered-pricing-editor'))
 })
 
 after(() => {
@@ -196,6 +443,119 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
+  test('allows adding a condition to the initial tier and exposes time fields', async () => {
+    const container = createContainer()
+    const root = createRoot(container)
+    try {
+      await act(async () => {
+        root.render(
+          <I18nextProvider i18n={i18n}>
+            <TieredPricingEditor
+              modelName='new-model'
+              billingExpr='tier("base", p * 1 + c * 2)'
+              requestRuleExpr=''
+              onBillingExprChange={() => undefined}
+              onRequestRuleExprChange={() => undefined}
+            />
+          </I18nextProvider>
+        )
+      })
+      const editor = within(container)
+      const addCondition = editor.getAllByRole('button', {
+        name: 'Add condition',
+      })[0]
+      assert.equal((addCondition as HTMLButtonElement).disabled, false)
+      fireEvent.click(addCondition)
+      assert.ok(editor.getByLabelText('Condition Value'))
+      assert.match(container.textContent || '', /Full input length/)
+
+      assert.ok(editor.getAllByRole('button', { name: 'Add condition' }).length)
+    } finally {
+      await unmount(root, container)
+    }
+  })
+
+  test('allows adding more than two conditions and condition groups', async () => {
+    const container = createContainer()
+    const root = createRoot(container)
+    try {
+      await act(async () => {
+        root.render(
+          <I18nextProvider i18n={i18n}>
+            <TieredPricingEditor
+              modelName='conditions-model'
+              billingExpr='tier("base", p * 1 + c * 2)'
+              requestRuleExpr=''
+              onBillingExprChange={() => undefined}
+              onRequestRuleExprChange={() => undefined}
+            />
+          </I18nextProvider>
+        )
+      })
+      const editor = within(container)
+      const addCondition = editor.getAllByRole('button', {
+        name: 'Add condition',
+      })[0]
+      fireEvent.click(addCondition)
+      fireEvent.click(addCondition)
+      fireEvent.click(addCondition)
+      assert.equal(editor.getAllByLabelText('Condition Value').length, 3)
+
+      fireEvent.click(
+        editor.getByRole('button', { name: 'Add condition group' })
+      )
+      assert.equal(editor.getAllByText(/Condition group/).length, 2)
+      fireEvent.click(
+        editor.getAllByRole('button', { name: 'Remove condition group' })[1]
+      )
+      assert.equal(editor.getAllByText(/Condition group/).length, 1)
+    } finally {
+      await unmount(root, container)
+    }
+  })
+
+  test('removes a condition from a non-fallback tier', async () => {
+    const container = createContainer()
+    const root = createRoot(container)
+    const billingChanges: string[] = []
+    try {
+      await act(async () => {
+        root.render(
+          <I18nextProvider i18n={i18n}>
+            <TieredPricingEditor
+              modelName='multi-tier-model'
+              billingExpr={
+                'len < 200000 ? tier("short", p * 1 + c * 2) : tier("long", p * 3 + c * 4)'
+              }
+              requestRuleExpr=''
+              onBillingExprChange={(next) => billingChanges.push(next)}
+              onRequestRuleExprChange={() => undefined}
+            />
+          </I18nextProvider>
+        )
+      })
+
+      const editor = within(container)
+      const removeButtons = editor.getAllByRole('button', {
+        name: 'Remove condition',
+      })
+      assert.equal(removeButtons.length, 1)
+      fireEvent.click(removeButtons[0])
+      assert.equal(
+        editor.queryByRole('button', { name: 'Remove condition' }),
+        null
+      )
+      await act(async () => undefined)
+      assert.ok(
+        billingChanges.some((expr) =>
+          expr.startsWith('true ? tier("short", p * 1 + c * 2)')
+        )
+      )
+    } finally {
+      await unmount(root, container)
+    }
+  })
+
   test('removes a newly added fallback tier', async () => {
     const container = createContainer()
     const root = createRoot(container)
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.tsx
index f55adc89..a8efb0ac 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.tsx
@@ -18,6 +18,7 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 */
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { toast } from 'sonner'
 import { Label } from '@/components/ui/label'
 import {
   Select,
@@ -189,8 +190,18 @@ const TieredPricingEditorContent = memo(function TieredPricingEditorContent({
       if (next === 'visual') {
         const { billingExpr, requestRuleExpr: ruleStr } =
           splitRawExprWithFallback(rawExpr, rawExprFallback)
-        setRawExprFallback(null)
         const parsed = tryParseVisualConfig(billingExpr)
+        // An unsupported expression must stay intact in raw mode. Only a
+        // genuinely empty draft may start with the default zero-price tier.
+        if (!parsed && billingExpr.trim()) {
+          toast.error(
+            t(
+              'This expression is too complex for the visual editor. Please switch to expression mode to edit.'
+            )
+          )
+          return
+        }
+        setRawExprFallback(null)
         if (parsed) {
           setVisualConfig(parsed)
         } else {
@@ -231,6 +242,7 @@ const TieredPricingEditorContent = memo(function TieredPricingEditorContent({
       requestRulesCompatible,
       currentRequestRuleExpr,
       onRequestRuleExprChange,
+      t,
     ]
   )
 
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-fields.tsx b/web/default/src/features/system-settings/models/tiered-pricing-fields.tsx
index ba5da8a5..290ecce4 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-fields.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-fields.tsx
@@ -49,12 +49,14 @@ type DraftNumberInputProps = Omit<
 > & {
   value: number | string
   onValueChange: (next: number) => void
+  onEmpty?: () => void
   selectZeroOnFocus?: boolean
 }
 
 export function DraftNumberInput({
   value,
   onValueChange,
+  onEmpty,
   selectZeroOnFocus = true,
   onBlur,
   onFocus,
@@ -75,7 +77,8 @@ export function DraftNumberInput({
   const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
     const nextDraft = event.target.value
     setDraft(nextDraft)
-    onValueChange(parseNumberDraft(nextDraft))
+    if (nextDraft.trim() === '' && onEmpty) onEmpty()
+    else onValueChange(parseNumberDraft(nextDraft))
   }
 
   const handleFocus = (event: FocusEvent<HTMLInputElement>) => {
@@ -95,6 +98,13 @@ export function DraftNumberInput({
   }
 
   const handleBlur = (event: FocusEvent<HTMLInputElement>) => {
+    if (event.currentTarget.value.trim() === '' && onEmpty) {
+      setFocused(false)
+      setDraft('')
+      onEmpty()
+      onBlur?.(event)
+      return
+    }
     const normalized = parseNumberDraft(event.currentTarget.value)
     setFocused(false)
     setDraft(String(normalized))
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
index 43be2988..b9600b89 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
@@ -40,10 +40,13 @@ import {
   CACHE_MODE_GENERIC,
   CACHE_MODE_TIMED,
   type CacheMode,
+  type TierConditionGroup,
   type TierConditionInput,
   type VisualConfig,
   type VisualTier,
   getTierCacheMode,
+  getTierConditionGroups,
+  getTierConditionBounds,
   normalizeVisualConfig,
   normalizeVisualTier,
 } from '@/features/pricing/lib/tier-expr'
@@ -69,6 +72,11 @@ const CONDITION_INPUT_OPTIONS: {
   { value: 'len', labelKey: 'Full input length' },
   { value: 'p', labelKey: 'Billable input tokens' },
   { value: 'c', labelKey: 'Billable output tokens' },
+  { value: 'hour', labelKey: 'Hour' },
+  { value: 'minute', labelKey: 'Minute' },
+  { value: 'weekday', labelKey: 'Weekday' },
+  { value: 'month', labelKey: 'Month' },
+  { value: 'day', labelKey: 'Day' },
 ]
 const OPS: TierConditionInput['op'][] = ['<', '<=', '>', '>=']
 
@@ -93,9 +101,38 @@ function ConditionRow({
   const currentInputOption = CONDITION_INPUT_OPTIONS.find(
     (option) => option.value === condition.var
   )
+  const isTimeCondition = [
+    'hour',
+    'minute',
+    'weekday',
+    'month',
+    'day',
+  ].includes(condition.var)
+  const timeBounds = getTierConditionBounds(condition.var)
+  const handleVariableChange = (value: string | null) => {
+    if (!value) return
+    const nextVar = value as TierConditionInput['var']
+    const bounds = getTierConditionBounds(nextVar)
+    const numericValue = Number(condition.value)
+    const nextValue = bounds
+      ? Number.isFinite(numericValue) &&
+        numericValue >= bounds.min &&
+        numericValue <= bounds.max
+        ? numericValue
+        : bounds.defaultValue
+      : Number.isFinite(numericValue)
+        ? numericValue
+        : 0
+    onChange({
+      ...condition,
+      var: nextVar,
+      value: nextValue,
+      ...(bounds ? { timezone: condition.timezone || 'Asia/Shanghai' } : {}),
+    })
+  }
 
   return (
-    <div className='flex items-center gap-2'>
+    <div className='flex flex-wrap items-center gap-2'>
       <Select
         items={[
           ...CONDITION_INPUT_OPTIONS.map((option) => ({
@@ -104,9 +141,7 @@ function ConditionRow({
           })),
         ]}
         value={condition.var}
-        onValueChange={(value) =>
-          onChange({ ...condition, var: value as TierConditionInput['var'] })
-        }
+        onValueChange={handleVariableChange}
       >
         <SelectTrigger className='w-32' size='sm'>
           <SelectValue>
@@ -125,6 +160,17 @@ function ConditionRow({
           </SelectGroup>
         </SelectContent>
       </Select>
+      {isTimeCondition && (
+        <Input
+          value={condition.timezone || 'Asia/Shanghai'}
+          onChange={(event) =>
+            onChange({ ...condition, timezone: event.target.value })
+          }
+          aria-label={t('Timezone')}
+          placeholder='Asia/Shanghai'
+          className='w-40'
+        />
+      )}
       <Select
         items={[...OPS.map((op) => ({ value: op, label: op }))]}
         value={condition.op}
@@ -146,15 +192,28 @@ function ConditionRow({
         </SelectContent>
       </Select>
       <DraftNumberInput
-        min={0}
+        min={timeBounds?.min ?? 0}
+        max={timeBounds?.max}
+        step={timeBounds ? 1 : undefined}
         value={condition.value}
-        onValueChange={(value) => onChange({ ...condition, value })}
+        onValueChange={(value) =>
+          onChange({
+            ...condition,
+            value: timeBounds
+              ? Math.min(timeBounds.max, Math.max(timeBounds.min, value))
+              : value,
+          })
+        }
         aria-label={t('Condition Value')}
-        placeholder={t('tokens')}
+        placeholder={
+          timeBounds ? `${timeBounds.min}-${timeBounds.max}` : t('tokens')
+        }
         className='w-32'
       />
       <span className='text-muted-foreground text-xs'>
-        {formatTokenHint(condition.value, t)}
+        {timeBounds
+          ? `${timeBounds.min}–${timeBounds.max}`
+          : formatTokenHint(condition.value, t)}
       </span>
       <Button
         type='button'
@@ -162,8 +221,8 @@ function ConditionRow({
         size='icon'
         onClick={onRemove}
         disabled={removeDisabled}
-        aria-label={t('Remove')}
-        className='ml-auto'
+        aria-label={t('Remove condition')}
+        className='ml-auto shrink-0'
       >
         <Trash2 className='text-destructive h-4 w-4' />
       </Button>
@@ -178,11 +237,18 @@ function ConditionRow({
 type PriceFieldProps = {
   label: string
   hint?: string
-  value: number
+  value: number | undefined
   onChange: (next: number) => void
+  onClear?: () => void
 }
 
-function PriceField({ label, hint, value, onChange }: PriceFieldProps) {
+function PriceField({
+  label,
+  hint,
+  value,
+  onChange,
+  onClear,
+}: PriceFieldProps) {
   const inputId = useId()
   return (
     <div className='w-36 space-y-0.5'>
@@ -193,8 +259,9 @@ function PriceField({ label, hint, value, onChange }: PriceFieldProps) {
         id={inputId}
         min={0}
         step={0.000001}
-        value={Number.isFinite(value) ? value : 0}
+        value={value ?? ''}
         onValueChange={onChange}
+        onEmpty={onClear}
         className='h-8 w-full'
       />
       {hint && <p className='text-muted-foreground text-xs'>{hint}</p>}
@@ -212,7 +279,8 @@ type VisualTierCardProps = {
   total: number
   onChange: (next: VisualTier) => void
   onRemove: () => void
-  onAddCondition: () => void
+  onAddCondition: (groupIndex: number) => void
+  onAddConditionGroup: () => void
 }
 
 function VisualTierCard({
@@ -222,29 +290,53 @@ function VisualTierCard({
   onChange,
   onRemove,
   onAddCondition,
+  onAddConditionGroup,
 }: VisualTierCardProps) {
   const { t } = useTranslation()
   const cacheMode = getTierCacheMode(tier)
-  const isFallbackTier = index === total - 1
-
+  const conditionGroups = getTierConditionGroups(tier)
+  const updateConditionGroups = (groups: TierConditionGroup[]) => {
+    onChange({
+      ...tier,
+      conditions: groups[0]?.conditions ?? [],
+      conditionGroups: groups,
+    })
+  }
   const handleConditionChange = (
+    groupIndex: number,
     conditionIndex: number,
     next: TierConditionInput
   ) => {
-    const conditions = [...tier.conditions]
-    conditions[conditionIndex] = next
-    onChange({ ...tier, conditions })
+    const groups = conditionGroups.map((group) => ({
+      conditions: [...group.conditions],
+    }))
+    groups[groupIndex].conditions[conditionIndex] = next
+    updateConditionGroups(groups)
   }
 
-  const handleConditionRemove = (conditionIndex: number) => {
-    if (!isFallbackTier && tier.conditions.length <= 1) return
-    onChange({
-      ...tier,
-      conditions: tier.conditions.filter((_, i) => i !== conditionIndex),
-    })
+  const handleConditionRemove = (
+    groupIndex: number,
+    conditionIndex: number
+  ) => {
+    const groups = conditionGroups.map((group) => ({
+      conditions: [...group.conditions],
+    }))
+    const target = groups[groupIndex]
+    if (!target) return
+    target.conditions = target.conditions.filter((_, i) => i !== conditionIndex)
+    updateConditionGroups(groups.filter((group) => group.conditions.length > 0))
   }
 
-  const handlePriceChange = (field: keyof VisualTier, value: number) => {
+  const handleConditionGroupRemove = (groupIndex: number) => {
+    updateConditionGroups(
+      conditionGroups.filter((_, currentIndex) => currentIndex !== groupIndex)
+    )
+  }
+
+  const handlePriceChange = (
+    field: keyof VisualTier,
+    value: number | undefined
+  ) => {
     onChange({ ...tier, [field]: value })
   }
 
@@ -253,7 +345,7 @@ function VisualTierCard({
       ...tier,
       cache_mode: mode,
       cache_create_1h_unit_cost:
-        mode === CACHE_MODE_TIMED ? (tier.cache_create_1h_unit_cost ?? 0) : 0,
+        mode === CACHE_MODE_TIMED ? tier.cache_create_1h_unit_cost : undefined,
     })
   }
 
@@ -261,7 +353,7 @@ function VisualTierCard({
   const outputUnitPrice = unitCostToPrice(tier.output_unit_cost)
   const hasMediaPricing = MEDIA_PRICE_VARS.some((variable) => {
     const fieldKey = variable.tierField as keyof VisualTier
-    return unitCostToPrice((tier[fieldKey] as number | undefined) ?? 0) > 0
+    return tier[fieldKey] != null
   })
   const [mediaOpen, setMediaOpen] = useState(hasMediaPricing)
 
@@ -275,7 +367,8 @@ function VisualTierCard({
     variable: (typeof BILLING_EXTRA_VARS)[number]
   ) => {
     const fieldKey = variable.tierField as keyof VisualTier
-    const value = unitCostToPrice((tier[fieldKey] as number | undefined) ?? 0)
+    const unitCost = tier[fieldKey] as number | undefined
+    const value = unitCost == null ? undefined : unitCostToPrice(unitCost)
 
     return (
       <PriceField
@@ -283,6 +376,7 @@ function VisualTierCard({
         label={t(variable.label)}
         value={value}
         onChange={(next) => handlePriceChange(fieldKey, priceToUnitCost(next))}
+        onClear={() => handlePriceChange(fieldKey, undefined)}
       />
     )
   }
@@ -294,7 +388,7 @@ function VisualTierCard({
           <Badge variant='outline'>
             {t('Tier')} {index + 1} / {total}
           </Badge>
-          {tier.conditions.length === 0 && (
+          {conditionGroups.length === 0 && (
             <Badge variant='secondary'>{t('Fallback tier')}</Badge>
           )}
           <Input
@@ -321,34 +415,84 @@ function VisualTierCard({
 
       {/* Conditions */}
       <div className='space-y-1.5'>
-        <div className='flex h-7 items-center justify-between'>
+        <div className='flex h-7 items-center justify-between gap-2'>
           <Label className='text-xs font-medium'>{t('Tier conditions')}</Label>
-          <Button
-            type='button'
-            variant='ghost'
-            size='sm'
-            onClick={onAddCondition}
-            disabled={isFallbackTier || tier.conditions.length >= 2}
-            className='h-7 px-2 text-xs'
-          >
-            <Plus className='mr-1 h-3 w-3' />
-            {t('Add condition')}
-          </Button>
+          <div className='flex items-center gap-1'>
+            <Button
+              type='button'
+              variant='ghost'
+              size='sm'
+              onClick={() =>
+                onAddCondition(Math.max(0, conditionGroups.length - 1))
+              }
+              className='h-7 px-2 text-xs'
+            >
+              <Plus className='mr-1 h-3 w-3' />
+              {t('Add condition')}
+            </Button>
+            <Button
+              type='button'
+              variant='ghost'
+              size='sm'
+              onClick={onAddConditionGroup}
+              className='h-7 px-2 text-xs'
+            >
+              <Plus className='mr-1 h-3 w-3' />
+              {t('Add condition group')}
+            </Button>
+          </div>
         </div>
-        {tier.conditions.length === 0 ? (
+        {conditionGroups.length === 0 ? (
           <p className='text-muted-foreground text-xs'>
             {t('Always matches (default tier).')}
           </p>
         ) : (
-          tier.conditions.map((condition, conditionIndex) => (
-            <ConditionRow
-              key={conditionIndex}
-              condition={condition}
-              onChange={(next) => handleConditionChange(conditionIndex, next)}
-              onRemove={() => handleConditionRemove(conditionIndex)}
-              removeDisabled={!isFallbackTier && tier.conditions.length <= 1}
-            />
-          ))
+          <div className='flex flex-col gap-2'>
+            {conditionGroups.map((group, groupIndex) => (
+              <div key={groupIndex} className='rounded-md border p-2'>
+                <div className='mb-1 flex items-center justify-between text-xs'>
+                  <span className='text-muted-foreground'>
+                    {t('Condition group')} {groupIndex + 1}
+                  </span>
+                  <Button
+                    type='button'
+                    variant='ghost'
+                    size='icon'
+                    onClick={() => handleConditionGroupRemove(groupIndex)}
+                    aria-label={t('Remove condition group')}
+                    className='size-6'
+                  >
+                    <Trash2 className='text-destructive size-3.5' />
+                  </Button>
+                </div>
+                <div className='flex flex-col gap-1.5'>
+                  {group.conditions.map((condition, conditionIndex) => (
+                    <ConditionRow
+                      key={conditionIndex}
+                      condition={condition}
+                      onChange={(next) =>
+                        handleConditionChange(groupIndex, conditionIndex, next)
+                      }
+                      onRemove={() =>
+                        handleConditionRemove(groupIndex, conditionIndex)
+                      }
+                      removeDisabled={false}
+                    />
+                  ))}
+                </div>
+                <Button
+                  type='button'
+                  variant='ghost'
+                  size='sm'
+                  onClick={() => onAddCondition(groupIndex)}
+                  className='mt-1 h-7 px-2 text-xs'
+                >
+                  <Plus className='mr-1 h-3 w-3' />
+                  {t('Add condition')}
+                </Button>
+              </div>
+            ))}
+          </div>
         )}
       </div>
 
@@ -379,6 +523,11 @@ function VisualTierCard({
           </div>
 
           <div className='space-y-2'>
+            <p className='text-muted-foreground text-xs'>
+              {t(
+                'Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.'
+              )}
+            </p>
             <div className='flex h-7 items-center'>
               <Tabs
                 value={cacheMode}
@@ -459,11 +608,7 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
 
   const handleTierChange = (index: number, next: VisualTier) => {
     const tiers = [...config.tiers]
-    const lastIndex = tiers.length - 1
-    const normalized = normalizeVisualTier(
-      index === lastIndex ? { ...next, conditions: [] } : next
-    )
-    if (index < lastIndex && normalized.conditions.length === 0) return
+    const normalized = normalizeVisualTier(next)
     tiers[index] = normalized
     onChange({ ...config, tiers })
   }
@@ -478,14 +623,22 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
       tiers[lastIndex] = normalizeVisualTier({
         ...tiers[lastIndex],
         conditions: [{ var: 'len', op: '<', value: 200000 }],
+        conditionGroups: undefined,
       })
     }
     tiers.push(
       normalizeVisualTier({
         label: `tier_${tiers.length + 1}`,
         conditions: [],
-        input_unit_cost: 0,
-        output_unit_cost: 0,
+        input_unit_cost: tiers[lastIndex]?.input_unit_cost ?? 0,
+        output_unit_cost: tiers[lastIndex]?.output_unit_cost ?? 0,
+        cache_read_unit_cost: tiers[lastIndex]?.cache_read_unit_cost,
+        cache_create_unit_cost: tiers[lastIndex]?.cache_create_unit_cost,
+        cache_create_1h_unit_cost: tiers[lastIndex]?.cache_create_1h_unit_cost,
+        image_unit_cost: tiers[lastIndex]?.image_unit_cost,
+        image_output_unit_cost: tiers[lastIndex]?.image_output_unit_cost,
+        audio_input_unit_cost: tiers[lastIndex]?.audio_input_unit_cost,
+        audio_output_unit_cost: tiers[lastIndex]?.audio_output_unit_cost,
       })
     )
     onChange({ ...config, tiers })
@@ -495,33 +648,88 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
     if (config.tiers.length <= 1) return
     const tiers = config.tiers.filter((_, i) => i !== index)
     const lastIndex = tiers.length - 1
-    tiers[lastIndex] = normalizeVisualTier({
-      ...tiers[lastIndex],
-      conditions: [],
-    })
+    // Keep the final remaining tier as the catch-all branch after removing a
+    // sibling tier; a standalone tier may still be explicitly conditioned.
+    if (lastIndex >= 0) {
+      tiers[lastIndex] = normalizeVisualTier({
+        ...tiers[lastIndex],
+        conditions: [],
+      })
+    }
     onChange({ ...config, tiers })
   }
 
-  const handleAddCondition = (index: number) => {
+  const handleAddCondition = (index: number, groupIndex = 0) => {
     const tier = config.tiers[index]
-    if (index === config.tiers.length - 1) return
-    if (tier.conditions.length >= 2) return
     // Prefer `len` (input length) over `p`/`c` for tier conditions because
     // `p` is subject to auto-exclusion when sub-categories like `cr` are
     // priced separately, which can misroute long-input requests into shorter
     // tiers when cache-hits reduce the effective `p`.
-    const usedVars = new Set(tier.conditions.map((c) => c.var))
-    const nextVar: TierConditionInput['var'] = usedVars.has('len') ? 'c' : 'len'
+    const groups = getTierConditionGroups(tier)
+    const targetIndex = Math.max(0, Math.min(groupIndex, groups.length))
+    const targetGroup = groups[targetIndex] ?? { conditions: [] }
+    const usedVars = new Set(
+      groups.flatMap((group) =>
+        group.conditions.map((condition) => condition.var)
+      )
+    )
+    const variableOrder: TierConditionInput['var'][] = [
+      'len',
+      'p',
+      'c',
+      'hour',
+      'minute',
+      'weekday',
+      'month',
+      'day',
+    ]
+    const nextVar =
+      variableOrder.find((variable) => !usedVars.has(variable)) || 'len'
+    const timeBounds = getTierConditionBounds(nextVar)
+    const nextGroups =
+      groups.length > 0
+        ? groups.map((group) => ({ conditions: [...group.conditions] }))
+        : [{ conditions: [] }]
+    if (!nextGroups[targetIndex]) nextGroups[targetIndex] = targetGroup
+    nextGroups[targetIndex].conditions.push({
+      var: nextVar,
+      op: '<',
+      value: timeBounds?.defaultValue ?? 200000,
+      ...(timeBounds ? { timezone: 'Asia/Shanghai' } : {}),
+    })
+    onChange({
+      ...config,
+      tiers: config.tiers.map((current, i) =>
+        i === index
+          ? {
+              ...current,
+              conditions: nextGroups[0]?.conditions ?? [],
+              conditionGroups: nextGroups,
+            }
+          : current
+      ),
+    })
+  }
+
+  const handleAddConditionGroup = (index: number) => {
+    const tier = config.tiers[index]
+    const groups = getTierConditionGroups(tier)
+    const nextGroups = groups.map((group) => ({
+      conditions: [...group.conditions],
+    }))
+    nextGroups.push({
+      conditions: [
+        { var: 'hour', timezone: 'Asia/Shanghai', op: '>=', value: 9 },
+      ],
+    })
     onChange({
       ...config,
       tiers: config.tiers.map((current, i) =>
         i === index
           ? {
               ...current,
-              conditions: [
-                ...tier.conditions,
-                { var: nextVar, op: '<', value: 200000 },
-              ],
+              conditions: nextGroups[0]?.conditions ?? [],
+              conditionGroups: nextGroups,
             }
           : current
       ),
@@ -532,7 +740,7 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
     <div className='space-y-2'>
       <p className='text-muted-foreground text-xs'>
         {t(
-          'Each tier supports up to 2 conditions. The last tier without conditions is the fallback.'
+          'Each tier supports multiple conditions. The last tier without conditions is the fallback.'
         )}
       </p>
       {config.tiers.map((tier, index) => (
@@ -543,7 +751,8 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
           total={config.tiers.length}
           onChange={(next) => handleTierChange(index, next)}
           onRemove={() => handleRemoveTier(index)}
-          onAddCondition={() => handleAddCondition(index)}
+          onAddCondition={(groupIndex) => handleAddCondition(index, groupIndex)}
+          onAddConditionGroup={() => handleAddConditionGroup(index)}
         />
       ))}
       <Button
diff --git a/web/default/src/i18n/locales/en.json b/web/default/src/i18n/locales/en.json
index 4681e796..eeb1a21e 100644
--- a/web/default/src/i18n/locales/en.json
+++ b/web/default/src/i18n/locales/en.json
@@ -3,6 +3,8 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.",
+    "Timezone": "Timezone",
     "Failed to complete manual task billing.": "Failed to complete manual task billing.",
     "Manual task billing completed.": "Manual task billing completed.",
     "Completed {{completed}} selected task settlements; {{failed}} remain for review.": "Completed {{completed}} selected task settlements; {{failed}} remain for review.",
@@ -2552,6 +2554,7 @@
     "JSON map of model → USD cost per request. Takes precedence over ratio based billing.": "JSON map of model → USD cost per request. Takes precedence over ratio based billing.",
     "JSON mode": "JSON mode",
     "JSON Mode": "JSON Mode",
+    "JSON imported. Review prices before saving.": "JSON imported. Review prices before saving.",
     "JSON must be an object": "JSON must be an object",
     "JSON object:": "JSON object:",
     "JSON Text": "JSON Text",
@@ -3104,6 +3107,7 @@
     "No matching items": "No matching items",
     "No matching results": "No matching results",
     "No matching rules": "No matching rules",
+    "No matching task rate cards.": "No matching task rate cards.",
     "No messages yet": "No messages yet",
     "No missing models found.": "No missing models found.",
     "No model found.": "No model found.",
diff --git a/web/default/src/i18n/locales/fr.json b/web/default/src/i18n/locales/fr.json
index a4c1f244..77aff591 100644
--- a/web/default/src/i18n/locales/fr.json
+++ b/web/default/src/i18n/locales/fr.json
@@ -3,6 +3,8 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "Laissez les prix facultatifs vides pour appliquer le prix de base d’entrée ou de sortie. Saisissez 0 pour rendre cette catégorie de tokens gratuite.",
+    "Timezone": "Fuseau horaire",
     "Failed to complete manual task billing.": "Échec de la finalisation manuelle de la facturation de la tâche.",
     "Manual task billing completed.": "La facturation manuelle de la tâche est terminée.",
     "Completed {{completed}} selected task settlements; {{failed}} remain for review.": "Règlements de tâches sélectionnés terminés : {{completed}} ; règlements à examiner : {{failed}}.",
@@ -2552,6 +2554,7 @@
     "JSON map of model → USD cost per request. Takes precedence over ratio based billing.": "Carte JSON de modèle → coût en USD par requête. Prend le pas sur la facturation basée sur le ratio.",
     "JSON mode": "Mode JSON",
     "JSON Mode": "Mode JSON",
+    "JSON imported. Review prices before saving.": "JSON importé. Vérifiez les prix avant d'enregistrer.",
     "JSON must be an object": "Le JSON doit être un objet",
     "JSON object:": "Objet JSON :",
     "JSON Text": "Texte JSON",
@@ -3104,6 +3107,7 @@
     "No matching items": "Aucun élément correspondant",
     "No matching results": "Aucun résultat correspondant",
     "No matching rules": "Aucune règle correspondante",
+    "No matching task rate cards.": "Aucune carte tarifaire de tâche correspondante.",
     "No messages yet": "Pas encore de messages",
     "No missing models found.": "Aucun modèle manquant trouvé.",
     "No model found.": "Aucun modèle trouvé.",
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index 1f7cefd2..dba98b2b 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -3,6 +3,8 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "任意の価格を空欄にすると、基本の入力・出力価格が適用されます。0 を入力すると、その種類のトークンは無料になります。",
+    "Timezone": "タイムゾーン",
     "Failed to complete manual task billing.": "タスクの手動課金を完了できませんでした。",
     "Manual task billing completed.": "タスクの手動課金が完了しました。",
     "Completed {{completed}} selected task settlements; {{failed}} remain for review.": "選択したタスク精算を {{completed}} 件完了しました。{{failed}} 件は引き続き確認が必要です。",
@@ -2552,6 +2554,7 @@
     "JSON map of model → USD cost per request. Takes precedence over ratio based billing.": "モデル → リクエストあたりのUSDコストのJSONマップ。比率ベースの請求よりも優先されます。",
     "JSON mode": "JSON モード",
     "JSON Mode": "JSONモード",
+    "JSON imported. Review prices before saving.": "JSON をインポートしました。保存前に料金を確認してください。",
     "JSON must be an object": "JSON はオブジェクトである必要があります",
     "JSON object:": "JSONオブジェクト:",
     "JSON Text": "JSONテキスト",
@@ -3104,6 +3107,7 @@
     "No matching items": "一致する項目がありません",
     "No matching results": "一致する結果がありません",
     "No matching rules": "一致するルールがありません",
+    "No matching task rate cards.": "一致するタスク料金カードはありません。",
     "No messages yet": "まだメッセージがありません",
     "No missing models found.": "不足しているモデルは見つかりません。",
     "No model found.": "モデルが見つかりません。",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index 969855ba..e922f122 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -3,6 +3,8 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "Оставьте необязательные цены пустыми, чтобы применять базовую цену ввода или вывода. Введите 0, чтобы эта категория токенов была бесплатной.",
+    "Timezone": "Часовой пояс",
     "Failed to complete manual task billing.": "Не удалось завершить ручной биллинг задачи.",
     "Manual task billing completed.": "Ручной биллинг задачи завершен.",
     "Completed {{completed}} selected task settlements; {{failed}} remain for review.": "Завершено расчетов выбранных задач: {{completed}}; требуют проверки: {{failed}}.",
@@ -2552,6 +2554,7 @@
     "JSON map of model → USD cost per request. Takes precedence over ratio based billing.": "JSON-карта модели → стоимость в долларах США за запрос. Имеет приоритет над тарификацией на основе соотношения.",
     "JSON mode": "Режим JSON",
     "JSON Mode": "Режим JSON",
+    "JSON imported. Review prices before saving.": "JSON импортирован. Проверьте цены перед сохранением.",
     "JSON must be an object": "JSON должен быть объектом",
     "JSON object:": "Объект JSON:",
     "JSON Text": "JSON текст",
@@ -3104,6 +3107,7 @@
     "No matching items": "Нет подходящих элементов",
     "No matching results": "Нет совпадений",
     "No matching rules": "Нет совпадающих правил",
+    "No matching task rate cards.": "Подходящие карточки тарифов задач не найдены.",
     "No messages yet": "Сообщений пока нет",
     "No missing models found.": "Недостающие модели не найдены.",
     "No model found.": "Модель не найдена.",
diff --git a/web/default/src/i18n/locales/vi.json b/web/default/src/i18n/locales/vi.json
index d2ef1400..4051edea 100644
--- a/web/default/src/i18n/locales/vi.json
+++ b/web/default/src/i18n/locales/vi.json
@@ -3,6 +3,8 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "Để trống giá tùy chọn để áp dụng giá đầu vào hoặc đầu ra cơ bản. Nhập 0 để miễn phí loại token đó.",
+    "Timezone": "Múi giờ",
     "Failed to complete manual task billing.": "Không thể hoàn tất tính phí thủ công cho tác vụ.",
     "Manual task billing completed.": "Đã hoàn tất tính phí thủ công cho tác vụ.",
     "Completed {{completed}} selected task settlements; {{failed}} remain for review.": "Đã hoàn tất {{completed}} quyết toán tác vụ đã chọn; còn {{failed}} quyết toán tác vụ cần xem xét.",
@@ -2552,6 +2554,7 @@
     "JSON map of model → USD cost per request. Takes precedence over ratio based billing.": "Ánh xạ JSON của mô hình → chi phí USD mỗi yêu cầu. Ưu tiên hơn thanh toán dựa trên tỷ lệ.",
     "JSON mode": "Chế độ JSON",
     "JSON Mode": "Chế độ JSON",
+    "JSON imported. Review prices before saving.": "Đã nhập JSON. Hãy kiểm tra giá trước khi lưu.",
     "JSON must be an object": "JSON phải là object",
     "JSON object:": "Đối tượng JSON:",
     "JSON Text": "Văn bản JSON",
@@ -3104,6 +3107,7 @@
     "No matching items": "Không có mục phù hợp",
     "No matching results": "Không có kết quả phù hợp",
     "No matching rules": "Không có quy tắc phù hợp",
+    "No matching task rate cards.": "Không có thẻ giá tác vụ phù hợp.",
     "No messages yet": "Chưa có tin nhắn",
     "No missing models found.": "Không tìm thấy mô hình nào bị thiếu.",
     "No model found.": "Không tìm thấy mô hình.",
diff --git a/web/default/src/i18n/locales/zh.json b/web/default/src/i18n/locales/zh.json
index 11aafe95..d6ea563f 100644
--- a/web/default/src/i18n/locales/zh.json
+++ b/web/default/src/i18n/locales/zh.json
@@ -3,6 +3,8 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "可选价格留空时沿用基础输入或输出价格；填写 0 表示该类 token 免费。",
+    "Timezone": "时区",
     "Failed to complete manual task billing.": "无法完成人工任务计费。",
     "Manual task billing completed.": "人工任务计费已完成。",
     "Completed {{completed}} selected task settlements; {{failed}} remain for review.": "已完成 {{completed}} 个所选任务结算；仍有 {{failed}} 个需要复核。",
@@ -2552,6 +2554,7 @@
     "JSON map of model → USD cost per request. Takes precedence over ratio based billing.": "模型 → 每请求美元成本的 JSON 映射。优先于基于比率的计费。",
     "JSON mode": "JSON 模式",
     "JSON Mode": "JSON 模式",
+    "JSON imported. Review prices before saving.": "JSON 已导入，请在保存前检查价格。",
     "JSON must be an object": "JSON 必须是对象",
     "JSON object:": "JSON 对象：",
     "JSON Text": "JSON 文本",
@@ -3104,6 +3107,7 @@
     "No matching items": "没有匹配项",
     "No matching results": "无匹配结果",
     "No matching rules": "没有匹配的规则",
+    "No matching task rate cards.": "没有匹配的任务费率卡。",
     "No messages yet": "暂无消息",
     "No missing models found.": "未找到缺失的模型。",
     "No model found.": "未找到模型。",

From acaf4c5eac7582aa54da98c9b3fda374ee0650b0 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 12:41:56 +0800
Subject: [PATCH 02/20] fix: address chat retry and pricing editor review
 findings

---
 controller/relay_stream_error_test.go         |  46 +++++++
 relay/channel/openai/chat_stream.go           |  19 ++-
 .../src/features/pricing/lib/billing-expr.ts  |  76 ++---------
 .../features/pricing/lib/expression-syntax.ts |  84 ++++++++++++
 .../features/pricing/lib/tier-expr.test.ts    |  37 +++++
 .../src/features/pricing/lib/tier-expr.ts     | 102 ++------------
 .../models/tiered-billing-settings.tsx        |   6 +-
 .../tiered-pricing-editor.runtime.test.tsx    | 127 +++++++++++++++++-
 .../models/tiered-pricing-visual-editor.tsx   |  26 ++--
 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 +
 15 files changed, 356 insertions(+), 173 deletions(-)
 create mode 100644 web/default/src/features/pricing/lib/expression-syntax.ts

diff --git a/controller/relay_stream_error_test.go b/controller/relay_stream_error_test.go
index 7c252442..3d656e3d 100644
--- a/controller/relay_stream_error_test.go
+++ b/controller/relay_stream_error_test.go
@@ -59,6 +59,52 @@ func TestStartedChatStreamErrorUsesSSEFraming(t *testing.T) {
 	require.Equal(t, "data: [DONE]", frames[2])
 }
 
+func TestNativeChatRequestErrorsRespectControllerRetryPolicy(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	oldFlag, oldTimes, oldRanges := common.EmptyCompletionRetryEnabled, common.RetryTimes, operation_setting.AutomaticRetryStatusCodeRanges
+	common.EmptyCompletionRetryEnabled, common.RetryTimes = true, 2
+	operation_setting.AutomaticRetryStatusCodeRanges = []operation_setting.StatusCodeRange{{Start: 502, End: 502}}
+	t.Cleanup(func() {
+		common.EmptyCompletionRetryEnabled, common.RetryTimes, operation_setting.AutomaticRetryStatusCodeRanges = oldFlag, oldTimes, oldRanges
+	})
+	for _, tc := range []struct {
+		name      string
+		errorType string
+		code      any
+		retry     bool
+	}{
+		{"invalid request without code", "invalid_request_error", nil, false},
+		{"context limit", "upstream_error", "context_length_exceeded", false},
+		{"invalid prompt", "upstream_error", "invalid_prompt", false},
+		{"content policy", "invalid_request_error", "content_policy_violation", false},
+		{"overload", "upstream_error", nil, true},
+		{"server error", "server_error", "server_error", true},
+		{"rate limit", "invalid_request_error", "rate_limit_exceeded", true},
+		{"provider quota", "invalid_request_error", "insufficient_quota", true},
+		{"provider credential", "invalid_request_error", "invalid_api_key", true},
+		{"provider model", "invalid_request_error", "model_not_found", true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			recorder := httptest.NewRecorder()
+			c, _ := gin.CreateTestContext(recorder)
+			c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
+			upstream := types.OpenAIError{Message: "synthetic request failure", Type: tc.errorType, Code: tc.code}
+			body, err := common.Marshal(map[string]any{"error": upstream})
+			require.NoError(t, err)
+			info := &relaycommon.RelayInfo{RelayMode: relayconstant.RelayModeChatCompletions, RelayFormat: types.RelayFormatOpenAI, DisablePing: true, ChannelMeta: &relaycommon.ChannelMeta{UpstreamModelName: "gpt-test"}}
+			usage, apiErr := openai.OaiStreamHandler(c, info, &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(strings.NewReader("data: {\"choices\":[{\"delta\":{\"role\":\"assistant\"}}]}\n\ndata: " + string(body) + "\n\n"))})
+			require.NotNil(t, apiErr)
+			require.Nil(t, usage)
+			require.False(t, c.Writer.Written())
+			require.Equal(t, upstream.Message, apiErr.ToOpenAIError().Message)
+			require.Equal(t, upstream.Type, apiErr.ToOpenAIError().Type)
+			require.Equal(t, upstream.Code, apiErr.ToOpenAIError().Code)
+			require.Equal(t, tc.retry, shouldRetry(c, apiErr, 1))
+			require.False(t, shouldRetry(c, apiErr, 0))
+		})
+	}
+}
+
 func TestNativeChatUnstartedErrorUsesJSONStatusAndContentType(t *testing.T) {
 	recorder := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(recorder)
diff --git a/relay/channel/openai/chat_stream.go b/relay/channel/openai/chat_stream.go
index 531f24e9..951a064f 100644
--- a/relay/channel/openai/chat_stream.go
+++ b/relay/channel/openai/chat_stream.go
@@ -78,7 +78,24 @@ func (frame *chatStreamFrame) upstreamError() *types.MaxAPIError {
 	if upstream.Type == "" {
 		upstream.Type = "upstream_error"
 	}
-	return types.WithOpenAIError(upstream, http.StatusBadGateway)
+	apiErr := types.WithOpenAIError(upstream, http.StatusBadGateway)
+	if chatStreamRequestErrorIsPermanent(upstream) {
+		types.ErrOptionWithSkipRetry()(apiErr)
+	}
+	return apiErr
+}
+
+// Reject invalid requests without replaying them, but leave channel-specific
+// credentials, quota, model availability and transient failures to routing.
+func chatStreamRequestErrorIsPermanent(upstream types.OpenAIError) bool {
+	code, _ := upstream.Code.(string)
+	switch strings.ToLower(strings.TrimSpace(code)) {
+	case "rate_limit_exceeded", "insufficient_quota", "invalid_api_key", "model_not_found", "server_error", "overloaded_error":
+		return false
+	case "invalid_request", "invalid_request_error", "context_length_exceeded", "invalid_prompt", "content_policy_violation", "invalid_parameter", "unsupported_parameter", "missing_required_parameter", "invalid_value", "invalid_type":
+		return true
+	}
+	return strings.EqualFold(strings.TrimSpace(upstream.Type), "invalid_request_error")
 }
 
 // A failed attempt with no payload returns nil usage and can reach the retry
diff --git a/web/default/src/features/pricing/lib/billing-expr.ts b/web/default/src/features/pricing/lib/billing-expr.ts
index 37f2f964..cc5811e9 100644
--- a/web/default/src/features/pricing/lib/billing-expr.ts
+++ b/web/default/src/features/pricing/lib/billing-expr.ts
@@ -16,6 +16,11 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API/issues
 */
+import {
+  splitTopLevelExpression,
+  unwrapConditionParens,
+} from './expression-syntax'
+
 /**
  * Billing expression parsing utilities.
  *
@@ -271,79 +276,20 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
   if (!exprStr) return []
   try {
     const { body } = stripExprVersion(exprStr)
-    const splitTopLevelColon = (source: string): string[] => {
-      const parts: string[] = []
-      let start = 0
-      let depth = 0
-      let quote = ''
-      let escaped = false
-      for (let index = 0; index < source.length; index += 1) {
-        const char = source[index]
-        if (quote) {
-          if (escaped) escaped = false
-          else if (char === '\\') escaped = true
-          else if (char === quote) quote = ''
-          continue
-        }
-        if (char === '"' || char === "'") {
-          quote = char
-          continue
-        }
-        if (char === '(') depth += 1
-        else if (char === ')') depth = Math.max(0, depth - 1)
-        else if (char === ':' && depth === 0) {
-          parts.push(source.slice(start, index).trim())
-          start = index + 1
-        }
-      }
-      parts.push(source.slice(start).trim())
-      return parts.filter(Boolean)
-    }
     const tierRe = /^tier\("([^"]*)",\s*([\s\S]+)\)$/
     const tiers: ParsedTier[] = []
-    for (const branch of splitTopLevelColon(body)) {
+    for (const branch of splitTopLevelExpression(body, ':')) {
       const parts = branch.match(/^(.*?)\s*\?\s*(tier\("[^"]*",[\s\S]+\))$/)
       const condStr = parts?.[1]?.trim() || ''
       const tierMatch = tierRe.exec(parts?.[2] || branch)
       if (!tierMatch) continue
       const conditionGroups: TierCondition[][] = []
-      const splitLogical = (source: string, operator: '&&' | '||') => {
-        const parts: string[] = []
-        let start = 0
-        let depth = 0
-        for (let index = 0; index < source.length; index += 1) {
-          if (source[index] === '(') depth += 1
-          else if (source[index] === ')') depth = Math.max(0, depth - 1)
-          if (depth === 0 && source.startsWith(operator, index)) {
-            parts.push(source.slice(start, index).trim())
-            start = index + operator.length
-            index += operator.length - 1
-          }
-        }
-        parts.push(source.slice(start).trim())
-        return parts.filter(Boolean)
-      }
-      const unwrap = (source: string) => {
-        let value = source.trim()
-        while (value.startsWith('(') && value.endsWith(')')) {
-          let depth = 0
-          let closesAtEnd = false
-          for (let index = 0; index < value.length; index += 1) {
-            if (value[index] === '(') depth += 1
-            else if (value[index] === ')') depth -= 1
-            if (depth === 0) {
-              closesAtEnd = index === value.length - 1
-              break
-            }
-          }
-          if (!closesAtEnd) break
-          value = value.slice(1, -1).trim()
-        }
-        return value
-      }
-      for (const group of splitLogical(condStr, '||')) {
+      for (const group of splitTopLevelExpression(condStr, '||')) {
         const groupConditions: TierCondition[] = []
-        for (const cp of splitLogical(unwrap(group), '&&')) {
+        for (const cp of splitTopLevelExpression(
+          unwrapConditionParens(group),
+          '&&'
+        )) {
           if (cp.trim() === 'true') continue
           const cm = cp
             .trim()
diff --git a/web/default/src/features/pricing/lib/expression-syntax.ts b/web/default/src/features/pricing/lib/expression-syntax.ts
new file mode 100644
index 00000000..3f0b9044
--- /dev/null
+++ b/web/default/src/features/pricing/lib/expression-syntax.ts
@@ -0,0 +1,84 @@
+/*
+Copyright (C) 2023-2026 MAX-API-Next
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API/issues
+*/
+// Split only outside calls and quoted strings; both pricing parsers share this contract.
+export function splitTopLevelExpression(
+  source: string,
+  operator: ':' | '&&' | '||'
+): string[] {
+  const parts: string[] = []
+  let start = 0
+  let depth = 0
+  let quote = ''
+  let escaped = false
+  for (let index = 0; index < source.length; index += 1) {
+    const char = source[index]
+    if (quote) {
+      if (escaped) escaped = false
+      else if (char === '\\') escaped = true
+      else if (char === quote) quote = ''
+      continue
+    }
+    if (char === '"' || char === "'") {
+      quote = char
+      continue
+    }
+    if (char === '(') depth += 1
+    else if (char === ')') depth = Math.max(0, depth - 1)
+    if (depth === 0 && source.startsWith(operator, index)) {
+      parts.push(source.slice(start, index).trim())
+      start = index + operator.length
+      index += operator.length - 1
+    }
+  }
+  parts.push(source.slice(start).trim())
+  return parts.filter(Boolean)
+}
+
+// Remove enclosing parentheses without interpreting quoted punctuation.
+export function unwrapConditionParens(source: string): string {
+  let value = source.trim()
+  while (value.startsWith('(') && value.endsWith(')')) {
+    let depth = 0
+    let quote = ''
+    let closesAtEnd = false
+    let escaped = false
+    for (let index = 0; index < value.length; index += 1) {
+      const char = value[index]
+      if (quote) {
+        if (escaped) escaped = false
+        else if (char === '\\') escaped = true
+        else if (char === quote) quote = ''
+        continue
+      }
+      if (char === '"' || char === "'") {
+        quote = char
+        continue
+      }
+      if (char === '(') depth += 1
+      else if (char === ')') depth -= 1
+      if (depth === 0) {
+        closesAtEnd = index === value.length - 1
+        break
+      }
+    }
+    if (!closesAtEnd) break
+    value = value.slice(1, -1).trim()
+  }
+  return value
+}
diff --git a/web/default/src/features/pricing/lib/tier-expr.test.ts b/web/default/src/features/pricing/lib/tier-expr.test.ts
index b6a545f9..845fd4b9 100644
--- a/web/default/src/features/pricing/lib/tier-expr.test.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.test.ts
@@ -210,6 +210,43 @@ describe('evalExprLocally', () => {
 })
 
 describe('visual tier conditions', () => {
+  for (const timezone of ['Test/)||(', 'Test/)&&(', 'Test/:offset']) {
+    test(`preserves quoted syntax in both pricing parsers: ${timezone}`, () => {
+      const config = {
+        tiers: [
+          normalizeVisualTier({
+            label: 'peak:night',
+            conditions: [],
+            conditionGroups: [
+              { conditions: [{ var: 'hour', timezone, op: '>=', value: 9 }] },
+              { conditions: [{ var: 'len', op: '<', value: 100 }] },
+            ],
+            input_unit_cost: 2,
+            output_unit_cost: 4,
+          }),
+          normalizeVisualTier({
+            label: 'off',
+            input_unit_cost: 1,
+            output_unit_cost: 2,
+          }),
+        ],
+      }
+      const expression = generateExprFromVisualConfig(config)
+      const visual = tryParseVisualConfig(expression)
+      const display = parseTiersFromExpr(expression)
+      assert.equal(
+        visual?.tiers[0].conditionGroups?.[0].conditions[0].timezone,
+        timezone
+      )
+      assert.deepEqual(
+        display[0]?.conditionGroups,
+        config.tiers[0].conditionGroups?.map((group) => group.conditions)
+      )
+      assert.equal(display[0]?.label, 'peak:night')
+      assert.equal(display.length, 2)
+    })
+  }
+
   test('supports time conditions without requiring a second tier', () => {
     const expr = generateExprFromVisualConfig({
       tiers: [
diff --git a/web/default/src/features/pricing/lib/tier-expr.ts b/web/default/src/features/pricing/lib/tier-expr.ts
index dc462f62..5db16835 100644
--- a/web/default/src/features/pricing/lib/tier-expr.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.ts
@@ -18,6 +18,10 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 */
 import { Parser, type Value } from 'expr-eval'
 import { BILLING_CACHE_VAR_MAP } from './billing-expr'
+import {
+  splitTopLevelExpression,
+  unwrapConditionParens,
+} from './expression-syntax'
 
 export const CACHE_MODE_TIMED = 'timed'
 export const CACHE_MODE_GENERIC = 'generic'
@@ -64,7 +68,7 @@ export function normalizeTierCondition(
   return {
     ...condition,
     value,
-    timezone: condition.timezone || 'Asia/Shanghai',
+    timezone: condition.timezone ?? 'Asia/Shanghai',
   }
 }
 
@@ -186,77 +190,15 @@ function buildConditionStr(conditions: TierConditionInput[]): string {
     .join(' && ')
 }
 
-function splitTopLevelLogical(source: string, operator: '&&' | '||'): string[] {
-  const parts: string[] = []
-  let start = 0
-  let depth = 0
-  let quote = ''
-  let escaped = false
-  for (let index = 0; index < source.length; index += 1) {
-    const char = source[index]
-    if (quote) {
-      if (escaped) escaped = false
-      else if (char === '\\') escaped = true
-      else if (char === quote) quote = ''
-      continue
-    }
-    if (char === '"' || char === "'") {
-      quote = char
-      continue
-    }
-    if (char === '(') depth += 1
-    else if (char === ')') depth = Math.max(0, depth - 1)
-    if (depth === 0 && source.startsWith(operator, index)) {
-      parts.push(source.slice(start, index).trim())
-      start = index + operator.length
-      index += operator.length - 1
-    }
-  }
-  parts.push(source.slice(start).trim())
-  return parts.filter(Boolean)
-}
-
-function unwrapConditionParens(source: string): string {
-  let value = source.trim()
-  while (value.startsWith('(') && value.endsWith(')')) {
-    let depth = 0
-    let quote = ''
-    let closesAtEnd = false
-    let escaped = false
-    for (let index = 0; index < value.length; index += 1) {
-      const char = value[index]
-      if (quote) {
-        if (escaped) escaped = false
-        else if (char === '\\') escaped = true
-        else if (char === quote) quote = ''
-        continue
-      }
-      if (char === '"' || char === "'") {
-        quote = char
-        continue
-      }
-      if (char === '(') depth += 1
-      else if (char === ')') depth -= 1
-      if (depth === 0) {
-        closesAtEnd = index === value.length - 1
-        break
-      }
-    }
-    if (!closesAtEnd) break
-    value = value.slice(1, -1).trim()
-  }
-  return value
-}
-
 function parseTierConditionGroups(conditionStr: string): TierConditionGroup[] {
   if (!conditionStr || conditionStr.trim() === 'true') return []
   const atomPattern =
     /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("([^"\\]+)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
-  return splitTopLevelLogical(conditionStr, '||')
+  return splitTopLevelExpression(conditionStr, '||')
     .map((groupStr) => unwrapConditionParens(groupStr))
     .map((groupStr) => {
       const conditions: TierConditionInput[] = []
-      for (const atom of splitTopLevelLogical(groupStr, '&&')) {
+      for (const atom of splitTopLevelExpression(groupStr, '&&')) {
         const match = atom.trim().match(atomPattern)
         if (!match) continue
         conditions.push({
@@ -432,37 +374,9 @@ export function tryParseVisualConfig(
         : null
     }
 
-    const splitTopLevelColon = (source: string): string[] => {
-      const parts: string[] = []
-      let start = 0
-      let depth = 0
-      let quote = ''
-      let escaped = false
-      for (let index = 0; index < source.length; index += 1) {
-        const char = source[index]
-        if (quote) {
-          if (escaped) escaped = false
-          else if (char === '\\') escaped = true
-          else if (char === quote) quote = ''
-          continue
-        }
-        if (char === '"' || char === "'") {
-          quote = char
-          continue
-        }
-        if (char === '(') depth += 1
-        else if (char === ')') depth = Math.max(0, depth - 1)
-        else if (char === ':' && depth === 0) {
-          parts.push(source.slice(start, index).trim())
-          start = index + 1
-        }
-      }
-      parts.push(source.slice(start).trim())
-      return parts.filter(Boolean)
-    }
     const tierRe = new RegExp(`^tier\\("([^"]*)",\\s*${bodyPat}\\)$`)
     const tiers: VisualTier[] = []
-    for (const branch of splitTopLevelColon(body)) {
+    for (const branch of splitTopLevelExpression(body, ':')) {
       const parts = branch.match(/^(.*?)\s*\?\s*(tier\("[^"]*",[\s\S]+\))$/)
       const condStr = parts?.[1]?.trim() || ''
       const tierSource = parts?.[2] || branch
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 797f96b4..768794a9 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -348,7 +348,11 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
         )}
 
         {search.trim() && filteredModels.length > 0 && (
-          <div className='flex flex-wrap gap-1.5' aria-label={t('Search')}>
+          <div
+            role='group'
+            className='flex flex-wrap gap-1.5'
+            aria-label={t('Matching models')}
+          >
             {filteredModels.map((model) => (
               <span
                 key={model}
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
index b7180a7b..b10f15a9 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
@@ -23,7 +23,10 @@ import { JSDOM } from 'jsdom'
 import assert from 'node:assert/strict'
 import { after, before, describe, test } from 'node:test'
 import { I18nextProvider } from 'react-i18next'
-import { BILLING_EXTRA_VARS } from '@/features/pricing/lib/billing-expr'
+import {
+  BILLING_EXTRA_VARS,
+  parseTiersFromExpr,
+} from '@/features/pricing/lib/billing-expr'
 import type { ModelRatioData } from './model-pricing-sheet'
 
 // Load DOM-dependent modules after installing JSDOM so Base UI selects use
@@ -418,6 +421,128 @@ after(() => {
 })
 
 describe('TieredPricingEditor runtime behavior', () => {
+  test('keeps an empty timezone editable and applies the default only to the expression', async () => {
+    const container = createContainer()
+    const root = createRoot(container)
+    const source =
+      'hour("Asia/Shanghai") >= 9 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
+    let saved = source
+    try {
+      await act(async () =>
+        root.render(
+          <I18nextProvider i18n={i18n}>
+            <TieredPricingEditor
+              billingExpr={source}
+              requestRuleExpr=''
+              onBillingExprChange={(next) => {
+                saved = next
+              }}
+              onRequestRuleExprChange={() => undefined}
+            />
+          </I18nextProvider>
+        )
+      )
+      const input = within(container).getByLabelText(
+        'Timezone'
+      ) as HTMLInputElement
+      await act(async () => fireEvent.change(input, { target: { value: '' } }))
+      assert.equal(input.value, '')
+      assert.match(saved, /hour\("Asia\/Shanghai"\)/)
+      await act(async () =>
+        fireEvent.change(input, { target: { value: 'UTC' } })
+      )
+      assert.equal(input.value, 'UTC')
+      assert.match(saved, /hour\("UTC"\)/)
+    } finally {
+      await unmount(root, container)
+    }
+  })
+
+  test('clears OR groups when deleting the final sibling and can add a fresh tier', async () => {
+    const container = createContainer()
+    const root = createRoot(container)
+    const source =
+      '(hour("UTC") >= 9 && hour("UTC") < 17) || (len < 100) ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
+    let saved = source
+    try {
+      await act(async () =>
+        root.render(
+          <I18nextProvider i18n={i18n}>
+            <TieredPricingEditor
+              billingExpr={source}
+              requestRuleExpr=''
+              onBillingExprChange={(next) => {
+                saved = next
+              }}
+              onRequestRuleExprChange={() => undefined}
+            />
+          </I18nextProvider>
+        )
+      )
+      const editor = within(container)
+      assert.equal(editor.getAllByLabelText('Condition Value').length, 3)
+      await act(async () =>
+        fireEvent.click(
+          editor.getAllByRole('button', { name: 'Remove tier' })[1]
+        )
+      )
+      assert.equal(editor.queryAllByLabelText('Condition Value').length, 0)
+      assert.equal(saved, 'tier("peak", p * 2 + c * 4)')
+      await act(async () =>
+        fireEvent.click(editor.getByRole('button', { name: 'Add tier' }))
+      )
+      assert.equal(editor.getAllByLabelText('Condition Value').length, 1)
+      assert.deepEqual(parseTiersFromExpr(saved)[0].conditions, [
+        { var: 'len', op: '<', value: 200000 },
+      ])
+    } finally {
+      await unmount(root, container)
+    }
+  })
+
+  test('chooses a new condition using only the target OR group', async () => {
+    const container = createContainer()
+    const root = createRoot(container)
+    const source =
+      'len < 100 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
+    let saved = source
+    try {
+      await act(async () =>
+        root.render(
+          <I18nextProvider i18n={i18n}>
+            <TieredPricingEditor
+              billingExpr={source}
+              requestRuleExpr=''
+              onBillingExprChange={(next) => {
+                saved = next
+              }}
+              onRequestRuleExprChange={() => undefined}
+            />
+          </I18nextProvider>
+        )
+      )
+      const editor = within(container)
+      await act(async () =>
+        fireEvent.click(
+          editor.getAllByRole('button', { name: 'Add condition group' })[0]
+        )
+      )
+      await act(async () =>
+        fireEvent.click(
+          editor.getAllByRole('button', { name: 'Add condition' })[2]
+        )
+      )
+      assert.deepEqual(
+        parseTiersFromExpr(saved)[0].conditionGroups?.map((group) =>
+          group.map((condition) => condition.var)
+        ),
+        [['len'], ['hour', 'len']]
+      )
+    } finally {
+      await unmount(root, container)
+    }
+  })
+
   test('mounts the visual editor without a runtime hook error', async () => {
     const container = createContainer()
     const root = createRoot(container)
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
index b9600b89..443718ec 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
@@ -114,15 +114,20 @@ function ConditionRow({
     const nextVar = value as TierConditionInput['var']
     const bounds = getTierConditionBounds(nextVar)
     const numericValue = Number(condition.value)
-    const nextValue = bounds
-      ? Number.isFinite(numericValue) &&
+    let nextValue = 0
+    if (bounds) {
+      if (
+        Number.isFinite(numericValue) &&
         numericValue >= bounds.min &&
         numericValue <= bounds.max
-        ? numericValue
-        : bounds.defaultValue
-      : Number.isFinite(numericValue)
-        ? numericValue
-        : 0
+      ) {
+        nextValue = numericValue
+      } else {
+        nextValue = bounds.defaultValue
+      }
+    } else if (Number.isFinite(numericValue)) {
+      nextValue = numericValue
+    }
     onChange({
       ...condition,
       var: nextVar,
@@ -162,7 +167,7 @@ function ConditionRow({
       </Select>
       {isTimeCondition && (
         <Input
-          value={condition.timezone || 'Asia/Shanghai'}
+          value={condition.timezone ?? ''}
           onChange={(event) =>
             onChange({ ...condition, timezone: event.target.value })
           }
@@ -654,6 +659,7 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
       tiers[lastIndex] = normalizeVisualTier({
         ...tiers[lastIndex],
         conditions: [],
+        conditionGroups: [],
       })
     }
     onChange({ ...config, tiers })
@@ -669,9 +675,7 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
     const targetIndex = Math.max(0, Math.min(groupIndex, groups.length))
     const targetGroup = groups[targetIndex] ?? { conditions: [] }
     const usedVars = new Set(
-      groups.flatMap((group) =>
-        group.conditions.map((condition) => condition.var)
-      )
+      targetGroup.conditions.map((condition) => condition.var)
     )
     const variableOrder: TierConditionInput['var'][] = [
       'len',
diff --git a/web/default/src/i18n/locales/en.json b/web/default/src/i18n/locales/en.json
index eeb1a21e..cb99991d 100644
--- a/web/default/src/i18n/locales/en.json
+++ b/web/default/src/i18n/locales/en.json
@@ -3,6 +3,7 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Matching models": "Matching models",
     "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.",
     "Timezone": "Timezone",
     "Failed to complete manual task billing.": "Failed to complete manual task billing.",
diff --git a/web/default/src/i18n/locales/fr.json b/web/default/src/i18n/locales/fr.json
index 77aff591..5590dc82 100644
--- a/web/default/src/i18n/locales/fr.json
+++ b/web/default/src/i18n/locales/fr.json
@@ -3,6 +3,7 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Matching models": "Modèles correspondants",
     "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "Laissez les prix facultatifs vides pour appliquer le prix de base d’entrée ou de sortie. Saisissez 0 pour rendre cette catégorie de tokens gratuite.",
     "Timezone": "Fuseau horaire",
     "Failed to complete manual task billing.": "Échec de la finalisation manuelle de la facturation de la tâche.",
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index dba98b2b..a42b9414 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -3,6 +3,7 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Matching models": "一致するモデル",
     "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "任意の価格を空欄にすると、基本の入力・出力価格が適用されます。0 を入力すると、その種類のトークンは無料になります。",
     "Timezone": "タイムゾーン",
     "Failed to complete manual task billing.": "タスクの手動課金を完了できませんでした。",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index e922f122..c0f94782 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -3,6 +3,7 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Matching models": "Совпадающие модели",
     "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "Оставьте необязательные цены пустыми, чтобы применять базовую цену ввода или вывода. Введите 0, чтобы эта категория токенов была бесплатной.",
     "Timezone": "Часовой пояс",
     "Failed to complete manual task billing.": "Не удалось завершить ручной биллинг задачи.",
diff --git a/web/default/src/i18n/locales/vi.json b/web/default/src/i18n/locales/vi.json
index 4051edea..15c13588 100644
--- a/web/default/src/i18n/locales/vi.json
+++ b/web/default/src/i18n/locales/vi.json
@@ -3,6 +3,7 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Matching models": "Mô hình phù hợp",
     "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "Để trống giá tùy chọn để áp dụng giá đầu vào hoặc đầu ra cơ bản. Nhập 0 để miễn phí loại token đó.",
     "Timezone": "Múi giờ",
     "Failed to complete manual task billing.": "Không thể hoàn tất tính phí thủ công cho tác vụ.",
diff --git a/web/default/src/i18n/locales/zh.json b/web/default/src/i18n/locales/zh.json
index d6ea563f..0a7b536f 100644
--- a/web/default/src/i18n/locales/zh.json
+++ b/web/default/src/i18n/locales/zh.json
@@ -3,6 +3,7 @@
     "360": "360",
     "1000": "1000",
     "10000": "10000",
+    "Matching models": "匹配的模型",
     "Leave optional prices blank to use the base input or output price. Enter 0 to make that token category free.": "可选价格留空时沿用基础输入或输出价格；填写 0 表示该类 token 免费。",
     "Timezone": "时区",
     "Failed to complete manual task billing.": "无法完成人工任务计费。",

From 80234cba01133b8d497991a126f8c664ca3fc68a Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 13:32:30 +0800
Subject: [PATCH 03/20] fix: preserve wrapped pricing conditions in visual
 conversion

---
 .../src/features/pricing/lib/billing-expr.ts  |  5 +-
 .../features/pricing/lib/tier-expr.test.ts    | 51 +++++++++++++++++++
 .../src/features/pricing/lib/tier-expr.ts     | 18 +++++--
 web/default/src/i18n/locales/vi.json          |  2 +-
 4 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/web/default/src/features/pricing/lib/billing-expr.ts b/web/default/src/features/pricing/lib/billing-expr.ts
index cc5811e9..767e0ac1 100644
--- a/web/default/src/features/pricing/lib/billing-expr.ts
+++ b/web/default/src/features/pricing/lib/billing-expr.ts
@@ -284,7 +284,10 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
       const tierMatch = tierRe.exec(parts?.[2] || branch)
       if (!tierMatch) continue
       const conditionGroups: TierCondition[][] = []
-      for (const group of splitTopLevelExpression(condStr, '||')) {
+      for (const group of splitTopLevelExpression(
+        unwrapConditionParens(condStr),
+        '||'
+      )) {
         const groupConditions: TierCondition[] = []
         for (const cp of splitTopLevelExpression(
           unwrapConditionParens(group),
diff --git a/web/default/src/features/pricing/lib/tier-expr.test.ts b/web/default/src/features/pricing/lib/tier-expr.test.ts
index 845fd4b9..cf070989 100644
--- a/web/default/src/features/pricing/lib/tier-expr.test.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.test.ts
@@ -120,6 +120,9 @@ describe('visual optional price presence', () => {
       'tier("base", p * 3 + c * 15 + max(cr, 1))',
       'hour("Asia/Shanghai") > 99 ? tier("base", p * 3 + c * 15) : tier("other", p * 6 + c * 30)',
       'len < 100 && c == 5 ? tier("base", p * 3 + c * 15) : tier("other", p * 6 + c * 30)',
+      ': tier("base", p * 3 + c * 15)',
+      'tier("base", p * 3 + c * 15) :',
+      'len < 100 ? tier("base", p * 3 + c * 15) : : tier("other", p * 6 + c * 30)',
     ])
       assert.equal(tryParseVisualConfig(source), null, source)
   })
@@ -210,6 +213,54 @@ describe('evalExprLocally', () => {
 })
 
 describe('visual tier conditions', () => {
+  for (const condition of [
+    '((len < 100) || (len > 200))',
+    '((((len < 100) || (len > 200))))',
+    '((len < 100 && hour("Test/)||(:offset") >= 9) || (len > 200))',
+  ]) {
+    test(`preserves fully wrapped OR conditions: ${condition}`, () => {
+      const source = `${condition} ? tier("peak", p * 2 + c * 4 + cr * 0) : tier("off", p * 1 + c * 2)`
+      const display = parseTiersFromExpr(source)
+      assert.equal(display[0]?.conditionGroups?.length, 2)
+      assert.equal(display[0].conditionGroups![0][0].value, 100)
+      assert.equal(display[0].conditionGroups![1][0].value, 200)
+      const visual = tryParseVisualConfig(source)
+      assert.ok(visual)
+      assert.deepEqual(
+        visual.tiers[0].conditionGroups?.map((group) => group.conditions),
+        display[0].conditionGroups
+      )
+      assert.equal(visual.tiers[0].cache_read_unit_cost, 0)
+      assert.equal(visual.tiers[1].cache_read_unit_cost, undefined)
+      const regenerated = generateExprFromVisualConfig(visual)
+      assert.deepEqual(tryParseVisualConfig(regenerated), visual)
+      assert.deepEqual(parseTiersFromExpr(regenerated), display)
+      for (const len of [0, 99, 100, 150, 200, 201]) {
+        assert.deepEqual(
+          evalExprLocally(regenerated, len, 2, emptyExtraTokens),
+          evalExprLocally(source, len, 2, emptyExtraTokens)
+        )
+      }
+    })
+  }
+
+  test('keeps rejecting unsupported or lossy conditions inside outer wrappers', () => {
+    for (const condition of [
+      '((len < 100 || len > 200) && c > 1)',
+      '((len < 100) || (c == 5))',
+      '((hour("UTC") > 99) || (len > 200))',
+      '((len < 9007199254740993) || (len > 200))',
+    ]) {
+      assert.equal(
+        tryParseVisualConfig(
+          `${condition} ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)`
+        ),
+        null,
+        condition
+      )
+    }
+  })
+
   for (const timezone of ['Test/)||(', 'Test/)&&(', 'Test/:offset']) {
     test(`preserves quoted syntax in both pricing parsers: ${timezone}`, () => {
       const config = {
diff --git a/web/default/src/features/pricing/lib/tier-expr.ts b/web/default/src/features/pricing/lib/tier-expr.ts
index 5db16835..6d13c1fa 100644
--- a/web/default/src/features/pricing/lib/tier-expr.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.ts
@@ -194,7 +194,7 @@ function parseTierConditionGroups(conditionStr: string): TierConditionGroup[] {
   if (!conditionStr || conditionStr.trim() === 'true') return []
   const atomPattern =
     /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("([^"\\]+)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
-  return splitTopLevelExpression(conditionStr, '||')
+  return splitTopLevelExpression(unwrapConditionParens(conditionStr), '||')
     .map((groupStr) => unwrapConditionParens(groupStr))
     .map((groupStr) => {
       const conditions: TierConditionInput[] = []
@@ -376,10 +376,22 @@ export function tryParseVisualConfig(
 
     const tierRe = new RegExp(`^tier\\("([^"]*)",\\s*${bodyPat}\\)$`)
     const tiers: VisualTier[] = []
-    for (const branch of splitTopLevelExpression(body, ':')) {
+    const branches = splitTopLevelExpression(body, ':')
+    // The splitter omits empty parts. Reject missing branches before comparing
+    // conditions with only their complete outer parentheses removed.
+    if (
+      canonicalizeExprForComparison(branches.join(':')) !==
+      canonicalizeExprForComparison(body)
+    )
+      return null
+    const comparisonBranches: string[] = []
+    for (const branch of branches) {
       const parts = branch.match(/^(.*?)\s*\?\s*(tier\("[^"]*",[\s\S]+\))$/)
       const condStr = parts?.[1]?.trim() || ''
       const tierSource = parts?.[2] || branch
+      comparisonBranches.push(
+        parts ? `${unwrapConditionParens(condStr)} ? ${tierSource}` : branch
+      )
       const match = tierRe.exec(tierSource)
       if (!match) continue
       const conditionGroups = parseTierConditionGroups(condStr)
@@ -403,7 +415,7 @@ export function tryParseVisualConfig(
     const regenerated = generateExprFromVisualConfig(cfg)
     if (
       canonicalizeExprForComparison(regenerated) !==
-      canonicalizeExprForComparison(body)
+      canonicalizeExprForComparison(comparisonBranches.join(' : '))
     ) {
       return null
     }
diff --git a/web/default/src/i18n/locales/vi.json b/web/default/src/i18n/locales/vi.json
index 15c13588..ff4ef374 100644
--- a/web/default/src/i18n/locales/vi.json
+++ b/web/default/src/i18n/locales/vi.json
@@ -3108,7 +3108,7 @@
     "No matching items": "Không có mục phù hợp",
     "No matching results": "Không có kết quả phù hợp",
     "No matching rules": "Không có quy tắc phù hợp",
-    "No matching task rate cards.": "Không có thẻ giá tác vụ phù hợp.",
+    "No matching task rate cards.": "Không có bảng giá tác vụ phù hợp.",
     "No messages yet": "Chưa có tin nhắn",
     "No missing models found.": "Không tìm thấy mô hình nào bị thiếu.",
     "No model found.": "Không tìm thấy mô hình.",

From e32b9ab4c40ec49485cdfb79ff926fe27c6d99b6 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 14:29:35 +0800
Subject: [PATCH 04/20] fix: display unconditional pricing OR branches
 correctly

---
 .../src/features/pricing/lib/billing-expr.ts  | 16 ++++++++--
 .../features/pricing/lib/tier-expr.test.ts    | 31 +++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/web/default/src/features/pricing/lib/billing-expr.ts b/web/default/src/features/pricing/lib/billing-expr.ts
index 767e0ac1..686a5c89 100644
--- a/web/default/src/features/pricing/lib/billing-expr.ts
+++ b/web/default/src/features/pricing/lib/billing-expr.ts
@@ -288,11 +288,21 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
         unwrapConditionParens(condStr),
         '||'
       )) {
-        const groupConditions: TierCondition[] = []
-        for (const cp of splitTopLevelExpression(
+        const atoms = splitTopLevelExpression(
           unwrapConditionParens(group),
           '&&'
-        )) {
+        )
+        if (
+          atoms.length > 0 &&
+          atoms.every((atom) => unwrapConditionParens(atom) === 'true')
+        ) {
+          // A true OR branch makes this tier unconditional, including when
+          // restrictive groups were already collected earlier in the loop.
+          conditionGroups.length = 0
+          break
+        }
+        const groupConditions: TierCondition[] = []
+        for (const cp of atoms) {
           if (cp.trim() === 'true') continue
           const cm = cp
             .trim()
diff --git a/web/default/src/features/pricing/lib/tier-expr.test.ts b/web/default/src/features/pricing/lib/tier-expr.test.ts
index cf070989..398f2cf3 100644
--- a/web/default/src/features/pricing/lib/tier-expr.test.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.test.ts
@@ -213,6 +213,37 @@ describe('evalExprLocally', () => {
 })
 
 describe('visual tier conditions', () => {
+  for (const condition of [
+    'true || len < 100',
+    '(len < 100) || (len > 200) || ((true))',
+    '((len < 100) || (true && (true)))',
+  ]) {
+    test(`displays an unconditional OR tier without restrictions: ${condition}`, () => {
+      const source = `${condition} ? tier("always", p * 2 + c * 4) : tier("off", p * 1 + c * 2)`
+      const display = parseTiersFromExpr(source)
+      assert.equal(display.length, 2)
+      assert.deepEqual(display[0].conditions, [])
+      assert.equal(display[0].conditionGroups, undefined)
+      // Display simplification must not enable a lossy visual rewrite.
+      assert.equal(tryParseVisualConfig(source), null)
+      assert.deepEqual(evalExprLocally(source, 150, 2, emptyExtraTokens), {
+        cost: 308,
+        matchedTier: 'always',
+        error: null,
+      })
+    })
+  }
+
+  test('retains restrictions when true is an AND member rather than an OR branch', () => {
+    const tiers = parseTiersFromExpr(
+      '(true && len < 100) || (len > 200) ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
+    )
+    assert.deepEqual(tiers[0].conditionGroups, [
+      [{ var: 'len', op: '<', value: 100 }],
+      [{ var: 'len', op: '>', value: 200 }],
+    ])
+  })
+
   for (const condition of [
     '((len < 100) || (len > 200))',
     '((((len < 100) || (len > 200))))',

From b7ad074d263b25b1ff8a808f560d77a77171b117 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 16:14:32 +0800
Subject: [PATCH 05/20] fix: fall back for unsupported pricing conditions

---
 relay/channel/openai/chat_stream_test.go      |  5 ++-
 .../components/model-details.runtime.test.tsx | 19 +++++++++
 .../src/features/pricing/lib/billing-expr.ts  | 41 ++++++++++---------
 .../features/pricing/lib/tier-expr.test.ts    | 27 ++++++++++++
 web/default/src/i18n/locales/fr.json          |  2 +-
 web/default/src/i18n/locales/ja.json          |  2 +-
 web/default/src/i18n/locales/ru.json          |  2 +-
 7 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/relay/channel/openai/chat_stream_test.go b/relay/channel/openai/chat_stream_test.go
index 0ad3aa30..a9d14836 100644
--- a/relay/channel/openai/chat_stream_test.go
+++ b/relay/channel/openai/chat_stream_test.go
@@ -184,7 +184,10 @@ func TestNativeChatStreamBufferLimitsCloseRetryWindow(t *testing.T) {
 			if limit == "bytes" {
 				frames = []string{`{"padding":"` + strings.Repeat("x", maxPendingChatStreamBytes) + `","choices":[{"delta":{"role":"assistant"}}]}`}
 			}
-			_, apiErr := replayChatStream(c, info, append(frames, chatOverloadFrame)...)
+			allFrames := make([]string, len(frames)+1)
+			copy(allFrames, frames)
+			allFrames[len(frames)] = chatOverloadFrame
+			_, apiErr := replayChatStream(c, info, allFrames...)
 			require.NotNil(t, apiErr)
 			require.True(t, types.IsSkipRetryError(apiErr))
 			require.NotEmpty(t, recorder.Body.String())
diff --git a/web/default/src/features/pricing/components/model-details.runtime.test.tsx b/web/default/src/features/pricing/components/model-details.runtime.test.tsx
index 0671b48c..20d43565 100644
--- a/web/default/src/features/pricing/components/model-details.runtime.test.tsx
+++ b/web/default/src/features/pricing/components/model-details.runtime.test.tsx
@@ -21,6 +21,7 @@ import { createReactTestEnvironment } from '@/test/react'
 import assert from 'node:assert/strict'
 import { after, before, describe, test } from 'node:test'
 import type { PricingModel } from '../types'
+import { DynamicPricingBreakdown } from './dynamic-pricing-breakdown'
 import { ModelDetailsContent } from './model-details'
 
 const testEnv = createReactTestEnvironment()
@@ -29,6 +30,24 @@ before(() => testEnv.setup())
 
 after(() => testEnv.teardown())
 
+test('shows the raw expression instead of partially parsed tier restrictions', async () => {
+  const expression =
+    'len < 100 && c == 5 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
+  const view = await testEnv.render(
+    <DynamicPricingBreakdown billingExpr={expression} />
+  )
+  try {
+    assert.match(
+      view.container.textContent || '',
+      /Unable to parse structured pricing/
+    )
+    assert.equal(view.container.querySelector('code')?.textContent, expression)
+    assert.equal(view.container.querySelector('table'), null)
+  } finally {
+    await view.unmount()
+  }
+})
+
 describe('ModelDetailsContent structured task pricing', () => {
   function createModel(inputVideoMaxQuantity?: number): PricingModel {
     return {
diff --git a/web/default/src/features/pricing/lib/billing-expr.ts b/web/default/src/features/pricing/lib/billing-expr.ts
index 686a5c89..70e19038 100644
--- a/web/default/src/features/pricing/lib/billing-expr.ts
+++ b/web/default/src/features/pricing/lib/billing-expr.ts
@@ -284,6 +284,7 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
       const tierMatch = tierRe.exec(parts?.[2] || branch)
       if (!tierMatch) continue
       const conditionGroups: TierCondition[][] = []
+      let isUnconditional = false
       for (const group of splitTopLevelExpression(
         unwrapConditionParens(condStr),
         '||'
@@ -296,34 +297,34 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
           atoms.length > 0 &&
           atoms.every((atom) => unwrapConditionParens(atom) === 'true')
         ) {
-          // A true OR branch makes this tier unconditional, including when
-          // restrictive groups were already collected earlier in the loop.
-          conditionGroups.length = 0
-          break
+          // Still validate the remaining groups before using structured pricing.
+          isUnconditional = true
+          continue
         }
         const groupConditions: TierCondition[] = []
         for (const cp of atoms) {
-          if (cp.trim() === 'true') continue
-          const cm = cp
-            .trim()
-            .match(
-              /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("([^"\\]+)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
-            )
-          if (cm) {
-            groupConditions.push({
-              var: (cm[1] || cm[2]) as TierCondition['var'],
-              op: cm[4] as TierCondition['op'],
-              value: Number(cm[5]),
-              ...(cm[2] ? { timezone: cm[3] } : {}),
-            })
-          }
+          const atom = unwrapConditionParens(cp)
+          if (atom === 'true') continue
+          const cm = atom.match(
+            /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("([^"\\]+)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
+          )
+          // A partial condition would advertise a different pricing contract.
+          if (!cm || !Number.isFinite(Number(cm[5]))) return []
+          groupConditions.push({
+            var: (cm[1] || cm[2]) as TierCondition['var'],
+            op: cm[4] as TierCondition['op'],
+            value: Number(cm[5]),
+            ...(cm[2] ? { timezone: cm[3] } : {}),
+          })
         }
         if (groupConditions.length > 0) conditionGroups.push(groupConditions)
       }
       const tier = parseTierBody(tierMatch[2]) as ParsedTier
       tier.label = tierMatch[1]
-      tier.conditions = conditionGroups.flat()
-      if (conditionGroups.length > 1) tier.conditionGroups = conditionGroups
+      tier.conditions = isUnconditional ? [] : conditionGroups.flat()
+      if (!isUnconditional && conditionGroups.length > 1) {
+        tier.conditionGroups = conditionGroups
+      }
       tiers.push(tier)
     }
     return tiers
diff --git a/web/default/src/features/pricing/lib/tier-expr.test.ts b/web/default/src/features/pricing/lib/tier-expr.test.ts
index 398f2cf3..6ac2a8fd 100644
--- a/web/default/src/features/pricing/lib/tier-expr.test.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.test.ts
@@ -213,6 +213,33 @@ describe('evalExprLocally', () => {
 })
 
 describe('visual tier conditions', () => {
+  test('rejects incomplete structured displays for unsupported conditions', () => {
+    for (const condition of [
+      'len < 100 && c == 5',
+      '(len < 100) || (c == 5)',
+      'len < 100 && (c > 1 || c < 5)',
+      'param("service_tier") == "priority" && len < 100',
+      '(len < 100) || (true) || (c == 5)',
+      'len < 1e999',
+      'len < 1+2',
+    ]) {
+      assert.deepEqual(
+        parseTiersFromExpr(
+          `${condition} ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)`
+        ),
+        [],
+        condition
+      )
+    }
+  })
+
+  test('preserves wrapped true AND members in supported display conditions', () => {
+    const tiers = parseTiersFromExpr(
+      '(true) && len < 100 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
+    )
+    assert.deepEqual(tiers[0].conditions, [{ var: 'len', op: '<', value: 100 }])
+  })
+
   for (const condition of [
     'true || len < 100',
     '(len < 100) || (len > 200) || ((true))',
diff --git a/web/default/src/i18n/locales/fr.json b/web/default/src/i18n/locales/fr.json
index 5590dc82..2b4e0082 100644
--- a/web/default/src/i18n/locales/fr.json
+++ b/web/default/src/i18n/locales/fr.json
@@ -3108,7 +3108,7 @@
     "No matching items": "Aucun élément correspondant",
     "No matching results": "Aucun résultat correspondant",
     "No matching rules": "Aucune règle correspondante",
-    "No matching task rate cards.": "Aucune carte tarifaire de tâche correspondante.",
+    "No matching task rate cards.": "Aucune grille tarifaire de tâche correspondante.",
     "No messages yet": "Pas encore de messages",
     "No missing models found.": "Aucun modèle manquant trouvé.",
     "No model found.": "Aucun modèle trouvé.",
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index a42b9414..e8f48286 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -3108,7 +3108,7 @@
     "No matching items": "一致する項目がありません",
     "No matching results": "一致する結果がありません",
     "No matching rules": "一致するルールがありません",
-    "No matching task rate cards.": "一致するタスク料金カードはありません。",
+    "No matching task rate cards.": "一致するタスクレートカードはありません。",
     "No messages yet": "まだメッセージがありません",
     "No missing models found.": "不足しているモデルは見つかりません。",
     "No model found.": "モデルが見つかりません。",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index c0f94782..f7264b99 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -3108,7 +3108,7 @@
     "No matching items": "Нет подходящих элементов",
     "No matching results": "Нет совпадений",
     "No matching rules": "Нет совпадающих правил",
-    "No matching task rate cards.": "Подходящие карточки тарифов задач не найдены.",
+    "No matching task rate cards.": "Подходящие тарифные карты задач не найдены.",
     "No messages yet": "Сообщений пока нет",
     "No missing models found.": "Недостающие модели не найдены.",
     "No model found.": "Модель не найдена.",

From 7e7a7744afdd4a4b1ba60f6b0167949e0558cb9f Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 17:28:25 +0800
Subject: [PATCH 06/20] fix: clear manual groups when disabling automatic
 routing

---
 .../api-key-routing-editor.test.tsx           | 172 ++++++++++++++++--
 .../components/api-key-routing-editor.tsx     |   9 +-
 .../components/api-keys-mutate-drawer.tsx     |  31 +---
 .../features/keys/lib/api-key-form.test.ts    |  43 +++--
 .../src/features/keys/lib/api-key-form.ts     |  30 ++-
 5 files changed, 211 insertions(+), 74 deletions(-)

diff --git a/web/default/src/features/keys/components/api-key-routing-editor.test.tsx b/web/default/src/features/keys/components/api-key-routing-editor.test.tsx
index 57ee6a43..b0220179 100644
--- a/web/default/src/features/keys/components/api-key-routing-editor.test.tsx
+++ b/web/default/src/features/keys/components/api-key-routing-editor.test.tsx
@@ -16,45 +16,180 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API/issues
 */
-import { createReactTestEnvironment } from '@/test/react'
-import { cleanup, fireEvent, render, within } from '@testing-library/react'
+import { act, useState, type ReactElement } from 'react'
+import { createInstance } from 'i18next'
+import { JSDOM } from 'jsdom'
 import assert from 'node:assert/strict'
 import { after, afterEach, before, describe, test } from 'node:test'
 import { I18nextProvider } from 'react-i18next'
 import { MAX_MANUAL_ROUTING_GROUPS } from '../lib/api-key-form'
-import { ApiKeyRoutingEditor } from './api-key-routing-editor'
+import type { TokenRoutingMode } from '../types'
 
-const testEnv = createReactTestEnvironment()
+let ApiKeyRoutingEditor: typeof import('./api-key-routing-editor').ApiKeyRoutingEditor
+let cleanup: typeof import('@testing-library/react/pure').cleanup
+let fireEvent: typeof import('@testing-library/react/pure').fireEvent
+let render: typeof import('@testing-library/react/pure').render
+let within: typeof import('@testing-library/react/pure').within
 
-before(() => testEnv.setup())
+const dom = new JSDOM('<!doctype html><html><body></body></html>', {
+  url: 'http://localhost/',
+  pretendToBeVisual: true,
+})
+const i18n = createInstance()
+const previousGlobals = new Map<string, PropertyDescriptor | undefined>()
 
-afterEach(() => cleanup())
+before(async () => {
+  await i18n.init({ lng: 'en', resources: { en: { translation: {} } } })
+  const globals = {
+    window: dom.window,
+    document: dom.window.document,
+    navigator: dom.window.navigator,
+    HTMLElement: dom.window.HTMLElement,
+    Element: dom.window.Element,
+    Node: dom.window.Node,
+    Event: dom.window.Event,
+    MouseEvent: dom.window.MouseEvent,
+    MutationObserver: dom.window.MutationObserver,
+    getComputedStyle: dom.window.getComputedStyle.bind(dom.window),
+    requestAnimationFrame: dom.window.requestAnimationFrame.bind(dom.window),
+    cancelAnimationFrame: dom.window.cancelAnimationFrame.bind(dom.window),
+    ResizeObserver: class {
+      observe() {}
+      unobserve() {}
+      disconnect() {}
+    },
+    IS_REACT_ACT_ENVIRONMENT: true,
+  }
+  for (const [key, value] of Object.entries(globals)) {
+    previousGlobals.set(key, Object.getOwnPropertyDescriptor(globalThis, key))
+    Object.defineProperty(globalThis, key, {
+      configurable: true,
+      writable: true,
+      value,
+    })
+  }
+  dom.window.HTMLElement.prototype.scrollIntoView = () => undefined
+  Object.defineProperty(dom.window, 'matchMedia', {
+    value: () => ({
+      matches: false,
+      addListener() {},
+      removeListener() {},
+      addEventListener() {},
+      removeEventListener() {},
+    }),
+  })
+  // React and Base UI must detect the browser before mounting interactive portals.
+  ;({ cleanup, fireEvent, render, within } =
+    await import('@testing-library/react/pure'))
+  ;({ ApiKeyRoutingEditor } = await import('./api-key-routing-editor'))
+})
 
-after(() => testEnv.teardown())
+afterEach(async () => {
+  await act(async () => cleanup())
+})
+
+after(() => {
+  dom.window.close()
+  for (const [key, descriptor] of previousGlobals) {
+    if (descriptor) Object.defineProperty(globalThis, key, descriptor)
+    else Reflect.deleteProperty(globalThis, key)
+  }
+})
 
 const groups = Array.from(
   { length: MAX_MANUAL_ROUTING_GROUPS },
   (_, index) => `group-${index + 1}`
 )
 
+const availableGroups = Array.from(
+  { length: 14 },
+  (_, index) => `group-${index + 1}`
+)
+
+function RoutingHarness(props: { initialGroups: string[] }): ReactElement {
+  const [mode, setMode] = useState<TokenRoutingMode>('smart')
+  const [manualGroups, setManualGroups] = useState(props.initialGroups)
+  return (
+    <I18nextProvider i18n={i18n}>
+      <ApiKeyRoutingEditor
+        mode={mode}
+        route='auto'
+        manualGroups={manualGroups}
+        retryOnFailure
+        autoRouteOptions={[
+          { value: 'auto', label: 'Automatic', groups: availableGroups },
+        ]}
+        realGroupOptions={availableGroups.map((group) => ({
+          value: group,
+          label: group,
+          ratio: 1,
+        }))}
+        onModeChange={setMode}
+        onRouteChange={() => undefined}
+        onManualGroupsChange={setManualGroups}
+        onRetryOnFailureChange={() => undefined}
+      />
+    </I18nextProvider>
+  )
+}
+
 describe('ApiKeyRoutingEditor', () => {
-  test('keeps the maximum manual selection in one accessible selector', (): void => {
+  for (const initialGroups of [[], groups]) {
+    test(`clears ${initialGroups.length} stored manual selections when automatic routing is disabled`, async () => {
+      const view = render(<RoutingHarness initialGroups={initialGroups} />)
+      view.getByText('+11')
+      fireEvent.click(
+        view.getByRole('button', { name: 'Disable and select groups' })
+      )
+
+      view.getByText('0 / 8 groups selected')
+      view.getByText('Select at least one manual routing group')
+      assert.equal(
+        view.queryAllByRole('button', { name: /^Remove group-/ }).length,
+        0
+      )
+
+      fireEvent.click(view.getByRole('combobox', { name: 'Select groups' }))
+      const options = await view.findAllByRole('option')
+      assert.equal(options.length, availableGroups.length)
+      for (const group of availableGroups) {
+        const option = view.getByRole('option', {
+          name: `${group}1x Ratio`,
+        })
+        assert.notEqual(option.getAttribute('aria-disabled'), 'true')
+      }
+      fireEvent.click(view.getByRole('option', { name: 'group-141x Ratio' }))
+      within(view.getByRole('combobox', { name: 'Select groups' })).getByText(
+        'group-14'
+      )
+      fireEvent.click(view.getByRole('combobox', { name: 'Select groups' }))
+
+      fireEvent.click(
+        view.getByRole('button', { name: 'Enable automatic routing' })
+      )
+      fireEvent.click(
+        view.getByRole('button', { name: 'Disable and select groups' })
+      )
+      view.getByText('0 / 8 groups selected')
+    })
+  }
+
+  test('keeps all available groups visible at the manual selection limit', async () => {
     let changedGroups: string[] | undefined
     const view = render(
-      <I18nextProvider i18n={testEnv.i18n}>
+      <I18nextProvider i18n={i18n}>
         <ApiKeyRoutingEditor
           mode='manual'
           route='auto'
           manualGroups={groups}
           retryOnFailure
           autoRouteOptions={[]}
-          realGroupOptions={groups.map((group) => ({
+          realGroupOptions={availableGroups.map((group) => ({
             value: group,
             label: group,
             desc: group,
             ratio: 1,
           }))}
-          defaultManualGroups={groups}
           onModeChange={() => undefined}
           onRouteChange={() => undefined}
           onManualGroupsChange={(nextGroups: string[]): void => {
@@ -74,6 +209,21 @@ describe('ApiKeyRoutingEditor', () => {
     fireEvent.click(trigger)
 
     assert.equal(trigger.getAttribute('aria-expanded'), 'true')
+    const options = await view.findAllByRole('option')
+    assert.equal(options.length, availableGroups.length)
+    for (const group of availableGroups) {
+      const option = view.getByRole('option', {
+        name: `${group}${group}1x Ratio`,
+      })
+      assert.equal(
+        option.getAttribute('aria-disabled'),
+        String(!groups.includes(group))
+      )
+    }
+    fireEvent.click(
+      view.getByRole('option', { name: 'group-14group-141x Ratio' })
+    )
+    assert.equal(changedGroups, undefined)
 
     const removeButtons = view.getAllByRole('button', {
       name: /^Remove group-/,
diff --git a/web/default/src/features/keys/components/api-key-routing-editor.tsx b/web/default/src/features/keys/components/api-key-routing-editor.tsx
index c348d940..a97675da 100644
--- a/web/default/src/features/keys/components/api-key-routing-editor.tsx
+++ b/web/default/src/features/keys/components/api-key-routing-editor.tsx
@@ -69,7 +69,6 @@ type ApiKeyRoutingEditorProps = {
   retryOnFailure: boolean
   autoRouteOptions: ApiKeyAutoRouteOption[]
   realGroupOptions: ApiKeyGroupOption[]
-  defaultManualGroups: string[]
   preserveUnavailableRouting?: boolean
   routesLoading?: boolean
   disabled?: boolean
@@ -432,11 +431,9 @@ export function ApiKeyRoutingEditor(props: ApiKeyRoutingEditorProps) {
     (option) => option.value === props.route
   )
 
-  const setMode = (mode: TokenRoutingMode) => {
-    if (mode === 'manual' && props.manualGroups.length === 0) {
-      props.onManualGroupsChange(
-        props.defaultManualGroups.slice(0, MAX_MANUAL_ROUTING_GROUPS)
-      )
+  const setMode = (mode: TokenRoutingMode): void => {
+    if (mode === 'manual') {
+      props.onManualGroupsChange([])
     }
     props.onModeChange(mode)
   }
diff --git a/web/default/src/features/keys/components/api-keys-mutate-drawer.tsx b/web/default/src/features/keys/components/api-keys-mutate-drawer.tsx
index 95f09d50..e11bbc82 100644
--- a/web/default/src/features/keys/components/api-keys-mutate-drawer.tsx
+++ b/web/default/src/features/keys/components/api-keys-mutate-drawer.tsx
@@ -133,7 +133,7 @@ export function ApiKeysMutateDrawer(
     realGroups,
     autoRouteOptions,
     effectiveAutoRoute,
-    defaultManualGroups,
+    legacyManualGroups,
   } = useMemo(() => {
     const entries = Object.entries(groupsRaw)
     const real: ApiKeyGroupOption[] = entries
@@ -177,7 +177,7 @@ export function ApiKeysMutateDrawer(
       realGroups: real,
       autoRouteOptions: routes,
       effectiveAutoRoute: route,
-      defaultManualGroups:
+      legacyManualGroups:
         routeGroups.length > 0
           ? routeGroups
           : real.slice(0, 1).map((option) => option.value),
@@ -187,13 +187,13 @@ export function ApiKeysMutateDrawer(
   const routingContextRef = useRef({
     autoRouteOptions,
     realGroups,
-    defaultManualGroups,
+    legacyManualGroups,
     effectiveAutoRoute,
   })
   routingContextRef.current = {
     autoRouteOptions,
     realGroups,
-    defaultManualGroups,
+    legacyManualGroups,
     effectiveAutoRoute,
   }
   const schema = useMemo(
@@ -226,7 +226,7 @@ export function ApiKeysMutateDrawer(
     const {
       autoRouteOptions: availableAutoRoutes,
       realGroups: availableRealGroups,
-      defaultManualGroups: availableDefaultManualGroups,
+      legacyManualGroups: availableLegacyManualGroups,
       effectiveAutoRoute: availableAutoRoute,
     } = routingContextRef.current
 
@@ -265,7 +265,7 @@ export function ApiKeysMutateDrawer(
           setPreservedManualGroups(unavailableManualGroups)
           const routeManualGroups =
             availableAutoRoutes.find((route) => route.value === routeKey)
-              ?.groups || availableDefaultManualGroups
+              ?.groups || availableLegacyManualGroups
           form.reset(
             transformApiKeyToFormDefaults(result.data, routeManualGroups)
           )
@@ -281,12 +281,7 @@ export function ApiKeysMutateDrawer(
       setEditingLegacyRouting(false)
       setPreservedSmartRoute(undefined)
       setPreservedManualGroups([])
-      form.reset(
-        getApiKeyFormDefaultValues(
-          availableAutoRoute,
-          availableDefaultManualGroups
-        )
-      )
+      form.reset(getApiKeyFormDefaultValues(availableAutoRoute))
     }
 
     return () => {
@@ -467,7 +462,6 @@ export function ApiKeysMutateDrawer(
                         retryOnFailure={!!crossGroupRetry}
                         autoRouteOptions={autoRouteOptions}
                         realGroupOptions={realGroups}
-                        defaultManualGroups={defaultManualGroups}
                         preserveUnavailableRouting={
                           Boolean(preservedSmartRoute) ||
                           preservedManualGroups.length > 0
@@ -485,17 +479,6 @@ export function ApiKeysMutateDrawer(
                             shouldDirty: true,
                             shouldValidate: true,
                           })
-                          if (!form.getFieldState('manual_groups').isDirty) {
-                            const routeGroups =
-                              autoRouteOptions.find(
-                                (option) => option.value === route
-                              )?.groups || []
-                            form.setValue(
-                              'manual_groups',
-                              routeGroups.slice(0, MAX_MANUAL_ROUTING_GROUPS),
-                              { shouldValidate: true }
-                            )
-                          }
                         }}
                         onManualGroupsChange={(groups) =>
                           form.setValue('manual_groups', groups, {
diff --git a/web/default/src/features/keys/lib/api-key-form.test.ts b/web/default/src/features/keys/lib/api-key-form.test.ts
index 39423803..a6deefe1 100644
--- a/web/default/src/features/keys/lib/api-key-form.test.ts
+++ b/web/default/src/features/keys/lib/api-key-form.test.ts
@@ -23,11 +23,11 @@ const translate = ((key: string) => key) as TFunction
 
 describe('API key routing form', () => {
   test('defaults new keys to the configured automatic routing group', () => {
-    const values = getApiKeyFormDefaultValues('auto', ['base', 'default'])
+    const values = getApiKeyFormDefaultValues('auto')
     const payload = transformFormDataToPayload(values)
 
     assert.equal(values.routing_mode, 'smart')
-    assert.deepEqual(values.manual_groups, ['base', 'default'])
+    assert.deepEqual(values.manual_groups, [])
     assert.deepEqual(payload.routing, {
       version: 1,
       mode: 'smart',
@@ -97,18 +97,12 @@ describe('API key routing form', () => {
     assert.equal(values.manual_groups.includes(''), false)
   })
 
-  test('normalizes default manual groups to the supported maximum', () => {
-    const values = getApiKeyFormDefaultValues(
-      'auto',
-      Array.from(
-        { length: MAX_MANUAL_ROUTING_GROUPS + 2 },
-        (_, index) => `group-${index}`
-      )
-    )
-
-    assert.equal(values.manual_groups.length, MAX_MANUAL_ROUTING_GROUPS)
-    assert.equal(values.manual_groups.includes(''), false)
-
+  test('requires a manual selection and enforces the supported maximum', () => {
+    const values = {
+      ...getApiKeyFormDefaultValues(),
+      name: 'manual-key',
+      routing_mode: 'manual',
+    }
     const schema = getApiKeyFormSchema(translate, {
       smartRoutes: ['auto'],
       manualGroups: Array.from(
@@ -116,6 +110,21 @@ describe('API key routing form', () => {
         (_, index) => `group-${index}`
       ),
     })
+    const empty = schema.safeParse(values)
+    assert.equal(empty.success, false)
+    assert.ok(
+      empty.error?.issues.some((issue) => issue.path[0] === 'manual_groups')
+    )
+    const selected = schema.safeParse({ ...values, manual_groups: ['group-9'] })
+    assert.equal(selected.success, true)
+    const maximum = schema.safeParse({
+      ...values,
+      manual_groups: Array.from(
+        { length: MAX_MANUAL_ROUTING_GROUPS },
+        (_, index) => `group-${index}`
+      ),
+    })
+    assert.equal(maximum.success, true)
     const result = schema.safeParse({
       ...values,
       routing_mode: 'manual',
@@ -186,7 +195,7 @@ describe('API key routing form', () => {
     assert.equal(shouldIncludeRoutingProjection(true, true, false), false)
   })
 
-  test('uses the selected smart route groups when switching to manual mode', () => {
+  test('does not seed manual groups when loading a smart key', () => {
     const apiKey = {
       id: 2,
       name: 'smart-key',
@@ -212,7 +221,7 @@ describe('API key routing form', () => {
     } satisfies ApiKey
 
     const values = transformApiKeyToFormDefaults(apiKey, ['fast', 'default'])
-    assert.deepEqual(values.manual_groups, ['fast', 'default'])
+    assert.deepEqual(values.manual_groups, [])
     assert.equal(values.cross_group_retry, false)
   })
 
@@ -222,7 +231,7 @@ describe('API key routing form', () => {
     assert.equal(shouldIncludeRoutingProjection(true, false, false), true)
 
     const payload = transformFormDataToPayload(
-      getApiKeyFormDefaultValues('auto', ['default']),
+      getApiKeyFormDefaultValues('auto'),
       { includeRouting: false }
     )
 
diff --git a/web/default/src/features/keys/lib/api-key-form.ts b/web/default/src/features/keys/lib/api-key-form.ts
index b0af43df..641e646d 100644
--- a/web/default/src/features/keys/lib/api-key-form.ts
+++ b/web/default/src/features/keys/lib/api-key-form.ts
@@ -146,16 +146,12 @@ export const API_KEY_FORM_DEFAULT_VALUES: ApiKeyFormValues = {
 }
 
 export function getApiKeyFormDefaultValues(
-  defaultAutoRoute: string = DEFAULT_AUTO_ROUTE_KEY,
-  defaultManualGroups: string[] = []
+  defaultAutoRoute: string = DEFAULT_AUTO_ROUTE_KEY
 ): ApiKeyFormValues {
-  const availableManualGroups = defaultManualGroups
-    .filter((group) => group.trim() !== '')
-    .slice(0, MAX_MANUAL_ROUTING_GROUPS)
   return {
     ...API_KEY_FORM_DEFAULT_VALUES,
     routing_route: defaultAutoRoute,
-    manual_groups: availableManualGroups,
+    manual_groups: [],
   }
 }
 
@@ -231,25 +227,27 @@ export function transformFormDataToPayload(
  */
 export function transformApiKeyToFormDefaults(
   apiKey: ApiKey,
-  smartModeManualGroups: string[] = []
+  legacyManualGroups: string[] = []
 ): ApiKeyFormValues {
   const routing = apiKey.routing
   const legacySmart = !routing && isAutoRouteKey(apiKey.group)
   const mode = routing?.mode ?? (legacySmart ? 'smart' : 'manual')
-  const availableManualGroups = smartModeManualGroups
+  const availableManualGroups = legacyManualGroups
     .filter((group) => group.trim() !== '')
     .slice(0, MAX_MANUAL_ROUTING_GROUPS)
   const legacyGroup = apiKey.group?.trim() || ''
   const storedManualGroups =
     routing?.groups?.filter((group) => group.trim() !== '') || []
-  const manualGroups =
-    mode === 'manual'
-      ? storedManualGroups.length > 0
-        ? storedManualGroups
-        : legacyGroup
-          ? [legacyGroup]
-          : availableManualGroups
-      : availableManualGroups
+  let manualGroups: string[] = []
+  if (mode === 'manual') {
+    if (storedManualGroups.length > 0) {
+      manualGroups = storedManualGroups
+    } else if (legacyGroup) {
+      manualGroups = [legacyGroup]
+    } else {
+      manualGroups = availableManualGroups
+    }
+  }
   return {
     name: apiKey.name,
     remain_quota_dollars: apiKey.unlimited_quota

From fac6444e81e6e11f5bef901abd9ed00dfe607d9a Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 18:14:02 +0800
Subject: [PATCH 07/20] fix: reject incomplete pricing displays and clarify
 fallback tiers

---
 .../components/model-details.runtime.test.tsx | 40 +++++++++++-------
 .../src/features/pricing/lib/billing-expr.ts  | 18 ++++----
 .../features/pricing/lib/expression-syntax.ts | 17 +++++++-
 .../features/pricing/lib/tier-expr.test.ts    | 42 +++++++++++++++++++
 .../src/features/pricing/lib/tier-expr.ts     | 18 ++++----
 .../tiered-pricing-editor.runtime.test.tsx    |  1 +
 .../models/tiered-pricing-visual-editor.tsx   | 20 ++++-----
 7 files changed, 112 insertions(+), 44 deletions(-)

diff --git a/web/default/src/features/pricing/components/model-details.runtime.test.tsx b/web/default/src/features/pricing/components/model-details.runtime.test.tsx
index 20d43565..e32ae7f5 100644
--- a/web/default/src/features/pricing/components/model-details.runtime.test.tsx
+++ b/web/default/src/features/pricing/components/model-details.runtime.test.tsx
@@ -30,23 +30,31 @@ before(() => testEnv.setup())
 
 after(() => testEnv.teardown())
 
-test('shows the raw expression instead of partially parsed tier restrictions', async () => {
-  const expression =
-    'len < 100 && c == 5 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
-  const view = await testEnv.render(
-    <DynamicPricingBreakdown billingExpr={expression} />
-  )
-  try {
-    assert.match(
-      view.container.textContent || '',
-      /Unable to parse structured pricing/
+for (const expression of [
+  'len < 100 && c == 5 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)',
+  'len < 100 ? tier("peak", p * 2 + c * 4) : max(p, 1)',
+  'len < 9007199254740993 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)',
+  'len < 1e-999 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)',
+]) {
+  test(`shows the complete raw expression when structured parsing is unsupported: ${expression}`, async () => {
+    const view = await testEnv.render(
+      <DynamicPricingBreakdown billingExpr={expression} />
     )
-    assert.equal(view.container.querySelector('code')?.textContent, expression)
-    assert.equal(view.container.querySelector('table'), null)
-  } finally {
-    await view.unmount()
-  }
-})
+    try {
+      assert.match(
+        view.container.textContent || '',
+        /Unable to parse structured pricing/
+      )
+      assert.equal(
+        view.container.querySelector('code')?.textContent,
+        expression
+      )
+      assert.equal(view.container.querySelector('table'), null)
+    } finally {
+      await view.unmount()
+    }
+  })
+}
 
 describe('ModelDetailsContent structured task pricing', () => {
   function createModel(inputVideoMaxQuantity?: number): PricingModel {
diff --git a/web/default/src/features/pricing/lib/billing-expr.ts b/web/default/src/features/pricing/lib/billing-expr.ts
index 70e19038..fb29086b 100644
--- a/web/default/src/features/pricing/lib/billing-expr.ts
+++ b/web/default/src/features/pricing/lib/billing-expr.ts
@@ -17,6 +17,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API/issues
 */
 import {
+  isSupportedNumericLiteral,
   splitTopLevelExpression,
   unwrapConditionParens,
 } from './expression-syntax'
@@ -278,20 +279,21 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
     const { body } = stripExprVersion(exprStr)
     const tierRe = /^tier\("([^"]*)",\s*([\s\S]+)\)$/
     const tiers: ParsedTier[] = []
-    for (const branch of splitTopLevelExpression(body, ':')) {
+    for (const branch of splitTopLevelExpression(body, ':', true)) {
       const parts = branch.match(/^(.*?)\s*\?\s*(tier\("[^"]*",[\s\S]+\))$/)
       const condStr = parts?.[1]?.trim() || ''
       const tierMatch = tierRe.exec(parts?.[2] || branch)
-      if (!tierMatch) continue
+      if (!tierMatch || (parts && !condStr)) return []
       const conditionGroups: TierCondition[][] = []
       let isUnconditional = false
-      for (const group of splitTopLevelExpression(
-        unwrapConditionParens(condStr),
-        '||'
-      )) {
+      const groups = condStr
+        ? splitTopLevelExpression(unwrapConditionParens(condStr), '||', true)
+        : []
+      for (const group of groups) {
         const atoms = splitTopLevelExpression(
           unwrapConditionParens(group),
-          '&&'
+          '&&',
+          true
         )
         if (
           atoms.length > 0 &&
@@ -309,7 +311,7 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
             /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("([^"\\]+)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
           )
           // A partial condition would advertise a different pricing contract.
-          if (!cm || !Number.isFinite(Number(cm[5]))) return []
+          if (!cm || !isSupportedNumericLiteral(cm[5])) return []
           groupConditions.push({
             var: (cm[1] || cm[2]) as TierCondition['var'],
             op: cm[4] as TierCondition['op'],
diff --git a/web/default/src/features/pricing/lib/expression-syntax.ts b/web/default/src/features/pricing/lib/expression-syntax.ts
index 3f0b9044..0731000e 100644
--- a/web/default/src/features/pricing/lib/expression-syntax.ts
+++ b/web/default/src/features/pricing/lib/expression-syntax.ts
@@ -19,7 +19,8 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 // Split only outside calls and quoted strings; both pricing parsers share this contract.
 export function splitTopLevelExpression(
   source: string,
-  operator: ':' | '&&' | '||'
+  operator: ':' | '&&' | '||',
+  preserveEmpty: boolean = false
 ): string[] {
   const parts: string[] = []
   let start = 0
@@ -47,7 +48,19 @@ export function splitTopLevelExpression(
     }
   }
   parts.push(source.slice(start).trim())
-  return parts.filter(Boolean)
+  return preserveEmpty ? parts : parts.filter(Boolean)
+}
+
+// Reject non-finite values, unsafe integer magnitudes, and nonzero underflow.
+export function isSupportedNumericLiteral(source: string): boolean {
+  if (!/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/.test(source))
+    return false
+  const value = Number(source)
+  return (
+    Number.isFinite(value) &&
+    (!Number.isInteger(value) || Number.isSafeInteger(value)) &&
+    (value !== 0 || !/[1-9]/.test(source.split(/[eE]/)[0]))
+  )
 }
 
 // Remove enclosing parentheses without interpreting quoted punctuation.
diff --git a/web/default/src/features/pricing/lib/tier-expr.test.ts b/web/default/src/features/pricing/lib/tier-expr.test.ts
index 6ac2a8fd..22e85de2 100644
--- a/web/default/src/features/pricing/lib/tier-expr.test.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.test.ts
@@ -213,6 +213,45 @@ describe('evalExprLocally', () => {
 })
 
 describe('visual tier conditions', () => {
+  test('rejects structured displays with unsupported or missing branches', () => {
+    for (const expression of [
+      'len < 100 ? tier("peak", p * 2 + c * 4) : max(p, 1)',
+      'len < 100 ? max(p, 1) : tier("off", p * 1 + c * 2)',
+      'len < 100 ? tier("peak", p * 2 + c * 4) : : tier("off", p * 1 + c * 2)',
+      ': tier("off", p * 1 + c * 2)',
+      'tier("off", p * 1 + c * 2) :',
+    ]) {
+      assert.deepEqual(parseTiersFromExpr(expression), [], expression)
+    }
+  })
+
+  test('rejects unsafe integer and underflowed condition literals', () => {
+    for (const literal of [
+      '9007199254740993',
+      '-9007199254740993',
+      '1e-999',
+      '-1e-999',
+    ]) {
+      const expression = `len < ${literal} ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)`
+      assert.deepEqual(parseTiersFromExpr(expression), [], literal)
+      assert.equal(tryParseVisualConfig(expression), null, literal)
+    }
+    for (const literal of [
+      '0',
+      '-0',
+      '0e-999',
+      '1e3',
+      '1.25',
+      '9007199254740991',
+    ]) {
+      const expression = `len < ${literal} ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)`
+      assert.equal(
+        parseTiersFromExpr(expression)[0]?.conditions[0]?.value,
+        Number(literal)
+      )
+    }
+  })
+
   test('rejects incomplete structured displays for unsupported conditions', () => {
     for (const condition of [
       'len < 100 && c == 5',
@@ -222,6 +261,9 @@ describe('visual tier conditions', () => {
       '(len < 100) || (true) || (c == 5)',
       'len < 1e999',
       'len < 1+2',
+      'len < 100 &&',
+      '|| len < 100',
+      '(len < 100) || ()',
     ]) {
       assert.deepEqual(
         parseTiersFromExpr(
diff --git a/web/default/src/features/pricing/lib/tier-expr.ts b/web/default/src/features/pricing/lib/tier-expr.ts
index 6d13c1fa..bcc1b5db 100644
--- a/web/default/src/features/pricing/lib/tier-expr.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.ts
@@ -19,6 +19,7 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 import { Parser, type Value } from 'expr-eval'
 import { BILLING_CACHE_VAR_MAP } from './billing-expr'
 import {
+  isSupportedNumericLiteral,
   splitTopLevelExpression,
   unwrapConditionParens,
 } from './expression-syntax'
@@ -38,12 +39,14 @@ export type TierConditionGroup = {
   conditions: TierConditionInput[]
 }
 
+type TierConditionBounds = { min: number; max: number; defaultValue: number }
+
 export const TIME_CONDITION_BOUNDS: Record<
   Extract<
     TierConditionInput['var'],
     'hour' | 'minute' | 'weekday' | 'month' | 'day'
   >,
-  { min: number; max: number; defaultValue: number }
+  TierConditionBounds
 > = {
   hour: { min: 0, max: 23, defaultValue: 9 },
   minute: { min: 0, max: 59, defaultValue: 0 },
@@ -52,7 +55,9 @@ export const TIME_CONDITION_BOUNDS: Record<
   day: { min: 1, max: 31, defaultValue: 1 },
 }
 
-export function getTierConditionBounds(variable: TierConditionInput['var']) {
+export function getTierConditionBounds(
+  variable: TierConditionInput['var']
+): TierConditionBounds | undefined {
   return TIME_CONDITION_BOUNDS[variable as keyof typeof TIME_CONDITION_BOUNDS]
 }
 
@@ -319,12 +324,9 @@ function canonicalizeExprForComparison(source: string): string {
         .slice(index)
         .match(/^(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/)
       if (match) {
-        const numeric = Number(match[0])
-        const safeNumber =
-          Number.isFinite(numeric) &&
-          (!Number.isInteger(numeric) || Number.isSafeInteger(numeric)) &&
-          (numeric !== 0 || !/[1-9]/.test(match[0].split(/[eE]/)[0]))
-        result += safeNumber ? String(numeric) : match[0]
+        result += isSupportedNumericLiteral(match[0])
+          ? String(Number(match[0]))
+          : match[0]
         index += match[0].length
         continue
       }
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
index b10f15a9..d25827bb 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
@@ -671,6 +671,7 @@ describe('TieredPricingEditor runtime behavior', () => {
         null
       )
       await act(async () => undefined)
+      assert.equal(editor.getAllByText('Fallback tier').length, 1)
       assert.ok(
         billingChanges.some((expr) =>
           expr.startsWith('true ? tier("short", p * 1 + c * 2)')
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
index 443718ec..7fbee493 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
@@ -16,7 +16,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API/issues
 */
-import { useEffect, useId, useMemo, useState } from 'react'
+import { useEffect, useId, useMemo, useState, type ReactElement } from 'react'
 import { ChevronDown, Plus, Trash2 } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 import { cn } from '@/lib/utils'
@@ -109,7 +109,7 @@ function ConditionRow({
     'day',
   ].includes(condition.var)
   const timeBounds = getTierConditionBounds(condition.var)
-  const handleVariableChange = (value: string | null) => {
+  const handleVariableChange = (value: string | null): void => {
     if (!value) return
     const nextVar = value as TierConditionInput['var']
     const bounds = getTierConditionBounds(nextVar)
@@ -253,7 +253,7 @@ function PriceField({
   value,
   onChange,
   onClear,
-}: PriceFieldProps) {
+}: PriceFieldProps): ReactElement {
   const inputId = useId()
   return (
     <div className='w-36 space-y-0.5'>
@@ -300,7 +300,7 @@ function VisualTierCard({
   const { t } = useTranslation()
   const cacheMode = getTierCacheMode(tier)
   const conditionGroups = getTierConditionGroups(tier)
-  const updateConditionGroups = (groups: TierConditionGroup[]) => {
+  const updateConditionGroups = (groups: TierConditionGroup[]): void => {
     onChange({
       ...tier,
       conditions: groups[0]?.conditions ?? [],
@@ -322,7 +322,7 @@ function VisualTierCard({
   const handleConditionRemove = (
     groupIndex: number,
     conditionIndex: number
-  ) => {
+  ): void => {
     const groups = conditionGroups.map((group) => ({
       conditions: [...group.conditions],
     }))
@@ -332,7 +332,7 @@ function VisualTierCard({
     updateConditionGroups(groups.filter((group) => group.conditions.length > 0))
   }
 
-  const handleConditionGroupRemove = (groupIndex: number) => {
+  const handleConditionGroupRemove = (groupIndex: number): void => {
     updateConditionGroups(
       conditionGroups.filter((_, currentIndex) => currentIndex !== groupIndex)
     )
@@ -341,7 +341,7 @@ function VisualTierCard({
   const handlePriceChange = (
     field: keyof VisualTier,
     value: number | undefined
-  ) => {
+  ): void => {
     onChange({ ...tier, [field]: value })
   }
 
@@ -393,7 +393,7 @@ function VisualTierCard({
           <Badge variant='outline'>
             {t('Tier')} {index + 1} / {total}
           </Badge>
-          {conditionGroups.length === 0 && (
+          {index === total - 1 && conditionGroups.length === 0 && (
             <Badge variant='secondary'>{t('Fallback tier')}</Badge>
           )}
           <Input
@@ -665,7 +665,7 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
     onChange({ ...config, tiers })
   }
 
-  const handleAddCondition = (index: number, groupIndex = 0) => {
+  const handleAddCondition = (index: number, groupIndex: number = 0): void => {
     const tier = config.tiers[index]
     // Prefer `len` (input length) over `p`/`c` for tier conditions because
     // `p` is subject to auto-exclusion when sub-categories like `cr` are
@@ -715,7 +715,7 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
     })
   }
 
-  const handleAddConditionGroup = (index: number) => {
+  const handleAddConditionGroup = (index: number): void => {
     const tier = config.tiers[index]
     const groups = getTierConditionGroups(tier)
     const nextGroups = groups.map((group) => ({

From ecb2b63a0d8f894590de1a271a1a6849b67b563b Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 19:01:21 +0800
Subject: [PATCH 08/20] fix: preserve complete pricing displays and import
 validation

---
 .../components/dynamic-pricing-breakdown.tsx  | 20 +++---
 .../components/model-details.runtime.test.tsx | 52 ++++++++++++++
 .../src/features/pricing/lib/billing-expr.ts  | 42 +++++++-----
 .../src/features/pricing/lib/dynamic-price.ts |  4 +-
 .../src/features/pricing/lib/price.test.ts    | 17 +++++
 .../features/pricing/lib/tier-expr.test.ts    | 48 +++++++++++++
 .../task-rate-card-settings.runtime.test.tsx  | 67 ++++++++++++++++++-
 .../models/task-rate-card-settings.tsx        |  5 +-
 .../models/tiered-billing-settings.tsx        |  5 +-
 .../features/usage-logs/lib/format.test.ts    | 32 ++++++++-
 .../src/features/usage-logs/lib/format.ts     |  5 +-
 11 files changed, 255 insertions(+), 42 deletions(-)

diff --git a/web/default/src/features/pricing/components/dynamic-pricing-breakdown.tsx b/web/default/src/features/pricing/components/dynamic-pricing-breakdown.tsx
index 9be00aa5..366e1098 100644
--- a/web/default/src/features/pricing/components/dynamic-pricing-breakdown.tsx
+++ b/web/default/src/features/pricing/components/dynamic-pricing-breakdown.tsx
@@ -238,9 +238,10 @@ export function DynamicPricingBreakdown({
   const visiblePriceFields = BILLING_PRICING_VARS.filter((v) => {
     if (!hasTiers) return false
     if (hideCacheColumns && v.group === 'cache') return false
-    return tiers.some(
-      (tier) => Number(tier[v.field as string as keyof ParsedTier] || 0) > 0
-    )
+    return tiers.some((tier) => {
+      const value = tier[v.field as string]
+      return typeof value === 'number' && Number.isFinite(value)
+    })
   })
 
   return (
@@ -302,16 +303,14 @@ export function DynamicPricingBreakdown({
                   )}
                   <div className='grid grid-cols-2 gap-x-3 gap-y-1.5'>
                     {visiblePriceFields.map((v) => {
-                      const value = Number(
-                        tier[v.field as string as keyof ParsedTier] || 0
-                      )
+                      const value = tier[v.field as string]
                       return (
                         <div key={v.field} className='min-w-0'>
                           <div className='text-muted-foreground truncate text-[10px] font-medium tracking-wider uppercase'>
                             {t(v.shortLabel)}
                           </div>
                           <div className='truncate font-mono text-sm font-semibold'>
-                            {value > 0
+                            {typeof value === 'number' && Number.isFinite(value)
                               ? `${symbol}${(value * rate).toFixed(4)}`
                               : '-'}
                           </div>
@@ -379,15 +378,14 @@ export function DynamicPricingBreakdown({
                         )}
                       </TableCell>
                       {visiblePriceFields.map((v) => {
-                        const value = Number(
-                          tier[v.field as string as keyof ParsedTier] || 0
-                        )
+                        const value = tier[v.field as string]
                         return (
                           <TableCell
                             key={v.field}
                             className='py-2.5 text-right align-top font-mono'
                           >
-                            {value > 0 ? (
+                            {typeof value === 'number' &&
+                            Number.isFinite(value) ? (
                               <span className='font-semibold'>
                                 {`${symbol}${(value * rate).toFixed(4)}`}
                               </span>
diff --git a/web/default/src/features/pricing/components/model-details.runtime.test.tsx b/web/default/src/features/pricing/components/model-details.runtime.test.tsx
index e32ae7f5..b7473a71 100644
--- a/web/default/src/features/pricing/components/model-details.runtime.test.tsx
+++ b/web/default/src/features/pricing/components/model-details.runtime.test.tsx
@@ -35,6 +35,9 @@ for (const expression of [
   'len < 100 ? tier("peak", p * 2 + c * 4) : max(p, 1)',
   'len < 9007199254740993 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)',
   'len < 1e-999 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)',
+  'tier("custom", max(p, 1) * 3 + c * 15)',
+  'tier("custom", p * 1e999 + c * 15)',
+  'tier("custom", p * 1e-999 + c * 15)',
 ]) {
   test(`shows the complete raw expression when structured parsing is unsupported: ${expression}`, async () => {
     const view = await testEnv.render(
@@ -56,6 +59,55 @@ for (const expression of [
   })
 }
 
+test('shows configured zero coefficients and leaves absent coefficients blank in both layouts', async () => {
+  const view = await testEnv.render(
+    <DynamicPricingBreakdown
+      billingExpr={
+        'len < 100 ? tier("free", p * 0 + c * 0 + cr * 0 + cc * 0 + cc1h * 0 + img * 0 + img_o * 0 + ai * 0 + ao * 0) : tier("base", p * 2 + c * 4)'
+      }
+    />
+  )
+  try {
+    const headers = [...view.container.querySelectorAll('thead th')]
+    assert.equal(headers.length, 10)
+    const rows = view.container.querySelectorAll('tbody tr')
+    assert.deepEqual(
+      [...rows[0].querySelectorAll('td')]
+        .slice(1)
+        .map((cell) => cell.textContent),
+      Array(9).fill('$0.0000')
+    )
+    assert.deepEqual(
+      [...rows[1].querySelectorAll('td')]
+        .slice(3)
+        .map((cell) => cell.textContent),
+      Array(7).fill('-')
+    )
+    const mobile = view.container.querySelector('.sm\\:hidden')
+    assert.ok(mobile)
+    assert.equal((mobile.textContent?.match(/\$0\.0000/g) || []).length, 9)
+  } finally {
+    await view.unmount()
+  }
+})
+
+test('still hides cache columns when the request has no cache usage', async () => {
+  const view = await testEnv.render(
+    <DynamicPricingBreakdown
+      billingExpr={'tier("free", p * 0 + c * 0 + cr * 0 + img * 0)'}
+      hideCacheColumns
+    />
+  )
+  try {
+    const headers = [...view.container.querySelectorAll('thead th')].map(
+      (cell) => cell.textContent
+    )
+    assert.deepEqual(headers, ['Tier', 'Input', 'Output', 'Image In'])
+  } finally {
+    await view.unmount()
+  }
+})
+
 describe('ModelDetailsContent structured task pricing', () => {
   function createModel(inputVideoMaxQuantity?: number): PricingModel {
     return {
diff --git a/web/default/src/features/pricing/lib/billing-expr.ts b/web/default/src/features/pricing/lib/billing-expr.ts
index fb29086b..9ea7ee38 100644
--- a/web/default/src/features/pricing/lib/billing-expr.ts
+++ b/web/default/src/features/pricing/lib/billing-expr.ts
@@ -166,11 +166,6 @@ export const BILLING_CACHE_VAR_MAP = BILLING_EXTRA_VARS.map((v) => ({
   exprVar: v.key,
 }))
 
-const BILLING_VAR_REGEX = new RegExp(
-  `\\b(${BILLING_PRICING_VARS.map((v) => v.key).join('|')})\\s*\\*\\s*([\\d.eE+-]+)`,
-  'g'
-)
-
 // ---------------------------------------------------------------------------
 // Request rule constants
 // ---------------------------------------------------------------------------
@@ -259,18 +254,25 @@ function stripExprVersion(exprStr: string): { version: number; body: string } {
   return { version: 1, body: exprStr }
 }
 
-function parseTierBody(bodyStr: string): Record<string, number> {
-  const coeffs: Record<string, number> = {}
-  const re = new RegExp(BILLING_VAR_REGEX.source, 'g')
-  let m
-  while ((m = re.exec(bodyStr)) !== null) {
-    if (!(m[1] in coeffs)) coeffs[m[1]] = Number(m[2])
-  }
+function parseTierBody(bodyStr: string): Record<string, number> | null {
+  const body = bodyStr.trim()
+  // Consume every term and separator. Unsupported bodies must stay raw.
+  const termRe =
+    /\s*([a-z][a-z0-9_]*)\s*\*\s*([+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?)\s*/y
   const tier: Record<string, number> = {}
-  for (const [varName, field] of Object.entries(BILLING_VAR_KEY_TO_FIELD)) {
-    tier[field] = coeffs[varName] || 0
+  while (termRe.lastIndex < body.length) {
+    const match = termRe.exec(body)
+    if (!match || !Object.hasOwn(BILLING_VAR_KEY_TO_FIELD, match[1]))
+      return null
+    const field = BILLING_VAR_KEY_TO_FIELD[match[1]]
+    if (Object.hasOwn(tier, field) || !isSupportedNumericLiteral(match[2]))
+      return null
+    tier[field] = Number(match[2])
+    if (termRe.lastIndex === body.length) return tier
+    if (body[termRe.lastIndex] !== '+') return null
+    termRe.lastIndex += 1
   }
-  return tier
+  return null
 }
 
 export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
@@ -321,9 +323,13 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
         }
         if (groupConditions.length > 0) conditionGroups.push(groupConditions)
       }
-      const tier = parseTierBody(tierMatch[2]) as ParsedTier
-      tier.label = tierMatch[1]
-      tier.conditions = isUnconditional ? [] : conditionGroups.flat()
+      const prices = parseTierBody(tierMatch[2])
+      if (!prices) return []
+      const tier: ParsedTier = {
+        ...prices,
+        label: tierMatch[1],
+        conditions: isUnconditional ? [] : conditionGroups.flat(),
+      }
       if (!isUnconditional && conditionGroups.length > 1) {
         tier.conditionGroups = conditionGroups
       }
diff --git a/web/default/src/features/pricing/lib/dynamic-price.ts b/web/default/src/features/pricing/lib/dynamic-price.ts
index 474aadb7..ef3e62c6 100644
--- a/web/default/src/features/pricing/lib/dynamic-price.ts
+++ b/web/default/src/features/pricing/lib/dynamic-price.ts
@@ -138,8 +138,8 @@ export function getDynamicPriceEntries(
 
   return BILLING_PRICING_VARS.flatMap((variable) => {
     if (!variable.field) return []
-    const value = Number(tier[variable.field])
-    if (!Number.isFinite(value) || value <= 0) return []
+    const value = tier[variable.field]
+    if (typeof value !== 'number' || !Number.isFinite(value)) return []
 
     return [
       {
diff --git a/web/default/src/features/pricing/lib/price.test.ts b/web/default/src/features/pricing/lib/price.test.ts
index eed5d963..efc82ef0 100644
--- a/web/default/src/features/pricing/lib/price.test.ts
+++ b/web/default/src/features/pricing/lib/price.test.ts
@@ -9,6 +9,8 @@ the Free Software Foundation, either version 3 of the License, or
 import assert from 'node:assert/strict'
 import { describe, test } from 'node:test'
 import type { PricingModel } from '../types'
+import { parseTiersFromExpr } from './billing-expr'
+import { getDynamicPriceEntries } from './dynamic-price'
 import {
   formatFixedPrice,
   formatGroupPrice,
@@ -36,6 +38,21 @@ function modelWithRateCard(
 }
 
 describe('task rate-card display prices', () => {
+  test('dynamic summaries keep configured zero prices and omit absent prices', () => {
+    const [tier] = parseTiersFromExpr('tier("free", p * 0 + c * 2 + cr * 0)')
+    const entries = getDynamicPriceEntries(tier, { tokenUnit: 'M' })
+    assert.deepEqual(
+      entries.map(({ key, value }) => [key, value]),
+      [
+        ['p', 0],
+        ['c', 2],
+        ['cr', 0],
+      ]
+    )
+    assert.match(entries[0].formatted, /0/)
+    assert.match(entries[2].formatted, /0/)
+  })
+
   test('keeps an explicit zero price visible', () => {
     assert.match(formatTaskRateCardRange(modelWithRateCard(0, 0)), /0/)
   })
diff --git a/web/default/src/features/pricing/lib/tier-expr.test.ts b/web/default/src/features/pricing/lib/tier-expr.test.ts
index 22e85de2..658b4025 100644
--- a/web/default/src/features/pricing/lib/tier-expr.test.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.test.ts
@@ -213,6 +213,54 @@ describe('evalExprLocally', () => {
 })
 
 describe('visual tier conditions', () => {
+  test('rejects unsupported or unsafe complete tier bodies', () => {
+    for (const body of [
+      'max(p, 1) * 3 + c * 15',
+      'p * 2 * 3 + c * 4',
+      'p * 2 - c * 4',
+      'p * 2 + unknown * 3',
+      'xp * 2 + c * 4',
+      'p * 2 + p * 3',
+      'p * 1e999 + c * 4',
+      'p * 1e-999 + c * 4',
+      'p * 9007199254740993 + c * 4',
+      'p * 2 +',
+      'p * 2 + 10',
+      '',
+    ]) {
+      assert.deepEqual(parseTiersFromExpr(`tier("custom", ${body})`), [], body)
+      assert.deepEqual(
+        parseTiersFromExpr(
+          `len < 100 ? tier("known", p * 1 + c * 2) : tier("custom", ${body})`
+        ),
+        [],
+        body
+      )
+    }
+  })
+
+  test('retains coefficient presence, zero, and supported exponent notation', () => {
+    const [tier] = parseTiersFromExpr(
+      'tier("free", c * 1e+2 + p * .5 + cr * 0 + cc1h * 0e-99)'
+    )
+    assert.equal(tier.inputPrice, 0.5)
+    assert.equal(tier.outputPrice, 100)
+    assert.equal(tier.cacheReadPrice, 0)
+    assert.equal(tier.cacheCreate1hPrice, 0)
+    assert.equal(Object.hasOwn(tier, 'cacheCreatePrice'), false)
+    for (const { exprVar } of BILLING_CACHE_VAR_MAP) {
+      const absent = parseTiersFromExpr('tier("base", p * 2 + c * 4)')[0]
+      const present = parseTiersFromExpr(
+        `tier("base", p * 2 + c * 4 + ${exprVar} * 0)`
+      )[0]
+      assert.equal(
+        Object.keys(present).length,
+        Object.keys(absent).length + 1,
+        exprVar
+      )
+    }
+  })
+
   test('rejects structured displays with unsupported or missing branches', () => {
     for (const expression of [
       'len < 100 ? tier("peak", p * 2 + c * 4) : max(p, 1)',
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
index c5258b74..64b6db51 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
@@ -16,12 +16,15 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API/issues
 */
+import { act } from 'react'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { createReactTestEnvironment } from '@/test/react'
-import { within } from '@testing-library/react'
+import { fireEvent, within } from '@testing-library/react'
 import assert from 'node:assert/strict'
 import { after, before, describe, test } from 'node:test'
+import { SettingsPageProvider } from '../components/settings-page-context'
 import { TaskRateCardSettings } from './task-rate-card-settings'
+import { TieredBillingSettings } from './tiered-billing-settings'
 
 const testEnv = createReactTestEnvironment()
 
@@ -29,6 +32,68 @@ before(() => testEnv.setup())
 
 after(() => testEnv.teardown())
 
+for (const kind of ['task', 'tiered'] as const) {
+  test(`${kind} settings retain valid editor state after failed file imports`, async () => {
+    const queryClient = new QueryClient()
+    const actions = document.createElement('div')
+    document.body.append(actions)
+    const view = await testEnv.render(
+      <QueryClientProvider client={queryClient}>
+        <SettingsPageProvider actionsContainer={actions}>
+          {kind === 'task' ? (
+            <TaskRateCardSettings defaultValue='{}' />
+          ) : (
+            <TieredBillingSettings billingMode='{}' billingExpr='{}' />
+          )}
+        </SettingsPageProvider>
+      </QueryClientProvider>
+    )
+    try {
+      const editor = [...view.container.querySelectorAll('textarea')].find(
+        (input) => !input.readOnly
+      )
+      assert.ok(editor)
+      const save = within(actions).getByRole('button', {
+        name: kind === 'task' ? 'Save task rate cards' : 'Save tiered billing',
+      }) as HTMLButtonElement
+      const fileInput = (
+        kind === 'task' ? view.container : actions
+      ).querySelector('input[type=file]')
+      assert.ok(fileInput)
+      const original = editor.value
+      assert.equal(save.disabled, false)
+      for (const text of [
+        async () => '{',
+        async () => '[]',
+        async () => {
+          throw new Error('Synthetic file read failure')
+        },
+      ]) {
+        await act(async () => {
+          fireEvent.change(fileInput, { target: { files: [{ text }] } })
+        })
+        assert.equal(editor.value, original)
+        assert.equal(save.disabled, false)
+      }
+      const imported =
+        kind === 'task'
+          ? '{"test-model":{"unit":"second","rows":[]}}'
+          : '{"test-model":{"enabled":true,"expr":"p * 1"}}'
+      await act(async () => {
+        fireEvent.change(fileInput, {
+          target: { files: [{ text: async () => imported }] },
+        })
+      })
+      assert.deepEqual(JSON.parse(editor.value), JSON.parse(imported))
+      assert.equal(save.disabled, false)
+    } finally {
+      await view.unmount()
+      actions.remove()
+      queryClient.clear()
+    }
+  })
+}
+
 describe('TaskRateCardSettings billing examples', () => {
   test('allows the active MiniMax structured example to be loaded', async () => {
     const queryClient = new QueryClient()
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
index cfd6d639..ce5c1969 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
@@ -155,7 +155,7 @@ const MINIMAX_RATE_CARD_EXAMPLE = JSON.stringify(
   2
 )
 
-function downloadJson(filename: string, value: string) {
+function downloadJson(filename: string, value: string): void {
   const blob = new Blob([value], { type: 'application/json;charset=utf-8' })
   const url = URL.createObjectURL(blob)
   const anchor = document.createElement('a')
@@ -398,7 +398,7 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
   }, [handleUseExample])
 
   const handleImport = useCallback(
-    async (event: ChangeEvent<HTMLInputElement>) => {
+    async (event: ChangeEvent<HTMLInputElement>): Promise<void> => {
       const file = event.target.files?.[0]
       event.target.value = ''
       if (!file) return
@@ -414,7 +414,6 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
         toast.success(t('JSON imported. Review prices before saving.'))
       } catch (err) {
         const message = err instanceof Error ? err.message : t('Invalid JSON')
-        setError(message)
         toast.error(message)
       }
     },
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 768794a9..054c1b54 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -123,7 +123,7 @@ function validateUnifiedConfig(value: string) {
   return normalized
 }
 
-function downloadJson(filename: string, value: string) {
+function downloadJson(filename: string, value: string): void {
   const blob = new Blob([value], { type: 'application/json;charset=utf-8' })
   const url = URL.createObjectURL(blob)
   const anchor = document.createElement('a')
@@ -229,7 +229,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   const isDirty = text !== initialText
 
   const handleImport = useCallback(
-    async (event: ChangeEvent<HTMLInputElement>) => {
+    async (event: ChangeEvent<HTMLInputElement>): Promise<void> => {
       const file = event.target.files?.[0]
       event.target.value = ''
       if (!file) return
@@ -241,7 +241,6 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
         setError('')
       } catch (err) {
         const message = err instanceof Error ? err.message : t('Invalid JSON')
-        setError(message)
         toast.error(message)
       }
     },
diff --git a/web/default/src/features/usage-logs/lib/format.test.ts b/web/default/src/features/usage-logs/lib/format.test.ts
index 17537372..557f144b 100644
--- a/web/default/src/features/usage-logs/lib/format.test.ts
+++ b/web/default/src/features/usage-logs/lib/format.test.ts
@@ -19,7 +19,37 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 import ru from '@/i18n/locales/ru.json'
 import assert from 'node:assert/strict'
 import { describe, test } from 'node:test'
-import { renderAuditContent } from './format'
+import { getTieredBillingSummary, renderAuditContent } from './format'
+
+describe('tiered billing price summaries', () => {
+  test('preserves configured zero prices and the cache-usage visibility policy', () => {
+    const expr = 'tier("free", p * 0 + c * 2 + cr * 0 + img * 0)'
+    const other = {
+      billing_mode: 'tiered_expr',
+      expr_b64: Buffer.from(expr).toString('base64'),
+      matched_tier: 'free',
+    }
+    const withoutCache = getTieredBillingSummary(other)
+    assert.deepEqual(
+      withoutCache?.priceEntries.map(({ field, price }) => [field, price]),
+      [
+        ['inputPrice', 0],
+        ['outputPrice', 2],
+        ['imagePrice', 0],
+      ]
+    )
+    const withCache = getTieredBillingSummary({ ...other, cache_tokens: 10 })
+    assert.deepEqual(
+      withCache?.priceEntries.map(({ field, price }) => [field, price]),
+      [
+        ['inputPrice', 0],
+        ['outputPrice', 2],
+        ['cacheReadPrice', 0],
+        ['imagePrice', 0],
+      ]
+    )
+  })
+})
 
 describe('renderAuditContent', () => {
   test('localizes completed manual task billing settlements', () => {
diff --git a/web/default/src/features/usage-logs/lib/format.ts b/web/default/src/features/usage-logs/lib/format.ts
index 20d7583b..21873b89 100644
--- a/web/default/src/features/usage-logs/lib/format.ts
+++ b/web/default/src/features/usage-logs/lib/format.ts
@@ -264,9 +264,8 @@ export function getTieredBillingSummary(
   for (const v of BILLING_PRICING_VARS) {
     if (!v.field) continue
     if (v.group === 'cache' && !cacheTokensPresent) continue
-    const raw = tier[v.field as keyof ParsedTier]
-    const price = Number(raw)
-    if (Number.isFinite(price) && price > 0) {
+    const price = tier[v.field]
+    if (typeof price === 'number' && Number.isFinite(price)) {
       priceEntries.push({
         field: v.field,
         shortLabel: v.shortLabel,

From 8da2f920fbb3b6fb94a41c13ef70a76208ecc4da Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 20:04:54 +0800
Subject: [PATCH 09/20] fix: validate pricing fallbacks and configuration
 exports

---
 .../components/model-details.runtime.test.tsx |  1 +
 .../src/features/pricing/lib/billing-expr.ts  |  6 ++-
 .../features/pricing/lib/tier-expr.test.ts    | 10 ++++
 .../models/tiered-billing-settings.tsx        | 29 +++++-----
 .../tiered-pricing-editor.runtime.test.tsx    | 53 +++++++++++++++++++
 5 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/web/default/src/features/pricing/components/model-details.runtime.test.tsx b/web/default/src/features/pricing/components/model-details.runtime.test.tsx
index b7473a71..a58517cd 100644
--- a/web/default/src/features/pricing/components/model-details.runtime.test.tsx
+++ b/web/default/src/features/pricing/components/model-details.runtime.test.tsx
@@ -38,6 +38,7 @@ for (const expression of [
   'tier("custom", max(p, 1) * 3 + c * 15)',
   'tier("custom", p * 1e999 + c * 15)',
   'tier("custom", p * 1e-999 + c * 15)',
+  'len < 100 ? tier("short", p * 1 + c * 2)',
 ]) {
   test(`shows the complete raw expression when structured parsing is unsupported: ${expression}`, async () => {
     const view = await testEnv.render(
diff --git a/web/default/src/features/pricing/lib/billing-expr.ts b/web/default/src/features/pricing/lib/billing-expr.ts
index 9ea7ee38..b3fd09d9 100644
--- a/web/default/src/features/pricing/lib/billing-expr.ts
+++ b/web/default/src/features/pricing/lib/billing-expr.ts
@@ -281,8 +281,12 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
     const { body } = stripExprVersion(exprStr)
     const tierRe = /^tier\("([^"]*)",\s*([\s\S]+)\)$/
     const tiers: ParsedTier[] = []
-    for (const branch of splitTopLevelExpression(body, ':', true)) {
+    const branches = splitTopLevelExpression(body, ':', true)
+    for (const [index, branch] of branches.entries()) {
       const parts = branch.match(/^(.*?)\s*\?\s*(tier\("[^"]*",[\s\S]+\))$/)
+      // A complete ternary chain ends in exactly one unconditional fallback.
+      const expectsCondition = index < branches.length - 1
+      if (Boolean(parts) !== expectsCondition) return []
       const condStr = parts?.[1]?.trim() || ''
       const tierMatch = tierRe.exec(parts?.[2] || branch)
       if (!tierMatch || (parts && !condStr)) return []
diff --git a/web/default/src/features/pricing/lib/tier-expr.test.ts b/web/default/src/features/pricing/lib/tier-expr.test.ts
index 658b4025..08d2a58e 100644
--- a/web/default/src/features/pricing/lib/tier-expr.test.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.test.ts
@@ -239,6 +239,16 @@ describe('visual tier conditions', () => {
     }
   })
 
+  test('rejects conditional expressions without a complete fallback chain', () => {
+    for (const expression of [
+      'len < 100 ? tier("short", p * 1 + c * 2)',
+      'tier("short", p * 1 + c * 2) : tier("long", p * 2 + c * 4)',
+      'len < 100 ? tier("short", p * 1 + c * 2) : len < 200 ? tier("mid", p * 2 + c * 4)',
+    ]) {
+      assert.deepEqual(parseTiersFromExpr(expression), [], expression)
+    }
+  })
+
   test('retains coefficient presence, zero, and supported exponent notation', () => {
     const [tier] = parseTiersFromExpr(
       'tier("free", c * 1e+2 + p * .5 + cr * 0 + cc1h * 0e-99)'
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 054c1b54..03863e3f 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -201,22 +201,27 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
     await mutateAsync({ config })
   }, [mutateAsync, t, text])
 
-  const enabledCount = useMemo(() => {
+  const validatedConfig = useMemo((): Record<
+    string,
+    TieredBillingEntry
+  > | null => {
     try {
-      const config = validateUnifiedConfig(text || '{}')
-      return Object.values(config).filter((entry) => entry.enabled).length
+      return validateUnifiedConfig(text || '{}')
     } catch {
-      return 0
+      return null
     }
   }, [text])
 
-  const configuredModels = useMemo(() => {
-    try {
-      return Object.keys(validateUnifiedConfig(text || '{}'))
-    } catch {
-      return []
-    }
-  }, [text])
+  const enabledCount = useMemo(
+    (): number =>
+      Object.values(validatedConfig ?? {}).filter((entry) => entry.enabled)
+        .length,
+    [validatedConfig]
+  )
+  const configuredModels = useMemo(
+    (): string[] => Object.keys(validatedConfig ?? {}),
+    [validatedConfig]
+  )
 
   const filteredModels = useMemo(() => {
     const query = search.trim().toLowerCase()
@@ -272,7 +277,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
           variant='outline'
           size='sm'
           onClick={() => downloadJson('tiered-billing.json', text || '{}')}
-          disabled={Boolean(error)}
+          disabled={validatedConfig === null}
         >
           <Download className='mr-2 h-4 w-4' />
           {t('Download')}
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
index d25827bb..2ac030a4 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
@@ -18,6 +18,7 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 */
 import { act, useState } from 'react'
 import type { Root } from 'react-dom/client'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { createInstance } from 'i18next'
 import { JSDOM } from 'jsdom'
 import assert from 'node:assert/strict'
@@ -37,6 +38,8 @@ let within: typeof import('@testing-library/react').within
 let ModelPricingEditorPanel: typeof import('./model-pricing-sheet').ModelPricingEditorPanel
 let ModelRatioVisualEditor: typeof import('./model-ratio-visual-editor').ModelRatioVisualEditor
 let TieredPricingEditor: typeof import('./tiered-pricing-editor').TieredPricingEditor
+let TieredBillingSettings: typeof import('./tiered-billing-settings').TieredBillingSettings
+let SettingsPageProvider: typeof import('../components/settings-page-context').SettingsPageProvider
 
 const dom = new JSDOM('<!doctype html><html><body></body></html>', {
   url: 'http://localhost/',
@@ -130,6 +133,53 @@ const modelB: ModelRatioData = {
 }
 
 describe('optional zero prices in the actual editor', () => {
+  test('only enables tiered configuration downloads for valid current JSON', async () => {
+    const container = createContainer()
+    const actions = createContainer()
+    const root = createRoot(container)
+    const queryClient = new QueryClient()
+    try {
+      await act(async () =>
+        root.render(
+          <I18nextProvider i18n={i18n}>
+            <QueryClientProvider client={queryClient}>
+              <SettingsPageProvider actionsContainer={actions}>
+                <TieredBillingSettings billingMode='{}' billingExpr='{}' />
+              </SettingsPageProvider>
+            </QueryClientProvider>
+          </I18nextProvider>
+        )
+      )
+      const editor = container.querySelector('textarea')
+      assert.ok(editor)
+      const download = within(actions).getByRole('button', {
+        name: 'Download',
+      }) as HTMLButtonElement
+      assert.equal(download.disabled, false)
+      for (const invalid of ['{', '[]', '{"model":{"enabled":true}}']) {
+        await act(async () =>
+          fireEvent.change(editor, { target: { value: invalid } })
+        )
+        assert.equal(editor.value, invalid)
+        assert.equal(download.disabled, true, invalid)
+      }
+      for (const valid of [
+        '{}',
+        '{"model":{"enabled":true,"expr":"tier(\\"base\\", p * 1)"}}',
+        '{"model":{"enabled":false,"expr":""}}',
+      ]) {
+        await act(async () =>
+          fireEvent.change(editor, { target: { value: valid } })
+        )
+        assert.equal(download.disabled, false, valid)
+      }
+    } finally {
+      await unmount(root, container)
+      actions.remove()
+      queryClient.clear()
+    }
+  })
+
   for (const source of [
     'tier("base", p * 3.0 + c * 15.0 + cr * 0.0)',
     'tier("base", p * 3e0 + c * 1.5e1 + cr * 0e0)',
@@ -413,6 +463,9 @@ before(async () => {
   ;({ ModelPricingEditorPanel } = await import('./model-pricing-sheet'))
   ;({ ModelRatioVisualEditor } = await import('./model-ratio-visual-editor'))
   ;({ TieredPricingEditor } = await import('./tiered-pricing-editor'))
+  ;({ TieredBillingSettings } = await import('./tiered-billing-settings'))
+  ;({ SettingsPageProvider } =
+    await import('../components/settings-page-context'))
 })
 
 after(() => {

From cf0c1496df704c433c0643800b10511614e66a9f Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 20:44:54 +0800
Subject: [PATCH 10/20] fix: discard stale pricing imports and flag shadowed
 tiers

---
 .../models/task-rate-card-settings.tsx        |  16 +-
 .../models/tiered-billing-settings.tsx        |  17 +-
 .../tiered-pricing-editor.runtime.test.tsx    | 154 +++++++++++++++++-
 .../models/tiered-pricing-visual-editor.tsx   |  15 +-
 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 +
 10 files changed, 194 insertions(+), 14 deletions(-)

diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
index ce5c1969..c6a1e8e1 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
@@ -330,12 +330,13 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
   const [search, setSearch] = useState('')
   const [vendorFilter, setVendorFilter] = useState('all')
   const fileInputRef = useRef<HTMLInputElement>(null)
+  const editRevision = useRef(0)
   const initialText = useMemo(
     () => formatJsonForTextarea(defaultValue || '{}'),
     [defaultValue]
   )
   const vendorSummary = useMemo(() => buildVendorSummary(text), [text])
-  const filteredVendorSummary = useMemo(() => {
+  const filteredVendorSummary = useMemo((): VendorSummary[] => {
     const query = search.trim().toLowerCase()
     return vendorSummary
       .filter((vendor) => vendorFilter === 'all' || vendor.key === vendorFilter)
@@ -359,12 +360,17 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
   const isDirty = text !== initialText
 
   useEffect(() => {
+    editRevision.current += 1
     setText(formatJsonForTextarea(defaultValue || '{}'))
     setError('')
+    return () => {
+      editRevision.current += 1
+    }
   }, [defaultValue])
 
   const handleChange = useCallback(
     (value: string) => {
+      editRevision.current += 1
       setText(value)
       try {
         const parsed = JSON.parse(value) as unknown
@@ -382,6 +388,7 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
 
   const handleUseExample = useCallback(
     (example: string): void => {
+      editRevision.current += 1
       setText(example)
       setError('')
       toast.success(t('Example loaded. Review prices before saving.'))
@@ -402,17 +409,22 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
       const file = event.target.files?.[0]
       event.target.value = ''
       if (!file) return
+      const revision = ++editRevision.current
 
       try {
-        const imported = formatJsonForTextarea(await file.text())
+        const contents = await file.text()
+        if (revision !== editRevision.current) return
+        const imported = formatJsonForTextarea(contents)
         const parsed = JSON.parse(imported || '{}') as unknown
         if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
           throw new Error(t('JSON must be an object'))
         }
+        editRevision.current += 1
         setText(imported || '{}')
         setError('')
         toast.success(t('JSON imported. Review prices before saving.'))
       } catch (err) {
+        if (revision !== editRevision.current) return
         const message = err instanceof Error ? err.message : t('Invalid JSON')
         toast.error(message)
       }
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 03863e3f..378ea7f0 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -140,6 +140,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   const [error, setError] = useState('')
   const [search, setSearch] = useState('')
   const fileInputRef = useRef<HTMLInputElement>(null)
+  const editRevision = useRef(0)
 
   const initialText = useMemo(() => {
     return JSON.stringify(
@@ -150,10 +151,14 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   }, [props.billingExpr, props.billingMode])
 
   useEffect(() => {
+    editRevision.current += 1
     // The editor must reset when the server-provided model selection changes.
     // eslint-disable-next-line react-hooks/set-state-in-effect
     setText(initialText)
     setError('')
+    return () => {
+      editRevision.current += 1
+    }
   }, [initialText])
 
   const mutation = useMutation({
@@ -173,6 +178,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   const { mutateAsync } = mutation
 
   const handleFormat = useCallback(() => {
+    editRevision.current += 1
     try {
       setText(formatJsonForTextarea(text || '{}'))
       setError('')
@@ -182,6 +188,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   }, [t, text])
 
   const handleLoadExample = useCallback(() => {
+    editRevision.current += 1
     setText(JSON.stringify(EXAMPLE_CONFIG, null, 2))
     setError('')
   }, [])
@@ -223,7 +230,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
     [validatedConfig]
   )
 
-  const filteredModels = useMemo(() => {
+  const filteredModels = useMemo((): string[] => {
     const query = search.trim().toLowerCase()
     if (!query) return configuredModels
     return configuredModels.filter((model) =>
@@ -238,13 +245,18 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
       const file = event.target.files?.[0]
       event.target.value = ''
       if (!file) return
+      const revision = ++editRevision.current
 
       try {
-        const imported = formatJsonForTextarea(await file.text())
+        const contents = await file.text()
+        if (revision !== editRevision.current) return
+        const imported = formatJsonForTextarea(contents)
         validateUnifiedConfig(imported || '{}')
+        editRevision.current += 1
         setText(imported || '{}')
         setError('')
       } catch (err) {
+        if (revision !== editRevision.current) return
         const message = err instanceof Error ? err.message : t('Invalid JSON')
         toast.error(message)
       }
@@ -371,6 +383,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
         <Textarea
           value={text}
           onChange={(event) => {
+            editRevision.current += 1
             setText(event.target.value)
             if (error) setError('')
           }}
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
index 2ac030a4..a45e613d 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
@@ -16,7 +16,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API/issues
 */
-import { act, useState } from 'react'
+import { act, useState, type ReactElement } from 'react'
 import type { Root } from 'react-dom/client'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { createInstance } from 'i18next'
@@ -39,6 +39,7 @@ let ModelPricingEditorPanel: typeof import('./model-pricing-sheet').ModelPricing
 let ModelRatioVisualEditor: typeof import('./model-ratio-visual-editor').ModelRatioVisualEditor
 let TieredPricingEditor: typeof import('./tiered-pricing-editor').TieredPricingEditor
 let TieredBillingSettings: typeof import('./tiered-billing-settings').TieredBillingSettings
+let TaskRateCardSettings: typeof import('./task-rate-card-settings').TaskRateCardSettings
 let SettingsPageProvider: typeof import('../components/settings-page-context').SettingsPageProvider
 
 const dom = new JSDOM('<!doctype html><html><body></body></html>', {
@@ -133,6 +134,130 @@ const modelB: ModelRatioData = {
 }
 
 describe('optional zero prices in the actual editor', () => {
+  for (const kind of ['task', 'tiered'] as const) {
+    test(`${kind} settings discard imports superseded by edits, imports, examples, and resets`, async () => {
+      const container = createContainer()
+      const actions = createContainer()
+      const root = createRoot(container)
+      const queryClient = new QueryClient()
+      const { toast } = await import('sonner')
+      const config = (name: string): string =>
+        JSON.stringify({ [name]: { enabled: false, expr: '' } })
+      const renderSettings = (name: string): ReactElement => (
+        <I18nextProvider i18n={i18n}>
+          <QueryClientProvider client={queryClient}>
+            <SettingsPageProvider actionsContainer={actions}>
+              {kind === 'task' ? (
+                <TaskRateCardSettings defaultValue={config(name)} />
+              ) : (
+                <TieredBillingSettings
+                  billingMode='{}'
+                  billingExpr={JSON.stringify({
+                    [name]: 'tier("base", p * 1)',
+                  })}
+                />
+              )}
+            </SettingsPageProvider>
+          </QueryClientProvider>
+        </I18nextProvider>
+      )
+      try {
+        await act(async () => root.render(renderSettings('initial')))
+        const editor = [...container.querySelectorAll('textarea')].find(
+          (input) => !input.readOnly
+        )
+        assert.ok(editor)
+        const fileInput = (kind === 'task' ? container : actions).querySelector(
+          'input[type=file]'
+        )
+        assert.ok(fileInput)
+        const importFile = async (
+          text: () => Promise<string>
+        ): Promise<void> => {
+          await act(async () =>
+            fireEvent.change(fileInput, { target: { files: [{ text }] } })
+          )
+        }
+        const startSlowImport = async (): Promise<(value: string) => void> => {
+          let resolve!: (value: string) => void
+          const pending = new Promise<string>((done) => {
+            resolve = done
+          })
+          await importFile(() => pending)
+          return resolve
+        }
+        const assertStaleIgnored = async (
+          resolve: (value: string) => void
+        ): Promise<void> => {
+          const current = editor.value
+          const notifications = toast.getHistory().length
+          await act(async () => resolve(config('stale')))
+          assert.equal(editor.value, current)
+          assert.equal(toast.getHistory().length, notifications)
+        }
+
+        let complete = await startSlowImport()
+        await act(async () =>
+          fireEvent.change(editor, { target: { value: config('edited') } })
+        )
+        await assertStaleIgnored(complete)
+
+        complete = await startSlowImport()
+        await importFile(async () => config('newer'))
+        assert.deepEqual(JSON.parse(editor.value), JSON.parse(config('newer')))
+        await assertStaleIgnored(complete)
+
+        complete = await startSlowImport()
+        await importFile(async () => '{')
+        await assertStaleIgnored(complete)
+
+        complete = await startSlowImport()
+        const example = within(container).getAllByRole('button', {
+          name: kind === 'task' ? 'Use example' : 'Load example',
+        })[0]
+        await act(async () => fireEvent.click(example))
+        await assertStaleIgnored(complete)
+
+        if (kind === 'tiered') {
+          complete = await startSlowImport()
+          await act(async () =>
+            fireEvent.click(
+              within(actions).getByRole('button', { name: 'Format JSON' })
+            )
+          )
+          await assertStaleIgnored(complete)
+        }
+
+        complete = await startSlowImport()
+        await act(async () => root.render(renderSettings('reset')))
+        assert.match(editor.value, /reset/)
+        await assertStaleIgnored(complete)
+
+        let reject!: (reason: Error) => void
+        const failedRead = new Promise<string>((_resolve, fail) => {
+          reject = fail
+        })
+        await importFile(() => failedRead)
+        await act(async () =>
+          fireEvent.change(editor, {
+            target: { value: config('after-failed-read') },
+          })
+        )
+        const notifications = toast.getHistory().length
+        await act(async () => reject(new Error('Stale read failure')))
+        assert.equal(toast.getHistory().length, notifications)
+
+        complete = await startSlowImport()
+        await act(async () => root.render(null))
+        await assertStaleIgnored(complete)
+      } finally {
+        await unmount(root, container)
+        actions.remove()
+        queryClient.clear()
+      }
+    })
+  }
+
   test('only enables tiered configuration downloads for valid current JSON', async () => {
     const container = createContainer()
     const actions = createContainer()
@@ -193,7 +318,7 @@ describe('optional zero prices in the actual editor', () => {
         ? 'tier("base", p * 3 + c * 15 + cr * 0)'
         : source
       let saved = source
-      function ControlledEditor() {
+      function ControlledEditor(): ReactElement {
         const [expression, setExpression] = useState(source)
         return (
           <TieredPricingEditor
@@ -207,7 +332,7 @@ describe('optional zero prices in the actual editor', () => {
           />
         )
       }
-      const selectMode = async (name: string) => {
+      const selectMode = async (name: string): Promise<void> => {
         await act(async () => {
           fireEvent.keyDown(within(container).getAllByRole('combobox')[0], {
             key: 'ArrowDown',
@@ -320,7 +445,7 @@ describe('optional zero prices in the actual editor', () => {
       const container = createContainer()
       const root = createRoot(container)
       let saved = `tier("base", p * 3 + c * 15 + ${variable.key} * 0)`
-      const renderEditor = (key: string) => (
+      const renderEditor = (key: string): ReactElement => (
         <I18nextProvider i18n={i18n}>
           <TieredPricingEditor
             key={key}
@@ -358,7 +483,7 @@ describe('optional zero prices in the actual editor', () => {
     const container = createContainer()
     const root = createRoot(container)
     let saved = 'tier("base", p * 3 + c * 15)'
-    function ControlledEditor() {
+    function ControlledEditor(): ReactElement {
       const [expression, setExpression] = useState(saved)
       return (
         <TieredPricingEditor
@@ -464,6 +589,7 @@ before(async () => {
   ;({ ModelRatioVisualEditor } = await import('./model-ratio-visual-editor'))
   ;({ TieredPricingEditor } = await import('./tiered-pricing-editor'))
   ;({ TieredBillingSettings } = await import('./tiered-billing-settings'))
+  ;({ TaskRateCardSettings } = await import('./task-rate-card-settings'))
   ;({ SettingsPageProvider } =
     await import('../components/settings-page-context'))
 })
@@ -725,11 +851,25 @@ describe('TieredPricingEditor runtime behavior', () => {
       )
       await act(async () => undefined)
       assert.equal(editor.getAllByText('Fallback tier').length, 1)
+      editor.getByText('Always matches; later tiers are unreachable')
+      assert.equal(
+        editor.getAllByText('Always matches (default tier).').length,
+        1
+      )
       assert.ok(
         billingChanges.some((expr) =>
           expr.startsWith('true ? tier("short", p * 1 + c * 2)')
         )
       )
+      await act(async () =>
+        fireEvent.click(
+          editor.getAllByRole('button', { name: 'Add condition' })[0]
+        )
+      )
+      assert.equal(
+        editor.queryByText('Always matches; later tiers are unreachable'),
+        null
+      )
     } finally {
       await unmount(root, container)
     }
@@ -785,7 +925,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     const container = createContainer()
     const root = createRoot(container)
     const changes: Array<{ modelName: string; next: string }> = []
-    const renderEditor = (model: ModelRatioData) => (
+    const renderEditor = (model: ModelRatioData): ReactElement => (
       <I18nextProvider i18n={i18n}>
         <TieredPricingEditor
           modelName={model.name}
@@ -888,7 +1028,7 @@ describe('TieredPricingEditor runtime behavior', () => {
       [modelA.name]: modelA.billingExpr,
       [modelB.name]: modelB.billingExpr,
     })
-    const renderEditor = () => (
+    const renderEditor = (): ReactElement => (
       <I18nextProvider i18n={i18n}>
         <ModelRatioVisualEditor
           savedModelPrice='{}'
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
index 7fbee493..7003f06e 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
@@ -448,9 +448,18 @@ function VisualTierCard({
           </div>
         </div>
         {conditionGroups.length === 0 ? (
-          <p className='text-muted-foreground text-xs'>
-            {t('Always matches (default tier).')}
-          </p>
+          <>
+            {index === total - 1 && (
+              <p className='text-muted-foreground text-xs'>
+                {t('Always matches (default tier).')}
+              </p>
+            )}
+            {index < total - 1 && (
+              <p className='text-destructive text-xs'>
+                {t('Always matches; later tiers are unreachable')}
+              </p>
+            )}
+          </>
         ) : (
           <div className='flex flex-col gap-2'>
             {conditionGroups.map((group, groupIndex) => (
diff --git a/web/default/src/i18n/locales/en.json b/web/default/src/i18n/locales/en.json
index cb99991d..fd729336 100644
--- a/web/default/src/i18n/locales/en.json
+++ b/web/default/src/i18n/locales/en.json
@@ -478,6 +478,7 @@
     "Allowed Ports": "Allowed Ports",
     "Already have an account?": "Already have an account?",
     "Always matches (default tier).": "Always matches (default tier).",
+    "Always matches; later tiers are unreachable": "Always matches; later tiers are unreachable",
     "Amount": "Amount",
     "Amount cannot be changed when editing.": "Amount cannot be changed when editing.",
     "Amount discount": "Amount discount",
diff --git a/web/default/src/i18n/locales/fr.json b/web/default/src/i18n/locales/fr.json
index 2b4e0082..36ddb132 100644
--- a/web/default/src/i18n/locales/fr.json
+++ b/web/default/src/i18n/locales/fr.json
@@ -478,6 +478,7 @@
     "Allowed Ports": "Ports autorisés",
     "Already have an account?": "Vous avez déjà un compte ?",
     "Always matches (default tier).": "Toujours appliqué (palier par défaut).",
+    "Always matches; later tiers are unreachable": "Toujours appliqué ; les paliers suivants ne seront jamais atteints",
     "Amount": "Montant",
     "Amount cannot be changed when editing.": "Le montant ne peut pas être modifié lors de la modification.",
     "Amount discount": "Remise sur le montant",
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index e8f48286..d33400cf 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -478,6 +478,7 @@
     "Allowed Ports": "許可するポート",
     "Already have an account?": "アカウントをお持ちの方？",
     "Always matches (default tier).": "常に一致（デフォルト ティア）。",
+    "Always matches; later tiers are unreachable": "常に一致するため、後続のティアは適用されません",
     "Amount": "金額",
     "Amount cannot be changed when editing.": "編集時は金額を変更できません。",
     "Amount discount": "割引額",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index f7264b99..b5e2a1f2 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -478,6 +478,7 @@
     "Allowed Ports": "Разрешенные порты",
     "Already have an account?": "Уже есть аккаунт?",
     "Always matches (default tier).": "Всегда совпадает (уровень по умолчанию).",
+    "Always matches; later tiers are unreachable": "Всегда применяется; последующие уровни недостижимы",
     "Amount": "Сумма",
     "Amount cannot be changed when editing.": "Количество нельзя изменить при редактировании.",
     "Amount discount": "Скидка на сумму",
diff --git a/web/default/src/i18n/locales/vi.json b/web/default/src/i18n/locales/vi.json
index ff4ef374..24f4be59 100644
--- a/web/default/src/i18n/locales/vi.json
+++ b/web/default/src/i18n/locales/vi.json
@@ -478,6 +478,7 @@
     "Allowed Ports": "Cổng được phép",
     "Already have an account?": "Đã có tài khoản?",
     "Always matches (default tier).": "Luôn khớp (bậc mặc định).",
+    "Always matches; later tiers are unreachable": "Luôn khớp; các bậc sau sẽ không được áp dụng",
     "Amount": "Số lượng",
     "Amount cannot be changed when editing.": "Số tiền không thể thay đổi khi chỉnh sửa.",
     "Amount discount": "Số tiền giảm giá",
diff --git a/web/default/src/i18n/locales/zh.json b/web/default/src/i18n/locales/zh.json
index 0a7b536f..e49650e5 100644
--- a/web/default/src/i18n/locales/zh.json
+++ b/web/default/src/i18n/locales/zh.json
@@ -478,6 +478,7 @@
     "Allowed Ports": "允许的端口",
     "Already have an account?": "已有账户？",
     "Always matches (default tier).": "始终匹配（默认档位）。",
+    "Always matches; later tiers are unreachable": "始终匹配，后续档位将不会生效",
     "Amount": "金额",
     "Amount cannot be changed when editing.": "编辑时无法更改数量。",
     "Amount discount": "金额折扣",

From 724a4b244fac3e8ad45a32d7f059115f1f1eb700 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 21:33:38 +0800
Subject: [PATCH 11/20] chore: annotate pricing settings callback return types

---
 .../task-rate-card-settings.runtime.test.tsx       | 14 +++++++-------
 .../models/task-rate-card-settings.tsx             |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
index 64b6db51..d03db168 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
@@ -33,7 +33,7 @@ before(() => testEnv.setup())
 after(() => testEnv.teardown())
 
 for (const kind of ['task', 'tiered'] as const) {
-  test(`${kind} settings retain valid editor state after failed file imports`, async () => {
+  test(`${kind} settings retain valid editor state after failed file imports`, async (): Promise<void> => {
     const queryClient = new QueryClient()
     const actions = document.createElement('div')
     document.body.append(actions)
@@ -63,13 +63,13 @@ for (const kind of ['task', 'tiered'] as const) {
       const original = editor.value
       assert.equal(save.disabled, false)
       for (const text of [
-        async () => '{',
-        async () => '[]',
-        async () => {
+        async (): Promise<string> => '{',
+        async (): Promise<string> => '[]',
+        async (): Promise<string> => {
           throw new Error('Synthetic file read failure')
         },
       ]) {
-        await act(async () => {
+        await act(async (): Promise<void> => {
           fireEvent.change(fileInput, { target: { files: [{ text }] } })
         })
         assert.equal(editor.value, original)
@@ -79,9 +79,9 @@ for (const kind of ['task', 'tiered'] as const) {
         kind === 'task'
           ? '{"test-model":{"unit":"second","rows":[]}}'
           : '{"test-model":{"enabled":true,"expr":"p * 1"}}'
-      await act(async () => {
+      await act(async (): Promise<void> => {
         fireEvent.change(fileInput, {
-          target: { files: [{ text: async () => imported }] },
+          target: { files: [{ text: async (): Promise<string> => imported }] },
         })
       })
       assert.deepEqual(JSON.parse(editor.value), JSON.parse(imported))
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
index c6a1e8e1..30a32393 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
@@ -332,7 +332,7 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
   const fileInputRef = useRef<HTMLInputElement>(null)
   const editRevision = useRef(0)
   const initialText = useMemo(
-    () => formatJsonForTextarea(defaultValue || '{}'),
+    (): string => formatJsonForTextarea(defaultValue || '{}'),
     [defaultValue]
   )
   const vendorSummary = useMemo(() => buildVendorSummary(text), [text])

From 0c782bc5e8fd41982f08f197360f284a867c0fbb Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 22:42:45 +0800
Subject: [PATCH 12/20] fix: settle only delivered chat output and validate
 pricing imports

---
 relay/channel/openai/chat_stream.go           | 67 +++++++++++---
 relay/channel/openai/chat_stream_test.go      | 70 ++++++++++++++
 relay/chat_stream_billing_test.go             | 92 +++++++++++++++++++
 .../task-rate-card-settings.runtime.test.tsx  | 22 ++++-
 .../models/task-rate-card-settings.tsx        |  5 +-
 .../models/tiered-billing-settings.tsx        | 27 ++++--
 .../tiered-pricing-editor.runtime.test.tsx    | 87 ++++++++++++++++++
 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 +
 13 files changed, 353 insertions(+), 23 deletions(-)

diff --git a/relay/channel/openai/chat_stream.go b/relay/channel/openai/chat_stream.go
index 951a064f..67df91a4 100644
--- a/relay/channel/openai/chat_stream.go
+++ b/relay/channel/openai/chat_stream.go
@@ -3,6 +3,7 @@ package openai
 import (
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"strings"
 
@@ -20,6 +21,29 @@ const (
 	maxPendingChatStreamBytes  = 64 << 10
 )
 
+// Observe native Chat writes because legacy SSE rendering can discard writer
+// errors. The scanner serializes this wrapper with ping writes.
+type chatStreamWriteObserver struct {
+	gin.ResponseWriter
+	err error
+}
+
+func (w *chatStreamWriteObserver) Write(data []byte) (int, error) {
+	if w.err != nil {
+		return 0, w.err
+	}
+	n, err := w.ResponseWriter.Write(data)
+	if err == nil && n != len(data) {
+		err = io.ErrShortWrite
+	}
+	w.err = err
+	return n, err
+}
+
+func (w *chatStreamWriteObserver) WriteString(data string) (int, error) {
+	return w.Write([]byte(data))
+}
+
 // Keep the raw delta fields for the visibility decision. The forwarding path
 // still owns formatting; unknown provider payloads must not become empty just
 // because the typed Chat DTO does not yet describe them.
@@ -119,12 +143,28 @@ func oaiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *htt
 	observer := newOpenAIStreamToolCallObserver(info)
 
 	send := func(data string) bool {
-		if err := HandleStreamFormat(c, info, data, info.ChannelSetting.ForceFormat, info.ChannelSetting.ThinkingToContent); err != nil {
-			streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusBadGateway, types.ErrOptionWithSkipRetry())
+		writer := &chatStreamWriteObserver{ResponseWriter: c.Writer}
+		c.Writer = writer
+		defer func() { c.Writer = writer.ResponseWriter }()
+		err := HandleStreamFormat(c, info, data, info.ChannelSetting.ForceFormat, info.ChannelSetting.ThinkingToContent)
+		if err == nil {
+			err = writer.err
+		}
+		if err != nil {
+			streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusBadGateway)
+			if c.Writer.Written() {
+				types.ErrOptionWithSkipRetry()(streamErr)
+			}
 			return false
 		}
 		return true
 	}
+	recordUsage := func(frame *chatStreamFrame, data string) {
+		lastData = data
+		if frame.Usage != nil {
+			usage, containUsage = frame.Usage, true
+		}
+	}
 	flushPending := func() bool {
 		buffering = false
 		for _, data := range pending {
@@ -149,17 +189,9 @@ func oaiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *htt
 			sr.Stop(streamErr)
 			return
 		}
-		lastData = data
-		if frame.Usage != nil {
-			usage, containUsage = frame.Usage, true
-		}
 		visible := frame.hasPayload()
-		hasPayload = hasPayload || visible
-		observeOpenAIStreamToolCalls(observer, data)
-		if err := processTokenData(info.RelayMode, data, &text, &toolCount); err != nil {
-			sr.Error(err)
-		}
 		if !info.ShouldIncludeUsage && frame.Usage != nil && len(frame.Choices) == 0 {
+			recordUsage(&frame, data)
 			return
 		}
 		if buffering {
@@ -169,6 +201,7 @@ func oaiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *htt
 					return
 				}
 			} else {
+				recordUsage(&frame, data)
 				pending = append(pending, data)
 				pendingBytes += len(data)
 				return
@@ -176,6 +209,13 @@ func oaiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *htt
 		}
 		if !send(data) {
 			sr.Stop(streamErr)
+			return
+		}
+		hasPayload = hasPayload || visible
+		recordUsage(&frame, data)
+		observeOpenAIStreamToolCalls(observer, data)
+		if err := processTokenData(info.RelayMode, data, &text, &toolCount); err != nil {
+			sr.Error(err)
 		}
 	})
 
@@ -187,7 +227,7 @@ func oaiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *htt
 		streamErr = types.NewOpenAIError(fmt.Errorf("upstream chat stream ended: %s", info.StreamStatus.Summary()), types.ErrorCodeBadResponse, http.StatusBadGateway)
 	}
 	if streamErr != nil {
-		if c.Writer.Written() || hasPayload {
+		if c.Writer.Written() {
 			types.ErrOptionWithSkipRetry()(streamErr)
 		}
 		if !hasPayload {
@@ -214,6 +254,9 @@ func oaiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *htt
 		return usage, streamErr
 	}
 	if !flushPending() {
+		if !hasPayload {
+			return nil, streamErr
+		}
 		return usage, streamErr
 	}
 	if hasPayload {
diff --git a/relay/channel/openai/chat_stream_test.go b/relay/channel/openai/chat_stream_test.go
index a9d14836..d5676b31 100644
--- a/relay/channel/openai/chat_stream_test.go
+++ b/relay/channel/openai/chat_stream_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/MAX-API-Next/MAX-API/dto"
 	relaycommon "github.com/MAX-API-Next/MAX-API/relay/common"
 	relayconstant "github.com/MAX-API-Next/MAX-API/relay/constant"
+	"github.com/MAX-API-Next/MAX-API/service"
 	"github.com/MAX-API-Next/MAX-API/setting/operation_setting"
 	"github.com/MAX-API-Next/MAX-API/types"
 	"github.com/gin-gonic/gin"
@@ -310,3 +311,72 @@ func TestNativeChatStreamContentFilterIsNotRetried(t *testing.T) {
 	require.Contains(t, recorder.Body.String(), "content_filter")
 	require.Zero(t, emptyCompletionRetryCount(c))
 }
+
+func TestNativeChatStreamFormattingFailureTracksForwardedPayload(t *testing.T) {
+	for _, prefix := range []string{"none", "role", "payload"} {
+		t.Run(prefix, func(t *testing.T) {
+			c, recorder, info := newChatStreamTest(t)
+			info.ChannelSetting.ForceFormat = true
+			frames := []string{}
+			if prefix == "role" {
+				frames = append(frames, chatRoleFrame)
+			} else if prefix == "payload" {
+				frames = append(frames, `{"choices":[{"delta":{"content":"hello"}}]}`)
+			}
+			// The native envelope accepts an extension's numeric id, but the
+			// requested typed formatter rejects it before writing this payload.
+			frames = append(frames, `{"id":123,"choices":[{"delta":{"content":"never delivered"}}],"usage":{"prompt_tokens":1000,"completion_tokens":999,"total_tokens":1999}}`, "[DONE]")
+			usage, apiErr := replayChatStream(c, info, frames...)
+			require.NotNil(t, apiErr)
+			require.Equal(t, prefix != "none", types.IsSkipRetryError(apiErr))
+			require.NotContains(t, recorder.Body.String(), "never delivered")
+			if prefix != "payload" {
+				require.Nil(t, usage, "role-only or uncommitted failures must not settle")
+			} else {
+				require.NotNil(t, usage)
+				require.Equal(t, 38, usage.PromptTokens)
+				expected := service.ResponseText2Usage(c, "hello", info.UpstreamModelName, 38)
+				require.Equal(t, expected.CompletionTokens, usage.CompletionTokens)
+				require.Contains(t, recorder.Body.String(), "hello")
+			}
+			if prefix == "none" {
+				require.False(t, c.Writer.Written())
+				info.RetryIndex++
+				usage, apiErr = replayChatStream(c, info, `{"choices":[{"delta":{"content":"winner"}}]}`, "[DONE]")
+				require.Nil(t, apiErr)
+				require.NotNil(t, usage)
+				require.Equal(t, 1, strings.Count(recorder.Body.String(), "winner"))
+			}
+		})
+	}
+}
+
+type rejectedChatResponseWriter struct {
+	header http.Header
+	short  bool
+}
+
+func (w *rejectedChatResponseWriter) Header() http.Header { return w.header }
+func (w *rejectedChatResponseWriter) WriteHeader(int)     {}
+func (w *rejectedChatResponseWriter) Flush()              {}
+func (w *rejectedChatResponseWriter) Write([]byte) (int, error) {
+	if w.short {
+		return 0, nil
+	}
+	return 0, io.ErrClosedPipe
+}
+
+func TestNativeChatStreamWriteFailureDoesNotSettleFirstPayload(t *testing.T) {
+	for _, short := range []bool{false, true} {
+		t.Run(fmt.Sprintf("short=%t", short), func(t *testing.T) {
+			c, _, info := newChatStreamTest(t)
+			failed, _ := gin.CreateTestContext(&rejectedChatResponseWriter{header: make(http.Header), short: short})
+			c.Writer = failed.Writer
+			usage, apiErr := replayChatStream(c, info, `{"choices":[{"delta":{"content":"never delivered"}}]}`, "[DONE]")
+			require.NotNil(t, apiErr)
+			require.True(t, types.IsSkipRetryError(apiErr), "Gin committed the response headers")
+			require.Nil(t, usage)
+			require.Same(t, failed.Writer, c.Writer)
+		})
+	}
+}
diff --git a/relay/chat_stream_billing_test.go b/relay/chat_stream_billing_test.go
index cf18bdb6..c47c51a4 100644
--- a/relay/chat_stream_billing_test.go
+++ b/relay/chat_stream_billing_test.go
@@ -2,6 +2,7 @@ package relay
 
 import (
 	"fmt"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -34,6 +35,97 @@ type chatStreamBillingRecorder struct {
 
 var chatStreamMetricSequence atomic.Uint64
 
+type billingChatWriteFailure struct {
+	*httptest.ResponseRecorder
+}
+
+func (w *billingChatWriteFailure) Write(data []byte) (int, error) {
+	if strings.Contains(string(data), "undelivered") {
+		return 0, io.ErrClosedPipe
+	}
+	return w.ResponseRecorder.Write(data)
+}
+
+func TestNativeChatRelayBillingOnDeliveryFailures(t *testing.T) {
+	for _, scenario := range []string{"format", "role_format", "partial_format", "write", "partial_write"} {
+		t.Run(scenario, func(t *testing.T) {
+			gin.SetMode(gin.TestMode)
+			service.InitHttpClient()
+			oldFlag, oldTimes := common.EmptyCompletionRetryEnabled, common.RetryTimes
+			common.EmptyCompletionRetryEnabled, common.RetryTimes = true, 2
+			t.Cleanup(func() { common.EmptyCompletionRetryEnabled, common.RetryTimes = oldFlag, oldTimes })
+			var calls atomic.Int32
+			partial := strings.HasPrefix(scenario, "partial_")
+			writeFailure := strings.HasSuffix(scenario, "write")
+			upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.Header().Set("Content-Type", "text/event-stream")
+				frames := []string{}
+				if calls.Add(1) > 1 {
+					frames = append(frames, `{"choices":[{"delta":{"content":"winner"}}],"usage":{"prompt_tokens":10,"completion_tokens":2,"total_tokens":12}}`)
+				} else {
+					if scenario == "role_format" {
+						frames = append(frames, `{"choices":[{"delta":{"role":"assistant"}}]}`)
+					} else if partial {
+						frames = append(frames, `{"choices":[{"delta":{"content":"hello"}}],"usage":{"prompt_tokens":10,"completion_tokens":2,"total_tokens":12}}`)
+					}
+					id := `"bad"`
+					if !writeFailure {
+						id = `123`
+					}
+					frames = append(frames, `{"id":`+id+`,"choices":[{"delta":{"content":"undelivered"}}],"usage":{"prompt_tokens":1000,"completion_tokens":999,"total_tokens":1999}}`)
+				}
+				_, _ = w.Write([]byte("data: " + strings.Join(append(frames, "[DONE]"), "\n\ndata: ") + "\n\n"))
+			}))
+			t.Cleanup(upstream.Close)
+			recorder := httptest.NewRecorder()
+			var writer http.ResponseWriter = recorder
+			if writeFailure {
+				writer = &billingChatWriteFailure{recorder}
+			}
+			c, _ := gin.CreateTestContext(writer)
+			c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
+			c.Set(string(constant.ContextKeyChannelType), constant.ChannelTypeOpenAI)
+			c.Set(string(constant.ContextKeyChannelBaseUrl), upstream.URL)
+			c.Set(string(constant.ContextKeyChannelKey), "synthetic-test-key")
+			c.Set(string(constant.ContextKeyOriginalModel), "gpt-test")
+			common.SetContextKey(c, constant.ContextKeyChannelSetting, dto.ChannelSettings{ForceFormat: true})
+			billing := &chatStreamBillingRecorder{}
+			info := &relaycommon.RelayInfo{
+				RelayMode: relayconstant.RelayModeChatCompletions, RelayFormat: types.RelayFormatOpenAI,
+				OriginModelName: "gpt-test", StartTime: time.Now(), IsStream: true, DisablePing: true,
+				RequestId: "delivery-test-" + scenario, Billing: billing,
+				UserQuota: 1000, UserSetting: dto.UserSetting{QuotaWarningThreshold: 1},
+				PriceData: types.PriceData{ModelRatio: 1, CompletionRatio: 1, GroupRatioInfo: types.GroupRatioInfo{GroupRatio: 1}},
+				Request:   &dto.GeneralOpenAIRequest{Model: "gpt-test", Stream: common.GetPointer(true)},
+			}
+			apiErr := TextHelper(c, info)
+			require.NotNil(t, apiErr)
+			require.Equal(t, scenario != "format", types.IsSkipRetryError(apiErr))
+			require.NotContains(t, recorder.Body.String(), "undelivered")
+			if partial {
+				require.Equal(t, []int{12}, billing.quotas)
+				require.Len(t, billing.effects, 1)
+				service.HandleFailedBilling(c, info, apiErr)
+				require.Zero(t, billing.refunds)
+			} else {
+				require.Empty(t, billing.quotas)
+				require.Empty(t, billing.effects)
+				if scenario == "format" {
+					info.RetryIndex++
+					require.Nil(t, TextHelper(c, info))
+					require.Equal(t, []int{12}, billing.quotas)
+					require.Len(t, billing.effects, 1)
+					require.Equal(t, 1, strings.Count(recorder.Body.String(), "winner"))
+				} else {
+					service.HandleFailedBilling(c, info, apiErr)
+					service.HandleFailedBilling(c, info, apiErr)
+					require.Equal(t, 1, billing.refunds)
+				}
+			}
+		})
+	}
+}
+
 func (b *chatStreamBillingRecorder) Settle(int) error { panic("expected settlement with effect") }
 func (b *chatStreamBillingRecorder) SettleWithEffect(quota int, effect *model.BillingSettlementEffect) error {
 	b.quotas = append(b.quotas, quota)
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
index d03db168..0d366b02 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
@@ -41,9 +41,12 @@ for (const kind of ['task', 'tiered'] as const) {
       <QueryClientProvider client={queryClient}>
         <SettingsPageProvider actionsContainer={actions}>
           {kind === 'task' ? (
-            <TaskRateCardSettings defaultValue='{}' />
+            <TaskRateCardSettings defaultValue='{"existing-model":{"unit":"second","rows":[]}}' />
           ) : (
-            <TieredBillingSettings billingMode='{}' billingExpr='{}' />
+            <TieredBillingSettings
+              billingMode='{"existing-model":"tiered_expr"}'
+              billingExpr='{"existing-model":"p * 1"}'
+            />
           )}
         </SettingsPageProvider>
       </QueryClientProvider>
@@ -63,8 +66,17 @@ for (const kind of ['task', 'tiered'] as const) {
       const original = editor.value
       assert.equal(save.disabled, false)
       for (const text of [
+        async (): Promise<string> => '',
+        async (): Promise<string> => ' \r\n\t ',
         async (): Promise<string> => '{',
         async (): Promise<string> => '[]',
+        ...(kind === 'tiered'
+          ? ['false', 'true', 0, 1, null, [], {}].map(
+              (enabled): (() => Promise<string>) =>
+                async (): Promise<string> =>
+                  JSON.stringify({ model: { enabled, expr: 'p * 1' } })
+            )
+          : []),
         async (): Promise<string> => {
           throw new Error('Synthetic file read failure')
         },
@@ -86,6 +98,12 @@ for (const kind of ['task', 'tiered'] as const) {
       })
       assert.deepEqual(JSON.parse(editor.value), JSON.parse(imported))
       assert.equal(save.disabled, false)
+      await act(async (): Promise<void> => {
+        fireEvent.change(fileInput, {
+          target: { files: [{ text: async (): Promise<string> => '{}' }] },
+        })
+      })
+      assert.deepEqual(JSON.parse(editor.value), {})
     } finally {
       await view.unmount()
       actions.remove()
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
index 30a32393..8bfa1cbb 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
@@ -415,12 +415,13 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
         const contents = await file.text()
         if (revision !== editRevision.current) return
         const imported = formatJsonForTextarea(contents)
-        const parsed = JSON.parse(imported || '{}') as unknown
+        if (!imported) throw new Error(t('Invalid JSON'))
+        const parsed = JSON.parse(imported) as unknown
         if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
           throw new Error(t('JSON must be an object'))
         }
         editRevision.current += 1
-        setText(imported || '{}')
+        setText(imported)
         setError('')
         toast.success(t('JSON imported. Review prices before saving.'))
       } catch (err) {
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 378ea7f0..36034e93 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -25,6 +25,7 @@ import {
   useState,
 } from 'react'
 import { useMutation, useQueryClient } from '@tanstack/react-query'
+import type { TFunction } from 'i18next'
 import {
   Braces,
   Check,
@@ -93,7 +94,10 @@ function buildUnifiedConfig(billingMode: string, billingExpr: string) {
   return config
 }
 
-function validateUnifiedConfig(value: string) {
+function validateUnifiedConfig(
+  value: string,
+  t: TFunction
+): Record<string, TieredBillingEntry> {
   const parsed = JSON.parse(value) as unknown
   if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
     throw new Error('Tiered billing JSON must be an object')
@@ -111,7 +115,15 @@ function validateUnifiedConfig(value: string) {
       }
 
       const rawEntry = entry as Partial<TieredBillingEntry>
-      const enabled = Boolean(rawEntry.enabled)
+      if (
+        rawEntry.enabled !== undefined &&
+        typeof rawEntry.enabled !== 'boolean'
+      ) {
+        throw new Error(
+          t('Enabled flag for {{model}} must be a boolean', { model: name })
+        )
+      }
+      const enabled = rawEntry.enabled ?? false
       const expr = typeof rawEntry.expr === 'string' ? rawEntry.expr.trim() : ''
       if (enabled && !expr) {
         throw new Error(`Billing expression for ${name} cannot be empty`)
@@ -196,7 +208,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   const handleSave = useCallback(async () => {
     let config: Record<string, TieredBillingEntry>
     try {
-      config = validateUnifiedConfig(text || '{}')
+      config = validateUnifiedConfig(text || '{}', t)
       setError('')
     } catch (err) {
       const message = err instanceof Error ? err.message : t('Invalid JSON')
@@ -213,11 +225,11 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
     TieredBillingEntry
   > | null => {
     try {
-      return validateUnifiedConfig(text || '{}')
+      return validateUnifiedConfig(text || '{}', t)
     } catch {
       return null
     }
-  }, [text])
+  }, [t, text])
 
   const enabledCount = useMemo(
     (): number =>
@@ -251,9 +263,10 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
         const contents = await file.text()
         if (revision !== editRevision.current) return
         const imported = formatJsonForTextarea(contents)
-        validateUnifiedConfig(imported || '{}')
+        if (!imported) throw new Error(t('Invalid JSON'))
+        validateUnifiedConfig(imported, t)
         editRevision.current += 1
-        setText(imported || '{}')
+        setText(imported)
         setError('')
       } catch (err) {
         if (revision !== editRevision.current) return
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
index a45e613d..29e89463 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
@@ -18,6 +18,7 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 */
 import { act, useState, type ReactElement } from 'react'
 import type { Root } from 'react-dom/client'
+import type { AxiosResponse, InternalAxiosRequestConfig } from 'axios'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { createInstance } from 'i18next'
 import { JSDOM } from 'jsdom'
@@ -134,6 +135,92 @@ const modelB: ModelRatioData = {
 }
 
 describe('optional zero prices in the actual editor', () => {
+  for (const enabled of [
+    false,
+    true,
+    undefined,
+    'false',
+    'true',
+    0,
+    1,
+    null,
+    [],
+    {},
+  ]) {
+    test(`tiered configuration enforces boolean flags before save or download: ${JSON.stringify(enabled)}`, async (): Promise<void> => {
+      const { api } = await import('@/lib/api')
+      const previousAdapter = api.defaults.adapter
+      const writes: unknown[] = []
+      api.defaults.adapter = async (
+        config: InternalAxiosRequestConfig
+      ): Promise<AxiosResponse> => {
+        assert.equal(config.url, '/api/option/tiered_billing')
+        writes.push(JSON.parse(config.data as string))
+        return {
+          data: { success: true },
+          status: 200,
+          statusText: 'OK',
+          headers: {},
+          config,
+        }
+      }
+      const container = createContainer()
+      const actions = createContainer()
+      const root = createRoot(container)
+      const queryClient = new QueryClient()
+      try {
+        await act(async (): Promise<void> => {
+          root.render(
+            <I18nextProvider i18n={i18n}>
+              <QueryClientProvider client={queryClient}>
+                <SettingsPageProvider actionsContainer={actions}>
+                  <TieredBillingSettings billingMode='{}' billingExpr='{}' />
+                </SettingsPageProvider>
+              </QueryClientProvider>
+            </I18nextProvider>
+          )
+        })
+        const editor = container.querySelector('textarea')
+        assert.ok(editor)
+        const save = within(actions).getByRole('button', {
+          name: 'Save tiered billing',
+        })
+        const download = within(actions).getByRole('button', {
+          name: 'Download',
+        }) as HTMLButtonElement
+        const valid = enabled === undefined || typeof enabled === 'boolean'
+        await act(async (): Promise<void> => {
+          fireEvent.change(editor, {
+            target: {
+              value: JSON.stringify({ model: { enabled, expr: 'p * 1' } }),
+            },
+          })
+        })
+        assert.equal(download.disabled, !valid)
+        await act(async (): Promise<void> => {
+          fireEvent.click(save)
+        })
+        assert.deepEqual(
+          writes,
+          valid
+            ? [
+                {
+                  config: {
+                    model: { enabled: enabled ?? false, expr: 'p * 1' },
+                  },
+                },
+              ]
+            : []
+        )
+      } finally {
+        await unmount(root, container)
+        actions.remove()
+        queryClient.clear()
+        api.defaults.adapter = previousAdapter
+      }
+    })
+  }
+
   for (const kind of ['task', 'tiered'] as const) {
     test(`${kind} settings discard imports superseded by edits, imports, examples, and resets`, async () => {
       const container = createContainer()
diff --git a/web/default/src/i18n/locales/en.json b/web/default/src/i18n/locales/en.json
index fd729336..a0867163 100644
--- a/web/default/src/i18n/locales/en.json
+++ b/web/default/src/i18n/locales/en.json
@@ -1762,6 +1762,7 @@
     "Enable WeChat Auth": "Enable WeChat Auth",
     "Enable when proxying workers that fetch images over HTTP.": "Enable when proxying workers that fetch images over HTTP.",
     "Enabled": "Enabled",
+    "Enabled flag for {{model}} must be a boolean": "Enabled flag for {{model}} must be a boolean",
     "Enabled all channels with tag: {{tag}}": "Enabled all channels with tag: {{tag}}",
     "Enabled Status": "Enabled Status",
     "Enabling...": "Enabling...",
diff --git a/web/default/src/i18n/locales/fr.json b/web/default/src/i18n/locales/fr.json
index 36ddb132..ec1635a1 100644
--- a/web/default/src/i18n/locales/fr.json
+++ b/web/default/src/i18n/locales/fr.json
@@ -1762,6 +1762,7 @@
     "Enable WeChat Auth": "Activer l'authentification WeChat",
     "Enable when proxying workers that fetch images over HTTP.": "Activer lors de la mise en proxy des workers qui récupèrent des images via HTTP.",
     "Enabled": "Activé",
+    "Enabled flag for {{model}} must be a boolean": "L’indicateur d’activation de {{model}} doit être un booléen",
     "Enabled all channels with tag: {{tag}}": "Tous les canaux avec le tag {{tag}} ont été activés",
     "Enabled Status": "Statut activé",
     "Enabling...": "Activation en cours...",
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index d33400cf..538b6079 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -1762,6 +1762,7 @@
     "Enable WeChat Auth": "WeChat認証を有効にする",
     "Enable when proxying workers that fetch images over HTTP.": "HTTP経由で画像をフェッチするワーカーをプロキシする場合に有効にします。",
     "Enabled": "有効",
+    "Enabled flag for {{model}} must be a boolean": "{{model}} の有効フラグは真偽値である必要があります",
     "Enabled all channels with tag: {{tag}}": "タグ「{{tag}}」の全チャネルを有効にしました",
     "Enabled Status": "有効ステータス",
     "Enabling...": "有効化中...",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index b5e2a1f2..17b76bc9 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -1762,6 +1762,7 @@
     "Enable WeChat Auth": "Включить аутентификацию WeChat",
     "Enable when proxying workers that fetch images over HTTP.": "Включить при проксировании воркеров, которые получают изображения по HTTP.",
     "Enabled": "Включено",
+    "Enabled flag for {{model}} must be a boolean": "Флаг включения для {{model}} должен быть логическим значением",
     "Enabled all channels with tag: {{tag}}": "Все каналы с тегом {{tag}} включены",
     "Enabled Status": "Статус включения",
     "Enabling...": "Включается...",
diff --git a/web/default/src/i18n/locales/vi.json b/web/default/src/i18n/locales/vi.json
index 24f4be59..12ad969e 100644
--- a/web/default/src/i18n/locales/vi.json
+++ b/web/default/src/i18n/locales/vi.json
@@ -1762,6 +1762,7 @@
     "Enable WeChat Auth": "Bật xác thực WeChat",
     "Enable when proxying workers that fetch images over HTTP.": "Kích hoạt khi làm proxy cho các worker tìm nạp hình ảnh qua HTTP.",
     "Enabled": "Đã bật",
+    "Enabled flag for {{model}} must be a boolean": "Cờ bật của {{model}} phải là giá trị boolean",
     "Enabled all channels with tag: {{tag}}": "Đã bật tất cả kênh với nhãn: {{tag}}",
     "Enabled Status": "Trạng thái kích hoạt",
     "Enabling...": "Đang bật...",
diff --git a/web/default/src/i18n/locales/zh.json b/web/default/src/i18n/locales/zh.json
index e49650e5..6faf063f 100644
--- a/web/default/src/i18n/locales/zh.json
+++ b/web/default/src/i18n/locales/zh.json
@@ -1762,6 +1762,7 @@
     "Enable WeChat Auth": "启用微信授权",
     "Enable when proxying workers that fetch images over HTTP.": "当代理通过 HTTP 获取图像的 worker 时启用。",
     "Enabled": "已启用",
+    "Enabled flag for {{model}} must be a boolean": "{{model}} 的启用标志必须为布尔值",
     "Enabled all channels with tag: {{tag}}": "已启用标签「{{tag}}」下的所有渠道",
     "Enabled Status": "启用状态",
     "Enabling...": "正在启用...",

From c4db6ed85c94a1ae571f9740d694f0f44b0c6eb6 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 23:26:55 +0800
Subject: [PATCH 13/20] update

---
 AGENTS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AGENTS.md b/AGENTS.md
index 86e509ba..613ddaac 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -179,4 +179,4 @@ RelayKit-specific requirements:
 - Review changes to converter identity, quality, steps, usage, and diagnostics as compatibility-sensitive interface changes.
 - RelayKit does not own billing. Preserve MAX-API's billing, reservation, settlement, retry, and logging invariants, and prove that normalized usage is applied exactly once.
 - If the private checker or registry is unavailable in a fresh workspace, perform the equivalent remote commit/path comparison manually and record the missing maintenance prerequisite instead of silently skipping the check.
-- If the living plan is missing in a fresh workspace, recreate it under `new-api/.tmp/` from the current code and upstream records before continuing; never substitute an old chat summary for the plan.
+- If the living plan is missing in a fresh workspace, recreate it under `.tmp/` from the current code and upstream records before continuing; never substitute an old chat summary for the plan.

From 17538488187ee175fde2d88590371ddc5f272f74 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Thu, 17 Sep 2026 23:28:15 +0800
Subject: [PATCH 14/20] chore: complete routing and pricing handler type
 annotations

---
 .../api-key-routing-editor.test.tsx           | 20 +++++++++++--------
 .../models/tiered-billing-settings.tsx        |  2 +-
 .../models/tiered-pricing-visual-editor.tsx   |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/web/default/src/features/keys/components/api-key-routing-editor.test.tsx b/web/default/src/features/keys/components/api-key-routing-editor.test.tsx
index b0220179..2cbaf9a1 100644
--- a/web/default/src/features/keys/components/api-key-routing-editor.test.tsx
+++ b/web/default/src/features/keys/components/api-key-routing-editor.test.tsx
@@ -54,9 +54,9 @@ before(async () => {
     requestAnimationFrame: dom.window.requestAnimationFrame.bind(dom.window),
     cancelAnimationFrame: dom.window.cancelAnimationFrame.bind(dom.window),
     ResizeObserver: class {
-      observe() {}
-      unobserve() {}
-      disconnect() {}
+      observe(): void {}
+      unobserve(): void {}
+      disconnect(): void {}
     },
     IS_REACT_ACT_ENVIRONMENT: true,
   }
@@ -72,10 +72,10 @@ before(async () => {
   Object.defineProperty(dom.window, 'matchMedia', {
     value: () => ({
       matches: false,
-      addListener() {},
-      removeListener() {},
-      addEventListener() {},
-      removeEventListener() {},
+      addListener(): void {},
+      removeListener(): void {},
+      addEventListener(): void {},
+      removeEventListener(): void {},
     }),
   })
   // React and Base UI must detect the browser before mounting interactive portals.
@@ -106,7 +106,11 @@ const availableGroups = Array.from(
   (_, index) => `group-${index + 1}`
 )
 
-function RoutingHarness(props: { initialGroups: string[] }): ReactElement {
+type RoutingHarnessProps = {
+  initialGroups: string[]
+}
+
+function RoutingHarness(props: RoutingHarnessProps): ReactElement {
   const [mode, setMode] = useState<TokenRoutingMode>('smart')
   const [manualGroups, setManualGroups] = useState(props.initialGroups)
   return (
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 36034e93..130e4915 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -205,7 +205,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
     setError('')
   }, [])
 
-  const handleSave = useCallback(async () => {
+  const handleSave = useCallback(async (): Promise<void> => {
     let config: Record<string, TieredBillingEntry>
     try {
       config = validateUnifiedConfig(text || '{}', t)
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
index 7003f06e..b480e723 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
@@ -311,7 +311,7 @@ function VisualTierCard({
     groupIndex: number,
     conditionIndex: number,
     next: TierConditionInput
-  ) => {
+  ): void => {
     const groups = conditionGroups.map((group) => ({
       conditions: [...group.conditions],
     }))

From 0833f82061c4e25c116b725099b6df995e9b21d9 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Fri, 18 Sep 2026 00:07:06 +0800
Subject: [PATCH 15/20] docs: align upstream implementation plan paths

---
 AGENTS.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 613ddaac..81fb70bb 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -158,7 +158,7 @@ Run the private upstream component check before any of the following work:
 
 Required procedure:
 
-1. Read `.agents/upstream-sync/components.json`, `.agents/upstream-sync/new-api-sync.md`, and the living implementation plan at `new-api/.tmp/MAX_API_UPSTREAM_IMPLEMENTATION_PLAN.md`.
+1. Read `.agents/upstream-sync/components.json`, `.agents/upstream-sync/new-api-sync.md`, and the living implementation plan at `.tmp/MAX_API_UPSTREAM_IMPLEMENTATION_PLAN.md`.
 2. Run the checker from the repository root with the cross-platform `pwsh` executable when available:
    `pwsh -NoProfile -ExecutionPolicy Bypass -File .agents/upstream-sync/check-new-api.ps1`.
    On Windows hosts without `pwsh`, use the equivalent Windows PowerShell fallback:
@@ -179,4 +179,4 @@ RelayKit-specific requirements:
 - Review changes to converter identity, quality, steps, usage, and diagnostics as compatibility-sensitive interface changes.
 - RelayKit does not own billing. Preserve MAX-API's billing, reservation, settlement, retry, and logging invariants, and prove that normalized usage is applied exactly once.
 - If the private checker or registry is unavailable in a fresh workspace, perform the equivalent remote commit/path comparison manually and record the missing maintenance prerequisite instead of silently skipping the check.
-- If the living plan is missing in a fresh workspace, recreate it under `.tmp/` from the current code and upstream records before continuing; never substitute an old chat summary for the plan.
+- If the living plan is missing in a fresh workspace, recreate `.tmp/MAX_API_UPSTREAM_IMPLEMENTATION_PLAN.md` from the current code and upstream records before continuing; never substitute an old chat summary for the plan.

From 33b193a3824d88052ef6c4d7a177438d3ec128b8 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Fri, 18 Sep 2026 01:06:02 +0800
Subject: [PATCH 16/20] fix: keep pricing filters and imported expressions
 valid

---
 .../api-key-routing-editor.test.tsx           |  66 +++++----
 .../models/task-rate-card-settings.tsx        |  10 ++
 .../models/tiered-billing-settings.tsx        |   9 +-
 .../tiered-pricing-editor.runtime.test.tsx    | 135 +++++++++++++++---
 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 +
 10 files changed, 182 insertions(+), 44 deletions(-)

diff --git a/web/default/src/features/keys/components/api-key-routing-editor.test.tsx b/web/default/src/features/keys/components/api-key-routing-editor.test.tsx
index 2cbaf9a1..778d35d0 100644
--- a/web/default/src/features/keys/components/api-key-routing-editor.test.tsx
+++ b/web/default/src/features/keys/components/api-key-routing-editor.test.tsx
@@ -24,6 +24,7 @@ import { after, afterEach, before, describe, test } from 'node:test'
 import { I18nextProvider } from 'react-i18next'
 import { MAX_MANUAL_ROUTING_GROUPS } from '../lib/api-key-form'
 import type { TokenRoutingMode } from '../types'
+import type { ApiKeyGroupOption } from './api-key-group-combobox'
 
 let ApiKeyRoutingEditor: typeof import('./api-key-routing-editor').ApiKeyRoutingEditor
 let cleanup: typeof import('@testing-library/react/pure').cleanup
@@ -38,7 +39,7 @@ const dom = new JSDOM('<!doctype html><html><body></body></html>', {
 const i18n = createInstance()
 const previousGlobals = new Map<string, PropertyDescriptor | undefined>()
 
-before(async () => {
+before(async (): Promise<void> => {
   await i18n.init({ lng: 'en', resources: { en: { translation: {} } } })
   const globals = {
     window: dom.window,
@@ -68,9 +69,16 @@ before(async () => {
       value,
     })
   }
-  dom.window.HTMLElement.prototype.scrollIntoView = () => undefined
+  dom.window.HTMLElement.prototype.scrollIntoView = (): void => undefined
   Object.defineProperty(dom.window, 'matchMedia', {
-    value: () => ({
+    value: (): Pick<
+      MediaQueryList,
+      | 'matches'
+      | 'addListener'
+      | 'removeListener'
+      | 'addEventListener'
+      | 'removeEventListener'
+    > => ({
       matches: false,
       addListener(): void {},
       removeListener(): void {},
@@ -84,11 +92,11 @@ before(async () => {
   ;({ ApiKeyRoutingEditor } = await import('./api-key-routing-editor'))
 })
 
-afterEach(async () => {
-  await act(async () => cleanup())
+afterEach(async (): Promise<void> => {
+  await act(async (): Promise<void> => cleanup())
 })
 
-after(() => {
+after((): void => {
   dom.window.close()
   for (const [key, descriptor] of previousGlobals) {
     if (descriptor) Object.defineProperty(globalThis, key, descriptor)
@@ -98,12 +106,12 @@ after(() => {
 
 const groups = Array.from(
   { length: MAX_MANUAL_ROUTING_GROUPS },
-  (_, index) => `group-${index + 1}`
+  (_: unknown, index: number): string => `group-${index + 1}`
 )
 
 const availableGroups = Array.from(
   { length: 14 },
-  (_, index) => `group-${index + 1}`
+  (_: unknown, index: number): string => `group-${index + 1}`
 )
 
 type RoutingHarnessProps = {
@@ -123,23 +131,25 @@ function RoutingHarness(props: RoutingHarnessProps): ReactElement {
         autoRouteOptions={[
           { value: 'auto', label: 'Automatic', groups: availableGroups },
         ]}
-        realGroupOptions={availableGroups.map((group) => ({
-          value: group,
-          label: group,
-          ratio: 1,
-        }))}
+        realGroupOptions={availableGroups.map(
+          (group: string): ApiKeyGroupOption => ({
+            value: group,
+            label: group,
+            ratio: 1,
+          })
+        )}
         onModeChange={setMode}
-        onRouteChange={() => undefined}
+        onRouteChange={(): void => undefined}
         onManualGroupsChange={setManualGroups}
-        onRetryOnFailureChange={() => undefined}
+        onRetryOnFailureChange={(): void => undefined}
       />
     </I18nextProvider>
   )
 }
 
-describe('ApiKeyRoutingEditor', () => {
+describe('ApiKeyRoutingEditor', (): void => {
   for (const initialGroups of [[], groups]) {
-    test(`clears ${initialGroups.length} stored manual selections when automatic routing is disabled`, async () => {
+    test(`clears ${initialGroups.length} stored manual selections when automatic routing is disabled`, async (): Promise<void> => {
       const view = render(<RoutingHarness initialGroups={initialGroups} />)
       view.getByText('+11')
       fireEvent.click(
@@ -178,7 +188,7 @@ describe('ApiKeyRoutingEditor', () => {
     })
   }
 
-  test('keeps all available groups visible at the manual selection limit', async () => {
+  test('keeps all available groups visible at the manual selection limit', async (): Promise<void> => {
     let changedGroups: string[] | undefined
     const view = render(
       <I18nextProvider i18n={i18n}>
@@ -188,18 +198,20 @@ describe('ApiKeyRoutingEditor', () => {
           manualGroups={groups}
           retryOnFailure
           autoRouteOptions={[]}
-          realGroupOptions={availableGroups.map((group) => ({
-            value: group,
-            label: group,
-            desc: group,
-            ratio: 1,
-          }))}
-          onModeChange={() => undefined}
-          onRouteChange={() => undefined}
+          realGroupOptions={availableGroups.map(
+            (group: string): ApiKeyGroupOption => ({
+              value: group,
+              label: group,
+              desc: group,
+              ratio: 1,
+            })
+          )}
+          onModeChange={(): void => undefined}
+          onRouteChange={(): void => undefined}
           onManualGroupsChange={(nextGroups: string[]): void => {
             changedGroups = nextGroups
           }}
-          onRetryOnFailureChange={() => undefined}
+          onRetryOnFailureChange={(): void => undefined}
         />
       </I18nextProvider>
     )
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
index 8bfa1cbb..e8ff165f 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
@@ -336,6 +336,16 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
     [defaultValue]
   )
   const vendorSummary = useMemo(() => buildVendorSummary(text), [text])
+  useEffect((): void => {
+    if (
+      vendorFilter !== 'all' &&
+      !vendorSummary.some(
+        (vendor: VendorSummary): boolean => vendor.key === vendorFilter
+      )
+    ) {
+      setVendorFilter('all')
+    }
+  }, [vendorFilter, vendorSummary])
   const filteredVendorSummary = useMemo((): VendorSummary[] => {
     const query = search.trim().toLowerCase()
     return vendorSummary
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 130e4915..68c55d7d 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -124,7 +124,14 @@ function validateUnifiedConfig(
         )
       }
       const enabled = rawEntry.enabled ?? false
-      const expr = typeof rawEntry.expr === 'string' ? rawEntry.expr.trim() : ''
+      if (rawEntry.expr !== undefined && typeof rawEntry.expr !== 'string') {
+        throw new Error(
+          t('Billing expression for {{model}} must be a string', {
+            model: name,
+          })
+        )
+      }
+      const expr = rawEntry.expr?.trim() ?? ''
       if (enabled && !expr) {
         throw new Error(`Billing expression for ${name} cannot be empty`)
       }
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
index 29e89463..851780c0 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
@@ -134,20 +134,110 @@ const modelB: ModelRatioData = {
   requestRuleExpr: '',
 }
 
+type TieredValidationCase = {
+  name: string
+  entry: { enabled?: unknown; expr?: unknown }
+  normalized?: { enabled: boolean; expr: string }
+}
+
+const tieredValidationCases: TieredValidationCase[] = [
+  ...[false, true, undefined, 'false', 'true', 0, 1, null, [], {}].map(
+    (enabled: unknown): TieredValidationCase => ({
+      name: `boolean flag ${JSON.stringify(enabled)}`,
+      entry: { enabled, expr: 'p * 1' },
+      normalized:
+        enabled === undefined || typeof enabled === 'boolean'
+          ? { enabled: enabled ?? false, expr: 'p * 1' }
+          : undefined,
+    })
+  ),
+  ...[0, 1, null, false, [], {}, undefined, '', ' p * 0 '].map(
+    (expr: unknown): TieredValidationCase => ({
+      name: `expression ${JSON.stringify(expr)}`,
+      entry: { enabled: false, expr },
+      normalized:
+        expr === undefined || typeof expr === 'string'
+          ? { enabled: false, expr: expr?.trim() ?? '' }
+          : undefined,
+    })
+  ),
+]
+
+for (const replaceVia of ['import', 'edit'] as const) {
+  test(`task vendor filter follows valid selections after ${replaceVia} replacement`, async (): Promise<void> => {
+    const queryClient = new QueryClient()
+    const config = (vendors: string[]): string =>
+      JSON.stringify(
+        Object.fromEntries(
+          vendors.map((vendor: string): [string, object] => [
+            `${vendor}-test-model`,
+            { vendor, unit: 'second', rows: [] },
+          ])
+        )
+      )
+    const container = createContainer()
+    const root = createRoot(container)
+    await act(async (): Promise<void> => {
+      root.render(
+        <I18nextProvider i18n={i18n}>
+          <QueryClientProvider client={queryClient}>
+            <TaskRateCardSettings defaultValue={config(['kling', 'minimax'])} />
+          </QueryClientProvider>
+        </I18nextProvider>
+      )
+    })
+    try {
+      const screen = within(container)
+      const section = screen
+        .getByRole('heading', { name: 'Vendor partitions' })
+        .closest('section')
+      assert.ok(section)
+      const summary = within(section)
+      await act(async (): Promise<void> => {
+        fireEvent.click(summary.getByRole('button', { name: 'Kling' }))
+      })
+      summary.getByText('kling-test-model')
+      assert.equal(summary.queryByText('minimax-test-model'), null)
+
+      const replace = async (vendors: string[]): Promise<void> => {
+        await act(async (): Promise<void> => {
+          if (replaceVia === 'import') {
+            const input = container.querySelector('input[type=file]')
+            assert.ok(input)
+            fireEvent.change(input, {
+              target: {
+                files: [{ text: async (): Promise<string> => config(vendors) }],
+              },
+            })
+          } else {
+            fireEvent.change(
+              screen.getByRole('textbox', { name: 'Current rate card JSON' }),
+              { target: { value: config(vendors) } }
+            )
+          }
+        })
+      }
+
+      await replace(['kling', 'sora'])
+      summary.getByText('kling-test-model')
+      assert.equal(summary.queryByText('sora-test-model'), null)
+      await replace(['minimax', 'sora'])
+      summary.getByText('minimax-test-model')
+      summary.getByText('sora-test-model')
+      assert.equal(summary.queryByRole('button', { name: 'Kling' }), null)
+      await replace(['kling', 'sora'])
+      summary.getByText('kling-test-model')
+      summary.getByText('sora-test-model')
+    } finally {
+      await unmount(root, container)
+      queryClient.clear()
+    }
+  })
+}
+
 describe('optional zero prices in the actual editor', () => {
-  for (const enabled of [
-    false,
-    true,
-    undefined,
-    'false',
-    'true',
-    0,
-    1,
-    null,
-    [],
-    {},
-  ]) {
-    test(`tiered configuration enforces boolean flags before save or download: ${JSON.stringify(enabled)}`, async (): Promise<void> => {
+  for (const { name, entry, normalized } of tieredValidationCases) {
+    test(`tiered configuration validates import, save and download: ${name}`, async (): Promise<void> => {
       const { api } = await import('@/lib/api')
       const previousAdapter = api.defaults.adapter
       const writes: unknown[] = []
@@ -188,11 +278,24 @@ describe('optional zero prices in the actual editor', () => {
         const download = within(actions).getByRole('button', {
           name: 'Download',
         }) as HTMLButtonElement
-        const valid = enabled === undefined || typeof enabled === 'boolean'
+        const valid = normalized !== undefined
+        const input = JSON.stringify({ model: entry })
+        const fileInput = actions.querySelector('input[type=file]')
+        assert.ok(fileInput)
+        const original = editor.value
+        await act(async (): Promise<void> => {
+          fireEvent.change(fileInput, {
+            target: {
+              files: [{ text: async (): Promise<string> => input }],
+            },
+          })
+        })
+        if (valid) assert.deepEqual(JSON.parse(editor.value), JSON.parse(input))
+        else assert.equal(editor.value, original)
         await act(async (): Promise<void> => {
           fireEvent.change(editor, {
             target: {
-              value: JSON.stringify({ model: { enabled, expr: 'p * 1' } }),
+              value: input,
             },
           })
         })
@@ -206,7 +309,7 @@ describe('optional zero prices in the actual editor', () => {
             ? [
                 {
                   config: {
-                    model: { enabled: enabled ?? false, expr: 'p * 1' },
+                    model: normalized,
                   },
                 },
               ]
diff --git a/web/default/src/i18n/locales/en.json b/web/default/src/i18n/locales/en.json
index a0867163..3e856d88 100644
--- a/web/default/src/i18n/locales/en.json
+++ b/web/default/src/i18n/locales/en.json
@@ -1763,6 +1763,7 @@
     "Enable when proxying workers that fetch images over HTTP.": "Enable when proxying workers that fetch images over HTTP.",
     "Enabled": "Enabled",
     "Enabled flag for {{model}} must be a boolean": "Enabled flag for {{model}} must be a boolean",
+    "Billing expression for {{model}} must be a string": "Billing expression for {{model}} must be a string",
     "Enabled all channels with tag: {{tag}}": "Enabled all channels with tag: {{tag}}",
     "Enabled Status": "Enabled Status",
     "Enabling...": "Enabling...",
diff --git a/web/default/src/i18n/locales/fr.json b/web/default/src/i18n/locales/fr.json
index ec1635a1..e47127c6 100644
--- a/web/default/src/i18n/locales/fr.json
+++ b/web/default/src/i18n/locales/fr.json
@@ -1763,6 +1763,7 @@
     "Enable when proxying workers that fetch images over HTTP.": "Activer lors de la mise en proxy des workers qui récupèrent des images via HTTP.",
     "Enabled": "Activé",
     "Enabled flag for {{model}} must be a boolean": "L’indicateur d’activation de {{model}} doit être un booléen",
+    "Billing expression for {{model}} must be a string": "L'expression de facturation de {{model}} doit être une chaîne de caractères",
     "Enabled all channels with tag: {{tag}}": "Tous les canaux avec le tag {{tag}} ont été activés",
     "Enabled Status": "Statut activé",
     "Enabling...": "Activation en cours...",
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index 538b6079..cec26bca 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -1763,6 +1763,7 @@
     "Enable when proxying workers that fetch images over HTTP.": "HTTP経由で画像をフェッチするワーカーをプロキシする場合に有効にします。",
     "Enabled": "有効",
     "Enabled flag for {{model}} must be a boolean": "{{model}} の有効フラグは真偽値である必要があります",
+    "Billing expression for {{model}} must be a string": "{{model}} の課金式は文字列である必要があります",
     "Enabled all channels with tag: {{tag}}": "タグ「{{tag}}」の全チャネルを有効にしました",
     "Enabled Status": "有効ステータス",
     "Enabling...": "有効化中...",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index 17b76bc9..5371f42e 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -1763,6 +1763,7 @@
     "Enable when proxying workers that fetch images over HTTP.": "Включить при проксировании воркеров, которые получают изображения по HTTP.",
     "Enabled": "Включено",
     "Enabled flag for {{model}} must be a boolean": "Флаг включения для {{model}} должен быть логическим значением",
+    "Billing expression for {{model}} must be a string": "Выражение тарификации для {{model}} должно быть строкой",
     "Enabled all channels with tag: {{tag}}": "Все каналы с тегом {{tag}} включены",
     "Enabled Status": "Статус включения",
     "Enabling...": "Включается...",
diff --git a/web/default/src/i18n/locales/vi.json b/web/default/src/i18n/locales/vi.json
index 12ad969e..6652611e 100644
--- a/web/default/src/i18n/locales/vi.json
+++ b/web/default/src/i18n/locales/vi.json
@@ -1763,6 +1763,7 @@
     "Enable when proxying workers that fetch images over HTTP.": "Kích hoạt khi làm proxy cho các worker tìm nạp hình ảnh qua HTTP.",
     "Enabled": "Đã bật",
     "Enabled flag for {{model}} must be a boolean": "Cờ bật của {{model}} phải là giá trị boolean",
+    "Billing expression for {{model}} must be a string": "Biểu thức tính phí của {{model}} phải là một chuỗi",
     "Enabled all channels with tag: {{tag}}": "Đã bật tất cả kênh với nhãn: {{tag}}",
     "Enabled Status": "Trạng thái kích hoạt",
     "Enabling...": "Đang bật...",
diff --git a/web/default/src/i18n/locales/zh.json b/web/default/src/i18n/locales/zh.json
index 6faf063f..fe0b7238 100644
--- a/web/default/src/i18n/locales/zh.json
+++ b/web/default/src/i18n/locales/zh.json
@@ -1763,6 +1763,7 @@
     "Enable when proxying workers that fetch images over HTTP.": "当代理通过 HTTP 获取图像的 worker 时启用。",
     "Enabled": "已启用",
     "Enabled flag for {{model}} must be a boolean": "{{model}} 的启用标志必须为布尔值",
+    "Billing expression for {{model}} must be a string": "模型 {{model}} 的计费表达式必须是字符串",
     "Enabled all channels with tag: {{tag}}": "已启用标签「{{tag}}」下的所有渠道",
     "Enabled Status": "启用状态",
     "Enabling...": "正在启用...",

From 9c2385a657159bab1909ef1bdc9a358aadca1100 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Fri, 18 Sep 2026 02:02:47 +0800
Subject: [PATCH 17/20] chore: annotate pricing filter and action callbacks

---
 .../models/task-rate-card-settings.tsx        | 25 +++++++++++++------
 .../models/tiered-billing-settings.tsx        |  4 +--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
index e8ff165f..46332a35 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
@@ -349,23 +349,34 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
   const filteredVendorSummary = useMemo((): VendorSummary[] => {
     const query = search.trim().toLowerCase()
     return vendorSummary
-      .filter((vendor) => vendorFilter === 'all' || vendor.key === vendorFilter)
-      .map((vendor) => {
+      .filter(
+        (vendor: VendorSummary): boolean =>
+          vendorFilter === 'all' || vendor.key === vendorFilter
+      )
+      .map((vendor: VendorSummary): VendorSummary => {
         if (!query) return vendor
         return {
           ...vendor,
-          modelCount: vendor.models.filter((model) =>
+          modelCount: vendor.models.filter((model: string): boolean =>
             model.toLowerCase().includes(query)
           ).length,
           rowCount: vendor.models
-            .filter((model) => model.toLowerCase().includes(query))
-            .reduce((sum, model) => sum + (vendor.modelRows[model] ?? 0), 0),
-          models: vendor.models.filter((model) =>
+            .filter((model: string): boolean =>
+              model.toLowerCase().includes(query)
+            )
+            .reduce(
+              (sum: number, model: string): number =>
+                sum + (vendor.modelRows[model] ?? 0),
+              0
+            ),
+          models: vendor.models.filter((model: string): boolean =>
             model.toLowerCase().includes(query)
           ),
         }
       })
-      .filter((vendor) => !query || vendor.models.length > 0)
+      .filter(
+        (vendor: VendorSummary): boolean => !query || vendor.models.length > 0
+      )
   }, [search, vendorFilter, vendorSummary])
   const isDirty = text !== initialText
 
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 68c55d7d..cf83c9d5 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -196,7 +196,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   })
   const { mutateAsync } = mutation
 
-  const handleFormat = useCallback(() => {
+  const handleFormat = useCallback((): void => {
     editRevision.current += 1
     try {
       setText(formatJsonForTextarea(text || '{}'))
@@ -206,7 +206,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
     }
   }, [t, text])
 
-  const handleLoadExample = useCallback(() => {
+  const handleLoadExample = useCallback((): void => {
     editRevision.current += 1
     setText(JSON.stringify(EXAMPLE_CONFIG, null, 2))
     setError('')

From 5eb13c285819d61d947df8b1c3a288e7af251501 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Fri, 18 Sep 2026 03:57:49 +0800
Subject: [PATCH 18/20] fix: harden native stream writes and pricing expression
 boundaries

---
 pkg/billingexpr/timezone_string_test.go       | 24 ++++++
 relay/channel/openai/chat_stream.go           | 12 ++-
 relay/channel/openai/chat_stream_test.go      | 73 +++++++++++++++++++
 .../features/keys/lib/api-key-form.test.ts    | 10 +--
 .../src/features/pricing/lib/billing-expr.ts  | 10 ++-
 .../features/pricing/lib/tier-expr.test.ts    | 51 +++++++++++++
 .../src/features/pricing/lib/tier-expr.ts     |  8 +-
 .../models/task-rate-card-settings.tsx        |  2 +
 .../models/tiered-billing-settings.tsx        | 12 ++-
 .../tiered-pricing-editor.runtime.test.tsx    |  9 ++-
 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 +
 16 files changed, 215 insertions(+), 20 deletions(-)
 create mode 100644 pkg/billingexpr/timezone_string_test.go

diff --git a/pkg/billingexpr/timezone_string_test.go b/pkg/billingexpr/timezone_string_test.go
new file mode 100644
index 00000000..ec51e3cc
--- /dev/null
+++ b/pkg/billingexpr/timezone_string_test.go
@@ -0,0 +1,24 @@
+package billingexpr_test
+
+import (
+	"testing"
+
+	"github.com/MAX-API-Next/MAX-API/common"
+	"github.com/MAX-API-Next/MAX-API/pkg/billingexpr"
+	"github.com/stretchr/testify/require"
+)
+
+// The visual editor emits JSON-quoted strings. The Go expression runtime must
+// preserve those strings and its established unknown-timezone UTC fallback.
+func TestTimeFunctionsJSONQuotedTimezoneCompatibility(t *testing.T) {
+	for _, timezone := range []string{"UTC", `Test/"quote`, `Test/back\`, "Test/\nline", "Test/\tvalue"} {
+		t.Run(timezone, func(t *testing.T) {
+			quoted, err := common.Marshal(timezone)
+			require.NoError(t, err)
+			expression := "hour(" + string(quoted) + `) >= 0 ? tier("base", p * 1 + c * 0) : tier("fallback", p * 2 + c * 0)`
+			cost, _, err := billingexpr.RunExpr(expression, billingexpr.TokenParams{P: 100})
+			require.NoError(t, err)
+			require.Equal(t, float64(100), cost)
+		})
+	}
+}
diff --git a/relay/channel/openai/chat_stream.go b/relay/channel/openai/chat_stream.go
index 67df91a4..dfec65c4 100644
--- a/relay/channel/openai/chat_stream.go
+++ b/relay/channel/openai/chat_stream.go
@@ -44,6 +44,10 @@ func (w *chatStreamWriteObserver) WriteString(data string) (int, error) {
 	return w.Write([]byte(data))
 }
 
+func (w *chatStreamWriteObserver) Unwrap() http.ResponseWriter {
+	return w.ResponseWriter
+}
+
 // Keep the raw delta fields for the visibility decision. The forwarding path
 // still owns formatting; unknown provider payloads must not become empty just
 // because the typed Chat DTO does not yet describe them.
@@ -141,14 +145,14 @@ func oaiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *htt
 	pendingBytes := 0
 	buffering := shouldRetryEmptyCompletion(c, info)
 	observer := newOpenAIStreamToolCallObserver(info)
+	writeObserver := &chatStreamWriteObserver{ResponseWriter: c.Writer}
+	c.Writer = writeObserver
+	defer func() { c.Writer = writeObserver.ResponseWriter }()
 
 	send := func(data string) bool {
-		writer := &chatStreamWriteObserver{ResponseWriter: c.Writer}
-		c.Writer = writer
-		defer func() { c.Writer = writer.ResponseWriter }()
 		err := HandleStreamFormat(c, info, data, info.ChannelSetting.ForceFormat, info.ChannelSetting.ThinkingToContent)
 		if err == nil {
-			err = writer.err
+			err = writeObserver.err
 		}
 		if err != nil {
 			streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusBadGateway)
diff --git a/relay/channel/openai/chat_stream_test.go b/relay/channel/openai/chat_stream_test.go
index d5676b31..c35fd69b 100644
--- a/relay/channel/openai/chat_stream_test.go
+++ b/relay/channel/openai/chat_stream_test.go
@@ -380,3 +380,76 @@ func TestNativeChatStreamWriteFailureDoesNotSettleFirstPayload(t *testing.T) {
 		})
 	}
 }
+
+type pingFaultChatWriter struct {
+	gin.ResponseWriter
+	short          bool
+	pingWrites     int
+	writeDeadlines int
+}
+
+func (w *pingFaultChatWriter) SetWriteDeadline(time.Time) error {
+	w.writeDeadlines++
+	return nil
+}
+
+func (w *pingFaultChatWriter) Write(data []byte) (int, error) {
+	if strings.HasPrefix(string(data), ": PING") {
+		w.pingWrites++
+		w.ResponseWriter.WriteHeaderNow()
+		if w.short {
+			return len(data) - 1, nil
+		}
+		return 0, io.ErrClosedPipe
+	}
+	return w.ResponseWriter.Write(data)
+}
+
+func TestNativeChatStreamPingWriteFailureIsTerminal(t *testing.T) {
+	for _, partial := range []bool{false, true} {
+		for _, short := range []bool{false, true} {
+			t.Run(fmt.Sprintf("partial=%t/short=%t", partial, short), func(t *testing.T) {
+				c, _, info := newChatStreamTest(t)
+				info.DisablePing = false
+				settings := operation_setting.GetGeneralSetting()
+				oldEnabled, oldSeconds := settings.PingIntervalEnabled, settings.PingIntervalSeconds
+				oldTimeout := constant.StreamingTimeout
+				settings.PingIntervalEnabled, settings.PingIntervalSeconds = true, 1
+				constant.StreamingTimeout = 3
+				t.Cleanup(func() {
+					settings.PingIntervalEnabled, settings.PingIntervalSeconds = oldEnabled, oldSeconds
+					constant.StreamingTimeout = oldTimeout
+				})
+				writer := &pingFaultChatWriter{ResponseWriter: c.Writer, short: short}
+				c.Writer = writer
+				r, w := io.Pipe()
+				defer r.Close()
+				defer w.Close()
+				producer := make(chan error, 1)
+				go func() {
+					frame := chatRoleFrame
+					if partial {
+						frame = `{"choices":[{"delta":{"content":"hello"}}]}`
+					}
+					_, err := io.WriteString(w, "data: "+frame+"\n\n")
+					producer <- err
+				}()
+				usage, apiErr := OaiStreamHandler(c, info, &http.Response{StatusCode: 200, Body: r})
+				require.NoError(t, <-producer)
+				require.NotNil(t, apiErr)
+				require.True(t, types.IsSkipRetryError(apiErr))
+				require.Contains(t, info.StreamStatus.Summary(), string(relaycommon.StreamEndReasonPingFail))
+				require.Equal(t, 1, writer.pingWrites, "a failed ping must terminate without more underlying writes")
+				require.Positive(t, writer.writeDeadlines, "observer must preserve response-controller deadline traversal")
+				require.Same(t, writer, c.Writer)
+				if partial {
+					expected := service.ResponseText2Usage(c, "hello", info.UpstreamModelName, 38)
+					require.NotNil(t, usage)
+					require.Equal(t, expected.CompletionTokens, usage.CompletionTokens)
+				} else {
+					require.Nil(t, usage)
+				}
+			})
+		}
+	}
+}
diff --git a/web/default/src/features/keys/lib/api-key-form.test.ts b/web/default/src/features/keys/lib/api-key-form.test.ts
index a6deefe1..09ce199b 100644
--- a/web/default/src/features/keys/lib/api-key-form.test.ts
+++ b/web/default/src/features/keys/lib/api-key-form.test.ts
@@ -97,7 +97,7 @@ describe('API key routing form', () => {
     assert.equal(values.manual_groups.includes(''), false)
   })
 
-  test('requires a manual selection and enforces the supported maximum', () => {
+  test('requires a manual selection and enforces the supported maximum', (): void => {
     const values = {
       ...getApiKeyFormDefaultValues(),
       name: 'manual-key',
@@ -107,7 +107,7 @@ describe('API key routing form', () => {
       smartRoutes: ['auto'],
       manualGroups: Array.from(
         { length: MAX_MANUAL_ROUTING_GROUPS + 2 },
-        (_, index) => `group-${index}`
+        (_: unknown, index: number): string => `group-${index}`
       ),
     })
     const empty = schema.safeParse(values)
@@ -121,7 +121,7 @@ describe('API key routing form', () => {
       ...values,
       manual_groups: Array.from(
         { length: MAX_MANUAL_ROUTING_GROUPS },
-        (_, index) => `group-${index}`
+        (_: unknown, index: number): string => `group-${index}`
       ),
     })
     assert.equal(maximum.success, true)
@@ -130,7 +130,7 @@ describe('API key routing form', () => {
       routing_mode: 'manual',
       manual_groups: Array.from(
         { length: MAX_MANUAL_ROUTING_GROUPS + 1 },
-        (_, index) => `group-${index}`
+        (_: unknown, index: number): string => `group-${index}`
       ),
     })
     assert.equal(result.success, false)
@@ -195,7 +195,7 @@ describe('API key routing form', () => {
     assert.equal(shouldIncludeRoutingProjection(true, true, false), false)
   })
 
-  test('does not seed manual groups when loading a smart key', () => {
+  test('does not seed manual groups when loading a smart key', (): void => {
     const apiKey = {
       id: 2,
       name: 'smart-key',
diff --git a/web/default/src/features/pricing/lib/billing-expr.ts b/web/default/src/features/pricing/lib/billing-expr.ts
index b3fd09d9..878c51a1 100644
--- a/web/default/src/features/pricing/lib/billing-expr.ts
+++ b/web/default/src/features/pricing/lib/billing-expr.ts
@@ -281,7 +281,11 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
     const { body } = stripExprVersion(exprStr)
     const tierRe = /^tier\("([^"]*)",\s*([\s\S]+)\)$/
     const tiers: ParsedTier[] = []
-    const branches = splitTopLevelExpression(body, ':', true)
+    const branches = splitTopLevelExpression(
+      unwrapConditionParens(body),
+      ':',
+      true
+    )
     for (const [index, branch] of branches.entries()) {
       const parts = branch.match(/^(.*?)\s*\?\s*(tier\("[^"]*",[\s\S]+\))$/)
       // A complete ternary chain ends in exactly one unconditional fallback.
@@ -314,7 +318,7 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
           const atom = unwrapConditionParens(cp)
           if (atom === 'true') continue
           const cm = atom.match(
-            /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("([^"\\]+)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
+            /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("((?:[^"\\]|\\.)*)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
           )
           // A partial condition would advertise a different pricing contract.
           if (!cm || !isSupportedNumericLiteral(cm[5])) return []
@@ -322,7 +326,7 @@ export function parseTiersFromExpr(exprStr: string): ParsedTier[] {
             var: (cm[1] || cm[2]) as TierCondition['var'],
             op: cm[4] as TierCondition['op'],
             value: Number(cm[5]),
-            ...(cm[2] ? { timezone: cm[3] } : {}),
+            ...(cm[2] ? { timezone: JSON.parse(`"${cm[3]}"`) as string } : {}),
           })
         }
         if (groupConditions.length > 0) conditionGroups.push(groupConditions)
diff --git a/web/default/src/features/pricing/lib/tier-expr.test.ts b/web/default/src/features/pricing/lib/tier-expr.test.ts
index 08d2a58e..69143807 100644
--- a/web/default/src/features/pricing/lib/tier-expr.test.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.test.ts
@@ -38,6 +38,57 @@ const emptyExtraTokens: ExtraTokenValues = {
   audioOutputTokens: 0,
 }
 
+for (const expression of [
+  'tier("base", p * 0 + c * 15)',
+  'len < 100 ? tier("low", p * 0 + c * 1) : tier("high", p * 2 + c * 3)',
+]) {
+  test(`preserves outer wrappers in price displays: ${expression}`, (): void => {
+    const expected = parseTiersFromExpr(expression)
+    assert.ok(expected.length > 0)
+    for (const wrapped of [`(${expression})`, `v1: (( ${expression} ))`]) {
+      assert.deepEqual(parseTiersFromExpr(wrapped), expected)
+    }
+    assert.deepEqual(parseTiersFromExpr(`(${expression} + unknown)`), [])
+  })
+}
+
+for (const timezone of [
+  'UTC',
+  'Test/"quote',
+  'Test/back\\',
+  'Test/\\"',
+  'Test/\nline',
+  'Test/\tvalue',
+]) {
+  test(`round-trips escaped timezone strings: ${JSON.stringify(timezone)}`, (): void => {
+    const config = {
+      tiers: [
+        normalizeVisualTier({
+          label: 'day',
+          conditions: [{ var: 'hour', timezone, op: '>=', value: 9 }],
+          input_unit_cost: 1,
+          output_unit_cost: 2,
+        }),
+        normalizeVisualTier({
+          label: 'base',
+          input_unit_cost: 3,
+          output_unit_cost: 4,
+        }),
+      ],
+    }
+    const expression = generateExprFromVisualConfig(config)
+    assert.ok(expression.includes(`hour(${JSON.stringify(timezone)})`))
+    const parsed = tryParseVisualConfig(expression)
+    assert.ok(parsed)
+    assert.equal(parsed.tiers[0].conditions[0].timezone, timezone)
+    assert.equal(generateExprFromVisualConfig(parsed), expression)
+    assert.equal(
+      parseTiersFromExpr(expression)[0]?.conditions[0]?.timezone,
+      timezone
+    )
+  })
+}
+
 describe('visual optional price presence', () => {
   for (const { field, exprVar } of BILLING_CACHE_VAR_MAP) {
     test(`preserves absent, zero and positive ${exprVar} prices through normalization and round trips`, () => {
diff --git a/web/default/src/features/pricing/lib/tier-expr.ts b/web/default/src/features/pricing/lib/tier-expr.ts
index bcc1b5db..957b7be3 100644
--- a/web/default/src/features/pricing/lib/tier-expr.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.ts
@@ -188,7 +188,7 @@ function buildConditionStr(conditions: TierConditionInput[]): string {
     .filter((c) => c.var && c.op && c.value != null && c.value !== '')
     .map((c) => {
       const lhs = ['hour', 'minute', 'weekday', 'month', 'day'].includes(c.var)
-        ? `${c.var}("${String(c.timezone || 'Asia/Shanghai').replace(/"/g, '\\"')}")`
+        ? `${c.var}(${JSON.stringify(String(c.timezone || 'Asia/Shanghai'))})`
         : c.var
       return `${lhs} ${c.op} ${c.value}`
     })
@@ -198,7 +198,7 @@ function buildConditionStr(conditions: TierConditionInput[]): string {
 function parseTierConditionGroups(conditionStr: string): TierConditionGroup[] {
   if (!conditionStr || conditionStr.trim() === 'true') return []
   const atomPattern =
-    /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("([^"\\]+)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
+    /^(?:(p|c|len)|((?:hour|minute|weekday|month|day))\("((?:[^"\\]|\\.)*)"\))\s*(<=|>=|<|>)\s*([\d.eE+-]+)$/
   return splitTopLevelExpression(unwrapConditionParens(conditionStr), '||')
     .map((groupStr) => unwrapConditionParens(groupStr))
     .map((groupStr) => {
@@ -210,7 +210,9 @@ function parseTierConditionGroups(conditionStr: string): TierConditionGroup[] {
           var: (match[1] || match[2]) as TierConditionInput['var'],
           op: match[4] as TierConditionInput['op'],
           value: Number(match[5]),
-          ...(match[2] ? { timezone: match[3] } : {}),
+          ...(match[2]
+            ? { timezone: JSON.parse(`"${match[3]}"`) as string }
+            : {}),
         })
       }
       return { conditions }
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
index 46332a35..93ec2a1a 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
@@ -524,6 +524,7 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
               type='button'
               size='sm'
               variant={vendorFilter === 'all' ? 'secondary' : 'ghost'}
+              aria-pressed={vendorFilter === 'all'}
               onClick={() => setVendorFilter('all')}
             >
               {t('All')}
@@ -534,6 +535,7 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
                 type='button'
                 size='sm'
                 variant={vendorFilter === vendor.key ? 'secondary' : 'ghost'}
+                aria-pressed={vendorFilter === vendor.key}
                 onClick={() => setVendorFilter(vendor.key)}
               >
                 {t(vendor.label)}
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index cf83c9d5..57ff8df7 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -100,7 +100,7 @@ function validateUnifiedConfig(
 ): Record<string, TieredBillingEntry> {
   const parsed = JSON.parse(value) as unknown
   if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-    throw new Error('Tiered billing JSON must be an object')
+    throw new Error(t('Tiered billing JSON must be an object'))
   }
 
   const normalized: Record<string, TieredBillingEntry> = {}
@@ -108,10 +108,12 @@ function validateUnifiedConfig(
     ([model, entry]) => {
       const name = model.trim()
       if (!name) {
-        throw new Error('Model name cannot be empty')
+        throw new Error(t('Model name cannot be empty'))
       }
       if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
-        throw new Error(`Config for ${name} must be an object`)
+        throw new Error(
+          t('Config for {{model}} must be an object', { model: name })
+        )
       }
 
       const rawEntry = entry as Partial<TieredBillingEntry>
@@ -133,7 +135,9 @@ function validateUnifiedConfig(
       }
       const expr = rawEntry.expr?.trim() ?? ''
       if (enabled && !expr) {
-        throw new Error(`Billing expression for ${name} cannot be empty`)
+        throw new Error(
+          t('Billing expression for {{model}} cannot be empty', { model: name })
+        )
       }
       normalized[name] = { enabled, expr }
     }
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
index 851780c0..617af209 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
@@ -196,6 +196,8 @@ for (const replaceVia of ['import', 'edit'] as const) {
       await act(async (): Promise<void> => {
         fireEvent.click(summary.getByRole('button', { name: 'Kling' }))
       })
+      summary.getByRole('button', { name: 'Kling', pressed: true })
+      summary.getByRole('button', { name: 'All', pressed: false })
       summary.getByText('kling-test-model')
       assert.equal(summary.queryByText('minimax-test-model'), null)
 
@@ -222,6 +224,8 @@ for (const replaceVia of ['import', 'edit'] as const) {
       summary.getByText('kling-test-model')
       assert.equal(summary.queryByText('sora-test-model'), null)
       await replace(['minimax', 'sora'])
+      summary.getByRole('button', { name: 'All', pressed: true })
+      summary.getByRole('button', { name: 'MiniMax', pressed: false })
       summary.getByText('minimax-test-model')
       summary.getByText('sora-test-model')
       assert.equal(summary.queryByRole('button', { name: 'Kling' }), null)
@@ -439,7 +443,10 @@ describe('optional zero prices in the actual editor', () => {
 
         complete = await startSlowImport()
         await act(async () => root.render(null))
-        await assertStaleIgnored(complete)
+        const notificationsAfterUnmount = toast.getHistory().length
+        await act(async (): Promise<void> => complete(config('stale')))
+        assert.equal(container.querySelector('textarea'), null)
+        assert.equal(toast.getHistory().length, notificationsAfterUnmount)
       } finally {
         await unmount(root, container)
         actions.remove()
diff --git a/web/default/src/i18n/locales/en.json b/web/default/src/i18n/locales/en.json
index 3e856d88..fda14dc7 100644
--- a/web/default/src/i18n/locales/en.json
+++ b/web/default/src/i18n/locales/en.json
@@ -1763,6 +1763,10 @@
     "Enable when proxying workers that fetch images over HTTP.": "Enable when proxying workers that fetch images over HTTP.",
     "Enabled": "Enabled",
     "Enabled flag for {{model}} must be a boolean": "Enabled flag for {{model}} must be a boolean",
+    "Tiered billing JSON must be an object": "Tiered billing JSON must be an object",
+    "Model name cannot be empty": "Model name cannot be empty",
+    "Config for {{model}} must be an object": "Config for {{model}} must be an object",
+    "Billing expression for {{model}} cannot be empty": "Billing expression for {{model}} cannot be empty",
     "Billing expression for {{model}} must be a string": "Billing expression for {{model}} must be a string",
     "Enabled all channels with tag: {{tag}}": "Enabled all channels with tag: {{tag}}",
     "Enabled Status": "Enabled Status",
diff --git a/web/default/src/i18n/locales/fr.json b/web/default/src/i18n/locales/fr.json
index e47127c6..5c5d7da9 100644
--- a/web/default/src/i18n/locales/fr.json
+++ b/web/default/src/i18n/locales/fr.json
@@ -1763,6 +1763,10 @@
     "Enable when proxying workers that fetch images over HTTP.": "Activer lors de la mise en proxy des workers qui récupèrent des images via HTTP.",
     "Enabled": "Activé",
     "Enabled flag for {{model}} must be a boolean": "L’indicateur d’activation de {{model}} doit être un booléen",
+    "Tiered billing JSON must be an object": "Le JSON de tarification par paliers doit être un objet",
+    "Model name cannot be empty": "Le nom du modèle ne peut pas être vide",
+    "Config for {{model}} must be an object": "La configuration de {{model}} doit être un objet",
+    "Billing expression for {{model}} cannot be empty": "L'expression de facturation de {{model}} ne peut pas être vide",
     "Billing expression for {{model}} must be a string": "L'expression de facturation de {{model}} doit être une chaîne de caractères",
     "Enabled all channels with tag: {{tag}}": "Tous les canaux avec le tag {{tag}} ont été activés",
     "Enabled Status": "Statut activé",
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index cec26bca..1546cfa0 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -1763,6 +1763,10 @@
     "Enable when proxying workers that fetch images over HTTP.": "HTTP経由で画像をフェッチするワーカーをプロキシする場合に有効にします。",
     "Enabled": "有効",
     "Enabled flag for {{model}} must be a boolean": "{{model}} の有効フラグは真偽値である必要があります",
+    "Tiered billing JSON must be an object": "段階料金の JSON はオブジェクトである必要があります",
+    "Model name cannot be empty": "モデル名は空にできません",
+    "Config for {{model}} must be an object": "{{model}} の設定はオブジェクトである必要があります",
+    "Billing expression for {{model}} cannot be empty": "{{model}} の課金式は空にできません",
     "Billing expression for {{model}} must be a string": "{{model}} の課金式は文字列である必要があります",
     "Enabled all channels with tag: {{tag}}": "タグ「{{tag}}」の全チャネルを有効にしました",
     "Enabled Status": "有効ステータス",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index 5371f42e..f6fc2be2 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -1763,6 +1763,10 @@
     "Enable when proxying workers that fetch images over HTTP.": "Включить при проксировании воркеров, которые получают изображения по HTTP.",
     "Enabled": "Включено",
     "Enabled flag for {{model}} must be a boolean": "Флаг включения для {{model}} должен быть логическим значением",
+    "Tiered billing JSON must be an object": "JSON ступенчатой тарификации должен быть объектом",
+    "Model name cannot be empty": "Имя модели не может быть пустым",
+    "Config for {{model}} must be an object": "Конфигурация для {{model}} должна быть объектом",
+    "Billing expression for {{model}} cannot be empty": "Выражение тарификации для {{model}} не может быть пустым",
     "Billing expression for {{model}} must be a string": "Выражение тарификации для {{model}} должно быть строкой",
     "Enabled all channels with tag: {{tag}}": "Все каналы с тегом {{tag}} включены",
     "Enabled Status": "Статус включения",
diff --git a/web/default/src/i18n/locales/vi.json b/web/default/src/i18n/locales/vi.json
index 6652611e..d100e36b 100644
--- a/web/default/src/i18n/locales/vi.json
+++ b/web/default/src/i18n/locales/vi.json
@@ -1763,6 +1763,10 @@
     "Enable when proxying workers that fetch images over HTTP.": "Kích hoạt khi làm proxy cho các worker tìm nạp hình ảnh qua HTTP.",
     "Enabled": "Đã bật",
     "Enabled flag for {{model}} must be a boolean": "Cờ bật của {{model}} phải là giá trị boolean",
+    "Tiered billing JSON must be an object": "JSON tính phí theo bậc phải là một đối tượng",
+    "Model name cannot be empty": "Tên mô hình không được để trống",
+    "Config for {{model}} must be an object": "Cấu hình của {{model}} phải là một đối tượng",
+    "Billing expression for {{model}} cannot be empty": "Biểu thức tính phí của {{model}} không được để trống",
     "Billing expression for {{model}} must be a string": "Biểu thức tính phí của {{model}} phải là một chuỗi",
     "Enabled all channels with tag: {{tag}}": "Đã bật tất cả kênh với nhãn: {{tag}}",
     "Enabled Status": "Trạng thái kích hoạt",
diff --git a/web/default/src/i18n/locales/zh.json b/web/default/src/i18n/locales/zh.json
index fe0b7238..4969e368 100644
--- a/web/default/src/i18n/locales/zh.json
+++ b/web/default/src/i18n/locales/zh.json
@@ -1763,6 +1763,10 @@
     "Enable when proxying workers that fetch images over HTTP.": "当代理通过 HTTP 获取图像的 worker 时启用。",
     "Enabled": "已启用",
     "Enabled flag for {{model}} must be a boolean": "{{model}} 的启用标志必须为布尔值",
+    "Tiered billing JSON must be an object": "阶梯计费 JSON 必须是对象",
+    "Model name cannot be empty": "模型名称不能为空",
+    "Config for {{model}} must be an object": "模型 {{model}} 的配置必须是对象",
+    "Billing expression for {{model}} cannot be empty": "模型 {{model}} 的计费表达式不能为空",
     "Billing expression for {{model}} must be a string": "模型 {{model}} 的计费表达式必须是字符串",
     "Enabled all channels with tag: {{tag}}": "已启用标签「{{tag}}」下的所有渠道",
     "Enabled Status": "启用状态",

From dca48c3a7b592dceee3bab610341809086768524 Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Fri, 18 Sep 2026 04:58:52 +0800
Subject: [PATCH 19/20] fix: consolidate pricing registries and strengthen
 review coverage

---
 pkg/billingexpr/timezone_string_test.go       |  8 +-
 .../components/model-details.runtime.test.tsx | 57 +++++++------
 .../features/pricing/lib/tier-expr.test.ts    | 66 +++++++--------
 .../src/features/pricing/lib/tier-expr.ts     |  8 +-
 .../task-rate-card-settings.runtime.test.tsx  |  4 +-
 .../models/task-rate-card-settings.tsx        | 14 ++--
 .../models/tiered-billing-settings.tsx        | 31 ++++---
 .../tiered-pricing-editor.runtime.test.tsx    | 80 +++++++++++++++++++
 .../models/tiered-pricing-visual-editor.tsx   | 55 +++++++------
 web/default/src/i18n/locales/ja.json          |  2 +-
 web/default/src/i18n/locales/ru.json          |  2 +-
 11 files changed, 215 insertions(+), 112 deletions(-)

diff --git a/pkg/billingexpr/timezone_string_test.go b/pkg/billingexpr/timezone_string_test.go
index ec51e3cc..9551924e 100644
--- a/pkg/billingexpr/timezone_string_test.go
+++ b/pkg/billingexpr/timezone_string_test.go
@@ -15,10 +15,14 @@ func TestTimeFunctionsJSONQuotedTimezoneCompatibility(t *testing.T) {
 		t.Run(timezone, func(t *testing.T) {
 			quoted, err := common.Marshal(timezone)
 			require.NoError(t, err)
-			expression := "hour(" + string(quoted) + `) >= 0 ? tier("base", p * 1 + c * 0) : tier("fallback", p * 2 + c * 0)`
-			cost, _, err := billingexpr.RunExpr(expression, billingexpr.TokenParams{P: 100})
+			// Each hour() call reads the clock independently. Bracket the actual
+			// value with UTC reads so crossing an hour boundary is still valid.
+			expression := `let before = hour("UTC"); let actual = hour(` + string(quoted) + `); let after = hour("UTC");
+				actual == before || actual == after ? tier("base", p * 1 + c * 0) : tier("fallback", p * 2 + c * 0)`
+			cost, trace, err := billingexpr.RunExpr(expression, billingexpr.TokenParams{P: 100})
 			require.NoError(t, err)
 			require.Equal(t, float64(100), cost)
+			require.Equal(t, "base", trace.MatchedTier)
 		})
 	}
 }
diff --git a/web/default/src/features/pricing/components/model-details.runtime.test.tsx b/web/default/src/features/pricing/components/model-details.runtime.test.tsx
index a58517cd..4be1239a 100644
--- a/web/default/src/features/pricing/components/model-details.runtime.test.tsx
+++ b/web/default/src/features/pricing/components/model-details.runtime.test.tsx
@@ -18,6 +18,7 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 */
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { createReactTestEnvironment } from '@/test/react'
+import { within } from '@testing-library/react'
 import assert from 'node:assert/strict'
 import { after, before, describe, test } from 'node:test'
 import type { PricingModel } from '../types'
@@ -40,27 +41,22 @@ for (const expression of [
   'tier("custom", p * 1e-999 + c * 15)',
   'len < 100 ? tier("short", p * 1 + c * 2)',
 ]) {
-  test(`shows the complete raw expression when structured parsing is unsupported: ${expression}`, async () => {
+  test(`shows the complete raw expression when structured parsing is unsupported: ${expression}`, async (): Promise<void> => {
     const view = await testEnv.render(
       <DynamicPricingBreakdown billingExpr={expression} />
     )
     try {
-      assert.match(
-        view.container.textContent || '',
-        /Unable to parse structured pricing/
-      )
-      assert.equal(
-        view.container.querySelector('code')?.textContent,
-        expression
-      )
-      assert.equal(view.container.querySelector('table'), null)
+      const pricing = within(view.container)
+      assert.ok(pricing.getByText('Unable to parse structured pricing'))
+      assert.ok(pricing.getByText(expression, { exact: true }))
+      assert.equal(pricing.queryByRole('table'), null)
     } finally {
       await view.unmount()
     }
   })
 }
 
-test('shows configured zero coefficients and leaves absent coefficients blank in both layouts', async () => {
+test('shows configured zero coefficients and leaves absent coefficients blank in both layouts', async (): Promise<void> => {
   const view = await testEnv.render(
     <DynamicPricingBreakdown
       billingExpr={
@@ -69,30 +65,41 @@ test('shows configured zero coefficients and leaves absent coefficients blank in
     />
   )
   try {
-    const headers = [...view.container.querySelectorAll('thead th')]
-    assert.equal(headers.length, 10)
-    const rows = view.container.querySelectorAll('tbody tr')
+    const pricing = within(view.container)
+    const table = pricing.getByRole('table')
+    const desktop = within(table)
+    assert.equal(desktop.getAllByRole('columnheader').length, 10)
+    const freeRow = desktop.getByRole('row', { name: /^free / })
+    const baseRow = desktop.getByRole('row', { name: /^base / })
     assert.deepEqual(
-      [...rows[0].querySelectorAll('td')]
+      within(freeRow)
+        .getAllByRole('cell')
         .slice(1)
-        .map((cell) => cell.textContent),
+        .map((cell: HTMLElement): string | null => cell.textContent),
       Array(9).fill('$0.0000')
     )
     assert.deepEqual(
-      [...rows[1].querySelectorAll('td')]
+      within(baseRow)
+        .getAllByRole('cell')
         .slice(3)
-        .map((cell) => cell.textContent),
+        .map((cell: HTMLElement): string | null => cell.textContent),
       Array(7).fill('-')
     )
-    const mobile = view.container.querySelector('.sm\\:hidden')
-    assert.ok(mobile)
-    assert.equal((mobile.textContent?.match(/\$0\.0000/g) || []).length, 9)
+    // Mobile cards render outside the semantic desktop table.
+    const mobilePrices = (price: string): HTMLElement[] =>
+      pricing
+        .getAllByText(price, { exact: true })
+        .filter((element: HTMLElement): boolean => !table.contains(element))
+    assert.equal(mobilePrices('$0.0000').length, 9)
+    assert.equal(mobilePrices('-').length, 7)
+    assert.equal(mobilePrices('$2.0000').length, 1)
+    assert.equal(mobilePrices('$4.0000').length, 1)
   } finally {
     await view.unmount()
   }
 })
 
-test('still hides cache columns when the request has no cache usage', async () => {
+test('still hides cache columns when the request has no cache usage', async (): Promise<void> => {
   const view = await testEnv.render(
     <DynamicPricingBreakdown
       billingExpr={'tier("free", p * 0 + c * 0 + cr * 0 + img * 0)'}
@@ -100,9 +107,9 @@ test('still hides cache columns when the request has no cache usage', async () =
     />
   )
   try {
-    const headers = [...view.container.querySelectorAll('thead th')].map(
-      (cell) => cell.textContent
-    )
+    const headers = within(view.container)
+      .getAllByRole('columnheader')
+      .map((cell: HTMLElement): string | null => cell.textContent)
     assert.deepEqual(headers, ['Tier', 'Input', 'Output', 'Image In'])
   } finally {
     await view.unmount()
diff --git a/web/default/src/features/pricing/lib/tier-expr.test.ts b/web/default/src/features/pricing/lib/tier-expr.test.ts
index 69143807..8129823c 100644
--- a/web/default/src/features/pricing/lib/tier-expr.test.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.test.ts
@@ -89,9 +89,9 @@ for (const timezone of [
   })
 }
 
-describe('visual optional price presence', () => {
+describe('visual optional price presence', (): void => {
   for (const { field, exprVar } of BILLING_CACHE_VAR_MAP) {
-    test(`preserves absent, zero and positive ${exprVar} prices through normalization and round trips`, () => {
+    test(`preserves absent, zero and positive ${exprVar} prices through normalization and round trips`, (): void => {
       const absent = normalizeVisualTier({
         input_unit_cost: 3,
         output_unit_cost: 15,
@@ -120,14 +120,14 @@ describe('visual optional price presence', () => {
     })
   }
 
-  test('does not create zero-priced subcategories in default tiers', () => {
+  test('does not create zero-priced subcategories in default tiers', (): void => {
     assert.equal(
       generateExprFromVisualConfig(createDefaultVisualConfig()),
       'tier("base", p * 0 + c * 0)'
     )
   })
 
-  test('accepts equivalent numeric spellings when switching to visual mode', () => {
+  test('accepts equivalent numeric spellings when switching to visual mode', (): void => {
     for (const source of [
       'tier("base", p * 3.0 + c * 15.0)',
       'tier("base", p * 3e0 + c * 1.5e1)',
@@ -139,7 +139,7 @@ describe('visual optional price presence', () => {
     }
   })
 
-  test('preserves numeric spellings and zero presence in every optional category', () => {
+  test('preserves numeric spellings and zero presence in every optional category', (): void => {
     for (const { field, exprVar } of BILLING_CACHE_VAR_MAP) {
       for (const zero of ['0.0', '0e0']) {
         const source = `tier("base 3.0", p * 3.0 + c * 1.5e1 + ${exprVar} * ${zero})`
@@ -162,7 +162,7 @@ describe('visual optional price presence', () => {
     }
   })
 
-  test('still rejects lossy or malformed visual conversions', () => {
+  test('still rejects lossy or malformed visual conversions', (): void => {
     for (const source of [
       'tier("base", p * 1+2 + c * 15)',
       'tier("base", p * 1e999 + c * 15)',
@@ -178,7 +178,7 @@ describe('visual optional price presence', () => {
       assert.equal(tryParseVisualConfig(source), null, source)
   })
 
-  test('keeps every zero-priced subcategory referenced in the billing contract', () => {
+  test('keeps every zero-priced subcategory referenced in the billing contract', (): void => {
     const source = `tier("base", p * 3 + c * 15${BILLING_CACHE_VAR_MAP.map(({ exprVar }) => ` + ${exprVar} * 0`).join('')})`
     const parsed = tryParseVisualConfig(source)
     assert.ok(parsed)
@@ -186,8 +186,8 @@ describe('visual optional price presence', () => {
   })
 })
 
-describe('evalExprLocally', () => {
-  test('evaluates backend-style ternaries and logical operators', () => {
+describe('evalExprLocally', (): void => {
+  test('evaluates backend-style ternaries and logical operators', (): void => {
     const result = evalExprLocally(
       'v1:p <= 100 && c > 0 ? tier("small", p * 2 + c * 3) : tier("large", p * 4)',
       100,
@@ -198,7 +198,7 @@ describe('evalExprLocally', () => {
     assert.deepEqual(result, { cost: 230, matchedTier: 'small', error: null })
   })
 
-  test('evaluates time-based pricing expressions with backend time functions', () => {
+  test('evaluates time-based pricing expressions with backend time functions', (): void => {
     const result = evalExprLocally(
       'hour("Asia/Shanghai") < 9 || (hour("Asia/Shanghai") >= 12 && hour("Asia/Shanghai") < 14) || hour("Asia/Shanghai") >= 18 ? tier("平常时段 0-9/12-14/18-24", p * 4.5 + c * 13.5 + cr * 0.15) : tier("高峰期 9-12/14-18", p * 9 + c * 27 + cr * 0.3)',
       100,
@@ -225,7 +225,7 @@ describe('evalExprLocally', () => {
     )
   })
 
-  test('keeps time helpers in backend ranges and falls back to UTC', () => {
+  test('keeps time helpers in backend ranges and falls back to UTC', (): void => {
     const utcFallbackChecks = ['hour', 'minute', 'weekday', 'month', 'day']
       .flatMap((helper) => [
         `${helper}("Invalid/Zone") == ${helper}("UTC")`,
@@ -249,7 +249,7 @@ describe('evalExprLocally', () => {
     assert.deepEqual(result, { cost: 42, matchedTier: 'valid', error: null })
   })
 
-  test('does not expose browser globals or member access', () => {
+  test('does not expose browser globals or member access', (): void => {
     const result = evalExprLocally(
       'globalThis.document ? 999 : 1',
       100,
@@ -263,8 +263,8 @@ describe('evalExprLocally', () => {
   })
 })
 
-describe('visual tier conditions', () => {
-  test('rejects unsupported or unsafe complete tier bodies', () => {
+describe('visual tier conditions', (): void => {
+  test('rejects unsupported or unsafe complete tier bodies', (): void => {
     for (const body of [
       'max(p, 1) * 3 + c * 15',
       'p * 2 * 3 + c * 4',
@@ -290,7 +290,7 @@ describe('visual tier conditions', () => {
     }
   })
 
-  test('rejects conditional expressions without a complete fallback chain', () => {
+  test('rejects conditional expressions without a complete fallback chain', (): void => {
     for (const expression of [
       'len < 100 ? tier("short", p * 1 + c * 2)',
       'tier("short", p * 1 + c * 2) : tier("long", p * 2 + c * 4)',
@@ -300,7 +300,7 @@ describe('visual tier conditions', () => {
     }
   })
 
-  test('retains coefficient presence, zero, and supported exponent notation', () => {
+  test('retains coefficient presence, zero, and supported exponent notation', (): void => {
     const [tier] = parseTiersFromExpr(
       'tier("free", c * 1e+2 + p * .5 + cr * 0 + cc1h * 0e-99)'
     )
@@ -322,7 +322,7 @@ describe('visual tier conditions', () => {
     }
   })
 
-  test('rejects structured displays with unsupported or missing branches', () => {
+  test('rejects structured displays with unsupported or missing branches', (): void => {
     for (const expression of [
       'len < 100 ? tier("peak", p * 2 + c * 4) : max(p, 1)',
       'len < 100 ? max(p, 1) : tier("off", p * 1 + c * 2)',
@@ -334,7 +334,7 @@ describe('visual tier conditions', () => {
     }
   })
 
-  test('rejects unsafe integer and underflowed condition literals', () => {
+  test('rejects unsafe integer and underflowed condition literals', (): void => {
     for (const literal of [
       '9007199254740993',
       '-9007199254740993',
@@ -361,7 +361,7 @@ describe('visual tier conditions', () => {
     }
   })
 
-  test('rejects incomplete structured displays for unsupported conditions', () => {
+  test('rejects incomplete structured displays for unsupported conditions', (): void => {
     for (const condition of [
       'len < 100 && c == 5',
       '(len < 100) || (c == 5)',
@@ -384,7 +384,7 @@ describe('visual tier conditions', () => {
     }
   })
 
-  test('preserves wrapped true AND members in supported display conditions', () => {
+  test('preserves wrapped true AND members in supported display conditions', (): void => {
     const tiers = parseTiersFromExpr(
       '(true) && len < 100 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
     )
@@ -396,7 +396,7 @@ describe('visual tier conditions', () => {
     '(len < 100) || (len > 200) || ((true))',
     '((len < 100) || (true && (true)))',
   ]) {
-    test(`displays an unconditional OR tier without restrictions: ${condition}`, () => {
+    test(`displays an unconditional OR tier without restrictions: ${condition}`, (): void => {
       const source = `${condition} ? tier("always", p * 2 + c * 4) : tier("off", p * 1 + c * 2)`
       const display = parseTiersFromExpr(source)
       assert.equal(display.length, 2)
@@ -412,7 +412,7 @@ describe('visual tier conditions', () => {
     })
   }
 
-  test('retains restrictions when true is an AND member rather than an OR branch', () => {
+  test('retains restrictions when true is an AND member rather than an OR branch', (): void => {
     const tiers = parseTiersFromExpr(
       '(true && len < 100) || (len > 200) ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
     )
@@ -427,7 +427,7 @@ describe('visual tier conditions', () => {
     '((((len < 100) || (len > 200))))',
     '((len < 100 && hour("Test/)||(:offset") >= 9) || (len > 200))',
   ]) {
-    test(`preserves fully wrapped OR conditions: ${condition}`, () => {
+    test(`preserves fully wrapped OR conditions: ${condition}`, (): void => {
       const source = `${condition} ? tier("peak", p * 2 + c * 4 + cr * 0) : tier("off", p * 1 + c * 2)`
       const display = parseTiersFromExpr(source)
       assert.equal(display[0]?.conditionGroups?.length, 2)
@@ -453,7 +453,7 @@ describe('visual tier conditions', () => {
     })
   }
 
-  test('keeps rejecting unsupported or lossy conditions inside outer wrappers', () => {
+  test('keeps rejecting unsupported or lossy conditions inside outer wrappers', (): void => {
     for (const condition of [
       '((len < 100 || len > 200) && c > 1)',
       '((len < 100) || (c == 5))',
@@ -471,7 +471,7 @@ describe('visual tier conditions', () => {
   })
 
   for (const timezone of ['Test/)||(', 'Test/)&&(', 'Test/:offset']) {
-    test(`preserves quoted syntax in both pricing parsers: ${timezone}`, () => {
+    test(`preserves quoted syntax in both pricing parsers: ${timezone}`, (): void => {
       const config = {
         tiers: [
           normalizeVisualTier({
@@ -507,7 +507,7 @@ describe('visual tier conditions', () => {
     })
   }
 
-  test('supports time conditions without requiring a second tier', () => {
+  test('supports time conditions without requiring a second tier', (): void => {
     const expr = generateExprFromVisualConfig({
       tiers: [
         {
@@ -528,7 +528,7 @@ describe('visual tier conditions', () => {
     assert.equal(parsed?.tiers[0].conditions[0].timezone, 'Asia/Shanghai')
   })
 
-  test('keeps time conditions visible in pricing breakdown parsing', () => {
+  test('keeps time conditions visible in pricing breakdown parsing', (): void => {
     const tiers = parseTiersFromExpr(
       'hour("Asia/Shanghai") >= 9 ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
     )
@@ -536,7 +536,7 @@ describe('visual tier conditions', () => {
     assert.equal(tiers[0]?.conditions[0]?.timezone, 'Asia/Shanghai')
   })
 
-  test('parses OR condition groups for pricing breakdowns', () => {
+  test('parses OR condition groups for pricing breakdowns', (): void => {
     const tiers = parseTiersFromExpr(
       '(len < 200000 && hour("Asia/Shanghai") >= 9) || (weekday("Asia/Shanghai") <= 5 && month("Asia/Shanghai") >= 1) ? tier("peak", p * 2 + c * 4) : tier("off", p * 1 + c * 2)'
     )
@@ -545,7 +545,7 @@ describe('visual tier conditions', () => {
     assert.equal(tiers[0]?.conditions[3]?.var, 'month')
   })
 
-  test('round-trips an explicit unconditional non-final tier', () => {
+  test('round-trips an explicit unconditional non-final tier', (): void => {
     const expr =
       'true ? tier("primary", p * 2 + c * 4) : tier("fallback", p * 1 + c * 2)'
     const parsed = tryParseVisualConfig(expr)
@@ -560,7 +560,7 @@ describe('visual tier conditions', () => {
     })
   })
 
-  test('normalizes time condition values to their calendar ranges', () => {
+  test('normalizes time condition values to their calendar ranges', (): void => {
     const tier = normalizeVisualTier({
       conditions: [
         { var: 'month', op: '<=', value: 200000 },
@@ -571,7 +571,7 @@ describe('visual tier conditions', () => {
     assert.equal(tier.conditions[1].value, 0)
   })
 
-  test('generates more than two conditions without truncation', () => {
+  test('generates more than two conditions without truncation', (): void => {
     const expr = generateExprFromVisualConfig({
       tiers: [
         {
@@ -593,7 +593,7 @@ describe('visual tier conditions', () => {
     )
   })
 
-  test('round-trips OR condition groups with AND members', () => {
+  test('round-trips OR condition groups with AND members', (): void => {
     const expr = generateExprFromVisualConfig({
       tiers: [
         {
@@ -642,7 +642,7 @@ describe('visual tier conditions', () => {
     assert.equal(generateExprFromVisualConfig(parsed!), expr)
   })
 
-  test('resets invalid time values when normalizing a condition', () => {
+  test('resets invalid time values when normalizing a condition', (): void => {
     const tier = normalizeVisualTier({
       conditions: [{ var: 'month', op: '<=', value: 200000 }],
     })
diff --git a/web/default/src/features/pricing/lib/tier-expr.ts b/web/default/src/features/pricing/lib/tier-expr.ts
index 957b7be3..145fde43 100644
--- a/web/default/src/features/pricing/lib/tier-expr.ts
+++ b/web/default/src/features/pricing/lib/tier-expr.ts
@@ -185,9 +185,11 @@ export function normalizeVisualConfig(
 function buildConditionStr(conditions: TierConditionInput[]): string {
   if (!conditions || conditions.length === 0) return ''
   return conditions
-    .filter((c) => c.var && c.op && c.value != null && c.value !== '')
-    .map((c) => {
-      const lhs = ['hour', 'minute', 'weekday', 'month', 'day'].includes(c.var)
+    .filter((c: TierConditionInput): boolean =>
+      Boolean(c.var && c.op && c.value != null && c.value !== '')
+    )
+    .map((c: TierConditionInput): string => {
+      const lhs = getTierConditionBounds(c.var)
         ? `${c.var}(${JSON.stringify(String(c.timezone || 'Asia/Shanghai'))})`
         : c.var
       return `${lhs} ${c.op} ${c.value}`
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
index 0d366b02..6185f1f0 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.runtime.test.tsx
@@ -53,7 +53,7 @@ for (const kind of ['task', 'tiered'] as const) {
     )
     try {
       const editor = [...view.container.querySelectorAll('textarea')].find(
-        (input) => !input.readOnly
+        (input: HTMLTextAreaElement): boolean => !input.readOnly
       )
       assert.ok(editor)
       const save = within(actions).getByRole('button', {
@@ -72,7 +72,7 @@ for (const kind of ['task', 'tiered'] as const) {
         async (): Promise<string> => '[]',
         ...(kind === 'tiered'
           ? ['false', 'true', 0, 1, null, [], {}].map(
-              (enabled): (() => Promise<string>) =>
+              (enabled: unknown): (() => Promise<string>) =>
                 async (): Promise<string> =>
                   JSON.stringify({ model: { enabled, expr: 'p * 1' } })
             )
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
index 93ec2a1a..11f6105b 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
@@ -513,7 +513,9 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
             <Search className='text-muted-foreground pointer-events-none absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2' />
             <Input
               value={search}
-              onChange={(event) => setSearch(event.target.value)}
+              onChange={(event: ChangeEvent<HTMLInputElement>): void =>
+                setSearch(event.target.value)
+              }
               placeholder={t('Search model name...')}
               aria-label={t('Search model name...')}
               className='pl-9'
@@ -525,7 +527,7 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
               size='sm'
               variant={vendorFilter === 'all' ? 'secondary' : 'ghost'}
               aria-pressed={vendorFilter === 'all'}
-              onClick={() => setVendorFilter('all')}
+              onClick={(): void => setVendorFilter('all')}
             >
               {t('All')}
             </Button>
@@ -536,7 +538,7 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
                 size='sm'
                 variant={vendorFilter === vendor.key ? 'secondary' : 'ghost'}
                 aria-pressed={vendorFilter === vendor.key}
-                onClick={() => setVendorFilter(vendor.key)}
+                onClick={(): void => setVendorFilter(vendor.key)}
               >
                 {t(vendor.label)}
               </Button>
@@ -626,7 +628,9 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
               type='button'
               variant='outline'
               size='sm'
-              onClick={() => downloadJson('task-rate-cards.json', text || '{}')}
+              onClick={(): void =>
+                downloadJson('task-rate-cards.json', text || '{}')
+              }
               disabled={Boolean(error)}
             >
               <Download className='mr-2 h-4 w-4' />
@@ -636,7 +640,7 @@ export const TaskRateCardSettings = memo(function TaskRateCardSettings({
               type='button'
               variant='outline'
               size='sm'
-              onClick={() => fileInputRef.current?.click()}
+              onClick={(): void => fileInputRef.current?.click()}
             >
               <Upload className='mr-2 h-4 w-4' />
               {t('Upload file')}
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 57ff8df7..62299b06 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -18,6 +18,7 @@ For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API
 */
 import {
   type ChangeEvent,
+  type ReactElement,
   useCallback,
   useEffect,
   useMemo,
@@ -256,7 +257,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   const filteredModels = useMemo((): string[] => {
     const query = search.trim().toLowerCase()
     if (!query) return configuredModels
-    return configuredModels.filter((model) =>
+    return configuredModels.filter((model: string): boolean =>
       model.toLowerCase().includes(query)
     )
   }, [configuredModels, search])
@@ -312,7 +313,9 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
           type='button'
           variant='outline'
           size='sm'
-          onClick={() => downloadJson('tiered-billing.json', text || '{}')}
+          onClick={(): void =>
+            downloadJson('tiered-billing.json', text || '{}')
+          }
           disabled={validatedConfig === null}
         >
           <Download className='mr-2 h-4 w-4' />
@@ -322,7 +325,7 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
           type='button'
           variant='outline'
           size='sm'
-          onClick={() => fileInputRef.current?.click()}
+          onClick={(): void => fileInputRef.current?.click()}
         >
           <Upload className='mr-2 h-4 w-4' />
           {t('Upload file')}
@@ -359,7 +362,9 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
             <Search className='text-muted-foreground pointer-events-none absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2' />
             <Input
               value={search}
-              onChange={(event) => setSearch(event.target.value)}
+              onChange={(event: ChangeEvent<HTMLInputElement>): void =>
+                setSearch(event.target.value)
+              }
               placeholder={t('Search model name...')}
               aria-label={t('Search model name...')}
               className='pl-9'
@@ -393,14 +398,16 @@ export function TieredBillingSettings(props: TieredBillingSettingsProps) {
             className='flex flex-wrap gap-1.5'
             aria-label={t('Matching models')}
           >
-            {filteredModels.map((model) => (
-              <span
-                key={model}
-                className='bg-muted text-muted-foreground rounded-md px-2 py-1 font-mono text-xs'
-              >
-                {model}
-              </span>
-            ))}
+            {filteredModels.map(
+              (model: string): ReactElement => (
+                <span
+                  key={model}
+                  className='bg-muted text-muted-foreground rounded-md px-2 py-1 font-mono text-xs'
+                >
+                  {model}
+                </span>
+              )
+            )}
           </div>
         )}
 
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
index 617af209..1cc950ca 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
@@ -676,6 +676,86 @@ describe('optional zero prices in the actual editor', () => {
     })
   }
 
+  for (const price of [undefined, 0, 0.25]) {
+    test(`inherits every registered optional price (${price}) when adding a tier`, async (): Promise<void> => {
+      const container = createContainer()
+      const root = createRoot(container)
+      const extraTerms =
+        price === undefined
+          ? ''
+          : BILLING_EXTRA_VARS.map(
+              (variable: (typeof BILLING_EXTRA_VARS)[number]): string =>
+                ` + ${variable.key} * ${price}`
+            ).join('')
+      let saved = `tier("base", p * 3 + c * 15${extraTerms})`
+      function ControlledEditor(): ReactElement {
+        const [expression, setExpression] = useState(saved)
+        return (
+          <TieredPricingEditor
+            billingExpr={expression}
+            requestRuleExpr=''
+            onBillingExprChange={(next: string): void => {
+              saved = next
+              setExpression(next)
+            }}
+            onRequestRuleExprChange={(): void => undefined}
+          />
+        )
+      }
+      try {
+        await act(async (): Promise<void> => {
+          root.render(
+            <I18nextProvider i18n={i18n}>
+              <ControlledEditor />
+            </I18nextProvider>
+          )
+        })
+        await act(async (): Promise<void> => {
+          fireEvent.click(
+            within(container).getByRole('button', { name: 'Add tier' })
+          )
+        })
+        assert.equal(
+          saved,
+          `len < 200000 ? tier("base", p * 3 + c * 15${extraTerms}) : tier("tier_2", p * 3 + c * 15${extraTerms})`
+        )
+        if (price === undefined) {
+          // Blank media fields are collapsed and 1h cache is hidden in generic mode.
+          for (const button of within(container).getAllByRole('button', {
+            name: 'Media pricing',
+          })) {
+            await act(async (): Promise<void> => {
+              fireEvent.click(button)
+            })
+          }
+          for (const tab of within(container).getAllByRole('tab', {
+            name: 'Time-sliced cache (Claude)',
+          })) {
+            await act(async (): Promise<void> => {
+              fireEvent.click(tab)
+            })
+          }
+          assert.equal(
+            saved,
+            'len < 200000 ? tier("base", p * 3 + c * 15) : tier("tier_2", p * 3 + c * 15)'
+          )
+        }
+        for (const variable of BILLING_EXTRA_VARS) {
+          const inputs = within(container).getAllByLabelText(variable.label)
+          assert.equal(inputs.length, 2)
+          for (const input of inputs) {
+            assert.equal(
+              (input as HTMLInputElement).value,
+              price === undefined ? '' : String(price)
+            )
+          }
+        }
+      } finally {
+        await unmount(root, container)
+      }
+    })
+  }
+
   test('distinguishes blank, zero and positive prices and preserves them when adding a tier', async () => {
     const container = createContainer()
     const root = createRoot(container)
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
index b480e723..43299e33 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-visual-editor.tsx
@@ -35,7 +35,10 @@ import {
 } from '@/components/ui/select'
 import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { Textarea } from '@/components/ui/textarea'
-import { BILLING_EXTRA_VARS } from '@/features/pricing/lib/billing-expr'
+import {
+  BILLING_EXTRA_VARS,
+  type BillingVar,
+} from '@/features/pricing/lib/billing-expr'
 import {
   CACHE_MODE_GENERIC,
   CACHE_MODE_TIMED,
@@ -101,14 +104,8 @@ function ConditionRow({
   const currentInputOption = CONDITION_INPUT_OPTIONS.find(
     (option) => option.value === condition.var
   )
-  const isTimeCondition = [
-    'hour',
-    'minute',
-    'weekday',
-    'month',
-    'day',
-  ].includes(condition.var)
   const timeBounds = getTierConditionBounds(condition.var)
+  const isTimeCondition = Boolean(timeBounds)
   const handleVariableChange = (value: string | null): void => {
     if (!value) return
     const nextVar = value as TierConditionInput['var']
@@ -627,7 +624,7 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
     onChange({ ...config, tiers })
   }
 
-  const handleAddTier = () => {
+  const handleAddTier = (): void => {
     const tiers = [...config.tiers]
     const lastIndex = tiers.length - 1
     // When adding a new fallback, give the previous catch-all tier a default
@@ -646,13 +643,14 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
         conditions: [],
         input_unit_cost: tiers[lastIndex]?.input_unit_cost ?? 0,
         output_unit_cost: tiers[lastIndex]?.output_unit_cost ?? 0,
-        cache_read_unit_cost: tiers[lastIndex]?.cache_read_unit_cost,
-        cache_create_unit_cost: tiers[lastIndex]?.cache_create_unit_cost,
-        cache_create_1h_unit_cost: tiers[lastIndex]?.cache_create_1h_unit_cost,
-        image_unit_cost: tiers[lastIndex]?.image_unit_cost,
-        image_output_unit_cost: tiers[lastIndex]?.image_output_unit_cost,
-        audio_input_unit_cost: tiers[lastIndex]?.audio_input_unit_cost,
-        audio_output_unit_cost: tiers[lastIndex]?.audio_output_unit_cost,
+        ...Object.fromEntries(
+          BILLING_EXTRA_VARS.flatMap(
+            (variable: BillingVar): [string, unknown][] =>
+              variable.tierField
+                ? [[variable.tierField, tiers[lastIndex]?.[variable.tierField]]]
+                : []
+          )
+        ),
       })
     )
     onChange({ ...config, tiers })
@@ -684,20 +682,21 @@ export function VisualEditor({ visualConfig, onChange }: VisualEditorProps) {
     const targetIndex = Math.max(0, Math.min(groupIndex, groups.length))
     const targetGroup = groups[targetIndex] ?? { conditions: [] }
     const usedVars = new Set(
-      targetGroup.conditions.map((condition) => condition.var)
+      targetGroup.conditions.map(
+        (condition: TierConditionInput): TierConditionInput['var'] =>
+          condition.var
+      )
+    )
+    const variableOrder = CONDITION_INPUT_OPTIONS.map(
+      (
+        option: (typeof CONDITION_INPUT_OPTIONS)[number]
+      ): TierConditionInput['var'] => option.value
     )
-    const variableOrder: TierConditionInput['var'][] = [
-      'len',
-      'p',
-      'c',
-      'hour',
-      'minute',
-      'weekday',
-      'month',
-      'day',
-    ]
     const nextVar =
-      variableOrder.find((variable) => !usedVars.has(variable)) || 'len'
+      variableOrder.find(
+        (variable: TierConditionInput['var']): boolean =>
+          !usedVars.has(variable)
+      ) || 'len'
     const timeBounds = getTierConditionBounds(nextVar)
     const nextGroups =
       groups.length > 0
diff --git a/web/default/src/i18n/locales/ja.json b/web/default/src/i18n/locales/ja.json
index 1546cfa0..7c477ccc 100644
--- a/web/default/src/i18n/locales/ja.json
+++ b/web/default/src/i18n/locales/ja.json
@@ -1763,7 +1763,7 @@
     "Enable when proxying workers that fetch images over HTTP.": "HTTP経由で画像をフェッチするワーカーをプロキシする場合に有効にします。",
     "Enabled": "有効",
     "Enabled flag for {{model}} must be a boolean": "{{model}} の有効フラグは真偽値である必要があります",
-    "Tiered billing JSON must be an object": "段階料金の JSON はオブジェクトである必要があります",
+    "Tiered billing JSON must be an object": "階層課金の JSON はオブジェクトである必要があります",
     "Model name cannot be empty": "モデル名は空にできません",
     "Config for {{model}} must be an object": "{{model}} の設定はオブジェクトである必要があります",
     "Billing expression for {{model}} cannot be empty": "{{model}} の課金式は空にできません",
diff --git a/web/default/src/i18n/locales/ru.json b/web/default/src/i18n/locales/ru.json
index f6fc2be2..642dec47 100644
--- a/web/default/src/i18n/locales/ru.json
+++ b/web/default/src/i18n/locales/ru.json
@@ -1763,7 +1763,7 @@
     "Enable when proxying workers that fetch images over HTTP.": "Включить при проксировании воркеров, которые получают изображения по HTTP.",
     "Enabled": "Включено",
     "Enabled flag for {{model}} must be a boolean": "Флаг включения для {{model}} должен быть логическим значением",
-    "Tiered billing JSON must be an object": "JSON ступенчатой тарификации должен быть объектом",
+    "Tiered billing JSON must be an object": "JSON многоуровневого биллинга должен быть объектом",
     "Model name cannot be empty": "Имя модели не может быть пустым",
     "Config for {{model}} must be an object": "Конфигурация для {{model}} должна быть объектом",
     "Billing expression for {{model}} cannot be empty": "Выражение тарификации для {{model}} не может быть пустым",

From 3dafd05f792cb4358e670a3064b657c2440db00d Mon Sep 17 00:00:00 2001
From: CSCITech <cscitech@cscitech.top>
Date: Fri, 18 Sep 2026 05:30:31 +0800
Subject: [PATCH 20/20] fix: retain failed stream writer through controller
 error handling

---
 controller/relay_stream_error_test.go         | 64 +++++++++++++++++++
 relay/channel/openai/chat_stream.go           |  8 ++-
 relay/channel/openai/chat_stream_test.go      | 21 +++++-
 .../system-settings/models/download-json.ts   | 27 ++++++++
 .../models/task-rate-card-settings.tsx        | 11 +---
 .../models/tiered-billing-settings.tsx        | 11 +---
 .../tiered-pricing-editor.runtime.test.tsx    | 36 +++++------
 7 files changed, 137 insertions(+), 41 deletions(-)
 create mode 100644 web/default/src/features/system-settings/models/download-json.ts

diff --git a/controller/relay_stream_error_test.go b/controller/relay_stream_error_test.go
index 3d656e3d..7970205c 100644
--- a/controller/relay_stream_error_test.go
+++ b/controller/relay_stream_error_test.go
@@ -2,6 +2,7 @@ package controller
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -13,12 +14,75 @@ import (
 	relaycommon "github.com/MAX-API-Next/MAX-API/relay/common"
 	relayconstant "github.com/MAX-API-Next/MAX-API/relay/constant"
 	"github.com/MAX-API-Next/MAX-API/relay/helper"
+	"github.com/MAX-API-Next/MAX-API/service"
 	"github.com/MAX-API-Next/MAX-API/setting/operation_setting"
 	"github.com/MAX-API-Next/MAX-API/types"
 	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/require"
 )
 
+type partialNativeStreamWriter struct {
+	*httptest.ResponseRecorder
+	short  bool
+	writes int
+}
+
+func (w *partialNativeStreamWriter) Write(data []byte) (int, error) {
+	w.writes++
+	if strings.Contains(string(data), "broken") {
+		n, _ := w.ResponseRecorder.Write(data[:len(data)/2])
+		if w.short {
+			return n, nil
+		}
+		return n, io.ErrClosedPipe
+	}
+	return w.ResponseRecorder.Write(data)
+}
+
+func TestNativeChatWriteFailureStaysLatchedThroughController(t *testing.T) {
+	oldFlag, oldTimes := common.EmptyCompletionRetryEnabled, common.RetryTimes
+	common.EmptyCompletionRetryEnabled, common.RetryTimes = true, 2
+	t.Cleanup(func() { common.EmptyCompletionRetryEnabled, common.RetryTimes = oldFlag, oldTimes })
+	for _, partial := range []bool{false, true} {
+		for _, short := range []bool{false, true} {
+			t.Run(fmt.Sprintf("partial=%t/short=%t", partial, short), func(t *testing.T) {
+				writer := &partialNativeStreamWriter{ResponseRecorder: httptest.NewRecorder(), short: short}
+				c, _ := gin.CreateTestContext(writer)
+				c.Request = httptest.NewRequest(http.MethodPost, "/v1/chat/completions", nil)
+				info := &relaycommon.RelayInfo{RelayMode: relayconstant.RelayModeChatCompletions, RelayFormat: types.RelayFormatOpenAI, DisablePing: true, ChannelMeta: &relaycommon.ChannelMeta{UpstreamModelName: "gpt-test"}}
+				info.SetEstimatePromptTokens(38)
+				frames := ""
+				if partial {
+					frames = "data: {\"choices\":[{\"delta\":{\"content\":\"hello\"}}]}\n\n"
+				}
+				frames += "data: {\"choices\":[{\"delta\":{\"content\":\"broken\"}}],\"usage\":{\"prompt_tokens\":1000,\"completion_tokens\":999,\"total_tokens\":1999}}\n\ndata: [DONE]\n\n"
+				usage, apiErr := openai.OaiStreamHandler(c, info, &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(strings.NewReader(frames))})
+				require.NotNil(t, apiErr)
+				require.True(t, types.IsSkipRetryError(apiErr))
+				require.False(t, shouldRetry(c, apiErr, 1))
+				if partial {
+					require.Equal(t, service.ResponseText2Usage(c, "hello", info.UpstreamModelName, 38), usage)
+				} else {
+					require.Nil(t, usage)
+				}
+				body, writes := writer.Body.String(), writer.writes
+				require.NotEmpty(t, body)
+				require.True(t, writeStartedStreamError(c, types.RelayFormatOpenAI, apiErr))
+				require.Equal(t, writes, writer.writes, "controller must not append to a partially written SSE frame")
+				require.Equal(t, body, writer.Body.String())
+				n, err := c.Writer.WriteString("late write")
+				require.Zero(t, n)
+				if short {
+					require.ErrorIs(t, err, io.ErrShortWrite)
+				} else {
+					require.ErrorIs(t, err, io.ErrClosedPipe)
+				}
+				require.Equal(t, writes, writer.writes)
+			})
+		}
+	}
+}
+
 func TestNativeChatErrorReachesControllerRetryPolicy(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 	oldFlag, oldTimes, oldRanges := common.EmptyCompletionRetryEnabled, common.RetryTimes, operation_setting.AutomaticRetryStatusCodeRanges
diff --git a/relay/channel/openai/chat_stream.go b/relay/channel/openai/chat_stream.go
index dfec65c4..cfc02fa5 100644
--- a/relay/channel/openai/chat_stream.go
+++ b/relay/channel/openai/chat_stream.go
@@ -147,7 +147,13 @@ func oaiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *htt
 	observer := newOpenAIStreamToolCallObserver(info)
 	writeObserver := &chatStreamWriteObserver{ResponseWriter: c.Writer}
 	c.Writer = writeObserver
-	defer func() { c.Writer = writeObserver.ResponseWriter }()
+	defer func() {
+		// Keep terminal write failures latched through the controller's error
+		// response; appending SSE events after a partial frame corrupts it.
+		if writeObserver.err == nil {
+			c.Writer = writeObserver.ResponseWriter
+		}
+	}()
 
 	send := func(data string) bool {
 		err := HandleStreamFormat(c, info, data, info.ChannelSetting.ForceFormat, info.ChannelSetting.ThinkingToContent)
diff --git a/relay/channel/openai/chat_stream_test.go b/relay/channel/openai/chat_stream_test.go
index c35fd69b..7b0f2231 100644
--- a/relay/channel/openai/chat_stream_test.go
+++ b/relay/channel/openai/chat_stream_test.go
@@ -54,6 +54,7 @@ func TestNativeChatStreamOverloadBeforeOutput(t *testing.T) {
 		for _, role := range []bool{false, true} {
 			t.Run(fmt.Sprintf("force=%t/role=%t", force, role), func(t *testing.T) {
 				c, recorder, info := newChatStreamTest(t)
+				originalWriter := c.Writer
 				info.ChannelSetting.ForceFormat = force
 				frames := []string{chatOverloadFrame, chatUsageFrame, "[DONE]"}
 				if role {
@@ -68,6 +69,7 @@ func TestNativeChatStreamOverloadBeforeOutput(t *testing.T) {
 				require.False(t, types.IsSkipRetryError(apiErr))
 				require.False(t, c.Writer.Written())
 				require.Empty(t, recorder.Body.String())
+				require.Same(t, originalWriter, c.Writer, "healthy writer must be restored for an uncommitted error")
 			})
 		}
 	}
@@ -106,12 +108,14 @@ func TestNativeChatStreamPreservesNonTextAndZeroUsageOutput(t *testing.T) {
 	} {
 		t.Run(name, func(t *testing.T) {
 			c, recorder, info := newChatStreamTest(t)
+			originalWriter := c.Writer
 			frame := `{"choices":[{"index":0,"delta":` + delta + `,"finish_reason":null}]}`
 			usage, apiErr := replayChatStream(c, info, chatRoleFrame, frame, chatUsageFrame, "[DONE]")
 			require.Nil(t, apiErr)
 			require.Equal(t, 38, usage.PromptTokens)
 			require.Contains(t, recorder.Body.String(), frame)
 			require.Equal(t, 0, emptyCompletionRetryCount(c))
+			require.Same(t, originalWriter, c.Writer, "successful streams restore the healthy writer")
 		})
 	}
 }
@@ -376,7 +380,13 @@ func TestNativeChatStreamWriteFailureDoesNotSettleFirstPayload(t *testing.T) {
 			require.NotNil(t, apiErr)
 			require.True(t, types.IsSkipRetryError(apiErr), "Gin committed the response headers")
 			require.Nil(t, usage)
-			require.Same(t, failed.Writer, c.Writer)
+			n, err := c.Writer.WriteString("late response")
+			require.Zero(t, n)
+			if short {
+				require.ErrorIs(t, err, io.ErrShortWrite)
+			} else {
+				require.ErrorIs(t, err, io.ErrClosedPipe)
+			}
 		})
 	}
 }
@@ -441,7 +451,14 @@ func TestNativeChatStreamPingWriteFailureIsTerminal(t *testing.T) {
 				require.Contains(t, info.StreamStatus.Summary(), string(relaycommon.StreamEndReasonPingFail))
 				require.Equal(t, 1, writer.pingWrites, "a failed ping must terminate without more underlying writes")
 				require.Positive(t, writer.writeDeadlines, "observer must preserve response-controller deadline traversal")
-				require.Same(t, writer, c.Writer)
+				n, err := c.Writer.WriteString(": PING\n\n")
+				require.Zero(t, n)
+				if short {
+					require.ErrorIs(t, err, io.ErrShortWrite)
+				} else {
+					require.ErrorIs(t, err, io.ErrClosedPipe)
+				}
+				require.Equal(t, 1, writer.pingWrites, "late writes must remain blocked after returning to the controller")
 				if partial {
 					expected := service.ResponseText2Usage(c, "hello", info.UpstreamModelName, 38)
 					require.NotNil(t, usage)
diff --git a/web/default/src/features/system-settings/models/download-json.ts b/web/default/src/features/system-settings/models/download-json.ts
new file mode 100644
index 00000000..8f4db4a8
--- /dev/null
+++ b/web/default/src/features/system-settings/models/download-json.ts
@@ -0,0 +1,27 @@
+/*
+Copyright (C) 2023-2026 MAX-API-Next
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact https://github.com/MAX-API-Next/MAX-API/issues
+*/
+export function downloadJson(filename: string, value: string): void {
+  const blob = new Blob([value], { type: 'application/json;charset=utf-8' })
+  const url = URL.createObjectURL(blob)
+  const anchor = document.createElement('a')
+  anchor.href = url
+  anchor.download = filename
+  anchor.click()
+  setTimeout((): void => URL.revokeObjectURL(url), 0)
+}
diff --git a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
index 11f6105b..0d06c028 100644
--- a/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
+++ b/web/default/src/features/system-settings/models/task-rate-card-settings.tsx
@@ -37,6 +37,7 @@ import { Textarea } from '@/components/ui/textarea'
 import { CopyButton } from '@/components/copy-button'
 import { SettingsPageActionsPortal } from '../components/settings-page-context'
 import { useUpdateOption } from '../hooks/use-update-option'
+import { downloadJson } from './download-json'
 import { formatJsonForTextarea, normalizeJsonString } from './utils'
 
 const OPTION_KEY = 'task_billing_setting.rate_cards'
@@ -155,16 +156,6 @@ const MINIMAX_RATE_CARD_EXAMPLE = JSON.stringify(
   2
 )
 
-function downloadJson(filename: string, value: string): void {
-  const blob = new Blob([value], { type: 'application/json;charset=utf-8' })
-  const url = URL.createObjectURL(blob)
-  const anchor = document.createElement('a')
-  anchor.href = url
-  anchor.download = filename
-  anchor.click()
-  setTimeout(() => URL.revokeObjectURL(url), 0)
-}
-
 type TaskRateCardSettingsProps = {
   defaultValue: string
 }
diff --git a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
index 62299b06..c6dd7e57 100644
--- a/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
+++ b/web/default/src/features/system-settings/models/tiered-billing-settings.tsx
@@ -44,6 +44,7 @@ import { Textarea } from '@/components/ui/textarea'
 import { updateTieredBillingConfig } from '../api'
 import { SettingsForm } from '../components/settings-form-layout'
 import { SettingsPageActionsPortal } from '../components/settings-page-context'
+import { downloadJson } from './download-json'
 import { formatJsonForTextarea } from './utils'
 
 type TieredBillingEntry = {
@@ -147,16 +148,6 @@ function validateUnifiedConfig(
   return normalized
 }
 
-function downloadJson(filename: string, value: string): void {
-  const blob = new Blob([value], { type: 'application/json;charset=utf-8' })
-  const url = URL.createObjectURL(blob)
-  const anchor = document.createElement('a')
-  anchor.href = url
-  anchor.download = filename
-  anchor.click()
-  setTimeout(() => URL.revokeObjectURL(url), 0)
-}
-
 export function TieredBillingSettings(props: TieredBillingSettingsProps) {
   const { t } = useTranslation()
   const queryClient = useQueryClient()
diff --git a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
index 1cc950ca..ff9e6662 100644
--- a/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
+++ b/web/default/src/features/system-settings/models/tiered-pricing-editor.runtime.test.tsx
@@ -329,7 +329,7 @@ describe('optional zero prices in the actual editor', () => {
   }
 
   for (const kind of ['task', 'tiered'] as const) {
-    test(`${kind} settings discard imports superseded by edits, imports, examples, and resets`, async () => {
+    test(`${kind} settings discard imports superseded by edits, imports, examples, and resets`, async (): Promise<void> => {
       const container = createContainer()
       const actions = createContainer()
       const root = createRoot(container)
@@ -455,7 +455,7 @@ describe('optional zero prices in the actual editor', () => {
     })
   }
 
-  test('only enables tiered configuration downloads for valid current JSON', async () => {
+  test('only enables tiered configuration downloads for valid current JSON', async (): Promise<void> => {
     const container = createContainer()
     const actions = createContainer()
     const root = createRoot(container)
@@ -507,7 +507,7 @@ describe('optional zero prices in the actual editor', () => {
     'tier("base", p * 3e0 + c * 1.5e1 + cr * 0e0)',
     'tier("custom", max(p, 1) * 3 + c * 15)',
   ]) {
-    test(`preserves prices on mount and mode changes: ${source}`, async () => {
+    test(`preserves prices on mount and mode changes: ${source}`, async (): Promise<void> => {
       const container = createContainer()
       const root = createRoot(container)
       const supported = !source.includes('max(')
@@ -576,7 +576,7 @@ describe('optional zero prices in the actual editor', () => {
     })
   }
 
-  test('keeps zero prices when switching between visual and expression modes', async () => {
+  test('keeps zero prices when switching between visual and expression modes', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     const source =
@@ -638,7 +638,7 @@ describe('optional zero prices in the actual editor', () => {
   })
 
   for (const variable of BILLING_EXTRA_VARS) {
-    test(`keeps ${variable.key}=0 on mount, unrelated edit and remount`, async () => {
+    test(`keeps ${variable.key}=0 on mount, unrelated edit and remount`, async (): Promise<void> => {
       const container = createContainer()
       const root = createRoot(container)
       let saved = `tier("base", p * 3 + c * 15 + ${variable.key} * 0)`
@@ -756,7 +756,7 @@ describe('optional zero prices in the actual editor', () => {
     })
   }
 
-  test('distinguishes blank, zero and positive prices and preserves them when adding a tier', async () => {
+  test('distinguishes blank, zero and positive prices and preserves them when adding a tier', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     let saved = 'tier("base", p * 3 + c * 15)'
@@ -877,7 +877,7 @@ after(() => {
 })
 
 describe('TieredPricingEditor runtime behavior', () => {
-  test('keeps an empty timezone editable and applies the default only to the expression', async () => {
+  test('keeps an empty timezone editable and applies the default only to the expression', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     const source =
@@ -914,7 +914,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('clears OR groups when deleting the final sibling and can add a fresh tier', async () => {
+  test('clears OR groups when deleting the final sibling and can add a fresh tier', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     const source =
@@ -956,7 +956,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('chooses a new condition using only the target OR group', async () => {
+  test('chooses a new condition using only the target OR group', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     const source =
@@ -999,7 +999,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('mounts the visual editor without a runtime hook error', async () => {
+  test('mounts the visual editor without a runtime hook error', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
 
@@ -1024,7 +1024,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('allows adding a condition to the initial tier and exposes time fields', async () => {
+  test('allows adding a condition to the initial tier and exposes time fields', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     try {
@@ -1056,7 +1056,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('allows adding more than two conditions and condition groups', async () => {
+  test('allows adding more than two conditions and condition groups', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     try {
@@ -1095,7 +1095,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('removes a condition from a non-fallback tier', async () => {
+  test('removes a condition from a non-fallback tier', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     const billingChanges: string[] = []
@@ -1152,7 +1152,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('removes a newly added fallback tier', async () => {
+  test('removes a newly added fallback tier', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
 
@@ -1198,7 +1198,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('never emits model A billing through model B callbacks', async () => {
+  test('never emits model A billing through model B callbacks', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     const changes: Array<{ modelName: string; next: string }> = []
@@ -1232,7 +1232,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('does not carry model A billing state into model B', async () => {
+  test('does not carry model A billing state into model B', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     const renderPanel = (editData: ModelRatioData) => (
@@ -1264,7 +1264,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('replaces expression state when the selected model snapshot changes', async () => {
+  test('replaces expression state when the selected model snapshot changes', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     const updatedModelA: ModelRatioData = {
@@ -1294,7 +1294,7 @@ describe('TieredPricingEditor runtime behavior', () => {
     }
   })
 
-  test('updates expression prices when selecting another model row', async () => {
+  test('updates expression prices when selecting another model row', async (): Promise<void> => {
     const container = createContainer()
     const root = createRoot(container)
     const modeMap = JSON.stringify({