github-issue-tower-defence-management 2.66.0 → 2.67.0

package/bin/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.js

@@ -8,6 +8,8 @@ const githubGraphqlClient_1 = require("../githubGraphqlClient");
 const utils_1 = require("../utils");
 const localStorageCacheDirectory_1 = require("../localStorageCacheDirectory");
 const githubRateLimitRetry_1 = require("./githubRateLimitRetry");
+const githubRestClient_1 = require("../githubRestClient");
+const githubSecondaryRateLimitBreaker_1 = require("./githubSecondaryRateLimitBreaker");
 exports.FULL_ISSUE_FETCH_INTERVAL_MS = 60 * 60 * 1000;
 exports.INCREMENTAL_FETCH_SKEW_BUFFER_MS = 5 * 60 * 1000;
 exports.REQUIRED_CHECKS_CACHE_TTL_MS = 10 * 60 * 1000;
@@ -238,14 +240,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         this.getAllIssuesRefreshMemo = new Map();
         this.lastIssuesFetchedAtByProjectId = new Map();
         this.getLastIssuesFetchedAt = (projectId) => this.lastIssuesFetchedAtByProjectId.get(projectId) ?? null;
-        this.fetchWithRateLimitRetry = (request) => (0, githubRateLimitRetry_1.fetchWithGitHubRateLimitRetry)(request, this.sleep);
+        this.fetchWithRateLimitRetry = (request, requestInfo = {}) => (0, githubRateLimitRetry_1.fetchWithGitHubRateLimitRetry)(request, this.sleep, Date.now, false, false, (0, githubSecondaryRateLimitBreaker_1.secondaryRateLimitStateFilePath)(), requestInfo);
         /**
          * Variant for content-creating requests (POST / PUT / PATCH / DELETE).
          * Checks the shared secondary rate limit circuit breaker before issuing
          * the request so that a block discovered by one process immediately
          * silences all other processes on the host.
          */
