[codex] Structure Bitbucket API errors - #3457

Merged
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors
Jun 21, 2026
Merged

[codex] Structure Bitbucket API errors#3457
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors

Conversation

@juliusmarminge

@juliusmarmingejuliusmarminge commented Jun 21, 2026

Copy link
Copy Markdown
Member

Summary

  • replace the free-form BitbucketApiError.detail bucket with distinct Schema error classes for transport, HTTP response, body-read, decode, repository resolution, locator, body-file, and checkout failures
  • expose the union and its Schema.is predicate so checkout preserves already-structured Bitbucket failures by tag
  • retain the existing user-facing messages while attaching operation-specific context, HTTP status/body diagnostics, and immediate causes
  • update the existing Bitbucket API and provider tests with focused coverage for response diagnostics, body-read cause chains, and checkout tag preservation

Validation

  • vp test run apps/server/src/sourceControl/BitbucketApi.test.ts apps/server/src/sourceControl/BitbucketSourceControlProvider.test.ts
  • vp check (passes with 20 pre-existing warnings)
  • vp run typecheck

Note

Medium Risk
Changes error shapes and HTTP failure messaging (no embedded API bodies); callers matching on detail or the old single class need updates, but user-facing messages stay stable and leakage risk is reduced.

Overview
Replaces the monolithic BitbucketApiError (with free-form detail) with tagged Schema error classes and a BitbucketApiError union plus isBitbucketApiError for narrowing.

Failures are split by kind: transport (BitbucketRequestError), HTTP status (BitbucketResponseError with responseBodyLength only—no response body text in messages or fields), body read (BitbucketResponseBodyReadError), JSON decode, repository resolution/locator, PR body file read, and checkout (BitbucketCheckoutError with cwd/reference). checkoutPullRequest re-throws existing union members via isBitbucketApiError instead of re-wrapping.

Tests assert specific error classes, redaction of secrets from diagnostics, body-read cause chains, and provider-layer cause preservation without leaking upstream messages.

Reviewed by Cursor Bugbot for commit d0ebe0d. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Replace generic Bitbucket API errors with typed error classes

  • Introduces specific tagged error classes (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError, BitbucketCheckoutError, BitbucketRepositoryLocatorError, etc.) replacing the previous single BitbucketApiError class in BitbucketApi.ts.
  • Each error class captures structured context (e.g. operation, status, responseBodyLength, cwd, reference) rather than freeform detail strings.
  • Non-2xx response bodies are no longer included in error objects; only the body length is recorded, preventing sensitive content from leaking into diagnostics.
  • BitbucketApiError is now a Schema.Union of all specific error types with an exported isBitbucketApiError predicate.
  • Behavioral Change: callers that previously matched on BitbucketApiError with detail/operation fields must migrate to the new specific error types and their respective fields.

Macroscope summarized d0ebe0d.

@coderabbitai

coderabbitaiBot commented Jun 21, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: e489e8ca-112d-4ca5-86c3-7adb9d4c51f7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/structural-bitbucket-errors

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jun 21, 2026

@macroscopeappmacroscopeappBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Effect service review: one convention issue, recurring across six new error classes in apps/server/src/sourceControl/BitbucketApi.ts.

The split from the generic BitbucketApiError into tagged classes is the right direction. The problem is that six of the new classes encode the same distinction twice — a specific error tag plus a single-value operation literal — which the conventions disallow. The fix is to drop the redundant operation field from those classes (inlining the constant operation name in each message getter) while keeping operation only on the shared multi-operation errors (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError).

Posted via Macroscope — Effect Service Conventions

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
@macroscopeapp

macroscopeappBot commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Refactor that replaces a generic BitbucketApiError with multiple specific error classes for better error handling granularity. Changes are internal to error structure with comprehensive test coverage and include a security improvement by excluding response bodies from error messages.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bb38a29 to ecba319CompareJune 21, 2026 01:01
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:01

Dismissing prior approval to re-evaluate ecba319

macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from ecba319 to bbb7b63CompareJune 21, 2026 01:11

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

Fix All in Cursor

Bugbot Autofix prepared a fix for the issue found in the latest run.

  • ✅ Fixed: Raw response body in message
    • Added a 512-character truncation limit to the HTTP response body in the responseError() function before storing it in BitbucketResponseError, preventing sensitive data exposure and excessively large error payloads.

Create PR

Or push these changes by commenting:

@cursor push 482367cda8
Preview (482367cda8)
diff --git a/apps/server/src/sourceControl/BitbucketApi.ts b/apps/server/src/sourceControl/BitbucketApi.ts--- a/apps/server/src/sourceControl/BitbucketApi.ts+++ b/apps/server/src/sourceControl/BitbucketApi.ts@@ -27,6 +27,8 @@
const DEFAULT_API_BASE_URL = "https://api.bitbucket.org/2.0";
+const MAX_RESPONSE_BODY_LENGTH = 512;+
const BitbucketApiEnvConfig = Config.all({
baseUrl: Config.string("T3CODE_BITBUCKET_API_BASE_URL").pipe(
Config.withDefault(DEFAULT_API_BASE_URL),
@@ -488,15 +490,20 @@
cause,
}),
),
- Effect.flatMap((body) =>- Effect.fail(+ Effect.flatMap((body) => {+ const trimmed = body.trim();+ const bounded =+ trimmed.length > MAX_RESPONSE_BODY_LENGTH+ ? `${trimmed.slice(0, MAX_RESPONSE_BODY_LENGTH)}…`+ : trimmed;+ return Effect.fail(
new BitbucketResponseError({
operation,
status: response.status,
- responseBody: body,+ responseBody: bounded,
}),
- ),- ),+ );+ }),
);
}

You can send follow-ups to the cloud agent here.

Reviewed by Cursor Bugbot for commit bbb7b636b42e7aee50162efa908ef3efd9166455. Configure here.

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bbb7b63 to b6efbe9CompareJune 21, 2026 01:22
juliusmarmingeand others added 2 commits June 20, 2026 18:33
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from b6efbe9 to d0ebe0dCompareJune 21, 2026 01:39
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:39

Dismissing prior approval to re-evaluate d0ebe0d

@juliusmarminge
juliusmarminge merged commit a3dadc0 into mainJun 21, 2026
16 checks passed
@juliusmarminge
juliusmarminge deleted the codex/structural-bitbucket-errors branch June 21, 2026 01:47
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[codex] Structure Bitbucket API errors - #3457

