Skip to content

fix (desktop): delete optimistic updates #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AviPeltz merged 3 commits into from
Jan 7, 2026
Merged

fix (desktop): delete optimistic updates #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f1feba
fix delete taking so long
AviPeltz Jan 6, 2026
08bc55c
Merge remote-tracking branch 'origin/main' into why-deleting-take-so-…
AviPeltz Jan 7, 2026
8e30af5
make this ish more robusticles
AviPeltz Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 128 additions & 2 deletions apps/desktop/src/renderer/react-query/workspaces/useCloseWorkspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,27 @@
import { trpc } from "renderer/lib/trpc";

type CloseContext = {
previousGrouped: ReturnType<
typeof trpc.useUtils
>["workspaces"]["getAllGrouped"]["getData"] extends () => infer R
? R
: never;
previousAll: ReturnType<
typeof trpc.useUtils
>["workspaces"]["getAll"]["getData"] extends () => infer R
? R
: never;
previousActive: ReturnType<
typeof trpc.useUtils
>["workspaces"]["getActive"]["getData"] extends () => infer R
? R
: never;
};

/**
* Mutation hook for closing a workspace without deleting the worktree
* Automatically invalidates all workspace queries on success
* Uses optimistic updates to immediately remove workspace from UI,
* then performs actual close in background.
*/
export function useCloseWorkspace(
options?: Parameters<typeof trpc.workspaces.close.useMutation>[0],
Expand All @@ -11,8 +30,115 @@ export function useCloseWorkspace(

return trpc.workspaces.close.useMutation({
...options,
onMutate: async ({ id }) => {
// Cancel outgoing refetches to avoid overwriting optimistic update
await Promise.all([
utils.workspaces.getAll.cancel(),
utils.workspaces.getAllGrouped.cancel(),
utils.workspaces.getActive.cancel(),
]);

// Snapshot previous values for rollback
const previousGrouped = utils.workspaces.getAllGrouped.getData();
const previousAll = utils.workspaces.getAll.getData();
const previousActive = utils.workspaces.getActive.getData();

// Optimistically remove workspace from getAllGrouped cache
if (previousGrouped) {
utils.workspaces.getAllGrouped.setData(
undefined,
previousGrouped
.map((group) => ({
...group,
workspaces: group.workspaces.filter((w) => w.id !== id),
}))
.filter((group) => group.workspaces.length > 0),
);
}

// Optimistically remove workspace from getAll cache
if (previousAll) {
utils.workspaces.getAll.setData(
undefined,
previousAll.filter((w) => w.id !== id),
);
}

// If closing the active workspace, switch to another workspace optimistically
// This prevents a flash of "no workspace" state while the backend processes
if (previousActive?.id === id) {
// Find the next workspace to switch to (matches backend logic: most recently opened)
const remainingWorkspaces = previousAll
?.filter((w) => w.id !== id)
.sort((a, b) => b.lastOpenedAt - a.lastOpenedAt);

if (remainingWorkspaces && remainingWorkspaces.length > 0) {
const nextWorkspace = remainingWorkspaces[0];
// Find the project info for the next workspace from grouped data
const projectGroup = previousGrouped?.find((g) =>
g.workspaces.some((w) => w.id === nextWorkspace.id),
);
const workspaceFromGrouped = projectGroup?.workspaces.find(
(w) => w.id === nextWorkspace.id,
);

if (projectGroup && workspaceFromGrouped) {
// For worktree-type workspaces, provide minimal worktree data to prevent
// hasIncompleteInit from triggering the initialization view
const worktreeData =
workspaceFromGrouped.type === "worktree"
? {
branch: nextWorkspace.branch,
baseBranch: null,
gitStatus: {
branch: nextWorkspace.branch,
needsRebase: false,
lastRefreshed: Date.now(),
},
}
: null;

utils.workspaces.getActive.setData(undefined, {
...nextWorkspace,
type: workspaceFromGrouped.type,
worktreePath: workspaceFromGrouped.worktreePath,
project: {
id: projectGroup.project.id,
name: projectGroup.project.name,
mainRepoPath: projectGroup.project.mainRepoPath,
},
worktree: worktreeData,
});
} else {
// Fallback: just clear it and let invalidate handle it
utils.workspaces.getActive.setData(undefined, null);
}
} else {
// No remaining workspaces
utils.workspaces.getActive.setData(undefined, null);
}
}

// Return context for rollback
return { previousGrouped, previousAll, previousActive } as CloseContext;
},
onError: (_err, _variables, context) => {
// Rollback to previous state on error
if (context?.previousGrouped !== undefined) {
utils.workspaces.getAllGrouped.setData(
undefined,
context.previousGrouped,
);
}
if (context?.previousAll !== undefined) {
utils.workspaces.getAll.setData(undefined, context.previousAll);
}
if (context?.previousActive !== undefined) {
utils.workspaces.getActive.setData(undefined, context.previousActive);
}
},
onSuccess: async (...args) => {
// Auto-invalidate all workspace queries
// Invalidate to ensure consistency with backend state
await utils.workspaces.invalidate();
// Invalidate project queries since close updates project metadata
await utils.projects.getRecents.invalidate();
Expand Down
130 changes: 128 additions & 2 deletions apps/desktop/src/renderer/react-query/workspaces/useDeleteWorkspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,27 @@
import { trpc } from "renderer/lib/trpc";

type DeleteContext = {
previousGrouped: ReturnType<
typeof trpc.useUtils
>["workspaces"]["getAllGrouped"]["getData"] extends () => infer R
? R
: never;
previousAll: ReturnType<
typeof trpc.useUtils
>["workspaces"]["getAll"]["getData"] extends () => infer R
? R
: never;
previousActive: ReturnType<
typeof trpc.useUtils
>["workspaces"]["getActive"]["getData"] extends () => infer R
? R
: never;
};

/**
* Mutation hook for deleting a workspace
* Automatically invalidates all workspace queries on success
* Uses optimistic updates to immediately remove workspace from UI,
* then performs actual deletion in background.
*/
export function useDeleteWorkspace(
options?: Parameters<typeof trpc.workspaces.delete.useMutation>[0],
Expand All @@ -11,8 +30,115 @@ export function useDeleteWorkspace(

return trpc.workspaces.delete.useMutation({
...options,
onMutate: async ({ id }) => {
// Cancel outgoing refetches to avoid overwriting optimistic update
await Promise.all([
utils.workspaces.getAll.cancel(),
utils.workspaces.getAllGrouped.cancel(),
utils.workspaces.getActive.cancel(),
]);

// Snapshot previous values for rollback
const previousGrouped = utils.workspaces.getAllGrouped.getData();
const previousAll = utils.workspaces.getAll.getData();
const previousActive = utils.workspaces.getActive.getData();

// Optimistically remove workspace from getAllGrouped cache
if (previousGrouped) {
utils.workspaces.getAllGrouped.setData(
undefined,
previousGrouped
.map((group) => ({
...group,
workspaces: group.workspaces.filter((w) => w.id !== id),
}))
.filter((group) => group.workspaces.length > 0),
);
}

// Optimistically remove workspace from getAll cache
if (previousAll) {
utils.workspaces.getAll.setData(
undefined,
previousAll.filter((w) => w.id !== id),
);
}

// If deleting the active workspace, switch to another workspace optimistically
// This prevents a flash of "no workspace" state while the backend processes
if (previousActive?.id === id) {
// Find the next workspace to switch to (matches backend logic: most recently opened)
const remainingWorkspaces = previousAll
?.filter((w) => w.id !== id)
.sort((a, b) => b.lastOpenedAt - a.lastOpenedAt);

if (remainingWorkspaces && remainingWorkspaces.length > 0) {
const nextWorkspace = remainingWorkspaces[0];
// Find the project info for the next workspace from grouped data
const projectGroup = previousGrouped?.find((g) =>
g.workspaces.some((w) => w.id === nextWorkspace.id),
);
const workspaceFromGrouped = projectGroup?.workspaces.find(
(w) => w.id === nextWorkspace.id,
);

if (projectGroup && workspaceFromGrouped) {
// For worktree-type workspaces, provide minimal worktree data to prevent
// hasIncompleteInit from triggering the initialization view
const worktreeData =
workspaceFromGrouped.type === "worktree"
? {
branch: nextWorkspace.branch,
baseBranch: null,
gitStatus: {
branch: nextWorkspace.branch,
needsRebase: false,
lastRefreshed: Date.now(),
},
}
: null;

utils.workspaces.getActive.setData(undefined, {
...nextWorkspace,
type: workspaceFromGrouped.type,
worktreePath: workspaceFromGrouped.worktreePath,
project: {
id: projectGroup.project.id,
name: projectGroup.project.name,
mainRepoPath: projectGroup.project.mainRepoPath,
},
worktree: worktreeData,
});
} else {
// Fallback: just clear it and let invalidate handle it
utils.workspaces.getActive.setData(undefined, null);
}
} else {
// No remaining workspaces
utils.workspaces.getActive.setData(undefined, null);
}
}

// Return context for rollback
return { previousGrouped, previousAll, previousActive } as DeleteContext;
},
onError: (_err, _variables, context) => {
// Rollback to previous state on error
if (context?.previousGrouped !== undefined) {
utils.workspaces.getAllGrouped.setData(
undefined,
context.previousGrouped,
);
}
if (context?.previousAll !== undefined) {
utils.workspaces.getAll.setData(undefined, context.previousAll);
}
if (context?.previousActive !== undefined) {
utils.workspaces.getActive.setData(undefined, context.previousActive);
}
},
onSuccess: async (...args) => {
// Auto-invalidate all workspace queries
// Invalidate to ensure consistency with backend state
await utils.workspaces.invalidate();

// Call user's onSuccess if provided
Expand Down
Loading