fix(worktree): filter worktrees by branch pattern and handle orphaned state

.gitignore

@@ -61,6 +61,7 @@ lerna-debug.log*
 .auto-claude-status
 .claude_settings.json
 .update-metadata.json
+tmpclaude-*
 
 # ===========================
 # Python (apps/backend)

apps/backend/core/worktree.py

@@ -31,6 +31,11 @@
 
 T = TypeVar("T")
 
+# Base branches that should be filtered out when listing worktrees
+# These indicate orphaned worktrees (e.g., after GitHub PR merge)
+# NOTE: Keep in sync with BASE_BRANCHES in apps/frontend/src/shared/constants/git.ts
+BASE_BRANCHES = frozenset({"main", "master", "develop", "head"})
+
 
 def _is_retryable_network_error(stderr: str) -> bool:
     """Check if an error is a retryable network/connection issue."""
@@ -647,29 +652,10 @@ def merge_worktree(
         result = self._run_git(merge_args)
 
         if result.returncode != 0:
-            # Check if it's "already up to date" - not an error
-            output = (result.stdout + result.stderr).lower()
-            if "already up to date" in output or "already up-to-date" in output:
-                print(f"Branch {info.branch} is already up to date.")
-                if no_commit:
-                    print("No changes to stage.")
-                if delete_after:
-                    self.remove_worktree(spec_name, delete_branch=True)
-                return True
-            # Check for actual conflicts
-            if "conflict" in output:
-                print("Merge conflict! Aborting merge...")
-                self._run_git(["merge", "--abort"])
-                return False
-            # Other error - show details
-            stderr_msg = (
-                result.stderr[:200]
-                if result.stderr
-                else result.stdout[:200]
-                if result.stdout
-                else "<no output>"
+            error_detail = (
+                result.stderr.strip() or result.stdout.strip() or "Unknown error"
             )
-            print(f"Merge failed: {stderr_msg}")
+            print(f"Merge failed: {error_detail}")
             self._run_git(["merge", "--abort"])
             return False
 
@@ -719,7 +705,8 @@ def list_all_worktrees(self) -> list[WorktreeInfo]:
             for item in self.worktrees_dir.iterdir():
                 if item.is_dir():
                     info = self.get_worktree_info(item.name)
-                    if info:
+                    # Skip worktrees on base branches (orphaned after GitHub merge)
+                    if info and info.branch.lower() not in BASE_BRANCHES:
                         worktrees.append(info)
                         seen_specs.add(item.name)
 
@@ -729,7 +716,8 @@ def list_all_worktrees(self) -> list[WorktreeInfo]:
             for item in legacy_dir.iterdir():
                 if item.is_dir() and item.name not in seen_specs:
                     info = self.get_worktree_info(item.name)
-                    if info:
+                    # Skip worktrees on base branches (orphaned after GitHub merge)
+                    if info and info.branch.lower() not in BASE_BRANCHES:
                         worktrees.append(info)
 
         return worktrees

apps/frontend/src/main/__tests__/insights-config.test.ts

@@ -59,9 +59,8 @@ describe('InsightsConfig', () => {
     expect(env.CLAUDE_CODE_OAUTH_TOKEN).toBe('oauth-token');
     expect(env.ANTHROPIC_BASE_URL).toBe('https://api.z.ai');
     expect(env.ANTHROPIC_AUTH_TOKEN).toBe('key');
-    expect(env.PYTHONPATH).toBe(
-      [path.resolve('/site-packages'), path.resolve('/backend')].join(path.delimiter)
-    );
+    // path.resolve() normalizes paths to platform-specific format
+    expect(env.PYTHONPATH).toBe([path.resolve('/site-packages'), path.resolve('/backend')].join(path.delimiter));
   });
 
   it('should clear ANTHROPIC env vars in OAuth mode when no API profile is set', async () => {
@@ -86,6 +85,7 @@ describe('InsightsConfig', () => {
 
     const env = await config.getProcessEnv();
 
+    // path.resolve() normalizes paths to platform-specific format
     expect(env.PYTHONPATH).toBe(path.resolve('/backend'));
   });
 
@@ -96,6 +96,7 @@ describe('InsightsConfig', () => {
 
     const env = await config.getProcessEnv();
 
+    // path.resolve() normalizes paths to platform-specific format
     expect(env.PYTHONPATH).toBe(path.resolve('/site-packages'));
   });
 });