-        this.fetchWithRateLimitRetryForWrite = (request) => (0, githubRateLimitRetry_1.fetchWithGitHubRateLimitRetry)(request, this.sleep, Date.now, false, true);
+        this.fetchWithRateLimitRetryForWrite = (request, requestInfo = {}) => (0, githubRateLimitRetry_1.fetchWithGitHubRateLimitRetry)(request, this.sleep, Date.now, false, true, (0, githubSecondaryRateLimitBreaker_1.secondaryRateLimitStateFilePath)(), requestInfo);
         this.throwGitHubError = async (prefix, response) => {
             const bodyText = await response.clone().text();
             const isRateLimit = (0, githubRateLimitRetry_1.hasRateLimitSignals)(response.status, response.headers, bodyText);
@@ -769,13 +771,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             const repoSegment = encodeURIComponent(repo);
             const branchSegment = encodeURIComponent(branch);
             const requiredCheckNamesSet = new Set();
-            const rulesResponse = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/rules/branches/${branchSegment}?per_page=100`, {
+            const rulesUrl = `https://api.github.com/repos/${ownerSegment}/${repoSegment}/rules/branches/${branchSegment}?per_page=100`;
+            const rulesResponse = await this.fetchWithRateLimitRetry(() => fetch(rulesUrl, {
                 method: 'GET',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(rulesUrl) });
             if (rulesResponse.ok) {
                 const rulesBody = await rulesResponse.json();
                 if (!isBranchRulesResponse(rulesBody)) {
@@ -797,13 +800,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                 const reason = await this.formatGitHubErrorWithStatus(rulesResponse);
                 throw new Error(`Failed to fetch branch rules for ${owner}/${repo}/${branch}: ${reason}`);
             }
-            const branchResponse = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/branches/${branchSegment}`, {
+            const branchUrl = `https://api.github.com/repos/${ownerSegment}/${repoSegment}/branches/${branchSegment}`;
+            const branchResponse = await this.fetchWithRateLimitRetry(() => fetch(branchUrl, {
                 method: 'GET',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(branchUrl) });
             if (branchResponse.ok) {
                 const branchBody = await branchResponse.json();
                 if (!isBranchDetailResponse(branchBody)) {
@@ -852,13 +856,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             const ownerSegment = encodeURIComponent(owner);
             const repoSegment = encodeURIComponent(repo);
             const shaSegment = encodeURIComponent(commitSha);
-            const checkSuitesResponse = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/commits/${shaSegment}/check-suites`, {
+            const checkSuitesUrl = `https://api.github.com/repos/${ownerSegment}/${repoSegment}/commits/${shaSegment}/check-suites`;
+            const checkSuitesResponse = await this.fetchWithRateLimitRetry(() => fetch(checkSuitesUrl, {
                 method: 'GET',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(checkSuitesUrl) });
             if (!checkSuitesResponse.ok) {
                 if (checkSuitesResponse.status === 404) {
                     console.warn(`ApiV3CheerioRestIssueRepository: commits/${commitSha}/check-suites returned 404 for ${owner}/${repo}, treating as no check runs.`);
@@ -877,13 +882,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                 let page = 1;
                 let hasMore = true;
                 while (hasMore) {
-                    const runsResponse = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/check-suites/${suite.id}/check-runs?per_page=${perPage}&page=${page}`, {
+                    const runsUrl = `https://api.github.com/repos/${ownerSegment}/${repoSegment}/check-suites/${suite.id}/check-runs?per_page=${perPage}&page=${page}`;
+                    const runsResponse = await this.fetchWithRateLimitRetry(() => fetch(runsUrl, {
                         method: 'GET',
                         headers: {
                             Authorization: `Bearer ${this.ghToken}`,
                             Accept: 'application/vnd.github+json',
                         },
-                    }));
+                    }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(runsUrl) });
                     if (!runsResponse.ok) {
                         const reason = await this.formatGitHubErrorWithStatus(runsResponse);
                         throw new Error(`Failed to fetch check runs for suite ${suite.id} in ${owner}/${repo}: ${reason}`);
@@ -936,7 +942,8 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             if (diskCache?.etag) {
                 page1Headers['If-None-Match'] = diskCache.etag;
             }
-            const page1Response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/commits/${shaSegment}/check-runs?per_page=100&page=1`, { method: 'GET', headers: page1Headers }));
+            const page1Url = `https://api.github.com/repos/${ownerSegment}/${repoSegment}/commits/${shaSegment}/check-runs?per_page=100&page=1`;
+            const page1Response = await this.fetchWithRateLimitRetry(() => fetch(page1Url, { method: 'GET', headers: page1Headers }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(page1Url) });
             if (!page1Response.ok &&
                 (0, githubRateLimitRetry_1.hasRateLimitSignals)(page1Response.status, page1Response.headers, await page1Response.clone().text())) {
                 if (diskCache) {
@@ -982,13 +989,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             let page = 2;
             let hasMore = page1Body.check_runs.length >= perPage && perPage < page1Body.total_count;
             while (hasMore) {
-                const pageResponse = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/commits/${shaSegment}/check-runs?per_page=${perPage}&page=${page}`, {
+                const pageUrl = `https://api.github.com/repos/${ownerSegment}/${repoSegment}/commits/${shaSegment}/check-runs?per_page=${perPage}&page=${page}`;
+                const pageResponse = await this.fetchWithRateLimitRetry(() => fetch(pageUrl, {
                     method: 'GET',
                     headers: {
                         Authorization: `Bearer ${this.ghToken}`,
                         Accept: 'application/vnd.github+json',
                     },
-                }));
+                }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(pageUrl) });
                 if (!pageResponse.ok &&
                     (0, githubRateLimitRetry_1.hasRateLimitSignals)(pageResponse.status, pageResponse.headers, await pageResponse.clone().text())) {
                     if (diskCache) {
@@ -1033,10 +1041,11 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             if (diskCache?.combinedStatusEtag) {
                 combinedStatusHeaders['If-None-Match'] = diskCache.combinedStatusEtag;
             }
-            const combinedStatusResponse = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/commits/${shaSegment}/status?per_page=100`, {
+            const combinedStatusUrl = `https://api.github.com/repos/${ownerSegment}/${repoSegment}/commits/${shaSegment}/status?per_page=100`;
+            const combinedStatusResponse = await this.fetchWithRateLimitRetry(() => fetch(combinedStatusUrl, {
                 method: 'GET',
                 headers: combinedStatusHeaders,
-            }));
+            }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(combinedStatusUrl) });
             if (!combinedStatusResponse.ok &&
                 (0, githubRateLimitRetry_1.hasRateLimitSignals)(combinedStatusResponse.status, combinedStatusResponse.headers, await combinedStatusResponse.clone().text())) {
                 if (diskCache) {
@@ -1536,13 +1545,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                 if (attempt > 0) {
                     await this.sleep(retryDelayMilliseconds);
                 }
-                const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}`, {
+                const prStatusUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}`;
+                const response = await this.fetchWithRateLimitRetry(() => fetch(prStatusUrl, {
                     method: 'GET',
                     headers: {
                         Authorization: `Bearer ${this.ghToken}`,
                         Accept: 'application/vnd.github+json',
                     },
-                }));
+                }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(prStatusUrl) });
                 if (response.status === 404) {
                     return null;
                 }
@@ -1747,14 +1757,15 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         };
         this.closePullRequest = async (prUrl) => {
             const { owner, repo, issueNumber: prNumber } = this.parseIssueUrl(prUrl);
-            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}`, {
+            const closePrUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}`;
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(closePrUrl, {
                 method: 'PATCH',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     'Content-Type': 'application/json',
                 },
                 body: JSON.stringify({ state: 'closed' }),
-            }));
+            }), { method: 'PATCH', path: (0, githubRestClient_1.sanitizeRestPath)(closePrUrl) });
             if (!response.ok) {
                 const reason = await this.formatGitHubErrorWithStatus(response);
                 throw new Error(`Failed to close PR ${prUrl}: ${reason}`);
@@ -1764,14 +1775,15 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             const { owner, repo, issueNumber } = this.parseIssueUrl(issueUrl);
             const ownerSegment = encodeURIComponent(owner);
             const repoSegment = encodeURIComponent(repo);
-            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/issues/${issueNumber}`, {
+            const closeIssueUrl = `https://api.github.com/repos/${ownerSegment}/${repoSegment}/issues/${issueNumber}`;
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(closeIssueUrl, {
                 method: 'PATCH',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     'Content-Type': 'application/json',
                 },
                 body: JSON.stringify({ state: 'closed', state_reason: stateReason }),
-            }));
+            }), { method: 'PATCH', path: (0, githubRestClient_1.sanitizeRestPath)(closeIssueUrl) });
             if (!response.ok) {
                 const reason = await this.formatGitHubErrorWithStatus(response);
                 throw new Error(`Failed to close issue ${issueUrl}: ${reason}`);
@@ -1784,13 +1796,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             let page = 1;
             let hasMore = true;
             while (hasMore) {
-                const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/files?per_page=${perPage}&page=${page}`, {
+                const prFilesUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/files?per_page=${perPage}&page=${page}`;
+                const response = await this.fetchWithRateLimitRetry(() => fetch(prFilesUrl, {
                     method: 'GET',
                     headers: {
                         Authorization: `Bearer ${this.ghToken}`,
                         Accept: 'application/vnd.github+json',
                     },
-                }));
+                }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(prFilesUrl) });
                 if (!response.ok) {
                     const reason = await this.formatGitHubErrorWithStatus(response);
                     throw new Error(`Failed to fetch changed files for PR ${prUrl}: ${reason}`);
@@ -1818,7 +1831,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'GET', path: '/user' });
             if (!response.ok) {
                 const reason = await this.formatGitHubErrorWithStatus(response);
                 throw new Error(`Failed to fetch authenticated user: ${reason}`);
@@ -1831,7 +1844,8 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         };
         this.approvePullRequest = async (prUrl) => {
             const { owner, repo, issueNumber: prNumber } = this.parseIssueUrl(prUrl);
-            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/reviews`, {
+            const approveUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/reviews`;
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(approveUrl, {
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
@@ -1839,7 +1853,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                     Accept: 'application/vnd.github+json',
                 },
                 body: JSON.stringify({ event: 'APPROVE' }),
-            }));
+            }), { method: 'POST', path: (0, githubRestClient_1.sanitizeRestPath)(approveUrl) });
             if (!response.ok) {
                 const reason = await this.formatGitHubErrorWithStatus(response);
                 throw new Error(`Failed to approve PR ${prUrl}: ${reason}`);
@@ -1857,7 +1871,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                 method: 'PUT',
                 headers,
                 body: JSON.stringify(mergeMethod ? { merge_method: mergeMethod } : {}),
-            }));
+            }), { method: 'PUT', path: (0, githubRestClient_1.sanitizeRestPath)(mergeUrl) });
             const response = await mergeWith();
             if (response.ok) {
                 return;
@@ -1877,12 +1891,13 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             throw new Error(`Failed to merge PR ${prUrl}: ${reason}`);
         };
         this.resolveAllowedMergeMethod = async (owner, repo) => {
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`, {
+            const repoUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`;
+            const response = await this.fetchWithRateLimitRetry(() => fetch(repoUrl, {
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(repoUrl) });
             if (!response.ok) {
                 return null;
             }
@@ -1917,7 +1932,8 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                 body: commentBody,
                 comments: [inlineComment],
             };
-            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/reviews`, {
+            const reviewUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/reviews`;
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(reviewUrl, {
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
@@ -1925,7 +1941,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                     Accept: 'application/vnd.github+json',
                 },
                 body: JSON.stringify(reviewBody),
-            }));
+            }), { method: 'POST', path: (0, githubRestClient_1.sanitizeRestPath)(reviewUrl) });
             if (!response.ok) {
                 const reason = await this.formatGitHubErrorWithStatus(response);
                 if (response.status === 422 &&
@@ -1946,13 +1962,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         this.fetchPullRequestHeadSha = async (owner, repo, prNumber, prUrl) => {
             const ownerSegment = encodeURIComponent(owner);
             const repoSegment = encodeURIComponent(repo);
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/pulls/${prNumber}`, {
+            const headShaUrl = `https://api.github.com/repos/${ownerSegment}/${repoSegment}/pulls/${prNumber}`;
+            const response = await this.fetchWithRateLimitRetry(() => fetch(headShaUrl, {
                 method: 'GET',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(headShaUrl) });
             if (!response.ok) {
                 const reason = await this.formatGitHubErrorWithStatus(response);
                 throw new Error(`Failed to fetch head commit for PR ${prUrl}: ${reason}`);
@@ -1970,7 +1987,8 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             const commitId = await this.fetchPullRequestHeadSha(owner, repo, prNumber, prUrl);
             const ownerSegment = encodeURIComponent(owner);
             const repoSegment = encodeURIComponent(repo);
-            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/pulls/${prNumber}/comments`, {
+            const reviewCommentUrl = `https://api.github.com/repos/${ownerSegment}/${repoSegment}/pulls/${prNumber}/comments`;
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(reviewCommentUrl, {
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
@@ -1984,7 +2002,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                     line,
                     side,
                 }),
-            }));
+            }), { method: 'POST', path: (0, githubRestClient_1.sanitizeRestPath)(reviewCommentUrl) });
             if (!response.ok) {
                 const reason = await this.formatGitHubErrorWithStatus(response);
                 throw new Error(`Failed to create review comment on PR ${prUrl}: ${reason}`);
@@ -2040,13 +2058,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         };
         this.updateBranch = async (prUrl) => {
             const { owner, repo, issueNumber: prNumber } = this.parseIssueUrl(prUrl);
-            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/update-branch`, {
+            const updateBranchUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/update-branch`;
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(updateBranchUrl, {
                 method: 'PUT',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'PUT', path: (0, githubRestClient_1.sanitizeRestPath)(updateBranchUrl) });
             if (response.ok) {
                 return true;
             }
@@ -2058,12 +2077,13 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         };
         this.deletePullRequestBranch = async (prUrl, branchName) => {
             const { owner, repo } = this.parseIssueUrl(prUrl);
-            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/refs/heads/${encodeURIComponent(branchName)}`, {
+            const deleteBranchUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/refs/heads/${encodeURIComponent(branchName)}`;
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(deleteBranchUrl, {
                 method: 'DELETE',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                 },
-            }));
+            }), { method: 'DELETE', path: (0, githubRestClient_1.sanitizeRestPath)(deleteBranchUrl) });
             if (!response.ok && response.status !== 422) {
                 const reason = await this.formatGitHubErrorWithStatus(response);
                 throw new Error(`Failed to delete branch ${branchName} for PR ${prUrl}: ${reason}`);
@@ -2074,13 +2094,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         };
         this.fetchIssueBodyResponse = (url) => {
             const { owner, repo, issueNumber } = this.parseIssueUrl(url);
-            return this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/${issueNumber}`, {
+            const issueBodyUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/${issueNumber}`;
+            return this.fetchWithRateLimitRetry(() => fetch(issueBodyUrl, {
                 method: 'GET',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(issueBodyUrl) });
         };
         this.parseIssueBodyResponse = async (url, response) => {
             const body = await response.json();
@@ -2114,13 +2135,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             let page = 1;
             let hasMore = true;
             while (hasMore) {
-                const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/${issueNumber}/comments?per_page=${perPage}&page=${page}`, {
+                const commentsUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/${issueNumber}/comments?per_page=${perPage}&page=${page}`;
+                const response = await this.fetchWithRateLimitRetry(() => fetch(commentsUrl, {
                     method: 'GET',
                     headers: {
                         Authorization: `Bearer ${this.ghToken}`,
                         Accept: 'application/vnd.github+json',
                     },
-                }));
+                }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(commentsUrl) });
                 if (!response.ok) {
                     await this.throwGitHubError(`Failed to fetch comments for ${url}`, response);
                 }
