sidecarsync 1.1.0 → 1.3.0

package/README.md

@@ -86,7 +86,7 @@ Sidecar takes over branch management there —
 - [Standalone repos](docs/standalone.md) — a repo that is its own sidecar
 - [Redaction](docs/redaction.md) — what's stripped from pushes, reviewing it, opting out
 - [Editor search visibility](docs/editors.md) — making gitignored files searchable
-- [Global vs local installs](docs/install.md) — pinning sidecar per-repo
+- [Global vs local installs](docs/install.md) — the newest install wins
 - [All commands](docs/commands.md)
 - [Uninstall & troubleshooting](docs/uninstall.md) — removing the daemon, service, and state
 

package/dist/cli.js

@@ -238,6 +238,15 @@ function projectDependsOnSidecar(projectRoot) {
     return false;
   }
 }
+function installedPackageVersion(projectRoot) {
+  const manifestPath = path2.join(projectRoot, "node_modules", PACKAGE_NAME, "package.json");
+  try {
+    const manifest = JSON.parse(fs2.readFileSync(manifestPath, "utf8"));
+    return manifest.name === PACKAGE_NAME ? manifest.version : undefined;
+  } catch {
+    return;
+  }
+}
 function shouldUseGlobalRegistry() {
   return process.env[GLOBAL_EXEC_ENV] === "1" || !findDependencyRoot(process.cwd());
 }