Merged
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors
Jun 21, 2026
Merged

[codex] Structure Bitbucket API errors#3457
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors

Conversation

@juliusmarminge

@juliusmarmingejuliusmarminge commented Jun 21, 2026

Copy link
Copy Markdown
Member

Summary

  • replace the free-form BitbucketApiError.detail bucket with distinct Schema error classes for transport, HTTP response, body-read, decode, repository resolution, locator, body-file, and checkout failures
  • expose the union and its Schema.is predicate so checkout preserves already-structured Bitbucket failures by tag
  • retain the existing user-facing messages while attaching operation-specific context, HTTP status/body diagnostics, and immediate causes
  • update the existing Bitbucket API and provider tests with focused coverage for response diagnostics, body-read cause chains, and checkout tag preservation

Validation

  • vp test run apps/server/src/sourceControl/BitbucketApi.test.ts apps/server/src/sourceControl/BitbucketSourceControlProvider.test.ts
  • vp check (passes with 20 pre-existing warnings)
  • vp run typecheck

Note

Medium Risk
Changes error shapes and HTTP failure messaging (no embedded API bodies); callers matching on detail or the old single class need updates, but user-facing messages stay stable and leakage risk is reduced.

Overview
Replaces the monolithic BitbucketApiError (with free-form detail) with tagged Schema error classes and a BitbucketApiError union plus isBitbucketApiError for narrowing.

Failures are split by kind: transport (BitbucketRequestError), HTTP status (BitbucketResponseError with responseBodyLength only—no response body text in messages or fields), body read (BitbucketResponseBodyReadError), JSON decode, repository resolution/locator, PR body file read, and checkout (BitbucketCheckoutError with cwd/reference). checkoutPullRequest re-throws existing union members via isBitbucketApiError instead of re-wrapping.

Tests assert specific error classes, redaction of secrets from diagnostics, body-read cause chains, and provider-layer cause preservation without leaking upstream messages.

Reviewed by Cursor Bugbot for commit d0ebe0d. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Replace generic Bitbucket API errors with typed error classes

  • Introduces specific tagged error classes (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError, BitbucketCheckoutError, BitbucketRepositoryLocatorError, etc.) replacing the previous single BitbucketApiError class in BitbucketApi.ts.
  • Each error class captures structured context (e.g. operation, status, responseBodyLength, cwd, reference) rather than freeform detail strings.
  • Non-2xx response bodies are no longer included in error objects; only the body length is recorded, preventing sensitive content from leaking into diagnostics.
  • BitbucketApiError is now a Schema.Union of all specific error types with an exported isBitbucketApiError predicate.
  • Behavioral Change: callers that previously matched on BitbucketApiError with detail/operation fields must migrate to the new specific error types and their respective fields.

Macroscope summarized d0ebe0d.

@coderabbitai

coderabbitaiBot commented Jun 21, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: e489e8ca-112d-4ca5-86c3-7adb9d4c51f7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/structural-bitbucket-errors

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jun 21, 2026

@macroscopeappmacroscopeappBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Effect service review: one convention issue, recurring across six new error classes in apps/server/src/sourceControl/BitbucketApi.ts.

The split from the generic BitbucketApiError into tagged classes is the right direction. The problem is that six of the new classes encode the same distinction twice — a specific error tag plus a single-value operation literal — which the conventions disallow. The fix is to drop the redundant operation field from those classes (inlining the constant operation name in each message getter) while keeping operation only on the shared multi-operation errors (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError).

Posted via Macroscope — Effect Service Conventions

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
@macroscopeapp

macroscopeappBot commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Refactor that replaces a generic BitbucketApiError with multiple specific error classes for better error handling granularity. Changes are internal to error structure with comprehensive test coverage and include a security improvement by excluding response bodies from error messages.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bb38a29 to ecba319CompareJune 21, 2026 01:01
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:01

Dismissing prior approval to re-evaluate ecba319

macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from ecba319 to bbb7b63CompareJune 21, 2026 01:11

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

Fix All in Cursor

Bugbot Autofix prepared a fix for the issue found in the latest run.

  • ✅ Fixed: Raw response body in message
    • Added a 512-character truncation limit to the HTTP response body in the responseError() function before storing it in BitbucketResponseError, preventing sensitive data exposure and excessively large error payloads.

Create PR

Or push these changes by commenting:

@cursor push 482367cda8
Preview (482367cda8)
diff --git a/apps/server/src/sourceControl/BitbucketApi.ts b/apps/server/src/sourceControl/BitbucketApi.ts--- a/apps/server/src/sourceControl/BitbucketApi.ts+++ b/apps/server/src/sourceControl/BitbucketApi.ts@@ -27,6 +27,8 @@
const DEFAULT_API_BASE_URL = "https://api.bitbucket.org/2.0";
+const MAX_RESPONSE_BODY_LENGTH = 512;+
const BitbucketApiEnvConfig = Config.all({
baseUrl: Config.string("T3CODE_BITBUCKET_API_BASE_URL").pipe(
Config.withDefault(DEFAULT_API_BASE_URL),
@@ -488,15 +490,20 @@
cause,
}),
),
- Effect.flatMap((body) =>- Effect.fail(+ Effect.flatMap((body) => {+ const trimmed = body.trim();+ const bounded =+ trimmed.length > MAX_RESPONSE_BODY_LENGTH+ ? `${trimmed.slice(0, MAX_RESPONSE_BODY_LENGTH)}…`+ : trimmed;+ return Effect.fail(
new BitbucketResponseError({
operation,
status: response.status,
- responseBody: body,+ responseBody: bounded,
}),
- ),- ),+ );+ }),
);
}

You can send follow-ups to the cloud agent here.

Reviewed by Cursor Bugbot for commit bbb7b636b42e7aee50162efa908ef3efd9166455. Configure here.

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bbb7b63 to b6efbe9CompareJune 21, 2026 01:22
juliusmarmingeand others added 2 commits June 20, 2026 18:33
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from b6efbe9 to d0ebe0dCompareJune 21, 2026 01:39
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:39

Dismissing prior approval to re-evaluate d0ebe0d

@juliusmarminge
juliusmarminge merged commit a3dadc0 into mainJun 21, 2026
16 checks passed
@juliusmarminge
juliusmarminge deleted the codex/structural-bitbucket-errors branch June 21, 2026 01:47
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[codex] Structure Bitbucket API errors - #3457

