[codex] Structure GitLab CLI failures

[juliusmarminge]

Summary

• replace free-form GitLab CLI errors with distinct Schema error classes and a union predicate
• classify process failures from VCS tags and failure kinds instead of parsing error text
• retain immediate causes and attach operation-specific decode context

Validation

• vp test apps/server/src/sourceControl/GitLabCli.test.ts apps/server/src/sourceControl/GitLabSourceControlProvider.test.ts
• vp check
• vp run typecheck

---

Note

Medium Risk
Changes how all GitLab CLI failures are typed and surfaced; callers matching on the old single error shape or detail strings need updates, though behavior is covered by updated tests.

Overview
Replaces the single free-form GitLabCliError with tagged Schema error classes (unavailable, authentication, MR not found, generic command failure, and operation-specific decode errors) plus a GitLabCliError union and isGitLabCliError.

Process failures are classified via VcsError tags and failureKind (Match.valueTags) instead of parsing stderr/detail strings; spawn → unavailable, auth → GitLabCliAuthenticationError, etc.

MR-specific paths (getMergeRequest, checkoutMergeRequest) use executeMergeRequest so not-found becomes GitLabMergeRequestNotFoundError with the MR reference in the message; other APIs (e.g. project 404) stay GitLabCliCommandError.

JSON decode failures now map to dedicated decode error types with structured cause; user-facing message/detail no longer leak raw upstream text.

^{Reviewed by Cursor Bugbot for commit 8b7ee6d. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Structure GitLab CLI failures into typed error classes

• Replaces the single generic GitLabCliError class with a union of specific typed errors: GitLabCliUnavailableError, GitLabCliAuthenticationError, GitLabMergeRequestNotFoundError, GitLabCliCommandError, and operation-specific decode errors.
• MR operations (getMergeRequest, checkoutMergeRequest) now throw GitLabMergeRequestNotFoundError with a reference-specific message (e.g. "Merge request 4888 was not found") instead of a generic error.
• Each GitLabCli method maps decode failures to a dedicated error class (e.g. GitLabRepositoryDecodeError, GitLabNamespaceDecodeError) rather than a shared generic decode error.
• Error classification moves from heuristic string matching (errorText) to structured VcsError tag/failureKind matching via static fromVcsError methods.
• Behavioral Change: callers catching GitLabCliError must update to use the new isGitLabCliError guard or handle individual error variants.

^{Macroscope summarized 8b7ee6d.}

[coderabbitai]

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: f5c6e6b4-dde5-48cf-8788-8bfc80738a41

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/structure-gitlab-cli-errors

---

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

[cursor]

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

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

• ✅ Fixed: Not-found always MR error
  • Changed fromVcsError to map not-found to generic GitLabCliCommandError, and added a refineNotFoundToMrError helper applied only in getMergeRequest and checkoutMergeRequest to correctly produce GitLabMergeRequestNotFoundError only for MR operations.

Or push these changes by commenting:

@cursor push 9529c4928a

Preview (9529c4928a)

diff --git a/apps/server/src/sourceControl/GitLabCli.ts b/apps/server/src/sourceControl/GitLabCli.ts--- a/apps/server/src/sourceControl/GitLabCli.ts+++ b/apps/server/src/sourceControl/GitLabCli.ts@@ -101,7 +101,6 @@
case "authentication":
return new GitLabCliAuthenticationError({ ...context, cause });
case "not-found":
- return new GitLabMergeRequestNotFoundError({ ...context, cause });
case "command-failed":
case undefined:
return new GitLabCliCommandError({ ...context, cause });
@@ -315,6 +314,24 @@
}
}
+function refineNotFoundToMrError(error: GitLabCliError): GitLabCliError {+ if (+ error._tag === "GitLabCliCommandError" &&+ error.cause != null &&+ typeof error.cause === "object" &&+ "failureKind" in error.cause &&+ error.cause.failureKind === "not-found"+ ) {+ return new GitLabMergeRequestNotFoundError({+ operation: error.operation,+ command: error.command,+ cwd: error.cwd,+ cause: error.cause,+ });+ }+ return error;+}+
function normalizeHeadSelector(headSelector: string): string {
const trimmed = headSelector.trim();
const ownerBranch = /^[^:]+:(.+)$/.exec(trimmed);
@@ -424,6 +441,7 @@
cwd: input.cwd,
args: ["mr", "view", input.reference, "--output", "json"],
}).pipe(
+ Effect.mapError(refineNotFoundToMrError),
Effect.map((result) => result.stdout.trim()),
Effect.flatMap((raw) =>
Effect.sync(() => decodeGitLabMergeRequestJson(raw)).pipe(
@@ -578,7 +596,7 @@
execute({
cwd: input.cwd,
args: ["mr", "checkout", input.reference],
- }).pipe(Effect.asVoid),+ }).pipe(Effect.mapError(refineNotFoundToMrError), Effect.asVoid),
});
});

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