@@ -3696,7 +3705,7 @@ function cmdStatus(args) {
   statusLine("main branch", config.branch);
   statusLine("inbox branch", inbox);
   if (!checkoutPresent) {
-    statusLine("checkout", "missing", "bad");
+    statusLine("checkout", "missing — run `sidecar init`", "bad");
     printDaemonLine();
     printLastSyncLine(root);
     return 0;
@@ -3737,6 +3746,7 @@ function cmdStatusJson() {
     branch: config.branch,
     inbox,
     checkout: checkoutPresent ? "present" : "missing",
+    globalInstall: shouldUseGlobalRegistry() || Boolean(findGlobalSidecarExecutable()),
     currentBranch: branch || undefined,
     dirty: checkoutPresent ? Boolean(git(sidecarPath, ["status", "--porcelain"]).stdout.trim()) : undefined,
     daemon: daemonHealth().text,
@@ -3752,8 +3762,12 @@ function pendingStatusInboxBranches(sidecarPath, config) {
   return pendingInboxBranches(sidecarPath, config).filter((remoteBranch) => !isAncestor(sidecarPath, remoteBranch, base));
 }
 function daemonHealth() {
-  if (!shouldUseGlobalRegistry())
-    return { text: "no global install", role: "quiet" };
+  if (!shouldUseGlobalRegistry()) {
+    if (!findGlobalSidecarExecutable()) {
+      return { text: `no global install — nothing syncs; \`npm install -g ${PACKAGE_SPEC}\``, role: "bad" };
+    }
+    return { text: "owned by the global install", role: "quiet" };
+  }
   const service = daemonServiceStatus();
   if (!service.available)
     return { text: service.message ?? "unavailable", role: "quiet" };
@@ -4175,10 +4189,9 @@ function localSidecarCliPath(root) {
   const candidate = path9.join(root, "node_modules", PACKAGE_NAME, "dist", "cli.js");
   if (!isFile(candidate))
     return;
-  try {
-    if (fs11.realpathSync(candidate) === fs11.realpathSync(currentCliPath()))
-      return;
-  } catch {}
+  const localVersion = installedPackageVersion(root);
+  if (localVersion === undefined || compareVersions(localVersion, packageVersion()) <= 0)
+    return;
   return candidate;
 }
 function currentCliPath() {
@@ -5098,12 +5111,11 @@ var GLOBAL_EXEC_ENV3 = "SIDECAR_GLOBAL_EXEC";
 var PACKAGE_NAME2 = "sidecarsync";
 var GLOBAL_ONLY_COMMANDS = new Set(["daemon", "deinit", "register-install", "set-install-source", "update"]);
 if (!process.env[SKIP_LOCAL_EXEC_ENV3]) {
-  const localExecutable = findLocalExecutable(process.cwd(), fileURLToPath4(import.meta.url));
-  if (localExecutable) {
-    if (GLOBAL_ONLY_COMMANDS.has(process.argv[2])) {
-      process.env[GLOBAL_EXEC_ENV3] = "1";
-    } else {
-      const result = spawnSync5(process.execPath, [localExecutable, ...process.argv.slice(2)], {
+  const local = findLocalInstall(process.cwd(), fileURLToPath4(import.meta.url));
+  if (local) {
+    process.env[GLOBAL_EXEC_ENV3] = "1";
+    if (local.newer && !GLOBAL_ONLY_COMMANDS.has(process.argv[2])) {
+      const result = spawnSync5(process.execPath, [local.executable, ...process.argv.slice(2)], {
         stdio: "inherit",
         env: {
           ...process.env,
@@ -5119,13 +5131,13 @@ if (!process.env[SKIP_LOCAL_EXEC_ENV3]) {
   }
 }
 process.exit(await main());
-function findLocalExecutable(start, self) {
+function findLocalInstall(start, self) {
   let current = path11.resolve(start);
   while (true) {
     if (projectDependsOnSidecar2(current)) {
       const candidate = path11.join(current, "node_modules", PACKAGE_NAME2, "dist", "cli.js");
       if (isFile2(candidate) && !sameFile(candidate, self)) {
-        return candidate;
+        return { executable: candidate, newer: localIsNewer(current) };
       }
     }
     const parent = path11.dirname(current);
@@ -5134,6 +5146,10 @@ function findLocalExecutable(start, self) {
     current = parent;
   }
 }
+function localIsNewer(projectRoot) {
+  const localVersion = installedPackageVersion(projectRoot);
+  return localVersion !== undefined && compareVersions(localVersion, packageVersion()) > 0;
+}
 function projectDependsOnSidecar2(projectRoot) {
   const manifestPath = path11.join(projectRoot, "package.json");
   if (!isFile2(manifestPath))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidecarsync",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "A Git-backed sidecar inbox for repo-local development metadata.",
   "license": "MIT",
   "repository": {

package/scripts/postinstall.js

@@ -14,8 +14,7 @@ try {
     enableDaemon(packageRoot);
     recordInstallSource(packageRoot);
   } else {
-    cloneIfMissing(packageRoot);
-    registerWithGlobalSidecar(packageRoot);
+    setUpLocalInstall(packageRoot);
   }
 } catch (error) {
   console.warn(`sidecar: postinstall failed: ${error instanceof Error ? error.message : String(error)}`);
@@ -61,10 +60,36 @@ function recordInstallSource(packageRoot) {
   });
 }
 
-function cloneIfMissing(packageRoot) {
+// The global install owns the daemon, so it is what makes a cloned checkout
+// actually sync. Without it a clone here would leave the user with a sidecar
+// directory that silently never updates — worse than no checkout at all.
+function setUpLocalInstall(packageRoot) {
   const projectRoot = findInstallProjectRoot();
   if (!projectRoot || !fs.existsSync(path.join(projectRoot, ".sidecar"))) return;
 
+  const globalSidecar = findGlobalSidecar(packageRoot);
+  if (!globalSidecar) {
+    warnMissingGlobalSidecar();
+    return;
+  }
+
+  cloneIfMissing(packageRoot, projectRoot);
+  registerWithGlobalSidecar(globalSidecar, projectRoot);
+}
+
+function warnMissingGlobalSidecar() {
+  console.warn(
+    [
+      "sidecar: no global install found, so this repo's sidecar checkout was not cloned.",
+      "sidecar: without the global install there is no daemon, and nothing would sync.",
+      "sidecar: install it, then set this repo up:",
+      "sidecar:   npm install -g sidecarsync",
+      "sidecar:   sidecar init",
+    ].join("\n"),
+  );
+}
+
+function cloneIfMissing(packageRoot, projectRoot) {
   const cliPath = path.join(packageRoot, "dist", "cli.js");
   if (!fs.existsSync(cliPath)) return;
 
@@ -80,13 +105,7 @@ function cloneIfMissing(packageRoot) {
   if (output) console.warn(output);
 }
 
-function registerWithGlobalSidecar(packageRoot) {
-  const projectRoot = findInstallProjectRoot();
-  if (!projectRoot || !fs.existsSync(path.join(projectRoot, ".sidecar"))) return;
-
-  const globalSidecar = findGlobalSidecar(packageRoot);
-  if (!globalSidecar) return;
-
+function registerWithGlobalSidecar(globalSidecar, projectRoot) {
   const result = spawnSync(globalSidecar, ["register-install"], {
     cwd: projectRoot,
     encoding: "utf8",