Merged
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors
Jun 21, 2026
Merged

[codex] Structure Bitbucket API errors#3457
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors

Conversation

@juliusmarminge

@juliusmarmingejuliusmarminge commented Jun 21, 2026

Copy link
Copy Markdown
Member

Summary

  • replace the free-form BitbucketApiError.detail bucket with distinct Schema error classes for transport, HTTP response, body-read, decode, repository resolution, locator, body-file, and checkout failures
  • expose the union and its Schema.is predicate so checkout preserves already-structured Bitbucket failures by tag
  • retain the existing user-facing messages while attaching operation-specific context, HTTP status/body diagnostics, and immediate causes
  • update the existing Bitbucket API and provider tests with focused coverage for response diagnostics, body-read cause chains, and checkout tag preservation

Validation

  • vp test run apps/server/src/sourceControl/BitbucketApi.test.ts apps/server/src/sourceControl/BitbucketSourceControlProvider.test.ts
  • vp check (passes with 20 pre-existing warnings)
  • vp run typecheck

Note

Medium Risk
Changes error shapes and HTTP failure messaging (no embedded API bodies); callers matching on detail or the old single class need updates, but user-facing messages stay stable and leakage risk is reduced.

Overview
Replaces the monolithic BitbucketApiError (with free-form detail) with tagged Schema error classes and a BitbucketApiError union plus isBitbucketApiError for narrowing.

Failures are split by kind: transport (BitbucketRequestError), HTTP status (BitbucketResponseError with responseBodyLength only—no response body text in messages or fields), body read (BitbucketResponseBodyReadError), JSON decode, repository resolution/locator, PR body file read, and checkout (BitbucketCheckoutError with cwd/reference). checkoutPullRequest re-throws existing union members via isBitbucketApiError instead of re-wrapping.

Tests assert specific error classes, redaction of secrets from diagnostics, body-read cause chains, and provider-layer cause preservation without leaking upstream messages.

Reviewed by Cursor Bugbot for commit d0ebe0d. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Replace generic Bitbucket API errors with typed error classes

  • Introduces specific tagged error classes (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError, BitbucketCheckoutError, BitbucketRepositoryLocatorError, etc.) replacing the previous single BitbucketApiError class in BitbucketApi.ts.
  • Each error class captures structured context (e.g. operation, status, responseBodyLength, cwd, reference) rather than freeform detail strings.
  • Non-2xx response bodies are no longer included in error objects; only the body length is recorded, preventing sensitive content from leaking into diagnostics.
  • BitbucketApiError is now a Schema.Union of all specific error types with an exported isBitbucketApiError predicate.
  • Behavioral Change: callers that previously matched on BitbucketApiError with detail/operation fields must migrate to the new specific error types and their respective fields.

Macroscope summarized d0ebe0d.

@coderabbitai

coderabbitaiBot commented Jun 21, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: e489e8ca-112d-4ca5-86c3-7adb9d4c51f7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/structural-bitbucket-errors

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jun 21, 2026

@macroscopeappmacroscopeappBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Effect service review: one convention issue, recurring across six new error classes in apps/server/src/sourceControl/BitbucketApi.ts.

The split from the generic BitbucketApiError into tagged classes is the right direction. The problem is that six of the new classes encode the same distinction twice — a specific error tag plus a single-value operation literal — which the conventions disallow. The fix is to drop the redundant operation field from those classes (inlining the constant operation name in each message getter) while keeping operation only on the shared multi-operation errors (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError).

Posted via Macroscope — Effect Service Conventions

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
@macroscopeapp

macroscopeappBot commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Refactor that replaces a generic BitbucketApiError with multiple specific error classes for better error handling granularity. Changes are internal to error structure with comprehensive test coverage and include a security improvement by excluding response bodies from error messages.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bb38a29 to ecba319CompareJune 21, 2026 01:01
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:01

Dismissing prior approval to re-evaluate ecba319

macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from ecba319 to bbb7b63CompareJune 21, 2026 01:11

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

Fix All in Cursor

Bugbot Autofix prepared a fix for the issue found in the latest run.

  • ✅ Fixed: Raw response body in message
    • Added a 512-character truncation limit to the HTTP response body in the responseError() function before storing it in BitbucketResponseError, preventing sensitive data exposure and excessively large error payloads.

Create PR

Or push these changes by commenting:

@cursor push 482367cda8
Preview (482367cda8)
diff --git a/apps/server/src/sourceControl/BitbucketApi.ts b/apps/server/src/sourceControl/BitbucketApi.ts--- a/apps/server/src/sourceControl/BitbucketApi.ts+++ b/apps/server/src/sourceControl/BitbucketApi.ts@@ -27,6 +27,8 @@
const DEFAULT_API_BASE_URL = "https://api.bitbucket.org/2.0";
+const MAX_RESPONSE_BODY_LENGTH = 512;+
const BitbucketApiEnvConfig = Config.all({
baseUrl: Config.string("T3CODE_BITBUCKET_API_BASE_URL").pipe(
Config.withDefault(DEFAULT_API_BASE_URL),
@@ -488,15 +490,20 @@
cause,
}),
),
- Effect.flatMap((body) =>- Effect.fail(+ Effect.flatMap((body) => {+ const trimmed = body.trim();+ const bounded =+ trimmed.length > MAX_RESPONSE_BODY_LENGTH+ ? `${trimmed.slice(0, MAX_RESPONSE_BODY_LENGTH)}…`+ : trimmed;+ return Effect.fail(
new BitbucketResponseError({
operation,
status: response.status,
- responseBody: body,+ responseBody: bounded,
}),
- ),- ),+ );+ }),
);
}

You can send follow-ups to the cloud agent here.

Reviewed by Cursor Bugbot for commit bbb7b636b42e7aee50162efa908ef3efd9166455. Configure here.

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bbb7b63 to b6efbe9CompareJune 21, 2026 01:22
juliusmarmingeand others added 2 commits June 20, 2026 18:33
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from b6efbe9 to d0ebe0dCompareJune 21, 2026 01:39
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:39

Dismissing prior approval to re-evaluate d0ebe0d

@juliusmarminge
juliusmarminge merged commit a3dadc0 into mainJun 21, 2026
16 checks passed
@juliusmarminge
juliusmarminge deleted the codex/structural-bitbucket-errors branch June 21, 2026 01:47
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[codex] Structure Bitbucket API errors - #3457

Merged
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors
Jun 21, 2026
Merged