@@ -2150,13 +2172,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             if (!isPr) {
                 return null;
             }
-            const detailResponse = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}`, {
+            const prDetailUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}`;
+            const detailResponse = await this.fetchWithRateLimitRetry(() => fetch(prDetailUrl, {
                 method: 'GET',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(prDetailUrl) });
             if (!detailResponse.ok) {
                 await this.throwGitHubError(`Failed to fetch detail for PR ${prUrl}`, detailResponse);
             }
@@ -2185,13 +2208,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             let page = 1;
             let hasMore = true;
             while (hasMore) {
-                const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/files?per_page=${perPage}&page=${page}`, {
+                const prDetailFilesUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/files?per_page=${perPage}&page=${page}`;
+                const response = await this.fetchWithRateLimitRetry(() => fetch(prDetailFilesUrl, {
                     method: 'GET',
                     headers: {
                         Authorization: `Bearer ${this.ghToken}`,
                         Accept: 'application/vnd.github+json',
                     },
-                }));
+                }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(prDetailFilesUrl) });
                 if (!response.ok) {
                     await this.throwGitHubError(`Failed to fetch files for PR ${prUrl}`, response);
                 }
@@ -2230,13 +2254,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             let page = 1;
             let hasMore = true;
             while (hasMore) {
-                const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/commits?per_page=${perPage}&page=${page}`, {
+                const prCommitsUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/commits?per_page=${perPage}&page=${page}`;
+                const response = await this.fetchWithRateLimitRetry(() => fetch(prCommitsUrl, {
                     method: 'GET',
                     headers: {
                         Authorization: `Bearer ${this.ghToken}`,
                         Accept: 'application/vnd.github+json',
                     },
-                }));
+                }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(prCommitsUrl) });
                 if (!response.ok) {
                     await this.throwGitHubError(`Failed to fetch commits for PR ${prUrl}`, response);
                 }
