@cellajs/cli 0.2.0 → 0.2.2

package/dist/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env tsx
 
 // src/cella-cli.ts
-import { existsSync as existsSync10, statSync as statSync2 } from "fs";
-import { join as join17, resolve as resolve6 } from "path";
+import { existsSync as existsSync11, statSync as statSync3 } from "fs";
+import { join as join18, resolve as resolve6 } from "path";
 import process9 from "process";
 
 // src/cli.ts
@@ -75,6 +75,7 @@ var cellaConfigSchema = z.object({
         "engines",
         "packageManager",
         "overrides",
+        "exports",
         "pnpm"
       ])
     ).optional(),
@@ -215,7 +216,7 @@ import process4 from "process";
 // package.json
 var package_default = {
   name: "@cellajs/cli",
-  version: "0.2.0",
+  version: "0.2.2",
   private: false,
   license: "MIT",
   description: "CLI for managing your monorepo and syncing with upstream Cella.",
@@ -226,7 +227,7 @@ var package_default = {
   homepage: "https://cellajs.com",
   author: "CellaJS <info@cellajs.com>",
   engines: {
-    node: "24.x"
+    node: "26.x"
   },
   type: "module",
   main: "./dist/index.js",
@@ -266,24 +267,24 @@ var package_default = {
   },
   dependencies: {
     "@inquirer/core": "^11.2.1",
-    "@inquirer/prompts": "^8.5.2",
-    "@pierre/diffs": "^1.2.12",
+    "@inquirer/prompts": "^8.7.2",
+    "@pierre/diffs": "^1.4.3",
     commander: "^15.0.0",
     "ts-morph": "^28.0.0",
-    zod: "^4.4.3"
+    zod: "^4.6.5"
   },
   devDependencies: {
-    "@biomejs/biome": "^2.5.2",
-    "@commitlint/cli": "^21.2.0",
-    "@commitlint/config-conventional": "^21.2.0",
-    "@evilmartians/lefthook": "^2.1.9",
-    "@types/node": "24.10.13",
+    "@biomejs/biome": "^2.5.14",
+    "@commitlint/cli": "^21.2.3",
+    "@commitlint/config-conventional": "^21.2.3",
+    "@evilmartians/lefthook": "^2.1.14",
+    "@types/node": "26.5.0",
     "@typescript/native-preview": "7.0.0-dev.20260702.3",
     rimraf: "^6.1.3",
     tsup: "^8.5.1",
-    tsx: "^4.22.4",
+    tsx: "^4.23.15",
     typescript: "^6.0.3",
-    vitest: "^4.1.9"
+    vitest: "^4.1.11"
   },
   publishConfig: {
     access: "public"
@@ -567,37 +568,74 @@ function printSummary(summary, title = "summary") {
   console.info();
   printLine("behind", summary.behind);
 }
-function printFileGroup(files, status, linkOptions, options) {
-  const filtered = files.filter((f) => f.status === status && !isManagedFile(f.path));
-  if (filtered.length === 0) return;
-  const config = statusConfig[status];
-  const title = options?.title ?? `${config.icon} ${config.label}`;
-  printSectionHeader(`${title} ${colors_default.dim(`\xB7 ${filtered.length} files`)}`);
-  const useUpstream = options?.dateSource === "upstream";
+function printFileSection(files, title, linkOptions, options) {
+  if (files.length === 0) return;
+  printSectionHeader(`${title} ${colors_default.dim(`\xB7 ${files.length} files`)}`);
+  const useUpstream = options.dateSource === "upstream";
   const maxLines = 100;
-  const shown = filtered.length > maxLines ? filtered.slice(0, maxLines) : filtered;
+  const shown = files.length > maxLines ? files.slice(0, maxLines) : files;
   for (const file of shown) {
+    const icon = typeof options.icon === "string" ? options.icon : options.icon(file);
     const commit = useUpstream ? file.upstreamCommit : file.changedCommit;
     const date = useUpstream ? file.upstreamChangedAt : file.changedAt;
     const dateInfo = formatFileDateInfo(file.path, commit, date, linkOptions);
-    console.info(`  ${config.icon} ${file.path}${dateInfo}`);
+    console.info(`  ${icon} ${file.path}${dateInfo}${options.suffix?.(file) ?? ""}`);
   }
-  if (filtered.length > maxLines) {
-    console.info(colors_default.dim(`  ... + ${filtered.length - maxLines} more`));
+  if (files.length > maxLines) {
+    console.info(colors_default.dim(`  ... + ${files.length - maxLines} more`));
   }
-  if (options?.hint) {
+  if (options.hint) {
     console.info();
-    console.info(colors_default.dim(`  ${options.hint}`));
+    for (const line of Array.isArray(options.hint) ? options.hint : [options.hint]) {
+      console.info(colors_default.dim(`  ${line}`));
+    }
   }
 }
+function printFileGroup(files, status, linkOptions, options) {
+  const filtered = files.filter((f) => f.status === status && !isManagedFile(f.path));
+  const config = statusConfig[status];
+  const title = options?.title ?? `${config.icon} ${config.label}`;
+  printFileSection(filtered, title, linkOptions, { ...options, icon: config.icon });
+}
+function findProtectedBehind(files) {
+  return files.filter((file) => file.upstreamChanged && !isManagedFile(file.path));
+}
+var PROTECTED_BEHIND_HINT = "pinned/ignored files where upstream also changed since the last sync; the fork side wins on conflict, so diff each against upstream (analyze --open-diff <path>) and adopt what you need.";
+function protectionIcon(file) {
+  return file.isIgnored ? statusConfig.ignored.icon : statusConfig.pinned.icon;
+}
+function formatUpstreamChangedLines(file) {
+  if (file.upstreamChangedLines === void 0) return "";
+  const n = file.upstreamChangedLines;
+  return colors_default.yellow(` \xB7 ${n} ${n === 1 ? "line" : "lines"} changed upstream`);
+}
+function formatUpstreamLinesAbsent(file) {
+  const n = file.upstreamLinesAbsent ?? 0;
+  return n > 0 ? colors_default.yellow(` \xB7 ${n} upstream ${n === 1 ? "line" : "lines"} absent`) : "";
+}
 function printAnalysisFileGroups(files, linkOptions) {
   printFileGroup(files, "behind", linkOptions, {
     title: colors_default.cyan("\u2193 behind on upstream")
   });
   printFileGroup(files, "ahead", linkOptions, {
     title: `${colors_default.blue("\u2191 protected in fork")}`,
-    hint: "these files have fork changes but are protected (pinned)."
+    suffix: formatUpstreamLinesAbsent,
+    hint: [
+      "these files have fork changes but are protected (pinned); upstream did not change them since the last sync.",
+      "pinned files keep the fork side on every conflict; a count here is upstream content the fork never received, deliberately or not: diff and decide."
+    ]
   });
+  printFileSection(
+    findProtectedBehind(files),
+    `${warningMark} ${colors_default.yellow("protected but behind upstream")}`,
+    linkOptions,
+    {
+      icon: protectionIcon,
+      suffix: formatUpstreamChangedLines,
+      dateSource: "upstream",
+      hint: PROTECTED_BEHIND_HINT
+    }
+  );
   printFileGroup(files, "drifted", linkOptions, {
     title: `${warningMark} ${colors_default.yellow("drifted from upstream")}`,
     hint: "these files have fork changes but are not pinned or ignored."
@@ -607,11 +645,6 @@ function printAnalysisFileGroups(files, linkOptions) {
     hint: "both fork and upstream changed.",
     dateSource: "upstream"
   });
-  printFileGroup(files, "pinned", linkOptions, {
-    title: `${colors_default.green("\u2A00 pinned")}`,
-    hint: "both changed, fork wins (pinned in cella/cella.config.ts).",
-    dateSource: "upstream"
-  });
 }
 function writeLogFile(forkPath, files) {
   const logPath = join3(forkPath, "cella-sync.log");
@@ -652,11 +685,29 @@ function printSyncComplete(result, options = {}) {
     console.info(`${colors_default.green("\u2713")} sync complete`);
     console.info(colors_default.dim(`  ${updated} files updated, ${merged} auto-merged, ${conflicts} conflicts`));
   }
+  printProtectedConflicts(result);
+  console.info();
+}
+function printProtectedConflicts(result) {
+  const paths = result.protectedConflicts ?? [];
+  if (paths.length === 0) return;
+  const byPath = new Map(result.files.map((file) => [file.path, file]));
   console.info();
+  console.info(
+    `${warningMark} ${colors_default.yellow(
+      `${paths.length} protected ${paths.length === 1 ? "file kept" : "files kept"} the fork version, dropping upstream changes:`
+    )}`
+  );
+  for (const path4 of paths) {
+    const file = byPath.get(path4);
+    const icon = file ? protectionIcon(file) : statusConfig.pinned.icon;
+    console.info(`  ${icon} ${path4}${file ? formatUpstreamChangedLines(file) : ""}`);
+  }
+  console.info(colors_default.dim(`  ${PROTECTED_BEHIND_HINT}`));
 }
 function findMaskingPins(files) {
   return files.filter(
-    (file) => file.isPinned && file.status === "behind" && file.existsInFork && file.existsInUpstream
+    (file) => file.isPinned && !isManagedFile(file.path) && file.status === "behind" && file.existsInFork && file.existsInUpstream
   );
 }
 function printMaskingPinWarning(files) {
@@ -1377,6 +1428,23 @@ async function getFileChanges(cwd, baseRef, targetRef) {
   }
   return changes;
 }
+async function getDiffStat(cwd, fromRef, toRef, paths = []) {
+  const args = ["diff", "--numstat", "--no-renames", fromRef, toRef];
+  if (paths.length > 0) args.push("--", ...paths);
+  const out = await git(args, cwd, { ignoreErrors: true });
+  const stat = /* @__PURE__ */ new Map();
+  for (const line of out.split("\n")) {
+    if (!line.trim()) continue;
+    const [a, d, ...rest] = line.split("	");
+    const path4 = rest.join("	");
+    if (!path4) continue;
+    stat.set(path4, {
+      additions: a === "-" ? null : Number(a),
+      deletions: d === "-" ? null : Number(d)
+    });
+  }
+  return stat;
+}
 async function getFileHashesAtRef(cwd, ref) {
   const output = await git(["ls-tree", "-r", ref], cwd);
   const hashes = /* @__PURE__ */ new Map();
@@ -1747,6 +1815,7 @@ async function analyzeRefs(repoPath, localRef, incomingRef, mergeBaseRef, predic
   );
   const analyzedFiles = [];
   const handledOldPaths = /* @__PURE__ */ new Set();
+  const renamedProtected = /* @__PURE__ */ new Set();
   let processed = 0;
   for (const filePath of allFiles) {
     if (handledOldPaths.has(filePath)) continue;
@@ -1785,8 +1854,13 @@ async function analyzeRefs(repoPath, localRef, incomingRef, mergeBaseRef, predic
       handledOldPaths.add(oldPath);
       const forkModifiedOld = forkOldHash !== baseOldHash;
       const oldPathPinned = predicates.isPinned(oldPath);
+      let upstreamChanged2;
       if (fileIsPinned || oldPathPinned || predicates.isIgnored(oldPath)) {
         status = "pinned";
+        if (forkModifiedOld && upstreamHash !== baseOldHash) {
+          upstreamChanged2 = true;
+          renamedProtected.add(filePath);
+        }
       } else if (!oldPathInFork) {
         status = "behind";
       } else if (forkModifiedOld) {
@@ -1803,7 +1877,8 @@ async function analyzeRefs(repoPath, localRef, incomingRef, mergeBaseRef, predic
         isPinned: fileIsPinned,
         existsInFork: inFork,
         existsInUpstream: true,
-        renamedFrom
+        renamedFrom,
+        upstreamChanged: upstreamChanged2
       });
       continue;
     }
@@ -1826,26 +1901,58 @@ async function analyzeRefs(repoPath, localRef, incomingRef, mergeBaseRef, predic
       status = "identical";
     } else {
       const forkChanged = forkHash !== baseHash;
-      const upstreamChanged = upstreamHash !== baseHash;
-      if (forkChanged && upstreamChanged) {
+      const upstreamChanged2 = upstreamHash !== baseHash;
+      if (forkChanged && upstreamChanged2) {
         status = fileIsPinned ? "pinned" : "diverged";
-      } else if (forkChanged && !upstreamChanged) {
+      } else if (forkChanged && !upstreamChanged2) {
         status = fileIsPinned ? "ahead" : predicates.hard ? "behind" : "drifted";
-      } else if (!forkChanged && upstreamChanged) {
+      } else if (!forkChanged && upstreamChanged2) {
         status = "behind";
       } else {
         status = "identical";
       }
     }
+    const upstreamChanged = (fileIsPinned || fileIsIgnored) && inUpstream && upstreamHash !== baseHash && forkHash !== baseHash;
     analyzedFiles.push({
       path: filePath,
       status,
       isIgnored: fileIsIgnored,
       isPinned: fileIsPinned,
       existsInFork: inFork,
-      existsInUpstream: inUpstream
+      existsInUpstream: inUpstream,
+      upstreamChanged: upstreamChanged || void 0
     });
   }
+  const flagged = analyzedFiles.filter((file) => file.upstreamChanged && !renamedProtected.has(file.path));
+  if (flagged.length > 0) {
+    const stat = await getDiffStat(
+      repoPath,
+      mergeBaseRef,
+      incomingRef,
+      flagged.map((file) => file.path)
+    );
+    for (const file of flagged) {
+      const entry = stat.get(file.path);
+      if (entry && entry.additions !== null && entry.deletions !== null) {
+        file.upstreamChangedLines = entry.additions + entry.deletions;
+      }
+    }
+  }
+  const stale = analyzedFiles.filter(
+    (file) => file.status === "ahead" && file.isPinned && !file.isIgnored && file.existsInFork && file.existsInUpstream && forkHashes.get(file.path) !== upstreamHashes.get(file.path)
+  );
+  if (stale.length > 0) {
+    const stat = await getDiffStat(
+      repoPath,
+      incomingRef,
+      localRef,
+      stale.map((file) => file.path)
+    );
+    for (const file of stale) {
+      const deletions = stat.get(file.path)?.deletions;
+      if (deletions !== null && deletions !== void 0) file.upstreamLinesAbsent = deletions;
+    }
+  }
   return analyzedFiles;
 }
 async function enrichChangeInfo(repoPath, files, mergeBaseRef, localRef, incomingRef) {
@@ -1867,7 +1974,7 @@ async function enrichChangeInfo(repoPath, files, mergeBaseRef, localRef, incomin
         file.changedTs = info.timestamp;
         file.changedCommit = info.hash;
       }
-    } else if (file.status === "diverged" || file.status === "pinned") {
+    } else if (file.status === "diverged" || file.status === "pinned" || file.upstreamChanged) {
       const forkFileInfo = forkInfo.get(file.path);
       const upstreamFileInfo = upstreamInfo.get(file.path);
       if (forkFileInfo) {
@@ -2013,6 +2120,7 @@ async function applyDirectMerge(forkPath, upstreamRef, mergeBaseRef, config, onP
       }
     }
   }
+  const protectedConflicts = analyzedFiles.filter((file) => file.upstreamChanged).map((file) => file.path);
   const gitConflicts = await getConflictedFiles(forkPath);
   for (const filePath of gitConflicts) {
     const isProtected = isIgnored(filePath, config) || isPinnedForSync(filePath, config, config.unpinned);
@@ -2020,6 +2128,7 @@ async function applyDirectMerge(forkPath, upstreamRef, mergeBaseRef, config, onP
     if (await fileExistsAtRef(forkPath, "HEAD", filePath)) {
       onProgress?.(`\u2192 ${filePath}: keeping fork (protected conflict)`);
       await restoreToHead(forkPath, filePath);
+      if (!protectedConflicts.includes(filePath)) protectedConflicts.push(filePath);
     } else {
       onProgress?.(`\u2192 ${filePath}: removing (protected conflict, not in fork)`);
       await removeFileFully(forkPath, filePath);
@@ -2037,7 +2146,7 @@ async function applyDirectMerge(forkPath, upstreamRef, mergeBaseRef, config, onP
       await removeFileFromWorktree(forkPath, filePath);
     }
   }
-  return { remainingConflicts, analyzedFiles, autoMergedFiles };
+  return { remainingConflicts, analyzedFiles, autoMergedFiles, protectedConflicts };
 }
 function calculateSummary(files) {
   const summary = {
@@ -2130,7 +2239,7 @@ function resultMeta(config, ctx) {
 async function runSyncMerge(config, ctx, onProgress, onStep) {
   const { forkPath } = config;
   const { upstreamRef, releaseTag, mergeBase, upstreamGitHubUrl, upstreamCommit } = ctx;
-  const { remainingConflicts, analyzedFiles, autoMergedFiles } = await applyDirectMerge(
+  const { remainingConflicts, analyzedFiles, autoMergedFiles, protectedConflicts } = await applyDirectMerge(
     forkPath,
     upstreamRef,
     mergeBase,
@@ -2177,6 +2286,7 @@ async function runSyncMerge(config, ctx, onProgress, onStep) {
     summary,
     conflicts: remainingConflicts,
     autoMergedFiles,
+    protectedConflicts,
     ...resultMeta(config, ctx)
   };
 }
@@ -2213,6 +2323,7 @@ async function runAnalyzePreview(config, ctx, onProgress, onStep) {
     summary: calculateSummary(analyzedFiles),
     // For analyze mode, count diverged files as potential conflicts
     conflicts: analyzedFiles.filter((f) => f.status === "diverged").map((f) => f.path),
+    protectedConflicts: analyzedFiles.filter((f) => f.upstreamChanged).map((f) => f.path),
     ...resultMeta(config, ctx)
   };
 }
@@ -2239,7 +2350,8 @@ var scopeStatuses = {
 };
 function filterByScope(files, scope) {
   const statuses = scopeStatuses[scope];
-  return files.filter((f) => statuses.has(f.status));
+  const includeProtectedBehind = scope !== "risk";
+  return files.filter((f) => statuses.has(f.status) || includeProtectedBehind && f.upstreamChanged === true);
 }
 function findTargetFile(files, targetPath) {
   const exact = files.find((f) => f.path === targetPath);
@@ -2280,7 +2392,10 @@ async function runAnalyze(config) {
       changedAt: f.changedAt ?? null,
       changedCommit: f.changedCommit ?? null,
       upstreamChangedAt: f.upstreamChangedAt ?? null,
-      upstreamCommit: f.upstreamCommit ?? null
+      upstreamCommit: f.upstreamCommit ?? null,
+      upstreamChanged: f.upstreamChanged ?? false,
+      upstreamChangedLines: f.upstreamChangedLines ?? null,
+      upstreamLinesAbsent: f.upstreamLinesAbsent ?? null
     }));
     writeStdout(JSON.stringify(out, null, 2));
     return result;
@@ -2778,11 +2893,11 @@ function printOutdatedResults(enhancedPackages, dependentNameCache, forkPath) {
   const sortedDependents = [...dependentMap.entries()].sort((a, b) => a[0].localeCompare(b[0]));
   const maxDependentNameLen = Math.max(0, ...sortedDependents.map(([name]) => name.length));
   for (const [dependentName, { location, count }] of sortedDependents) {
-    const packageJsonPath = path2.join(location, "package.json");
-    const relativePath = path2.relative(forkPath, packageJsonPath);
+    const packageJsonPath2 = path2.join(location, "package.json");
+    const relativePath = path2.relative(forkPath, packageJsonPath2);
     const paddedName = dependentName.padEnd(maxDependentNameLen);
     console.info(
-      `  ${colors_default.dim("\u2022")} ${paddedName}  ${hyperlink(relativePath, `file://${packageJsonPath}`)} ${colors_default.dim(`${count}`)}`
+      `  ${colors_default.dim("\u2022")} ${paddedName}  ${hyperlink(relativePath, `file://${packageJsonPath2}`)} ${colors_default.dim(`${count}`)}`
     );
   }
 }
@@ -3379,21 +3494,6 @@ async function forkRefMeta(cellaPath, forkRef) {
   const [sha = forkRef.slice(0, 7), date = "unknown"] = out.split("	");
   return { sha, date };
 }
-async function diffStat(cellaPath, baseRef, ref) {
-  const out = await git(["diff", "--numstat", `${baseRef}..${ref}`], cellaPath, { ignoreErrors: true });
-  const stat = /* @__PURE__ */ new Map();
-  for (const line of out.split("\n")) {
-    if (!line.trim()) continue;
-    const [a, d, ...rest] = line.split("	");
-    const path4 = rest.join("	");
-    if (!path4) continue;
-    stat.set(path4, {
-      additions: a === "-" ? null : Number(a),
-      deletions: d === "-" ? null : Number(d)
-    });
-  }
-  return stat;
-}
 async function runContributions(config) {
   const forks = config.forks ?? [];
   if (forks.length === 0) {
@@ -3468,7 +3568,7 @@ async function runContributions(config) {
     if (countDetection(detection) > 0) {
       const { branch, appliedFiles } = await buildContribBranch(config.forkPath, baseRef, forkRef, detection, forkName);
       if (appliedFiles.length > 0) {
-        const stat = await diffStat(config.forkPath, baseRef, branch);
+        const stat = await getDiffStat(config.forkPath, baseRef, branch);
         const metaByPath = new Map(detection.files.map((f) => [f.path, f]));
         for (const path4 of [...detection.modified, ...detection.created]) {
           const fileMeta = metaByPath.get(path4);
@@ -3668,8 +3768,93 @@ function closePr(cwd, ref) {
 }
 
 // src/services/packages.ts
-import { existsSync as existsSync8, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
+import { join as join15 } from "path";
+
+// src/services/package-usage.ts
+import { existsSync as existsSync8, readFileSync as readFileSync5, statSync } from "fs";
 import { join as join14 } from "path";
+var MAX_FILE_BYTES = 1024 * 1024;
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function readSearchable(filePath) {
+  try {
+    if (statSync(filePath).size > MAX_FILE_BYTES) return "";
+    const text = readFileSync5(filePath, "utf-8");
+    return text.includes("\0") ? "" : text;
+  } catch {
+    return "";
+  }
+}
+function fileSource(forkPath, path4) {
+  let text;
+  return { path: path4, label: path4, text: () => text ??= readSearchable(join14(forkPath, path4)) };
+}
+async function readScriptsAtRef(forkPath, ref, path4) {
+  try {
+    return JSON.parse(await git(["show", `${ref}:${path4}`], forkPath)).scripts ?? {};
+  } catch {
+    return {};
+  }
+}
+async function scriptSources(forkPath, upstreamRef, baseRef, path4) {
+  let forkScripts;
+  try {
+    forkScripts = JSON.parse(readFileSync5(join14(forkPath, path4), "utf-8")).scripts ?? {};
+  } catch {
+    return [];
+  }
+  const baseScripts = await readScriptsAtRef(forkPath, baseRef, path4);
+  const upstreamScripts = await readScriptsAtRef(forkPath, upstreamRef, path4);
+  return Object.entries(forkScripts).filter(([name, value]) => value !== baseScripts[name] && value !== upstreamScripts[name]).map(([name, value]) => ({ path: path4, label: `${path4} (scripts.${name})`, text: () => value }));
+}
+function binNames(forkPath, location, name) {
+  const bareName = name.split("/").pop();
+  for (const dir of [join14(forkPath, location), forkPath]) {
+    const manifest = join14(dir, "node_modules", name, "package.json");
+    if (!existsSync8(manifest)) continue;
+    try {
+      const { bin } = JSON.parse(readFileSync5(manifest, "utf-8"));
+      if (typeof bin === "string") return [bareName];
+      return bin && typeof bin === "object" ? Object.keys(bin) : [];
+    } catch {
+      return [];
+    }
+  }
+  return [bareName];
+}
+function packagePatterns(forkPath, location, name) {
+  const specifiers = [name];
+  const typed = name.match(/^@types\/(.+)$/);
+  if (typed) specifiers.push(typed[1].includes("__") ? `@${typed[1].replace("__", "/")}` : typed[1]);
+  const patterns = specifiers.map((specifier) => new RegExp(`(['"\`])${escapeRegExp(specifier)}(?:/[^'"\`\\s]*)?\\1`));
+  for (const bin of binNames(forkPath, location, name)) {
+    patterns.push(new RegExp(`(?:^|[\\s'"\`(;&|=])${escapeRegExp(bin)}(?=$|[\\s'"\`);&|])`, "m"));
+  }
+  return patterns;
+}
+function scriptPattern(name) {
+  return new RegExp(`\\b(?:pnpm|npm|yarn|bun)\\s+(?:[^\\n;&|]*?\\s)?${escapeRegExp(name)}(?=$|[\\s'"\`);&|])`, "m");
+}
+async function loadForkUsage(forkPath, upstreamRef, baseRef) {
+  const diff = await git(["diff", "--name-only", "-z", "--diff-filter=d", upstreamRef], forkPath);
+  const sources = [];
+  for (const path4 of diff.split("\0").filter(Boolean)) {
+    if (isPackageJson(path4)) sources.push(...await scriptSources(forkPath, upstreamRef, baseRef, path4));
+    else if (!isManagedFile(path4)) sources.push(fileSource(forkPath, path4));
+  }
+  const findIn = (scoped, patterns) => scoped.find((source) => patterns.some((pattern) => pattern.test(source.text())))?.label;
+  return {
+    findPackage: (location, name) => findIn(
+      location ? sources.filter((source) => isUnderAnyFolder(source.path, [location])) : sources,
+      packagePatterns(forkPath, location, name)
+    ),
+    findScript: (name) => findIn(sources, [scriptPattern(name)])
+  };
+}
+
+// src/services/packages.ts
 function parseComparableVersion(version) {
   const trimmed = version.trim();
   if (trimmed === "" || trimmed === "*" || trimmed.includes("workspace:") || trimmed.includes("catalog:") || trimmed.includes("file:") || trimmed.includes("link:") || trimmed.includes("git+") || trimmed.includes("github:") || trimmed.includes("http://") || trimmed.includes("https://") || trimmed.includes("||")) {
@@ -3697,33 +3882,71 @@ function isHigherVersion(upstreamVersion, forkVersion) {
   if (!upCoerced || !forkCoerced) return false;
   return compareVersions(upCoerced, forkCoerced) > 0;
 }
-function safeMergeRecord(forkRecord, upstreamRecord, addOnly = false) {
+var DEPENDENCY_KEYS = [
+  "dependencies",
+  "devDependencies",
+  "peerDependencies",
+  "optionalDependencies"
+];
+function mergeRecord(forkRecord, upstreamRecord, baseRecord, { bumpHigher = true, findUse } = {}) {
   if (!upstreamRecord) return void 0;
   const merged = { ...forkRecord || {} };
+  const base = baseRecord || {};
   const added = [];
-  let changed = false;
+  const updated = [];
+  const removed = [];
+  const kept = [];
   for (const [name, upstreamValue] of Object.entries(upstreamRecord)) {
     const forkValue = merged[name];
     if (forkValue === void 0) {
+      if (name in base) continue;
       merged[name] = upstreamValue;
       added.push(name);
-      changed = true;
-    } else if (!addOnly && forkValue !== upstreamValue && isHigherVersion(upstreamValue, forkValue)) {
+    } else if (forkValue === upstreamValue) {
+    } else if (base[name] === forkValue) {
       merged[name] = upstreamValue;
-      changed = true;
+      updated.push(name);
+    } else if (bumpHigher && isHigherVersion(upstreamValue, forkValue)) {
+      merged[name] = upstreamValue;
+      updated.push(name);
+    }
+  }
+  for (const [name, forkValue] of Object.entries(merged)) {
+    if (name in upstreamRecord) continue;
+    if (base[name] === void 0 || base[name] !== forkValue) continue;
+    const usedAt = findUse?.(name);
+    if (usedAt) {
+      kept.push({ name, usedAt });
+      continue;
     }
+    delete merged[name];
+    removed.push(name);
   }
   const sorted = Object.fromEntries(Object.entries(merged).sort(([a], [b]) => a.localeCompare(b)));
-  return { merged: sorted, changed, added };
-}
-function safeMergePnpm(forkPnpm, upstreamPnpm) {
+  const changed = added.length + updated.length + removed.length > 0;
+  return { merged: sorted, changed, added, updated, removed, kept };
+}
+function isSubpathMap(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+  return Object.keys(value).every((name) => name.startsWith("."));
+}
+function safeMergeExports(forkExports, upstreamExports) {
+  if (!isSubpathMap(upstreamExports)) return void 0;
+  if (forkExports !== void 0 && !isSubpathMap(forkExports)) return void 0;
+  const merged = { ...forkExports || {} };
+  const added = Object.keys(upstreamExports).filter((name) => !(name in merged));
+  for (const name of added) merged[name] = upstreamExports[name];
+  return { merged, changed: added.length > 0, added };
+}
+function safeMergePnpm(forkPnpm, upstreamPnpm, basePnpm) {
   if (!upstreamPnpm) return void 0;
   const merged = { ...forkPnpm || {} };
   let changed = false;
   if (upstreamPnpm.overrides) {
-    const result = safeMergeRecord(
+    const result = mergeRecord(
       merged.overrides,
-      upstreamPnpm.overrides
+      upstreamPnpm.overrides,
+      basePnpm?.overrides
     );
     if (result?.changed) {
       merged.overrides = result.merged;
@@ -3731,18 +3954,15 @@ function safeMergePnpm(forkPnpm, upstreamPnpm) {
     }
   }
   if (upstreamPnpm.patchedDependencies) {
-    const forkPatched = merged.patchedDependencies || {};
-    const upstreamPatched = upstreamPnpm.patchedDependencies;
-    for (const [name, value] of Object.entries(upstreamPatched)) {
-      if (!(name in forkPatched)) {
-        forkPatched[name] = value;
-        changed = true;
-      }
-    }
-    if (changed || !merged.patchedDependencies) {
-      merged.patchedDependencies = Object.fromEntries(
-        Object.entries(forkPatched).sort(([a], [b]) => a.localeCompare(b))
-      );
+    const result = mergeRecord(
+      merged.patchedDependencies,
+      upstreamPnpm.patchedDependencies,
+      basePnpm?.patchedDependencies,
+      { bumpHigher: false }
+    );
+    if (result?.changed) {
+      merged.patchedDependencies = result.merged;
+      changed = true;
     }
   }
   if (upstreamPnpm.packageExtensions) {
@@ -3773,9 +3993,9 @@ function safeMergePnpm(forkPnpm, upstreamPnpm) {
   return { merged, changed };
 }
 function readPackageJson(filePath) {
-  if (!existsSync8(filePath)) return null;
+  if (!existsSync9(filePath)) return null;
   try {
-    return JSON.parse(readFileSync5(filePath, "utf-8"));
+    return JSON.parse(readFileSync6(filePath, "utf-8"));
   } catch {
     return null;
   }
@@ -3784,31 +4004,50 @@ function writePackageJson(filePath, data) {
   writeFileSync4(filePath, `${JSON.stringify(data, null, 2)}
 `, "utf-8");
 }
-async function getUpstreamPackageJson(forkPath, upstreamRef, relativePath) {
-  const filePath = relativePath ? `${relativePath}/package.json` : "package.json";
+function packageJsonPath(relativePath) {
+  return relativePath ? `${relativePath}/package.json` : "package.json";
+}
+async function readPackageJsonAtRef(forkPath, ref, relativePath) {
   try {
-    return JSON.parse(await git(["show", `${upstreamRef}:${filePath}`], forkPath));
+    const raw = await git(["show", `${ref}:${packageJsonPath(relativePath)}`], forkPath);
+    return { raw, data: JSON.parse(raw) };
   } catch {
     return null;
   }
 }
 async function discoverPackageLocations(forkPath, upstreamRef) {
   const stdout = await git(["ls-tree", "-r", "--name-only", upstreamRef], forkPath, { ignoreErrors: true });
-  const upstreamPaths = stdout.split("\n").filter((p) => p.endsWith("/package.json") || p === "package.json").map((p) => p === "package.json" ? "" : p.replace("/package.json", ""));
-  return upstreamPaths.filter((loc) => existsSync8(join14(forkPath, loc, "package.json")));
+  return stdout.split("\n").filter((p) => p.endsWith("/package.json") || p === "package.json").map((p) => p === "package.json" ? "" : p.replace("/package.json", ""));
+}
+async function resolveMergeBase(forkPath, upstreamRef) {
+  try {
+    return (await getEffectiveMergeBase(forkPath, "HEAD", upstreamRef)).base || null;
+  } catch {
+    return null;
+  }
 }
-async function syncPackageJson(forkPath, upstreamRef, relativePath, keysToSync) {
+async function syncPackageJson(config, baseRef, usage, relativePath, keysToSync) {
+  const { forkPath, upstreamRef } = config;
   const changes = [];
-  const pkgPath = join14(forkPath, relativePath, "package.json");
+  const kept = [];
+  const pkgRelPath = packageJsonPath(relativePath);
+  const pkgPath = join15(forkPath, pkgRelPath);
   const forkPkg = readPackageJson(pkgPath);
-  const upstreamPkg = await getUpstreamPackageJson(forkPath, upstreamRef, relativePath);
-  if (!forkPkg || !upstreamPkg) {
-    return { updated: false, changes };
+  const upstream = await readPackageJsonAtRef(forkPath, upstreamRef, relativePath);
+  const basePkg = baseRef ? (await readPackageJsonAtRef(forkPath, baseRef, relativePath))?.data : void 0;
+  if (!upstream) return { updated: false, changes, kept };
+  if (!forkPkg) {
+    const workspaceArrived = relativePath !== "" && existsSync9(join15(forkPath, relativePath));
+    if (basePkg || !workspaceArrived || isIgnored(pkgRelPath, config)) return { updated: false, changes, kept };
+    writeFileSync4(pkgPath, upstream.raw.endsWith("\n") ? upstream.raw : `${upstream.raw}
+`, "utf-8");
+    return { updated: true, changes: ["copied from upstream (new workspace)"], kept };
   }
+  const upstreamPkg = upstream.data;
   let updated = false;
   for (const key of keysToSync) {
     if (key === "pnpm") {
-      const result2 = safeMergePnpm(forkPkg.pnpm, upstreamPkg.pnpm);
+      const result2 = safeMergePnpm(forkPkg.pnpm, upstreamPkg.pnpm, basePkg?.pnpm);
       if (result2?.changed) {
         forkPkg.pnpm = result2.merged;
         updated = true;
@@ -3819,59 +4058,88 @@ async function syncPackageJson(forkPath, upstreamRef, relativePath, keysToSync)
     if (key === "packageManager") {
       const upstreamValue2 = upstreamPkg[key];
       const forkValue2 = forkPkg[key];
+      const baseValue2 = basePkg?.[key];
       if (upstreamValue2 && !forkValue2) {
+        if (baseValue2) continue;
         forkPkg[key] = upstreamValue2;
         updated = true;
         changes.push(`${key}: added`);
-      } else if (upstreamValue2 && forkValue2 && upstreamValue2 !== forkValue2 && isHigherVersion(upstreamValue2, forkValue2)) {
+      } else if (upstreamValue2 && forkValue2 && upstreamValue2 !== forkValue2 && (forkValue2 === baseValue2 || isHigherVersion(upstreamValue2, forkValue2))) {
         forkPkg[key] = upstreamValue2;
         updated = true;
-        changes.push(`${key}: bumped`);
+        changes.push(`${key}: updated`);
+      }
+      continue;
+    }
+    if (key === "exports") {
+      const result2 = safeMergeExports(forkPkg.exports, upstreamPkg.exports);
+      if (result2?.changed) {
+        forkPkg.exports = result2.merged;
+        updated = true;
+        changes.push(...result2.added.map((name) => `exports.${name}: added`));
       }
       continue;
     }
     const forkValue = forkPkg[key];
     const upstreamValue = upstreamPkg[key];
-    const addOnly = key === "scripts";
-    const result = safeMergeRecord(forkValue, upstreamValue, addOnly);
+    const baseValue = basePkg?.[key];
+    let findUse;
+    if (usage && key === "scripts") findUse = (name) => usage.findScript(name);
+    else if (usage && DEPENDENCY_KEYS.includes(key)) findUse = (name) => usage.findPackage(relativePath, name);
+    const result = mergeRecord(forkValue, upstreamValue, baseValue, { bumpHigher: key !== "scripts", findUse });
+    kept.push(...(result?.kept ?? []).map(({ name, usedAt }) => `${key}.${name}: used in ${usedAt}`));
     if (result?.changed) {
       forkPkg[key] = result.merged;
       updated = true;
-      if (addOnly) {
-        changes.push(...result.added.map((name) => `scripts.${name}: added`));
-      } else {
-        changes.push(`${key}: merged`);
-      }
+      changes.push(
+        ...result.added.map((name) => `${key}.${name}: added`),
+        ...result.updated.map((name) => `${key}.${name}: updated`),
+        ...result.removed.map((name) => `${key}.${name}: removed`)
+      );
     }
   }
   if (updated) {
     writePackageJson(pkgPath, forkPkg);
   }
-  return { updated, changes };
+  return { updated, changes, kept };
 }
 async function runPackages(config, options = {}) {
   createSpinner("syncing package.json files...");
   const keysToSync = config.settings.packageJsonSync || ["dependencies", "devDependencies"];
   const conflictedSet = new Set(options.conflictedFiles ?? []);
+  const baseRef = await resolveMergeBase(config.forkPath, config.upstreamRef);
+  const usage = baseRef ? await loadForkUsage(config.forkPath, config.upstreamRef, baseRef) : null;
   const locations = await discoverPackageLocations(config.forkPath, config.upstreamRef);
-  let changedCount = 0;
+  const reports = [];
   const skipped = [];
   for (const location of locations) {
-    const pkgRelPath = location ? `${location}/package.json` : "package.json";
+    const pkgRelPath = packageJsonPath(location);
     if (conflictedSet.has(pkgRelPath)) {
       skipped.push(pkgRelPath);
       continue;
     }
     spinnerText(`syncing ${location || "root"}/package.json...`);
-    const { updated } = await syncPackageJson(config.forkPath, config.upstreamRef, location, keysToSync);
-    if (updated) {
-      changedCount += 1;
-    }
+    const { updated, changes, kept: kept2 } = await syncPackageJson(config, baseRef, usage, location, keysToSync);
+    if (updated || kept2.length > 0) reports.push({ path: pkgRelPath, changes, kept: kept2 });
   }
+  const changedCount = reports.filter(({ changes }) => changes.length > 0).length;
   spinnerSuccess(
     "package sync complete",
     `${changedCount} package.json${changedCount === 1 ? " was" : "s were"} changed`
   );
+  for (const { path: path4, changes } of reports) {
+    if (changes.length === 0) continue;
+    console.info(`  ${path4}`);
+    for (const change of changes) console.info(`    ${colors_default.dim(change)}`);
+  }
+  const kept = reports.flatMap(({ path: path4, kept: kept2 }) => kept2.map((entry) => `${path4} ${entry}`));
+  if (kept.length > 0) {
+    console.info();
+    console.warn(
+      `${warningMark} kept ${kept.length} ${kept.length === 1 ? "entry" : "entries"} upstream dropped, the fork still uses ${kept.length === 1 ? "it" : "them"}:`
+    );
+    for (const entry of kept) console.warn(`    ${colors_default.dim("\u2192")} ${entry}`);
+  }
   if (skipped.length > 0) {
     console.info();
     console.warn(
@@ -4356,7 +4624,7 @@ async function runForks(config) {
 
 // src/services/stats.ts
 import { readFile as readFile2 } from "fs/promises";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 
 // src/utils/coverage-utils.ts
 import { spawnSync as spawnSync4 } from "child_process";
@@ -4367,6 +4635,7 @@ function summaryPath(forkPath) {
   return path3.join(forkPath, ".coverage", "coverage-summary.json");
 }
 function colorPct(pct) {
+  if (typeof pct !== "number" || !Number.isFinite(pct)) return colors_default.dim("n/a");
   const label = `${pct.toFixed(2)}%`;
   if (pct >= 80) return colors_default.green(label);
   if (pct >= 50) return colors_default.yellow(label);
@@ -4429,6 +4698,11 @@ function printCoverageSummary(forkPath, options = {}) {
   if (stale) {
     console.info(colors_default.yellow("  \u26A0 data is older than 7 days \u2014 run `pnpm test` to refresh"));
   }
+  if (!Object.keys(summary).some((key) => key !== "total")) {
+    console.info(colors_default.yellow("  no coverage data found \u2014 run `pnpm test` to regenerate"));
+    console.info();
+    return;
+  }
   const total = summary.total;
   console.info(
     `  ${colors_default.bold("overall")}  lines ${colorPct(total.lines.pct)} ${colors_default.dim(`(${total.lines.covered}/${total.lines.total})`)}  funcs ${colorPct(total.functions.pct)}  branches ${colorPct(total.branches.pct)}`
@@ -4444,7 +4718,7 @@ function printCoverageSummary(forkPath, options = {}) {
 // src/services/stats.ts
 var sourceExtensions = /* @__PURE__ */ new Set(["ts", "tsx", "js", "jsx", "mjs", "cjs", "json", "jsonc", "css", "html"]);
 async function getWorkspacePackages(forkPath) {
-  const content = await readFile2(join16(forkPath, "pnpm-workspace.yaml"), "utf-8");
+  const content = await readFile2(join17(forkPath, "pnpm-workspace.yaml"), "utf-8");
   return parseYamlBlockList(content, "packages").map((pattern) => {
     if (pattern.endsWith("/*")) {
       const base = pattern.slice(0, -2);
@@ -4607,7 +4881,7 @@ function getForkPath() {
   const envPath = getEnv("CELLA_FORK_PATH");
   if (envPath) {
     const resolved = resolve6(envPath);
-    if (!existsSync10(resolved) || !statSync2(resolved).isDirectory()) {
+    if (!existsSync11(resolved) || !statSync3(resolved).isDirectory()) {
       throw new Error(`CELLA_FORK_PATH is not a valid directory: ${resolved}`);
     }
     return resolved;
@@ -4619,7 +4893,7 @@ function getForkPath() {
   return cwd;
 }
 async function preflight(forkPath) {
-  if (!existsSync10(join17(forkPath, ".git"))) {
+  if (!existsSync11(join18(forkPath, ".git"))) {
     throw new Error(`not a git repository: ${forkPath}`);
   }
 }