^{Reviewed by Cursor Bugbot for commit fcc01bc5b135b400814d2f8f2fa27862c55aafd1. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

This PR refactors GitLab CLI error handling by splitting a single generic error class into multiple specific typed error classes with structured tag-based matching instead of string-based detection. The changes are internal infrastructure improvements with comprehensive test coverage and no impact on core business logic.

^{You can customize Macroscope's approvability policy. Learn more.}

[juliusmarminge]

Summary

• replace free-form GitLab CLI errors with distinct Schema error classes and a union predicate
• classify process failures from VCS tags and failure kinds instead of parsing error text
• retain immediate causes and attach operation-specific decode context

Validation

• vp test apps/server/src/sourceControl/GitLabCli.test.ts apps/server/src/sourceControl/GitLabSourceControlProvider.test.ts
• vp check
• vp run typecheck

---

Note

Medium Risk
Changes how all GitLab CLI failures are typed and surfaced; callers matching on the old single error shape or detail strings need updates, though behavior is covered by updated tests.

Overview
Replaces the single free-form GitLabCliError with tagged Schema error classes (unavailable, authentication, MR not found, generic command failure, and operation-specific decode errors) plus a GitLabCliError union and isGitLabCliError.

Process failures are classified via VcsError tags and failureKind (Match.valueTags) instead of parsing stderr/detail strings; spawn → unavailable, auth → GitLabCliAuthenticationError, etc.

MR-specific paths (getMergeRequest, checkoutMergeRequest) use executeMergeRequest so not-found becomes GitLabMergeRequestNotFoundError with the MR reference in the message; other APIs (e.g. project 404) stay GitLabCliCommandError.

JSON decode failures now map to dedicated decode error types with structured cause; user-facing message/detail no longer leak raw upstream text.

^{Reviewed by Cursor Bugbot for commit 8b7ee6d. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Structure GitLab CLI failures into typed error classes

• Replaces the single generic GitLabCliError class with a union of specific typed errors: GitLabCliUnavailableError, GitLabCliAuthenticationError, GitLabMergeRequestNotFoundError, GitLabCliCommandError, and operation-specific decode errors.
• MR operations (getMergeRequest, checkoutMergeRequest) now throw GitLabMergeRequestNotFoundError with a reference-specific message (e.g. "Merge request 4888 was not found") instead of a generic error.
• Each GitLabCli method maps decode failures to a dedicated error class (e.g. GitLabRepositoryDecodeError, GitLabNamespaceDecodeError) rather than a shared generic decode error.
• Error classification moves from heuristic string matching (errorText) to structured VcsError tag/failureKind matching via static fromVcsError methods.
• Behavioral Change: callers catching GitLabCliError must update to use the new isGitLabCliError guard or handle individual error variants.

^{Macroscope summarized 8b7ee6d.}

[coderabbitai]

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: f5c6e6b4-dde5-48cf-8788-8bfc80738a41

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/structure-gitlab-cli-errors

---

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

[cursor]

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

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

• ✅ Fixed: Not-found always MR error
  • Changed fromVcsError to map not-found to generic GitLabCliCommandError, and added a refineNotFoundToMrError helper applied only in getMergeRequest and checkoutMergeRequest to correctly produce GitLabMergeRequestNotFoundError only for MR operations.

Or push these changes by commenting:

@cursor push 9529c4928a

Preview (9529c4928a)

diff --git a/apps/server/src/sourceControl/GitLabCli.ts b/apps/server/src/sourceControl/GitLabCli.ts--- a/apps/server/src/sourceControl/GitLabCli.ts+++ b/apps/server/src/sourceControl/GitLabCli.ts@@ -101,7 +101,6 @@
case "authentication":
return new GitLabCliAuthenticationError({ ...context, cause });
case "not-found":
- return new GitLabMergeRequestNotFoundError({ ...context, cause });
case "command-failed":
case undefined:
return new GitLabCliCommandError({ ...context, cause });
@@ -315,6 +314,24 @@
}
}
+function refineNotFoundToMrError(error: GitLabCliError): GitLabCliError {+ if (+ error._tag === "GitLabCliCommandError" &&+ error.cause != null &&+ typeof error.cause === "object" &&+ "failureKind" in error.cause &&+ error.cause.failureKind === "not-found"+ ) {+ return new GitLabMergeRequestNotFoundError({+ operation: error.operation,+ command: error.command,+ cwd: error.cwd,+ cause: error.cause,+ });+ }+ return error;+}+
function normalizeHeadSelector(headSelector: string): string {
const trimmed = headSelector.trim();
const ownerBranch = /^[^:]+:(.+)$/.exec(trimmed);
@@ -424,6 +441,7 @@
cwd: input.cwd,
args: ["mr", "view", input.reference, "--output", "json"],
}).pipe(
+ Effect.mapError(refineNotFoundToMrError),
Effect.map((result) => result.stdout.trim()),
Effect.flatMap((raw) =>
Effect.sync(() => decodeGitLabMergeRequestJson(raw)).pipe(
@@ -578,7 +596,7 @@
execute({
cwd: input.cwd,
args: ["mr", "checkout", input.reference],
- }).pipe(Effect.asVoid),+ }).pipe(Effect.mapError(refineNotFoundToMrError), Effect.asVoid),
});
});

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