[codex] Structure Bitbucket API errors#3457
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors

Conversation

@juliusmarminge

@juliusmarmingejuliusmarminge commented Jun 21, 2026

Copy link
Copy Markdown
Member

Summary

  • replace the free-form BitbucketApiError.detail bucket with distinct Schema error classes for transport, HTTP response, body-read, decode, repository resolution, locator, body-file, and checkout failures
  • expose the union and its Schema.is predicate so checkout preserves already-structured Bitbucket failures by tag
  • retain the existing user-facing messages while attaching operation-specific context, HTTP status/body diagnostics, and immediate causes
  • update the existing Bitbucket API and provider tests with focused coverage for response diagnostics, body-read cause chains, and checkout tag preservation

Validation

  • vp test run apps/server/src/sourceControl/BitbucketApi.test.ts apps/server/src/sourceControl/BitbucketSourceControlProvider.test.ts
  • vp check (passes with 20 pre-existing warnings)
  • vp run typecheck

Note

Medium Risk
Changes error shapes and HTTP failure messaging (no embedded API bodies); callers matching on detail or the old single class need updates, but user-facing messages stay stable and leakage risk is reduced.

Overview
Replaces the monolithic BitbucketApiError (with free-form detail) with tagged Schema error classes and a BitbucketApiError union plus isBitbucketApiError for narrowing.

Failures are split by kind: transport (BitbucketRequestError), HTTP status (BitbucketResponseError with responseBodyLength only—no response body text in messages or fields), body read (BitbucketResponseBodyReadError), JSON decode, repository resolution/locator, PR body file read, and checkout (BitbucketCheckoutError with cwd/reference). checkoutPullRequest re-throws existing union members via isBitbucketApiError instead of re-wrapping.

Tests assert specific error classes, redaction of secrets from diagnostics, body-read cause chains, and provider-layer cause preservation without leaking upstream messages.

Reviewed by Cursor Bugbot for commit d0ebe0d. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Replace generic Bitbucket API errors with typed error classes

  • Introduces specific tagged error classes (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError, BitbucketCheckoutError, BitbucketRepositoryLocatorError, etc.) replacing the previous single BitbucketApiError class in BitbucketApi.ts.
  • Each error class captures structured context (e.g. operation, status, responseBodyLength, cwd, reference) rather than freeform detail strings.
  • Non-2xx response bodies are no longer included in error objects; only the body length is recorded, preventing sensitive content from leaking into diagnostics.
  • BitbucketApiError is now a Schema.Union of all specific error types with an exported isBitbucketApiError predicate.
  • Behavioral Change: callers that previously matched on BitbucketApiError with detail/operation fields must migrate to the new specific error types and their respective fields.

Macroscope summarized d0ebe0d.

@coderabbitai

coderabbitaiBot commented Jun 21, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: e489e8ca-112d-4ca5-86c3-7adb9d4c51f7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/structural-bitbucket-errors

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jun 21, 2026

@macroscopeappmacroscopeappBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Effect service review: one convention issue, recurring across six new error classes in apps/server/src/sourceControl/BitbucketApi.ts.

The split from the generic BitbucketApiError into tagged classes is the right direction. The problem is that six of the new classes encode the same distinction twice — a specific error tag plus a single-value operation literal — which the conventions disallow. The fix is to drop the redundant operation field from those classes (inlining the constant operation name in each message getter) while keeping operation only on the shared multi-operation errors (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError).

Posted via Macroscope — Effect Service Conventions

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
@macroscopeapp

macroscopeappBot commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Refactor that replaces a generic BitbucketApiError with multiple specific error classes for better error handling granularity. Changes are internal to error structure with comprehensive test coverage and include a security improvement by excluding response bodies from error messages.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bb38a29 to ecba319CompareJune 21, 2026 01:01
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:01

Dismissing prior approval to re-evaluate ecba319

macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from ecba319 to bbb7b63CompareJune 21, 2026 01:11

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

Fix All in Cursor

Bugbot Autofix prepared a fix for the issue found in the latest run.

  • ✅ Fixed: Raw response body in message
    • Added a 512-character truncation limit to the HTTP response body in the responseError() function before storing it in BitbucketResponseError, preventing sensitive data exposure and excessively large error payloads.

Create PR

Or push these changes by commenting:

@cursor push 482367cda8
Preview (482367cda8)
diff --git a/apps/server/src/sourceControl/BitbucketApi.ts b/apps/server/src/sourceControl/BitbucketApi.ts--- a/apps/server/src/sourceControl/BitbucketApi.ts+++ b/apps/server/src/sourceControl/BitbucketApi.ts@@ -27,6 +27,8 @@
const DEFAULT_API_BASE_URL = "https://api.bitbucket.org/2.0";
+const MAX_RESPONSE_BODY_LENGTH = 512;+
const BitbucketApiEnvConfig = Config.all({
baseUrl: Config.string("T3CODE_BITBUCKET_API_BASE_URL").pipe(
Config.withDefault(DEFAULT_API_BASE_URL),
@@ -488,15 +490,20 @@
cause,
}),
),
- Effect.flatMap((body) =>- Effect.fail(+ Effect.flatMap((body) => {+ const trimmed = body.trim();+ const bounded =+ trimmed.length > MAX_RESPONSE_BODY_LENGTH+ ? `${trimmed.slice(0, MAX_RESPONSE_BODY_LENGTH)}…`+ : trimmed;+ return Effect.fail(
new BitbucketResponseError({
operation,
status: response.status,
- responseBody: body,+ responseBody: bounded,
}),
- ),- ),+ );+ }),
);
}

You can send follow-ups to the cloud agent here.

Reviewed by Cursor Bugbot for commit bbb7b636b42e7aee50162efa908ef3efd9166455. Configure here.

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bbb7b63 to b6efbe9CompareJune 21, 2026 01:22
juliusmarmingeand others added 2 commits June 20, 2026 18:33
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from b6efbe9 to d0ebe0dCompareJune 21, 2026 01:39
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:39

Dismissing prior approval to re-evaluate d0ebe0d

@juliusmarminge
juliusmarminge merged commit a3dadc0 into mainJun 21, 2026
16 checks passed
@juliusmarminge
juliusmarminge deleted the codex/structural-bitbucket-errors branch June 21, 2026 01:47
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[codex] Structure Bitbucket API errors - #3457

Merged
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors
Jun 21, 2026
Merged

[codex] Structure Bitbucket API errors#3457
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors

Conversation

@juliusmarminge

@juliusmarmingejuliusmarminge commented Jun 21, 2026

Copy link
Copy Markdown
Member

Summary

  • replace the free-form BitbucketApiError.detail bucket with distinct Schema error classes for transport, HTTP response, body-read, decode, repository resolution, locator, body-file, and checkout failures
  • expose the union and its Schema.is predicate so checkout preserves already-structured Bitbucket failures by tag
  • retain the existing user-facing messages while attaching operation-specific context, HTTP status/body diagnostics, and immediate causes
  • update the existing Bitbucket API and provider tests with focused coverage for response diagnostics, body-read cause chains, and checkout tag preservation

Validation

  • vp test run apps/server/src/sourceControl/BitbucketApi.test.ts apps/server/src/sourceControl/BitbucketSourceControlProvider.test.ts
  • vp check (passes with 20 pre-existing warnings)
  • vp run typecheck

Note

Medium Risk
Changes error shapes and HTTP failure messaging (no embedded API bodies); callers matching on detail or the old single class need updates, but user-facing messages stay stable and leakage risk is reduced.

Overview
Replaces the monolithic BitbucketApiError (with free-form detail) with tagged Schema error classes and a BitbucketApiError union plus isBitbucketApiError for narrowing.

Failures are split by kind: transport (BitbucketRequestError), HTTP status (BitbucketResponseError with responseBodyLength only—no response body text in messages or fields), body read (BitbucketResponseBodyReadError), JSON decode, repository resolution/locator, PR body file read, and checkout (BitbucketCheckoutError with cwd/reference). checkoutPullRequest re-throws existing union members via isBitbucketApiError instead of re-wrapping.

Tests assert specific error classes, redaction of secrets from diagnostics, body-read cause chains, and provider-layer cause preservation without leaking upstream messages.

Reviewed by Cursor Bugbot for commit d0ebe0d. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Replace generic Bitbucket API errors with typed error classes

  • Introduces specific tagged error classes (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError, BitbucketCheckoutError, BitbucketRepositoryLocatorError, etc.) replacing the previous single BitbucketApiError class in BitbucketApi.ts.
  • Each error class captures structured context (e.g. operation, status, responseBodyLength, cwd, reference) rather than freeform detail strings.
  • Non-2xx response bodies are no longer included in error objects; only the body length is recorded, preventing sensitive content from leaking into diagnostics.
  • BitbucketApiError is now a Schema.Union of all specific error types with an exported isBitbucketApiError predicate.
  • Behavioral Change: callers that previously matched on BitbucketApiError with detail/operation fields must migrate to the new specific error types and their respective fields.

Macroscope summarized d0ebe0d.

@coderabbitai

coderabbitaiBot commented Jun 21, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: e489e8ca-112d-4ca5-86c3-7adb9d4c51f7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/structural-bitbucket-errors

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jun 21, 2026

@macroscopeappmacroscopeappBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Effect service review: one convention issue, recurring across six new error classes in apps/server/src/sourceControl/BitbucketApi.ts.

The split from the generic BitbucketApiError into tagged classes is the right direction. The problem is that six of the new classes encode the same distinction twice — a specific error tag plus a single-value operation literal — which the conventions disallow. The fix is to drop the redundant operation field from those classes (inlining the constant operation name in each message getter) while keeping operation only on the shared multi-operation errors (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError).

Posted via Macroscope — Effect Service Conventions

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
@macroscopeapp

macroscopeappBot commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Refactor that replaces a generic BitbucketApiError with multiple specific error classes for better error handling granularity. Changes are internal to error structure with comprehensive test coverage and include a security improvement by excluding response bodies from error messages.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bb38a29 to ecba319CompareJune 21, 2026 01:01
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:01

Dismissing prior approval to re-evaluate ecba319

macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from ecba319 to bbb7b63CompareJune 21, 2026 01:11

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

Fix All in Cursor

Bugbot Autofix prepared a fix for the issue found in the latest run.

  • ✅ Fixed: Raw response body in message
    • Added a 512-character truncation limit to the HTTP response body in the responseError() function before storing it in BitbucketResponseError, preventing sensitive data exposure and excessively large error payloads.

Create PR

Or push these changes by commenting:

@cursor push 482367cda8
Preview (482367cda8)
diff --git a/apps/server/src/sourceControl/BitbucketApi.ts b/apps/server/src/sourceControl/BitbucketApi.ts--- a/apps/server/src/sourceControl/BitbucketApi.ts+++ b/apps/server/src/sourceControl/BitbucketApi.ts@@ -27,6 +27,8 @@
const DEFAULT_API_BASE_URL = "https://api.bitbucket.org/2.0";
+const MAX_RESPONSE_BODY_LENGTH = 512;+
const BitbucketApiEnvConfig = Config.all({
baseUrl: Config.string("T3CODE_BITBUCKET_API_BASE_URL").pipe(
Config.withDefault(DEFAULT_API_BASE_URL),
@@ -488,15 +490,20 @@
cause,
}),
),
- Effect.flatMap((body) =>- Effect.fail(+ Effect.flatMap((body) => {+ const trimmed = body.trim();+ const bounded =+ trimmed.length > MAX_RESPONSE_BODY_LENGTH+ ? `${trimmed.slice(0, MAX_RESPONSE_BODY_LENGTH)}…`+ : trimmed;+ return Effect.fail(
new BitbucketResponseError({
operation,
status: response.status,
- responseBody: body,+ responseBody: bounded,
}),
- ),- ),+ );+ }),
);
}

You can send follow-ups to the cloud agent here.

Reviewed by Cursor Bugbot for commit bbb7b636b42e7aee50162efa908ef3efd9166455. Configure here.

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bbb7b63 to b6efbe9CompareJune 21, 2026 01:22
juliusmarmingeand others added 2 commits June 20, 2026 18:33
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from b6efbe9 to d0ebe0dCompareJune 21, 2026 01:39
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:39

Dismissing prior approval to re-evaluate d0ebe0d

@juliusmarminge
juliusmarminge merged commit a3dadc0 into mainJun 21, 2026
16 checks passed
@juliusmarminge
juliusmarminge deleted the codex/structural-bitbucket-errors branch June 21, 2026 01:47
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[codex] Structure Bitbucket API errors - #3457

Merged
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors
Jun 21, 2026
Merged

[codex] Structure Bitbucket API errors#3457
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors

Conversation

@juliusmarminge

