sync-worktrees 4.1.0 → 5.0.0

package/dist/index.js

@@ -2,9 +2,9 @@
 
 // src/index.ts
 import { realpathSync as realpathSync2 } from "fs";
-import * as path17 from "path";
+import * as path23 from "path";
 import { fileURLToPath } from "url";
-import pLimit3 from "p-limit";
+import pLimit4 from "p-limit";
 
 // src/constants.ts
 var GIT_CONSTANTS = {
@@ -15,6 +15,10 @@ var GIT_CONSTANTS = {
   COMMON_DEFAULT_BRANCHES: ["main", "master", "develop", "trunk"],
   BARE_DIR_NAME: ".bare",
   DIVERGED_DIR_NAME: ".diverged",
+  REMOVED_DIR_NAME: ".removed",
+  TRASH_DIR_NAME: ".trash",
+  TRASH_REF_PREFIX: "refs/sync-worktrees/trash/",
+  KEEP_REF_PREFIX: "refs/sync-worktrees/keep/",
   LFS_HEADER: "version https://git-lfs.github.com/spec/",
   SUBMODULE_STATUS_ADDED: "+",
   SUBMODULE_STATUS_REMOVED: "-",
@@ -60,7 +64,16 @@ var DEFAULT_CONFIG = {
   FETCH_TIMEOUT_MS: 3e5,
   CLONE_TIMEOUT_MS: 9e5,
   LOCK_STALE_MS: 6e5,
-  LOCK_UPDATE_MS: 3e4
+  LOCK_UPDATE_MS: 3e4,
+  MAINTENANCE: {
+    ENABLED: true,
+    INTERVAL: "7d"
+  },
+  TRASH: {
+    ENABLED: true,
+    RETENTION_DAYS: 30,
+    MIGRATE_LEGACY: true
+  }
 };
 var ERROR_MESSAGES = {
   GIT_NOT_INITIALIZED: "Git service not initialized. Call initialize() first.",
@@ -95,6 +108,15 @@ var CONFIG_FILE_NAMES = [
   "sync-worktrees.config.mjs",
   "sync-worktrees.config.cjs"
 ];
+var MAINTENANCE_CONSTANTS = {
+  STATE_FILENAME: "sync-worktrees-maintenance.json"
+};
+var TRASH_CONSTANTS = {
+  MANIFEST_FILENAME: "manifest.json",
+  PAYLOAD_DIRNAME: "payload",
+  BUNDLE_FILENAME: "commits.bundle",
+  SCHEMA_VERSION: 1
+};
 var METADATA_CONSTANTS = {
   MAX_HISTORY_ENTRIES: 10,
   METADATA_FILENAME: "sync-metadata.json",
@@ -141,6 +163,8 @@ var SyncWorktreesError = class extends Error {
 Caused by: ${cause.stack}`;
     }
   }
+  code;
+  cause;
 };
 var GitError = class extends SyncWorktreesError {
   constructor(message, code, cause) {
@@ -152,17 +176,26 @@ var GitOperationError = class extends GitError {
     super(`Git operation '${operation}' failed: ${details}`, "OPERATION_FAILED", cause);
   }
 };
+var FastForwardError = class extends GitError {
+  constructor(branchName, cause) {
+    super(`Cannot fast-forward branch '${branchName}'`, "FAST_FORWARD_FAILED", cause);
+    this.branchName = branchName;
+  }
+  branchName;
+};
 var WorktreeError = class extends SyncWorktreesError {
   constructor(message, code, cause) {
     super(message, `WORKTREE_${code}`, cause);
   }
 };
 var WorktreeNotCleanError = class extends WorktreeError {
-  constructor(path18, reasons) {
-    super(`Worktree at '${path18}' is not clean: ${reasons.join(", ")}`, "NOT_CLEAN");
-    this.path = path18;
+  constructor(path24, reasons) {
+    super(`Worktree at '${path24}' is not clean: ${reasons.join(", ")}`, "NOT_CLEAN");
+    this.path = path24;
     this.reasons = reasons;
   }
+  path;
+  reasons;
 };
 var ConfigError = class extends SyncWorktreesError {
   constructor(message, code, cause) {
@@ -175,18 +208,34 @@ var ConfigValidationError = class extends ConfigError {
     this.field = field;
     this.reason = reason;
   }
+  field;
+  reason;
 };
 var ConfigFileNotFoundError = class extends ConfigError {
   constructor(configPath) {
     super(`Config file not found: ${configPath}`, "FILE_NOT_FOUND");
     this.configPath = configPath;
   }
+  configPath;
 };
 var ConfigFileExistsError = class extends ConfigError {
   constructor(configPath) {
     super(`Config file already exists: ${configPath}`, "FILE_EXISTS");
     this.configPath = configPath;
   }
+  configPath;
+};
+var TrashError = class extends SyncWorktreesError {
+  constructor(message, code, cause) {
+    super(message, `TRASH_${code}`, cause);
+  }
+};
+var TrashOperationError = class extends TrashError {
+  constructor(operation, details, cause) {
+    super(`Trash operation '${operation}' failed: ${details}`, "OPERATION_FAILED", cause);
+    this.operation = operation;
+  }
+  operation;
 };
 
 // src/services/config-loader.service.ts
@@ -214,16 +263,73 @@ function filterBranchesByName(branches, include, exclude) {
   return result;
 }
 
+// src/utils/date-filter.ts
+function parseDuration(durationStr) {
+  const match = durationStr.match(/^(\d+)([hdwmy])$/);
+  if (!match) {
+    return null;
+  }
+  const value = parseInt(match[1], 10);
+  const unit = match[2];
+  const multipliers = {
+    h: 60 * 60 * 1e3,
+    // hours
+    d: 24 * 60 * 60 * 1e3,
+    // days
+    w: 7 * 24 * 60 * 60 * 1e3,
+    // weeks
+    m: 30 * 24 * 60 * 60 * 1e3,
+    // months (approximate)
+    y: 365 * 24 * 60 * 60 * 1e3
+    // years (approximate)
+  };
+  return value * multipliers[unit];
+}
+function filterBranchesByAge(branches, maxAge) {
+  const maxAgeMs = parseDuration(maxAge);
+  if (maxAgeMs === null) {
+    console.warn(`Invalid duration format: ${maxAge}. Using all branches.`);
+    return branches;
+  }
+  const cutoffDate = new Date(Date.now() - maxAgeMs);
+  return branches.filter(({ lastActivity }) => lastActivity >= cutoffDate);
+}
+function formatDuration(durationStr) {
+  const match = durationStr.match(/^(\d+)([hdwmy])$/);
+  if (!match) {
+    return durationStr;
+  }
+  const value = parseInt(match[1], 10);
+  const unit = match[2];
+  const unitNames = {
+    h: value === 1 ? "hour" : "hours",
+    d: value === 1 ? "day" : "days",
+    w: value === 1 ? "week" : "weeks",
+    m: value === 1 ? "month" : "months",
+    y: value === 1 ? "year" : "years"
+  };
+  return `${value} ${unitNames[unit]}`;
+}
+
 // src/utils/file-exists.ts
 import * as fs from "fs/promises";
-async function fileExists(path18) {
+async function fileExists(path24) {
   try {
-    await fs.access(path18);
+    await fs.access(path24);
     return true;
   } catch {
     return false;
   }
 }
+async function probePathExists(path24) {
+  try {
+    await fs.access(path24);
+    return "exists";
+  } catch (error) {
+    const code = error.code;
+    return code === "ENOENT" || code === "ENOTDIR" ? "missing" : "unknown";
+  }
+}
 
 // src/utils/git-url.ts
 function extractRepoNameFromUrl(gitUrl) {
@@ -311,7 +417,8 @@ var CLONE_MODE_CONFLICTING_FIELDS = [
   "branchExclude",
   "branchMaxAge",
   "updateExistingWorktrees",
-  "bareRepoDir"
+  "bareRepoDir",
+  "trash"
 ];
 var ConfigLoaderService = class {
   async findConfigUpward(startDir) {
@@ -414,6 +521,12 @@ var ConfigLoaderService = class {
       if (repoObj.sparseCheckout !== void 0) {
         this.validateSparseCheckoutConfig(repoObj.sparseCheckout, `Repository '${repoObj.name}'`);
       }
+      if (repoObj.maintenance !== void 0) {
+        this.validateMaintenanceConfig(repoObj.maintenance, `Repository '${repoObj.name}'`);
+      }
+      if (repoObj.trash !== void 0) {
+        this.validateTrashConfig(repoObj.trash, `Repository '${repoObj.name}'`);
+      }
       this.validateDepth(repoObj.depth, `Repository '${repoObj.name}' depth`);
       this.validateRepositoryMode(repoObj, configObj.defaults);
     });
@@ -450,6 +563,12 @@ var ConfigLoaderService = class {
       if (defaults.sparseCheckout !== void 0) {
         this.validateSparseCheckoutConfig(defaults.sparseCheckout, "defaults");
       }
+      if (defaults.maintenance !== void 0) {
+        this.validateMaintenanceConfig(defaults.maintenance, "defaults");
+      }
+      if (defaults.trash !== void 0) {
+        this.validateTrashConfig(defaults.trash, "defaults");
+      }
       this.validateDepth(defaults.depth, "defaults.depth");
       if (defaults.mode !== void 0 && !isRepositoryMode(defaults.mode)) {
         throw new ConfigValidationError("defaults.mode", "must be 'clone' or 'worktree'");
@@ -477,6 +596,46 @@ var ConfigLoaderService = class {
       throw new ConfigValidationError(field, "must be a positive safe integer");
     }
   }
+  validateMaintenanceConfig(value, context) {
+    if (value === void 0) return;
+    if (typeof value !== "object" || value === null) {
+      throw new Error(`'maintenance' in ${context} must be an object`);
+    }
+    const maintenance = value;
+    if (maintenance.enabled !== void 0 && typeof maintenance.enabled !== "boolean") {
+      throw new Error(`'maintenance.enabled' in ${context} must be a boolean`);
+    }
+    if (maintenance.aggressive !== void 0 && typeof maintenance.aggressive !== "boolean") {
+      throw new Error(`'maintenance.aggressive' in ${context} must be a boolean`);
+    }
+    if (maintenance.interval !== void 0) {
+      const parsed = typeof maintenance.interval === "string" ? parseDuration(maintenance.interval) : null;
+      if (parsed === null || parsed <= 0) {
+        throw new Error(
+          `'maintenance.interval' in ${context} must be a positive duration string like '7d', '24h', or '2w'`
+        );
+      }
+    }
+  }
+  validateTrashConfig(value, context) {
+    if (value === void 0) return;
+    if (typeof value !== "object" || value === null) {
+      throw new Error(`'trash' in ${context} must be an object`);
+    }
+    const trash = value;
+    if (trash.enabled !== void 0 && typeof trash.enabled !== "boolean") {
+      throw new Error(`'trash.enabled' in ${context} must be a boolean`);
+    }
+    if (trash.migrateLegacy !== void 0 && typeof trash.migrateLegacy !== "boolean") {
+      throw new Error(`'trash.migrateLegacy' in ${context} must be a boolean`);
+    }
+    if (trash.retentionDays !== void 0 && (typeof trash.retentionDays !== "number" || !Number.isFinite(trash.retentionDays) || trash.retentionDays <= 0)) {
+      throw new Error(`'trash.retentionDays' in ${context} must be a positive number`);
+    }
+    if (trash.warnSizeBytes !== void 0 && (typeof trash.warnSizeBytes !== "number" || !Number.isFinite(trash.warnSizeBytes) || trash.warnSizeBytes <= 0)) {
+      throw new Error(`'trash.warnSizeBytes' in ${context} must be a positive number`);
+    }
+  }
   validateRetryConfig(value, context) {
     if (typeof value !== "object" || value === null) {
       throw new Error(context === "retry config" ? "'retry' must be an object" : `Invalid 'retry' in ${context}`);
@@ -748,6 +907,18 @@ var ConfigLoaderService = class {
     if (sparse) {
       resolved.sparseCheckout = sparse;
     }
+    if (repo.maintenance || defaults?.maintenance) {
+      resolved.maintenance = {
+        ...defaults?.maintenance || {},
+        ...repo.maintenance || {}
+      };
+    }
+    if (repo.trash || defaults?.trash) {
+      resolved.trash = {
+        ...defaults?.trash || {},
+        ...repo.trash || {}
+      };
+    }
     return resolved;
   }
   isDuplicateRepoUrl(repo, all, defaults) {
@@ -811,16 +982,16 @@ var ConfigLoaderService = class {
 
 // src/services/InteractiveUIService.tsx
 import React8 from "react";
-import * as path14 from "path";
+import * as path20 from "path";
 import { render } from "ink";
 import * as cron2 from "node-cron";
-import pLimit2 from "p-limit";
+import pLimit3 from "p-limit";
 import { spawn as spawn2, spawnSync } from "child_process";
 import { existsSync as existsSync2 } from "fs";
 
 // src/components/App.tsx
 import React7, { useState as useState6, useEffect as useEffect6, useCallback as useCallback4, useRef as useRef5 } from "react";
-import { Box as Box7, useInput as useInput6, useStdout } from "ink";
+import { Box as Box7, useInput as useInput6, useWindowSize } from "ink";
 
 // src/components/StatusBar.tsx
 import React, { useState, useEffect } from "react";
@@ -829,6 +1000,7 @@ import { CronExpressionParser } from "cron-parser";
 var StatusBar = ({
   status,
   syncProgressEntries = [],
+  activeOps = [],
   maxProgressLines = 2,
   repositoryCount,
   lastSyncTime,
@@ -864,17 +1036,14 @@ var StatusBar = ({
   const getStatusIcon = () => {
     return status === "syncing" ? "\u27F3" : "\u2713";
   };
-  const formatProgress = (syncProgress) => {
-    const percent = syncProgress.progress === void 0 || syncProgress.message.includes(`${syncProgress.progress}%`) ? "" : ` ${syncProgress.progress}%`;
-    return `[${syncProgress.repo}] ${syncProgress.message}${percent}`;
-  };
+  const formatProgress = (syncProgress) => `[${syncProgress.repo}] ${syncProgress.message}`;
   const progressLineCount = Math.max(1, maxProgressLines);
   const visibleProgress = syncProgressEntries.slice(-progressLineCount);
   return /* @__PURE__ */ React.createElement(Box, { borderStyle: "single", paddingX: 1 }, /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React.createElement(Box, { justifyContent: "space-between" }, /* @__PURE__ */ React.createElement(Text, { bold: true }, getStatusIcon(), " Status:", " ", /* @__PURE__ */ React.createElement(Text, { color: getStatusColor() }, status === "syncing" ? "Syncing..." : "Running")), /* @__PURE__ */ React.createElement(Text, null, "Repositories: ", /* @__PURE__ */ React.createElement(Text, { bold: true, color: "cyan" }, repositoryCount))), /* @__PURE__ */ React.createElement(Box, { justifyContent: "space-between" }, /* @__PURE__ */ React.createElement(Text, null, "Last Sync: ", /* @__PURE__ */ React.createElement(Text, { color: "gray" }, formatTime(lastSyncTime))), cronSchedule && /* @__PURE__ */ React.createElement(Text, null, "Next Sync: ", /* @__PURE__ */ React.createElement(Text, { color: "gray" }, formatTime(nextSyncTime)))), status === "syncing" && Array.from({ length: progressLineCount }).map((_, index) => {
     const entry = visibleProgress[index];
     const message = entry ? formatProgress(entry) : index === 0 ? "waiting for progress events" : "";
     return /* @__PURE__ */ React.createElement(Box, { key: index }, /* @__PURE__ */ React.createElement(Text, { wrap: "truncate" }, message ? "Progress: " : " ", message && /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, message)));
-  }), /* @__PURE__ */ React.createElement(Box, { justifyContent: "space-between" }, /* @__PURE__ */ React.createElement(Text, null, "Disk Space: ", /* @__PURE__ */ React.createElement(Text, { color: "magenta" }, diskSpaceUsed || "Calculating...")), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "s"), "ync", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "c"), "reate", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "o"), "pen", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "w"), "tree", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "r"), "eload", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "?"), "help", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "q"), "uit"))));
+  }), activeOps.map((label, index) => /* @__PURE__ */ React.createElement(Box, { key: `op-${index}` }, /* @__PURE__ */ React.createElement(Text, { wrap: "truncate" }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "\u23F3 "), /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, label)))), /* @__PURE__ */ React.createElement(Box, { justifyContent: "space-between" }, /* @__PURE__ */ React.createElement(Text, null, "Disk Space: ", /* @__PURE__ */ React.createElement(Text, { color: "magenta" }, diskSpaceUsed || "Calculating...")), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "s"), "ync", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "c"), "reate", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "o"), "pen", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "w"), "tree", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "r"), "eload", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "?"), "help", " ", /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "q"), "uit"))));
 };
 var StatusBar_default = StatusBar;
 
@@ -893,7 +1062,7 @@ var HelpModal_default = HelpModal;
 
 // src/components/BranchCreationWizard.tsx
 import React3, { useState as useState2, useEffect as useEffect2, useCallback, useMemo, useRef } from "react";
-import { Box as Box3, Text as Text3, useInput as useInput2 } from "ink";
+import { Box as Box3, Text as Text3, useInput as useInput2, usePaste } from "ink";
 
 // src/utils/git-validation.ts
 function isValidGitBranchName(name) {
@@ -1159,6 +1328,17 @@ var BranchCreationWizard = ({
       onComplete(result?.success ?? false);
     }
   });
+  usePaste((text) => {
+    if (step === "SELECT_PROJECT") {
+      setProjectFilter((prev) => prev + text);
+      setSelectedProjectIndex(0);
+    } else if (step === "SELECT_BRANCH") {
+      setBranchFilter((prev) => prev + text);
+      setSelectedBranchIndex(0);
+    } else if (step === "ENTER_NAME") {
+      setBranchName((prev) => prev + text.replace(/[^a-zA-Z0-9/._-]/g, ""));
+    }
+  });
   const getStepNumber = () => {
     if (repositories.length === 1) {
       if (step === "SELECT_BRANCH") return 1;
@@ -1252,7 +1432,7 @@ var BranchCreationWizard_default = BranchCreationWizard;
 
 // src/components/OpenEditorWizard.tsx
 import React4, { useState as useState3, useEffect as useEffect3, useMemo as useMemo2, useCallback as useCallback2, useRef as useRef2 } from "react";
-import { Box as Box4, Text as Text4, useInput as useInput3 } from "ink";
+import { Box as Box4, Text as Text4, useInput as useInput3, usePaste as usePaste2 } from "ink";
 var OpenEditorWizard = ({
   repositories,
   getWorktreesForRepo,
@@ -1370,6 +1550,15 @@ var OpenEditorWizard = ({
       onClose();
     }
   });
+  usePaste2((text) => {
+    if (step === "SELECT_PROJECT") {
+      setProjectFilter((prev) => prev + text);
+      setSelectedProjectIndex(0);
+    } else if (step === "SELECT_WORKTREE") {
+      setWorktreeFilter((prev) => prev + text);
+      setSelectedWorktreeIndex(0);
+    }
+  });
   const getStepNumber = () => {
     if (repositories.length === 1) {
       return 1;
@@ -1441,7 +1630,7 @@ var OpenEditorWizard_default = OpenEditorWizard;
 
 // src/components/WorktreeStatusView.tsx
 import React5, { useState as useState4, useEffect as useEffect4, useMemo as useMemo3, useCallback as useCallback3, useRef as useRef3 } from "react";
-import { Box as Box5, Text as Text5, useInput as useInput4 } from "ink";
+import { Box as Box5, Text as Text5, useInput as useInput4, usePaste as usePaste3 } from "ink";
 
 // src/utils/lfs-error.ts
 function getErrorMessage(error) {
@@ -1486,7 +1675,7 @@ var getStatusFlags = (status) => {
   }
   if (status.hasUnpushedCommits) {
     flags.push(
-      /* @__PURE__ */ React5.createElement(Text5, { key: "unpushed", color: "cyan" }, "\u2191")
+      status.fullyPushedUpstreamDeleted ? /* @__PURE__ */ React5.createElement(Text5, { key: "unpushed", color: "green" }, "\u21E1") : /* @__PURE__ */ React5.createElement(Text5, { key: "unpushed", color: "cyan" }, "\u2191")
     );
   }
   if (status.hasStashedChanges) {
@@ -1519,7 +1708,9 @@ var getStatusSummary = (status) => {
     if (fileCount > 0) parts.push(`${fileCount} changed`);
   }
   if (status.hasUnpushedCommits && details?.unpushedCommitCount) {
-    parts.push(`${details.unpushedCommitCount} unpushed`);
+    parts.push(
+      status.fullyPushedUpstreamDeleted ? "pushed, remote branch deleted" : `${details.unpushedCommitCount} unpushed`
+    );
   }
   if (status.hasStashedChanges && details?.stashCount) {
     parts.push(`${details.stashCount} stash`);
@@ -1747,6 +1938,17 @@ var WorktreeStatusView = ({
       onClose();
     }
   });
+  usePaste3((text) => {
+    if (confirmDelete !== null) return;
+    if (step === "SELECT_PROJECT") {
+      setProjectFilter((prev) => prev + text);
+      setSelectedProjectIndex(0);
+    } else if (step === "VIEW_STATUS" && !loading) {
+      setEntryFilter((prev) => prev + text);
+      setSelectedEntryIndex(0);
+      setExpandedEntry(null);
+    }
+  });
   const getStepNumber = () => {
     if (repositories.length === 1) return 1;
     return step === "SELECT_PROJECT" ? 1 : 2;
@@ -1770,7 +1972,7 @@ var WorktreeStatusView = ({
   const renderDetailPanel = (entry) => {
     const { status } = entry;
     const details = status.details;
-    return /* @__PURE__ */ React5.createElement(Box5, { flexDirection: "column", marginLeft: 4, marginTop: 0, marginBottom: 1 }, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "Path: ", entry.path), details && /* @__PURE__ */ React5.createElement(React5.Fragment, null, details.modifiedFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, " Modified: ", details.modifiedFiles), details.deletedFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "red" }, " Deleted: ", details.deletedFiles), details.createdFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "green" }, " Created: ", details.createdFiles), details.renamedFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "blue" }, " Renamed: ", details.renamedFiles), details.untrackedFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "gray" }, " Untracked: ", details.untrackedFiles), details.conflictedFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "red" }, " Conflicted: ", details.conflictedFiles), (details.unpushedCommitCount ?? 0) > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, " Unpushed commits: ", details.unpushedCommitCount), (details.stashCount ?? 0) > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "magenta" }, " Stashes: ", details.stashCount), details.operationType && /* @__PURE__ */ React5.createElement(Text5, { color: "red" }, " Operation: ", details.operationType), details.modifiedSubmodules && details.modifiedSubmodules.length > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, " Modified submodules: ", details.modifiedSubmodules.join(", "))), status.upstreamGone && /* @__PURE__ */ React5.createElement(Text5, { color: "red" }, " Remote branch has been deleted"), status.reasons.length > 0 && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " Reasons: ", status.reasons.join(", ")));
+    return /* @__PURE__ */ React5.createElement(Box5, { flexDirection: "column", marginLeft: 4, marginTop: 0, marginBottom: 1 }, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "Path: ", entry.path), details && /* @__PURE__ */ React5.createElement(React5.Fragment, null, details.modifiedFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, " Modified: ", details.modifiedFiles), details.deletedFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "red" }, " Deleted: ", details.deletedFiles), details.createdFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "green" }, " Created: ", details.createdFiles), details.renamedFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "blue" }, " Renamed: ", details.renamedFiles), details.untrackedFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "gray" }, " Untracked: ", details.untrackedFiles), details.conflictedFiles > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "red" }, " Conflicted: ", details.conflictedFiles), (details.unpushedCommitCount ?? 0) > 0 && (status.fullyPushedUpstreamDeleted ? /* @__PURE__ */ React5.createElement(Text5, { color: "green" }, " ", "Fully pushed before remote branch deletion (", details.unpushedCommitCount, " commit", details.unpushedCommitCount === 1 ? "" : "s", " not on any remote \u2014 likely squash-merged)") : /* @__PURE__ */ React5.createElement(Text5, { color: "cyan" }, " Unpushed commits: ", details.unpushedCommitCount)), (details.stashCount ?? 0) > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "magenta" }, " Stashes: ", details.stashCount), details.operationType && /* @__PURE__ */ React5.createElement(Text5, { color: "red" }, " Operation: ", details.operationType), details.modifiedSubmodules && details.modifiedSubmodules.length > 0 && /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, " Modified submodules: ", details.modifiedSubmodules.join(", "))), status.upstreamGone && /* @__PURE__ */ React5.createElement(Text5, { color: "red" }, " Remote branch has been deleted"), status.reasons.length > 0 && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " Reasons: ", status.reasons.join(", ")));
   };
   const renderDivergedDetailPanel = (entry) => {
     return /* @__PURE__ */ React5.createElement(Box5, { flexDirection: "column", marginLeft: 4, marginTop: 0, marginBottom: 1 }, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "Path: ", entry.path), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " Original branch: ", entry.originalBranch), entry.divergedAt && /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " Diverged: ", entry.divergedAt), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " Size: ", entry.sizeFormatted));
@@ -1971,13 +2173,15 @@ var App = ({
   const [showOpenEditorWizard, setShowOpenEditorWizard] = useState6(false);
   const [showWorktreeStatus, setShowWorktreeStatus] = useState6(false);
   const [status, setStatus] = useState6("idle");
+  const [activeOps, setActiveOps] = useState6([]);
+  const opIdRef = useRef5(0);
   const [syncProgressEntries, setSyncProgressEntries] = useState6([]);
   const [lastSyncTime, setLastSyncTime] = useState6(null);
   const [diskSpaceUsed, setDiskSpaceUsed] = useState6(null);
   const [logs, setLogs] = useState6([]);
   const [repoCount, setRepoCount] = useState6(repositoryCount);
   const [schedule2, setSchedule] = useState6(cronSchedule);
-  const { stdout } = useStdout();
+  const { rows } = useWindowSize();
   const addLog = useCallback4((message, level = "info") => {
     setLogs((prev) => {
       const newLogs = [
@@ -2011,11 +2215,11 @@ var App = ({
       onQuit().catch((err) => console.error("Quit failed:", err));
     } else if (input2 === "?" || input2 === "h") {
       setShowHelp(true);
-    } else if (input2 === "c" && status === "idle") {
+    } else if (input2 === "c") {
       setShowBranchWizard(true);
-    } else if (input2 === "o" && status === "idle") {
+    } else if (input2 === "o") {
       setShowOpenEditorWizard(true);
-    } else if (input2 === "w" && status === "idle" && getWorktreeStatusForRepo) {
+    } else if (input2 === "w" && getWorktreeStatusForRepo) {
       setShowWorktreeStatus(true);
     } else if (input2 === "s" && status !== "syncing") {
       setStatus("syncing");
@@ -2092,8 +2296,8 @@ var App = ({
     };
   }, []);
   const progressLineCount = status === "syncing" ? Math.max(1, maxProgressLines) : 0;
-  const statusBarHeight = 5 + progressLineCount;
-  const terminalRows = stdout.rows ?? 24;
+  const statusBarHeight = 5 + progressLineCount + activeOps.length;
+  const terminalRows = rows ?? 24;
   const logPanelHeight = Math.max(5, terminalRows - statusBarHeight);
   const showModal = showHelp || showBranchWizard || showOpenEditorWizard || showWorktreeStatus;
   return /* @__PURE__ */ React7.createElement(Box7, { flexDirection: "column", minHeight: terminalRows }, !showModal && /* @__PURE__ */ React7.createElement(LogPanel_default, { logs, height: logPanelHeight, isActive: !showModal }), showHelp && /* @__PURE__ */ React7.createElement(HelpModal_default, { onClose: () => setShowHelp(false) }), showBranchWizard && /* @__PURE__ */ React7.createElement(
@@ -2106,7 +2310,8 @@ var App = ({
       createAndPushBranch,
       onClose: () => setShowBranchWizard(false),
       onBranchCreated: (context) => {
-        setStatus("syncing");
+        const opId = ++opIdRef.current;
+        setActiveOps((prev) => [...prev, { id: opId, label: `Creating worktree ${context.newBranch}` }]);
         (async () => {
           try {
             await createWorktreeForBranch(context.repoIndex, context.newBranch);
@@ -2135,7 +2340,7 @@ var App = ({
               level: "error"
             });
           } finally {
-            setStatus("idle");
+            setActiveOps((prev) => prev.filter((op) => op.id !== opId));
           }
         })().catch((err) => console.error("Branch creation unhandled error:", err));
       },
@@ -2167,6 +2372,7 @@ var App = ({
     {
       status,
       syncProgressEntries,
+      activeOps: activeOps.map((op) => op.label),
       maxProgressLines,
       repositoryCount: repoCount,
       lastSyncTime,
@@ -2177,6 +2383,34 @@ var App = ({
 };
 var App_default = App;
 
+// src/services/worktree-sync.service.ts
+import pLimit2 from "p-limit";
+
+// src/utils/lock-path.ts
+import { createHash } from "crypto";
+import * as os from "os";
+import * as path3 from "path";
+function getCloneModeLockTarget(config) {
+  const hash = createHash("sha256").update(path3.resolve(config.worktreeDir)).digest("hex").slice(0, 16);
+  const stateBase = process.env.XDG_STATE_HOME && process.env.XDG_STATE_HOME.length > 0 ? process.env.XDG_STATE_HOME : path3.join(os.homedir(), ".cache");
+  const dir = path3.join(stateBase, "sync-worktrees", "locks");
+  return { dir, file: `${hash}.lock` };
+}
+function getRemovalAuditLogPath(config) {
+  const name = config.name;
+  const configDir = config.__configFileDir;
+  const hash = createHash("sha256").update(path3.resolve(config.worktreeDir)).digest("hex").slice(0, 16);
+  if (configDir) {
+    return path3.join(
+      configDir,
+      ".sync-worktrees-state",
+      `${sanitizeNameForPath(name ?? "repo", "removal audit log name")}-${hash}-removals.jsonl`
+    );
+  }
+  const stateBase = process.env.XDG_STATE_HOME && process.env.XDG_STATE_HOME.length > 0 ? process.env.XDG_STATE_HOME : path3.join(os.homedir(), ".cache");
+  return path3.join(stateBase, "sync-worktrees", "removals", `${hash}.jsonl`);
+}
+
 // src/utils/retry.ts
 var DEFAULT_OPTIONS = {
   maxAttempts: "unlimited",
@@ -2247,7 +2481,7 @@ async function retry(fn, options = {}) {
       const jitter = opts.jitterMs > 0 ? Math.random() * opts.jitterMs : 0;
       const delay = baseDelay + jitter;
       opts.onRetry(error, attempt, lfsContext);
-      await new Promise((resolve12) => setTimeout(resolve12, delay));
+      await new Promise((resolve14) => setTimeout(resolve14, delay));
       attempt++;
     }
   }
@@ -2318,7 +2552,7 @@ var PhaseTimer = class {
     return results;
   }
 };
-function formatDuration(ms) {
+function formatDuration2(ms) {
   if (ms < 1e3) {
     return `${ms}ms`;
   }
@@ -2340,7 +2574,7 @@ function formatTimingTable(totalDuration, phaseResults, repoName) {
     }
   });
   table.push([{ colSpan: 3, content: header, hAlign: "center" }]);
-  table.push(["Total Sync", formatDuration(totalDuration), ""]);
+  table.push(["Total Sync", formatDuration2(totalDuration), ""]);
   for (let i = 0; i < phaseResults.length; i++) {
     const result = phaseResults[i];
     const isLast = i === phaseResults.length - 1;
@@ -2348,14 +2582,14 @@ function formatTimingTable(totalDuration, phaseResults, repoName) {
     const prefix = isLast ? "\u2514\u2500" : "\u251C\u2500";
     const name = `  ${prefix} ${result.name}${countStr}`;
     const efficiency = result.efficiency ? `${result.efficiency}%` : "";
-    table.push([name, formatDuration(result.duration), efficiency]);
+    table.push([name, formatDuration2(result.duration), efficiency]);
   }
   return table.toString();
 }
 
 // src/services/clone-sync.service.ts
 import * as fs3 from "fs/promises";
-import * as path4 from "path";
+import * as path5 from "path";
 import simpleGit from "simple-git";
 
 // src/utils/git-progress.ts
@@ -2384,7 +2618,7 @@ function makeGitProgressHandler(logger, emitProgress) {
 
 // src/services/file-copy.service.ts
 import * as fs2 from "fs/promises";
-import * as path3 from "path";
+import * as path4 from "path";
 import { glob } from "glob";
 var DEFAULT_IGNORE_PATTERNS = [
   "**/node_modules/**",
@@ -2411,8 +2645,8 @@ var FileCopyService = class {
     }
     const filesToCopy = await this.expandPatterns(sourceDir, patterns);
     for (const relativePath of filesToCopy) {
-      const sourcePath = path3.join(sourceDir, relativePath);
-      const destPath = path3.join(destDir, relativePath);
+      const sourcePath = path4.join(sourceDir, relativePath);
+      const destPath = path4.join(destDir, relativePath);
       try {
         const copied = await this.copyFile(sourcePath, destPath);
         if (copied) {
@@ -2451,7 +2685,7 @@ var FileCopyService = class {
     if (await fileExists(destPath)) {
       return false;
     }
-    const destDir = path3.dirname(destPath);
+    const destDir = path4.dirname(destPath);
     await fs2.mkdir(destDir, { recursive: true });
     await fs2.copyFile(sourcePath, destPath);
     return true;
@@ -2513,7 +2747,7 @@ var BranchCreatedActionsService = class {
 function formatCloneSkipReason(reason) {
   switch (reason.kind) {
     case "branch_mismatch":
-      return reason.phase === "init" ? `clone is on '${reason.currentBranch}', expected '${reason.expectedBranch}' (since process start)` : `clone is on '${reason.currentBranch}', expected '${reason.expectedBranch}'`;
+      return reason.phase === "init" ? `clone is on '${reason.currentBranch}', expected '${reason.expectedBranch}' (since process start) \u2014 update 'branch' in the config or switch the clone back` : `clone is on '${reason.currentBranch}', expected '${reason.expectedBranch}' \u2014 update 'branch' in the config or switch the clone back`;
     case "head_unreadable":
       return `could not read HEAD: ${reason.error}`;
     case "dirty_tree":
@@ -2577,20 +2811,21 @@ var SyncOutcomeAccumulator = class {
   constructor(options) {
     this.options = options;
   }
+  options;
   counts = cloneCounts(EMPTY_COUNTS);
   actions = [];
   add(action) {
     this.actions.push(action);
     this.counts[countKeyFor(action)]++;
   }
-  recordCreated(branch, path18) {
-    this.add({ kind: "created", branch, path: path18 });
+  recordCreated(branch, path24) {
+    this.add({ kind: "created", branch, path: path24 });
   }
-  recordRemoved(branch, path18) {
-    this.add({ kind: "removed", branch, path: path18 });
+  recordRemoved(branch, path24, warning) {
+    this.add({ kind: "removed", branch, path: path24, ...warning !== void 0 && { warning } });
   }
-  recordUpdated(branch, path18, reason) {
-    this.add({ kind: "updated", branch, path: path18, reason });
+  recordUpdated(branch, path24, reason) {
+    this.add({ kind: "updated", branch, path: path24, reason });
   }
   recordNoop(scope, reason, details) {
     this.add({ kind: "noop", scope, reason, ...details });
@@ -2598,8 +2833,8 @@ var SyncOutcomeAccumulator = class {
   recordSkipped(scope, reason, details) {
     this.add({ kind: "skipped", scope, reason, ...details });
   }
-  recordPreservedDiverged(branch, path18, preservedPath) {
-    this.add({ kind: "preserved-diverged", branch, path: path18, preservedPath });
+  recordPreservedDiverged(branch, path24, preservedPath) {
+    this.add({ kind: "preserved-diverged", branch, path: path24, preservedPath });
   }
   recordFailed(scope, error, details = {}) {
     this.add({ kind: "failed", scope, error, ...details });
@@ -2642,7 +2877,6 @@ function cloneSkipToOutcomeAction(reason, details = {}) {
 }
 
 // src/services/clone-sync.service.ts
-var ALL_REMOTE_BRANCHES_REFSPEC = "+refs/heads/*:refs/remotes/origin/*";
 var SHALLOW_RELATION_DEEPEN_TARGETS = [50, 200, 1e3];
 var CloneSyncService = class {
   constructor(config, gitService, logger, options = {}) {
@@ -2653,6 +2887,9 @@ var CloneSyncService = class {
     this.progressEmitter = options.progressEmitter;
     this.onSkip = options.onSkip;
   }
+  config;
+  gitService;
+  logger;
   initialized = false;
   resolvedBranch = null;
   branchCreatedActions;
@@ -2673,8 +2910,8 @@ var CloneSyncService = class {
     this.pendingInitSkip = null;
   }
   async getWorktrees() {
-    const worktreeDir = path4.resolve(this.config.worktreeDir);
-    if (!await fileExists(path4.join(worktreeDir, PATH_CONSTANTS.GIT_DIR))) {
+    const worktreeDir = path5.resolve(this.config.worktreeDir);
+    if (!await fileExists(path5.join(worktreeDir, PATH_CONSTANTS.GIT_DIR))) {
       return [];
     }
     const git = this.clientFor(worktreeDir, this.getFetchTimeoutMs());
@@ -2758,40 +2995,27 @@ var CloneSyncService = class {
     return env;
   }
   buildCloneArgs(branch) {
-    const args = ["--branch", branch, "--progress"];
+    const args = ["--branch", branch, "--single-branch", "--no-tags", "--progress"];
     if (this.config.depth !== void 0) {
-      args.push("--depth", String(this.config.depth), "--no-single-branch");
+      args.push("--depth", String(this.config.depth));
     }
     return args;
   }
-  async buildFetchArgs(git) {
-    const args = ["origin", "--prune", "--progress"];
+  getBranchRefspec(branch) {
+    return `+refs/heads/${branch}:refs/remotes/origin/${branch}`;
+  }
+  async buildFetchArgs(git, branch) {
+    const args = ["origin", "--prune", "--no-tags", "--progress"];
     if (this.config.depth !== void 0 && await this.isShallowRepository(git)) {
       args.push("--depth", String(this.config.depth));
     }
+    args.push(this.getBranchRefspec(branch));
     return args;
   }
-  async ensureAllRemoteBranchesRefspec(git) {
-    let fetchRefspecs = [];
-    try {
-      const output = await git.raw(["config", "--get-all", "remote.origin.fetch"]);
-      fetchRefspecs = output.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-    } catch {
-      fetchRefspecs = [];
-    }
-    if (fetchRefspecs.includes(ALL_REMOTE_BRANCHES_REFSPEC)) return;
-    const customRefspecs = fetchRefspecs.filter((refspec) => !this.isOriginRemoteBranchTrackingRefspec(refspec));
-    this.logger.info(`Configuring '${this.repoName}' to fetch all remote branches from origin.`);
-    await git.raw(["remote", "set-branches", "origin", "*"]);
-    for (const refspec of customRefspecs) {
-      await git.raw(["config", "--add", "remote.origin.fetch", refspec]);
-    }
-  }
-  isOriginRemoteBranchTrackingRefspec(refspec) {
-    const withoutForce = refspec.startsWith("+") ? refspec.slice(1) : refspec;
-    if (withoutForce.startsWith("^")) return false;
-    const [source, destination] = withoutForce.split(":");
-    return source.startsWith("refs/heads/") && destination?.startsWith("refs/remotes/origin/") === true;
+  async configureSingleBranchRemote(git, branch) {
+    await git.raw(["config", "--replace-all", "remote.origin.fetch", this.getBranchRefspec(branch)]);
+    await git.raw(["config", "--replace-all", "remote.origin.tagOpt", "--no-tags"]);
+    await this.deleteStaleRemoteTrackingRefs(git, branch);
   }
   recordMissingRemoteRefSkip(branch) {
     this.recordSkip(
@@ -2800,7 +3024,10 @@ var CloneSyncService = class {
       `Skipping '${this.repoName}': origin/${branch} is missing`
     );
   }
-  async fetchWithRecovery(git, fetchArgs, worktreeDir, branch) {
+  async fetchWithRecovery(git, fetchArgs, worktreeDir, branch, recordSkip = true) {
+    const recordMissing = () => {
+      if (recordSkip) this.recordMissingRemoteRefSkip(branch);
+    };
     try {
       await git.fetch(fetchArgs);
       return { skipped: false };
@@ -2817,14 +3044,14 @@ var CloneSyncService = class {
           return { skipped: false };
         } catch (retryError) {
           if (isMissingRemoteRefError(getErrorMessage(retryError))) {
-            this.recordMissingRemoteRefSkip(branch);
+            recordMissing();
             return { skipped: true };
           }
           throw retryError;
         }
       }
       if (isMissingRemoteRefError(message)) {
-        this.recordMissingRemoteRefSkip(branch);
+        recordMissing();
         return { skipped: true };
       }
       throw fetchError;
@@ -2852,7 +3079,7 @@ var CloneSyncService = class {
     this.logger.info(
       `[deepen] Existing shallow clone for '${this.repoName}' has no configured depth; fetching full history...`
     );
-    await git.fetch(["--unshallow"]);
+    await git.fetch(["--unshallow", "--no-tags"]);
   }
   getDeepenTargets() {
     const configuredDepth = this.config.depth;
@@ -2872,8 +3099,9 @@ var CloneSyncService = class {
       "--depth",
       String(targetDepth),
       "--prune",
+      "--no-tags",
       "--progress",
-      `+refs/heads/${branch}:refs/remotes/origin/${branch}`
+      this.getBranchRefspec(branch)
     ]);
   }
   async resolveBranch() {
@@ -2890,6 +3118,153 @@ var CloneSyncService = class {
     this.emitProgress({ phase: "branch", message: `Resolved default branch '${this.resolvedBranch}'` });
     return this.resolvedBranch;
   }
+  parseLsRemoteHeads(output) {
+    return output.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).map((line) => line.split(/\s+/)[1] ?? "").filter((ref) => ref.startsWith("refs/heads/")).map((ref) => ref.slice("refs/heads/".length)).filter((branch) => branch.length > 0);
+  }
+  async getRemoteBranches() {
+    const worktreeDir = path5.resolve(this.config.worktreeDir);
+    const repoArg = await fileExists(path5.join(worktreeDir, PATH_CONSTANTS.GIT_DIR)) ? "origin" : this.config.repoUrl;
+    const git = repoArg === "origin" ? this.clientFor(worktreeDir, this.getFetchTimeoutMs()) : simpleGit(this.buildGitOptions(this.getFetchTimeoutMs())).env(this.buildGitEnv());
+    const output = await git.raw(["ls-remote", "--heads", repoArg]);
+    return this.parseLsRemoteHeads(output);
+  }
+  async localBranchExists(git, branch) {
+    try {
+      await git.raw(["show-ref", "--verify", `refs/heads/${branch}`]);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  async localBranchCanFastForward(git, branch) {
+    const localRef = `refs/heads/${branch}`;
+    const remoteRef = `refs/remotes/origin/${branch}`;
+    let localSha;
+    let remoteSha;
+    try {
+      localSha = (await git.raw(["rev-parse", localRef])).trim();
+      remoteSha = (await git.raw(["rev-parse", remoteRef])).trim();
+    } catch {
+      return false;
+    }
+    if (localSha === remoteSha) return true;
+    try {
+      const mergeBase = (await git.raw(["merge-base", localRef, remoteRef])).trim();
+      return mergeBase === localSha;
+    } catch {
+      return false;
+    }
+  }
+  async deleteRemoteTrackingRef(git, refName) {
+    try {
+      await git.raw(["update-ref", "-d", refName]);
+    } catch {
+    }
+  }
+  async deleteStaleRemoteTrackingRefs(git, branch) {
+    let refsOutput;
+    try {
+      refsOutput = await git.raw(["for-each-ref", "--format=%(refname)", "refs/remotes/origin"]);
+    } catch {
+      return;
+    }
+    const keepRef = `refs/remotes/origin/${branch}`;
+    const refsToDelete = refsOutput.split(/\r?\n/).map((ref) => ref.trim()).filter((ref) => ref && ref !== keepRef && ref !== "refs/remotes/origin/HEAD");
+    for (const ref of refsToDelete) {
+      await this.deleteRemoteTrackingRef(git, ref);
+    }
+  }
+  async restoreBranchAfterCheckoutFailure(git, previousBranch, attemptedBranch) {
+    if (!previousBranch || previousBranch === "HEAD" || previousBranch === attemptedBranch) return;
+    try {
+      await git.raw(["switch", previousBranch]);
+    } catch (error) {
+      this.logger.warn(
+        `Failed to restore '${this.repoName}' to '${previousBranch}' after checkout failure: ${getErrorMessage(error)}`
+      );
+    }
+  }
+  async checkoutBranch(branch, options = {}) {
+    if (!this.initialized) {
+      await this.initialize();
+    }
+    const targetBranch = await this.resolveBranch();
+    if (branch !== targetBranch && !options.allowConfigDrift) {
+      throw new ConfigError(
+        this.config.branch ? `Cannot switch '${this.repoName}' to '${branch}': clone mode tracks the configured branch '${targetBranch}'. Update 'branch' in the config file first, then run checkout to converge.` : `Cannot switch '${this.repoName}' to '${branch}': no 'branch' is configured, so this clone tracks the remote default branch '${targetBranch}'. Set branch: "${branch}" in the config file first.`,
+        "CLONE_BRANCH_MISMATCH"
+      );
+    }
+    const worktreeDir = this.config.worktreeDir;
+    const git = this.clientFor(worktreeDir, this.getFetchTimeoutMs());
+    const originMismatch = await this.evaluateOriginMatch(git, worktreeDir);
+    if (originMismatch) {
+      throw new ConfigError(
+        `Cannot switch '${this.repoName}' to '${branch}': ${originMismatch.progressDetail}.`,
+        "ORIGIN_MISMATCH"
+      );
+    }
+    const currentBranch = (await git.raw(["rev-parse", "--abbrev-ref", "HEAD"])).trim();
+    if (currentBranch === "HEAD") {
+      throw new GitOperationError(
+        "checkout",
+        `'${this.repoName}' is on a detached HEAD; check out a branch manually (preserving any local commits) before switching the tracked branch`
+      );
+    }
+    if (currentBranch === branch) {
+      await this.configureSingleBranchRemote(git, branch);
+      this.resolvedBranch = branch;
+      this.pendingInitSkip = null;
+      this.warnConfigDriftAfterCheckout(branch, targetBranch);
+      return;
+    }
+    const isClean = await this.gitService.checkWorktreeStatus(worktreeDir);
+    if (!isClean) {
+      throw new WorktreeNotCleanError(worktreeDir, ["working tree has local changes"]);
+    }
+    await this.unshallowIfDepthRemoved(git);
+    const fetchArgs = await this.buildFetchArgs(git, branch);
+    if ((await this.fetchWithRecovery(git, fetchArgs, worktreeDir, branch, false)).skipped) {
+      throw new GitOperationError("checkout", `origin/${branch} is missing for '${this.repoName}'`);
+    }
+    if (!await this.hasRemoteBranch(git, branch)) {
+      throw new GitOperationError(
+        "checkout",
+        `origin/${branch} did not materialize after fetch for '${this.repoName}'`
+      );
+    }
+    if (await this.localBranchExists(git, branch)) {
+      if (!await this.localBranchCanFastForward(git, branch)) {
+        throw new FastForwardError(branch);
+      }
+      let switched = false;
+      try {
+        await git.raw(["switch", branch]);
+        switched = true;
+        await git.merge([`origin/${branch}`, "--ff-only"]);
+      } catch (error) {
+        if (switched) {
+          await this.restoreBranchAfterCheckoutFailure(git, currentBranch, branch);
+        }
+        throw error;
+      }
+    } else {
+      await git.raw(["switch", "-c", branch, "--track", `origin/${branch}`]);
+    }
+    await this.configureSingleBranchRemote(git, branch);
+    this.resolvedBranch = branch;
+    this.pendingInitSkip = null;
+    this.warnConfigDriftAfterCheckout(branch, targetBranch);
+  }
+  // resolvedBranch keeps in-session syncs on the new branch, but the config
+  // file still names the old one: the next process start will soft-skip with
+  // branch_mismatch on every tick until the config is updated.
+  warnConfigDriftAfterCheckout(branch, targetBranch) {
+    if (branch === targetBranch) return;
+    this.logger.warn(
+      `\u26A0\uFE0F '${this.repoName}' now tracks '${branch}', but the config ${this.config.branch ? `still says branch '${targetBranch}'` : `resolves the remote default '${targetBranch}'`}. Set branch: "${branch}" in the config file \u2014 after a restart every sync will soft-skip with branch_mismatch until it matches.`
+    );
+  }
   async initialize(outcome) {
     return this.withOutcome(outcome, () => this.initializeInternal());
   }
@@ -2913,7 +3288,7 @@ var CloneSyncService = class {
         return;
       }
       const git = this.clientFor(worktreeDir, this.getFetchTimeoutMs());
-      await this.ensureAllRemoteBranchesRefspec(git);
+      await this.configureSingleBranchRemote(git, branch);
       this.initialized = true;
       this.emitProgress({ phase: "clone", message: `Existing clone validated for '${this.repoName}'` });
       return;
@@ -2941,7 +3316,7 @@ var CloneSyncService = class {
       throw error;
     }
     const worktreeGit = this.clientFor(worktreeDir, this.getFetchTimeoutMs());
-    await this.ensureAllRemoteBranchesRefspec(worktreeGit);
+    await this.configureSingleBranchRemote(worktreeGit, branch);
     this.logger.info(`\u2705 Clone successful.`);
     this.emitProgress({ phase: "clone", message: `Clone successful for '${this.repoName}'` });
     if (this.config.sparseCheckout) {
@@ -3029,7 +3404,7 @@ var CloneSyncService = class {
       return;
     }
     const looksIncomplete = entries.every((e) => e.startsWith("."));
-    const hasUsableGit = entries.includes(PATH_CONSTANTS.GIT_DIR) && await fileExists(path4.join(worktreeDir, PATH_CONSTANTS.GIT_DIR, "HEAD"));
+    const hasUsableGit = entries.includes(PATH_CONSTANTS.GIT_DIR) && await fileExists(path5.join(worktreeDir, PATH_CONSTANTS.GIT_DIR, "HEAD"));
     if (looksIncomplete && !hasUsableGit) {
       try {
         await fs3.rm(worktreeDir, { recursive: true, force: true });
@@ -3044,7 +3419,7 @@ var CloneSyncService = class {
     }
   }
   getInitMarkerPath(worktreeDir) {
-    return path4.join(worktreeDir, PATH_CONSTANTS.GIT_DIR, PATH_CONSTANTS.CLONE_INIT_MARKER);
+    return path5.join(worktreeDir, PATH_CONSTANTS.GIT_DIR, PATH_CONSTANTS.CLONE_INIT_MARKER);
   }
   async runInitialFileCopy(worktreeDir, branch) {
     const marker = this.getInitMarkerPath(worktreeDir);
@@ -3096,7 +3471,7 @@ var CloneSyncService = class {
     if (currentBranch !== branch) {
       this.recordSkip(
         { kind: "branch_mismatch", phase: "sync", currentBranch, expectedBranch: branch },
-        `Clone at '${worktreeDir}' is on '${currentBranch}', expected '${branch}'. Skipping fetch+merge.`,
+        `Clone at '${worktreeDir}' is on '${currentBranch}', expected '${branch}'. Skipping fetch+merge. Update 'branch' in the config or switch the clone back.`,
         `Skipping '${this.repoName}': current branch '${currentBranch}' is not '${branch}'`
       );
       return;
@@ -3111,13 +3486,13 @@ var CloneSyncService = class {
       return;
     }
     await this.unshallowIfDepthRemoved(git);
-    await this.ensureAllRemoteBranchesRefspec(git);
-    const fetchArgs = await this.buildFetchArgs(git);
-    this.emitProgress({ phase: "fetch", message: `Fetching origin branches for '${this.repoName}'` });
+    await this.configureSingleBranchRemote(git, branch);
+    const fetchArgs = await this.buildFetchArgs(git, branch);
+    this.emitProgress({ phase: "fetch", message: `Fetching origin/${branch} for '${this.repoName}'` });
     if ((await this.fetchWithRecovery(git, fetchArgs, worktreeDir, branch)).skipped) {
       return;
     }
-    this.emitProgress({ phase: "fetch", message: `Fetched origin branches for '${this.repoName}'` });
+    this.emitProgress({ phase: "fetch", message: `Fetched origin/${branch} for '${this.repoName}'` });
     if (!await this.hasRemoteBranch(git, branch)) {
       this.recordSkip(
         { kind: "missing_remote_ref", branch, source: "post_fetch_verify" },
@@ -3207,50 +3582,39 @@ var CloneSyncService = class {
   }
 };
 
-// src/services/git.service.ts
-import * as fs6 from "fs/promises";
-import * as path8 from "path";
-import simpleGit5 from "simple-git";
+// src/services/git-maintenance.service.ts
+import * as fs5 from "fs/promises";
+import * as path6 from "path";
+import simpleGit2 from "simple-git";
 
-// src/utils/worktree-list-parser.ts
-function parseWorktreeListPorcelain(output) {
-  const worktrees = [];
-  let current = {};
-  const flush = () => {
-    if (!current.path) {
-      current = {};
-      return;
+// src/utils/atomic-write.ts
+import * as fs4 from "fs/promises";
+async function atomicWriteFile(filePath, content) {
+  const tmpPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
+  let renamed = false;
+  try {
+    const handle = await fs4.open(tmpPath, "w");
+    try {
+      await handle.writeFile(content, "utf-8");
+      await handle.sync();
+    } finally {
+      await handle.close();
     }
-    worktrees.push({
-      path: current.path,
-      branch: current.branch ?? null,
-      head: current.head ?? null,
-      detached: current.detached ?? false,
-      prunable: current.prunable ?? false,
-      locked: current.locked ?? false
-    });
-    current = {};
-  };
-  for (const line of output.split("\n")) {
-    if (line.startsWith("worktree ")) {
-      flush();
-      current.path = line.substring("worktree ".length);
-    } else if (line.startsWith("branch ")) {
-      current.branch = line.substring("branch ".length).replace("refs/heads/", "");
-    } else if (line.startsWith("HEAD ")) {
-      current.head = line.substring("HEAD ".length);
-    } else if (line === "detached") {
-      current.detached = true;
-    } else if (line === "prunable" || line.startsWith("prunable ")) {
-      current.prunable = true;
-    } else if (line === "locked" || line.startsWith("locked ")) {
-      current.locked = true;
-    } else if (line.trim() === "") {
-      flush();
+    try {
+      await fs4.rename(tmpPath, filePath);
+      renamed = true;
+    } catch (err) {
+      if (err.code === ERROR_MESSAGES.EXDEV) {
+        await fs4.copyFile(tmpPath, filePath);
+      } else {
+        throw err;
+      }
+    }
+  } finally {
+    if (!renamed) {
+      await fs4.unlink(tmpPath).catch(() => void 0);
     }
   }
-  flush();
-  return worktrees;
 }
 
 // src/services/logger.service.ts
@@ -3352,9 +3716,190 @@ function defaultConsoleOutput(msg, level) {
   else console.log(msg);
 }
 
+// src/services/git-maintenance.service.ts
+var GitMaintenanceService = class {
+  constructor(config, gitService, logger, gitFactory = (cwd) => simpleGit2(cwd)) {
+    this.config = config;
+    this.gitService = gitService;
+    this.logger = logger ?? Logger.createDefault();
+    this.gitFactory = gitFactory;
+  }
+  config;
+  gitService;
+  logger;
+  gitFactory;
+  updateLogger(logger) {
+    this.logger = logger;
+  }
+  isEnabled() {
+    return this.config.maintenance?.enabled ?? DEFAULT_CONFIG.MAINTENANCE.ENABLED;
+  }
+  getIntervalMs() {
+    const fallback = parseDuration(DEFAULT_CONFIG.MAINTENANCE.INTERVAL);
+    const raw = this.config.maintenance?.interval;
+    if (raw === void 0) {
+      return fallback;
+    }
+    const parsed = parseDuration(raw);
+    if (parsed === null || parsed <= 0) {
+      this.logger.warn(`Invalid maintenance.interval '${raw}', using default ${DEFAULT_CONFIG.MAINTENANCE.INTERVAL}.`);
+      return fallback;
+    }
+    return parsed;
+  }
+  resolveTarget() {
+    if (resolveMode(this.config) === REPOSITORY_MODES.CLONE) {
+      const cwd = path6.resolve(this.config.worktreeDir);
+      return { cwd, gitDir: path6.join(cwd, PATH_CONSTANTS.GIT_DIR) };
+    }
+    const bare = this.gitService.getBareRepoPath();
+    return { cwd: bare, gitDir: bare };
+  }
+  getStatePath(gitDir) {
+    return path6.join(gitDir, MAINTENANCE_CONSTANTS.STATE_FILENAME);
+  }
+  async readState(statePath) {
+    try {
+      const parsed = JSON.parse(await fs5.readFile(statePath, "utf-8"));
+      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+        return {};
+      }
+      return { ...parsed };
+    } catch {
+      return {};
+    }
+  }
+  async writeState(statePath, state) {
+    try {
+      await atomicWriteFile(statePath, JSON.stringify(state, null, 2));
+    } catch (error) {
+      this.logger.warn(`Failed to persist maintenance state: ${getErrorMessage(error)}`);
+    }
+  }
+  isDue(state, now) {
+    if (!state.lastAttemptAt) {
+      return true;
+    }
+    const last = new Date(state.lastAttemptAt).getTime();
+    if (Number.isNaN(last)) {
+      return true;
+    }
+    return now - last >= this.getIntervalMs();
+  }
+  /**
+   * Run `git gc` if maintenance is enabled and due. MUST be called while the
+   * repository operation lock is already held. Never throws: a gc failure is
+   * recorded and warned so it cannot fail the surrounding sync. The attempt
+   * timestamp is persisted even on failure, so a perpetually-failing gc is
+   * throttled instead of retried every tick.
+   */
+  async runIfDueUnlocked(now = Date.now()) {
+    if (!this.isEnabled()) {
+      return;
+    }
+    try {
+      const { cwd, gitDir } = this.resolveTarget();
+      try {
+        await fs5.access(gitDir);
+      } catch {
+        return;
+      }
+      const statePath = this.getStatePath(gitDir);
+      const state = await this.readState(statePath);
+      if (!this.isDue(state, now)) {
+        return;
+      }
+      const aggressive = this.config.maintenance?.aggressive ?? false;
+      const args = aggressive ? ["gc", "--prune=now"] : ["gc"];
+      const nowIso = new Date(now).toISOString();
+      state.lastAttemptAt = nowIso;
+      this.logger.info(`\u{1F9F9} Running git ${args.join(" ")} (maintenance)...`);
+      try {
+        await this.gitFactory(cwd).raw(args);
+        state.lastSuccessAt = nowIso;
+        delete state.lastError;
+        this.logger.info("\u{1F9F9} Maintenance complete.");
+      } catch (error) {
+        state.lastFailureAt = nowIso;
+        state.lastError = getErrorMessage(error);
+        this.logger.warn(`\u26A0\uFE0F  Maintenance (git ${args.join(" ")}) failed: ${state.lastError}`);
+      } finally {
+        await this.writeState(statePath, state);
+      }
+    } catch (error) {
+      this.logger.warn(`\u26A0\uFE0F  Maintenance skipped due to an unexpected error: ${getErrorMessage(error)}`);
+    }
+  }
+};
+
+// src/services/git.service.ts
+import * as fs9 from "fs/promises";
+import * as path11 from "path";
+import simpleGit6 from "simple-git";
+
+// src/utils/quarantine.ts
+import * as fs6 from "fs/promises";
+import * as path7 from "path";
+
+// src/utils/filename-timestamp.ts
+function filenameTimestamp(date = /* @__PURE__ */ new Date()) {
+  return date.toISOString().replace(/[:.]/g, "-");
+}
+
+// src/utils/quarantine.ts
+async function quarantineDirectory(dirPath) {
+  const baseDir = path7.join(path7.dirname(dirPath), GIT_CONSTANTS.REMOVED_DIR_NAME);
+  await fs6.mkdir(baseDir, { recursive: true });
+  const timestamp = filenameTimestamp();
+  const quarantinePath = path7.join(baseDir, `${timestamp}-${path7.basename(dirPath)}`);
+  await fs6.rename(dirPath, quarantinePath);
+  return quarantinePath;
+}
+
+// src/utils/worktree-list-parser.ts
+function parseWorktreeListPorcelain(output) {
+  const worktrees = [];
+  let current = {};
+  const flush = () => {
+    if (!current.path) {
+      current = {};
+      return;
+    }
+    worktrees.push({
+      path: current.path,
+      branch: current.branch ?? null,
+      head: current.head ?? null,
+      detached: current.detached ?? false,
+      prunable: current.prunable ?? false,
+      locked: current.locked ?? false
+    });
+    current = {};
+  };
+  for (const line of output.split("\n")) {
+    if (line.startsWith("worktree ")) {
+      flush();
+      current.path = line.substring("worktree ".length);
+    } else if (line.startsWith("branch ")) {
+      current.branch = line.substring("branch ".length).replace("refs/heads/", "");
+    } else if (line.startsWith("HEAD ")) {
+      current.head = line.substring("HEAD ".length);
+    } else if (line === "detached") {
+      current.detached = true;
+    } else if (line === "prunable" || line.startsWith("prunable ")) {
+      current.prunable = true;
+    } else if (line === "locked" || line.startsWith("locked ")) {
+      current.locked = true;
+    } else if (line.trim() === "") {
+      flush();
+    }
+  }
+  flush();
+  return worktrees;
+}
+
 // src/services/sparse-checkout.service.ts
-import * as path5 from "path";
-import simpleGit2 from "simple-git";
+import * as path8 from "path";
+import simpleGit3 from "simple-git";
 var SparseCheckoutService = class {
   logger;
   gitFactory;
@@ -3362,7 +3907,7 @@ var SparseCheckoutService = class {
   matcherCache = /* @__PURE__ */ new WeakMap();
   constructor(logger, gitFactory) {
     this.logger = logger ?? Logger.createDefault();
-    this.gitFactory = gitFactory ?? ((p) => simpleGit2(p));
+    this.gitFactory = gitFactory ?? ((p) => simpleGit3(p));
   }
   updateLogger(logger) {
     this.logger = logger;
@@ -3488,7 +4033,7 @@ var SparseCheckoutService = class {
       for (const pat of matcher.patterns) {
         if (p === pat || p.startsWith(pat + "/")) return true;
       }
-      return matcher.ancestorDirs.has(path5.posix.dirname(p));
+      return matcher.ancestorDirs.has(path8.posix.dirname(p));
     });
   }
   getMatcher(cfg) {
@@ -3515,9 +4060,9 @@ var SparseCheckoutService = class {
 };
 
 // src/services/worktree-metadata.service.ts
-import * as fs4 from "fs/promises";
-import * as path6 from "path";
-import simpleGit3 from "simple-git";
+import * as fs7 from "fs/promises";
+import * as path9 from "path";
+import simpleGit4 from "simple-git";
 var WorktreeMetadataService = class {
   logger;
   constructor(logger) {
@@ -3529,7 +4074,7 @@ var WorktreeMetadataService = class {
    * For example: /worktrees/fix/test-branch -> test-branch (not fix/test-branch)
    */
   getWorktreeDirectoryName(worktreePath) {
-    return path6.basename(worktreePath);
+    return path9.basename(worktreePath);
   }
   async getMetadataPath(bareRepoPath, worktreeName) {
     if (worktreeName.includes("/") || worktreeName.includes("\\")) {
@@ -3537,7 +4082,7 @@ var WorktreeMetadataService = class {
         `getMetadataPath requires a filesystem-safe worktree directory name, got '${worktreeName}'. Use getMetadataPathFromWorktreePath when starting from a raw branch name.`
       );
     }
-    return path6.join(
+    return path9.join(
       bareRepoPath,
       METADATA_CONSTANTS.WORKTREE_METADATA_PATH,
       worktreeName,
@@ -3550,31 +4095,13 @@ var WorktreeMetadataService = class {
   }
   async saveMetadata(bareRepoPath, worktreeName, metadata) {
     const metadataPath = await this.getMetadataPath(bareRepoPath, worktreeName);
-    await fs4.mkdir(path6.dirname(metadataPath), { recursive: true });
-    const tmpPath = `${metadataPath}.${process.pid}.${Date.now()}.tmp`;
-    let renamed = false;
-    try {
-      await fs4.writeFile(tmpPath, JSON.stringify(metadata, null, 2), "utf-8");
-      try {
-        await fs4.rename(tmpPath, metadataPath);
-        renamed = true;
-      } catch (err) {
-        if (err.code === ERROR_MESSAGES.EXDEV) {
-          await fs4.copyFile(tmpPath, metadataPath);
-        } else {
-          throw err;
-        }
-      }
-    } finally {
-      if (!renamed) {
-        await fs4.unlink(tmpPath).catch(() => void 0);
-      }
-    }
+    await fs7.mkdir(path9.dirname(metadataPath), { recursive: true });
+    await atomicWriteFile(metadataPath, JSON.stringify(metadata, null, 2));
   }
   async loadMetadata(bareRepoPath, worktreeName) {
     const metadataPath = await this.getMetadataPath(bareRepoPath, worktreeName);
     try {
-      const content = await fs4.readFile(metadataPath, "utf-8");
+      const content = await fs7.readFile(metadataPath, "utf-8");
       return JSON.parse(content);
     } catch {
       return null;
@@ -3583,7 +4110,7 @@ var WorktreeMetadataService = class {
   async loadMetadataFromPath(bareRepoPath, worktreePath) {
     const metadataPath = await this.getMetadataPathFromWorktreePath(bareRepoPath, worktreePath);
     try {
-      const content = await fs4.readFile(metadataPath, "utf-8");
+      const content = await fs7.readFile(metadataPath, "utf-8");
       const metadata = JSON.parse(content);
       if (!await this.validateMetadata(metadata)) {
         this.logger.warn(`Corrupted metadata for ${worktreePath}, treating as missing`);
@@ -3597,7 +4124,7 @@ var WorktreeMetadataService = class {
   async deleteMetadata(bareRepoPath, worktreeName) {
     const metadataPath = await this.getMetadataPath(bareRepoPath, worktreeName);
     try {
-      await fs4.unlink(metadataPath);
+      await fs7.unlink(metadataPath);
     } catch (error) {
       if (error.code !== "ENOENT") {
         throw error;
@@ -3607,7 +4134,7 @@ var WorktreeMetadataService = class {
   async deleteMetadataFromPath(bareRepoPath, worktreePath) {
     const metadataPath = await this.getMetadataPathFromWorktreePath(bareRepoPath, worktreePath);
     try {
-      await fs4.unlink(metadataPath);
+      await fs7.unlink(metadataPath);
     } catch (error) {
       if (error.code !== "ENOENT") {
         throw error;
@@ -3641,7 +4168,7 @@ var WorktreeMetadataService = class {
       this.logger.warn(`No metadata found for worktree ${worktreeDirName}`);
       this.logger.info(`  Attempting to create initial metadata...`);
       try {
-        const worktreeGit = simpleGit3(worktreePath);
+        const worktreeGit = simpleGit4(worktreePath);
         const currentCommit = await worktreeGit.revparse(["HEAD"]);
         const branchSummary = await worktreeGit.branch();
         const actualBranchName = branchSummary.current;
@@ -3688,6 +4215,25 @@ var WorktreeMetadataService = class {
     }
     await this.saveMetadata(bareRepoPath, worktreeDirName, existing);
   }
+  /**
+   * Records the upstream tip observed during this sync. This is what later
+   * proves "HEAD was fully pushed" after the remote branch is deleted, so it
+   * must only ever be overwritten with a live observation — callers must not
+   * invoke this once the upstream ref is gone.
+   */
+  async recordRemoteTip(bareRepoPath, worktreePath, ref, oid) {
+    const worktreeDirName = this.getWorktreeDirectoryName(worktreePath);
+    const existing = await this.loadMetadataFromPath(bareRepoPath, worktreePath);
+    if (!existing) {
+      this.logger.debug(`No metadata found for worktree ${worktreeDirName}; skipping remote tip recording`);
+      return;
+    }
+    if (existing.lastKnownRemoteTip?.ref === ref && existing.lastKnownRemoteTip.oid === oid) {
+      return;
+    }
+    existing.lastKnownRemoteTip = { ref, oid, recordedAt: (/* @__PURE__ */ new Date()).toISOString() };
+    await this.saveMetadata(bareRepoPath, worktreeDirName, existing);
+  }
   async createInitialMetadata(bareRepoPath, worktreeName, commit, upstreamBranch, parentBranch, parentCommit) {
     const metadata = {
       lastSyncCommit: commit,
@@ -3742,9 +4288,9 @@ var WorktreeMetadataService = class {
 };
 
 // src/services/worktree-status.service.ts
-import * as fs5 from "fs/promises";
-import * as path7 from "path";
-import simpleGit4 from "simple-git";
+import * as fs8 from "fs/promises";
+import * as path10 from "path";
+import simpleGit5 from "simple-git";
 var OPERATION_FILES = [
   { file: GIT_OPERATIONS.MERGE_HEAD, type: "merge" },
   { file: GIT_OPERATIONS.CHERRY_PICK_HEAD, type: "cherry-pick" },
@@ -3758,6 +4304,7 @@ var WorktreeStatusService = class {
     this.config = config;
     this.logger = logger ?? Logger.createDefault();
   }
+  config;
   gitInstances = /* @__PURE__ */ new Map();
   logger;
   async checkWorktreeStatus(worktreePath) {
@@ -3774,8 +4321,9 @@ var WorktreeStatusService = class {
     }
     return true;
   }
-  async getFullWorktreeStatus(worktreePath, includeDetails = false, lastSyncCommit) {
-    if (!await fileExists(worktreePath)) {
+  async getFullWorktreeStatus(worktreePath, includeDetails = false, lastSyncCommit, lastKnownRemoteTip) {
+    const pathProbe = await probePathExists(worktreePath);
+    if (pathProbe === "missing") {
       return {
         isClean: true,
         hasUnpushedCommits: false,
@@ -3783,25 +4331,44 @@ var WorktreeStatusService = class {
         hasOperationInProgress: false,
         hasModifiedSubmodules: false,
         upstreamGone: false,
+        fullyPushedUpstreamDeleted: false,
         canRemove: true,
         reasons: []
       };
     }
-    const snap = await this.collectSnapshot(worktreePath, lastSyncCommit);
+    if (pathProbe === "unknown") {
+      return {
+        isClean: false,
+        hasUnpushedCommits: true,
+        hasStashedChanges: true,
+        hasOperationInProgress: true,
+        hasModifiedSubmodules: true,
+        upstreamGone: false,
+        fullyPushedUpstreamDeleted: false,
+        canRemove: false,
+        reasons: ["cannot verify worktree path (filesystem probe failed)"]
+      };
+    }
+    const snap = await this.collectSnapshot(worktreePath, lastSyncCommit, lastKnownRemoteTip);
     const isClean = this.deriveIsClean(snap);
-    const hasUnpushedCommits = !snap.detached && (snap.unpushedCount ?? 1) > 0;
+    const anyRemoteUnpushed = (snap.unpushedAnyRemoteCount ?? 1) > 0;
+    const sinceSyncUnpushed = snap.sinceSyncChecked && (snap.sinceSyncCount ?? 1) > 0;
+    const hasUnpushedCommits = !snap.detached && (anyRemoteUnpushed || sinceSyncUnpushed);
+    const recordedRefGone = lastKnownRemoteTip !== void 0 && snap.remoteBranches.length > 0 && !snap.remoteBranches.includes(lastKnownRemoteTip.ref);
+    const fullyPushedUpstreamDeleted = hasUnpushedCommits && recordedRefGone && snap.headPushedToRecordedTip === true;
     const hasStashedChanges = snap.stashTotal === null ? true : snap.stashTotal > 0;
-    const hasOperationInProgress = snap.gitDir === null ? true : snap.operationFile !== null;
+    const hasOperationInProgress = snap.gitDir === null ? true : snap.operationFile !== null || snap.operationProbeUnknown;
     const hasModifiedSubmodules = this.deriveModifiedSubmodules(snap).length > 0 || snap.submoduleStatus === null;
     const upstreamGone = !snap.detached && snap.upstream !== null && snap.remoteBranches.length > 0 ? !snap.remoteBranches.includes(snap.upstream) : false;
     const reasons = [];
     if (!isClean) reasons.push("uncommitted changes");
-    if (hasUnpushedCommits) reasons.push("unpushed commits");
+    if (hasUnpushedCommits && !fullyPushedUpstreamDeleted) reasons.push("unpushed commits");
     if (hasStashedChanges) reasons.push("stashed changes");
     if (hasOperationInProgress) reasons.push("operation in progress");
     if (hasModifiedSubmodules) reasons.push("modified submodules");
     if (upstreamGone) reasons.push("upstream gone");
-    const canRemove = isClean && !hasUnpushedCommits && !hasStashedChanges && !hasOperationInProgress && !hasModifiedSubmodules;
+    if (snap.detached) reasons.push("detached HEAD");
+    const canRemove = isClean && (!hasUnpushedCommits || fullyPushedUpstreamDeleted) && !hasStashedChanges && !hasOperationInProgress && !hasModifiedSubmodules && !snap.detached;
     const details = includeDetails ? this.buildStatusDetails(snap) : void 0;
     return {
       isClean,
@@ -3810,12 +4377,13 @@ var WorktreeStatusService = class {
       hasOperationInProgress,
       hasModifiedSubmodules,
       upstreamGone,
+      fullyPushedUpstreamDeleted,
       canRemove,
       reasons,
       details
     };
   }
-  async collectSnapshot(worktreePath, lastSyncCommit) {
+  async collectSnapshot(worktreePath, lastSyncCommit, lastKnownRemoteTip) {
     const git = this.createGitInstance(worktreePath);
     const [status, branchResult, remoteBranchesResult, stashResult, submoduleResult, gitDirResult] = await Promise.all([
       git.status().catch((e) => {
@@ -3840,19 +4408,33 @@ var WorktreeStatusService = class {
     const currentBranch = branchResult?.current ?? null;
     const detached = !branchResult?.current || Boolean(branchResult?.detached);
     let upstream = null;
-    let unpushedCount = null;
+    let unpushedAnyRemoteCount = null;
+    let sinceSyncCount = null;
+    let headPushedToRecordedTip = null;
     if (!detached && currentBranch) {
-      const revListArgs = lastSyncCommit ? ["rev-list", "--count", `${lastSyncCommit}..HEAD`] : ["rev-list", "--count", currentBranch, "--not", "--remotes"];
-      const [upstreamResult, unpushedResult] = await Promise.all([
+      const [upstreamResult, anyRemoteResult, sinceSyncResult, recordedTipResult] = await Promise.all([
         git.raw(["rev-parse", "--abbrev-ref", `${currentBranch}@{upstream}`]).then(
           (raw) => ({ ok: true, value: raw }),
           (error) => ({ ok: false, error })
         ),
-        git.raw(revListArgs).then(
+        git.raw(["rev-list", "--count", currentBranch, "--not", "--remotes"]).then(
           (raw) => ({ ok: true, value: raw }),
           (error) => ({ ok: false, error })
-        )
+        ),
+        lastSyncCommit ? git.raw(["rev-list", "--count", `${lastSyncCommit}..HEAD`]).then(
+          (raw) => ({ ok: true, value: raw }),
+          (error) => ({ ok: false, error })
+        ) : Promise.resolve(null),
+        // Zero commits in <tip>..HEAD ⟺ HEAD is the recorded tip or behind it.
+        // NOT merge-base --is-ancestor: simple-git resolves its silent exit-1
+        // ("not an ancestor") as success because nothing is written to stderr.
+        // Any failure (e.g. the recorded oid was gc'd) reads as "not proven".
+        lastKnownRemoteTip ? git.raw(["rev-list", "--count", `${lastKnownRemoteTip.oid}..HEAD`]).then(
+          (raw) => this.parseCount(raw) === 0,
+          () => false
+        ) : Promise.resolve(null)
       ]);
+      headPushedToRecordedTip = recordedTipResult;
       if (upstreamResult.ok) {
         upstream = upstreamResult.value.trim() || null;
       } else {
@@ -3861,13 +4443,20 @@ var WorktreeStatusService = class {
           this.logger.error(`Unexpected error checking upstream status for ${worktreePath}: ${errorMessage}`);
         }
       }
-      if (unpushedResult.ok) {
-        unpushedCount = parseInt(unpushedResult.value.trim(), 10);
+      if (anyRemoteResult.ok) {
+        unpushedAnyRemoteCount = this.parseCount(anyRemoteResult.value);
       } else {
-        this.logger.error(`Error checking unpushed commits`, unpushedResult.error);
+        this.logger.error(`Error checking unpushed commits`, anyRemoteResult.error);
+      }
+      if (sinceSyncResult) {
+        if (sinceSyncResult.ok) {
+          sinceSyncCount = this.parseCount(sinceSyncResult.value);
+        } else {
+          this.logger.error(`Error checking commits since last sync`, sinceSyncResult.error);
+        }
       }
     }
-    const operationFile = gitDirResult ? await this.detectOperationFile(gitDirResult) : null;
+    const operationProbe = gitDirResult ? await this.detectOperationFile(gitDirResult) : { file: null, unknown: false };
     let untrackedNotIgnored = [];
     if (status && status.not_added.length > 0) {
       try {
@@ -3883,14 +4472,22 @@ var WorktreeStatusService = class {
       detached,
       remoteBranches: remoteBranchesResult?.all ?? [],
       upstream,
-      unpushedCount,
+      unpushedAnyRemoteCount,
+      sinceSyncCount,
+      sinceSyncChecked: lastSyncCommit !== void 0,
+      headPushedToRecordedTip,
       stashTotal: stashResult?.total ?? null,
       submoduleStatus: submoduleResult,
-      operationFile,
+      operationFile: operationProbe.file,
+      operationProbeUnknown: operationProbe.unknown,
       gitDir: gitDirResult,
       untrackedNotIgnored
     };
   }
+  parseCount(raw) {
+    const count = parseInt(raw.trim(), 10);
+    return Number.isNaN(count) ? null : count;
+  }
   deriveIsClean(snap) {
     const status = snap.status;
     if (!status) return false;
@@ -3930,7 +4527,8 @@ var WorktreeStatusService = class {
       if (status.conflicted.length > 0) details.conflictedFilesList = status.conflicted;
     }
     if (snap.untrackedNotIgnored.length > 0) details.untrackedFilesList = snap.untrackedNotIgnored;
-    if (!snap.detached && snap.unpushedCount !== null) details.unpushedCommitCount = snap.unpushedCount;
+    const unpushedCount = snap.unpushedAnyRemoteCount ?? snap.sinceSyncCount;
+    if (!snap.detached && unpushedCount !== null) details.unpushedCommitCount = unpushedCount;
     if (snap.stashTotal !== null) details.stashCount = snap.stashTotal;
     const opType = this.operationTypeFromFile(snap.operationFile);
     if (opType) details.operationType = opType;
@@ -3945,34 +4543,37 @@ var WorktreeStatusService = class {
   async detectOperationFile(gitDir) {
     const results = await Promise.all(
       OPERATION_FILES.map(
-        ({ file }) => fs5.access(path7.join(gitDir, file)).then(
-          () => true,
-          () => false
+        ({ file }) => fs8.access(path10.join(gitDir, file)).then(
+          () => "present",
+          (error) => error.code === "ENOENT" ? "absent" : "unknown"
         )
       )
     );
-    const idx = results.findIndex(Boolean);
-    return idx >= 0 ? OPERATION_FILES[idx].file : null;
+    const idx = results.findIndex((result) => result === "present");
+    if (idx >= 0) return { file: OPERATION_FILES[idx].file, unknown: false };
+    return { file: null, unknown: results.includes("unknown") };
   }
   async hasUnpushedCommits(worktreePath, lastSyncCommit) {
     const worktreeGit = this.createGitInstance(worktreePath);
     try {
       if (await this.isDetachedHead(worktreeGit)) {
-        return false;
+        return true;
       }
       const branchSummary = await worktreeGit.branch();
       const currentBranch = branchSummary.current;
+      const anyRemoteResult = await worktreeGit.raw(["rev-list", "--count", currentBranch, "--not", "--remotes"]);
+      const anyRemoteCount = this.parseCount(anyRemoteResult);
+      if (anyRemoteCount === null || anyRemoteCount > 0) {
+        return true;
+      }
       if (lastSyncCommit) {
-        try {
-          const newCommitsResult = await worktreeGit.raw(["rev-list", "--count", `${lastSyncCommit}..HEAD`]);
-          const newCommitsCount = parseInt(newCommitsResult.trim(), 10);
-          return newCommitsCount > 0;
-        } catch {
+        const sinceSyncResult = await worktreeGit.raw(["rev-list", "--count", `${lastSyncCommit}..HEAD`]);
+        const sinceSyncCount = this.parseCount(sinceSyncResult);
+        if (sinceSyncCount === null || sinceSyncCount > 0) {
+          return true;
         }
       }
-      const result = await worktreeGit.raw(["rev-list", "--count", currentBranch, "--not", "--remotes"]);
-      const unpushedCount = parseInt(result.trim(), 10);
-      return unpushedCount > 0;
+      return false;
     } catch (error) {
       this.logger.error(`Error checking unpushed commits`, error);
       return true;
@@ -4028,14 +4629,15 @@ var WorktreeStatusService = class {
   async hasOperationInProgress(worktreePath) {
     try {
       const gitDir = await this.resolveGitDir(worktreePath);
-      return await this.detectOperationFile(gitDir) !== null;
+      const probe = await this.detectOperationFile(gitDir);
+      return probe.unknown || probe.file !== null;
     } catch (error) {
       this.logger.error(`Error checking operation in progress for ${worktreePath}`, error);
       return true;
     }
   }
-  async validateWorktreeForRemoval(worktreePath, lastSyncCommit) {
-    const status = await this.getFullWorktreeStatus(worktreePath, false, lastSyncCommit);
+  async validateWorktreeForRemoval(worktreePath, lastSyncCommit, lastKnownRemoteTip) {
+    const status = await this.getFullWorktreeStatus(worktreePath, false, lastSyncCommit, lastKnownRemoteTip);
     if (!status.canRemove) {
       throw new WorktreeNotCleanError(worktreePath, status.reasons);
     }
@@ -4066,14 +4668,14 @@ var WorktreeStatusService = class {
     }
   }
   async resolveGitDir(worktreePath) {
-    const gitPath = path7.join(worktreePath, PATH_CONSTANTS.GIT_DIR);
+    const gitPath = path10.join(worktreePath, PATH_CONSTANTS.GIT_DIR);
     try {
-      const stat3 = await fs5.stat(gitPath);
+      const stat3 = await fs8.stat(gitPath);
       if (stat3.isFile()) {
-        const content = await fs5.readFile(gitPath, "utf-8");
+        const content = await fs8.readFile(gitPath, "utf-8");
         const gitdirMatch = content.match(new RegExp(`^${GIT_CONSTANTS.GITDIR_PREFIX}\\s*(.+)$`, "m"));
         if (gitdirMatch) {
-          return path7.resolve(worktreePath, gitdirMatch[1].trim());
+          return path10.resolve(worktreePath, gitdirMatch[1].trim());
         }
         throw new GitOperationError("resolve-git-dir", `Failed to parse gitdir from .git file at ${gitPath}`);
       }
@@ -4087,10 +4689,10 @@ var WorktreeStatusService = class {
     }
   }
   createGitInstance(worktreePath) {
-    const key = `${path7.resolve(worktreePath)}::${this.config.skipLfs ? "1" : "0"}`;
+    const key = `${path10.resolve(worktreePath)}::${this.config.skipLfs ? "1" : "0"}`;
     let git = this.gitInstances.get(key);
     if (!git) {
-      git = this.config.skipLfs ? simpleGit4(worktreePath).env({ [ENV_CONSTANTS.GIT_LFS_SKIP_SMUDGE]: "1" }) : simpleGit4(worktreePath);
+      git = this.config.skipLfs ? simpleGit5(worktreePath).env({ [ENV_CONSTANTS.GIT_LFS_SKIP_SMUDGE]: "1" }) : simpleGit5(worktreePath);
       this.gitInstances.set(key, git);
     }
     return git;
@@ -4111,11 +4713,13 @@ var GitService = class {
     this.progressEmitter = progressEmitter;
     this.logger = logger ?? Logger.createDefault(void 0, config.debug);
     this.bareRepoPath = this.config.bareRepoDir || getDefaultBareRepoDir(this.config.repoUrl);
-    this.mainWorktreePath = path8.join(this.config.worktreeDir, GIT_CONSTANTS.DEFAULT_BRANCH);
+    this.mainWorktreePath = path11.join(this.config.worktreeDir, GIT_CONSTANTS.DEFAULT_BRANCH);
     this.metadataService = new WorktreeMetadataService(this.logger);
     this.statusService = new WorktreeStatusService({ skipLfs: this.config.skipLfs }, this.logger);
     this.sparseCheckoutService = new SparseCheckoutService(this.logger);
   }
+  config;
+  progressEmitter;
   git = null;
   bareRepoPath;
   mainWorktreePath;
@@ -4139,10 +4743,10 @@ var GitService = class {
     return this.config.cloneTimeoutMs ?? DEFAULT_CONFIG.CLONE_TIMEOUT_MS;
   }
   getCachedGit(dirPath, useLfsSkip = false) {
-    const key = `${path8.resolve(dirPath)}::${useLfsSkip ? "1" : "0"}`;
+    const key = `${path11.resolve(dirPath)}::${useLfsSkip ? "1" : "0"}`;
     let git = this.gitInstances.get(key);
     if (!git) {
-      const base = simpleGit5(dirPath, this.buildSimpleGitOptions(this.getFetchTimeoutMs()));
+      const base = simpleGit6(dirPath, this.buildSimpleGitOptions(this.getFetchTimeoutMs()));
       git = useLfsSkip ? base.env({ [ENV_CONSTANTS.GIT_LFS_SKIP_SMUDGE]: "1" }) : base;
       this.gitInstances.set(key, git);
     }
@@ -4162,11 +4766,11 @@ var GitService = class {
   async initialize() {
     const { repoUrl } = this.config;
     try {
-      await fs6.access(path8.join(this.bareRepoPath, "HEAD"));
+      await fs9.access(path11.join(this.bareRepoPath, "HEAD"));
     } catch {
       this.logger.info(`Cloning from "${repoUrl}" as bare repository into "${this.bareRepoPath}"...`);
-      await fs6.mkdir(path8.dirname(this.bareRepoPath), { recursive: true });
-      const cloneBase = simpleGit5(this.buildSimpleGitOptions(this.getCloneTimeoutMs()));
+      await fs9.mkdir(path11.dirname(this.bareRepoPath), { recursive: true });
+      const cloneBase = simpleGit6(this.buildSimpleGitOptions(this.getCloneTimeoutMs()));
       const cloneGit = this.isLfsSkipEnabled() ? cloneBase.env({ [ENV_CONSTANTS.GIT_LFS_SKIP_SMUDGE]: "1" }) : cloneBase;
       await cloneGit.clone(repoUrl, this.bareRepoPath, ["--bare", "--progress"]);
       this.logger.info("\u2705 Clone successful.");
@@ -4184,17 +4788,17 @@ var GitService = class {
     this.logger.info("Fetching remote branches...");
     await bareGit.fetch(["--all", "--progress"]);
     this.defaultBranch = await this.detectDefaultBranch(bareGit);
-    this.mainWorktreePath = path8.join(this.config.worktreeDir, this.defaultBranch);
+    this.mainWorktreePath = path11.join(this.config.worktreeDir, this.defaultBranch);
     let needsMainWorktree = true;
     try {
       const worktrees = await this.getWorktreesFromBare(bareGit);
-      needsMainWorktree = !worktrees.some((w) => path8.resolve(w.path) === path8.resolve(this.mainWorktreePath));
+      needsMainWorktree = !worktrees.some((w) => path11.resolve(w.path) === path11.resolve(this.mainWorktreePath));
     } catch {
     }
     if (needsMainWorktree) {
       this.logger.info(`Creating ${this.defaultBranch} worktree at "${this.mainWorktreePath}"...`);
-      await fs6.mkdir(this.config.worktreeDir, { recursive: true });
-      const absoluteWorktreePath = path8.resolve(this.mainWorktreePath);
+      await fs9.mkdir(this.config.worktreeDir, { recursive: true });
+      const absoluteWorktreePath = path11.resolve(this.mainWorktreePath);
       const branches = await bareGit.branch();
       const defaultBranchExists = branches.all.includes(this.defaultBranch);
       const useNoCheckoutMain = !!this.config.sparseCheckout;
@@ -4230,7 +4834,7 @@ var GitService = class {
       }
       const updatedWorktrees = await this.getWorktreesFromBare(bareGit);
       const mainWorktreeRegistered = updatedWorktrees.some(
-        (w) => path8.resolve(w.path) === path8.resolve(this.mainWorktreePath)
+        (w) => path11.resolve(w.path) === path11.resolve(this.mainWorktreePath)
       );
       if (!mainWorktreeRegistered) {
         if (process.env.NODE_ENV !== ENV_CONSTANTS.NODE_ENV_TEST) {
@@ -4257,7 +4861,7 @@ var GitService = class {
     return this.bareRepoPath;
   }
   async getRemoteDefaultBranch(repoUrl) {
-    const git = simpleGit5(this.buildSimpleGitOptions(this.getFetchTimeoutMs()));
+    const git = simpleGit6(this.buildSimpleGitOptions(this.getFetchTimeoutMs()));
     try {
       const out = await git.raw(["ls-remote", "--symref", repoUrl, "HEAD"]);
       const match = out.match(/^ref: refs\/heads\/(\S+)\s+HEAD/m);
@@ -4341,7 +4945,7 @@ var GitService = class {
     return branches;
   }
   async verifyLfsFilesDownloaded(worktreePath, branchName) {
-    const worktreeGit = this.config.sparseCheckout ? simpleGit5(worktreePath).env({ ...sanitizeGitEnv(process.env), [ENV_CONSTANTS.GIT_ATTR_SOURCE]: "HEAD" }) : this.getCachedGit(worktreePath);
+    const worktreeGit = this.config.sparseCheckout ? simpleGit6(worktreePath).env({ ...sanitizeGitEnv(process.env), [ENV_CONSTANTS.GIT_ATTR_SOURCE]: "HEAD" }) : this.getCachedGit(worktreePath);
     try {
       const lfsFiles = await worktreeGit.raw(["lfs", "ls-files", "--name-only"]);
       let lfsFileList = lfsFiles.trim().split("\n").filter((f) => f.length > 0);
@@ -4352,7 +4956,7 @@ var GitService = class {
         const existence = await Promise.all(
           lfsFileList.map(async (f) => {
             try {
-              await fs6.access(path8.join(worktreePath, f));
+              await fs9.access(path11.join(worktreePath, f));
               return f;
             } catch {
               return null;
@@ -4380,9 +4984,9 @@ var GitService = class {
         let allDownloaded = true;
         const notDownloaded = [];
         for (const file of samplesToCheck) {
-          const filePath = path8.join(worktreePath, file);
+          const filePath = path11.join(worktreePath, file);
           try {
-            const handle = await fs6.open(filePath, "r");
+            const handle = await fs9.open(filePath, "r");
             try {
               const buffer = Buffer.alloc(200);
               const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0);
@@ -4407,7 +5011,7 @@ var GitService = class {
         }
         retries++;
         if (retries < maxRetries) {
-          await new Promise((resolve12) => setTimeout(resolve12, retryDelay));
+          await new Promise((resolve14) => setTimeout(resolve14, retryDelay));
         }
       }
       this.logger.warn(
@@ -4469,20 +5073,23 @@ var GitService = class {
   }
   async addWorktree(branchName, worktreePath) {
     const bareGit = this.getCachedGit(this.bareRepoPath, this.isLfsSkipEnabled());
-    const absoluteWorktreePath = path8.resolve(worktreePath);
-    await fs6.mkdir(path8.dirname(absoluteWorktreePath), { recursive: true });
+    const absoluteWorktreePath = path11.resolve(worktreePath);
+    await fs9.mkdir(path11.dirname(absoluteWorktreePath), { recursive: true });
     try {
-      await fs6.access(absoluteWorktreePath);
+      await fs9.access(absoluteWorktreePath);
       const worktrees = await this.getWorktreesFromBare(bareGit);
-      const isValidWorktree = worktrees.some((w) => path8.resolve(w.path) === absoluteWorktreePath);
+      const isValidWorktree = worktrees.some((w) => path11.resolve(w.path) === absoluteWorktreePath);
       if (isValidWorktree) {
         this.logger.info(`  - Worktree for '${branchName}' already exists at '${absoluteWorktreePath}'`);
         return;
       } else {
         this.logger.info(`  - Cleaning up orphaned directory at '${absoluteWorktreePath}'`);
-        await fs6.rm(absoluteWorktreePath, { recursive: true, force: true });
+        await this.clearStaleWorktreeDirectory(absoluteWorktreePath);
+      }
+    } catch (error) {
+      if (error instanceof GitOperationError || error instanceof WorktreeError) {
+        throw error;
       }
-    } catch {
     }
     let createdNewBranch = false;
     try {
@@ -4519,17 +5126,14 @@ var GitService = class {
       }
       if (errorMessage.includes("already registered worktree")) {
         const worktrees = await this.getWorktreesFromBare(bareGit);
-        const existingWorktree = worktrees.find((w) => path8.resolve(w.path) === absoluteWorktreePath);
+        const existingWorktree = worktrees.find((w) => path11.resolve(w.path) === absoluteWorktreePath);
         if (existingWorktree && !existingWorktree.isPrunable) {
           this.logger.info(`  - Worktree for '${branchName}' was created by concurrent operation`);
           return;
         }
         this.logger.warn(`  - Worktree already registered but missing. Pruning and retrying...`);
         await bareGit.raw(["worktree", "prune"]);
-        try {
-          await fs6.rm(absoluteWorktreePath, { recursive: true, force: true });
-        } catch {
-        }
+        await this.clearStaleWorktreeDirectory(absoluteWorktreePath);
         let retryCreatedNewBranch = false;
         try {
           const { local: localBranchExists, remote: remoteBranchExists } = await this.branchExists(branchName);
@@ -4563,17 +5167,20 @@ var GitService = class {
       }
       this.logger.warn(`  - Failed to create worktree with tracking, falling back to simple add: ${error}`);
       try {
-        await fs6.access(absoluteWorktreePath);
+        await fs9.access(absoluteWorktreePath);
         const worktrees = await this.getWorktreesFromBare(bareGit);
-        const isValidWorktree = worktrees.some((w) => path8.resolve(w.path) === absoluteWorktreePath);
+        const isValidWorktree = worktrees.some((w) => path11.resolve(w.path) === absoluteWorktreePath);
         if (isValidWorktree) {
           this.logger.info(`  - Worktree for '${branchName}' already exists at '${absoluteWorktreePath}'`);
           return;
         } else {
           this.logger.info(`  - Cleaning up orphaned directory at '${absoluteWorktreePath}' before fallback attempt`);
-          await fs6.rm(absoluteWorktreePath, { recursive: true, force: true });
+          await this.clearStaleWorktreeDirectory(absoluteWorktreePath);
+        }
+      } catch (error2) {
+        if (error2 instanceof GitOperationError || error2 instanceof WorktreeError) {
+          throw error2;
         }
-      } catch {
       }
       try {
         const useNoCheckout = !!this.config.sparseCheckout;
@@ -4595,7 +5202,7 @@ var GitService = class {
         const fallbackErrorMessage = getErrorMessage(fallbackError);
         if (fallbackErrorMessage.includes("already registered worktree")) {
           const worktrees = await this.getWorktreesFromBare(bareGit);
-          const existingWorktree = worktrees.find((w) => path8.resolve(w.path) === absoluteWorktreePath);
+          const existingWorktree = worktrees.find((w) => path11.resolve(w.path) === absoluteWorktreePath);
           if (existingWorktree && !existingWorktree.isPrunable) {
             this.logger.info(`  - Worktree for '${branchName}' was created by concurrent operation during fallback`);
             return;
@@ -4664,9 +5271,19 @@ var GitService = class {
     wrapped.isUpstreamSetupFailure = true;
     return wrapped;
   }
-  async removeWorktree(worktreePath) {
+  async removeWorktree(worktreePath, options) {
     const bareGit = this.getCachedGit(this.bareRepoPath);
-    await bareGit.raw(["worktree", "remove", worktreePath, "--force"]);
+    const args = ["worktree", "remove", worktreePath];
+    if (options?.force) args.push("--force");
+    try {
+      await bareGit.raw(args);
+    } catch (error) {
+      const message = getErrorMessage(error);
+      if (!options?.force && /contains modified or untracked files|use --force/i.test(message)) {
+        throw new WorktreeNotCleanError(worktreePath, [`git refused removal: ${message}`]);
+      }
+      throw error;
+    }
     this.logger.info(`  - \u2705 Safely removed stale worktree at '${worktreePath}'.`);
     try {
       await this.metadataService.deleteMetadataFromPath(this.bareRepoPath, worktreePath);
@@ -4679,6 +5296,111 @@ var GitService = class {
     await bareGit.raw(["worktree", "prune"]);
     this.logger.info("Pruned worktree metadata.");
   }
+  async updateRef(refName, sha) {
+    const bareGit = this.getCachedGit(this.bareRepoPath);
+    await bareGit.raw(["update-ref", refName, sha]);
+  }
+  async deleteRef(refName) {
+    const bareGit = this.getCachedGit(this.bareRepoPath);
+    await bareGit.raw(["update-ref", "-d", refName]);
+  }
+  async listRefs(prefix) {
+    const bareGit = this.getCachedGit(this.bareRepoPath);
+    const raw = await bareGit.raw(["for-each-ref", "--format=%(refname)", prefix]);
+    return raw.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
+  }
+  async localBranchExists(branchName) {
+    const bareGit = this.getCachedGit(this.bareRepoPath);
+    try {
+      await bareGit.raw(["show-ref", "--verify", "--quiet", `${GIT_CONSTANTS.REFS.HEADS}${branchName}`]);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  async getLocalBranchCommit(branchName) {
+    const bareGit = this.getCachedGit(this.bareRepoPath);
+    try {
+      return (await bareGit.raw(["rev-parse", `${GIT_CONSTANTS.REFS.HEADS}${branchName}^{commit}`])).trim();
+    } catch {
+      return null;
+    }
+  }
+  async createBranchAt(branchName, sha) {
+    const bareGit = this.getCachedGit(this.bareRepoPath);
+    await bareGit.raw(["branch", branchName, sha]);
+  }
+  async deleteLocalBranch(branchName) {
+    const bareGit = this.getCachedGit(this.bareRepoPath);
+    await bareGit.raw(["branch", "-D", branchName]);
+  }
+  // Bundles only commits not reachable from any remote — for fully-pushed
+  // refs that set is empty and `bundle create` would fail. Emptiness is
+  // pre-checked with rev-list (locale-independent) instead of parsing git's
+  // localized "empty bundle" stderr; after the pre-check, any bundle-create
+  // error is a real failure the caller must treat as fail-closed.
+  async createBundleFromRef(bundlePath, refName) {
+    const bareGit = this.getCachedGit(this.bareRepoPath);
+    const count = (await bareGit.raw(["rev-list", "--count", refName, "--not", "--remotes"])).trim();
+    if (count === "0") {
+      return false;
+    }
+    await bareGit.raw(["bundle", "create", bundlePath, refName, "--not", "--remotes"]);
+    return true;
+  }
+  // Registers the worktree and writes its .git link without populating files —
+  // restore overlays the preserved payload instead of a fresh checkout.
+  async addWorktreeNoCheckout(branchName, worktreePath) {
+    const bareGit = this.getCachedGit(this.bareRepoPath);
+    const absoluteWorktreePath = path11.resolve(worktreePath);
+    await fs9.mkdir(path11.dirname(absoluteWorktreePath), { recursive: true });
+    await bareGit.raw(["worktree", "add", "--no-checkout", absoluteWorktreePath, branchName]);
+  }
+  // Mixed reset: points the index at HEAD without touching working files, so
+  // overlaid payload content shows up as ordinary uncommitted changes.
+  async resetWorktreeIndex(worktreePath) {
+    const worktreeGit = this.getCachedGit(worktreePath);
+    await worktreeGit.raw(["reset"]);
+  }
+  // Injected by WorktreeSyncService when trash is enabled, so stale-directory
+  // cleanup follows the same reversible-removal pipeline as everything else.
+  // GitService cannot own a TrashService directly (TrashService depends on it).
+  staleDirectoryTrasher = null;
+  setStaleDirectoryTrasher(trasher) {
+    this.staleDirectoryTrasher = trasher;
+  }
+  // A stale directory that contains a .git may be a live checkout that git
+  // failed to report; quarantine it instead of deleting.
+  async clearStaleWorktreeDirectory(absoluteWorktreePath) {
+    const gitProbe = await probePathExists(path11.join(absoluteWorktreePath, PATH_CONSTANTS.GIT_DIR));
+    if (gitProbe === "unknown") {
+      throw new GitOperationError(
+        "clear-stale-directory",
+        `Cannot verify whether '${absoluteWorktreePath}' is a live checkout; refusing to clear it`
+      );
+    }
+    if (this.staleDirectoryTrasher) {
+      try {
+        const trashPath = await this.staleDirectoryTrasher(absoluteWorktreePath);
+        this.logger.info(`  - Moved stale directory at '${absoluteWorktreePath}' to trash ('${trashPath}')`);
+        return;
+      } catch (error) {
+        throw new GitOperationError(
+          "clear-stale-directory",
+          `Cannot move stale directory '${absoluteWorktreePath}' to trash: ${getErrorMessage(error)}`,
+          error instanceof Error ? error : void 0
+        );
+      }
+    }
+    if (gitProbe === "exists") {
+      const quarantinePath = await quarantineDirectory(absoluteWorktreePath);
+      this.logger.warn(
+        `  - \u26A0\uFE0F Directory at '${absoluteWorktreePath}' contains a .git; quarantined to '${quarantinePath}' instead of deleting.`
+      );
+      return;
+    }
+    await fs9.rm(absoluteWorktreePath, { recursive: true, force: true });
+  }
   async checkWorktreeStatus(worktreePath) {
     return this.statusService.checkWorktreeStatus(worktreePath);
   }
@@ -4694,7 +5416,37 @@ var GitService = class {
   }
   async getFullWorktreeStatus(worktreePath, includeDetails = false) {
     const metadata = await this.metadataService.loadMetadataFromPath(this.bareRepoPath, worktreePath);
-    return this.statusService.getFullWorktreeStatus(worktreePath, includeDetails, metadata?.lastSyncCommit);
+    return this.statusService.getFullWorktreeStatus(
+      worktreePath,
+      includeDetails,
+      metadata?.lastSyncCommit,
+      metadata?.lastKnownRemoteTip
+    );
+  }
+  /** Map of remote branch name (without "origin/") → tip oid, from the bare repo. */
+  async getRemoteBranchTips() {
+    const git = this.getGit();
+    const raw = await git.raw(["for-each-ref", "--format=%(refname:short) %(objectname)", GIT_CONSTANTS.REFS.REMOTES]);
+    const tips = /* @__PURE__ */ new Map();
+    for (const line of raw.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      const spaceIdx = trimmed.lastIndexOf(" ");
+      if (spaceIdx <= 0) continue;
+      const ref = trimmed.slice(0, spaceIdx);
+      const oid = trimmed.slice(spaceIdx + 1);
+      if (!ref.startsWith(GIT_CONSTANTS.REMOTE_PREFIX) || ref === `${GIT_CONSTANTS.REMOTE_PREFIX}HEAD`) continue;
+      tips.set(ref.slice(GIT_CONSTANTS.REMOTE_PREFIX.length), oid);
+    }
+    return tips;
+  }
+  async recordRemoteTip(worktreePath, branchName, oid) {
+    await this.metadataService.recordRemoteTip(
+      this.bareRepoPath,
+      worktreePath,
+      `${GIT_CONSTANTS.REMOTE_PREFIX}${branchName}`,
+      oid
+    );
   }
   async hasModifiedSubmodules(worktreePath) {
     return this.statusService.hasModifiedSubmodules(worktreePath);
@@ -4979,37 +5731,41 @@ var ProgressEmitter = class {
   }
 };
 
+// src/services/removal-audit.service.ts
+import * as fs10 from "fs/promises";
+import * as path12 from "path";
+var RemovalAuditService = class {
+  constructor(logFilePath) {
+    this.logFilePath = logFilePath;
+  }
+  logFilePath;
+  async record(entry) {
+    await fs10.mkdir(path12.dirname(this.logFilePath), { recursive: true });
+    const line = JSON.stringify({ timestamp: (/* @__PURE__ */ new Date()).toISOString(), ...entry });
+    const handle = await fs10.open(this.logFilePath, "a");
+    try {
+      await handle.appendFile(`${line}
+`, "utf-8");
+      await handle.sync();
+    } finally {
+      await handle.close();
+    }
+  }
+};
+
 // src/services/repo-operation-lock.ts
-import * as fs7 from "fs/promises";
-import * as path10 from "path";
+import * as fs11 from "fs/promises";
+import * as path13 from "path";
 import * as lockfile from "proper-lockfile";
-
-// src/utils/lock-path.ts
-import { createHash } from "crypto";
-import * as os from "os";
-import * as path9 from "path";
-function getCloneModeLockTarget(config) {
-  const name = config.name;
-  const configDir = config.__configFileDir;
-  const hash = createHash("sha256").update(path9.resolve(config.worktreeDir)).digest("hex").slice(0, 16);
-  if (configDir) {
-    return {
-      dir: path9.join(configDir, ".sync-worktrees-state"),
-      file: `${sanitizeNameForPath(name ?? "repo", "clone-mode lock name")}-${hash}.lock`
-    };
-  }
-  const stateBase = process.env.XDG_STATE_HOME && process.env.XDG_STATE_HOME.length > 0 ? process.env.XDG_STATE_HOME : path9.join(os.homedir(), ".cache");
-  const dir = path9.join(stateBase, "sync-worktrees", "locks");
-  return { dir, file: `${hash}.lock` };
-}
-
-// src/services/repo-operation-lock.ts
 var RepoOperationLock = class {
   constructor(config, gitService, logger = Logger.createDefault()) {
     this.config = config;
     this.gitService = gitService;
     this.logger = logger;
   }
+  config;
+  gitService;
+  logger;
   updateLogger(logger) {
     this.logger = logger;
   }
@@ -5025,10 +5781,10 @@ var RepoOperationLock = class {
   }
   async acquireCloneModeLock() {
     const target = getCloneModeLockTarget(this.config);
-    const lockTarget = path10.join(target.dir, target.file);
+    const lockTarget = path13.join(target.dir, target.file);
     try {
-      await fs7.mkdir(target.dir, { recursive: true });
-      await fs7.writeFile(lockTarget, "", { flag: "a" });
+      await fs11.mkdir(target.dir, { recursive: true });
+      await fs11.writeFile(lockTarget, "", { flag: "a" });
     } catch {
       return null;
     }
@@ -5037,7 +5793,7 @@ var RepoOperationLock = class {
   async acquireWorktreeModeLock() {
     const barePath = this.gitService.getBareRepoPath();
     try {
-      await fs7.mkdir(barePath, { recursive: true });
+      await fs11.mkdir(barePath, { recursive: true });
     } catch {
       return null;
     }
@@ -5071,6 +5827,9 @@ var SyncRetryPolicy = class {
     this.gitService = gitService;
     this.logger = logger;
   }
+  config;
+  gitService;
+  logger;
   updateLogger(logger) {
     this.logger = logger;
   }
@@ -5103,72 +5862,748 @@ var SyncRetryPolicy = class {
           syncContext.lfsSkipEnabled = true;
         }
       }
-    };
+    };
+  }
+  resetLfsSkipIfNeeded(syncContext) {
+    if (syncContext.lfsSkipEnabled && !this.config.skipLfs) {
+      this.gitService.setLfsSkipEnabled(false);
+    }
+  }
+};
+
+// src/services/trash-migration.service.ts
+import * as fs12 from "fs/promises";
+import * as path14 from "path";
+var REMOVED_ENTRY_RE = /^(\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}Z)-(.+)$/;
+var TrashMigrationService = class {
+  constructor(config, trashService, logger) {
+    this.config = config;
+    this.trashService = trashService;
+    this.logger = logger;
+  }
+  config;
+  trashService;
+  logger;
+  updateLogger(logger) {
+    this.logger = logger;
+  }
+  isEnabled() {
+    return this.trashService.isEnabled() && (this.config.trash?.migrateLegacy ?? DEFAULT_CONFIG.TRASH.MIGRATE_LEGACY);
+  }
+  async migrateLegacyUnlocked() {
+    if (!this.isEnabled()) return;
+    await this.migrateRemovedDir();
+    await this.migrateDivergedDir();
+  }
+  async migrateRemovedDir() {
+    const removedDir = path14.join(this.config.worktreeDir, GIT_CONSTANTS.REMOVED_DIR_NAME);
+    const names = await this.listDirectories(removedDir);
+    for (const name of names) {
+      const match = REMOVED_ENTRY_RE.exec(name);
+      const quarantinedAt = match ? this.parseQuarantineTimestamp(match[1]) : null;
+      if (!match || !quarantinedAt) {
+        this.logger.warn(`\u26A0\uFE0F Leaving unrecognized entry '${name}' in ${GIT_CONSTANTS.REMOVED_DIR_NAME}/ alone`);
+        continue;
+      }
+      try {
+        const entry = await this.trashService.trashDirectory({
+          dirPath: path14.join(removedDir, name),
+          reason: "legacy-adopt",
+          source: ".removed",
+          legacyOriginalName: name,
+          legacyQuarantinedAt: quarantinedAt,
+          headOid: null,
+          originalPath: path14.join(this.config.worktreeDir, match[2]),
+          auditAction: "trash_adopt"
+        });
+        this.logger.info(
+          `\u267B\uFE0F Adopted '${name}' from ${GIT_CONSTANTS.REMOVED_DIR_NAME}/ as trash entry '${entry.manifest.id}'`
+        );
+      } catch (error) {
+        this.logger.warn(`\u26A0\uFE0F Failed to adopt '${name}' into trash: ${getErrorMessage(error)}`);
+      }
+    }
+    await fs12.rmdir(removedDir).catch(() => void 0);
+  }
+  async migrateDivergedDir() {
+    const divergedDir = path14.join(this.config.worktreeDir, GIT_CONSTANTS.DIVERGED_DIR_NAME);
+    const names = await this.listDirectories(divergedDir);
+    for (const name of names) {
+      const dirPath = path14.join(divergedDir, name);
+      const info = await this.readDivergedInfo(dirPath);
+      const quarantinedAt = info?.divergedAt ? new Date(info.divergedAt) : null;
+      const hasOriginalPath = typeof info?.originalPath === "string" && info.originalPath.length > 0;
+      if (!info || !info.originalBranch || !hasOriginalPath || !quarantinedAt || Number.isNaN(quarantinedAt.getTime())) {
+        this.logger.warn(
+          `\u26A0\uFE0F Leaving entry '${name}' in ${GIT_CONSTANTS.DIVERGED_DIR_NAME}/ alone (no parseable ${METADATA_CONSTANTS.DIVERGED_INFO_FILE})`
+        );
+        continue;
+      }
+      try {
+        const entry = await this.trashService.trashDirectory({
+          dirPath,
+          reason: "legacy-adopt",
+          source: ".diverged",
+          branch: info.originalBranch,
+          legacyOriginalName: name,
+          legacyQuarantinedAt: quarantinedAt,
+          headOid: info.localCommit ?? null,
+          originalPath: info.originalPath,
+          auditAction: "trash_adopt",
+          keepPinOnReap: true
+        });
+        this.logger.info(
+          `\u267B\uFE0F Adopted '${name}' from ${GIT_CONSTANTS.DIVERGED_DIR_NAME}/ as trash entry '${entry.manifest.id}'`
+        );
+      } catch (error) {
+        this.logger.warn(`\u26A0\uFE0F Failed to adopt '${name}' into trash: ${getErrorMessage(error)}`);
+      }
+    }
+    await fs12.rmdir(divergedDir).catch(() => void 0);
+  }
+  async listDirectories(dirPath) {
+    try {
+      const dirents = await fs12.readdir(dirPath, { withFileTypes: true });
+      return dirents.filter((dirent) => dirent.isDirectory() && !dirent.isSymbolicLink()).map((dirent) => dirent.name);
+    } catch (error) {
+      if (error.code !== "ENOENT") {
+        this.logger.warn(`\u26A0\uFE0F Cannot scan '${dirPath}' for legacy trash adoption: ${getErrorMessage(error)}`);
+      }
+      return [];
+    }
+  }
+  async readDivergedInfo(dirPath) {
+    try {
+      const raw = await fs12.readFile(path14.join(dirPath, METADATA_CONSTANTS.DIVERGED_INFO_FILE), "utf-8");
+      return JSON.parse(raw);
+    } catch {
+      return null;
+    }
+  }
+  // quarantine timestamps replaced [:.] with "-": 2026-06-06T18-34-18-123Z
+  parseQuarantineTimestamp(raw) {
+    const match = /^(\d{4}-\d{2}-\d{2})T(\d{2})-(\d{2})-(\d{2})-(\d{3})Z$/.exec(raw);
+    if (!match) return null;
+    const date = /* @__PURE__ */ new Date(`${match[1]}T${match[2]}:${match[3]}:${match[4]}.${match[5]}Z`);
+    return Number.isNaN(date.getTime()) ? null : date;
+  }
+};
+
+// src/services/trash-reaper.service.ts
+import * as fs14 from "fs/promises";
+import * as path16 from "path";
+
+// src/utils/disk-space.ts
+import fastFolderSize from "fast-folder-size";
+async function calculateDirectorySize(dirPath) {
+  return new Promise((resolve14, reject) => {
+    fastFolderSize(dirPath, (err, bytes) => {
+      if (err) {
+        reject(err);
+        return;
+      }
+      if (bytes === void 0) {
+        reject(new Error(`fast-folder-size returned no bytes for ${dirPath}`));
+        return;
+      }
+      resolve14(bytes);
+    });
+  });
+}
+function formatBytes(bytes) {
+  if (bytes === 0) return "0 B";
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  const k = 1024;
+  const decimals = 2;
+  const i = Math.floor(Math.log(bytes) / Math.log(k));
+  const value = bytes / Math.pow(k, i);
+  return `${value.toFixed(decimals)} ${units[i]}`;
+}
+async function calculateSyncDiskSpace(repoPaths, worktreeDirs) {
+  try {
+    let totalBytes = 0;
+    for (const repoPath of repoPaths) {
+      try {
+        totalBytes += await calculateDirectorySize(repoPath);
+      } catch {
+      }
+    }
+    for (const worktreeDir of worktreeDirs) {
+      try {
+        totalBytes += await calculateDirectorySize(worktreeDir);
+      } catch {
+      }
+    }
+    return formatBytes(totalBytes);
+  } catch (error) {
+    console.error("Failed to calculate disk space:", error);
+    return "N/A";
+  }
+}
+
+// src/services/trash.service.ts
+import { randomBytes } from "crypto";
+import * as fs13 from "fs/promises";
+import * as path15 from "path";
+function isWorktreeRestorable(manifest) {
+  return manifest.branch !== null && manifest.headOid !== null && manifest.pinRef !== null;
+}
+function summarizeTrashEntries(entries) {
+  let totalSizeBytes = 0;
+  let unknownSizeCount = 0;
+  let soonest = null;
+  for (const { manifest } of entries) {
+    if (manifest.sizeBytes === null) {
+      unknownSizeCount++;
+    } else {
+      totalSizeBytes += manifest.sizeBytes;
+    }
+    if (soonest === null || manifest.expiresAt < soonest) {
+      soonest = manifest.expiresAt;
+    }
+  }
+  return { itemCount: entries.length, totalSizeBytes, unknownSizeCount, soonestExpiresAt: soonest };
+}
+var TrashService = class {
+  constructor(config, gitService, logger, removalAudit) {
+    this.config = config;
+    this.gitService = gitService;
+    this.logger = logger;
+    this.removalAudit = removalAudit;
+  }
+  config;
+  gitService;
+  logger;
+  removalAudit;
+  updateLogger(logger) {
+    this.logger = logger;
+  }
+  isEnabled() {
+    return this.config.trash?.enabled ?? DEFAULT_CONFIG.TRASH.ENABLED;
+  }
+  getTrashRoot() {
+    return path15.join(this.config.worktreeDir, GIT_CONSTANTS.TRASH_DIR_NAME);
+  }
+  getRetentionDays() {
+    return this.config.trash?.retentionDays ?? DEFAULT_CONFIG.TRASH.RETENTION_DAYS;
+  }
+  async trashDirectory(options) {
+    const deletedAt = /* @__PURE__ */ new Date();
+    const expiresAt = new Date(deletedAt.getTime() + this.getRetentionDays() * 864e5);
+    const keepPinOnReap = options.keepPinOnReap ?? false;
+    const headOid = options.headOid !== void 0 ? options.headOid : await this.resolveHeadOid(options);
+    if (keepPinOnReap && !headOid) {
+      throw new TrashOperationError(
+        "trash-directory",
+        `cannot create keep-on-reap trash entry for '${options.dirPath}': HEAD commit could not be resolved`
+      );
+    }
+    const sizeBytes = await calculateDirectorySize(options.dirPath).catch(() => null);
+    await fs13.mkdir(this.getTrashRoot(), { recursive: true });
+    const { id, containerPath } = await this.createContainer(deletedAt, path15.basename(options.dirPath));
+    const manifest = {
+      schemaVersion: TRASH_CONSTANTS.SCHEMA_VERSION,
+      id,
+      deletedAt: deletedAt.toISOString(),
+      expiresAt: expiresAt.toISOString(),
+      originalPath: path15.resolve(options.originalPath ?? options.dirPath),
+      branch: options.branch ?? null,
+      reason: options.reason,
+      sizeBytes,
+      headOid,
+      pinRef: null,
+      bundleFile: null,
+      source: options.source ?? "worktree",
+      legacyOriginalName: options.legacyOriginalName ?? null,
+      legacyQuarantinedAt: options.legacyQuarantinedAt?.toISOString() ?? null,
+      keepPinOnReap
+    };
+    try {
+      await this.writeManifest(containerPath, manifest);
+    } catch (error) {
+      await this.undoPartialTrash(containerPath, null);
+      throw new TrashOperationError(
+        "trash-directory",
+        `cannot write trash manifest for '${options.dirPath}': ${getErrorMessage(error)}`,
+        error instanceof Error ? error : void 0
+      );
+    }
+    const pinRef = headOid ? await this.createPinRef(id, headOid) : null;
+    if (keepPinOnReap && !pinRef) {
+      await this.undoPartialTrash(containerPath, pinRef);
+      throw new TrashOperationError(
+        "trash-directory",
+        `cannot create keep-on-reap trash entry '${id}' for '${options.dirPath}': pin ref could not be created`
+      );
+    }
+    let bundleFile = null;
+    if (keepPinOnReap && pinRef) {
+      try {
+        const created = await this.gitService.createBundleFromRef(
+          path15.join(containerPath, TRASH_CONSTANTS.BUNDLE_FILENAME),
+          pinRef
+        );
+        bundleFile = created ? TRASH_CONSTANTS.BUNDLE_FILENAME : null;
+      } catch (error) {
+        await this.undoPartialTrash(containerPath, pinRef);
+        throw new TrashOperationError(
+          "trash-directory",
+          `cannot bundle commits for keep-on-reap trash entry '${id}': ${getErrorMessage(error)}`,
+          error instanceof Error ? error : void 0
+        );
+      }
+    }
+    const payloadPath = path15.join(containerPath, TRASH_CONSTANTS.PAYLOAD_DIRNAME);
+    manifest.pinRef = pinRef;
+    manifest.bundleFile = bundleFile;
+    try {
+      await this.writeManifest(containerPath, manifest);
+      await fs13.rename(options.dirPath, payloadPath);
+    } catch (error) {
+      await this.undoPartialTrash(containerPath, pinRef);
+      const hint = error.code === "EXDEV" ? " (trash lives inside worktreeDir; a cross-device rename means the directory is on a different filesystem \u2014 co-locate it or set trash.enabled=false)" : "";
+      throw new TrashOperationError(
+        "trash-directory",
+        `cannot move '${options.dirPath}' to trash${hint}: ${getErrorMessage(error)}`,
+        error instanceof Error ? error : void 0
+      );
+    }
+    await this.removalAudit.record({
+      action: options.auditAction ?? "trash_create",
+      result: "success",
+      path: manifest.originalPath,
+      branch: manifest.branch ?? void 0,
+      trashId: id,
+      trashPath: payloadPath
+    }).catch(
+      (auditError) => this.logger.warn(`\u26A0\uFE0F Failed to write trash audit record: ${getErrorMessage(auditError)}`)
+    );
+    return { manifest, containerPath, payloadPath };
+  }
+  async listEntries() {
+    const root = this.getTrashRoot();
+    const entries = [];
+    const invalid = [];
+    let dirents;
+    try {
+      dirents = await fs13.readdir(root, { withFileTypes: true });
+    } catch (error) {
+      if (error.code === "ENOENT") {
+        return { entries, invalid };
+      }
+      throw error;
+    }
+    for (const dirent of dirents) {
+      const containerPath = path15.join(root, dirent.name);
+      if (dirent.isSymbolicLink()) {
+        invalid.push(containerPath);
+        continue;
+      }
+      if (!dirent.isDirectory()) {
+        continue;
+      }
+      const manifest = await this.readManifest(containerPath);
+      if (manifest === null) {
+        invalid.push(containerPath);
+        continue;
+      }
+      entries.push({
+        manifest,
+        containerPath,
+        payloadPath: path15.join(containerPath, TRASH_CONSTANTS.PAYLOAD_DIRNAME)
+      });
+    }
+    return { entries, invalid };
+  }
+  // The full reversible-removal sequence shared by prune and manual removal:
+  // payload to trash, dangling registration cleared, branch ref deleted.
+  // A ref-delete failure is a hygiene problem, not a failed removal — the
+  // payload and pin ref already capture everything restore needs, and restore
+  // tolerates a leftover ref at the trashed commit.
+  async trashAndUnregisterWorktree(options) {
+    const entry = await this.trashDirectory(options);
+    await this.gitService.removeWorktree(options.dirPath, { force: true });
+    let branchRefError;
+    try {
+      await this.deleteTrashedBranchRef(entry.manifest);
+    } catch (refError) {
+      branchRefError = getErrorMessage(refError);
+      this.logger.warn(
+        `\u26A0\uFE0F Leftover branch ref '${entry.manifest.branch}' after trashing '${entry.manifest.id}': ${branchRefError}`
+      );
+    }
+    return { entry, branchRefError };
+  }
+  async restore(id) {
+    const { entries } = await this.listEntries();
+    const entry = entries.find((candidate) => candidate.manifest.id === id);
+    if (!entry) {
+      throw new TrashOperationError("restore", `no trash entry with id '${id}'`);
+    }
+    const { manifest, containerPath, payloadPath } = entry;
+    if (await probePathExists(payloadPath) !== "exists") {
+      throw new TrashOperationError("restore", `payload missing or unverifiable for '${id}' at '${payloadPath}'`);
+    }
+    const destinationProbe = await probePathExists(manifest.originalPath);
+    if (destinationProbe !== "missing") {
+      const why = destinationProbe === "exists" ? "already exists" : "cannot be verified";
+      const hint = manifest.reason === "diverged-replace" && destinationProbe === "exists" ? " \u2014 a fresh worktree replaced this one when the branch diverged; remove that worktree first, or copy the files you need out of the trash payload manually" : "";
+      throw new TrashOperationError("restore", `destination '${manifest.originalPath}' ${why}${hint}`);
+    }
+    if (isWorktreeRestorable(manifest)) {
+      await this.restoreAsWorktree(manifest, payloadPath);
+    } else {
+      if (manifest.branch) {
+        this.logger.warn(
+          `\u26A0\uFE0F Trash entry '${id}' has no pinned commit; restoring files only \u2014 the directory will not be a registered worktree.`
+        );
+      }
+      await fs13.rename(payloadPath, manifest.originalPath);
+    }
+    await fs13.rm(containerPath, { recursive: true, force: true }).catch(
+      (error) => this.logger.warn(`\u26A0\uFE0F Failed to remove restored trash container '${containerPath}': ${getErrorMessage(error)}`)
+    );
+    if (manifest.pinRef) {
+      await this.gitService.deleteRef(manifest.pinRef).catch(
+        (error) => this.logger.warn(`\u26A0\uFE0F Failed to delete pin ref '${manifest.pinRef}': ${getErrorMessage(error)}`)
+      );
+    }
+    await this.removalAudit.record({
+      action: "trash_restore",
+      result: "success",
+      path: manifest.originalPath,
+      branch: manifest.branch ?? void 0,
+      trashId: id
+    }).catch(
+      (auditError) => this.logger.warn(`\u26A0\uFE0F Failed to write trash audit record: ${getErrorMessage(auditError)}`)
+    );
+    return manifest;
+  }
+  async deleteTrashedBranchRef(manifest) {
+    if (!manifest.branch) return;
+    if (!manifest.pinRef) {
+      this.logger.warn(
+        `\u26A0\uFE0F Keeping branch ref '${manifest.branch}' after trashing '${manifest.id}': entry has no pin ref, so the ref is the only gc protection left`
+      );
+      return;
+    }
+    try {
+      await this.gitService.deleteLocalBranch(manifest.branch);
+    } catch (error) {
+      throw new TrashOperationError(
+        "trash-branch-ref",
+        `cannot delete branch ref '${manifest.branch}' after trashing '${manifest.id}': ${getErrorMessage(error)}`,
+        error instanceof Error ? error : void 0
+      );
+    }
+  }
+  async restoreAsWorktree(manifest, payloadPath) {
+    const branch = manifest.branch;
+    const headOid = manifest.headOid;
+    const existingBranchOid = await this.gitService.getLocalBranchCommit(branch);
+    let createdBranch = false;
+    if (existingBranchOid !== null && existingBranchOid !== headOid) {
+      throw new TrashOperationError(
+        "restore",
+        `branch '${branch}' already exists at ${existingBranchOid}; expected trashed commit ${headOid}. Restore the files manually from '${payloadPath}' or move that branch first`
+      );
+    }
+    if (existingBranchOid === null) {
+      await this.gitService.createBranchAt(branch, headOid);
+      createdBranch = true;
+    }
+    try {
+      await this.gitService.addWorktreeNoCheckout(branch, manifest.originalPath);
+      await this.copyPayloadOver(payloadPath, manifest.originalPath);
+      await this.gitService.resetWorktreeIndex(manifest.originalPath);
+      if (this.config.sparseCheckout) {
+        await this.gitService.getSparseCheckoutService().applyToWorktree(manifest.originalPath, this.config.sparseCheckout);
+      }
+    } catch (error) {
+      await this.gitService.removeWorktree(manifest.originalPath, { force: true }).catch(
+        (rollbackError) => this.logger.warn(`\u26A0\uFE0F Restore rollback (worktree) failed: ${getErrorMessage(rollbackError)}`)
+      );
+      if (createdBranch) {
+        await this.gitService.deleteLocalBranch(branch).catch(
+          (rollbackError) => this.logger.warn(`\u26A0\uFE0F Restore rollback (branch) failed: ${getErrorMessage(rollbackError)}`)
+        );
+      }
+      throw new TrashOperationError(
+        "restore",
+        `failed to recreate worktree for '${manifest.id}'; trash entry left intact: ${getErrorMessage(error)}`,
+        error instanceof Error ? error : void 0
+      );
+    }
+  }
+  // The payload's top-level .git link points at a pruned admin dir; the fresh
+  // one written by `worktree add --no-checkout` must survive the overlay.
+  async copyPayloadOver(payloadPath, destination) {
+    await fs13.cp(payloadPath, destination, {
+      recursive: true,
+      force: true,
+      filter: (source) => !(path15.dirname(source) === payloadPath && path15.basename(source) === PATH_CONSTANTS.GIT_DIR)
+    });
+  }
+  async resolveHeadOid(options) {
+    if (!options.branch) return null;
+    try {
+      return (await this.gitService.getCurrentCommit(options.dirPath)).trim();
+    } catch (error) {
+      this.logger.warn(
+        `\u26A0\uFE0F Could not resolve HEAD for '${options.dirPath}'; trash entry will preserve files only: ${getErrorMessage(error)}`
+      );
+      return null;
+    }
+  }
+  // Pin failure degrades to a files-only trash entry rather than blocking the
+  // removal — the payload itself is still fully preserved either way.
+  async createPinRef(id, headOid) {
+    const refName = `${GIT_CONSTANTS.TRASH_REF_PREFIX}${id}`;
+    try {
+      await this.gitService.updateRef(refName, headOid);
+      return refName;
+    } catch (error) {
+      this.logger.warn(
+        `\u26A0\uFE0F Could not pin '${headOid}' for trash entry '${id}'; git gc may collect its objects: ${getErrorMessage(error)}`
+      );
+      return null;
+    }
+  }
+  async writeManifest(containerPath, manifest) {
+    const manifestPath = path15.join(containerPath, TRASH_CONSTANTS.MANIFEST_FILENAME);
+    await atomicWriteFile(manifestPath, JSON.stringify(manifest, null, 2));
+  }
+  async readManifest(containerPath) {
+    try {
+      const raw = await fs13.readFile(path15.join(containerPath, TRASH_CONSTANTS.MANIFEST_FILENAME), "utf-8");
+      const parsed = JSON.parse(raw);
+      if (typeof parsed.id !== "string" || typeof parsed.expiresAt !== "string" || typeof parsed.originalPath !== "string") {
+        return null;
+      }
+      return parsed;
+    } catch {
+      return null;
+    }
+  }
+  async undoPartialTrash(containerPath, pinRef) {
+    await fs13.rm(containerPath, { recursive: true, force: true }).catch(() => void 0);
+    if (pinRef) {
+      await this.gitService.deleteRef(pinRef).catch(() => void 0);
+    }
+  }
+  async createContainer(deletedAt, baseName) {
+    let lastError;
+    for (let attempt = 0; attempt < 3; attempt++) {
+      const id = this.generateId(deletedAt, baseName);
+      const containerPath = path15.join(this.getTrashRoot(), id);
+      try {
+        await fs13.mkdir(containerPath);
+        return { id, containerPath };
+      } catch (error) {
+        lastError = error;
+        if (error.code !== "EEXIST") break;
+      }
+    }
+    throw new TrashOperationError(
+      "trash-directory",
+      `cannot create trash container for '${baseName}': ${getErrorMessage(lastError)}`,
+      lastError instanceof Error ? lastError : void 0
+    );
+  }
+  // The id doubles as a refname component (refs/sync-worktrees/trash/<id>).
+  // The timestamp prefix and hex suffix rule out leading dots and ".lock"
+  // endings, but ".." inside the name would still make the ref invalid and
+  // silently degrade the entry to files-only.
+  generateId(deletedAt, baseName) {
+    const timestamp = filenameTimestamp(deletedAt);
+    const safeName = baseName.replace(/[^A-Za-z0-9._-]/g, "_").replace(/\.{2,}/g, "_");
+    return `${timestamp}-${safeName}-${randomBytes(3).toString("hex")}`;
+  }
+};
+
+// src/services/trash-reaper.service.ts
+var TrashReaperService = class {
+  constructor(config, trashService, logger, removalAudit, gitService) {
+    this.config = config;
+    this.trashService = trashService;
+    this.logger = logger;
+    this.removalAudit = removalAudit;
+    this.gitService = gitService;
+  }
+  config;
+  trashService;
+  logger;
+  removalAudit;
+  gitService;
+  updateLogger(logger) {
+    this.logger = logger;
+  }
+  // Disabled trash means "don't touch my trash" — existing entries are left
+  // alone rather than aged out behind the user's back.
+  async reapExpiredUnlocked(now = /* @__PURE__ */ new Date()) {
+    if (!this.trashService.isEnabled()) return;
+    let realRoot;
+    try {
+      realRoot = await fs14.realpath(this.trashService.getTrashRoot());
+    } catch (error) {
+      if (error.code === "ENOENT") {
+        this.logger.debug(`Trash reaper: no trash root; skipping pin-ref sweep`);
+        return;
+      }
+      this.logger.warn(`\u26A0\uFE0F Trash reaper skipped: cannot resolve trash root: ${getErrorMessage(error)}`);
+      return;
+    }
+    const { entries, invalid } = await this.trashService.listEntries();
+    for (const invalidPath of invalid) {
+      this.logger.warn(`\u26A0\uFE0F Trash reaper: leaving unrecognized entry '${invalidPath}' alone (no valid manifest)`);
+    }
+    const reapedIds = /* @__PURE__ */ new Set();
+    for (const entry of entries) {
+      const expiresAt = new Date(entry.manifest.expiresAt);
+      if (Number.isNaN(expiresAt.getTime())) {
+        this.logger.warn(`\u26A0\uFE0F Trash reaper: entry '${entry.manifest.id}' has an unparseable expiry; skipping`);
+        continue;
+      }
+      if (expiresAt.getTime() > now.getTime()) continue;
+      try {
+        const realEntry = await fs14.realpath(entry.containerPath);
+        if (!realEntry.startsWith(realRoot + path16.sep)) {
+          this.logger.warn(`\u26A0\uFE0F Trash reaper: entry '${entry.manifest.id}' resolves outside the trash root; skipping`);
+          continue;
+        }
+      } catch (error) {
+        this.logger.warn(
+          `\u26A0\uFE0F Trash reaper: cannot verify path of entry '${entry.manifest.id}'; skipping: ${getErrorMessage(error)}`
+        );
+        continue;
+      }
+      let keepRef = null;
+      if (entry.manifest.keepPinOnReap && entry.manifest.headOid) {
+        keepRef = `${GIT_CONSTANTS.KEEP_REF_PREFIX}${entry.manifest.id}`;
+        try {
+          await this.gitService.updateRef(keepRef, entry.manifest.headOid);
+        } catch (error) {
+          this.logger.warn(
+            `\u26A0\uFE0F Trash reaper: cannot create keep ref '${keepRef}' for '${entry.manifest.id}'; deferring reap: ${getErrorMessage(error)}`
+          );
+          continue;
+        }
+      }
+      try {
+        await this.removalAudit.record({
+          action: "trash_reap",
+          result: "attempt",
+          path: entry.manifest.originalPath,
+          branch: entry.manifest.branch ?? void 0,
+          trashId: entry.manifest.id,
+          trashPath: entry.payloadPath
+        });
+      } catch (auditError) {
+        this.logger.warn(
+          `\u26A0\uFE0F Trash reaper: cannot write audit log; skipping '${entry.manifest.id}': ${getErrorMessage(auditError)}`
+        );
+        continue;
+      }
+      try {
+        await fs14.rm(entry.containerPath, { recursive: true, force: true });
+      } catch (error) {
+        this.logger.warn(`\u26A0\uFE0F Trash reaper: failed to delete '${entry.manifest.id}': ${getErrorMessage(error)}`);
+        await this.removalAudit.record({
+          action: "trash_reap",
+          result: "failure",
+          path: entry.manifest.originalPath,
+          trashId: entry.manifest.id,
+          error: getErrorMessage(error)
+        }).catch(() => void 0);
+        continue;
+      }
+      if (entry.manifest.pinRef) {
+        await this.gitService.deleteRef(entry.manifest.pinRef).catch(
+          (error) => this.logger.warn(
+            `\u26A0\uFE0F Trash reaper: failed to delete pin ref '${entry.manifest.pinRef}': ${getErrorMessage(error)}`
+          )
+        );
+      }
+      reapedIds.add(entry.manifest.id);
+      this.logger.info(
+        `\u{1F5D1}\uFE0F Trash reaper: deleted expired entry '${entry.manifest.id}' (trashed ${entry.manifest.deletedAt})`
+      );
+      if (keepRef) {
+        this.logger.info(
+          `   Commits remain recoverable at '${keepRef}' (${entry.manifest.headOid}) \u2014 recover with: git branch <name> ${entry.manifest.headOid}`
+        );
+      }
+      await this.removalAudit.record({
+        action: "trash_reap",
+        result: "success",
+        path: entry.manifest.originalPath,
+        trashId: entry.manifest.id
+      }).catch(
+        (auditError) => this.logger.warn(`\u26A0\uFE0F Failed to write trash audit record: ${getErrorMessage(auditError)}`)
+      );
+    }
+    let containerNames = null;
+    try {
+      containerNames = new Set(await fs14.readdir(realRoot));
+    } catch (error) {
+      this.logger.warn(`\u26A0\uFE0F Trash reaper: cannot scan trash root for pin-ref sweep: ${getErrorMessage(error)}`);
+    }
+    if (containerNames !== null) {
+      await this.reapOrphanedPinRefs(containerNames);
+    }
+    this.warnIfOverThreshold(entries.filter((entry) => !reapedIds.has(entry.manifest.id)));
+  }
+  // Pin refs whose trash container is gone would pin objects forever (failed
+  // ref delete during restore, manually emptied trash). Keyed on container
+  // existence, NOT manifest validity — an invalid-manifest entry still owns
+  // its pin because the reaper refuses to delete its payload. Deliberately
+  // any dirent name counts (files, symlinks): deleting a pin is irreversible
+  // once gc runs, while a stray name collision merely keeps one ref alive.
+  async reapOrphanedPinRefs(containerNames) {
+    let refs;
+    try {
+      refs = await this.gitService.listRefs(GIT_CONSTANTS.TRASH_REF_PREFIX.replace(/\/$/, ""));
+    } catch (error) {
+      this.logger.warn(`\u26A0\uFE0F Trash reaper: cannot list pin refs: ${getErrorMessage(error)}`);
+      return;
+    }
+    for (const ref of refs) {
+      if (!ref.startsWith(GIT_CONSTANTS.TRASH_REF_PREFIX)) continue;
+      const id = ref.slice(GIT_CONSTANTS.TRASH_REF_PREFIX.length);
+      if (id.length === 0 || id.includes("/")) {
+        this.logger.warn(`\u26A0\uFE0F Trash reaper: leaving unexpected ref '${ref}' alone`);
+        continue;
+      }
+      if (containerNames.has(id)) continue;
+      try {
+        await this.gitService.deleteRef(ref);
+        this.logger.info(`\u{1F5D1}\uFE0F Trash reaper: deleted orphaned pin ref '${ref}'`);
+      } catch (error) {
+        this.logger.warn(`\u26A0\uFE0F Trash reaper: failed to delete orphaned pin ref '${ref}': ${getErrorMessage(error)}`);
+      }
+    }
   }
-  resetLfsSkipIfNeeded(syncContext) {
-    if (syncContext.lfsSkipEnabled && !this.config.skipLfs) {
-      this.gitService.setLfsSkipEnabled(false);
+  warnIfOverThreshold(remaining) {
+    const warnSizeBytes = this.config.trash?.warnSizeBytes;
+    if (warnSizeBytes === void 0) return;
+    const summary = summarizeTrashEntries(remaining);
+    if (summary.totalSizeBytes > warnSizeBytes) {
+      this.logger.warn(
+        `\u26A0\uFE0F Trash holds ${formatBytes(summary.totalSizeBytes)} across ${summary.itemCount} entries (threshold ${formatBytes(warnSizeBytes)}). Entries expire ${this.trashService.getRetentionDays()} days after removal.`
+      );
     }
   }
 };
 
 // src/services/worktree-mode-sync-runner.ts
-import * as fs9 from "fs/promises";
-import * as path13 from "path";
+import * as fs16 from "fs/promises";
+import * as path19 from "path";
 import pLimit from "p-limit";
 
-// src/utils/date-filter.ts
-function parseDuration(durationStr) {
-  const match = durationStr.match(/^(\d+)([hdwmy])$/);
-  if (!match) {
-    return null;
-  }
-  const value = parseInt(match[1], 10);
-  const unit = match[2];
-  const multipliers = {
-    h: 60 * 60 * 1e3,
-    // hours
-    d: 24 * 60 * 60 * 1e3,
-    // days
-    w: 7 * 24 * 60 * 60 * 1e3,
-    // weeks
-    m: 30 * 24 * 60 * 60 * 1e3,
-    // months (approximate)
-    y: 365 * 24 * 60 * 60 * 1e3
-    // years (approximate)
-  };
-  return value * multipliers[unit];
-}
-function filterBranchesByAge(branches, maxAge) {
-  const maxAgeMs = parseDuration(maxAge);
-  if (maxAgeMs === null) {
-    console.warn(`Invalid duration format: ${maxAge}. Using all branches.`);
-    return branches;
-  }
-  const cutoffDate = new Date(Date.now() - maxAgeMs);
-  return branches.filter(({ lastActivity }) => lastActivity >= cutoffDate);
-}
-function formatDuration2(durationStr) {
-  const match = durationStr.match(/^(\d+)([hdwmy])$/);
-  if (!match) {
-    return durationStr;
-  }
-  const value = parseInt(match[1], 10);
-  const unit = match[2];
-  const unitNames = {
-    h: value === 1 ? "hour" : "hours",
-    d: value === 1 ? "day" : "days",
-    w: value === 1 ? "week" : "weeks",
-    m: value === 1 ? "month" : "months",
-    y: value === 1 ? "year" : "years"
-  };
-  return `${value} ${unitNames[unit]}`;
-}
-
 // src/services/path-resolution.service.ts
 import { createHash as createHash2 } from "crypto";
-import * as fs8 from "fs";
-import * as path11 from "path";
+import * as fs15 from "fs";
+import * as path17 from "path";
 var BRANCH_STEM_MAX = 80;
 var BRANCH_HASH_LEN = 8;
 var PathResolutionService = class {
@@ -5178,22 +6613,22 @@ var PathResolutionService = class {
     return `${stem}-${hash}`;
   }
   getBranchWorktreePath(worktreeDir, branchName) {
-    return path11.join(worktreeDir, this.sanitizeBranchName(branchName));
+    return path17.join(worktreeDir, this.sanitizeBranchName(branchName));
   }
   resolveRealPath(inputPath) {
-    const absolute = path11.resolve(inputPath);
+    const absolute = path17.resolve(inputPath);
     const missing = [];
     let current = absolute;
-    while (!fs8.existsSync(current)) {
-      const parent = path11.dirname(current);
+    while (!fs15.existsSync(current)) {
+      const parent = path17.dirname(current);
       if (parent === current) {
         return absolute;
       }
-      missing.unshift(path11.basename(current));
+      missing.unshift(path17.basename(current));
       current = parent;
     }
     try {
-      return path11.join(fs8.realpathSync(current), ...missing);
+      return path17.join(fs15.realpathSync(current), ...missing);
     } catch {
       return absolute;
     }
@@ -5203,7 +6638,7 @@ var PathResolutionService = class {
     const a = fold(resolved);
     const b = fold(resolvedBase);
     if (a === b) return true;
-    return a.length > b.length && a.charAt(b.length) === path11.sep && a.startsWith(b);
+    return a.length > b.length && a.charAt(b.length) === path17.sep && a.startsWith(b);
   }
   normalizeWorktreePath(worktreePath, worktreeBaseDir) {
     const resolved = this.resolveRealPath(worktreePath);
@@ -5211,7 +6646,7 @@ var PathResolutionService = class {
     if (!this.isResolvedPathInsideBase(resolved, resolvedBase)) {
       throw new Error(`Worktree path '${worktreePath}' is outside base directory '${worktreeBaseDir}'`);
     }
-    return path11.relative(resolvedBase, resolved);
+    return path17.relative(resolvedBase, resolved);
   }
   isPathInsideBaseDir(targetPath, baseDir) {
     const resolved = this.resolveRealPath(targetPath);
@@ -5224,7 +6659,7 @@ var PathResolutionService = class {
 };
 
 // src/services/worktree-sync-planner.ts
-import * as path12 from "path";
+import * as path18 from "path";
 function createWorktreeSyncPlan(inventory, options = {}) {
   return {
     create: planCreateActions(inventory, options),
@@ -5242,12 +6677,12 @@ function planCreateActions(inventory, options = {}) {
   );
   const reservedPaths = /* @__PURE__ */ new Map();
   for (const worktree of inventory.existingWorktrees) {
-    reservedPaths.set(path12.resolve(worktree.path), worktree.branch);
+    reservedPaths.set(path18.resolve(worktree.path), worktree.branch);
   }
   const actions = [];
   for (const branch of newBranches) {
     const worktreePath = pathResolution.getBranchWorktreePath(inventory.worktreeDir, branch);
-    const resolved = path12.resolve(worktreePath);
+    const resolved = path18.resolve(worktreePath);
     const conflictingBranch = reservedPaths.get(resolved);
     if (conflictingBranch && conflictingBranch !== branch) {
       actions.push({
@@ -5285,21 +6720,30 @@ function planSparseActions(inventory, sparseCheckout) {
 
 // src/services/worktree-mode-sync-runner.ts
 var WorktreeModeSyncRunner = class {
-  constructor(config, gitService, logger, progressEmitter) {
+  constructor(config, gitService, logger, progressEmitter, services) {
     this.config = config;
     this.gitService = gitService;
     this.logger = logger;
     this.progressEmitter = progressEmitter;
+    this.removalAudit = services?.removalAudit ?? new RemovalAuditService(getRemovalAuditLogPath(config));
+    this.trashService = services?.trashService ?? new TrashService(config, gitService, logger, this.removalAudit);
   }
+  config;
+  gitService;
+  logger;
+  progressEmitter;
   pathResolution = new PathResolutionService();
+  removalAudit;
+  trashService;
   updateLogger(logger) {
     this.logger = logger;
+    this.trashService.updateLogger(logger);
   }
   async runSyncAttempt(phaseTimer, syncContext, outcome) {
     await this.gitService.pruneWorktrees();
     await this.fetchLatestRemoteData(phaseTimer, syncContext);
     const { remoteBranches, defaultBranch } = await this.resolveSyncBranches();
-    await fs9.mkdir(this.config.worktreeDir, { recursive: true });
+    await fs16.mkdir(this.config.worktreeDir, { recursive: true });
     const worktrees = await this.gitService.getWorktrees();
     this.logger.info(`Found ${worktrees.length} existing Git worktrees.`);
     await this.cleanupOrphanedDirectories(worktrees);
@@ -5317,6 +6761,7 @@ var WorktreeModeSyncRunner = class {
       }
     );
     await this.createNewWorktreesWithTiming(syncPlan, phaseTimer, outcome);
+    await this.recordRemoteBranchTips([...worktrees, ...syncPlan.create.filter((action) => action.kind === "create")]);
     await this.pruneOldWorktreesWithTiming(syncPlan.prune, phaseTimer, outcome);
     if (this.config.updateExistingWorktrees !== false) {
       await this.updateExistingWorktreesWithTiming(syncPlan.update, phaseTimer, outcome);
@@ -5339,7 +6784,7 @@ var WorktreeModeSyncRunner = class {
           if (action.kind !== "check-sparse") return;
           try {
             try {
-              await fs9.access(action.path);
+              await fs16.access(action.path);
             } catch {
               return;
             }
@@ -5425,7 +6870,7 @@ var WorktreeModeSyncRunner = class {
     const filteredBranches = filterBranchesByAge(filteredByName, this.config.branchMaxAge);
     const remoteBranches = filteredBranches.map((b) => b.branch);
     this.logger.info(
-      `After filtering by age (${formatDuration2(this.config.branchMaxAge)}): ${remoteBranches.length} branches.`
+      `After filtering by age (${formatDuration(this.config.branchMaxAge)}): ${remoteBranches.length} branches.`
     );
     if (filteredByName.length > remoteBranches.length) {
       const excludedCount = filteredByName.length - remoteBranches.length;
@@ -5502,6 +6947,37 @@ var WorktreeModeSyncRunner = class {
     const successCount = results.filter((r) => r.status === "fulfilled").length;
     this.logger.info(`  Created ${successCount}/${plan.length} worktrees successfully`);
   }
+  // Persist each worktree's upstream tip while the remote ref still exists.
+  // This is the proof consulted after a squash-merge deletes the branch:
+  // "HEAD was on the remote before the deletion" — without it every such
+  // worktree reads as having unpushed commits forever. Best-effort: a failed
+  // recording only means that worktree stays conservatively preserved.
+  async recordRemoteBranchTips(worktrees) {
+    try {
+      const tips = await this.gitService.getRemoteBranchTips();
+      if (tips.size === 0) return;
+      const limit = pLimit(this.config.parallelism?.maxStatusChecks ?? DEFAULT_CONFIG.PARALLELISM.MAX_STATUS_CHECKS);
+      await Promise.all(
+        worktrees.map(
+          (wt) => limit(async () => {
+            const oid = tips.get(wt.branch);
+            if (!oid) return;
+            await this.gitService.recordRemoteTip(wt.path, wt.branch, oid).catch(
+              (error) => this.logger.warn(`  - \u26A0\uFE0F Could not record remote tip for '${wt.branch}': ${getErrorMessage(error)}`)
+            );
+          })
+        )
+      );
+    } catch (error) {
+      this.logger.warn(`\u26A0\uFE0F Could not record remote branch tips: ${getErrorMessage(error)}`);
+    }
+  }
+  // A removal authorized only by the fully-pushed proof must stay reversible:
+  // without trash it would be a permanent delete of commits whose remote
+  // branch may have been deleted unmerged.
+  blockedByDisabledTrash(status) {
+    return status.fullyPushedUpstreamDeleted && !this.trashService.isEnabled();
+  }
   async pruneOldWorktreesWithTiming(actions, phaseTimer, outcome) {
     const maxConcurrent = this.config.parallelism?.maxStatusChecks ?? DEFAULT_CONFIG.PARALLELISM.MAX_STATUS_CHECKS;
     phaseTimer.startPhase("Phase 3: Prune", maxConcurrent);
@@ -5531,7 +7007,18 @@ var WorktreeModeSyncRunner = class {
         if (result.status === "fulfilled") {
           const { branchName, worktreePath, status } = result.value;
           if (status.canRemove) {
-            toRemove.push({ branchName, worktreePath });
+            if (this.blockedByDisabledTrash(status)) {
+              this.logger.warn(
+                `  - \u26A0\uFE0F '${branchName}' was fully pushed before its remote branch was deleted, but trash is disabled \u2014 keeping worktree. Enable trash for reversible auto-removal, or remove manually.`
+              );
+              outcome.recordSkipped("worktree", "fully_pushed_trash_disabled", {
+                branch: branchName,
+                path: worktreePath,
+                message: "fully pushed before upstream deletion; trash disabled"
+              });
+            } else {
+              toRemove.push({ branchName, worktreePath });
+            }
           } else {
             toSkip.push({ branchName, worktreePath, status });
           }
@@ -5554,7 +7041,7 @@ var WorktreeModeSyncRunner = class {
             ({ branchName, worktreePath }) => removeLimit(async () => {
               try {
                 const recheck = await this.gitService.getFullWorktreeStatus(worktreePath, false);
-                if (!recheck.canRemove) {
+                if (!recheck.canRemove || this.blockedByDisabledTrash(recheck)) {
                   this.logger.warn(
                     `  \u26A0\uFE0F Skipping removal of '${branchName}' - status changed since initial check: ${recheck.reasons.join(", ")}`
                   );
@@ -5565,10 +7052,76 @@ var WorktreeModeSyncRunner = class {
                   });
                   return;
                 }
-                await this.gitService.removeWorktree(worktreePath);
-                this.logger.info(`  \u2705 Removed worktree for '${branchName}'`);
-                outcome.recordRemoved(branchName, worktreePath);
+                try {
+                  await this.removalAudit.record({
+                    action: "prune_remove",
+                    result: "attempt",
+                    path: worktreePath,
+                    branch: branchName,
+                    status: recheck
+                  });
+                } catch (auditError) {
+                  this.logger.warn(
+                    `  \u26A0\uFE0F Skipping removal of '${branchName}' - cannot write removal audit log: ${getErrorMessage(auditError)}`
+                  );
+                  outcome.recordSkipped("worktree", "audit_log_unavailable", {
+                    branch: branchName,
+                    path: worktreePath,
+                    message: getErrorMessage(auditError)
+                  });
+                  return;
+                }
+                if (await probePathExists(worktreePath) === "missing") {
+                  await this.gitService.removeWorktree(worktreePath, { force: true });
+                  this.logger.info(`  \u2705 Cleared dangling registration for '${branchName}' (directory already gone)`);
+                  outcome.recordRemoved(branchName, worktreePath);
+                  await this.removalAudit.record({ action: "prune_remove", result: "success", path: worktreePath, branch: branchName }).catch(
+                    (auditError) => this.logger.warn(`  \u26A0\uFE0F Failed to write removal audit record: ${getErrorMessage(auditError)}`)
+                  );
+                  return;
+                }
+                let refWarning;
+                if (this.trashService.isEnabled()) {
+                  const { entry, branchRefError } = await this.trashService.trashAndUnregisterWorktree({
+                    dirPath: worktreePath,
+                    branch: branchName,
+                    reason: "prune",
+                    keepPinOnReap: recheck.fullyPushedUpstreamDeleted
+                  });
+                  if (branchRefError !== void 0) {
+                    refWarning = `leftover_branch_ref: could not delete branch ref '${branchName}': ${branchRefError}`;
+                  }
+                  const pushedNote = recheck.fullyPushedUpstreamDeleted ? " \u2014 was fully pushed before its remote branch was deleted" : "";
+                  this.logger.info(
+                    `  \u2705 Moved worktree for '${branchName}' to trash (id: ${entry.manifest.id})${pushedNote}`
+                  );
+                } else {
+                  await this.gitService.removeWorktree(worktreePath);
+                  this.logger.info(`  \u2705 Removed worktree for '${branchName}'`);
+                }
+                outcome.recordRemoved(branchName, worktreePath, refWarning);
+                await this.removalAudit.record({ action: "prune_remove", result: "success", path: worktreePath, branch: branchName }).catch(
+                  (auditError) => this.logger.warn(`  \u26A0\uFE0F Failed to write removal audit record: ${getErrorMessage(auditError)}`)
+                );
               } catch (error) {
+                if (error instanceof WorktreeNotCleanError) {
+                  this.logger.warn(`  \u26A0\uFE0F Skipping removal of '${branchName}' - git refused: ${getErrorMessage(error)}`);
+                  outcome.recordSkipped("worktree", "git_refused_removal", {
+                    branch: branchName,
+                    path: worktreePath,
+                    message: getErrorMessage(error)
+                  });
+                  return;
+                }
+                if (error instanceof TrashOperationError) {
+                  this.logger.warn(`  \u26A0\uFE0F Skipping removal of '${branchName}' - ${getErrorMessage(error)}`);
+                  outcome.recordSkipped("worktree", "trash_failed", {
+                    branch: branchName,
+                    path: worktreePath,
+                    message: getErrorMessage(error)
+                  });
+                  return;
+                }
                 this.logger.error(`  \u274C Failed to remove worktree for '${branchName}':`, getErrorMessage(error));
                 outcome.recordFailed("worktree", getErrorMessage(error), {
                   reason: "remove_failed",
@@ -5694,12 +7247,12 @@ var WorktreeModeSyncRunner = class {
   }
   async updateExistingWorktrees(actions, outcome) {
     this.logger.info("Step 4: Checking for worktrees that need updates...");
-    const divergedDir = path13.join(this.config.worktreeDir, GIT_CONSTANTS.DIVERGED_DIR_NAME);
+    const divergedDir = path19.join(this.config.worktreeDir, GIT_CONSTANTS.DIVERGED_DIR_NAME);
     try {
-      const diverged = await fs9.readdir(divergedDir);
+      const diverged = await fs16.readdir(divergedDir);
       if (diverged.length > 0) {
         this.logger.info(
-          `\u{1F4E6} Note: ${diverged.length} diverged worktree(s) in ${path13.relative(process.cwd(), divergedDir)}`
+          `\u{1F4E6} Note: ${diverged.length} diverged worktree(s) in ${path19.relative(process.cwd(), divergedDir)}`
         );
       }
     } catch {
@@ -5711,7 +7264,7 @@ var WorktreeModeSyncRunner = class {
         (action) => limit(async () => {
           const worktree = { path: action.path, branch: action.branch };
           try {
-            await fs9.access(worktree.path);
+            await fs16.access(worktree.path);
           } catch {
             return { action: "skip", worktree, reason: "missing_worktree_path" };
           }
@@ -5851,13 +7404,13 @@ var WorktreeModeSyncRunner = class {
   }
   async cleanupOrphanedDirectories(worktrees) {
     try {
-      const worktreeRelativePaths = worktrees.map((w) => path13.relative(this.config.worktreeDir, w.path));
-      const allDirs = await fs9.readdir(this.config.worktreeDir);
+      const worktreeRelativePaths = worktrees.map((w) => path19.relative(this.config.worktreeDir, w.path));
+      const allDirs = await fs16.readdir(this.config.worktreeDir);
       const regularDirs = allDirs.filter((dir) => !dir.startsWith("."));
       const orphanedDirs = [];
       for (const dir of regularDirs) {
         const isPartOfWorktree = worktreeRelativePaths.some((worktreePath) => {
-          return worktreePath === dir || worktreePath.startsWith(dir + path13.sep);
+          return worktreePath === dir || worktreePath.startsWith(dir + path19.sep);
         });
         if (!isPartOfWorktree) {
           orphanedDirs.push(dir);
@@ -5866,13 +7419,46 @@ var WorktreeModeSyncRunner = class {
       if (orphanedDirs.length > 0) {
         this.logger.info(`Found ${orphanedDirs.length} orphaned directories: ${orphanedDirs.join(", ")}`);
         for (const dir of orphanedDirs) {
-          const dirPath = path13.join(this.config.worktreeDir, dir);
+          const dirPath = path19.join(this.config.worktreeDir, dir);
           try {
-            const stat3 = await fs9.stat(dirPath);
-            if (stat3.isDirectory()) {
-              await fs9.rm(dirPath, { recursive: true, force: true });
-              this.logger.info(`  - Removed orphaned directory: ${dir}`);
+            const stat3 = await fs16.stat(dirPath);
+            if (!stat3.isDirectory()) {
+              continue;
+            }
+            const gitProbe = await probePathExists(path19.join(dirPath, PATH_CONSTANTS.GIT_DIR));
+            if (gitProbe === "unknown") {
+              this.logger.warn(`  - \u26A0\uFE0F Skipping orphaned directory ${dir}: cannot verify it is not a live checkout`);
+              continue;
+            }
+            if (this.trashService.isEnabled()) {
+              try {
+                const entry = await this.trashService.trashDirectory({ dirPath, reason: "orphan" });
+                this.logger.info(`  - Moved orphaned directory '${dir}' to trash (id: ${entry.manifest.id})`);
+              } catch (trashError) {
+                this.logger.warn(`  - \u26A0\uFE0F Skipping orphaned directory ${dir} - ${getErrorMessage(trashError)}`);
+              }
+              continue;
+            }
+            if (gitProbe === "exists") {
+              const quarantinePath = await quarantineDirectory(dirPath);
+              this.logger.warn(
+                `  - \u26A0\uFE0F Orphaned directory ${dir} contains a .git; quarantined to '${quarantinePath}' instead of deleting.`
+              );
+              await this.removalAudit.record({ action: "orphan_quarantine", result: "success", path: dirPath, quarantinePath }).catch(
+                (auditError) => this.logger.warn(`  \u26A0\uFE0F Failed to write removal audit record: ${getErrorMessage(auditError)}`)
+              );
+              continue;
             }
+            try {
+              await this.removalAudit.record({ action: "orphan_delete", result: "attempt", path: dirPath });
+            } catch (auditError) {
+              this.logger.warn(
+                `  - \u26A0\uFE0F Skipping orphaned directory ${dir} - cannot write removal audit log: ${getErrorMessage(auditError)}`
+              );
+              continue;
+            }
+            await fs16.rm(dirPath, { recursive: true, force: true });
+            this.logger.info(`  - Removed orphaned directory: ${dir}`);
           } catch (error) {
             this.logger.error(`  - Failed to remove orphaned directory ${dir}:`, error);
           }
@@ -5901,14 +7487,37 @@ var WorktreeModeSyncRunner = class {
         outcome.recordUpdated(worktree.branch, worktree.path, "reset_no_local_changes");
       } else {
         this.logger.info(`\u{1F512} Branch '${worktree.branch}' has diverged with local changes. Moving to diverged...`);
-        const divergedPath = await this.divergeWorktree(worktree.path, worktree.branch);
-        const relativePath = path13.relative(process.cwd(), divergedPath);
+        let keepRef = null;
+        if (!this.trashService.isEnabled()) {
+          const localCommit = (await this.gitService.getCurrentCommit(worktree.path)).trim();
+          keepRef = `${GIT_CONSTANTS.KEEP_REF_PREFIX}diverged-${Date.now().toString(36)}-${this.pathResolution.sanitizeBranchName(worktree.branch)}`;
+          await this.gitService.updateRef(keepRef, localCommit);
+        }
+        const { divergedPath, manifest } = await this.divergeWorktree(worktree.path, worktree.branch);
+        const relativePath = path19.relative(process.cwd(), divergedPath);
         outcome.recordPreservedDiverged(worktree.branch, worktree.path, divergedPath);
         this.logger.info(`   Moved to: ${relativePath}`);
         this.logger.info(`   Your local changes are preserved. To review:`);
         this.logger.info(`     cd ${relativePath}`);
         this.logger.info(`     git diff origin/${worktree.branch}`);
-        await this.gitService.removeWorktree(worktree.path);
+        await this.gitService.removeWorktree(worktree.path, { force: true });
+        if (manifest !== null) {
+          await this.trashService.deleteTrashedBranchRef(manifest);
+        } else {
+          await this.gitService.deleteLocalBranch(worktree.branch);
+          this.logger.info(
+            `   Never-pushed commits remain recoverable at '${keepRef}' \u2014 recover with: git branch <name> ${keepRef}`
+          );
+        }
+        await this.removalAudit.record({
+          action: "diverged_replace",
+          result: "success",
+          path: worktree.path,
+          branch: worktree.branch,
+          quarantinePath: divergedPath
+        }).catch(
+          (auditError) => this.logger.warn(`  \u26A0\uFE0F Failed to write removal audit record: ${getErrorMessage(auditError)}`)
+        );
         await this.gitService.addWorktree(worktree.branch, worktree.path);
         this.logger.info(`   Created fresh worktree from upstream at: ${worktree.path}`);
       }
@@ -5927,42 +7536,55 @@ var WorktreeModeSyncRunner = class {
     }
   }
   async divergeWorktree(worktreePath, branchName) {
-    const divergedBaseDir = path13.join(this.config.worktreeDir, GIT_CONSTANTS.DIVERGED_DIR_NAME);
+    if (this.trashService.isEnabled()) {
+      const entry = await this.trashService.trashDirectory({
+        dirPath: worktreePath,
+        branch: branchName,
+        reason: "diverged-replace",
+        keepPinOnReap: true
+      });
+      await this.writeDivergedInfoFile(entry.payloadPath, worktreePath, branchName, entry.manifest.headOid);
+      return { divergedPath: entry.payloadPath, manifest: entry.manifest };
+    }
+    const divergedBaseDir = path19.join(this.config.worktreeDir, GIT_CONSTANTS.DIVERGED_DIR_NAME);
     const timestamp = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
     const uniqueSuffix = Date.now().toString(36) + Math.random().toString(36).substring(2, 7);
     const safeBranchName = this.pathResolution.sanitizeBranchName(branchName);
     const divergedName = `${timestamp}-${safeBranchName}-${uniqueSuffix}`;
-    const divergedPath = path13.join(divergedBaseDir, divergedName);
-    await fs9.mkdir(divergedBaseDir, { recursive: true });
+    const divergedPath = path19.join(divergedBaseDir, divergedName);
+    await fs16.mkdir(divergedBaseDir, { recursive: true });
     try {
-      await fs9.rename(worktreePath, divergedPath);
+      await fs16.rename(worktreePath, divergedPath);
     } catch (err) {
       if (err.code === ERROR_MESSAGES.EXDEV) {
-        await fs9.cp(worktreePath, divergedPath, { recursive: true });
-        await fs9.rm(worktreePath, { recursive: true, force: true });
+        await fs16.cp(worktreePath, divergedPath, { recursive: true });
+        await fs16.rm(worktreePath, { recursive: true, force: true });
       } else {
         throw err;
       }
     }
+    await this.writeDivergedInfoFile(divergedPath, worktreePath, branchName, null);
+    return { divergedPath, manifest: null };
+  }
+  async writeDivergedInfoFile(preservedPath, originalPath, branchName, knownLocalCommit) {
     const metadata = {
       originalBranch: branchName,
       divergedAt: (/* @__PURE__ */ new Date()).toISOString(),
       reason: METADATA_CONSTANTS.DIVERGED_REASON,
-      originalPath: worktreePath,
-      localCommit: await this.gitService.getCurrentCommit(divergedPath),
+      originalPath,
+      localCommit: knownLocalCommit ?? await this.gitService.getCurrentCommit(preservedPath),
       remoteCommit: await this.gitService.getRemoteCommit(`origin/${branchName}`),
       instruction: `To preserve your changes:
   1. Review: git diff origin/${branchName}
   2. Keep changes: git push --force-with-lease origin ${branchName}
   3. Discard changes: rm -rf this directory
 
-  Original worktree location: ${worktreePath}`
+  Original worktree location: ${originalPath}`
     };
-    await fs9.writeFile(
-      path13.join(divergedPath, METADATA_CONSTANTS.DIVERGED_INFO_FILE),
+    await fs16.writeFile(
+      path19.join(preservedPath, METADATA_CONSTANTS.DIVERGED_INFO_FILE),
       JSON.stringify(metadata, null, 2)
     );
-    return divergedPath;
   }
 };
 
@@ -5973,12 +7595,26 @@ var WorktreeSyncService = class {
     this.logger = config.logger ?? Logger.createDefault(void 0, config.debug);
     this.gitService = new GitService(config, this.logger, (event) => this.emitProgress(event));
     this.repoOperationLock = new RepoOperationLock(config, this.gitService, this.logger);
+    this.maintenanceService = new GitMaintenanceService(config, this.gitService, this.logger);
     this.retryPolicy = new SyncRetryPolicy(config, this.gitService, this.logger);
+    const removalAudit = new RemovalAuditService(getRemovalAuditLogPath(config));
+    this.trashService = new TrashService(config, this.gitService, this.logger, removalAudit);
+    this.trashReaper = new TrashReaperService(config, this.trashService, this.logger, removalAudit, this.gitService);
+    this.trashMigration = new TrashMigrationService(config, this.trashService, this.logger);
+    if (this.trashService.isEnabled()) {
+      this.gitService.setStaleDirectoryTrasher(
+        async (dirPath) => (await this.trashService.trashDirectory({ dirPath, reason: "orphan" })).payloadPath
+      );
+    }
     this.worktreeModeSyncRunner = new WorktreeModeSyncRunner(
       config,
       this.gitService,
       this.logger,
-      this.progressEmitter
+      this.progressEmitter,
+      {
+        trashService: this.trashService,
+        removalAudit
+      }
     );
     if (resolveMode(config) === REPOSITORY_MODES.CLONE) {
       this.cloneSyncService = new CloneSyncService(config, this.gitService, this.logger, {
@@ -5989,14 +7625,23 @@ var WorktreeSyncService = class {
       });
     }
   }
+  config;
   gitService;
   cloneSyncService = null;
   logger;
-  syncInProgress = false;
+  // In-process FIFO serializer for all bare-repo-mutating operations (sync, init,
+  // interactive create). One per repo. wait:true callers queue behind an in-flight op;
+  // wait:false callers fail fast. The cross-process file lock (RepoOperationLock) is
+  // acquired inside the mutex body for multi-process safety.
+  repoMutex = pLimit2(1);
   progressEmitter = new ProgressEmitter();
   repoOperationLock;
+  maintenanceService;
   retryPolicy;
   worktreeModeSyncRunner;
+  trashService;
+  trashReaper;
+  trashMigration;
   skipsAccumulator = [];
   lastOutcome = null;
   getRecordedSkips() {
@@ -6020,6 +7665,18 @@ var WorktreeSyncService = class {
     }
     return this.gitService.getWorktrees();
   }
+  async getRemoteBranches() {
+    if (this.cloneSyncService) {
+      return this.cloneSyncService.getRemoteBranches();
+    }
+    return this.gitService.getRemoteBranches();
+  }
+  async checkoutBranch(branchName, options = {}) {
+    if (!this.cloneSyncService) {
+      throw new ConfigError("checkoutBranch is only available for clone-mode repositories", "CLONE_MODE_REQUIRED");
+    }
+    await this.cloneSyncService.checkoutBranch(branchName, options);
+  }
   async initialize() {
     if (this.isInitialized()) return;
     const result = await this.runExclusiveRepoOperation(() => this.initializeUnlocked());
@@ -6044,11 +7701,28 @@ var WorktreeSyncService = class {
     return this.gitService.isInitialized();
   }
   isSyncInProgress() {
-    return this.syncInProgress;
+    return this.repoMutex.activeCount + this.repoMutex.pendingCount > 0;
   }
   getGitService() {
     return this.gitService;
   }
+  // Restore must hold the repo lock: the reaper, prune, and gc all mutate the
+  // same trash entries and refs at the tail of a sync. wait:true queues behind
+  // an in-flight sync instead of failing fast — restores are explicit user
+  // actions, not periodic work.
+  async restoreFromTrash(id) {
+    const result = await this.runExclusiveRepoOperation(() => this.trashService.restore(id), { wait: true });
+    if (!result.started) {
+      throw new TrashOperationError(
+        "restore",
+        `cannot restore trash entry '${id}': another process holds the repo lock`
+      );
+    }
+    return result.value;
+  }
+  async listTrashEntries() {
+    return this.trashService.listEntries();
+  }
   updateLogger(logger) {
     this.logger = logger;
     this.gitService.updateLogger(logger);
@@ -6056,44 +7730,73 @@ var WorktreeSyncService = class {
     this.retryPolicy.updateLogger(logger);
     this.worktreeModeSyncRunner.updateLogger(logger);
     this.repoOperationLock.updateLogger(logger);
+    this.maintenanceService.updateLogger(logger);
+    this.trashService.updateLogger(logger);
+    this.trashReaper.updateLogger(logger);
+    this.trashMigration.updateLogger(logger);
+  }
+  // Runs git gc when due, inside the already-held repo lock (mirrors
+  // initializeUnlocked — must NOT re-acquire runExclusiveRepoOperation or it
+  // would self-deadlock/skip). Skipped under NODE_ENV=test so unit suites don't
+  // shell out to real git; GitMaintenanceService is covered by its own tests.
+  async runMaintenanceIfDueUnlocked() {
+    if (process.env.NODE_ENV === ENV_CONSTANTS.NODE_ENV_TEST) {
+      return;
+    }
+    await this.maintenanceService.runIfDueUnlocked();
+  }
+  // Same contract as runMaintenanceIfDueUnlocked: tail of a successful sync,
+  // inside the held lock, never fails the sync. Runs before gc so freshly
+  // reaped pin refs can be collected in the same maintenance window.
+  async runTrashMaintenanceUnlocked() {
+    if (process.env.NODE_ENV === ENV_CONSTANTS.NODE_ENV_TEST) {
+      return;
+    }
+    if (this.cloneSyncService) {
+      return;
+    }
+    try {
+      await this.trashMigration.migrateLegacyUnlocked();
+      await this.trashReaper.reapExpiredUnlocked();
+    } catch (error) {
+      this.logger.warn(`\u26A0\uFE0F Trash maintenance failed: ${getErrorMessage(error)}`);
+    }
   }
   onProgress(listener) {
     return this.progressEmitter.onProgress(listener);
   }
-  async runExclusiveRepoOperation(operation) {
-    if (this.syncInProgress) {
+  async runExclusiveRepoOperation(operation, options = {}) {
+    if (!options.wait && this.repoMutex.activeCount + this.repoMutex.pendingCount > 0) {
       this.logger.warn("\u26A0\uFE0F  Another repository operation is already in progress, skipping...");
       return { started: false, reason: "in_progress" };
     }
-    this.syncInProgress = true;
-    let release;
-    try {
-      release = await this.repoOperationLock.acquire();
-    } catch (error) {
-      this.syncInProgress = false;
-      throw error;
-    }
-    if (release === null) {
-      this.syncInProgress = false;
-      this.logger.warn("\u26A0\uFE0F  Another process holds the sync lock for this repo, skipping...");
-      return { started: false, reason: "locked" };
-    }
-    try {
-      return { started: true, value: await operation() };
-    } finally {
+    return this.repoMutex(async () => {
+      const release = await this.repoOperationLock.acquire();
+      if (release === null) {
+        this.logger.warn("\u26A0\uFE0F  Another process holds the sync lock for this repo, skipping...");
+        return { started: false, reason: "locked" };
+      }
       try {
-        await release();
-      } catch (releaseError) {
-        this.logger.warn(`Failed to release sync lock: ${getErrorMessage(releaseError)}`);
+        return { started: true, value: await operation() };
+      } finally {
+        try {
+          await release();
+        } catch (releaseError) {
+          this.logger.warn(`Failed to release sync lock: ${getErrorMessage(releaseError)}`);
+        }
       }
-      this.syncInProgress = false;
-    }
+    });
+  }
+  // Interactive variant: queues behind any in-flight sync/op instead of failing fast.
+  async runQueuedRepoOperation(operation) {
+    return this.runExclusiveRepoOperation(operation, { wait: true });
   }
   emitProgress(event) {
     this.progressEmitter.emit(event);
   }
   async sync() {
     const result = await this.runExclusiveRepoOperation(async () => {
+      this.clearRecordedSkips();
       const totalTimer = new Timer();
       const phaseTimer = new PhaseTimer();
       const outcome = new SyncOutcomeAccumulator({
@@ -6142,7 +7845,9 @@ var WorktreeSyncService = class {
           const repoName = this.config.name;
           this.logger.table(formatTimingTable(durationMs, phaseResults, repoName));
         }
+        await this.runTrashMaintenanceUnlocked();
       }
+      await this.runMaintenanceIfDueUnlocked();
       return this.lastOutcome ?? outcome.toOutcome(durationMs);
     });
     return result.started ? { started: true, outcome: result.value } : result;
@@ -6275,54 +7980,6 @@ var HookExecutionService = class {
   }
 };
 
-// src/utils/disk-space.ts
-import fastFolderSize from "fast-folder-size";
-async function calculateDirectorySize(dirPath) {
-  return new Promise((resolve12, reject) => {
-    fastFolderSize(dirPath, (err, bytes) => {
-      if (err) {
-        reject(err);
-        return;
-      }
-      if (bytes === void 0) {
-        reject(new Error(`fast-folder-size returned no bytes for ${dirPath}`));
-        return;
-      }
-      resolve12(bytes);
-    });
-  });
-}
-function formatBytes(bytes) {
-  if (bytes === 0) return "0 B";
-  const units = ["B", "KB", "MB", "GB", "TB"];
-  const k = 1024;
-  const decimals = 2;
-  const i = Math.floor(Math.log(bytes) / Math.log(k));
-  const value = bytes / Math.pow(k, i);
-  return `${value.toFixed(decimals)} ${units[i]}`;
-}
-async function calculateSyncDiskSpace(repoPaths, worktreeDirs) {
-  try {
-    let totalBytes = 0;
-    for (const repoPath of repoPaths) {
-      try {
-        totalBytes += await calculateDirectorySize(repoPath);
-      } catch {
-      }
-    }
-    for (const worktreeDir of worktreeDirs) {
-      try {
-        totalBytes += await calculateDirectorySize(worktreeDir);
-      } catch {
-      }
-    }
-    return formatBytes(totalBytes);
-  } catch (error) {
-    console.error("Failed to calculate disk space:", error);
-    return "N/A";
-  }
-}
-
 // src/utils/app-events.ts
 var AppEventEmitter = class {
   listeners = /* @__PURE__ */ new Map();
@@ -6359,7 +8016,7 @@ var AppEventEmitter = class {
 };
 
 // src/services/InteractiveUIService.tsx
-import * as fs10 from "fs/promises";
+import * as fs17 from "fs/promises";
 var WAIT_SYNC_FAST_TIMEOUT_MS = 2e3;
 var WAIT_SYNC_DEFAULT_TIMEOUT_MS = 3e4;
 var InteractiveUIService = class {
@@ -6393,7 +8050,7 @@ var InteractiveUIService = class {
     this.cronSchedule = cronSchedule;
     this.repositoryCount = syncServices.length;
     this.maxProgressLines = Math.max(1, maxParallel ?? DEFAULT_CONFIG.PARALLELISM.MAX_REPOSITORIES);
-    this.limit = pLimit2(this.maxProgressLines);
+    this.limit = pLimit3(this.maxProgressLines);
     this.startBufferFlushCheck();
     this.renderUI();
     this.subscribeToServiceProgress();
@@ -6520,13 +8177,17 @@ var InteractiveUIService = class {
           getRepositoryDiskUsage: (index) => this.getRepositoryDiskUsage(index),
           getDivergedDirectoriesForRepo: (index) => this.getDivergedDirectoriesForRepo(index),
           deleteDivergedDirectory: (repoIndex, name) => this.deleteDivergedDirectory(repoIndex, name),
-          openEditorInWorktree: (path18) => this.openEditorInWorktree(path18),
-          openTerminalInWorktree: (repoIndex, path18, branchName) => this.openTerminalInWorktree(repoIndex, path18, branchName),
+          openEditorInWorktree: (path24) => this.openEditorInWorktree(path24),
+          openTerminalInWorktree: (repoIndex, path24, branchName) => this.openTerminalInWorktree(repoIndex, path24, branchName),
           copyBranchFiles: (repoIndex, baseBranch, targetBranch) => this.copyBranchFiles(repoIndex, baseBranch, targetBranch),
           createWorktreeForBranch: (repoIndex, branchName) => this.createWorktreeForBranch(repoIndex, branchName),
           executeOnBranchCreatedHooks: (repoIndex, context) => this.executeOnBranchCreatedHooks(repoIndex, context)
         }
-      )
+      ),
+      {
+        alternateScreen: true,
+        incrementalRendering: true
+      }
     );
   }
   async handleManualSync() {
@@ -6641,14 +8302,14 @@ var InteractiveUIService = class {
         if (Date.now() - startTime > timeoutMs) {
           throw new Error("Timeout waiting for sync operations to complete");
         }
-        await new Promise((resolve12) => setTimeout(resolve12, checkInterval));
+        await new Promise((resolve14) => setTimeout(resolve14, checkInterval));
       }
     });
     try {
       await Promise.all(syncChecks);
     } catch {
       this.addLog(
-        `Warning: Timeout waiting for sync operations to complete after ${formatDuration(timeoutMs)}. Proceeding with potential data loss risk.`,
+        `Warning: Timeout waiting for sync operations to complete after ${formatDuration2(timeoutMs)}. Proceeding with potential data loss risk.`,
         "warn"
       );
     }
@@ -6721,11 +8382,12 @@ var InteractiveUIService = class {
     }
     const sizeBytes = bareSizeBytes + worktreeSizeBytes;
     const failedAllPaths = errors.length === sizeTargets.length;
+    const partialFailure = errors.length > 0 && !failedAllPaths;
     return {
       repoIndex,
       repoName,
       sizeBytes: failedAllPaths ? null : sizeBytes,
-      sizeFormatted: failedAllPaths ? "N/A" : formatBytes(sizeBytes),
+      sizeFormatted: failedAllPaths ? "N/A" : partialFailure ? `\u2265${formatBytes(sizeBytes)}` : formatBytes(sizeBytes),
       bareSizeBytes,
       worktreeSizeBytes,
       error: errors.length > 0 ? errors.join("; ") : void 0
@@ -6736,11 +8398,14 @@ var InteractiveUIService = class {
       throw new Error(`Invalid repository index: ${repoIndex}`);
     }
     const service = this.syncServices[repoIndex];
-    if (!service.isInitialized()) {
+    if (!service.isInitialized() && !service.isCloneMode()) {
+      return [];
+    }
+    try {
+      return await service.getRemoteBranches();
+    } catch {
       return [];
     }
-    const gitService = service.getGitService();
-    return gitService.getRemoteBranches();
   }
   getDefaultBranchForRepo(repoIndex) {
     if (repoIndex < 0 || repoIndex >= this.syncServices.length) {
@@ -6755,11 +8420,18 @@ var InteractiveUIService = class {
       throw new Error(`Invalid repository index: ${repoIndex}`);
     }
     const service = this.syncServices[repoIndex];
-    if (!service.isInitialized()) {
-      await service.initialize();
+    const result = await service.runQueuedRepoOperation(async () => {
+      if (!service.isInitialized()) {
+        await service.initializeUnlocked();
+      }
+      if (service.isCloneMode()) {
+        return;
+      }
+      await service.getGitService().fetchAll();
+    });
+    if (!result.started) {
+      throw new Error("Another process holds the repository lock; fetch skipped. Try again.");
     }
-    const gitService = service.getGitService();
-    await gitService.fetchAll();
   }
   async createAndPushBranch(repoIndex, baseBranch, branchName) {
     if (repoIndex < 0 || repoIndex >= this.syncServices.length) {
@@ -6767,25 +8439,35 @@ var InteractiveUIService = class {
     }
     const service = this.syncServices[repoIndex];
     const gitService = service.getGitService();
-    const maxAttempts = 10;
-    let finalName = branchName;
-    let suffix = 0;
-    for (let attempt = 0; attempt < maxAttempts; attempt++) {
-      try {
-        await gitService.createBranch(finalName, baseBranch);
-        await gitService.pushBranch(finalName);
-        return { success: true, finalName };
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        if (errorMessage.includes("already exists")) {
-          suffix++;
-          finalName = `${branchName}-${suffix}`;
-          continue;
+    const result = await service.runQueuedRepoOperation(async () => {
+      const maxAttempts = 10;
+      let finalName = branchName;
+      let suffix = 0;
+      for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        try {
+          await gitService.createBranch(finalName, baseBranch);
+          await gitService.pushBranch(finalName);
+          return { success: true, finalName };
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          if (errorMessage.includes("already exists")) {
+            suffix++;
+            finalName = `${branchName}-${suffix}`;
+            continue;
+          }
+          return { success: false, finalName: branchName, error: errorMessage };
         }
-        return { success: false, finalName: branchName, error: errorMessage };
       }
+      return { success: false, finalName: branchName, error: `Failed to create branch after ${maxAttempts} attempts` };
+    });
+    if (!result.started) {
+      return {
+        success: false,
+        finalName: branchName,
+        error: "Another process holds the repository lock; branch not created. Try again."
+      };
     }
-    return { success: false, finalName: branchName, error: `Failed to create branch after ${maxAttempts} attempts` };
+    return result.value;
   }
   async getWorktreesForRepo(repoIndex) {
     if (repoIndex < 0 || repoIndex >= this.syncServices.length) {
@@ -6822,22 +8504,22 @@ var InteractiveUIService = class {
     }
     const service = this.syncServices[repoIndex];
     const worktreeDir = service.config.worktreeDir;
-    const divergedDir = path14.join(worktreeDir, GIT_CONSTANTS.DIVERGED_DIR_NAME);
+    const divergedDir = path20.join(worktreeDir, GIT_CONSTANTS.DIVERGED_DIR_NAME);
     let dirEntries;
     try {
-      dirEntries = await fs10.readdir(divergedDir, { withFileTypes: true, encoding: "utf-8" });
+      dirEntries = await fs17.readdir(divergedDir, { withFileTypes: true, encoding: "utf-8" });
     } catch {
       return [];
     }
     const subdirs = dirEntries.filter((e) => e.isDirectory());
     const results = await Promise.allSettled(
       subdirs.map(async (entry) => {
-        const fullPath = path14.join(divergedDir, entry.name);
-        const infoFilePath = path14.join(fullPath, METADATA_CONSTANTS.DIVERGED_INFO_FILE);
+        const fullPath = path20.join(divergedDir, entry.name);
+        const infoFilePath = path20.join(fullPath, METADATA_CONSTANTS.DIVERGED_INFO_FILE);
         let originalBranch = entry.name;
         let divergedAt = "";
         try {
-          const infoContent = await fs10.readFile(infoFilePath, "utf-8");
+          const infoContent = await fs17.readFile(infoFilePath, "utf-8");
           const info = JSON.parse(infoContent);
           if (typeof info.originalBranch === "string") originalBranch = info.originalBranch;
           if (typeof info.divergedAt === "string") divergedAt = info.divergedAt;
@@ -6868,15 +8550,15 @@ var InteractiveUIService = class {
     }
     const service = this.syncServices[repoIndex];
     const worktreeDir = service.config.worktreeDir;
-    const divergedBase = path14.resolve(worktreeDir, GIT_CONSTANTS.DIVERGED_DIR_NAME);
+    const divergedBase = path20.resolve(worktreeDir, GIT_CONSTANTS.DIVERGED_DIR_NAME);
     if (!name || name === "." || name === ".." || name.includes("/") || name.includes("\\")) {
       throw new Error(`Invalid diverged directory name: "${name}"`);
     }
-    const targetPath = path14.join(divergedBase, name);
+    const targetPath = path20.join(divergedBase, name);
     if (!this.pathResolution.isPathInsideBaseDir(targetPath, divergedBase)) {
       throw new Error(`Path traversal rejected: "${name}" resolves outside the diverged directory`);
     }
-    await fs10.rm(targetPath, { recursive: true, force: true });
+    await fs17.rm(targetPath, { recursive: true, force: true });
     this.addLog(`\u{1F5D1}\uFE0F Deleted diverged directory: ${name}`, "info");
   }
   async createWorktreeForBranch(repoIndex, branchName) {
@@ -6887,7 +8569,16 @@ var InteractiveUIService = class {
     const gitService = service.getGitService();
     const worktreeDir = service.config.worktreeDir;
     const worktreePath = this.pathResolution.getBranchWorktreePath(worktreeDir, branchName);
-    await gitService.addWorktree(branchName, worktreePath);
+    const result = await service.runQueuedRepoOperation(async () => {
+      if (service.isCloneMode()) {
+        await service.checkoutBranch(branchName, { allowConfigDrift: true });
+        return;
+      }
+      await gitService.addWorktree(branchName, worktreePath);
+    });
+    if (!result.started) {
+      throw new Error("Another process holds the repository lock; worktree not created. Try again.");
+    }
   }
   openEditorInWorktree(worktreePath) {
     const editor = process.env.EDITOR || process.env.VISUAL || "code";
@@ -7229,8 +8920,8 @@ function parseArguments(argv = hideBin(process.argv)) {
 }
 
 // src/utils/config-generator.ts
-import * as fs11 from "fs/promises";
-import * as path15 from "path";
+import * as fs18 from "fs/promises";
+import * as path21 from "path";
 function serializeToESM(obj, indent = 0) {
   const spaces = " ".repeat(indent);
   const innerSpaces = " ".repeat(indent + 2);
@@ -7260,9 +8951,9 @@ ${spaces}}`;
   return String(obj);
 }
 async function generateConfigFile(input2, configPath, options = {}) {
-  const configDir = path15.dirname(configPath);
-  await fs11.mkdir(configDir, { recursive: true });
-  const worktreeDirRelative = path15.relative(configDir, input2.worktreeDir);
+  const configDir = path21.dirname(configPath);
+  await fs18.mkdir(configDir, { recursive: true });
+  const worktreeDirRelative = path21.relative(configDir, input2.worktreeDir);
   const useRelativeWorktree = !worktreeDirRelative.startsWith("../../../");
   const repoName = extractRepoNameFromUrl(input2.repoUrl);
   const repository = {
@@ -7271,7 +8962,7 @@ async function generateConfigFile(input2, configPath, options = {}) {
     worktreeDir: useRelativeWorktree ? `./${worktreeDirRelative}` : input2.worktreeDir
   };
   if (input2.bareRepoDir) {
-    const bareRepoDirRelative = path15.relative(configDir, input2.bareRepoDir);
+    const bareRepoDirRelative = path21.relative(configDir, input2.bareRepoDir);
     const useRelativeBare = !bareRepoDirRelative.startsWith("../../../");
     repository.bareRepoDir = useRelativeBare ? `./${bareRepoDirRelative}` : input2.bareRepoDir;
   }
@@ -7298,7 +8989,7 @@ const config = ${serializeToESM(configObject)};
 export default config;
 `;
   try {
-    await fs11.writeFile(configPath, configContent, {
+    await fs18.writeFile(configPath, configContent, {
       encoding: "utf-8",
       flag: options.overwrite ? "w" : "wx"
     });
@@ -7310,11 +9001,11 @@ export default config;
   }
 }
 function getDefaultConfigPath() {
-  return path15.join(process.cwd(), "sync-worktrees.config.js");
+  return path21.join(process.cwd(), "sync-worktrees.config.js");
 }
 async function findConfigInCwd(cwd = process.cwd()) {
   for (const name of CONFIG_FILE_NAMES) {
-    const full = path15.join(cwd, name);
+    const full = path21.join(cwd, name);
     if (await fileExists(full)) {
       return full;
     }
@@ -7323,7 +9014,7 @@ async function findConfigInCwd(cwd = process.cwd()) {
 }
 
 // src/utils/interactive.ts
-import * as path16 from "path";
+import * as path22 from "path";
 import { confirm, input, select } from "@inquirer/prompts";
 async function promptForInitConfig() {
   console.log("\u{1F527} Welcome to sync-worktrees interactive setup!\n");
@@ -7354,8 +9045,8 @@ async function promptForInitConfig() {
   if (!worktreeDir.trim() && defaultWorktreeDir) {
     worktreeDir = defaultWorktreeDir;
   }
-  if (!path16.isAbsolute(worktreeDir)) {
-    worktreeDir = path16.resolve(worktreeDir);
+  if (!path22.isAbsolute(worktreeDir)) {
+    worktreeDir = path22.resolve(worktreeDir);
   }
   let bareRepoDir;
   const askForBareDir = await confirm({
@@ -7373,8 +9064,8 @@ async function promptForInitConfig() {
         return true;
       }
     });
-    if (!path16.isAbsolute(bareRepoDir)) {
-      bareRepoDir = path16.resolve(bareRepoDir);
+    if (!path22.isAbsolute(bareRepoDir)) {
+      bareRepoDir = path22.resolve(bareRepoDir);
     }
   }
   const runMode = await select({
@@ -7465,7 +9156,7 @@ async function runMultipleRepositories(configFile, repositories, configPath) {
   const globalLogger = Logger.createDefault();
   const runOnce = configFile.defaults?.runOnce ?? false;
   const maxParallel = configFile.parallelism?.maxRepositories ?? configFile.defaults?.parallelism?.maxRepositories ?? DEFAULT_CONFIG.PARALLELISM.MAX_REPOSITORIES;
-  const limit = pLimit3(maxParallel);
+  const limit = pLimit4(maxParallel);
   if (runOnce) {
     globalLogger.info(`
 \u{1F504} Syncing ${repositories.length} repositories...`);
@@ -7627,7 +9318,7 @@ async function runFromConfigFile(configPath, runOnceOverride = false) {
   await runMultipleRepositories(effectiveConfigFile, repositories, configPath);
 }
 async function resolveConfigOrExit(cliPath) {
-  const resolved = cliPath ? path17.resolve(cliPath) : await findConfigInCwd();
+  const resolved = cliPath ? path23.resolve(cliPath) : await findConfigInCwd();
   if (!resolved) {
     console.error(
       "\u274C No config file found. Pass --config <path>, run `sync-worktrees init` to create one, or place a sync-worktrees.config.{js,mjs,cjs} in this directory."
@@ -7643,7 +9334,7 @@ function exitConfigExists(targetPath) {
   process.exit(1);
 }
 async function runInit(configPath, force) {
-  const targetPath = configPath ? path17.resolve(configPath) : getDefaultConfigPath();
+  const targetPath = configPath ? path23.resolve(configPath) : getDefaultConfigPath();
   if (!force && await fileExists(targetPath)) {
     exitConfigExists(targetPath);
   }
@@ -7656,7 +9347,7 @@ async function runInit(configPath, force) {
     }
     throw error;
   }
-  const displayPath = path17.relative(process.cwd(), targetPath) || targetPath;
+  const displayPath = path23.relative(process.cwd(), targetPath) || targetPath;
   console.log(`
 \u2705 Configuration saved to: ${targetPath}`);
   console.log(`
@@ -7664,7 +9355,7 @@ async function runInit(configPath, force) {
 }
 async function runSync(options) {
   const configPath = await resolveConfigOrExit(options.config);
-  const displayPath = path17.relative(process.cwd(), configPath) || configPath;
+  const displayPath = path23.relative(process.cwd(), configPath) || configPath;
   console.log(`\u{1F4C4} Using config: ${displayPath}`);
   try {
     await runFromConfigFile(configPath, options.runOnce);