From e1d1e7ef3086d525f8a37ec708441de52a41e9c9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 17 Sep 2025 14:43:58 -0700
Subject: [PATCH 1/6] Add a `StrippedLocation` interface and pipe it through
 the CommentEnhancers.

---
 browser-extension/src/lib/enhancer.ts         | 11 +++++++++-
 .../lib/enhancers/CommentEnhancerMissing.tsx  |  4 ++--
 .../github/githubIssueAddComment.tsx          | 17 +++++++++-------
 .../github/githubIssueNewComment.tsx          | 17 +++++++++-------
 .../enhancers/github/githubPRAddComment.tsx   | 20 +++++++++----------
 .../enhancers/github/githubPRNewComment.tsx   | 17 +++++++++-------
 6 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/browser-extension/src/lib/enhancer.ts b/browser-extension/src/lib/enhancer.ts
index 5c9e95b..168bcf5 100644
--- a/browser-extension/src/lib/enhancer.ts
+++ b/browser-extension/src/lib/enhancer.ts
@@ -19,6 +19,15 @@ export interface CommentEvent {
   draft?: string
 }
 
+/**
+ * Minimal location information that enhancers need for routing decisions.
+ * Avoids dependency on global window/location objects for better testability.
+ */
+export interface StrippedLocation {
+  domain: string
+  pathname: string
+}
+
 /** Wraps the textareas of a given platform with Gitcasso's enhancements. */
 export interface CommentEnhancer<Spot extends CommentSpot = CommentSpot> {
   /** Guarantees to only return a type within this list. */
@@ -27,7 +36,7 @@ export interface CommentEnhancer<Spot extends CommentSpot = CommentSpot> {
    * Whenever a new `textarea` is added to any webpage, this method is called.
    * If we return non-null, then we become the handler for that text area.
    */
-  tryToEnhance(textarea: HTMLTextAreaElement): Spot | null
+  tryToEnhance(textarea: HTMLTextAreaElement, location: StrippedLocation): Spot | null
   /** This gets called the first time that `tryToEnhance` returns non-null. */
   prepareForFirstEnhancement(): void
   /**
diff --git a/browser-extension/src/lib/enhancers/CommentEnhancerMissing.tsx b/browser-extension/src/lib/enhancers/CommentEnhancerMissing.tsx
index a470feb..f59a6e6 100644
--- a/browser-extension/src/lib/enhancers/CommentEnhancerMissing.tsx
+++ b/browser-extension/src/lib/enhancers/CommentEnhancerMissing.tsx
@@ -1,6 +1,6 @@
 import type { OverTypeInstance } from 'overtype'
 import type { ReactNode } from 'react'
-import type { CommentEnhancer, CommentSpot } from '../enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from '../enhancer'
 
 /** Used when an entry is in the table which we don't recognize. */
 export class CommentEnhancerMissing implements CommentEnhancer {
@@ -40,7 +40,7 @@ export class CommentEnhancerMissing implements CommentEnhancer {
   forSpotTypes(): string[] {
     throw new Error('Method not implemented.')
   }
-  tryToEnhance(_textarea: HTMLTextAreaElement): CommentSpot | null {
+  tryToEnhance(_textarea: HTMLTextAreaElement, _location: StrippedLocation): CommentSpot | null {
     throw new Error('Method not implemented.')
   }
   prepareForFirstEnhancement(): void {
diff --git a/browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx b/browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx
index e3b195d..edf7671 100644
--- a/browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx
+++ b/browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx
@@ -1,7 +1,7 @@
 import { IssueOpenedIcon } from '@primer/octicons-react'
 import OverType, { type OverTypeInstance } from 'overtype'
 import type React from 'react'
-import type { CommentEnhancer, CommentSpot } from '@/lib/enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from '@/lib/enhancer'
 import { logger } from '@/lib/logger'
 import { modifyDOM } from '../modifyDOM'
 import { commonGithubOptions } from './ghOptions'
@@ -20,19 +20,22 @@ export class GitHubIssueAddCommentEnhancer implements CommentEnhancer<GitHubIssu
     return ['GH_ISSUE_ADD_COMMENT']
   }
 
-  tryToEnhance(textarea: HTMLTextAreaElement): GitHubIssueAddCommentSpot | null {
+  tryToEnhance(
+    textarea: HTMLTextAreaElement,
+    location: StrippedLocation,
+  ): GitHubIssueAddCommentSpot | null {
     if (textarea.id === 'feedback') {
       return null
     }
-    if (document.querySelector('meta[name="hostname"]')?.getAttribute('content') !== 'github.com') {
+    if (location.domain !== 'github.com') {
       return null
     }
 
     // Parse GitHub URL structure: /owner/repo/issues/123 or /owner/repo/pull/456
-    logger.debug(`${this.constructor.name} examing url`, window.location.pathname)
+    logger.debug(`${this.constructor.name} examing url`, location.pathname)
 
-    const match = window.location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/issues\/(\d+))/)
-    logger.debug(`${this.constructor.name} found match`, window.location.pathname)
+    const match = location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/issues\/(\d+))/)
+    logger.debug(`${this.constructor.name} found match`, location.pathname)
     if (!match) return null
 
     const [, owner, repo, numberStr] = match
@@ -41,7 +44,7 @@ export class GitHubIssueAddCommentEnhancer implements CommentEnhancer<GitHubIssu
     const unique_key = `github.com:${slug}:${number}`
     const title = 'TODO_TITLE'
     return {
-      domain: 'github.com',
+      domain: location.domain,
       number,
       slug,
       title,
diff --git a/browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx b/browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx
index 6d26515..4c4e386 100644
--- a/browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx
+++ b/browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx
@@ -1,5 +1,5 @@
 import OverType, { type OverTypeInstance } from 'overtype'
-import type { CommentEnhancer, CommentSpot } from '../../enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from '../../enhancer'
 import { logger } from '../../logger'
 import { modifyDOM } from '../modifyDOM'
 import { commonGithubOptions } from './ghOptions'
@@ -16,23 +16,26 @@ export class GitHubIssueNewCommentEnhancer implements CommentEnhancer<GitHubIssu
     return ['GH_ISSUE_NEW_COMMENT']
   }
 
-  tryToEnhance(_textarea: HTMLTextAreaElement): GitHubIssueNewCommentSpot | null {
-    if (document.querySelector('meta[name="hostname"]')?.getAttribute('content') !== 'github.com') {
+  tryToEnhance(
+    _textarea: HTMLTextAreaElement,
+    location: StrippedLocation,
+  ): GitHubIssueNewCommentSpot | null {
+    if (location.domain !== 'github.com') {
       return null
     }
 
     // Parse GitHub URL structure: /owner/repo/issues/123 or /owner/repo/pull/456
-    logger.debug(`${this.constructor.name} examing url`, window.location.pathname)
+    logger.debug(`${this.constructor.name} examing url`, location.pathname)
 
-    const match = window.location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/issues\/new)/)
-    logger.debug(`${this.constructor.name} found match`, window.location.pathname)
+    const match = location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/issues\/new)/)
+    logger.debug(`${this.constructor.name} found match`, location.pathname)
 
     if (!match) return null
     const [, owner, repo] = match
     const slug = `${owner}/${repo}`
     const unique_key = `github.com:${slug}:new`
     return {
-      domain: 'github.com',
+      domain: location.domain,
       slug,
       type: 'GH_ISSUE_NEW_COMMENT',
       unique_key,
diff --git a/browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx b/browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx
index b223339..6ee80fb 100644
--- a/browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx
+++ b/browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx
@@ -1,6 +1,6 @@
 import OverType, { type OverTypeInstance } from 'overtype'
 import type React from 'react'
-import type { CommentEnhancer, CommentSpot } from '@/lib/enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from '@/lib/enhancer'
 import { logger } from '@/lib/logger'
 import { modifyDOM } from '../modifyDOM'
 import { commonGithubOptions } from './ghOptions'
@@ -19,20 +19,20 @@ export class GitHubPRAddCommentEnhancer implements CommentEnhancer<GitHubPRAddCo
     return ['GH_PR_ADD_COMMENT']
   }
 
-  tryToEnhance(_textarea: HTMLTextAreaElement): GitHubPRAddCommentSpot | null {
+  tryToEnhance(
+    _textarea: HTMLTextAreaElement,
+    location: StrippedLocation,
+  ): GitHubPRAddCommentSpot | null {
     // Only handle github.com domains TODO: identify GitHub Enterprise somehow
-    if (
-      document.querySelector('meta[name="hostname"]')?.getAttribute('content') !== 'github.com' ||
-      _textarea.id !== 'new_comment_field'
-    ) {
+    if (location.domain !== 'github.com' || _textarea.id !== 'new_comment_field') {
       return null
     }
 
     // Parse GitHub URL structure: /owner/repo/issues/123 or /owner/repo/pull/456
-    logger.debug(`${this.constructor.name} examing url`, window.location.pathname)
+    logger.debug(`${this.constructor.name} examing url`, location.pathname)
 
-    const match = window.location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/pull\/(\d+))/)
-    logger.debug(`${this.constructor.name} found match`, window.location.pathname)
+    const match = location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/pull\/(\d+))/)
+    logger.debug(`${this.constructor.name} found match`, location.pathname)
     if (!match) return null
     const [, owner, repo, numberStr] = match
     const slug = `${owner}/${repo}`
@@ -40,7 +40,7 @@ export class GitHubPRAddCommentEnhancer implements CommentEnhancer<GitHubPRAddCo
     const unique_key = `github.com:${slug}:${number}`
     const title = 'TODO_TITLE'
     return {
-      domain: 'github.com',
+      domain: location.domain,
       number,
       slug,
       title,
diff --git a/browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx b/browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx
index 1740aa2..d3a5d25 100644
--- a/browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx
+++ b/browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx
@@ -1,5 +1,5 @@
 import OverType, { type OverTypeInstance } from 'overtype'
-import type { CommentEnhancer, CommentSpot } from '../../enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from '../../enhancer'
 import { logger } from '../../logger'
 import { modifyDOM } from '../modifyDOM'
 import { commonGithubOptions } from './ghOptions'
@@ -16,22 +16,25 @@ export class GitHubPRNewCommentEnhancer implements CommentEnhancer<GitHubPRNewCo
     return ['GH_PR_NEW_COMMENT']
   }
 
-  tryToEnhance(textarea: HTMLTextAreaElement): GitHubPRNewCommentSpot | null {
+  tryToEnhance(
+    textarea: HTMLTextAreaElement,
+    location: StrippedLocation,
+  ): GitHubPRNewCommentSpot | null {
     if (textarea.id === 'feedback') {
       return null
     }
-    if (document.querySelector('meta[name="hostname"]')?.getAttribute('content') !== 'github.com') {
+    if (location.domain !== 'github.com') {
       return null
     }
 
     // /owner/repo/compare/feature/more-enhancers?expand=1
     // or /owner/repo/compare/feat/issue-static-and-dynamic...feature/more-enhancers?expand=1
-    logger.info(`${this.constructor.name} examing url`, window.location.pathname)
+    logger.info(`${this.constructor.name} examing url`, location.pathname)
 
-    const match = window.location.pathname.match(
+    const match = location.pathname.match(
       /^\/([^/]+)\/([^/]+)\/compare\/(?:([^.?]+)\.\.\.)?([^?]+)/,
     )
-    logger.info(`${this.constructor.name} found match`, window.location.pathname, match)
+    logger.info(`${this.constructor.name} found match`, location.pathname, match)
 
     if (!match) return null
     const [, owner, repo, baseBranch, compareBranch] = match
@@ -40,7 +43,7 @@ export class GitHubPRNewCommentEnhancer implements CommentEnhancer<GitHubPRNewCo
       : `${owner}/${repo}/${compareBranch}`
     const unique_key = `github.com:${slug}`
     return {
-      domain: 'github.com',
+      domain: location.domain,
       slug,
       type: 'GH_PR_NEW_COMMENT',
       unique_key,

From 46f64e8fc4b8260f1c7b1b251a44433da929c969 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 17 Sep 2025 14:56:02 -0700
Subject: [PATCH 2/6] Pipe it into tests and prod.

---
 browser-extension/src/entrypoints/content.ts    | 11 +++++++++--
 browser-extension/src/lib/registries.ts         |  6 +++---
 .../tests/lib/enhancers/github.test.ts          | 17 +++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/browser-extension/src/entrypoints/content.ts b/browser-extension/src/entrypoints/content.ts
index b49267f..04ed1cc 100644
--- a/browser-extension/src/entrypoints/content.ts
+++ b/browser-extension/src/entrypoints/content.ts
@@ -1,5 +1,5 @@
 import { CONFIG } from '../lib/config'
-import type { CommentEvent, CommentSpot } from '../lib/enhancer'
+import type { CommentEvent, CommentSpot, StrippedLocation } from '../lib/enhancer'
 import { logger } from '../lib/logger'
 import { EnhancerRegistry, TextareaRegistry } from '../lib/registries'
 
@@ -9,6 +9,13 @@ const enhancedTextareas = new TextareaRegistry()
 // Expose for debugging in har:view
 ;(window as any).gitcassoTextareaRegistry = enhancedTextareas
 
+function detectLocation(): StrippedLocation {
+  return {
+    domain: window.location.host,
+    pathname: window.location.pathname,
+  }
+}
+
 function sendEventToBackground(type: 'ENHANCED' | 'DESTROYED', spot: CommentSpot): void {
   const message: CommentEvent = {
     spot,
@@ -89,7 +96,7 @@ function enhanceMaybe(textarea: HTMLTextAreaElement) {
   injectStyles()
 
   try {
-    const enhancedTextarea = enhancers.tryToEnhance(textarea)
+    const enhancedTextarea = enhancers.tryToEnhance(textarea, detectLocation())
     if (enhancedTextarea) {
       logger.debug(
         'Identified textarea:',
diff --git a/browser-extension/src/lib/registries.ts b/browser-extension/src/lib/registries.ts
index 2c7cc07..35081e2 100644
--- a/browser-extension/src/lib/registries.ts
+++ b/browser-extension/src/lib/registries.ts
@@ -1,6 +1,6 @@
 import type { OverTypeInstance } from 'overtype'
 import OverType from 'overtype'
-import type { CommentEnhancer, CommentSpot } from './enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from './enhancer'
 import { CommentEnhancerMissing } from './enhancers/CommentEnhancerMissing'
 import { GitHubIssueAddCommentEnhancer } from './enhancers/github/githubIssueAddComment'
 import { GitHubIssueNewCommentEnhancer } from './enhancers/github/githubIssueNewComment'
@@ -59,10 +59,10 @@ export class EnhancerRegistry {
     return (this.byType.get(spot.type) || new CommentEnhancerMissing()) as CommentEnhancer<T>
   }
 
-  tryToEnhance(textarea: HTMLTextAreaElement): EnhancedTextarea | null {
+  tryToEnhance(textarea: HTMLTextAreaElement, location: StrippedLocation): EnhancedTextarea | null {
     for (const enhancer of this.enhancers) {
       try {
-        const spot = enhancer.tryToEnhance(textarea)
+        const spot = enhancer.tryToEnhance(textarea, location)
         if (spot) {
           // Prepare enhancer on first use
           if (!this.preparedEnhancers.has(enhancer)) {
diff --git a/browser-extension/tests/lib/enhancers/github.test.ts b/browser-extension/tests/lib/enhancers/github.test.ts
index 587be2f..50a3750 100644
--- a/browser-extension/tests/lib/enhancers/github.test.ts
+++ b/browser-extension/tests/lib/enhancers/github.test.ts
@@ -3,14 +3,19 @@ import { describe, expect, usingHar } from '../../har-fixture'
 // must import fixture **first** for mocks, the `expect` keeps biome from changing sort-order
 expect
 
+import type { StrippedLocation } from '@/lib/enhancer'
 import { EnhancerRegistry } from '../../../src/lib/registries'
 
 const enhancers = new EnhancerRegistry()
-function enhancements(document: Document) {
+function enhancements(document: Document, window: Window) {
   const textareas = document.querySelectorAll('textarea')
+  const location: StrippedLocation = {
+    domain: window.location.host,
+    pathname: window.location.pathname,
+  }
   const spotsFound = []
   for (const textarea of textareas) {
-    const enhanced = enhancers.tryToEnhance(textarea)
+    const enhanced = enhancers.tryToEnhance(textarea, location)
     const forValue = `id=${textarea.id} name=${textarea.name} className=${textarea.className}`
     if (enhanced) {
       spotsFound.push({
@@ -31,7 +36,7 @@ function enhancements(document: Document) {
 
 describe('github', () => {
   usingHar('gh_pr').it('should create the correct spot object', async () => {
-    expect(enhancements(document)).toMatchInlineSnapshot(`
+    expect(enhancements(document, window)).toMatchInlineSnapshot(`
       [
         {
           "for": "id=feedback name=feedback className=form-control width-full mb-2",
@@ -66,7 +71,7 @@ describe('github', () => {
     `)
   })
   usingHar('gh_new_pr').it('should create the correct spot object', async () => {
-    expect(enhancements(document)).toMatchInlineSnapshot(`
+    expect(enhancements(document, window)).toMatchInlineSnapshot(`
       [
         {
           "for": "id=feedback name=feedback className=form-control width-full mb-2",
@@ -98,7 +103,7 @@ describe('github', () => {
     `)
   })
   usingHar('gh_issue').it('should create the correct spot object', async () => {
-    expect(enhancements(document)).toMatchInlineSnapshot(`
+    expect(enhancements(document, window)).toMatchInlineSnapshot(`
       [
         {
           "for": "id=feedback name=feedback className=form-control width-full mb-2",
@@ -108,7 +113,7 @@ describe('github', () => {
     `)
   })
   usingHar('gh_new_issue').it('should create the correct spot object', async () => {
-    expect(enhancements(document)).toMatchInlineSnapshot(`
+    expect(enhancements(document, window)).toMatchInlineSnapshot(`
       [
         {
           "for": "id=feedback name=feedback className=form-control width-full mb-2 overtype-input",

From 6d5d0a94d783a81e14fa9f2aa51113f68a085409 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 17 Sep 2025 15:06:31 -0700
Subject: [PATCH 3/6] Modify har-view to match.

---
 browser-extension/tests/har-view.ts | 35 +++++++++++++++--------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/browser-extension/tests/har-view.ts b/browser-extension/tests/har-view.ts
index 80cbba9..b19999f 100644
--- a/browser-extension/tests/har-view.ts
+++ b/browser-extension/tests/har-view.ts
@@ -315,31 +315,31 @@ function injectGitcassoScript(key: keyof typeof PAGES, html: string) {
   const contentScriptTag =
     `
         <script>
-          // Patch window.location before loading content script
-          console.log('Patching window.location to simulate original URL...');
-          
-          // Use history.pushState to change the pathname
-          window.history.pushState({}, '', '${urlParts.pathname}');
-          
-          console.log('Location patched:', {
-            hostname: window.location.hostname,
-            pathname: window.location.pathname,
-            href: window.location.href,
-            host: window.location.host
-          });
-          
+          console.log('Loading Gitcasso with mocked location:', '${urlParts.href}');
+
           // Fetch and patch the content script to remove webextension-polyfill issues
           fetch('/chrome-mv3-dev/content-scripts/content.js')
             .then(response => response.text())
             .then(code => {
-              console.log('Fetched content script, patching webextension-polyfill...');
-              
+              console.log('Fetched content script, patching webextension-polyfill and detectLocation...');
+
               // Replace the problematic webextension-polyfill error check
-              const patchedCode = code.replace(
+              let patchedCode = code.replace(
                 'throw new Error("This script should only be loaded in a browser extension.")',
                 'console.warn("Webextension-polyfill check bypassed for HAR testing")'
               );
 
+              // Override detectLocation function with correct domain and pathname
+              patchedCode = patchedCode.replace(
+                /function detectLocation(): StrippedLocation {[sS]*?}/,
+                'function detectLocation() {\\n' +
+                '  return {\\n' +
+                '    domain: \\'${urlParts.host}\\',\\n' +
+                '    pathname: \\'${urlParts.pathname}\\'\\n' +
+                '  };\\n' +
+                '}'
+              );
+
               // Execute the patched script with browser API mocks prepended
               const browserMocks = 'window.chrome=window.chrome||{runtime:{getURL:path=>"chrome-extension://gitcasso-test/"+path,onMessage:{addListener:()=>{}},sendMessage:()=>Promise.resolve(),id:"gitcasso-test"}};window.browser=window.chrome;';
               const script = document.createElement('script');
@@ -505,8 +505,9 @@ function injectGitcassoScript(key: keyof typeof PAGES, html: string) {
 
             const content = enhanced.length > 0
               ? '<div style="' + styles.header + '">CommentSpots (' + enhanced.length + '):</div>' +
+                '<div style="font-size: 10px; color: #666; margin-bottom: 8px; word-break: break-all;">URL: ${urlParts.href}</div>' +
                 enhanced.map(formatSpot).join('')
-              : '<div style="' + styles.empty + '">No CommentSpots detected yet...<br><small>Textareas found: ' + document.querySelectorAll('textarea').length + '</small></div>';
+              : '<div style="' + styles.empty + '">No CommentSpots detected yet...<br><small>Textareas found: ' + document.querySelectorAll('textarea').length + '</small><br><small>URL: ${urlParts.href}</small></div>';
 
             commentSpotDisplay.innerHTML = content;
           }

From 96c464f1c2affc1b72eeceb157dc81c35d7b4421 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 17 Sep 2025 15:16:35 -0700
Subject: [PATCH 4/6] Rename `domain` -> `host` to better match the underlying
 `window.location` api.

---
 browser-extension/src/entrypoints/content.ts                  | 2 +-
 browser-extension/src/lib/enhancer.ts                         | 2 +-
 .../src/lib/enhancers/github/githubIssueAddComment.tsx        | 4 ++--
 .../src/lib/enhancers/github/githubIssueNewComment.tsx        | 4 ++--
 .../src/lib/enhancers/github/githubPRAddComment.tsx           | 4 ++--
 .../src/lib/enhancers/github/githubPRNewComment.tsx           | 4 ++--
 browser-extension/tests/har-view.ts                           | 2 +-
 browser-extension/tests/lib/enhancers/github.test.ts          | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/browser-extension/src/entrypoints/content.ts b/browser-extension/src/entrypoints/content.ts
index 04ed1cc..759d130 100644
--- a/browser-extension/src/entrypoints/content.ts
+++ b/browser-extension/src/entrypoints/content.ts
@@ -11,7 +11,7 @@ const enhancedTextareas = new TextareaRegistry()
 
 function detectLocation(): StrippedLocation {
   return {
-    domain: window.location.host,
+    host: window.location.host,
     pathname: window.location.pathname,
   }
 }
diff --git a/browser-extension/src/lib/enhancer.ts b/browser-extension/src/lib/enhancer.ts
index 168bcf5..d835c4c 100644
--- a/browser-extension/src/lib/enhancer.ts
+++ b/browser-extension/src/lib/enhancer.ts
@@ -24,7 +24,7 @@ export interface CommentEvent {
  * Avoids dependency on global window/location objects for better testability.
  */
 export interface StrippedLocation {
-  domain: string
+  host: string
   pathname: string
 }
 
diff --git a/browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx b/browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx
index edf7671..233508d 100644
--- a/browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx
+++ b/browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx
@@ -27,7 +27,7 @@ export class GitHubIssueAddCommentEnhancer implements CommentEnhancer<GitHubIssu
     if (textarea.id === 'feedback') {
       return null
     }
-    if (location.domain !== 'github.com') {
+    if (location.host !== 'github.com') {
       return null
     }
 
@@ -44,7 +44,7 @@ export class GitHubIssueAddCommentEnhancer implements CommentEnhancer<GitHubIssu
     const unique_key = `github.com:${slug}:${number}`
     const title = 'TODO_TITLE'
     return {
-      domain: location.domain,
+      domain: location.host,
       number,
       slug,
       title,
diff --git a/browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx b/browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx
index 4c4e386..b5a7852 100644
--- a/browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx
+++ b/browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx
@@ -20,7 +20,7 @@ export class GitHubIssueNewCommentEnhancer implements CommentEnhancer<GitHubIssu
     _textarea: HTMLTextAreaElement,
     location: StrippedLocation,
   ): GitHubIssueNewCommentSpot | null {
-    if (location.domain !== 'github.com') {
+    if (location.host !== 'github.com') {
       return null
     }
 
@@ -35,7 +35,7 @@ export class GitHubIssueNewCommentEnhancer implements CommentEnhancer<GitHubIssu
     const slug = `${owner}/${repo}`
     const unique_key = `github.com:${slug}:new`
     return {
-      domain: location.domain,
+      domain: location.host,
       slug,
       type: 'GH_ISSUE_NEW_COMMENT',
       unique_key,
diff --git a/browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx b/browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx
index 6ee80fb..4e12c5f 100644
--- a/browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx
+++ b/browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx
@@ -24,7 +24,7 @@ export class GitHubPRAddCommentEnhancer implements CommentEnhancer<GitHubPRAddCo
     location: StrippedLocation,
   ): GitHubPRAddCommentSpot | null {
     // Only handle github.com domains TODO: identify GitHub Enterprise somehow
-    if (location.domain !== 'github.com' || _textarea.id !== 'new_comment_field') {
+    if (location.host !== 'github.com' || _textarea.id !== 'new_comment_field') {
       return null
     }
 
@@ -40,7 +40,7 @@ export class GitHubPRAddCommentEnhancer implements CommentEnhancer<GitHubPRAddCo
     const unique_key = `github.com:${slug}:${number}`
     const title = 'TODO_TITLE'
     return {
-      domain: location.domain,
+      domain: location.host,
       number,
       slug,
       title,
diff --git a/browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx b/browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx
index d3a5d25..f23e018 100644
--- a/browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx
+++ b/browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx
@@ -23,7 +23,7 @@ export class GitHubPRNewCommentEnhancer implements CommentEnhancer<GitHubPRNewCo
     if (textarea.id === 'feedback') {
       return null
     }
-    if (location.domain !== 'github.com') {
+    if (location.host !== 'github.com') {
       return null
     }
 
@@ -43,7 +43,7 @@ export class GitHubPRNewCommentEnhancer implements CommentEnhancer<GitHubPRNewCo
       : `${owner}/${repo}/${compareBranch}`
     const unique_key = `github.com:${slug}`
     return {
-      domain: location.domain,
+      domain: location.host,
       slug,
       type: 'GH_PR_NEW_COMMENT',
       unique_key,
diff --git a/browser-extension/tests/har-view.ts b/browser-extension/tests/har-view.ts
index b19999f..62f63ce 100644
--- a/browser-extension/tests/har-view.ts
+++ b/browser-extension/tests/har-view.ts
@@ -334,7 +334,7 @@ function injectGitcassoScript(key: keyof typeof PAGES, html: string) {
                 /function detectLocation(): StrippedLocation {[sS]*?}/,
                 'function detectLocation() {\\n' +
                 '  return {\\n' +
-                '    domain: \\'${urlParts.host}\\',\\n' +
+                '    host: \\'${urlParts.host}\\',\\n' +
                 '    pathname: \\'${urlParts.pathname}\\'\\n' +
                 '  };\\n' +
                 '}'
diff --git a/browser-extension/tests/lib/enhancers/github.test.ts b/browser-extension/tests/lib/enhancers/github.test.ts
index 50a3750..35692c5 100644
--- a/browser-extension/tests/lib/enhancers/github.test.ts
+++ b/browser-extension/tests/lib/enhancers/github.test.ts
@@ -10,7 +10,7 @@ const enhancers = new EnhancerRegistry()
 function enhancements(document: Document, window: Window) {
   const textareas = document.querySelectorAll('textarea')
   const location: StrippedLocation = {
-    domain: window.location.host,
+    host: window.location.host,
     pathname: window.location.pathname,
   }
   const spotsFound = []

From 00805edc1101fa00bc3de1b0f89a54364976708e Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 17 Sep 2025 15:42:18 -0700
Subject: [PATCH 5/6] Fix mocking the locaiton.

---
 browser-extension/src/entrypoints/content.ts | 15 ++++++++++++---
 browser-extension/tests/har-view.ts          | 15 ++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/browser-extension/src/entrypoints/content.ts b/browser-extension/src/entrypoints/content.ts
index 759d130..c21c33a 100644
--- a/browser-extension/src/entrypoints/content.ts
+++ b/browser-extension/src/entrypoints/content.ts
@@ -10,10 +10,15 @@ const enhancedTextareas = new TextareaRegistry()
 ;(window as any).gitcassoTextareaRegistry = enhancedTextareas
 
 function detectLocation(): StrippedLocation {
-  return {
+  if ((window as any).gitcassoMockLocation) {
+    return (window as any).gitcassoMockLocation
+  }
+  const result = {
     host: window.location.host,
     pathname: window.location.pathname,
   }
+  logger.debug('[gitcasso] detectLocation called, returning:', result)
+  return result
 }
 
 function sendEventToBackground(type: 'ENHANCED' | 'DESTROYED', spot: CommentSpot): void {
@@ -33,6 +38,7 @@ enhancedTextareas.setEventHandlers(
 
 export default defineContentScript({
   main() {
+    logger.debug('Main was called')
     const textAreasOnPageLoad = document.querySelectorAll<HTMLTextAreaElement>(`textarea`)
     for (const textarea of textAreasOnPageLoad) {
       enhanceMaybe(textarea)
@@ -42,7 +48,7 @@ export default defineContentScript({
       childList: true,
       subtree: true,
     })
-    logger.debug('Extension loaded with', enhancers.getEnhancerCount, 'handlers')
+    logger.debug('Extension loaded with', enhancers.getEnhancerCount(), 'handlers')
   },
   matches: ['<all_urls>'],
   runAt: 'document_end',
@@ -87,6 +93,7 @@ function handleMutations(mutations: MutationRecord[]): void {
 }
 
 function enhanceMaybe(textarea: HTMLTextAreaElement) {
+  logger.debug('[gitcasso] enhanceMaybe called for textarea:', textarea.id, textarea.className)
   if (enhancedTextareas.get(textarea)) {
     logger.debug('textarea already registered {}', textarea)
     return
@@ -96,7 +103,9 @@ function enhanceMaybe(textarea: HTMLTextAreaElement) {
   injectStyles()
 
   try {
-    const enhancedTextarea = enhancers.tryToEnhance(textarea, detectLocation())
+    const location = detectLocation()
+    logger.debug('[gitcasso] Calling tryToEnhance with location:', location)
+    const enhancedTextarea = enhancers.tryToEnhance(textarea, location)
     if (enhancedTextarea) {
       logger.debug(
         'Identified textarea:',
diff --git a/browser-extension/tests/har-view.ts b/browser-extension/tests/har-view.ts
index 62f63ce..e2de34c 100644
--- a/browser-extension/tests/har-view.ts
+++ b/browser-extension/tests/har-view.ts
@@ -328,17 +328,10 @@ function injectGitcassoScript(key: keyof typeof PAGES, html: string) {
                 'throw new Error("This script should only be loaded in a browser extension.")',
                 'console.warn("Webextension-polyfill check bypassed for HAR testing")'
               );
-
-              // Override detectLocation function with correct domain and pathname
-              patchedCode = patchedCode.replace(
-                /function detectLocation(): StrippedLocation {[sS]*?}/,
-                'function detectLocation() {\\n' +
-                '  return {\\n' +
-                '    host: \\'${urlParts.host}\\',\\n' +
-                '    pathname: \\'${urlParts.pathname}\\'\\n' +
-                '  };\\n' +
-                '}'
-              );
+              window.gitcassoMockLocation = {
+                host: '${urlParts.host}',
+                pathname: '${urlParts.pathname}'
+              };
 
               // Execute the patched script with browser API mocks prepended
               const browserMocks = 'window.chrome=window.chrome||{runtime:{getURL:path=>"chrome-extension://gitcasso-test/"+path,onMessage:{addListener:()=>{}},sendMessage:()=>Promise.resolve(),id:"gitcasso-test"}};window.browser=window.chrome;';

From 97929e5962c5226244f4c02a8b052b49941d10e5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 17 Sep 2025 16:09:15 -0700
Subject: [PATCH 6/6] Improve the har display to look more like our unit tests.

---
 browser-extension/tests/har-view.ts | 62 +++++++++++------------------
 1 file changed, 23 insertions(+), 39 deletions(-)

diff --git a/browser-extension/tests/har-view.ts b/browser-extension/tests/har-view.ts
index e2de34c..6586eba 100644
--- a/browser-extension/tests/har-view.ts
+++ b/browser-extension/tests/har-view.ts
@@ -437,7 +437,7 @@ function injectGitcassoScript(key: keyof typeof PAGES, html: string) {
             'position: fixed;' +
             'top: 80px;' +
             'right: 20px;' +
-            'width: 300px;' +
+            'width: 400px;' +
             'max-height: 400px;' +
             'background: rgba(255, 255, 255, 0.95);' +
             'border: 1px solid #ddd;' +
@@ -463,46 +463,30 @@ function injectGitcassoScript(key: keyof typeof PAGES, html: string) {
             empty: 'color: #666; font-style: italic;'
           };
 
-          function formatSpot(enhanced, index) {
-            const { textarea, spot } = enhanced;
-            const rect = textarea.getBoundingClientRect();
-            const textareaInfo = {
-              id: textarea.id || '',
-              name: textarea.name || '',
-              className: textarea.className || '',
-              tagName: textarea.tagName,
-              placeholder: textarea.placeholder || '',
-              value: textarea.value ? textarea.value.substring(0, 50) + '...' : '',
-              parentElement: textarea.parentElement ? textarea.parentElement.tagName + (textarea.parentElement.className ? '.' + textarea.parentElement.className : '') : '',
-              position: {
-                top: rect.top,
-                left: rect.left,
-                width: rect.width,
-                height: rect.height
-              }
-            };
-
-            return '<div style="' + styles.spotContainer + '">' +
-                   '<div style="' + styles.spotTitle + '">Spot ' + (index + 1) + ':</div>' +
-                   '<pre style="' + styles.jsonPre + '">' + JSON.stringify(spot, null, 2) + '</pre>' +
-                   '<div style="' + styles.textareaHeader + '">Textarea Info:</div>' +
-                   '<pre style="' + styles.textareaPre + '">' + JSON.stringify(textareaInfo, null, 2) + '</pre>' +
-                   '</div>';
-          }
-
           function updateCommentSpotDisplay() {
-            const enhanced = window.gitcassoTextareaRegistry ? window.gitcassoTextareaRegistry.getAllEnhanced() : [];
-
-            console.log('Enhanced textareas:', enhanced.length);
-            console.log('All textareas on page:', document.querySelectorAll('textarea').length);
-
-            const content = enhanced.length > 0
-              ? '<div style="' + styles.header + '">CommentSpots (' + enhanced.length + '):</div>' +
-                '<div style="font-size: 10px; color: #666; margin-bottom: 8px; word-break: break-all;">URL: ${urlParts.href}</div>' +
-                enhanced.map(formatSpot).join('')
-              : '<div style="' + styles.empty + '">No CommentSpots detected yet...<br><small>Textareas found: ' + document.querySelectorAll('textarea').length + '</small><br><small>URL: ${urlParts.href}</small></div>';
+            const textareas = document.querySelectorAll('textarea');
+            const spotsFound = [];
+
+            for (const textarea of textareas) {
+              const forValue = 'id=' + textarea.id + ' name=' + textarea.name + ' className=' + textarea.className;
+              const enhancedItem = window.gitcassoTextareaRegistry ? window.gitcassoTextareaRegistry.get(textarea) : undefined;
+              if (enhancedItem) {
+                spotsFound.push({
+                  for: forValue,
+                  spot: enhancedItem.spot,
+                  title: enhancedItem.enhancer.tableTitle(enhancedItem.spot),
+                });
+              } else {
+                spotsFound.push({
+                  for: forValue,
+                  spot: 'NO_SPOT',
+                });
+              }
+            }
 
-            commentSpotDisplay.innerHTML = content;
+            console.log('Enhanced textareas:', spotsFound.filter(s => s.spot !== 'NO_SPOT').length);
+            console.log('All textareas on page:', textareas.length);
+            commentSpotDisplay.innerHTML = '<div style="' + styles.header + '"><pre>${urlParts.href}\\n' + JSON.stringify(spotsFound, null, 2) + '</pre></div>';
           }
 
           // Initial update