Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix([issue-12572]): keep gh-pages worktrees out of the merged-worktree reapers

[._.]/ Adam Eivy7804e8c60be2
diff --git a/server/services/worktreeManager.js b/server/services/worktreeManager.js
index c2d2f7c9a4..60903f3cc0 100644
--- a/server/services/worktreeManager.js
+++ b/server/services/worktreeManager.js
@@ -1973,7 +1973,7 @@ export async function reapMergedWorktrees(sourceWorkspace, {
.then(r => r.stdout.trim())
.catch(() => '');
- const protectedBranches = new Set(['main', 'master', 'dev', 'develop', 'release', defaultBranch]);
+ const protectedBranches = new Set([...PROTECTED_BRANCHES, defaultBranch]);
const claudeTreesRoot = join(sourceWorkspace, '.claude', 'worktrees');
// An empty allowlist is how worktreeOwnershipReason spells "no location check"
// (see includeUnmanagedTrees above for what that gives up).
@@ -2127,7 +2127,7 @@ async function cleanupExternalRepoWorktrees(readActiveIds, alreadyHandled, readO
const branchName = wt.branch.replace(/^refs\/heads\//, '');
const defaultBranch = await getDefaultBranch(parentRepo, { strict: true }).catch(() => null);
- if (!defaultBranch || ['main', 'master', 'dev', 'develop', 'release', defaultBranch].includes(branchName)) continue;
+ if (!defaultBranch || PROTECTED_BRANCHES.includes(branchName) || branchName === defaultBranch) continue;
const status = await execGit(['status', '--porcelain'], worktreePath).then(r => r.stdout).catch(() => null);
if (status === null || !classifyWorktreeDirt(status).clean) continue;
const target = await resolveMergeTarget(parentRepo, defaultBranch);
diff --git a/server/services/worktreeReap.test.js b/server/services/worktreeReap.test.js
index fbce24e7fa..1fbe7af8f9 100644
--- a/server/services/worktreeReap.test.js
+++ b/server/services/worktreeReap.test.js
@@ -27,9 +27,10 @@ import { cleanupTempDataRoots, lazyTempDataRoot, makePathsProxy } from '../lib/m
vi.mock('../lib/paths.js', async importOriginal => makePathsProxy(await importOriginal(), { dataRoot: () => lazyTempDataRoot('portos-reap-archives-') }));
afterAll(cleanupTempDataRoots);
import { PATHS } from '../lib/paths.js';
+import { PATHS as FILE_PATHS } from '../lib/fileUtils.js';
import { preserveBranchRetirement } from '../lib/branchRetirementArchive.js';
import { hasBranchMergeEvidence, getStatus, getStatusPorcelain } from './git.js';
-import { reapMergedWorktrees, deleteCompletedLocalBranch, readWorktreeStatus } from './worktreeManager.js';
+import { reapMergedWorktrees, cleanupOrphanedWorktrees, deleteCompletedLocalBranch, readWorktreeStatus } from './worktreeManager.js';
vi.mock('./branchCompletionPolicy.js', () => ({ readBranchCompletionHold: async () => null }));
vi.mock('./cosState.js', () => ({ readAgentsStateForSafetyCheck: async () => ({ trusted: true, agents: {} }) }));
@@ -676,6 +677,52 @@ describe.skipIf(SKIP_HEAVY_INTEGRATION)('reapMergedWorktrees', () => {
expect(existsSync(path)).toBe(true);
});
+ // gh-pages is a publishing branch. Both sweeps used to copy the protected
+ // list and drop it, so a clean merged checkout was archived and removed.
+ // The disposable sibling is the same shape on an unprotected name, so a
+ // sweep that protected every branch would fail here too.
+ it('holds a merged + clean gh-pages worktree in both reapers', async () => {
+ const pagesPath = await addWorktree(dir, 'pages', 'gh-pages');
+ const disposablePath = await addWorktree(dir, 'disposable', 'disposable-br');
+ await execGit(['merge', '--no-ff', 'gh-pages', '--no-edit'], dir);
+ await execGit(['merge', '--no-ff', 'disposable-br', '--no-edit'], dir);
+
+ const reaped = await reapMergedWorktrees(dir, { includeClaudeTrees: true });
+ expect(reaped.reaped.map(r => r.branch)).not.toContain('gh-pages');
+ expect(skipReason(reaped, pagesPath)).toBe('protected');
+ expect(existsSync(pagesPath)).toBe(true);
+ expect(reaped.reaped.map(r => r.branch)).toContain('disposable-br');
+ expect(existsSync(disposablePath)).toBe(false);
+
+ // cleanupExternalRepoWorktrees only admits agent-* dirs under the shared
+ // worktrees root, and that root must be the temp one both PATHS see.
+ expect(PATHS.worktrees).toContain('portos-reap-archives-');
+ expect(FILE_PATHS.worktrees).toBe(PATHS.worktrees);
+ const managedApp = join(externalRoot, 'managed-app');
+ await materializeGitRepo(managedApp, { identity: { email: '[email protected]', name: 'Test' } });
+ await mkdir(PATHS.worktrees, { recursive: true });
+ const externalPages = join(PATHS.worktrees, 'agent-pages');
+ const externalDisposable = join(PATHS.worktrees, 'agent-disposable');
+ try {
+ await execGit(['worktree', 'add', '-b', 'gh-pages', externalPages, 'main'], managedApp);
+ await execGit(['worktree', 'add', '-b', 'disposable-br', externalDisposable, 'main'], managedApp);
+ await commitFile(externalPages, 'pages.txt', 'pages\n', 'pages work');
+ await commitFile(externalDisposable, 'disposable.txt', 'disposable\n', 'disposable work');
+ await execGit(['merge', '--no-ff', 'gh-pages', '--no-edit'], managedApp);
+ await execGit(['merge', '--no-ff', 'disposable-br', '--no-edit'], managedApp);
+
+ const cleaned = await cleanupOrphanedWorktrees(dir, new Set(), { claimOwners: { agents: [] } });
+ expect(cleaned).toBe(1);
+ expect(existsSync(externalPages)).toBe(true);
+ expect((await execGit(['show-ref', '--verify', 'refs/heads/gh-pages'], managedApp, { ignoreExitCode: true })).exitCode).toBe(0);
+ expect(existsSync(externalDisposable)).toBe(false);
+ expect((await execGit(['show-ref', '--verify', 'refs/heads/disposable-br'], managedApp, { ignoreExitCode: true })).exitCode).not.toBe(0);
+ } finally {
+ await rm(PATHS.worktrees, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+ await rm(managedApp, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+ }
+ });
+
it('excludes .claude trees when includeClaudeTrees is false', async () => {
const path = await addWorktree(dir, 'excluded', 'excluded-br');
await execGit(['merge', '--no-ff', 'excluded-br', '--no-edit'], dir);