@smoothbricks/cli 0.5.0 → 0.6.0

package/dist/monorepo/git-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-config.d.ts","sourceRoot":"","sources":["../../src/monorepo/git-config.ts"],"names":[],"mappings":"AAKA,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYzE"}
+{"version":3,"file":"git-config.d.ts","sourceRoot":"","sources":["../../src/monorepo/git-config.ts"],"names":[],"mappings":"AAKA,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBzE"}

package/dist/monorepo/git-config.js

@@ -10,6 +10,13 @@ export async function applyWorkspaceGitConfig(root) {
     const gitDir = resolve(root, decode(gitDirResult.stdout).trim());
     const tooling = join(root, 'tooling');
     await $ `git config --local include.path ${join(tooling, 'workspace.gitconfig')}`.cwd(root);
+    // Keep the newer runtime version pins on any merge (nvfetcher overlay +
+    // devenv.lock) so a mirror sync's `git am --3way` never stalls on a version
+    // conflict. Mapped by the managed .gitattributes (merge=smoo-newer-pins);
+    // implemented in tooling/direnv/merge-newer-pins.sh. The next `devenv shell`
+    // regenerates package.json fields from the resulting runtime.
+    await $ `git config --local merge.smoo-newer-pins.name ${'keep the newer devenv/nvfetcher runtime pins'}`.cwd(root);
+    await $ `git config --local merge.smoo-newer-pins.driver ${'bash tooling/direnv/merge-newer-pins.sh %O %A %B %P'}`.cwd(root);
     linkHook(gitDir, tooling, 'pre-commit');
     linkHook(gitDir, tooling, 'commit-msg');
 }