^{Reviewed by Cursor Bugbot for commit fcc01bc5b135b400814d2f8f2fa27862c55aafd1. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

This PR refactors GitLab CLI error handling by splitting a single generic error class into multiple specific typed error classes with structured tag-based matching instead of string-based detection. The changes are internal infrastructure improvements with comprehensive test coverage and no impact on core business logic.

^{You can customize Macroscope's approvability policy. Learn more.}

[juliusmarminge]

Summary

• replace free-form GitLab CLI errors with distinct Schema error classes and a union predicate
• classify process failures from VCS tags and failure kinds instead of parsing error text
• retain immediate causes and attach operation-specific decode context

Validation

• vp test apps/server/src/sourceControl/GitLabCli.test.ts apps/server/src/sourceControl/GitLabSourceControlProvider.test.ts
• vp check
• vp run typecheck

---

Note

Medium Risk
Changes how all GitLab CLI failures are typed and surfaced; callers matching on the old single error shape or detail strings need updates, though behavior is covered by updated tests.

Overview
Replaces the single free-form GitLabCliError with tagged Schema error classes (unavailable, authentication, MR not found, generic command failure, and operation-specific decode errors) plus a GitLabCliError union and isGitLabCliError.

Process failures are classified via VcsError tags and failureKind (Match.valueTags) instead of parsing stderr/detail strings; spawn → unavailable, auth → GitLabCliAuthenticationError, etc.

MR-specific paths (getMergeRequest, checkoutMergeRequest) use executeMergeRequest so not-found becomes GitLabMergeRequestNotFoundError with the MR reference in the message; other APIs (e.g. project 404) stay GitLabCliCommandError.

JSON decode failures now map to dedicated decode error types with structured cause; user-facing message/detail no longer leak raw upstream text.

^{Reviewed by Cursor Bugbot for commit 8b7ee6d. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Structure GitLab CLI failures into typed error classes

• Replaces the single generic GitLabCliError class with a union of specific typed errors: GitLabCliUnavailableError, GitLabCliAuthenticationError, GitLabMergeRequestNotFoundError, GitLabCliCommandError, and operation-specific decode errors.
• MR operations (getMergeRequest, checkoutMergeRequest) now throw GitLabMergeRequestNotFoundError with a reference-specific message (e.g. "Merge request 4888 was not found") instead of a generic error.
• Each GitLabCli method maps decode failures to a dedicated error class (e.g. GitLabRepositoryDecodeError, GitLabNamespaceDecodeError) rather than a shared generic decode error.
• Error classification moves from heuristic string matching (errorText) to structured VcsError tag/failureKind matching via static fromVcsError methods.
• Behavioral Change: callers catching GitLabCliError must update to use the new isGitLabCliError guard or handle individual error variants.

^{Macroscope summarized 8b7ee6d.}

[coderabbitai]

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: f5c6e6b4-dde5-48cf-8788-8bfc80738a41

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/structure-gitlab-cli-errors

---

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

[cursor]

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

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

• ✅ Fixed: Not-found always MR error
  • Changed fromVcsError to map not-found to generic GitLabCliCommandError, and added a refineNotFoundToMrError helper applied only in getMergeRequest and checkoutMergeRequest to correctly produce GitLabMergeRequestNotFoundError only for MR operations.

Or push these changes by commenting:

@cursor push 9529c4928a

Preview (9529c4928a)

diff --git a/apps/server/src/sourceControl/GitLabCli.ts b/apps/server/src/sourceControl/GitLabCli.ts--- a/apps/server/src/sourceControl/GitLabCli.ts+++ b/apps/server/src/sourceControl/GitLabCli.ts@@ -101,7 +101,6 @@
case "authentication":
return new GitLabCliAuthenticationError({ ...context, cause });
case "not-found":
- return new GitLabMergeRequestNotFoundError({ ...context, cause });
case "command-failed":
case undefined:
return new GitLabCliCommandError({ ...context, cause });
@@ -315,6 +314,24 @@
}
}
+function refineNotFoundToMrError(error: GitLabCliError): GitLabCliError {+ if (+ error._tag === "GitLabCliCommandError" &&+ error.cause != null &&+ typeof error.cause === "object" &&+ "failureKind" in error.cause &&+ error.cause.failureKind === "not-found"+ ) {+ return new GitLabMergeRequestNotFoundError({+ operation: error.operation,+ command: error.command,+ cwd: error.cwd,+ cause: error.cause,+ });+ }+ return error;+}+
function normalizeHeadSelector(headSelector: string): string {
const trimmed = headSelector.trim();
const ownerBranch = /^[^:]+:(.+)$/.exec(trimmed);
@@ -424,6 +441,7 @@
cwd: input.cwd,
args: ["mr", "view", input.reference, "--output", "json"],
}).pipe(
+ Effect.mapError(refineNotFoundToMrError),
Effect.map((result) => result.stdout.trim()),
Effect.flatMap((raw) =>
Effect.sync(() => decodeGitLabMergeRequestJson(raw)).pipe(
@@ -578,7 +596,7 @@
execute({
cwd: input.cwd,
args: ["mr", "checkout", input.reference],
- }).pipe(Effect.asVoid),+ }).pipe(Effect.mapError(refineNotFoundToMrError), Effect.asVoid),
});
});

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

