From 98e776348e87574920684460ea2813cd9a8ea1ce Mon Sep 17 00:00:00 2001
From: QLHazyCoder <2825305047@qq.com>
Date: Tue, 19 May 2026 11:34:06 +0800
Subject: [PATCH] Reorder Plus access strategy setting

---
 shared/flow-registry.js                     |  2 +-
 sidepanel/sidepanel.html                    | 20 ++++++++++----------
 tests/flow-registry-settings-schema.test.js |  2 +-
 tests/sidepanel-paypal-manager.test.js      |  6 ++++++
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/shared/flow-registry.js b/shared/flow-registry.js
index d917f7f..2bdda8d 100644
--- a/shared/flow-registry.js
+++ b/shared/flow-registry.js
@@ -336,7 +336,7 @@
     'openai-plus': {
       id: 'openai-plus',
       label: 'Plus',
-      rowIds: ['row-plus-mode', 'row-plus-payment-method', 'row-plus-account-access-strategy'],
+      rowIds: ['row-plus-mode', 'row-plus-account-access-strategy', 'row-plus-payment-method'],
     },
     'openai-phone': {
       id: 'openai-phone',
diff --git a/sidepanel/sidepanel.html b/sidepanel/sidepanel.html
index e0b453e..6681883 100644
--- a/sidepanel/sidepanel.html
+++ b/sidepanel/sidepanel.html
@@ -301,6 +301,16 @@
           <span class="setting-caption">Plus 订阅链路</span>
         </div>
       </div>
+      <div class="data-row" id="row-plus-account-access-strategy" style="display:none;">
+        <span class="data-label">账号接入策略</span>
+        <div class="data-inline">
+          <select id="select-plus-account-access-strategy" class="data-select">
+            <option value="oauth">OAuth</option>
+            <option value="sub2api_codex_session">导入当前 ChatGPT 会话到 SUB2API</option>
+          </select>
+          <span class="setting-caption" id="plus-account-access-strategy-caption">当前来源仅支持 OAuth</span>
+        </div>
+      </div>
       <div class="data-row" id="row-plus-payment-method" style="display:none;">
         <span class="data-label">Plus 支付</span>
         <div class="data-inline">
@@ -313,16 +323,6 @@
           <span class="setting-caption" id="plus-payment-method-caption">PayPal 订阅链路</span>
         </div>
       </div>
-      <div class="data-row" id="row-plus-account-access-strategy" style="display:none;">
-        <span class="data-label">账号接入策略</span>
-        <div class="data-inline">
-          <select id="select-plus-account-access-strategy" class="data-select">
-            <option value="oauth">OAuth</option>
-            <option value="sub2api_codex_session">导入当前 ChatGPT 会话到 SUB2API</option>
-          </select>
-          <span class="setting-caption" id="plus-account-access-strategy-caption">当前来源仅支持 OAuth</span>
-        </div>
-      </div>
       <div class="data-row" id="row-paypal-account" style="display:none;">
         <span class="data-label">PayPal 账号</span>
         <div class="data-inline">
diff --git a/tests/flow-registry-settings-schema.test.js b/tests/flow-registry-settings-schema.test.js
index c509678..95fe10f 100644
--- a/tests/flow-registry-settings-schema.test.js
+++ b/tests/flow-registry-settings-schema.test.js
@@ -36,7 +36,7 @@ test('flow registry exposes canonical flow and target metadata', () => {
   );
   assert.deepEqual(
     flowRegistry.getSettingsGroupDefinition('openai-plus')?.rowIds,
-    ['row-plus-mode', 'row-plus-payment-method', 'row-plus-account-access-strategy']
+    ['row-plus-mode', 'row-plus-account-access-strategy', 'row-plus-payment-method']
   );
   assert.equal(flowRegistry.getPublicationTargetDefinition('kiro', 'kiro-rs')?.label, 'kiro.rs');
 });
diff --git a/tests/sidepanel-paypal-manager.test.js b/tests/sidepanel-paypal-manager.test.js
index 73281a7..683caca 100644
--- a/tests/sidepanel-paypal-manager.test.js
+++ b/tests/sidepanel-paypal-manager.test.js
@@ -20,8 +20,14 @@ test('sidepanel loads reusable form dialog and paypal manager before sidepanel b
 
 test('sidepanel html contains paypal select and GoPay controls', () => {
   const html = fs.readFileSync('sidepanel/sidepanel.html', 'utf8');
+  const plusAccountAccessStrategyIndex = html.indexOf('id="row-plus-account-access-strategy"');
+  const plusPaymentMethodIndex = html.indexOf('id="row-plus-payment-method"');
 
   assert.match(html, /id="row-plus-payment-method"/);
+  assert.match(html, /id="row-plus-account-access-strategy"/);
+  assert.notEqual(plusAccountAccessStrategyIndex, -1);
+  assert.notEqual(plusPaymentMethodIndex, -1);
+  assert.ok(plusAccountAccessStrategyIndex < plusPaymentMethodIndex);
   assert.match(html, /id="select-plus-payment-method"/);
   assert.match(html, /id="row-paypal-account"/);
   assert.match(html, /id="select-paypal-account"/);