From 30aae1bbeb89b3d7a2a8e9279b250e90d40cb585 Mon Sep 17 00:00:00 2001
From: QLHazyCoder <2825305047@qq.com>
Date: Fri, 29 May 2026 15:04:04 +0800
Subject: [PATCH] fix: collapse repeated GPC running logs

---
 .../background/steps/fill-plus-checkout.js    | 54 +++++++++++++++----
 ...us-checkout-billing-tab-resolution.test.js | 22 ++++++++
 2 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/flows/openai/background/steps/fill-plus-checkout.js b/flows/openai/background/steps/fill-plus-checkout.js
index 75dcf65..021042f 100644
--- a/flows/openai/background/steps/fill-plus-checkout.js
+++ b/flows/openai/background/steps/fill-plus-checkout.js
@@ -408,29 +408,58 @@
 
       const deadline = Date.now() + getGpcPageTimeoutMs(state);
       let startAttempts = 0;
-      let lastSignature = '';
       let hasClickedStart = false;
+      let pendingStatusKey = '';
+      let pendingStatusLabel = '';
+      let pendingStatusLevel = 'info';
+      let pendingStatusCount = 0;
+
+      const flushPendingStatusLog = async () => {
+        if (!pendingStatusKey || !pendingStatusCount) {
+          return;
+        }
+        const countSuffix = pendingStatusCount > 1 ? ` ×${pendingStatusCount}` : '';
+        await addLog(`步骤 7：GPC 页面状态：${pendingStatusLabel}${countSuffix}`, pendingStatusLevel);
+        pendingStatusKey = '';
+        pendingStatusLabel = '';
+        pendingStatusLevel = 'info';
+        pendingStatusCount = 0;
+      };
+
+      const collectStatusLog = async (pageState, currentButtonText) => {
+        const statusLabel = `${currentButtonText || '未识别按钮'}${pageState.hasSubscriptionDone ? ' / 订阅完成' : ''}`;
+        const statusKey = [
+          currentButtonText || '',
+          pageState.hasSubscriptionDone ? 'done' : '',
+          pageState.noTrial ? 'no-trial' : '',
+          pageState.isCardModeActive ? 'card' : 'not-card',
+          pageState.startButtonDisabled ? 'disabled' : '',
+        ].join('|');
+        const statusLevel = pageState.hasSubscriptionDone ? 'ok' : 'info';
+        if (statusKey === pendingStatusKey) {
+          pendingStatusCount += 1;
+          return;
+        }
+        await flushPendingStatusLog();
+        pendingStatusKey = statusKey;
+        pendingStatusLabel = statusLabel;
+        pendingStatusLevel = statusLevel;
+        pendingStatusCount = 1;
+      };
 
       while (Date.now() <= deadline) {
         throwIfStopped();
         const pageState = await inspectGpcPortalPage(tabId);
         const buttonText = normalizeText(pageState.startButtonText);
-        const logText = String(pageState.logText || pageState.bodyText || '');
-        const signature = `${buttonText}|${pageState.hasSubscriptionDone ? 'done' : ''}|${pageState.noTrial ? 'no-trial' : ''}|${logText.slice(-300)}`;
-
-        if (signature && signature !== lastSignature) {
-          lastSignature = signature;
-          await addLog(
-            `步骤 7：GPC 页面状态：${buttonText || '未识别按钮'}${pageState.hasSubscriptionDone ? ' / 订阅完成' : ''}`,
-            pageState.hasSubscriptionDone ? 'ok' : 'info'
-          );
-        }
+        await collectStatusLog(pageState, buttonText);
 
         if (pageState.noTrial) {
+          await flushPendingStatusLog();
           throw new Error('PLUS_CHECKOUT_NON_FREE_TRIAL::步骤 7：该账户没有试用资格，当前轮 GPC 充值失败。');
         }
 
         if (pageState.hasSubscriptionDone && /开始\s*Plus\s*充值/.test(buttonText)) {
+          await flushPendingStatusLog();
           await setState({
             plusCheckoutSource: PLUS_PAYMENT_METHOD_GPC_HELPER,
             gpcPageStatus: 'completed',
@@ -449,6 +478,7 @@
         }
 
         if (!pageState.isCardModeActive) {
+          await flushPendingStatusLog();
           let modeResult = null;
           for (let attempt = 1; attempt <= 8; attempt += 1) {
             modeResult = await ensureGpcCardMode(tabId);
@@ -474,6 +504,7 @@
         }
 
         if (/开始\s*Plus\s*充值/.test(buttonText) && !pageState.startButtonDisabled) {
+          await flushPendingStatusLog();
           if (startAttempts >= GPC_PAGE_MAX_START_ATTEMPTS) {
             throw new Error(`GPC_PAGE_FLOW_ENDED::步骤 7：GPC 页面已尝试启动 ${startAttempts} 次仍未显示订阅完成。`);
           }
@@ -502,6 +533,7 @@
         await sleepWithStop(GPC_PAGE_POLL_INTERVAL_MS);
       }
 
+      await flushPendingStatusLog();
       throw new Error('GPC_PAGE_FLOW_ENDED::步骤 7：GPC 页面等待超时，未检测到订阅完成。');
     }
 
diff --git a/tests/plus-checkout-billing-tab-resolution.test.js b/tests/plus-checkout-billing-tab-resolution.test.js
index f4ef460..8bea27f 100644
--- a/tests/plus-checkout-billing-tab-resolution.test.js
+++ b/tests/plus-checkout-billing-tab-resolution.test.js
@@ -1074,6 +1074,28 @@ test('GPC billing restarts when start button returns without subscription done',
   assert.equal(events.completed.length, 1);
 });
 
+test('GPC billing collapses repeated running status logs with a multiplier', async () => {
+  const { events, executor, pageHarness } = createGpcPageExecutorHarness([
+    { startButtonText: '开始 Plus 充值', logText: 'SYSTEM 页面已就绪' },
+    { startButtonText: '任务进行中', logText: '处理中 1' },
+    { startButtonText: '任务进行中', logText: '处理中 2' },
+    { startButtonText: '任务进行中', logText: '处理中 3' },
+    { startButtonText: '开始 Plus 充值', logText: '订阅完成', hasSubscriptionDone: true },
+  ]);
+
+  await executor.executePlusCheckoutBilling({
+    plusPaymentMethod: 'gpc-helper',
+    plusCheckoutSource: 'gpc-helper',
+    plusCheckoutTabId: 77,
+  });
+
+  const runningStatusLogs = events.logs.filter((entry) => /GPC 页面状态：任务进行中/.test(entry.message));
+  assert.equal(pageHarness.clicks.length, 1);
+  assert.equal(runningStatusLogs.length, 1);
+  assert.match(runningStatusLogs[0].message, /任务进行中 ×3/);
+  assert.equal(events.completed.length, 1);
+});
+
 test('GPC billing fails current round without restart when account has no trial eligibility', async () => {
   const { events, executor, pageHarness } = createGpcPageExecutorHarness([
     { startButtonText: '开始 Plus 充值', logText: '该账户没有试用资格', noTrial: true },