^{Reviewed by Cursor Bugbot for commit fcc01bc5b135b400814d2f8f2fa27862c55aafd1. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

This PR refactors GitLab CLI error handling by splitting a single generic error class into multiple specific typed error classes with structured tag-based matching instead of string-based detection. The changes are internal infrastructure improvements with comprehensive test coverage and no impact on core business logic.

^{You can customize Macroscope's approvability policy. Learn more.}

[juliusmarminge]

Summary

• replace free-form GitLab CLI errors with distinct Schema error classes and a union predicate
• classify process failures from VCS tags and failure kinds instead of parsing error text
• retain immediate causes and attach operation-specific decode context

Validation

• vp test apps/server/src/sourceControl/GitLabCli.test.ts apps/server/src/sourceControl/GitLabSourceControlProvider.test.ts
• vp check
• vp run typecheck

---

Note

Medium Risk
Changes how all GitLab CLI failures are typed and surfaced; callers matching on the old single error shape or detail strings need updates, though behavior is covered by updated tests.

Overview
Replaces the single free-form GitLabCliError with tagged Schema error classes (unavailable, authentication, MR not found, generic command failure, and operation-specific decode errors) plus a GitLabCliError union and isGitLabCliError.

Process failures are classified via VcsError tags and failureKind (Match.valueTags) instead of parsing stderr/detail strings; spawn → unavailable, auth → GitLabCliAuthenticationError, etc.

MR-specific paths (getMergeRequest, checkoutMergeRequest) use executeMergeRequest so not-found becomes GitLabMergeRequestNotFoundError with the MR reference in the message; other APIs (e.g. project 404) stay GitLabCliCommandError.

JSON decode failures now map to dedicated decode error types with structured cause; user-facing message/detail no longer leak raw upstream text.

^{Reviewed by Cursor Bugbot for commit 8b7ee6d. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Structure GitLab CLI failures into typed error classes

• Replaces the single generic GitLabCliError class with a union of specific typed errors: GitLabCliUnavailableError, GitLabCliAuthenticationError, GitLabMergeRequestNotFoundError, GitLabCliCommandError, and operation-specific decode errors.
• MR operations (getMergeRequest, checkoutMergeRequest) now throw GitLabMergeRequestNotFoundError with a reference-specific message (e.g. "Merge request 4888 was not found") instead of a generic error.
• Each GitLabCli method maps decode failures to a dedicated error class (e.g. GitLabRepositoryDecodeError, GitLabNamespaceDecodeError) rather than a shared generic decode error.
• Error classification moves from heuristic string matching (errorText) to structured VcsError tag/failureKind matching via static fromVcsError methods.
• Behavioral Change: callers catching GitLabCliError must update to use the new isGitLabCliError guard or handle individual error variants.

^{Macroscope summarized 8b7ee6d.}

[coderabbitai]

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: f5c6e6b4-dde5-48cf-8788-8bfc80738a41

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/structure-gitlab-cli-errors

---

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

[cursor]

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

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

• ✅ Fixed: Not-found always MR error
  • Changed fromVcsError to map not-found to generic GitLabCliCommandError, and added a refineNotFoundToMrError helper applied only in getMergeRequest and checkoutMergeRequest to correctly produce GitLabMergeRequestNotFoundError only for MR operations.

Or push these changes by commenting:

@cursor push 9529c4928a

Preview (9529c4928a)

diff --git a/apps/server/src/sourceControl/GitLabCli.ts b/apps/server/src/sourceControl/GitLabCli.ts--- a/apps/server/src/sourceControl/GitLabCli.ts+++ b/apps/server/src/sourceControl/GitLabCli.ts@@ -101,7 +101,6 @@
case "authentication":
return new GitLabCliAuthenticationError({ ...context, cause });
case "not-found":
- return new GitLabMergeRequestNotFoundError({ ...context, cause });
case "command-failed":
case undefined:
return new GitLabCliCommandError({ ...context, cause });
@@ -315,6 +314,24 @@
}
}
+function refineNotFoundToMrError(error: GitLabCliError): GitLabCliError {+ if (+ error._tag === "GitLabCliCommandError" &&+ error.cause != null &&+ typeof error.cause === "object" &&+ "failureKind" in error.cause &&+ error.cause.failureKind === "not-found"+ ) {+ return new GitLabMergeRequestNotFoundError({+ operation: error.operation,+ command: error.command,+ cwd: error.cwd,+ cause: error.cause,+ });+ }+ return error;+}+
function normalizeHeadSelector(headSelector: string): string {
const trimmed = headSelector.trim();
const ownerBranch = /^[^:]+:(.+)$/.exec(trimmed);
@@ -424,6 +441,7 @@
cwd: input.cwd,
args: ["mr", "view", input.reference, "--output", "json"],
}).pipe(
+ Effect.mapError(refineNotFoundToMrError),
Effect.map((result) => result.stdout.trim()),
Effect.flatMap((raw) =>
Effect.sync(() => decodeGitLabMergeRequestJson(raw)).pipe(
@@ -578,7 +596,7 @@
execute({
cwd: input.cwd,
args: ["mr", "checkout", input.reference],
- }).pipe(Effect.asVoid),+ }).pipe(Effect.mapError(refineNotFoundToMrError), Effect.asVoid),
});
});

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

