fix(archive): skip checkpoint when worktree was deleted externally by jonathanlab · Pull Request #1910 · PostHog/code

jonathanlab · 2026-04-28T15:33:57Z

Closes https://github.com/PostHog/code/issues/1798

jonathanlab · 2026-04-28T15:34:12Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

greptile-apps · 2026-04-28T15:46:18Z

Prompt To Fix All With AI

This is a comment left during a code review.
Path: apps/code/src/main/services/archive/service.ts
Line: 187-218

Comment:
**Prefer `if/else` over two separate `if` blocks**

The two independent `if (!worktreeIsValid)` / `if (worktreeIsValid)` blocks are mutually exclusive and can be collapsed into a single `if/else`, removing the superfluous second condition check and making the intent clearer.

```suggestion
        if (worktreeIsValid) {
```

How can I resolve this? If you propose a fix, please make it concise.

_{Reviews (1): Last reviewed commit: "fix(archive): skip checkpoint when workt..." | Re-trigger Greptile}

greptile-apps · 2026-04-28T15:46:22Z

+        if (!worktreeIsValid) {
+          log.warn(
+            `Worktree at ${worktreePath} is missing or not a git repository; skipping checkpoint capture`,
+          );
+          archivedTask.checkpointId = null;
+        }
+
+        if (worktreeIsValid) {
+          const actualBranch = await this.getCurrentBranchName(worktreePath);
+          if (actualBranch && actualBranch !== "HEAD") {
+            archivedTask.branchName = actualBranch;
+          }
+
+          await step(
+            async () => {
+              if (!archivedTask.checkpointId) {
+                throw new Error("checkpointId must be set for worktree mode");
+              }
+              await this.captureWorktreeCheckpoint(
+                folderPath,
+                worktreePath,
+                archivedTask.checkpointId,
+              );
+            },
+            async () => {
+              if (archivedTask.checkpointId) {
+                const git = createGitClient(folderPath);
+                await deleteCheckpoint(git, archivedTask.checkpointId);
+              }
+            },
+          );
+        }


Prefer if/else over two separate if blocks

The two independent if (!worktreeIsValid) / if (worktreeIsValid) blocks are mutually exclusive and can be collapsed into a single if/else, removing the superfluous second condition check and making the intent clearer.

Suggested change

if (!worktreeIsValid) {

log.warn(

`Worktree at ${worktreePath} is missing or not a git repository; skipping checkpoint capture`,

);

archivedTask.checkpointId = null;

}

if (worktreeIsValid) {

const actualBranch = await this.getCurrentBranchName(worktreePath);

if (actualBranch && actualBranch !== "HEAD") {

archivedTask.branchName = actualBranch;

}

await step(

async () => {

if (!archivedTask.checkpointId) {

throw new Error("checkpointId must be set for worktree mode");

}

await this.captureWorktreeCheckpoint(

folderPath,

worktreePath,

archivedTask.checkpointId,

);

},

async () => {

if (archivedTask.checkpointId) {

const git = createGitClient(folderPath);

await deleteCheckpoint(git, archivedTask.checkpointId);

}

},

);

}

