Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

[codex] Structure Azure DevOps CLI failures (#3460)

Julius Marminged389cfd4e39e
diff --git a/apps/server/src/sourceControl/AzureDevOpsCli.test.ts b/apps/server/src/sourceControl/AzureDevOpsCli.test.ts
index 8617f14e3..1cd4b3885 100644
--- a/apps/server/src/sourceControl/AzureDevOpsCli.test.ts
+++ b/apps/server/src/sourceControl/AzureDevOpsCli.test.ts
@@ -4,8 +4,9 @@ import * as Effect from "effect/Effect";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
+import * as PlatformError from "effect/PlatformError";
import { ChildProcessSpawner } from "effect/unstable/process";
-import { VcsProcessExitError } from "@t3tools/contracts";
+import { VcsProcessExitError, VcsProcessSpawnError } from "@t3tools/contracts";
import * as VcsProcess from "../vcs/VcsProcess.ts";
import * as AzureDevOpsCli from "./AzureDevOpsCli.ts";
@@ -345,11 +346,63 @@ describe("AzureDevOpsCli.layer", () => {
const az = yield* AzureDevOpsCli.AzureDevOpsCli;
const error = yield* az.execute({ cwd: "/repo", args: ["repos", "list"] }).pipe(Effect.flip);
+ assert.instanceOf(error, AzureDevOpsCli.AzureDevOpsCommandFailedError);
+ assert.strictEqual(error.operation, "execute");
assert.strictEqual(error.command, "az");
assert.strictEqual(error.cwd, "/repo");
+ assert.strictEqual(error.argumentCount, 2);
assert.strictEqual(error.detail, "Azure DevOps CLI command failed.");
assert.strictEqual(error.cause, cause);
assert.equal(error.message.includes("sensitive-upstream-detail"), false);
}).pipe(Effect.provide(layer)),
);
+
+ it.effect("does not report a missing working directory as a missing Azure CLI", () =>
+ Effect.gen(function* () {
+ const cwd = "/missing/repo";
+ const platformCause = PlatformError.systemError({
+ _tag: "NotFound",
+ module: "ChildProcess",
+ method: "spawn",
+ syscall: "chdir",
+ pathOrDescriptor: cwd,
+ });
+ const cause = new VcsProcessSpawnError({
+ operation: "AzureDevOpsCli.execute",
+ command: "az",
+ cwd,
+ argumentCount: 2,
+ cause: platformCause,
+ });
+ mockRun.mockReturnValueOnce(Effect.fail(cause));
+
+ const az = yield* AzureDevOpsCli.AzureDevOpsCli;
+ const error = yield* az.execute({ cwd, args: ["repos", "list"] }).pipe(Effect.flip);
+
+ assert.instanceOf(error, AzureDevOpsCli.AzureDevOpsCommandFailedError);
+ assert.strictEqual(error.cwd, cwd);
+ assert.strictEqual(error.cause, cause);
+ }).pipe(Effect.provide(layer)),
+ );
+
+ it.effect("keeps invalid pull request output diagnostics structured", () =>
+ Effect.gen(function* () {
+ mockRun.mockReturnValueOnce(Effect.succeed(processOutput("not-json")));
+
+ const az = yield* AzureDevOpsCli.AzureDevOpsCli;
+ const error = yield* az.getPullRequest({ cwd: "/repo", reference: "42" }).pipe(Effect.flip);
+
+ assert.instanceOf(error, AzureDevOpsCli.AzureDevOpsPullRequestDecodeError);
+ assert.strictEqual(error.operation, "getPullRequest");
+ assert.strictEqual(error.command, "az");
+ assert.strictEqual(error.cwd, "/repo");
+ assert.strictEqual(error.outputLength, 8);
+ assert.strictEqual(error.detail, "Azure DevOps CLI returned invalid pull request JSON.");
+ assert.exists(error.cause);
+ assert.strictEqual(
+ error.message,
+ "Azure DevOps CLI failed in getPullRequest: Azure DevOps CLI returned invalid pull request JSON.",
+ );
+ }).pipe(Effect.provide(layer)),
+ );
});
diff --git a/apps/server/src/sourceControl/AzureDevOpsCli.ts b/apps/server/src/sourceControl/AzureDevOpsCli.ts
index ea0e52868..609efe4df 100644
--- a/apps/server/src/sourceControl/AzureDevOpsCli.ts
+++ b/apps/server/src/sourceControl/AzureDevOpsCli.ts
@@ -1,9 +1,11 @@
import * as Context from "effect/Context";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
+import * as PlatformError from "effect/PlatformError";
import * as Result from "effect/Result";
import * as Schema from "effect/Schema";
import {
+ NonNegativeInt,
TrimmedNonEmptyString,
type SourceControlRepositoryVisibility,
type VcsError,
@@ -19,16 +21,61 @@ import * as SourceControlProvider from "./SourceControlProvider.ts";
const DEFAULT_TIMEOUT_MS = 30_000;
-export class AzureDevOpsCliError extends Schema.TaggedErrorClass<AzureDevOpsCliError>()(
- "AzureDevOpsCliError",
- {
- operation: Schema.String,
- command: Schema.String,
- cwd: Schema.String,
- detail: Schema.String,
- cause: Schema.optional(Schema.Defect()),
- },
+const azureDevOpsCommandErrorFields = {
+ operation: Schema.Literal("execute"),
+ command: Schema.Literal("az"),
+ cwd: Schema.String,
+ argumentCount: NonNegativeInt,
+ cause: Schema.Defect(),
+};
+
+export class AzureDevOpsCliUnavailableError extends Schema.TaggedErrorClass<AzureDevOpsCliUnavailableError>()(
+ "AzureDevOpsCliUnavailableError",
+ azureDevOpsCommandErrorFields,
+) {
+ get detail(): string {
+ return "Azure CLI (`az`) with the Azure DevOps extension is required but not available on PATH.";
+ }
+
+ override get message(): string {
+ return `Azure DevOps CLI failed in ${this.operation}: ${this.detail}`;
+ }
+}
+
+export class AzureDevOpsCliAuthenticationError extends Schema.TaggedErrorClass<AzureDevOpsCliAuthenticationError>()(
+ "AzureDevOpsCliAuthenticationError",
+ azureDevOpsCommandErrorFields,
+) {
+ get detail(): string {
+ return "Azure DevOps CLI is not authenticated. Run `az devops login` and retry.";
+ }
+
+ override get message(): string {
+ return `Azure DevOps CLI failed in ${this.operation}: ${this.detail}`;
+ }
+}
+
+export class AzureDevOpsPullRequestNotFoundError extends Schema.TaggedErrorClass<AzureDevOpsPullRequestNotFoundError>()(
+ "AzureDevOpsPullRequestNotFoundError",
+ azureDevOpsCommandErrorFields,
+) {
+ get detail(): string {
+ return "Pull request not found. Check the PR number or URL and try again.";
+ }
+
+ override get message(): string {
+ return `Azure DevOps CLI failed in ${this.operation}: ${this.detail}`;
+ }
+}
+
+export class AzureDevOpsCommandFailedError extends Schema.TaggedErrorClass<AzureDevOpsCommandFailedError>()(
+ "AzureDevOpsCommandFailedError",
+ azureDevOpsCommandErrorFields,
) {
+ get detail(): string {
+ return "Azure DevOps CLI command failed.";
+ }
+
override get message(): string {
return `Azure DevOps CLI failed in ${this.operation}: ${this.detail}`;
}
@@ -38,53 +85,109 @@ export class AzureDevOpsCliError extends Schema.TaggedErrorClass<AzureDevOpsCliE
readonly operation: "execute";
readonly command: "az";
readonly cwd: string;
+ readonly argumentCount: number;
},
- error: VcsError | unknown,
+ cause: VcsError,
): AzureDevOpsCliError {
- const lower = errorText(error).toLowerCase();
-
- if (lower.includes("command not found: az") || lower.includes("enoent")) {
- return new AzureDevOpsCliError({
- ...context,
- detail:
- "Azure CLI (`az`) with the Azure DevOps extension is required but not available on PATH.",
- cause: error,
- });
- }
+ const fields = { ...context, cause };
if (
- lower.includes("az devops login") ||
- lower.includes("please run az login") ||
- lower.includes("not logged in") ||
- lower.includes("authentication failed") ||
- lower.includes("unauthorized")
+ cause._tag === "VcsProcessSpawnError" &&
+ cause.cause instanceof PlatformError.PlatformError &&
+ cause.cause.reason._tag === "NotFound" &&
+ cause.cause.reason.pathOrDescriptor !== context.cwd &&
+ cause.cause.reason.syscall !== "chdir"
) {
- return new AzureDevOpsCliError({
- ...context,
- detail: "Azure DevOps CLI is not authenticated. Run `az devops login` and retry.",
- cause: error,
- });
+ return new AzureDevOpsCliUnavailableError(fields);
}
- if (
- lower.includes("pull request") &&
- (lower.includes("not found") || lower.includes("does not exist"))
- ) {
- return new AzureDevOpsCliError({
- ...context,
- detail: "Pull request not found. Check the PR number or URL and try again.",
- cause: error,
- });
+ if (cause._tag === "VcsProcessExitError") {
+ if (cause.failureKind === "authentication") {
+ return new AzureDevOpsCliAuthenticationError(fields);
+ }
+ if (cause.failureKind === "not-found") {
+ return new AzureDevOpsPullRequestNotFoundError(fields);
+ }
}
- return new AzureDevOpsCliError({
- ...context,
- detail: "Azure DevOps CLI command failed.",
- cause: error,
- });
+ return new AzureDevOpsCommandFailedError(fields);
+ }
+}
+
+const azureDevOpsDecodeErrorFields = {
+ command: Schema.Literal("az"),
+ cwd: Schema.String,
+ outputLength: NonNegativeInt,
+ cause: Schema.Defect(),
+};
+
+export class AzureDevOpsPullRequestListDecodeError extends Schema.TaggedErrorClass<AzureDevOpsPullRequestListDecodeError>()(
+ "AzureDevOpsPullRequestListDecodeError",
+ {
+ operation: Schema.Literal("listPullRequests"),
+ ...azureDevOpsDecodeErrorFields,
+ },
+) {
+ get detail(): string {
+ return "Azure DevOps CLI returned invalid PR list JSON.";
+ }
+
+ override get message(): string {
+ return `Azure DevOps CLI failed in ${this.operation}: ${this.detail}`;
+ }
+}
+
+export class AzureDevOpsPullRequestDecodeError extends Schema.TaggedErrorClass<AzureDevOpsPullRequestDecodeError>()(
+ "AzureDevOpsPullRequestDecodeError",
+ {
+ operation: Schema.Literal("getPullRequest"),
+ ...azureDevOpsDecodeErrorFields,
+ },
+) {
+ get detail(): string {
+ return "Azure DevOps CLI returned invalid pull request JSON.";
+ }
+
+ override get message(): string {
+ return `Azure DevOps CLI failed in ${this.operation}: ${this.detail}`;
+ }
+}
+
+const AzureDevOpsRepositoryDecodeOperation = Schema.Literals([
+ "getRepositoryCloneUrls",
+ "getDefaultBranch",
+ "createRepository",
+]);
+
+export class AzureDevOpsRepositoryDecodeError extends Schema.TaggedErrorClass<AzureDevOpsRepositoryDecodeError>()(
+ "AzureDevOpsRepositoryDecodeError",
+ {
+ operation: AzureDevOpsRepositoryDecodeOperation,
+ ...azureDevOpsDecodeErrorFields,
+ },
+) {
+ get detail(): string {
+ return "Azure DevOps CLI returned invalid repository JSON.";
+ }
+
+ override get message(): string {
+ return `Azure DevOps CLI failed in ${this.operation}: ${this.detail}`;
}
}
+export const AzureDevOpsCliError = Schema.Union([
+ AzureDevOpsCliUnavailableError,
+ AzureDevOpsCliAuthenticationError,
+ AzureDevOpsPullRequestNotFoundError,
+ AzureDevOpsCommandFailedError,
+ AzureDevOpsPullRequestListDecodeError,
+ AzureDevOpsPullRequestDecodeError,
+ AzureDevOpsRepositoryDecodeError,
+]);
+export type AzureDevOpsCliError = typeof AzureDevOpsCliError.Type;
+
+export const isAzureDevOpsCliError = Schema.is(AzureDevOpsCliError);
+
export interface AzureDevOpsRepositoryCloneUrls {
readonly nameWithOwner: string;
readonly url: string;
@@ -146,17 +249,6 @@ export class AzureDevOpsCli extends Context.Service<
}
>()("t3/sourceControl/AzureDevOpsCli") {}
-function errorText(error: VcsError | unknown): string {
- if (typeof error === "object" && error !== null) {
- const tag = "_tag" in error && typeof error._tag === "string" ? error._tag : "";
- const detail = "detail" in error && typeof error.detail === "string" ? error.detail : "";
- const message = "message" in error && typeof error.message === "string" ? error.message : "";
- return [tag, detail, message].filter(Boolean).join("\n");
- }
-
- return String(error);
-}
-
function normalizeChangeRequestId(reference: string): string {
const trimmed = reference.trim().replace(/^#/, "");
const urlMatch = /(?:pullrequest|pull-request|pull|_pulls?)\/(\d+)(?:\D.*)?$/i.exec(trimmed);
@@ -225,19 +317,18 @@ function parseRepositorySpecifier(repository: string): {
function decodeAzureDevOpsJson<S extends Schema.Top>(
raw: string,
schema: S,
- operation: "getRepositoryCloneUrls" | "getDefaultBranch" | "createRepository",
- invalidDetail: string,
+ operation: typeof AzureDevOpsRepositoryDecodeOperation.Type,
cwd: string,
-): Effect.Effect<S["Type"], AzureDevOpsCliError, S["DecodingServices"]> {
+): Effect.Effect<S["Type"], AzureDevOpsRepositoryDecodeError, S["DecodingServices"]> {
return Schema.decodeEffect(Schema.fromJsonString(schema))(raw).pipe(
Effect.mapError(
- (error) =>
- new AzureDevOpsCliError({
+ (cause) =>
+ new AzureDevOpsRepositoryDecodeError({
operation,
command: "az",
cwd,
- detail: invalidDetail,
- cause: error,
+ outputLength: raw.length,
+ cause,
}),
),
);
@@ -257,8 +348,13 @@ export const make = Effect.gen(function* () {
})
.pipe(
Effect.mapError((error) =>
- AzureDevOpsCliError.fromVcsError(
- { operation: "execute", command: "az", cwd: input.cwd },
+ AzureDevOpsCommandFailedError.fromVcsError(
+ {
+ operation: "execute",
+ command: "az",
+ cwd: input.cwd,
+ argumentCount: input.args.length,
+ },
error,
),
),
@@ -297,11 +393,11 @@ export const make = Effect.gen(function* () {
Effect.flatMap((decoded) => {
if (!Result.isSuccess(decoded)) {
return Effect.fail(
- new AzureDevOpsCliError({
+ new AzureDevOpsPullRequestListDecodeError({
operation: "listPullRequests",
command: "az",
cwd: input.cwd,
- detail: "Azure DevOps CLI returned invalid PR list JSON.",
+ outputLength: raw.length,
cause: decoded.failure,
}),
);
@@ -331,11 +427,11 @@ export const make = Effect.gen(function* () {
Effect.flatMap((decoded) => {
if (!Result.isSuccess(decoded)) {
return Effect.fail(
- new AzureDevOpsCliError({
+ new AzureDevOpsPullRequestDecodeError({
operation: "getPullRequest",
command: "az",
cwd: input.cwd,
- detail: "Azure DevOps CLI returned invalid pull request JSON.",
+ outputLength: raw.length,
cause: decoded.failure,
}),
);
@@ -357,7 +453,6 @@ export const make = Effect.gen(function* () {
raw,
RawAzureDevOpsRepositorySchema,
"getRepositoryCloneUrls",
- "Azure DevOps CLI returned invalid repository JSON.",
input.cwd,
),
),
@@ -383,13 +478,7 @@ export const make = Effect.gen(function* () {
}).pipe(
Effect.map((result) => result.stdout.trim()),
Effect.flatMap((raw) =>
- decodeAzureDevOpsJson(
- raw,
- RawAzureDevOpsRepositorySchema,
- "createRepository",
- "Azure DevOps CLI returned invalid repository JSON.",
- input.cwd,
- ),
+ decodeAzureDevOpsJson(raw, RawAzureDevOpsRepositorySchema, "createRepository", input.cwd),
),
Effect.map(normalizeRepositoryCloneUrls),
);
@@ -421,13 +510,7 @@ export const make = Effect.gen(function* () {
}).pipe(
Effect.map((result) => result.stdout.trim()),
Effect.flatMap((raw) =>
- decodeAzureDevOpsJson(
- raw,
- RawAzureDevOpsRepositorySchema,
- "getDefaultBranch",
- "Azure DevOps CLI returned invalid repository JSON.",
- input.cwd,
- ),
+ decodeAzureDevOpsJson(raw, RawAzureDevOpsRepositorySchema, "getDefaultBranch", input.cwd),
),
Effect.map((repo) => normalizeDefaultBranch(repo.defaultBranch)),
),
diff --git a/apps/server/src/sourceControl/AzureDevOpsSourceControlProvider.test.ts b/apps/server/src/sourceControl/AzureDevOpsSourceControlProvider.test.ts
index 1341f4cc0..21db25e79 100644
--- a/apps/server/src/sourceControl/AzureDevOpsSourceControlProvider.test.ts
+++ b/apps/server/src/sourceControl/AzureDevOpsSourceControlProvider.test.ts
@@ -48,11 +48,11 @@ it.effect("maps Azure DevOps PR summaries into provider-neutral change requests"
it.effect("adds change-request context while retaining Azure CLI causes", () =>
Effect.gen(function* () {
- const cause = new AzureDevOpsCli.AzureDevOpsCliError({
+ const cause = new AzureDevOpsCli.AzureDevOpsCommandFailedError({
operation: "execute",
command: "az",
cwd: "/repo",
- detail: "Azure DevOps CLI command failed.",
+ argumentCount: 2,
cause: new Error("raw upstream detail that should remain in the cause"),
});
const provider = yield* makeProvider({