crewly 1.20.296 → 1.20.298

package/dist/backend/backend/src/services/worktree/worktree-janitor.service.d.ts

@@ -33,15 +33,23 @@
  *    dir's index / HEAD / logs/HEAD) more than 2 hours ago in a known agent
  *    location (`<main>/.claude/worktrees/`, `<tmp>/crewly-worktrees/`, or a
  *    `worktree-agent-*` branch), more than 24 hours ago anywhere else.
- * 6. `git status --porcelain --untracked-files=all` is empty: no tracked
- *    change and no untracked file. Ignored files (node_modules, dist) do not
- *    count. A failing status keeps it.
+ * 6. Nothing but regenerable output is uncommitted: `git status --porcelain`
+ *    shows no tracked change and no untracked file, ignoring untracked
+ *    `node_modules` / `.next` / `dist` / `build` / `.turbo` / `coverage` /
+ *    `.cache` / `logs` directories and `*.log` files (nested packages rarely
+ *    ignore their own). A failing status keeps it.
  * 7. Its work has landed: HEAD is an ancestor of `origin/<default branch>`
  *    after a quiet `git fetch` (fetch errors ignored), OR — when `gh` is
  *    installed and authenticated — a MERGED PR has this branch as head AND
  *    its head commit equals the worktree HEAD (squash merges; commits made
  *    after the merge keep the worktree). A repo without an origin (not on
- *    GitHub) only has the ancestor check, so its worktrees are kept.
+ *    GitHub) only has the ancestor check, so its worktrees are kept — OR, for
+ *    any git host (Bitbucket, GitLab, squash merges), its CONTENT is already in
+ *    `origin/<default>`: merging HEAD into it changes nothing
+ *    (`git merge-tree --write-tree`, falling back to `git cherry`), or the
+ *    branch's combined diff is patch-equivalent to one commit the default
+ *    branch gained since (a squash commit). See worktree-landed.ts. Work in
+ *    none of these is never removed. `gh` is not asked about non-GitHub remotes.
  *
  * ## Removal
  * `git worktree remove <path>` without `--force`. If git refuses although
@@ -49,6 +57,17 @@
  * no submodules, it is retried once with `--force`. Then the local branch is
  * deleted (never a protected name), and `git worktree prune` runs per repo.
  *
+ * ## Low disk: kept worktrees
+ * Under low disk, a worktree kept as `dirty` or `not-merged` and idle for
+ * 24 h+ still loses its `node_modules` / `.next` directories (reversible:
+ * reinstall / rebuild); the verdict carries `reclaimed` and the summary
+ * `reclaimedBytes`.
+ *
+ * ## Work completion
+ * A WorkItem reaching done / verified calls `requestTidy()`: one debounced pass
+ * (2 min) with a 10 min idle threshold, so a finished worktree is removed as
+ * soon as its change has landed, not at the next 30-minute tick.
+ *
  * ## Scratch sweep
  * After the worktrees, stale Claude Code session dirs
  * (`<tmp>/claude-<uid>/<slug>/<uuid>/`) are deleted when idle for 3 days,
@@ -64,6 +83,15 @@
  * the janitor left and why; below 5 GB the notice is urgent and repeats at
  * most every 6 h.
  *