if (worktreeIsValid) {

Prompt To Fix With AI

This is a comment left during a code review. Path: apps/code/src/main/services/archive/service.ts Line: 187-218 Comment: **Prefer `if/else` over two separate `if` blocks** The two independent `if (!worktreeIsValid)` / `if (worktreeIsValid)` blocks are mutually exclusive and can be collapsed into a single `if/else`, removing the superfluous second condition check and making the intent clearer. ```suggestion if (worktreeIsValid) { ``` How can I resolve this? If you propose a fix, please make it concise.

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!

adboio · 2026-04-28T18:25:11Z

+        if (!worktreeIsValid) {
+          log.warn(
+            `Worktree at ${worktreePath} is missing or not a git repository; skipping checkpoint capture`,
+          );
+          archivedTask.checkpointId = null;
+        }
+
+        if (worktreeIsValid) {
+          const actualBranch = await this.getCurrentBranchName(worktreePath);
+          if (actualBranch && actualBranch !== "HEAD") {
+            archivedTask.branchName = actualBranch;
+          }
+
+          await step(
+            async () => {
+              if (!archivedTask.checkpointId) {
+                throw new Error("checkpointId must be set for worktree mode");
+              }
+              await this.captureWorktreeCheckpoint(
+                folderPath,
+                worktreePath,
+                archivedTask.checkpointId,
+              );
+            },
+            async () => {
+              if (archivedTask.checkpointId) {
+                const git = createGitClient(folderPath);
+                await deleteCheckpoint(git, archivedTask.checkpointId);
+              }
+            },
+          );
+        }


jonathanlab · 2026-04-29T11:00:33Z

Merge activity

Apr 29, 11:00 AM UTC: A user started a stack merge that includes this pull request via Graphite.
Apr 29, 11:00 AM UTC: Graphite couldn't merge this pull request because a downstack PR fix(sidebar): show created task immediately #1908 failed to merge.
Apr 29, 11:21 AM UTC: A user started a stack merge that includes this pull request via Graphite.
Apr 29, 11:30 AM UTC: Graphite rebased this pull request as part of a merge.
Apr 29, 11:37 AM UTC: @jonathanlab merged this pull request with Graphite.

When a workspace's worktree directory was deleted by an external process, archiving failed because CaptureCheckpointSaga ran against a non-git path and threw "fatal: not a git repository". The rollback then restored the task, producing the flash-and-reappear behavior reported in #1798. Now we probe the worktree with isGitRepository before checkpointing; if the path is missing or invalid, we log the reason, set checkpointId to null, and continue with the remaining cleanup steps. A null checkpointId naturally causes unarchive to skip worktree restoration. Generated-By: PostHog Code Task-Id: eeaa1905-3fe5-423c-a853-08d75e78947b

This was referenced Apr 28, 2026

fix(sidebar): show created task immediately #1908

Merged

fix(code): make plan approval primary option match user's prior mode #1909

Merged

This was referenced Apr 28, 2026

fix(code): show full file path for untracked files in review pane #1911

Merged

fix(code): auto-highlight first branch result in selector #1912

Merged

fix(code): allow adjusting thinking level mid-run from chat box #1913

Merged

jonathanlab marked this pull request as ready for review April 28, 2026 15:45

greptile-apps Bot reviewed Apr 28, 2026

View reviewed changes

adboio approved these changes Apr 28, 2026

View reviewed changes

jonathanlab force-pushed the 04-28-fix_archive_skip_checkpoint_when_worktree_was_deleted_externally branch from a5618da to 45304f5 Compare April 29, 2026 10:26

jonathanlab force-pushed the 04-28-fix_code_make_plan_approval_primary_option_match_user_s_prior_mode branch from c67bb56 to 271ba9c Compare April 29, 2026 10:26

jonathanlab force-pushed the 04-28-fix_code_make_plan_approval_primary_option_match_user_s_prior_mode branch from 271ba9c to 1640b9e Compare April 29, 2026 11:06

jonathanlab force-pushed the 04-28-fix_archive_skip_checkpoint_when_worktree_was_deleted_externally branch from 45304f5 to 7989298 Compare April 29, 2026 11:06

jonathanlab changed the base branch from 04-28-fix_code_make_plan_approval_primary_option_match_user_s_prior_mode to graphite-base/1910 April 29, 2026 11:22

jonathanlab changed the base branch from graphite-base/1910 to main April 29, 2026 11:28

jonathanlab force-pushed the 04-28-fix_archive_skip_checkpoint_when_worktree_was_deleted_externally branch from 7989298 to e5704e9 Compare April 29, 2026 11:29

jonathanlab merged commit 393b289 into main Apr 29, 2026
16 checks passed

jonathanlab deleted the 04-28-fix_archive_skip_checkpoint_when_worktree_was_deleted_externally branch April 29, 2026 11:37

Navigation Menu

Repository navigation

fix(archive): skip checkpoint when worktree was deleted externally - #1910

fix(archive): skip checkpoint when worktree was deleted externally#1910
jonathanlab merged 1 commit into
mainfrom
04-28-fix_archive_skip_checkpoint_when_worktree_was_deleted_externally

jonathanlab commented Apr 28, 2026 •

edited

Loading

Uh oh!

jonathanlab commented Apr 28, 2026 •

edited

Loading

Uh oh!

greptile-apps Bot commented Apr 28, 2026

Uh oh!

greptile-apps Bot Apr 28, 2026

Uh oh!

adboio Apr 28, 2026

Uh oh!

adboio Apr 28, 2026

Uh oh!

jonathanlab commented Apr 29, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

jonathanlab commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jonathanlab commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

greptile-apps Bot commented Apr 28, 2026

Uh oh!

greptile-apps Bot Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

adboio Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

adboio Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

jonathanlab commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge activity

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jonathanlab commented Apr 28, 2026 •

edited

Loading

jonathanlab commented Apr 28, 2026 •

edited

Loading

jonathanlab commented Apr 29, 2026 •

edited

Loading