@smoothbricks/cli 0.10.6 → 0.10.8

package/dist/monorepo/ci-workflow.js

@@ -29,7 +29,7 @@ export function defineCiWorkflow(options) {
         { kind: CiWorkflowStepKind.ManagedFilesDispatch, name: '🔁 Dispatch managed-file drift healing' },
     ];
     if (options.deploy) {
-        steps.push({ kind: CiWorkflowStepKind.Deploy, name: '🚀 Deploy Staging' });
+        steps.push({ kind: CiWorkflowStepKind.Deploy, name: '🚀 Deploy Environment' });
     }
     steps.push({ kind: CiWorkflowStepKind.SaveNxCache, name: '💾 Save Nx cache' }, { kind: CiWorkflowStepKind.UploadTraceDbs, name: '📎 Upload trace DBs' }, { kind: CiWorkflowStepKind.SaveNixDevenv, name: '🧹 Cleanup and cache Nix/devenv' });
     return steps.map((step, index) => ({ ...step, number: index + 2 }));
@@ -51,7 +51,7 @@ permissions:
   # actions:write lets the drift step dispatch the managed-files workflow.
   actions: write
   contents: read
-  statuses: write
+${options.deploy ? '  deployments: write\n' : ''}  statuses: write
 
 defaults:
   run:
@@ -167,11 +167,15 @@ function yamlLinesForStep(step, options) {
         case CiWorkflowStepKind.Deploy:
             return [
                 `      - name: ${step.name}`,
-                '        if:',
-                "          ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}',",
-                '          github.event.repository.default_branch) }}',
+                '        if: >-',
+                '          ${{',
+                "            (github.event_name == 'pull_request' &&",
+                '              contains(fromJSON(\'["opened","reopened","synchronize"]\'), github.event.action) &&',
+                '              github.event.pull_request.head.repo.full_name == github.repository) ||',
+                "            (github.event_name == 'push' && github.ref == 'refs/heads/private')",
+                '          }}',
                 ...deployEnvLines(options),
-                `        run: smoo github-ci nx-deploy --configuration staging --mode affected --name "Deploy Staging" --step ${step.number}`,
+                `        run: smoo github-ci nx-deploy --mode run-many --name "Deploy Environment" --step ${step.number}`,
             ];
         case CiWorkflowStepKind.SaveNxCache:
             return [
@@ -220,6 +224,12 @@ function deployEnvLines(options) {
         '        env:',
         '          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}',
         '          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}',
+        '          GITHUB_CLIENT_SECRET: ${{ secrets.GITHUB_CLIENT_SECRET }}',
+        '          GITHUB_APP_PRIVATE_KEY: ${{ secrets.GITHUB_APP_PRIVATE_KEY }}',
+        '          GITHUB_APP_PRIVATE_KEY_PEM: ${{ secrets.GITHUB_APP_PRIVATE_KEY_PEM }}',
+        '          OAUTH_STATE_SIGNING_KEY: ${{ secrets.OAUTH_STATE_SIGNING_KEY }}',
+        '          MAIL_CAPTURE_CONTROL_TOKEN: ${{ secrets.MAIL_CAPTURE_CONTROL_TOKEN }}',
+        '          TOKEN_ENCRYPTION_KEY: ${{ secrets.TOKEN_ENCRYPTION_KEY }}',
     ];
 }
 function nxSmartStep(step, target, name) {

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

@@ -1,3 +1,4 @@
+import { type NxProjects } from '../nx/index.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
@@ -51,31 +52,14 @@ interface DeployTargetInfo {
     exists: boolean;
     provider?: 'cloudflare';
 }
+export declare const managedFileTargetsForTest: {
+    target: string;
+    executable: boolean | undefined;
+}[];
 export declare function applyManagedFiles(root: string, mode: 'update' | 'check' | 'diff'): Promise<FileResult[]>;
 export declare function platformTargetGlobsForTest(targetNames: Iterable<string>): string[];
-/** Resolved Nx project node as returned under `graph.nodes` / project-graph.json. */
-export type NxGraphProjectNode = {
-    data?: {
-        targets?: Record<string, NxGraphTarget>;
-    };
-    targets?: Record<string, NxGraphTarget>;
-};
-type NxGraphTarget = {
-    command?: string;
-    options?: {
-        command?: string;
-    };
-    configurations?: Record<string, {
-        command?: string;
-        options?: {
-            command?: string;
-        };
-    }>;
-};
-/** Test seam: collect target names from a graph.nodes map. */
-export declare function targetNamesFromProjects(nodes: Record<string, NxGraphProjectNode>): string[];
 /** Test seam: deploy configuration presence/provider from graph nodes. */
-export declare function deployTargetInfoFromProjects(nodes: Record<string, NxGraphProjectNode>, configuration: string): DeployTargetInfo;
+export declare function deployTargetInfoFromProjects(projects: NxProjects, configuration: string): DeployTargetInfo;
 export declare function printResults(results: FileResult[]): void;
 export declare function validateManagedFiles(root: string): Promise<number>;
 /**

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":"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"}
+{"version":3,"file":"managed-files.d.ts","sourceRoot":"","sources":["../../src/monorepo/managed-files.ts"],"names":[],"mappings":"AAMA,OAAO,EAAkB,KAAK,UAAU,EAA2B,MAAM,gBAAgB,CAAC;AAO1F;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,yEAAyE,CAAC;AAW3G,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;AAeD,UAAU,gBAAgB;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAkHD,eAAO,MAAM,yBAAyB;;;GAAyE,CAAC;AAIhH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAG9G;AAyGD,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAMlF;AAED,0EAA0E;AAC1E,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,gBAAgB,CAY1G;AA2DD,wBAAgB,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAIxD;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQxE;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBxE"}

package/dist/monorepo/managed-files.js

@@ -2,10 +2,10 @@ import { appendFileSync, existsSync, lstatSync, mkdirSync, readFileSync, writeFi
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { PLATFORM_TARGET_GLOBS } from '@smoothbricks/nx-plugin/workspace-config-policy';
-// Nx package exports are CLI-oriented; this is the module the CLI uses for graph + daemon IPC.
-import { createProjectGraphAsync } from 'nx/src/project-graph/project-graph.js';
 import { listReleasePackages, readPackageJson } from '../lib/workspace.js';
+import { loadNxProjects, targetNamesFromProjects } from '../nx/index.js';
 import { renderCiWorkflowYaml } from './ci-workflow.js';
+import { renderPrPreviewCleanupWorkflowYaml } from './pr-preview-cleanup-workflow.js';
 import { renderPublishWorkflowYaml } from './publish-workflow.js';
 /**
  * Repos may append their own content to a managed file below this marker —
@@ -100,6 +100,12 @@ const managedFiles = [
         source: 'envrc',
         target: '.envrc',
     },
+    {
+        kind: 'raw',
+        source: 'tooling/devenv',
+        target: 'tooling/devenv',
+        executable: true,
+    },
     {
         kind: 'raw',
         source: 'tooling/direnv/repo-path',
@@ -146,16 +152,17 @@ const managedFiles = [
         target: 'tooling/direnv/merge-newer-pins.sh',
         executable: true,
     },
-    {
-        kind: 'raw',
-        source: 'patches/ttsc@0.19.3.patch',
-        target: 'patches/ttsc@0.19.3.patch',
-    },
     {
         kind: 'generated',
         source: 'ci-workflow',
         target: '.github/workflows/ci.yml',
     },
+    {
+        kind: 'generated',
+        source: 'pr-preview-cleanup-workflow',
+        target: '.github/workflows/pr-preview-cleanup.yml',
+        cloudflareDeployOnly: true,
+    },
     {
         kind: 'generated',
         source: 'publish-workflow',
@@ -198,6 +205,7 @@ const managedFiles = [
         target: '.github/actions/cache-nx/action.yml',
     },
 ];
+export const managedFileTargetsForTest = managedFiles.map(({ target, executable }) => ({ target, executable }));
 const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..', '..');
 export async function applyManagedFiles(root, mode) {
     const context = await getManagedFileContext(root);
@@ -207,6 +215,9 @@ function applyManagedFile(root, file, mode, context) {
     if (file.releasePackagesOnly === true && !context.hasReleasePackages && !context.hasProductionDeployTargets) {
         return { target: file.target, action: 'skipped' };
     }
+    if (file.cloudflareDeployOnly === true && context.stagingDeployProvider !== 'cloudflare') {
+        return { target: file.target, action: 'skipped' };
+    }
     const target = resolve(root, file.target);
     const content = getManagedContent(file, context);
     if (existsSync(target)) {
@@ -256,6 +267,9 @@ function getManagedContent(file, context) {
                 runsOn: context.ciRunsOn,
             });
         }
+        if (file.source === 'pr-preview-cleanup-workflow') {
+            return renderPrPreviewCleanupWorkflowYaml({ runsOn: context.ciRunsOn });
+        }
         throw new Error(`Unknown generated managed file source ${file.source}`);
     }
     const sourceRoot = file.kind === 'raw' ? 'managed/raw' : 'managed/templates';
@@ -272,7 +286,7 @@ async function getManagedFileContext(root) {
     const ciPushBranches = getCiPushBranches(packageJson?.json);
     const ciRunsOn = getCiRunsOn(packageJson?.json);
     // In-process Nx API → daemon socket (no second Node/`nx` CLI process).
-    const nxProjects = await loadNxGraphProjects(root);
+    const nxProjects = await loadNxProjects(root);
     const stagingDeploy = deployTargetInfoFromProjects(nxProjects, 'staging');
     const productionDeploy = deployTargetInfoFromProjects(nxProjects, 'production');
     const platformTargetGlobs = platformTargetGlobsForTest(targetNamesFromProjects(nxProjects));
@@ -299,48 +313,12 @@ export function platformTargetGlobsForTest(targetNames) {
         return names.some((name) => name.endsWith(suffix));
     });
 }
-/**
- * Load resolved project nodes via Nx's programmatic API.
- *
- * `createProjectGraphAsync` is what the CLI uses: with the daemon up it speaks the
- * daemon unix socket instead of rebuilding the graph in a fresh Node process.
- * Spawning `nx graph` / `nx show` only added CLI boot + plugin-worker overhead on
- * top of that. smoo runs under Bun; Bun can import this CJS module directly.
- */
-async function loadNxGraphProjects(root) {
-    const prevCwd = process.cwd();
-    process.chdir(root);
-    try {
-        const graph = (await createProjectGraphAsync());
-        const out = {};
-        for (const [name, node] of Object.entries(graph.nodes)) {
-            out[name] = { data: { targets: node.data?.targets ?? {} } };
-        }
-        return out;
-    }
-    finally {
-        process.chdir(prevCwd);
-    }
-}
-function targetsOfProject(node) {
-    return node.data?.targets ?? node.targets ?? {};
-}
-/** Test seam: collect target names from a graph.nodes map. */
-export function targetNamesFromProjects(nodes) {
-    const targetNames = new Set();
-    for (const node of Object.values(nodes)) {
-        for (const name of Object.keys(targetsOfProject(node))) {
-            targetNames.add(name);
-        }
-    }
-    return [...targetNames];
-}
 /** Test seam: deploy configuration presence/provider from graph nodes. */
-export function deployTargetInfoFromProjects(nodes, configuration) {
+export function deployTargetInfoFromProjects(projects, configuration) {
     let exists = false;
     let provider;
-    for (const node of Object.values(nodes)) {
-        const info = deployTargetInfoFromTargets(targetsOfProject(node), configuration);
+    for (const project of Object.values(projects)) {
+        const info = deployTargetInfoFromTargets(project.targets ?? {}, configuration);
         if (!info.exists) {
             continue;
         }
@@ -354,11 +332,16 @@ function deployTargetInfoFromTargets(targets, configuration) {
     if (!deploy) {
         return { exists: false };
     }
+    const baseCommandValue = deploy.options?.command ?? deploy.command;
+    const baseCommand = typeof baseCommandValue === 'string' ? baseCommandValue : '';
+    if (baseCommand.includes('smoo wrangler deploy-environment')) {
+        return { exists: true, provider: 'cloudflare' };
+    }
     const config = deploy.configurations?.[configuration];
     if (!config) {
         return { exists: false };
     }
-    const commandValue = config.command ?? config.options?.command ?? deploy.options?.command ?? deploy.command;
+    const commandValue = config.command ?? config.options?.command ?? baseCommand;
     const command = typeof commandValue === 'string' ? commandValue : '';
     return { exists: true, provider: command.includes('wrangler ') ? 'cloudflare' : undefined };
 }

package/dist/monorepo/package-policy.js

@@ -113,7 +113,7 @@ export function applyWorkspaceDependencyDefaults(root, options = {}) {
     else {
         console.log('unchanged      tsconfig.test.json policy');
     }
-    if (applyWorkspaceBoundedTestTargetPolicy(root)) {
+    if (applyWorkspaceBoundedTestTargetPolicy(root, options)) {
         console.log('updated        package test targets bounded execution policy');
     }
     else {
@@ -343,7 +343,7 @@ export function validateWorkspaceDependencies(root, options = {}) {
         console.error(`${issue.path}: ${issue.message}`);
         failures++;
     }
-    for (const issue of checkWorkspaceBoundedTestTargetPolicy(root)) {
+    for (const issue of checkWorkspaceBoundedTestTargetPolicy(root, options)) {
         console.error(`${issue.path}: ${issue.message}`);
         failures++;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/monorepo/packs/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,cAAc,EAAsB,MAAM,mBAAmB,CAAC;AAK5E,OAAO,EAKL,KAAK,sBAAsB,EAO5B,MAAM,sBAAsB,CAAC;AAU9B,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAClD,WAAW,CAAC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACzD,YAAY,CAAC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1D,gBAAgB,CAAC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IAClE,iBAAiB,CAAC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;CACpE;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAChC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,mBAAmB,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;CAC9F;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB;AAqHD,wBAAsB,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAItE;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,eAAe,EACpB,OAAO,GAAE,mBAAwB,EACjC,KAAK,GAAE,oBAAyB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA0B7B;AAuMD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAaxG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/monorepo/packs/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,cAAc,EAAsB,MAAM,mBAAmB,CAAC;AAK5E,OAAO,EAKL,KAAK,sBAAsB,EAO5B,MAAM,sBAAsB,CAAC;AAU9B,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAClD,WAAW,CAAC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACzD,YAAY,CAAC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1D,gBAAgB,CAAC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IAClE,iBAAiB,CAAC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;CACpE;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAChC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,mBAAmB,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;CAC9F;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB;AAqHD,wBAAsB,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAItE;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,eAAe,EACpB,OAAO,GAAE,mBAAwB,EACjC,KAAK,GAAE,oBAAyB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA0B7B;AAuMD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAexG"}

package/dist/monorepo/packs/index.js

@@ -315,10 +315,12 @@ export function resolvedTargetsByProject(projects) {
     return new Map(projects.map((project) => [
         project.project,
         {
+            ...(project.root ? { root: project.root } : {}),
             targets: new Set(project.targets),
             ...(project.buildDependsOn ? { buildDependsOn: project.buildDependsOn } : {}),
             ...(project.targetDependencies ? { targetDependencies: project.targetDependencies } : {}),
             ...(project.targetExecutors ? { targetExecutors: project.targetExecutors } : {}),
+            ...(project.targetOptions ? { targetOptions: project.targetOptions } : {}),
             ...(project.targetScripts ? { targetScripts: project.targetScripts } : {}),
         },
     ]));

package/dist/monorepo/pr-preview-cleanup-workflow.d.ts

@@ -0,0 +1,5 @@
+export interface PrPreviewCleanupWorkflowOptions {
+    runsOn?: string | string[];
+}
+export declare function renderPrPreviewCleanupWorkflowYaml(options?: PrPreviewCleanupWorkflowOptions): string;
+//# sourceMappingURL=pr-preview-cleanup-workflow.d.ts.map

package/dist/monorepo/pr-preview-cleanup-workflow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pr-preview-cleanup-workflow.d.ts","sourceRoot":"","sources":["../../src/monorepo/pr-preview-cleanup-workflow.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,+BAA+B;IAC9C,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC5B;AAED,wBAAgB,kCAAkC,CAAC,OAAO,GAAE,+BAAoC,GAAG,MAAM,CAmCxG"}

package/dist/monorepo/pr-preview-cleanup-workflow.js

@@ -0,0 +1,38 @@
+/* biome-ignore-all lint/suspicious/noTemplateCurlyInString: GitHub Actions expressions are emitted literally. */
+import { renderRunsOnLine } from './github-runs-on.js';
+export function renderPrPreviewCleanupWorkflowYaml(options = {}) {
+    return `name: PR Preview Cleanup
+
+on:
+  pull_request:
+    types: [closed]
+
+permissions:
+  contents: read
+
+jobs:
+  cleanup:
+    name: Cleanup PR environment
+    if: github.event.pull_request.head.repo.full_name == github.repository
+${renderRunsOnLine(options.runsOn)}
+    timeout-minutes: 15
+    defaults:
+      run:
+        working-directory: tooling/direnv
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6.0.2
+        with:
+          filter: blob:none
+          fetch-depth: 1
+
+      - name: Setup Nix/devenv
+        uses: ./.github/actions/setup-devenv
+
+      - name: Cleanup PR environment
+        env:
+          CLOUDFLARE_API_TOKEN: \${{ secrets.CLOUDFLARE_API_TOKEN }}
+          CLOUDFLARE_ACCOUNT_ID: \${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+        run: smoo wrangler cleanup-pr --pr \${{ github.event.pull_request.number }}
+`;
+}

package/dist/monorepo/publish-workflow.js

@@ -380,7 +380,7 @@ function deployProductionStep(step, options) {
         "          ${{ steps.version.outputs.mode != 'none' && inputs.deploy_environment == 'production' && inputs.dry_run !=",
         "          'true' }}",
         ...deployEnvLines(options),
-        '        run: smoo github-ci nx-deploy --configuration production --mode run-many --verify --name "Deploy Production"',
+        '        run: smoo github-ci nx-deploy --environment production --mode run-many --verify --name "Deploy Production"',
     ];
 }
 function deployEnvLines(options) {
@@ -557,7 +557,7 @@ function renderMacosPlatformSteps(options) {
     if (isSmoothBricksCodebasePackageName(options.repoName)) {
         lines.push('', `      # Step ${stepNumber++}`, '      - name: 🏗️ Build self-hosted smoo', '        # SmoothBricks self-hosts smoo from source for release commands.', '        run: nx build cli');
     }
-    lines.push('', `      # Step ${stepNumber++}`, '      - name: 🍎 Build selected macOS and iOS release outputs', '        run:', `          smoo release build-platform-outputs --bump "${githubExpression('inputs.bump')}" --ref "${githubExpression('github.sha')}" --targets "${MACOS_PLATFORM_TARGET_GLOBS.join(',')}" --output`, `          "${githubExpression('runner.temp')}/macos-platform-outputs"`, '', `      # Step ${stepNumber++}`, '      - name: 📤 Upload macOS platform outputs', '        uses: actions/upload-artifact@v7.0.1', '        with:', `          name: publish-macos-outputs-${githubExpression('github.run_id')}`, `          path: ${githubExpression('runner.temp')}/macos-platform-outputs`, '          if-no-files-found: error', '          retention-days: 1', '          include-hidden-files: true', '', '      # --- Cleanup ------------------------------------------------------------', '', `      # Step ${stepNumber}`, '      - name: 🧹 Cleanup and cache Nix/devenv', '        # success() is default; always() still saves GH Nix cache after a red job.', '        if: always()', '        uses: ./.github/actions/save-nix-devenv', '        with:', `          nix-cache-hit: ${githubExpression('steps.setup.outputs.nix-cache-hit')}`, `          devenv-cache-hit: ${githubExpression('steps.setup.outputs.devenv-cache-hit')}`);
+    lines.push('', `      # Step ${stepNumber++}`, '      - name: 🍎 Build selected macOS and iOS release outputs', '        run:', `          smoo release build-platform-outputs --bump "${githubExpression('inputs.bump')}" --ref "${githubExpression('github.sha')}" --targets "${MACOS_PLATFORM_TARGET_GLOBS.join(',')}" --output`, `          "${githubExpression('runner.temp')}/macos-platform-outputs"`, '', `      # Step ${stepNumber++}`, '      - name: 🧪 Unit test macOS and iOS packages', '        run:', `          smoo github-ci nx-run-many --targets test --projects-with-targets "${MACOS_PLATFORM_TARGET_GLOBS.join(',')}"`, '', `      # Step ${stepNumber++}`, '      - name: 📤 Upload macOS platform outputs', '        uses: actions/upload-artifact@v7.0.1', '        with:', `          name: publish-macos-outputs-${githubExpression('github.run_id')}`, `          path: ${githubExpression('runner.temp')}/macos-platform-outputs`, '          if-no-files-found: error', '          retention-days: 1', '          include-hidden-files: true', '', '      # --- Cleanup ------------------------------------------------------------', '', `      # Step ${stepNumber}`, '      - name: 🧹 Cleanup and cache Nix/devenv', '        # success() is default; always() still saves GH Nix cache after a red job.', '        if: always()', '        uses: ./.github/actions/save-nix-devenv', '        with:', `          nix-cache-hit: ${githubExpression('steps.setup.outputs.nix-cache-hit')}`, `          devenv-cache-hit: ${githubExpression('steps.setup.outputs.devenv-cache-hit')}`);
     return lines.join('\n').trimEnd();
 }
 function renderFinalLinuxPublishSteps(options) {
@@ -606,7 +606,7 @@ function renderFinalLinuxPublishSteps(options) {
     }
     lines.push('', `      # Step ${stepNumber++}`, '      - name: 🍎 Apply verified macOS outputs', `        if: ${mode} != 'none'`, '        run:', `          smoo github-ci apply-outputs --source-sha "${githubExpression('github.sha')}"`, `          "${githubExpression('runner.temp')}/publish-artifacts/publish-macos-outputs-${githubExpression('github.run_id')}/current"`, '', `      # Step ${stepNumber++}`, `      - name: ✅ Validate restored release (${githubExpression(mode)})`, `        if: ${mode} != 'none'`, '        run: smoo monorepo validate', '', '      # --- Release ------------------------------------------------------------', '', `      # Step ${stepNumber++}`, `      - name: 📦 Publish release (${githubExpression(mode)})`, '        # smoo packs with Bun, then publishes tarballs with npm. Existing', '        # packages must already exist on npm and use trusted publishing/OIDC.', '        # Missing package names are bootstrapped locally before trust setup.', `        run: smoo release publish --bump "${githubExpression('inputs.bump')}" --dry-run "${githubExpression('inputs.dry_run')}"`);
     if (options.deploy === true) {
-        lines.push('', `      # Step ${stepNumber++}`, '      - name: 🚀 Deploy production', '        if:', "          ${{ needs.linux-release-candidate.outputs.mode != 'none' && inputs.deploy_environment == 'production' &&", "          inputs.dry_run != 'true' }}", ...deployEnvLines(options), '        run: smoo github-ci nx-deploy --configuration production --mode run-many --verify --name "Deploy Production"');
+        lines.push('', `      # Step ${stepNumber++}`, '      - name: 🚀 Deploy production', '        if:', "          ${{ needs.linux-release-candidate.outputs.mode != 'none' && inputs.deploy_environment == 'production' &&", "          inputs.dry_run != 'true' }}", ...deployEnvLines(options), '        run: smoo github-ci nx-deploy --environment production --mode run-many --verify --name "Deploy Production"');
     }
     lines.push('', '      # --- Cleanup ------------------------------------------------------------', '', `      # Step ${stepNumber}`, '      - name: 🧹 Cleanup and cache Nix/devenv', '        # success() is default; always() still saves GH Nix cache after a red job.', '        if: always()', '        uses: ./.github/actions/save-nix-devenv', '        with:', `          nix-cache-hit: ${githubExpression('steps.setup.outputs.nix-cache-hit')}`, `          devenv-cache-hit: ${githubExpression('steps.setup.outputs.devenv-cache-hit')}`);
     return lines.join('\n').trimEnd();

package/dist/monorepo/runtime.d.ts

@@ -9,8 +9,8 @@ export declare function syncRootRuntimeVersions(root: string): Promise<void>;
 /**
  * Validate that package.json runtime pins agree with the LIVE PATH runtimes,
  * never a stored template. Offline by design: structural alignment only
- * (majors, exact bun pin, no `~major.0.0` floor) — the registry is not
- * consulted. Repair: `smoo monorepo init --runtime-only` inside the devenv shell.
+ * (Node types float within the runtime major; Bun types stay exact) — the registry
+ * is not consulted. Repair: `smoo monorepo init --runtime-only` inside the devenv shell.
  */
 export declare function validateRootRuntimeVersions(root: string): Promise<number>;
 export declare function validateRuntimePins(packageJson: PackageJson, runtime: RuntimeVersions): number;

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

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/monorepo/runtime.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,WAAW,EAMjB,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED,mGAAmG;AACnG,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAOpF;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCzE;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO/E;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAmC9F;AAED,KAAK,mBAAmB,GAAG,OAAO,GAAG,OAAO,CAAC;AAgB7C,wBAAgB,qCAAqC,CACnD,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,EAAE,SAAS,MAAM,EAAE,GAC1B,MAAM,CA2BR"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/monorepo/runtime.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,WAAW,EAMjB,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED,mGAAmG;AACnG,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAOpF;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCzE;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO/E;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CA8B9F;AAED,KAAK,mBAAmB,GAAG,OAAO,GAAG,OAAO,CAAC;AAgB7C,wBAAgB,qCAAqC,CACnD,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,EAAE,SAAS,MAAM,EAAE,GAC1B,MAAM,CA2BR"}

package/dist/monorepo/runtime.js

@@ -39,8 +39,8 @@ export async function syncRootRuntimeVersions(root) {
 /**
  * Validate that package.json runtime pins agree with the LIVE PATH runtimes,
  * never a stored template. Offline by design: structural alignment only
- * (majors, exact bun pin, no `~major.0.0` floor) — the registry is not
- * consulted. Repair: `smoo monorepo init --runtime-only` inside the devenv shell.
+ * (Node types float within the runtime major; Bun types stay exact) — the registry
+ * is not consulted. Repair: `smoo monorepo init --runtime-only` inside the devenv shell.
  */
 export async function validateRootRuntimeVersions(root) {
     const packageJson = readJsonObject(join(root, 'package.json'));
@@ -68,13 +68,9 @@ export function validateRuntimePins(packageJson, runtime) {
         failures++;
     }
     const typesNode = packageJson.devDependencies?.['@types/node'] ?? null;
-    const typesNodeParts = typesNode ? /^~(\d+)\.(\d+)\.(\d+)$/.exec(typesNode) : null;
+    const typesNodeParts = typesNode ? /^\^(\d+)\.(\d+)\.(\d+)$/.exec(typesNode) : null;
     if (!typesNodeParts || typesNodeParts[1] !== nodeMajor) {
-        console.error(`package.json @types/node is ${typesNode ?? 'missing'} but the PATH node is v${runtime.node} — types track the runtime major (~${nodeMajor}.x.y, newest published minor); ${repair}`);
-        failures++;
-    }
-    else if (typesNodeParts[2] === '0' && typesNodeParts[3] === '0') {
-        console.error(`package.json @types/node is pinned to the ~${nodeMajor}.0.0 floor — tilde locks the first patch line and strands the repo on early broken releases; ${repair} to repin to the newest published ${nodeMajor}.x`);
+        console.error(`package.json @types/node is ${typesNode ?? 'missing'} but the PATH node is v${runtime.node} — expected a caret range within the runtime major (^${nodeMajor}.x.y); ${repair}`);
         failures++;
     }
     return failures;
@@ -94,16 +90,15 @@ export function runtimeTypesRangeForPublishedVersions(packageName, runtimeVersio
     }
     if (pinMode === 'major') {
         const runtimeMajor = parsedRuntimeVersion[0].toString();
-        // Newest published types WITHIN the runtime major — never the `~major.0.0`
-        // floor: tilde locks the patch line, so the floor can strand consumers on a
-        // broken early release (e.g. @types/node 24.0.x's URLPattern/DOM TS2403
-        // conflict, fixed in 24.13) with no path to the repaired minors.
+        // Anchor the range at the newest published types in the runtime major. The caret
+        // admits later patches and minors without crossing into a different Node major.
         const latestInMajor = latestVersion(versions.filter((version) => versionMajor(version) === runtimeMajor));
-        if (latestInMajor) {
-            return `~${latestInMajor}`;
+        if (!latestInMajor) {
+            throw new Error(`Unable to find published ${packageName} versions for runtime major ${runtimeMajor}`);
         }
+        return `^${latestInMajor}`;
     }
-    else if (versions.includes(runtimeVersion)) {
+    if (versions.includes(runtimeVersion)) {
         return runtimeVersion;
     }
     const latest = latestVersion(versions);
@@ -111,7 +106,7 @@ export function runtimeTypesRangeForPublishedVersions(packageName, runtimeVersio
         throw new Error(`Unable to find any published ${packageName} versions`);
     }
     console.warn(`${packageName} has no published types for runtime ${runtimeVersion}; using ${latest}`);
-    return pinMode === 'major' ? `~${latest}` : latest;
+    return latest;
 }
 function latestVersion(versions) {
     let latest = null;

package/dist/monorepo/tool-validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-validation.d.ts","sourceRoot":"","sources":["../../src/monorepo/tool-validation.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,WAAW,EAAyB,MAAM,qBAAqB,CAAC;AAU9E,MAAM,WAAW,UAAU;IACzB,sBAAsB,EAAE,OAAO,CAAC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,UAAU,CAAC;CACpB;AAkDD,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKzE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAStE;AAED,wBAAsB,8BAA8B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBtG;AA2CD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAkBlF;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAY/D;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CA0B7D;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,GAAG,MAAM,CAyBvG;AAsBD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAoB/E;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,GAAG,MAAM,CAWhF;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAqB3D;AAsED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAQxE"}
+{"version":3,"file":"tool-validation.d.ts","sourceRoot":"","sources":["../../src/monorepo/tool-validation.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,WAAW,EAAyB,MAAM,qBAAqB,CAAC;AAU9E,MAAM,WAAW,UAAU;IACzB,sBAAsB,EAAE,OAAO,CAAC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,UAAU,CAAC;CACpB;AA4DD,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKzE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAStE;AAED,wBAAsB,8BAA8B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBtG;AAqCD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAkBlF;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAY/D;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAiC7D;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,GAAG,MAAM,CAyBvG;AAyBD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAoB/E;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,GAAG,MAAM,CAWhF;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA6B3D;AAoID,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAQxE"}