@cellajs/cli 0.1.1 → 0.2.1

package/dist/index.js

@@ -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.1.1",
+  version: "0.2.1",
   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");
@@ -646,16 +679,32 @@ function printSyncComplete(result, options = {}) {
   if (options.stagedBranch) {
     console.info(`${colors_default.green("\u2713")} Sync merge staged on '${options.stagedBranch}'`);
     console.info(
-      colors_default.dim(
-        `  ${updated} files updated, ${merged} auto-merged, ${conflicts} conflicts. Review, then rerun \`pnpm cella sync\` to finish.`
-      )
+      colors_default.dim(`  ${updated} files updated, ${merged} auto-merged, ${conflicts} conflicts. Committing next...`)
     );
   } else {
     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
@@ -1379,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();
@@ -1749,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;
@@ -1787,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) {
@@ -1805,7 +1877,8 @@ async function analyzeRefs(repoPath, localRef, incomingRef, mergeBaseRef, predic
         isPinned: fileIsPinned,
         existsInFork: inFork,
         existsInUpstream: true,
-        renamedFrom
+        renamedFrom,
+        upstreamChanged: upstreamChanged2
       });
       continue;
     }
@@ -1828,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) {
@@ -1869,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) {
@@ -2015,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);
@@ -2022,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);
@@ -2039,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 = {
@@ -2132,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,
@@ -2179,6 +2286,7 @@ async function runSyncMerge(config, ctx, onProgress, onStep) {
     summary,
     conflicts: remainingConflicts,
     autoMergedFiles,
+    protectedConflicts,
     ...resultMeta(config, ctx)
   };
 }
@@ -2215,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)
   };
 }
@@ -2241,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);
@@ -2282,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;
@@ -3381,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) {
@@ -3470,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);
@@ -3718,6 +3816,18 @@ function safeMergeRecord(forkRecord, upstreamRecord, addOnly = false) {
   const sorted = Object.fromEntries(Object.entries(merged).sort(([a], [b]) => a.localeCompare(b)));
   return { merged: sorted, changed, added };
 }
+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) {
   if (!upstreamPnpm) return void 0;
   const merged = { ...forkPnpm || {} };
@@ -3832,6 +3942,15 @@ async function syncPackageJson(forkPath, upstreamRef, relativePath, keysToSync)
       }
       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";
@@ -4114,7 +4233,7 @@ async function runSyncCycle(config) {
   }
   return { status: "staged", branch };
 }
-async function resumeSyncMerge(config, branch) {
+async function commitSyncMerge(config, branch) {
   const { forkPath } = config;
   const conflicts = await getConflictedFiles(forkPath);
   console.info();
@@ -4137,7 +4256,12 @@ async function resumeSyncMerge(config, branch) {
   await commitSquash(forkPath, message);
   console.info();
   console.info(colors_default.green(`committed the sync on '${branch}' as '${message}'.`));
-  await shipSyncBranch(config, branch);
+  printTriageSteps(branch);
+}
+function printTriageSteps(branch) {
+  console.info(colors_default.dim(`staying on '${branch}' without pushing.`));
+  console.info(colors_default.dim("  run drift triage (`pnpm cella analyze`), commit any follow-ups, then:"));
+  console.info(colors_default.dim("  pnpm cella sync   (pushes the branch and opens the PR)"));
 }
 async function mergeOpenSyncPrs(config, open) {
   const { forkPath, settings } = config;
@@ -4202,7 +4326,7 @@ async function runSyncCommand(config) {
   const currentBranch = await getCurrentBranch(forkPath);
   const onSyncBranch = isTemporarySyncBranch(currentBranch);
   if (onSyncBranch && mergeInProgress(forkPath)) {
-    await resumeSyncMerge(config, currentBranch);
+    await commitSyncMerge(config, currentBranch);
     return;
   }
   if (onSyncBranch) {
@@ -4231,9 +4355,11 @@ commit them first (\`git commit --amend --no-edit\` or a new commit).`
   if (outcome.status === "conflicts") {
     console.info(`${warningMark} ${colors_default.yellow(`conflicts on '${temporaryBranch}'. Resolve and stage them, then:`)}`);
     printFinishSteps();
-    console.info(colors_default.dim("  rerun commits the sync, pushes the branch, and opens a PR."));
+    console.info(colors_default.dim("  rerun commits the sync and stops for drift triage; a further rerun ships (push + PR)."));
     console.info(colors_default.dim("  let the rerun commit \u2014 a manual `git commit` records a merge commit that bloats the PR."));
+    return;
   }
+  await commitSyncMerge(config, temporaryBranch);
 }
 
 // src/services/forks.ts