chore: sync gemini-cli v0.1.19

packages/core/src/services/loopDetectionService.test.ts

@@ -202,6 +202,80 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
+    it('should not detect loops when content transitions into a code block', () => {
+      service.reset('');
+      const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
+
+      // Add some repetitive content outside of code block
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 2; i++) {
+        service.addAndCheck(createContentEvent(repeatedContent));
+      }
+
+      // Now transition into a code block - this should prevent loop detection
+      // even though we were already close to the threshold
+      const codeBlockStart = '```javascript\n';
+      const isLoop = service.addAndCheck(createContentEvent(codeBlockStart));
+      expect(isLoop).toBe(false);
+
+      // Continue adding repetitive content inside the code block - should not trigger loop
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
+        const isLoopInside = service.addAndCheck(
+          createContentEvent(repeatedContent),
+        );
+        expect(isLoopInside).toBe(false);
+      }
+
+      expect(loggers.logLoopDetected).not.toHaveBeenCalled();
+    });
+
+    it('should skip loop detection when already inside a code block (this.inCodeBlock)', () => {
+      service.reset('');
+
+      // Start with content that puts us inside a code block
+      service.addAndCheck(createContentEvent('Here is some code:\n```\n'));
+
+      // Verify we are now inside a code block and any content should be ignored for loop detection
+      const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD + 5; i++) {
+        const isLoop = service.addAndCheck(createContentEvent(repeatedContent));
+        expect(isLoop).toBe(false);
+      }
+
+      expect(loggers.logLoopDetected).not.toHaveBeenCalled();
+    });
+
+    it('should correctly track inCodeBlock state with multiple fence transitions', () => {
+      service.reset('');
+      const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
+
+      // Outside code block - should track content
+      service.addAndCheck(createContentEvent('Normal text '));
+
+      // Enter code block (1 fence) - should stop tracking
+      const enterResult = service.addAndCheck(createContentEvent('```\n'));
+      expect(enterResult).toBe(false);
+
+      // Inside code block - should not track loops
+      for (let i = 0; i < 5; i++) {
+        const insideResult = service.addAndCheck(
+          createContentEvent(repeatedContent),
+        );
+        expect(insideResult).toBe(false);
+      }
+
+      // Exit code block (2nd fence) - should reset tracking but still return false
+      const exitResult = service.addAndCheck(createContentEvent('```\n'));
+      expect(exitResult).toBe(false);
+
+      // Enter code block again (3rd fence) - should stop tracking again
+      const reenterResult = service.addAndCheck(
+        createContentEvent('```python\n'),
+      );
+      expect(reenterResult).toBe(false);
+
+      expect(loggers.logLoopDetected).not.toHaveBeenCalled();
+    });
+
     it('should detect a loop when repetitive content is outside a code block', () => {
       service.reset('');
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
@@ -281,6 +355,200 @@ describe('LoopDetectionService', () => {
         expect(isLoop).toBe(false);
       }
 
+      expect(loggers.logLoopDetected).not.toHaveBeenCalled();
+    });
+    it('should reset tracking when a table is detected', () => {
+      service.reset('');
+      const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
+
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+        service.addAndCheck(createContentEvent(repeatedContent));
+      }
+
+      // This should reset tracking and not trigger a loop
+      service.addAndCheck(createContentEvent('| Column 1 | Column 2 |'));
+
+      // Add more repeated content after table - should not trigger loop
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+        const isLoop = service.addAndCheck(createContentEvent(repeatedContent));
+        expect(isLoop).toBe(false);
+      }
+
+      expect(loggers.logLoopDetected).not.toHaveBeenCalled();
+    });
+
+    it('should reset tracking when a list item is detected', () => {
+      service.reset('');
+      const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
+
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+        service.addAndCheck(createContentEvent(repeatedContent));
+      }
+
+      // This should reset tracking and not trigger a loop
+      service.addAndCheck(createContentEvent('* List item'));
+
+      // Add more repeated content after list - should not trigger loop
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+        const isLoop = service.addAndCheck(createContentEvent(repeatedContent));
+        expect(isLoop).toBe(false);
+      }
+
+      expect(loggers.logLoopDetected).not.toHaveBeenCalled();
+    });
+
+    it('should reset tracking when a heading is detected', () => {
+      service.reset('');
+      const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
+
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+        service.addAndCheck(createContentEvent(repeatedContent));
+      }
+
+      // This should reset tracking and not trigger a loop
+      service.addAndCheck(createContentEvent('## Heading'));
+
+      // Add more repeated content after heading - should not trigger loop
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+        const isLoop = service.addAndCheck(createContentEvent(repeatedContent));
+        expect(isLoop).toBe(false);
+      }
+
+      expect(loggers.logLoopDetected).not.toHaveBeenCalled();
+    });
+
+    it('should reset tracking when a blockquote is detected', () => {
+      service.reset('');
+      const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
+
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+        service.addAndCheck(createContentEvent(repeatedContent));
+      }
+
+      // This should reset tracking and not trigger a loop
+      service.addAndCheck(createContentEvent('> Quote text'));
+
+      // Add more repeated content after blockquote - should not trigger loop
+      for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+        const isLoop = service.addAndCheck(createContentEvent(repeatedContent));
+        expect(isLoop).toBe(false);
+      }
+
+      expect(loggers.logLoopDetected).not.toHaveBeenCalled();
+    });
+
+    it('should reset tracking for various list item formats', () => {
+      const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
+
+      // Test different list formats - make sure they start at beginning of line
+      const listFormats = [
+        '* Bullet item',
+        '- Dash item',
+        '+ Plus item',
+        '1. Numbered item',
+        '42. Another numbered item',
+      ];
+
+      listFormats.forEach((listFormat, index) => {
+        service.reset('');
+
+        // Build up to near threshold
+        for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+          service.addAndCheck(createContentEvent(repeatedContent));
+        }
+
+        // Reset should occur with list item - add newline to ensure it starts at beginning
+        service.addAndCheck(createContentEvent('\n' + listFormat));
+
+        // Should not trigger loop after reset - use different content to avoid any cached state issues
+        const newRepeatedContent = createRepetitiveContent(
+          index + 100,
+          CONTENT_CHUNK_SIZE,
+        );
+        for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+          const isLoop = service.addAndCheck(
+            createContentEvent(newRepeatedContent),
+          );
+          expect(isLoop).toBe(false);
+        }
+      });
+
+      expect(loggers.logLoopDetected).not.toHaveBeenCalled();
+    });
+
+    it('should reset tracking for various table formats', () => {
+      const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
+
+      const tableFormats = [
+        '| Column 1 | Column 2 |',
+        '|---|---|',
+        '|++|++|',
+        '+---+---+',
+      ];
+
+      tableFormats.forEach((tableFormat, index) => {
+        service.reset('');
+
+        // Build up to near threshold
+        for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+          service.addAndCheck(createContentEvent(repeatedContent));
+        }
+
+        // Reset should occur with table format - add newline to ensure it starts at beginning
+        service.addAndCheck(createContentEvent('\n' + tableFormat));
+
+        // Should not trigger loop after reset - use different content to avoid any cached state issues
+        const newRepeatedContent = createRepetitiveContent(
+          index + 200,
+          CONTENT_CHUNK_SIZE,
+        );
+        for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+          const isLoop = service.addAndCheck(
+            createContentEvent(newRepeatedContent),
+          );
+          expect(isLoop).toBe(false);
+        }
+      });
+
+      expect(loggers.logLoopDetected).not.toHaveBeenCalled();
+    });
+
+    it('should reset tracking for various heading levels', () => {
+      const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
+
+      const headingFormats = [
+        '# H1 Heading',
+        '## H2 Heading',
+        '### H3 Heading',
+        '#### H4 Heading',
+        '##### H5 Heading',
+        '###### H6 Heading',
+      ];
+
+      headingFormats.forEach((headingFormat, index) => {
+        service.reset('');
+
+        // Build up to near threshold
+        for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+          service.addAndCheck(createContentEvent(repeatedContent));
+        }
+
+        // Reset should occur with heading - add newline to ensure it starts at beginning
+        service.addAndCheck(createContentEvent('\n' + headingFormat));
+
+        // Should not trigger loop after reset - use different content to avoid any cached state issues
+        const newRepeatedContent = createRepetitiveContent(
+          index + 300,
+          CONTENT_CHUNK_SIZE,
+        );
+        for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
+          const isLoop = service.addAndCheck(
+            createContentEvent(newRepeatedContent),
+          );
+          expect(isLoop).toBe(false);
+        }
+      });
+
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
   });