+ * ## Runaway files
+ * Once a minute a watcher scans agent scratch dirs and worktrees for a single
+ * file that grows without bound (a 40 GB `all.md` filled a disk, crewly#1078):
+ * a file over 5 GB that is still growing, or any file growing over 1 GB/min,
+ * has its writer stopped, is cut to its first 1 MB, the agent working there is
+ * told and the owner is alerted once through the low-disk notifier. A big file
+ * that is not growing is only reported. See
+ * {@link module:services/worktree/runaway-file-watcher}.
+ *
  * Runs every 30 minutes (first run 10 minutes after boot). Kill switch:
  * `CREWLY_WORKTREE_JANITOR=0` (also stops the low-disk guard). Never throws;
  * logs one summary line per sweep.
@@ -73,12 +101,13 @@
 import { type StatFsFn } from './low-disk-guard.js';
 import { type ScratchSweepSummary } from './scratch-janitor.js';
 import { type DockerReclaimResult } from './docker-reclaim.js';
+import { type RunawayOutcome } from './runaway-file-watcher.js';
 import { type TraceDiskResult } from '../trace/trace-store.js';
 /**
  * Why a worktree is kept, or why it may go. (`not-agent-worktree` is retired:
  * location no longer decides eligibility, only the idle threshold.)
  */
-export type WorktreeReason = 'main-worktree' | 'bare' | 'prunable' | 'locked' | 'managed-by-workitem-worktrees' | 'agent-session-inside' | 'process-inside' | 'cwd-probe-failed' | 'recent' | 'dirty' | 'status-failed' | 'not-merged' | 'merged' | 'pr-merged';
+export type WorktreeReason = 'main-worktree' | 'bare' | 'prunable' | 'locked' | 'managed-by-workitem-worktrees' | 'agent-session-inside' | 'process-inside' | 'cwd-probe-failed' | 'recent' | 'dirty' | 'status-failed' | 'not-merged' | 'merged' | 'pr-merged' | 'content-landed';
 /** Verdict for one worktree (the dry-run output). */
 export interface WorktreeVerdict {
     /** Main worktree of the repo this worktree belongs to */
@@ -97,6 +126,11 @@ export interface WorktreeVerdict {
     detail?: string;
     /** Ms since last touched, when computed */
     idleMs?: number;
+    /** Low disk only: regenerable dirs (node_modules, .next) of a kept worktree that were (or, in a dry run, would be) deleted */
+    reclaimed?: {
+        dirs: string[];
+        freedBytes: number;
+    };
 }
 /** Outcome of acting on one verdict. */
 export interface WorktreeOutcome extends WorktreeVerdict {
@@ -127,6 +161,8 @@ export interface JanitorRunSummary {
     wouldRemove: number;
     /** Worktrees kept */
     kept: number;
+    /** Bytes freed by deleting regenerable dirs (node_modules, .next) from kept worktrees under low disk */
+    reclaimedBytes: number;
     /** Kept worktrees by reason (removal failures under `remove-failed`) */
     keptReasons: Record<string, number>;
     /** Per-worktree results */
@@ -203,6 +239,8 @@ export interface WorktreeJanitorOptions {
     statePath?: string | null;
     /** Docker reclaim on low disk (default: the real one, except under jest); null = never */
     reclaimDocker?: (() => Promise<DockerReclaimResult>) | null;
+    /** Debounce before a completion-triggered pass (default COMPLETION_TIDY_DELAY_MS) */
+    tidyDelayMs?: number;
     /** Environment for the kill switch (default process.env) */
     env?: NodeJS.ProcessEnv;
     /** Logger (default: component logger `WorktreeJanitor`) */
@@ -234,6 +272,11 @@ export declare class WorktreeJanitorService {
     private lastPassAt;
     private memoryNoticeState;
     private notifier;
+    private agentNotifier;
+    private runawayTimer;
+    private tidyTimer;
+    private runawayWatcher;
+    private runawayInFlight;
     /**
      * @param options - Injectable dependencies; defaults use the live backend
      */
@@ -245,6 +288,22 @@ export declare class WorktreeJanitorService {
      * @param notifier - Sender, or null to disable notices
      */
     setLowDiskNotifier(notifier: LowDiskNotifier | null): void;
+    /**
+     * Set how an agent is told its working dir had a runaway file (the server
+     * wires the normal agent message delivery here).
+     *
+     * @param notifier - Sender (true when delivered), or null to skip agent notices
+     */
+    setAgentNotifier(notifier: ((sessionName: string, message: string) => Promise<boolean>) | null): void;
+    /**
+     * One runaway-file scan now (also what the minute timer runs). Never
+     * throws; overlapping scans are skipped. Honours the kill switch.
+     *
+     * @returns What was flagged and done (empty when nothing is wrong)
+     */
+    checkRunawayFiles(): Promise<RunawayOutcome[]>;
+    /** Sessions whose cwd holds `file`, or sits in the same scratch session dir; told via the agent notifier. */
+    private notifyAgentsNear;
     /**
      * Process-wide instance used by the server and the HTTP routes.
      *
@@ -301,6 +360,15 @@ export declare class WorktreeJanitorService {
      * @returns Summary with per-worktree verdicts
      */
     plan(): Promise<JanitorRunSummary>;
+    /**
+     * Work just finished (a WorkItem / ticket reached done or verified): run one
+     * pass soon, so a finished worktree goes away when its PR is merged instead
+     * of waiting for the next 30-minute tick. Bursts are debounced into one pass
+     * after COMPLETION_TIDY_DELAY_MS; the idle threshold is COMPLETION_MIN_IDLE_MS.
+     * Only worktrees that pass every safety rule are removed (landed, clean, nobody
+     * inside) — unmerged work stays for the next pass. No-op when disabled. Never throws.
+     */
+    requestTidy(): void;
     /**
      * One real pass. Concurrent calls share the pass in flight. Never throws.
      * Honours the kill switch.
@@ -334,6 +402,12 @@ export declare class WorktreeJanitorService {
      * Apply the removal rules to one worktree (read-only apart from fetch).
      */
     private evaluate;
+    /**
+     * Low disk: delete the regenerable dirs (node_modules, .next) of a kept
+     * worktree that has been idle for a day. Reversible; never touches
+     * tracked or source files. Never throws.
+     */
+    private reclaimKept;
     /** `origin/<default>` after one quiet fetch per repo per pass; null when there is no origin. */
     private defaultRef;
     /** Number of a MERGED PR whose head is `branch` at exactly `head`, or null. */

package/dist/backend/backend/src/services/worktree/worktree-janitor.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-janitor.service.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/worktree/worktree-janitor.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worktree-janitor.service.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/worktree/worktree-janitor.service.ts"],"names":[],"mappings":"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"}

package/dist/backend/backend/src/services/worktree/worktree-janitor.service.js

@@ -33,15 +33,23 @@
  *    dir's index / HEAD / logs/HEAD) more than 2 hours ago in a known agent
  *    location (`<main>/.claude/worktrees/`, `<tmp>/crewly-worktrees/`, or a
  *    `worktree-agent-*` branch), more than 24 hours ago anywhere else.
- * 6. `git status --porcelain --untracked-files=all` is empty: no tracked
- *    change and no untracked file. Ignored files (node_modules, dist) do not
- *    count. A failing status keeps it.
+ * 6. Nothing but regenerable output is uncommitted: `git status --porcelain`
+ *    shows no tracked change and no untracked file, ignoring untracked
+ *    `node_modules` / `.next` / `dist` / `build` / `.turbo` / `coverage` /
+ *    `.cache` / `logs` directories and `*.log` files (nested packages rarely
+ *    ignore their own). A failing status keeps it.
  * 7. Its work has landed: HEAD is an ancestor of `origin/<default branch>`
  *    after a quiet `git fetch` (fetch errors ignored), OR — when `gh` is
  *    installed and authenticated — a MERGED PR has this branch as head AND
  *    its head commit equals the worktree HEAD (squash merges; commits made
  *    after the merge keep the worktree). A repo without an origin (not on
- *    GitHub) only has the ancestor check, so its worktrees are kept.
+ *    GitHub) only has the ancestor check, so its worktrees are kept — OR, for
+ *    any git host (Bitbucket, GitLab, squash merges), its CONTENT is already in
+ *    `origin/<default>`: merging HEAD into it changes nothing
+ *    (`git merge-tree --write-tree`, falling back to `git cherry`), or the
+ *    branch's combined diff is patch-equivalent to one commit the default
+ *    branch gained since (a squash commit). See worktree-landed.ts. Work in
+ *    none of these is never removed. `gh` is not asked about non-GitHub remotes.
  *
  * ## Removal
  * `git worktree remove <path>` without `--force`. If git refuses although
@@ -49,6 +57,17 @@
  * no submodules, it is retried once with `--force`. Then the local branch is
  * deleted (never a protected name), and `git worktree prune` runs per repo.
  *
+ * ## Low disk: kept worktrees
+ * Under low disk, a worktree kept as `dirty` or `not-merged` and idle for
+ * 24 h+ still loses its `node_modules` / `.next` directories (reversible:
+ * reinstall / rebuild); the verdict carries `reclaimed` and the summary
+ * `reclaimedBytes`.
+ *
+ * ## Work completion
+ * A WorkItem reaching done / verified calls `requestTidy()`: one debounced pass
+ * (2 min) with a 10 min idle threshold, so a finished worktree is removed as
+ * soon as its change has landed, not at the next 30-minute tick.
+ *
  * ## Scratch sweep
  * After the worktrees, stale Claude Code session dirs
  * (`<tmp>/claude-<uid>/<slug>/<uuid>/`) are deleted when idle for 3 days,
@@ -64,6 +83,15 @@
  * the janitor left and why; below 5 GB the notice is urgent and repeats at
  * most every 6 h.
  *
+ * ## Runaway files
+ * Once a minute a watcher scans agent scratch dirs and worktrees for a single
+ * file that grows without bound (a 40 GB `all.md` filled a disk, crewly#1078):
+ * a file over 5 GB that is still growing, or any file growing over 1 GB/min,
+ * has its writer stopped, is cut to its first 1 MB, the agent working there is
+ * told and the owner is alerted once through the low-disk notifier. A big file
+ * that is not growing is only reported. See
+ * {@link module:services/worktree/runaway-file-watcher}.
+ *
  * Runs every 30 minutes (first run 10 minutes after boot). Kill switch:
  * `CREWLY_WORKTREE_JANITOR=0` (also stops the low-disk guard). Never throws;
  * logs one summary line per sweep.
@@ -80,8 +108,11 @@ import { safeReadJson, modifyJsonFile } from '../../utils/file-io.utils.js';
 import { buildLowDiskNotice, diskLevel, idleThreshold, noticeToSend, readFreeBytes, recordNotice, } from './low-disk-guard.js';
 import { defaultScratchRoots, sweepScratch } from './scratch-janitor.js';
 import { reclaimDocker } from './docker-reclaim.js';
+import { RunawayFileWatcher, runawayWatchRoots } from './runaway-file-watcher.js';
 import { getTraceStore } from '../trace/trace-store.js';
 import { canonicalPath, diskUsageBytes, discoverLinkedWorktreeRepos, formatBytes, isJanitorDisabled, isPathInside, latestWorktreeMtimeMs, listProcessCwds, parsePorcelainWorktrees, runCommand, } from './worktree-janitor.git.js';
+import { contentLandedSignal, isNonGithubRemote } from './worktree-landed.js';
+import { dirtyStatusLines, reclaimRegenerableDirs } from './worktree-dirty.js';
 /** Milliseconds per minute (for the `recent` detail text). */
 const MS_PER_MINUTE = 60 * 1000;
 /**
@@ -110,6 +141,11 @@ export class WorktreeJanitorService {
     lastPassAt = null;
     memoryNoticeState = {};
     notifier;
+    agentNotifier = null;
+    runawayTimer = null;
+    tidyTimer = null;
+    runawayWatcher = null;
+    runawayInFlight = false;
     /**
      * @param options - Injectable dependencies; defaults use the live backend
      */
@@ -126,6 +162,69 @@ export class WorktreeJanitorService {
     setLowDiskNotifier(notifier) {
         this.notifier = notifier;
     }
+    /**
+     * Set how an agent is told its working dir had a runaway file (the server
+     * wires the normal agent message delivery here).
+     *
+     * @param notifier - Sender (true when delivered), or null to skip agent notices
+     */
+    setAgentNotifier(notifier) {
+        this.agentNotifier = notifier;
+    }
+    /**
+     * One runaway-file scan now (also what the minute timer runs). Never
+     * throws; overlapping scans are skipped. Honours the kill switch.
+     *
+     * @returns What was flagged and done (empty when nothing is wrong)
+     */
+    async checkRunawayFiles() {
+        if (this.isDisabled() || this.runawayInFlight)
+            return [];
+        this.runawayInFlight = true;
+        try {
+            if (!this.runawayWatcher) {
+                this.runawayWatcher = new RunawayFileWatcher({
+                    listRoots: async () => {
+                        const repos = await (this.opts.listRepoPaths ?? defaultListRepoPaths)().catch(() => []);
+                        return runawayWatchRoots(this.scratchRoots(), this.tmpRoots(), repos);
+                    },
+                    notifyOwner: async (notice) => (this.notifier ? this.notifier(notice) : false),
+                    notifyAgents: (file, message) => this.notifyAgentsNear(file, message),
+                    now: () => this.now(),
+                    logger: this.logger,
+                });
+            }
+            return await this.runawayWatcher.scan();
+        }
+        finally {
+            this.runawayInFlight = false;
+        }
+    }
+    /** Sessions whose cwd holds `file`, or sits in the same scratch session dir; told via the agent notifier. */
+    async notifyAgentsNear(file, message) {
+        const notifier = this.agentNotifier;
+        if (!notifier)
+            return [];
+        const told = [];
+        try {
+            const { getSessionBackendSync } = await import('../session/session-backend.factory.js');
+            const backend = getSessionBackendSync();
+            const unit = /^(.*[\\/]claude-\d+[\\/][^\\/]+[\\/][0-9a-f-]{36})(?:[\\/]|$)/i.exec(file)?.[1];
+            for (const name of backend?.listSessions() ?? []) {
+                const cwd = backend?.getSession(name)?.cwd;
+                if (!cwd)
+                    continue;
+                if (isPathInside(file, cwd) || (unit && isPathInside(cwd, unit))) {
+                    if (await notifier(name, message).catch(() => false))
+                        told.push(name);
+                }
+            }
+        }
+        catch {
+            // no session backend — the owner alert still goes out
+        }
+        return told;
+    }
     /**
      * Process-wide instance used by the server and the HTTP routes.
      *
@@ -168,6 +267,8 @@ export class WorktreeJanitorService {
         this.firstRunTimer.unref?.();
         this.diskTimer = setInterval(() => void this.checkDisk(), WORKTREE_JANITOR_CONSTANTS.LOW_DISK_CHECK_INTERVAL_MS);
         this.diskTimer.unref?.();
+        this.runawayTimer = setInterval(() => void this.checkRunawayFiles(), WORKTREE_JANITOR_CONSTANTS.RUNAWAY_CHECK_INTERVAL_MS);
+        this.runawayTimer.unref?.();
         return true;
     }
     /** Cancel scheduled passes. */
@@ -178,6 +279,12 @@ export class WorktreeJanitorService {
             clearInterval(this.intervalTimer);
         if (this.diskTimer)
             clearInterval(this.diskTimer);
+        if (this.runawayTimer)
+            clearInterval(this.runawayTimer);
+        if (this.tidyTimer)
+            clearTimeout(this.tidyTimer);
+        this.tidyTimer = null;
+        this.runawayTimer = null;
         this.firstRunTimer = null;
         this.intervalTimer = null;
         this.diskTimer = null;
@@ -225,6 +332,41 @@ export class WorktreeJanitorService {
     async plan() {
         return this.pass(true);
     }
+    /**
+     * Work just finished (a WorkItem / ticket reached done or verified): run one
+     * pass soon, so a finished worktree goes away when its PR is merged instead
+     * of waiting for the next 30-minute tick. Bursts are debounced into one pass
+     * after COMPLETION_TIDY_DELAY_MS; the idle threshold is COMPLETION_MIN_IDLE_MS.
+     * Only worktrees that pass every safety rule are removed (landed, clean, nobody
+     * inside) — unmerged work stays for the next pass. No-op when disabled. Never throws.
+     */
+    requestTidy() {
+        if (this.isDisabled() || this.tidyTimer)
+            return;
+        this.tidyTimer = setTimeout(() => {
+            this.tidyTimer = null;
+            void (async () => {
+                try {
+                    if (this.inFlight)
+                        await this.inFlight.catch(() => undefined);
+                    if (this.isDisabled())
+                        return;
+                    this.inFlight = this.pass(false, WORKTREE_JANITOR_CONSTANTS.COMPLETION_MIN_IDLE_MS).finally(() => {
+                        this.inFlight = null;
+                    });
+                    const summary = await this.inFlight;
+                    if (!summary.disabled) {
+                        this.lastSummary = summary;
+                        this.lastPassAt = this.now();
+                    }
+                }
+                catch (err) {
+                    this.logger.warn('Completion tidy failed (non-fatal)', { error: err instanceof Error ? err.message : String(err) });
+                }
+            })();
+        }, this.opts.tidyDelayMs ?? WORKTREE_JANITOR_CONSTANTS.COMPLETION_TIDY_DELAY_MS);
+        this.tidyTimer.unref?.();
+    }
     /**
      * One real pass. Concurrent calls share the pass in flight. Never throws.
      * Honours the kill switch.
@@ -379,7 +521,7 @@ export class WorktreeJanitorService {
     git(args, options = {}) {
         return runCommand(this.opts.gitBin ?? 'git', args, options);
     }
-    async pass(dryRun) {
+    async pass(dryRun, idleOverrideMs) {
         const started = Date.now();
         const summary = {
             startedAt: new Date(started).toISOString(),
@@ -390,6 +532,7 @@ export class WorktreeJanitorService {
             removed: 0,
             wouldRemove: 0,
             kept: 0,
+            reclaimedBytes: 0,
             keptReasons: {},
             worktrees: [],
             lowDisk: false,
@@ -411,7 +554,14 @@ export class WorktreeJanitorService {
             for (const repo of repos) {
                 let removedHere = 0;
                 for (const entry of repo.entries) {
-                    const verdict = await this.evaluate(repo, entry, busy, summary.lowDisk);
+                    const verdict = await this.evaluate(repo, entry, busy, summary.lowDisk, idleOverrideMs);
+                    if (summary.lowDisk && verdict.decision === 'keep' && (verdict.reason === 'dirty' || verdict.reason === 'not-merged')) {
+                        const rec = await this.reclaimKept(entry.path, verdict.idleMs, dryRun);
+                        if (rec) {
+                            verdict.reclaimed = rec;
+                            summary.reclaimedBytes += rec.freedBytes;
+                        }
+                    }
                     const outcome = { ...verdict, removed: false, forced: false, branchDeleted: false };
                     if (verdict.decision === 'remove' && !dryRun) {
                         await this.remove(repo, outcome);
@@ -456,7 +606,7 @@ export class WorktreeJanitorService {
                 .sort((a, b) => b[1] - a[1])
                 .map(([k, v]) => `${k}: ${v}`)
                 .join(', ');
-            this.logger.info(`Worktree janitor: removed ${summary.removed}, kept ${summary.kept}${reasons ? ` (${reasons})` : ''} across ${summary.repos.length} repo(s) in ${summary.durationMs}ms`, { removed: summary.worktrees.filter((w) => w.removed).map((w) => w.path), lowDisk: summary.lowDisk });
+            this.logger.info(`Worktree janitor: removed ${summary.removed}, kept ${summary.kept}${reasons ? ` (${reasons})` : ''}${summary.reclaimedBytes > 0 ? `, reclaimed ${formatBytes(summary.reclaimedBytes)} of node_modules/.next from kept worktrees` : ''} across ${summary.repos.length} repo(s) in ${summary.durationMs}ms`, { removed: summary.worktrees.filter((w) => w.removed).map((w) => w.path), lowDisk: summary.lowDisk });
             const sc = summary.scratch;
             if (sc) {
                 const scReasons = Object.entries(sc.keptReasons)
@@ -496,7 +646,7 @@ export class WorktreeJanitorService {
             const key = canonicalPath(main.path);
             if (seen.has(key))
                 continue;
-            seen.set(key, { main: main.path, entries, fetched: false, defaultRef: undefined });
+            seen.set(key, { main: main.path, entries, fetched: false, defaultRef: undefined, landed: {} });
         }
         return [...seen.values()];
     }
@@ -522,7 +672,7 @@ export class WorktreeJanitorService {
     /**
      * Apply the removal rules to one worktree (read-only apart from fetch).
      */
-    async evaluate(repo, entry, busy, lowDisk) {
+    async evaluate(repo, entry, busy, lowDisk, idleOverrideMs) {
         const base = { repo: repo.main, path: entry.path, branch: entry.branch, head: entry.head };
         const keep = (reason, detail, idleMs) => ({
             ...base,
@@ -555,14 +705,16 @@ export class WorktreeJanitorService {
         const normalIdle = agentLocation
             ? (this.opts.minIdleMs ?? WORKTREE_JANITOR_CONSTANTS.MIN_IDLE_MS)
             : (this.opts.minIdleOtherMs ?? WORKTREE_JANITOR_CONSTANTS.MIN_IDLE_OTHER_MS);
-        const minIdle = idleThreshold(normalIdle, lowDisk);
+        const minIdle = idleOverrideMs !== undefined ? Math.min(idleOverrideMs, idleThreshold(normalIdle, lowDisk)) : idleThreshold(normalIdle, lowDisk);
         if (idleMs === undefined || idleMs < minIdle) {
             return keep('recent', `needs ${Math.round(minIdle / MS_PER_MINUTE)} min idle (${agentLocation ? 'agent location' : 'other location'})`, idleMs);
         }
-        const status = await this.git(['-C', entry.path, 'status', '--porcelain', '--untracked-files=all']);
+        // `normal` keeps untracked directories collapsed (one line per
+        // `node_modules/`), so a huge dependency tree cannot flood the output.
+        const status = await this.git(['-C', entry.path, 'status', '--porcelain', '--untracked-files=normal']);
         if (status.code !== 0)
             return keep('status-failed', status.stderr.trim().slice(0, 200), idleMs);
-        const dirtyLines = status.stdout.split('\n').filter((l) => l.trim() !== '');
+        const dirtyLines = dirtyStatusLines(status.stdout);
         if (dirtyLines.length > 0)
             return keep('dirty', `${dirtyLines.length} changed/untracked path(s)`, idleMs);
         if (!entry.head)
@@ -578,7 +730,31 @@ export class WorktreeJanitorService {
             if (pr !== null)
                 return { ...base, decision: 'remove', reason: 'pr-merged', detail: `PR #${pr} merged`, idleMs };
         }
-        return keep('not-merged', defaultRef ? `not in ${defaultRef}, no merged PR` : 'no origin default branch, no merged PR', idleMs);
+        if (defaultRef) {
+            // Host-agnostic: squash merges on Bitbucket / GitLab / anywhere leave no
+            // ancestry and no GitHub PR, but the CONTENT is in the default branch.
+            const signal = await contentLandedSignal((a, o) => this.git(a, o), repo.main, defaultRef, entry.head, repo.landed);
+            if (signal)
+                return { ...base, decision: 'remove', reason: 'content-landed', detail: `${signal} in ${defaultRef}`, idleMs };
+        }
+        return keep('not-merged', defaultRef ? `not in ${defaultRef} (history or content), no merged PR` : 'no origin default branch, no merged PR', idleMs);
+    }
+    /**
+     * Low disk: delete the regenerable dirs (node_modules, .next) of a kept
+     * worktree that has been idle for a day. Reversible; never touches
+     * tracked or source files. Never throws.
+     */
+    async reclaimKept(worktreePath, idleMs, dryRun) {
+        if (idleMs === undefined || idleMs < WORKTREE_JANITOR_CONSTANTS.RECLAIM_MIN_IDLE_MS)
+            return null;
+        try {
+            const r = await reclaimRegenerableDirs(worktreePath, this.opts.sizeOf ?? diskUsageBytes, dryRun);
+            return r.dirs.length > 0 ? r : null;
+        }
+        catch (err) {
+            this.logger.warn('Reclaiming regenerable dirs failed (non-fatal)', { path: worktreePath, error: err instanceof Error ? err.message : String(err) });
+            return null;
+        }
     }
     /** `origin/<default>` after one quiet fetch per repo per pass; null when there is no origin. */
     async defaultRef(repo) {
@@ -628,6 +804,13 @@ export class WorktreeJanitorService {
         const gh = this.opts.ghBin === undefined ? 'gh' : this.opts.ghBin;
         if (!gh)
             return null;
+        if (repo.nonGithub === undefined) {
+            const url = await this.git(['-C', repo.main, 'config', '--get', 'remote.origin.url']);
+            repo.nonGithub = url.code === 0 && isNonGithubRemote(url.stdout);
+        }
+        // Bitbucket / GitLab remotes: gh cannot see their PRs, and asking costs a call per worktree.
+        if (repo.nonGithub)
+            return null;
         if (this.ghUsable === undefined) {
             const auth = await runCommand(gh, ['auth', 'status'], { cwd: repo.main, timeoutMs: WORKTREE_JANITOR_CONSTANTS.GH_TIMEOUT_MS });
             this.ghUsable = auth.code === 0;
@@ -654,8 +837,8 @@ export class WorktreeJanitorService {
         if (r.code !== 0) {
             // Force only when git's refusal can only be ignored output: status is
             // still clean (untracked included) and there are no submodules.
-            const status = await this.git(['-C', outcome.path, 'status', '--porcelain', '--untracked-files=all', '--ignore-submodules=none']);
-            const clean = status.code === 0 && status.stdout.trim() === '';
+            const status = await this.git(['-C', outcome.path, 'status', '--porcelain', '--untracked-files=normal', '--ignore-submodules=none']);
+            const clean = status.code === 0 && dirtyStatusLines(status.stdout).length === 0;
             const hasSubmodules = fs.existsSync(path.join(outcome.path, '.gitmodules'));
             if (clean && !hasSubmodules) {
                 r = await this.git(['-C', repo.main, 'worktree', 'remove', '--force', outcome.path]);