^{Reviewed by Cursor Bugbot for commit fcc01bc5b135b400814d2f8f2fa27862c55aafd1. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

This PR refactors GitLab CLI error handling by splitting a single generic error class into multiple specific typed error classes with structured tag-based matching instead of string-based detection. The changes are internal infrastructure improvements with comprehensive test coverage and no impact on core business logic.

^{You can customize Macroscope's approvability policy. Learn more.}

[juliusmarminge]

Summary

• replace free-form GitLab CLI errors with distinct Schema error classes and a union predicate
• classify process failures from VCS tags and failure kinds instead of parsing error text
• retain immediate causes and attach operation-specific decode context

Validation

• vp test apps/server/src/sourceControl/GitLabCli.test.ts apps/server/src/sourceControl/GitLabSourceControlProvider.test.ts
• vp check
• vp run typecheck

---

Note

Medium Risk
Changes how all GitLab CLI failures are typed and surfaced; callers matching on the old single error shape or detail strings need updates, though behavior is covered by updated tests.

Overview
Replaces the single free-form GitLabCliError with tagged Schema error classes (unavailable, authentication, MR not found, generic command failure, and operation-specific decode errors) plus a GitLabCliError union and isGitLabCliError.

Process failures are classified via VcsError tags and failureKind (Match.valueTags) instead of parsing stderr/detail strings; spawn → unavailable, auth → GitLabCliAuthenticationError, etc.

MR-specific paths (getMergeRequest, checkoutMergeRequest) use executeMergeRequest so not-found becomes GitLabMergeRequestNotFoundError with the MR reference in the message; other APIs (e.g. project 404) stay GitLabCliCommandError.

JSON decode failures now map to dedicated decode error types with structured cause; user-facing message/detail no longer leak raw upstream text.

^{Reviewed by Cursor Bugbot for commit 8b7ee6d. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Structure GitLab CLI failures into typed error classes

• Replaces the single generic GitLabCliError class with a union of specific typed errors: GitLabCliUnavailableError, GitLabCliAuthenticationError, GitLabMergeRequestNotFoundError, GitLabCliCommandError, and operation-specific decode errors.
• MR operations (getMergeRequest, checkoutMergeRequest) now throw GitLabMergeRequestNotFoundError with a reference-specific message (e.g. "Merge request 4888 was not found") instead of a generic error.
• Each GitLabCli method maps decode failures to a dedicated error class (e.g. GitLabRepositoryDecodeError, GitLabNamespaceDecodeError) rather than a shared generic decode error.
• Error classification moves from heuristic string matching (errorText) to structured VcsError tag/failureKind matching via static fromVcsError methods.
• Behavioral Change: callers catching GitLabCliError must update to use the new isGitLabCliError guard or handle individual error variants.

^{Macroscope summarized 8b7ee6d.}

[coderabbitai]

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: f5c6e6b4-dde5-48cf-8788-8bfc80738a41

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/structure-gitlab-cli-errors

---

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

[cursor]

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

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

• ✅ Fixed: Not-found always MR error
  • Changed fromVcsError to map not-found to generic GitLabCliCommandError, and added a refineNotFoundToMrError helper applied only in getMergeRequest and checkoutMergeRequest to correctly produce GitLabMergeRequestNotFoundError only for MR operations.

Or push these changes by commenting:

@cursor push 9529c4928a

Preview (9529c4928a)

diff --git a/apps/server/src/sourceControl/GitLabCli.ts b/apps/server/src/sourceControl/GitLabCli.ts--- a/apps/server/src/sourceControl/GitLabCli.ts+++ b/apps/server/src/sourceControl/GitLabCli.ts@@ -101,7 +101,6 @@
case "authentication":
return new GitLabCliAuthenticationError({ ...context, cause });
case "not-found":
- return new GitLabMergeRequestNotFoundError({ ...context, cause });
case "command-failed":
case undefined:
return new GitLabCliCommandError({ ...context, cause });
@@ -315,6 +314,24 @@
}
}
+function refineNotFoundToMrError(error: GitLabCliError): GitLabCliError {+ if (+ error._tag === "GitLabCliCommandError" &&+ error.cause != null &&+ typeof error.cause === "object" &&+ "failureKind" in error.cause &&+ error.cause.failureKind === "not-found"+ ) {+ return new GitLabMergeRequestNotFoundError({+ operation: error.operation,+ command: error.command,+ cwd: error.cwd,+ cause: error.cause,+ });+ }+ return error;+}+
function normalizeHeadSelector(headSelector: string): string {
const trimmed = headSelector.trim();
const ownerBranch = /^[^:]+:(.+)$/.exec(trimmed);
@@ -424,6 +441,7 @@
cwd: input.cwd,
args: ["mr", "view", input.reference, "--output", "json"],
}).pipe(
+ Effect.mapError(refineNotFoundToMrError),
Effect.map((result) => result.stdout.trim()),
Effect.flatMap((raw) =>
Effect.sync(() => decodeGitLabMergeRequestJson(raw)).pipe(
@@ -578,7 +596,7 @@
execute({
cwd: input.cwd,
args: ["mr", "checkout", input.reference],
- }).pipe(Effect.asVoid),+ }).pipe(Effect.mapError(refineNotFoundToMrError), Effect.asVoid),
});
});

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

