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
JavaScript ai-agentsdashboarddeveloper-toolsdigital-twinquantified-selfsecond-brainself-hostedtailscale
Merge remote-tracking branch 'origin/main' into next/issue-12572
[._.]/ Adam Eivyae4f9a9e8196
diff --cc server/services/worktreeManager.jsindex 60903f3cc0,4bf90fb6a9..3c8f7953ce--- a/server/services/worktreeManager.js+++ b/server/services/worktreeManager.js@@@ -1973,11 -1954,9 +1954,9 @@@ export async function reapMergedWorktre.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).- const managedRoots = includeUnmanagedTrees ? [] : [+ const managedRoots = [{ path: WORKTREES_DIR, requireAgentId: true },{ path: claudeTreesRoot, requireAgentId: false },];diff --cc server/services/worktreeReap.test.jsindex 1fbe7af8f9,62386100c4..ee42e5c72c--- a/server/services/worktreeReap.test.js+++ b/server/services/worktreeReap.test.js@@@ -663,66 -626,6 +627,52 @@@ describe.skipIf(SKIP_HEAVY_INTEGRATION)expect(listed).not.toContain('vanished');});- it('holds a merged + clean tree whose branch is in excludeBranches', async () => {- const path = await addWorktree(dir, 'spoken-for', 'spoken-for-br');- await execGit(['merge', '--no-ff', 'spoken-for-br', '--no-edit'], dir);-- const result = await reapMergedWorktrees(dir, {- includeClaudeTrees: true,- excludeBranches: new Set(['spoken-for-br'])- });-- expect(result.reaped.map(r => r.branch)).not.toContain('spoken-for-br');- expect(skipReason(result, path)).toBe('protected');- 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);