fix: mask legacy routing probe policy

linhay · linhay · commit 5bb5df622f25 · 2026-05-26T13:19:25.000+08:00
diff --git a/frontend/src/features/claude-code/ClaudeCodeAccountListFeature.tsx b/frontend/src/features/claude-code/ClaudeCodeAccountListFeature.tsx
@@ -38,6 +38,7 @@ import {
   buildCodexRoutePolicyPreview,
   buildCodexRoutePolicyRowStates,
   buildCodexRoutingProbeModelOptions,
+  buildCodexRoutingProbeRequestInput,
   buildCodexRoutingProbeStreamLines,
   mergeCodexAuthFileModelMappings,
   resolveCodexRoutingProbeDefaultModel,
@@ -114,15 +115,14 @@ export default function ClaudeCodeAccountListFeature({ sidecarStatus }: ClaudeCo
     };
   }, [authFileModelMappings, detailRow]);
   const requestableRows = useMemo(() => orderedRows.filter((row) => row.requestable), [orderedRows]);
-  const requestableOrderIDs = useMemo(() => requestableRows.map((row) => row.id), [requestableRows]);
   const routePolicyDraft = useMemo(
     () => ({
       allowAccountIDs: [],
       denyAccountIDs: [],
-      orderAccountIDs: requestableOrderIDs,
-      allowFallback: false,
+      orderAccountIDs: [],
+      allowFallback: true,
     }),
-    [requestableOrderIDs],
+    [],
   );
   const routePolicyPreviewRows = useMemo(
     () => buildCodexRoutePolicyPreview(orderedRows, routePolicyDraft),
@@ -147,10 +147,6 @@ export default function ClaudeCodeAccountListFeature({ sidecarStatus }: ClaudeCo
   );
   const latestRoutingProbeAttempt = routingProbeAttempts[routingProbeAttempts.length - 1] || null;
   const latestRoutingProbeAccountID = latestRoutingProbeAttempt?.accountID || '';
-  const latestRoutingProbeExpectedID = routePolicyPreviewRows[0]?.id || '';
-  const latestRoutingProbeUsedFallback =
-    Boolean(latestRoutingProbeAccountID && latestRoutingProbeExpectedID) &&
-    latestRoutingProbeAccountID !== latestRoutingProbeExpectedID;
   const routingProbeDisabled = !ready || saving || routingProbeRunning || !routingProbeModel.trim();
 
   async function reload(messageOverride?: string) {
@@ -593,14 +589,7 @@ export default function ClaudeCodeAccountListFeature({ sidecarStatus }: ClaudeCo
     try {
       const collectedAttempts: CodexRoutingProbeAttemptView[] = [];
       for (let attemptIndex = 0; attemptIndex < safeAttempts; attemptIndex += 1) {
-        const routePolicyInput = {
-          model,
-          attempts: 1,
-          allowAccountIDs: [],
-          denyAccountIDs: [],
-          orderAccountIDs: requestableOrderIDs,
-          allowFallback: false,
-        };
+        const routePolicyInput = buildCodexRoutingProbeRequestInput(model, 1);
         const result = await trackRequest('ProbeClaudeCodeAccountRouting', { ...routePolicyInput, index: attemptIndex + 1 }, () =>
           ProbeClaudeCodeAccountRouting(
             main.ProbeClaudeCodeAccountRoutingInput.createFrom({
@@ -829,7 +818,6 @@ export default function ClaudeCodeAccountListFeature({ sidecarStatus }: ClaudeCo
           routingProbeDisabled={routingProbeDisabled || routePolicyPreviewRows.length === 0}
           routePolicyPreviewRows={routePolicyPreviewRows}
           routingProbeStreamLines={routingProbeStreamLines}
-          latestUsedFallback={latestRoutingProbeUsedFallback}
           onClose={() => setRouteProbeOpen(false)}
           onModelChange={setRoutingProbeModel}
           onProbeOnce={() => void runRoutingProbe(1)}
diff --git a/frontend/src/features/codex/CodexAccountListFeature.tsx b/frontend/src/features/codex/CodexAccountListFeature.tsx
@@ -52,6 +52,7 @@ import {
   buildCodexRoutePolicyPreview,
   buildCodexRoutePolicyRowStates,
   buildCodexRoutingProbeModelOptions,
+  buildCodexRoutingProbeRequestInput,
   buildCodexRoutingProbeStreamLines,
   buildOpenAICompatibleModelMappings,
   canEditCodexModelMappings,
@@ -126,15 +127,14 @@ export default function CodexAccountListFeature({ sidecarStatus }: CodexAccountL
   const orderChanged = orderDirty;
   const routingProbeModelOptions = useMemo(() => buildCodexRoutingProbeModelOptions(orderedRows), [orderedRows]);
   const requestableRows = useMemo(() => orderedRows.filter((row) => row.requestable), [orderedRows]);
-  const requestableOrderIDs = useMemo(() => requestableRows.map((row) => row.id), [requestableRows]);
   const routePolicyDraft = useMemo(
     () => ({
       allowAccountIDs: [],
       denyAccountIDs: [],
-      orderAccountIDs: requestableOrderIDs,
-      allowFallback: false,
+      orderAccountIDs: [],
+      allowFallback: true,
     }),
-    [requestableOrderIDs],
+    [],
   );
   const routePolicyPreviewRows = useMemo(
     () => buildCodexRoutePolicyPreview(orderedRows, routePolicyDraft),
@@ -159,10 +159,6 @@ export default function CodexAccountListFeature({ sidecarStatus }: CodexAccountL
   );
   const latestRoutingProbeAttempt = routingProbeAttempts[routingProbeAttempts.length - 1] || null;
   const latestRoutingProbeAccountID = latestRoutingProbeAttempt?.accountID || '';
-  const latestRoutingProbeExpectedID = routePolicyPreviewRows[0]?.id || '';
-  const latestRoutingProbeUsedFallback =
-    Boolean(latestRoutingProbeAccountID && latestRoutingProbeExpectedID) &&
-    latestRoutingProbeAccountID !== latestRoutingProbeExpectedID;
   const routingProbeDisabled = !ready || saving || routingProbeRunning || !routingProbeModel.trim();
 
   async function reload(messageOverride?: string) {
@@ -598,26 +594,31 @@ export default function CodexAccountListFeature({ sidecarStatus }: CodexAccountL
           channelOrder: index,
         }));
       const result = main.ChannelRoutingExplainResult.createFrom({
-          channel: 'codex',
-          routeMode: nextConfig.routeMode,
-          selectedAccountID: candidates[0]?.id || '',
-          candidates,
-          filtered: orderedRows
-            .filter((row) => !row.requestable)
-            .map((row) => ({ id: row.id, reason: row.disabled ? 'account-disabled' : 'account-unrequestable' })),
-          steps: [`mode:${nextConfig.routeMode}`, `candidates:${candidates.length}`, 'preview:browser'],
-          snapshotVersion: 'preview',
-          policyVersion: 'channel-routing-v1',
-          shadow: nextConfig.shadowEnabled
-            ? {
-                enabled: true,
-                routeMode: nextConfig.shadowRouteMode,
-                selectedAccountID: candidates[candidates.length - 1]?.id || candidates[0]?.id || '',
-                diff: Boolean(candidates.length > 1),
-                steps: [`mode:${nextConfig.shadowRouteMode}`, `candidates:${candidates.length}`, 'preview:shadow'],
+        channel: 'codex',
+        routeMode: nextConfig.routeMode,
+        selectedAccountID: candidates[0]?.id || '',
+        candidates,
+        filtered: orderedRows
+          .filter((row) => !row.requestable)
+          .map((row) => ({ id: row.id, reason: row.disabled ? 'account-disabled' : 'account-unrequestable' })),
+        steps: [
+          `mode:${nextConfig.routeMode}`,
+          'legacy:compatibility-mask=blocked',
+          `candidates:${candidates.length}`,
+          'preview:browser',
+        ],
+        snapshotVersion: 'preview',
+        policyVersion: 'channel-routing-v1',
+        shadow: nextConfig.shadowEnabled
+          ? {
+              enabled: true,
+              routeMode: nextConfig.shadowRouteMode,
+              selectedAccountID: candidates[candidates.length - 1]?.id || candidates[0]?.id || '',
+              diff: Boolean(candidates.length > 1),
+              steps: [`mode:${nextConfig.shadowRouteMode}`, `candidates:${candidates.length}`, 'preview:shadow'],
             }
-            : undefined,
-        });
+          : undefined,
+      });
       setChannelExplain(result);
       const event = buildPreviewChannelRouteAuditEvent({ channel: 'codex', explain: result });
       setChannelRouteEvents((prev) => (event ? [event, ...prev].slice(0, 5) : prev));
@@ -684,14 +685,7 @@ export default function CodexAccountListFeature({ sidecarStatus }: CodexAccountL
     try {
       const collectedAttempts: CodexRoutingProbeAttemptView[] = [];
       for (let attemptIndex = 0; attemptIndex < safeAttempts; attemptIndex += 1) {
-        const routePolicyInput = {
-          model,
-          attempts: 1,
-          allowAccountIDs: [],
-          denyAccountIDs: [],
-          orderAccountIDs: requestableOrderIDs,
-          allowFallback: false,
-        };
+        const routePolicyInput = buildCodexRoutingProbeRequestInput(model, 1);
         const result = await trackRequest('ProbeCodexAccountRouting', { ...routePolicyInput, index: attemptIndex + 1 }, () =>
           ProbeCodexAccountRouting(
             main.ProbeCodexAccountRoutingInput.createFrom({
@@ -957,7 +951,6 @@ export default function CodexAccountListFeature({ sidecarStatus }: CodexAccountL
           routingProbeDisabled={routingProbeDisabled || routePolicyPreviewRows.length === 0}
           routePolicyPreviewRows={routePolicyPreviewRows}
           routingProbeStreamLines={routingProbeStreamLines}
-          latestUsedFallback={latestRoutingProbeUsedFallback}
           onClose={() => setRouteProbeOpen(false)}
           onModelChange={setRoutingProbeModel}
           onProbeOnce={() => void runRoutingProbe(1)}
diff --git a/frontend/src/features/codex/components/CodexRouteProbeCard.stories.tsx b/frontend/src/features/codex/components/CodexRouteProbeCard.stories.tsx
@@ -173,7 +173,6 @@ function ProbeSample({
         routingProbeDisabled={running}
         routePolicyPreviewRows={visibleRows}
         routingProbeStreamLines={empty ? [] : fallback ? hitLines : idleLines}
-        latestUsedFallback={fallback}
         onClose={() => undefined}
         onModelChange={setModel}
         onProbeOnce={() => undefined}
diff --git a/frontend/src/features/codex/components/CodexRouteProbeCard.tsx b/frontend/src/features/codex/components/CodexRouteProbeCard.tsx
@@ -16,7 +16,6 @@ export function RouteProbeCard({
   routingProbeDisabled,
   routePolicyPreviewRows,
   routingProbeStreamLines,
-  latestUsedFallback,
   onClose,
   onModelChange,
   onProbeOnce,
@@ -36,7 +35,6 @@ export function RouteProbeCard({
     detail: string;
     status: CodexRoutingProbeStreamLineStatus;
   }>;
-  latestUsedFallback: boolean;
   onClose: () => void;
   onModelChange: (value: string) => void;
   onProbeOnce: () => void;
@@ -58,10 +56,8 @@ export function RouteProbeCard({
   const latestHitLine = [...routingProbeStreamLines].reverse().find((line) => line.marker.startsWith('#') && line.status === 'hit');
   const statusLabel = routingProbeRunning
     ? t('codex.account_list_probe_running')
-    : latestUsedFallback
-      ? t('codex.account_list_probe_fallback_hit')
-      : latestHitLine
-        ? latestHitLine.label
+    : latestHitLine
+      ? latestHitLine.label
       : t('codex.account_list_probe_idle');
 
   return (
@@ -92,7 +88,6 @@ export function RouteProbeCard({
               model={resolvedModel}
               candidateCount={routePolicyPreviewRows.length}
               statusLabel={statusLabel}
-              latestUsedFallback={latestUsedFallback}
             />
             <button
               type="button"
@@ -125,7 +120,6 @@ export function RouteProbeCard({
               <RouteProbeCandidateQueue rows={routePolicyPreviewRows} t={t} />
               <RouteProbeTerminal
                 lines={routingProbeStreamLines}
-                latestUsedFallback={latestUsedFallback}
                 t={t}
               />
             </div>
@@ -141,24 +135,17 @@ function ProbeStatusBar({
   model,
   candidateCount,
   statusLabel,
-  latestUsedFallback,
 }: {
   t: (key: string) => string;
   model: string;
   candidateCount: number;
   statusLabel: string;
-  latestUsedFallback: boolean;
 }) {
   return (
     <div className="hidden min-w-[28rem] grid-cols-[minmax(0,1.25fr)_7rem_minmax(0,1fr)] border-2 border-[var(--border-color)] bg-[var(--bg-main)] lg:grid">
       <ProbeMetric label={t('codex.account_list_probe_model')} value={model} />
       <ProbeMetric label={t('codex.account_list_policy_preview_count')} value={String(candidateCount).padStart(2, '0')} />
-      <ProbeMetric
-        label={t('codex.account_list_probe_result')}
-        value={statusLabel}
-        tone={latestUsedFallback ? 'critical' : 'neutral'}
-        last
-      />
+      <ProbeMetric label={t('codex.account_list_probe_result')} value={statusLabel} tone="neutral" last />
     </div>
   );
 }
@@ -321,7 +308,6 @@ function RouteProbeCandidateQueue({ rows, t }: { rows: CodexAccountRow[]; t: (ke
 
 function RouteProbeTerminal({
   lines,
-  latestUsedFallback,
   t,
 }: {
   lines: Array<{
@@ -331,7 +317,6 @@ function RouteProbeTerminal({
     detail: string;
     status: CodexRoutingProbeStreamLineStatus;
   }>;
-  latestUsedFallback: boolean;
   t: (key: string) => string;
 }) {
   return (
@@ -341,11 +326,6 @@ function RouteProbeTerminal({
           <Terminal className="h-3.5 w-3.5" strokeWidth={3} />
           {t('codex.account_list_probe_terminal')}
         </div>
-        {latestUsedFallback ? (
-          <div className="border-2 border-[var(--accent-red)] bg-[color-mix(in_srgb,var(--color-status-danger)_10%,transparent)] px-2 py-1 text-[length:var(--font-size-ui-xs)] font-black uppercase tracking-wide text-[var(--accent-red)]">
-            {t('codex.account_list_probe_fallback_hit')}
-          </div>
-        ) : null}
       </div>
       <div className="max-h-[22rem] min-h-[13rem] overflow-auto bg-[var(--bg-main)] py-3 font-mono text-[length:var(--font-size-ui-md-compact)] font-black leading-6 text-[var(--text-primary)]">
         {lines.length === 0 ? (
diff --git a/frontend/src/features/codex/model/codexAccountList.ts b/frontend/src/features/codex/model/codexAccountList.ts
@@ -18,6 +18,7 @@ export {
   buildCodexRoutePolicyPreview,
   buildCodexRoutePolicyRowStates,
   buildCodexRoutePolicySummary,
+  buildCodexRoutingProbeRequestInput,
   buildCodexRoutingProbeModelOptions,
   buildCodexRoutingProbeStreamLines,
   DEFAULT_CODEX_ROUTING_PROBE_MODEL,
diff --git a/frontend/src/features/codex/model/codexRoutePolicy.ts b/frontend/src/features/codex/model/codexRoutePolicy.ts
@@ -18,6 +18,17 @@ export interface CodexRoutePolicyDraft {
   allowFallback: boolean;
 }
 
+export function buildCodexRoutingProbeRequestInput(model: string, attempts: number) {
+  return {
+    model: String(model || '').trim(),
+    attempts: Math.max(1, Math.min(5, Number.isFinite(attempts) ? attempts : 1)),
+    allowAccountIDs: [],
+    denyAccountIDs: [],
+    orderAccountIDs: [],
+    allowFallback: false,
+  };
+}
+
 export type CodexRoutePolicyRowMode = 'default' | 'allow' | 'deny' | 'blocked';
 
 export interface CodexRoutePolicyRowState {
diff --git a/internal/wailsapp/channel_routing.go b/internal/wailsapp/channel_routing.go
@@ -306,6 +306,7 @@ func explainChannelRoutingWithRuntime(accounts []accountsdomain.AccountRecord, c
 func explainNormalizedChannelRouting(accounts []accountsdomain.AccountRecord, normalized ChannelRoutingConfig, input ChannelRoutingExplainInput, meta ChannelRoutingConfigMeta, runtimeStates map[string]ChannelAccountRuntimeState) ChannelRoutingExplainResult {
 	mode := normalized.RouteMode
 	steps := []string{"mode:" + string(mode)}
+	steps = appendChannelRoutingLegacyCompatibilitySteps(steps, normalized.Channel)
 	scope := channelRouteScope{}
 	if mode == ChannelRouteModeProject {
 		binding, ok := matchChannelProjectBinding(normalized.ProjectBindings, input.ProjectName)
@@ -365,6 +366,18 @@ func decideChannelRoute(accounts []accountsdomain.AccountRecord, cfg ChannelRout
 	}
 }
 
+func appendChannelRoutingLegacyCompatibilitySteps(steps []string, channel string) []string {
+	if strings.TrimSpace(channel) != "codex" {
+		return steps
+	}
+	return append(
+		steps,
+		"legacy:session-affinity=blocked",
+		"legacy:websocket-pin=blocked",
+		"legacy:route-order-header=ignored",
+	)
+}
+
 func buildChannelRouteablePool(accounts []accountsdomain.AccountRecord, cfg ChannelRoutingConfig, input ChannelRoutingExplainInput, scope channelRouteScope, runtimeStates map[string]ChannelAccountRuntimeState) ([]channelRouteCandidate, []ChannelRoutingFilteredAccount) {
 	groupLookup := channelAccountGroupLookup(cfg.AccountGroups, cfg.ChannelGroupStates)
 	groupMembership := channelAccountGroupMembership(groupLookup)
diff --git a/internal/wailsapp/channel_routing_test.go b/internal/wailsapp/channel_routing_test.go
@@ -156,6 +156,9 @@ func TestExplainChannelRoutingBalancedUsesActiveSessionsThenSortOrder(t *testing
 	if result.SelectedAccountID != "auth-file:b.json" {
 		t.Fatalf("SelectedAccountID = %q, want auth-file:b.json", result.SelectedAccountID)
 	}
+	assertStepContains(t, result.Steps, "legacy:session-affinity=blocked")
+	assertStepContains(t, result.Steps, "legacy:websocket-pin=blocked")
+	assertStepContains(t, result.Steps, "legacy:route-order-header=ignored")
 }
 
 func TestExplainChannelRoutingDisabledStickyInvalidatesAndFallsBack(t *testing.T) {
diff --git a/internal/wailsapp/claude_code_routing_probe_test.go b/internal/wailsapp/claude_code_routing_probe_test.go
@@ -71,8 +71,8 @@ func TestProbeClaudeCodeAccountRoutingSendsAnthropicMessagesRequestAndRouteHeade
 		if got := headers["X-GetTokens-Route-Allow"]; got != expectedRouteID {
 			t.Fatalf("allow header = %q, want %q", got, expectedRouteID)
 		}
-		if got := headers["X-GetTokens-Route-Order"]; got != expectedRouteID {
-			t.Fatalf("order header = %q, want %q", got, expectedRouteID)
+		if got := headers["X-GetTokens-Route-Order"]; got != "" {
+			t.Fatalf("order header = %q, want empty", got)
 		}
 		if got := headers["X-GetTokens-Route-Fallback"]; got != "false" {
 			t.Fatalf("fallback header = %q, want false", got)
diff --git a/internal/wailsapp/codex_routing_probe.go b/internal/wailsapp/codex_routing_probe.go
@@ -62,7 +62,6 @@ type codexRoutingRecentBucket struct {
 const (
 	codexRouteAllowHeader    = "X-GetTokens-Route-Allow"
 	codexRouteDenyHeader     = "X-GetTokens-Route-Deny"
-	codexRouteOrderHeader    = "X-GetTokens-Route-Order"
 	codexRouteFallbackHeader = "X-GetTokens-Route-Fallback"
 )
 
@@ -251,8 +250,7 @@ func buildCodexRoutingRouteHeaders(input ProbeCodexAccountRoutingInput, candidat
 
 	allowIDs := resolveCodexRoutingRouteIDs(input.AllowAccountIDs, routeIDByAccountID)
 	denyIDs := resolveCodexRoutingRouteIDs(input.DenyAccountIDs, routeIDByAccountID)
-	orderIDs := resolveCodexRoutingRouteIDs(input.OrderAccountIDs, routeIDByAccountID)
-	if len(allowIDs) == 0 && len(denyIDs) == 0 && len(orderIDs) == 0 {
+	if len(allowIDs) == 0 && len(denyIDs) == 0 {
 		return nil
 	}
 
@@ -263,14 +261,7 @@ func buildCodexRoutingRouteHeaders(input ProbeCodexAccountRoutingInput, candidat
 	if len(denyIDs) > 0 {
 		headers[codexRouteDenyHeader] = strings.Join(denyIDs, ",")
 	}
-	if len(orderIDs) > 0 {
-		headers[codexRouteOrderHeader] = strings.Join(orderIDs, ",")
-	}
-	if input.AllowFallback {
-		headers[codexRouteFallbackHeader] = "true"
-	} else {
-		headers[codexRouteFallbackHeader] = "false"
-	}
+	headers[codexRouteFallbackHeader] = "false"
 	return headers
 }
 
diff --git a/internal/wailsapp/codex_routing_probe_test.go b/internal/wailsapp/codex_routing_probe_test.go

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,9 @@ func TestExplainChannelRoutingBalancedUsesActiveSessionsThenSortOrder(t *testing`
`156`	`156`	`if result.SelectedAccountID != "auth-file:b.json" {`
`157`	`157`	`t.Fatalf("SelectedAccountID = %q, want auth-file:b.json", result.SelectedAccountID)`
`158`	`158`	`}`
	`159`	`+ assertStepContains(t, result.Steps, "legacy:session-affinity=blocked")`
	`160`	`+ assertStepContains(t, result.Steps, "legacy:websocket-pin=blocked")`
	`161`	`+ assertStepContains(t, result.Steps, "legacy:route-order-header=ignored")`
`159`	`162`	`}`
`160`	`163`
`161`	`164`	`func TestExplainChannelRoutingDisabledStickyInvalidatesAndFallsBack(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ func TestProbeClaudeCodeAccountRoutingSendsAnthropicMessagesRequestAndRouteHeade`
`71`	`71`	`if got := headers["X-GetTokens-Route-Allow"]; got != expectedRouteID {`
`72`	`72`	`t.Fatalf("allow header = %q, want %q", got, expectedRouteID)`
`73`	`73`	`}`
`74`		`- if got := headers["X-GetTokens-Route-Order"]; got != expectedRouteID {`
`75`		`- t.Fatalf("order header = %q, want %q", got, expectedRouteID)`
	`74`	`+ if got := headers["X-GetTokens-Route-Order"]; got != "" {`
	`75`	`+ t.Fatalf("order header = %q, want empty", got)`
`76`	`76`	`}`
`77`	`77`	`if got := headers["X-GetTokens-Route-Fallback"]; got != "false" {`
`78`	`78`	`t.Fatalf("fallback header = %q, want false", got)`