@smoothbricks/cli 0.10.3 → 0.10.4

package/dist/lib/workspace.js

@@ -1,7 +1,7 @@
 import { readdirSync, statSync } from 'node:fs';
 import { dirname, join, relative } from 'node:path';
 import { isSmoothBricksCodebasePackageName } from './cli-package.js';
-import { hasOwn, hasOwnString, isRecord, readJson, readJsonObject, stringProperty } from './json.js';
+import { isPackageJson, readJson, readJsonObject, } from './json.js';
 export const workspaceDependencyFields = [
     'dependencies',
     'devDependencies',
@@ -12,22 +12,19 @@ export function listPublicPackages(root) {
     return getWorkspacePackages(root).filter((pkg) => !pkg.private && pkg.tags.includes('npm:public'));
 }
 export function listReleasePackages(root, rootPackage = readPackageJson(join(root, 'package.json'))) {
-    if (!rootPackage) {
-        return [];
-    }
-    const rootRepository = repositoryInfo(rootPackage.json);
+    const rootRepository = rootPackage ? repositoryInfo(rootPackage.json) : null;
     if (!rootRepository) {
         return [];
     }
-    return getWorkspacePackagesForPatterns(root, getWorkspacePatternsFromPackageJson(rootPackage.json)).filter((pkg) => !pkg.private && pkg.tags.includes('npm:public') && isOwnedPackage(rootRepository, pkg));
+    return listPublicPackages(root).filter((pkg) => isOwnedPackage(rootRepository, pkg));
 }
 export function rootRepositoryInfo(root) {
-    const rootPackage = readJsonObject(join(root, 'package.json'));
-    return rootPackage ? repositoryInfo(rootPackage) : null;
+    const rootPackage = readPackageJson(join(root, 'package.json'));
+    return rootPackage ? repositoryInfo(rootPackage.json) : null;
 }
 export function rootPackageName(root) {
     const rootPackage = readPackageJsonObject(join(root, 'package.json'));
-    return rootPackage ? stringProperty(rootPackage, 'name') : null;
+    return rootPackage?.name ?? null;
 }
 export function isSmoothBricksCodebase(root) {
     return isSmoothBricksCodebasePackageName(rootPackageName(root) ?? undefined);
@@ -40,62 +37,63 @@ export function isOwnedPackage(rootRepository, pkg) {
     return packageRepository !== null && packageRepository.url === rootRepository.url;
 }
 export function getWorkspacePackages(root) {
-    const rootPackage = readPackageJson(join(root, 'package.json'));
-    if (!rootPackage) {
-        throw new Error('package.json not found or invalid');
-    }
-    return getWorkspacePackagesForPatterns(root, getWorkspacePatternsFromPackageJson(rootPackage.json));
+    return getWorkspacePackagesForPatterns(root, getWorkspacePatterns(root));
 }
 export function getWorkspacePackageManifests(root) {
-    const rootPackage = readPackageJsonObject(join(root, 'package.json'));
-    if (!rootPackage) {
-        throw new Error('package.json not found or invalid');
-    }
-    return getWorkspacePackageManifestsForPatterns(root, getWorkspacePatternsFromPackageJson(rootPackage));
+    return getWorkspacePackageManifestsForPatterns(root, getWorkspacePatterns(root));
 }
 function getWorkspacePackagesForPatterns(root, workspacePatterns) {
     const packages = [];
-    for (const pkgPath of listWorkspacePackageJsonPaths(root, workspacePatterns)) {
-        const pkg = readPackageJson(pkgPath);
-        if (!pkg?.name || !pkg.version) {
+    for (const path of listWorkspacePackageJsonPaths(root, workspacePatterns)) {
+        const pkg = readPackageJson(path);
+        if (!pkg) {
             continue;
         }
         packages.push({
-            name: pkg.name,
-            projectName: pkg.projectName,
-            version: pkg.version,
-            private: pkg.private,
-            tags: pkg.tags,
-            path: relative(root, dirname(pkgPath)),
-            packageJsonPath: pkg.packageJsonPath,
-            json: pkg.json,
+            ...pkg,
+            path: relative(root, dirname(path)),
         });
     }
     return packages.sort((a, b) => a.name.localeCompare(b.name));
 }
 function getWorkspacePackageManifestsForPatterns(root, workspacePatterns) {
-    const manifests = [];
-    for (const pkgPath of listWorkspacePackageJsonPaths(root, workspacePatterns)) {
-        const pkg = readWorkspacePackageManifest(pkgPath);
-        if (pkg) {
-            manifests.push(pkg);
+    const packages = [];
+    for (const path of listWorkspacePackageJsonPaths(root, workspacePatterns)) {
+        const pkg = readWorkspacePackageManifest(path);
+        if (!pkg) {
+            continue;
         }
+        packages.push({
+            ...pkg,
+            path: relative(root, dirname(path)),
+        });
     }
-    return manifests.sort((a, b) => a.name.localeCompare(b.name));
+    return packages.sort((a, b) => a.name.localeCompare(b.name));
 }
 function listWorkspacePackageJsonPaths(root, workspacePatterns) {
     const paths = [];
     for (const pattern of workspacePatterns) {
         if (!pattern.endsWith('/*')) {
-            paths.push(join(root, pattern, 'package.json'));
             continue;
         }
         const parent = join(root, pattern.slice(0, -2));
-        if (!statSync(parent, { throwIfNoEntry: false })?.isDirectory()) {
+        let entries;
+        try {
+            entries = readdirSync(parent);
+        }
+        catch {
             continue;
         }
-        for (const entry of readdirSync(parent)) {
-            paths.push(join(parent, entry, 'package.json'));
+        for (const entry of entries) {
+            const packageJsonPath = join(parent, entry, 'package.json');
+            try {
+                if (statSync(packageJsonPath).isFile()) {
+                    paths.push(packageJsonPath);
+                }
+            }
+            catch {
+                // skip missing package.json
+            }
         }
     }
     return paths;
@@ -103,7 +101,7 @@ function listWorkspacePackageJsonPaths(root, workspacePatterns) {
 export function listPackageJsonRecords(root) {
     const rootPackage = readPackageJson(join(root, 'package.json'));
     if (!rootPackage) {
-        throw new Error('package.json not found or invalid');
+        return getWorkspacePackages(root);
     }
     return [
         { ...rootPackage, path: '.' },
@@ -112,34 +110,30 @@ export function listPackageJsonRecords(root) {
 }
 export function getWorkspacePatterns(root) {
     const raw = readJson(join(root, 'package.json'));
-    return isRecord(raw) ? getWorkspacePatternsFromPackageJson(raw) : ['packages/*'];
+    const pkg = isPackageJson(raw) ? raw : null;
+    return pkg ? getWorkspacePatternsFromPackageJson(pkg) : ['packages/*'];
 }
 function getWorkspacePatternsFromPackageJson(pkg) {
-    if (!hasOwn(pkg, 'workspaces')) {
-        return ['packages/*'];
-    }
     const workspaces = pkg.workspaces;
     if (Array.isArray(workspaces)) {
         return workspaces.filter((entry) => typeof entry === 'string');
     }
-    if (isRecord(workspaces) && hasOwn(workspaces, 'packages') && Array.isArray(workspaces.packages)) {
+    if (workspaces && typeof workspaces === 'object' && Array.isArray(workspaces.packages)) {
         return workspaces.packages.filter((entry) => typeof entry === 'string');
     }
     return ['packages/*'];
 }
 export function readPackageJson(path) {
     const parsed = readPackageJsonObject(path);
-    if (!isRecord(parsed) || !hasOwnString(parsed, 'name') || !hasOwnString(parsed, 'version')) {
+    if (!parsed?.name || !parsed.version) {
         return null;
     }
-    const privateValue = hasOwn(parsed, 'private') && typeof parsed.private === 'boolean' ? parsed.private : false;
-    const tags = getNxTags(parsed);
     return {
         name: parsed.name,
         projectName: packageNxProjectName(parsed),
         version: parsed.version,
-        private: privateValue,
-        tags,
+        private: parsed.private === true,
+        tags: getNxTags(parsed),
         path: dirname(path),
         packageJsonPath: path,
         json: parsed,
@@ -147,70 +141,70 @@ export function readPackageJson(path) {
 }
 export function readWorkspacePackageManifest(path) {
     const parsed = readPackageJsonObject(path);
-    if (!isRecord(parsed) || !hasOwnString(parsed, 'name')) {
+    if (!parsed?.name) {
         return null;
     }
-    const privateValue = hasOwn(parsed, 'private') && typeof parsed.private === 'boolean' ? parsed.private : false;
     return {
         name: parsed.name,
         projectName: packageNxProjectName(parsed),
-        private: privateValue,
+        private: parsed.private === true,
         path: dirname(path),
         packageJsonPath: path,
         json: parsed,
     };
 }
 function packageNxProjectName(pkg) {
-    const nx = isRecord(pkg.nx) ? pkg.nx : null;
-    return (nx ? stringProperty(nx, 'name') : null) ?? stringProperty(pkg, 'name') ?? '';
+    return pkg.nx?.name ?? pkg.name ?? '';
 }
 export function readPackageJsonObject(path) {
-    const parsed = readJsonObject(path);
-    return parsed;
+    return readJsonObject(path);
 }
 export function getNxTags(pkg) {
-    if (!hasOwn(pkg, 'nx') || !isRecord(pkg.nx) || !hasOwn(pkg.nx, 'tags') || !Array.isArray(pkg.nx.tags)) {
+    const tags = pkg.nx?.tags;
+    if (!Array.isArray(tags)) {
         return [];
     }
-    return pkg.nx.tags.filter((tag) => typeof tag === 'string');
+    return tags.filter((tag) => typeof tag === 'string');
 }
 export function repositoryInfo(pkg) {
     const repository = pkg.repository;
     if (typeof repository === 'string') {
         return { type: 'git', url: repository };
     }
-    if (!isRecord(repository)) {
+    if (!repository || typeof repository !== 'object') {
         return null;
     }
-    const url = stringProperty(repository, 'url');
+    const url = repository.url;
     if (!url) {
         return null;
     }
-    return { type: stringProperty(repository, 'type') ?? 'git', url };
+    return { type: repository.type ?? 'git', url };
 }
 export function sameRepositoryAfterNormalization(left, right) {
     return normalizedRepositoryUrl(left) === normalizedRepositoryUrl(right);
 }
 function normalizedRepositoryUrl(url) {
-    const trimmed = url
-        .trim()
-        .replace(/^git\+/, '')
-        .replace(/#.*$/, '')
-        .replace(/\/$/, '')
-        .replace(/\.git$/, '');
-    const https = /^https:\/\/github\.com\/([^/]+)\/([^/]+)$/i.exec(trimmed);
-    if (https?.[1] && https[2]) {
-        return githubRepositoryKey(https[1], https[2]);
-    }
-    const ssh = /^git@github\.com:([^/]+)\/([^/]+)$/i.exec(trimmed);
-    if (ssh?.[1] && ssh[2]) {
-        return githubRepositoryKey(ssh[1], ssh[2]);
-    }
-    const shorthand = /^github:([^/]+)\/([^/]+)$/i.exec(trimmed);
-    if (shorthand?.[1] && shorthand[2]) {
-        return githubRepositoryKey(shorthand[1], shorthand[2]);
-    }
-    return trimmed;
+    const trimmed = url.trim().replace(/\.git$/i, '');
+    const ssh = /^git@github\.com:(.+)$/i.exec(trimmed);
+    if (ssh?.[1]) {
+        const [owner, repo] = ssh[1].split('/');
+        if (owner && repo) {
+            return githubRepositoryKey(owner, repo);
+        }
+    }
+    try {
+        const parsed = new URL(trimmed.includes('://') ? trimmed : `https://${trimmed}`);
+        if (parsed.hostname.replace(/^www\./i, '').toLowerCase() === 'github.com') {
+            const [owner, repo] = parsed.pathname.replace(/^\//, '').split('/');
+            if (owner && repo) {
+                return githubRepositoryKey(owner, repo);
+            }
+        }
+    }
+    catch {
+        // fall through
+    }
+    return trimmed.toLowerCase();
 }
 function githubRepositoryKey(owner, repo) {
     return `github:${owner.toLowerCase()}/${repo.toLowerCase()}`;

package/dist/monorepo/ci-workflow.d.ts

@@ -6,6 +6,8 @@ export declare enum CiWorkflowStepKind {
     Build = "build",
     Lint = "lint",
     UnitTests = "unit-tests",
+    ManagedFilesCheck = "managed-files-check",
+    ManagedFilesDispatch = "managed-files-dispatch",
     Deploy = "deploy",
     SaveNxCache = "save-nx-cache",
     UploadTraceDbs = "upload-trace-dbs",

package/dist/monorepo/ci-workflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ci-workflow.d.ts","sourceRoot":"","sources":["../../src/monorepo/ci-workflow.ts"],"names":[],"mappings":"AAEA,oBAAY,kBAAkB;IAC5B,QAAQ,aAAa;IACrB,WAAW,iBAAiB;IAC5B,SAAS,gBAAgB;IACzB,cAAc,qBAAqB;IACnC,KAAK,UAAU;IACf,IAAI,SAAS;IACb,SAAS,eAAe;IACxB,MAAM,WAAW;IACjB,WAAW,kBAAkB;IAC7B,cAAc,qBAAqB;IACnC,aAAa,oBAAoB;CAClC;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,kBAAkB,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,YAAY,CAAC;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAID,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,2BAA2B,GAAG,cAAc,EAAE,CAmBvF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,MAAM,CAGjF"}
+{"version":3,"file":"ci-workflow.d.ts","sourceRoot":"","sources":["../../src/monorepo/ci-workflow.ts"],"names":[],"mappings":"AAEA,oBAAY,kBAAkB;IAC5B,QAAQ,aAAa;IACrB,WAAW,iBAAiB;IAC5B,SAAS,gBAAgB;IACzB,cAAc,qBAAqB;IACnC,KAAK,UAAU;IACf,IAAI,SAAS;IACb,SAAS,eAAe;IACxB,iBAAiB,wBAAwB;IACzC,oBAAoB,2BAA2B;IAC/C,MAAM,WAAW;IACjB,WAAW,kBAAkB;IAC7B,cAAc,qBAAqB;IACnC,aAAa,oBAAoB;CAClC;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,kBAAkB,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,YAAY,CAAC;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAID,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,2BAA2B,GAAG,cAAc,EAAE,CAqBvF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,MAAM,CAGjF"}

package/dist/monorepo/ci-workflow.js

@@ -8,6 +8,8 @@ export var CiWorkflowStepKind;
     CiWorkflowStepKind["Build"] = "build";
     CiWorkflowStepKind["Lint"] = "lint";
     CiWorkflowStepKind["UnitTests"] = "unit-tests";
+    CiWorkflowStepKind["ManagedFilesCheck"] = "managed-files-check";
+    CiWorkflowStepKind["ManagedFilesDispatch"] = "managed-files-dispatch";
     CiWorkflowStepKind["Deploy"] = "deploy";
     CiWorkflowStepKind["SaveNxCache"] = "save-nx-cache";
     CiWorkflowStepKind["UploadTraceDbs"] = "upload-trace-dbs";
@@ -22,6 +24,8 @@ export function defineCiWorkflow(options) {
         { kind: CiWorkflowStepKind.Build, name: '🔨 Build' },
         { kind: CiWorkflowStepKind.Lint, name: '🔍 Lint' },
         { kind: CiWorkflowStepKind.UnitTests, name: '🧪 Unit Tests' },
+        { kind: CiWorkflowStepKind.ManagedFilesCheck, name: '🩺 Check managed-file drift' },
+        { kind: CiWorkflowStepKind.ManagedFilesDispatch, name: '🔁 Dispatch managed-file drift healing' },
     ];
     if (options.deploy) {
         steps.push({ kind: CiWorkflowStepKind.Deploy, name: '🚀 Deploy Staging' });
@@ -43,7 +47,8 @@ ${renderYamlList(options.pushBranches, 6)}
   pull_request:
 
 permissions:
-  actions: read
+  # actions:write lets the drift step dispatch the managed-files workflow.
+  actions: write
   contents: read
   statuses: write
 
@@ -135,6 +140,27 @@ function yamlLinesForStep(step, options) {
             return nxSmartStep(step, 'lint', 'Lint');
         case CiWorkflowStepKind.UnitTests:
             return nxSmartStep(step, 'test', 'Unit Tests');
+        case CiWorkflowStepKind.ManagedFilesCheck:
+            // The authoritative drift check is nearly free here (devenv is already
+            // up). --warn never fails the job and publishes the step output
+            // `drifted=<count>` for the dispatch step below.
+            return [
+                `      - name: ${step.name}`,
+                '        id: managed-drift',
+                '        if:',
+                "          ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}',",
+                '          github.event.repository.default_branch) }}',
+                '        run: smoo monorepo check --warn',
+            ];
+        case CiWorkflowStepKind.ManagedFilesDispatch:
+            // Dispatches the managed-files workflow, which maintains the persistent
+            // review PR. workflow_dispatch is exempt from GitHub's GITHUB_TOKEN
+            // recursion guard, so the default token suffices.
+            return [
+                `      - name: ${step.name}`,
+                "        if: ${{ steps.managed-drift.outputs.drifted != '' && steps.managed-drift.outputs.drifted != '0' }}",
+                '        run: gh workflow run managed-files.yml --ref "$GITHUB_REF_NAME"',
+            ];
         case CiWorkflowStepKind.Deploy:
             return [
                 `      - name: ${step.name}`,

package/dist/monorepo/git-config.js

@@ -13,8 +13,8 @@ export async function applyWorkspaceGitConfig(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.
+    // implemented in tooling/direnv/merge-newer-pins.sh. Runtime package.json
+    // pin repair is explicit via `smoo monorepo init --runtime-only`.
     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');

package/dist/monorepo/index.d.ts

@@ -31,7 +31,9 @@ export interface SetupTestTracingShell {
 export declare function initMonorepo(root: string, options: InitOptions): Promise<void>;
 export declare function validateMonorepo(root: string, options?: ValidateOptions): Promise<void>;
 export declare function updateManagedFiles(root: string): void;
-export declare function checkManagedFiles(root: string): void;
+export declare function checkManagedFiles(root: string, options?: {
+    warn?: boolean;
+}): void;
 export declare function diffManagedFiles(root: string): void;
 export declare function validateCommitMessageFile(path: string | undefined, options?: ValidateCommitMessageOptions, root?: string): void;
 export declare function listReleaseProjectNamesForNx(root: string, options?: ListReleasePackagesOptions): string;

package/dist/monorepo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/monorepo/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAMxD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,4BAA4B;IAC3C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpF;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBjG;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAErD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAMpD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEnD;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,GAAE,4BAAiC,EAC1C,IAAI,SAAgB,GACnB,IAAI,CAgBN;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,0BAA+B,GAAG,MAAM,CAW3G;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAI5D;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,uBAAuB,EAChC,KAAK,GAAE,qBAAoD,GAC1D,OAAO,CAAC,IAAI,CAAC,CA8Bf;AAED,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/monorepo/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAMxD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,4BAA4B;IAC3C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpF;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBjG;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAErD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,IAAI,CAUtF;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEnD;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,GAAE,4BAAiC,EAC1C,IAAI,SAAgB,GACnB,IAAI,CAgBN;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,0BAA+B,GAAG,MAAM,CAW3G;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAI5D;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,uBAAuB,EAChC,KAAK,GAAE,qBAAoD,GAC1D,OAAO,CAAC,IAAI,CAAC,CA8Bf;AAED,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,CAAC"}

package/dist/monorepo/index.js

@@ -5,7 +5,7 @@ import { escapeRegex, getWorkspacePackages, getWorkspacePatterns, listReleasePac
 import { formatCommitMessage, validateCommitMessage } from './commit-msg.js';
 import { applyWorkspaceGitConfig } from './git-config.js';
 import { syncBunLockfileVersions } from './lockfile.js';
-import { applyManagedFiles, printResults } from './managed-files.js';
+import { applyManagedFiles, printResults, warnOnManagedFileDrift } from './managed-files.js';
 import { listValidCommitScopes, validatePublicTags } from './package-policy.js';
 import { runInitPacks, runValidatePacks } from './packs/index.js';
 import { syncRootRuntimeVersions } from './runtime.js';
@@ -38,7 +38,11 @@ export async function validateMonorepo(root, options = {}) {
 export function updateManagedFiles(root) {
     printResults(applyManagedFiles(root, 'update'));
 }
-export function checkManagedFiles(root) {
+export function checkManagedFiles(root, options = {}) {
+    if (options.warn === true) {
+        warnOnManagedFileDrift(root);
+        return;
+    }
     const results = applyManagedFiles(root, 'check');
     printResults(results);
     if (results.some((result) => result.action === 'drifted')) {

package/dist/monorepo/lockfile.d.ts

@@ -1,8 +1,20 @@
 export interface SyncBunLockfileVersionsOptions {
     log?: boolean;
-    /** `git add` bun.lock after rewriting it, for the pre-commit self-heal path. */
+    /** `git add` bun.lock when versions were resynced. */
     stage?: boolean;
+    /**
+     * `install` (default for validation): lockfile must match package.json.
+     * `publish`: rewrite unpublished prerelease package.json versions to the last
+     * stable git tag so `bun pm pack` embeds installable dependency versions.
+     */
+    mode?: 'install' | 'publish';
 }
 export declare function syncBunLockfileVersions(root: string, options?: SyncBunLockfileVersionsOptions): number;
+/** Install/CI invariant: bun.lock workspace versions match package.json. */
 export declare function validateBunLockfileVersions(root: string): number;
+/**
+ * Version Bun should embed for a workspace dependency when packing for publish.
+ * Unpublished package.json prereleases (prepare-next) map to the last stable tag.
+ */
+export declare function publishPackDependencyVersion(root: string, projectName: string, packageVersion: string): string;
 //# sourceMappingURL=lockfile.d.ts.map

package/dist/monorepo/lockfile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lockfile.d.ts","sourceRoot":"","sources":["../../src/monorepo/lockfile.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,8BAA8B;IAC7C,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,gFAAgF;IAChF,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAiBD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,8BAAmC,GAAG,MAAM,CAuD1G;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAiChE"}
+{"version":3,"file":"lockfile.d.ts","sourceRoot":"","sources":["../../src/monorepo/lockfile.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,8BAA8B;IAC7C,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,sDAAsD;IACtD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;CAC9B;AAmBD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,8BAAmC,GAAG,MAAM,CAqD1G;AAED,4EAA4E;AAC5E,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA8BhE;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAE9G"}

package/dist/monorepo/lockfile.js

@@ -2,23 +2,26 @@ import { execSync } from 'node:child_process';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { escapeRegex, getWorkspacePackages } from '../lib/workspace.js';
-// Temporary Bun workaround. Delete this sync function, validateBunLockfileVersions,
-// the `smoo monorepo sync-bun-lockfile-versions` command, and the matching Nx
-// versionActions hook once supported Bun versions stop leaving workspace package
-// versions stale in bun.lock after manifest bumps. Until then, `bun pm pack`
-// rewrites `workspace:*` dependencies using those stale lockfile versions instead
-// of the current package.json versions. Track removal against:
+// Temporary Bun workaround. Delete once supported Bun versions stop leaving
+// workspace package versions stale in bun.lock after manifest bumps, and stop
+// resolving `workspace:*` from the lockfile during `bun pm pack`:
 // - https://github.com/oven-sh/bun/issues/18906
 // - https://github.com/oven-sh/bun/issues/20477
 // - https://github.com/oven-sh/bun/issues/20829
 //
-// Any `bun install` rewrites the workspace versions from package.json, reverting
-// this sync between releases. The pre-commit hook therefore runs
-// `smoo monorepo sync-bun-lockfile-versions --stage` on every commit so drift is
-// healed at the commit that would otherwise carry it — validation must never
-// fail a committer for drift a routine `bun install` introduced.
+// Two modes, because one lockfile serves two jobs:
+//
+// 1) install / frozen CI  → lockfile ≡ package.json (including -next)
+// 2) pre-publish pack    → for package.json prereleases that were never published
+//                          (post-release "prepare next"), lockfile entry := last
+//                          stable tag so a releasing package does not embed an
+//                          unpublished -next dependency version.
+//
+// Do not run publish-mode rewrite in day-to-day validate or pre-commit: bun install
+// rewrites lockfile back to package.json and frozen CI then fails.
 export function syncBunLockfileVersions(root, options = {}) {
     const log = options.log ?? true;
+    const mode = options.mode ?? 'publish';
     const lockfilePath = join(root, 'bun.lock');
     if (!existsSync(lockfilePath)) {
         throw new Error('bun.lock not found');
@@ -27,12 +30,7 @@ export function syncBunLockfileVersions(root, options = {}) {
     let lockfile = readFileSync(lockfilePath, 'utf8');
     let updated = 0;
     for (const pkg of packages) {
-        // If the package.json version is a prerelease (e.g. 0.2.2-next.0) it may
-        // never have been published.  Use the latest stable git tag version so
-        // that `bun pm pack` writes an installable dependency range for consumers.
-        const targetVersion = pkg.version.includes('-')
-            ? (latestStableTagVersion(root, pkg.projectName) ?? pkg.version)
-            : pkg.version;
+        const targetVersion = lockfileTargetVersion(root, pkg.projectName, pkg.version, mode);
         const relativePath = pkg.path.replaceAll('\\', '/');
         const escaped = escapeRegex(relativePath);
         const pattern = new RegExp(`("${escaped}":\\s*\\{[^}]*"version":\\s*")([^"]+)(")`);
@@ -52,7 +50,9 @@ export function syncBunLockfileVersions(root, options = {}) {
         }
         lockfile = lockfile.replace(pattern, `$1${targetVersion}$3`);
         if (log) {
-            const suffix = targetVersion !== pkg.version ? ` (latest stable tag; package.json has ${pkg.version})` : '';
+            const suffix = mode === 'publish' && targetVersion !== pkg.version
+                ? ` (latest stable tag; package.json has ${pkg.version})`
+                : '';
             console.log(`fix:  ${relativePath}: ${lockVersion} -> ${targetVersion}${suffix}`);
         }
         updated++;
@@ -70,6 +70,7 @@ export function syncBunLockfileVersions(root, options = {}) {
     }
     return updated;
 }
+/** Install/CI invariant: bun.lock workspace versions match package.json. */
 export function validateBunLockfileVersions(root) {
     const lockfilePath = join(root, 'bun.lock');
     if (!existsSync(lockfilePath)) {
@@ -80,9 +81,7 @@ export function validateBunLockfileVersions(root) {
     const lockfile = readFileSync(lockfilePath, 'utf8');
     let failures = 0;
     for (const pkg of packages) {
-        const targetVersion = pkg.version.includes('-')
-            ? (latestStableTagVersion(root, pkg.projectName) ?? pkg.version)
-            : pkg.version;
+        const targetVersion = pkg.version;
         const relativePath = pkg.path.replaceAll('\\', '/');
         const escaped = escapeRegex(relativePath);
         const pattern = new RegExp(`("${escaped}":\\s*\\{[^}]*"version":\\s*")([^"]+)(")`);
@@ -103,6 +102,19 @@ export function validateBunLockfileVersions(root) {
     }
     return failures;
 }
+/**
+ * Version Bun should embed for a workspace dependency when packing for publish.
+ * Unpublished package.json prereleases (prepare-next) map to the last stable tag.
+ */
+export function publishPackDependencyVersion(root, projectName, packageVersion) {
+    return lockfileTargetVersion(root, projectName, packageVersion, 'publish');
+}
+function lockfileTargetVersion(root, projectName, packageVersion, mode) {
+    if (mode === 'install' || !packageVersion.includes('-')) {
+        return packageVersion;
+    }
+    return latestStableTagVersion(root, projectName) ?? packageVersion;
+}
 function latestStableTagVersion(root, projectName) {
     try {
         const output = execSync(`git tag --list '${projectName}@*' --sort=-v:refname`, {

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

@@ -51,5 +51,16 @@ export declare function applyManagedFiles(root: string, mode: 'update' | 'check'
 export declare function platformTargetGlobsForTest(targetNames: Iterable<string>): string[];
 export declare function printResults(results: FileResult[]): void;
 export declare function validateManagedFiles(root: string): number;
+/**
+ * Non-blocking drift report: prints the per-file table and surfaces drift as
+ * GitHub Actions warning annotations (plain stderr elsewhere) without failing
+ * the run. Managed-file drift is derived state with its own remediation flow
+ * (the persistent managed-files PR); only `monorepo check` without --warn and
+ * PR-scoped gates treat it as an error.
+ *
+ * Under GitHub Actions the drifted-file count is published as the step output
+ * `drifted`, so downstream steps gate declaratively instead of parsing logs.
+ */
+export declare function warnOnManagedFileDrift(root: string): void;
 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":"AAWA;;;;;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;;;;;;;;;GASG;AACH,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AACvD,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;8BAE8B;AAC9B,iBAAS,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,gBAAgB,EAAE,CAAA;CAAE,CAkCxG;AAED,wCAAwC;AACxC,eAAO,MAAM,+BAA+B,iCAA2B,CAAC;AAExE;+EAC+E;AAC/E,iBAAS,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAqBtF;AAED,yCAAyC;AACzC,eAAO,MAAM,gCAAgC,kCAA4B,CAAC;AAE1E,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;AA+GD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,EAAE,CAG/F;AA6FD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAMlF;AAsHD,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":"AAYA;;;;;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;;;;;;;;;GASG;AACH,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AACvD,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;8BAE8B;AAC9B,iBAAS,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,gBAAgB,EAAE,CAAA;CAAE,CAkCxG;AAED,wCAAwC;AACxC,eAAO,MAAM,+BAA+B,iCAA2B,CAAC;AAExE;+EAC+E;AAC/E,iBAAS,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAqBtF;AAED,yCAAyC;AACzC,eAAO,MAAM,gCAAgC,kCAA4B,CAAC;AAE1E,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;AAyHD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,EAAE,CAG/F;AA6FD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAMlF;AAgGD,wBAAgB,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAIxD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAkBzD"}