sidecarsync 2.0.0 → 2.0.1

package/README.md

@@ -1,9 +1,9 @@
 <p align="center">
-  <img src="https://raw.githubusercontent.com/anteprojector/sidecar/main/packages/marketing/branding/readme-hero.svg" alt="sidecar" width="420" />
+  <img src="https://raw.githubusercontent.com/endograph/sidecar/main/packages/marketing/branding/readme-hero.svg" alt="sidecar" width="420" />
 </p>
 
 <p align="center">
-  <a href="https://anteprojector.github.io/sidecar/">Website</a> ·
+  <a href="https://endograph.github.io/sidecar/">Website</a> ·
   <a href="#quickstart">Quickstart</a> ·
   <a href="docs/commands.md">Commands</a> ·
   <a href="https://www.npmjs.com/package/sidecarsync">npm</a>
@@ -11,7 +11,7 @@
 
 # sidecar
 
-[![CI](https://github.com/anteprojector/sidecar/actions/workflows/ci.yml/badge.svg)](https://github.com/anteprojector/sidecar/actions/workflows/ci.yml)
+[![CI](https://github.com/endograph/sidecar/actions/workflows/ci.yml/badge.svg)](https://github.com/endograph/sidecar/actions/workflows/ci.yml)
 [![npm](https://img.shields.io/npm/v/sidecarsync)](https://www.npmjs.com/package/sidecarsync)
 [![license](https://img.shields.io/npm/l/sidecarsync)](LICENSE)
 [![node](https://img.shields.io/node/v/sidecarsync)](https://nodejs.org)

package/dist/cli.js

@@ -4815,7 +4815,7 @@ function bootstrapMainBranch(repo, config) {
 
 Scratch space for a code repository: plans, notes, and agent context.
 This is a plain git repo you own — read it, edit it, clone it anywhere.
-Kept in sync by [sidecar](https://github.com/anteprojector/sidecar).
+Kept in sync by [sidecar](https://github.com/endograph/sidecar).
 `, "utf8");
   git(repo, ["add", "README.md"]);
   git(repo, ["commit", "-m", "Initialize sidecar"]);
@@ -5209,7 +5209,8 @@ function resolveLastWriterWins(repo, canonicalBranch, remoteBranch, selectedPath
     const oursChanged = oursWrite.source !== baseWrite.source;
     const theirsChanged = theirsWrite.source !== baseWrite.source;
     const incoming = oursChanged !== theirsChanged ? theirsChanged : theirsAt > oursAt || theirsAt === oursAt && entryKey(theirs) > entryKey(ours);
-    return { filePath, ours, theirs, incoming, winner: incoming ? theirs : ours, write: incoming ? theirsWrite : oursWrite };
+    const conflict = oursChanged && theirsChanged && entryKey(ours) !== entryKey(theirs);
+    return { filePath, ours, theirs, incoming, conflict, winner: incoming ? theirs : ours, write: incoming ? theirsWrite : oursWrite };
   });
   const selected = new Set(selections.map((entry) => entry.filePath));
   const indexed = new Set(git(repo, ["ls-files", "-z"]).stdout.split("\x00").filter(Boolean));
@@ -5229,30 +5230,33 @@ function resolveLastWriterWins(repo, canonicalBranch, remoteBranch, selectedPath
     }
   }
   const written = [];
-  for (const { filePath, ours, theirs, incoming, winner, write } of selections) {
+  for (const { filePath, ours, theirs, incoming, conflict, winner, write } of selections) {
     if (winner) {
       git(repo, ["restore", `--source=${incoming ? remoteBranch : "HEAD"}`, "--staged", "--worktree", "--", `:(literal)${filePath}`]);
       git(repo, ["add", "--renormalize", "--", `:(literal)${filePath}`]);
     }
-    manifest.paths.push({
-      path: filePath,
-      kept: incoming ? branch : canonicalBranch,
-      kept_at: write.time,
-      dropped: incoming ? canonicalBranch : branch,
-      dropped_oid: (incoming ? ours : theirs)?.oid ?? null
-    });
+    if (conflict)
+      manifest.paths.push({
+        path: filePath,
+        kept: incoming ? branch : canonicalBranch,
+        kept_at: write.time,
+        dropped: incoming ? canonicalBranch : branch,
+        dropped_oid: (incoming ? ours : theirs)?.oid ?? null
+      });
     written.push(lwwWrittenTrailer(filePath, write));
   }
-  const manifestDir = path8.join(repo, ".sidecar-conflicts");
-  fs8.mkdirSync(manifestDir, { recursive: true });
-  const manifestPath = path8.join(manifestDir, `${timestamp}-${fileLabel(branch)}-lww.json`);
-  fs8.writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}
+  if (manifest.paths.length) {
+    const manifestDir = path8.join(repo, ".sidecar-conflicts");
+    fs8.mkdirSync(manifestDir, { recursive: true });
+    const manifestPath = path8.join(manifestDir, `${timestamp}-${fileLabel(branch)}-lww.json`);
+    fs8.writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}
 `, "utf8");
-  git(repo, ["add", "--", `:(literal)${path8.relative(repo, manifestPath)}`]);
+    git(repo, ["add", "--", `:(literal)${path8.relative(repo, manifestPath)}`]);
+  }
   if (Object.keys(selectConflictPaths(unmergedPaths(repo), selectedPaths)).length) {
     throw new SidecarError("last-writer-wins did not clear all unmerged paths");
   }
-  console.log(`selected ${manifest.paths.length} complete file version(s) by last writer`);
+  console.log(`selected ${selections.length} complete file version(s) by last writer`);
   return written;
 }
 function entryKey(entry) {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "sidecarsync",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A Git-backed sidecar inbox for repo-local development metadata.",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/anteprojector/sidecar.git",
+    "url": "git+https://github.com/endograph/sidecar.git",
     "directory": "packages/sidecar"
   },
   "publishConfig": {
@@ -45,5 +45,9 @@
     "ignore": "^7.0.8",
     "picomatch": "^4.0.5",
     "smol-toml": "^1.7.0"
+  },
+  "homepage": "https://github.com/endograph/sidecar/tree/main/packages/sidecar#readme",
+  "bugs": {
+    "url": "https://github.com/endograph/sidecar/issues"
   }
 }