^{Reviewed by Cursor Bugbot for commit fcc01bc5b135b400814d2f8f2fa27862c55aafd1. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

This PR refactors GitLab CLI error handling by splitting a single generic error class into multiple specific typed error classes with structured tag-based matching instead of string-based detection. The changes are internal infrastructure improvements with comprehensive test coverage and no impact on core business logic.

^{You can customize Macroscope's approvability policy. Learn more.}

[juliusmarminge]

Summary

• replace free-form GitLab CLI errors with distinct Schema error classes and a union predicate
• classify process failures from VCS tags and failure kinds instead of parsing error text
• retain immediate causes and attach operation-specific decode context

Validation

• vp test apps/server/src/sourceControl/GitLabCli.test.ts apps/server/src/sourceControl/GitLabSourceControlProvider.test.ts
• vp check
• vp run typecheck

---

Note

Medium Risk
Changes how all GitLab CLI failures are typed and surfaced; callers matching on the old single error shape or detail strings need updates, though behavior is covered by updated tests.

Overview
Replaces the single free-form GitLabCliError with tagged Schema error classes (unavailable, authentication, MR not found, generic command failure, and operation-specific decode errors) plus a GitLabCliError union and isGitLabCliError.

Process failures are classified via VcsError tags and failureKind (Match.valueTags) instead of parsing stderr/detail strings; spawn → unavailable, auth → GitLabCliAuthenticationError, etc.

MR-specific paths (getMergeRequest, checkoutMergeRequest) use executeMergeRequest so not-found becomes GitLabMergeRequestNotFoundError with the MR reference in the message; other APIs (e.g. project 404) stay GitLabCliCommandError.

JSON decode failures now map to dedicated decode error types with structured cause; user-facing message/detail no longer leak raw upstream text.

^{Reviewed by Cursor Bugbot for commit 8b7ee6d. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Structure GitLab CLI failures into typed error classes

• Replaces the single generic GitLabCliError class with a union of specific typed errors: GitLabCliUnavailableError, GitLabCliAuthenticationError, GitLabMergeRequestNotFoundError, GitLabCliCommandError, and operation-specific decode errors.
• MR operations (getMergeRequest, checkoutMergeRequest) now throw GitLabMergeRequestNotFoundError with a reference-specific message (e.g. "Merge request 4888 was not found") instead of a generic error.
• Each GitLabCli method maps decode failures to a dedicated error class (e.g. GitLabRepositoryDecodeError, GitLabNamespaceDecodeError) rather than a shared generic decode error.
• Error classification moves from heuristic string matching (errorText) to structured VcsError tag/failureKind matching via static fromVcsError methods.
• Behavioral Change: callers catching GitLabCliError must update to use the new isGitLabCliError guard or handle individual error variants.

^{Macroscope summarized 8b7ee6d.}

[coderabbitai]

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: f5c6e6b4-dde5-48cf-8788-8bfc80738a41

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/structure-gitlab-cli-errors

---

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

[cursor]

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

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

• ✅ Fixed: Not-found always MR error
  • Changed fromVcsError to map not-found to generic GitLabCliCommandError, and added a refineNotFoundToMrError helper applied only in getMergeRequest and checkoutMergeRequest to correctly produce GitLabMergeRequestNotFoundError only for MR operations.

Or push these changes by commenting:

@cursor push 9529c4928a

Preview (9529c4928a)

diff --git a/apps/server/src/sourceControl/GitLabCli.ts b/apps/server/src/sourceControl/GitLabCli.ts--- a/apps/server/src/sourceControl/GitLabCli.ts+++ b/apps/server/src/sourceControl/GitLabCli.ts@@ -101,7 +101,6 @@
case "authentication":
return new GitLabCliAuthenticationError({ ...context, cause });
case "not-found":
- return new GitLabMergeRequestNotFoundError({ ...context, cause });
case "command-failed":
case undefined:
return new GitLabCliCommandError({ ...context, cause });
@@ -315,6 +314,24 @@
}
}
+function refineNotFoundToMrError(error: GitLabCliError): GitLabCliError {+ if (+ error._tag === "GitLabCliCommandError" &&+ error.cause != null &&+ typeof error.cause === "object" &&+ "failureKind" in error.cause &&+ error.cause.failureKind === "not-found"+ ) {+ return new GitLabMergeRequestNotFoundError({+ operation: error.operation,+ command: error.command,+ cwd: error.cwd,+ cause: error.cause,+ });+ }+ return error;+}+
function normalizeHeadSelector(headSelector: string): string {
const trimmed = headSelector.trim();
const ownerBranch = /^[^:]+:(.+)$/.exec(trimmed);
@@ -424,6 +441,7 @@
cwd: input.cwd,
args: ["mr", "view", input.reference, "--output", "json"],
}).pipe(
+ Effect.mapError(refineNotFoundToMrError),
Effect.map((result) => result.stdout.trim()),
Effect.flatMap((raw) =>
Effect.sync(() => decodeGitLabMergeRequestJson(raw)).pipe(
@@ -578,7 +596,7 @@
execute({
cwd: input.cwd,
args: ["mr", "checkout", input.reference],
- }).pipe(Effect.asVoid),+ }).pipe(Effect.mapError(refineNotFoundToMrError), Effect.asVoid),
});
});

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

^{Reviewed by Cursor Bugbot for commit fcc01bc5b135b400814d2f8f2fa27862c55aafd1. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

This PR refactors GitLab CLI error handling by splitting a single generic error class into multiple specific typed error classes with structured tag-based matching instead of string-based detection. The changes are internal infrastructure improvements with comprehensive test coverage and no impact on core business logic.

^{You can customize Macroscope's approvability policy. Learn more.}

[juliusmarminge]

Summary

• replace free-form GitLab CLI errors with distinct Schema error classes and a union predicate
• classify process failures from VCS tags and failure kinds instead of parsing error text
• retain immediate causes and attach operation-specific decode context

Validation

• vp test apps/server/src/sourceControl/GitLabCli.test.ts apps/server/src/sourceControl/GitLabSourceControlProvider.test.ts
• vp check
• vp run typecheck

---

Note

Medium Risk
Changes how all GitLab CLI failures are typed and surfaced; callers matching on the old single error shape or detail strings need updates, though behavior is covered by updated tests.

Overview
Replaces the single free-form GitLabCliError with tagged Schema error classes (unavailable, authentication, MR not found, generic command failure, and operation-specific decode errors) plus a GitLabCliError union and isGitLabCliError.

Process failures are classified via VcsError tags and failureKind (Match.valueTags) instead of parsing stderr/detail strings; spawn → unavailable, auth → GitLabCliAuthenticationError, etc.

MR-specific paths (getMergeRequest, checkoutMergeRequest) use executeMergeRequest so not-found becomes GitLabMergeRequestNotFoundError with the MR reference in the message; other APIs (e.g. project 404) stay GitLabCliCommandError.

JSON decode failures now map to dedicated decode error types with structured cause; user-facing message/detail no longer leak raw upstream text.

^{Reviewed by Cursor Bugbot for commit 8b7ee6d. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Structure GitLab CLI failures into typed error classes

• Replaces the single generic GitLabCliError class with a union of specific typed errors: GitLabCliUnavailableError, GitLabCliAuthenticationError, GitLabMergeRequestNotFoundError, GitLabCliCommandError, and operation-specific decode errors.
• MR operations (getMergeRequest, checkoutMergeRequest) now throw GitLabMergeRequestNotFoundError with a reference-specific message (e.g. "Merge request 4888 was not found") instead of a generic error.
• Each GitLabCli method maps decode failures to a dedicated error class (e.g. GitLabRepositoryDecodeError, GitLabNamespaceDecodeError) rather than a shared generic decode error.
• Error classification moves from heuristic string matching (errorText) to structured VcsError tag/failureKind matching via static fromVcsError methods.
• Behavioral Change: callers catching GitLabCliError must update to use the new isGitLabCliError guard or handle individual error variants.

^{Macroscope summarized 8b7ee6d.}

[coderabbitai]

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: f5c6e6b4-dde5-48cf-8788-8bfc80738a41

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/structure-gitlab-cli-errors

---

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

[cursor]

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

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

• ✅ Fixed: Not-found always MR error
  • Changed fromVcsError to map not-found to generic GitLabCliCommandError, and added a refineNotFoundToMrError helper applied only in getMergeRequest and checkoutMergeRequest to correctly produce GitLabMergeRequestNotFoundError only for MR operations.

Or push these changes by commenting:

@cursor push 9529c4928a

Preview (9529c4928a)

diff --git a/apps/server/src/sourceControl/GitLabCli.ts b/apps/server/src/sourceControl/GitLabCli.ts--- a/apps/server/src/sourceControl/GitLabCli.ts+++ b/apps/server/src/sourceControl/GitLabCli.ts@@ -101,7 +101,6 @@
case "authentication":
return new GitLabCliAuthenticationError({ ...context, cause });
case "not-found":
- return new GitLabMergeRequestNotFoundError({ ...context, cause });
case "command-failed":
case undefined:
return new GitLabCliCommandError({ ...context, cause });
@@ -315,6 +314,24 @@
}
}
+function refineNotFoundToMrError(error: GitLabCliError): GitLabCliError {+ if (+ error._tag === "GitLabCliCommandError" &&+ error.cause != null &&+ typeof error.cause === "object" &&+ "failureKind" in error.cause &&+ error.cause.failureKind === "not-found"+ ) {+ return new GitLabMergeRequestNotFoundError({+ operation: error.operation,+ command: error.command,+ cwd: error.cwd,+ cause: error.cause,+ });+ }+ return error;+}+
function normalizeHeadSelector(headSelector: string): string {
const trimmed = headSelector.trim();
const ownerBranch = /^[^:]+:(.+)$/.exec(trimmed);
@@ -424,6 +441,7 @@
cwd: input.cwd,
args: ["mr", "view", input.reference, "--output", "json"],
}).pipe(
+ Effect.mapError(refineNotFoundToMrError),
Effect.map((result) => result.stdout.trim()),
Effect.flatMap((raw) =>
Effect.sync(() => decodeGitLabMergeRequestJson(raw)).pipe(
@@ -578,7 +596,7 @@
execute({
cwd: input.cwd,
args: ["mr", "checkout", input.reference],
- }).pipe(Effect.asVoid),+ }).pipe(Effect.mapError(refineNotFoundToMrError), Effect.asVoid),
});
});

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

^{Reviewed by Cursor Bugbot for commit fcc01bc5b135b400814d2f8f2fa27862c55aafd1. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

This PR refactors GitLab CLI error handling by splitting a single generic error class into multiple specific typed error classes with structured tag-based matching instead of string-based detection. The changes are internal infrastructure improvements with comprehensive test coverage and no impact on core business logic.

^{You can customize Macroscope's approvability policy. Learn more.}

[juliusmarminge]

Summary

• replace free-form GitLab CLI errors with distinct Schema error classes and a union predicate
• classify process failures from VCS tags and failure kinds instead of parsing error text
• retain immediate causes and attach operation-specific decode context

Validation

• vp test apps/server/src/sourceControl/GitLabCli.test.ts apps/server/src/sourceControl/GitLabSourceControlProvider.test.ts
• vp check
• vp run typecheck

---

Note

Medium Risk
Changes how all GitLab CLI failures are typed and surfaced; callers matching on the old single error shape or detail strings need updates, though behavior is covered by updated tests.

Overview
Replaces the single free-form GitLabCliError with tagged Schema error classes (unavailable, authentication, MR not found, generic command failure, and operation-specific decode errors) plus a GitLabCliError union and isGitLabCliError.

Process failures are classified via VcsError tags and failureKind (Match.valueTags) instead of parsing stderr/detail strings; spawn → unavailable, auth → GitLabCliAuthenticationError, etc.

MR-specific paths (getMergeRequest, checkoutMergeRequest) use executeMergeRequest so not-found becomes GitLabMergeRequestNotFoundError with the MR reference in the message; other APIs (e.g. project 404) stay GitLabCliCommandError.

JSON decode failures now map to dedicated decode error types with structured cause; user-facing message/detail no longer leak raw upstream text.

^{Reviewed by Cursor Bugbot for commit 8b7ee6d. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Structure GitLab CLI failures into typed error classes

• Replaces the single generic GitLabCliError class with a union of specific typed errors: GitLabCliUnavailableError, GitLabCliAuthenticationError, GitLabMergeRequestNotFoundError, GitLabCliCommandError, and operation-specific decode errors.
• MR operations (getMergeRequest, checkoutMergeRequest) now throw GitLabMergeRequestNotFoundError with a reference-specific message (e.g. "Merge request 4888 was not found") instead of a generic error.
• Each GitLabCli method maps decode failures to a dedicated error class (e.g. GitLabRepositoryDecodeError, GitLabNamespaceDecodeError) rather than a shared generic decode error.
• Error classification moves from heuristic string matching (errorText) to structured VcsError tag/failureKind matching via static fromVcsError methods.
• Behavioral Change: callers catching GitLabCliError must update to use the new isGitLabCliError guard or handle individual error variants.

^{Macroscope summarized 8b7ee6d.}

[coderabbitai]

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: f5c6e6b4-dde5-48cf-8788-8bfc80738a41

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/structure-gitlab-cli-errors

---

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

[cursor]

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

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

• ✅ Fixed: Not-found always MR error
  • Changed fromVcsError to map not-found to generic GitLabCliCommandError, and added a refineNotFoundToMrError helper applied only in getMergeRequest and checkoutMergeRequest to correctly produce GitLabMergeRequestNotFoundError only for MR operations.

Or push these changes by commenting:

@cursor push 9529c4928a

Preview (9529c4928a)

diff --git a/apps/server/src/sourceControl/GitLabCli.ts b/apps/server/src/sourceControl/GitLabCli.ts--- a/apps/server/src/sourceControl/GitLabCli.ts+++ b/apps/server/src/sourceControl/GitLabCli.ts@@ -101,7 +101,6 @@
case "authentication":
return new GitLabCliAuthenticationError({ ...context, cause });
case "not-found":
- return new GitLabMergeRequestNotFoundError({ ...context, cause });
case "command-failed":
case undefined:
return new GitLabCliCommandError({ ...context, cause });
@@ -315,6 +314,24 @@
}
}
+function refineNotFoundToMrError(error: GitLabCliError): GitLabCliError {+ if (+ error._tag === "GitLabCliCommandError" &&+ error.cause != null &&+ typeof error.cause === "object" &&+ "failureKind" in error.cause &&+ error.cause.failureKind === "not-found"+ ) {+ return new GitLabMergeRequestNotFoundError({+ operation: error.operation,+ command: error.command,+ cwd: error.cwd,+ cause: error.cause,+ });+ }+ return error;+}+
function normalizeHeadSelector(headSelector: string): string {
const trimmed = headSelector.trim();
const ownerBranch = /^[^:]+:(.+)$/.exec(trimmed);
@@ -424,6 +441,7 @@
cwd: input.cwd,
args: ["mr", "view", input.reference, "--output", "json"],
}).pipe(
+ Effect.mapError(refineNotFoundToMrError),
Effect.map((result) => result.stdout.trim()),
Effect.flatMap((raw) =>
Effect.sync(() => decodeGitLabMergeRequestJson(raw)).pipe(
@@ -578,7 +596,7 @@
execute({
cwd: input.cwd,
args: ["mr", "checkout", input.reference],
- }).pipe(Effect.asVoid),+ }).pipe(Effect.mapError(refineNotFoundToMrError), Effect.asVoid),
});
});

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

^{Reviewed by Cursor Bugbot for commit fcc01bc5b135b400814d2f8f2fa27862c55aafd1. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

This PR refactors GitLab CLI error handling by splitting a single generic error class into multiple specific typed error classes with structured tag-based matching instead of string-based detection. The changes are internal infrastructure improvements with comprehensive test coverage and no impact on core business logic.

^{You can customize Macroscope's approvability policy. Learn more.}