@smoothbricks/cli 0.3.4 → 0.4.1

package/src/monorepo/package-hygiene.ts

@@ -1,11 +1,20 @@
-import { run, runStatus } from '../lib/run.js';
+import { printCommandOutput, run, runResult, runStatus } from '../lib/run.js';
 
 export interface PackageHygieneShell {
   run(command: string, args: string[], cwd: string): Promise<void>;
+  runResult?(
+    command: string,
+    args: string[],
+    cwd: string,
+  ): Promise<{
+    exitCode: number;
+    stdout: string;
+    stderr: string;
+  }>;
   runStatus(command: string, args: string[], cwd: string, quiet?: boolean): Promise<number>;
 }
 
-const defaultShell: PackageHygieneShell = { run, runStatus };
+const defaultShell: PackageHygieneShell = { run, runResult, runStatus };
 
 export async function fixPackageHygiene(
   root: string,
@@ -14,8 +23,12 @@ export async function fixPackageHygiene(
 ): Promise<void> {
   const verbose = typeof verboseOrShell === 'boolean' ? verboseOrShell : false;
   const shell = typeof verboseOrShell === 'boolean' ? maybeShell : verboseOrShell;
-  const status = await shell.runStatus('sherif', ['-f', '--select', 'highest'], root, !verbose);
+  const result = await runPackageHygieneCommand(shell, 'sherif', ['-f', '--select', 'highest'], root, verbose);
+  const status = result.exitCode;
   if (status !== 0) {
+    if (!verbose) {
+      printCommandOutput(result.stdout, result.stderr);
+    }
     throw new Error(`sherif -f --select highest failed with exit code ${status}`);
   }
 }
@@ -27,10 +40,27 @@ export async function validatePackageHygiene(
 ): Promise<number> {
   const verbose = typeof verboseOrShell === 'boolean' ? verboseOrShell : false;
   const shell = typeof verboseOrShell === 'boolean' ? maybeShell : verboseOrShell;
-  const status = await shell.runStatus('sherif', ['--fail-on-warnings'], root, !verbose);
+  const result = await runPackageHygieneCommand(shell, 'sherif', ['--fail-on-warnings'], root, verbose);
+  const status = result.exitCode;
   if (status !== 0) {
+    if (!verbose) {
+      printCommandOutput(result.stdout, result.stderr);
+    }
     console.error('sherif package hygiene validation failed');
     return 1;
   }
   return 0;
 }
+
+async function runPackageHygieneCommand(
+  shell: PackageHygieneShell,
+  command: string,
+  args: string[],
+  root: string,
+  verbose: boolean,
+): Promise<{ exitCode: number; stdout: string; stderr: string }> {
+  if (!verbose && shell.runResult) {
+    return shell.runResult(command, args, root);
+  }
+  return { exitCode: await shell.runStatus(command, args, root, !verbose), stdout: '', stderr: '' };
+}

package/src/monorepo/package-policy.test.ts

@@ -51,14 +51,17 @@ describe('root smoo monorepo policy', () => {
       );
       await writeJson(join(root, 'nx.json'), validNxJson());
 
-      expect(validateRootPackagePolicy(root)).toBe(5);
-      expect(validateNxReleaseConfig(root)).toBe(6);
+      expect(validateRootPackagePolicy(root)).toBe(7);
+      expect(validateNxReleaseConfig(root)).toBe(8);
 
       applyFixableMonorepoDefaults(root);
 
       const rootPackage = await readJson(join(root, 'package.json'));
       const nxJson = await readJson(join(root, 'nx.json'));
       expect(rootPackage.scripts).toEqual({
+        clean: 'nx run-many -t clean; nx reset',
+        'clean:node_modules':
+          'rm -rf node_modules && find e* t* p* -type d -name node_modules -print0 | xargs -0 rm -rvf',
         'format:changed': 'git-format-staged --config tooling/git-hooks/git-format-staged.yml --also-unstaged',
         'format:staged': 'git-format-staged --config tooling/git-hooks/git-format-staged.yml',
         lint: 'nx run-many -t lint',
@@ -66,7 +69,7 @@ describe('root smoo monorepo policy', () => {
       });
       expect(rootPackage).toMatchObject({ nx: { includedScripts: [] } });
       expect(nxJson.namedInputs).toEqual(validNamedInputs());
-      expect(nxJson.targetDefaults).toEqual({ build: { cache: true, outputs: ['{projectRoot}/dist'] } });
+      expect(nxJson.targetDefaults).toEqual(validTargetDefaults());
       expect(nxJson.plugins).toEqual([
         {
           plugin: '@nx/js/typescript',
@@ -152,12 +155,12 @@ describe('root smoo monorepo policy', () => {
         },
       });
 
-      expect(validateNxReleaseConfig(root)).toBe(4);
+      expect(validateNxReleaseConfig(root)).toBe(6);
 
       applyFixableMonorepoDefaults(root);
 
       const nxJson = await readJson(join(root, 'nx.json'));
-      expect(nxJson.targetDefaults).toEqual({ build: { cache: true, outputs: ['{projectRoot}/dist'] } });
+      expect(nxJson.targetDefaults).toEqual(validTargetDefaults());
       expect(validateNxReleaseConfig(root)).toBe(0);
     } finally {
       await rm(root, { recursive: true, force: true });
@@ -1096,7 +1099,7 @@ function validConfiguredNxJson(): Record<string, unknown> {
   return {
     ...validNxJson(),
     namedInputs: validNamedInputs(),
-    targetDefaults: { build: { cache: true, outputs: ['{projectRoot}/dist'] } },
+    targetDefaults: validTargetDefaults(),
     plugins: [
       {
         plugin: '@nx/js/typescript',
@@ -1115,6 +1118,13 @@ function validConfiguredNxJson(): Record<string, unknown> {
   };
 }
 
+function validTargetDefaults(): Record<string, unknown> {
+  return {
+    build: { cache: true, outputs: ['{projectRoot}/dist'] },
+    clean: { executor: '@smoothbricks/nx-plugin:clean-outputs', cache: false },
+  };
+}
+
 function validNamedInputs(): Record<string, unknown> {
   return {
     default: ['{projectRoot}/**/*', 'sharedGlobals'],

package/src/monorepo/package-policy.ts

@@ -48,10 +48,12 @@ export { SMOO_NX_RELEASE_TAG_PATTERN, SMOO_NX_VERSION_ACTIONS };
 
 const extraCommitScopes = ['release'];
 const rootScriptPolicy: Record<string, string> = {
+  clean: 'nx run-many -t clean; nx reset',
+  'clean:node_modules': 'rm -rf node_modules && find e* t* p* -type d -name node_modules -print0 | xargs -0 rm -rvf',
+  'format:changed': 'git-format-staged --config tooling/git-hooks/git-format-staged.yml --also-unstaged',
+  'format:staged': 'git-format-staged --config tooling/git-hooks/git-format-staged.yml',
   lint: 'nx run-many -t lint',
   'lint:fix': 'git-format-staged --config tooling/git-hooks/git-format-staged.yml --unstaged',
-  'format:staged': 'git-format-staged --config tooling/git-hooks/git-format-staged.yml',
-  'format:changed': 'git-format-staged --config tooling/git-hooks/git-format-staged.yml --also-unstaged',
 };
 
 export function applyFixableMonorepoDefaults(root: string): void {

package/src/monorepo/packed-package.ts

@@ -3,7 +3,7 @@ import { join } from 'node:path';
 import { publint } from 'publint';
 import { formatMessage } from 'publint/utils';
 import { isRecord } from '../lib/json.js';
-import { runResult, runStatus } from '../lib/run.js';
+import { printCommandOutput, runResult } from '../lib/run.js';
 import type { PackageInfo } from '../lib/workspace.js';
 import { listPublicPackages } from '../lib/workspace.js';
 import { readPackedPackageJson, validatePackedWorkspaceDependencies } from './packed-manifest.js';
@@ -142,14 +142,14 @@ async function packPackage(root: string, pkg: PackageInfo): Promise<{ path: stri
   const tarballName = `.smoo-${process.pid}-${Date.now()}.tgz`;
   const tarballPath = join(root, tarballName);
   try {
-    const status = await runStatus(
+    const result = await runResult(
       'bun',
       ['pm', 'pack', '--filename', tarballName, '--ignore-scripts', '--quiet'],
       packageDir,
-      true,
     );
-    if (status !== 0) {
-      throw new Error(`bun pm pack failed with exit code ${status}`);
+    if (result.exitCode !== 0) {
+      printCommandOutput(result.stdout, result.stderr);
+      throw new Error(`bun pm pack failed with exit code ${result.exitCode}`);
     }
     const bytes = new Uint8Array(readFileSync(tarballPath));
     return { path: tarballPath, arrayBuffer: bytes.slice().buffer };

package/src/monorepo/packs/index.ts

@@ -1,6 +1,6 @@
 import { chmodSync, existsSync, statSync } from 'node:fs';
 import { join } from 'node:path';
-import { runStatus } from '../../lib/run.js';
+import { printCommandOutput, runResult, runStatus } from '../../lib/run.js';
 import { readProjectTargets } from '../../nx/index.js';
 import { syncBunLockfileVersions, validateBunLockfileVersions } from '../lockfile.js';
 import { validateManagedFiles } from '../managed-files.js';
@@ -315,10 +315,14 @@ async function runBuild(ctx: MonorepoContext, options: ValidatePackOptions = {})
   if (options.verbose) {
     printCheckHeading('build', true);
   }
-  const status = await runStatus('nx', ['run-many', '-t', 'build'], ctx.root, options.verbose !== true);
+  const result = options.verbose
+    ? { exitCode: await runStatus('nx', ['run-many', '-t', 'build'], ctx.root, false), stdout: '', stderr: '' }
+    : await runResult('nx', ['run-many', '-t', 'build'], ctx.root);
+  const status = result.exitCode;
   if (status !== 0) {
     if (!options.verbose) {
       printCheckHeading('build', true);
+      printCommandOutput(result.stdout, result.stderr);
     }
     console.error('nx run-many -t build failed');
     printCheckStatus('build', 1);

package/src/monorepo/publish-workflow.ts

@@ -1,8 +1,9 @@
 import { isSmoothBricksCodebasePackageName } from '../lib/cli-package.js';
 
 export type PublishWorkflowBump = 'auto' | 'patch' | 'minor' | 'major' | 'prerelease';
-export type PublishWorkflowCondition = 'version-mode-not-none' | 'failure' | 'always';
+export type PublishWorkflowCondition = 'version-mode-not-none' | 'deploy-production' | 'failure' | 'always';
 export type PublishWorkflowNxTarget = 'build' | 'lint' | 'test';
+export type PublishWorkflowDeployEnvironment = 'none' | 'production';
 
 export enum PublishWorkflowStepKind {
   Checkout = 'checkout',
@@ -18,6 +19,7 @@ export enum PublishWorkflowStepKind {
   UploadTraceDbs = 'upload-trace-dbs',
   ValidateMonorepoConfig = 'validate-monorepo-config',
   PublishRelease = 'publish-release',
+  DeployProduction = 'deploy-production',
   SaveNixDevenv = 'save-nix-devenv',
 }
 
@@ -35,11 +37,14 @@ export interface PublishWorkflowDefinition {
 }
 
 export interface PublishWorkflowDefinitionOptions {
+  deploy?: boolean;
+  deployProvider?: 'cloudflare';
   repoName?: string;
 }
 
 export interface PublishWorkflowInputs {
   bump: PublishWorkflowBump;
+  deployEnvironment: PublishWorkflowDeployEnvironment;
   dryRun: boolean;
 }
 
@@ -65,6 +70,7 @@ export interface PublishWorkflowCallbacks {
   uploadTraceDbs(): Promise<void>;
   validateMonorepoConfig(): Promise<void>;
   publishRelease(input: { bump: PublishWorkflowBump; dryRun: boolean }): Promise<void>;
+  deployProduction(): Promise<void>;
   saveNixDevenv(input: PublishWorkflowSetupOutputs): Promise<void>;
 }
 
@@ -90,6 +96,19 @@ export function definePublishWorkflow(options: PublishWorkflowDefinitionOptions
   if (isSmoothBricksCodebasePackageName(options.repoName)) {
     setupSteps.push({ kind: PublishWorkflowStepKind.BuildSelfHostedCli, name: '🏗️ Build self-hosted smoo' });
   }
+  const releaseSteps: PublishWorkflowStepInput[] = [
+    {
+      kind: PublishWorkflowStepKind.PublishRelease,
+      name: `📦 Publish release (${versionMode})`,
+    },
+  ];
+  if (options.deploy === true) {
+    releaseSteps.push({
+      kind: PublishWorkflowStepKind.DeployProduction,
+      name: '🚀 Deploy production',
+      condition: 'deploy-production',
+    });
+  }
   return {
     steps: numberWorkflowSteps([
       ...setupSteps,
@@ -127,10 +146,7 @@ export function definePublishWorkflow(options: PublishWorkflowDefinitionOptions
         name: `✅ Validate monorepo config (${versionMode})`,
         condition: 'version-mode-not-none',
       },
-      {
-        kind: PublishWorkflowStepKind.PublishRelease,
-        name: `📦 Publish release (${versionMode})`,
-      },
+      ...releaseSteps,
       {
         kind: PublishWorkflowStepKind.SaveNixDevenv,
         name: '🧹 Cleanup and cache Nix/devenv',
@@ -153,7 +169,7 @@ export async function runPublishWorkflow(
   let failed = false;
   let failure: unknown;
   for (const step of workflow.steps) {
-    if (!shouldRunStep(step, version, failed)) {
+    if (!shouldRunStep(step, version, failed, context.inputs)) {
       continue;
     }
     try {
@@ -201,6 +217,9 @@ export async function runPublishWorkflow(
             dryRun: context.inputs.dryRun,
           });
           break;
+        case PublishWorkflowStepKind.DeployProduction:
+          await context.callbacks.deployProduction();
+          break;
         case PublishWorkflowStepKind.SaveNixDevenv:
           await context.callbacks.saveNixDevenv(setupOutputs);
           break;
@@ -216,10 +235,18 @@ export async function runPublishWorkflow(
   return { version, failed };
 }
 
-function shouldRunStep(step: PublishWorkflowStep, version: PublishWorkflowVersionOutputs, failed: boolean): boolean {
+function shouldRunStep(
+  step: PublishWorkflowStep,
+  version: PublishWorkflowVersionOutputs,
+  failed: boolean,
+  inputs: PublishWorkflowInputs,
+): boolean {
   if (step.condition === 'version-mode-not-none') {
     return version.mode !== 'none';
   }
+  if (step.condition === 'deploy-production') {
+    return version.mode !== 'none' && inputs.deployEnvironment === 'production' && !inputs.dryRun;
+  }
   if (step.condition === 'failure') {
     return failed;
   }
@@ -228,10 +255,19 @@ function shouldRunStep(step: PublishWorkflowStep, version: PublishWorkflowVersio
 
 export function renderPublishWorkflowYaml(options: PublishWorkflowDefinitionOptions = {}): string {
   const steps = definePublishWorkflow(options).steps;
-  return `${renderPublishWorkflowHeader()}${renderPublishWorkflowSteps(steps)}`;
+  return `${renderPublishWorkflowHeader(options)}${renderPublishWorkflowSteps(steps, options)}`;
 }
 
-function renderPublishWorkflowHeader(): string {
+function renderPublishWorkflowHeader(options: PublishWorkflowDefinitionOptions): string {
+  const deployInput =
+    options.deploy === true
+      ? `
+      deploy_environment:
+        type: choice
+        description: Deploy live systems after a successful publish.
+        options: [none, production]
+        default: none`
+      : '';
   return `name: Publish
 
 on:
@@ -247,7 +283,7 @@ on:
       dry_run:
         type: boolean
         description: Run release commands without writing versions, tags, publishes, or GitHub Releases.
-        default: false
+        default: false${deployInput}
 
 permissions:
   contents: write
@@ -271,12 +307,12 @@ jobs:
 `;
 }
 
-function renderPublishWorkflowSteps(steps: PublishWorkflowStep[]): string {
+function renderPublishWorkflowSteps(steps: PublishWorkflowStep[], options: PublishWorkflowDefinitionOptions): string {
   const lines: string[] = [];
   for (const step of steps) {
     lines.push(...sectionLinesBefore(step));
     lines.push(...commentLinesForStep(step));
-    lines.push(...yamlLinesForStep(step));
+    lines.push(...yamlLinesForStep(step, options));
     lines.push('');
   }
   return `${lines.join('\n').trimEnd()}\n`;
@@ -319,7 +355,7 @@ function commentLinesForStep(step: PublishWorkflowStep): string[] {
   return [`      # Step ${step.number}`];
 }
 
-function yamlLinesForStep(step: PublishWorkflowStep): string[] {
+function yamlLinesForStep(step: PublishWorkflowStep, options: PublishWorkflowDefinitionOptions): string[] {
   switch (step.kind) {
     case PublishWorkflowStepKind.Checkout:
       return [
@@ -396,6 +432,8 @@ function yamlLinesForStep(step: PublishWorkflowStep): string[] {
         '        # Missing package names are bootstrapped locally before trust setup.',
         `        run: smoo release publish --bump "${githubExpression('inputs.bump')}" --dry-run "${githubExpression('inputs.dry_run')}"`,
       ];
+    case PublishWorkflowStepKind.DeployProduction:
+      return deployProductionStep(step, options);
     case PublishWorkflowStepKind.SaveNixDevenv:
       return [
         `      - name: ${step.name}`,
@@ -408,14 +446,33 @@ function yamlLinesForStep(step: PublishWorkflowStep): string[] {
   }
 }
 
-function conditionalRunStep(step: PublishWorkflowStep, run: string): string[] {
+function deployProductionStep(step: PublishWorkflowStep, options: PublishWorkflowDefinitionOptions): string[] {
   return [
     `      - name: ${step.name}`,
-    `        if: ${githubExpression("steps.version.outputs.mode != 'none'")}`,
-    `        run: ${run}`,
+    '        if:',
+    "          ${{ 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"',
   ];
 }
 
+function deployEnvLines(options: PublishWorkflowDefinitionOptions): string[] {
+  if (options.deployProvider !== 'cloudflare') {
+    return [];
+  }
+  return [
+    '        env:',
+    '          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}',
+    '          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}',
+  ];
+}
+
+function conditionalRunStep(step: PublishWorkflowStep, run: string): string[] {
+  const condition = "steps.version.outputs.mode != 'none'";
+  return [`      - name: ${step.name}`, `        if: ${githubExpression(condition)}`, `        run: ${run}`];
+}
+
 function githubExpression(expression: string): string {
   return ['$', '{{ ', expression, ' }}'].join('');
 }

package/managed/templates/github/workflows/ci.yml

@@ -1,102 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - '**'
-  pull_request:
-
-permissions:
-  actions: read
-  contents: read
-  statuses: write
-
-defaults:
-  run:
-    working-directory: tooling/direnv
-
-jobs:
-  main:
-    name: Validate
-    runs-on: ubuntu-latest
-    timeout-minutes: 45
-    env:
-      NIX_STORE_NAR: ${{ github.workspace }}/nix-store.nar
-      GH_TOKEN: ${{ github.token }}
-    steps:
-      # Step 1: GitHub adds "Set up job" automatically
-      # Step 2
-      - name: 📥 Checkout
-        uses: actions/checkout@v6.0.2
-        with:
-          filter: blob:none
-          fetch-depth: 0
-
-      # Step 3. Composite action internals do not affect top-level job step
-      # anchors; update the nx-smart --step values below if top-level steps move.
-      - name: 🧱 Setup Nix/devenv
-        id: setup
-        uses: ./.github/actions/setup-devenv
-
-      # --- Nx -----------------------------------------------------------------
-
-      # Step 4
-      # Sets the base and head SHAs required for the nx affected commands
-      - name: 🧭 Set Nx SHAs
-        uses: nrwl/nx-set-shas@v5.0.1
-        with:
-          workflow-id: ci.yml
-
-      # Step 5
-      - name: 🧠 Restore Nx cache
-        id: nx-cache
-        uses: ./.github/actions/cache-nx
-
-      # Step 6
-      - name: 🔨 Build
-        run: smoo github-ci nx-smart --target build --name "Build" --step 6
-
-      # Step 7
-      - name: 🔍 Lint
-        run: smoo github-ci nx-smart --target lint --name "Lint" --step 7
-
-      # Step 8
-      - name: 🧪 Unit Tests
-        run: smoo github-ci nx-smart --target test --name "Unit Tests" --step 8
-
-      # Step 9
-      # Nx's database cache needs artifact files and .nx/workspace-data DB
-      # metadata restored together; GitHub Actions cache is only the archive
-      # transport. Save runs only after build/lint/test succeed on the default
-      # branch, so PRs may restore shared cache but cannot publish it.
-      - name: 💾 Save Nx cache
-        if:
-          ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}',
-          github.event.repository.default_branch) && steps.nx-cache.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v5.0.5
-        with:
-          path: |
-            .nx/cache
-            .nx/workspace-data/*.db*
-          key: ${{ runner.os }}-nx-db-v1-${{ github.sha }}
-
-      # Step 10
-      - name: 📎 Upload trace DBs
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v7.0.1
-        with:
-          name: trace-results-${{ github.run_id }}
-          path: packages/*/.trace-results.db
-          if-no-files-found: ignore
-          retention-days: 14
-          include-hidden-files: true
-
-      # --- Cleanup ------------------------------------------------------------
-
-      # Step 11
-      - name: 🧹 Cleanup and cache Nix/devenv
-        if: ${{ always() }}
-        uses: ./.github/actions/save-nix-devenv
-        with:
-          nix-cache-hit: ${{ steps.setup.outputs.nix-cache-hit }}
-          devenv-cache-hit: ${{ steps.setup.outputs.devenv-cache-hit }}