@juliusmarmingejuliusmarminge commented Jun 21, 2026

Copy link
Copy Markdown
Member

Summary

  • replace the free-form BitbucketApiError.detail bucket with distinct Schema error classes for transport, HTTP response, body-read, decode, repository resolution, locator, body-file, and checkout failures
  • expose the union and its Schema.is predicate so checkout preserves already-structured Bitbucket failures by tag
  • retain the existing user-facing messages while attaching operation-specific context, HTTP status/body diagnostics, and immediate causes
  • update the existing Bitbucket API and provider tests with focused coverage for response diagnostics, body-read cause chains, and checkout tag preservation

Validation

  • vp test run apps/server/src/sourceControl/BitbucketApi.test.ts apps/server/src/sourceControl/BitbucketSourceControlProvider.test.ts
  • vp check (passes with 20 pre-existing warnings)
  • vp run typecheck

Note

Medium Risk
Changes error shapes and HTTP failure messaging (no embedded API bodies); callers matching on detail or the old single class need updates, but user-facing messages stay stable and leakage risk is reduced.

Overview
Replaces the monolithic BitbucketApiError (with free-form detail) with tagged Schema error classes and a BitbucketApiError union plus isBitbucketApiError for narrowing.

Failures are split by kind: transport (BitbucketRequestError), HTTP status (BitbucketResponseError with responseBodyLength only—no response body text in messages or fields), body read (BitbucketResponseBodyReadError), JSON decode, repository resolution/locator, PR body file read, and checkout (BitbucketCheckoutError with cwd/reference). checkoutPullRequest re-throws existing union members via isBitbucketApiError instead of re-wrapping.

Tests assert specific error classes, redaction of secrets from diagnostics, body-read cause chains, and provider-layer cause preservation without leaking upstream messages.

Reviewed by Cursor Bugbot for commit d0ebe0d. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Replace generic Bitbucket API errors with typed error classes

  • Introduces specific tagged error classes (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError, BitbucketCheckoutError, BitbucketRepositoryLocatorError, etc.) replacing the previous single BitbucketApiError class in BitbucketApi.ts.
  • Each error class captures structured context (e.g. operation, status, responseBodyLength, cwd, reference) rather than freeform detail strings.
  • Non-2xx response bodies are no longer included in error objects; only the body length is recorded, preventing sensitive content from leaking into diagnostics.
  • BitbucketApiError is now a Schema.Union of all specific error types with an exported isBitbucketApiError predicate.
  • Behavioral Change: callers that previously matched on BitbucketApiError with detail/operation fields must migrate to the new specific error types and their respective fields.

Macroscope summarized d0ebe0d.

@coderabbitai

coderabbitaiBot commented Jun 21, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: e489e8ca-112d-4ca5-86c3-7adb9d4c51f7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/structural-bitbucket-errors

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jun 21, 2026

@macroscopeappmacroscopeappBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Effect service review: one convention issue, recurring across six new error classes in apps/server/src/sourceControl/BitbucketApi.ts.

The split from the generic BitbucketApiError into tagged classes is the right direction. The problem is that six of the new classes encode the same distinction twice — a specific error tag plus a single-value operation literal — which the conventions disallow. The fix is to drop the redundant operation field from those classes (inlining the constant operation name in each message getter) while keeping operation only on the shared multi-operation errors (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError).

Posted via Macroscope — Effect Service Conventions

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
@macroscopeapp

macroscopeappBot commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Refactor that replaces a generic BitbucketApiError with multiple specific error classes for better error handling granularity. Changes are internal to error structure with comprehensive test coverage and include a security improvement by excluding response bodies from error messages.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bb38a29 to ecba319CompareJune 21, 2026 01:01
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:01

Dismissing prior approval to re-evaluate ecba319

macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from ecba319 to bbb7b63CompareJune 21, 2026 01:11

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

Fix All in Cursor

Bugbot Autofix prepared a fix for the issue found in the latest run.

  • ✅ Fixed: Raw response body in message
    • Added a 512-character truncation limit to the HTTP response body in the responseError() function before storing it in BitbucketResponseError, preventing sensitive data exposure and excessively large error payloads.

Create PR

Or push these changes by commenting:

@cursor push 482367cda8
Preview (482367cda8)
diff --git a/apps/server/src/sourceControl/BitbucketApi.ts b/apps/server/src/sourceControl/BitbucketApi.ts--- a/apps/server/src/sourceControl/BitbucketApi.ts+++ b/apps/server/src/sourceControl/BitbucketApi.ts@@ -27,6 +27,8 @@
const DEFAULT_API_BASE_URL = "https://api.bitbucket.org/2.0";
+const MAX_RESPONSE_BODY_LENGTH = 512;+
const BitbucketApiEnvConfig = Config.all({
baseUrl: Config.string("T3CODE_BITBUCKET_API_BASE_URL").pipe(
Config.withDefault(DEFAULT_API_BASE_URL),
@@ -488,15 +490,20 @@
cause,
}),
),
- Effect.flatMap((body) =>- Effect.fail(+ Effect.flatMap((body) => {+ const trimmed = body.trim();+ const bounded =+ trimmed.length > MAX_RESPONSE_BODY_LENGTH+ ? `${trimmed.slice(0, MAX_RESPONSE_BODY_LENGTH)}…`+ : trimmed;+ return Effect.fail(
new BitbucketResponseError({
operation,
status: response.status,
- responseBody: body,+ responseBody: bounded,
}),
- ),- ),+ );+ }),
);
}

You can send follow-ups to the cloud agent here.

Reviewed by Cursor Bugbot for commit bbb7b636b42e7aee50162efa908ef3efd9166455. Configure here.

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bbb7b63 to b6efbe9CompareJune 21, 2026 01:22
juliusmarmingeand others added 2 commits June 20, 2026 18:33
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from b6efbe9 to d0ebe0dCompareJune 21, 2026 01:39
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:39

Dismissing prior approval to re-evaluate d0ebe0d

@juliusmarminge
juliusmarminge merged commit a3dadc0 into mainJun 21, 2026
16 checks passed
@juliusmarminge
juliusmarminge deleted the codex/structural-bitbucket-errors branch June 21, 2026 01:47
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[codex] Structure Bitbucket API errors - #3457

Merged
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors
Jun 21, 2026
Merged

[codex] Structure Bitbucket API errors#3457
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors

Conversation

@juliusmarminge