package/dist/monorepo/managed-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"managed-files.d.ts","sourceRoot":"","sources":["../../src/monorepo/managed-files.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,iBAAiB,GAAG,SAAS,GAAG,YAAY,CAAC;CACxG;AAmGD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,EAAE,CAG/F;AA4KD,wBAAgB,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAIxD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQzD"}
+{"version":3,"file":"managed-files.d.ts","sourceRoot":"","sources":["../../src/monorepo/managed-files.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,iBAAiB,GAAG,SAAS,GAAG,YAAY,CAAC;CACxG;AA8GD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,EAAE,CAG/F;AA4KD,wBAAgB,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAIxD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQzD"}

package/dist/monorepo/managed-files.js

@@ -46,6 +46,17 @@ const managedFiles = [
         source: 'git-format-staged.yml',
         target: '.git-format-staged.yml',
     },
+    {
+        kind: 'raw',
+        source: 'gitattributes',
+        target: '.gitattributes',
+    },
+    {
+        kind: 'raw',
+        source: 'tooling/direnv/merge-newer-pins.sh',
+        target: 'tooling/direnv/merge-newer-pins.sh',
+        executable: true,
+    },
     {
         kind: 'generated',
         source: 'ci-workflow',

package/managed/raw/gitattributes

@@ -0,0 +1,8 @@
+# smoo-managed. Keep the newer runtime version pins on any merge (especially a
+# mirror sync's `git am --3way`) instead of stalling on a conflict. The driver
+# `smoo-newer-pins` is defined by `smoo` (git config, installed at devenv setup)
+# and implemented in tooling/direnv/merge-newer-pins.sh. Files not present in a
+# given repo are simply ignored.
+tooling/direnv/nixpkgs-overlay/_sources/generated.json  merge=smoo-newer-pins
+tooling/direnv/nixpkgs-overlay/_sources/generated.nix   merge=smoo-newer-pins
+tooling/direnv/devenv.lock                              merge=smoo-newer-pins

package/managed/raw/tooling/direnv/merge-newer-pins.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# smoo-managed git merge driver: keep whichever side pins the NEWER version.
+#
+# Runtime version pins (nvfetcher overlay _sources/generated.{json,nix}) and the
+# devenv/flake lock (devenv.lock) frequently differ across branches or across a
+# mirror sync's `git am --3way`. Instead of stalling on a conflict, keep the
+# higher pin wholesale so the tree always converges to the newest runtime; the
+# next `devenv shell` then regenerates package.json engine/packageManager from
+# it (see monorepo/runtime.ts syncRootRuntimeVersions).
+#
+# Wired by `smoo` (managed .gitattributes -> merge=smoo-newer-pins, and
+# `git config merge.smoo-newer-pins.driver` installed by applyWorkspaceGitConfig).
+# git invokes it as: merge-newer-pins.sh %O %A %B %P
+#   %O base, %A ours (result written here), %B theirs, %P pathname.
+set -euo pipefail
+
+ours="$2"
+theirs="$3"
+
+# Flake locks are ordered by lastModified (unix seconds); nvfetcher outputs by
+# the semver in their version fields. A given file is one kind or the other.
+max_last_modified() {
+  grep -oE '"lastModified"[[:space:]]*:[[:space:]]*[0-9]+' "$1" 2>/dev/null \
+    | grep -oE '[0-9]+' | sort -n | tail -1
+}
+max_semver() {
+  grep -oE 'version[[:space:]":=]*[0-9]+\.[0-9]+\.[0-9]+' "$1" 2>/dev/null \
+    | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1
+}
+
+ours_lm="$(max_last_modified "$ours" || true)"
+theirs_lm="$(max_last_modified "$theirs" || true)"
+
+if [ -n "${ours_lm}${theirs_lm}" ]; then
+  # Flake lock: numeric lastModified comparison.
+  if [ -n "$theirs_lm" ] && [ "${theirs_lm:-0}" -gt "${ours_lm:-0}" ]; then
+    cp "$theirs" "$ours"
+  fi
+else
+  # nvfetcher / version-pinned file: semver comparison.
+  ov="$(max_semver "$ours" || true)"
+  tv="$(max_semver "$theirs" || true)"
+  newest="$(printf '%s\n%s\n' "${ov:-0.0.0}" "${tv:-0.0.0}" | sort -V | tail -1)"
+  if [ -n "$tv" ] && [ "$newest" = "$tv" ] && [ "$tv" != "${ov:-}" ]; then
+    cp "$theirs" "$ours"
+  fi
+fi
+exit 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smoothbricks/cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "type": "module",
   "description": "SmoothBricks monorepo automation CLI",
   "bin": {

package/src/monorepo/git-config.ts

@@ -13,6 +13,16 @@ export async function applyWorkspaceGitConfig(root: string): Promise<void> {
   const tooling = join(root, 'tooling');
 
   await $`git config --local include.path ${join(tooling, 'workspace.gitconfig')}`.cwd(root);
+
+  // Keep the newer runtime version pins on any merge (nvfetcher overlay +
+  // devenv.lock) so a mirror sync's `git am --3way` never stalls on a version
+  // conflict. Mapped by the managed .gitattributes (merge=smoo-newer-pins);
+  // implemented in tooling/direnv/merge-newer-pins.sh. The next `devenv shell`
+  // regenerates package.json fields from the resulting runtime.
+  await $`git config --local merge.smoo-newer-pins.name ${'keep the newer devenv/nvfetcher runtime pins'}`.cwd(root);
+  await $`git config --local merge.smoo-newer-pins.driver ${'bash tooling/direnv/merge-newer-pins.sh %O %A %B %P'}`.cwd(
+    root,
+  );
   linkHook(gitDir, tooling, 'pre-commit');
   linkHook(gitDir, tooling, 'commit-msg');
 }

package/src/monorepo/managed-files.ts

@@ -78,6 +78,17 @@ const managedFiles: ManagedFile[] = [
     source: 'git-format-staged.yml',
     target: '.git-format-staged.yml',
   },
+  {
+    kind: 'raw',
+    source: 'gitattributes',
+    target: '.gitattributes',
+  },
+  {
+    kind: 'raw',
+    source: 'tooling/direnv/merge-newer-pins.sh',
+    target: 'tooling/direnv/merge-newer-pins.sh',
+    executable: true,
+  },
   {
     kind: 'generated',
     source: 'ci-workflow',

package/src/monorepo/merge-newer-pins.test.ts

@@ -0,0 +1,59 @@
+import { describe, expect, it } from 'bun:test';
+import { spawnSync } from 'node:child_process';
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const script = resolve(
+  dirname(fileURLToPath(import.meta.url)),
+  '..',
+  '..',
+  'managed/raw/tooling/direnv/merge-newer-pins.sh',
+);
+
+// Invoke the merge driver as git does: `driver %O %A %B %P`, result written to %A (ours).
+function mergedOurs(oursContent: string, theirsContent: string): string {
+  const dir = mkdtempSync(join(tmpdir(), 'mnp-'));
+  try {
+    const base = join(dir, 'base');
+    const ours = join(dir, 'ours');
+    const theirs = join(dir, 'theirs');
+    writeFileSync(base, '');
+    writeFileSync(ours, oursContent);
+    writeFileSync(theirs, theirsContent);
+    const r = spawnSync('bash', [script, base, ours, theirs, 'pins'], { encoding: 'utf8' });
+    expect(r.status).toBe(0);
+    return readFileSync(ours, 'utf8');
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+}
+
+describe('smoo-newer-pins merge driver', () => {
+  it('nvfetcher JSON: takes theirs when it pins a newer semver', () => {
+    expect(mergedOurs('{"bun":{"version": "1.3.13"}}', '{"bun":{"version": "1.3.14"}}')).toContain('1.3.14');
+  });
+
+  it('nvfetcher JSON: keeps ours when ours pins the newer semver', () => {
+    expect(mergedOurs('{"bun":{"version": "1.3.14"}}', '{"bun":{"version": "1.3.13"}}')).toContain('1.3.14');
+  });
+
+  it('nvfetcher nix form: takes the newer semver', () => {
+    expect(mergedOurs('version = "1.3.13";', 'version = "1.3.14";')).toContain('1.3.14');
+  });
+
+  it('flake lock: takes theirs when lastModified is newer', () => {
+    const out = mergedOurs('{"nixpkgs":{"lastModified": 1777573317}}', '{"nixpkgs":{"lastModified": 1779717400}}');
+    expect(out).toContain('1779717400');
+  });
+
+  it('flake lock: keeps ours when ours lastModified is newer', () => {
+    const out = mergedOurs('{"nixpkgs":{"lastModified": 1779717400}}', '{"nixpkgs":{"lastModified": 1777573317}}');
+    expect(out).toContain('1779717400');
+  });
+
+  it('equal versions: keeps ours unchanged (idempotent)', () => {
+    expect(mergedOurs('{"v": "1.3.14", "note": "ours"}', '{"v": "1.3.14", "note": "theirs"}')).toContain('ours');
+  });
+});