@devries-cameron20 / t3code Mirror · read-only / commits / 9bc3fda0ac
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 08:30 UTC

fix(azure-devops): pull requests show their labels (#38018)

Julius Marminge committed Nov 17, 2026 at 01:02 UTC 9bc3fda0ac28020977c8adc89422c2d6c6c0e907
6 files changed +82 -5
packages/source-control-azure-devops/src/server/AzureDevOpsPullRequestCli.test.ts
+7 -2
@@ -189,7 +189,10 @@ layer("AzureDevOpsPullRequestCli.layer", (it) => {
189 ),
190 )
191 .mockReturnValueOnce(Effect.succeed(output(json({ changeEntries: [] }))))
192 - .mockReturnValueOnce(Effect.succeed(output("[]")));
192 + .mockReturnValueOnce(Effect.succeed(output("[]")))
193 + .mockReturnValueOnce(
194 + Effect.succeed(output(json({ count: 1, value: [{ id: "4f1c", name: "release-1.0" }] }))),
195 + );
196 const provider = yield* AzureDevOpsPullRequestProvider.make;
197 const detail = yield* provider.getChangeRequest({
198 cwd: "/w",
@@ -200,7 +203,9 @@ layer("AzureDevOpsPullRequestCli.layer", (it) => {
203
204 expect(detail.headSha).toBe(latestHead);
205 expect(argsOfCall(2)).toContain("iterationId=2");
203 - expect(mockedExecute).toHaveBeenCalledTimes(4);
206 + expect(argsOfCall(4)).toContain("pullRequestLabels");
207 + expect(detail.labels).toEqual([{ name: "release-1.0", color: null }]);
208 + expect(mockedExecute).toHaveBeenCalledTimes(5);
209 }),
210 );
211
packages/source-control-azure-devops/src/server/AzureDevOpsPullRequestCli.ts
+19
@@ -9,6 +9,7 @@ import type {
9 PullRequestCheck,
10 PullRequestComment,
11 PullRequestInvolvement,
12 + PullRequestLabel,
13 PullRequestListState,
14 PullRequestMergeMethod,
15 } from "@t3tools/contracts";
@@ -21,6 +22,7 @@ import {
22 decodeItemContentJson,
23 decodeIterationChangesJson,
24 decodeIterationsJson,
25 + decodeLabelsJson,
26 decodePolicyChecksJson,
27 decodePullRequestJson,
28 decodePullRequestListJson,
@@ -186,6 +188,13 @@ export class AzureDevOpsPullRequestCli extends Context.Service<
188 readonly number: number;
189 }) => Effect.Effect<ReadonlyArray<PullRequestComment>, AzureDevOpsPullRequestCliError>;
190
191 + /** `az repos pr show` returns null labels, so the detail reads them here. */
192 + readonly listLabels: (input: {
193 + readonly cwd: string;
194 + readonly location: AzureDevOpsRepositoryLocation;
195 + readonly number: number;
196 + }) => Effect.Effect<ReadonlyArray<PullRequestLabel>, AzureDevOpsPullRequestCliError>;
197 +
198 readonly listIterations: (input: {
199 readonly cwd: string;
200 readonly location: AzureDevOpsRepositoryLocation;
@@ -627,6 +636,16 @@ export const make = Effect.gen(function* () {
636 });
637 }),
638
639 + listLabels: Effect.fn("AzureDevOpsPullRequestCli.listLabels")(function (input) {
640 + return invoke({
641 + cwd: input.cwd,
642 + operation: "listLabels",
643 + resource: "pullRequestLabels",
644 + routeParameters: pullRequestRoute(input),
645 + decode: decodeLabelsJson,
646 + });
647 + }),
648 +
649 listIterations: Effect.fn("AzureDevOpsPullRequestCli.listIterations")(function (input) {
650 return invoke({
651 cwd: input.cwd,
packages/source-control-azure-devops/src/server/AzureDevOpsPullRequestProvider.test.ts
+5
@@ -39,6 +39,7 @@ const PULL_REQUEST = {
39 body: "",
40 reviewRequestLogins: [],
41 reviewers: [],
42 + labels: [],
43 location: { project: "acme", repository: "web" },
44 autoMergeEnabled: false,
45 };
@@ -138,6 +139,7 @@ describe("getChangeRequest", () => {
139 Layer.mock(AzureDevOpsPullRequestCli.AzureDevOpsPullRequestCli)({
140 getPullRequest: () => Effect.succeed(PULL_REQUEST),
141 listPolicyChecks: () => Effect.succeed([]),
142 + listLabels: () => Effect.succeed([]),
143 listIterations: () =>
144 Effect.succeed([ITERATION, { ...ITERATION, id: 4, headCommit: "new-head" }]),
145 listIterationChanges: () =>
@@ -173,6 +175,7 @@ describe("getChangeRequest", () => {
175 Layer.mock(AzureDevOpsPullRequestCli.AzureDevOpsPullRequestCli)({
176 getPullRequest: () => Effect.succeed(PULL_REQUEST),
177 listPolicyChecks: () => Effect.succeed([]),
178 + listLabels: () => Effect.succeed([]),
179 listIterations: () =>
180 state === "missing"
181 ? Effect.succeed([])
@@ -218,6 +221,7 @@ describe("getChangeRequest", () => {
221 Effect.succeed({ contents: side("new", 2, 4), isBinary: false }),
222 ...NO_BLOBS,
223 listPolicyChecks: () => Effect.succeed([]),
224 + listLabels: () => Effect.succeed([]),
225 listThreads: () => Effect.succeed([]),
226 }),
227 ),
@@ -273,6 +277,7 @@ describe("policy checks", () => {
277 listIterations: () => Effect.succeed([ITERATION]),
278 listIterationChanges: () => Effect.succeed({ changes: [], truncated: false }),
279 listPolicyChecks,
280 + listLabels: () => Effect.succeed([]),
281 }),
282 ),
283 );
packages/source-control-azure-devops/src/server/AzureDevOpsPullRequestProvider.ts
+8 -2
@@ -149,8 +149,7 @@ function toChangeRequest(pullRequest: AzureDevOpsPullRequest): ProviderChangeReq
149 mergedAt: pullRequest.state === "merged" ? pullRequest.closedAt : null,
150 updatedAt: pullRequest.updatedAt,
151 reviewRequestLogins: pullRequest.reviewRequestLogins,
152 - // Azure keeps labels on work items rather than on the pull request.
153 - labels: [],
152 + labels: pullRequest.labels,
153 };
154 }
155
@@ -465,8 +464,15 @@ export const make = Effect.gen(function* () {
464 Effect.orElseSucceed(() => 0),
465 );
466 const checks = yield* readChecks(input, pullRequest).pipe(Effect.orElseSucceed(() => []));
467 + const labels =
468 + location === null
469 + ? pullRequest.labels
470 + : yield* cli
471 + .listLabels({ cwd: input.cwd, location, number: input.number })
472 + .pipe(Effect.orElseSucceed(() => pullRequest.labels));
473 const detail: ProviderChangeRequestDetail = {
474 ...toChangeRequest(pullRequest),
475 + labels,
476 body: pullRequest.body,
477 ...(headSha === undefined ? {} : { headSha }),
478 changedFiles,
packages/source-control-azure-devops/src/server/azureDevOpsPullRequestJson.test.ts
+10 -1
@@ -42,7 +42,15 @@ const asJson = (value: unknown) => JSON.stringify(value);
42
43 describe("decodePullRequestListJson", () => {
44 it("reads a pull request as a change request", () => {
45 - const batch = expectSuccess(decodePullRequestListJson(asJson([pullRequest()])));
45 + const batch = expectSuccess(
46 + decodePullRequestListJson(
47 + asJson([
48 + pullRequest({
49 + labels: [{ id: "4f1c", name: "release-1.0", active: true, url: null }],
50 + }),
51 + ]),
52 + ),
53 + );
54
55 expect(batch.items).toHaveLength(1);
56 expect(batch.items[0]).toMatchObject({
@@ -54,6 +62,7 @@ describe("decodePullRequestListJson", () => {
62 state: "open",
63 isDraft: false,
64 mergeability: "mergeable",
65 + labels: [{ name: "release-1.0" }],
66 });
67 });
68
packages/source-control-azure-devops/src/server/azureDevOpsPullRequestJson.ts
+33
@@ -10,6 +10,7 @@ import type {
10 PullRequestActor,
11 PullRequestCheck,
12 PullRequestComment,
13 + PullRequestLabel,
14 PullRequestMergeMethod,
15 PullRequestMergeability,
16 PullRequestState,
@@ -26,6 +27,8 @@ const RawIdentitySchema = Schema.Struct({
27 imageUrl: Schema.optional(Schema.NullOr(Schema.String)),
28 });
29
30 +const RawLabelSchema = Schema.Struct({ name: Schema.optional(Schema.NullOr(Schema.String)) });
31 +
32 const RawPullRequestSchema = Schema.Struct({
33 pullRequestId: Schema.Int,
34 title: Schema.String,
@@ -45,6 +48,8 @@ const RawPullRequestSchema = Schema.Struct({
48 mergeStatus: Schema.optional(Schema.NullOr(Schema.String)),
49 createdBy: Schema.optional(Schema.NullOr(RawIdentitySchema)),
50 reviewers: Schema.optional(Schema.NullOr(Schema.Array(RawIdentitySchema))),
51 + /** `az repos pr list` fills this; `az repos pr show` returns null. */
52 + labels: Schema.optional(Schema.NullOr(Schema.Array(RawLabelSchema))),
53 sourceRefName: TrimmedNonEmptyString,
54 targetRefName: TrimmedNonEmptyString,
55 creationDate: TrimmedNonEmptyString,
@@ -158,6 +163,7 @@ export interface AzureDevOpsPullRequest {
163 readonly body: string;
164 readonly reviewRequestLogins: ReadonlyArray<string>;
165 readonly reviewers: ReadonlyArray<PullRequestActor>;
166 + readonly labels: ReadonlyArray<PullRequestLabel>;
167 readonly location: AzureDevOpsRepositoryLocation | null;
168 readonly autoMergeEnabled: boolean;
169 readonly autoMergeMethod?: PullRequestMergeMethod;
@@ -171,6 +177,15 @@ function toActor(raw: Schema.Schema.Type<typeof RawIdentitySchema> | null | unde
177 : { login, name: trimmed(raw?.displayName), avatarUrl: trimmed(raw?.imageUrl) };
178 }
179
180 +function toLabels(
181 + raw: ReadonlyArray<Schema.Schema.Type<typeof RawLabelSchema>> | null | undefined,
182 +): ReadonlyArray<PullRequestLabel> {
183 + return (raw ?? []).flatMap((label) => {
184 + const name = trimmed(label.name);
185 + return name === null ? [] : [{ name, color: null }];
186 + });
187 +}
188 +
189 function toState(raw: Schema.Schema.Type<typeof RawPullRequestSchema>): PullRequestState {
190 switch (raw.status?.trim().toLowerCase()) {
191 case "completed":
@@ -259,6 +274,7 @@ function toPullRequest(
274 body: raw.description ?? "",
275 reviewRequestLogins: reviewers.map((reviewer) => reviewer.login),
276 reviewers,
277 + labels: toLabels(raw.labels),
278 location: toLocation(raw),
279 autoMergeEnabled: (raw.autoCompleteSetBy ?? null) !== null,
280 ...(autoMergeMethod === undefined ? {} : { autoMergeMethod }),
@@ -271,6 +287,8 @@ const decodePullRequest = decodeJsonResult(RawPullRequestSchema);
287 const decodeThreadPage = decodeJsonResult(RawThreadPageSchema);
288 const decodeThreadEntry = Schema.decodeUnknownExit(RawThreadSchema);
289 const decodeViewer = decodeJsonResult(RawViewerSchema);
290 +const decodeLabelPage = decodeJsonResult(Schema.Struct({ value: Schema.Array(Schema.Unknown) }));
291 +const decodeLabelEntry = Schema.decodeUnknownExit(RawLabelSchema);
292 const decodePolicyEvaluations = decodeJsonResult(Schema.Array(RawPolicyEvaluationSchema));
293
294 type DecodeFailure = Cause.Cause<Schema.SchemaError>;
@@ -320,6 +338,21 @@ export function decodeViewerJson(raw: string): Result.Result<string | null, Deco
338 : Result.fail(decoded.failure);
339 }
340
341 +export function decodeLabelsJson(
342 + raw: string,
343 +): Result.Result<ReadonlyArray<PullRequestLabel>, DecodeFailure> {
344 + const decoded = decodeLabelPage(raw);
345 + if (!Result.isSuccess(decoded)) return Result.fail(decoded.failure);
346 + return Result.succeed(
347 + toLabels(
348 + decoded.success.value.flatMap((entry) => {
349 + const label = decodeLabelEntry(entry);
350 + return Exit.isFailure(label) ? [] : [label.value];
351 + }),
352 + ),
353 + );
354 +}
355 +
356 export function decodeThreadsJson(
357 raw: string,
358 ): Result.Result<ReadonlyArray<PullRequestComment>, DecodeFailure> {