@juliusmarmingejuliusmarminge commented Jun 21, 2026

Copy link
Copy Markdown
Member

Summary

  • replace the free-form BitbucketApiError.detail bucket with distinct Schema error classes for transport, HTTP response, body-read, decode, repository resolution, locator, body-file, and checkout failures
  • expose the union and its Schema.is predicate so checkout preserves already-structured Bitbucket failures by tag
  • retain the existing user-facing messages while attaching operation-specific context, HTTP status/body diagnostics, and immediate causes
  • update the existing Bitbucket API and provider tests with focused coverage for response diagnostics, body-read cause chains, and checkout tag preservation

Validation

  • vp test run apps/server/src/sourceControl/BitbucketApi.test.ts apps/server/src/sourceControl/BitbucketSourceControlProvider.test.ts
  • vp check (passes with 20 pre-existing warnings)
  • vp run typecheck

Note

Medium Risk
Changes error shapes and HTTP failure messaging (no embedded API bodies); callers matching on detail or the old single class need updates, but user-facing messages stay stable and leakage risk is reduced.

Overview
Replaces the monolithic BitbucketApiError (with free-form detail) with tagged Schema error classes and a BitbucketApiError union plus isBitbucketApiError for narrowing.

Failures are split by kind: transport (BitbucketRequestError), HTTP status (BitbucketResponseError with responseBodyLength only—no response body text in messages or fields), body read (BitbucketResponseBodyReadError), JSON decode, repository resolution/locator, PR body file read, and checkout (BitbucketCheckoutError with cwd/reference). checkoutPullRequest re-throws existing union members via isBitbucketApiError instead of re-wrapping.

Tests assert specific error classes, redaction of secrets from diagnostics, body-read cause chains, and provider-layer cause preservation without leaking upstream messages.

Reviewed by Cursor Bugbot for commit d0ebe0d. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Replace generic Bitbucket API errors with typed error classes

  • Introduces specific tagged error classes (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError, BitbucketCheckoutError, BitbucketRepositoryLocatorError, etc.) replacing the previous single BitbucketApiError class in BitbucketApi.ts.
  • Each error class captures structured context (e.g. operation, status, responseBodyLength, cwd, reference) rather than freeform detail strings.
  • Non-2xx response bodies are no longer included in error objects; only the body length is recorded, preventing sensitive content from leaking into diagnostics.
  • BitbucketApiError is now a Schema.Union of all specific error types with an exported isBitbucketApiError predicate.
  • Behavioral Change: callers that previously matched on BitbucketApiError with detail/operation fields must migrate to the new specific error types and their respective fields.

Macroscope summarized d0ebe0d.

@coderabbitai

coderabbitaiBot commented Jun 21, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: e489e8ca-112d-4ca5-86c3-7adb9d4c51f7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/structural-bitbucket-errors

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jun 21, 2026

@macroscopeappmacroscopeappBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Effect service review: one convention issue, recurring across six new error classes in apps/server/src/sourceControl/BitbucketApi.ts.

The split from the generic BitbucketApiError into tagged classes is the right direction. The problem is that six of the new classes encode the same distinction twice — a specific error tag plus a single-value operation literal — which the conventions disallow. The fix is to drop the redundant operation field from those classes (inlining the constant operation name in each message getter) while keeping operation only on the shared multi-operation errors (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError).

Posted via Macroscope — Effect Service Conventions

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
@macroscopeapp

macroscopeappBot commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Refactor that replaces a generic BitbucketApiError with multiple specific error classes for better error handling granularity. Changes are internal to error structure with comprehensive test coverage and include a security improvement by excluding response bodies from error messages.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bb38a29 to ecba319CompareJune 21, 2026 01:01
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:01

Dismissing prior approval to re-evaluate ecba319

macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from ecba319 to bbb7b63CompareJune 21, 2026 01:11

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

Fix All in Cursor

Bugbot Autofix prepared a fix for the issue found in the latest run.

  • ✅ Fixed: Raw response body in message
    • Added a 512-character truncation limit to the HTTP response body in the responseError() function before storing it in BitbucketResponseError, preventing sensitive data exposure and excessively large error payloads.

Create PR

Or push these changes by commenting:

@cursor push 482367cda8
Preview (482367cda8)
diff --git a/apps/server/src/sourceControl/BitbucketApi.ts b/apps/server/src/sourceControl/BitbucketApi.ts--- a/apps/server/src/sourceControl/BitbucketApi.ts+++ b/apps/server/src/sourceControl/BitbucketApi.ts@@ -27,6 +27,8 @@
const DEFAULT_API_BASE_URL = "https://api.bitbucket.org/2.0";
+const MAX_RESPONSE_BODY_LENGTH = 512;+
const BitbucketApiEnvConfig = Config.all({
baseUrl: Config.string("T3CODE_BITBUCKET_API_BASE_URL").pipe(
Config.withDefault(DEFAULT_API_BASE_URL),
@@ -488,15 +490,20 @@
cause,
}),
),
- Effect.flatMap((body) =>- Effect.fail(+ Effect.flatMap((body) => {+ const trimmed = body.trim();+ const bounded =+ trimmed.length > MAX_RESPONSE_BODY_LENGTH+ ? `${trimmed.slice(0, MAX_RESPONSE_BODY_LENGTH)}…`+ : trimmed;+ return Effect.fail(
new BitbucketResponseError({
operation,
status: response.status,
- responseBody: body,+ responseBody: bounded,
}),
- ),- ),+ );+ }),
);
}

You can send follow-ups to the cloud agent here.

Reviewed by Cursor Bugbot for commit bbb7b636b42e7aee50162efa908ef3efd9166455. Configure here.

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bbb7b63 to b6efbe9CompareJune 21, 2026 01:22
juliusmarmingeand others added 2 commits June 20, 2026 18:33
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from b6efbe9 to d0ebe0dCompareJune 21, 2026 01:39
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:39

Dismissing prior approval to re-evaluate d0ebe0d

@juliusmarminge
juliusmarminge merged commit a3dadc0 into mainJun 21, 2026
16 checks passed
@juliusmarminge
juliusmarminge deleted the codex/structural-bitbucket-errors branch June 21, 2026 01:47
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[codex] Structure Bitbucket API errors - #3457

Merged
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors
Jun 21, 2026
Merged

[codex] Structure Bitbucket API errors#3457
juliusmarminge merged 2 commits into
mainfrom
codex/structural-bitbucket-errors

Conversation

