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

@juliusmarminge juliusmarminge 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

coderabbitai Bot 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-actions github-actions Bot 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

@macroscopeapp macroscopeapp Bot 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 thread apps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment thread apps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment thread apps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment thread apps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment thread apps/server/src/sourceControl/BitbucketApi.ts Outdated
Comment thread apps/server/src/sourceControl/BitbucketApi.ts Outdated
macroscopeapp[bot]
macroscopeapp Bot previously approved these changes Jun 21, 2026
@macroscopeapp

macroscopeapp Bot 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
juliusmarminge force-pushed the codex/structural-bitbucket-errors branch from bb38a29 to ecba319 Compare June 21, 2026 01:01
@macroscopeapp
macroscopeapp Bot dismissed their stale review June 21, 2026 01:01

Dismissing prior approval to re-evaluate ecba319

macroscopeapp[bot]
macroscopeapp Bot previously approved these changes Jun 21, 2026
Comment thread apps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarminge force-pushed the codex/structural-bitbucket-errors branch from ecba319 to bbb7b63 Compare June 21, 2026 01:11

@cursor cursor Bot 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 bbb7b63. Configure here.

Comment thread apps/server/src/sourceControl/BitbucketApi.ts Outdated
@juliusmarminge
juliusmarminge force-pushed the codex/structural-bitbucket-errors branch from bbb7b63 to b6efbe9 Compare June 21, 2026 01:22
juliusmarminge and 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
juliusmarminge force-pushed the codex/structural-bitbucket-errors branch from b6efbe9 to d0ebe0d Compare June 21, 2026 01:39
@macroscopeapp
macroscopeapp Bot dismissed their stale review June 21, 2026 01:39

Dismissing prior approval to re-evaluate d0ebe0d

@juliusmarminge
juliusmarminge merged commit a3dadc0 into main Jun 21, 2026
16 checks passed
@juliusmarminge
juliusmarminge deleted the codex/structural-bitbucket-errors branch June 21, 2026 01:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L 100-499 changed lines (additions + deletions). vouch:trusted PR 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