@smoothbricks/cli 0.5.0 → 0.7.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

@@ -1,3 +1,17 @@
+/**
+ * Repos may append their own content to a managed file below this marker —
+ * e.g. extra merge drivers in .gitattributes. Everything from the marker
+ * line onward is preserved verbatim across updates and ignored by the
+ * drift check; the managed section above it stays byte-exact.
+ */
+export declare const LOCAL_SECTION_MARKER = "# smoo-local: everything below this line is repo-owned and preserved";
+/** Split a managed target's content into the managed part and the repo-owned tail. */
+declare function splitLocalSection(current: string): {
+    managed: string;
+    localTail: string;
+};
+/** Test seam for the pure splitter. */
+export declare const splitLocalSectionForTest: typeof splitLocalSection;
 export interface FileResult {
     target: string;
     action: 'created' | 'updated' | 'unchanged' | 'skipped' | 'skipped-symlink' | 'drifted' | 'ok-symlink';
@@ -5,4 +19,5 @@ export interface FileResult {
 export declare function applyManagedFiles(root: string, mode: 'update' | 'check' | 'diff'): FileResult[];
 export declare function printResults(results: FileResult[]): void;
 export declare function validateManagedFiles(root: string): number;
+export {};
 //# sourceMappingURL=managed-files.d.ts.map

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":"AAUA;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,yEAAyE,CAAC;AAU3G,sFAAsF;AACtF,iBAAS,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAIlF;AAED,uCAAuC;AACvC,eAAO,MAAM,wBAAwB,0BAAoB,CAAC;AAE1D,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;AA8KD,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

@@ -5,6 +5,22 @@ import { fileURLToPath } from 'node:url';
 import { listReleasePackages, readPackageJson } from '../lib/workspace.js';
 import { renderCiWorkflowYaml } from './ci-workflow.js';
 import { renderPublishWorkflowYaml } from './publish-workflow.js';
+/**
+ * Repos may append their own content to a managed file below this marker —
+ * e.g. extra merge drivers in .gitattributes. Everything from the marker
+ * line onward is preserved verbatim across updates and ignored by the
+ * drift check; the managed section above it stays byte-exact.
+ */
+export const LOCAL_SECTION_MARKER = '# smoo-local: everything below this line is repo-owned and preserved';
+/** Split a managed target's content into the managed part and the repo-owned tail. */
+function splitLocalSection(current) {
+    const index = current.indexOf(LOCAL_SECTION_MARKER);
+    if (index === -1)
+        return { managed: current, localTail: '' };
+    return { managed: current.slice(0, index), localTail: current.slice(index) };
+}
+/** Test seam for the pure splitter. */
+export const splitLocalSectionForTest = splitLocalSection;
 const managedFiles = [
     {
         kind: 'raw',
@@ -46,6 +62,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',
@@ -103,13 +130,15 @@ function applyManagedFile(root, file, mode, context) {
             throw new Error(`${file.target} exists but is not a regular file or symlink`);
         }
         const current = readFileSync(target, 'utf8');
-        if (current === content) {
+        const { managed, localTail } = splitLocalSection(current);
+        if (managed === content || (localTail !== '' && managed === `${content}\n`)) {
             return { target: file.target, action: 'unchanged' };
         }
         if (mode === 'check' || mode === 'diff') {
             return { target: file.target, action: 'drifted' };
         }
-        writeManagedFile(target, content, file.executable === true);
+        const next = localTail === '' ? content : `${content}\n${localTail}`;
+        writeManagedFile(target, next, file.executable === true);
         return { target: file.target, action: 'updated' };
     }
     if (mode === 'check' || mode === 'diff') {

package/dist/monorepo/packed-package.js

@@ -69,7 +69,7 @@ async function validatePackedManifest(root, pkg, packed) {
 async function validateAttw(root, pkg, packed) {
     const attw = await loadAttwCore();
     const analysis = await attw.checkPackage(await createAttwPackageFromTarball(attw, root, packed.path), {
-        excludeEntrypoints: wasmExportEntrypoints(pkg.json.exports),
+        excludeEntrypoints: nonJsExportEntrypoints(pkg.json.exports),
     });
     if (!isRecord(analysis) || analysis.types === false) {
         return 0;
@@ -205,19 +205,21 @@ function formatResolutionKind(kind) {
     }
     return kind;
 }
-function wasmExportEntrypoints(exports) {
+function nonJsExportEntrypoints(exports) {
     if (!isRecord(exports)) {
         return [];
     }
     return Object.entries(exports)
-        .filter(([key, value]) => key.startsWith('.') && exportPointsToWasm(value))
+        .filter(([key, value]) => key.startsWith('.') && exportPointsToNonJs(value))
         .map(([key]) => key);
 }
-function exportPointsToWasm(value) {
+function exportPointsToNonJs(value) {
     if (typeof value === 'string') {
-        return value.endsWith('.wasm');
+        // attw resolves every entrypoint as a module; assets can never have types.
+        // Existence of the target files is still validated by publint.
+        return value.endsWith('.wasm') || value.endsWith('.css');
     }
-    return isRecord(value) && Object.values(value).some(exportPointsToWasm);
+    return isRecord(value) && Object.values(value).some(exportPointsToNonJs);
 }
 async function packPackage(root, pkg) {
     const packageDir = join(root, pkg.path);

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.7.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.test.ts

@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'bun:test';
+import { LOCAL_SECTION_MARKER, splitLocalSectionForTest } from './managed-files.js';
+
+const MANAGED = '# managed content\npath merge=driver\n';
+
+describe('managed-file local sections', () => {
+  it('content without a marker is entirely managed', () => {
+    const { managed, localTail } = splitLocalSectionForTest(MANAGED);
+    expect(managed).toBe(MANAGED);
+    expect(localTail).toBe('');
+  });
+
+  it('everything from the marker onward is the repo-owned tail', () => {
+    const tail = `${LOCAL_SECTION_MARKER}\ncustom/*.jsonl merge=custom-log\n`;
+    const { managed, localTail } = splitLocalSectionForTest(`${MANAGED}\n${tail}`);
+    expect(managed).toBe(`${MANAGED}\n`);
+    expect(localTail).toBe(tail);
+  });
+
+  it('a tail directly after the managed content tolerates the separating newline', () => {
+    // The compare rule accepts `managed === content + '\n'` when a tail exists,
+    // so update → check round-trips as unchanged.
+    const written = `${MANAGED}\n${LOCAL_SECTION_MARKER}\nextra\n`;
+    const { managed, localTail } = splitLocalSectionForTest(written);
+    expect(managed).toBe(`${MANAGED}\n`);
+    expect(localTail.startsWith(LOCAL_SECTION_MARKER)).toBe(true);
+  });
+});

package/src/monorepo/managed-files.ts

@@ -8,6 +8,14 @@ import { renderPublishWorkflowYaml } from './publish-workflow.js';
 
 type ManagedKind = 'raw' | 'template' | 'generated';
 
+/**
+ * Repos may append their own content to a managed file below this marker —
+ * e.g. extra merge drivers in .gitattributes. Everything from the marker
+ * line onward is preserved verbatim across updates and ignored by the
+ * drift check; the managed section above it stays byte-exact.
+ */
+export const LOCAL_SECTION_MARKER = '# smoo-local: everything below this line is repo-owned and preserved';
+
 interface ManagedFile {
   kind: ManagedKind;
   source: string;
@@ -16,6 +24,16 @@ interface ManagedFile {
   releasePackagesOnly?: boolean;
 }
 
+/** Split a managed target's content into the managed part and the repo-owned tail. */
+function splitLocalSection(current: string): { managed: string; localTail: string } {
+  const index = current.indexOf(LOCAL_SECTION_MARKER);
+  if (index === -1) return { managed: current, localTail: '' };
+  return { managed: current.slice(0, index), localTail: current.slice(index) };
+}
+
+/** Test seam for the pure splitter. */
+export const splitLocalSectionForTest = splitLocalSection;
+
 export interface FileResult {
   target: string;
   action: 'created' | 'updated' | 'unchanged' | 'skipped' | 'skipped-symlink' | 'drifted' | 'ok-symlink';
@@ -78,6 +96,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',
@@ -143,13 +172,15 @@ function applyManagedFile(
       throw new Error(`${file.target} exists but is not a regular file or symlink`);
     }
     const current = readFileSync(target, 'utf8');
-    if (current === content) {
+    const { managed, localTail } = splitLocalSection(current);
+    if (managed === content || (localTail !== '' && managed === `${content}\n`)) {
       return { target: file.target, action: 'unchanged' };
     }
     if (mode === 'check' || mode === 'diff') {
       return { target: file.target, action: 'drifted' };
     }
-    writeManagedFile(target, content, file.executable === true);
+    const next = localTail === '' ? content : `${content}\n${localTail}`;
+    writeManagedFile(target, next, file.executable === true);
     return { target: file.target, action: 'updated' };
   }
   if (mode === 'check' || mode === 'diff') {

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');
+  });
+});

package/src/monorepo/packed-package.ts

@@ -90,7 +90,7 @@ async function validatePackedManifest(
 async function validateAttw(root: string, pkg: PackageInfo, packed: { path: string }): Promise<number> {
   const attw = await loadAttwCore();
   const analysis = await attw.checkPackage(await createAttwPackageFromTarball(attw, root, packed.path), {
-    excludeEntrypoints: wasmExportEntrypoints(pkg.json.exports),
+    excludeEntrypoints: nonJsExportEntrypoints(pkg.json.exports),
   });
   if (!isRecord(analysis) || analysis.types === false) {
     return 0;
@@ -242,20 +242,22 @@ function formatResolutionKind(kind: string): string {
   return kind;
 }
 
-function wasmExportEntrypoints(exports: unknown): string[] {
+function nonJsExportEntrypoints(exports: unknown): string[] {
   if (!isRecord(exports)) {
     return [];
   }
   return Object.entries(exports)
-    .filter(([key, value]) => key.startsWith('.') && exportPointsToWasm(value))
+    .filter(([key, value]) => key.startsWith('.') && exportPointsToNonJs(value))
     .map(([key]) => key);
 }
 
-function exportPointsToWasm(value: unknown): boolean {
+function exportPointsToNonJs(value: unknown): boolean {
   if (typeof value === 'string') {
-    return value.endsWith('.wasm');
+    // attw resolves every entrypoint as a module; assets can never have types.
+    // Existence of the target files is still validated by publint.
+    return value.endsWith('.wasm') || value.endsWith('.css');
   }
-  return isRecord(value) && Object.values(value).some(exportPointsToWasm);
+  return isRecord(value) && Object.values(value).some(exportPointsToNonJs);
 }
 
 async function packPackage(root: string, pkg: PackageInfo): Promise<{ path: string; arrayBuffer: ArrayBuffer }> {

package/src/pr/index.test.ts

@@ -18,7 +18,7 @@ afterEach(() => {
 
 const PR_JSON = JSON.stringify({
   number: 40,
-  url: 'https://github.com/conloca/private/pull/40',
+  url: 'https://github.com/acme/private/pull/40',
   headRefName: 'gar-sync/private-to-public',
   baseRefName: 'public-mirror',
   isCrossRepository: false,
@@ -145,7 +145,7 @@ function writeState(overrides: Record<string, unknown>): void {
   mkdirSync(join(gitDir, 'smoo'), { recursive: true });
   const state = {
     pr: 40,
-    url: 'https://github.com/conloca/private/pull/40',
+    url: 'https://github.com/acme/private/pull/40',
     headBranch: 'gar-sync/private-to-public',
     baseBranch: 'public-mirror',
     remote: 'origin',