@juliusmarminge

@juliusmarmingejuliusmarminge commented Jun 21, 2026

Copy link
Copy Markdown
Member

Summary

  • replace the free-form BitbucketApiError.detail bucket with distinct Schema error classes for transport, HTTP response, body-read, decode, repository resolution, locator, body-file, and checkout failures
  • expose the union and its Schema.is predicate so checkout preserves already-structured Bitbucket failures by tag
  • retain the existing user-facing messages while attaching operation-specific context, HTTP status/body diagnostics, and immediate causes
  • update the existing Bitbucket API and provider tests with focused coverage for response diagnostics, body-read cause chains, and checkout tag preservation

Validation

  • vp test run apps/server/src/sourceControl/BitbucketApi.test.ts apps/server/src/sourceControl/BitbucketSourceControlProvider.test.ts
  • vp check (passes with 20 pre-existing warnings)
  • vp run typecheck

Note

Medium Risk
Changes error shapes and HTTP failure messaging (no embedded API bodies); callers matching on detail or the old single class need updates, but user-facing messages stay stable and leakage risk is reduced.

Overview
Replaces the monolithic BitbucketApiError (with free-form detail) with tagged Schema error classes and a BitbucketApiError union plus isBitbucketApiError for narrowing.

Failures are split by kind: transport (BitbucketRequestError), HTTP status (BitbucketResponseError with responseBodyLength only—no response body text in messages or fields), body read (BitbucketResponseBodyReadError), JSON decode, repository resolution/locator, PR body file read, and checkout (BitbucketCheckoutError with cwd/reference). checkoutPullRequest re-throws existing union members via isBitbucketApiError instead of re-wrapping.

Tests assert specific error classes, redaction of secrets from diagnostics, body-read cause chains, and provider-layer cause preservation without leaking upstream messages.

Reviewed by Cursor Bugbot for commit d0ebe0d. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Replace generic Bitbucket API errors with typed error classes

  • Introduces specific tagged error classes (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError, BitbucketCheckoutError, BitbucketRepositoryLocatorError, etc.) replacing the previous single BitbucketApiError class in BitbucketApi.ts.
  • Each error class captures structured context (e.g. operation, status, responseBodyLength, cwd, reference) rather than freeform detail strings.
  • Non-2xx response bodies are no longer included in error objects; only the body length is recorded, preventing sensitive content from leaking into diagnostics.
  • BitbucketApiError is now a Schema.Union of all specific error types with an exported isBitbucketApiError predicate.
  • Behavioral Change: callers that previously matched on BitbucketApiError with detail/operation fields must migrate to the new specific error types and their respective fields.

Macroscope summarized d0ebe0d.

@coderabbitai

coderabbitaiBot commented Jun 21, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: e489e8ca-112d-4ca5-86c3-7adb9d4c51f7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/structural-bitbucket-errors

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jun 21, 2026

@macroscopeappmacroscopeappBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Effect service review: one convention issue, recurring across six new error classes in apps/server/src/sourceControl/BitbucketApi.ts.

The split from the generic BitbucketApiError into tagged classes is the right direction. The problem is that six of the new classes encode the same distinction twice — a specific error tag plus a single-value operation literal — which the conventions disallow. The fix is to drop the redundant operation field from those classes (inlining the constant operation name in each message getter) while keeping operation only on the shared multi-operation errors (BitbucketRequestError, BitbucketResponseError, BitbucketResponseBodyReadError, BitbucketResponseDecodeError).

Posted via Macroscope — Effect Service Conventions

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
@macroscopeapp

macroscopeappBot commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Refactor that replaces a generic BitbucketApiError with multiple specific error classes for better error handling granularity. Changes are internal to error structure with comprehensive test coverage and include a security improvement by excluding response bodies from error messages.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bb38a29 to ecba319CompareJune 21, 2026 01:01
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:01

Dismissing prior approval to re-evaluate ecba319

macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 21, 2026
Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from ecba319 to bbb7b63CompareJune 21, 2026 01:11

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

Fix All in Cursor

Bugbot Autofix prepared a fix for the issue found in the latest run.

  • ✅ Fixed: Raw response body in message
    • Added a 512-character truncation limit to the HTTP response body in the responseError() function before storing it in BitbucketResponseError, preventing sensitive data exposure and excessively large error payloads.

Create PR

Or push these changes by commenting:

@cursor push 482367cda8
Preview (482367cda8)
diff --git a/apps/server/src/sourceControl/BitbucketApi.ts b/apps/server/src/sourceControl/BitbucketApi.ts--- a/apps/server/src/sourceControl/BitbucketApi.ts+++ b/apps/server/src/sourceControl/BitbucketApi.ts@@ -27,6 +27,8 @@
const DEFAULT_API_BASE_URL = "https://api.bitbucket.org/2.0";
+const MAX_RESPONSE_BODY_LENGTH = 512;+
const BitbucketApiEnvConfig = Config.all({
baseUrl: Config.string("T3CODE_BITBUCKET_API_BASE_URL").pipe(
Config.withDefault(DEFAULT_API_BASE_URL),
@@ -488,15 +490,20 @@
cause,
}),
),
- Effect.flatMap((body) =>- Effect.fail(+ Effect.flatMap((body) => {+ const trimmed = body.trim();+ const bounded =+ trimmed.length > MAX_RESPONSE_BODY_LENGTH+ ? `${trimmed.slice(0, MAX_RESPONSE_BODY_LENGTH)}…`+ : trimmed;+ return Effect.fail(
new BitbucketResponseError({
operation,
status: response.status,
- responseBody: body,+ responseBody: bounded,
}),
- ),- ),+ );+ }),
);
}

You can send follow-ups to the cloud agent here.

Reviewed by Cursor Bugbot for commit bbb7b636b42e7aee50162efa908ef3efd9166455. Configure here.

Comment threadapps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from bbb7b63 to b6efbe9CompareJune 21, 2026 01:22
juliusmarmingeand others added 2 commits June 20, 2026 18:33
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed the codex/structural-bitbucket-errors branch from b6efbe9 to d0ebe0dCompareJune 21, 2026 01:39
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 21, 2026 01:39

Dismissing prior approval to re-evaluate d0ebe0d

@juliusmarminge
juliusmarminge merged commit a3dadc0 into mainJun 21, 2026
16 checks passed
@juliusmarminge
juliusmarminge deleted the codex/structural-bitbucket-errors branch June 21, 2026 01:47
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge