Extract shared vcsErrorText helper and add force support to Azure DevOps checkout

- Extract duplicated errorText function from AzureDevOpsCli.ts and
  GitHubCli.ts into a shared vcsErrorText utility in vcs/vcsErrorText.ts
- Add force parameter to AzureDevOpsCliShape.checkoutPullRequest to match
  SourceControlProviderShape.checkoutChangeRequest interface
- When force is true, run git checkout --force before az repos pr checkout
  to discard local modifications (matching gh pr checkout --force behavior)

Author: cursoragent

apps/server/src/sourceControl/AzureDevOpsCli.ts

@@ -2,6 +2,7 @@ import { Context, Effect, FileSystem, Layer, Result, Schema, SchemaIssue } from
 import { TrimmedNonEmptyString, type VcsError } from "@t3tools/contracts";
 
 import { VcsProcess, type VcsProcessOutput } from "../vcs/VcsProcess.ts";
+import { vcsErrorText } from "../vcs/vcsErrorText.ts";
 import {
   decodeAzureDevOpsPullRequestJson,
   decodeAzureDevOpsPullRequestListJson,
@@ -69,29 +70,19 @@ export interface AzureDevOpsCliShape {
   readonly checkoutPullRequest: (input: {
     readonly cwd: string;
     readonly reference: string;
+    readonly force?: boolean;
   }) => Effect.Effect<void, AzureDevOpsCliError>;
 }
 
 export class AzureDevOpsCli extends Context.Service<AzureDevOpsCli, AzureDevOpsCliShape>()(
   "t3/source-control/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 normalizeAzureDevOpsCliError(
   operation: "execute" | "readBodyFile",
   error: VcsError | unknown,
 ): AzureDevOpsCliError {
-  const text = errorText(error);
+  const text = vcsErrorText(error);
   const lower = text.toLowerCase();
 
   if (lower.includes("command not found: az") || lower.includes("enoent")) {
@@ -363,19 +354,38 @@ export const make = Effect.fn("makeAzureDevOpsCli")(function* () {
         Effect.map((repo) => normalizeDefaultBranch(repo.defaultBranch)),
       ),
     checkoutPullRequest: (input) =>
-      execute({
-        cwd: input.cwd,
-        args: [
-          "repos",
-          "pr",
-          "checkout",
-          "--only-show-errors",
-          "--id",
-          normalizeChangeRequestId(input.reference),
-          "--remote-name",
-          "origin",
-        ],
-      }).pipe(Effect.asVoid),
+      (input.force
+        ? process
+            .run({
+              operation: "AzureDevOpsCli.checkoutPullRequest",
+              command: "git",
+              args: ["checkout", "--force"],
+              cwd: input.cwd,
+              timeoutMs: DEFAULT_TIMEOUT_MS,
+            })
+            .pipe(
+              Effect.mapError((error) => normalizeAzureDevOpsCliError("execute", error)),
+              Effect.asVoid,
+            )
+        : Effect.void
+      ).pipe(
+        Effect.andThen(
+          execute({
+            cwd: input.cwd,
+            args: [
+              "repos",
+              "pr",
+              "checkout",
+              "--only-show-errors",
+              "--id",
+              normalizeChangeRequestId(input.reference),
+              "--remote-name",
+              "origin",
+            ],
+          }),
+        ),
+        Effect.asVoid,
+      ),
   });
 });
 

apps/server/src/sourceControl/GitHubCli.ts

@@ -3,6 +3,7 @@ import { Context, Effect, Layer, Result, Schema, SchemaIssue } from "effect";
 import { GitHubCliError, TrimmedNonEmptyString, type VcsError } from "@t3tools/contracts";
 
 import { VcsProcess, type VcsProcessOutput } from "../vcs/VcsProcess.ts";
+import { vcsErrorText } from "../vcs/vcsErrorText.ts";
 import {
   decodeGitHubPullRequestJson,
   decodeGitHubPullRequestListJson,
@@ -75,22 +76,11 @@ export class GitHubCli extends Context.Service<GitHubCli, GitHubCliShape>()(
   "t3/source-control/GitHubCli",
 ) {}
 
-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 normalizeGitHubCliError(
   operation: "execute" | "stdout",
   error: VcsError | unknown,
 ): GitHubCliError {
-  const text = errorText(error);
+  const text = vcsErrorText(error);
   const lower = text.toLowerCase();
 
   if (lower.includes("command not found: gh") || lower.includes("enoent")) {

apps/server/src/vcs/vcsErrorText.ts

@@ -0,0 +1,12 @@
+import type { VcsError } from "@t3tools/contracts";
+
+export function vcsErrorText(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);
+}