feat(git): friendly checkout error messages with stash & switch recovery

apps/server/src/git/GitWorkflowService.ts

@@ -19,6 +19,10 @@ import {
   type GitPullRequestRefInput,
   type VcsPullResult,
   type VcsRemoveWorktreeInput,
+  type VcsStashAndSwitchInput,
+  type VcsStashDropInput,
+  type VcsStashInfoInput,
+  type VcsStashInfoResult,
   type GitResolvePullRequestResult,
   type GitRunStackedActionInput,
   type GitRunStackedActionResult,
@@ -67,6 +71,11 @@ export interface GitWorkflowServiceShape {
   readonly switchRef: (
     input: VcsSwitchRefInput,
   ) => Effect.Effect<VcsSwitchRefResult, GitCommandError>;
+  readonly stashAndSwitch: (input: VcsStashAndSwitchInput) => Effect.Effect<void, GitCommandError>;
+  readonly stashDrop: (input: VcsStashDropInput) => Effect.Effect<void, GitCommandError>;
+  readonly stashInfo: (
+    input: VcsStashInfoInput,
+  ) => Effect.Effect<VcsStashInfoResult, GitCommandError>;
   readonly renameBranch: (input: {
     readonly cwd: string;
     readonly oldBranch: string;
@@ -306,6 +315,18 @@ export const make = Effect.fn("makeGitWorkflowService")(function* () {
       ensureGitCommand("GitWorkflowService.switchRef", input.cwd).pipe(
         Effect.andThen(Effect.scoped(git.switchRef(input))),
       ),
+    stashAndSwitch: (input) =>
+      ensureGitCommand("GitWorkflowService.stashAndSwitch", input.cwd).pipe(
+        Effect.andThen(Effect.scoped(git.stashAndSwitch(input))),
+      ),
+    stashDrop: (input) =>
+      ensureGitCommand("GitWorkflowService.stashDrop", input.cwd).pipe(
+        Effect.andThen(git.stashDrop(input)),
+      ),
+    stashInfo: (input) =>
+      ensureGitCommand("GitWorkflowService.stashInfo", input.cwd).pipe(
+        Effect.andThen(git.stashInfo(input)),
+      ),
     renameBranch: (input) =>
       ensureGit("GitWorkflowService.renameBranch", input.cwd).pipe(
         Effect.andThen(git.renameBranch(input)),

apps/server/src/server.test.ts

@@ -2897,6 +2897,62 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
     }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
+  it.effect("routes websocket rpc vcs.stashAndSwitch errors after refreshing vcs status", () =>
+    Effect.gen(function* () {
+      const gitError = new GitCommandError({
+        operation: "stashAndSwitch",
+        command: "git stash pop",
+        cwd: "/tmp/repo",
+        detail: "stash pop conflict",
+      });
+      const refreshed = yield* Deferred.make<void>();
+      let refreshCalls = 0;
+      yield* buildAppUnderTest({
+        layers: {
+          gitVcsDriver: {
+            stashAndSwitch: () => Effect.fail(gitError),
+          },
+          vcsStatusBroadcaster: {
+            refreshStatus: (cwd: string) =>
+              Effect.sync(() => {
+                assert.equal(cwd, "/tmp/repo");
+                refreshCalls += 1;
+              }).pipe(
+                Effect.andThen(Deferred.succeed(refreshed, undefined)),
+                Effect.as({
+                  isRepo: true,
+                  hasPrimaryRemote: true,
+                  isDefaultRef: false,
+                  refName: "feature/demo",
+                  hasWorkingTreeChanges: true,
+                  workingTree: { files: [], insertions: 0, deletions: 0 },
+                  hasUpstream: true,
+                  aheadCount: 0,
+                  behindCount: 0,
+                  aheadOfDefaultCount: 0,
+                  pr: null,
+                }),
+              ),
+          },
+        },
+      });
+
+      const wsUrl = yield* getWsServerUrl("/ws");
+      const result = yield* Effect.scoped(
+        withWsRpcClient(wsUrl, (client) =>
+          client[WS_METHODS.vcsStashAndSwitch]({
+            cwd: "/tmp/repo",
+            refName: "feature/demo",
+          }).pipe(Effect.result),
+        ),
+      );
+
+      assertFailure(result, gitError);
+      yield* Deferred.await(refreshed).pipe(Effect.timeout(Duration.seconds(1)));
+      assert.equal(refreshCalls, 1);
+    }).pipe(Effect.provide(NodeHttpServer.layerTest)),
+  );
+
   it.effect("routes websocket rpc git.runStackedAction errors after refreshing git status", () =>
     Effect.gen(function* () {
       const gitError = new GitCommandError({

apps/server/src/vcs/GitVcsDriver.ts

@@ -23,6 +23,10 @@ import {
   type VcsListRefsResult,
   type VcsPullResult,
   type VcsRemoveWorktreeInput,
+  type VcsStashAndSwitchInput,
+  type VcsStashDropInput,
+  type VcsStashInfoInput,
+  type VcsStashInfoResult,
   type VcsStatusInput,
   type VcsStatusResult,
 } from "@t3tools/contracts";
@@ -212,6 +216,11 @@ export interface GitVcsDriverShape {
   readonly switchRef: (
     input: VcsSwitchRefInput,
   ) => Effect.Effect<VcsSwitchRefResult, GitCommandError>;
+  readonly stashAndSwitch: (input: VcsStashAndSwitchInput) => Effect.Effect<void, GitCommandError>;
+  readonly stashDrop: (input: VcsStashDropInput) => Effect.Effect<void, GitCommandError>;
+  readonly stashInfo: (
+    input: VcsStashInfoInput,
+  ) => Effect.Effect<VcsStashInfoResult, GitCommandError>;
   readonly initRepo: (input: VcsInitInput) => Effect.Effect<void, GitCommandError>;
   readonly listLocalBranchNames: (cwd: string) => Effect.Effect<string[], GitCommandError>;
 }