@pygmalionjs/pygmalion 0.5.12 → 0.5.13

package/node/dev-mirror.mjs

@@ -253,13 +253,30 @@ export async function listSourceRefs(repoRoot, remote = 'origin') {
       .filter((parts) => parts.length === 3 && parts[0])
       .map(([name, commit, fullName]) => ({ name, commit, fullName }));
   };
-  const locals = (await read('refs/heads')).map((item) => ({ ...item, kind: 'local' }));
   const remotes = (await read(`refs/remotes/${remote}`))
     // `%(refname:short)` may abbreviate refs/remotes/origin/HEAD to just
     // `origin`, so the full ref is the only reliable way to remove the
     // symbolic remote default from the branch picker.
     .filter((item) => !item.fullName.endsWith('/HEAD'))
     .map((item) => ({ ...item, kind: 'remote' }));
+  // `commit` is what SELECTING this entry would render, not what the listed ref
+  // happens to point at. Choosing a branch name repoints the mirror at that
+  // branch on the remote (syncDevMirrorWorktree fetches and resolves
+  // `<remote>/<name>`), so a local branch has to report its remote tip. Reading
+  // refs/heads instead made an editor name an OLDER commit as the update target
+  // whenever the local ref lagged behind what the mirror had already fetched —
+  // `dev@a0d5fdbf → 3e8cca5b`, an invitation to go backwards.
+  const remoteTipPrefix = `refs/remotes/${remote}/`;
+  const remoteTips = new Map(
+    remotes.map((item) => [item.fullName.slice(remoteTipPrefix.length), item.commit]),
+  );
+  const locals = (await read('refs/heads')).map((item) => ({
+    ...item,
+    // A branch the remote does not have resolves locally (the fetch fails and
+    // becomes a warning), so its own tip is the honest answer there.
+    commit: remoteTips.get(item.name) ?? item.commit,
+    kind: 'local',
+  }));
   const seen = new Set();
   return [...locals, ...remotes].filter((item) => {
     if (seen.has(item.name)) return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pygmalionjs/pygmalion",
-  "version": "0.5.12",
+  "version": "0.5.13",
   "description": "Code-backed DOM design sandbox and visual QA editor",
   "license": "UNLICENSED",
   "publishConfig": {