authorgravatar for julius0216@outlook.comJulius Marminge <julius0216@outlook.com> 2026-06-20 18:47:12-07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2026-06-20 18:47:12-07:00
loga3dadc04bf38b49bc8476a8e6c59bda7dc81d2e4
treed9ed773dbe21867e612dcebfe06af1b4dde15e58
parent1a59277dc84105e2131c2bc828deb51c0b12d7f6
signature Signed by PGP key B5690EEEBB952194

[codex] Structure Bitbucket API errors (#3457)

Co-authored-by: codex <codex@users.noreply.github.com>

3 files changed, 239 insertions(+), 49 deletions(-)

apps/server/src/sourceControl/BitbucketApi.test.ts+59-3
...@@ -533,8 +533,8 @@ it.effect("preserves the HTTP client failure without deriving the domain message...@@ -533,8 +533,8 @@ it.effect("preserves the HTTP client failure without deriving the domain message
533 }),533 }),
534 );534 );
535535
536 assert.instanceOf(error, BitbucketApi.BitbucketRequestError);
536 assert.strictEqual(error.operation, "getPullRequest");537 assert.strictEqual(error.operation, "getPullRequest");
537 assert.strictEqual(error.detail, "Failed to send the Bitbucket request.");
538 assert.strictEqual(538 assert.strictEqual(
539 error.message,539 error.message,
540 "Bitbucket API failed in getPullRequest: Failed to send the Bitbucket request.",540 "Bitbucket API failed in getPullRequest: Failed to send the Bitbucket request.",
...@@ -544,6 +544,61 @@ it.effect("preserves the HTTP client failure without deriving the domain message...@@ -544,6 +544,61 @@ it.effect("preserves the HTTP client failure without deriving the domain message
544 }).pipe(Effect.provide(layer));544 }).pipe(Effect.provide(layer));
545});545});
546546
547it.effect("keeps Bitbucket response bodies out of checkout diagnostics", () => {
548 const responseBody = '{"error":{"message":"credential=secret-value"}}';
549 const { layer } = makeLayer({
550 response: () => new Response(responseBody, { status: 403 }),
551 });
552
553 return Effect.gen(function* () {
554 const bitbucket = yield* BitbucketApi.BitbucketApi;
555 const error = yield* bitbucket
556 .checkoutPullRequest({ cwd: "/repo", reference: "42" })
557 .pipe(Effect.flip);
558
559 assert.instanceOf(error, BitbucketApi.BitbucketResponseError);
560 assert.strictEqual(error.operation, "getPullRequest");
561 assert.strictEqual(error.status, 403);
562 assert.strictEqual(error.responseBodyLength, responseBody.length);
563 assert.notProperty(error, "responseBody");
564 assert.strictEqual(
565 error.message,
566 "Bitbucket API failed in getPullRequest: Bitbucket returned HTTP 403.",
567 );
568 assert.notInclude(error.message, "secret-value");
569 }).pipe(Effect.provide(layer));
570});
571
572it.effect("preserves Bitbucket response body read failures as their immediate cause", () => {
573 const cause = new Error("response stream failed");
574 const { layer } = makeLayer({
575 response: () =>
576 new Response(
577 new ReadableStream<Uint8Array>({
578 start: (controller) => controller.error(cause),
579 }),
580 { status: 502 },
581 ),
582 });
583
584 return Effect.gen(function* () {
585 const bitbucket = yield* BitbucketApi.BitbucketApi;
586 const error = yield* bitbucket
587 .getPullRequest({ cwd: "/repo", reference: "42" })
588 .pipe(Effect.flip);
589
590 assert.instanceOf(error, BitbucketApi.BitbucketResponseBodyReadError);
591 assert.strictEqual(error.operation, "getPullRequest");
592 assert.strictEqual(error.status, 502);
593 assert.instanceOf(error.cause, HttpClientError.HttpClientError);
594 assert.strictEqual(error.cause.cause, cause);
595 assert.strictEqual(
596 error.message,
597 "Bitbucket API failed in getPullRequest: Bitbucket returned HTTP 502.",
598 );
599 }).pipe(Effect.provide(layer));
600});
601
547it.effect("checks out same-repository pull requests with the existing Bitbucket remote", () => {602it.effect("checks out same-repository pull requests with the existing Bitbucket remote", () => {
548 const { git, layer } = makeLayer({603 const { git, layer } = makeLayer({
549 response: () =>604 response: () =>
...@@ -630,8 +685,9 @@ it.effect("preserves Git checkout failures without deriving the domain message f...@@ -630,8 +685,9 @@ it.effect("preserves Git checkout failures without deriving the domain message f
630 }),685 }),
631 );686 );
632687
633 assert.strictEqual(error.operation, "checkoutPullRequest");688 assert.instanceOf(error, BitbucketApi.BitbucketCheckoutError);
634 assert.strictEqual(error.detail, "Failed to check out the Bitbucket pull request.");689 assert.strictEqual(error.cwd, "/repo");
690 assert.strictEqual(error.reference, "42");
635 assert.strictEqual(691 assert.strictEqual(
636 error.message,692 error.message,
637 "Bitbucket API failed in checkoutPullRequest: Failed to check out the Bitbucket pull request.",693 "Bitbucket API failed in checkoutPullRequest: Failed to check out the Bitbucket pull request.",
apps/server/src/sourceControl/BitbucketApi.ts+176-41
...@@ -6,6 +6,7 @@ import * as Layer from "effect/Layer";...@@ -6,6 +6,7 @@ import * as Layer from "effect/Layer";
6import * as Option from "effect/Option";6import * as Option from "effect/Option";
7import * as Schema from "effect/Schema";7import * as Schema from "effect/Schema";
8import {8import {
9 NonNegativeInt,
9 TrimmedNonEmptyString,10 TrimmedNonEmptyString,
10 type SourceControlProviderAuth,11 type SourceControlProviderAuth,
11 type SourceControlRepositoryCloneUrls,12 type SourceControlRepositoryCloneUrls,
...@@ -36,20 +37,156 @@ const BitbucketApiEnvConfig = Config.all({...@@ -36,20 +37,156 @@ const BitbucketApiEnvConfig = Config.all({
36 apiToken: Config.string("T3CODE_BITBUCKET_API_TOKEN").pipe(Config.option),37 apiToken: Config.string("T3CODE_BITBUCKET_API_TOKEN").pipe(Config.option),
37});38});
3839
39export class BitbucketApiError extends Schema.TaggedErrorClass<BitbucketApiError>()(40const BitbucketApiOperation = Schema.Literals([
40 "BitbucketApiError",41 "resolveRepository",
42 "getRepository",
43 "getBranchingModel",
44 "getPullRequest",
45 "listPullRequests",
46 "createRepository",
47 "createPullRequest",
48 "probeAuth",
49 "checkoutPullRequest",
50]);
51type BitbucketApiOperation = typeof BitbucketApiOperation.Type;
52
53export class BitbucketRepositoryLocatorError extends Schema.TaggedErrorClass<BitbucketRepositoryLocatorError>()(
54 "BitbucketRepositoryLocatorError",
41 {55 {
42 operation: Schema.String,56 repository: Schema.String,
43 detail: Schema.String,
44 status: Schema.optional(Schema.Number),
45 cause: Schema.optional(Schema.Defect()),
46 },57 },
47) {58) {
48 override get message(): string {59 override get message(): string {
49 return `Bitbucket API failed in ${this.operation}: ${this.detail}`;60 return "Bitbucket API failed in createRepository: Bitbucket repositories must be specified as workspace/repository.";
50 }61 }
51}62}
52const isBitbucketApiError = Schema.is(BitbucketApiError);63
64export class BitbucketRequestError extends Schema.TaggedErrorClass<BitbucketRequestError>()(
65 "BitbucketRequestError",
66 {
67 operation: BitbucketApiOperation,
68 cause: Schema.Defect(),
69 },
70) {
71 override get message(): string {
72 return `Bitbucket API failed in ${this.operation}: Failed to send the Bitbucket request.`;
73 }
74}
75
76export class BitbucketResponseError extends Schema.TaggedErrorClass<BitbucketResponseError>()(
77 "BitbucketResponseError",
78 {
79 operation: BitbucketApiOperation,
80 status: Schema.Int,
81 responseBodyLength: NonNegativeInt,
82 },
83) {
84 override get message(): string {
85 return `Bitbucket API failed in ${this.operation}: Bitbucket returned HTTP ${this.status}.`;
86 }
87}
88
89export class BitbucketResponseBodyReadError extends Schema.TaggedErrorClass<BitbucketResponseBodyReadError>()(
90 "BitbucketResponseBodyReadError",
91 {
92 operation: BitbucketApiOperation,
93 status: Schema.Int,
94 cause: Schema.Defect(),
95 },
96) {
97 override get message(): string {
98 return `Bitbucket API failed in ${this.operation}: Bitbucket returned HTTP ${this.status}.`;
99 }
100}
101
102export class BitbucketResponseDecodeError extends Schema.TaggedErrorClass<BitbucketResponseDecodeError>()(
103 "BitbucketResponseDecodeError",
104 {
105 operation: BitbucketApiOperation,
106 status: Schema.Int,
107 cause: Schema.Defect(),
108 },
109) {
110 override get message(): string {
111 return `Bitbucket API failed in ${this.operation}: Bitbucket returned invalid JSON for the requested resource.`;
112 }
113}
114
115export class BitbucketRepositoryVcsResolveError extends Schema.TaggedErrorClass<BitbucketRepositoryVcsResolveError>()(
116 "BitbucketRepositoryVcsResolveError",
117 {
118 cwd: Schema.String,
119 cause: Schema.Defect(),
120 },
121) {
122 override get message(): string {
123 return `Bitbucket API failed in resolveRepository: Failed to resolve VCS repository for ${this.cwd}.`;
124 }
125}
126
127export class BitbucketRepositoryRemotesListError extends Schema.TaggedErrorClass<BitbucketRepositoryRemotesListError>()(
128 "BitbucketRepositoryRemotesListError",
129 {
130 cwd: Schema.String,
131 cause: Schema.Defect(),
132 },
133) {
134 override get message(): string {
135 return `Bitbucket API failed in resolveRepository: Failed to list remotes for ${this.cwd}.`;
136 }
137}
138
139export class BitbucketRepositoryRemoteNotFoundError extends Schema.TaggedErrorClass<BitbucketRepositoryRemoteNotFoundError>()(
140 "BitbucketRepositoryRemoteNotFoundError",
141 {
142 cwd: Schema.String,
143 },
144) {
145 override get message(): string {
146 return `Bitbucket API failed in resolveRepository: No Bitbucket repository remote was detected for ${this.cwd}.`;
147 }
148}
149
150export class BitbucketPullRequestBodyReadError extends Schema.TaggedErrorClass<BitbucketPullRequestBodyReadError>()(
151 "BitbucketPullRequestBodyReadError",
152 {
153 cwd: Schema.String,
154 bodyFile: Schema.String,
155 cause: Schema.Defect(),
156 },
157) {
158 override get message(): string {
159 return `Bitbucket API failed in createPullRequest: Failed to read pull request body file ${this.bodyFile}.`;
160 }
161}
162
163export class BitbucketCheckoutError extends Schema.TaggedErrorClass<BitbucketCheckoutError>()(
164 "BitbucketCheckoutError",
165 {
166 cwd: Schema.String,
167 reference: Schema.String,
168 cause: Schema.Defect(),
169 },
170) {
171 override get message(): string {
172 return "Bitbucket API failed in checkoutPullRequest: Failed to check out the Bitbucket pull request.";
173 }
174}
175
176export const BitbucketApiError = Schema.Union([
177 BitbucketRepositoryLocatorError,
178 BitbucketRequestError,
179 BitbucketResponseError,
180 BitbucketResponseBodyReadError,
181 BitbucketResponseDecodeError,
182 BitbucketRepositoryVcsResolveError,
183 BitbucketRepositoryRemotesListError,
184 BitbucketRepositoryRemoteNotFoundError,
185 BitbucketPullRequestBodyReadError,
186 BitbucketCheckoutError,
187]);
188export type BitbucketApiError = typeof BitbucketApiError.Type;
189export const isBitbucketApiError = Schema.is(BitbucketApiError);
53190
54const RawBitbucketRepositorySchema = Schema.Struct({191const RawBitbucketRepositorySchema = Schema.Struct({
55 full_name: TrimmedNonEmptyString,192 full_name: TrimmedNonEmptyString,
...@@ -209,16 +346,14 @@ function parseBitbucketRepositorySlug(value: string): BitbucketRepositoryLocator...@@ -209,16 +346,14 @@ function parseBitbucketRepositorySlug(value: string): BitbucketRepositoryLocator
209}346}
210347
211function requireRepositoryLocator(348function requireRepositoryLocator(
212 operation: string,
213 repository: string,349 repository: string,
214): Effect.Effect<BitbucketRepositoryLocator, BitbucketApiError> {350): Effect.Effect<BitbucketRepositoryLocator, BitbucketApiError> {
215 const locator = parseBitbucketRepositorySlug(repository);351 const locator = parseBitbucketRepositorySlug(repository);
216 return locator352 return locator
217 ? Effect.succeed(locator)353 ? Effect.succeed(locator)
218 : Effect.fail(354 : Effect.fail(
219 new BitbucketApiError({355 new BitbucketRepositoryLocatorError({
220 operation,356 repository,
221 detail: "Bitbucket repositories must be specified as workspace/repository.",
222 }),357 }),
223 );358 );
224}359}
...@@ -339,20 +474,24 @@ function authFromConfig(...@@ -339,20 +474,24 @@ function authFromConfig(
339}474}
340475
341function responseError(476function responseError(
342 operation: string,477 operation: BitbucketApiOperation,
343 response: HttpClientResponse.HttpClientResponse,478 response: HttpClientResponse.HttpClientResponse,
344): Effect.Effect<never, BitbucketApiError> {479): Effect.Effect<never, BitbucketApiError> {
345 return response.text.pipe(480 return response.text.pipe(
346 Effect.orElseSucceed(() => ""),481 Effect.mapError(
482 (cause) =>
483 new BitbucketResponseBodyReadError({
484 operation,
485 status: response.status,
486 cause,
487 }),
488 ),
347 Effect.flatMap((body) =>489 Effect.flatMap((body) =>
348 Effect.fail(490 Effect.fail(
349 new BitbucketApiError({491 new BitbucketResponseError({
350 operation,492 operation,
351 status: response.status,493 status: response.status,
352 detail:494 responseBodyLength: body.length,
353 body.trim().length > 0
354 ? `Bitbucket returned HTTP ${response.status}: ${body.trim()}`
355 : `Bitbucket returned HTTP ${response.status}.`,
356 }),495 }),
357 ),496 ),
358 ),497 ),
...@@ -379,7 +518,7 @@ export const make = Effect.gen(function* () {...@@ -379,7 +518,7 @@ export const make = Effect.gen(function* () {
379 };518 };
380519
381 const decodeResponse = <S extends Schema.Top>(520 const decodeResponse = <S extends Schema.Top>(
382 operation: string,521 operation: BitbucketApiOperation,
383 schema: S,522 schema: S,
384 response: HttpClientResponse.HttpClientResponse,523 response: HttpClientResponse.HttpClientResponse,
385 ): Effect.Effect<S["Type"], BitbucketApiError, S["DecodingServices"]> =>524 ): Effect.Effect<S["Type"], BitbucketApiError, S["DecodingServices"]> =>
...@@ -388,9 +527,9 @@ export const make = Effect.gen(function* () {...@@ -388,9 +527,9 @@ export const make = Effect.gen(function* () {
388 HttpClientResponse.schemaBodyJson(schema)(success).pipe(527 HttpClientResponse.schemaBodyJson(schema)(success).pipe(
389 Effect.mapError(528 Effect.mapError(
390 (cause) =>529 (cause) =>
391 new BitbucketApiError({530 new BitbucketResponseDecodeError({
392 operation,531 operation,
393 detail: "Bitbucket returned invalid JSON for the requested resource.",532 status: success.status,
394 cause,533 cause,
395 }),534 }),
396 ),535 ),
...@@ -399,16 +538,15 @@ export const make = Effect.gen(function* () {...@@ -399,16 +538,15 @@ export const make = Effect.gen(function* () {
399 })(response);538 })(response);
400539
401 const executeJson = <S extends Schema.Top>(540 const executeJson = <S extends Schema.Top>(
402 operation: string,541 operation: BitbucketApiOperation,
403 request: HttpClientRequest.HttpClientRequest,542 request: HttpClientRequest.HttpClientRequest,
404 schema: S,543 schema: S,
405 ): Effect.Effect<S["Type"], BitbucketApiError, S["DecodingServices"]> =>544 ): Effect.Effect<S["Type"], BitbucketApiError, S["DecodingServices"]> =>
406 httpClient.execute(withAuth(request.pipe(HttpClientRequest.acceptJson))).pipe(545 httpClient.execute(withAuth(request.pipe(HttpClientRequest.acceptJson))).pipe(
407 Effect.mapError(546 Effect.mapError(
408 (cause) =>547 (cause) =>
409 new BitbucketApiError({548 new BitbucketRequestError({
410 operation,549 operation,
411 detail: "Failed to send the Bitbucket request.",
412 cause,550 cause,
413 }),551 }),
414 ),552 ),
...@@ -433,9 +571,8 @@ export const make = Effect.gen(function* () {...@@ -433,9 +571,8 @@ export const make = Effect.gen(function* () {
433 const handle = yield* vcsRegistry.resolve({ cwd: input.cwd }).pipe(571 const handle = yield* vcsRegistry.resolve({ cwd: input.cwd }).pipe(
434 Effect.mapError(572 Effect.mapError(
435 (cause) =>573 (cause) =>
436 new BitbucketApiError({574 new BitbucketRepositoryVcsResolveError({
437 operation: "resolveRepository",575 cwd: input.cwd,
438 detail: `Failed to resolve VCS repository for ${input.cwd}.`,
439 cause,576 cause,
440 }),577 }),
441 ),578 ),
...@@ -443,9 +580,8 @@ export const make = Effect.gen(function* () {...@@ -443,9 +580,8 @@ export const make = Effect.gen(function* () {
443 const remotes = yield* handle.driver.listRemotes(input.cwd).pipe(580 const remotes = yield* handle.driver.listRemotes(input.cwd).pipe(
444 Effect.mapError(581 Effect.mapError(
445 (cause) =>582 (cause) =>
446 new BitbucketApiError({583 new BitbucketRepositoryRemotesListError({
447 operation: "resolveRepository",584 cwd: input.cwd,
448 detail: `Failed to list remotes for ${input.cwd}.`,
449 cause,585 cause,
450 }),586 }),
451 ),587 ),
...@@ -457,9 +593,8 @@ export const make = Effect.gen(function* () {...@@ -457,9 +593,8 @@ export const make = Effect.gen(function* () {
457 if (parsed) return parsed;593 if (parsed) return parsed;
458 }594 }
459595
460 return yield* new BitbucketApiError({596 return yield* new BitbucketRepositoryRemoteNotFoundError({
461 operation: "resolveRepository",597 cwd: input.cwd,
462 detail: `No Bitbucket repository remote was detected for ${input.cwd}.`,
463 });598 });
464 });599 });
465600
...@@ -600,7 +735,7 @@ export const make = Effect.gen(function* () {...@@ -600,7 +735,7 @@ export const make = Effect.gen(function* () {
600 getRepositoryCloneUrls: (input) =>735 getRepositoryCloneUrls: (input) =>
601 getRepository(input).pipe(Effect.map(normalizeRepositoryCloneUrls)),736 getRepository(input).pipe(Effect.map(normalizeRepositoryCloneUrls)),
602 createRepository: (input) =>737 createRepository: (input) =>
603 requireRepositoryLocator("createRepository", input.repository).pipe(738 requireRepositoryLocator(input.repository).pipe(
604 Effect.flatMap((repository) =>739 Effect.flatMap((repository) =>
605 executeJson(740 executeJson(
606 "createRepository",741 "createRepository",
...@@ -625,9 +760,9 @@ export const make = Effect.gen(function* () {...@@ -625,9 +760,9 @@ export const make = Effect.gen(function* () {
625 const description = yield* fileSystem.readFileString(input.bodyFile).pipe(760 const description = yield* fileSystem.readFileString(input.bodyFile).pipe(
626 Effect.mapError(761 Effect.mapError(
627 (cause) =>762 (cause) =>
628 new BitbucketApiError({763 new BitbucketPullRequestBodyReadError({
629 operation: "createPullRequest",764 cwd: input.cwd,
630 detail: `Failed to read pull request body file ${input.bodyFile}.`,765 bodyFile: input.bodyFile,
631 cause,766 cause,
632 }),767 }),
633 ),768 ),
...@@ -743,9 +878,9 @@ export const make = Effect.gen(function* () {...@@ -743,9 +878,9 @@ export const make = Effect.gen(function* () {
743 Effect.mapError((cause) =>878 Effect.mapError((cause) =>
744 isBitbucketApiError(cause)879 isBitbucketApiError(cause)
745 ? cause880 ? cause
746 : new BitbucketApiError({881 : new BitbucketCheckoutError({
747 operation: "checkoutPullRequest",882 cwd: input.cwd,
748 detail: "Failed to check out the Bitbucket pull request.",883 reference: input.reference,
749 cause,884 cause,
750 }),885 }),
751 ),886 ),
apps/server/src/sourceControl/BitbucketSourceControlProvider.test.ts+4-5
...@@ -53,11 +53,10 @@ it.effect("maps Bitbucket PR summaries into provider-neutral change requests", (...@@ -53,11 +53,10 @@ it.effect("maps Bitbucket PR summaries into provider-neutral change requests", (
5353
54it.effect("adds repository context while retaining Bitbucket API causes", () =>54it.effect("adds repository context while retaining Bitbucket API causes", () =>
55 Effect.gen(function* () {55 Effect.gen(function* () {
56 const cause = new BitbucketApi.BitbucketApiError({56 const upstreamCause = new Error("raw upstream failure");
57 const cause = new BitbucketApi.BitbucketRequestError({
57 operation: "getRepository",58 operation: "getRepository",
58 detail: "upstream detail that should remain in the cause",59 cause: upstreamCause,
59 status: 503,
60 cause: new Error("raw upstream failure"),
61 });60 });
62 const provider = yield* makeProvider({61 const provider = yield* makeProvider({
63 getRepositoryCloneUrls: () => Effect.fail(cause),62 getRepositoryCloneUrls: () => Effect.fail(cause),
...@@ -86,7 +85,7 @@ it.effect("adds repository context while retaining Bitbucket API causes", () =>...@@ -86,7 +85,7 @@ it.effect("adds repository context while retaining Bitbucket API causes", () =>
86 },85 },
87 );86 );
88 assert.strictEqual(error.cause, cause);87 assert.strictEqual(error.cause, cause);
89 assert.equal(error.message.includes(cause.detail), false);88 assert.equal(error.message.includes(upstreamCause.message), false);
90 }),89 }),
91);90);
9291