Merge pull request #23 from FuugaMo/auto-fix/issue-22-chatgpt-turn-fallback

fix: ChatGPT 会话回合检测增加 fallback 选择器

Author: FuugaMo

.github/workflows/codex-trigger.yml

@@ -2,7 +2,7 @@ name: Trigger Codex Review
 
 on:
   pull_request:
-    types: [opened, reopened]
+    types: [opened, reopened, labeled, synchronize]
 
 jobs:
   trigger:
@@ -13,9 +13,26 @@ jobs:
         with:
           github-token: ${{ secrets.FUUGAMO_PAT }}
           script: |
+            const prNumber = context.payload.pull_request.number;
+            const pingText = '@codex Please review this PR. If you find no critical issues, reply with "LGTM". If you find critical issues, describe them clearly.';
+
+            // 去重：如果已存在相同触发评论则跳过，避免重复@codex
+            const { data: comments } = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              per_page: 100,
+            });
+
+            const alreadyPinged = comments.some(c => (c.body || '').includes(pingText));
+            if (alreadyPinged) {
+              core.info('Codex already pinged on this PR, skip duplicate comment.');
+              return;
+            }
+
             await github.rest.issues.createComment({
               owner: context.repo.owner,
-              repo:  context.repo.repo,
-              issue_number: context.payload.pull_request.number,
-              body: '@codex Please review this PR. If you find no critical issues, reply with "LGTM". If you find critical issues, describe them clearly.',
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              body: pingText,
             });

content.js

@@ -21,6 +21,8 @@
       chatgpt: {
         turns: [
           "article[data-testid^='conversation-turn-']",
+          "[data-testid='conversation-turn']",
+          '[data-message-author-role]',
           '[data-message-id]',
         ],
         turnRoleAttr: 'data-turn',
@@ -556,10 +558,25 @@ function makePathEntry(turn) {
   }
 
   function readChatGPTTurns() {
-    const turns = [...document.querySelectorAll('article[data-testid^="conversation-turn-"]')];
+    let turns = [...document.querySelectorAll('article[data-testid^="conversation-turn-"]')];
+
+    if (!turns.length) {
+      const fallbackSelectors = [
+        "[data-testid='conversation-turn']",
+        '[data-message-author-role]',
+        'main article',
+      ];
+      const candidates = dedupeElements(fallbackSelectors.flatMap(sel => [...document.querySelectorAll(sel)]))
+        .filter(el => isReadableTurnCandidate(el, { minText: 2 }));
+      turns = candidates
+        .filter(el => !candidates.some(other => other !== el && other.contains(el)))
+        .sort((a, b) => rectTop(a) - rectTop(b));
+    }
+
     return turns.map((turn, idx) => {
-      const role   = turn.getAttribute('data-turn') === 'user' ? 'user' : 'assistant';
-      const msgDiv = turn.querySelector('[data-message-id]');
+      const roleAttr = turn.getAttribute('data-turn') || turn.getAttribute('data-message-author-role') || '';
+      const role   = /^user$/i.test(roleAttr) ? 'user' : 'assistant';
+      const msgDiv = turn.matches('[data-message-id]') ? turn : turn.querySelector('[data-message-id]');
       const msgId  = msgDiv?.getAttribute('data-message-id') || turn.getAttribute('data-turn-id') || null;
       const nav    = findChatGPTBranchNav(turn);
       return {
@@ -1007,17 +1024,28 @@ function makePathEntry(turn) {
     return false;
   }
 
+  function isLikelyChatConversationPage() {
+    try {
+      const path = new URL(location.href).pathname || '';
+      return path.includes('/c/');
+    } catch (_) {
+      return (location.pathname || '').includes('/c/');
+    }
+  }
+
   function syncStateToPanel(force = false) {
     const turns = serializeTurns(readRawTurns());
     if (!turns.length) {
       if (pageSeemsLoading()) {
         sendToPanel({ type: 'CONVERSATION_LOADING' });
         return;
       }
-      maybeReportBreakage('no_turns_detected', {
-        phase: 'sync',
-        force,
-      });
+      if (isLikelyChatConversationPage()) {
+        maybeReportBreakage('no_turns_detected', {
+          phase: 'sync',
+          force,
+        });
+      }
       sendToPanel({ type: 'CONVERSATION_LOADING' });
       return;
     }

selectors.json

@@ -1,10 +1,12 @@
 {
-  "version": "0.3.0",
+  "version": "0.3.1",
   "lastVerified": "2026-03-11",
   "platforms": {
     "chatgpt": {
       "turns": [
         "article[data-testid^='conversation-turn-']",
+        "[data-testid='conversation-turn']",
+        "[data-message-author-role]",
         "[data-message-id]"
       ],
       "turnRoleAttr": "data-turn",