@cellajs/cli 0.1.0 → 0.2.0

package/README.md

@@ -79,16 +79,18 @@ pnpm cella sync --track branch   # follow the tip once, without editing config
 main ──▶ cella/sync/<stamp> ──(3-way merge)──▶ PR ──(squash)──▶ main
 ```
 
-It runs a real git 3-way merge and leaves the result **staged** — it never auto-commits on the
-first pass. `sync` is **idempotent and two-phase**:
-
-1. **First run** cuts the branch and stages the merge, then stops so you can review (and resolve
-   any conflicts in your IDE — `git add` the resolved files).
-2. **Re-run `pnpm cella sync`** on the same branch to finish: it reconciles dependencies
-   (`pnpm install` + `pnpm check`), stages everything, commits the delta, pushes to `origin`,
+It runs a real git 3-way merge. `sync` is **idempotent and staged**: each run advances the sync
+one stage, and the run that commits never ships — the pause on the committed branch is where
+drift triage (`pnpm cella analyze` diffs committed HEAD) and follow-up commits happen.
+
+1. **First run** cuts the branch and merges. A clean merge is committed right away: dependencies
+   are reconciled (`pnpm install` + `pnpm check`), everything is staged, and the delta is
+   committed — then the run stops on the branch. A conflicted merge stops earlier so you can
+   resolve in your IDE (`git add` the resolved files) and re-run to commit.
+2. **Final re-run `pnpm cella sync`** on the committed branch ships it: pushes to `origin`,
    opens a PR into `main` (via `gh`), and switches you back to `main`.
 
-When you commit, the in-progress merge state (`MERGE_HEAD`) is discarded, so the staged delta
+When the commit stage runs, the in-progress merge state (`MERGE_HEAD`) is discarded, so the staged delta
 collapses into a **single-parent commit** (`chore: sync upstream cella <sha>`). This keeps the PR
 to one clean commit with the incremental diff — a two-parent merge commit would instead list the
 upstream branch's entire history, because the fork doesn't share pushed ancestry with upstream

package/dist/index.js

@@ -97,11 +97,16 @@ var cellaConfigSchema = z.object({
 
 // src/utils/managed-files.ts
 var CONFIG_FILE = "cella/cella.config.ts";
+var LEGACY_CONFIG_FILE = "cella.config.ts";
+var CONFIG_FILE_PATHS = [CONFIG_FILE, LEGACY_CONFIG_FILE];
+function isConfigFile(filePath) {
+  return CONFIG_FILE_PATHS.includes(filePath);
+}
 function isPackageJson(filePath) {
   return filePath === "package.json" || filePath.endsWith("/package.json");
 }
 function isManagedFile(filePath) {
-  return isPackageJson(filePath) || filePath === "pnpm-lock.yaml" || filePath === CONFIG_FILE;
+  return isPackageJson(filePath) || filePath === "pnpm-lock.yaml" || isConfigFile(filePath);
 }
 
 // src/utils/module-territory.ts
@@ -210,7 +215,7 @@ import process4 from "process";
 // package.json
 var package_default = {
   name: "@cellajs/cli",
-  version: "0.1.0",
+  version: "0.2.0",
   private: false,
   license: "MIT",
   description: "CLI for managing your monorepo and syncing with upstream Cella.",
@@ -641,9 +646,7 @@ 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`);
@@ -651,6 +654,30 @@ function printSyncComplete(result, options = {}) {
   }
   console.info();
 }
+function findMaskingPins(files) {
+  return files.filter(
+    (file) => file.isPinned && file.status === "behind" && file.existsInFork && file.existsInUpstream
+  );
+}
+function printMaskingPinWarning(files) {
+  const masking = findMaskingPins(files);
+  if (masking.length === 0) return;
+  const many = masking.length > 1;
+  console.info();
+  console.info(
+    `${warningMark} ${colors_default.yellow(
+      `${masking.length} pinned ${many ? "files match" : "file matches"} the previous upstream but changed upstream \u2014`
+    )}`
+  );
+  console.info(colors_default.yellow("  the pin keeps the old fork copy and silently drops those upstream changes:"));
+  for (const file of masking) {
+    console.info(colors_default.dim(`  \u2A00 ${file.path}`));
+  }
+  console.info(
+    colors_default.yellow("  If the fork never customized these, unpin them in cella/cella.config.ts to take upstream.")
+  );
+  console.info();
+}
 function printFlagWarnings(options) {
   const { hard, unpinned } = options;
   if (!hard && !unpinned) return;
@@ -2294,6 +2321,7 @@ async function runAnalyze(config) {
   };
   printAnalysisFileGroups(result.files, linkOptions);
   printSummary(result.summary, "analysis summary");
+  printMaskingPinWarning(result.files);
   if (config.logFile) {
     const logPath = writeLogFile(config.forkPath, result.files);
     console.info();
@@ -3908,6 +3936,7 @@ async function runSync(config, options) {
     spinnerFail("sync completed with conflicts");
   }
   printSummary(result.summary, "merge summary");
+  printMaskingPinWarning(result.files);
   if (config.logFile) {
     const logPath = writeLogFile(config.forkPath, result.files);
     console.info();
@@ -4083,7 +4112,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();
@@ -4106,7 +4135,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;
@@ -4171,7 +4205,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) {
@@ -4200,9 +4234,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