@@ -2264,13 +2289,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         this.getIssueOrPullRequestState = async (url) => {
             const { owner, repo, issueNumber, isPr } = this.parseIssueUrl(url);
             if (isPr) {
-                const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${issueNumber}`, {
+                const prStateUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${issueNumber}`;
+                const response = await this.fetchWithRateLimitRetry(() => fetch(prStateUrl, {
                     method: 'GET',
                     headers: {
                         Authorization: `Bearer ${this.ghToken}`,
                         Accept: 'application/vnd.github+json',
                     },
-                }));
+                }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(prStateUrl) });
                 if (!response.ok) {
                     await this.throwGitHubError(`Failed to fetch state for ${url}`, response);
                 }
@@ -2285,13 +2311,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                     title: body.title,
                 };
             }
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/${issueNumber}`, {
+            const issueStateUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/${issueNumber}`;
+            const response = await this.fetchWithRateLimitRetry(() => fetch(issueStateUrl, {
                 method: 'GET',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(issueStateUrl) });
             if (!response.ok) {
                 await this.throwGitHubError(`Failed to fetch state for ${url}`, response);
             }
@@ -2311,13 +2338,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             if (!isPr) {
                 return null;
             }
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}`, {
+            const prSummaryUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}`;
+            const response = await this.fetchWithRateLimitRetry(() => fetch(prSummaryUrl, {
                 method: 'GET',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
                     Accept: 'application/vnd.github+json',
                 },
-            }));
+            }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(prSummaryUrl) });
             if (!response.ok) {
                 const reason = await this.formatGitHubErrorWithStatus(response);
                 throw new Error(`Failed to fetch summary for PR ${prUrl}: ${reason}`);
@@ -2338,13 +2366,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             const { owner, repo, issueNumber } = this.parseIssueUrl(issueOrPrUrl);
             const perPage = 100;
             while (true) {
-                const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/${issueNumber}/comments?per_page=${perPage}&page=1`, {
+                const listCommentsUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/${issueNumber}/comments?per_page=${perPage}&page=1`;
+                const response = await this.fetchWithRateLimitRetry(() => fetch(listCommentsUrl, {
                     method: 'GET',
                     headers: {
                         Authorization: `Bearer ${this.ghToken}`,
                         Accept: 'application/vnd.github+json',
                     },
-                }));
+                }), { method: 'GET', path: (0, githubRestClient_1.sanitizeRestPath)(listCommentsUrl) });
                 if (!response.ok) {
                     await this.throwGitHubError(`Failed to fetch comments for ${issueOrPrUrl}`, response);
                 }
@@ -2353,13 +2382,14 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                     throw new Error(`Unexpected response shape when fetching comments for ${issueOrPrUrl}`);
                 }
                 for (const comment of body) {
-                    const deleteResponse = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/comments/${comment.id}`, {
+                    const deleteCommentUrl = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/comments/${comment.id}`;
+                    const deleteResponse = await this.fetchWithRateLimitRetryForWrite(() => fetch(deleteCommentUrl, {
                         method: 'DELETE',
                         headers: {
                             Authorization: `Bearer ${this.ghToken}`,
                             Accept: 'application/vnd.github+json',
                         },
-                    }));
+                    }), { method: 'DELETE', path: (0, githubRestClient_1.sanitizeRestPath)(deleteCommentUrl) });
                     if (!deleteResponse.ok) {
                         await this.throwGitHubError(`Failed to delete comment ${comment.id} on ${issueOrPrUrl}`, deleteResponse);
                     }